sync with code

75 files changed, 24633 insertions, 38604 deletions

diff --git a/po/af.po b/po/af.po
index b057b146..624496cb 100644
--- a/po/af.po
+++ b/po/af.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline-af\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-09 16:26+0200\n"
+"POT-Creation-Date: 2008-02-21 18:21+0100\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"
@@ -18,70 +18,60 @@ 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:94
+#: ../mdkapplet:88
 #, fuzzy, c-format
 msgid "Will check updates at %s"
 msgstr "Kyk vir Opdaterings"
 
-#: ../mdkapplet:103
+#: ../mdkapplet:97
 #, c-format
 msgid "Your system is up-to-date"
 msgstr ""
 
-#: ../mdkapplet:109
+#: ../mdkapplet:103
 #, fuzzy, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
 "support@mandrivaonline.com"
 msgstr "Vir enige probleem stuur 'n e-pos na support@mandrivaonline.com\n"
 
-#: ../mdkapplet:115
+#: ../mdkapplet:110
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "Net 'n oomblik, opsoek na beskikbare pakette..."
 
-#: ../mdkapplet:121
+#: ../mdkapplet:116
 #, c-format
 msgid "New updates are available for your system"
 msgstr ""
 
-#: ../mdkapplet:127
-#, c-format
-msgid "New bundles are available for your system"
-msgstr ""
-
-#: ../mdkapplet:133
-#, c-format
-msgid "Service is not configured. Please click on \"Configure the service\""
-msgstr ""
-
-#: ../mdkapplet:139
+#: ../mdkapplet:122
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr ""
 
-#: ../mdkapplet:145
+#: ../mdkapplet:128
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr ""
 
-#: ../mdkapplet:151 ../mdkapplet:182
+#: ../mdkapplet:134 ../mdkapplet:165
 #, fuzzy, c-format
 msgid "urpmi database locked"
 msgstr "RPM-databasisnavraag het misluk\n"
 
-#: ../mdkapplet:157
+#: ../mdkapplet:140
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
-#: ../mdkapplet:163
+#: ../mdkapplet:146
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
 msgstr ""
 
-#: ../mdkapplet:169
+#: ../mdkapplet:152
 #, fuzzy, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -97,572 +87,131 @@ msgstr ""
 "\n"
 "Herbegin net %s daarna."
 
-#: ../mdkapplet:174
+#: ../mdkapplet:157
 #, c-format
 msgid "Enabled"
 msgstr "Aktiveer"
 
-#: ../mdkapplet:187
+#: ../mdkapplet:170
 #, c-format
 msgid "Error updating media"
 msgstr ""
 
-#: ../mdkapplet:202
+#: ../mdkapplet:185
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr ""
 
-#: ../mdkapplet:207
+#: ../mdkapplet:190
 #, c-format
 msgid "Packages are up to date"
 msgstr ""
 
-#: ../mdkapplet:212
+#: ../mdkapplet:195
 #, fuzzy, c-format
 msgid "Failed to open urpmi database"
 msgstr "Kan nie lêer %s oopmaak nie\n"
 
-#: ../mdkapplet:217 ../mdkapplet:324
+#: ../mdkapplet:200
 #, c-format
 msgid "Install updates"
 msgstr "Installeer updaterings"
 
-#: ../mdkapplet:218
-#, fuzzy, c-format
-msgid "Configure the service"
-msgstr "Konfigureer die Netwerk"
-
-#: ../mdkapplet:219
+#: ../mdkapplet:201
 #, c-format
 msgid "Check Updates"
 msgstr "Kyk vir Opdaterings"
 
-#: ../mdkapplet:220 ../mdkapplet:327 ../mdkonline:114 ../mdkonline:155
-#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
-#, c-format
-msgid "Please wait"
-msgstr "Wag asb."
-
-#: ../mdkapplet:220 ../mdkapplet:326 ../mdkapplet:327
-#, fuzzy, c-format
-msgid "Check updates"
-msgstr "Kyk vir Opdaterings"
-
-#: ../mdkapplet:223 ../mdkapplet:648
-#, c-format
-msgid "Online WebSite"
-msgstr "Aanlyn Webwerf"
-
-#: ../mdkapplet:224
+#: ../mdkapplet:202
 #, c-format
 msgid "Configure Network"
 msgstr "Konfigureer die Netwerk"
 
-#: ../mdkapplet:225
-#, fuzzy, c-format
-msgid "Configure Now!"
-msgstr "Konfigureer"
-
-#: ../mdkapplet:313 ../mdkapplet:392
-#, c-format
-msgid "Mandriva Linux Updates Applet"
-msgstr "Mandriva Linux Updates Applet"
-
-#: ../mdkapplet:322
-#, c-format
-msgid "Actions"
-msgstr "Aksies"
-
-#: ../mdkapplet:325
-#, c-format
-msgid "Configure"
-msgstr "Konfigureer"
-
-#: ../mdkapplet:329
-#, c-format
-msgid "See logs"
-msgstr "Bekyk staaflêers"
-
-#: ../mdkapplet:332
-#, c-format
-msgid "Status"
-msgstr "Status"
-
-#: ../mdkapplet:336 ../mdkapplet:597
-#, c-format
-msgid "Close"
-msgstr "Maak toe"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Network Connection: "
-msgstr "Netwerk konneksie: "
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Up"
-msgstr "Op"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Down"
-msgstr "Af"
-
-#: ../mdkapplet:366
-#, c-format
-msgid "Last check: "
-msgstr "Laaste gemerk: "
-
-#: ../mdkapplet:367 ../mdkonline:145
-#, c-format
-msgid "Machine name:"
-msgstr "Masjiennaam:"
-
-#: ../mdkapplet:368
-#, fuzzy, c-format
-msgid "Updates: "
-msgstr "Nuwe Opdaterings: "
-
-#: ../mdkapplet:372
+#: ../mdkapplet:283
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr ""
 
-#: ../mdkapplet:375
+#: ../mdkapplet:286
 #, c-format
 msgid "Mandriva Online seems to be reinstalled, reloading applet ...."
 msgstr ""
 
-#: ../mdkapplet:383
+#: ../mdkapplet:294
 #, c-format
 msgid "Launching MandrivaUpdate\n"
 msgstr ""
 
-#: ../mdkapplet:398
+#: ../mdkapplet:303
+#, c-format
+msgid "Mandriva Linux Updates Applet"
+msgstr "Mandriva Linux Updates Applet"
+
+#: ../mdkapplet:308
 #, fuzzy, c-format
 msgid "Computing new updates...\n"
 msgstr "Kyk vir Opdaterings"
 
-#: ../mdkapplet:399
+#: ../mdkapplet:309
 #, fuzzy, c-format
 msgid "Connecting to"
 msgstr "Konneksie probleem"
 
-#: ../mdkapplet:467 ../mdkupdate:159 ../mdkupdate:188
-#, c-format
-msgid "An error occurred"
-msgstr "'n Fout het voorgekom"
-
-#: ../mdkapplet:475
-#, c-format
-msgid "Development release not supported by service"
-msgstr ""
-
-#: ../mdkapplet:476
-#, c-format
-msgid "Too old release not supported by service"
-msgstr ""
-
-#: ../mdkapplet:477
-#, c-format
-msgid "Unknown state"
-msgstr ""
-
-#: ../mdkapplet:478
-#, c-format
-msgid "Online services disabled. Contact Mandriva Online site\n"
-msgstr ""
-
-#: ../mdkapplet:479
-#, c-format
-msgid "Wrong Password.\n"
-msgstr "Verkeerde wagwoord\n"
-
-#: ../mdkapplet:480
-#, c-format
-msgid "Wrong Action or host or login.\n"
-msgstr ""
-
-#: ../mdkapplet:481
-#, c-format
-msgid ""
-"Something is wrong with your network settings (check your route, firewall or "
-"proxy settings)\n"
-msgstr ""
-
-#: ../mdkapplet:483
-#, c-format
-msgid ""
-"Problem occured while connecting to the server, please contact the support "
-"team"
-msgstr ""
-
-#: ../mdkapplet:487
-#, fuzzy, c-format
-msgid "Response from Mandriva Online server\n"
-msgstr "Welkom by Mandriva Online"
-
-#: ../mdkapplet:490
+#: ../mdkapplet:386
 #, c-format
 msgid "System is up-to-date\n"
 msgstr ""
 
-#: ../mdkapplet:527
-#, fuzzy, c-format
-msgid "No check"
-msgstr "Laaste gemerk: "
-
-#: ../mdkapplet:541
-#, c-format
-msgid "Checking config file: Not present\n"
-msgstr ""
-
-#: ../mdkapplet:544
+#: ../mdkapplet:415
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr ""
 
-#: ../mdkapplet:587
+#: ../mdkapplet:457 ../mdkupdate:118 ../mdkupdate:164
 #, c-format
-msgid "Logs"
-msgstr "Staaflêers"
-
-#: ../mdkapplet:603
-#, c-format
-msgid "Clear"
-msgstr "Maak skoon"
+msgid "Warning"
+msgstr "Waarskuwing"
 
-#: ../mdkapplet:629
+#: ../mdkapplet:468
 #, c-format
 msgid "About..."
 msgstr "Omtrent.."
 
-#: ../mdkapplet:631
+#: ../mdkapplet:472
 #, fuzzy, c-format
 msgid "Mandriva Online %s"
 msgstr "Mandriva Online"
 
-#: ../mdkapplet:635
+#: ../mdkapplet:473
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr ""
 
-#: ../mdkapplet:647
+#: ../mdkapplet:476
 #, c-format
 msgid "Mandriva Online gives access to Mandriva web services."
 msgstr ""
 
-#: ../mdkapplet:655
-#, c-format
-msgid "Always launch on startup"
-msgstr ""
-
-#: ../mdkapplet:657
-#, c-format
-msgid "Quit"
-msgstr "Eindig"
-
-#: ../mdkonline:58
-#, c-format
-msgid ""
-"mdonline version %s\n"
-"Copyright (C) %s Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"mdonline uitgawe %s\n"
-"Kopiereg (C) %s Mandriva.\n"
-"Hierdie is vry sagteware en mag versprei word onder die terme van die GNU "
-"GPL.\n"
-"\n"
-"gebruik:\n"
-
-#: ../mdkonline:63 ../mdkupdate:73
-#, c-format
-msgid "  --help\t\t- print this help message.\n"
-msgstr "  --help\t\t- druk hierdie help boodskap.\n"
-
-#: ../mdkonline:64
-#, c-format
-msgid "  --box=\t\t\t- hostname.\n"
-msgstr ""
-
-#: ../mdkonline:65
-#, c-format
-msgid "  --country\t\t\t- name of country of the user. \n"
-msgstr ""
-
-#: ../mdkonline:66
-#, c-format
-msgid "  --interactive\t\t- use the interactive mode.\n"
-msgstr ""
-
-#: ../mdkonline:67
-#, c-format
-msgid "  --nointeractive\t- use the non-interactive mode.\n"
-msgstr ""
-
-#: ../mdkonline:68
-#, c-format
-msgid "  --login=\t\t     - login name of the user.\n"
-msgstr ""
-
-#: ../mdkonline:69
-#, c-format
-msgid "  --pass=\t\t\t- password  of the user.\n"
-msgstr ""
-
-#: ../mdkonline:87 ../mdkonline:120
-#, c-format
-msgid "Mandriva Online"
-msgstr "Mandriva Online"
-
-#: ../mdkonline:90
-#, c-format
-msgid "I already have an account"
-msgstr ""
-
-#: ../mdkonline:91
-#, c-format
-msgid "I want to subscribe"
-msgstr ""
-
-#: ../mdkonline:96
-#, c-format
-msgid "Mr."
-msgstr ""
-
-#: ../mdkonline:96
-#, c-format
-msgid "Mrs."
-msgstr ""
-
-#: ../mdkonline:96
-#, c-format
-msgid "Ms."
-msgstr ""
-
-#: ../mdkonline:114
-#, c-format
-msgid "Reading configuration\n"
-msgstr "Lees konfigurasie\n"
-
-#: ../mdkonline:123
-#, c-format
-msgid ""
-"This assistant will help you to upload your configuration\n"
-"(packages, hardware configuration) to a centralized database in\n"
-"order to keep you informed about security updates and useful upgrades.\n"
-msgstr ""
-"Die assistent sal jou help om jou konfigurasie op te laai\n"
-"(pakkette, hardeware konfigurasie) na 'n sentrale databasis sodat\n"
-"jy op datum gehou kan word met sekuriteit en ander waardevolle nuus.\n"
-
-#: ../mdkonline:131
-#, c-format
-msgid "Account creation or authentication"
-msgstr ""
-
-#: ../mdkonline:136
-#, c-format
-msgid "Enter your Mandriva Online login, password and machine name:"
-msgstr "Sleutel in jou Mandriva Online inteken, wagwoord, en masjiennaam:"
-
-#: ../mdkonline:142 ../mdkonline:195
-#, fuzzy, c-format
-msgid "Email address:"
-msgstr "IP-adres"
-
-#: ../mdkonline:143
-#, c-format
-msgid "Country"
-msgstr "Land"
-
-#: ../mdkonline:144 ../mdkonline:196
-#, c-format
-msgid "Password:"
-msgstr "Wagwoord:"
-
-#: ../mdkonline:146
-#, fuzzy, c-format
-msgid "Machine description:"
-msgstr "Masjiennaam:"
-
-#: ../mdkonline:147
-#, c-format
-msgid "(Ex: My Home Office's Computer)"
-msgstr ""
-
-#: ../mdkonline:152 ../mdkonline:159 ../mdkonline:180 ../mdkonline:204
-#: ../mdkonline:208 ../mdkonline:212 ../mdkonline:217 ../mdkupdate:141
-#: ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
-#, c-format
-msgid "Error"
-msgstr "Fout"
-
-#: ../mdkonline:152
-#, fuzzy, c-format
-msgid "Machine name must be 1 to 40 alphanumerical characters"
-msgstr "Hegpunte kan slegs alfa-numeriese karakters bevat"
-
-#: ../mdkonline:155
-#, fuzzy, c-format
-msgid "Connecting to Mandriva Online website..."
-msgstr "Welkom by Mandriva Online"
-
-#: ../mdkonline:167
-#, c-format
-msgid ""
-"In order to benefit from Mandriva Online services,\n"
-"we are about to upload your configuration.\n"
-"\n"
-"The Wizard will now send the following information to Mandriva:\n"
-"\n"
-"1) the list of packages you have installed on your system,\n"
-"\n"
-"2) your hardware configuration.\n"
-"\n"
-"If you feel uncomfortable by that idea, or do not want to benefit from this "
-"service,\n"
-"please press 'Cancel'. By pressing 'Next', you allow us to keep you "
-"informed\n"
-"about security updates and useful upgrades via personalized email alerts.\n"
-"Furthermore, you benefit from discounted paid support services on\n"
-"www.mandrivaexpert.com."
-msgstr ""
-"Om jou die beste Mandriva Online diens te lewer,\n"
-"gaan ons nou jou konfigurasie oplaai.\n"
-"\n"
-"Die assistent sal die volgende inligting stuur na Mandriva:\n"
-"\n"
-"1) Lys van pakkette wat jy geinstalleer het op jou stelsel,\n"
-"\n"
-"2) Jou hardeware konfigurasie.\n"
-"\n"
-"As jy ongemaklik voel met dit, of wil nie die diens hê nie, kliek\n"
-"asseblief 'Kanselleer'. As jy 'Volgende' kliek laat jy ons toe\n"
-"om jou op datum te hou\n"
-"oor sekuriteits nuus en waardevolle opgradeerings d.m.v. e-pos.\n"
-"Verder, jy kry afslag hulp by www.mandrivaexpert.com."
-
-#: ../mdkonline:180
-#, c-format
-msgid "Connection problem"
-msgstr "Konneksie probleem"
-
-#: ../mdkonline:180
-#, c-format
-msgid "Problem occurs when uploading files, please try again"
-msgstr ""
-
-#: ../mdkonline:187
-#, c-format
-msgid "Create a Mandriva Online Account"
-msgstr "Skep 'n Mandriva Online Rekening"
-
-#. -PO: that is for things like "Mr", "Ms",...
-#: ../mdkonline:192
-#, fuzzy, c-format
-msgid "Greeting:"
-msgstr "Groen"
-
-#: ../mdkonline:193
-#, fuzzy, c-format
-msgid "First name:"
-msgstr "Masjien naam:"
-
-#: ../mdkonline:194
-#, fuzzy, c-format
-msgid "Last name:"
-msgstr "Masjien naam:"
-
-#: ../mdkonline:197
-#, c-format
-msgid "Confirm Password:"
-msgstr "Bevestig Wagwoord:"
-
-#: ../mdkonline:204
-#, c-format
-msgid ""
-"The passwords do not match\n"
-" Please try again\n"
-msgstr ""
-"Die wagwoorde verskil\n"
-"probeer weer\n"
-
-#: ../mdkonline:208
-#, fuzzy, c-format
-msgid "Please fill in each field"
-msgstr "Voorsien asselbief alle velde\n"
-
-#: ../mdkonline:212
-#, c-format
-msgid "Not a valid mail address!\n"
-msgstr "Nie-geldige e-pos adres!\n"
-
-#: ../mdkonline:217
-#, fuzzy, c-format
-msgid "Creating account failed!"
-msgstr "Verander rekening"
-
-#: ../mdkonline:225
-#, c-format
-msgid ""
-"Mandriva Online Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
-msgstr ""
-
-#: ../mdkonline:229
-#, c-format
-msgid "Your upload was successful!"
-msgstr "Die oplaai was suksesvol!"
-
-#: ../mdkonline:229
+#: ../mdkapplet:478
 #, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandriva Online."
-msgstr ""
-"Van nou af sal jy sekuritiets en opgradeerings nuus kry\n"
-"vanaf Mandriva Online."
+msgid "Online WebSite"
+msgstr "Aanlyn Webwerf"
 
-#: ../mdkonline:229
+#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
+#: ../mdkapplet:483
 #, c-format
-msgid ""
-"Mandriva Online offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
+msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
-"Mandriva Online gee jou die vermoë op die opgradeerings te automatiseer.\n"
-"'n Program sal gereeld op jou stelsel loop en wag vir nuwe opgradeerings\n"
-
-#: ../mdkonline:238
-#, c-format
-msgid "Congratulations"
-msgstr "Konfigurasie"
 
-#: ../mdkonline:238
+#: ../mdkapplet:492
 #, c-format
-msgid "Your Mandriva Online account has been successfully configured\n"
+msgid "Always launch on startup"
 msgstr ""
 
-#: ../mdkonline:253
-#, fuzzy, c-format
-msgid "Configuration uploaded successfully"
-msgstr "Die oplaai was suksesvol!"
-
-#: ../mdkonline:254
-#, fuzzy, c-format
-msgid "Problem uploading configuration"
-msgstr "Lees konfigurasie\n"
-
-#: ../mdkonline:256
+#: ../mdkapplet:494
 #, c-format
-msgid ""
-"Cannot connect to Mandriva Online website: wrong login/password or router/"
-"firewall bad settings"
-msgstr ""
+msgid "Quit"
+msgstr "Eindig"
 
 #: ../mdkonline.pm:207
 #, fuzzy, c-format
@@ -803,6 +352,11 @@ msgstr ""
 "\n"
 "gebruik:\n"
 
+#: ../mdkupdate:73
+#, c-format
+msgid "  --help\t\t- print this help message.\n"
+msgstr "  --help\t\t- druk hierdie help boodskap.\n"
+
 #: ../mdkupdate:74
 #, fuzzy, c-format
 msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
@@ -830,11 +384,6 @@ msgid ""
 "file.\n"
 msgstr ""
 
-#: ../mdkupdate:118 ../mdkupdate:164
-#, c-format
-msgid "Warning"
-msgstr "Waarskuwing"
-
 #. -PO: here Live Install is currently *NOT* translated on the desktop, so it's better to keep as it:
 #: ../mdkupdate:120
 #, c-format
@@ -843,11 +392,21 @@ msgid ""
 "Install' wizard."
 msgstr ""
 
+#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
+#, c-format
+msgid "Please wait"
+msgstr "Wag asb."
+
 #: ../mdkupdate:123 ../mdkupdate:174
 #, fuzzy, c-format
 msgid "Preparing..."
 msgstr "Herlaaistelsel word voorberei..."
 
+#: ../mdkupdate:141 ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
+#, c-format
+msgid "Error"
+msgstr "Fout"
+
 #: ../mdkupdate:141
 #, c-format
 msgid ""
@@ -856,6 +415,11 @@ msgid ""
 "%s"
 msgstr ""
 
+#: ../mdkupdate:159 ../mdkupdate:188
+#, c-format
+msgid "An error occurred"
+msgstr "'n Fout het voorgekom"
+
 #: ../mdkupdate:164
 #, c-format
 msgid ""
@@ -880,6 +444,225 @@ msgstr "Installeer pakkette...\n"
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "Kon nie pakette vanaf update_source media opgradeer nie.\n"
 
+#, fuzzy
+#~ msgid "Configure the service"
+#~ msgstr "Konfigureer die Netwerk"
+
+#, fuzzy
+#~ msgid "Check updates"
+#~ msgstr "Kyk vir Opdaterings"
+
+#, fuzzy
+#~ msgid "Configure Now!"
+#~ msgstr "Konfigureer"
+
+#~ msgid "Actions"
+#~ msgstr "Aksies"
+
+#~ msgid "Configure"
+#~ msgstr "Konfigureer"
+
+#~ msgid "See logs"
+#~ msgstr "Bekyk staaflêers"
+
+#~ msgid "Status"
+#~ msgstr "Status"
+
+#~ msgid "Close"
+#~ msgstr "Maak toe"
+
+#~ msgid "Network Connection: "
+#~ msgstr "Netwerk konneksie: "
+
+#~ msgid "Up"
+#~ msgstr "Op"
+
+#~ msgid "Down"
+#~ msgstr "Af"
+
+#~ msgid "Last check: "
+#~ msgstr "Laaste gemerk: "
+
+#~ msgid "Machine name:"
+#~ msgstr "Masjiennaam:"
+
+#, fuzzy
+#~ msgid "Updates: "
+#~ msgstr "Nuwe Opdaterings: "
+
+#~ msgid "Wrong Password.\n"
+#~ msgstr "Verkeerde wagwoord\n"
+
+#, fuzzy
+#~ msgid "Response from Mandriva Online server\n"
+#~ msgstr "Welkom by Mandriva Online"
+
+#, fuzzy
+#~ msgid "No check"
+#~ msgstr "Laaste gemerk: "
+
+#~ msgid "Logs"
+#~ msgstr "Staaflêers"
+
+#~ msgid "Clear"
+#~ msgstr "Maak skoon"
+
+#~ msgid ""
+#~ "mdonline version %s\n"
+#~ "Copyright (C) %s Mandriva.\n"
+#~ "This is free software and may be redistributed under the terms of the GNU "
+#~ "GPL.\n"
+#~ "\n"
+#~ "usage:\n"
+#~ msgstr ""
+#~ "mdonline uitgawe %s\n"
+#~ "Kopiereg (C) %s Mandriva.\n"
+#~ "Hierdie is vry sagteware en mag versprei word onder die terme van die GNU "
+#~ "GPL.\n"
+#~ "\n"
+#~ "gebruik:\n"
+
+#~ msgid "Mandriva Online"
+#~ msgstr "Mandriva Online"
+
+#~ msgid "Reading configuration\n"
+#~ msgstr "Lees konfigurasie\n"
+
+#~ msgid ""
+#~ "This assistant will help you to upload your configuration\n"
+#~ "(packages, hardware configuration) to a centralized database in\n"
+#~ "order to keep you informed about security updates and useful upgrades.\n"
+#~ msgstr ""
+#~ "Die assistent sal jou help om jou konfigurasie op te laai\n"
+#~ "(pakkette, hardeware konfigurasie) na 'n sentrale databasis sodat\n"
+#~ "jy op datum gehou kan word met sekuriteit en ander waardevolle nuus.\n"
+
+#~ msgid "Enter your Mandriva Online login, password and machine name:"
+#~ msgstr "Sleutel in jou Mandriva Online inteken, wagwoord, en masjiennaam:"
+
+#, fuzzy
+#~ msgid "Email address:"
+#~ msgstr "IP-adres"
+
+#~ msgid "Country"
+#~ msgstr "Land"
+
+#~ msgid "Password:"
+#~ msgstr "Wagwoord:"
+
+#, fuzzy
+#~ msgid "Machine description:"
+#~ msgstr "Masjiennaam:"
+
+#, fuzzy
+#~ msgid "Machine name must be 1 to 40 alphanumerical characters"
+#~ msgstr "Hegpunte kan slegs alfa-numeriese karakters bevat"
+
+#, fuzzy
+#~ msgid "Connecting to Mandriva Online website..."
+#~ msgstr "Welkom by Mandriva Online"
+
+#~ msgid ""
+#~ "In order to benefit from Mandriva Online services,\n"
+#~ "we are about to upload your configuration.\n"
+#~ "\n"
+#~ "The Wizard will now send the following information to Mandriva:\n"
+#~ "\n"
+#~ "1) the list of packages you have installed on your system,\n"
+#~ "\n"
+#~ "2) your hardware configuration.\n"
+#~ "\n"
+#~ "If you feel uncomfortable by that idea, or do not want to benefit from "
+#~ "this service,\n"
+#~ "please press 'Cancel'. By pressing 'Next', you allow us to keep you "
+#~ "informed\n"
+#~ "about security updates and useful upgrades via personalized email "
+#~ "alerts.\n"
+#~ "Furthermore, you benefit from discounted paid support services on\n"
+#~ "www.mandrivaexpert.com."
+#~ msgstr ""
+#~ "Om jou die beste Mandriva Online diens te lewer,\n"
+#~ "gaan ons nou jou konfigurasie oplaai.\n"
+#~ "\n"
+#~ "Die assistent sal die volgende inligting stuur na Mandriva:\n"
+#~ "\n"
+#~ "1) Lys van pakkette wat jy geinstalleer het op jou stelsel,\n"
+#~ "\n"
+#~ "2) Jou hardeware konfigurasie.\n"
+#~ "\n"
+#~ "As jy ongemaklik voel met dit, of wil nie die diens hê nie, kliek\n"
+#~ "asseblief 'Kanselleer'. As jy 'Volgende' kliek laat jy ons toe\n"
+#~ "om jou op datum te hou\n"
+#~ "oor sekuriteits nuus en waardevolle opgradeerings d.m.v. e-pos.\n"
+#~ "Verder, jy kry afslag hulp by www.mandrivaexpert.com."
+
+#~ msgid "Connection problem"
+#~ msgstr "Konneksie probleem"
+
+#~ msgid "Create a Mandriva Online Account"
+#~ msgstr "Skep 'n Mandriva Online Rekening"
+
+#, fuzzy
+#~ msgid "Greeting:"
+#~ msgstr "Groen"
+
+#, fuzzy
+#~ msgid "First name:"
+#~ msgstr "Masjien naam:"
+
+#, fuzzy
+#~ msgid "Last name:"
+#~ msgstr "Masjien naam:"
+
+#~ msgid "Confirm Password:"
+#~ msgstr "Bevestig Wagwoord:"
+
+#~ msgid ""
+#~ "The passwords do not match\n"
+#~ " Please try again\n"
+#~ msgstr ""
+#~ "Die wagwoorde verskil\n"
+#~ "probeer weer\n"
+
+#, fuzzy
+#~ msgid "Please fill in each field"
+#~ msgstr "Voorsien asselbief alle velde\n"
+
+#~ msgid "Not a valid mail address!\n"
+#~ msgstr "Nie-geldige e-pos adres!\n"
+
+#, fuzzy
+#~ msgid "Creating account failed!"
+#~ msgstr "Verander rekening"
+
+#~ msgid "Your upload was successful!"
+#~ msgstr "Die oplaai was suksesvol!"
+
+#~ msgid ""
+#~ "From now you will receive on security and updates \n"
+#~ "announcements thanks to Mandriva Online."
+#~ msgstr ""
+#~ "Van nou af sal jy sekuritiets en opgradeerings nuus kry\n"
+#~ "vanaf Mandriva Online."
+
+#~ msgid ""
+#~ "Mandriva Online offers you the ability to automate the updates.\n"
+#~ "A program will run regulary in your system waiting for new updates\n"
+#~ msgstr ""
+#~ "Mandriva Online gee jou die vermoë op die opgradeerings te automatiseer.\n"
+#~ "'n Program sal gereeld op jou stelsel loop en wag vir nuwe opgradeerings\n"
+
+#~ msgid "Congratulations"
+#~ msgstr "Konfigurasie"
+
+#, fuzzy
+#~ msgid "Configuration uploaded successfully"
+#~ msgstr "Die oplaai was suksesvol!"
+
+#, fuzzy
+#~ msgid "Problem uploading configuration"
+#~ msgstr "Lees konfigurasie\n"
+
 #~ msgid "  --applet\t\t- launch Mandriva Update.\n"
 #~ msgstr "  --applet\t\t- loods Mandriva Update.\n"
 
diff --git a/po/am.po b/po/am.po
index a2e23d4f..37d8e591 100644
--- a/po/am.po
+++ b/po/am.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2007-08-09 16:26+0200\n"
+"POT-Creation-Date: 2008-02-21 18:21+0100\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"
@@ -14,67 +14,60 @@ 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:94
+#: ../mdkapplet:88
 #, c-format
 msgid "Will check updates at %s"
 msgstr ""
 
-#: ../mdkapplet:103
+#: ../mdkapplet:97
 #, c-format
 msgid "Your system is up-to-date"
 msgstr ""
 
-#: ../mdkapplet:109
+#: ../mdkapplet:103
 #, c-format
-msgid "Service configuration problem. Please check logs and send mail to support@mandrivaonline.com"
+msgid ""
+"Service configuration problem. Please check logs and send mail to "
+"support@mandrivaonline.com"
 msgstr ""
 
-#: ../mdkapplet:115
+#: ../mdkapplet:110
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr ""
 
-#: ../mdkapplet:121
+#: ../mdkapplet:116
 #, c-format
 msgid "New updates are available for your system"
 msgstr ""
 
-#: ../mdkapplet:127
-#, c-format
-msgid "New bundles are available for your system"
-msgstr ""
-
-#: ../mdkapplet:133
-#, c-format
-msgid "Service is not configured. Please click on \"Configure the service\""
-msgstr ""
-
-#: ../mdkapplet:139
+#: ../mdkapplet:122
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr ""
 
-#: ../mdkapplet:145
+#: ../mdkapplet:128
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr ""
 
-#: ../mdkapplet:151 ../mdkapplet:182
+#: ../mdkapplet:134 ../mdkapplet:165
 #, c-format
 msgid "urpmi database locked"
 msgstr ""
 
-#: ../mdkapplet:157
+#: ../mdkapplet:140
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
-#: ../mdkapplet:163
+#: ../mdkapplet:146
 #, c-format
-msgid "No medium found. You must add some media through 'Software Media Manager'."
+msgid ""
+"No medium found. You must add some media through 'Software Media Manager'."
 msgstr ""
 
-#: ../mdkapplet:169
+#: ../mdkapplet:152
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -85,581 +78,132 @@ msgid ""
 "Then, restart \"%s\"."
 msgstr ""
 
-#: ../mdkapplet:174
+#: ../mdkapplet:157
 #, c-format
 msgid "Enabled"
 msgstr "ያስችላል"
 
-#: ../mdkapplet:187
+#: ../mdkapplet:170
 #, c-format
 msgid "Error updating media"
 msgstr ""
 
-#: ../mdkapplet:202
+#: ../mdkapplet:185
 #, c-format
-msgid ""
-"Checking... Updates are available\n"
-""
+msgid "Checking... Updates are available\n"
 msgstr ""
 
-#: ../mdkapplet:207
+#: ../mdkapplet:190
 #, c-format
 msgid "Packages are up to date"
 msgstr ""
 
-#: ../mdkapplet:212
+#: ../mdkapplet:195
 #, c-format
 msgid "Failed to open urpmi database"
 msgstr ""
 
-#: ../mdkapplet:217 ../mdkapplet:324
+#: ../mdkapplet:200
 #, c-format
 msgid "Install updates"
 msgstr ""
 
-#: ../mdkapplet:218
-#, c-format
-msgid "Configure the service"
-msgstr ""
-
-#: ../mdkapplet:219
+#: ../mdkapplet:201
 #, c-format
 msgid "Check Updates"
 msgstr ""
 
-#: ../mdkapplet:220 ../mdkapplet:327 ../mdkonline:114 ../mdkonline:155 ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
-#, c-format
-msgid "Please wait"
-msgstr "እባክዎ ይጠብቁ"
-
-#: ../mdkapplet:220 ../mdkapplet:326 ../mdkapplet:327
-#, c-format
-msgid "Check updates"
-msgstr ""
-
-#: ../mdkapplet:223 ../mdkapplet:648
-#, c-format
-msgid "Online WebSite"
-msgstr ""
-
-#: ../mdkapplet:224
+#: ../mdkapplet:202
 #, c-format
 msgid "Configure Network"
 msgstr ""
 
-#: ../mdkapplet:225
-#, c-format
-msgid "Configure Now!"
-msgstr ""
-
-#: ../mdkapplet:313 ../mdkapplet:392
-#, c-format
-msgid "Mandriva Linux Updates Applet"
-msgstr ""
-
-#: ../mdkapplet:322
-#, c-format
-msgid "Actions"
-msgstr ""
-
-#: ../mdkapplet:325
-#, c-format
-msgid "Configure"
-msgstr "ለውጥ"
-
-#: ../mdkapplet:329
+#: ../mdkapplet:283
 #, c-format
-msgid "See logs"
+msgid "Launching drakconnect\n"
 msgstr ""
 
-#: ../mdkapplet:332
+#: ../mdkapplet:286
 #, c-format
-msgid "Status"
+msgid "Mandriva Online seems to be reinstalled, reloading applet ...."
 msgstr ""
 
-#: ../mdkapplet:336 ../mdkapplet:597
+#: ../mdkapplet:294
 #, c-format
-msgid "Close"
-msgstr "ዝጋ"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Network Connection: "
+msgid "Launching MandrivaUpdate\n"
 msgstr ""
 
-#: ../mdkapplet:365
-#, c-format
-msgid "Up"
-msgstr "ወደላይ"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Down"
-msgstr "ወደታች"
-
-#: ../mdkapplet:366
+#: ../mdkapplet:303
 #, c-format
-msgid "Last check: "
+msgid "Mandriva Linux Updates Applet"
 msgstr ""
 
-#: ../mdkapplet:367 ../mdkonline:145
+#: ../mdkapplet:308
 #, c-format
-msgid "Machine name:"
+msgid "Computing new updates...\n"
 msgstr ""
 
-#: ../mdkapplet:368
+#: ../mdkapplet:309
 #, c-format
-msgid "Updates: "
+msgid "Connecting to"
 msgstr ""
 
-#: ../mdkapplet:372
+#: ../mdkapplet:386
 #, c-format
-msgid ""
-"Launching drakconnect\n"
-""
+msgid "System is up-to-date\n"
 msgstr ""
 
-#: ../mdkapplet:375
+#: ../mdkapplet:415
 #, c-format
-msgid "Mandriva Online seems to be reinstalled, reloading applet ...."
+msgid "Checking Network: seems disabled\n"
 msgstr ""
 
-#: ../mdkapplet:383
+#: ../mdkapplet:457 ../mdkupdate:118 ../mdkupdate:164
 #, c-format
-msgid ""
-"Launching MandrivaUpdate\n"
-""
-msgstr ""
+msgid "Warning"
+msgstr "ማስጠንቀቂያ"
 
-#: ../mdkapplet:398
+#: ../mdkapplet:468
 #, c-format
-msgid ""
-"Computing new updates...\n"
-""
+msgid "About..."
 msgstr ""
 
-#: ../mdkapplet:399
+#: ../mdkapplet:472
 #, c-format
-msgid "Connecting to"
+msgid "Mandriva Online %s"
 msgstr ""
 
-#: ../mdkapplet:467 ../mdkupdate:159 ../mdkupdate:188
+#: ../mdkapplet:473
 #, c-format
-msgid "An error occurred"
-msgstr "ስህተት ተፈጥሯል"
-
-#: ../mdkapplet:475
-#, c-format
-msgid "Development release not supported by service"
+msgid "Copyright (C) %s by Mandriva"
 msgstr ""
 
 #: ../mdkapplet:476
 #, c-format
-msgid "Too old release not supported by service"
-msgstr ""
-
-#: ../mdkapplet:477
-#, c-format
-msgid "Unknown state"
+msgid "Mandriva Online gives access to Mandriva web services."
 msgstr ""
 
 #: ../mdkapplet:478
 #, c-format
-msgid ""
-"Online services disabled. Contact Mandriva Online site\n"
-""
-msgstr ""
-
-#: ../mdkapplet:479
-#, c-format
-msgid ""
-"Wrong Password.\n"
-""
-msgstr ""
-
-#: ../mdkapplet:480
-#, c-format
-msgid ""
-"Wrong Action or host or login.\n"
-""
-msgstr ""
-
-#: ../mdkapplet:481
-#, c-format
-msgid ""
-"Something is wrong with your network settings (check your route, firewall or proxy settings)\n"
-""
+msgid "Online WebSite"
 msgstr ""
 
+#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
 #: ../mdkapplet:483
 #, c-format
-msgid "Problem occured while connecting to the server, please contact the support team"
-msgstr ""
-
-#: ../mdkapplet:487
-#, c-format
-msgid ""
-"Response from Mandriva Online server\n"
-""
-msgstr ""
-
-#: ../mdkapplet:490
-#, c-format
-msgid ""
-"System is up-to-date\n"
-""
-msgstr ""
-
-#: ../mdkapplet:527
-#, c-format
-msgid "No check"
-msgstr ""
-
-#: ../mdkapplet:541
-#, c-format
-msgid ""
-"Checking config file: Not present\n"
-""
-msgstr ""
-
-#: ../mdkapplet:544
-#, c-format
-msgid ""
-"Checking Network: seems disabled\n"
-""
-msgstr ""
-
-#: ../mdkapplet:587
-#, c-format
-msgid "Logs"
-msgstr ""
-
-#: ../mdkapplet:603
-#, c-format
-msgid "Clear"
-msgstr "አጥፋ"
-
-#: ../mdkapplet:629
-#, c-format
-msgid "About..."
-msgstr ""
-
-#: ../mdkapplet:631
-#, c-format
-msgid "Mandriva Online %s"
-msgstr ""
-
-#: ../mdkapplet:635
-#, c-format
-msgid "Copyright (C) %s by Mandriva"
-msgstr ""
-
-#: ../mdkapplet:647
-#, c-format
-msgid "Mandriva Online gives access to Mandriva web services."
+msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
 
-#: ../mdkapplet:655
+#: ../mdkapplet:492
 #, c-format
 msgid "Always launch on startup"
 msgstr ""
 
-#: ../mdkapplet:657
+#: ../mdkapplet:494
 #, c-format
 msgid "Quit"
 msgstr "ውጣ"
 
-#: ../mdkonline:58
-#, c-format
-msgid ""
-"mdonline version %s\n"
-"Copyright (C) %s Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU GPL.\n"
-"\n"
-"usage:\n"
-""
-msgstr ""
-
-#: ../mdkonline:63 ../mdkupdate:73
-#, c-format
-msgid ""
-"  --help\t\t- print this help message.\n"
-""
-msgstr ""
-
-#: ../mdkonline:64
-#, c-format
-msgid ""
-"  --box=\t\t\t- hostname.\n"
-""
-msgstr ""
-
-#: ../mdkonline:65
-#, c-format
-msgid ""
-"  --country\t\t\t- name of country of the user. \n"
-""
-msgstr ""
-
-#: ../mdkonline:66
-#, c-format
-msgid ""
-"  --interactive\t\t- use the interactive mode.\n"
-""
-msgstr ""
-
-#: ../mdkonline:67
-#, c-format
-msgid ""
-"  --nointeractive\t- use the non-interactive mode.\n"
-""
-msgstr ""
-
-#: ../mdkonline:68
-#, c-format
-msgid ""
-"  --login=\t\t     - login name of the user.\n"
-""
-msgstr ""
-
-#: ../mdkonline:69
-#, c-format
-msgid ""
-"  --pass=\t\t\t- password  of the user.\n"
-""
-msgstr ""
-
-#: ../mdkonline:87 ../mdkonline:120
-#, c-format
-msgid "Mandriva Online"
-msgstr "Mandriva Online"
-
-#: ../mdkonline:90
-#, c-format
-msgid "I already have an account"
-msgstr ""
-
-#: ../mdkonline:91
-#, c-format
-msgid "I want to subscribe"
-msgstr ""
-
-#: ../mdkonline:96
-#, c-format
-msgid "Mr."
-msgstr ""
-
-#: ../mdkonline:96
-#, c-format
-msgid "Mrs."
-msgstr ""
-
-#: ../mdkonline:96
-#, c-format
-msgid "Ms."
-msgstr ""
-
-#: ../mdkonline:114
-#, c-format
-msgid ""
-"Reading configuration\n"
-""
-msgstr ""
-
-#: ../mdkonline:123
-#, c-format
-msgid ""
-"This assistant will help you to upload your configuration\n"
-"(packages, hardware configuration) to a centralized database in\n"
-"order to keep you informed about security updates and useful upgrades.\n"
-""
-msgstr ""
-
-#: ../mdkonline:131
-#, c-format
-msgid "Account creation or authentication"
-msgstr ""
-
-#: ../mdkonline:136
-#, c-format
-msgid "Enter your Mandriva Online login, password and machine name:"
-msgstr ""
-
-#: ../mdkonline:142 ../mdkonline:195
-#, c-format
-msgid "Email address:"
-msgstr ""
-
-#: ../mdkonline:143
-#, c-format
-msgid "Country"
-msgstr ""
-
-#: ../mdkonline:144 ../mdkonline:196
-#, c-format
-msgid "Password:"
-msgstr "ሚስጢራዊ ቃል"
-
-#: ../mdkonline:146
-#, c-format
-msgid "Machine description:"
-msgstr ""
-
-#: ../mdkonline:147
-#, c-format
-msgid "(Ex: My Home Office's Computer)"
-msgstr ""
-
-#: ../mdkonline:152 ../mdkonline:159 ../mdkonline:180 ../mdkonline:204 ../mdkonline:208 ../mdkonline:212 ../mdkonline:217 ../mdkupdate:141 ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
-#, c-format
-msgid "Error"
-msgstr "ስህተት"
-
-#: ../mdkonline:152
-#, c-format
-msgid "Machine name must be 1 to 40 alphanumerical characters"
-msgstr ""
-
-#: ../mdkonline:155
-#, c-format
-msgid "Connecting to Mandriva Online website..."
-msgstr ""
-
-#: ../mdkonline:167
-#, c-format
-msgid ""
-"In order to benefit from Mandriva Online services,\n"
-"we are about to upload your configuration.\n"
-"\n"
-"The Wizard will now send the following information to Mandriva:\n"
-"\n"
-"1) the list of packages you have installed on your system,\n"
-"\n"
-"2) your hardware configuration.\n"
-"\n"
-"If you feel uncomfortable by that idea, or do not want to benefit from this service,\n"
-"please press 'Cancel'. By pressing 'Next', you allow us to keep you informed\n"
-"about security updates and useful upgrades via personalized email alerts.\n"
-"Furthermore, you benefit from discounted paid support services on\n"
-"www.mandrivaexpert.com."
-msgstr ""
-
-#: ../mdkonline:180
-#, c-format
-msgid "Connection problem"
-msgstr ""
-
-#: ../mdkonline:180
-#, c-format
-msgid "Problem occurs when uploading files, please try again"
-msgstr ""
-
-#: ../mdkonline:187
-#, c-format
-msgid "Create a Mandriva Online Account"
-msgstr ""
-
-#. -PO: that is for things like "Mr", "Ms",...
-#: ../mdkonline:192
-#, c-format
-msgid "Greeting:"
-msgstr ""
-
-#: ../mdkonline:193
-#, c-format
-msgid "First name:"
-msgstr ""
-
-#: ../mdkonline:194
-#, c-format
-msgid "Last name:"
-msgstr ""
-
-#: ../mdkonline:197
-#, c-format
-msgid "Confirm Password:"
-msgstr ""
-
-#: ../mdkonline:204
-#, c-format
-msgid ""
-"The passwords do not match\n"
-" Please try again\n"
-""
-msgstr ""
-
-#: ../mdkonline:208
-#, c-format
-msgid "Please fill in each field"
-msgstr ""
-
-#: ../mdkonline:212
-#, c-format
-msgid ""
-"Not a valid mail address!\n"
-""
-msgstr ""
-
-#: ../mdkonline:217
-#, c-format
-msgid "Creating account failed!"
-msgstr ""
-
-#: ../mdkonline:225
-#, c-format
-msgid ""
-"Mandriva Online Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
-""
-msgstr ""
-
-#: ../mdkonline:229
-#, c-format
-msgid "Your upload was successful!"
-msgstr ""
-
-#: ../mdkonline:229
-#, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandriva Online."
-msgstr ""
-
-#: ../mdkonline:229
-#, c-format
-msgid ""
-"Mandriva Online offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
-""
-msgstr ""
-
-#: ../mdkonline:238
-#, c-format
-msgid "Congratulations"
-msgstr "እንኳን ደስ ያለዎ!"
-
-#: ../mdkonline:238
-#, c-format
-msgid ""
-"Your Mandriva Online account has been successfully configured\n"
-""
-msgstr ""
-
-#: ../mdkonline:253
-#, c-format
-msgid "Configuration uploaded successfully"
-msgstr ""
-
-#: ../mdkonline:254
-#, c-format
-msgid "Problem uploading configuration"
-msgstr ""
-
-#: ../mdkonline:256
-#, c-format
-msgid "Cannot connect to Mandriva Online website: wrong login/password or router/firewall bad settings"
-msgstr ""
-
 #: ../mdkonline.pm:207
 #, c-format
 msgid "Security error"
@@ -712,7 +256,6 @@ msgstr ""
 msgid ""
 "The email you provided is already in use\n"
 "Please enter another one\n"
-""
 msgstr ""
 
 #: ../mdkonline.pm:212
@@ -786,63 +329,67 @@ msgstr ""
 msgid ""
 "mdkupdate version %s\n"
 "Copyright (C) %s Mandriva.\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:73
+#, c-format
+msgid "  --help\t\t- print this help message.\n"
 msgstr ""
 
 #: ../mdkupdate:74
 #, c-format
-msgid ""
-"  --auto\t\t- Mandriva Update launched automatically.\n"
-""
+msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
 msgstr ""
 
 #: ../mdkupdate:75
 #, c-format
-msgid ""
-"  --mnf\t\t\t- launch mnf specific scripts.\n"
-""
+msgid "  --mnf\t\t\t- launch mnf specific scripts.\n"
 msgstr ""
 
 #: ../mdkupdate:76
 #, c-format
-msgid ""
-"  --noX\t\t\t- text mode version of Mandriva Update.\n"
-""
+msgid "  --noX\t\t\t- text mode version of Mandriva Update.\n"
 msgstr ""
 
 #: ../mdkupdate:77
 #, c-format
-msgid ""
-"  --debug\t\t\t- log what is done\n"
-""
+msgid "  --debug\t\t\t- log what is done\n"
 msgstr ""
 
 #: ../mdkupdate:78
 #, c-format
 msgid ""
-"  --bundle file.bundle\t- parse and install package from .bundle metainfo file.\n"
-""
+"  --bundle file.bundle\t- parse and install package from .bundle metainfo "
+"file.\n"
 msgstr ""
 
-#: ../mdkupdate:118 ../mdkupdate:164
-#, c-format
-msgid "Warning"
-msgstr "ማስጠንቀቂያ"
-
 #. -PO: here Live Install is currently *NOT* translated on the desktop, so it's better to keep as it:
 #: ../mdkupdate:120
 #, c-format
-msgid "You first need to install the system on your harddrive with the 'Live Install' wizard."
+msgid ""
+"You first need to install the system on your harddrive with the 'Live "
+"Install' wizard."
 msgstr ""
 
+#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
+#, c-format
+msgid "Please wait"
+msgstr "እባክዎ ይጠብቁ"
+
 #: ../mdkupdate:123 ../mdkupdate:174
 #, c-format
 msgid "Preparing..."
 msgstr ""
 
+#: ../mdkupdate:141 ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
+#, c-format
+msgid "Error"
+msgstr "ስህተት"
+
 #: ../mdkupdate:141
 #, c-format
 msgid ""
@@ -851,12 +398,18 @@ msgid ""
 "%s"
 msgstr ""
 
+#: ../mdkupdate:159 ../mdkupdate:188
+#, c-format
+msgid "An error occurred"
+msgstr "ስህተት ተፈጥሯል"
+
 #: ../mdkupdate:164
 #, c-format
 msgid ""
 "The version of the Mandriva Online client is too old.\n"
 "\n"
-"You need to update to a newer version. You can get a new one from http://start.mandriva.com"
+"You need to update to a newer version. You can get a new one from http://"
+"start.mandriva.com"
 msgstr ""
 
 #: ../mdkupdate:207
@@ -866,15 +419,34 @@ msgstr ""
 
 #: ../mdkupdate:219
 #, c-format
-msgid ""
-"Installing packages ...\n"
-""
+msgid "Installing packages ...\n"
 msgstr ""
 
 #: ../mdkupdate:231 ../mdkupdate:271
 #, c-format
-msgid ""
-"Unable to update packages from update_source medium.\n"
-""
+msgid "Unable to update packages from update_source medium.\n"
 msgstr ""
 
+#~ msgid "Configure"
+#~ msgstr "ለውጥ"
+
+#~ msgid "Close"
+#~ msgstr "ዝጋ"
+
+#~ msgid "Up"
+#~ msgstr "ወደላይ"
+
+#~ msgid "Down"
+#~ msgstr "ወደታች"
+
+#~ msgid "Clear"
+#~ msgstr "አጥፋ"
+
+#~ msgid "Mandriva Online"
+#~ msgstr "Mandriva Online"
+
+#~ msgid "Password:"
+#~ msgstr "ሚስጢራዊ ቃል"
+
+#~ msgid "Congratulations"
+#~ msgstr "እንኳን ደስ ያለዎ!"
diff --git a/po/ar.po b/po/ar.po
index 26ee8bbe..f77bbae7 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-09 16:26+0200\n"
+"POT-Creation-Date: 2008-02-21 18:21+0100\n"
 "PO-Revision-Date: 2005-02-24 23:27+0300\n"
 "Last-Translator: Ossama M. Khayat <okhayat@yahoo.com>\n"
 "Language-Team: Arabic <support@arabeyes.org>\n"
@@ -20,17 +20,17 @@ msgstr ""
 "3\n"
 
 #. -PO: here %s will be replaced by the local time (eg: "Will check updates at 14:03:50"
-#: ../mdkapplet:94
+#: ../mdkapplet:88
 #, fuzzy, c-format
 msgid "Will check updates at %s"
 msgstr "إفحص التّحديثات"
 
-#: ../mdkapplet:103
+#: ../mdkapplet:97
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "النّظام محدّث"
 
-#: ../mdkapplet:109
+#: ../mdkapplet:103
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -39,54 +39,44 @@ msgstr ""
 "مشكلة في تهيئة الخدمة. رجاء تحقّق من السجلّ وأرسل إلى support@mandrivaonline."
 "net"
 
-#: ../mdkapplet:115
+#: ../mdkapplet:110
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "اتنظر من فضلك، جاري ايجاد الحزم المتوفرة..."
 
-#: ../mdkapplet:121
+#: ../mdkapplet:116
 #, c-format
 msgid "New updates are available for your system"
 msgstr "هناك تحديثات متوفّرة لنظامك"
 
-#: ../mdkapplet:127
-#, fuzzy, c-format
-msgid "New bundles are available for your system"
-msgstr "هناك تحديثات متوفّرة لنظامك"
-
-#: ../mdkapplet:133
-#, c-format
-msgid "Service is not configured. Please click on \"Configure the service\""
-msgstr "الخدمة غير مهيّئة. رجاء اضغط على \"تهيئة الخدمة\""
-
-#: ../mdkapplet:139
+#: ../mdkapplet:122
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "الشّبكة متوقّفة. رجاء هيّئ شبكتك"
 
-#: ../mdkapplet:145
+#: ../mdkapplet:128
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "الخدمة غير مُنشَّطة. رجاء اضغط على \"موقع الإنترنت\""
 
-#: ../mdkapplet:151 ../mdkapplet:182
+#: ../mdkapplet:134 ../mdkapplet:165
 #, fuzzy, c-format
 msgid "urpmi database locked"
 msgstr "تم اقفال قاعدة بيانات urpmi"
 
-#: ../mdkapplet:157
+#: ../mdkapplet:140
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 "هذه الإصدارة غير مدعومة (إما بسبب أنها قديماً جداً، أو أنها إصدارة تطويريّة)"
 
-#: ../mdkapplet:163
+#: ../mdkapplet:146
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
 msgstr ""
 
-#: ../mdkapplet:169
+#: ../mdkapplet:152
 #, fuzzy, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -101,578 +91,131 @@ msgstr ""
 "البرامج لتمكين واحد على الأقل (قم بالتأشير عليها في عامود التمكين؟).\n"
 "ثم قم بإعادة تشغيل أداة %s."
 
-#: ../mdkapplet:174
+#: ../mdkapplet:157
 #, c-format
 msgid "Enabled"
 msgstr "متاح؟"
 
-#: ../mdkapplet:187
+#: ../mdkapplet:170
 #, c-format
 msgid "Error updating media"
 msgstr ""
 
-#: ../mdkapplet:202
+#: ../mdkapplet:185
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr "يجري الفحص... التّحديثات متوفّرة\n"
 
-#: ../mdkapplet:207
+#: ../mdkapplet:190
 #, c-format
 msgid "Packages are up to date"
 msgstr ""
 
-#: ../mdkapplet:212
+#: ../mdkapplet:195
 #, fuzzy, c-format
 msgid "Failed to open urpmi database"
 msgstr "تعذر فتح rpmdb"
 
-#: ../mdkapplet:217 ../mdkapplet:324
+#: ../mdkapplet:200
 #, c-format
 msgid "Install updates"
 msgstr "ثبّت التّحديثات"
 
-#: ../mdkapplet:218
-#, c-format
-msgid "Configure the service"
-msgstr "تهيئة الخدمة"
-
-#: ../mdkapplet:219
+#: ../mdkapplet:201
 #, c-format
 msgid "Check Updates"
 msgstr "إفحص التّحديثات"
 
-#: ../mdkapplet:220 ../mdkapplet:327 ../mdkonline:114 ../mdkonline:155
-#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
-#, c-format
-msgid "Please wait"
-msgstr "من فضلك انتظر"
-
-#: ../mdkapplet:220 ../mdkapplet:326 ../mdkapplet:327
-#, c-format
-msgid "Check updates"
-msgstr "إفحص التّحديثات"
-
-#: ../mdkapplet:223 ../mdkapplet:648
-#, c-format
-msgid "Online WebSite"
-msgstr "موقع على الخطّ"
-
-#: ../mdkapplet:224
+#: ../mdkapplet:202
 #, c-format
 msgid "Configure Network"
 msgstr "أعدّ الشّبكة"
 
-#: ../mdkapplet:225
-#, c-format
-msgid "Configure Now!"
-msgstr "أعدّ الآن !"
-
-#: ../mdkapplet:313 ../mdkapplet:392
-#, c-format
-msgid "Mandriva Linux Updates Applet"
-msgstr "بريمج تحديثات ماندريبا لينكس"
-
-#: ../mdkapplet:322
-#, c-format
-msgid "Actions"
-msgstr "الأفعال"
-
-#: ../mdkapplet:325
-#, c-format
-msgid "Configure"
-msgstr "أعدّ"
-
-#: ../mdkapplet:329
-#, c-format
-msgid "See logs"
-msgstr "شاهد السّجلّات"
-
-#: ../mdkapplet:332
-#, c-format
-msgid "Status"
-msgstr "الحالة"
-
-#: ../mdkapplet:336 ../mdkapplet:597
-#, c-format
-msgid "Close"
-msgstr "إغلق"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Network Connection: "
-msgstr "وصلة الشّبكة: "
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Up"
-msgstr "أعلى"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Down"
-msgstr "أسفل"
-
-#: ../mdkapplet:366
-#, c-format
-msgid "Last check: "
-msgstr "آخر فحص: "
-
-#: ../mdkapplet:367 ../mdkonline:145
-#, c-format
-msgid "Machine name:"
-msgstr "إسم الماكنة:"
-
-#: ../mdkapplet:368
-#, c-format
-msgid "Updates: "
-msgstr "تحديثات: "
-
-#: ../mdkapplet:372
+#: ../mdkapplet:283
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "يجري إطلاق دراكونكت (drakconnect)\n"
 
-#: ../mdkapplet:375
+#: ../mdkapplet:286
 #, c-format
 msgid "Mandriva Online seems to be reinstalled, reloading applet ...."
 msgstr "يبدو أنّ ماندريبا أُنلاين مثبّت من جديد،ياجريإعادة تحميل البريمج..."
 
-#: ../mdkapplet:383
+#: ../mdkapplet:294
 #, c-format
 msgid "Launching MandrivaUpdate\n"
 msgstr "يجري إطلاق محدّث ماندريبا بريمج (MandrivaUpdate)\n"
 
-#: ../mdkapplet:398
+#: ../mdkapplet:303
+#, c-format
+msgid "Mandriva Linux Updates Applet"
+msgstr "بريمج تحديثات ماندريبا لينكس"
+
+#: ../mdkapplet:308
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "يجري حساب التّحديثات الجديدة...\n"
 
-#: ../mdkapplet:399
+#: ../mdkapplet:309
 #, c-format
 msgid "Connecting to"
 msgstr "الإتّصال بـ"
 
-#: ../mdkapplet:467 ../mdkupdate:159 ../mdkupdate:188
-#, c-format
-msgid "An error occurred"
-msgstr "حدث خطأ"
-
-#: ../mdkapplet:475
-#, c-format
-msgid "Development release not supported by service"
-msgstr "إصدارة تطويريّة غير مدعومة من قبل الخدمة"
-
-#: ../mdkapplet:476
-#, c-format
-msgid "Too old release not supported by service"
-msgstr "إصدارة قديمة جداً غير مدعومة من قبل الخدمة"
-
-#: ../mdkapplet:477
-#, c-format
-msgid "Unknown state"
-msgstr "حالة مجهولة"
-
-#: ../mdkapplet:478
-#, c-format
-msgid "Online services disabled. Contact Mandriva Online site\n"
-msgstr "الخدمات على الخطّ معطّلة. اتّصل بموقع ماندريبا أُنلاين\n"
-
-#: ../mdkapplet:479
-#, c-format
-msgid "Wrong Password.\n"
-msgstr "كلمة مرور خاطئة.\n"
-
-#: ../mdkapplet:480
-#, c-format
-msgid "Wrong Action or host or login.\n"
-msgstr "فعل أو مضيف أو إسم دخول خاطئ.\n"
-
-#: ../mdkapplet:481
-#, c-format
-msgid ""
-"Something is wrong with your network settings (check your route, firewall or "
-"proxy settings)\n"
-msgstr ""
-"هناك شيء خاطئ في إعدادات شبكتك (إفحص الطّريق، الجدار النّاري أو إعدادات "
-"البروكسي الخاصّة بك)\n"
-
-#: ../mdkapplet:483
-#, c-format
-msgid ""
-"Problem occured while connecting to the server, please contact the support "
-"team"
-msgstr "حدثت مشكلة أثناء الاتصال باخادم، الرجاء الاتصال بفريق الدعم"
-
-#: ../mdkapplet:487
-#, c-format
-msgid "Response from Mandriva Online server\n"
-msgstr "الردّ من خادم ماندريبا أُنلاين\n"
-
-#: ../mdkapplet:490
+#: ../mdkapplet:386
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "النّظام محدّث\n"
 
-#: ../mdkapplet:527
-#, c-format
-msgid "No check"
-msgstr "دون فحص"
-
-#: ../mdkapplet:541
-#, c-format
-msgid "Checking config file: Not present\n"
-msgstr "يجري فحص ملفّ الإعداد: غير موجود\n"
-
-#: ../mdkapplet:544
+#: ../mdkapplet:415
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "يجري فحص الشّبكة: تبدو معطّلة\n"
 
-#: ../mdkapplet:587
+#: ../mdkapplet:457 ../mdkupdate:118 ../mdkupdate:164
 #, c-format
-msgid "Logs"
-msgstr "السّجلّات"
-
-#: ../mdkapplet:603
-#, c-format
-msgid "Clear"
-msgstr "إمحي"
+msgid "Warning"
+msgstr "تحذير"
 
-#: ../mdkapplet:629
+#: ../mdkapplet:468
 #, c-format
 msgid "About..."
 msgstr "حَوْل..."
 
-#: ../mdkapplet:631
+#: ../mdkapplet:472
 #, fuzzy, c-format
 msgid "Mandriva Online %s"
 msgstr "ماندريبا أُنلاين"
 
-#: ../mdkapplet:635
+#: ../mdkapplet:473
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr ""
 
-#: ../mdkapplet:647
+#: ../mdkapplet:476
 #, c-format
 msgid "Mandriva Online gives access to Mandriva web services."
 msgstr ""
 
-#: ../mdkapplet:655
-#, c-format
-msgid "Always launch on startup"
-msgstr "أطلق دوما عند البدأ"
-
-#: ../mdkapplet:657
-#, c-format
-msgid "Quit"
-msgstr "خروج"
-
-#: ../mdkonline:58
-#, fuzzy, c-format
-msgid ""
-"mdonline version %s\n"
-"Copyright (C) %s Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-" ماندريبا أبدايت)النسخةة %s\n"
-"جميع الحقوق محفوظة %s ماندريبا سوفت.\n"
-"هذا البرنامج حرّ و يمكن إعادة توزيعه تحت بنود ترخيص GNU GPL.\n"
-"\n"
-"الاستعمال:\n"
-
-#: ../mdkonline:63 ../mdkupdate:73
-#, c-format
-msgid "  --help\t\t- print this help message.\n"
-msgstr "  --help\t\t- إظهار رسالة المساعدة هذه.\n"
-
-#: ../mdkonline:64
-#, c-format
-msgid "  --box=\t\t\t- hostname.\n"
-msgstr ""
-
-#: ../mdkonline:65
-#, c-format
-msgid "  --country\t\t\t- name of country of the user. \n"
-msgstr ""
-
-#: ../mdkonline:66
-#, c-format
-msgid "  --interactive\t\t- use the interactive mode.\n"
-msgstr ""
-
-#: ../mdkonline:67
-#, c-format
-msgid "  --nointeractive\t- use the non-interactive mode.\n"
-msgstr ""
-
-#: ../mdkonline:68
-#, c-format
-msgid "  --login=\t\t     - login name of the user.\n"
-msgstr ""
-
-#: ../mdkonline:69
-#, c-format
-msgid "  --pass=\t\t\t- password  of the user.\n"
-msgstr ""
-
-#: ../mdkonline:87 ../mdkonline:120
-#, c-format
-msgid "Mandriva Online"
-msgstr "ماندريبا أُنلاين"
-
-#: ../mdkonline:90
-#, c-format
-msgid "I already have an account"
-msgstr "لدي حساب مسبقاً"
-
-#: ../mdkonline:91
-#, c-format
-msgid "I want to subscribe"
-msgstr "أريد الاشتراك"
-
-#: ../mdkonline:96
-#, c-format
-msgid "Mr."
-msgstr ""
-
-#: ../mdkonline:96
-#, fuzzy, c-format
-msgid "Mrs."
-msgstr "XMrIs"
-
-#: ../mdkonline:96
-#, c-format
-msgid "Ms."
-msgstr ""
-
-#: ../mdkonline:114
-#, c-format
-msgid "Reading configuration\n"
-msgstr "جاري قراءة اعداداتك\n"
-
-#: ../mdkonline:123
-#, c-format
-msgid ""
-"This assistant will help you to upload your configuration\n"
-"(packages, hardware configuration) to a centralized database in\n"
-"order to keep you informed about security updates and useful upgrades.\n"
-msgstr ""
-"سيُعينك هذا المساعد على تحميل تهيئتك\n"
-"(الحزم، تهيئة العتاد) إلى قاعدة بيانات مركزية كي\n"
-"يتسنى لك أن تعلم بالتحديثات الأمنية و الترقيات المفيدة.\n"
-
-#: ../mdkonline:131
-#, c-format
-msgid "Account creation or authentication"
-msgstr "إنشاء أو توثيق الحساب"
-
-#: ../mdkonline:136
-#, c-format
-msgid "Enter your Mandriva Online login, password and machine name:"
-msgstr "أدخل اسم الدخول الخاص بماندريبا أُنلاين، وكلمة المرور واسم الماكينة:"
-
-#: ../mdkonline:142 ../mdkonline:195
-#, fuzzy, c-format
-msgid "Email address:"
-msgstr "عنوان البريد الخارج"
-
-#: ../mdkonline:143
-#, c-format
-msgid "Country"
-msgstr "الدولة"
-
-#: ../mdkonline:144 ../mdkonline:196
-#, c-format
-msgid "Password:"
-msgstr "كلمة المرور:"
-
-#: ../mdkonline:146
-#, fuzzy, c-format
-msgid "Machine description:"
-msgstr "إسم الماكنة:"
-
-#: ../mdkonline:147
-#, c-format
-msgid "(Ex: My Home Office's Computer)"
-msgstr ""
-
-#: ../mdkonline:152 ../mdkonline:159 ../mdkonline:180 ../mdkonline:204
-#: ../mdkonline:208 ../mdkonline:212 ../mdkonline:217 ../mdkupdate:141
-#: ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
-#, c-format
-msgid "Error"
-msgstr "خطأ"
-
-#: ../mdkonline:152
-#, fuzzy, c-format
-msgid "Machine name must be 1 to 40 alphanumerical characters"
-msgstr "أماكن التركيب يجب أن تحتوي فقط على الحروف و/أو الآرقام"
-
-#: ../mdkonline:155
-#, c-format
-msgid "Connecting to Mandriva Online website..."
-msgstr "جاري الاتصال بموقع ماندريبا أُنلاين..."
-
-#: ../mdkonline:167
-#, c-format
-msgid ""
-"In order to benefit from Mandriva Online services,\n"
-"we are about to upload your configuration.\n"
-"\n"
-"The Wizard will now send the following information to Mandriva:\n"
-"\n"
-"1) the list of packages you have installed on your system,\n"
-"\n"
-"2) your hardware configuration.\n"
-"\n"
-"If you feel uncomfortable by that idea, or do not want to benefit from this "
-"service,\n"
-"please press 'Cancel'. By pressing 'Next', you allow us to keep you "
-"informed\n"
-"about security updates and useful upgrades via personalized email alerts.\n"
-"Furthermore, you benefit from discounted paid support services on\n"
-"www.mandrivaexpert.com."
-msgstr ""
-"للاستفادة من خدمات ماندريبا على الخطّ،\n"
-"نحن على وشك تحميل تهيئتك.\n"
-"\n"
-"سيرسل هذا المعالج المعلومات التّالية إلى ماندريبا سوفت:\n"
-"\n"
-"1) قائمة الحزم التي قمت بتثبيتها على نظامك،\n"
-"\n"
-"2) تهيئة عتادك.\n"
-"\n"
-"إن لم تكن مرتاحا لهذه الفكرة، أو إن كنت لا تريد الاستفادة من هذه الخدمة،\n"
-"اضغط على 'إلغاء'. بالضّغط على 'التّالي'، تسمح لنا بإبقائك على اطلاع\n"
-"بالتّحديثات الأمنية و التّرقيات المفيدة عن طريق تنبيهات بريدية مخصّصة.\n"
-"كذلك، تستفيد من خدمات دعم بسعر أقلّ على\n"
-"www.mandrivaexpert.com."
-
-#: ../mdkonline:180
-#, c-format
-msgid "Connection problem"
-msgstr "مشكلة في الإتصال"
-
-#: ../mdkonline:180
-#, c-format
-msgid "Problem occurs when uploading files, please try again"
-msgstr "يحدث مشكل عند تحميل الملفّات، حاول مجدّدا من فضلك"
-
-#: ../mdkonline:187
-#, c-format
-msgid "Create a Mandriva Online Account"
-msgstr "إنشاء حساب في ماندريبا أُنلاين"
-
-#. -PO: that is for things like "Mr", "Ms",...
-#: ../mdkonline:192
-#, fuzzy, c-format
-msgid "Greeting:"
-msgstr "أخضر"
-
-#: ../mdkonline:193
-#, c-format
-msgid "First name:"
-msgstr "الإسم:"
-
-#: ../mdkonline:194
-#, fuzzy, c-format
-msgid "Last name:"
-msgstr "الإسم:"
-
-#: ../mdkonline:197
-#, c-format
-msgid "Confirm Password:"
-msgstr "أكّد كلمة المرور:"
-
-#: ../mdkonline:204
-#, c-format
-msgid ""
-"The passwords do not match\n"
-" Please try again\n"
-msgstr ""
-"كلمات المرور غير متطابقة\n"
-"كرّر المحاولة من فضلك\n"
-
-#: ../mdkonline:208
-#, fuzzy, c-format
-msgid "Please fill in each field"
-msgstr "الرجاء تعبئة كل الحقول\n"
-
-#: ../mdkonline:212
-#, c-format
-msgid "Not a valid mail address!\n"
-msgstr "عنوان بريدي غير صالح !\n"
-
-#: ../mdkonline:217
-#, c-format
-msgid "Creating account failed!"
-msgstr ""
-
-#: ../mdkonline:225
-#, c-format
-msgid ""
-"Mandriva Online Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
-msgstr ""
-"تم إنشاء حساب ماندريبا أُنلاين بنجاح.\n"
-"الرجاء الضغط على \"التالي\" للتوثيق وتحميل تهيئتك.\n"
-
-#: ../mdkonline:229
-#, c-format
-msgid "Your upload was successful!"
-msgstr "تم التحميل بنجاحك!"
-
-#: ../mdkonline:229
+#: ../mdkapplet:478
 #, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandriva Online."
-msgstr ""
-"من الآن ستستلم اشعارات بالترقيات\n"
-"و التحديثات الأمنية بفضل ماندريبا أنلاين."
+msgid "Online WebSite"
+msgstr "موقع على الخطّ"
 
-#: ../mdkonline:229
+#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
+#: ../mdkapplet:483
 #, c-format
-msgid ""
-"Mandriva Online offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
+msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
-"يُوفّر ماندريبا أنلاين القدرة على التحديث بشكل آلي.\n"
-"\n"
-"سيعمل برنامج بانتظام على نظامك منتظرا تحديثات جديدة\n"
-
-#: ../mdkonline:238
-#, c-format
-msgid "Congratulations"
-msgstr "تهانينا"
-
-#: ../mdkonline:238
-#, c-format
-msgid "Your Mandriva Online account has been successfully configured\n"
-msgstr "تمت تهيئة حساب ماندريبا أُنلاين الخاص بك بنجاح\n"
 
-#: ../mdkonline:253
+#: ../mdkapplet:492
 #, c-format
-msgid "Configuration uploaded successfully"
-msgstr "تم تحميل التهيئة بنجاح"
-
-#: ../mdkonline:254
-#, c-format
-msgid "Problem uploading configuration"
-msgstr "حدث خطأ أثناء تحميل التهيئة"
+msgid "Always launch on startup"
+msgstr "أطلق دوما عند البدأ"
 
-#: ../mdkonline:256
+#: ../mdkapplet:494
 #, c-format
-msgid ""
-"Cannot connect to Mandriva Online website: wrong login/password or router/"
-"firewall bad settings"
-msgstr ""
-"لا يمكن الاتصال بموقع ماندريبا أُنلاين: اسم دخول أو كلمة مرور خاطئة أو "
-"إعدادات مُوجّه أو جداري ناري سيئة"
+msgid "Quit"
+msgstr "خروج"
 
 #: ../mdkonline.pm:207
 #, fuzzy, c-format
@@ -810,6 +353,11 @@ msgstr ""
 "\n"
 "الاستعمال:\n"
 
+#: ../mdkupdate:73
+#, c-format
+msgid "  --help\t\t- print this help message.\n"
+msgstr "  --help\t\t- إظهار رسالة المساعدة هذه.\n"
+
 #: ../mdkupdate:74
 #, c-format
 msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
@@ -837,11 +385,6 @@ msgid ""
 "file.\n"
 msgstr ""
 
-#: ../mdkupdate:118 ../mdkupdate:164
-#, c-format
-msgid "Warning"
-msgstr "تحذير"
-
 #. -PO: here Live Install is currently *NOT* translated on the desktop, so it's better to keep as it:
 #: ../mdkupdate:120
 #, c-format
@@ -850,11 +393,21 @@ msgid ""
 "Install' wizard."
 msgstr ""
 
+#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
+#, c-format
+msgid "Please wait"
+msgstr "من فضلك انتظر"
+
 #: ../mdkupdate:123 ../mdkupdate:174
 #, c-format
 msgid "Preparing..."
 msgstr "جاري التحضير..."
 
+#: ../mdkupdate:141 ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
+#, c-format
+msgid "Error"
+msgstr "خطأ"
+
 #: ../mdkupdate:141
 #, c-format
 msgid ""
@@ -863,6 +416,11 @@ msgid ""
 "%s"
 msgstr ""
 
+#: ../mdkupdate:159 ../mdkupdate:188
+#, c-format
+msgid "An error occurred"
+msgstr "حدث خطأ"
+
 #: ../mdkupdate:164
 #, c-format
 msgid ""
@@ -887,6 +445,282 @@ msgstr "جاري تركيب الحزم...\n"
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "لم يمكن تحديث الحزم من وسيط التحديث.\n"
 
+#, fuzzy
+#~ msgid "New bundles are available for your system"
+#~ msgstr "هناك تحديثات متوفّرة لنظامك"
+
+#~ msgid "Service is not configured. Please click on \"Configure the service\""
+#~ msgstr "الخدمة غير مهيّئة. رجاء اضغط على \"تهيئة الخدمة\""
+
+#~ msgid "Configure the service"
+#~ msgstr "تهيئة الخدمة"
+
+#~ msgid "Check updates"
+#~ msgstr "إفحص التّحديثات"
+
+#~ msgid "Configure Now!"
+#~ msgstr "أعدّ الآن !"
+
+#~ msgid "Actions"
+#~ msgstr "الأفعال"
+
+#~ msgid "Configure"
+#~ msgstr "أعدّ"
+
+#~ msgid "See logs"
+#~ msgstr "شاهد السّجلّات"
+
+#~ msgid "Status"
+#~ msgstr "الحالة"
+
+#~ msgid "Close"
+#~ msgstr "إغلق"
+
+#~ msgid "Network Connection: "
+#~ msgstr "وصلة الشّبكة: "
+
+#~ msgid "Up"
+#~ msgstr "أعلى"
+
+#~ msgid "Down"
+#~ msgstr "أسفل"
+
+#~ msgid "Last check: "
+#~ msgstr "آخر فحص: "
+
+#~ msgid "Machine name:"
+#~ msgstr "إسم الماكنة:"
+
+#~ msgid "Updates: "
+#~ msgstr "تحديثات: "
+
+#~ msgid "Development release not supported by service"
+#~ msgstr "إصدارة تطويريّة غير مدعومة من قبل الخدمة"
+
+#~ msgid "Too old release not supported by service"
+#~ msgstr "إصدارة قديمة جداً غير مدعومة من قبل الخدمة"
+
+#~ msgid "Unknown state"
+#~ msgstr "حالة مجهولة"
+
+#~ msgid "Online services disabled. Contact Mandriva Online site\n"
+#~ msgstr "الخدمات على الخطّ معطّلة. اتّصل بموقع ماندريبا أُنلاين\n"
+
+#~ msgid "Wrong Password.\n"
+#~ msgstr "كلمة مرور خاطئة.\n"
+
+#~ msgid "Wrong Action or host or login.\n"
+#~ msgstr "فعل أو مضيف أو إسم دخول خاطئ.\n"
+
+#~ msgid ""
+#~ "Something is wrong with your network settings (check your route, firewall "
+#~ "or proxy settings)\n"
+#~ msgstr ""
+#~ "هناك شيء خاطئ في إعدادات شبكتك (إفحص الطّريق، الجدار النّاري أو إعدادات "
+#~ "البروكسي الخاصّة بك)\n"
+
+#~ msgid ""
+#~ "Problem occured while connecting to the server, please contact the "
+#~ "support team"
+#~ msgstr "حدثت مشكلة أثناء الاتصال باخادم، الرجاء الاتصال بفريق الدعم"
+
+#~ msgid "Response from Mandriva Online server\n"
+#~ msgstr "الردّ من خادم ماندريبا أُنلاين\n"
+
+#~ msgid "No check"
+#~ msgstr "دون فحص"
+
+#~ msgid "Checking config file: Not present\n"
+#~ msgstr "يجري فحص ملفّ الإعداد: غير موجود\n"
+
+#~ msgid "Logs"
+#~ msgstr "السّجلّات"
+
+#~ msgid "Clear"
+#~ msgstr "إمحي"
+
+#, fuzzy
+#~ msgid ""
+#~ "mdonline version %s\n"
+#~ "Copyright (C) %s Mandriva.\n"
+#~ "This is free software and may be redistributed under the terms of the GNU "
+#~ "GPL.\n"
+#~ "\n"
+#~ "usage:\n"
+#~ msgstr ""
+#~ " ماندريبا أبدايت)النسخةة %s\n"
+#~ "جميع الحقوق محفوظة %s ماندريبا سوفت.\n"
+#~ "هذا البرنامج حرّ و يمكن إعادة توزيعه تحت بنود ترخيص GNU GPL.\n"
+#~ "\n"
+#~ "الاستعمال:\n"
+
+#~ msgid "Mandriva Online"
+#~ msgstr "ماندريبا أُنلاين"
+
+#~ msgid "I already have an account"
+#~ msgstr "لدي حساب مسبقاً"
+
+#~ msgid "I want to subscribe"
+#~ msgstr "أريد الاشتراك"
+
+#, fuzzy
+#~ msgid "Mrs."
+#~ msgstr "XMrIs"
+
+#~ msgid "Reading configuration\n"
+#~ msgstr "جاري قراءة اعداداتك\n"
+
+#~ msgid ""
+#~ "This assistant will help you to upload your configuration\n"
+#~ "(packages, hardware configuration) to a centralized database in\n"
+#~ "order to keep you informed about security updates and useful upgrades.\n"
+#~ msgstr ""
+#~ "سيُعينك هذا المساعد على تحميل تهيئتك\n"
+#~ "(الحزم، تهيئة العتاد) إلى قاعدة بيانات مركزية كي\n"
+#~ "يتسنى لك أن تعلم بالتحديثات الأمنية و الترقيات المفيدة.\n"
+
+#~ msgid "Account creation or authentication"
+#~ msgstr "إنشاء أو توثيق الحساب"
+
+#~ msgid "Enter your Mandriva Online login, password and machine name:"
+#~ msgstr "أدخل اسم الدخول الخاص بماندريبا أُنلاين، وكلمة المرور واسم الماكينة:"
+
+#, fuzzy
+#~ msgid "Email address:"
+#~ msgstr "عنوان البريد الخارج"
+
+#~ msgid "Country"
+#~ msgstr "الدولة"
+
+#~ msgid "Password:"
+#~ msgstr "كلمة المرور:"
+
+#, fuzzy
+#~ msgid "Machine description:"
+#~ msgstr "إسم الماكنة:"
+
+#, fuzzy
+#~ msgid "Machine name must be 1 to 40 alphanumerical characters"
+#~ msgstr "أماكن التركيب يجب أن تحتوي فقط على الحروف و/أو الآرقام"
+
+#~ msgid "Connecting to Mandriva Online website..."
+#~ msgstr "جاري الاتصال بموقع ماندريبا أُنلاين..."
+
+#~ msgid ""
+#~ "In order to benefit from Mandriva Online services,\n"
+#~ "we are about to upload your configuration.\n"
+#~ "\n"
+#~ "The Wizard will now send the following information to Mandriva:\n"
+#~ "\n"
+#~ "1) the list of packages you have installed on your system,\n"
+#~ "\n"
+#~ "2) your hardware configuration.\n"
+#~ "\n"
+#~ "If you feel uncomfortable by that idea, or do not want to benefit from "
+#~ "this service,\n"
+#~ "please press 'Cancel'. By pressing 'Next', you allow us to keep you "
+#~ "informed\n"
+#~ "about security updates and useful upgrades via personalized email "
+#~ "alerts.\n"
+#~ "Furthermore, you benefit from discounted paid support services on\n"
+#~ "www.mandrivaexpert.com."
+#~ msgstr ""
+#~ "للاستفادة من خدمات ماندريبا على الخطّ،\n"
+#~ "نحن على وشك تحميل تهيئتك.\n"
+#~ "\n"
+#~ "سيرسل هذا المعالج المعلومات التّالية إلى ماندريبا سوفت:\n"
+#~ "\n"
+#~ "1) قائمة الحزم التي قمت بتثبيتها على نظامك،\n"
+#~ "\n"
+#~ "2) تهيئة عتادك.\n"
+#~ "\n"
+#~ "إن لم تكن مرتاحا لهذه الفكرة، أو إن كنت لا تريد الاستفادة من هذه الخدمة،\n"
+#~ "اضغط على 'إلغاء'. بالضّغط على 'التّالي'، تسمح لنا بإبقائك على اطلاع\n"
+#~ "بالتّحديثات الأمنية و التّرقيات المفيدة عن طريق تنبيهات بريدية مخصّصة.\n"
+#~ "كذلك، تستفيد من خدمات دعم بسعر أقلّ على\n"
+#~ "www.mandrivaexpert.com."
+
+#~ msgid "Connection problem"
+#~ msgstr "مشكلة في الإتصال"
+
+#~ msgid "Problem occurs when uploading files, please try again"
+#~ msgstr "يحدث مشكل عند تحميل الملفّات، حاول مجدّدا من فضلك"
+
+#~ msgid "Create a Mandriva Online Account"
+#~ msgstr "إنشاء حساب في ماندريبا أُنلاين"
+
+#, fuzzy
+#~ msgid "Greeting:"
+#~ msgstr "أخضر"
+
+#~ msgid "First name:"
+#~ msgstr "الإسم:"
+
+#, fuzzy
+#~ msgid "Last name:"
+#~ msgstr "الإسم:"
+
+#~ msgid "Confirm Password:"
+#~ msgstr "أكّد كلمة المرور:"
+
+#~ msgid ""
+#~ "The passwords do not match\n"
+#~ " Please try again\n"
+#~ msgstr ""
+#~ "كلمات المرور غير متطابقة\n"
+#~ "كرّر المحاولة من فضلك\n"
+
+#, fuzzy
+#~ msgid "Please fill in each field"
+#~ msgstr "الرجاء تعبئة كل الحقول\n"
+
+#~ msgid "Not a valid mail address!\n"
+#~ msgstr "عنوان بريدي غير صالح !\n"
+
+#~ msgid ""
+#~ "Mandriva Online Account successfully created.\n"
+#~ "Please click \"Next\" to authenticate and upload your configuration\n"
+#~ msgstr ""
+#~ "تم إنشاء حساب ماندريبا أُنلاين بنجاح.\n"
+#~ "الرجاء الضغط على \"التالي\" للتوثيق وتحميل تهيئتك.\n"
+
+#~ msgid "Your upload was successful!"
+#~ msgstr "تم التحميل بنجاحك!"
+
+#~ msgid ""
+#~ "From now you will receive on security and updates \n"
+#~ "announcements thanks to Mandriva Online."
+#~ msgstr ""
+#~ "من الآن ستستلم اشعارات بالترقيات\n"
+#~ "و التحديثات الأمنية بفضل ماندريبا أنلاين."
+
+#~ msgid ""
+#~ "Mandriva Online offers you the ability to automate the updates.\n"
+#~ "A program will run regulary in your system waiting for new updates\n"
+#~ msgstr ""
+#~ "يُوفّر ماندريبا أنلاين القدرة على التحديث بشكل آلي.\n"
+#~ "\n"
+#~ "سيعمل برنامج بانتظام على نظامك منتظرا تحديثات جديدة\n"
+
+#~ msgid "Congratulations"
+#~ msgstr "تهانينا"
+
+#~ msgid "Your Mandriva Online account has been successfully configured\n"
+#~ msgstr "تمت تهيئة حساب ماندريبا أُنلاين الخاص بك بنجاح\n"
+
+#~ msgid "Configuration uploaded successfully"
+#~ msgstr "تم تحميل التهيئة بنجاح"
+
+#~ msgid "Problem uploading configuration"
+#~ msgstr "حدث خطأ أثناء تحميل التهيئة"
+
+#~ msgid ""
+#~ "Cannot connect to Mandriva Online website: wrong login/password or router/"
+#~ "firewall bad settings"
+#~ msgstr ""
+#~ "لا يمكن الاتصال بموقع ماندريبا أُنلاين: اسم دخول أو كلمة مرور خاطئة أو "
+#~ "إعدادات مُوجّه أو جداري ناري سيئة"
+
 #~ msgid "  --applet\t\t- launch Mandriva Update.\n"
 #~ msgstr "  --applet\t\t- تشغيل ماندريبا  أبدايت.\n"
 
diff --git a/po/az.po b/po/az.po
index 5bfb34bf..5a03deac 100644
--- a/po/az.po
+++ b/po/az.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline-az\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-09 16:26+0200\n"
+"POT-Creation-Date: 2008-02-21 18:21+0100\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"
@@ -18,17 +18,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:94
+#: ../mdkapplet:88
 #, fuzzy, c-format
 msgid "Will check updates at %s"
 msgstr "Yeniləmələri yoxla"
 
-#: ../mdkapplet:103
+#: ../mdkapplet:97
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "Sisteminiz yenidir"
 
-#: ../mdkapplet:109
+#: ../mdkapplet:103
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -37,55 +37,44 @@ msgstr ""
 "Xidmət qurğu xətası. Xahiş edirik qeydlərdəki xətanı tapın və "
 "support@mandrivaonline.com ünvanına məktub göndərin."
 
-#: ../mdkapplet:115
+#: ../mdkapplet:110
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "Xahiş edirik gözləyin, mövcud paketlər tapılır..."
 
-#: ../mdkapplet:121
+#: ../mdkapplet:116
 #, c-format
 msgid "New updates are available for your system"
 msgstr "Sisteminiz üçün yeniləmələr mövcuddur"
 
-#: ../mdkapplet:127
-#, fuzzy, c-format
-msgid "New bundles are available for your system"
-msgstr "Sisteminiz üçün yeniləmələr mövcuddur"
-
-#: ../mdkapplet:133
-#, c-format
-msgid "Service is not configured. Please click on \"Configure the service\""
-msgstr ""
-"Xidmət quraşdırılmayıb. Xahiş edirik \"Xidməti quraşdır\" düyməsinə basın"
-
-#: ../mdkapplet:139
+#: ../mdkapplet:122
 #, 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:145
+#: ../mdkapplet:128
 #, 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:151 ../mdkapplet:182
+#: ../mdkapplet:134 ../mdkapplet:165
 #, fuzzy, c-format
 msgid "urpmi database locked"
 msgstr "urpmi databeyzi qıfıllıdır"
 
-#: ../mdkapplet:157
+#: ../mdkapplet:140
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
-#: ../mdkapplet:163
+#: ../mdkapplet:146
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
 msgstr ""
 
-#: ../mdkapplet:169
+#: ../mdkapplet:152
 #, fuzzy, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -102,577 +91,131 @@ msgstr ""
 "\n"
 "Daha sonra, %s'i yenidən başladın."
 
-#: ../mdkapplet:174
+#: ../mdkapplet:157
 #, c-format
 msgid "Enabled"
 msgstr "Fəal"
 
-#: ../mdkapplet:187
+#: ../mdkapplet:170
 #, c-format
 msgid "Error updating media"
 msgstr ""
 
-#: ../mdkapplet:202
+#: ../mdkapplet:185
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr "Yoxlanır... Yeniləmələr mövcuddur\n"
 
-#: ../mdkapplet:207
+#: ../mdkapplet:190
 #, c-format
 msgid "Packages are up to date"
 msgstr ""
 
-#: ../mdkapplet:212
+#: ../mdkapplet:195
 #, fuzzy, c-format
 msgid "Failed to open urpmi database"
 msgstr "rpmb açıla bilmir"
 
-#: ../mdkapplet:217 ../mdkapplet:324
+#: ../mdkapplet:200
 #, c-format
 msgid "Install updates"
 msgstr "Yeniləmələri qur"
 
-#: ../mdkapplet:218
-#, c-format
-msgid "Configure the service"
-msgstr "Xidməti quraşdır"
-
-#: ../mdkapplet:219
+#: ../mdkapplet:201
 #, c-format
 msgid "Check Updates"
 msgstr "Yeniləmələri Yoxla"
 
-#: ../mdkapplet:220 ../mdkapplet:327 ../mdkonline:114 ../mdkonline:155
-#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
-#, c-format
-msgid "Please wait"
-msgstr "Xahiş edirik, gözləyin"
-
-#: ../mdkapplet:220 ../mdkapplet:326 ../mdkapplet:327
-#, c-format
-msgid "Check updates"
-msgstr "Yeniləmələri yoxla"
-
-#: ../mdkapplet:223 ../mdkapplet:648
-#, c-format
-msgid "Online WebSite"
-msgstr "Onlayn Veb Saytı"
-
-#: ../mdkapplet:224
+#: ../mdkapplet:202
 #, c-format
 msgid "Configure Network"
 msgstr "Şəbəkəni Quraşdır"
 
-#: ../mdkapplet:225
-#, c-format
-msgid "Configure Now!"
-msgstr "İndi Quraşdır!"
-
-#: ../mdkapplet:313 ../mdkapplet:392
-#, c-format
-msgid "Mandriva Linux Updates Applet"
-msgstr "Mandriva Linux Yeniləmələr Appleti"
-
-#: ../mdkapplet:322
-#, c-format
-msgid "Actions"
-msgstr "Gedişatlar"
-
-#: ../mdkapplet:325
-#, c-format
-msgid "Configure"
-msgstr "Quraşdır"
-
-#: ../mdkapplet:329
-#, c-format
-msgid "See logs"
-msgstr "Qeydləri qöstər"
-
-#: ../mdkapplet:332
-#, c-format
-msgid "Status"
-msgstr "Vəziyyət"
-
-#: ../mdkapplet:336 ../mdkapplet:597
-#, c-format
-msgid "Close"
-msgstr "Bağla"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Network Connection: "
-msgstr "Şəbəkə Bağlantısı:"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Up"
-msgstr "Fəal"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Down"
-msgstr "İşləmir"
-
-#: ../mdkapplet:366
-#, c-format
-msgid "Last check: "
-msgstr "Son yoxlama:"
-
-#: ../mdkapplet:367 ../mdkonline:145
-#, c-format
-msgid "Machine name:"
-msgstr "Kompüter adı:"
-
-#: ../mdkapplet:368
-#, c-format
-msgid "Updates: "
-msgstr "Yeniləmələr:"
-
-#: ../mdkapplet:372
+#: ../mdkapplet:283
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Drakconnect başladılır\n"
 
-#: ../mdkapplet:375
+#: ../mdkapplet:286
 #, c-format
 msgid "Mandriva Online seems to be reinstalled, reloading applet ...."
 msgstr "Mandriva Online yenidən qurulub, applet yenidən yüklənir ..."
 
-#: ../mdkapplet:383
+#: ../mdkapplet:294
 #, c-format
 msgid "Launching MandrivaUpdate\n"
 msgstr "MandrivaUpdate başladılır\n"
 
-#: ../mdkapplet:398
+#: ../mdkapplet:303
+#, c-format
+msgid "Mandriva Linux Updates Applet"
+msgstr "Mandriva Linux Yeniləmələr Appleti"
+
+#: ../mdkapplet:308
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Yeniləmələr hesablanır...\n"
 
-#: ../mdkapplet:399
+#: ../mdkapplet:309
 #, c-format
 msgid "Connecting to"
 msgstr "Bağlanır"
 
-#: ../mdkapplet:467 ../mdkupdate:159 ../mdkupdate:188
-#, c-format
-msgid "An error occurred"
-msgstr "Bir xəta oldu"
-
-#: ../mdkapplet:475
-#, c-format
-msgid "Development release not supported by service"
-msgstr ""
-
-#: ../mdkapplet:476
-#, c-format
-msgid "Too old release not supported by service"
-msgstr ""
-
-#: ../mdkapplet:477
-#, c-format
-msgid "Unknown state"
-msgstr "Naməlum vəziyyət"
-
-#: ../mdkapplet:478
-#, c-format
-msgid "Online services disabled. Contact Mandriva Online site\n"
-msgstr "Online xidmətlər qeyri-fəaldır. Mandriva Online ilə əlaqə qurun\n"
-
-#: ../mdkapplet:479
-#, c-format
-msgid "Wrong Password.\n"
-msgstr "Səhv Şifrə.\n"
-
-#: ../mdkapplet:480
-#, c-format
-msgid "Wrong Action or host or login.\n"
-msgstr "Səhv gedişat, qovşaq ya da giriş.\n"
-
-#: ../mdkapplet:481
-#, c-format
-msgid ""
-"Something is wrong with your network settings (check your route, firewall or "
-"proxy settings)\n"
-msgstr ""
-"Şəbəkə qurğularınızda səhv bir çey var. (router, atəş divarı ya da vəkil  "
-"qurğularınızı yoxlayın)\n"
-
-#: ../mdkapplet:483
-#, c-format
-msgid ""
-"Problem occured while connecting to the server, please contact the support "
-"team"
-msgstr ""
-
-#: ../mdkapplet:487
-#, fuzzy, c-format
-msgid "Response from Mandriva Online server\n"
-msgstr "Mandriva Online-a Xoş Gəldiniz"
-
-#: ../mdkapplet:490
+#: ../mdkapplet:386
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Sistem yenidir\n"
 
-#: ../mdkapplet:527
-#, c-format
-msgid "No check"
-msgstr "Yoxlama"
-
-#: ../mdkapplet:541
-#, c-format
-msgid "Checking config file: Not present\n"
-msgstr "Quraşdırma faylı Yoxlanır: Mövcud deyil\n"
-
-#: ../mdkapplet:544
+#: ../mdkapplet:415
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Şəbəkə Yoxlanır: deyəsən qeyri-fəaldır\n"
 
-#: ../mdkapplet:587
-#, c-format
-msgid "Logs"
-msgstr "Qeydlər"
-
-#: ../mdkapplet:603
+#: ../mdkapplet:457 ../mdkupdate:118 ../mdkupdate:164
 #, c-format
-msgid "Clear"
-msgstr "Təmizlə"
+msgid "Warning"
+msgstr "Xəbərdarlıq"
 
-#: ../mdkapplet:629
+#: ../mdkapplet:468
 #, c-format
 msgid "About..."
 msgstr "Haqqında..."
 
-#: ../mdkapplet:631
+#: ../mdkapplet:472
 #, fuzzy, c-format
 msgid "Mandriva Online %s"
 msgstr "Mandriva Online"
 
-#: ../mdkapplet:635
+#: ../mdkapplet:473
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr ""
 
-#: ../mdkapplet:647
+#: ../mdkapplet:476
 #, c-format
 msgid "Mandriva Online gives access to Mandriva web services."
 msgstr ""
 
-#: ../mdkapplet:655
-#, c-format
-msgid "Always launch on startup"
-msgstr "Həmişə başlanğıcda işə sal"
-
-#: ../mdkapplet:657
-#, c-format
-msgid "Quit"
-msgstr "Çıx"
-
-#: ../mdkonline:58
-#, c-format
-msgid ""
-"mdonline version %s\n"
-"Copyright (C) %s Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"mdonline buraxılış %s\n"
-"Tə'lif Hüququ (C) %s Mandriva.\n"
-"Bu sərbəst proqram tə'minatıdır və GNU GPL şərtləri altında paylana bilər.\n"
-"\n"
-"istifadə qaydası:\n"
-
-#: ../mdkonline:63 ../mdkupdate:73
-#, c-format
-msgid "  --help\t\t- print this help message.\n"
-msgstr "  --help\t\t- bu yardım ismarışını göstər.\n"
-
-#: ../mdkonline:64
-#, c-format
-msgid "  --box=\t\t\t- hostname.\n"
-msgstr ""
-
-#: ../mdkonline:65
-#, c-format
-msgid "  --country\t\t\t- name of country of the user. \n"
-msgstr ""
-
-#: ../mdkonline:66
-#, c-format
-msgid "  --interactive\t\t- use the interactive mode.\n"
-msgstr ""
-
-#: ../mdkonline:67
-#, c-format
-msgid "  --nointeractive\t- use the non-interactive mode.\n"
-msgstr ""
-
-#: ../mdkonline:68
-#, c-format
-msgid "  --login=\t\t     - login name of the user.\n"
-msgstr ""
-
-#: ../mdkonline:69
-#, c-format
-msgid "  --pass=\t\t\t- password  of the user.\n"
-msgstr ""
-
-#: ../mdkonline:87 ../mdkonline:120
-#, c-format
-msgid "Mandriva Online"
-msgstr "Mandriva Online"
-
-#: ../mdkonline:90
-#, c-format
-msgid "I already have an account"
-msgstr ""
-
-#: ../mdkonline:91
-#, c-format
-msgid "I want to subscribe"
-msgstr ""
-
-#: ../mdkonline:96
-#, c-format
-msgid "Mr."
-msgstr ""
-
-#: ../mdkonline:96
-#, fuzzy, c-format
-msgid "Mrs."
-msgstr "XMrIs"
-
-#: ../mdkonline:96
-#, c-format
-msgid "Ms."
-msgstr ""
-
-#: ../mdkonline:114
-#, c-format
-msgid "Reading configuration\n"
-msgstr "Qurğularınız oxunur\n"
-
-#: ../mdkonline:123
-#, c-format
-msgid ""
-"This assistant will help you to upload your configuration\n"
-"(packages, hardware configuration) to a centralized database in\n"
-"order to keep you informed about security updates and useful upgrades.\n"
-msgstr ""
-"Bu yardımçı sizin qurğularınızı\n"
-"(paketlər, avadanlıq qurğuları) təhlükəsizlik və\n"
-"sərfəli güncəlləmələri xəbər vermək üçün\n"
-"mərkəzi verilənlər bazasına göndərəcəkdir.\n"
-
-#: ../mdkonline:131
-#, c-format
-msgid "Account creation or authentication"
-msgstr ""
-
-#: ../mdkonline:136
-#, c-format
-msgid "Enter your Mandriva Online login, password and machine name:"
-msgstr "Mandriva Online giriş adı, parolunuzu və kompüter adını girin:"
-
-#: ../mdkonline:142 ../mdkonline:195
-#, fuzzy, c-format
-msgid "Email address:"
-msgstr "IP ünvanı"
-
-#: ../mdkonline:143
-#, c-format
-msgid "Country"
-msgstr "Ölkə"
-
-#: ../mdkonline:144 ../mdkonline:196
-#, c-format
-msgid "Password:"
-msgstr "Parol:"
-
-#: ../mdkonline:146
-#, fuzzy, c-format
-msgid "Machine description:"
-msgstr "Kompüter adı:"
-
-#: ../mdkonline:147
-#, c-format
-msgid "(Ex: My Home Office's Computer)"
-msgstr ""
-
-#: ../mdkonline:152 ../mdkonline:159 ../mdkonline:180 ../mdkonline:204
-#: ../mdkonline:208 ../mdkonline:212 ../mdkonline:217 ../mdkupdate:141
-#: ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
-#, c-format
-msgid "Error"
-msgstr "Xəta"
-
-#: ../mdkonline:152
-#, fuzzy, c-format
-msgid "Machine name must be 1 to 40 alphanumerical characters"
-msgstr "Bağlama nöqtələri ancaq alfanumerik hərf daxil edə bilər"
-
-#: ../mdkonline:155
-#, fuzzy, c-format
-msgid "Connecting to Mandriva Online website..."
-msgstr "Mandriva Online-a Xoş Gəldiniz"
-
-#: ../mdkonline:167
-#, c-format
-msgid ""
-"In order to benefit from Mandriva Online services,\n"
-"we are about to upload your configuration.\n"
-"\n"
-"The Wizard will now send the following information to Mandriva:\n"
-"\n"
-"1) the list of packages you have installed on your system,\n"
-"\n"
-"2) your hardware configuration.\n"
-"\n"
-"If you feel uncomfortable by that idea, or do not want to benefit from this "
-"service,\n"
-"please press 'Cancel'. By pressing 'Next', you allow us to keep you "
-"informed\n"
-"about security updates and useful upgrades via personalized email alerts.\n"
-"Furthermore, you benefit from discounted paid support services on\n"
-"www.mandrivaexpert.com."
-msgstr ""
-"Mandriva Online xitmətlərindən faydalanmağınıza ikan vermək üçün,\n"
-"sizin qurğularınızı mərkəzə göndərməliyik.\n"
-"\n"
-"Sehirbaz indi aşağıdakı məlumatları Mandriva vericimizə göndərəcəkdir:\n"
-"\n"
-"1) sistemə qurulu paketlər,\n"
-"\n"
-"2) avadanlıq qurğularınız.\n"
-"\n"
-"İstəmirsinizsə, Ləğv Et'ə basın.\n"
-"'Sonrakı'nı basmaqla sizin satıcınız olaraq sizin haqqınızda daha\n"
-"çox şey öyrənmə səlahiyyətini bizə tanımış olursunuz\n"
-"və sərfəli güncəlləmələr haqqında xəbərlar almış olacaqsınız.\n"
-"Həm də bu qeydlə siz www.mandrivaexpert.com ünvanındakı xitmətlərdən\n"
-"endirimli, yəni daha ucuz faydalana bilərsiniz."
-
-#: ../mdkonline:180
-#, c-format
-msgid "Connection problem"
-msgstr "Bağlantı problemi"
-
-#: ../mdkonline:180
-#, c-format
-msgid "Problem occurs when uploading files, please try again"
-msgstr ""
-"Fayllar göndərilirkən xəta yaranır, xahiş edirik daha sonra yenidən sınayın"
-
-#: ../mdkonline:187
-#, c-format
-msgid "Create a Mandriva Online Account"
-msgstr "Mandriva Online Hesabı Yaradılır"
-
-#. -PO: that is for things like "Mr", "Ms",...
-#: ../mdkonline:192
-#, fuzzy, c-format
-msgid "Greeting:"
-msgstr "Yaşıl"
-
-#: ../mdkonline:193
-#, c-format
-msgid "First name:"
-msgstr "Adı:"
-
-#: ../mdkonline:194
-#, fuzzy, c-format
-msgid "Last name:"
-msgstr "Adı:"
-
-#: ../mdkonline:197
-#, c-format
-msgid "Confirm Password:"
-msgstr "Şifrənin Təstiqi:"
-
-#: ../mdkonline:204
-#, c-format
-msgid ""
-"The passwords do not match\n"
-" Please try again\n"
-msgstr ""
-"Şifrələr uyğun gəlmir\n"
-" Xahiş edirik yenidən sınayın\n"
-
-#: ../mdkonline:208
-#, fuzzy, c-format
-msgid "Please fill in each field"
-msgstr "Xahiş edirik, aşağıdakıları doldurun ya da seçin"
-
-#: ../mdkonline:212
-#, c-format
-msgid "Not a valid mail address!\n"
-msgstr "Hökmsüz epoçt ünvanı!\n"
-
-#: ../mdkonline:217
-#, c-format
-msgid "Creating account failed!"
-msgstr ""
-
-#: ../mdkonline:225
-#, c-format
-msgid ""
-"Mandriva Online Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
-msgstr ""
-
-#: ../mdkonline:229
-#, c-format
-msgid "Your upload was successful!"
-msgstr "Sizin yollamanız müvəffəqiyyətli oldu"
-
-#: ../mdkonline:229
+#: ../mdkapplet:478
 #, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandriva Online."
-msgstr ""
-"İndidən etibarən Mandriva Online vasitəsilə güncəlləmə və\n"
-"təhlükəsizlik elanları alacaqsınız."
+msgid "Online WebSite"
+msgstr "Onlayn Veb Saytı"
 
-#: ../mdkonline:229
+#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
+#: ../mdkapplet:483
 #, c-format
-msgid ""
-"Mandriva Online offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
+msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
-"Mandriva Online sizə avtokatik güncəlləmə imkanı verir.\n"
-"Proqram sürəkli olaraq sisteminizdə yeni göncəlləmələri gözləyəcək şəkildə "
-"işləyəcəkdir\n"
 
-#: ../mdkonline:238
+#: ../mdkapplet:492
 #, c-format
-msgid "Congratulations"
-msgstr "Təbriklər"
-
-#: ../mdkonline:238
-#, c-format
-msgid "Your Mandriva Online account has been successfully configured\n"
-msgstr ""
-
-#: ../mdkonline:253
-#, fuzzy, c-format
-msgid "Configuration uploaded successfully"
-msgstr "Sizin yollamanız müvəffəqiyyətli oldu"
-
-#: ../mdkonline:254
-#, fuzzy, c-format
-msgid "Problem uploading configuration"
-msgstr "Qurğularınız oxunur\n"
+msgid "Always launch on startup"
+msgstr "Həmişə başlanğıcda işə sal"
 
-#: ../mdkonline:256
+#: ../mdkapplet:494
 #, c-format
-msgid ""
-"Cannot connect to Mandriva Online website: wrong login/password or router/"
-"firewall bad settings"
-msgstr ""
+msgid "Quit"
+msgstr "Çıx"
 
 #: ../mdkonline.pm:207
 #, fuzzy, c-format
@@ -812,6 +355,11 @@ msgstr ""
 "\n"
 "istifadə qaydası:\n"
 
+#: ../mdkupdate:73
+#, 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:74
 #, c-format
 msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
@@ -839,11 +387,6 @@ msgid ""
 "file.\n"
 msgstr ""
 
-#: ../mdkupdate:118 ../mdkupdate:164
-#, c-format
-msgid "Warning"
-msgstr "Xəbərdarlıq"
-
 #. -PO: here Live Install is currently *NOT* translated on the desktop, so it's better to keep as it:
 #: ../mdkupdate:120
 #, c-format
@@ -852,11 +395,21 @@ msgid ""
 "Install' wizard."
 msgstr ""
 
+#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
+#, c-format
+msgid "Please wait"
+msgstr "Xahiş edirik, gözləyin"
+
 #: ../mdkupdate:123 ../mdkupdate:174
 #, c-format
 msgid "Preparing..."
 msgstr "Hazırlanır..."
 
+#: ../mdkupdate:141 ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
+#, c-format
+msgid "Error"
+msgstr "Xəta"
+
 #: ../mdkupdate:141
 #, c-format
 msgid ""
@@ -865,6 +418,11 @@ msgid ""
 "%s"
 msgstr ""
 
+#: ../mdkupdate:159 ../mdkupdate:188
+#, c-format
+msgid "An error occurred"
+msgstr "Bir xəta oldu"
+
 #: ../mdkupdate:164
 #, c-format
 msgid ""
@@ -889,6 +447,254 @@ msgstr "Paketlər qurulur...\n"
 msgid "Unable to update packages from update_source medium.\n"
 msgstr ""
 
+#, fuzzy
+#~ msgid "New bundles are available for your system"
+#~ msgstr "Sisteminiz üçün yeniləmələr mövcuddur"
+
+#~ msgid "Service is not configured. Please click on \"Configure the service\""
+#~ msgstr ""
+#~ "Xidmət quraşdırılmayıb. Xahiş edirik \"Xidməti quraşdır\" düyməsinə basın"
+
+#~ msgid "Configure the service"
+#~ msgstr "Xidməti quraşdır"
+
+#~ msgid "Check updates"
+#~ msgstr "Yeniləmələri yoxla"
+
+#~ msgid "Configure Now!"
+#~ msgstr "İndi Quraşdır!"
+
+#~ msgid "Actions"
+#~ msgstr "Gedişatlar"
+
+#~ msgid "Configure"
+#~ msgstr "Quraşdır"
+
+#~ msgid "See logs"
+#~ msgstr "Qeydləri qöstər"
+
+#~ msgid "Status"
+#~ msgstr "Vəziyyət"
+
+#~ msgid "Close"
+#~ msgstr "Bağla"
+
+#~ msgid "Network Connection: "
+#~ msgstr "Şəbəkə Bağlantısı:"
+
+#~ msgid "Up"
+#~ msgstr "Fəal"
+
+#~ msgid "Down"
+#~ msgstr "İşləmir"
+
+#~ msgid "Last check: "
+#~ msgstr "Son yoxlama:"
+
+#~ msgid "Machine name:"
+#~ msgstr "Kompüter adı:"
+
+#~ msgid "Updates: "
+#~ msgstr "Yeniləmələr:"
+
+#~ msgid "Unknown state"
+#~ msgstr "Naməlum vəziyyət"
+
+#~ msgid "Online services disabled. Contact Mandriva Online site\n"
+#~ msgstr "Online xidmətlər qeyri-fəaldır. Mandriva Online ilə əlaqə qurun\n"
+
+#~ msgid "Wrong Password.\n"
+#~ msgstr "Səhv Şifrə.\n"
+
+#~ msgid "Wrong Action or host or login.\n"
+#~ msgstr "Səhv gedişat, qovşaq ya da giriş.\n"
+
+#~ msgid ""
+#~ "Something is wrong with your network settings (check your route, firewall "
+#~ "or proxy settings)\n"
+#~ msgstr ""
+#~ "Şəbəkə qurğularınızda səhv bir çey var. (router, atəş divarı ya da vəkil  "
+#~ "qurğularınızı yoxlayın)\n"
+
+#, fuzzy
+#~ msgid "Response from Mandriva Online server\n"
+#~ msgstr "Mandriva Online-a Xoş Gəldiniz"
+
+#~ msgid "No check"
+#~ msgstr "Yoxlama"
+
+#~ msgid "Checking config file: Not present\n"
+#~ msgstr "Quraşdırma faylı Yoxlanır: Mövcud deyil\n"
+
+#~ msgid "Logs"
+#~ msgstr "Qeydlər"
+
+#~ msgid "Clear"
+#~ msgstr "Təmizlə"
+
+#~ msgid ""
+#~ "mdonline version %s\n"
+#~ "Copyright (C) %s Mandriva.\n"
+#~ "This is free software and may be redistributed under the terms of the GNU "
+#~ "GPL.\n"
+#~ "\n"
+#~ "usage:\n"
+#~ msgstr ""
+#~ "mdonline buraxılış %s\n"
+#~ "Tə'lif Hüququ (C) %s Mandriva.\n"
+#~ "Bu sərbəst proqram tə'minatıdır və GNU GPL şərtləri altında paylana "
+#~ "bilər.\n"
+#~ "\n"
+#~ "istifadə qaydası:\n"
+
+#~ msgid "Mandriva Online"
+#~ msgstr "Mandriva Online"
+
+#, fuzzy
+#~ msgid "Mrs."
+#~ msgstr "XMrIs"
+
+#~ msgid "Reading configuration\n"
+#~ msgstr "Qurğularınız oxunur\n"
+
+#~ msgid ""
+#~ "This assistant will help you to upload your configuration\n"
+#~ "(packages, hardware configuration) to a centralized database in\n"
+#~ "order to keep you informed about security updates and useful upgrades.\n"
+#~ msgstr ""
+#~ "Bu yardımçı sizin qurğularınızı\n"
+#~ "(paketlər, avadanlıq qurğuları) təhlükəsizlik və\n"
+#~ "sərfəli güncəlləmələri xəbər vermək üçün\n"
+#~ "mərkəzi verilənlər bazasına göndərəcəkdir.\n"
+
+#~ msgid "Enter your Mandriva Online login, password and machine name:"
+#~ msgstr "Mandriva Online giriş adı, parolunuzu və kompüter adını girin:"
+
+#, fuzzy
+#~ msgid "Email address:"
+#~ msgstr "IP ünvanı"
+
+#~ msgid "Country"
+#~ msgstr "Ölkə"
+
+#~ msgid "Password:"
+#~ msgstr "Parol:"
+
+#, fuzzy
+#~ msgid "Machine description:"
+#~ msgstr "Kompüter adı:"
+
+#, fuzzy
+#~ msgid "Machine name must be 1 to 40 alphanumerical characters"
+#~ msgstr "Bağlama nöqtələri ancaq alfanumerik hərf daxil edə bilər"
+
+#, fuzzy
+#~ msgid "Connecting to Mandriva Online website..."
+#~ msgstr "Mandriva Online-a Xoş Gəldiniz"
+
+#~ msgid ""
+#~ "In order to benefit from Mandriva Online services,\n"
+#~ "we are about to upload your configuration.\n"
+#~ "\n"
+#~ "The Wizard will now send the following information to Mandriva:\n"
+#~ "\n"
+#~ "1) the list of packages you have installed on your system,\n"
+#~ "\n"
+#~ "2) your hardware configuration.\n"
+#~ "\n"
+#~ "If you feel uncomfortable by that idea, or do not want to benefit from "
+#~ "this service,\n"
+#~ "please press 'Cancel'. By pressing 'Next', you allow us to keep you "
+#~ "informed\n"
+#~ "about security updates and useful upgrades via personalized email "
+#~ "alerts.\n"
+#~ "Furthermore, you benefit from discounted paid support services on\n"
+#~ "www.mandrivaexpert.com."
+#~ msgstr ""
+#~ "Mandriva Online xitmətlərindən faydalanmağınıza ikan vermək üçün,\n"
+#~ "sizin qurğularınızı mərkəzə göndərməliyik.\n"
+#~ "\n"
+#~ "Sehirbaz indi aşağıdakı məlumatları Mandriva vericimizə göndərəcəkdir:\n"
+#~ "\n"
+#~ "1) sistemə qurulu paketlər,\n"
+#~ "\n"
+#~ "2) avadanlıq qurğularınız.\n"
+#~ "\n"
+#~ "İstəmirsinizsə, Ləğv Et'ə basın.\n"
+#~ "'Sonrakı'nı basmaqla sizin satıcınız olaraq sizin haqqınızda daha\n"
+#~ "çox şey öyrənmə səlahiyyətini bizə tanımış olursunuz\n"
+#~ "və sərfəli güncəlləmələr haqqında xəbərlar almış olacaqsınız.\n"
+#~ "Həm də bu qeydlə siz www.mandrivaexpert.com ünvanındakı xitmətlərdən\n"
+#~ "endirimli, yəni daha ucuz faydalana bilərsiniz."
+
+#~ msgid "Connection problem"
+#~ msgstr "Bağlantı problemi"
+
+#~ msgid "Problem occurs when uploading files, please try again"
+#~ msgstr ""
+#~ "Fayllar göndərilirkən xəta yaranır, xahiş edirik daha sonra yenidən "
+#~ "sınayın"
+
+#~ msgid "Create a Mandriva Online Account"
+#~ msgstr "Mandriva Online Hesabı Yaradılır"
+
+#, fuzzy
+#~ msgid "Greeting:"
+#~ msgstr "Yaşıl"
+
+#~ msgid "First name:"
+#~ msgstr "Adı:"
+
+#, fuzzy
+#~ msgid "Last name:"
+#~ msgstr "Adı:"
+
+#~ msgid "Confirm Password:"
+#~ msgstr "Şifrənin Təstiqi:"
+
+#~ msgid ""
+#~ "The passwords do not match\n"
+#~ " Please try again\n"
+#~ msgstr ""
+#~ "Şifrələr uyğun gəlmir\n"
+#~ " Xahiş edirik yenidən sınayın\n"
+
+#, fuzzy
+#~ msgid "Please fill in each field"
+#~ msgstr "Xahiş edirik, aşağıdakıları doldurun ya da seçin"
+
+#~ msgid "Not a valid mail address!\n"
+#~ msgstr "Hökmsüz epoçt ünvanı!\n"
+
+#~ msgid "Your upload was successful!"
+#~ msgstr "Sizin yollamanız müvəffəqiyyətli oldu"
+
+#~ msgid ""
+#~ "From now you will receive on security and updates \n"
+#~ "announcements thanks to Mandriva Online."
+#~ msgstr ""
+#~ "İndidən etibarən Mandriva Online vasitəsilə güncəlləmə və\n"
+#~ "təhlükəsizlik elanları alacaqsınız."
+
+#~ msgid ""
+#~ "Mandriva Online offers you the ability to automate the updates.\n"
+#~ "A program will run regulary in your system waiting for new updates\n"
+#~ msgstr ""
+#~ "Mandriva Online sizə avtokatik güncəlləmə imkanı verir.\n"
+#~ "Proqram sürəkli olaraq sisteminizdə yeni göncəlləmələri gözləyəcək "
+#~ "şəkildə işləyəcəkdir\n"
+
+#~ msgid "Congratulations"
+#~ msgstr "Təbriklər"
+
+#, fuzzy
+#~ msgid "Configuration uploaded successfully"
+#~ msgstr "Sizin yollamanız müvəffəqiyyətli oldu"
+
+#, fuzzy
+#~ msgid "Problem uploading configuration"
+#~ msgstr "Qurğularınız oxunur\n"
+
 #~ msgid "  --applet\t\t- launch Mandriva Update.\n"
 #~ msgstr "  --applet\t\t- launch Mandriva Update.\n"
 
diff --git a/po/be.po b/po/be.po
index 7327b5e8..36398623 100644
--- a/po/be.po
+++ b/po/be.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2007-08-09 16:26+0200\n"
+"POT-Creation-Date: 2008-02-21 18:21+0100\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"
@@ -14,67 +14,60 @@ 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:94
+#: ../mdkapplet:88
 #, c-format
 msgid "Will check updates at %s"
 msgstr ""
 
-#: ../mdkapplet:103
+#: ../mdkapplet:97
 #, c-format
 msgid "Your system is up-to-date"
 msgstr ""
 
-#: ../mdkapplet:109
+#: ../mdkapplet:103
 #, c-format
-msgid "Service configuration problem. Please check logs and send mail to support@mandrivaonline.com"
+msgid ""
+"Service configuration problem. Please check logs and send mail to "
+"support@mandrivaonline.com"
 msgstr ""
 
-#: ../mdkapplet:115
+#: ../mdkapplet:110
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr ""
 
-#: ../mdkapplet:121
+#: ../mdkapplet:116
 #, c-format
 msgid "New updates are available for your system"
 msgstr ""
 
-#: ../mdkapplet:127
-#, c-format
-msgid "New bundles are available for your system"
-msgstr ""
-
-#: ../mdkapplet:133
-#, c-format
-msgid "Service is not configured. Please click on \"Configure the service\""
-msgstr ""
-
-#: ../mdkapplet:139
+#: ../mdkapplet:122
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr ""
 
-#: ../mdkapplet:145
+#: ../mdkapplet:128
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr ""
 
-#: ../mdkapplet:151 ../mdkapplet:182
+#: ../mdkapplet:134 ../mdkapplet:165
 #, c-format
 msgid "urpmi database locked"
 msgstr ""
 
-#: ../mdkapplet:157
+#: ../mdkapplet:140
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
-#: ../mdkapplet:163
+#: ../mdkapplet:146
 #, c-format
-msgid "No medium found. You must add some media through 'Software Media Manager'."
+msgid ""
+"No medium found. You must add some media through 'Software Media Manager'."
 msgstr ""
 
-#: ../mdkapplet:169
+#: ../mdkapplet:152
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -85,581 +78,132 @@ msgid ""
 "Then, restart \"%s\"."
 msgstr ""
 
-#: ../mdkapplet:174
+#: ../mdkapplet:157
 #, c-format
 msgid "Enabled"
 msgstr ""
 
-#: ../mdkapplet:187
+#: ../mdkapplet:170
 #, c-format
 msgid "Error updating media"
 msgstr ""
 
-#: ../mdkapplet:202
+#: ../mdkapplet:185
 #, c-format
-msgid ""
-"Checking... Updates are available\n"
-""
+msgid "Checking... Updates are available\n"
 msgstr ""
 
-#: ../mdkapplet:207
+#: ../mdkapplet:190
 #, c-format
 msgid "Packages are up to date"
 msgstr ""
 
-#: ../mdkapplet:212
+#: ../mdkapplet:195
 #, c-format
 msgid "Failed to open urpmi database"
 msgstr ""
 
-#: ../mdkapplet:217 ../mdkapplet:324
+#: ../mdkapplet:200
 #, c-format
 msgid "Install updates"
 msgstr ""
 
-#: ../mdkapplet:218
-#, c-format
-msgid "Configure the service"
-msgstr ""
-
-#: ../mdkapplet:219
+#: ../mdkapplet:201
 #, c-format
 msgid "Check Updates"
 msgstr ""
 
-#: ../mdkapplet:220 ../mdkapplet:327 ../mdkonline:114 ../mdkonline:155 ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
-#, c-format
-msgid "Please wait"
-msgstr "Калі ласка, пачакайце"
-
-#: ../mdkapplet:220 ../mdkapplet:326 ../mdkapplet:327
-#, c-format
-msgid "Check updates"
-msgstr ""
-
-#: ../mdkapplet:223 ../mdkapplet:648
-#, c-format
-msgid "Online WebSite"
-msgstr ""
-
-#: ../mdkapplet:224
+#: ../mdkapplet:202
 #, c-format
 msgid "Configure Network"
 msgstr ""
 
-#: ../mdkapplet:225
-#, c-format
-msgid "Configure Now!"
-msgstr ""
-
-#: ../mdkapplet:313 ../mdkapplet:392
-#, c-format
-msgid "Mandriva Linux Updates Applet"
-msgstr ""
-
-#: ../mdkapplet:322
-#, c-format
-msgid "Actions"
-msgstr ""
-
-#: ../mdkapplet:325
-#, c-format
-msgid "Configure"
-msgstr ""
-
-#: ../mdkapplet:329
-#, c-format
-msgid "See logs"
-msgstr ""
-
-#: ../mdkapplet:332
-#, c-format
-msgid "Status"
-msgstr ""
-
-#: ../mdkapplet:336 ../mdkapplet:597
-#, c-format
-msgid "Close"
-msgstr "Зачыніць"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Network Connection: "
-msgstr ""
-
-#: ../mdkapplet:365
+#: ../mdkapplet:283
 #, c-format
-msgid "Up"
+msgid "Launching drakconnect\n"
 msgstr ""
 
-#: ../mdkapplet:365
+#: ../mdkapplet:286
 #, c-format
-msgid "Down"
+msgid "Mandriva Online seems to be reinstalled, reloading applet ...."
 msgstr ""
 
-#: ../mdkapplet:366
+#: ../mdkapplet:294
 #, c-format
-msgid "Last check: "
+msgid "Launching MandrivaUpdate\n"
 msgstr ""
 
-#: ../mdkapplet:367 ../mdkonline:145
+#: ../mdkapplet:303
 #, c-format
-msgid "Machine name:"
+msgid "Mandriva Linux Updates Applet"
 msgstr ""
 
-#: ../mdkapplet:368
+#: ../mdkapplet:308
 #, c-format
-msgid "Updates: "
+msgid "Computing new updates...\n"
 msgstr ""
 
-#: ../mdkapplet:372
+#: ../mdkapplet:309
 #, c-format
-msgid ""
-"Launching drakconnect\n"
-""
+msgid "Connecting to"
 msgstr ""
 
-#: ../mdkapplet:375
+#: ../mdkapplet:386
 #, c-format
-msgid "Mandriva Online seems to be reinstalled, reloading applet ...."
+msgid "System is up-to-date\n"
 msgstr ""
 
-#: ../mdkapplet:383
+#: ../mdkapplet:415
 #, c-format
-msgid ""
-"Launching MandrivaUpdate\n"
-""
+msgid "Checking Network: seems disabled\n"
 msgstr ""
 
-#: ../mdkapplet:398
+#: ../mdkapplet:457 ../mdkupdate:118 ../mdkupdate:164
 #, c-format
-msgid ""
-"Computing new updates...\n"
-""
-msgstr ""
+msgid "Warning"
+msgstr "Увага!"
 
-#: ../mdkapplet:399
+#: ../mdkapplet:468
 #, c-format
-msgid "Connecting to"
+msgid "About..."
 msgstr ""
 
-#: ../mdkapplet:467 ../mdkupdate:159 ../mdkupdate:188
+#: ../mdkapplet:472
 #, c-format
-msgid "An error occurred"
+msgid "Mandriva Online %s"
 msgstr ""
 
-#: ../mdkapplet:475
+#: ../mdkapplet:473
 #, c-format
-msgid "Development release not supported by service"
+msgid "Copyright (C) %s by Mandriva"
 msgstr ""
 
 #: ../mdkapplet:476
 #, c-format
-msgid "Too old release not supported by service"
-msgstr ""
-
-#: ../mdkapplet:477
-#, c-format
-msgid "Unknown state"
+msgid "Mandriva Online gives access to Mandriva web services."
 msgstr ""
 
 #: ../mdkapplet:478
 #, c-format
-msgid ""
-"Online services disabled. Contact Mandriva Online site\n"
-""
-msgstr ""
-
-#: ../mdkapplet:479
-#, c-format
-msgid ""
-"Wrong Password.\n"
-""
-msgstr ""
-
-#: ../mdkapplet:480
-#, c-format
-msgid ""
-"Wrong Action or host or login.\n"
-""
-msgstr ""
-
-#: ../mdkapplet:481
-#, c-format
-msgid ""
-"Something is wrong with your network settings (check your route, firewall or proxy settings)\n"
-""
+msgid "Online WebSite"
 msgstr ""
 
+#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
 #: ../mdkapplet:483
 #, c-format
-msgid "Problem occured while connecting to the server, please contact the support team"
-msgstr ""
-
-#: ../mdkapplet:487
-#, c-format
-msgid ""
-"Response from Mandriva Online server\n"
-""
-msgstr ""
-
-#: ../mdkapplet:490
-#, c-format
-msgid ""
-"System is up-to-date\n"
-""
-msgstr ""
-
-#: ../mdkapplet:527
-#, c-format
-msgid "No check"
-msgstr ""
-
-#: ../mdkapplet:541
-#, c-format
-msgid ""
-"Checking config file: Not present\n"
-""
-msgstr ""
-
-#: ../mdkapplet:544
-#, c-format
-msgid ""
-"Checking Network: seems disabled\n"
-""
-msgstr ""
-
-#: ../mdkapplet:587
-#, c-format
-msgid "Logs"
-msgstr ""
-
-#: ../mdkapplet:603
-#, c-format
-msgid "Clear"
-msgstr ""
-
-#: ../mdkapplet:629
-#, c-format
-msgid "About..."
-msgstr ""
-
-#: ../mdkapplet:631
-#, c-format
-msgid "Mandriva Online %s"
-msgstr ""
-
-#: ../mdkapplet:635
-#, c-format
-msgid "Copyright (C) %s by Mandriva"
-msgstr ""
-
-#: ../mdkapplet:647
-#, c-format
-msgid "Mandriva Online gives access to Mandriva web services."
+msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
 
-#: ../mdkapplet:655
+#: ../mdkapplet:492
 #, c-format
 msgid "Always launch on startup"
 msgstr ""
 
-#: ../mdkapplet:657
+#: ../mdkapplet:494
 #, c-format
 msgid "Quit"
 msgstr "Выхад"
 
-#: ../mdkonline:58
-#, c-format
-msgid ""
-"mdonline version %s\n"
-"Copyright (C) %s Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU GPL.\n"
-"\n"
-"usage:\n"
-""
-msgstr ""
-
-#: ../mdkonline:63 ../mdkupdate:73
-#, c-format
-msgid ""
-"  --help\t\t- print this help message.\n"
-""
-msgstr ""
-
-#: ../mdkonline:64
-#, c-format
-msgid ""
-"  --box=\t\t\t- hostname.\n"
-""
-msgstr ""
-
-#: ../mdkonline:65
-#, c-format
-msgid ""
-"  --country\t\t\t- name of country of the user. \n"
-""
-msgstr ""
-
-#: ../mdkonline:66
-#, c-format
-msgid ""
-"  --interactive\t\t- use the interactive mode.\n"
-""
-msgstr ""
-
-#: ../mdkonline:67
-#, c-format
-msgid ""
-"  --nointeractive\t- use the non-interactive mode.\n"
-""
-msgstr ""
-
-#: ../mdkonline:68
-#, c-format
-msgid ""
-"  --login=\t\t     - login name of the user.\n"
-""
-msgstr ""
-
-#: ../mdkonline:69
-#, c-format
-msgid ""
-"  --pass=\t\t\t- password  of the user.\n"
-""
-msgstr ""
-
-#: ../mdkonline:87 ../mdkonline:120
-#, c-format
-msgid "Mandriva Online"
-msgstr ""
-
-#: ../mdkonline:90
-#, c-format
-msgid "I already have an account"
-msgstr ""
-
-#: ../mdkonline:91
-#, c-format
-msgid "I want to subscribe"
-msgstr ""
-
-#: ../mdkonline:96
-#, c-format
-msgid "Mr."
-msgstr ""
-
-#: ../mdkonline:96
-#, c-format
-msgid "Mrs."
-msgstr ""
-
-#: ../mdkonline:96
-#, c-format
-msgid "Ms."
-msgstr ""
-
-#: ../mdkonline:114
-#, c-format
-msgid ""
-"Reading configuration\n"
-""
-msgstr ""
-
-#: ../mdkonline:123
-#, c-format
-msgid ""
-"This assistant will help you to upload your configuration\n"
-"(packages, hardware configuration) to a centralized database in\n"
-"order to keep you informed about security updates and useful upgrades.\n"
-""
-msgstr ""
-
-#: ../mdkonline:131
-#, c-format
-msgid "Account creation or authentication"
-msgstr ""
-
-#: ../mdkonline:136
-#, c-format
-msgid "Enter your Mandriva Online login, password and machine name:"
-msgstr ""
-
-#: ../mdkonline:142 ../mdkonline:195
-#, c-format
-msgid "Email address:"
-msgstr ""
-
-#: ../mdkonline:143
-#, c-format
-msgid "Country"
-msgstr ""
-
-#: ../mdkonline:144 ../mdkonline:196
-#, c-format
-msgid "Password:"
-msgstr ""
-
-#: ../mdkonline:146
-#, c-format
-msgid "Machine description:"
-msgstr ""
-
-#: ../mdkonline:147
-#, c-format
-msgid "(Ex: My Home Office's Computer)"
-msgstr ""
-
-#: ../mdkonline:152 ../mdkonline:159 ../mdkonline:180 ../mdkonline:204 ../mdkonline:208 ../mdkonline:212 ../mdkonline:217 ../mdkupdate:141 ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
-#, c-format
-msgid "Error"
-msgstr "Памылка"
-
-#: ../mdkonline:152
-#, c-format
-msgid "Machine name must be 1 to 40 alphanumerical characters"
-msgstr ""
-
-#: ../mdkonline:155
-#, c-format
-msgid "Connecting to Mandriva Online website..."
-msgstr ""
-
-#: ../mdkonline:167
-#, c-format
-msgid ""
-"In order to benefit from Mandriva Online services,\n"
-"we are about to upload your configuration.\n"
-"\n"
-"The Wizard will now send the following information to Mandriva:\n"
-"\n"
-"1) the list of packages you have installed on your system,\n"
-"\n"
-"2) your hardware configuration.\n"
-"\n"
-"If you feel uncomfortable by that idea, or do not want to benefit from this service,\n"
-"please press 'Cancel'. By pressing 'Next', you allow us to keep you informed\n"
-"about security updates and useful upgrades via personalized email alerts.\n"
-"Furthermore, you benefit from discounted paid support services on\n"
-"www.mandrivaexpert.com."
-msgstr ""
-
-#: ../mdkonline:180
-#, c-format
-msgid "Connection problem"
-msgstr ""
-
-#: ../mdkonline:180
-#, c-format
-msgid "Problem occurs when uploading files, please try again"
-msgstr ""
-
-#: ../mdkonline:187
-#, c-format
-msgid "Create a Mandriva Online Account"
-msgstr ""
-
-#. -PO: that is for things like "Mr", "Ms",...
-#: ../mdkonline:192
-#, c-format
-msgid "Greeting:"
-msgstr ""
-
-#: ../mdkonline:193
-#, c-format
-msgid "First name:"
-msgstr ""
-
-#: ../mdkonline:194
-#, c-format
-msgid "Last name:"
-msgstr ""
-
-#: ../mdkonline:197
-#, c-format
-msgid "Confirm Password:"
-msgstr ""
-
-#: ../mdkonline:204
-#, c-format
-msgid ""
-"The passwords do not match\n"
-" Please try again\n"
-""
-msgstr ""
-
-#: ../mdkonline:208
-#, c-format
-msgid "Please fill in each field"
-msgstr ""
-
-#: ../mdkonline:212
-#, c-format
-msgid ""
-"Not a valid mail address!\n"
-""
-msgstr ""
-
-#: ../mdkonline:217
-#, c-format
-msgid "Creating account failed!"
-msgstr ""
-
-#: ../mdkonline:225
-#, c-format
-msgid ""
-"Mandriva Online Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
-""
-msgstr ""
-
-#: ../mdkonline:229
-#, c-format
-msgid "Your upload was successful!"
-msgstr ""
-
-#: ../mdkonline:229
-#, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandriva Online."
-msgstr ""
-
-#: ../mdkonline:229
-#, c-format
-msgid ""
-"Mandriva Online offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
-""
-msgstr ""
-
-#: ../mdkonline:238
-#, c-format
-msgid "Congratulations"
-msgstr ""
-
-#: ../mdkonline:238
-#, c-format
-msgid ""
-"Your Mandriva Online account has been successfully configured\n"
-""
-msgstr ""
-
-#: ../mdkonline:253
-#, c-format
-msgid "Configuration uploaded successfully"
-msgstr ""
-
-#: ../mdkonline:254
-#, c-format
-msgid "Problem uploading configuration"
-msgstr ""
-
-#: ../mdkonline:256
-#, c-format
-msgid "Cannot connect to Mandriva Online website: wrong login/password or router/firewall bad settings"
-msgstr ""
-
 #: ../mdkonline.pm:207
 #, c-format
 msgid "Security error"
@@ -712,7 +256,6 @@ msgstr ""
 msgid ""
 "The email you provided is already in use\n"
 "Please enter another one\n"
-""
 msgstr ""
 
 #: ../mdkonline.pm:212
@@ -786,63 +329,67 @@ msgstr ""
 msgid ""
 "mdkupdate version %s\n"
 "Copyright (C) %s Mandriva.\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:73
+#, c-format
+msgid "  --help\t\t- print this help message.\n"
 msgstr ""
 
 #: ../mdkupdate:74
 #, c-format
-msgid ""
-"  --auto\t\t- Mandriva Update launched automatically.\n"
-""
+msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
 msgstr ""
 
 #: ../mdkupdate:75
 #, c-format
-msgid ""
-"  --mnf\t\t\t- launch mnf specific scripts.\n"
-""
+msgid "  --mnf\t\t\t- launch mnf specific scripts.\n"
 msgstr ""
 
 #: ../mdkupdate:76
 #, c-format
-msgid ""
-"  --noX\t\t\t- text mode version of Mandriva Update.\n"
-""
+msgid "  --noX\t\t\t- text mode version of Mandriva Update.\n"
 msgstr ""
 
 #: ../mdkupdate:77
 #, c-format
-msgid ""
-"  --debug\t\t\t- log what is done\n"
-""
+msgid "  --debug\t\t\t- log what is done\n"
 msgstr ""
 
 #: ../mdkupdate:78
 #, c-format
 msgid ""
-"  --bundle file.bundle\t- parse and install package from .bundle metainfo file.\n"
-""
+"  --bundle file.bundle\t- parse and install package from .bundle metainfo "
+"file.\n"
 msgstr ""
 
-#: ../mdkupdate:118 ../mdkupdate:164
-#, c-format
-msgid "Warning"
-msgstr "Увага!"
-
 #. -PO: here Live Install is currently *NOT* translated on the desktop, so it's better to keep as it:
 #: ../mdkupdate:120
 #, c-format
-msgid "You first need to install the system on your harddrive with the 'Live Install' wizard."
+msgid ""
+"You first need to install the system on your harddrive with the 'Live "
+"Install' wizard."
 msgstr ""
 
+#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
+#, c-format
+msgid "Please wait"
+msgstr "Калі ласка, пачакайце"
+
 #: ../mdkupdate:123 ../mdkupdate:174
 #, c-format
 msgid "Preparing..."
 msgstr ""
 
+#: ../mdkupdate:141 ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
+#, c-format
+msgid "Error"
+msgstr "Памылка"
+
 #: ../mdkupdate:141
 #, c-format
 msgid ""
@@ -851,12 +398,18 @@ msgid ""
 "%s"
 msgstr ""
 
+#: ../mdkupdate:159 ../mdkupdate:188
+#, c-format
+msgid "An error occurred"
+msgstr ""
+
 #: ../mdkupdate:164
 #, c-format
 msgid ""
 "The version of the Mandriva Online client is too old.\n"
 "\n"
-"You need to update to a newer version. You can get a new one from http://start.mandriva.com"
+"You need to update to a newer version. You can get a new one from http://"
+"start.mandriva.com"
 msgstr ""
 
 #: ../mdkupdate:207
@@ -866,15 +419,13 @@ msgstr ""
 
 #: ../mdkupdate:219
 #, c-format
-msgid ""
-"Installing packages ...\n"
-""
+msgid "Installing packages ...\n"
 msgstr ""
 
 #: ../mdkupdate:231 ../mdkupdate:271
 #, c-format
-msgid ""
-"Unable to update packages from update_source medium.\n"
-""
+msgid "Unable to update packages from update_source medium.\n"
 msgstr ""
 
+#~ msgid "Close"
+#~ msgstr "Зачыніць"
diff --git a/po/bg.po b/po/bg.po
index 489f88a0..fbc0e355 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline-bg\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-09 16:26+0200\n"
+"POT-Creation-Date: 2008-02-21 18:21+0100\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"
@@ -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:94
+#: ../mdkapplet:88
 #, fuzzy, c-format
 msgid "Will check updates at %s"
 msgstr "Проверка за актуализации"
 
-#: ../mdkapplet:103
+#: ../mdkapplet:97
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "Вашата система е обновена"
 
-#: ../mdkapplet:109
+#: ../mdkapplet:103
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -38,55 +38,45 @@ msgstr ""
 "Проблем в конфигурация на услуга. Моля проверете журналните файлове и "
 "изпратете е-поща на support@mandrivaonline.com"
 
-#: ../mdkapplet:115
+#: ../mdkapplet:110
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr ""
 "Моля изчакайте\n"
 "Пакетите се сортират"
 
-#: ../mdkapplet:121
+#: ../mdkapplet:116
 #, c-format
 msgid "New updates are available for your system"
 msgstr "Налични са актуализации за вашата система"
 
-#: ../mdkapplet:127
-#, fuzzy, c-format
-msgid "New bundles are available for your system"
-msgstr "Налични са актуализации за вашата система"
-
-#: ../mdkapplet:133
-#, c-format
-msgid "Service is not configured. Please click on \"Configure the service\""
-msgstr "Услугата не е конфигурирана. Натиснете \"Конфигуриране\""
-
-#: ../mdkapplet:139
+#: ../mdkapplet:122
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "Мрежата е неактивна. Конфигурирайте мрежата си"
 
-#: ../mdkapplet:145
+#: ../mdkapplet:128
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "Услугата е неактивна. Натиснете \"Online Website\""
 
-#: ../mdkapplet:151 ../mdkapplet:182
+#: ../mdkapplet:134 ../mdkapplet:165
 #, fuzzy, c-format
 msgid "urpmi database locked"
 msgstr "базата данни на urpmi е заключена"
 
-#: ../mdkapplet:157
+#: ../mdkapplet:140
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr "Версията не се подържа (много стара, или в процес на разработка)"
 
-#: ../mdkapplet:163
+#: ../mdkapplet:146
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
 msgstr ""
 
-#: ../mdkapplet:169
+#: ../mdkapplet:152
 #, fuzzy, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -103,583 +93,131 @@ msgstr ""
 "\n"
 "След това рестартирайте %s."
 
-#: ../mdkapplet:174
+#: ../mdkapplet:157
 #, c-format
 msgid "Enabled"
 msgstr "Да разреша"
 
-#: ../mdkapplet:187
+#: ../mdkapplet:170
 #, c-format
 msgid "Error updating media"
 msgstr ""
 
-#: ../mdkapplet:202
+#: ../mdkapplet:185
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr "Проверка... Налични са актуализации\n"
 
-#: ../mdkapplet:207
+#: ../mdkapplet:190
 #, c-format
 msgid "Packages are up to date"
 msgstr ""
 
-#: ../mdkapplet:212
+#: ../mdkapplet:195
 #, fuzzy, c-format
 msgid "Failed to open urpmi database"
 msgstr "не мога да отворя rpmdb"
 
-#: ../mdkapplet:217 ../mdkapplet:324
+#: ../mdkapplet:200
 #, c-format
 msgid "Install updates"
 msgstr "Инсталиране на актуализации"
 
-#: ../mdkapplet:218
-#, c-format
-msgid "Configure the service"
-msgstr "Конфигураране"
-
-#: ../mdkapplet:219
+#: ../mdkapplet:201
 #, c-format
 msgid "Check Updates"
 msgstr "Проверка за актуализации"
 
-#: ../mdkapplet:220 ../mdkapplet:327 ../mdkonline:114 ../mdkonline:155
-#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
-#, c-format
-msgid "Please wait"
-msgstr "Моля изчакайте"
-
-#: ../mdkapplet:220 ../mdkapplet:326 ../mdkapplet:327
-#, c-format
-msgid "Check updates"
-msgstr "Проверка за актуализации"
-
-#: ../mdkapplet:223 ../mdkapplet:648
-#, c-format
-msgid "Online WebSite"
-msgstr "Online WebSite"
-
-#: ../mdkapplet:224
+#: ../mdkapplet:202
 #, c-format
 msgid "Configure Network"
 msgstr "Конфигуриране на мрежа"
 
-#: ../mdkapplet:225
-#, c-format
-msgid "Configure Now!"
-msgstr "Конфигуриране сега!"
-
-#: ../mdkapplet:313 ../mdkapplet:392
-#, c-format
-msgid "Mandriva Linux Updates Applet"
-msgstr "Аплет за актуализации на Mandriva Linux"
-
-#: ../mdkapplet:322
-#, c-format
-msgid "Actions"
-msgstr "Действия"
-
-#: ../mdkapplet:325
-#, c-format
-msgid "Configure"
-msgstr "Конфигураране"
-
-#: ../mdkapplet:329
-#, c-format
-msgid "See logs"
-msgstr "История"
-
-#: ../mdkapplet:332
-#, c-format
-msgid "Status"
-msgstr "Състояние"
-
-#: ../mdkapplet:336 ../mdkapplet:597
-#, c-format
-msgid "Close"
-msgstr "Затваряне"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Network Connection: "
-msgstr "Мрежова връзка: "
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Up"
-msgstr "Нагоре"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Down"
-msgstr "Надолу"
-
-#: ../mdkapplet:366
-#, c-format
-msgid "Last check: "
-msgstr "Последна проверка: "
-
-#: ../mdkapplet:367 ../mdkonline:145
-#, c-format
-msgid "Machine name:"
-msgstr "Име на машината:"
-
-#: ../mdkapplet:368
-#, c-format
-msgid "Updates: "
-msgstr "Актуализации: "
-
-#: ../mdkapplet:372
+#: ../mdkapplet:283
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Стартиране на drakconnect\n"
 
-#: ../mdkapplet:375
+#: ../mdkapplet:286
 #, c-format
 msgid "Mandriva Online seems to be reinstalled, reloading applet ...."
 msgstr "Mandriva Online може би е преинсталиран, презареждане на аплета...."
 
-#: ../mdkapplet:383
+#: ../mdkapplet:294
 #, c-format
 msgid "Launching MandrivaUpdate\n"
 msgstr "Стартиране на MandrivaUpdate\n"
 
-#: ../mdkapplet:398
+#: ../mdkapplet:303
+#, c-format
+msgid "Mandriva Linux Updates Applet"
+msgstr "Аплет за актуализации на Mandriva Linux"
+
+#: ../mdkapplet:308
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Събиране на нови актуализации...\n"
 
-#: ../mdkapplet:399
+#: ../mdkapplet:309
 #, c-format
 msgid "Connecting to"
 msgstr "Свързване с"
 
-#: ../mdkapplet:467 ../mdkupdate:159 ../mdkupdate:188
-#, c-format
-msgid "An error occurred"
-msgstr "Появи се грешка"
-
-#: ../mdkapplet:475
-#, c-format
-msgid "Development release not supported by service"
-msgstr "Версията за разработчици не се поддържа от услугата"
-
-#: ../mdkapplet:476
-#, c-format
-msgid "Too old release not supported by service"
-msgstr "Стара версия, не се поддържа от услугата"
-
-#: ../mdkapplet:477
-#, c-format
-msgid "Unknown state"
-msgstr "Неизвестно състояние"
-
-#: ../mdkapplet:478
-#, c-format
-msgid "Online services disabled. Contact Mandriva Online site\n"
-msgstr "Online услугите са забранени. Свържете се с Mandriva Online\n"
-
-#: ../mdkapplet:479
-#, c-format
-msgid "Wrong Password.\n"
-msgstr "Грешна парола\n"
-
-#: ../mdkapplet:480
-#, c-format
-msgid "Wrong Action or host or login.\n"
-msgstr "Грешно действие или хост или влизане.\n"
-
-#: ../mdkapplet:481
-#, c-format
-msgid ""
-"Something is wrong with your network settings (check your route, firewall or "
-"proxy settings)\n"
-msgstr ""
-"Грешни мрежови настройки (проверете маршрутизатора, огнената стена или "
-"прокси настройките)\n"
-
-#: ../mdkapplet:483
-#, c-format
-msgid ""
-"Problem occured while connecting to the server, please contact the support "
-"team"
-msgstr ""
-"Възникнал е проблем при връзка със сървъра, моля свържете се с екипа по "
-"поддръжка"
-
-#: ../mdkapplet:487
-#, c-format
-msgid "Response from Mandriva Online server\n"
-msgstr "Отговор от Mandriva Online сървър\n"
-
-#: ../mdkapplet:490
+#: ../mdkapplet:386
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Системата е обновена\n"
 
-#: ../mdkapplet:527
-#, c-format
-msgid "No check"
-msgstr "Няма проверка"
-
-#: ../mdkapplet:541
-#, c-format
-msgid "Checking config file: Not present\n"
-msgstr "Проверка на конфигурационния файл: не съществува\n"
-
-#: ../mdkapplet:544
+#: ../mdkapplet:415
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Проверка на мрежата: изглежда забранена\n"
 
-#: ../mdkapplet:587
-#, c-format
-msgid "Logs"
-msgstr "Журнали"
-
-#: ../mdkapplet:603
+#: ../mdkapplet:457 ../mdkupdate:118 ../mdkupdate:164
 #, c-format
-msgid "Clear"
-msgstr "Изчистване"
+msgid "Warning"
+msgstr "Предупреждение"
 
-#: ../mdkapplet:629
+#: ../mdkapplet:468
 #, c-format
 msgid "About..."
 msgstr "Относно..."
 
-#: ../mdkapplet:631
+#: ../mdkapplet:472
 #, fuzzy, c-format
 msgid "Mandriva Online %s"
 msgstr "Mandriva Online"
 
-#: ../mdkapplet:635
+#: ../mdkapplet:473
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr ""
 
-#: ../mdkapplet:647
+#: ../mdkapplet:476
 #, c-format
 msgid "Mandriva Online gives access to Mandriva web services."
 msgstr ""
 
-#: ../mdkapplet:655
-#, c-format
-msgid "Always launch on startup"
-msgstr "Зареждане при стартиране"
-
-#: ../mdkapplet:657
-#, c-format
-msgid "Quit"
-msgstr "Изход"
-
-#: ../mdkonline:58
-#, c-format
-msgid ""
-"mdonline version %s\n"
-"Copyright (C) %s Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"mdonline версия %s\n"
-"Mandriva %s, всички права запазени.\n"
-"Това е свободен софтуер и може да бъде разпространяван според условията на "
-"GNU GPL.\n"
-"\n"
-"начин на ползване:\n"
-
-#: ../mdkonline:63 ../mdkupdate:73
-#, c-format
-msgid "  --help\t\t- print this help message.\n"
-msgstr " --help\t\t- показва това помощно съобщение.\n"
-
-#: ../mdkonline:64
-#, c-format
-msgid "  --box=\t\t\t- hostname.\n"
-msgstr ""
-
-#: ../mdkonline:65
-#, c-format
-msgid "  --country\t\t\t- name of country of the user. \n"
-msgstr ""
-
-#: ../mdkonline:66
-#, c-format
-msgid "  --interactive\t\t- use the interactive mode.\n"
-msgstr ""
-
-#: ../mdkonline:67
-#, c-format
-msgid "  --nointeractive\t- use the non-interactive mode.\n"
-msgstr ""
-
-#: ../mdkonline:68
-#, c-format
-msgid "  --login=\t\t     - login name of the user.\n"
-msgstr ""
-
-#: ../mdkonline:69
-#, c-format
-msgid "  --pass=\t\t\t- password  of the user.\n"
-msgstr ""
-
-#: ../mdkonline:87 ../mdkonline:120
-#, c-format
-msgid "Mandriva Online"
-msgstr "Mandriva Online"
-
-#: ../mdkonline:90
-#, c-format
-msgid "I already have an account"
-msgstr "Вече имам регистрация"
-
-#: ../mdkonline:91
-#, c-format
-msgid "I want to subscribe"
-msgstr "Желая да се регистрирам"
-
-#: ../mdkonline:96
-#, c-format
-msgid "Mr."
-msgstr "г-дин"
-
-#: ../mdkonline:96
-#, c-format
-msgid "Mrs."
-msgstr "г-жа"
-
-#: ../mdkonline:96
-#, c-format
-msgid "Ms."
-msgstr "г-жа"
-
-#: ../mdkonline:114
-#, c-format
-msgid "Reading configuration\n"
-msgstr "Прочитане на конфигурацията\n"
-
-#: ../mdkonline:123
-#, c-format
-msgid ""
-"This assistant will help you to upload your configuration\n"
-"(packages, hardware configuration) to a centralized database in\n"
-"order to keep you informed about security updates and useful upgrades.\n"
-msgstr ""
-"Този асистент ще Ви помогне да качите вашата конфигурация\n"
-"(пакети и хардуерни настройки) в централизираната база данни, за да\n"
-"Ви държим в течение относно необходими актуализации и полезни новости.\n"
-
-#: ../mdkonline:131
-#, c-format
-msgid "Account creation or authentication"
-msgstr "Създаване на регистрация или идентификация"
-
-#: ../mdkonline:136
-#, c-format
-msgid "Enter your Mandriva Online login, password and machine name:"
-msgstr "Въведете вашите Mandriva Online име, парола и псевдоним на машината:"
-
-#: ../mdkonline:142 ../mdkonline:195
-#, c-format
-msgid "Email address:"
-msgstr "E-mail адрес:"
-
-#: ../mdkonline:143
-#, c-format
-msgid "Country"
-msgstr "Държава"
-
-#: ../mdkonline:144 ../mdkonline:196
-#, c-format
-msgid "Password:"
-msgstr "Парола:"
-
-#: ../mdkonline:146
-#, fuzzy, c-format
-msgid "Machine description:"
-msgstr "Име на машината:"
-
-#: ../mdkonline:147
-#, c-format
-msgid "(Ex: My Home Office's Computer)"
-msgstr ""
-
-#: ../mdkonline:152 ../mdkonline:159 ../mdkonline:180 ../mdkonline:204
-#: ../mdkonline:208 ../mdkonline:212 ../mdkonline:217 ../mdkupdate:141
-#: ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
-#, c-format
-msgid "Error"
-msgstr "Грешка"
-
-#: ../mdkonline:152
-#, c-format
-msgid "Machine name must be 1 to 40 alphanumerical characters"
-msgstr "Името на компютъра трябва да бъде между 1 и 40 символа."
-
-#: ../mdkonline:155
-#, c-format
-msgid "Connecting to Mandriva Online website..."
-msgstr "Свързване с Mandriva Online..."
-
-#: ../mdkonline:167
-#, c-format
-msgid ""
-"In order to benefit from Mandriva Online services,\n"
-"we are about to upload your configuration.\n"
-"\n"
-"The Wizard will now send the following information to Mandriva:\n"
-"\n"
-"1) the list of packages you have installed on your system,\n"
-"\n"
-"2) your hardware configuration.\n"
-"\n"
-"If you feel uncomfortable by that idea, or do not want to benefit from this "
-"service,\n"
-"please press 'Cancel'. By pressing 'Next', you allow us to keep you "
-"informed\n"
-"about security updates and useful upgrades via personalized email alerts.\n"
-"Furthermore, you benefit from discounted paid support services on\n"
-"www.mandrivaexpert.com."
-msgstr ""
-"За да се възползвате от услугите на Mandriva Online,\n"
-"трябва да качите Вашата конфигурация.\n"
-"\n"
-"Тази програма ще изпрати следната информация на Mandriva:\n"
-"\n"
-"1) списък с пакетите, които са инсталирани на системата Ви,\n"
-"\n"
-"2) информация за Вашият хардуер.\n"
-"\n"
-"Ако идеята не ви харесва, или не искате да се възползвате от тази услуга,\n"
-"моля натиснете 'Отказ'. Натискайки 'Напред', Вие ни позволявате да ви държим "
-"в течение\n"
-"за актуализация на системата за сигурност, както и полезни нововъведения, "
-"чрез е-писма.\n"
-"Освен това, Вие печелите още и намаление от цената за поддръжка от www."
-"mandrivaexpert.com."
-
-#: ../mdkonline:180
-#, c-format
-msgid "Connection problem"
-msgstr "Проблем с връзката"
-
-#: ../mdkonline:180
-#, c-format
-msgid "Problem occurs when uploading files, please try again"
-msgstr "Възникнал е проблем при изпращане на файловете, опитайте отново"
-
-#: ../mdkonline:187
-#, c-format
-msgid "Create a Mandriva Online Account"
-msgstr "Създаване на регистрация в Mandriva Online"
-
-#. -PO: that is for things like "Mr", "Ms",...
-#: ../mdkonline:192
-#, c-format
-msgid "Greeting:"
-msgstr "Поздрав:"
-
-#: ../mdkonline:193
-#, c-format
-msgid "First name:"
-msgstr "Име:"
-
-#: ../mdkonline:194
-#, c-format
-msgid "Last name:"
-msgstr "Фамилия:"
-
-#: ../mdkonline:197
-#, c-format
-msgid "Confirm Password:"
-msgstr "Потвърдете паролата:"
-
-#: ../mdkonline:204
-#, c-format
-msgid ""
-"The passwords do not match\n"
-" Please try again\n"
-msgstr ""
-"Паролите не съвпадат\n"
-" Моля опитайте отново\n"
-
-#: ../mdkonline:208
-#, c-format
-msgid "Please fill in each field"
-msgstr "Попълнете всички полета"
-
-#: ../mdkonline:212
-#, c-format
-msgid "Not a valid mail address!\n"
-msgstr "Невалиден адрес за е-поща!\n"
-
-#: ../mdkonline:217
-#, c-format
-msgid "Creating account failed!"
-msgstr ""
-
-#: ../mdkonline:225
-#, c-format
-msgid ""
-"Mandriva Online Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
-msgstr ""
-"Успешно е създадена регистрация в Mandriva Online.\n"
-"Натиснете \"Напред\" за идентификация и изпращане на конфигурацията\n"
-
-#: ../mdkonline:229
-#, c-format
-msgid "Your upload was successful!"
-msgstr "Изпращането бе успешно!"
-
-#: ../mdkonline:229
+#: ../mdkapplet:478
 #, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandriva Online."
-msgstr ""
-"От сега нататък, Вие ще получавате информация\n"
-"относно сигурността и новостите, благодарение на Mandriva Online."
+msgid "Online WebSite"
+msgstr "Online WebSite"
 
-#: ../mdkonline:229
+#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
+#: ../mdkapplet:483
 #, c-format
-msgid ""
-"Mandriva Online offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
+msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
-"Mandriva Online Ви предлага автоматизиране на актуализациите.\n"
-"Програмата ще се пуска периодично на системата Ви и ще следи за "
-"актуализации\n"
 
-#: ../mdkonline:238
+#: ../mdkapplet:492
 #, c-format
-msgid "Congratulations"
-msgstr "Поздравления"
-
-#: ../mdkonline:238
-#, c-format
-msgid "Your Mandriva Online account has been successfully configured\n"
-msgstr "Вашата регистрация в Mandriva Online е успешно конфигурирана\n"
-
-#: ../mdkonline:253
-#, c-format
-msgid "Configuration uploaded successfully"
-msgstr "Конфигурацията е качена успешно"
-
-#: ../mdkonline:254
-#, c-format
-msgid "Problem uploading configuration"
-msgstr "Грешка при качване на конфигурацията"
+msgid "Always launch on startup"
+msgstr "Зареждане при стартиране"
 
-#: ../mdkonline:256
+#: ../mdkapplet:494
 #, c-format
-msgid ""
-"Cannot connect to Mandriva Online website: wrong login/password or router/"
-"firewall bad settings"
-msgstr ""
-"Не е възможна връза с mandrivaonline: грешно име/парола или грешно "
-"конфигуриран маршрутизатор/огнена стена"
+msgid "Quit"
+msgstr "Изход"
 
 #: ../mdkonline.pm:207
 #, c-format
@@ -828,6 +366,11 @@ msgstr ""
 "\n"
 "начин на ползване:\n"
 
+#: ../mdkupdate:73
+#, c-format
+msgid "  --help\t\t- print this help message.\n"
+msgstr " --help\t\t- показва това помощно съобщение.\n"
+
 #: ../mdkupdate:74
 #, c-format
 msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
@@ -855,11 +398,6 @@ msgid ""
 "file.\n"
 msgstr ""
 
-#: ../mdkupdate:118 ../mdkupdate:164
-#, c-format
-msgid "Warning"
-msgstr "Предупреждение"
-
 #. -PO: here Live Install is currently *NOT* translated on the desktop, so it's better to keep as it:
 #: ../mdkupdate:120
 #, c-format
@@ -868,11 +406,21 @@ msgid ""
 "Install' wizard."
 msgstr ""
 
+#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
+#, c-format
+msgid "Please wait"
+msgstr "Моля изчакайте"
+
 #: ../mdkupdate:123 ../mdkupdate:174
 #, c-format
 msgid "Preparing..."
 msgstr "Подготовка..."
 
+#: ../mdkupdate:141 ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
+#, c-format
+msgid "Error"
+msgstr "Грешка"
+
 #: ../mdkupdate:141
 #, c-format
 msgid ""
@@ -881,6 +429,11 @@ msgid ""
 "%s"
 msgstr ""
 
+#: ../mdkupdate:159 ../mdkupdate:188
+#, c-format
+msgid "An error occurred"
+msgstr "Появи се грешка"
+
 #: ../mdkupdate:164
 #, c-format
 msgid ""
@@ -905,6 +458,288 @@ msgstr "Инсталиране на пакети ...\n"
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "Не е възможна актуализацията на пакетите от източника.\n"
 
+#, fuzzy
+#~ msgid "New bundles are available for your system"
+#~ msgstr "Налични са актуализации за вашата система"
+
+#~ msgid "Service is not configured. Please click on \"Configure the service\""
+#~ msgstr "Услугата не е конфигурирана. Натиснете \"Конфигуриране\""
+
+#~ msgid "Configure the service"
+#~ msgstr "Конфигураране"
+
+#~ msgid "Check updates"
+#~ msgstr "Проверка за актуализации"
+
+#~ msgid "Configure Now!"
+#~ msgstr "Конфигуриране сега!"
+
+#~ msgid "Actions"
+#~ msgstr "Действия"
+
+#~ msgid "Configure"
+#~ msgstr "Конфигураране"
+
+#~ msgid "See logs"
+#~ msgstr "История"
+
+#~ msgid "Status"
+#~ msgstr "Състояние"
+
+#~ msgid "Close"
+#~ msgstr "Затваряне"
+
+#~ msgid "Network Connection: "
+#~ msgstr "Мрежова връзка: "
+
+#~ msgid "Up"
+#~ msgstr "Нагоре"
+
+#~ msgid "Down"
+#~ msgstr "Надолу"
+
+#~ msgid "Last check: "
+#~ msgstr "Последна проверка: "
+
+#~ msgid "Machine name:"
+#~ msgstr "Име на машината:"
+
+#~ msgid "Updates: "
+#~ msgstr "Актуализации: "
+
+#~ msgid "Development release not supported by service"
+#~ msgstr "Версията за разработчици не се поддържа от услугата"
+
+#~ msgid "Too old release not supported by service"
+#~ msgstr "Стара версия, не се поддържа от услугата"
+
+#~ msgid "Unknown state"
+#~ msgstr "Неизвестно състояние"
+
+#~ msgid "Online services disabled. Contact Mandriva Online site\n"
+#~ msgstr "Online услугите са забранени. Свържете се с Mandriva Online\n"
+
+#~ msgid "Wrong Password.\n"
+#~ msgstr "Грешна парола\n"
+
+#~ msgid "Wrong Action or host or login.\n"
+#~ msgstr "Грешно действие или хост или влизане.\n"
+
+#~ msgid ""
+#~ "Something is wrong with your network settings (check your route, firewall "
+#~ "or proxy settings)\n"
+#~ msgstr ""
+#~ "Грешни мрежови настройки (проверете маршрутизатора, огнената стена или "
+#~ "прокси настройките)\n"
+
+#~ msgid ""
+#~ "Problem occured while connecting to the server, please contact the "
+#~ "support team"
+#~ msgstr ""
+#~ "Възникнал е проблем при връзка със сървъра, моля свържете се с екипа по "
+#~ "поддръжка"
+
+#~ msgid "Response from Mandriva Online server\n"
+#~ msgstr "Отговор от Mandriva Online сървър\n"
+
+#~ msgid "No check"
+#~ msgstr "Няма проверка"
+
+#~ msgid "Checking config file: Not present\n"
+#~ msgstr "Проверка на конфигурационния файл: не съществува\n"
+
+#~ msgid "Logs"
+#~ msgstr "Журнали"
+
+#~ msgid "Clear"
+#~ msgstr "Изчистване"
+
+#~ msgid ""
+#~ "mdonline version %s\n"
+#~ "Copyright (C) %s Mandriva.\n"
+#~ "This is free software and may be redistributed under the terms of the GNU "
+#~ "GPL.\n"
+#~ "\n"
+#~ "usage:\n"
+#~ msgstr ""
+#~ "mdonline версия %s\n"
+#~ "Mandriva %s, всички права запазени.\n"
+#~ "Това е свободен софтуер и може да бъде разпространяван според условията "
+#~ "на GNU GPL.\n"
+#~ "\n"
+#~ "начин на ползване:\n"
+
+#~ msgid "Mandriva Online"
+#~ msgstr "Mandriva Online"
+
+#~ msgid "I already have an account"
+#~ msgstr "Вече имам регистрация"
+
+#~ msgid "I want to subscribe"
+#~ msgstr "Желая да се регистрирам"
+
+#~ msgid "Mr."
+#~ msgstr "г-дин"
+
+#~ msgid "Mrs."
+#~ msgstr "г-жа"
+
+#~ msgid "Ms."
+#~ msgstr "г-жа"
+
+#~ msgid "Reading configuration\n"
+#~ msgstr "Прочитане на конфигурацията\n"
+
+#~ msgid ""
+#~ "This assistant will help you to upload your configuration\n"
+#~ "(packages, hardware configuration) to a centralized database in\n"
+#~ "order to keep you informed about security updates and useful upgrades.\n"
+#~ msgstr ""
+#~ "Този асистент ще Ви помогне да качите вашата конфигурация\n"
+#~ "(пакети и хардуерни настройки) в централизираната база данни, за да\n"
+#~ "Ви държим в течение относно необходими актуализации и полезни новости.\n"
+
+#~ msgid "Account creation or authentication"
+#~ msgstr "Създаване на регистрация или идентификация"
+
+#~ msgid "Enter your Mandriva Online login, password and machine name:"
+#~ msgstr ""
+#~ "Въведете вашите Mandriva Online име, парола и псевдоним на машината:"
+
+#~ msgid "Email address:"
+#~ msgstr "E-mail адрес:"
+
+#~ msgid "Country"
+#~ msgstr "Държава"
+
+#~ msgid "Password:"
+#~ msgstr "Парола:"
+
+#, fuzzy
+#~ msgid "Machine description:"
+#~ msgstr "Име на машината:"
+
+#~ msgid "Machine name must be 1 to 40 alphanumerical characters"
+#~ msgstr "Името на компютъра трябва да бъде между 1 и 40 символа."
+
+#~ msgid "Connecting to Mandriva Online website..."
+#~ msgstr "Свързване с Mandriva Online..."
+
+#~ msgid ""
+#~ "In order to benefit from Mandriva Online services,\n"
+#~ "we are about to upload your configuration.\n"
+#~ "\n"
+#~ "The Wizard will now send the following information to Mandriva:\n"
+#~ "\n"
+#~ "1) the list of packages you have installed on your system,\n"
+#~ "\n"
+#~ "2) your hardware configuration.\n"
+#~ "\n"
+#~ "If you feel uncomfortable by that idea, or do not want to benefit from "
+#~ "this service,\n"
+#~ "please press 'Cancel'. By pressing 'Next', you allow us to keep you "
+#~ "informed\n"
+#~ "about security updates and useful upgrades via personalized email "
+#~ "alerts.\n"
+#~ "Furthermore, you benefit from discounted paid support services on\n"
+#~ "www.mandrivaexpert.com."
+#~ msgstr ""
+#~ "За да се възползвате от услугите на Mandriva Online,\n"
+#~ "трябва да качите Вашата конфигурация.\n"
+#~ "\n"
+#~ "Тази програма ще изпрати следната информация на Mandriva:\n"
+#~ "\n"
+#~ "1) списък с пакетите, които са инсталирани на системата Ви,\n"
+#~ "\n"
+#~ "2) информация за Вашият хардуер.\n"
+#~ "\n"
+#~ "Ако идеята не ви харесва, или не искате да се възползвате от тази "
+#~ "услуга,\n"
+#~ "моля натиснете 'Отказ'. Натискайки 'Напред', Вие ни позволявате да ви "
+#~ "държим в течение\n"
+#~ "за актуализация на системата за сигурност, както и полезни нововъведения, "
+#~ "чрез е-писма.\n"
+#~ "Освен това, Вие печелите още и намаление от цената за поддръжка от www."
+#~ "mandrivaexpert.com."
+
+#~ msgid "Connection problem"
+#~ msgstr "Проблем с връзката"
+
+#~ msgid "Problem occurs when uploading files, please try again"
+#~ msgstr "Възникнал е проблем при изпращане на файловете, опитайте отново"
+
+#~ msgid "Create a Mandriva Online Account"
+#~ msgstr "Създаване на регистрация в Mandriva Online"
+
+#~ msgid "Greeting:"
+#~ msgstr "Поздрав:"
+
+#~ msgid "First name:"
+#~ msgstr "Име:"
+
+#~ msgid "Last name:"
+#~ msgstr "Фамилия:"
+
+#~ msgid "Confirm Password:"
+#~ msgstr "Потвърдете паролата:"
+
+#~ msgid ""
+#~ "The passwords do not match\n"
+#~ " Please try again\n"
+#~ msgstr ""
+#~ "Паролите не съвпадат\n"
+#~ " Моля опитайте отново\n"
+
+#~ msgid "Please fill in each field"
+#~ msgstr "Попълнете всички полета"
+
+#~ msgid "Not a valid mail address!\n"
+#~ msgstr "Невалиден адрес за е-поща!\n"
+
+#~ msgid ""
+#~ "Mandriva Online Account successfully created.\n"
+#~ "Please click \"Next\" to authenticate and upload your configuration\n"
+#~ msgstr ""
+#~ "Успешно е създадена регистрация в Mandriva Online.\n"
+#~ "Натиснете \"Напред\" за идентификация и изпращане на конфигурацията\n"
+
+#~ msgid "Your upload was successful!"
+#~ msgstr "Изпращането бе успешно!"
+
+#~ msgid ""
+#~ "From now you will receive on security and updates \n"
+#~ "announcements thanks to Mandriva Online."
+#~ msgstr ""
+#~ "От сега нататък, Вие ще получавате информация\n"
+#~ "относно сигурността и новостите, благодарение на Mandriva Online."
+
+#~ msgid ""
+#~ "Mandriva Online offers you the ability to automate the updates.\n"
+#~ "A program will run regulary in your system waiting for new updates\n"
+#~ msgstr ""
+#~ "Mandriva Online Ви предлага автоматизиране на актуализациите.\n"
+#~ "Програмата ще се пуска периодично на системата Ви и ще следи за "
+#~ "актуализации\n"
+
+#~ msgid "Congratulations"
+#~ msgstr "Поздравления"
+
+#~ msgid "Your Mandriva Online account has been successfully configured\n"
+#~ msgstr "Вашата регистрация в Mandriva Online е успешно конфигурирана\n"
+
+#~ msgid "Configuration uploaded successfully"
+#~ msgstr "Конфигурацията е качена успешно"
+
+#~ msgid "Problem uploading configuration"
+#~ msgstr "Грешка при качване на конфигурацията"
+
+#~ msgid ""
+#~ "Cannot connect to Mandriva Online website: wrong login/password or router/"
+#~ "firewall bad settings"
+#~ msgstr ""
+#~ "Не е възможна връза с mandrivaonline: грешно име/парола или грешно "
+#~ "конфигуриран маршрутизатор/огнена стена"
+
 #~ msgid "  --applet\t\t- launch Mandriva Update.\n"
 #~ msgstr "  --applet\t\t-  стартира Mandriva Update.\n"
 
diff --git a/po/bn.po b/po/bn.po
index b84e3a96..2bee55fc 100644
--- a/po/bn.po
+++ b/po/bn.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-09 16:26+0200\n"
+"POT-Creation-Date: 2008-02-21 18:21+0100\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"
@@ -18,17 +18,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:94
+#: ../mdkapplet:88
 #, fuzzy, c-format
 msgid "Will check updates at %s"
 msgstr "আপডেট পরীক্ষা করো"
 
-#: ../mdkapplet:103
+#: ../mdkapplet:97
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "আপনার সিস্টেম আপ-টু-ডেট আছে"
 
-#: ../mdkapplet:109
+#: ../mdkapplet:103
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -38,56 +38,44 @@ msgstr ""
 "support@mandrivaonline.com এ মেইল করুন"
 
 # উপলব্ধ
-#: ../mdkapplet:115
+#: ../mdkapplet:110
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "উপস্থিত প্যাকেজসমুহ খোঁজা হচ্ছে, অনুগ্রহ করে অপেক্ষা করুন..."
 
-#: ../mdkapplet:121
+#: ../mdkapplet:116
 #, c-format
 msgid "New updates are available for your system"
 msgstr "আপনার সিস্টেমের জন্য নতুন আপডেট উপস্হিত আছে"
 
-#: ../mdkapplet:127
-#, fuzzy, c-format
-msgid "New bundles are available for your system"
-msgstr "আপনার সিস্টেমের জন্য নতুন আপডেট উপস্হিত আছে"
-
-#: ../mdkapplet:133
-#, c-format
-msgid "Service is not configured. Please click on \"Configure the service\""
-msgstr ""
-"পরিসেবা (service) বর্তমানে কনফিগার করা নেই। অনুগ্রহ করে \"পরিসেবাটি কনফিগার করো"
-"\"-এ ক্লিক করুন"
-
-#: ../mdkapplet:139
+#: ../mdkapplet:122
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "নেটওয়ার্ক বর্তমানে বন্ধ আছে। অনুগ্রহ করে আপনার নেটওয়ার্ক কনফিগার করুন"
 
-#: ../mdkapplet:145
+#: ../mdkapplet:128
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr ""
 "পরিসেবা (service) বর্তমানে সক্রিয় নেই। অনুগ্রহ করে \"অনলাইন ওয়েবসাইট\"-এ ক্লিক করুন"
 
-#: ../mdkapplet:151 ../mdkapplet:182
+#: ../mdkapplet:134 ../mdkapplet:165
 #, fuzzy, c-format
 msgid "urpmi database locked"
 msgstr "urpmi ডাটাবেস লক করা আছে"
 
-#: ../mdkapplet:157
+#: ../mdkapplet:140
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr "সংস্করণটির সমর্থন নেই (খুব পুরানো, অথবা ডেভেলপমেন্ট সংস্করণ)"
 
-#: ../mdkapplet:163
+#: ../mdkapplet:146
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
 msgstr ""
 
-#: ../mdkapplet:169
+#: ../mdkapplet:152
 #, fuzzy, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -105,583 +93,132 @@ msgstr ""
 "এর পরে %s পুনরায় চালু করুন।"
 
 #  আছে কি
-#: ../mdkapplet:174
+#: ../mdkapplet:157
 #, c-format
 msgid "Enabled"
 msgstr "সক্রিয়"
 
-#: ../mdkapplet:187
+#: ../mdkapplet:170
 #, c-format
 msgid "Error updating media"
 msgstr ""
 
-#: ../mdkapplet:202
+#: ../mdkapplet:185
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr "পরীক্ষা চলছে... আপডেট পাওয়া গেছে\n"
 
-#: ../mdkapplet:207
+#: ../mdkapplet:190
 #, c-format
 msgid "Packages are up to date"
 msgstr ""
 
-#: ../mdkapplet:212
+#: ../mdkapplet:195
 #, fuzzy, c-format
 msgid "Failed to open urpmi database"
 msgstr "rpmdb খুলতে অক্ষম"
 
-#: ../mdkapplet:217 ../mdkapplet:324
+#: ../mdkapplet:200
 #, c-format
 msgid "Install updates"
 msgstr "আপডেট গুলো ইনস্টল করো"
 
-#: ../mdkapplet:218
-#, c-format
-msgid "Configure the service"
-msgstr "পরিসেবাটি কনফিগার করো"
-
-#: ../mdkapplet:219
+#: ../mdkapplet:201
 #, c-format
 msgid "Check Updates"
 msgstr "আপডেট পরীক্ষা করো"
 
-#: ../mdkapplet:220 ../mdkapplet:327 ../mdkonline:114 ../mdkonline:155
-#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
-#, c-format
-msgid "Please wait"
-msgstr "অনুগ্রহ করে অপেক্ষা করুন"
-
-#: ../mdkapplet:220 ../mdkapplet:326 ../mdkapplet:327
-#, c-format
-msgid "Check updates"
-msgstr "আপডেট পরীক্ষা করো"
-
-#: ../mdkapplet:223 ../mdkapplet:648
-#, c-format
-msgid "Online WebSite"
-msgstr "অনলাইন ওয়েবসাইট"
-
-#: ../mdkapplet:224
+#: ../mdkapplet:202
 #, c-format
 msgid "Configure Network"
 msgstr "নেটওয়ার্ক কনফিগার করো"
 
-#: ../mdkapplet:225
-#, c-format
-msgid "Configure Now!"
-msgstr "এক্ষুনি কনফিগার করো!"
-
-#: ../mdkapplet:313 ../mdkapplet:392
-#, c-format
-msgid "Mandriva Linux Updates Applet"
-msgstr "ম্যান্ড্রেক আপডেট অ্যাপ্লেট"
-
-#: ../mdkapplet:322
-#, c-format
-msgid "Actions"
-msgstr "কার্য"
-
-#: ../mdkapplet:325
-#, c-format
-msgid "Configure"
-msgstr "কনফিগার"
-
-#: ../mdkapplet:329
-#, c-format
-msgid "See logs"
-msgstr "লগ দেখুন"
-
-#: ../mdkapplet:332
-#, c-format
-msgid "Status"
-msgstr "অবস্থা"
-
-#: ../mdkapplet:336 ../mdkapplet:597
-#, c-format
-msgid "Close"
-msgstr "বন্ধ"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Network Connection: "
-msgstr "নেটওয়ার্ক সংযোগ: "
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Up"
-msgstr "উপরে"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Down"
-msgstr "নিচে"
-
-#: ../mdkapplet:366
-#, c-format
-msgid "Last check: "
-msgstr "সর্বশেষ পরীক্ষা: "
-
-#: ../mdkapplet:367 ../mdkonline:145
-#, c-format
-msgid "Machine name:"
-msgstr "মেশিনের নাম:"
-
-#: ../mdkapplet:368
-#, c-format
-msgid "Updates: "
-msgstr "আপডেট সমুহ: "
-
-#: ../mdkapplet:372
+#: ../mdkapplet:283
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "drakconnect চালু করা হচ্ছে\n"
 
-#: ../mdkapplet:375
+#: ../mdkapplet:286
 #, c-format
 msgid "Mandriva Online seems to be reinstalled, reloading applet ...."
 msgstr ""
 "মনে হচ্ছে ম্যান্ড্রেকঅনলাইন পুনরায় ইনস্টল করা হয়েছে, পুনরায় applet চালানো হচ্ছে ...."
 
-#: ../mdkapplet:383
+#: ../mdkapplet:294
 #, c-format
 msgid "Launching MandrivaUpdate\n"
 msgstr "MandrivaUpdate চালু করা হচ্ছে\n"
 
-#: ../mdkapplet:398
+#: ../mdkapplet:303
+#, c-format
+msgid "Mandriva Linux Updates Applet"
+msgstr "ম্যান্ড্রেক আপডেট অ্যাপ্লেট"
+
+#: ../mdkapplet:308
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "নতুন আপডেট পরীক্ষা করা হচ্ছে...\n"
 
-#: ../mdkapplet:399
+#: ../mdkapplet:309
 #, c-format
 msgid "Connecting to"
 msgstr "এর সাথে সংযোগ করা হচ্ছে"
 
-#: ../mdkapplet:467 ../mdkupdate:159 ../mdkupdate:188
-#, c-format
-msgid "An error occurred"
-msgstr "একটি ত্রুটি সম্পাদিত হয়েছে"
-
-#: ../mdkapplet:475
-#, c-format
-msgid "Development release not supported by service"
-msgstr "সার্ভিস ডেভেলপমেন্ট সংস্করণ সমর্থন করে না"
-
-#: ../mdkapplet:476
-#, c-format
-msgid "Too old release not supported by service"
-msgstr "সার্ভিস খুব পুরানো সংস্করণ সমর্থন করে না"
-
-#: ../mdkapplet:477
-#, c-format
-msgid "Unknown state"
-msgstr "অজ্ঞাত অবস্হা"
-
-#: ../mdkapplet:478
-#, c-format
-msgid "Online services disabled. Contact Mandriva Online site\n"
-msgstr ""
-"অনলাইন পরিসেবা নিষ্ক্রিয় করা রয়েছে। ম্যান্ড্রেকঅনলাইন সাইটের সাথে যোগাযোগ করুন\n"
-
-#: ../mdkapplet:479
-#, c-format
-msgid "Wrong Password.\n"
-msgstr "ভূল পাসওয়ার্ড।\n"
-
-#: ../mdkapplet:480
-#, c-format
-msgid "Wrong Action or host or login.\n"
-msgstr "কাজ অথবা হোস্ট অথবা লগ-ইন সঠিক নয়।\n"
-
-#: ../mdkapplet:481
-#, c-format
-msgid ""
-"Something is wrong with your network settings (check your route, firewall or "
-"proxy settings)\n"
-msgstr ""
-"আপনার নেটওয়ার্ক সেটিংস এ কিছু সমস্যা হয়েছে (আপনার route, firewall or proxy "
-"সেটিংস পুনায় পরীক্ষা করুন)\n"
-
-#: ../mdkapplet:483
-#, c-format
-msgid ""
-"Problem occured while connecting to the server, please contact the support "
-"team"
-msgstr ""
-"সার্ভারের সাথে সংযোগের সময় সমস্যা হয়েছে, অনুগ্রহ করে পরিসেবা দলের সাথে যোগাযোগ "
-"করুন"
-
-#: ../mdkapplet:487
-#, c-format
-msgid "Response from Mandriva Online server\n"
-msgstr "ম্যান্ড্রিব অনলাইন সার্ভারের উত্তর\n"
-
-#: ../mdkapplet:490
+#: ../mdkapplet:386
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "সিস্টেম আপ-টু-ডেট আছে\n"
 
-#: ../mdkapplet:527
-#, c-format
-msgid "No check"
-msgstr "কোন পরীক্ষণ নেই"
-
-#: ../mdkapplet:541
-#, c-format
-msgid "Checking config file: Not present\n"
-msgstr "config ফাইল পরীক্ষা করা হচ্ছে: উপস্থিত নেই\n"
-
-#: ../mdkapplet:544
+#: ../mdkapplet:415
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "নেটওয়ার্ক পরীক্ষা করা হচ্ছে: সম্ভবত নিষ্ক্রিয় করা আছে\n"
 
-#: ../mdkapplet:587
-#, c-format
-msgid "Logs"
-msgstr "লগ"
-
-#: ../mdkapplet:603
+#: ../mdkapplet:457 ../mdkupdate:118 ../mdkupdate:164
 #, c-format
-msgid "Clear"
-msgstr "পরিষ্কার করো"
+msgid "Warning"
+msgstr "নোটিশ"
 
-#: ../mdkapplet:629
+#: ../mdkapplet:468
 #, c-format
 msgid "About..."
 msgstr "পরিচিতি..."
 
-#: ../mdkapplet:631
+#: ../mdkapplet:472
 #, fuzzy, c-format
 msgid "Mandriva Online %s"
 msgstr "ম্যান্ড্রিব অনলাইন"
 
-#: ../mdkapplet:635
+#: ../mdkapplet:473
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr ""
 
-#: ../mdkapplet:647
+#: ../mdkapplet:476
 #, c-format
 msgid "Mandriva Online gives access to Mandriva web services."
 msgstr ""
 
-#: ../mdkapplet:655
-#, c-format
-msgid "Always launch on startup"
-msgstr "সবসময় স্টার্টআপে আরম্ভ করো"
-
-#: ../mdkapplet:657
-#, c-format
-msgid "Quit"
-msgstr "প্রস্থান"
-
-#: ../mdkonline:58
-#, c-format
-msgid ""
-"mdonline version %s\n"
-"Copyright (C) %s Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"mdonline version %s\n"
-"কপিরাইট %s Mandriva.\n"
-"এই সফ্‌টওয়ারটি ফ্রি এবং গনুহ্‌ (GNU) GPL terms এর মাধ্যমে বিতরণ করা যাবে।\n"
-"\n"
-"ব্যবহার বিধি:\n"
-
-#: ../mdkonline:63 ../mdkupdate:73
-#, c-format
-msgid "  --help\t\t- print this help message.\n"
-msgstr " --help\t\t- এই সহায়িকা বার্তা প্রদর্শন করো।\n"
-
-#: ../mdkonline:64
-#, c-format
-msgid "  --box=\t\t\t- hostname.\n"
-msgstr ""
-
-#: ../mdkonline:65
-#, c-format
-msgid "  --country\t\t\t- name of country of the user. \n"
-msgstr ""
-
-#: ../mdkonline:66
-#, c-format
-msgid "  --interactive\t\t- use the interactive mode.\n"
-msgstr ""
-
-#: ../mdkonline:67
-#, c-format
-msgid "  --nointeractive\t- use the non-interactive mode.\n"
-msgstr ""
-
-#: ../mdkonline:68
-#, c-format
-msgid "  --login=\t\t     - login name of the user.\n"
-msgstr ""
-
-#: ../mdkonline:69
-#, c-format
-msgid "  --pass=\t\t\t- password  of the user.\n"
-msgstr ""
-
-#: ../mdkonline:87 ../mdkonline:120
-#, c-format
-msgid "Mandriva Online"
-msgstr "ম্যান্ড্রিব অনলাইন"
-
-#: ../mdkonline:90
-#, c-format
-msgid "I already have an account"
-msgstr "ইতিমধ্যেই আমার একটি একাউন্ট আছে"
-
-#: ../mdkonline:91
-#, c-format
-msgid "I want to subscribe"
-msgstr "আমি গ্রহন করিতে ইচ্ছুক"
-
-#: ../mdkonline:96
-#, c-format
-msgid "Mr."
-msgstr "জনাব"
-
-#: ../mdkonline:96
-#, c-format
-msgid "Mrs."
-msgstr "জনাবা"
-
-#: ../mdkonline:96
-#, c-format
-msgid "Ms."
-msgstr "জনাবা"
-
-#: ../mdkonline:114
-#, c-format
-msgid "Reading configuration\n"
-msgstr "কনফিগারেশন পড়া হচ্ছে\n"
-
-#: ../mdkonline:123
-#, c-format
-msgid ""
-"This assistant will help you to upload your configuration\n"
-"(packages, hardware configuration) to a centralized database in\n"
-"order to keep you informed about security updates and useful upgrades.\n"
-msgstr ""
-"এই সাহায্যকারী আপনার কনফিগারেশন (প্যাকেজ, হার্ডওয়্যার কনফিগারেশন)\n"
-"একটি কেন্দ্রীয় ডাটাবেসে আপলোড করতে সাহায্য করবে যাতে\n"
-"আপনাকে সুরক্ষা সংক্রান্ত এবং অন্যান্য প্রয়োজনীয় আপডেট সম্বন্ধে জানানো করা যায়।\n"
-
-#: ../mdkonline:131
-#, c-format
-msgid "Account creation or authentication"
-msgstr "একাউন্ট তৈরি অথবা পরিচয় প্রমাণ প্রক্রিয়া"
-
-#: ../mdkonline:136
-#, c-format
-msgid "Enter your Mandriva Online login, password and machine name:"
-msgstr "আপনার ম্যান্ড্রেকঅনলাইন লগ-ইন, পাসওয়ার্ড এবং মেশিনের নাম লিখুন:"
-
-#: ../mdkonline:142 ../mdkonline:195
-#, fuzzy, c-format
-msgid "Email address:"
-msgstr "বহির্মুখী মেইল অ্যাড্রেস"
-
-#: ../mdkonline:143
-#, c-format
-msgid "Country"
-msgstr "দেশ"
-
-#: ../mdkonline:144 ../mdkonline:196
-#, c-format
-msgid "Password:"
-msgstr "পাসওয়ার্ড:"
-
-#: ../mdkonline:146
-#, fuzzy, c-format
-msgid "Machine description:"
-msgstr "মেশিনের নাম:"
-
-#: ../mdkonline:147
-#, c-format
-msgid "(Ex: My Home Office's Computer)"
-msgstr ""
-
-#: ../mdkonline:152 ../mdkonline:159 ../mdkonline:180 ../mdkonline:204
-#: ../mdkonline:208 ../mdkonline:212 ../mdkonline:217 ../mdkupdate:141
-#: ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
-#, c-format
-msgid "Error"
-msgstr "ত্রুটি"
-
-#: ../mdkonline:152
-#, fuzzy, c-format
-msgid "Machine name must be 1 to 40 alphanumerical characters"
-msgstr "মাউন্ট পয়েন্টগুলিতে শুধু * অক্ষর থাকবে"
-
-#: ../mdkonline:155
-#, c-format
-msgid "Connecting to Mandriva Online website..."
-msgstr "ম্যান্ড্রিব অনলাইন ওয়েবসাইটের সাথে সংযুক্ত হচ্ছি..."
-
-#: ../mdkonline:167
-#, c-format
-msgid ""
-"In order to benefit from Mandriva Online services,\n"
-"we are about to upload your configuration.\n"
-"\n"
-"The Wizard will now send the following information to Mandriva:\n"
-"\n"
-"1) the list of packages you have installed on your system,\n"
-"\n"
-"2) your hardware configuration.\n"
-"\n"
-"If you feel uncomfortable by that idea, or do not want to benefit from this "
-"service,\n"
-"please press 'Cancel'. By pressing 'Next', you allow us to keep you "
-"informed\n"
-"about security updates and useful upgrades via personalized email alerts.\n"
-"Furthermore, you benefit from discounted paid support services on\n"
-"www.mandrivaexpert.com."
-msgstr ""
-"ম্যান্ড্রেকঅনলাইন-এর পরিসেবা থেকে উপকৃত হওয়ার আশায়,\n"
-"আপনার কনফিগারেশনটি এখন আপলোড করা হবে।\n"
-"\n"
-"উইজার্ডটি নিম্নোক্ত তথ্যগুলো Mandriva-এ এখন প্রেরণ করবে:\n"
-"\n"
-"১) আপনার সিস্টেমে ইনস্টল করা প্যাকেজের তালিকা,\n"
-"\n"
-"২) আপনার হার্ডওয়্যার কনফিগারেশন.\n"
-"\n"
-"যদি আপনি এই পরিসেবা থেকে উপকৃত হতে অনিচ্ছুক হন তাহলে ,\n"
-"অনুগ্রহ করে 'বাতিল' ক্লিক করুন। 'পরবর্তী'-এ ক্লিক করলে আমরা আপনাকে সুরক্ষা সংক্রান্ত "
-"এবং \n"
-"অন্যান্য প্রয়োজনীয় তথ্য ব্যাক্তিগত ই-মেইলের দ্বারা পাঠাতে থাকব।\n"
-"উপরন্তু, আপনি www.mandrivaexpert.com-র ডিস্কাউন্টসহ মূল্য প্রদত্ত\n"
-"পরিসেবা পাবেন।"
-
-#: ../mdkonline:180
-#, c-format
-msgid "Connection problem"
-msgstr "সংযোগ সমস্যা"
-
-#: ../mdkonline:180
-#, c-format
-msgid "Problem occurs when uploading files, please try again"
-msgstr "ফাইল আপলোড করার সময় সমস্যা হয়েছে, অনুগ্রহ করে পুনরায় চেষ্টা করুন"
-
-#: ../mdkonline:187
-#, c-format
-msgid "Create a Mandriva Online Account"
-msgstr "ম্যান্ড্রেকঅনলাইনে একটি অ্যাকাউন্ট তৈরি করো"
-
-#. -PO: that is for things like "Mr", "Ms",...
-#: ../mdkonline:192
-#, fuzzy, c-format
-msgid "Greeting:"
-msgstr "সবুজ"
-
-#: ../mdkonline:193
-#, c-format
-msgid "First name:"
-msgstr "প্রথম নাম:"
-
-#: ../mdkonline:194
-#, fuzzy, c-format
-msgid "Last name:"
-msgstr "প্রথম নাম:"
-
-#: ../mdkonline:197
-#, c-format
-msgid "Confirm Password:"
-msgstr "পাসওয়ার্ড নিশ্চিত করুন:"
-
-#: ../mdkonline:204
-#, c-format
-msgid ""
-"The passwords do not match\n"
-" Please try again\n"
-msgstr ""
-"পাসওয়ার্ড মেলেনি\n"
-" অনুগ্রহ করে পুনরায় চেষ্টা করুন\n"
-
-#: ../mdkonline:208
-#, fuzzy, c-format
-msgid "Please fill in each field"
-msgstr "অনুগ্রহ করে সকল ক্ষেত্র পুরন করুন\n"
-
-#: ../mdkonline:212
-#, c-format
-msgid "Not a valid mail address!\n"
-msgstr "এটি বৈধ ই-মেইল ঠিকানা নয়!\n"
-
-#: ../mdkonline:217
-#, c-format
-msgid "Creating account failed!"
-msgstr ""
-
-#: ../mdkonline:225
-#, c-format
-msgid ""
-"Mandriva Online Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
-msgstr ""
-"ম্যান্ড্রেকঅনলাইন একাউন্ট সাফল্যের সাথে তৈরি হয়েছে।\n"
-"অনুগ্রহ করে পরিচয় প্রমাণ এবং আপনার কনফিগারেশন আপলোড করার জন্য \"পরবর্তী\" ক্লিক "
-"করুন\n"
-
-#: ../mdkonline:229
-#, c-format
-msgid "Your upload was successful!"
-msgstr "আপনার আপলোড সাফল্যের সাথে সম্পন্ন হয়েছে!"
-
-#: ../mdkonline:229
+#: ../mdkapplet:478
 #, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandriva Online."
-msgstr ""
-"ম্যান্ড্রেকঅনলাইন-এর জন্য, এখন থেকে আপনি নিরাপত্তা এবং \n"
-"আপডেট সংক্রান্ত ঘোষনাগুলো নিয়মিত পাবেন।"
+msgid "Online WebSite"
+msgstr "অনলাইন ওয়েবসাইট"
 
-#: ../mdkonline:229
+#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
+#: ../mdkapplet:483
 #, c-format
-msgid ""
-"Mandriva Online offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
+msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
-"ম্যান্ড্রেকঅনলাইন আপনাকে স্বয়ংক্রিয়ভাবে আপডেট পেতে সাহায্য করে।\n"
-"একটি প্রোগ্রাম নুতন আপডেটের অপেক্ষায় আপনার সিস্টেমে নিয়মিত চলবে\n"
-
-#: ../mdkonline:238
-#, c-format
-msgid "Congratulations"
-msgstr "অভিন্দন"
 
-#: ../mdkonline:238
+#: ../mdkapplet:492
 #, c-format
-msgid "Your Mandriva Online account has been successfully configured\n"
-msgstr "আপনার ম্যান্ড্রেকঅনলাইন একাউন্ট সাফল্যের সাথে কনফিগার করা হয়েছে\n"
-
-#: ../mdkonline:253
-#, c-format
-msgid "Configuration uploaded successfully"
-msgstr "অভিন্দন, আপলোড সাফল্যের সাথে সম্পন্ন হয়েছে"
-
-#: ../mdkonline:254
-#, c-format
-msgid "Problem uploading configuration"
-msgstr "আপলোড করতে সমস্যা হয়েছে"
+msgid "Always launch on startup"
+msgstr "সবসময় স্টার্টআপে আরম্ভ করো"
 
-#: ../mdkonline:256
+#: ../mdkapplet:494
 #, c-format
-msgid ""
-"Cannot connect to Mandriva Online website: wrong login/password or router/"
-"firewall bad settings"
-msgstr ""
-"ম্যান্ড্রেকঅনলাইন ওয়েবসাইটের সাথে সংযোগ করা যাচ্ছ না: ভুল লগ-ইন/পাসওয়ার্ড অথবা "
-"রুটার/ফায়ারওয়াল মন্দ বৈশিষ্ট্যাবলী"
+msgid "Quit"
+msgstr "প্রস্থান"
 
 #: ../mdkonline.pm:207
 #, fuzzy, c-format
@@ -819,6 +356,11 @@ msgstr ""
 "\n"
 "ব্যবহার বিধি:\n"
 
+#: ../mdkupdate:73
+#, c-format
+msgid "  --help\t\t- print this help message.\n"
+msgstr " --help\t\t- এই সহায়িকা বার্তা প্রদর্শন করো।\n"
+
 #: ../mdkupdate:74
 #, c-format
 msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
@@ -846,11 +388,6 @@ msgid ""
 "file.\n"
 msgstr ""
 
-#: ../mdkupdate:118 ../mdkupdate:164
-#, c-format
-msgid "Warning"
-msgstr "নোটিশ"
-
 #. -PO: here Live Install is currently *NOT* translated on the desktop, so it's better to keep as it:
 #: ../mdkupdate:120
 #, c-format
@@ -859,11 +396,21 @@ msgid ""
 "Install' wizard."
 msgstr ""
 
+#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
+#, c-format
+msgid "Please wait"
+msgstr "অনুগ্রহ করে অপেক্ষা করুন"
+
 #: ../mdkupdate:123 ../mdkupdate:174
 #, c-format
 msgid "Preparing..."
 msgstr "প্রস্তুত করা হচ্ছে..."
 
+#: ../mdkupdate:141 ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
+#, c-format
+msgid "Error"
+msgstr "ত্রুটি"
+
 #: ../mdkupdate:141
 #, c-format
 msgid ""
@@ -872,6 +419,11 @@ msgid ""
 "%s"
 msgstr ""
 
+#: ../mdkupdate:159 ../mdkupdate:188
+#, c-format
+msgid "An error occurred"
+msgstr "একটি ত্রুটি সম্পাদিত হয়েছে"
+
 #: ../mdkupdate:164
 #, c-format
 msgid ""
@@ -896,6 +448,292 @@ msgstr "প্যাকেজসমূহ ইনস্টল করা হচ্
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "update_source মাধ্যম থেকে প্যাকেজ আপডেট করা যায় নি।\n"
 
+#, fuzzy
+#~ msgid "New bundles are available for your system"
+#~ msgstr "আপনার সিস্টেমের জন্য নতুন আপডেট উপস্হিত আছে"
+
+#~ msgid "Service is not configured. Please click on \"Configure the service\""
+#~ msgstr ""
+#~ "পরিসেবা (service) বর্তমানে কনফিগার করা নেই। অনুগ্রহ করে \"পরিসেবাটি কনফিগার "
+#~ "করো\"-এ ক্লিক করুন"
+
+#~ msgid "Configure the service"
+#~ msgstr "পরিসেবাটি কনফিগার করো"
+
+#~ msgid "Check updates"
+#~ msgstr "আপডেট পরীক্ষা করো"
+
+#~ msgid "Configure Now!"
+#~ msgstr "এক্ষুনি কনফিগার করো!"
+
+#~ msgid "Actions"
+#~ msgstr "কার্য"
+
+#~ msgid "Configure"
+#~ msgstr "কনফিগার"
+
+#~ msgid "See logs"
+#~ msgstr "লগ দেখুন"
+
+#~ msgid "Status"
+#~ msgstr "অবস্থা"
+
+#~ msgid "Close"
+#~ msgstr "বন্ধ"
+
+#~ msgid "Network Connection: "
+#~ msgstr "নেটওয়ার্ক সংযোগ: "
+
+#~ msgid "Up"
+#~ msgstr "উপরে"
+
+#~ msgid "Down"
+#~ msgstr "নিচে"
+
+#~ msgid "Last check: "
+#~ msgstr "সর্বশেষ পরীক্ষা: "
+
+#~ msgid "Machine name:"
+#~ msgstr "মেশিনের নাম:"
+
+#~ msgid "Updates: "
+#~ msgstr "আপডেট সমুহ: "
+
+#~ msgid "Development release not supported by service"
+#~ msgstr "সার্ভিস ডেভেলপমেন্ট সংস্করণ সমর্থন করে না"
+
+#~ msgid "Too old release not supported by service"
+#~ msgstr "সার্ভিস খুব পুরানো সংস্করণ সমর্থন করে না"
+
+#~ msgid "Unknown state"
+#~ msgstr "অজ্ঞাত অবস্হা"
+
+#~ msgid "Online services disabled. Contact Mandriva Online site\n"
+#~ msgstr ""
+#~ "অনলাইন পরিসেবা নিষ্ক্রিয় করা রয়েছে। ম্যান্ড্রেকঅনলাইন সাইটের সাথে যোগাযোগ করুন\n"
+
+#~ msgid "Wrong Password.\n"
+#~ msgstr "ভূল পাসওয়ার্ড।\n"
+
+#~ msgid "Wrong Action or host or login.\n"
+#~ msgstr "কাজ অথবা হোস্ট অথবা লগ-ইন সঠিক নয়।\n"
+
+#~ msgid ""
+#~ "Something is wrong with your network settings (check your route, firewall "
+#~ "or proxy settings)\n"
+#~ msgstr ""
+#~ "আপনার নেটওয়ার্ক সেটিংস এ কিছু সমস্যা হয়েছে (আপনার route, firewall or proxy "
+#~ "সেটিংস পুনায় পরীক্ষা করুন)\n"
+
+#~ msgid ""
+#~ "Problem occured while connecting to the server, please contact the "
+#~ "support team"
+#~ msgstr ""
+#~ "সার্ভারের সাথে সংযোগের সময় সমস্যা হয়েছে, অনুগ্রহ করে পরিসেবা দলের সাথে "
+#~ "যোগাযোগ করুন"
+
+#~ msgid "Response from Mandriva Online server\n"
+#~ msgstr "ম্যান্ড্রিব অনলাইন সার্ভারের উত্তর\n"
+
+#~ msgid "No check"
+#~ msgstr "কোন পরীক্ষণ নেই"
+
+#~ msgid "Checking config file: Not present\n"
+#~ msgstr "config ফাইল পরীক্ষা করা হচ্ছে: উপস্থিত নেই\n"
+
+#~ msgid "Logs"
+#~ msgstr "লগ"
+
+#~ msgid "Clear"
+#~ msgstr "পরিষ্কার করো"
+
+#~ msgid ""
+#~ "mdonline version %s\n"
+#~ "Copyright (C) %s Mandriva.\n"
+#~ "This is free software and may be redistributed under the terms of the GNU "
+#~ "GPL.\n"
+#~ "\n"
+#~ "usage:\n"
+#~ msgstr ""
+#~ "mdonline version %s\n"
+#~ "কপিরাইট %s Mandriva.\n"
+#~ "এই সফ্‌টওয়ারটি ফ্রি এবং গনুহ্‌ (GNU) GPL terms এর মাধ্যমে বিতরণ করা যাবে।\n"
+#~ "\n"
+#~ "ব্যবহার বিধি:\n"
+
+#~ msgid "Mandriva Online"
+#~ msgstr "ম্যান্ড্রিব অনলাইন"
+
+#~ msgid "I already have an account"
+#~ msgstr "ইতিমধ্যেই আমার একটি একাউন্ট আছে"
+
+#~ msgid "I want to subscribe"
+#~ msgstr "আমি গ্রহন করিতে ইচ্ছুক"
+
+#~ msgid "Mr."
+#~ msgstr "জনাব"
+
+#~ msgid "Mrs."
+#~ msgstr "জনাবা"
+
+#~ msgid "Ms."
+#~ msgstr "জনাবা"
+
+#~ msgid "Reading configuration\n"
+#~ msgstr "কনফিগারেশন পড়া হচ্ছে\n"
+
+#~ msgid ""
+#~ "This assistant will help you to upload your configuration\n"
+#~ "(packages, hardware configuration) to a centralized database in\n"
+#~ "order to keep you informed about security updates and useful upgrades.\n"
+#~ msgstr ""
+#~ "এই সাহায্যকারী আপনার কনফিগারেশন (প্যাকেজ, হার্ডওয়্যার কনফিগারেশন)\n"
+#~ "একটি কেন্দ্রীয় ডাটাবেসে আপলোড করতে সাহায্য করবে যাতে\n"
+#~ "আপনাকে সুরক্ষা সংক্রান্ত এবং অন্যান্য প্রয়োজনীয় আপডেট সম্বন্ধে জানানো করা যায়।\n"
+
+#~ msgid "Account creation or authentication"
+#~ msgstr "একাউন্ট তৈরি অথবা পরিচয় প্রমাণ প্রক্রিয়া"
+
+#~ msgid "Enter your Mandriva Online login, password and machine name:"
+#~ msgstr "আপনার ম্যান্ড্রেকঅনলাইন লগ-ইন, পাসওয়ার্ড এবং মেশিনের নাম লিখুন:"
+
+#, fuzzy
+#~ msgid "Email address:"
+#~ msgstr "বহির্মুখী মেইল অ্যাড্রেস"
+
+#~ msgid "Country"
+#~ msgstr "দেশ"
+
+#~ msgid "Password:"
+#~ msgstr "পাসওয়ার্ড:"
+
+#, fuzzy
+#~ msgid "Machine description:"
+#~ msgstr "মেশিনের নাম:"
+
+#, fuzzy
+#~ msgid "Machine name must be 1 to 40 alphanumerical characters"
+#~ msgstr "মাউন্ট পয়েন্টগুলিতে শুধু * অক্ষর থাকবে"
+
+#~ msgid "Connecting to Mandriva Online website..."
+#~ msgstr "ম্যান্ড্রিব অনলাইন ওয়েবসাইটের সাথে সংযুক্ত হচ্ছি..."
+
+#~ msgid ""
+#~ "In order to benefit from Mandriva Online services,\n"
+#~ "we are about to upload your configuration.\n"
+#~ "\n"
+#~ "The Wizard will now send the following information to Mandriva:\n"
+#~ "\n"
+#~ "1) the list of packages you have installed on your system,\n"
+#~ "\n"
+#~ "2) your hardware configuration.\n"
+#~ "\n"
+#~ "If you feel uncomfortable by that idea, or do not want to benefit from "
+#~ "this service,\n"
+#~ "please press 'Cancel'. By pressing 'Next', you allow us to keep you "
+#~ "informed\n"
+#~ "about security updates and useful upgrades via personalized email "
+#~ "alerts.\n"
+#~ "Furthermore, you benefit from discounted paid support services on\n"
+#~ "www.mandrivaexpert.com."
+#~ msgstr ""
+#~ "ম্যান্ড্রেকঅনলাইন-এর পরিসেবা থেকে উপকৃত হওয়ার আশায়,\n"
+#~ "আপনার কনফিগারেশনটি এখন আপলোড করা হবে।\n"
+#~ "\n"
+#~ "উইজার্ডটি নিম্নোক্ত তথ্যগুলো Mandriva-এ এখন প্রেরণ করবে:\n"
+#~ "\n"
+#~ "১) আপনার সিস্টেমে ইনস্টল করা প্যাকেজের তালিকা,\n"
+#~ "\n"
+#~ "২) আপনার হার্ডওয়্যার কনফিগারেশন.\n"
+#~ "\n"
+#~ "যদি আপনি এই পরিসেবা থেকে উপকৃত হতে অনিচ্ছুক হন তাহলে ,\n"
+#~ "অনুগ্রহ করে 'বাতিল' ক্লিক করুন। 'পরবর্তী'-এ ক্লিক করলে আমরা আপনাকে সুরক্ষা "
+#~ "সংক্রান্ত এবং \n"
+#~ "অন্যান্য প্রয়োজনীয় তথ্য ব্যাক্তিগত ই-মেইলের দ্বারা পাঠাতে থাকব।\n"
+#~ "উপরন্তু, আপনি www.mandrivaexpert.com-র ডিস্কাউন্টসহ মূল্য প্রদত্ত\n"
+#~ "পরিসেবা পাবেন।"
+
+#~ msgid "Connection problem"
+#~ msgstr "সংযোগ সমস্যা"
+
+#~ msgid "Problem occurs when uploading files, please try again"
+#~ msgstr "ফাইল আপলোড করার সময় সমস্যা হয়েছে, অনুগ্রহ করে পুনরায় চেষ্টা করুন"
+
+#~ msgid "Create a Mandriva Online Account"
+#~ msgstr "ম্যান্ড্রেকঅনলাইনে একটি অ্যাকাউন্ট তৈরি করো"
+
+#, fuzzy
+#~ msgid "Greeting:"
+#~ msgstr "সবুজ"
+
+#~ msgid "First name:"
+#~ msgstr "প্রথম নাম:"
+
+#, fuzzy
+#~ msgid "Last name:"
+#~ msgstr "প্রথম নাম:"
+
+#~ msgid "Confirm Password:"
+#~ msgstr "পাসওয়ার্ড নিশ্চিত করুন:"
+
+#~ msgid ""
+#~ "The passwords do not match\n"
+#~ " Please try again\n"
+#~ msgstr ""
+#~ "পাসওয়ার্ড মেলেনি\n"
+#~ " অনুগ্রহ করে পুনরায় চেষ্টা করুন\n"
+
+#, fuzzy
+#~ msgid "Please fill in each field"
+#~ msgstr "অনুগ্রহ করে সকল ক্ষেত্র পুরন করুন\n"
+
+#~ msgid "Not a valid mail address!\n"
+#~ msgstr "এটি বৈধ ই-মেইল ঠিকানা নয়!\n"
+
+#~ msgid ""
+#~ "Mandriva Online Account successfully created.\n"
+#~ "Please click \"Next\" to authenticate and upload your configuration\n"
+#~ msgstr ""
+#~ "ম্যান্ড্রেকঅনলাইন একাউন্ট সাফল্যের সাথে তৈরি হয়েছে।\n"
+#~ "অনুগ্রহ করে পরিচয় প্রমাণ এবং আপনার কনফিগারেশন আপলোড করার জন্য \"পরবর্তী\" ক্লিক "
+#~ "করুন\n"
+
+#~ msgid "Your upload was successful!"
+#~ msgstr "আপনার আপলোড সাফল্যের সাথে সম্পন্ন হয়েছে!"
+
+#~ msgid ""
+#~ "From now you will receive on security and updates \n"
+#~ "announcements thanks to Mandriva Online."
+#~ msgstr ""
+#~ "ম্যান্ড্রেকঅনলাইন-এর জন্য, এখন থেকে আপনি নিরাপত্তা এবং \n"
+#~ "আপডেট সংক্রান্ত ঘোষনাগুলো নিয়মিত পাবেন।"
+
+#~ msgid ""
+#~ "Mandriva Online offers you the ability to automate the updates.\n"
+#~ "A program will run regulary in your system waiting for new updates\n"
+#~ msgstr ""
+#~ "ম্যান্ড্রেকঅনলাইন আপনাকে স্বয়ংক্রিয়ভাবে আপডেট পেতে সাহায্য করে।\n"
+#~ "একটি প্রোগ্রাম নুতন আপডেটের অপেক্ষায় আপনার সিস্টেমে নিয়মিত চলবে\n"
+
+#~ msgid "Congratulations"
+#~ msgstr "অভিন্দন"
+
+#~ msgid "Your Mandriva Online account has been successfully configured\n"
+#~ msgstr "আপনার ম্যান্ড্রেকঅনলাইন একাউন্ট সাফল্যের সাথে কনফিগার করা হয়েছে\n"
+
+#~ msgid "Configuration uploaded successfully"
+#~ msgstr "অভিন্দন, আপলোড সাফল্যের সাথে সম্পন্ন হয়েছে"
+
+#~ msgid "Problem uploading configuration"
+#~ msgstr "আপলোড করতে সমস্যা হয়েছে"
+
+#~ msgid ""
+#~ "Cannot connect to Mandriva Online website: wrong login/password or router/"
+#~ "firewall bad settings"
+#~ msgstr ""
+#~ "ম্যান্ড্রেকঅনলাইন ওয়েবসাইটের সাথে সংযোগ করা যাচ্ছ না: ভুল লগ-ইন/পাসওয়ার্ড অথবা "
+#~ "রুটার/ফায়ারওয়াল মন্দ বৈশিষ্ট্যাবলী"
+
 #~ msgid "  --applet\t\t- launch Mandriva Update.\n"
 #~ msgstr "  --applet\t\t- Mandriva Update চালু করো।\n"
 
diff --git a/po/br.po b/po/br.po
index 9e504fdb..4df10672 100644
--- a/po/br.po
+++ b/po/br.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-09 16:26+0200\n"
+"POT-Creation-Date: 2008-02-21 18:21+0100\n"
 "PO-Revision-Date: 2007-03-22 12:47+0100\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandriva.com>\n"
 "Language-Team: brezhoneg <LL@li.org>\n"
@@ -16,72 +16,60 @@ 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:94
+#: ../mdkapplet:88
 #, c-format
 msgid "Will check updates at %s"
 msgstr ""
 
-#: ../mdkapplet:103
+#: ../mdkapplet:97
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "Bremañaet eo ho reiziad"
 
-#: ../mdkapplet:109
+#: ../mdkapplet:103
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
 "support@mandrivaonline.com"
 msgstr ""
 
-#: ../mdkapplet:115
+#: ../mdkapplet:110
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "Gortozit mar plij, o klask ar pakadoù hegerz ..."
 
-#: ../mdkapplet:121
+#: ../mdkapplet:116
 #, c-format
 msgid "New updates are available for your system"
 msgstr ""
 
-#: ../mdkapplet:127
-#, c-format
-msgid "New bundles are available for your system"
-msgstr ""
-
-#: ../mdkapplet:133
-#, c-format
-msgid "Service is not configured. Please click on \"Configure the service\""
-msgstr ""
-"N'eo ket kefluniet ar servij. Klikit ouzh « Kefluniañ ar servij » mar plij"
-
-#: ../mdkapplet:139
+#: ../mdkapplet:122
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "Marv eo ar rouedad. Kefluniañ anezhañ mar plij"
 
-#: ../mdkapplet:145
+#: ../mdkapplet:128
 #, 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"
+msgstr "N'eo ket bev ar servij. Klikit ouzh « Lec'hienn gwiad Online » mar plij"
 
-#: ../mdkapplet:151 ../mdkapplet:182
+#: ../mdkapplet:134 ../mdkapplet:165
 #, c-format
 msgid "urpmi database locked"
 msgstr "krouilhet eo stlennvon urpmi"
 
-#: ../mdkapplet:157
+#: ../mdkapplet:140
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
-#: ../mdkapplet:163
+#: ../mdkapplet:146
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
 msgstr ""
 
-#: ../mdkapplet:169
+#: ../mdkapplet:152
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -92,551 +80,131 @@ msgid ""
 "Then, restart \"%s\"."
 msgstr ""
 
-#: ../mdkapplet:174
+#: ../mdkapplet:157
 #, c-format
 msgid "Enabled"
 msgstr "Bevaatet "
 
-#: ../mdkapplet:187
+#: ../mdkapplet:170
 #, c-format
 msgid "Error updating media"
 msgstr "Fazi en ur bremañaat ar medium"
 
-#: ../mdkapplet:202
+#: ../mdkapplet:185
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr ""
 
-#: ../mdkapplet:207
+#: ../mdkapplet:190
 #, c-format
 msgid "Packages are up to date"
 msgstr "Bremañaet eo ar pakadoù"
 
-#: ../mdkapplet:212
+#: ../mdkapplet:195
 #, c-format
 msgid "Failed to open urpmi database"
 msgstr "N'hell ket bet digoret stlennvon urpmi"
 
-#: ../mdkapplet:217 ../mdkapplet:324
+#: ../mdkapplet:200
 #, c-format
 msgid "Install updates"
 msgstr "Bremañaat"
 
-#: ../mdkapplet:218
-#, c-format
-msgid "Configure the service"
-msgstr "Kefluniañ ar servij"
-
-#: ../mdkapplet:219
+#: ../mdkapplet:201
 #, c-format
 msgid "Check Updates"
 msgstr ""
 
-#: ../mdkapplet:220 ../mdkapplet:327 ../mdkonline:114 ../mdkonline:155
-#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
-#, c-format
-msgid "Please wait"
-msgstr "Gortozit mar plij"
-
-#: ../mdkapplet:220 ../mdkapplet:326 ../mdkapplet:327
-#, c-format
-msgid "Check updates"
-msgstr ""
-
-#: ../mdkapplet:223 ../mdkapplet:648
-#, c-format
-msgid "Online WebSite"
-msgstr "Lec'hienn gwiad Online"
-
-#: ../mdkapplet:224
+#: ../mdkapplet:202
 #, c-format
 msgid "Configure Network"
 msgstr "Kefluniañ ar rouedad"
 
-#: ../mdkapplet:225
-#, c-format
-msgid "Configure Now!"
-msgstr "Kefluniañ bremanñ !"
-
-#: ../mdkapplet:313 ../mdkapplet:392
-#, c-format
-msgid "Mandriva Linux Updates Applet"
-msgstr ""
-
-#: ../mdkapplet:322
-#, c-format
-msgid "Actions"
-msgstr "Ober"
-
-#: ../mdkapplet:325
-#, c-format
-msgid "Configure"
-msgstr "Kefluniañ"
-
-#: ../mdkapplet:329
-#, c-format
-msgid "See logs"
-msgstr "Sellout ouzh ar c'herlevr"
-
-#: ../mdkapplet:332
-#, c-format
-msgid "Status"
-msgstr "Stad"
-
-#: ../mdkapplet:336 ../mdkapplet:597
-#, c-format
-msgid "Close"
-msgstr "Serriñ"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Network Connection: "
-msgstr "Kevreadenn ar rouedad :"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Up"
-msgstr "Bev"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Down"
-msgstr "Marv"
-
-#: ../mdkapplet:366
-#, c-format
-msgid "Last check: "
-msgstr ""
-
-#: ../mdkapplet:367 ../mdkonline:145
-#, c-format
-msgid "Machine name:"
-msgstr "Anv an ostiz :"
-
-#: ../mdkapplet:368
-#, c-format
-msgid "Updates: "
-msgstr ""
-
-#: ../mdkapplet:372
+#: ../mdkapplet:283
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "O loc'hañ drakconnect\n"
 
-#: ../mdkapplet:375
+#: ../mdkapplet:286
 #, c-format
 msgid "Mandriva Online seems to be reinstalled, reloading applet ...."
 msgstr ""
 
-#: ../mdkapplet:383
+#: ../mdkapplet:294
 #, c-format
 msgid "Launching MandrivaUpdate\n"
 msgstr "O loc'hañ MandrivaUpdate\n"
 
-#: ../mdkapplet:398
-#, c-format
-msgid "Computing new updates...\n"
-msgstr ""
-
-#: ../mdkapplet:399
-#, c-format
-msgid "Connecting to"
-msgstr "O kevreañ ouzh"
-
-#: ../mdkapplet:467 ../mdkupdate:159 ../mdkupdate:188
-#, c-format
-msgid "An error occurred"
-msgstr "Ur fazi zo bet"
-
-#: ../mdkapplet:475
-#, c-format
-msgid "Development release not supported by service"
-msgstr ""
-
-#: ../mdkapplet:476
-#, c-format
-msgid "Too old release not supported by service"
-msgstr ""
-
-#: ../mdkapplet:477
+#: ../mdkapplet:303
 #, c-format
-msgid "Unknown state"
-msgstr "Dianav eo ar stad"
-
-#: ../mdkapplet:478
-#, c-format
-msgid "Online services disabled. Contact Mandriva Online site\n"
-msgstr ""
-
-#: ../mdkapplet:479
-#, c-format
-msgid "Wrong Password.\n"
-msgstr "N'eo ket un tremenger mat.\n"
-
-#: ../mdkapplet:480
-#, c-format
-msgid "Wrong Action or host or login.\n"
-msgstr ""
-
-#: ../mdkapplet:481
-#, c-format
-msgid ""
-"Something is wrong with your network settings (check your route, firewall or "
-"proxy settings)\n"
+msgid "Mandriva Linux Updates Applet"
 msgstr ""
 
-#: ../mdkapplet:483
+#: ../mdkapplet:308
 #, c-format
-msgid ""
-"Problem occured while connecting to the server, please contact the support "
-"team"
+msgid "Computing new updates...\n"
 msgstr ""
 
-#: ../mdkapplet:487
+#: ../mdkapplet:309
 #, c-format
-msgid "Response from Mandriva Online server\n"
-msgstr "Respont ar servijer Mandriva Online\n"
+msgid "Connecting to"
+msgstr "O kevreañ ouzh"
 
-#: ../mdkapplet:490
+#: ../mdkapplet:386
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Bremañaet eo ar reiziad\n"
 
-#: ../mdkapplet:527
-#, c-format
-msgid "No check"
-msgstr ""
-
-#: ../mdkapplet:541
-#, c-format
-msgid "Checking config file: Not present\n"
-msgstr ""
-
-#: ../mdkapplet:544
+#: ../mdkapplet:415
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr ""
 
-#: ../mdkapplet:587
+#: ../mdkapplet:457 ../mdkupdate:118 ../mdkupdate:164
 #, c-format
-msgid "Logs"
-msgstr "Kazetennoù"
-
-#: ../mdkapplet:603
-#, c-format
-msgid "Clear"
-msgstr "Skarañ"
+msgid "Warning"
+msgstr "Ho evezh"
 
-#: ../mdkapplet:629
+#: ../mdkapplet:468
 #, c-format
 msgid "About..."
 msgstr "A-brepoz ..."
 
-#: ../mdkapplet:631
+#: ../mdkapplet:472
 #, c-format
 msgid "Mandriva Online %s"
 msgstr "Mandriva Online %s"
 
-#: ../mdkapplet:635
+#: ../mdkapplet:473
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Copyright (C) %s gant Mandriva"
 
-#: ../mdkapplet:647
+#: ../mdkapplet:476
 #, c-format
 msgid "Mandriva Online gives access to Mandriva web services."
 msgstr ""
 
-#: ../mdkapplet:655
-#, c-format
-msgid "Always launch on startup"
-msgstr "Loc'hañ atav pa loc'her ar reizhiad"
-
-#: ../mdkapplet:657
-#, c-format
-msgid "Quit"
-msgstr "Kuitaat"
-
-#: ../mdkonline:58
-#, c-format
-msgid ""
-"mdonline version %s\n"
-"Copyright (C) %s Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"mdonline version %s\n"
-"Copyright (C) %s Mandriva.\n"
-"Ur meziant frank eo an hini-mañ ha moien zo da zal'ch anezhañ hervez GNU "
-"GPL.\n"
-"\n"
-"arveriadur :\n"
-
-#: ../mdkonline:63 ../mdkupdate:73
-#, c-format
-msgid "  --help\t\t- print this help message.\n"
-msgstr ""
-
-#: ../mdkonline:64
-#, c-format
-msgid "  --box=\t\t\t- hostname.\n"
-msgstr ""
-
-#: ../mdkonline:65
-#, c-format
-msgid "  --country\t\t\t- name of country of the user. \n"
-msgstr ""
-
-#: ../mdkonline:66
-#, c-format
-msgid "  --interactive\t\t- use the interactive mode.\n"
-msgstr ""
-
-#: ../mdkonline:67
-#, c-format
-msgid "  --nointeractive\t- use the non-interactive mode.\n"
-msgstr ""
-
-#: ../mdkonline:68
-#, c-format
-msgid "  --login=\t\t     - login name of the user.\n"
-msgstr ""
-
-#: ../mdkonline:69
-#, c-format
-msgid "  --pass=\t\t\t- password  of the user.\n"
-msgstr ""
-
-#: ../mdkonline:87 ../mdkonline:120
-#, c-format
-msgid "Mandriva Online"
-msgstr "Mandriva Online"
-
-#: ../mdkonline:90
-#, c-format
-msgid "I already have an account"
-msgstr "Ur gont 'meus adarre"
-
-#: ../mdkonline:91
-#, c-format
-msgid "I want to subscribe"
-msgstr "C'hoant meus d'enskrivañ"
-
-#: ../mdkonline:96
-#, c-format
-msgid "Mr."
-msgstr "Ao."
-
-#: ../mdkonline:96
-#, c-format
-msgid "Mrs."
-msgstr "Itr."
-
-#: ../mdkonline:96
-#, c-format
-msgid "Ms."
-msgstr "Dim."
-
-#: ../mdkonline:114
-#, c-format
-msgid "Reading configuration\n"
-msgstr "O lenn ar gefluniadur\n"
-
-#: ../mdkonline:123
-#, c-format
-msgid ""
-"This assistant will help you to upload your configuration\n"
-"(packages, hardware configuration) to a centralized database in\n"
-"order to keep you informed about security updates and useful upgrades.\n"
-msgstr ""
-
-#: ../mdkonline:131
-#, c-format
-msgid "Account creation or authentication"
-msgstr "Krouidigezh pe dilesadur ar gont"
-
-#: ../mdkonline:136
-#, c-format
-msgid "Enter your Mandriva Online login, password and machine name:"
-msgstr "Roit hoc'h ereañ, tremenger hag ho anv ardivink Mandriva Online :"
-
-#: ../mdkonline:142 ../mdkonline:195
-#, c-format
-msgid "Email address:"
-msgstr "Chomlec'h postel :"
-
-#: ../mdkonline:143
-#, c-format
-msgid "Country"
-msgstr "Bro"
-
-#: ../mdkonline:144 ../mdkonline:196
-#, c-format
-msgid "Password:"
-msgstr "Tremenger :"
-
-#: ../mdkonline:146
-#, c-format
-msgid "Machine description:"
-msgstr "Deskrivadur an ostiz :"
-
-#: ../mdkonline:147
-#, c-format
-msgid "(Ex: My Home Office's Computer)"
-msgstr "(ds: Urhziataer burev ma zi)"
-
-#: ../mdkonline:152 ../mdkonline:159 ../mdkonline:180 ../mdkonline:204
-#: ../mdkonline:208 ../mdkonline:212 ../mdkonline:217 ../mdkupdate:141
-#: ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
-#, c-format
-msgid "Error"
-msgstr "Fazi"
-
-#: ../mdkonline:152
-#, c-format
-msgid "Machine name must be 1 to 40 alphanumerical characters"
-msgstr ""
-
-#: ../mdkonline:155
-#, c-format
-msgid "Connecting to Mandriva Online website..."
-msgstr "O kevreañ ouzh al lec'hienn Mandriva Online ..."
-
-#: ../mdkonline:167
-#, c-format
-msgid ""
-"In order to benefit from Mandriva Online services,\n"
-"we are about to upload your configuration.\n"
-"\n"
-"The Wizard will now send the following information to Mandriva:\n"
-"\n"
-"1) the list of packages you have installed on your system,\n"
-"\n"
-"2) your hardware configuration.\n"
-"\n"
-"If you feel uncomfortable by that idea, or do not want to benefit from this "
-"service,\n"
-"please press 'Cancel'. By pressing 'Next', you allow us to keep you "
-"informed\n"
-"about security updates and useful upgrades via personalized email alerts.\n"
-"Furthermore, you benefit from discounted paid support services on\n"
-"www.mandrivaexpert.com."
-msgstr ""
-
-#: ../mdkonline:180
-#, c-format
-msgid "Connection problem"
-msgstr "Kudenn ar gevreadenn"
-
-#: ../mdkonline:180
-#, c-format
-msgid "Problem occurs when uploading files, please try again"
-msgstr "Fazi en ur ezkargañ ar restroù; klaskit adarre mar plij"
-
-#: ../mdkonline:187
-#, c-format
-msgid "Create a Mandriva Online Account"
-msgstr "Krouiñ ur gont Mandriva Online"
-
-#. -PO: that is for things like "Mr", "Ms",...
-#: ../mdkonline:192
-#, c-format
-msgid "Greeting:"
-msgstr ""
-
-#: ../mdkonline:193
-#, c-format
-msgid "First name:"
-msgstr "Anv-bihan :"
-
-#: ../mdkonline:194
-#, c-format
-msgid "Last name:"
-msgstr "Anv-bras :"
-
-#: ../mdkonline:197
-#, c-format
-msgid "Confirm Password:"
-msgstr "Tremenger (adarre) :"
-
-#: ../mdkonline:204
-#, c-format
-msgid ""
-"The passwords do not match\n"
-" Please try again\n"
-msgstr ""
-"An tremegerioù ne glot ket\n"
-"Klask adarre mar plij\n"
-
-#: ../mdkonline:208
-#, c-format
-msgid "Please fill in each field"
-msgstr "Leuniit pep dachenn"
-
-#: ../mdkonline:212
-#, c-format
-msgid "Not a valid mail address!\n"
-msgstr "N'eo ket ur mailh mat !\n"
-
-#: ../mdkonline:217
-#, c-format
-msgid "Creating account failed!"
-msgstr "Sac'het eo krouiñ ar gont !"
-
-#: ../mdkonline:225
-#, c-format
-msgid ""
-"Mandriva Online Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
-msgstr ""
-
-#: ../mdkonline:229
-#, c-format
-msgid "Your upload was successful!"
-msgstr ""
-
-#: ../mdkonline:229
-#, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandriva Online."
-msgstr ""
-
-#: ../mdkonline:229
-#, c-format
-msgid ""
-"Mandriva Online offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
-msgstr ""
-
-#: ../mdkonline:238
-#, c-format
-msgid "Congratulations"
-msgstr "Gourc'hemennoù"
-
-#: ../mdkonline:238
+#: ../mdkapplet:478
 #, c-format
-msgid "Your Mandriva Online account has been successfully configured\n"
-msgstr ""
+msgid "Online WebSite"
+msgstr "Lec'hienn gwiad Online"
 
-#: ../mdkonline:253
+#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
+#: ../mdkapplet:483
 #, c-format
-msgid "Configuration uploaded successfully"
+msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
 
-#: ../mdkonline:254
+#: ../mdkapplet:492
 #, c-format
-msgid "Problem uploading configuration"
-msgstr "Fazi en ur ezkargañ ar gefluniadur"
+msgid "Always launch on startup"
+msgstr "Loc'hañ atav pa loc'her ar reizhiad"
 
-#: ../mdkonline:256
+#: ../mdkapplet:494
 #, c-format
-msgid ""
-"Cannot connect to Mandriva Online website: wrong login/password or router/"
-"firewall bad settings"
-msgstr ""
+msgid "Quit"
+msgstr "Kuitaat"
 
 #: ../mdkonline.pm:207
 #, c-format
@@ -781,6 +349,11 @@ msgstr ""
 "\n"
 "arveriadur :\n"
 
+#: ../mdkupdate:73
+#, c-format
+msgid "  --help\t\t- print this help message.\n"
+msgstr ""
+
 #: ../mdkupdate:74
 #, c-format
 msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
@@ -808,11 +381,6 @@ msgid ""
 "file.\n"
 msgstr ""
 
-#: ../mdkupdate:118 ../mdkupdate:164
-#, c-format
-msgid "Warning"
-msgstr "Ho evezh"
-
 #. -PO: here Live Install is currently *NOT* translated on the desktop, so it's better to keep as it:
 #: ../mdkupdate:120
 #, c-format
@@ -821,11 +389,21 @@ msgid ""
 "Install' wizard."
 msgstr ""
 
+#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
+#, c-format
+msgid "Please wait"
+msgstr "Gortozit mar plij"
+
 #: ../mdkupdate:123 ../mdkupdate:174
 #, c-format
 msgid "Preparing..."
 msgstr "Emaon o prientiñ ..."
 
+#: ../mdkupdate:141 ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
+#, c-format
+msgid "Error"
+msgstr "Fazi"
+
 #: ../mdkupdate:141
 #, c-format
 msgid ""
@@ -834,6 +412,11 @@ msgid ""
 "%s"
 msgstr ""
 
+#: ../mdkupdate:159 ../mdkupdate:188
+#, c-format
+msgid "An error occurred"
+msgstr "Ur fazi zo bet"
+
 #: ../mdkupdate:164
 #, c-format
 msgid ""
@@ -858,6 +441,158 @@ msgstr "O staliañ pakadoù ...\n"
 msgid "Unable to update packages from update_source medium.\n"
 msgstr ""
 
+#~ msgid "Service is not configured. Please click on \"Configure the service\""
+#~ msgstr ""
+#~ "N'eo ket kefluniet ar servij. Klikit ouzh « Kefluniañ ar servij » mar plij"
+
+#~ msgid "Configure the service"
+#~ msgstr "Kefluniañ ar servij"
+
+#~ msgid "Configure Now!"
+#~ msgstr "Kefluniañ bremanñ !"
+
+#~ msgid "Actions"
+#~ msgstr "Ober"
+
+#~ msgid "Configure"
+#~ msgstr "Kefluniañ"
+
+#~ msgid "See logs"
+#~ msgstr "Sellout ouzh ar c'herlevr"
+
+#~ msgid "Status"
+#~ msgstr "Stad"
+
+#~ msgid "Close"
+#~ msgstr "Serriñ"
+
+#~ msgid "Network Connection: "
+#~ msgstr "Kevreadenn ar rouedad :"
+
+#~ msgid "Up"
+#~ msgstr "Bev"
+
+#~ msgid "Down"
+#~ msgstr "Marv"
+
+#~ msgid "Machine name:"
+#~ msgstr "Anv an ostiz :"
+
+#~ msgid "Unknown state"
+#~ msgstr "Dianav eo ar stad"
+
+#~ msgid "Wrong Password.\n"
+#~ msgstr "N'eo ket un tremenger mat.\n"
+
+#~ msgid "Response from Mandriva Online server\n"
+#~ msgstr "Respont ar servijer Mandriva Online\n"
+
+#~ msgid "Logs"
+#~ msgstr "Kazetennoù"
+
+#~ msgid "Clear"
+#~ msgstr "Skarañ"
+
+#~ msgid ""
+#~ "mdonline version %s\n"
+#~ "Copyright (C) %s Mandriva.\n"
+#~ "This is free software and may be redistributed under the terms of the GNU "
+#~ "GPL.\n"
+#~ "\n"
+#~ "usage:\n"
+#~ msgstr ""
+#~ "mdonline version %s\n"
+#~ "Copyright (C) %s Mandriva.\n"
+#~ "Ur meziant frank eo an hini-mañ ha moien zo da zal'ch anezhañ hervez GNU "
+#~ "GPL.\n"
+#~ "\n"
+#~ "arveriadur :\n"
+
+#~ msgid "Mandriva Online"
+#~ msgstr "Mandriva Online"
+
+#~ msgid "I already have an account"
+#~ msgstr "Ur gont 'meus adarre"
+
+#~ msgid "I want to subscribe"
+#~ msgstr "C'hoant meus d'enskrivañ"
+
+#~ msgid "Mr."
+#~ msgstr "Ao."
+
+#~ msgid "Mrs."
+#~ msgstr "Itr."
+
+#~ msgid "Ms."
+#~ msgstr "Dim."
+
+#~ msgid "Reading configuration\n"
+#~ msgstr "O lenn ar gefluniadur\n"
+
+#~ msgid "Account creation or authentication"
+#~ msgstr "Krouidigezh pe dilesadur ar gont"
+
+#~ msgid "Enter your Mandriva Online login, password and machine name:"
+#~ msgstr "Roit hoc'h ereañ, tremenger hag ho anv ardivink Mandriva Online :"
+
+#~ msgid "Email address:"
+#~ msgstr "Chomlec'h postel :"
+
+#~ msgid "Country"
+#~ msgstr "Bro"
+
+#~ msgid "Password:"
+#~ msgstr "Tremenger :"
+
+#~ msgid "Machine description:"
+#~ msgstr "Deskrivadur an ostiz :"
+
+#~ msgid "(Ex: My Home Office's Computer)"
+#~ msgstr "(ds: Urhziataer burev ma zi)"
+
+#~ msgid "Connecting to Mandriva Online website..."
+#~ msgstr "O kevreañ ouzh al lec'hienn Mandriva Online ..."
+
+#~ msgid "Connection problem"
+#~ msgstr "Kudenn ar gevreadenn"
+
+#~ msgid "Problem occurs when uploading files, please try again"
+#~ msgstr "Fazi en ur ezkargañ ar restroù; klaskit adarre mar plij"
+
+#~ msgid "Create a Mandriva Online Account"
+#~ msgstr "Krouiñ ur gont Mandriva Online"
+
+#~ msgid "First name:"
+#~ msgstr "Anv-bihan :"
+
+#~ msgid "Last name:"
+#~ msgstr "Anv-bras :"
+
+#~ msgid "Confirm Password:"
+#~ msgstr "Tremenger (adarre) :"
+
+#~ msgid ""
+#~ "The passwords do not match\n"
+#~ " Please try again\n"
+#~ msgstr ""
+#~ "An tremegerioù ne glot ket\n"
+#~ "Klask adarre mar plij\n"
+
+#~ msgid "Please fill in each field"
+#~ msgstr "Leuniit pep dachenn"
+
+#~ msgid "Not a valid mail address!\n"
+#~ msgstr "N'eo ket ur mailh mat !\n"
+
+#~ msgid "Creating account failed!"
+#~ msgstr "Sac'het eo krouiñ ar gont !"
+
+#~ msgid "Congratulations"
+#~ msgstr "Gourc'hemennoù"
+
+#~ msgid "Problem uploading configuration"
+#~ msgstr "Fazi en ur ezkargañ ar gefluniadur"
+
 #~ msgid "Cannot get list of updates: %s"
 #~ msgstr "N'hell ket bet tegaset roll nevezioù : %s"
 
diff --git a/po/bs.po b/po/bs.po
index 688aa1fd..6f6efa65 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: 2007-08-09 16:26+0200\n"
+"POT-Creation-Date: 2008-02-21 18:21+0100\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"
@@ -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:94
+#: ../mdkapplet:88
 #, fuzzy, c-format
 msgid "Will check updates at %s"
 msgstr "Provjeri ispravke"
 
-#: ../mdkapplet:103
+#: ../mdkapplet:97
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "Vaš sistem je up-to-date"
 
-#: ../mdkapplet:109
+#: ../mdkapplet:103
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -42,54 +42,44 @@ msgstr ""
 "Problem kod podešavanja servisa. Provjerite logove i pošaljite mail za "
 "support@mandrivaonline.com"
 
-#: ../mdkapplet:115
+#: ../mdkapplet:110
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "Molim sačekajte, tražim dostupne pakete..."
 
-#: ../mdkapplet:121
+#: ../mdkapplet:116
 #, c-format
 msgid "New updates are available for your system"
 msgstr "Nove ispravke su dostupne za vaš sistem"
 
-#: ../mdkapplet:127
-#, c-format
-msgid "New bundles are available for your system"
-msgstr "Novi bundles su dostupni za vaš sistem"
-
-#: ../mdkapplet:133
-#, c-format
-msgid "Service is not configured. Please click on \"Configure the service\""
-msgstr "Servis nije podešen. Kliknite na \"Podesi servis\""
-
-#: ../mdkapplet:139
+#: ../mdkapplet:122
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "Mreža ne radi. Podesite vašu mrežu"
 
-#: ../mdkapplet:145
+#: ../mdkapplet:128
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "Servis nije aktiviran. Kliknite na \"Online web stranica\""
 
-#: ../mdkapplet:151 ../mdkapplet:182
+#: ../mdkapplet:134 ../mdkapplet:165
 #, fuzzy, c-format
 msgid "urpmi database locked"
 msgstr "urpmi baza podataka je zaključana"
 
-#: ../mdkapplet:157
+#: ../mdkapplet:140
 #, 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:163
+#: ../mdkapplet:146
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
 msgstr ""
 
-#: ../mdkapplet:169
+#: ../mdkapplet:152
 #, fuzzy, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -105,581 +95,131 @@ msgstr ""
 "\n"
 "Zatim, restartujte %s."
 
-#: ../mdkapplet:174
+#: ../mdkapplet:157
 #, c-format
 msgid "Enabled"
 msgstr "Uključeno"
 
-#: ../mdkapplet:187
+#: ../mdkapplet:170
 #, fuzzy, c-format
 msgid "Error updating media"
 msgstr "Ažuriram medije...\n"
 
-#: ../mdkapplet:202
+#: ../mdkapplet:185
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr "Provjeravam... Ispravke su dostupne\n"
 
-#: ../mdkapplet:207
+#: ../mdkapplet:190
 #, c-format
 msgid "Packages are up to date"
 msgstr ""
 
-#: ../mdkapplet:212
+#: ../mdkapplet:195
 #, fuzzy, c-format
 msgid "Failed to open urpmi database"
 msgstr "ne mogu otvoriti rpmdb"
 
-#: ../mdkapplet:217 ../mdkapplet:324
+#: ../mdkapplet:200
 #, c-format
 msgid "Install updates"
 msgstr "Instaliraj ispravke"
 
-#: ../mdkapplet:218
-#, c-format
-msgid "Configure the service"
-msgstr "Podesi servis"
-
-#: ../mdkapplet:219
+#: ../mdkapplet:201
 #, c-format
 msgid "Check Updates"
 msgstr "Provjeri da li ima ispravki"
 
-#: ../mdkapplet:220 ../mdkapplet:327 ../mdkonline:114 ../mdkonline:155
-#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
-#, c-format
-msgid "Please wait"
-msgstr "Molim sačekajte"
-
-#: ../mdkapplet:220 ../mdkapplet:326 ../mdkapplet:327
-#, c-format
-msgid "Check updates"
-msgstr "Provjeri ispravke"
-
-#: ../mdkapplet:223 ../mdkapplet:648
-#, c-format
-msgid "Online WebSite"
-msgstr "Online web stranica"
-
-#: ../mdkapplet:224
+#: ../mdkapplet:202
 #, c-format
 msgid "Configure Network"
 msgstr "Podesi mrežu"
 
-#: ../mdkapplet:225
-#, c-format
-msgid "Configure Now!"
-msgstr "Podesi odmah!"
-
-#: ../mdkapplet:313 ../mdkapplet:392
-#, c-format
-msgid "Mandriva Linux Updates Applet"
-msgstr "Mandriva Linux aplet sa ispravkama"
-
-#: ../mdkapplet:322
-#, c-format
-msgid "Actions"
-msgstr "Akcije"
-
-#: ../mdkapplet:325
-#, c-format
-msgid "Configure"
-msgstr "Podesi"
-
-#: ../mdkapplet:329
-#, c-format
-msgid "See logs"
-msgstr "Pogledaj logove"
-
-#: ../mdkapplet:332
-#, c-format
-msgid "Status"
-msgstr "Stanje"
-
-#: ../mdkapplet:336 ../mdkapplet:597
-#, c-format
-msgid "Close"
-msgstr "Zatvori"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Network Connection: "
-msgstr "Mrežna konekcija: "
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Up"
-msgstr "Radi"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Down"
-msgstr "Ne radi"
-
-#: ../mdkapplet:366
-#, c-format
-msgid "Last check: "
-msgstr "Zadnja provjera: "
-
-#: ../mdkapplet:367 ../mdkonline:145
-#, c-format
-msgid "Machine name:"
-msgstr "Naziv računara:"
-
-#: ../mdkapplet:368
-#, c-format
-msgid "Updates: "
-msgstr "Ispravke: "
-
-#: ../mdkapplet:372
+#: ../mdkapplet:283
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Pokrećem drakconnect\n"
 
-#: ../mdkapplet:375
+#: ../mdkapplet:286
 #, c-format
 msgid "Mandriva Online seems to be reinstalled, reloading applet ...."
 msgstr "Madrakeonline je izgleda ponovo instaliran, pokrećem aplet..."
 
-#: ../mdkapplet:383
+#: ../mdkapplet:294
 #, c-format
 msgid "Launching MandrivaUpdate\n"
 msgstr "Pokrećem MandrivaUpdate\n"
 
-#: ../mdkapplet:398
+#: ../mdkapplet:303
+#, c-format
+msgid "Mandriva Linux Updates Applet"
+msgstr "Mandriva Linux aplet sa ispravkama"
+
+#: ../mdkapplet:308
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Izračunavam nove ispravke...\n"
 
-#: ../mdkapplet:399
+#: ../mdkapplet:309
 #, c-format
 msgid "Connecting to"
 msgstr "Vežem se na"
 
-#: ../mdkapplet:467 ../mdkupdate:159 ../mdkupdate:188
-#, c-format
-msgid "An error occurred"
-msgstr "Došlo je do greške"
-
-#: ../mdkapplet:475
-#, c-format
-msgid "Development release not supported by service"
-msgstr "Servis ne podržava razvojno izdanje"
-
-#: ../mdkapplet:476
-#, c-format
-msgid "Too old release not supported by service"
-msgstr "Servis ne podržava prestaro izdanje"
-
-#: ../mdkapplet:477
-#, c-format
-msgid "Unknown state"
-msgstr "Nepoznato stanje"
-
-#: ../mdkapplet:478
-#, c-format
-msgid "Online services disabled. Contact Mandriva Online site\n"
-msgstr "Online servisi su isključeni. Kontaktirajte Mandriva Online stranicu\n"
-
-#: ../mdkapplet:479
-#, c-format
-msgid "Wrong Password.\n"
-msgstr "Pogrešna šifra\n"
-
-#: ../mdkapplet:480
-#, c-format
-msgid "Wrong Action or host or login.\n"
-msgstr "Pogrešna akcija, računar ili korisničko ime.\n"
-
-#: ../mdkapplet:481
-#, c-format
-msgid ""
-"Something is wrong with your network settings (check your route, firewall or "
-"proxy settings)\n"
-msgstr ""
-"Nešto nije u redu sa vašim postavkama za mrežu (provjerite postavke za "
-"route, firewall ili proxy)\n"
-
-#: ../mdkapplet:483
-#, c-format
-msgid ""
-"Problem occured while connecting to the server, please contact the support "
-"team"
-msgstr ""
-"Došlo je do problema prilikom spajanja na server, molim kontaktirajte tim za "
-"podršku"
-
-#: ../mdkapplet:487
-#, c-format
-msgid "Response from Mandriva Online server\n"
-msgstr "Odgovor sa Mandriva Online servera\n"
-
-#: ../mdkapplet:490
+#: ../mdkapplet:386
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Sistem je up-to-date\n"
 
-#: ../mdkapplet:527
-#, c-format
-msgid "No check"
-msgstr "Bez provjere"
-
-#: ../mdkapplet:541
-#, c-format
-msgid "Checking config file: Not present\n"
-msgstr "Provjeravam config datoteku: Ne postoji\n"
-
-#: ../mdkapplet:544
+#: ../mdkapplet:415
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Provjeravam mrežu: čini se da je isključena\n"
 
-#: ../mdkapplet:587
+#: ../mdkapplet:457 ../mdkupdate:118 ../mdkupdate:164
 #, c-format
-msgid "Logs"
-msgstr "Logovi"
-
-#: ../mdkapplet:603
-#, c-format
-msgid "Clear"
-msgstr "Očisti"
+msgid "Warning"
+msgstr "Upozorenje"
 
-#: ../mdkapplet:629
+#: ../mdkapplet:468
 #, c-format
 msgid "About..."
 msgstr "O programu..."
 
-#: ../mdkapplet:631
+#: ../mdkapplet:472
 #, c-format
 msgid "Mandriva Online %s"
 msgstr "Mandriva Online %s"
 
-#: ../mdkapplet:635
+#: ../mdkapplet:473
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Autorska prava (C) %s Mandriva"
 
-#: ../mdkapplet:647
+#: ../mdkapplet:476
 #, c-format
 msgid "Mandriva Online gives access to Mandriva web services."
 msgstr "Mandriva Online vam omogućuje pristup Mandriva web uslugama."
 
-#: ../mdkapplet:655
-#, c-format
-msgid "Always launch on startup"
-msgstr "Uvijek pokreni na početku"
-
-#: ../mdkapplet:657
-#, c-format
-msgid "Quit"
-msgstr "Završi"
-
-#: ../mdkonline:58
-#, c-format
-msgid ""
-"mdonline version %s\n"
-"Copyright (C) %s Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"mdonline verzija %s\n"
-"Autorska prava (C) %s Mandriva.\n"
-"Ovo je slobodan softver i možete ga distribuirati pod uslovima GNU GPL-a.\n"
-"\n"
-"upotreba:\n"
-
-#: ../mdkonline:63 ../mdkupdate:73
-#, c-format
-msgid "  --help\t\t- print this help message.\n"
-msgstr "  --help\t\t- štampa ovu poruku.\n"
-
-#: ../mdkonline:64
-#, c-format
-msgid "  --box=\t\t\t- hostname.\n"
-msgstr "  --box=\t\t\t- hostname.\n"
-
-#: ../mdkonline:65
-#, c-format
-msgid "  --country\t\t\t- name of country of the user. \n"
-msgstr "  --country\t\t\t- ime države korisnika. \n"
-
-#: ../mdkonline:66
-#, c-format
-msgid "  --interactive\t\t- use the interactive mode.\n"
-msgstr "  --interactive\t\t- koristi interaktivni režim.\n"
-
-#: ../mdkonline:67
-#, c-format
-msgid "  --nointeractive\t- use the non-interactive mode.\n"
-msgstr "  --nointeractive\t- koristi ne-interaktivni režim.\n"
-
-#: ../mdkonline:68
-#, c-format
-msgid "  --login=\t\t     - login name of the user.\n"
-msgstr "  --login=\t\t     - prijavno ime korisnika.\n"
-
-#: ../mdkonline:69
-#, c-format
-msgid "  --pass=\t\t\t- password  of the user.\n"
-msgstr "  --pass=\t\t\t- šifra korisnika.\n"
-
-#: ../mdkonline:87 ../mdkonline:120
-#, c-format
-msgid "Mandriva Online"
-msgstr "Mandriva Online"
-
-#: ../mdkonline:90
-#, c-format
-msgid "I already have an account"
-msgstr "Već imam račun"
-
-#: ../mdkonline:91
-#, c-format
-msgid "I want to subscribe"
-msgstr "Želim se pretplatiti"
-
-#: ../mdkonline:96
-#, c-format
-msgid "Mr."
-msgstr "Gdin."
-
-#: ../mdkonline:96
-#, c-format
-msgid "Mrs."
-msgstr "Gđica."
-
-#: ../mdkonline:96
-#, c-format
-msgid "Ms."
-msgstr "Gđa."
-
-#: ../mdkonline:114
-#, c-format
-msgid "Reading configuration\n"
-msgstr "Čitam konfiguraciju\n"
-
-#: ../mdkonline:123
-#, c-format
-msgid ""
-"This assistant will help you to upload your configuration\n"
-"(packages, hardware configuration) to a centralized database in\n"
-"order to keep you informed about security updates and useful upgrades.\n"
-msgstr ""
-"Ovaj pomoćnik će vam pomoći da pošaljete vaše postavke\n"
-"(pakete, podešavanja hardvera) u centraliziranu bazu podataka kako\n"
-"bi vas mogli informisali o sigurnosnim iskravkama i korisnim nadogradnjama.\n"
-
-#: ../mdkonline:131
-#, c-format
-msgid "Account creation or authentication"
-msgstr "Kreiranje računa ili identifikacija"
-
-#: ../mdkonline:136
-#, c-format
-msgid "Enter your Mandriva Online login, password and machine name:"
-msgstr "Upišite svoje Mandriva Online korisničko ime, šifru i naziv računara:"
-
-#: ../mdkonline:142 ../mdkonline:195
-#, c-format
-msgid "Email address:"
-msgstr "E-mail adresa:"
-
-#: ../mdkonline:143
-#, c-format
-msgid "Country"
-msgstr "Država"
-
-#: ../mdkonline:144 ../mdkonline:196
-#, c-format
-msgid "Password:"
-msgstr "Šifra:"
-
-#: ../mdkonline:146
-#, c-format
-msgid "Machine description:"
-msgstr "Opis računara:"
-
-#: ../mdkonline:147
-#, c-format
-msgid "(Ex: My Home Office's Computer)"
-msgstr "(npr. Moj kućni uredski računar)"
-
-#: ../mdkonline:152 ../mdkonline:159 ../mdkonline:180 ../mdkonline:204
-#: ../mdkonline:208 ../mdkonline:212 ../mdkonline:217 ../mdkupdate:141
-#: ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
-#, c-format
-msgid "Error"
-msgstr "Greška"
-
-#: ../mdkonline:152
-#, c-format
-msgid "Machine name must be 1 to 40 alphanumerical characters"
-msgstr "Naziv računara mora biti dugačak od 1 do 40 znakova"
-
-#: ../mdkonline:155
-#, c-format
-msgid "Connecting to Mandriva Online website..."
-msgstr "Povezujem se sa Mandriva Online web stranicom..."
-
-#: ../mdkonline:167
-#, c-format
-msgid ""
-"In order to benefit from Mandriva Online services,\n"
-"we are about to upload your configuration.\n"
-"\n"
-"The Wizard will now send the following information to Mandriva:\n"
-"\n"
-"1) the list of packages you have installed on your system,\n"
-"\n"
-"2) your hardware configuration.\n"
-"\n"
-"If you feel uncomfortable by that idea, or do not want to benefit from this "
-"service,\n"
-"please press 'Cancel'. By pressing 'Next', you allow us to keep you "
-"informed\n"
-"about security updates and useful upgrades via personalized email alerts.\n"
-"Furthermore, you benefit from discounted paid support services on\n"
-"www.mandrivaexpert.com."
-msgstr ""
-"Da bi imali koristi od Mandriva Online servisa,\n"
-"mi ćemo poslati vaše postavke.\n"
-"\n"
-"Ovaj će Čarobnjak poslati sljedeće informacije Mandriva-u:\n"
-"\n"
-"1) listu paketa koje imate instalirane na sistemu,\n"
-"\n"
-"2) vaša hardverska podešavanja.\n"
-"\n"
-"Ako vam se ideja ne sviđa ili ne želite koristiti ovaj servis,\n"
-"molim pritisnite 'Odustani'. Ukoliko pritisnete 'Sljedeći',\n"
-"dozvolit ćete nam da Vas obavještavamo o sigurnosnim\n"
-"ispravkama i korisnim nadogradnjama preko personalizovanih e-mail\n"
-"upozorenja.\n"
-"Furthermore, you benefit from discounted paid support services on\n"
-"www.mandrivaexpert.com."
-
-#: ../mdkonline:180
-#, c-format
-msgid "Connection problem"
-msgstr "Problem sa konekcijom"
-
-#: ../mdkonline:180
-#, c-format
-msgid "Problem occurs when uploading files, please try again"
-msgstr "Pojavio se problem prilikom slanja datoteka, pokušajte ponovo"
-
-#: ../mdkonline:187
-#, c-format
-msgid "Create a Mandriva Online Account"
-msgstr "Napravi račun na Mandriva Online"
-
-#. -PO: that is for things like "Mr", "Ms",...
-#: ../mdkonline:192
-#, c-format
-msgid "Greeting:"
-msgstr "Pozdrav:"
-
-#: ../mdkonline:193
-#, c-format
-msgid "First name:"
-msgstr "Ime:"
-
-#: ../mdkonline:194
-#, c-format
-msgid "Last name:"
-msgstr "Prezime:"
-
-#: ../mdkonline:197
-#, c-format
-msgid "Confirm Password:"
-msgstr "Ponovo šifra:"
-
-#: ../mdkonline:204
-#, c-format
-msgid ""
-"The passwords do not match\n"
-" Please try again\n"
-msgstr ""
-"Šifre se ne poklapaju\n"
-" Molim pokušajte ponovo\n"
-
-#: ../mdkonline:208
-#, c-format
-msgid "Please fill in each field"
-msgstr "Molim unesite sva polja"
-
-#: ../mdkonline:212
-#, c-format
-msgid "Not a valid mail address!\n"
-msgstr "Neispravna e-mail adresa!\n"
-
-#: ../mdkonline:217
-#, c-format
-msgid "Creating account failed!"
-msgstr "Pravljenje računa nije uspjelo!"
-
-#: ../mdkonline:225
-#, c-format
-msgid ""
-"Mandriva Online Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
-msgstr ""
-"Račun za Mandriva Online je uspješno napravljen.\n"
-"Kliknite na \"Dalje\" za identifikaciju i slanje vaših postavki\n"
-
-#: ../mdkonline:229
-#, c-format
-msgid "Your upload was successful!"
-msgstr "Slanje je uspješno!"
-
-#: ../mdkonline:229
+#: ../mdkapplet:478
 #, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandriva Online."
-msgstr ""
-"Od sada ćete primati obavještenja o sigurnosti i\n"
-"ispravkama zahvaljujući Mandriva Online."
+msgid "Online WebSite"
+msgstr "Online web stranica"
 
-#: ../mdkonline:229
+#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
+#: ../mdkapplet:483
 #, c-format
-msgid ""
-"Mandriva Online offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
+msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
-"Mandriva Online daje vam priliku da automatizirate ispravke.\n"
-"Program će se pokrenuti na vašem sistemu i čekati nove ispravke\n"
-
-#: ../mdkonline:238
-#, c-format
-msgid "Congratulations"
-msgstr "Čestitam"
 
-#: ../mdkonline:238
+#: ../mdkapplet:492
 #, c-format
-msgid "Your Mandriva Online account has been successfully configured\n"
-msgstr "Vaš račun za Mandriva Online je uspješno podešen\n"
-
-#: ../mdkonline:253
-#, c-format
-msgid "Configuration uploaded successfully"
-msgstr "Konfiguracija uspješno poslana"
-
-#: ../mdkonline:254
-#, c-format
-msgid "Problem uploading configuration"
-msgstr "Problem pri slanju konfiguracije"
+msgid "Always launch on startup"
+msgstr "Uvijek pokreni na početku"
 
-#: ../mdkonline:256
+#: ../mdkapplet:494
 #, c-format
-msgid ""
-"Cannot connect to Mandriva Online website: wrong login/password or router/"
-"firewall bad settings"
-msgstr ""
-"Ne mogu se spojiti na mandrivaonline website: pogrešno korisničko ime ili "
-"šifra ili problemi sa postavkama routera/firewalla"
+msgid "Quit"
+msgstr "Završi"
 
 #: ../mdkonline.pm:207
 #, c-format
@@ -827,6 +367,11 @@ msgstr ""
 "\n"
 "upotreba:\n"
 
+#: ../mdkupdate:73
+#, c-format
+msgid "  --help\t\t- print this help message.\n"
+msgstr "  --help\t\t- štampa ovu poruku.\n"
+
 #: ../mdkupdate:74
 #, c-format
 msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
@@ -856,11 +401,6 @@ msgstr ""
 "  --bundle file.bundle\t- obradi i instaliraj paket iz .bundle metainfo "
 "fajla.\n"
 
-#: ../mdkupdate:118 ../mdkupdate:164
-#, c-format
-msgid "Warning"
-msgstr "Upozorenje"
-
 #. -PO: here Live Install is currently *NOT* translated on the desktop, so it's better to keep as it:
 #: ../mdkupdate:120
 #, c-format
@@ -871,11 +411,21 @@ msgstr ""
 "Najprije morate instalirati sistem na vaš hard disk koristeći čarobnjak "
 "'Live Install'."
 
+#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
+#, c-format
+msgid "Please wait"
+msgstr "Molim sačekajte"
+
 #: ../mdkupdate:123 ../mdkupdate:174
 #, c-format
 msgid "Preparing..."
 msgstr "Pripremam..."
 
+#: ../mdkupdate:141 ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
+#, c-format
+msgid "Error"
+msgstr "Greška"
+
 #: ../mdkupdate:141
 #, c-format
 msgid ""
@@ -887,6 +437,11 @@ msgstr ""
 "\n"
 "%s"
 
+#: ../mdkupdate:159 ../mdkupdate:188
+#, c-format
+msgid "An error occurred"
+msgstr "Došlo je do greške"
+
 #: ../mdkupdate:164
 #, c-format
 msgid ""
@@ -915,6 +470,310 @@ msgstr "Instaliram pakete...\n"
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "Nisam u mogućnosti da uradim update paketa sa update_source medija.\n"
 
+#~ msgid "New bundles are available for your system"
+#~ msgstr "Novi bundles su dostupni za vaš sistem"
+
+#~ msgid "Service is not configured. Please click on \"Configure the service\""
+#~ msgstr "Servis nije podešen. Kliknite na \"Podesi servis\""
+
+#~ msgid "Configure the service"
+#~ msgstr "Podesi servis"
+
+#~ msgid "Check updates"
+#~ msgstr "Provjeri ispravke"
+
+#~ msgid "Configure Now!"
+#~ msgstr "Podesi odmah!"
+
+#~ msgid "Actions"
+#~ msgstr "Akcije"
+
+#~ msgid "Configure"
+#~ msgstr "Podesi"
+
+#~ msgid "See logs"
+#~ msgstr "Pogledaj logove"
+
+#~ msgid "Status"
+#~ msgstr "Stanje"
+
+#~ msgid "Close"
+#~ msgstr "Zatvori"
+
+#~ msgid "Network Connection: "
+#~ msgstr "Mrežna konekcija: "
+
+#~ msgid "Up"
+#~ msgstr "Radi"
+
+#~ msgid "Down"
+#~ msgstr "Ne radi"
+
+#~ msgid "Last check: "
+#~ msgstr "Zadnja provjera: "
+
+#~ msgid "Machine name:"
+#~ msgstr "Naziv računara:"
+
+#~ msgid "Updates: "
+#~ msgstr "Ispravke: "
+
+#~ msgid "Development release not supported by service"
+#~ msgstr "Servis ne podržava razvojno izdanje"
+
+#~ msgid "Too old release not supported by service"
+#~ msgstr "Servis ne podržava prestaro izdanje"
+
+#~ msgid "Unknown state"
+#~ msgstr "Nepoznato stanje"
+
+#~ msgid "Online services disabled. Contact Mandriva Online site\n"
+#~ msgstr ""
+#~ "Online servisi su isključeni. Kontaktirajte Mandriva Online stranicu\n"
+
+#~ msgid "Wrong Password.\n"
+#~ msgstr "Pogrešna šifra\n"
+
+#~ msgid "Wrong Action or host or login.\n"
+#~ msgstr "Pogrešna akcija, računar ili korisničko ime.\n"
+
+#~ msgid ""
+#~ "Something is wrong with your network settings (check your route, firewall "
+#~ "or proxy settings)\n"
+#~ msgstr ""
+#~ "Nešto nije u redu sa vašim postavkama za mrežu (provjerite postavke za "
+#~ "route, firewall ili proxy)\n"
+
+#~ msgid ""
+#~ "Problem occured while connecting to the server, please contact the "
+#~ "support team"
+#~ msgstr ""
+#~ "Došlo je do problema prilikom spajanja na server, molim kontaktirajte tim "
+#~ "za podršku"
+
+#~ msgid "Response from Mandriva Online server\n"
+#~ msgstr "Odgovor sa Mandriva Online servera\n"
+
+#~ msgid "No check"
+#~ msgstr "Bez provjere"
+
+#~ msgid "Checking config file: Not present\n"
+#~ msgstr "Provjeravam config datoteku: Ne postoji\n"
+
+#~ msgid "Logs"
+#~ msgstr "Logovi"
+
+#~ msgid "Clear"
+#~ msgstr "Očisti"
+
+#~ msgid ""
+#~ "mdonline version %s\n"
+#~ "Copyright (C) %s Mandriva.\n"
+#~ "This is free software and may be redistributed under the terms of the GNU "
+#~ "GPL.\n"
+#~ "\n"
+#~ "usage:\n"
+#~ msgstr ""
+#~ "mdonline verzija %s\n"
+#~ "Autorska prava (C) %s Mandriva.\n"
+#~ "Ovo je slobodan softver i možete ga distribuirati pod uslovima GNU GPL-"
+#~ "a.\n"
+#~ "\n"
+#~ "upotreba:\n"
+
+#~ msgid "  --box=\t\t\t- hostname.\n"
+#~ msgstr "  --box=\t\t\t- hostname.\n"
+
+#~ msgid "  --country\t\t\t- name of country of the user. \n"
+#~ msgstr "  --country\t\t\t- ime države korisnika. \n"
+
+#~ msgid "  --interactive\t\t- use the interactive mode.\n"
+#~ msgstr "  --interactive\t\t- koristi interaktivni režim.\n"
+
+#~ msgid "  --nointeractive\t- use the non-interactive mode.\n"
+#~ msgstr "  --nointeractive\t- koristi ne-interaktivni režim.\n"
+
+#~ msgid "  --login=\t\t     - login name of the user.\n"
+#~ msgstr "  --login=\t\t     - prijavno ime korisnika.\n"
+
+#~ msgid "  --pass=\t\t\t- password  of the user.\n"
+#~ msgstr "  --pass=\t\t\t- šifra korisnika.\n"
+
+#~ msgid "Mandriva Online"
+#~ msgstr "Mandriva Online"
+
+#~ msgid "I already have an account"
+#~ msgstr "Već imam račun"
+
+#~ msgid "I want to subscribe"
+#~ msgstr "Želim se pretplatiti"
+
+#~ msgid "Mr."
+#~ msgstr "Gdin."
+
+#~ msgid "Mrs."
+#~ msgstr "Gđica."
+
+#~ msgid "Ms."
+#~ msgstr "Gđa."
+
+#~ msgid "Reading configuration\n"
+#~ msgstr "Čitam konfiguraciju\n"
+
+#~ msgid ""
+#~ "This assistant will help you to upload your configuration\n"
+#~ "(packages, hardware configuration) to a centralized database in\n"
+#~ "order to keep you informed about security updates and useful upgrades.\n"
+#~ msgstr ""
+#~ "Ovaj pomoćnik će vam pomoći da pošaljete vaše postavke\n"
+#~ "(pakete, podešavanja hardvera) u centraliziranu bazu podataka kako\n"
+#~ "bi vas mogli informisali o sigurnosnim iskravkama i korisnim "
+#~ "nadogradnjama.\n"
+
+#~ msgid "Account creation or authentication"
+#~ msgstr "Kreiranje računa ili identifikacija"
+
+#~ msgid "Enter your Mandriva Online login, password and machine name:"
+#~ msgstr ""
+#~ "Upišite svoje Mandriva Online korisničko ime, šifru i naziv računara:"
+
+#~ msgid "Email address:"
+#~ msgstr "E-mail adresa:"
+
+#~ msgid "Country"
+#~ msgstr "Država"
+
+#~ msgid "Password:"
+#~ msgstr "Šifra:"
+
+#~ msgid "Machine description:"
+#~ msgstr "Opis računara:"
+
+#~ msgid "(Ex: My Home Office's Computer)"
+#~ msgstr "(npr. Moj kućni uredski računar)"
+
+#~ msgid "Machine name must be 1 to 40 alphanumerical characters"
+#~ msgstr "Naziv računara mora biti dugačak od 1 do 40 znakova"
+
+#~ msgid "Connecting to Mandriva Online website..."
+#~ msgstr "Povezujem se sa Mandriva Online web stranicom..."
+
+#~ msgid ""
+#~ "In order to benefit from Mandriva Online services,\n"
+#~ "we are about to upload your configuration.\n"
+#~ "\n"
+#~ "The Wizard will now send the following information to Mandriva:\n"
+#~ "\n"
+#~ "1) the list of packages you have installed on your system,\n"
+#~ "\n"
+#~ "2) your hardware configuration.\n"
+#~ "\n"
+#~ "If you feel uncomfortable by that idea, or do not want to benefit from "
+#~ "this service,\n"
+#~ "please press 'Cancel'. By pressing 'Next', you allow us to keep you "
+#~ "informed\n"
+#~ "about security updates and useful upgrades via personalized email "
+#~ "alerts.\n"
+#~ "Furthermore, you benefit from discounted paid support services on\n"
+#~ "www.mandrivaexpert.com."
+#~ msgstr ""
+#~ "Da bi imali koristi od Mandriva Online servisa,\n"
+#~ "mi ćemo poslati vaše postavke.\n"
+#~ "\n"
+#~ "Ovaj će Čarobnjak poslati sljedeće informacije Mandriva-u:\n"
+#~ "\n"
+#~ "1) listu paketa koje imate instalirane na sistemu,\n"
+#~ "\n"
+#~ "2) vaša hardverska podešavanja.\n"
+#~ "\n"
+#~ "Ako vam se ideja ne sviđa ili ne želite koristiti ovaj servis,\n"
+#~ "molim pritisnite 'Odustani'. Ukoliko pritisnete 'Sljedeći',\n"
+#~ "dozvolit ćete nam da Vas obavještavamo o sigurnosnim\n"
+#~ "ispravkama i korisnim nadogradnjama preko personalizovanih e-mail\n"
+#~ "upozorenja.\n"
+#~ "Furthermore, you benefit from discounted paid support services on\n"
+#~ "www.mandrivaexpert.com."
+
+#~ msgid "Connection problem"
+#~ msgstr "Problem sa konekcijom"
+
+#~ msgid "Problem occurs when uploading files, please try again"
+#~ msgstr "Pojavio se problem prilikom slanja datoteka, pokušajte ponovo"
+
+#~ msgid "Create a Mandriva Online Account"
+#~ msgstr "Napravi račun na Mandriva Online"
+
+#~ msgid "Greeting:"
+#~ msgstr "Pozdrav:"
+
+#~ msgid "First name:"
+#~ msgstr "Ime:"
+
+#~ msgid "Last name:"
+#~ msgstr "Prezime:"
+
+#~ msgid "Confirm Password:"
+#~ msgstr "Ponovo šifra:"
+
+#~ msgid ""
+#~ "The passwords do not match\n"
+#~ " Please try again\n"
+#~ msgstr ""
+#~ "Šifre se ne poklapaju\n"
+#~ " Molim pokušajte ponovo\n"
+
+#~ msgid "Please fill in each field"
+#~ msgstr "Molim unesite sva polja"
+
+#~ msgid "Not a valid mail address!\n"
+#~ msgstr "Neispravna e-mail adresa!\n"
+
+#~ msgid "Creating account failed!"
+#~ msgstr "Pravljenje računa nije uspjelo!"
+
+#~ msgid ""
+#~ "Mandriva Online Account successfully created.\n"
+#~ "Please click \"Next\" to authenticate and upload your configuration\n"
+#~ msgstr ""
+#~ "Račun za Mandriva Online je uspješno napravljen.\n"
+#~ "Kliknite na \"Dalje\" za identifikaciju i slanje vaših postavki\n"
+
+#~ msgid "Your upload was successful!"
+#~ msgstr "Slanje je uspješno!"
+
+#~ msgid ""
+#~ "From now you will receive on security and updates \n"
+#~ "announcements thanks to Mandriva Online."
+#~ msgstr ""
+#~ "Od sada ćete primati obavještenja o sigurnosti i\n"
+#~ "ispravkama zahvaljujući Mandriva Online."
+
+#~ msgid ""
+#~ "Mandriva Online offers you the ability to automate the updates.\n"
+#~ "A program will run regulary in your system waiting for new updates\n"
+#~ msgstr ""
+#~ "Mandriva Online daje vam priliku da automatizirate ispravke.\n"
+#~ "Program će se pokrenuti na vašem sistemu i čekati nove ispravke\n"
+
+#~ msgid "Congratulations"
+#~ msgstr "Čestitam"
+
+#~ msgid "Your Mandriva Online account has been successfully configured\n"
+#~ msgstr "Vaš račun za Mandriva Online je uspješno podešen\n"
+
+#~ msgid "Configuration uploaded successfully"
+#~ msgstr "Konfiguracija uspješno poslana"
+
+#~ msgid "Problem uploading configuration"
+#~ msgstr "Problem pri slanju konfiguracije"
+
+#~ msgid ""
+#~ "Cannot connect to Mandriva Online website: wrong login/password or router/"
+#~ "firewall bad settings"
+#~ msgstr ""
+#~ "Ne mogu se spojiti na mandrivaonline website: pogrešno korisničko ime ili "
+#~ "šifra ili problemi sa postavkama routera/firewalla"
+
 #~ msgid "  --applet\t\t- launch Mandriva Update.\n"
 #~ msgstr "  --applet\t\t- pokreće Mandriva Update.\n"
 
diff --git a/po/ca.po b/po/ca.po
index dc52bff4..3ee3a0a6 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: 2007-08-09 16:26+0200\n"
+"POT-Creation-Date: 2008-02-21 18:21+0100\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"
@@ -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:94
+#: ../mdkapplet:88
 #, fuzzy, c-format
 msgid "Will check updates at %s"
 msgstr "Comprova actualitzacions"
 
-#: ../mdkapplet:103
+#: ../mdkapplet:97
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "El vostre sistema està actualitzat"
 
-#: ../mdkapplet:109
+#: ../mdkapplet:103
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -39,53 +39,43 @@ msgstr ""
 "Problema de configuració del servei. Comproveu els logs i envieu un correu a "
 "support@mandrivaonline.com"
 
-#: ../mdkapplet:115
+#: ../mdkapplet:110
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "Espereu mentre es cerquen els paquets disponibles... "
 
-#: ../mdkapplet:121
+#: ../mdkapplet:116
 #, c-format
 msgid "New updates are available for your system"
 msgstr "Hi ha actualitzacions disponibles pel vostre sistema"
 
-#: ../mdkapplet:127
-#, fuzzy, c-format
-msgid "New bundles are available for your system"
-msgstr "Hi ha actualitzacions disponibles pel vostre sistema"
-
-#: ../mdkapplet:133
-#, c-format
-msgid "Service is not configured. Please click on \"Configure the service\""
-msgstr "El servei no està configurat. Premeu a \"configura el servei\""
-
-#: ../mdkapplet:139
+#: ../mdkapplet:122
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "La xarxa està inactiva. Si us plau configureu-la"
 
-#: ../mdkapplet:145
+#: ../mdkapplet:128
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr ""
 
-#: ../mdkapplet:151 ../mdkapplet:182
+#: ../mdkapplet:134 ../mdkapplet:165
 #, fuzzy, c-format
 msgid "urpmi database locked"
 msgstr "la base de dades de l'urpmi està bloquejada"
 
-#: ../mdkapplet:157
+#: ../mdkapplet:140
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
-#: ../mdkapplet:163
+#: ../mdkapplet:146
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
 msgstr ""
 
-#: ../mdkapplet:169
+#: ../mdkapplet:152
 #, fuzzy, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -102,580 +92,131 @@ msgstr ""
 "\n"
 "Després reinicieu la %s."
 
-#: ../mdkapplet:174
+#: ../mdkapplet:157
 #, c-format
 msgid "Enabled"
 msgstr "Habilitat"
 
-#: ../mdkapplet:187
+#: ../mdkapplet:170
 #, c-format
 msgid "Error updating media"
 msgstr ""
 
-#: ../mdkapplet:202
+#: ../mdkapplet:185
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr "S'està comprovant ...Hi ha actualitzacions disponibles\n"
 
-#: ../mdkapplet:207
+#: ../mdkapplet:190
 #, c-format
 msgid "Packages are up to date"
 msgstr ""
 
-#: ../mdkapplet:212
+#: ../mdkapplet:195
 #, fuzzy, c-format
 msgid "Failed to open urpmi database"
 msgstr "no s'ha pogut obrir rpmdb"
 
-#: ../mdkapplet:217 ../mdkapplet:324
+#: ../mdkapplet:200
 #, c-format
 msgid "Install updates"
 msgstr "Instal·la actualitzacions"
 
-#: ../mdkapplet:218
-#, c-format
-msgid "Configure the service"
-msgstr "Configura el servei"
-
-#: ../mdkapplet:219
+#: ../mdkapplet:201
 #, c-format
 msgid "Check Updates"
 msgstr "Comprova actualitzacions"
 
-#: ../mdkapplet:220 ../mdkapplet:327 ../mdkonline:114 ../mdkonline:155
-#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
-#, c-format
-msgid "Please wait"
-msgstr "Espereu si us plau"
-
-#: ../mdkapplet:220 ../mdkapplet:326 ../mdkapplet:327
-#, c-format
-msgid "Check updates"
-msgstr "Comprova actualitzacions"
-
-#: ../mdkapplet:223 ../mdkapplet:648
-#, c-format
-msgid "Online WebSite"
-msgstr ""
-
-#: ../mdkapplet:224
+#: ../mdkapplet:202
 #, c-format
 msgid "Configure Network"
 msgstr "Configura la xarxa"
 
-#: ../mdkapplet:225
-#, c-format
-msgid "Configure Now!"
-msgstr "Configura ara!"
-
-#: ../mdkapplet:313 ../mdkapplet:392
-#, c-format
-msgid "Mandriva Linux Updates Applet"
-msgstr "Applet Mandriva Linux Update"
-
-#: ../mdkapplet:322
-#, c-format
-msgid "Actions"
-msgstr "Accions"
-
-#: ../mdkapplet:325
-#, c-format
-msgid "Configure"
-msgstr "Configura"
-
-#: ../mdkapplet:329
-#, c-format
-msgid "See logs"
-msgstr "Veure els logs"
-
-#: ../mdkapplet:332
-#, c-format
-msgid "Status"
-msgstr "Estat"
-
-#: ../mdkapplet:336 ../mdkapplet:597
-#, c-format
-msgid "Close"
-msgstr "Tanca"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Network Connection: "
-msgstr "Connexió de xarxa: "
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Up"
-msgstr "Funcionant"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Down"
-msgstr "Caiguda"
-
-#: ../mdkapplet:366
-#, c-format
-msgid "Last check: "
-msgstr "Última comprovació: "
-
-#: ../mdkapplet:367 ../mdkonline:145
-#, c-format
-msgid "Machine name:"
-msgstr "Nom de màquina:"
-
-#: ../mdkapplet:368
-#, c-format
-msgid "Updates: "
-msgstr "Actualitzacions: "
-
-#: ../mdkapplet:372
+#: ../mdkapplet:283
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "S'està executant drakconnect\n"
 
-#: ../mdkapplet:375
+#: ../mdkapplet:286
 #, c-format
 msgid "Mandriva Online seems to be reinstalled, reloading applet ...."
 msgstr ""
 
-#: ../mdkapplet:383
+#: ../mdkapplet:294
 #, c-format
 msgid "Launching MandrivaUpdate\n"
 msgstr "S'està executant MandrivaUpdate\n"
 
-#: ../mdkapplet:398
+#: ../mdkapplet:303
+#, c-format
+msgid "Mandriva Linux Updates Applet"
+msgstr "Applet Mandriva Linux Update"
+
+#: ../mdkapplet:308
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "S'estan computant les noves actualitzacions...\n"
 
-#: ../mdkapplet:399
+#: ../mdkapplet:309
 #, c-format
 msgid "Connecting to"
 msgstr "S'està connectant a"
 
-#: ../mdkapplet:467 ../mdkupdate:159 ../mdkupdate:188
-#, c-format
-msgid "An error occurred"
-msgstr "S'ha produït un error"
-
-#: ../mdkapplet:475
-#, c-format
-msgid "Development release not supported by service"
-msgstr "Les versions de desenvolupament no estan suportades pel servei"
-
-#: ../mdkapplet:476
-#, c-format
-msgid "Too old release not supported by service"
-msgstr "Versió massa antiga no suportada pel servei"
-
-#: ../mdkapplet:477
-#, c-format
-msgid "Unknown state"
-msgstr "Estat desconegut"
-
-#: ../mdkapplet:478
-#, c-format
-msgid "Online services disabled. Contact Mandriva Online site\n"
-msgstr ""
-
-#: ../mdkapplet:479
-#, c-format
-msgid "Wrong Password.\n"
-msgstr "Contrasenya incorrecta.\n"
-
-#: ../mdkapplet:480
-#, c-format
-msgid "Wrong Action or host or login.\n"
-msgstr ""
-
-#: ../mdkapplet:481
-#, c-format
-msgid ""
-"Something is wrong with your network settings (check your route, firewall or "
-"proxy settings)\n"
-msgstr ""
-
-#: ../mdkapplet:483
-#, c-format
-msgid ""
-"Problem occured while connecting to the server, please contact the support "
-"team"
-msgstr ""
-
-#: ../mdkapplet:487
-#, c-format
-msgid "Response from Mandriva Online server\n"
-msgstr "Resposta del servidor de Mandriva Online\n"
-
-#: ../mdkapplet:490
+#: ../mdkapplet:386
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "El sistema està actualitzat\n"
 
-#: ../mdkapplet:527
-#, c-format
-msgid "No check"
-msgstr "No comprovis"
-
-#: ../mdkapplet:541
-#, c-format
-msgid "Checking config file: Not present\n"
-msgstr ""
-"S'està comprovant l'existència del fitxer de configuració: No està present\n"
-
-#: ../mdkapplet:544
+#: ../mdkapplet:415
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "S'està comprovant la xarxa: sembla estar desactivada\n"
 
-#: ../mdkapplet:587
-#, c-format
-msgid "Logs"
-msgstr "Registres"
-
-#: ../mdkapplet:603
+#: ../mdkapplet:457 ../mdkupdate:118 ../mdkupdate:164
 #, c-format
-msgid "Clear"
-msgstr "Neteja"
+msgid "Warning"
+msgstr "Advertència"
 
-#: ../mdkapplet:629
+#: ../mdkapplet:468
 #, c-format
 msgid "About..."
 msgstr "Quant a..."
 
-#: ../mdkapplet:631
+#: ../mdkapplet:472
 #, fuzzy, c-format
 msgid "Mandriva Online %s"
 msgstr "Mandriva Online"
 
-#: ../mdkapplet:635
+#: ../mdkapplet:473
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr ""
 
-#: ../mdkapplet:647
+#: ../mdkapplet:476
 #, c-format
 msgid "Mandriva Online gives access to Mandriva web services."
 msgstr ""
 
-#: ../mdkapplet:655
-#, c-format
-msgid "Always launch on startup"
-msgstr "Executa sempre al inici"
-
-#: ../mdkapplet:657
-#, c-format
-msgid "Quit"
-msgstr "Surt"
-
-#: ../mdkonline:58
-#, c-format
-msgid ""
-"mdonline version %s\n"
-"Copyright (C) %s Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"mdonline versió %s\n"
-"Copyright (C) %s Mandriva.\n"
-"Aquest programari és lliure i es pot redistribuir sota els termes de la GPL "
-"de GNU.\n"
-"\n"
-"sintaxi:\n"
-
-#: ../mdkonline:63 ../mdkupdate:73
-#, c-format
-msgid "  --help\t\t- print this help message.\n"
-msgstr "  --help\t\t- mostra aquest missatge d'ajuda.\n"
-
-#: ../mdkonline:64
-#, c-format
-msgid "  --box=\t\t\t- hostname.\n"
-msgstr ""
-
-#: ../mdkonline:65
-#, c-format
-msgid "  --country\t\t\t- name of country of the user. \n"
-msgstr ""
-
-#: ../mdkonline:66
-#, c-format
-msgid "  --interactive\t\t- use the interactive mode.\n"
-msgstr ""
-
-#: ../mdkonline:67
-#, c-format
-msgid "  --nointeractive\t- use the non-interactive mode.\n"
-msgstr ""
-
-#: ../mdkonline:68
-#, c-format
-msgid "  --login=\t\t     - login name of the user.\n"
-msgstr ""
-
-#: ../mdkonline:69
-#, c-format
-msgid "  --pass=\t\t\t- password  of the user.\n"
-msgstr ""
-
-#: ../mdkonline:87 ../mdkonline:120
-#, c-format
-msgid "Mandriva Online"
-msgstr "Mandriva Online"
-
-#: ../mdkonline:90
-#, c-format
-msgid "I already have an account"
-msgstr "Ja tinc un compte"
-
-#: ../mdkonline:91
-#, c-format
-msgid "I want to subscribe"
-msgstr "Vull subscriure'm"
-
-#: ../mdkonline:96
-#, c-format
-msgid "Mr."
-msgstr ""
-
-#: ../mdkonline:96
-#, c-format
-msgid "Mrs."
-msgstr ""
-
-#: ../mdkonline:96
-#, c-format
-msgid "Ms."
-msgstr ""
-
-#: ../mdkonline:114
-#, c-format
-msgid "Reading configuration\n"
-msgstr "S'està llegint la configuració\n"
-
-#: ../mdkonline:123
-#, c-format
-msgid ""
-"This assistant will help you to upload your configuration\n"
-"(packages, hardware configuration) to a centralized database in\n"
-"order to keep you informed about security updates and useful upgrades.\n"
-msgstr ""
-"Aquest auxiliar us ajudarà a penjar la vostra configuració\n"
-"(paquets, configuració del maquinari) a una base de dades centralitzada\n"
-"per tal de mantenir-vos informat sobre les actualitzacions de seguretat i "
-"altres millores.\n"
-
-#: ../mdkonline:131
-#, c-format
-msgid "Account creation or authentication"
-msgstr "Creació o autenticació del compte"
-
-#: ../mdkonline:136
-#, c-format
-msgid "Enter your Mandriva Online login, password and machine name:"
-msgstr ""
-"Introduïu el vostre nom d'usuari, contrasenya i nom de màquina de Mandriva "
-"Online:"
-
-#: ../mdkonline:142 ../mdkonline:195
-#, c-format
-msgid "Email address:"
-msgstr "Adreça del correu-e:"
-
-#: ../mdkonline:143
-#, c-format
-msgid "Country"
-msgstr "País"
-
-#: ../mdkonline:144 ../mdkonline:196
-#, c-format
-msgid "Password:"
-msgstr "Contrasenya:"
-
-#: ../mdkonline:146
-#, fuzzy, c-format
-msgid "Machine description:"
-msgstr "Nom de màquina:"
-
-#: ../mdkonline:147
-#, c-format
-msgid "(Ex: My Home Office's Computer)"
-msgstr ""
-
-#: ../mdkonline:152 ../mdkonline:159 ../mdkonline:180 ../mdkonline:204
-#: ../mdkonline:208 ../mdkonline:212 ../mdkonline:217 ../mdkupdate:141
-#: ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
-#, c-format
-msgid "Error"
-msgstr "Error"
-
-#: ../mdkonline:152
-#, fuzzy, c-format
-msgid "Machine name must be 1 to 40 alphanumerical characters"
-msgstr "Els punts de muntatge només poden contenir caràcters alfanumèrics"
-
-#: ../mdkonline:155
-#, c-format
-msgid "Connecting to Mandriva Online website..."
-msgstr "S'està connectant a la web de Mandriva Online..."
-
-#: ../mdkonline:167
-#, c-format
-msgid ""
-"In order to benefit from Mandriva Online services,\n"
-"we are about to upload your configuration.\n"
-"\n"
-"The Wizard will now send the following information to Mandriva:\n"
-"\n"
-"1) the list of packages you have installed on your system,\n"
-"\n"
-"2) your hardware configuration.\n"
-"\n"
-"If you feel uncomfortable by that idea, or do not want to benefit from this "
-"service,\n"
-"please press 'Cancel'. By pressing 'Next', you allow us to keep you "
-"informed\n"
-"about security updates and useful upgrades via personalized email alerts.\n"
-"Furthermore, you benefit from discounted paid support services on\n"
-"www.mandrivaexpert.com."
-msgstr ""
-"Per poder gaudir dels serveis de Mandriva Online,\n"
-"ara penjarem la vostra configuració.\n"
-"\n"
-"L'auxiliar enviarà a Mandriva la informació següent:\n"
-"\n"
-"1) la llista de paquets que heu instal·lat al sistema,\n"
-"\n"
-"2) la configuració del maquinari.\n"
-"\n"
-"Si no us agrada la idea, o no voleu gaudir d'aquest servei,\n"
-"feu clic a 'Cancel·la'. Si feu clic a 'Següent', ens autoritzeu a mantenir-"
-"vos informat\n"
-"de les actualitzacions de seguretat i altres millores mitjançant avisos "
-"personalitzats per correu electrònic.\n"
-"A més, gaudireu de descomptes en els serveis de suport de pagament de\n"
-"www.mandrivaexpert.com."
-
-#: ../mdkonline:180
-#, c-format
-msgid "Connection problem"
-msgstr "Problema de connexió"
-
-#: ../mdkonline:180
-#, c-format
-msgid "Problem occurs when uploading files, please try again"
-msgstr ""
-
-#: ../mdkonline:187
-#, c-format
-msgid "Create a Mandriva Online Account"
-msgstr "Crea un compte a Mandriva Online"
-
-#. -PO: that is for things like "Mr", "Ms",...
-#: ../mdkonline:192
-#, c-format
-msgid "Greeting:"
-msgstr ""
-
-#: ../mdkonline:193
-#, c-format
-msgid "First name:"
-msgstr "Nom:"
-
-#: ../mdkonline:194
-#, c-format
-msgid "Last name:"
-msgstr "Cognoms:"
-
-#: ../mdkonline:197
-#, c-format
-msgid "Confirm Password:"
-msgstr "Confirmació de la contrasenya:"
-
-#: ../mdkonline:204
-#, c-format
-msgid ""
-"The passwords do not match\n"
-" Please try again\n"
-msgstr ""
-"Les contrasenyes no concorden\n"
-" Si us plau intenteu-ho de nou\n"
-
-#: ../mdkonline:208
-#, fuzzy, c-format
-msgid "Please fill in each field"
-msgstr "Si us plau ompliu tots els camps\n"
-
-#: ../mdkonline:212
-#, c-format
-msgid "Not a valid mail address!\n"
-msgstr "No és una adreça de correu vàlida!\n"
-
-#: ../mdkonline:217
-#, fuzzy, c-format
-msgid "Creating account failed!"
-msgstr "Canvia compte"
-
-#: ../mdkonline:225
-#, c-format
-msgid ""
-"Mandriva Online Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
-msgstr ""
-
-#: ../mdkonline:229
-#, c-format
-msgid "Your upload was successful!"
-msgstr ""
-
-#: ../mdkonline:229
-#, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandriva Online."
-msgstr ""
-"A partir d'ara, gràcies a Mandriva Online, rebreu\n"
-"avisos d'actualitzacions i millores de seguretat."
-
-#: ../mdkonline:229
+#: ../mdkapplet:478
 #, c-format
-msgid ""
-"Mandriva Online offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
+msgid "Online WebSite"
 msgstr ""
-"Mandriva Online us ofereix la possibilitat d'automatitzar les "
-"actualitzacions.\n"
-"S'executarà regularment un programa per comprovar si hi ha noves "
-"actualitzacions\n"
 
-#: ../mdkonline:238
-#, c-format
-msgid "Congratulations"
-msgstr "Felicitats"
-
-#: ../mdkonline:238
-#, c-format
-msgid "Your Mandriva Online account has been successfully configured\n"
-msgstr "El vostre compte Mandriva Online s'ha configurat amb èxit\n"
-
-#: ../mdkonline:253
+#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
+#: ../mdkapplet:483
 #, c-format
-msgid "Configuration uploaded successfully"
+msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
 
-#: ../mdkonline:254
+#: ../mdkapplet:492
 #, c-format
-msgid "Problem uploading configuration"
-msgstr "Problema al pujar la configuració"
+msgid "Always launch on startup"
+msgstr "Executa sempre al inici"
 
-#: ../mdkonline:256
+#: ../mdkapplet:494
 #, c-format
-msgid ""
-"Cannot connect to Mandriva Online website: wrong login/password or router/"
-"firewall bad settings"
-msgstr ""
+msgid "Quit"
+msgstr "Surt"
 
 #: ../mdkonline.pm:207
 #, c-format
@@ -814,6 +355,11 @@ msgstr ""
 "\n"
 "sintaxi:\n"
 
+#: ../mdkupdate:73
+#, c-format
+msgid "  --help\t\t- print this help message.\n"
+msgstr "  --help\t\t- mostra aquest missatge d'ajuda.\n"
+
 #: ../mdkupdate:74
 #, c-format
 msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
@@ -841,11 +387,6 @@ msgid ""
 "file.\n"
 msgstr ""
 
-#: ../mdkupdate:118 ../mdkupdate:164
-#, c-format
-msgid "Warning"
-msgstr "Advertència"
-
 #. -PO: here Live Install is currently *NOT* translated on the desktop, so it's better to keep as it:
 #: ../mdkupdate:120
 #, c-format
@@ -854,11 +395,21 @@ msgid ""
 "Install' wizard."
 msgstr ""
 
+#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
+#, c-format
+msgid "Please wait"
+msgstr "Espereu si us plau"
+
 #: ../mdkupdate:123 ../mdkupdate:174
 #, c-format
 msgid "Preparing..."
 msgstr "S'està preparant..."
 
+#: ../mdkupdate:141 ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
+#, c-format
+msgid "Error"
+msgstr "Error"
+
 #: ../mdkupdate:141
 #, c-format
 msgid ""
@@ -867,6 +418,11 @@ msgid ""
 "%s"
 msgstr ""
 
+#: ../mdkupdate:159 ../mdkupdate:188
+#, c-format
+msgid "An error occurred"
+msgstr "S'ha produït un error"
+
 #: ../mdkupdate:164
 #, c-format
 msgid ""
@@ -891,6 +447,243 @@ msgstr "S'estan instal·lant els paquets...\n"
 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 "New bundles are available for your system"
+#~ msgstr "Hi ha actualitzacions disponibles pel vostre sistema"
+
+#~ msgid "Service is not configured. Please click on \"Configure the service\""
+#~ msgstr "El servei no està configurat. Premeu a \"configura el servei\""
+
+#~ msgid "Configure the service"
+#~ msgstr "Configura el servei"
+
+#~ msgid "Check updates"
+#~ msgstr "Comprova actualitzacions"
+
+#~ msgid "Configure Now!"
+#~ msgstr "Configura ara!"
+
+#~ msgid "Actions"
+#~ msgstr "Accions"
+
+#~ msgid "Configure"
+#~ msgstr "Configura"
+
+#~ msgid "See logs"
+#~ msgstr "Veure els logs"
+
+#~ msgid "Status"
+#~ msgstr "Estat"
+
+#~ msgid "Close"
+#~ msgstr "Tanca"
+
+#~ msgid "Network Connection: "
+#~ msgstr "Connexió de xarxa: "
+
+#~ msgid "Up"
+#~ msgstr "Funcionant"
+
+#~ msgid "Down"
+#~ msgstr "Caiguda"
+
+#~ msgid "Last check: "
+#~ msgstr "Última comprovació: "
+
+#~ msgid "Machine name:"
+#~ msgstr "Nom de màquina:"
+
+#~ msgid "Updates: "
+#~ msgstr "Actualitzacions: "
+
+#~ msgid "Development release not supported by service"
+#~ msgstr "Les versions de desenvolupament no estan suportades pel servei"
+
+#~ msgid "Too old release not supported by service"
+#~ msgstr "Versió massa antiga no suportada pel servei"
+
+#~ msgid "Unknown state"
+#~ msgstr "Estat desconegut"
+
+#~ msgid "Wrong Password.\n"
+#~ msgstr "Contrasenya incorrecta.\n"
+
+#~ msgid "Response from Mandriva Online server\n"
+#~ msgstr "Resposta del servidor de Mandriva Online\n"
+
+#~ msgid "No check"
+#~ msgstr "No comprovis"
+
+#~ msgid "Checking config file: Not present\n"
+#~ msgstr ""
+#~ "S'està comprovant l'existència del fitxer de configuració: No està "
+#~ "present\n"
+
+#~ msgid "Logs"
+#~ msgstr "Registres"
+
+#~ msgid "Clear"
+#~ msgstr "Neteja"
+
+#~ msgid ""
+#~ "mdonline version %s\n"
+#~ "Copyright (C) %s Mandriva.\n"
+#~ "This is free software and may be redistributed under the terms of the GNU "
+#~ "GPL.\n"
+#~ "\n"
+#~ "usage:\n"
+#~ msgstr ""
+#~ "mdonline versió %s\n"
+#~ "Copyright (C) %s Mandriva.\n"
+#~ "Aquest programari és lliure i es pot redistribuir sota els termes de la "
+#~ "GPL de GNU.\n"
+#~ "\n"
+#~ "sintaxi:\n"
+
+#~ msgid "Mandriva Online"
+#~ msgstr "Mandriva Online"
+
+#~ msgid "I already have an account"
+#~ msgstr "Ja tinc un compte"
+
+#~ msgid "I want to subscribe"
+#~ msgstr "Vull subscriure'm"
+
+#~ msgid "Reading configuration\n"
+#~ msgstr "S'està llegint la configuració\n"
+
+#~ msgid ""
+#~ "This assistant will help you to upload your configuration\n"
+#~ "(packages, hardware configuration) to a centralized database in\n"
+#~ "order to keep you informed about security updates and useful upgrades.\n"
+#~ msgstr ""
+#~ "Aquest auxiliar us ajudarà a penjar la vostra configuració\n"
+#~ "(paquets, configuració del maquinari) a una base de dades centralitzada\n"
+#~ "per tal de mantenir-vos informat sobre les actualitzacions de seguretat i "
+#~ "altres millores.\n"
+
+#~ msgid "Account creation or authentication"
+#~ msgstr "Creació o autenticació del compte"
+
+#~ msgid "Enter your Mandriva Online login, password and machine name:"
+#~ msgstr ""
+#~ "Introduïu el vostre nom d'usuari, contrasenya i nom de màquina de "
+#~ "Mandriva Online:"
+
+#~ msgid "Email address:"
+#~ msgstr "Adreça del correu-e:"
+
+#~ msgid "Country"
+#~ msgstr "País"
+
+#~ msgid "Password:"
+#~ msgstr "Contrasenya:"
+
+#, fuzzy
+#~ msgid "Machine description:"
+#~ msgstr "Nom de màquina:"
+
+#, fuzzy
+#~ msgid "Machine name must be 1 to 40 alphanumerical characters"
+#~ msgstr "Els punts de muntatge només poden contenir caràcters alfanumèrics"
+
+#~ msgid "Connecting to Mandriva Online website..."
+#~ msgstr "S'està connectant a la web de Mandriva Online..."
+
+#~ msgid ""
+#~ "In order to benefit from Mandriva Online services,\n"
+#~ "we are about to upload your configuration.\n"
+#~ "\n"
+#~ "The Wizard will now send the following information to Mandriva:\n"
+#~ "\n"
+#~ "1) the list of packages you have installed on your system,\n"
+#~ "\n"
+#~ "2) your hardware configuration.\n"
+#~ "\n"
+#~ "If you feel uncomfortable by that idea, or do not want to benefit from "
+#~ "this service,\n"
+#~ "please press 'Cancel'. By pressing 'Next', you allow us to keep you "
+#~ "informed\n"
+#~ "about security updates and useful upgrades via personalized email "
+#~ "alerts.\n"
+#~ "Furthermore, you benefit from discounted paid support services on\n"
+#~ "www.mandrivaexpert.com."
+#~ msgstr ""
+#~ "Per poder gaudir dels serveis de Mandriva Online,\n"
+#~ "ara penjarem la vostra configuració.\n"
+#~ "\n"
+#~ "L'auxiliar enviarà a Mandriva la informació següent:\n"
+#~ "\n"
+#~ "1) la llista de paquets que heu instal·lat al sistema,\n"
+#~ "\n"
+#~ "2) la configuració del maquinari.\n"
+#~ "\n"
+#~ "Si no us agrada la idea, o no voleu gaudir d'aquest servei,\n"
+#~ "feu clic a 'Cancel·la'. Si feu clic a 'Següent', ens autoritzeu a "
+#~ "mantenir-vos informat\n"
+#~ "de les actualitzacions de seguretat i altres millores mitjançant avisos "
+#~ "personalitzats per correu electrònic.\n"
+#~ "A més, gaudireu de descomptes en els serveis de suport de pagament de\n"
+#~ "www.mandrivaexpert.com."
+
+#~ msgid "Connection problem"
+#~ msgstr "Problema de connexió"
+
+#~ msgid "Create a Mandriva Online Account"
+#~ msgstr "Crea un compte a Mandriva Online"
+
+#~ msgid "First name:"
+#~ msgstr "Nom:"
+
+#~ msgid "Last name:"
+#~ msgstr "Cognoms:"
+
+#~ msgid "Confirm Password:"
+#~ msgstr "Confirmació de la contrasenya:"
+
+#~ msgid ""
+#~ "The passwords do not match\n"
+#~ " Please try again\n"
+#~ msgstr ""
+#~ "Les contrasenyes no concorden\n"
+#~ " Si us plau intenteu-ho de nou\n"
+
+#, fuzzy
+#~ msgid "Please fill in each field"
+#~ msgstr "Si us plau ompliu tots els camps\n"
+
+#~ msgid "Not a valid mail address!\n"
+#~ msgstr "No és una adreça de correu vàlida!\n"
+
+#, fuzzy
+#~ msgid "Creating account failed!"
+#~ msgstr "Canvia compte"
+
+#~ msgid ""
+#~ "From now you will receive on security and updates \n"
+#~ "announcements thanks to Mandriva Online."
+#~ msgstr ""
+#~ "A partir d'ara, gràcies a Mandriva Online, rebreu\n"
+#~ "avisos d'actualitzacions i millores de seguretat."
+
+#~ msgid ""
+#~ "Mandriva Online offers you the ability to automate the updates.\n"
+#~ "A program will run regulary in your system waiting for new updates\n"
+#~ msgstr ""
+#~ "Mandriva Online us ofereix la possibilitat d'automatitzar les "
+#~ "actualitzacions.\n"
+#~ "S'executarà regularment un programa per comprovar si hi ha noves "
+#~ "actualitzacions\n"
+
+#~ msgid "Congratulations"
+#~ msgstr "Felicitats"
+
+#~ msgid "Your Mandriva Online account has been successfully configured\n"
+#~ msgstr "El vostre compte Mandriva Online s'ha configurat amb èxit\n"
+
+#~ msgid "Problem uploading configuration"
+#~ msgstr "Problema al pujar la configuració"
+
 #~ msgid "  --applet\t\t- launch Mandriva Update.\n"
 #~ msgstr "  --applet\t\t- actualitza Mandriva Update.\n"
 
diff --git a/po/cs.po b/po/cs.po
index 9d099d79..71633df1 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: cs\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-09 16:26+0200\n"
+"POT-Creation-Date: 2008-02-21 18:21+0100\n"
 "PO-Revision-Date: 2007-09-08 23:45+0200\n"
 "Last-Translator: Michal Bukovjan <bukm@centrum.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -16,20 +16,21 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"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:94
+#: ../mdkapplet:88
 #, c-format
 msgid "Will check updates at %s"
 msgstr "Aktualizace se zkontrolují v %s"
 
-#: ../mdkapplet:103
+#: ../mdkapplet:97
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "Váš systém je plně aktuální"
 
-#: ../mdkapplet:109
+#: ../mdkapplet:103
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -38,54 +39,45 @@ msgstr ""
 "Problém s nastavením služby. Zkontrolujte prosím záznamy a pošlete email na "
 "support@mandrivaonline.com"
 
-#: ../mdkapplet:115
+#: ../mdkapplet:110
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "Prosím počkejte, hledám dostupné balíčky..."
 
-#: ../mdkapplet:121
+#: ../mdkapplet:116
 #, c-format
 msgid "New updates are available for your system"
 msgstr "Pro váš systém jsou k dispozici nové aktualizace"
 
-#: ../mdkapplet:127
-#, c-format
-msgid "New bundles are available for your system"
-msgstr "Pro váš systém jsou k dispozici nové produktové balíky"
-
-#: ../mdkapplet:133
-#, c-format
-msgid "Service is not configured. Please click on \"Configure the service\""
-msgstr "Služba není nastavena. Klikněte prosím na \"Nastavit službu\""
-
-#: ../mdkapplet:139
+#: ../mdkapplet:122
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "Síť není dostupná. Nastavte prosím vaši síť"
 
-#: ../mdkapplet:145
+#: ../mdkapplet:128
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "Služba není aktivována. Klikněte prosím na \"Online webové stránky\""
 
-#: ../mdkapplet:151 ../mdkapplet:182
+#: ../mdkapplet:134 ../mdkapplet:165
 #, c-format
 msgid "urpmi database locked"
 msgstr "databáze urpmi je zamknutá"
 
-#: ../mdkapplet:157
+#: ../mdkapplet:140
 #, 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:163
+#: ../mdkapplet:146
 #, c-format
-msgid "No medium found. You must add some media through 'Software Media Manager'."
+msgid ""
+"No medium found. You must add some media through 'Software Media Manager'."
 msgstr ""
 "Nebyl nalezen žádný zdroj software. Je třeba přidat alespoň jeden zdroj "
 "pomocí Správce zdrojů software."
 
-#: ../mdkapplet:169
+#: ../mdkapplet:152
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -101,583 +93,132 @@ msgstr ""
 "\n"
 "Poté znovu spusťte \"%s\"."
 
-#: ../mdkapplet:174
+#: ../mdkapplet:157
 #, c-format
 msgid "Enabled"
 msgstr "Povolen"
 
-#: ../mdkapplet:187
+#: ../mdkapplet:170
 #, c-format
 msgid "Error updating media"
 msgstr "Chyba při aktualizaci zdroje"
 
-#: ../mdkapplet:202
+#: ../mdkapplet:185
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr "Zjišťuji... Aktualizace jsou dostupné\n"
 
-#: ../mdkapplet:207
+#: ../mdkapplet:190
 #, c-format
 msgid "Packages are up to date"
 msgstr "Balíčky jsou aktuální"
 
-#: ../mdkapplet:212
+#: ../mdkapplet:195
 #, c-format
 msgid "Failed to open urpmi database"
 msgstr "Nelze otevřít databázi urpmi"
 
-#: ../mdkapplet:217 ../mdkapplet:324
+#: ../mdkapplet:200
 #, c-format
 msgid "Install updates"
 msgstr "Instalovat aktualizace"
 
-#: ../mdkapplet:218
-#, c-format
-msgid "Configure the service"
-msgstr "Nastavit službu"
-
-#: ../mdkapplet:219
+#: ../mdkapplet:201
 #, c-format
 msgid "Check Updates"
 msgstr "Zkontrolovat aktualizace"
 
-#: ../mdkapplet:220 ../mdkapplet:327 ../mdkonline:114 ../mdkonline:155
-#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
-#, c-format
-msgid "Please wait"
-msgstr "Prosím počkejte"
-
-#: ../mdkapplet:220 ../mdkapplet:326 ../mdkapplet:327
-#, c-format
-msgid "Check updates"
-msgstr "Zkontrolovat aktualizace"
-
-#: ../mdkapplet:223 ../mdkapplet:648
-#, c-format
-msgid "Online WebSite"
-msgstr "Online webové stránky"
-
-#: ../mdkapplet:224
+#: ../mdkapplet:202
 #, c-format
 msgid "Configure Network"
 msgstr "Nastavit síť"
 
-#: ../mdkapplet:225
-#, c-format
-msgid "Configure Now!"
-msgstr "Nastavit teď!"
-
-#: ../mdkapplet:313 ../mdkapplet:392
-#, c-format
-msgid "Mandriva Linux Updates Applet"
-msgstr "Aplet pro aktualizace Mandriva Linux"
-
-#: ../mdkapplet:322
-#, c-format
-msgid "Actions"
-msgstr "Akce"
-
-#: ../mdkapplet:325
-#, c-format
-msgid "Configure"
-msgstr "Nastavit"
-
-#: ../mdkapplet:329
-#, c-format
-msgid "See logs"
-msgstr "Prohlížet záznamy"
-
-#: ../mdkapplet:332
-#, c-format
-msgid "Status"
-msgstr "Stav"
-
-#: ../mdkapplet:336 ../mdkapplet:597
-#, c-format
-msgid "Close"
-msgstr "Zavřít"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Network Connection: "
-msgstr "Připojení k síti: "
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Up"
-msgstr "Připojeno"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Down"
-msgstr "Není"
-
-#: ../mdkapplet:366
-#, c-format
-msgid "Last check: "
-msgstr "Poslední kontrola: "
-
-#: ../mdkapplet:367 ../mdkonline:145
-#, c-format
-msgid "Machine name:"
-msgstr "Název počítače:"
-
-#: ../mdkapplet:368
-#, c-format
-msgid "Updates: "
-msgstr "Aktualizace: "
-
-#: ../mdkapplet:372
+#: ../mdkapplet:283
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Spouští se drakconnect\n"
 
-#: ../mdkapplet:375
+#: ../mdkapplet:286
 #, c-format
 msgid "Mandriva Online seems to be reinstalled, reloading applet ...."
 msgstr "Mandriva Online vypadá, že je přeinstalováno, znovu nahrávám aplet...."
 
-#: ../mdkapplet:383
+#: ../mdkapplet:294
 #, c-format
 msgid "Launching MandrivaUpdate\n"
 msgstr "Spouští se MandrivaUpdate\n"
 
-#: ../mdkapplet:398
+#: ../mdkapplet:303
+#, c-format
+msgid "Mandriva Linux Updates Applet"
+msgstr "Aplet pro aktualizace Mandriva Linux"
+
+#: ../mdkapplet:308
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Vyhledávám nové aktualizace...\n"
 
-#: ../mdkapplet:399
+#: ../mdkapplet:309
 #, c-format
 msgid "Connecting to"
 msgstr "Připojuji se k"
 
-#: ../mdkapplet:467 ../mdkupdate:159 ../mdkupdate:188
-#, c-format
-msgid "An error occurred"
-msgstr "Stala se chyba"
-
-#: ../mdkapplet:475
-#, c-format
-msgid "Development release not supported by service"
-msgstr "Služba nepodporuje vývojovou verzi"
-
-#: ../mdkapplet:476
-#, c-format
-msgid "Too old release not supported by service"
-msgstr "Služba nepodporuje přiliš starou verzi"
-
-#: ../mdkapplet:477
-#, c-format
-msgid "Unknown state"
-msgstr "Neznámý stav"
-
-#: ../mdkapplet:478
-#, c-format
-msgid "Online services disabled. Contact Mandriva Online site\n"
-msgstr "Online služby jsou vypnuty. Kontaktujte stránky Mandriva Online\n"
-
-#: ../mdkapplet:479
-#, c-format
-msgid "Wrong Password.\n"
-msgstr "Špatné heslo\n"
-
-#: ../mdkapplet:480
-#, c-format
-msgid "Wrong Action or host or login.\n"
-msgstr "Chybná akce nebo počítač nebo přihlášení.\n"
-
-#: ../mdkapplet:481
-#, c-format
-msgid ""
-"Something is wrong with your network settings (check your route, firewall or "
-"proxy settings)\n"
-msgstr ""
-"S vaším nastavením sítě není něco v pořádku (zkontrolujte nastavení "
-"směrování, firewallu nebo proxy)\n"
-
-#: ../mdkapplet:483
-#, c-format
-msgid ""
-"Problem occured while connecting to the server, please contact the support "
-"team"
-msgstr ""
-"Při připojování se k serveru se vyskytl problém, kontaktuje prosím tým "
-"technické podpory"
-
-#: ../mdkapplet:487
-#, c-format
-msgid "Response from Mandriva Online server\n"
-msgstr "Odpověď od serveru Mandriva Online\n"
-
-#: ../mdkapplet:490
+#: ../mdkapplet:386
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Systém je aktuální\n"
 
-#: ../mdkapplet:527
-#, c-format
-msgid "No check"
-msgstr "Nezjištěno"
-
-#: ../mdkapplet:541
-#, c-format
-msgid "Checking config file: Not present\n"
-msgstr "Kontroluji soubor s nastavením: Nenalezen\n"
-
-#: ../mdkapplet:544
+#: ../mdkapplet:415
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Kontroluji síť: zdá se nedostupná\n"
 
-#: ../mdkapplet:587
-#, c-format
-msgid "Logs"
-msgstr "Záznamy"
-
-#: ../mdkapplet:603
+#: ../mdkapplet:457 ../mdkupdate:118 ../mdkupdate:164
 #, c-format
-msgid "Clear"
-msgstr "Vyčistit"
+msgid "Warning"
+msgstr "Varování"
 
-#: ../mdkapplet:629
+#: ../mdkapplet:468
 #, c-format
 msgid "About..."
 msgstr "O aplikaci..."
 
-#: ../mdkapplet:631
+#: ../mdkapplet:472
 #, c-format
 msgid "Mandriva Online %s"
 msgstr "Mandriva Online %s"
 
-#: ../mdkapplet:635
+#: ../mdkapplet:473
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Copyright ©%s by Mandriva"
 
-#: ../mdkapplet:647
+#: ../mdkapplet:476
 #, c-format
 msgid "Mandriva Online gives access to Mandriva web services."
-msgstr "Mandriva Online umožňuje přístup k webovým službám společnosti Mandriva."
-
-#: ../mdkapplet:655
-#, c-format
-msgid "Always launch on startup"
-msgstr "Vždy spustit při startu"
-
-#: ../mdkapplet:657
-#, c-format
-msgid "Quit"
-msgstr "Konec"
-
-#: ../mdkonline:58
-#, c-format
-msgid ""
-"mdonline version %s\n"
-"Copyright (C) %s Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
 msgstr ""
-"mdonline verze %s\n"
-"Copyright © %s Mandriva.\n"
-"Toto je volně šiřitelný software a může být šířen v souladu s licencí GNU "
-"GPL.\n"
-"\n"
-"Použití:\n"
-
-#: ../mdkonline:63 ../mdkupdate:73
-#, c-format
-msgid "  --help\t\t- print this help message.\n"
-msgstr "  --help\t\t- vytiskne tuto nápovědu.\n"
-
-#: ../mdkonline:64
-#, c-format
-msgid "  --box=\t\t\t- hostname.\n"
-msgstr "  --box=\t\t\t- název počítače.\n"
-
-#: ../mdkonline:65
-#, c-format
-msgid "  --country\t\t\t- name of country of the user. \n"
-msgstr "  --country\t\t\t- název země uživatele. \n"
-
-#: ../mdkonline:66
-#, c-format
-msgid "  --interactive\t\t- use the interactive mode.\n"
-msgstr "  --interactive\t\t- použít interaktivní režim.\n"
+"Mandriva Online umožňuje přístup k webovým službám společnosti Mandriva."
 
-#: ../mdkonline:67
-#, c-format
-msgid "  --nointeractive\t- use the non-interactive mode.\n"
-msgstr "  --nointeractive\t- použít neinteraktivní režim.\n"
-
-#: ../mdkonline:68
-#, c-format
-msgid "  --login=\t\t     - login name of the user.\n"
-msgstr "  --login=\t\t     - přihlašovací jméno uživatele.\n"
-
-#: ../mdkonline:69
-#, c-format
-msgid "  --pass=\t\t\t- password  of the user.\n"
-msgstr "  --pass=\t\t\t- heslo uživatele.\n"
-
-#: ../mdkonline:87 ../mdkonline:120
-#, c-format
-msgid "Mandriva Online"
-msgstr "Mandriva Online"
-
-#: ../mdkonline:90
-#, c-format
-msgid "I already have an account"
-msgstr "Už mám účet"
-
-#: ../mdkonline:91
-#, c-format
-msgid "I want to subscribe"
-msgstr "Chci se zaregistrovat"
-
-#: ../mdkonline:96
-#, c-format
-msgid "Mr."
-msgstr "Pan"
-
-#: ../mdkonline:96
-#, c-format
-msgid "Mrs."
-msgstr "Paní"
-
-#: ../mdkonline:96
-#, c-format
-msgid "Ms."
-msgstr "Slečna"
-
-#: ../mdkonline:114
-#, c-format
-msgid "Reading configuration\n"
-msgstr "Načítám konfiguraci\n"
-
-#: ../mdkonline:123
-#, c-format
-msgid ""
-"This assistant will help you to upload your configuration\n"
-"(packages, hardware configuration) to a centralized database in\n"
-"order to keep you informed about security updates and useful upgrades.\n"
-msgstr ""
-"Tento průvodce umožní nahrát konfiguraci\n"
-"(konfigurace hardware, seznam balíčků) do centrální databáze,\n"
-"kdy budete ihned informováni o všech bezpečnostních a dalších\n"
-"potřebných aktualizacích.\n"
-
-#: ../mdkonline:131
-#, c-format
-msgid "Account creation or authentication"
-msgstr "Vytvoření nebo ověření účtu"
-
-#: ../mdkonline:136
-#, c-format
-msgid "Enter your Mandriva Online login, password and machine name:"
-msgstr "Zadejte jméno, heslo a název počítače pro Mandriva Online:"
-
-#: ../mdkonline:142 ../mdkonline:195
-#, c-format
-msgid "Email address:"
-msgstr "Emailová adresa:"
-
-#: ../mdkonline:143
-#, c-format
-msgid "Country"
-msgstr "Země"
-
-#: ../mdkonline:144 ../mdkonline:196
-#, c-format
-msgid "Password:"
-msgstr "Heslo:"
-
-#: ../mdkonline:146
-#, c-format
-msgid "Machine description:"
-msgstr "Popis počítače:"
-
-#: ../mdkonline:147
-#, c-format
-msgid "(Ex: My Home Office's Computer)"
-msgstr "(Např.: Počítač v mé domácí kanceláři)"
-
-#: ../mdkonline:152 ../mdkonline:159 ../mdkonline:180 ../mdkonline:204
-#: ../mdkonline:208 ../mdkonline:212 ../mdkonline:217 ../mdkupdate:141
-#: ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
-#, c-format
-msgid "Error"
-msgstr "Chyba"
-
-#: ../mdkonline:152
-#, c-format
-msgid "Machine name must be 1 to 40 alphanumerical characters"
-msgstr "Název počítače musí být dlouhý 1 až 40 alfanumerických znaků"
-
-#: ../mdkonline:155
-#, c-format
-msgid "Connecting to Mandriva Online website..."
-msgstr "Připojuji se k webovým stránkám Mandriva Online..."
-
-#: ../mdkonline:167
-#, c-format
-msgid ""
-"In order to benefit from Mandriva Online services,\n"
-"we are about to upload your configuration.\n"
-"\n"
-"The Wizard will now send the following information to Mandriva:\n"
-"\n"
-"1) the list of packages you have installed on your system,\n"
-"\n"
-"2) your hardware configuration.\n"
-"\n"
-"If you feel uncomfortable by that idea, or do not want to benefit from this "
-"service,\n"
-"please press 'Cancel'. By pressing 'Next', you allow us to keep you "
-"informed\n"
-"about security updates and useful upgrades via personalized email alerts.\n"
-"Furthermore, you benefit from discounted paid support services on\n"
-"www.mandrivaexpert.com."
-msgstr ""
-"Pokud chcete využívat službu Mandriva Online,\n"
-"je potřebné zaslat na server vaši konfiguraci.\n"
-"\n"
-"Průvodce nyní pošle následující informace do společnosti Mandriva:\n"
-"\n"
-"1) seznam balíčků, které máte nainstalovány na počítači,\n"
-"\n"
-"2) vaši konfiguraci hardware.\n"
-"\n"
-"Pokud s tím nesouhlasíte, nebo nechcete využít tuto službu,\n"
-"stiskněte tlačítko 'Zrušit'. Pokud stisknete tlačítko 'Další', dáváte nám "
-"možnost vás\n"
-"informovat o bezpečnostních nebo užitečných aktualizacích pomocí\n"
-"personalizovaného emailového upozornění.\n"
-"Můžete také využít snížených cen služeb placené podpory na\n"
-"www.mandrivaexpert.com."
-
-#: ../mdkonline:180
-#, c-format
-msgid "Connection problem"
-msgstr "Problémy při spojení"
-
-#: ../mdkonline:180
-#, c-format
-msgid "Problem occurs when uploading files, please try again"
-msgstr "Při nahrávání souborů se vyskytl problém, zkuste to prosím znovu"
-
-#: ../mdkonline:187
-#, c-format
-msgid "Create a Mandriva Online Account"
-msgstr "Vytvořit účet na Mandriva Online"
-
-#. -PO: that is for things like "Mr", "Ms",...
-#: ../mdkonline:192
-#, c-format
-msgid "Greeting:"
-msgstr "Pozdrav:"
-
-#: ../mdkonline:193
-#, c-format
-msgid "First name:"
-msgstr "Jméno:"
-
-#: ../mdkonline:194
-#, c-format
-msgid "Last name:"
-msgstr "Příjmení:"
-
-#: ../mdkonline:197
-#, c-format
-msgid "Confirm Password:"
-msgstr "Potvrdit heslo:"
-
-#: ../mdkonline:204
-#, c-format
-msgid ""
-"The passwords do not match\n"
-" Please try again\n"
-msgstr ""
-"Hesla se neshodují\n"
-"Zkuste to prosím znovu\n"
-
-#: ../mdkonline:208
-#, c-format
-msgid "Please fill in each field"
-msgstr "Vyplňte prosím každé pole"
-
-#: ../mdkonline:212
-#, c-format
-msgid "Not a valid mail address!\n"
-msgstr "Neplatná emailová adresa!\n"
-
-#: ../mdkonline:217
-#, c-format
-msgid "Creating account failed!"
-msgstr "Vytvoření účtu selhalo!"
-
-#: ../mdkonline:225
-#, c-format
-msgid ""
-"Mandriva Online Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
-msgstr ""
-"Účet na Mandriva Online byl úspěšně vytvořen.\n"
-"Klikněte prosím na \"Další\" a přihlaste se a nahrajte své nastavení\n"
-
-#: ../mdkonline:229
-#, c-format
-msgid "Your upload was successful!"
-msgstr "Zaslání informací proběhlo úspěšně!"
-
-#: ../mdkonline:229
+#: ../mdkapplet:478
 #, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandriva Online."
-msgstr ""
-"Od této chvíle budete díky službě Mandriva Online\n"
-"informováni o bezpečnostních a dalších aktualizacích."
+msgid "Online WebSite"
+msgstr "Online webové stránky"
 
-#: ../mdkonline:229
+#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
+#: ../mdkapplet:483
 #, c-format
-msgid ""
-"Mandriva Online offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
+msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
-"Mandriva Online nabízí možnost automatizovat aktualizace.\n"
-"Program, který bude běžet v systému a čekat na aktualizace\n"
-
-#: ../mdkonline:238
-#, c-format
-msgid "Congratulations"
-msgstr "Gratulujeme"
 
-#: ../mdkonline:238
+#: ../mdkapplet:492
 #, c-format
-msgid "Your Mandriva Online account has been successfully configured\n"
-msgstr "Váš účet na Mandriva Online byl úspěšně nastaven\n"
-
-#: ../mdkonline:253
-#, c-format
-msgid "Configuration uploaded successfully"
-msgstr "Informace o nastavení byly poslány úspěšně"
-
-#: ../mdkonline:254
-#, c-format
-msgid "Problem uploading configuration"
-msgstr "Problém při posílání nastavení"
+msgid "Always launch on startup"
+msgstr "Vždy spustit při startu"
 
-#: ../mdkonline:256
+#: ../mdkapplet:494
 #, c-format
-msgid ""
-"Cannot connect to Mandriva Online website: wrong login/password or router/"
-"firewall bad settings"
-msgstr ""
-"Nelze se připojit k webovým stránkám mandrivaonline: chybné přihlášení či "
-"heslo nebo špatně nastavený firewall či router"
+msgid "Quit"
+msgstr "Konec"
 
 #: ../mdkonline.pm:207
 #, c-format
@@ -826,6 +367,11 @@ msgstr ""
 "\n"
 "Použití:\n"
 
+#: ../mdkupdate:73
+#, c-format
+msgid "  --help\t\t- print this help message.\n"
+msgstr "  --help\t\t- vytiskne tuto nápovědu.\n"
+
 #: ../mdkupdate:74
 #, c-format
 msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
@@ -855,11 +401,6 @@ msgstr ""
 "  --bundle soubor.bundle\t- zpracovat a instalovat balíček z metasouboru ."
 "bundle.\n"
 
-#: ../mdkupdate:118 ../mdkupdate:164
-#, c-format
-msgid "Warning"
-msgstr "Varování"
-
 #. -PO: here Live Install is currently *NOT* translated on the desktop, so it's better to keep as it:
 #: ../mdkupdate:120
 #, c-format
@@ -870,11 +411,21 @@ msgstr ""
 "Nejprve musíte instalovat systém na váš pevný disk pomocí průvodce 'Live "
 "Install'."
 
+#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
+#, c-format
+msgid "Please wait"
+msgstr "Prosím počkejte"
+
 #: ../mdkupdate:123 ../mdkupdate:174
 #, c-format
 msgid "Preparing..."
 msgstr "Připravuji..."
 
+#: ../mdkupdate:141 ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
+#, c-format
+msgid "Error"
+msgstr "Chyba"
+
 #: ../mdkupdate:141
 #, c-format
 msgid ""
@@ -886,6 +437,11 @@ msgstr ""
 "\n"
 "%s"
 
+#: ../mdkupdate:159 ../mdkupdate:188
+#, c-format
+msgid "An error occurred"
+msgstr "Stala se chyba"
+
 #: ../mdkupdate:164
 #, c-format
 msgid ""
@@ -914,3 +470,304 @@ msgstr "Instaluji balíčky...\n"
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "Nelze aktualizovat balíčky ze zdroje update_source.\n"
 
+#~ msgid "New bundles are available for your system"
+#~ msgstr "Pro váš systém jsou k dispozici nové produktové balíky"
+
+#~ msgid "Service is not configured. Please click on \"Configure the service\""
+#~ msgstr "Služba není nastavena. Klikněte prosím na \"Nastavit službu\""
+
+#~ msgid "Configure the service"
+#~ msgstr "Nastavit službu"
+
+#~ msgid "Check updates"
+#~ msgstr "Zkontrolovat aktualizace"
+
+#~ msgid "Configure Now!"
+#~ msgstr "Nastavit teď!"
+
+#~ msgid "Actions"
+#~ msgstr "Akce"
+
+#~ msgid "Configure"
+#~ msgstr "Nastavit"
+
+#~ msgid "See logs"
+#~ msgstr "Prohlížet záznamy"
+
+#~ msgid "Status"
+#~ msgstr "Stav"
+
+#~ msgid "Close"
+#~ msgstr "Zavřít"
+
+#~ msgid "Network Connection: "
+#~ msgstr "Připojení k síti: "
+
+#~ msgid "Up"
+#~ msgstr "Připojeno"
+
+#~ msgid "Down"
+#~ msgstr "Není"
+
+#~ msgid "Last check: "
+#~ msgstr "Poslední kontrola: "
+
+#~ msgid "Machine name:"
+#~ msgstr "Název počítače:"
+
+#~ msgid "Updates: "
+#~ msgstr "Aktualizace: "
+
+#~ msgid "Development release not supported by service"
+#~ msgstr "Služba nepodporuje vývojovou verzi"
+
+#~ msgid "Too old release not supported by service"
+#~ msgstr "Služba nepodporuje přiliš starou verzi"
+
+#~ msgid "Unknown state"
+#~ msgstr "Neznámý stav"
+
+#~ msgid "Online services disabled. Contact Mandriva Online site\n"
+#~ msgstr "Online služby jsou vypnuty. Kontaktujte stránky Mandriva Online\n"
+
+#~ msgid "Wrong Password.\n"
+#~ msgstr "Špatné heslo\n"
+
+#~ msgid "Wrong Action or host or login.\n"
+#~ msgstr "Chybná akce nebo počítač nebo přihlášení.\n"
+
+#~ msgid ""
+#~ "Something is wrong with your network settings (check your route, firewall "
+#~ "or proxy settings)\n"
+#~ msgstr ""
+#~ "S vaším nastavením sítě není něco v pořádku (zkontrolujte nastavení "
+#~ "směrování, firewallu nebo proxy)\n"
+
+#~ msgid ""
+#~ "Problem occured while connecting to the server, please contact the "
+#~ "support team"
+#~ msgstr ""
+#~ "Při připojování se k serveru se vyskytl problém, kontaktuje prosím tým "
+#~ "technické podpory"
+
+#~ msgid "Response from Mandriva Online server\n"
+#~ msgstr "Odpověď od serveru Mandriva Online\n"
+
+#~ msgid "No check"
+#~ msgstr "Nezjištěno"
+
+#~ msgid "Checking config file: Not present\n"
+#~ msgstr "Kontroluji soubor s nastavením: Nenalezen\n"
+
+#~ msgid "Logs"
+#~ msgstr "Záznamy"
+
+#~ msgid "Clear"
+#~ msgstr "Vyčistit"
+
+#~ msgid ""
+#~ "mdonline version %s\n"
+#~ "Copyright (C) %s Mandriva.\n"
+#~ "This is free software and may be redistributed under the terms of the GNU "
+#~ "GPL.\n"
+#~ "\n"
+#~ "usage:\n"
+#~ msgstr ""
+#~ "mdonline verze %s\n"
+#~ "Copyright © %s Mandriva.\n"
+#~ "Toto je volně šiřitelný software a může být šířen v souladu s licencí GNU "
+#~ "GPL.\n"
+#~ "\n"
+#~ "Použití:\n"
+
+#~ msgid "  --box=\t\t\t- hostname.\n"
+#~ msgstr "  --box=\t\t\t- název počítače.\n"
+
+#~ msgid "  --country\t\t\t- name of country of the user. \n"
+#~ msgstr "  --country\t\t\t- název země uživatele. \n"
+
+#~ msgid "  --interactive\t\t- use the interactive mode.\n"
+#~ msgstr "  --interactive\t\t- použít interaktivní režim.\n"
+
+#~ msgid "  --nointeractive\t- use the non-interactive mode.\n"
+#~ msgstr "  --nointeractive\t- použít neinteraktivní režim.\n"
+
+#~ msgid "  --login=\t\t     - login name of the user.\n"
+#~ msgstr "  --login=\t\t     - přihlašovací jméno uživatele.\n"
+
+#~ msgid "  --pass=\t\t\t- password  of the user.\n"
+#~ msgstr "  --pass=\t\t\t- heslo uživatele.\n"
+
+#~ msgid "Mandriva Online"
+#~ msgstr "Mandriva Online"
+
+#~ msgid "I already have an account"
+#~ msgstr "Už mám účet"
+
+#~ msgid "I want to subscribe"
+#~ msgstr "Chci se zaregistrovat"
+
+#~ msgid "Mr."
+#~ msgstr "Pan"
+
+#~ msgid "Mrs."
+#~ msgstr "Paní"
+
+#~ msgid "Ms."
+#~ msgstr "Slečna"
+
+#~ msgid "Reading configuration\n"
+#~ msgstr "Načítám konfiguraci\n"
+
+#~ msgid ""
+#~ "This assistant will help you to upload your configuration\n"
+#~ "(packages, hardware configuration) to a centralized database in\n"
+#~ "order to keep you informed about security updates and useful upgrades.\n"
+#~ msgstr ""
+#~ "Tento průvodce umožní nahrát konfiguraci\n"
+#~ "(konfigurace hardware, seznam balíčků) do centrální databáze,\n"
+#~ "kdy budete ihned informováni o všech bezpečnostních a dalších\n"
+#~ "potřebných aktualizacích.\n"
+
+#~ msgid "Account creation or authentication"
+#~ msgstr "Vytvoření nebo ověření účtu"
+
+#~ msgid "Enter your Mandriva Online login, password and machine name:"
+#~ msgstr "Zadejte jméno, heslo a název počítače pro Mandriva Online:"
+
+#~ msgid "Email address:"
+#~ msgstr "Emailová adresa:"
+
+#~ msgid "Country"
+#~ msgstr "Země"
+
+#~ msgid "Password:"
+#~ msgstr "Heslo:"
+
+#~ msgid "Machine description:"
+#~ msgstr "Popis počítače:"
+
+#~ msgid "(Ex: My Home Office's Computer)"
+#~ msgstr "(Např.: Počítač v mé domácí kanceláři)"
+
+#~ msgid "Machine name must be 1 to 40 alphanumerical characters"
+#~ msgstr "Název počítače musí být dlouhý 1 až 40 alfanumerických znaků"
+
+#~ msgid "Connecting to Mandriva Online website..."
+#~ msgstr "Připojuji se k webovým stránkám Mandriva Online..."
+
+#~ msgid ""
+#~ "In order to benefit from Mandriva Online services,\n"
+#~ "we are about to upload your configuration.\n"
+#~ "\n"
+#~ "The Wizard will now send the following information to Mandriva:\n"
+#~ "\n"
+#~ "1) the list of packages you have installed on your system,\n"
+#~ "\n"
+#~ "2) your hardware configuration.\n"
+#~ "\n"
+#~ "If you feel uncomfortable by that idea, or do not want to benefit from "
+#~ "this service,\n"
+#~ "please press 'Cancel'. By pressing 'Next', you allow us to keep you "
+#~ "informed\n"
+#~ "about security updates and useful upgrades via personalized email "
+#~ "alerts.\n"
+#~ "Furthermore, you benefit from discounted paid support services on\n"
+#~ "www.mandrivaexpert.com."
+#~ msgstr ""
+#~ "Pokud chcete využívat službu Mandriva Online,\n"
+#~ "je potřebné zaslat na server vaši konfiguraci.\n"
+#~ "\n"
+#~ "Průvodce nyní pošle následující informace do společnosti Mandriva:\n"
+#~ "\n"
+#~ "1) seznam balíčků, které máte nainstalovány na počítači,\n"
+#~ "\n"
+#~ "2) vaši konfiguraci hardware.\n"
+#~ "\n"
+#~ "Pokud s tím nesouhlasíte, nebo nechcete využít tuto službu,\n"
+#~ "stiskněte tlačítko 'Zrušit'. Pokud stisknete tlačítko 'Další', dáváte nám "
+#~ "možnost vás\n"
+#~ "informovat o bezpečnostních nebo užitečných aktualizacích pomocí\n"
+#~ "personalizovaného emailového upozornění.\n"
+#~ "Můžete také využít snížených cen služeb placené podpory na\n"
+#~ "www.mandrivaexpert.com."
+
+#~ msgid "Connection problem"
+#~ msgstr "Problémy při spojení"
+
+#~ msgid "Problem occurs when uploading files, please try again"
+#~ msgstr "Při nahrávání souborů se vyskytl problém, zkuste to prosím znovu"
+
+#~ msgid "Create a Mandriva Online Account"
+#~ msgstr "Vytvořit účet na Mandriva Online"
+
+#~ msgid "Greeting:"
+#~ msgstr "Pozdrav:"
+
+#~ msgid "First name:"
+#~ msgstr "Jméno:"
+
+#~ msgid "Last name:"
+#~ msgstr "Příjmení:"
+
+#~ msgid "Confirm Password:"
+#~ msgstr "Potvrdit heslo:"
+
+#~ msgid ""
+#~ "The passwords do not match\n"
+#~ " Please try again\n"
+#~ msgstr ""
+#~ "Hesla se neshodují\n"
+#~ "Zkuste to prosím znovu\n"
+
+#~ msgid "Please fill in each field"
+#~ msgstr "Vyplňte prosím každé pole"
+
+#~ msgid "Not a valid mail address!\n"
+#~ msgstr "Neplatná emailová adresa!\n"
+
+#~ msgid "Creating account failed!"
+#~ msgstr "Vytvoření účtu selhalo!"
+
+#~ msgid ""
+#~ "Mandriva Online Account successfully created.\n"
+#~ "Please click \"Next\" to authenticate and upload your configuration\n"
+#~ msgstr ""
+#~ "Účet na Mandriva Online byl úspěšně vytvořen.\n"
+#~ "Klikněte prosím na \"Další\" a přihlaste se a nahrajte své nastavení\n"
+
+#~ msgid "Your upload was successful!"
+#~ msgstr "Zaslání informací proběhlo úspěšně!"
+
+#~ msgid ""
+#~ "From now you will receive on security and updates \n"
+#~ "announcements thanks to Mandriva Online."
+#~ msgstr ""
+#~ "Od této chvíle budete díky službě Mandriva Online\n"
+#~ "informováni o bezpečnostních a dalších aktualizacích."
+
+#~ msgid ""
+#~ "Mandriva Online offers you the ability to automate the updates.\n"
+#~ "A program will run regulary in your system waiting for new updates\n"
+#~ msgstr ""
+#~ "Mandriva Online nabízí možnost automatizovat aktualizace.\n"
+#~ "Program, který bude běžet v systému a čekat na aktualizace\n"
+
+#~ msgid "Congratulations"
+#~ msgstr "Gratulujeme"
+
+#~ msgid "Your Mandriva Online account has been successfully configured\n"
+#~ msgstr "Váš účet na Mandriva Online byl úspěšně nastaven\n"
+
+#~ msgid "Configuration uploaded successfully"
+#~ msgstr "Informace o nastavení byly poslány úspěšně"
+
+#~ msgid "Problem uploading configuration"
+#~ msgstr "Problém při posílání nastavení"
+
+#~ msgid ""
+#~ "Cannot connect to Mandriva Online website: wrong login/password or router/"
+#~ "firewall bad settings"
+#~ msgstr ""
+#~ "Nelze se připojit k webovým stránkám mandrivaonline: chybné přihlášení či "
+#~ "heslo nebo špatně nastavený firewall či router"
diff --git a/po/cy.po b/po/cy.po
index 7d463976..8725e02a 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline 0.15\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-09 16:26+0200\n"
+"POT-Creation-Date: 2008-02-21 18:21+0100\n"
 "PO-Revision-Date: 2007-09-19 22:55+0100\n"
 "Last-Translator: Rhoslyn Prys <post@meddal.com>\n"
 "Language-Team: Cymraeg/Welsh <post@meddal.com>\n"
@@ -17,68 +17,65 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n == 2) ? 1 : 0;\n"
 
 #. -PO: here %s will be replaced by the local time (eg: "Will check updates at 14:03:50"
-#: ../mdkapplet:94
+#: ../mdkapplet:88
 #, c-format
 msgid "Will check updates at %s"
 msgstr "Gwirio diweddariadau ar %s"
 
-#: ../mdkapplet:103
+#: ../mdkapplet:97
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "Mae'r system yn gyfredol"
 
-#: ../mdkapplet:109
+#: ../mdkapplet:103
 #, c-format
-msgid "Service configuration problem. Please check logs and send mail to support@mandrivaonline.com"
-msgstr "Problemau ffurfweddu'r gwasanaethwr. Gwiriwch gofnodion ac anfon e-byst at support@mandrivaonline.com"
+msgid ""
+"Service configuration problem. Please check logs and send mail to "
+"support@mandrivaonline.com"
+msgstr ""
+"Problemau ffurfweddu'r gwasanaethwr. Gwiriwch gofnodion ac anfon e-byst at "
+"support@mandrivaonline.com"
 
-#: ../mdkapplet:115
+#: ../mdkapplet:110
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "Arhoswch, canfod pecynnau sydd ar gael..."
 
-#: ../mdkapplet:121
+#: ../mdkapplet:116
 #, c-format
 msgid "New updates are available for your system"
 msgstr "Mae diweddariadau newydd ar gael ar gyfer eich system"
 
-#: ../mdkapplet:127
-#, c-format
-msgid "New bundles are available for your system"
-msgstr "Mae bwndeli newydd ar gael ar gyfer eich system"
-
-#: ../mdkapplet:133
-#, c-format
-msgid "Service is not configured. Please click on \"Configure the service\""
-msgstr "Nid yw'r gwasanaeth wedi ei ffurfweddu. Cliciwch \"Ffurfweddu'r gwasanaeth\""
-
-#: ../mdkapplet:139
+#: ../mdkapplet:122
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "Nid yw'r rhwydwaith ar gael.  Ffurfweddwch eich rhwydwaith"
 
-#: ../mdkapplet:145
+#: ../mdkapplet:128
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "Nid yw'r gwasanaeth ar gael. Cliciwch \"Gwefan Ar-lein\""
 
-#: ../mdkapplet:151
-#: ../mdkapplet:182
+#: ../mdkapplet:134 ../mdkapplet:165
 #, c-format
 msgid "urpmi database locked"
 msgstr "Cronfa ddata urpmi wedi cloi"
 
-#: ../mdkapplet:157
+#: ../mdkapplet:140
 #, 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)"
+msgstr ""
+"Nid yw'r rhyddhad yn cael ei gynnal (mae'n rhy hen neu'n rhyddhad datblygu)"
 
-#: ../mdkapplet:163
+#: ../mdkapplet:146
 #, c-format
-msgid "No medium found. You must add some media through 'Software Media Manager'."
-msgstr "Heb ganfod cyfrwng. Rhaid ychwanegu cyfrwng drwy'r \"Rheolwr Cyfrwng Meddalwedd\""
+msgid ""
+"No medium found. You must add some media through 'Software Media Manager'."
+msgstr ""
+"Heb ganfod cyfrwng. Rhaid ychwanegu cyfrwng drwy'r \"Rheolwr Cyfrwng "
+"Meddalwedd\""
 
-#: ../mdkapplet:169
+#: ../mdkapplet:152
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -95,590 +92,132 @@ msgstr ""
 "\n"
 "Yna ailgychwyn %s."
 
-#: ../mdkapplet:174
+#: ../mdkapplet:157
 #, c-format
 msgid "Enabled"
 msgstr "Galluogwyd"
 
-#: ../mdkapplet:187
+#: ../mdkapplet:170
 #, c-format
 msgid "Error updating media"
 msgstr "Gwall wrth diweddaru cyfrwng"
 
-#: ../mdkapplet:202
+#: ../mdkapplet:185
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr "Gwirio... Mae diweddariadau ar gael\n"
 
-#: ../mdkapplet:207
+#: ../mdkapplet:190
 #, c-format
 msgid "Packages are up to date"
 msgstr "Mae'r pecynnau'n rhai diweddaraf"
 
-#: ../mdkapplet:212
+#: ../mdkapplet:195
 #, c-format
 msgid "Failed to open urpmi database"
 msgstr "Methu agor cronfa ddata urpmi"
 
-#: ../mdkapplet:217
-#: ../mdkapplet:324
+#: ../mdkapplet:200
 #, c-format
 msgid "Install updates"
 msgstr "Gosod diweddariadau"
 
-#: ../mdkapplet:218
-#, c-format
-msgid "Configure the service"
-msgstr "Ffurfweddu'r gwasanaeth"
-
-#: ../mdkapplet:219
+#: ../mdkapplet:201
 #, c-format
 msgid "Check Updates"
 msgstr "Gwirio Diweddariad"
 
-#: ../mdkapplet:220
-#: ../mdkapplet:327
-#: ../mdkonline:114
-#: ../mdkonline:155
-#: ../mdkupdate:123
-#: ../mdkupdate:174
-#: ../mdkupdate:219
-#, c-format
-msgid "Please wait"
-msgstr "Arhoswch"
-
-#: ../mdkapplet:220
-#: ../mdkapplet:326
-#: ../mdkapplet:327
-#, c-format
-msgid "Check updates"
-msgstr "Gwirio diweddariad"
-
-#: ../mdkapplet:223
-#: ../mdkapplet:648
-#, c-format
-msgid "Online WebSite"
-msgstr "Safle Gwe Ar-lein"
-
-#: ../mdkapplet:224
+#: ../mdkapplet:202
 #, c-format
 msgid "Configure Network"
 msgstr "Ffurfweddu'r Rhwydwaith"
 
-#: ../mdkapplet:225
-#, c-format
-msgid "Configure Now!"
-msgstr "Ffurfweddu!"
-
-#: ../mdkapplet:313
-#: ../mdkapplet:392
-#, c-format
-msgid "Mandriva Linux Updates Applet"
-msgstr "Rhaglennig Diweddaru Mandriva Linux"
-
-#: ../mdkapplet:322
-#, c-format
-msgid "Actions"
-msgstr "Gweithredoedd"
-
-#: ../mdkapplet:325
-#, c-format
-msgid "Configure"
-msgstr "Ffurfweddu"
-
-#: ../mdkapplet:329
-#, c-format
-msgid "See logs"
-msgstr "Darllen cofnodion"
-
-#: ../mdkapplet:332
-#, c-format
-msgid "Status"
-msgstr "Statws"
-
-#: ../mdkapplet:336
-#: ../mdkapplet:597
-#, c-format
-msgid "Close"
-msgstr "Cau"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Network Connection: "
-msgstr "Cyswllt Rhwydwaith:"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Up"
-msgstr "Fyny"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Down"
-msgstr "Lawr"
-
-#: ../mdkapplet:366
-#, c-format
-msgid "Last check: "
-msgstr "Gwiriad diwethaf:"
-
-#: ../mdkapplet:367
-#: ../mdkonline:145
-#, c-format
-msgid "Machine name:"
-msgstr "Enw'r peiriant:"
-
-#: ../mdkapplet:368
-#, c-format
-msgid "Updates: "
-msgstr "Diweddariadau:"
-
-#: ../mdkapplet:372
+#: ../mdkapplet:283
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Cychwyn drakconnect\n"
 
-#: ../mdkapplet:375
+#: ../mdkapplet:286
 #, c-format
 msgid "Mandriva Online seems to be reinstalled, reloading applet ...."
-msgstr "Mae Mandriva Online i'w weld wedi ei ail osod, ail lwytho'r rhaglennig..."
+msgstr ""
+"Mae Mandriva Online i'w weld wedi ei ail osod, ail lwytho'r rhaglennig..."
 
-#: ../mdkapplet:383
+#: ../mdkapplet:294
 #, c-format
 msgid "Launching MandrivaUpdate\n"
 msgstr "Cychwyn MandrivaUpdate\n"
 
-#: ../mdkapplet:398
+#: ../mdkapplet:303
+#, c-format
+msgid "Mandriva Linux Updates Applet"
+msgstr "Rhaglennig Diweddaru Mandriva Linux"
+
+#: ../mdkapplet:308
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Cyfrifo diweddariadau newydd...\n"
 
-#: ../mdkapplet:399
+#: ../mdkapplet:309
 #, c-format
 msgid "Connecting to"
 msgstr "Cysylltu â"
 
-#: ../mdkapplet:467
-#: ../mdkupdate:159
-#: ../mdkupdate:188
-#, c-format
-msgid "An error occurred"
-msgstr "Digwyddodd gwall"
-
-#: ../mdkapplet:475
-#, c-format
-msgid "Development release not supported by service"
-msgstr "Nid yw ryddhad datblygu'n cael ei gynnal gan y gwasanaeth"
-
-#: ../mdkapplet:476
-#, c-format
-msgid "Too old release not supported by service"
-msgstr "Nid yw hen ryddhad yn cael ei gynnal gan y gwasanaeth"
-
-#: ../mdkapplet:477
-#, c-format
-msgid "Unknown state"
-msgstr "Cyflwr anhysbys"
-
-#: ../mdkapplet:478
-#, c-format
-msgid "Online services disabled. Contact Mandriva Online site\n"
-msgstr "Mae'r gwasanaethau ar-lein wedi eu hatal. Cysylltwch â safle Mandriva Online\n"
-
-#: ../mdkapplet:479
-#, c-format
-msgid "Wrong Password.\n"
-msgstr "Y cyfrinair anghywir\n"
-
-#: ../mdkapplet:480
-#, c-format
-msgid "Wrong Action or host or login.\n"
-msgstr "Gweithred, gwestai neu fewngofnod anghywir.\n"
-
-#: ../mdkapplet:481
-#, c-format
-msgid "Something is wrong with your network settings (check your route, firewall or proxy settings)\n"
-msgstr "Mae rhywbeth o'i le ar osodiadau eich rhwydwaith (gwiriwch eich llwybr, mur cadarn neu osodiadau dirprwy)\n"
-
-#: ../mdkapplet:483
-#, c-format
-msgid "Problem occured while connecting to the server, please contact the support team"
-msgstr "Digwyddodd anhawster wrth gysylltu â'r gweinydd, cysylltwch â'r tîm cefnogi"
-
-#: ../mdkapplet:487
-#, c-format
-msgid "Response from Mandriva Online server\n"
-msgstr "Ymateb gan weinydd Mandriva Online\n"
-
-#: ../mdkapplet:490
+#: ../mdkapplet:386
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Mae'r system yn gyfredol\n"
 
-#: ../mdkapplet:527
-#, c-format
-msgid "No check"
-msgstr "Dim gwiriad"
-
-#: ../mdkapplet:541
-#, c-format
-msgid "Checking config file: Not present\n"
-msgstr "Gwirio ffeil ffurfweddiad: Nid yw ar gael\n"
-
-#: ../mdkapplet:544
+#: ../mdkapplet:415
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Gwirio'r Rhwydwaith: i weld wedi ei anablu\n"
 
-#: ../mdkapplet:587
+#: ../mdkapplet:457 ../mdkupdate:118 ../mdkupdate:164
 #, c-format
-msgid "Logs"
-msgstr "Cofnodion"
-
-#: ../mdkapplet:603
-#, c-format
-msgid "Clear"
-msgstr "Clirio"
+msgid "Warning"
+msgstr "Rhybudd"
 
-#: ../mdkapplet:629
+#: ../mdkapplet:468
 #, c-format
 msgid "About..."
 msgstr "Ynghylch..."
 
-#: ../mdkapplet:631
+#: ../mdkapplet:472
 #, c-format
 msgid "Mandriva Online %s"
 msgstr "Mandriva Online %s"
 
-#: ../mdkapplet:635
+#: ../mdkapplet:473
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Hawlfraint (C) %s  Mandriva"
 
-#: ../mdkapplet:647
+#: ../mdkapplet:476
 #, c-format
 msgid "Mandriva Online gives access to Mandriva web services."
 msgstr "Mandriva Online yw gwasanaethau gwe Mandriva."
 
-#: ../mdkapplet:655
-#, c-format
-msgid "Always launch on startup"
-msgstr "Cychwyn wrth gychwyn"
-
-#: ../mdkapplet:657
-#, c-format
-msgid "Quit"
-msgstr "Gadael"
-
-#: ../mdkonline:58
-#, c-format
-msgid ""
-"mdonline version %s\n"
-"Copyright (C) %s Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"fersiwn %s mdonline  \n"
-"Hawlfraint (H) %s Mandriva.\n"
-"Mae hwn yn feddalwedd rhydd ac mae modd ei ail ddosbarthu o dan amodau GNU GPL.\n"
-"\n"
-"defnydd:\n"
-
-#: ../mdkonline:63
-#: ../mdkupdate:73
-#, c-format
-msgid "  --help\t\t- print this help message.\n"
-msgstr "  --help\t\t- argraffu'r neges cymorth hon.\n"
-
-#: ../mdkonline:64
-#, c-format
-msgid "  --box=\t\t\t- hostname.\n"
-msgstr "  --box=\t\t\t- enw gwesteiwr.\n"
-
-#: ../mdkonline:65
-#, c-format
-msgid "  --country\t\t\t- name of country of the user. \n"
-msgstr "  --country\t\t\t- enw gwlad y defnyddiwr. \n"
-
-#: ../mdkonline:66
-#, c-format
-msgid "  --interactive\t\t- use the interactive mode.\n"
-msgstr "  --interactive\t\t- defnyddio'r modd rhyngweithiol.\n"
-
-#: ../mdkonline:67
-#, c-format
-msgid "  --nointeractive\t- use the non-interactive mode.\n"
-msgstr "  --nointeractive\t- defnyddio'r modd anrhyngweithiol.\n"
-
-#: ../mdkonline:68
-#, c-format
-msgid "  --login=\t\t     - login name of the user.\n"
-msgstr "  --login=\t\t     - enw mewngofnodi'r defnyddiwr.\n"
-
-#: ../mdkonline:69
-#, c-format
-msgid "  --pass=\t\t\t- password  of the user.\n"
-msgstr "  --pass=\t\t\t- cyfrinair y defnyddiwr.\n"
-
-#: ../mdkonline:87
-#: ../mdkonline:120
-#, c-format
-msgid "Mandriva Online"
-msgstr "Mandriva Online"
-
-#: ../mdkonline:90
-#, c-format
-msgid "I already have an account"
-msgstr "Mae gen i gyfrif yn barod"
-
-#: ../mdkonline:91
-#, c-format
-msgid "I want to subscribe"
-msgstr "Rwyf eisiau tanysgrifio"
-
-#: ../mdkonline:96
-#, c-format
-msgid "Mr."
-msgstr "Mr."
-
-#: ../mdkonline:96
-#, c-format
-msgid "Mrs."
-msgstr "Mrs."
-
-#: ../mdkonline:96
-#, c-format
-msgid "Ms."
-msgstr "Ms."
-
-#: ../mdkonline:114
-#, c-format
-msgid "Reading configuration\n"
-msgstr "Darllen ffurfweddiad\n"
-
-#: ../mdkonline:123
-#, c-format
-msgid ""
-"This assistant will help you to upload your configuration\n"
-"(packages, hardware configuration) to a centralized database in\n"
-"order to keep you informed about security updates and useful upgrades.\n"
-msgstr ""
-"Bydd y cynorthwyydd yn eich helpu i lwytho'ch ffurfweddiad i fyny\n"
-"(pecynnau, ffurfweddiad caledwedd) i gronfa ddata canolog er\n"
-"mwyn eich hysbysu am ddiweddariadau diogelwch a defnyddiol.\n"
-
-#: ../mdkonline:131
-#, c-format
-msgid "Account creation or authentication"
-msgstr "Creu cyfrif neu ddilysiad"
-
-#: ../mdkonline:136
-#, c-format
-msgid "Enter your Mandriva Online login, password and machine name:"
-msgstr "Rhowch eich mewngofnod Mandriva Online, eich cyfrinair ac enw'r peiriant :"
-
-#: ../mdkonline:142
-#: ../mdkonline:195
-#, c-format
-msgid "Email address:"
-msgstr "Cyfeiriad e-bost:"
-
-#: ../mdkonline:143
-#, c-format
-msgid "Country"
-msgstr "Gwlad"
-
-#: ../mdkonline:144
-#: ../mdkonline:196
-#, c-format
-msgid "Password:"
-msgstr "Cyfrinair:"
-
-#: ../mdkonline:146
-#, c-format
-msgid "Machine description:"
-msgstr "Disgrifiad y peiriant:"
-
-#: ../mdkonline:147
-#, c-format
-msgid "(Ex: My Home Office's Computer)"
-msgstr "(E.e.: Cyfrifiadur Swyddfa Cartref)"
-
-#: ../mdkonline:152
-#: ../mdkonline:159
-#: ../mdkonline:180
-#: ../mdkonline:204
-#: ../mdkonline:208
-#: ../mdkonline:212
-#: ../mdkonline:217
-#: ../mdkupdate:141
-#: ../mdkupdate:159
-#: ../mdkupdate:188
-#: ../mdkupdate:207
-#, c-format
-msgid "Error"
-msgstr "Gwall"
-
-#: ../mdkonline:152
-#, c-format
-msgid "Machine name must be 1 to 40 alphanumerical characters"
-msgstr "Rhaid i enw'r peiriant fod 1 i 40 nod rhifol"
-
-#: ../mdkonline:155
-#, c-format
-msgid "Connecting to Mandriva Online website..."
-msgstr "Cysylltu â safle gwe Mandriva Online..."
-
-#: ../mdkonline:167
-#, c-format
-msgid ""
-"In order to benefit from Mandriva Online services,\n"
-"we are about to upload your configuration.\n"
-"\n"
-"The Wizard will now send the following information to Mandriva:\n"
-"\n"
-"1) the list of packages you have installed on your system,\n"
-"\n"
-"2) your hardware configuration.\n"
-"\n"
-"If you feel uncomfortable by that idea, or do not want to benefit from this service,\n"
-"please press 'Cancel'. By pressing 'Next', you allow us to keep you informed\n"
-"about security updates and useful upgrades via personalized email alerts.\n"
-"Furthermore, you benefit from discounted paid support services on\n"
-"www.mandrivaexpert.com."
-msgstr ""
-"Er mwyn manteisio ar wasanaethau Mandriva Online,\n"
-"rydym ar fin llwytho eich ffurfweddiad i fyny.\n"
-"\n"
-"Bydd y Dewin yn anfon y wybodaeth ganlynol at Mandriva:\n"
-"\n"
-"1) rhestr y pecynnau sydd ar eich system,\n"
-"\n"
-"2) ffurfweddiad eich caledwedd\n"
-"\n"
-"Os nad ydych yn gysurus gyda hyn, neu heb fod eisiau manteisio ar y gwasanaeth\n"
-"cliciwch 'Diddymu'. Drwy glicio 'Nesaf' rydych yn caniatáu i ni eich hysbysu am\n"
-"ddiweddariadau diogelwch a defnyddiol drwy hysbysiadau e-bost personol.\n"
-"Hefyd, byddwch yn manteisio ar wasanaeth cefnogaeth ratach gan\n"
-"www.mandrivaexpert.com."
-
-#: ../mdkonline:180
-#, c-format
-msgid "Connection problem"
-msgstr "Problem cysylltu"
-
-#: ../mdkonline:180
-#, c-format
-msgid "Problem occurs when uploading files, please try again"
-msgstr "Mae problem yn digwydd wrth lwytho ffeiliau i fyny, ceisiwch eto."
-
-#: ../mdkonline:187
-#, c-format
-msgid "Create a Mandriva Online Account"
-msgstr "Creu cyfrif Mandriva Online "
-
-#. -PO: that is for things like "Mr", "Ms",...
-#: ../mdkonline:192
-#, c-format
-msgid "Greeting:"
-msgstr "Cyfarchiad:"
-
-#: ../mdkonline:193
-#, c-format
-msgid "First name:"
-msgstr "Enw cyntaf:"
-
-#: ../mdkonline:194
-#, c-format
-msgid "Last name:"
-msgstr "Enw olaf :"
-
-#: ../mdkonline:197
-#, c-format
-msgid "Confirm Password:"
-msgstr "Cadarnhau Cyfrinair:"
-
-#: ../mdkonline:204
-#, c-format
-msgid ""
-"The passwords do not match\n"
-" Please try again\n"
-msgstr ""
-"Nid yw'r cyfrineiriau'n cydweddu\n"
-"Ceisiwch eto\n"
-
-#: ../mdkonline:208
-#, c-format
-msgid "Please fill in each field"
-msgstr "Llanwch pob maes"
-
-#: ../mdkonline:212
-#, c-format
-msgid "Not a valid mail address!\n"
-msgstr "Nid yw'n gyfeiriad e-bost dilys!\n"
-
-#: ../mdkonline:217
-#, c-format
-msgid "Creating account failed!"
-msgstr "Methodd creu cyfrif y defnyddiwr!"
-
-#: ../mdkonline:225
-#, c-format
-msgid ""
-"Mandriva Online Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
-msgstr ""
-"Crëwyd Cyfrif Mandriva Online yn llwyddiannus.\n"
-"Cliciwch \"Nesaf\" i ddilysu a llwytho'ch ffurfweddiad i fyny\n"
-
-#: ../mdkonline:229
-#, c-format
-msgid "Your upload was successful!"
-msgstr "Roedd eich llwytho i fyny'n llwyddiant!"
-
-#: ../mdkonline:229
+#: ../mdkapplet:478
 #, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandriva Online."
-msgstr ""
-"O hyn ymlaen byddwch yn derbyn cyhoeddiadau\n"
-"diogelwch a diweddariadau gan Mandriva Online."
+msgid "Online WebSite"
+msgstr "Safle Gwe Ar-lein"
 
-#: ../mdkonline:229
+#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
+#: ../mdkapplet:483
 #, c-format
-msgid ""
-"Mandriva Online offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
+msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
-"Mae Mandriva Online yn cynnig y dewis i chi ddiweddaru'n awtomatig,\n"
-"Bydd rhaglen yn rhedeg yn rheolaidd yn eich system i gasglu diweddariadau.\n"
-
-#: ../mdkonline:238
-#, c-format
-msgid "Congratulations"
-msgstr "Llongyfarchiadau"
-
-#: ../mdkonline:238
-#, c-format
-msgid "Your Mandriva Online account has been successfully configured\n"
-msgstr "Mae eich cyfrif Mandriva Online wedi ei ffurfweddu'n llwyddiannus\n"
-
-#: ../mdkonline:253
-#, c-format
-msgid "Configuration uploaded successfully"
-msgstr "Llwytho'r ffurfweddiad yn llwyddiannus"
 
-#: ../mdkonline:254
+#: ../mdkapplet:492
 #, c-format
-msgid "Problem uploading configuration"
-msgstr "Anhawster llwytho'r ffurfweddiad"
+msgid "Always launch on startup"
+msgstr "Cychwyn wrth gychwyn"
 
-#: ../mdkonline:256
+#: ../mdkapplet:494
 #, c-format
-msgid "Cannot connect to Mandriva Online website: wrong login/password or router/firewall bad settings"
-msgstr "Methu cysylltu â safle gwe Mandriva Online: mewngofnod/cyfrinair anghywir neu osodiadau llwybrydd/mur cadarn anghywir."
+msgid "Quit"
+msgstr "Gadael"
 
 #: ../mdkonline.pm:207
 #, c-format
@@ -714,8 +253,7 @@ msgstr "Gwall cofrestru"
 msgid "Some parameters are missing"
 msgstr "Mae rhai paramedrau ar goll"
 
-#: ../mdkonline.pm:210
-#: ../mdkonline.pm:216
+#: ../mdkonline.pm:210 ../mdkonline.pm:216
 #, c-format
 msgid "Password error"
 msgstr "Gwall cyfrinair"
@@ -725,9 +263,7 @@ msgstr "Gwall cyfrinair"
 msgid "Wrong password"
 msgstr "Y cyfrinair anghywir"
 
-#: ../mdkonline.pm:211
-#: ../mdkonline.pm:212
-#: ../mdkonline.pm:213
+#: ../mdkonline.pm:211 ../mdkonline.pm:212 ../mdkonline.pm:213
 #, c-format
 msgid "Login error"
 msgstr "Gwall mewngofnodi"
@@ -765,8 +301,7 @@ msgstr "Gwall Cyfyngu"
 msgid "Database access forbidden"
 msgstr "Mynediad cronfa ddata gwaharddedig"
 
-#: ../mdkonline.pm:215
-#: ../mdkonline.pm:217
+#: ../mdkonline.pm:215 ../mdkonline.pm:217
 #, c-format
 msgid "Service error"
 msgstr "Gwall gwasanaeth"
@@ -819,16 +354,23 @@ msgstr "Methu cyrraedd gwasanaethau gwe Mandriva"
 msgid ""
 "mdkupdate version %s\n"
 "Copyright (C) %s Mandriva.\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 ""
 "fersiwn %s mdkupdate  \n"
 "Hawlfraint (H) %s Mandriva.\n"
-"Mae hwn yn feddalwedd rhydd ac mae modd ei ail ddosbarthu o dan amodau GNU GPL.\n"
+"Mae hwn yn feddalwedd rhydd ac mae modd ei ail ddosbarthu o dan amodau GNU "
+"GPL.\n"
 "\n"
 "defnydd:\n"
 
+#: ../mdkupdate:73
+#, c-format
+msgid "  --help\t\t- print this help message.\n"
+msgstr "  --help\t\t- argraffu'r neges cymorth hon.\n"
+
 #: ../mdkupdate:74
 #, c-format
 msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
@@ -851,27 +393,36 @@ msgstr "  --debug\t\t\t- cofnodi'r hyn sydd wedi ei wneud\n"
 
 #: ../mdkupdate:78
 #, c-format
-msgid "  --bundle file.bundle\t- parse and install package from .bundle metainfo file.\n"
-msgstr "  --bundle file.bundle\t- didoli a gosod pecyn o .bundle metainfo file.\n"
-
-#: ../mdkupdate:118
-#: ../mdkupdate:164
-#, c-format
-msgid "Warning"
-msgstr "Rhybudd"
+msgid ""
+"  --bundle file.bundle\t- parse and install package from .bundle metainfo "
+"file.\n"
+msgstr ""
+"  --bundle file.bundle\t- didoli a gosod pecyn o .bundle metainfo file.\n"
 
 #. -PO: here Live Install is currently *NOT* translated on the desktop, so it's better to keep as it:
 #: ../mdkupdate:120
 #, c-format
-msgid "You first need to install the system on your harddrive with the 'Live Install' wizard."
-msgstr "Rhaid gosod y system ar eich disg caled yn gyntaf gyda dewin 'Live Install'."
+msgid ""
+"You first need to install the system on your harddrive with the 'Live "
+"Install' wizard."
+msgstr ""
+"Rhaid gosod y system ar eich disg caled yn gyntaf gyda dewin 'Live Install'."
+
+#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
+#, c-format
+msgid "Please wait"
+msgstr "Arhoswch"
 
-#: ../mdkupdate:123
-#: ../mdkupdate:174
+#: ../mdkupdate:123 ../mdkupdate:174
 #, c-format
 msgid "Preparing..."
 msgstr "Paratoi..."
 
+#: ../mdkupdate:141 ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
+#, c-format
+msgid "Error"
+msgstr "Gwall"
+
 #: ../mdkupdate:141
 #, c-format
 msgid ""
@@ -883,12 +434,18 @@ msgstr ""
 "\n"
 "%s"
 
+#: ../mdkupdate:159 ../mdkupdate:188
+#, c-format
+msgid "An error occurred"
+msgstr "Digwyddodd gwall"
+
 #: ../mdkupdate:164
 #, c-format
 msgid ""
 "The version of the Mandriva Online client is too old.\n"
 "\n"
-"You need to update to a newer version. You can get a new one from http://start.mandriva.com"
+"You need to update to a newer version. You can get a new one from http://"
+"start.mandriva.com"
 msgstr ""
 "Mae'r fersiwn o gleient Mandriva Online yn rhy hen.\n"
 "\n"
@@ -904,44 +461,366 @@ msgstr "Nid yw'r bwndel wedi ei ffurfio'n dda. Atal."
 msgid "Installing packages ...\n"
 msgstr "Gosod pecynnau...\n"
 
-#: ../mdkupdate:231
-#: ../mdkupdate:271
+#: ../mdkupdate:231 ../mdkupdate:271
 #, c-format
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "Methu diweddaru pecynnau o gyfrwng update_source.\n"
 
+#~ msgid "New bundles are available for your system"
+#~ msgstr "Mae bwndeli newydd ar gael ar gyfer eich system"
+
+#~ msgid "Service is not configured. Please click on \"Configure the service\""
+#~ msgstr ""
+#~ "Nid yw'r gwasanaeth wedi ei ffurfweddu. Cliciwch \"Ffurfweddu'r gwasanaeth"
+#~ "\""
+
+#~ msgid "Configure the service"
+#~ msgstr "Ffurfweddu'r gwasanaeth"
+
+#~ msgid "Check updates"
+#~ msgstr "Gwirio diweddariad"
+
+#~ msgid "Configure Now!"
+#~ msgstr "Ffurfweddu!"
+
+#~ msgid "Actions"
+#~ msgstr "Gweithredoedd"
+
+#~ msgid "Configure"
+#~ msgstr "Ffurfweddu"
+
+#~ msgid "See logs"
+#~ msgstr "Darllen cofnodion"
+
+#~ msgid "Status"
+#~ msgstr "Statws"
+
+#~ msgid "Close"
+#~ msgstr "Cau"
+
+#~ msgid "Network Connection: "
+#~ msgstr "Cyswllt Rhwydwaith:"
+
+#~ msgid "Up"
+#~ msgstr "Fyny"
+
+#~ msgid "Down"
+#~ msgstr "Lawr"
+
+#~ msgid "Last check: "
+#~ msgstr "Gwiriad diwethaf:"
+
+#~ msgid "Machine name:"
+#~ msgstr "Enw'r peiriant:"
+
+#~ msgid "Updates: "
+#~ msgstr "Diweddariadau:"
+
+#~ msgid "Development release not supported by service"
+#~ msgstr "Nid yw ryddhad datblygu'n cael ei gynnal gan y gwasanaeth"
+
+#~ msgid "Too old release not supported by service"
+#~ msgstr "Nid yw hen ryddhad yn cael ei gynnal gan y gwasanaeth"
+
+#~ msgid "Unknown state"
+#~ msgstr "Cyflwr anhysbys"
+
+#~ msgid "Online services disabled. Contact Mandriva Online site\n"
+#~ msgstr ""
+#~ "Mae'r gwasanaethau ar-lein wedi eu hatal. Cysylltwch â safle Mandriva "
+#~ "Online\n"
+
+#~ msgid "Wrong Password.\n"
+#~ msgstr "Y cyfrinair anghywir\n"
+
+#~ msgid "Wrong Action or host or login.\n"
+#~ msgstr "Gweithred, gwestai neu fewngofnod anghywir.\n"
+
+#~ msgid ""
+#~ "Something is wrong with your network settings (check your route, firewall "
+#~ "or proxy settings)\n"
+#~ msgstr ""
+#~ "Mae rhywbeth o'i le ar osodiadau eich rhwydwaith (gwiriwch eich llwybr, "
+#~ "mur cadarn neu osodiadau dirprwy)\n"
+
+#~ msgid ""
+#~ "Problem occured while connecting to the server, please contact the "
+#~ "support team"
+#~ msgstr ""
+#~ "Digwyddodd anhawster wrth gysylltu â'r gweinydd, cysylltwch â'r tîm "
+#~ "cefnogi"
+
+#~ msgid "Response from Mandriva Online server\n"
+#~ msgstr "Ymateb gan weinydd Mandriva Online\n"
+
+#~ msgid "No check"
+#~ msgstr "Dim gwiriad"
+
+#~ msgid "Checking config file: Not present\n"
+#~ msgstr "Gwirio ffeil ffurfweddiad: Nid yw ar gael\n"
+
+#~ msgid "Logs"
+#~ msgstr "Cofnodion"
+
+#~ msgid "Clear"
+#~ msgstr "Clirio"
+
+#~ msgid ""
+#~ "mdonline version %s\n"
+#~ "Copyright (C) %s Mandriva.\n"
+#~ "This is free software and may be redistributed under the terms of the GNU "
+#~ "GPL.\n"
+#~ "\n"
+#~ "usage:\n"
+#~ msgstr ""
+#~ "fersiwn %s mdonline  \n"
+#~ "Hawlfraint (H) %s Mandriva.\n"
+#~ "Mae hwn yn feddalwedd rhydd ac mae modd ei ail ddosbarthu o dan amodau "
+#~ "GNU GPL.\n"
+#~ "\n"
+#~ "defnydd:\n"
+
+#~ msgid "  --box=\t\t\t- hostname.\n"
+#~ msgstr "  --box=\t\t\t- enw gwesteiwr.\n"
+
+#~ msgid "  --country\t\t\t- name of country of the user. \n"
+#~ msgstr "  --country\t\t\t- enw gwlad y defnyddiwr. \n"
+
+#~ msgid "  --interactive\t\t- use the interactive mode.\n"
+#~ msgstr "  --interactive\t\t- defnyddio'r modd rhyngweithiol.\n"
+
+#~ msgid "  --nointeractive\t- use the non-interactive mode.\n"
+#~ msgstr "  --nointeractive\t- defnyddio'r modd anrhyngweithiol.\n"
+
+#~ msgid "  --login=\t\t     - login name of the user.\n"
+#~ msgstr "  --login=\t\t     - enw mewngofnodi'r defnyddiwr.\n"
+
+#~ msgid "  --pass=\t\t\t- password  of the user.\n"
+#~ msgstr "  --pass=\t\t\t- cyfrinair y defnyddiwr.\n"
+
+#~ msgid "Mandriva Online"
+#~ msgstr "Mandriva Online"
+
+#~ msgid "I already have an account"
+#~ msgstr "Mae gen i gyfrif yn barod"
+
+#~ msgid "I want to subscribe"
+#~ msgstr "Rwyf eisiau tanysgrifio"
+
+#~ msgid "Mr."
+#~ msgstr "Mr."
+
+#~ msgid "Mrs."
+#~ msgstr "Mrs."
+
+#~ msgid "Ms."
+#~ msgstr "Ms."
+
+#~ msgid "Reading configuration\n"
+#~ msgstr "Darllen ffurfweddiad\n"
+
+#~ msgid ""
+#~ "This assistant will help you to upload your configuration\n"
+#~ "(packages, hardware configuration) to a centralized database in\n"
+#~ "order to keep you informed about security updates and useful upgrades.\n"
+#~ msgstr ""
+#~ "Bydd y cynorthwyydd yn eich helpu i lwytho'ch ffurfweddiad i fyny\n"
+#~ "(pecynnau, ffurfweddiad caledwedd) i gronfa ddata canolog er\n"
+#~ "mwyn eich hysbysu am ddiweddariadau diogelwch a defnyddiol.\n"
+
+#~ msgid "Account creation or authentication"
+#~ msgstr "Creu cyfrif neu ddilysiad"
+
+#~ msgid "Enter your Mandriva Online login, password and machine name:"
+#~ msgstr ""
+#~ "Rhowch eich mewngofnod Mandriva Online, eich cyfrinair ac enw'r peiriant :"
+
+#~ msgid "Email address:"
+#~ msgstr "Cyfeiriad e-bost:"
+
+#~ msgid "Country"
+#~ msgstr "Gwlad"
+
+#~ msgid "Password:"
+#~ msgstr "Cyfrinair:"
+
+#~ msgid "Machine description:"
+#~ msgstr "Disgrifiad y peiriant:"
+
+#~ msgid "(Ex: My Home Office's Computer)"
+#~ msgstr "(E.e.: Cyfrifiadur Swyddfa Cartref)"
+
+#~ msgid "Machine name must be 1 to 40 alphanumerical characters"
+#~ msgstr "Rhaid i enw'r peiriant fod 1 i 40 nod rhifol"
+
+#~ msgid "Connecting to Mandriva Online website..."
+#~ msgstr "Cysylltu â safle gwe Mandriva Online..."
+
+#~ msgid ""
+#~ "In order to benefit from Mandriva Online services,\n"
+#~ "we are about to upload your configuration.\n"
+#~ "\n"
+#~ "The Wizard will now send the following information to Mandriva:\n"
+#~ "\n"
+#~ "1) the list of packages you have installed on your system,\n"
+#~ "\n"
+#~ "2) your hardware configuration.\n"
+#~ "\n"
+#~ "If you feel uncomfortable by that idea, or do not want to benefit from "
+#~ "this service,\n"
+#~ "please press 'Cancel'. By pressing 'Next', you allow us to keep you "
+#~ "informed\n"
+#~ "about security updates and useful upgrades via personalized email "
+#~ "alerts.\n"
+#~ "Furthermore, you benefit from discounted paid support services on\n"
+#~ "www.mandrivaexpert.com."
+#~ msgstr ""
+#~ "Er mwyn manteisio ar wasanaethau Mandriva Online,\n"
+#~ "rydym ar fin llwytho eich ffurfweddiad i fyny.\n"
+#~ "\n"
+#~ "Bydd y Dewin yn anfon y wybodaeth ganlynol at Mandriva:\n"
+#~ "\n"
+#~ "1) rhestr y pecynnau sydd ar eich system,\n"
+#~ "\n"
+#~ "2) ffurfweddiad eich caledwedd\n"
+#~ "\n"
+#~ "Os nad ydych yn gysurus gyda hyn, neu heb fod eisiau manteisio ar y "
+#~ "gwasanaeth\n"
+#~ "cliciwch 'Diddymu'. Drwy glicio 'Nesaf' rydych yn caniatáu i ni eich "
+#~ "hysbysu am\n"
+#~ "ddiweddariadau diogelwch a defnyddiol drwy hysbysiadau e-bost personol.\n"
+#~ "Hefyd, byddwch yn manteisio ar wasanaeth cefnogaeth ratach gan\n"
+#~ "www.mandrivaexpert.com."
+
+#~ msgid "Connection problem"
+#~ msgstr "Problem cysylltu"
+
+#~ msgid "Problem occurs when uploading files, please try again"
+#~ msgstr "Mae problem yn digwydd wrth lwytho ffeiliau i fyny, ceisiwch eto."
+
+#~ msgid "Create a Mandriva Online Account"
+#~ msgstr "Creu cyfrif Mandriva Online "
+
+#~ msgid "Greeting:"
+#~ msgstr "Cyfarchiad:"
+
+#~ msgid "First name:"
+#~ msgstr "Enw cyntaf:"
+
+#~ msgid "Last name:"
+#~ msgstr "Enw olaf :"
+
+#~ msgid "Confirm Password:"
+#~ msgstr "Cadarnhau Cyfrinair:"
+
+#~ msgid ""
+#~ "The passwords do not match\n"
+#~ " Please try again\n"
+#~ msgstr ""
+#~ "Nid yw'r cyfrineiriau'n cydweddu\n"
+#~ "Ceisiwch eto\n"
+
+#~ msgid "Please fill in each field"
+#~ msgstr "Llanwch pob maes"
+
+#~ msgid "Not a valid mail address!\n"
+#~ msgstr "Nid yw'n gyfeiriad e-bost dilys!\n"
+
+#~ msgid "Creating account failed!"
+#~ msgstr "Methodd creu cyfrif y defnyddiwr!"
+
+#~ msgid ""
+#~ "Mandriva Online Account successfully created.\n"
+#~ "Please click \"Next\" to authenticate and upload your configuration\n"
+#~ msgstr ""
+#~ "Crëwyd Cyfrif Mandriva Online yn llwyddiannus.\n"
+#~ "Cliciwch \"Nesaf\" i ddilysu a llwytho'ch ffurfweddiad i fyny\n"
+
+#~ msgid "Your upload was successful!"
+#~ msgstr "Roedd eich llwytho i fyny'n llwyddiant!"
+
+#~ msgid ""
+#~ "From now you will receive on security and updates \n"
+#~ "announcements thanks to Mandriva Online."
+#~ msgstr ""
+#~ "O hyn ymlaen byddwch yn derbyn cyhoeddiadau\n"
+#~ "diogelwch a diweddariadau gan Mandriva Online."
+
+#~ msgid ""
+#~ "Mandriva Online offers you the ability to automate the updates.\n"
+#~ "A program will run regulary in your system waiting for new updates\n"
+#~ msgstr ""
+#~ "Mae Mandriva Online yn cynnig y dewis i chi ddiweddaru'n awtomatig,\n"
+#~ "Bydd rhaglen yn rhedeg yn rheolaidd yn eich system i gasglu "
+#~ "diweddariadau.\n"
+
+#~ msgid "Congratulations"
+#~ msgstr "Llongyfarchiadau"
+
+#~ msgid "Your Mandriva Online account has been successfully configured\n"
+#~ msgstr "Mae eich cyfrif Mandriva Online wedi ei ffurfweddu'n llwyddiannus\n"
+
+#~ msgid "Configuration uploaded successfully"
+#~ msgstr "Llwytho'r ffurfweddiad yn llwyddiannus"
+
+#~ msgid "Problem uploading configuration"
+#~ msgstr "Anhawster llwytho'r ffurfweddiad"
+
+#~ msgid ""
+#~ "Cannot connect to Mandriva Online website: wrong login/password or router/"
+#~ "firewall bad settings"
+#~ msgstr ""
+#~ "Methu cysylltu â safle gwe Mandriva Online: mewngofnod/cyfrinair anghywir "
+#~ "neu osodiadau llwybrydd/mur cadarn anghywir."
+
 #~ msgid "  --applet\t\t- launch Mandriva Update.\n"
 #~ msgstr "  --applet\t\t- cychwyn Mandriva Update.\n"
+
 #~ msgid "Cannot get list of updates: %s"
 #~ msgstr "Methu estyn rhestr y diweddariadau: %s"
+
 #~ msgid "Choose which packages should be installed and Press Ok"
 #~ msgstr "Dewiswch pa becynnau i'w gosod a chlicio Iawn"
+
 #~ msgid "System is busy. Please wait ..."
 #~ msgstr "Mae'r system yn brysur. Arhoswch..."
+
 #~ msgid "Sending configuration..."
 #~ msgstr "Anfon ffurfweddiad..."
+
 #~ msgid "Unsecure invocation: Method available through httpS only"
 #~ msgstr "Galwad aniogel: Dull ar gael drwy https yn unig"
+
 #~ msgid "  --help         - print this help message.\n"
 #~ msgstr "  --help         - argraffu'r neges cymorth hon.\n"
+
 #~ msgid "  --auto         - Mandriva Update launched automatically.\n"
 #~ msgstr "  --auto         - cychwyn Mandriva Update yn awtomatig\n"
+
 #~ msgid "  --applet       - launch Mandriva Update.\n"
 #~ msgstr "  --applet       - cychwyn Mandriva Update.\n"
+
 #~ msgid "  --mnf          - launch mnf specific scripts.\n"
 #~ msgstr "  --mnf          - cychwyn sgriptiau mnf penodol.\n"
+
 #~ msgid "  --noX          - text mode version of Mandriva Update.\n"
 #~ msgstr "  --noX          - fersiwn modd testun o Mandriva Update\n"
+
 #~ msgid "No %s file found. Run mdkonline wizard first"
 #~ msgstr "Heb ganfod unrhyw ffeiliau %s. Rhedwch ddewin mdkonline yn gyntaf"
+
 #~ msgid "Mandriva Update could not contact the site, we will try again."
 #~ msgstr "Mandriva Update yn methu cysylltu â'r safle, byddwn yn ceisio eto"
+
 #~ msgid "Login:"
 #~ msgstr "Mewngofnod:"
+
 #~ msgid "or"
 #~ msgstr "neu"
+
 #~ msgid "wrong password:"
 #~ msgstr "cyfrinair anghywir!"
+
 #~ msgid ""
 #~ "Your login or password was wrong.\n"
 #~ " Either you'll have to type it again, or you'll need to create an account "
@@ -956,26 +835,34 @@ msgstr "Methu diweddaru pecynnau o gyfrwng update_source.\n"
 #~ "Os yr olaf, ewch yn ôl i'r cam cyntaf â chysylltu â Mandriva Online.\n"
 #~ "cofiwch y bydd angen darparu enw Peiriant \n"
 #~ "(gyda dim ond llythrennau)"
+
 #~ msgid "Mail contact:"
 #~ msgstr "Cyswllt E-bost"
+
 #~ msgid "Please provide a login"
 #~ msgstr "Rhowch fewngofnod"
+
 #~ msgid "Login and password should be less than 12 characters\n"
 #~ msgstr "Dylai'r mewngofnodiad a'r cyfrinair fod yn llai na 12 nod\n"
+
 #~ msgid "Special characters are not allowed\n"
 #~ msgstr "Does dim caniatâd i nodau arbennig\n"
+
 #~ msgid "Email not valid\n"
 #~ msgstr "Nid yw'r e-bost yn ddilys\n"
+
 #~ msgid "Account already exists\n"
 #~ msgstr "Mae'r cyfrif yn bod eisoes\n"
+
 #~ msgid "Problem connecting to server \n"
 #~ msgstr "Anhawster wrth gysylltu â'r gweinydd\n"
+
 #~ msgid ""
 #~ "Problem occurred while connecting to the server, please contact the "
 #~ "support team"
 #~ msgstr ""
 #~ "Digwyddodd anhawster wrth cysylltu â'r gweinydd, cycylltwch â'r tîm "
 #~ "cefnogi"
+
 #~ msgid "Unable to update packages from mdkupdate medium.\n"
 #~ msgstr "Methu diweddaru pecynnau o gyfrwng mdkupdate.\n"
-
diff --git a/po/da.po b/po/da.po
index be3bef2d..46e1443a 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: 2007-08-09 16:26+0200\n"
+"POT-Creation-Date: 2008-02-21 18:21+0100\n"
 "PO-Revision-Date: 2007-10-30 22:38+0100\n"
 "Last-Translator: Keld Simonsen <keld@dkuug.dk>\n"
 "Language-Team: dansk <dansk@dansk-gruppen.dk>\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:94
+#: ../mdkapplet:88
 #, c-format
 msgid "Will check updates at %s"
 msgstr "Vil tjekke for opdateringer klokken %s"
 
-#: ../mdkapplet:103
+#: ../mdkapplet:97
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "Dit system er opdateret"
 
-#: ../mdkapplet:109
+#: ../mdkapplet:103
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -40,52 +40,46 @@ msgstr ""
 "Problem med konfiguration af tjeneste. Tjek venligst loggene og send post "
 "til support@mandrivaonline.com"
 
-#: ../mdkapplet:115
+#: ../mdkapplet:110
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "Vent venligst, finder tilgængelige pakker..."
 
-#: ../mdkapplet:121
+#: ../mdkapplet:116
 #, c-format
 msgid "New updates are available for your system"
 msgstr "Nye opdateringer er tilgængelige for dit system"
 
-#: ../mdkapplet:127
-#, c-format
-msgid "New bundles are available for your system"
-msgstr "Nye samlinger er tilgængelige for dit system"
-
-#: ../mdkapplet:133
-#, c-format
-msgid "Service is not configured. Please click on \"Configure the service\""
-msgstr "Tjeneste er ikke konfigureret. Klik på \"konfigurér tjenesten\""
-
-#: ../mdkapplet:139
+#: ../mdkapplet:122
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "Netværket er nede. Konfigurér venligst dit netværk"
 
-#: ../mdkapplet:145
+#: ../mdkapplet:128
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "Tjeneste er ikke aktiveret. Klik på \"Websted på nettet\""
 
-#: ../mdkapplet:151 ../mdkapplet:182
+#: ../mdkapplet:134 ../mdkapplet:165
 #, c-format
 msgid "urpmi database locked"
 msgstr "urpmi-database låst"
 
-#: ../mdkapplet:157
+#: ../mdkapplet:140
 #, c-format
 msgid "Release not supported (too old release, or development release)"
-msgstr "Udgivelse ikke understøttet (for gammel udgivelse, eller udviklingsudgivelse)"
+msgstr ""
+"Udgivelse ikke understøttet (for gammel udgivelse, eller udviklingsudgivelse)"
 
-#: ../mdkapplet:163
+#: ../mdkapplet:146
 #, c-format
-msgid "No medium found. You must add some media through 'Software Media Manager'."
-msgstr "Intet medie fundet. Du skal tilføje et medie via 'Administration af programmedier'."
+msgid ""
+"No medium found. You must add some media through 'Software Media Manager'."
+msgstr ""
+"Intet medie fundet. Du skal tilføje et medie via 'Administration af "
+"programmedier'."
 
-#: ../mdkapplet:169
+#: ../mdkapplet:152
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -97,584 +91,136 @@ msgid ""
 msgstr ""
 "Du har allerede mindst ét opdateringsmedie konfigureret, men de\n"
 "er alle deaktiveret i øjeblikket. Du bør køre Administration\n"
-"af programmedier for at aktivere mindst ét. (Markér det i '%s'-"
-"kolonnen.)\n"
+"af programmedier for at aktivere mindst ét. (Markér det i '%s'-kolonnen.)\n"
 "\n"
 "Derefter skal '%s' genstartes."
 
-#: ../mdkapplet:174
+#: ../mdkapplet:157
 #, c-format
 msgid "Enabled"
 msgstr "Aktiveret"
 
-#: ../mdkapplet:187
+#: ../mdkapplet:170
 #, c-format
 msgid "Error updating media"
 msgstr "Fejl ved opdatering af medie"
 
-#: ../mdkapplet:202
+#: ../mdkapplet:185
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr "Tjekker... Opdateringer er tilgængelige\n"
 
-#: ../mdkapplet:207
+#: ../mdkapplet:190
 #, c-format
 msgid "Packages are up to date"
 msgstr "Pakker er opdaterede"
 
-#: ../mdkapplet:212
+#: ../mdkapplet:195
 #, c-format
 msgid "Failed to open urpmi database"
 msgstr "Kunne ikke åbne urpmi-database"
 
-#: ../mdkapplet:217 ../mdkapplet:324
+#: ../mdkapplet:200
 #, c-format
 msgid "Install updates"
 msgstr "Installér opdateringer"
 
-#: ../mdkapplet:218
-#, c-format
-msgid "Configure the service"
-msgstr "Konfigurér tjenesten"
-
-#: ../mdkapplet:219
+#: ../mdkapplet:201
 #, c-format
 msgid "Check Updates"
 msgstr "Tjek for opdateringer"
 
-#: ../mdkapplet:220 ../mdkapplet:327 ../mdkonline:114 ../mdkonline:155
-#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
-#, c-format
-msgid "Please wait"
-msgstr "Vent venligst"
-
-#: ../mdkapplet:220 ../mdkapplet:326 ../mdkapplet:327
-#, c-format
-msgid "Check updates"
-msgstr "Tjek for opdateringer"
-
-#: ../mdkapplet:223 ../mdkapplet:648
-#, c-format
-msgid "Online WebSite"
-msgstr "WebSite på nettet"
-
-#: ../mdkapplet:224
+#: ../mdkapplet:202
 #, c-format
 msgid "Configure Network"
 msgstr "Konfigurér netværk"
 
-#: ../mdkapplet:225
-#, c-format
-msgid "Configure Now!"
-msgstr "Konfigurér nu!"
-
-#: ../mdkapplet:313 ../mdkapplet:392
-#, c-format
-msgid "Mandriva Linux Updates Applet"
-msgstr "Mandriva Linux Opdateringer panelprogram"
-
-#: ../mdkapplet:322
-#, c-format
-msgid "Actions"
-msgstr "Handlinger"
-
-#: ../mdkapplet:325
-#, c-format
-msgid "Configure"
-msgstr "Konfigurér"
-
-#: ../mdkapplet:329
-#, c-format
-msgid "See logs"
-msgstr "Se logger"
-
-#: ../mdkapplet:332
-#, c-format
-msgid "Status"
-msgstr "Status"
-
-#: ../mdkapplet:336 ../mdkapplet:597
-#, c-format
-msgid "Close"
-msgstr "Luk"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Network Connection: "
-msgstr "Netværks-forbindelse: "
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Up"
-msgstr "Op"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Down"
-msgstr "Ned"
-
-#: ../mdkapplet:366
-#, c-format
-msgid "Last check: "
-msgstr "Sidste tjek: "
-
-#: ../mdkapplet:367 ../mdkonline:145
-#, c-format
-msgid "Machine name:"
-msgstr "Maskinnavn:"
-
-#: ../mdkapplet:368
-#, c-format
-msgid "Updates: "
-msgstr "Opdateringer: "
-
-#: ../mdkapplet:372
+#: ../mdkapplet:283
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Begynder på drakconnect\n"
 
-#: ../mdkapplet:375
+#: ../mdkapplet:286
 #, c-format
 msgid "Mandriva Online seems to be reinstalled, reloading applet ...."
-msgstr "Mandriva Online ser ud til at være geninstalleret, genindlæser applet ...."
+msgstr ""
+"Mandriva Online ser ud til at være geninstalleret, genindlæser applet ...."
 
-#: ../mdkapplet:383
+#: ../mdkapplet:294
 #, c-format
 msgid "Launching MandrivaUpdate\n"
 msgstr "Start MandrivaUpdate op\n"
 
-#: ../mdkapplet:398
+#: ../mdkapplet:303
+#, c-format
+msgid "Mandriva Linux Updates Applet"
+msgstr "Mandriva Linux Opdateringer panelprogram"
+
+#: ../mdkapplet:308
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Beregner nye opdateringer...\n"
 
-#: ../mdkapplet:399
+#: ../mdkapplet:309
 #, c-format
 msgid "Connecting to"
 msgstr "Kobler op til"
 
-#: ../mdkapplet:467 ../mdkupdate:159 ../mdkupdate:188
-#, c-format
-msgid "An error occurred"
-msgstr "Der er opstået en fejl"
-
-#: ../mdkapplet:475
-#, c-format
-msgid "Development release not supported by service"
-msgstr "Udviklingsudgivelse ikke understøttet af tjeneste"
-
-#: ../mdkapplet:476
-#, c-format
-msgid "Too old release not supported by service"
-msgstr "For gammel udgivelse ikke understøttet af tjeneste"
-
-#: ../mdkapplet:477
-#, c-format
-msgid "Unknown state"
-msgstr "Ukendt tilstand"
-
-#: ../mdkapplet:478
-#, c-format
-msgid "Online services disabled. Contact Mandriva Online site\n"
-msgstr "Nettjenester er deaktiveret. Kontakt Mandriva Online webstedet\n"
-
-#: ../mdkapplet:479
-#, c-format
-msgid "Wrong Password.\n"
-msgstr "Forkert adgangskode\n"
-
-#: ../mdkapplet:480
-#, c-format
-msgid "Wrong Action or host or login.\n"
-msgstr "Forkert handling eller vært eller brugerkonto.\n"
-
-#: ../mdkapplet:481
-#, c-format
-msgid ""
-"Something is wrong with your network settings (check your route, firewall or "
-"proxy settings)\n"
-msgstr ""
-"Noget er galt med din netværksopsætning (tjek din rute-, brandmurs- og proxy-"
-"opsætning)\n"
-
-#: ../mdkapplet:483
-#, c-format
-msgid ""
-"Problem occured while connecting to the server, please contact the support "
-"team"
-msgstr "Problem indtraf ved forbindelse til serveren, kontakt venligst kundetjenesten"
-
-#: ../mdkapplet:487
-#, c-format
-msgid "Response from Mandriva Online server\n"
-msgstr "Svar fra Mandriva Online-serveren\n"
-
-#: ../mdkapplet:490
+#: ../mdkapplet:386
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Systemet er opdateret\n"
 
-#: ../mdkapplet:527
-#, c-format
-msgid "No check"
-msgstr "Ingen tjek"
-
-#: ../mdkapplet:541
-#, c-format
-msgid "Checking config file: Not present\n"
-msgstr "Tjekker konfigureringsfil: Ikke til stede\n"
-
-#: ../mdkapplet:544
+#: ../mdkapplet:415
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Tjekker netværk: ser ud til at være deaktiveret\n"
 
-#: ../mdkapplet:587
+#: ../mdkapplet:457 ../mdkupdate:118 ../mdkupdate:164
 #, c-format
-msgid "Logs"
-msgstr "Logger"
-
-#: ../mdkapplet:603
-#, c-format
-msgid "Clear"
-msgstr "Nulstil"
+msgid "Warning"
+msgstr "Advarsel"
 
-#: ../mdkapplet:629
+#: ../mdkapplet:468
 #, c-format
 msgid "About..."
 msgstr "Om..."
 
-#: ../mdkapplet:631
+#: ../mdkapplet:472
 #, c-format
 msgid "Mandriva Online %s"
 msgstr "Mandriva Online %s"
 
-#: ../mdkapplet:635
+#: ../mdkapplet:473
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Ophavsret © %s ved Mandriva"
 
-#: ../mdkapplet:647
+#: ../mdkapplet:476
 #, c-format
 msgid "Mandriva Online gives access to Mandriva web services."
 msgstr "Mandriva Online giver adgang til Mandrivas webtjenester."
 
-#: ../mdkapplet:655
-#, c-format
-msgid "Always launch on startup"
-msgstr "Start altid op ved opstart"
-
-#: ../mdkapplet:657
-#, c-format
-msgid "Quit"
-msgstr "Afslut"
-
-#: ../mdkonline:58
-#, c-format
-msgid ""
-"mdonline version %s\n"
-"Copyright (C) %s Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"mdonline version %s\n"
-"Copyright (C) %s Mandriva.\n"
-"Dette er frit programmel og må distribueres ifølge vilkårene i GNU GPL.\n"
-"\n"
-"brug:\n"
-
-#: ../mdkonline:63 ../mdkupdate:73
-#, c-format
-msgid "  --help\t\t- print this help message.\n"
-msgstr "  --help\t\t- udskriv denne hjælpebesked.\n"
-
-#: ../mdkonline:64
-#, c-format
-msgid "  --box=\t\t\t- hostname.\n"
-msgstr "  --box=\t\t\t- værtsnavn.\n"
-
-#: ../mdkonline:65
-#, c-format
-msgid "  --country\t\t\t- name of country of the user. \n"
-msgstr "  --country\t\t\t- navn på brugerens land. \n"
-
-#: ../mdkonline:66
-#, c-format
-msgid "  --interactive\t\t- use the interactive mode.\n"
-msgstr "  --interactive\t\t- brug den interaktive tilstand.\n"
-
-#: ../mdkonline:67
-#, c-format
-msgid "  --nointeractive\t- use the non-interactive mode.\n"
-msgstr "  --nointeractive\t- brug den ikke-interaktive tilstand.\n"
-
-#: ../mdkonline:68
-#, c-format
-msgid "  --login=\t\t     - login name of the user.\n"
-msgstr "  --login=\t\t     - logindnavn for bruger.\n"
-
-#: ../mdkonline:69
-#, c-format
-msgid "  --pass=\t\t\t- password  of the user.\n"
-msgstr "  --pass=\t\t\t- adgangskode for bruger.\n"
-
-#: ../mdkonline:87 ../mdkonline:120
-#, c-format
-msgid "Mandriva Online"
-msgstr "Mandriva Online"
-
-#: ../mdkonline:90
-#, c-format
-msgid "I already have an account"
-msgstr "Jeg har allerede en konto"
-
-#: ../mdkonline:91
-#, c-format
-msgid "I want to subscribe"
-msgstr "Jeg vil gerne tilmeldes"
-
-#: ../mdkonline:96
-#, c-format
-msgid "Mr."
-msgstr "Hr."
-
-#: ../mdkonline:96
-#, c-format
-msgid "Mrs."
-msgstr "Fru"
-
-#: ../mdkonline:96
-#, c-format
-msgid "Ms."
-msgstr "Frk."
-
-#: ../mdkonline:114
-#, c-format
-msgid "Reading configuration\n"
-msgstr "Læser konfiguration\n"
-
-#: ../mdkonline:123
-#, c-format
-msgid ""
-"This assistant will help you to upload your configuration\n"
-"(packages, hardware configuration) to a centralized database in\n"
-"order to keep you informed about security updates and useful upgrades.\n"
-msgstr ""
-"Denne guide vil hjælpe dig med at oplægge din konfiguration\n"
-"(pakker, systemkonfiguration) i en centraliseret database for at \n"
-"holde dig orienteret omkring sikkerhedsopdateringer og nyttige "
-"opdateringer.\n"
-
-#: ../mdkonline:131
-#, c-format
-msgid "Account creation or authentication"
-msgstr "Oprettelse eller bekræftelse af konto"
-
-#: ../mdkonline:136
-#, c-format
-msgid "Enter your Mandriva Online login, password and machine name:"
-msgstr "Angiv dit Mandriva Online brugernavn, adgangskode og maskinnavn:"
-
-#: ../mdkonline:142 ../mdkonline:195
-#, c-format
-msgid "Email address:"
-msgstr "E-postadresse:"
-
-#: ../mdkonline:143
-#, c-format
-msgid "Country"
-msgstr "Land"
-
-#: ../mdkonline:144 ../mdkonline:196
-#, c-format
-msgid "Password:"
-msgstr "Adgangskode:"
-
-#: ../mdkonline:146
-#, c-format
-msgid "Machine description:"
-msgstr "Maskinbeskrivelse:"
-
-#: ../mdkonline:147
-#, c-format
-msgid "(Ex: My Home Office's Computer)"
-msgstr "(Fx: Mit hjemmekontors maskine)"
-
-#: ../mdkonline:152 ../mdkonline:159 ../mdkonline:180 ../mdkonline:204
-#: ../mdkonline:208 ../mdkonline:212 ../mdkonline:217 ../mdkupdate:141
-#: ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
-#, c-format
-msgid "Error"
-msgstr "Fejl"
-
-#: ../mdkonline:152
-#, c-format
-msgid "Machine name must be 1 to 40 alphanumerical characters"
-msgstr "Maskinnavn må indeholde 1 til 40 bogstaver og cifre"
-
-#: ../mdkonline:155
-#, c-format
-msgid "Connecting to Mandriva Online website..."
-msgstr "Kobler op til Mandriva Online-netstedet"
-
-#: ../mdkonline:167
-#, c-format
-msgid ""
-"In order to benefit from Mandriva Online services,\n"
-"we are about to upload your configuration.\n"
-"\n"
-"The Wizard will now send the following information to Mandriva:\n"
-"\n"
-"1) the list of packages you have installed on your system,\n"
-"\n"
-"2) your hardware configuration.\n"
-"\n"
-"If you feel uncomfortable by that idea, or do not want to benefit from this "
-"service,\n"
-"please press 'Cancel'. By pressing 'Next', you allow us to keep you "
-"informed\n"
-"about security updates and useful upgrades via personalized email alerts.\n"
-"Furthermore, you benefit from discounted paid support services on\n"
-"www.mandrivaexpert.com."
-msgstr ""
-"For at kunne få gavn af Mandriva Online-tjenesterne\n"
-"er vi ved at oplægge din konfiguration.\n"
-"\n"
-"Hjælperen vil nu sende den følgende information til mandriva:\n"
-"\n"
-"1) listen over pakker du har installeret på dit system, og \n"
-"\n"
-"2) din konfiguration af dit udstyr.\n"
-"\n"
-"Hvis du ikke føler dig tryg med denne idé, eller ikke ønsker at\n"
-"drage nytte af denne tjeneste, så tryk 'Annullér'.\n"
-"Ved at trykke 'Næste' vil du lade os holde dig informeret om\n"
-"sikkerhedsopdateringer og nyttige opgraderinger via individuelle\n"
-"epost-underretninger. Desuden vil du få rabat på betalbare \n"
-"supporttjenester på www.mandrivaexpert.com."
-
-#: ../mdkonline:180
-#, c-format
-msgid "Connection problem"
-msgstr "Problem med forbindelse"
-
-#: ../mdkonline:180
-#, c-format
-msgid "Problem occurs when uploading files, please try again"
-msgstr "Problem skete ved oplægning af filer, prøv igen"
-
-#: ../mdkonline:187
-#, c-format
-msgid "Create a Mandriva Online Account"
-msgstr "Opret en Mandriva Online-konto"
-
-#. -PO: that is for things like "Mr", "Ms",...
-#: ../mdkonline:192
-#, c-format
-msgid "Greeting:"
-msgstr "Velkomst:"
-
-#: ../mdkonline:193
-#, c-format
-msgid "First name:"
-msgstr "Fornavn:"
-
-#: ../mdkonline:194
-#, c-format
-msgid "Last name:"
-msgstr "Efternavn:"
-
-#: ../mdkonline:197
-#, c-format
-msgid "Confirm Password:"
-msgstr "Bekræft adgangskode:"
-
-#: ../mdkonline:204
-#, c-format
-msgid ""
-"The passwords do not match\n"
-" Please try again\n"
-msgstr ""
-"Adgangskoderne er ikke ens\n"
-" Prøv igen\n"
-
-#: ../mdkonline:208
-#, c-format
-msgid "Please fill in each field"
-msgstr "Udfyld venligst hvert felt"
-
-#: ../mdkonline:212
-#, c-format
-msgid "Not a valid mail address!\n"
-msgstr "Ikke en gyldig postadresse!\n"
-
-#: ../mdkonline:217
-#, c-format
-msgid "Creating account failed!"
-msgstr "Oprettelse af konto mislykkedes!"
-
-#: ../mdkonline:225
-#, c-format
-msgid ""
-"Mandriva Online Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
-msgstr ""
-"Mandriva Online-konto oprettet uden problemer\n"
-"Klik \"Næste\" for at bekræfte og lægge din  konfiguration op\n"
-
-#: ../mdkonline:229
-#, c-format
-msgid "Your upload was successful!"
-msgstr "Din oplægning lykkedes!"
-
-#: ../mdkonline:229
+#: ../mdkapplet:478
 #, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandriva Online."
-msgstr ""
-"Fra nu af vil du modtage annonceringer om sikkerhed\n"
-"og opdateringer takket være Mandriva Online."
+msgid "Online WebSite"
+msgstr "WebSite på nettet"
 
-#: ../mdkonline:229
+#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
+#: ../mdkapplet:483
 #, c-format
-msgid ""
-"Mandriva Online offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
+msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
-"Mandriva Online tilbyder dig at kunne automatisere opdateringerne.\n"
-"Et program vil køre jævnligt på dit system der venter på nye opdateringer\n"
-
-#: ../mdkonline:238
-#, c-format
-msgid "Congratulations"
-msgstr "Tillykke"
 
-#: ../mdkonline:238
+#: ../mdkapplet:492
 #, c-format
-msgid "Your Mandriva Online account has been successfully configured\n"
-msgstr "Din Mandriva Online-konto er blevet konfigureret uden problemer\n"
-
-#: ../mdkonline:253
-#, c-format
-msgid "Configuration uploaded successfully"
-msgstr "Din oplægning of konfiguration lykkedes!"
-
-#: ../mdkonline:254
-#, c-format
-msgid "Problem uploading configuration"
-msgstr "Problem med oplægning af konfiguration"
+msgid "Always launch on startup"
+msgstr "Start altid op ved opstart"
 
-#: ../mdkonline:256
+#: ../mdkapplet:494
 #, c-format
-msgid ""
-"Cannot connect to Mandriva Online website: wrong login/password or router/"
-"firewall bad settings"
-msgstr ""
-"Kan ikke koble op til mandrivaonlines netsted: forkert logind eller "
-"adgangskode, eller dårlige indstillinger for ruter eller brandmur"
+msgid "Quit"
+msgstr "Afslut"
 
 #: ../mdkonline.pm:207
 #, c-format
@@ -822,6 +368,11 @@ msgstr ""
 "\n"
 "brug:\n"
 
+#: ../mdkupdate:73
+#, c-format
+msgid "  --help\t\t- print this help message.\n"
+msgstr "  --help\t\t- udskriv denne hjælpebesked.\n"
+
 #: ../mdkupdate:74
 #, c-format
 msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
@@ -851,11 +402,6 @@ msgstr ""
 "  --bundle fil.bundle\t- fortolk og installér pakke fra .bundle metainfo-"
 "fil.\n"
 
-#: ../mdkupdate:118 ../mdkupdate:164
-#, c-format
-msgid "Warning"
-msgstr "Advarsel"
-
 #. -PO: here Live Install is currently *NOT* translated on the desktop, so it's better to keep as it:
 #: ../mdkupdate:120
 #, c-format
@@ -866,11 +412,21 @@ msgstr ""
 "Du skal først installere systemet på din disk med hjælperen 'Levende "
 "installering'."
 
+#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
+#, c-format
+msgid "Please wait"
+msgstr "Vent venligst"
+
 #: ../mdkupdate:123 ../mdkupdate:174
 #, c-format
 msgid "Preparing..."
 msgstr "Forbereder..."
 
+#: ../mdkupdate:141 ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
+#, c-format
+msgid "Error"
+msgstr "Fejl"
+
 #: ../mdkupdate:141
 #, c-format
 msgid ""
@@ -882,6 +438,11 @@ msgstr ""
 "\n"
 "%s"
 
+#: ../mdkupdate:159 ../mdkupdate:188
+#, c-format
+msgid "An error occurred"
+msgstr "Der er opstået en fejl"
+
 #: ../mdkupdate:164
 #, c-format
 msgid ""
@@ -910,3 +471,303 @@ msgstr "Installerer pakker...\n"
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "Kan ikke opdatere pakker fra update_source-medium.\n"
 
+#~ msgid "New bundles are available for your system"
+#~ msgstr "Nye samlinger er tilgængelige for dit system"
+
+#~ msgid "Service is not configured. Please click on \"Configure the service\""
+#~ msgstr "Tjeneste er ikke konfigureret. Klik på \"konfigurér tjenesten\""
+
+#~ msgid "Configure the service"
+#~ msgstr "Konfigurér tjenesten"
+
+#~ msgid "Check updates"
+#~ msgstr "Tjek for opdateringer"
+
+#~ msgid "Configure Now!"
+#~ msgstr "Konfigurér nu!"
+
+#~ msgid "Actions"
+#~ msgstr "Handlinger"
+
+#~ msgid "Configure"
+#~ msgstr "Konfigurér"
+
+#~ msgid "See logs"
+#~ msgstr "Se logger"
+
+#~ msgid "Status"
+#~ msgstr "Status"
+
+#~ msgid "Close"
+#~ msgstr "Luk"
+
+#~ msgid "Network Connection: "
+#~ msgstr "Netværks-forbindelse: "
+
+#~ msgid "Up"
+#~ msgstr "Op"
+
+#~ msgid "Down"
+#~ msgstr "Ned"
+
+#~ msgid "Last check: "
+#~ msgstr "Sidste tjek: "
+
+#~ msgid "Machine name:"
+#~ msgstr "Maskinnavn:"
+
+#~ msgid "Updates: "
+#~ msgstr "Opdateringer: "
+
+#~ msgid "Development release not supported by service"
+#~ msgstr "Udviklingsudgivelse ikke understøttet af tjeneste"
+
+#~ msgid "Too old release not supported by service"
+#~ msgstr "For gammel udgivelse ikke understøttet af tjeneste"
+
+#~ msgid "Unknown state"
+#~ msgstr "Ukendt tilstand"
+
+#~ msgid "Online services disabled. Contact Mandriva Online site\n"
+#~ msgstr "Nettjenester er deaktiveret. Kontakt Mandriva Online webstedet\n"
+
+#~ msgid "Wrong Password.\n"
+#~ msgstr "Forkert adgangskode\n"
+
+#~ msgid "Wrong Action or host or login.\n"
+#~ msgstr "Forkert handling eller vært eller brugerkonto.\n"
+
+#~ msgid ""
+#~ "Something is wrong with your network settings (check your route, firewall "
+#~ "or proxy settings)\n"
+#~ msgstr ""
+#~ "Noget er galt med din netværksopsætning (tjek din rute-, brandmurs- og "
+#~ "proxy-opsætning)\n"
+
+#~ msgid ""
+#~ "Problem occured while connecting to the server, please contact the "
+#~ "support team"
+#~ msgstr ""
+#~ "Problem indtraf ved forbindelse til serveren, kontakt venligst "
+#~ "kundetjenesten"
+
+#~ msgid "Response from Mandriva Online server\n"
+#~ msgstr "Svar fra Mandriva Online-serveren\n"
+
+#~ msgid "No check"
+#~ msgstr "Ingen tjek"
+
+#~ msgid "Checking config file: Not present\n"
+#~ msgstr "Tjekker konfigureringsfil: Ikke til stede\n"
+
+#~ msgid "Logs"
+#~ msgstr "Logger"
+
+#~ msgid "Clear"
+#~ msgstr "Nulstil"
+
+#~ msgid ""
+#~ "mdonline version %s\n"
+#~ "Copyright (C) %s Mandriva.\n"
+#~ "This is free software and may be redistributed under the terms of the GNU "
+#~ "GPL.\n"
+#~ "\n"
+#~ "usage:\n"
+#~ msgstr ""
+#~ "mdonline version %s\n"
+#~ "Copyright (C) %s Mandriva.\n"
+#~ "Dette er frit programmel og må distribueres ifølge vilkårene i GNU GPL.\n"
+#~ "\n"
+#~ "brug:\n"
+
+#~ msgid "  --box=\t\t\t- hostname.\n"
+#~ msgstr "  --box=\t\t\t- værtsnavn.\n"
+
+#~ msgid "  --country\t\t\t- name of country of the user. \n"
+#~ msgstr "  --country\t\t\t- navn på brugerens land. \n"
+
+#~ msgid "  --interactive\t\t- use the interactive mode.\n"
+#~ msgstr "  --interactive\t\t- brug den interaktive tilstand.\n"
+
+#~ msgid "  --nointeractive\t- use the non-interactive mode.\n"
+#~ msgstr "  --nointeractive\t- brug den ikke-interaktive tilstand.\n"
+
+#~ msgid "  --login=\t\t     - login name of the user.\n"
+#~ msgstr "  --login=\t\t     - logindnavn for bruger.\n"
+
+#~ msgid "  --pass=\t\t\t- password  of the user.\n"
+#~ msgstr "  --pass=\t\t\t- adgangskode for bruger.\n"
+
+#~ msgid "Mandriva Online"
+#~ msgstr "Mandriva Online"
+
+#~ msgid "I already have an account"
+#~ msgstr "Jeg har allerede en konto"
+
+#~ msgid "I want to subscribe"
+#~ msgstr "Jeg vil gerne tilmeldes"
+
+#~ msgid "Mr."
+#~ msgstr "Hr."
+
+#~ msgid "Mrs."
+#~ msgstr "Fru"
+
+#~ msgid "Ms."
+#~ msgstr "Frk."
+
+#~ msgid "Reading configuration\n"
+#~ msgstr "Læser konfiguration\n"
+
+#~ msgid ""
+#~ "This assistant will help you to upload your configuration\n"
+#~ "(packages, hardware configuration) to a centralized database in\n"
+#~ "order to keep you informed about security updates and useful upgrades.\n"
+#~ msgstr ""
+#~ "Denne guide vil hjælpe dig med at oplægge din konfiguration\n"
+#~ "(pakker, systemkonfiguration) i en centraliseret database for at \n"
+#~ "holde dig orienteret omkring sikkerhedsopdateringer og nyttige "
+#~ "opdateringer.\n"
+
+#~ msgid "Account creation or authentication"
+#~ msgstr "Oprettelse eller bekræftelse af konto"
+
+#~ msgid "Enter your Mandriva Online login, password and machine name:"
+#~ msgstr "Angiv dit Mandriva Online brugernavn, adgangskode og maskinnavn:"
+
+#~ msgid "Email address:"
+#~ msgstr "E-postadresse:"
+
+#~ msgid "Country"
+#~ msgstr "Land"
+
+#~ msgid "Password:"
+#~ msgstr "Adgangskode:"
+
+#~ msgid "Machine description:"
+#~ msgstr "Maskinbeskrivelse:"
+
+#~ msgid "(Ex: My Home Office's Computer)"
+#~ msgstr "(Fx: Mit hjemmekontors maskine)"
+
+#~ msgid "Machine name must be 1 to 40 alphanumerical characters"
+#~ msgstr "Maskinnavn må indeholde 1 til 40 bogstaver og cifre"
+
+#~ msgid "Connecting to Mandriva Online website..."
+#~ msgstr "Kobler op til Mandriva Online-netstedet"
+
+#~ msgid ""
+#~ "In order to benefit from Mandriva Online services,\n"
+#~ "we are about to upload your configuration.\n"
+#~ "\n"
+#~ "The Wizard will now send the following information to Mandriva:\n"
+#~ "\n"
+#~ "1) the list of packages you have installed on your system,\n"
+#~ "\n"
+#~ "2) your hardware configuration.\n"
+#~ "\n"
+#~ "If you feel uncomfortable by that idea, or do not want to benefit from "
+#~ "this service,\n"
+#~ "please press 'Cancel'. By pressing 'Next', you allow us to keep you "
+#~ "informed\n"
+#~ "about security updates and useful upgrades via personalized email "
+#~ "alerts.\n"
+#~ "Furthermore, you benefit from discounted paid support services on\n"
+#~ "www.mandrivaexpert.com."
+#~ msgstr ""
+#~ "For at kunne få gavn af Mandriva Online-tjenesterne\n"
+#~ "er vi ved at oplægge din konfiguration.\n"
+#~ "\n"
+#~ "Hjælperen vil nu sende den følgende information til mandriva:\n"
+#~ "\n"
+#~ "1) listen over pakker du har installeret på dit system, og \n"
+#~ "\n"
+#~ "2) din konfiguration af dit udstyr.\n"
+#~ "\n"
+#~ "Hvis du ikke føler dig tryg med denne idé, eller ikke ønsker at\n"
+#~ "drage nytte af denne tjeneste, så tryk 'Annullér'.\n"
+#~ "Ved at trykke 'Næste' vil du lade os holde dig informeret om\n"
+#~ "sikkerhedsopdateringer og nyttige opgraderinger via individuelle\n"
+#~ "epost-underretninger. Desuden vil du få rabat på betalbare \n"
+#~ "supporttjenester på www.mandrivaexpert.com."
+
+#~ msgid "Connection problem"
+#~ msgstr "Problem med forbindelse"
+
+#~ msgid "Problem occurs when uploading files, please try again"
+#~ msgstr "Problem skete ved oplægning af filer, prøv igen"
+
+#~ msgid "Create a Mandriva Online Account"
+#~ msgstr "Opret en Mandriva Online-konto"
+
+#~ msgid "Greeting:"
+#~ msgstr "Velkomst:"
+
+#~ msgid "First name:"
+#~ msgstr "Fornavn:"
+
+#~ msgid "Last name:"
+#~ msgstr "Efternavn:"
+
+#~ msgid "Confirm Password:"
+#~ msgstr "Bekræft adgangskode:"
+
+#~ msgid ""
+#~ "The passwords do not match\n"
+#~ " Please try again\n"
+#~ msgstr ""
+#~ "Adgangskoderne er ikke ens\n"
+#~ " Prøv igen\n"
+
+#~ msgid "Please fill in each field"
+#~ msgstr "Udfyld venligst hvert felt"
+
+#~ msgid "Not a valid mail address!\n"
+#~ msgstr "Ikke en gyldig postadresse!\n"
+
+#~ msgid "Creating account failed!"
+#~ msgstr "Oprettelse af konto mislykkedes!"
+
+#~ msgid ""
+#~ "Mandriva Online Account successfully created.\n"
+#~ "Please click \"Next\" to authenticate and upload your configuration\n"
+#~ msgstr ""
+#~ "Mandriva Online-konto oprettet uden problemer\n"
+#~ "Klik \"Næste\" for at bekræfte og lægge din  konfiguration op\n"
+
+#~ msgid "Your upload was successful!"
+#~ msgstr "Din oplægning lykkedes!"
+
+#~ msgid ""
+#~ "From now you will receive on security and updates \n"
+#~ "announcements thanks to Mandriva Online."
+#~ msgstr ""
+#~ "Fra nu af vil du modtage annonceringer om sikkerhed\n"
+#~ "og opdateringer takket være Mandriva Online."
+
+#~ msgid ""
+#~ "Mandriva Online offers you the ability to automate the updates.\n"
+#~ "A program will run regulary in your system waiting for new updates\n"
+#~ msgstr ""
+#~ "Mandriva Online tilbyder dig at kunne automatisere opdateringerne.\n"
+#~ "Et program vil køre jævnligt på dit system der venter på nye "
+#~ "opdateringer\n"
+
+#~ msgid "Congratulations"
+#~ msgstr "Tillykke"
+
+#~ msgid "Your Mandriva Online account has been successfully configured\n"
+#~ msgstr "Din Mandriva Online-konto er blevet konfigureret uden problemer\n"
+
+#~ msgid "Configuration uploaded successfully"
+#~ msgstr "Din oplægning of konfiguration lykkedes!"
+
+#~ msgid "Problem uploading configuration"
+#~ msgstr "Problem med oplægning af konfiguration"
+
+#~ msgid ""
+#~ "Cannot connect to Mandriva Online website: wrong login/password or router/"
+#~ "firewall bad settings"
+#~ msgstr ""
+#~ "Kan ikke koble op til mandrivaonlines netsted: forkert logind eller "
+#~ "adgangskode, eller dårlige indstillinger for ruter eller brandmur"
diff --git a/po/de.po b/po/de.po
index d39cdd96..2fd6fbfa 100644
--- a/po/de.po
+++ b/po/de.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-09 16:26+0200\n"
+"POT-Creation-Date: 2008-02-21 18:21+0100\n"
 "PO-Revision-Date: 2007-03-20 17:49+0100\n"
 "Last-Translator: Nicolas Bauer <rastafarii@mandrivauser.de>\n"
 "Language-Team: deutsch\n"
@@ -23,17 +23,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:94
+#: ../mdkapplet:88
 #, fuzzy, c-format
 msgid "Will check updates at %s"
 msgstr "Überprüfe Updates"
 
-#: ../mdkapplet:103
+#: ../mdkapplet:97
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "Ihr System ist aktuell"
 
-#: ../mdkapplet:109
+#: ../mdkapplet:103
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -42,48 +42,38 @@ msgstr ""
 "Konfigurationsproblem des Dienstes. Bitte überprüfen Sie die Log-Datei und "
 "senden Sie eine Mail an support@mandrivaonline.com"
 
-#: ../mdkapplet:115
+#: ../mdkapplet:110
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "Suche nach vorhandenen Paketen, bitte warten ..."
 
-#: ../mdkapplet:121
+#: ../mdkapplet:116
 #, c-format
 msgid "New updates are available for your system"
 msgstr "Neue Aktualisierungen für Ihr System verfügbar"
 
-#: ../mdkapplet:127
-#, c-format
-msgid "New bundles are available for your system"
-msgstr "Neue Aktualisierungen sind für Ihr System verfügbar"
-
-#: ../mdkapplet:133
-#, c-format
-msgid "Service is not configured. Please click on \"Configure the service\""
-msgstr "Dienst nicht konfiguriert. Klicken Sie auf „Den Dienst konfigurieren“"
-
-#: ../mdkapplet:139
+#: ../mdkapplet:122
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "Kein Netzwerk. Bitte konfigurieren Sie Ihr Netzwerk"
 
-#: ../mdkapplet:145
+#: ../mdkapplet:128
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "Dienst nicht verfügbar. Klicken Sie auf „Online Webseite“"
 
-#: ../mdkapplet:151 ../mdkapplet:182
+#: ../mdkapplet:134 ../mdkapplet:165
 #, c-format
 msgid "urpmi database locked"
 msgstr "urpmi Datenbank ist gesperrt"
 
-#: ../mdkapplet:157
+#: ../mdkapplet:140
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 "Version wird nicht unterstützt (zu alte Version, oder Entwicklungsversion)"
 
-#: ../mdkapplet:163
+#: ../mdkapplet:146
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
@@ -91,7 +81,7 @@ msgstr ""
 "Kein Medium gefunden. Sie müssen einige Medien mit dem 'Software Medien "
 "Manager'"
 
-#: ../mdkapplet:169
+#: ../mdkapplet:152
 #, fuzzy, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -107,592 +97,134 @@ msgstr ""
 "Aktiviert? Spalte ein)\n"
 "Starten Sie anschließend erneut %s."
 
-#: ../mdkapplet:174
+#: ../mdkapplet:157
 #, c-format
 msgid "Enabled"
 msgstr "Aktiviert"
 
-#: ../mdkapplet:187
+#: ../mdkapplet:170
 #, c-format
 msgid "Error updating media"
 msgstr "Fehler beim Aktualisieren des Mediums"
 
-#: ../mdkapplet:202
+#: ../mdkapplet:185
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr "Überprüfe... Updates sind verfügbar\n"
 
-#: ../mdkapplet:207
+#: ../mdkapplet:190
 #, c-format
 msgid "Packages are up to date"
 msgstr "Die Pakete sind auf dem aktuellen Stand"
 
-#: ../mdkapplet:212
+#: ../mdkapplet:195
 #, c-format
 msgid "Failed to open urpmi database"
 msgstr "Fehler beim öffnen der urpmi Datenbank"
 
-#: ../mdkapplet:217 ../mdkapplet:324
+#: ../mdkapplet:200
 #, c-format
 msgid "Install updates"
 msgstr "Aktualisieren"
 
-#: ../mdkapplet:218
-#, c-format
-msgid "Configure the service"
-msgstr "Den Dienst konfigurieren"
-
-#: ../mdkapplet:219
+#: ../mdkapplet:201
 #, c-format
 msgid "Check Updates"
 msgstr "Überprüfe Updates"
 
-#: ../mdkapplet:220 ../mdkapplet:327 ../mdkonline:114 ../mdkonline:155
-#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
-#, c-format
-msgid "Please wait"
-msgstr "Bitte warten"
-
-#: ../mdkapplet:220 ../mdkapplet:326 ../mdkapplet:327
-#, c-format
-msgid "Check updates"
-msgstr "Überprüfe Updates"
-
-#: ../mdkapplet:223 ../mdkapplet:648
-#, c-format
-msgid "Online WebSite"
-msgstr "Online Webseite"
-
-#: ../mdkapplet:224
+#: ../mdkapplet:202
 #, c-format
 msgid "Configure Network"
 msgstr "Netzwerk konfigurieren"
 
-#: ../mdkapplet:225
-#, c-format
-msgid "Configure Now!"
-msgstr "Jetzt konfigurieren!"
-
-#: ../mdkapplet:313 ../mdkapplet:392
-#, c-format
-msgid "Mandriva Linux Updates Applet"
-msgstr "Mandriva Linux Update-Applet"
-
-#: ../mdkapplet:322
-#, c-format
-msgid "Actions"
-msgstr "Aktionen"
-
-#: ../mdkapplet:325
-#, c-format
-msgid "Configure"
-msgstr "Konfigurieren"
-
-#: ../mdkapplet:329
-#, c-format
-msgid "See logs"
-msgstr "Logs ansehen"
-
-#: ../mdkapplet:332
-#, c-format
-msgid "Status"
-msgstr "Status"
-
-#: ../mdkapplet:336 ../mdkapplet:597
-#, c-format
-msgid "Close"
-msgstr "Schließen"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Network Connection: "
-msgstr "Netzwerkverbindung: "
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Up"
-msgstr "Hoch"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Down"
-msgstr "Runter"
-
-#: ../mdkapplet:366
-#, c-format
-msgid "Last check: "
-msgstr "Letzte Überprüfung: "
-
-#: ../mdkapplet:367 ../mdkonline:145
-#, c-format
-msgid "Machine name:"
-msgstr "Rechnername:"
-
-#: ../mdkapplet:368
-#, c-format
-msgid "Updates: "
-msgstr "Aktualisierungen: "
-
-#: ../mdkapplet:372
+#: ../mdkapplet:283
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Starte drakconnect\n"
 
-#: ../mdkapplet:375
+#: ../mdkapplet:286
 #, c-format
 msgid "Mandriva Online seems to be reinstalled, reloading applet ...."
 msgstr ""
 "Mandriva Online scheint neu installiert worden zu sein, lade Applet "
 "erneut ...."
 
-#: ../mdkapplet:383
+#: ../mdkapplet:294
 #, c-format
 msgid "Launching MandrivaUpdate\n"
 msgstr "Starte MandrivaUpdate\n"
 
-#: ../mdkapplet:398
+#: ../mdkapplet:303
+#, c-format
+msgid "Mandriva Linux Updates Applet"
+msgstr "Mandriva Linux Update-Applet"
+
+#: ../mdkapplet:308
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Berechne neue Updates...\n"
 
-#: ../mdkapplet:399
+#: ../mdkapplet:309
 #, c-format
 msgid "Connecting to"
 msgstr "Verbinde mit"
 
-#: ../mdkapplet:467 ../mdkupdate:159 ../mdkupdate:188
-#, c-format
-msgid "An error occurred"
-msgstr "Ein Fehler ist aufgetreten"
-
-#: ../mdkapplet:475
-#, c-format
-msgid "Development release not supported by service"
-msgstr "Entwicklungsversion wird nicht vom Service unterstützt"
-
-#: ../mdkapplet:476
-#, c-format
-msgid "Too old release not supported by service"
-msgstr "Zu alte Version wird nicht vom Service unterstützt"
-
-#: ../mdkapplet:477
-#, c-format
-msgid "Unknown state"
-msgstr "Unbekannter Zustand"
-
-#: ../mdkapplet:478
-#, c-format
-msgid "Online services disabled. Contact Mandriva Online site\n"
-msgstr ""
-"Onlinedienste abgeschaltet. Kontaktieren Sie die Mandriva Online Site\n"
-
-#: ../mdkapplet:479
-#, c-format
-msgid "Wrong Password.\n"
-msgstr "Falsches Passwort\n"
-
-#: ../mdkapplet:480
-#, c-format
-msgid "Wrong Action or host or login.\n"
-msgstr "Falsche Aktion, falscher Host oder Anmeldekennung\n"
-
-#: ../mdkapplet:481
-#, c-format
-msgid ""
-"Something is wrong with your network settings (check your route, firewall or "
-"proxy settings)\n"
-msgstr ""
-"Mit Ihren Netzwerkeinstellngen scheint etwas nicht in Ordnung zu sein "
-"(Pruefen SieRoute, Firewall, oder Prxy-einstellungen)\n"
-
-#: ../mdkapplet:483
-#, c-format
-msgid ""
-"Problem occured while connecting to the server, please contact the support "
-"team"
-msgstr ""
-"Ein Problem ist während des Verbindungsaufbaus zum Server aufgetreten, bitte "
-"kontaktieren Sie das Support Team"
-
-#: ../mdkapplet:487
-#, c-format
-msgid "Response from Mandriva Online server\n"
-msgstr "Antwort vom Mandriva Online Server\n"
-
-#: ../mdkapplet:490
+#: ../mdkapplet:386
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "System ist aktuell\n"
 
-#: ../mdkapplet:527
-#, c-format
-msgid "No check"
-msgstr "Keine Überprüfung"
-
-#: ../mdkapplet:541
-#, c-format
-msgid "Checking config file: Not present\n"
-msgstr "Überprüfe Konfigurationsdatei: Nicht vorhanden\n"
-
-#: ../mdkapplet:544
+#: ../mdkapplet:415
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Überprüfe Netzwerk: Scheint abgeschaltet\n"
 
-#: ../mdkapplet:587
+#: ../mdkapplet:457 ../mdkupdate:118 ../mdkupdate:164
 #, c-format
-msgid "Logs"
-msgstr "Logs"
-
-#: ../mdkapplet:603
-#, c-format
-msgid "Clear"
-msgstr "Löschen"
+msgid "Warning"
+msgstr "Warnung"
 
-#: ../mdkapplet:629
+#: ../mdkapplet:468
 #, c-format
 msgid "About..."
 msgstr "Über..."
 
-#: ../mdkapplet:631
+#: ../mdkapplet:472
 #, c-format
 msgid "Mandriva Online %s"
 msgstr "Mandriva Online %s"
 
-#: ../mdkapplet:635
+#: ../mdkapplet:473
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Copyright (C) %s by Mandriva"
 
-#: ../mdkapplet:647
+#: ../mdkapplet:476
 #, c-format
 msgid "Mandriva Online gives access to Mandriva web services."
 msgstr ""
 "Durch Mandriva Online erhalten Sie Zugriff auf Internetangebote von Mandriva"
 
-#: ../mdkapplet:655
-#, c-format
-msgid "Always launch on startup"
-msgstr "Immer beim Start ausführen"
-
-#: ../mdkapplet:657
-#, c-format
-msgid "Quit"
-msgstr "Beenden"
-
-#: ../mdkonline:58
-#, c-format
-msgid ""
-"mdonline version %s\n"
-"Copyright (C) %s Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"mdonline Version %s\n"
-"Copyright (C) %s Mandriva.\n"
-"Dies ist freie Software und kann unter den Bedingungen der GNU GPL weiter "
-"vertrieben werden.\n"
-"\n"
-"Verwendung: \n"
-
-#: ../mdkonline:63 ../mdkupdate:73
-#, c-format
-msgid "  --help\t\t- print this help message.\n"
-msgstr "  --help\t\t- Ausgabe dieser Hilfe.\n"
-
-#: ../mdkonline:64
-#, c-format
-msgid "  --box=\t\t\t- hostname.\n"
-msgstr " --box=\t\t\t- hostname.\n"
-
-#: ../mdkonline:65
-#, c-format
-msgid "  --country\t\t\t- name of country of the user. \n"
-msgstr " --country\t\t\t- Name des Heimatlandes des Benutzers.\n"
-
-#: ../mdkonline:66
-#, c-format
-msgid "  --interactive\t\t- use the interactive mode.\n"
-msgstr " --interactive\t\t- benutzen Sie den interaktiven Modus.\n"
-
-#: ../mdkonline:67
-#, c-format
-msgid "  --nointeractive\t- use the non-interactive mode.\n"
-msgstr "  --nointeractive\t- verwende den nicht interaktiven Modus.\n"
-
-#: ../mdkonline:68
-#, c-format
-msgid "  --login=\t\t     - login name of the user.\n"
-msgstr " --login=\t\t     - Benutzername des Benutzer.\n"
-
-#: ../mdkonline:69
-#, c-format
-msgid "  --pass=\t\t\t- password  of the user.\n"
-msgstr " --pass=\t\t\t- Passwort des Benutzers.\n"
-
-#: ../mdkonline:87 ../mdkonline:120
-#, c-format
-msgid "Mandriva Online"
-msgstr "Mandriva Online"
-
-#: ../mdkonline:90
-#, c-format
-msgid "I already have an account"
-msgstr "Ich besitze schon ein Benutzerkonto"
-
-#: ../mdkonline:91
-#, c-format
-msgid "I want to subscribe"
-msgstr "Ich möchte abonnieren"
-
-#: ../mdkonline:96
-#, c-format
-msgid "Mr."
-msgstr "Herr"
-
-#: ../mdkonline:96
-#, c-format
-msgid "Mrs."
-msgstr "Frau"
-
-#: ../mdkonline:96
-#, c-format
-msgid "Ms."
-msgstr "Frau"
-
-#: ../mdkonline:114
-#, c-format
-msgid "Reading configuration\n"
-msgstr "Lese Konfiguration\n"
-
-#: ../mdkonline:123
-#, c-format
-msgid ""
-"This assistant will help you to upload your configuration\n"
-"(packages, hardware configuration) to a centralized database in\n"
-"order to keep you informed about security updates and useful upgrades.\n"
-msgstr ""
-"Dieser Assistent hilft Ihnen Ihre Konfiguration (Pakete, Hardware\n"
-"Konfiguration) zu einer zentralisierten Datenbank hochzuladen um\n"
-"Sie über Sicherheitsupdates und nützliche Upgrades zu informieren.\n"
-
-#: ../mdkonline:131
-#, c-format
-msgid "Account creation or authentication"
-msgstr "Erstellung eines Benutzerkontos oder Authentifizierung"
-
-#: ../mdkonline:136
-#, c-format
-msgid "Enter your Mandriva Online login, password and machine name:"
-msgstr ""
-"Geben Sie Ihren Mandriva Online Benutzernamen, Passwort und Rechnernamen ein:"
-
-#: ../mdkonline:142 ../mdkonline:195
-#, c-format
-msgid "Email address:"
-msgstr "E-Mail-Adresse:"
-
-#: ../mdkonline:143
-#, c-format
-msgid "Country"
-msgstr "Land"
-
-#: ../mdkonline:144 ../mdkonline:196
-#, c-format
-msgid "Password:"
-msgstr "Passwort:"
-
-#: ../mdkonline:146
-#, c-format
-msgid "Machine description:"
-msgstr "Beschreibung des Rechners:"
-
-#: ../mdkonline:147
-#, c-format
-msgid "(Ex: My Home Office's Computer)"
-msgstr "(Ex: Mein Home Office's Computer)"
-
-#: ../mdkonline:152 ../mdkonline:159 ../mdkonline:180 ../mdkonline:204
-#: ../mdkonline:208 ../mdkonline:212 ../mdkonline:217 ../mdkupdate:141
-#: ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
-#, c-format
-msgid "Error"
-msgstr "Fehler"
-
-#: ../mdkonline:152
-#, c-format
-msgid "Machine name must be 1 to 40 alphanumerical characters"
-msgstr "Rechnername muss 1 bis 40 alphanumerische Zeichen enthalten"
-
-#: ../mdkonline:155
-#, c-format
-msgid "Connecting to Mandriva Online website..."
-msgstr "Verbinde mit Mandriva Online Webseite..."
-
-#: ../mdkonline:167
-#, c-format
-msgid ""
-"In order to benefit from Mandriva Online services,\n"
-"we are about to upload your configuration.\n"
-"\n"
-"The Wizard will now send the following information to Mandriva:\n"
-"\n"
-"1) the list of packages you have installed on your system,\n"
-"\n"
-"2) your hardware configuration.\n"
-"\n"
-"If you feel uncomfortable by that idea, or do not want to benefit from this "
-"service,\n"
-"please press 'Cancel'. By pressing 'Next', you allow us to keep you "
-"informed\n"
-"about security updates and useful upgrades via personalized email alerts.\n"
-"Furthermore, you benefit from discounted paid support services on\n"
-"www.mandrivaexpert.com."
-msgstr ""
-"Um von Mandriva Online Service zu profitieren\n"
-"wird Ihre Konfiguration hochgelagen.\n"
-"\n"
-"Der Assistent wird nun folgende Informationen an Mandriva senden:\n"
-"\n"
-"1)  die Liste der auf Ihrem System installierten Pakete,\n"
-"\n"
-"2) Ihre Hardwarekonfiguration.\n"
-"\n"
-"Falls Sie sich bei dieser Idee unwohl fühlen oder Sie nicht von diesem "
-"System profitieren wollen,\n"
-"drücken Sie bitte 'Abbrechen'. Wenn Sie 'Weiter' drücken, erlauben Sie uns "
-"Sie über\n"
-"personalisierte Email Nachrichten über Sicherheitsupdates und nützliche "
-"Updates informiert zu halten.\n"
-"Desweiteren profitiren Sie von ermäßigten Support Diensten auf\n"
-"www.mandrivaexpert.com."
-
-#: ../mdkonline:180
-#, c-format
-msgid "Connection problem"
-msgstr "Verbindungsproblem"
-
-#: ../mdkonline:180
-#, c-format
-msgid "Problem occurs when uploading files, please try again"
-msgstr ""
-"Ein Problem taucht beim hochladen der Dateien auf, bitte versuchen Sie es "
-"erneut"
-
-#: ../mdkonline:187
-#, c-format
-msgid "Create a Mandriva Online Account"
-msgstr "Erstelle ein Mandriva Online Benutzerkonto"
-
-#. -PO: that is for things like "Mr", "Ms",...
-#: ../mdkonline:192
-#, c-format
-msgid "Greeting:"
-msgstr "Begrüßung:"
-
-#: ../mdkonline:193
-#, c-format
-msgid "First name:"
-msgstr "Vorname:"
-
-#: ../mdkonline:194
-#, c-format
-msgid "Last name:"
-msgstr "Nachname:"
-
-#: ../mdkonline:197
-#, c-format
-msgid "Confirm Password:"
-msgstr "Passwort bestätigen:"
-
-#: ../mdkonline:204
-#, c-format
-msgid ""
-"The passwords do not match\n"
-" Please try again\n"
-msgstr ""
-"Die Passwörter stimmen nicht überein!\n"
-"Versuchen Sie es erneut!\n"
-
-#: ../mdkonline:208
-#, c-format
-msgid "Please fill in each field"
-msgstr "Bitte füllen Sie alle Felder aus"
-
-#: ../mdkonline:212
-#, c-format
-msgid "Not a valid mail address!\n"
-msgstr "Keine gültige E-Mail-Adresse!\n"
-
-#: ../mdkonline:217
-#, c-format
-msgid "Creating account failed!"
-msgstr "Erstellen des Benutzerkontos fehlgeschlagen!"
-
-#: ../mdkonline:225
-#, c-format
-msgid ""
-"Mandriva Online Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
-msgstr ""
-"Mandriva Online Benutzerkonto erfolgreich erstellt.\n"
-"Bitte drücken Sie „Weiter“ zum Authentifizieren und zum Hochzuladen Ihrer "
-"Konfiguration\n"
-
-#: ../mdkonline:229
-#, c-format
-msgid "Your upload was successful!"
-msgstr "Ihr Upload war erfolgreich!"
-
-#: ../mdkonline:229
+#: ../mdkapplet:478
 #, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandriva Online."
-msgstr ""
-"Ab jetzt erhalten SIe Sicherheits- und Updateankündigungen\n"
-"dank Mandriva Online."
+msgid "Online WebSite"
+msgstr "Online Webseite"
 
-#: ../mdkonline:229
+#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
+#: ../mdkapplet:483
 #, c-format
-msgid ""
-"Mandriva Online offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
+msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
-"Mandriva Online bietet Ihnen die Möglichkeit, Updates zu automatisieren.\n"
-"Ein Program wird regelmäßig auf Ihrem System laufen, um auf neue Updates zu "
-"prüfen\n"
-
-#: ../mdkonline:238
-#, c-format
-msgid "Congratulations"
-msgstr "Herzlichen Glückwunsch"
 
-#: ../mdkonline:238
+#: ../mdkapplet:492
 #, c-format
-msgid "Your Mandriva Online account has been successfully configured\n"
-msgstr "Ihr Mandriva Online Benutzerkonto wurde erfolgreich eingerichtet\n"
-
-#: ../mdkonline:253
-#, c-format
-msgid "Configuration uploaded successfully"
-msgstr "Die Konfiguration wurde erfolgreich hochgeladen"
-
-#: ../mdkonline:254
-#, c-format
-msgid "Problem uploading configuration"
-msgstr "Problem beim Hochladen der Konfiguration"
+msgid "Always launch on startup"
+msgstr "Immer beim Start ausführen"
 
-#: ../mdkonline:256
+#: ../mdkapplet:494
 #, c-format
-msgid ""
-"Cannot connect to Mandriva Online website: wrong login/password or router/"
-"firewall bad settings"
-msgstr ""
-"Kann Mandriva Online Webseite nicht erreichen: falscher Benutzername/"
-"Passwort oder fehlerhafte Einstellungen bei Router/Firewall"
+msgid "Quit"
+msgstr "Beenden"
 
 #: ../mdkonline.pm:207
 #, c-format
@@ -841,6 +373,11 @@ msgstr ""
 "\n"
 "Verwendung: \n"
 
+#: ../mdkupdate:73
+#, c-format
+msgid "  --help\t\t- print this help message.\n"
+msgstr "  --help\t\t- Ausgabe dieser Hilfe.\n"
+
 #: ../mdkupdate:74
 #, c-format
 msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
@@ -870,11 +407,6 @@ msgstr ""
 "--bunlde fiel.bunlde\t- analysiere und installiere Packet von .bundle "
 "metainfodatei.\n"
 
-#: ../mdkupdate:118 ../mdkupdate:164
-#, c-format
-msgid "Warning"
-msgstr "Warnung"
-
 #. -PO: here Live Install is currently *NOT* translated on the desktop, so it's better to keep as it:
 #: ../mdkupdate:120
 #, c-format
@@ -885,11 +417,21 @@ msgstr ""
 "Als erstes muss das System auf dem PC installiert sein über den 'Live "
 "install' wizard."
 
+#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
+#, c-format
+msgid "Please wait"
+msgstr "Bitte warten"
+
 #: ../mdkupdate:123 ../mdkupdate:174
 #, c-format
 msgid "Preparing..."
 msgstr "Vorbereiten ..."
 
+#: ../mdkupdate:141 ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
+#, c-format
+msgid "Error"
+msgstr "Fehler"
+
 #: ../mdkupdate:141
 #, c-format
 msgid ""
@@ -901,6 +443,11 @@ msgstr ""
 "\n"
 "%s"
 
+#: ../mdkupdate:159 ../mdkupdate:188
+#, c-format
+msgid "An error occurred"
+msgstr "Ein Fehler ist aufgetreten"
+
 #: ../mdkupdate:164
 #, c-format
 msgid ""
@@ -929,6 +476,316 @@ msgstr "Installiere Pakete...\n"
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "Aktualisieren der Pakete vom Mdkupdate Medium nicht möglich.\n"
 
+#~ msgid "New bundles are available for your system"
+#~ msgstr "Neue Aktualisierungen sind für Ihr System verfügbar"
+
+#~ msgid "Service is not configured. Please click on \"Configure the service\""
+#~ msgstr ""
+#~ "Dienst nicht konfiguriert. Klicken Sie auf „Den Dienst konfigurieren“"
+
+#~ msgid "Configure the service"
+#~ msgstr "Den Dienst konfigurieren"
+
+#~ msgid "Check updates"
+#~ msgstr "Überprüfe Updates"
+
+#~ msgid "Configure Now!"
+#~ msgstr "Jetzt konfigurieren!"
+
+#~ msgid "Actions"
+#~ msgstr "Aktionen"
+
+#~ msgid "Configure"
+#~ msgstr "Konfigurieren"
+
+#~ msgid "See logs"
+#~ msgstr "Logs ansehen"
+
+#~ msgid "Status"
+#~ msgstr "Status"
+
+#~ msgid "Close"
+#~ msgstr "Schließen"
+
+#~ msgid "Network Connection: "
+#~ msgstr "Netzwerkverbindung: "
+
+#~ msgid "Up"
+#~ msgstr "Hoch"
+
+#~ msgid "Down"
+#~ msgstr "Runter"
+
+#~ msgid "Last check: "
+#~ msgstr "Letzte Überprüfung: "
+
+#~ msgid "Machine name:"
+#~ msgstr "Rechnername:"
+
+#~ msgid "Updates: "
+#~ msgstr "Aktualisierungen: "
+
+#~ msgid "Development release not supported by service"
+#~ msgstr "Entwicklungsversion wird nicht vom Service unterstützt"
+
+#~ msgid "Too old release not supported by service"
+#~ msgstr "Zu alte Version wird nicht vom Service unterstützt"
+
+#~ msgid "Unknown state"
+#~ msgstr "Unbekannter Zustand"
+
+#~ msgid "Online services disabled. Contact Mandriva Online site\n"
+#~ msgstr ""
+#~ "Onlinedienste abgeschaltet. Kontaktieren Sie die Mandriva Online Site\n"
+
+#~ msgid "Wrong Password.\n"
+#~ msgstr "Falsches Passwort\n"
+
+#~ msgid "Wrong Action or host or login.\n"
+#~ msgstr "Falsche Aktion, falscher Host oder Anmeldekennung\n"
+
+#~ msgid ""
+#~ "Something is wrong with your network settings (check your route, firewall "
+#~ "or proxy settings)\n"
+#~ msgstr ""
+#~ "Mit Ihren Netzwerkeinstellngen scheint etwas nicht in Ordnung zu sein "
+#~ "(Pruefen SieRoute, Firewall, oder Prxy-einstellungen)\n"
+
+#~ msgid ""
+#~ "Problem occured while connecting to the server, please contact the "
+#~ "support team"
+#~ msgstr ""
+#~ "Ein Problem ist während des Verbindungsaufbaus zum Server aufgetreten, "
+#~ "bitte kontaktieren Sie das Support Team"
+
+#~ msgid "Response from Mandriva Online server\n"
+#~ msgstr "Antwort vom Mandriva Online Server\n"
+
+#~ msgid "No check"
+#~ msgstr "Keine Überprüfung"
+
+#~ msgid "Checking config file: Not present\n"
+#~ msgstr "Überprüfe Konfigurationsdatei: Nicht vorhanden\n"
+
+#~ msgid "Logs"
+#~ msgstr "Logs"
+
+#~ msgid "Clear"
+#~ msgstr "Löschen"
+
+#~ msgid ""
+#~ "mdonline version %s\n"
+#~ "Copyright (C) %s Mandriva.\n"
+#~ "This is free software and may be redistributed under the terms of the GNU "
+#~ "GPL.\n"
+#~ "\n"
+#~ "usage:\n"
+#~ msgstr ""
+#~ "mdonline Version %s\n"
+#~ "Copyright (C) %s Mandriva.\n"
+#~ "Dies ist freie Software und kann unter den Bedingungen der GNU GPL weiter "
+#~ "vertrieben werden.\n"
+#~ "\n"
+#~ "Verwendung: \n"
+
+#~ msgid "  --box=\t\t\t- hostname.\n"
+#~ msgstr " --box=\t\t\t- hostname.\n"
+
+#~ msgid "  --country\t\t\t- name of country of the user. \n"
+#~ msgstr " --country\t\t\t- Name des Heimatlandes des Benutzers.\n"
+
+#~ msgid "  --interactive\t\t- use the interactive mode.\n"
+#~ msgstr " --interactive\t\t- benutzen Sie den interaktiven Modus.\n"
+
+#~ msgid "  --nointeractive\t- use the non-interactive mode.\n"
+#~ msgstr "  --nointeractive\t- verwende den nicht interaktiven Modus.\n"
+
+#~ msgid "  --login=\t\t     - login name of the user.\n"
+#~ msgstr " --login=\t\t     - Benutzername des Benutzer.\n"
+
+#~ msgid "  --pass=\t\t\t- password  of the user.\n"
+#~ msgstr " --pass=\t\t\t- Passwort des Benutzers.\n"
+
+#~ msgid "Mandriva Online"
+#~ msgstr "Mandriva Online"
+
+#~ msgid "I already have an account"
+#~ msgstr "Ich besitze schon ein Benutzerkonto"
+
+#~ msgid "I want to subscribe"
+#~ msgstr "Ich möchte abonnieren"
+
+#~ msgid "Mr."
+#~ msgstr "Herr"
+
+#~ msgid "Mrs."
+#~ msgstr "Frau"
+
+#~ msgid "Ms."
+#~ msgstr "Frau"
+
+#~ msgid "Reading configuration\n"
+#~ msgstr "Lese Konfiguration\n"
+
+#~ msgid ""
+#~ "This assistant will help you to upload your configuration\n"
+#~ "(packages, hardware configuration) to a centralized database in\n"
+#~ "order to keep you informed about security updates and useful upgrades.\n"
+#~ msgstr ""
+#~ "Dieser Assistent hilft Ihnen Ihre Konfiguration (Pakete, Hardware\n"
+#~ "Konfiguration) zu einer zentralisierten Datenbank hochzuladen um\n"
+#~ "Sie über Sicherheitsupdates und nützliche Upgrades zu informieren.\n"
+
+#~ msgid "Account creation or authentication"
+#~ msgstr "Erstellung eines Benutzerkontos oder Authentifizierung"
+
+#~ msgid "Enter your Mandriva Online login, password and machine name:"
+#~ msgstr ""
+#~ "Geben Sie Ihren Mandriva Online Benutzernamen, Passwort und Rechnernamen "
+#~ "ein:"
+
+#~ msgid "Email address:"
+#~ msgstr "E-Mail-Adresse:"
+
+#~ msgid "Country"
+#~ msgstr "Land"
+
+#~ msgid "Password:"
+#~ msgstr "Passwort:"
+
+#~ msgid "Machine description:"
+#~ msgstr "Beschreibung des Rechners:"
+
+#~ msgid "(Ex: My Home Office's Computer)"
+#~ msgstr "(Ex: Mein Home Office's Computer)"
+
+#~ msgid "Machine name must be 1 to 40 alphanumerical characters"
+#~ msgstr "Rechnername muss 1 bis 40 alphanumerische Zeichen enthalten"
+
+#~ msgid "Connecting to Mandriva Online website..."
+#~ msgstr "Verbinde mit Mandriva Online Webseite..."
+
+#~ msgid ""
+#~ "In order to benefit from Mandriva Online services,\n"
+#~ "we are about to upload your configuration.\n"
+#~ "\n"
+#~ "The Wizard will now send the following information to Mandriva:\n"
+#~ "\n"
+#~ "1) the list of packages you have installed on your system,\n"
+#~ "\n"
+#~ "2) your hardware configuration.\n"
+#~ "\n"
+#~ "If you feel uncomfortable by that idea, or do not want to benefit from "
+#~ "this service,\n"
+#~ "please press 'Cancel'. By pressing 'Next', you allow us to keep you "
+#~ "informed\n"
+#~ "about security updates and useful upgrades via personalized email "
+#~ "alerts.\n"
+#~ "Furthermore, you benefit from discounted paid support services on\n"
+#~ "www.mandrivaexpert.com."
+#~ msgstr ""
+#~ "Um von Mandriva Online Service zu profitieren\n"
+#~ "wird Ihre Konfiguration hochgelagen.\n"
+#~ "\n"
+#~ "Der Assistent wird nun folgende Informationen an Mandriva senden:\n"
+#~ "\n"
+#~ "1)  die Liste der auf Ihrem System installierten Pakete,\n"
+#~ "\n"
+#~ "2) Ihre Hardwarekonfiguration.\n"
+#~ "\n"
+#~ "Falls Sie sich bei dieser Idee unwohl fühlen oder Sie nicht von diesem "
+#~ "System profitieren wollen,\n"
+#~ "drücken Sie bitte 'Abbrechen'. Wenn Sie 'Weiter' drücken, erlauben Sie "
+#~ "uns Sie über\n"
+#~ "personalisierte Email Nachrichten über Sicherheitsupdates und nützliche "
+#~ "Updates informiert zu halten.\n"
+#~ "Desweiteren profitiren Sie von ermäßigten Support Diensten auf\n"
+#~ "www.mandrivaexpert.com."
+
+#~ msgid "Connection problem"
+#~ msgstr "Verbindungsproblem"
+
+#~ msgid "Problem occurs when uploading files, please try again"
+#~ msgstr ""
+#~ "Ein Problem taucht beim hochladen der Dateien auf, bitte versuchen Sie es "
+#~ "erneut"
+
+#~ msgid "Create a Mandriva Online Account"
+#~ msgstr "Erstelle ein Mandriva Online Benutzerkonto"
+
+#~ msgid "Greeting:"
+#~ msgstr "Begrüßung:"
+
+#~ msgid "First name:"
+#~ msgstr "Vorname:"
+
+#~ msgid "Last name:"
+#~ msgstr "Nachname:"
+
+#~ msgid "Confirm Password:"
+#~ msgstr "Passwort bestätigen:"
+
+#~ msgid ""
+#~ "The passwords do not match\n"
+#~ " Please try again\n"
+#~ msgstr ""
+#~ "Die Passwörter stimmen nicht überein!\n"
+#~ "Versuchen Sie es erneut!\n"
+
+#~ msgid "Please fill in each field"
+#~ msgstr "Bitte füllen Sie alle Felder aus"
+
+#~ msgid "Not a valid mail address!\n"
+#~ msgstr "Keine gültige E-Mail-Adresse!\n"
+
+#~ msgid "Creating account failed!"
+#~ msgstr "Erstellen des Benutzerkontos fehlgeschlagen!"
+
+#~ msgid ""
+#~ "Mandriva Online Account successfully created.\n"
+#~ "Please click \"Next\" to authenticate and upload your configuration\n"
+#~ msgstr ""
+#~ "Mandriva Online Benutzerkonto erfolgreich erstellt.\n"
+#~ "Bitte drücken Sie „Weiter“ zum Authentifizieren und zum Hochzuladen Ihrer "
+#~ "Konfiguration\n"
+
+#~ msgid "Your upload was successful!"
+#~ msgstr "Ihr Upload war erfolgreich!"
+
+#~ msgid ""
+#~ "From now you will receive on security and updates \n"
+#~ "announcements thanks to Mandriva Online."
+#~ msgstr ""
+#~ "Ab jetzt erhalten SIe Sicherheits- und Updateankündigungen\n"
+#~ "dank Mandriva Online."
+
+#~ msgid ""
+#~ "Mandriva Online offers you the ability to automate the updates.\n"
+#~ "A program will run regulary in your system waiting for new updates\n"
+#~ msgstr ""
+#~ "Mandriva Online bietet Ihnen die Möglichkeit, Updates zu automatisieren.\n"
+#~ "Ein Program wird regelmäßig auf Ihrem System laufen, um auf neue Updates "
+#~ "zu prüfen\n"
+
+#~ msgid "Congratulations"
+#~ msgstr "Herzlichen Glückwunsch"
+
+#~ msgid "Your Mandriva Online account has been successfully configured\n"
+#~ msgstr "Ihr Mandriva Online Benutzerkonto wurde erfolgreich eingerichtet\n"
+
+#~ msgid "Configuration uploaded successfully"
+#~ msgstr "Die Konfiguration wurde erfolgreich hochgeladen"
+
+#~ msgid "Problem uploading configuration"
+#~ msgstr "Problem beim Hochladen der Konfiguration"
+
+#~ msgid ""
+#~ "Cannot connect to Mandriva Online website: wrong login/password or router/"
+#~ "firewall bad settings"
+#~ msgstr ""
+#~ "Kann Mandriva Online Webseite nicht erreichen: falscher Benutzername/"
+#~ "Passwort oder fehlerhafte Einstellungen bei Router/Firewall"
+
 #~ msgid "  --applet\t\t- launch Mandriva Update.\n"
 #~ msgstr "  --applet\t\t- starte Mandriva Aktualisierung.\n"
 
diff --git a/po/el.po b/po/el.po
index 71d26d7f..647c1a91 100644
--- a/po/el.po
+++ b/po/el.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline-el\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-09 16:26+0200\n"
+"POT-Creation-Date: 2008-02-21 18:21+0100\n"
 "PO-Revision-Date: 2006-05-12 11:01+0300\n"
 "Last-Translator: Theophanis Mastakas <mastakas@otenet.gr>\n"
 "Language-Team: Greek <nls@tux.hellug.gr>\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:94
+#: ../mdkapplet:88
 #, fuzzy, c-format
 msgid "Will check updates at %s"
 msgstr "Ελεγχος αναβαθμίσεων"
 
-#: ../mdkapplet:103
+#: ../mdkapplet:97
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "Το σύστημα σας είναι ενημερωμένο "
 
-#: ../mdkapplet:109
+#: ../mdkapplet:103
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -40,56 +40,45 @@ msgstr ""
 "Πρόβλημα υπηρεσίας ρυθμίσεων. Παρακαλώ ελέγξτε τα ημερολόγια και στείλτε "
 "μήνυμα στο support@mandrivaonline.com"
 
-#: ../mdkapplet:115
+#: ../mdkapplet:110
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "Παρακαλώ περιμένετε, αναζητούνται τα διαθέσιμα πακέτα..."
 
-#: ../mdkapplet:121
+#: ../mdkapplet:116
 #, c-format
 msgid "New updates are available for your system"
 msgstr "Υπάρχουν νέες αναβαθμίσεις για το σύστημα σας"
 
-#: ../mdkapplet:127
-#, c-format
-msgid "New bundles are available for your system"
-msgstr "Υπάρχουν νέες δέσμες για το σύστημα σας"
-
-#: ../mdkapplet:133
-#, c-format
-msgid "Service is not configured. Please click on \"Configure the service\""
-msgstr ""
-"Η υπηρεσία δεν εχει ρυθμιστεί.Παρακαλώ κάντε κλίκ στο \"Ρύθμιση υπηρεσίας\" "
-
-#: ../mdkapplet:139
+#: ../mdkapplet:122
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "Το δίκτυο δεν λειτουργεί.Παρακαλώ διαμορφώστε το δίκτυο σας "
 
-#: ../mdkapplet:145
+#: ../mdkapplet:128
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr ""
 "Η υπηρεσία δεν είναι ενεργοποιημένη.Παρακαλώ κάντε κλικ στο \"Online "
 "Δικτυακός τόπος\" "
 
-#: ../mdkapplet:151 ../mdkapplet:182
+#: ../mdkapplet:134 ../mdkapplet:165
 #, fuzzy, c-format
 msgid "urpmi database locked"
 msgstr "Η βάση δεδομένων urpmi είναι κλειδωμένη"
 
-#: ../mdkapplet:157
+#: ../mdkapplet:140
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr "Η έκδοση δεν υποστηρίζεται ( πολύ παλιά έκδοση ή έκδοση σε ανάπτυξη)"
 
-#: ../mdkapplet:163
+#: ../mdkapplet:146
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
 msgstr ""
 
-#: ../mdkapplet:169
+#: ../mdkapplet:152
 #, fuzzy, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -106,594 +95,134 @@ msgstr ""
 "\n"
 "Μετά, επανεκκινήστε το %s."
 
-#: ../mdkapplet:174
+#: ../mdkapplet:157
 #, c-format
 msgid "Enabled"
 msgstr "Ενεργοποίηση;"
 
-#: ../mdkapplet:187
+#: ../mdkapplet:170
 #, c-format
 msgid "Error updating media"
 msgstr ""
 
-#: ../mdkapplet:202
+#: ../mdkapplet:185
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr "Έλεγχος...Υπάρχουν αναβαθμίσεις\n"
 
-#: ../mdkapplet:207
+#: ../mdkapplet:190
 #, c-format
 msgid "Packages are up to date"
 msgstr ""
 
-#: ../mdkapplet:212
+#: ../mdkapplet:195
 #, fuzzy, c-format
 msgid "Failed to open urpmi database"
 msgstr "αδυναμία ανοίγματος του rpmdb"
 
-#: ../mdkapplet:217 ../mdkapplet:324
+#: ../mdkapplet:200
 #, c-format
 msgid "Install updates"
 msgstr "Εγκατάσταση αναβαθμίσεων"
 
-#: ../mdkapplet:218
-#, c-format
-msgid "Configure the service"
-msgstr "Ρύθμιση υπηρεσίας "
-
-#: ../mdkapplet:219
+#: ../mdkapplet:201
 #, c-format
 msgid "Check Updates"
 msgstr "Ελεγχος  αναβαθμίσεων"
 
-#: ../mdkapplet:220 ../mdkapplet:327 ../mdkonline:114 ../mdkonline:155
-#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
-#, c-format
-msgid "Please wait"
-msgstr "Παρακαλώ περιμένετε"
-
-#: ../mdkapplet:220 ../mdkapplet:326 ../mdkapplet:327
-#, c-format
-msgid "Check updates"
-msgstr "Ελεγχος αναβαθμίσεων"
-
-#: ../mdkapplet:223 ../mdkapplet:648
-#, c-format
-msgid "Online WebSite"
-msgstr "Online Δικτυακός τόπος"
-
-#: ../mdkapplet:224
+#: ../mdkapplet:202
 #, c-format
 msgid "Configure Network"
 msgstr "Ρύθμιση δικτύου"
 
-#: ../mdkapplet:225
-#, c-format
-msgid "Configure Now!"
-msgstr "Ρύθμιση τώρα !"
-
-#: ../mdkapplet:313 ../mdkapplet:392
-#, c-format
-msgid "Mandriva Linux Updates Applet"
-msgstr "Μικροεφαρμογή αναβαθμίσεων της Mandriva Linux"
-
-#: ../mdkapplet:322
-#, c-format
-msgid "Actions"
-msgstr "Ενέργειες"
-
-#: ../mdkapplet:325
-#, c-format
-msgid "Configure"
-msgstr "Ρύθμιση"
-
-#: ../mdkapplet:329
-#, c-format
-msgid "See logs"
-msgstr "Δές ημερολόγια"
-
-#: ../mdkapplet:332
-#, c-format
-msgid "Status"
-msgstr "Κατάσταση"
-
-#: ../mdkapplet:336 ../mdkapplet:597
-#, c-format
-msgid "Close"
-msgstr "Κλείσιμο"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Network Connection: "
-msgstr "Σύνδεση δικτύου:"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Up"
-msgstr "Πάνω"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Down"
-msgstr "Κάτω"
-
-#: ../mdkapplet:366
-#, c-format
-msgid "Last check: "
-msgstr "Τελευταίος έλεγχος:"
-
-#: ../mdkapplet:367 ../mdkonline:145
-#, c-format
-msgid "Machine name:"
-msgstr "Όνομα μηχανήματος:"
-
-#: ../mdkapplet:368
-#, c-format
-msgid "Updates: "
-msgstr "Αναβαθμίσεις"
-
-#: ../mdkapplet:372
+#: ../mdkapplet:283
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Εκτέλεση drakconnect\n"
 
-#: ../mdkapplet:375
+#: ../mdkapplet:286
 #, c-format
 msgid "Mandriva Online seems to be reinstalled, reloading applet ...."
 msgstr ""
 "Η υπηρεσία Mandriva Online φαίνεται πώς έχει επανεγκατασταθεί, επαναφόρτωση "
 "μικροεφαρμογής...  "
 
-#: ../mdkapplet:383
+#: ../mdkapplet:294
 #, c-format
 msgid "Launching MandrivaUpdate\n"
 msgstr " Εκτέλεση μικροεφαρμογής MandrivaUpdate\n"
 
-#: ../mdkapplet:398
+#: ../mdkapplet:303
+#, c-format
+msgid "Mandriva Linux Updates Applet"
+msgstr "Μικροεφαρμογή αναβαθμίσεων της Mandriva Linux"
+
+#: ../mdkapplet:308
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Επεξεργασία νέων αναβαθμίσεων...\n"
 
-#: ../mdkapplet:399
+#: ../mdkapplet:309
 #, c-format
 msgid "Connecting to"
 msgstr "Σύνδεση με"
 
-#: ../mdkapplet:467 ../mdkupdate:159 ../mdkupdate:188
-#, c-format
-msgid "An error occurred"
-msgstr "Προκλήθηκε σφάλμα"
-
-#: ../mdkapplet:475
-#, c-format
-msgid "Development release not supported by service"
-msgstr "Διανομή υπο εξέλιξη δεν υποστηρίζεται απο την υπηρεσία"
-
-#: ../mdkapplet:476
-#, c-format
-msgid "Too old release not supported by service"
-msgstr "Πολύ παλιά διανομή δεν υποστηρίζεται απο την υπηρεσία"
-
-#: ../mdkapplet:477
-#, c-format
-msgid "Unknown state"
-msgstr "Αγνωστη κατάσταση"
-
-#: ../mdkapplet:478
-#, c-format
-msgid "Online services disabled. Contact Mandriva Online site\n"
-msgstr ""
-"Υπηρεσία Online απενεργοποιημένη. Επικοινωνήστε με δικτυακό τόπο Manriva "
-"Online\n"
-
-#: ../mdkapplet:479
-#, c-format
-msgid "Wrong Password.\n"
-msgstr "Λάθος κωδικός πρόσβασης\n"
-
-#: ../mdkapplet:480
-#, c-format
-msgid "Wrong Action or host or login.\n"
-msgstr "Λανθασμένη ενέργεια ή λάθος κεντρικός υπολογιστής ή λάθος σύνδεση.\n"
-
-#: ../mdkapplet:481
-#, c-format
-msgid ""
-"Something is wrong with your network settings (check your route, firewall or "
-"proxy settings)\n"
-msgstr ""
-"Υπάρχει πρόβλημα με τις ρυθμίσεις του δικτύου σας (ελέγξτε τη δρομολόγηση "
-"σας,το δικτυακό φίλτρο ασφάλειας ή τις ρυθμίσεις διαμεσολαβητή\n"
-
-#: ../mdkapplet:483
-#, c-format
-msgid ""
-"Problem occured while connecting to the server, please contact the support "
-"team"
-msgstr ""
-"Υπήρξε πρόβλημα κατά τη σύνδεση σας με τον διακομιστή,παρακαλώ επικοινωνήστε "
-"με την ομάδα υποστήριξης"
-
-#: ../mdkapplet:487
-#, c-format
-msgid "Response from Mandriva Online server\n"
-msgstr "Απάντηση απο τόν διακομιστή της Mandriva Online\n"
-
-#: ../mdkapplet:490
+#: ../mdkapplet:386
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Το σύστημα είναι ενημερωμένο\n"
 
-#: ../mdkapplet:527
-#, c-format
-msgid "No check"
-msgstr "Μη έλεγχος"
-
-#: ../mdkapplet:541
-#, c-format
-msgid "Checking config file: Not present\n"
-msgstr "Έλεγχος αρχείου config:Δεν υπάρχει\n"
-
-#: ../mdkapplet:544
+#: ../mdkapplet:415
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Έλεγχος δικτύου: φαίνεται απενεργοποιημένο\n"
 
-#: ../mdkapplet:587
+#: ../mdkapplet:457 ../mdkupdate:118 ../mdkupdate:164
 #, c-format
-msgid "Logs"
-msgstr "Ημερολόγια"
-
-#: ../mdkapplet:603
-#, c-format
-msgid "Clear"
-msgstr "Καθαρισμός"
+msgid "Warning"
+msgstr "Προσοχή"
 
-#: ../mdkapplet:629
+#: ../mdkapplet:468
 #, c-format
 msgid "About..."
 msgstr "Περί..."
 
-#: ../mdkapplet:631
+#: ../mdkapplet:472
 #, c-format
 msgid "Mandriva Online %s"
 msgstr "Mandriva Online %s"
 
-#: ../mdkapplet:635
+#: ../mdkapplet:473
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Copyright (C)%s by mandriva"
 
-#: ../mdkapplet:647
+#: ../mdkapplet:476
 #, c-format
 msgid "Mandriva Online gives access to Mandriva web services."
 msgstr ""
 " Η Mandriva Online παρέχει πρόσβαση στις δικτυακές υπηρεσίες της Mandriva."
 
-#: ../mdkapplet:655
-#, c-format
-msgid "Always launch on startup"
-msgstr "Να εκτελείται πάντοτε στην εκκίνηση"
-
-#: ../mdkapplet:657
-#, c-format
-msgid "Quit"
-msgstr "Έξοδος"
-
-#: ../mdkonline:58
-#, c-format
-msgid ""
-"mdonline version %s\n"
-"Copyright (C) %s Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"mdkonline έκδοση %s\n"
-"Copyright (C) %s Mandriva.\n"
-"Αυτό είναι ελεύθερο λογισμικό και μπορεί να διανεμηθεί υπό τους όρους του "
-"GNU GPL.\n"
-"\n"
-"χρήση:\n"
-
-#: ../mdkonline:63 ../mdkupdate:73
-#, c-format
-msgid "  --help\t\t- print this help message.\n"
-msgstr "  --help\t\t- εκτύπωση αυτού του μηνύματος βοήθειας.\n"
-
-#: ../mdkonline:64
-#, c-format
-msgid "  --box=\t\t\t- hostname.\n"
-msgstr "  --box=\t\t\t- όνομα κεντρικού υπολογιστή.\n"
-
-#: ../mdkonline:65
-#, c-format
-msgid "  --country\t\t\t- name of country of the user. \n"
-msgstr "  --country\t\t\t- όνομα χώρας του χρήστη. \n"
-
-#: ../mdkonline:66
-#, c-format
-msgid "  --interactive\t\t- use the interactive mode.\n"
-msgstr "  --interactive\t\t- χρήση διαδραστικής κατάστασης.\n"
-
-#: ../mdkonline:67
-#, c-format
-msgid "  --nointeractive\t- use the non-interactive mode.\n"
-msgstr "  --nointeractive\t -χρήση της μή διαδραστικής κατάστασης.\n"
-
-#: ../mdkonline:68
-#, c-format
-msgid "  --login=\t\t     - login name of the user.\n"
-msgstr "  --login=\t\t     - όνομα σύνδεσης του χρήστη.\n"
-
-#: ../mdkonline:69
-#, c-format
-msgid "  --pass=\t\t\t- password  of the user.\n"
-msgstr "  --pass=\t\t\t- κωδικός χρήστη.\n"
-
-#: ../mdkonline:87 ../mdkonline:120
-#, c-format
-msgid "Mandriva Online"
-msgstr "Mandriva Online"
-
-#: ../mdkonline:90
-#, c-format
-msgid "I already have an account"
-msgstr "Εχω ήδη ενα λογαριασμό"
-
-#: ../mdkonline:91
-#, c-format
-msgid "I want to subscribe"
-msgstr "Θέλω να εγγραφώ συνδρομητής"
-
-#: ../mdkonline:96
-#, c-format
-msgid "Mr."
-msgstr "Κος."
-
-#: ../mdkonline:96
-#, c-format
-msgid "Mrs."
-msgstr "Κα."
-
-#: ../mdkonline:96
-#, c-format
-msgid "Ms."
-msgstr "Δνις."
-
-#: ../mdkonline:114
-#, c-format
-msgid "Reading configuration\n"
-msgstr "Ανάγνωση Ρυθμίσεων\n"
-
-#: ../mdkonline:123
-#, c-format
-msgid ""
-"This assistant will help you to upload your configuration\n"
-"(packages, hardware configuration) to a centralized database in\n"
-"order to keep you informed about security updates and useful upgrades.\n"
-msgstr ""
-"Ο βοηθός θα σας διευκολύνει να στείλετε την σύνθεση σας\n"
-"(πακέτα, υλικό του υπολογιστή σας) σε μια κεντρική βάση για να μπορείτε\n"
-"να ενημερώνεστε για αναβαθμίσεις ασφαλείας και χρήσιμες αναβαθμίσεις.\n"
-
-#: ../mdkonline:131
-#, c-format
-msgid "Account creation or authentication"
-msgstr "Δημιουργία λογαριασμού ή πιστοποίηση ταυτότητας"
-
-#: ../mdkonline:136
-#, c-format
-msgid "Enter your Mandriva Online login, password and machine name:"
-msgstr ""
-"Εισάγετε το όνομα χρήστη ,κωδικό πρόσβασης και το Όνομα μηχανήματος για το "
-"Mandriva Online:"
-
-#: ../mdkonline:142 ../mdkonline:195
-#, c-format
-msgid "Email address:"
-msgstr "Διεύθυνση ηλεκτρονικού ταχυδρομείου"
-
-#: ../mdkonline:143
-#, c-format
-msgid "Country"
-msgstr "Χώρα"
-
-#: ../mdkonline:144 ../mdkonline:196
-#, c-format
-msgid "Password:"
-msgstr "Κωδικός πρόσβασης:               "
-
-#: ../mdkonline:146
-#, c-format
-msgid "Machine description:"
-msgstr "Περιγραφή μηχανήματος:"
-
-#: ../mdkonline:147
-#, c-format
-msgid "(Ex: My Home Office's Computer)"
-msgstr "(Εχ:"
-
-#: ../mdkonline:152 ../mdkonline:159 ../mdkonline:180 ../mdkonline:204
-#: ../mdkonline:208 ../mdkonline:212 ../mdkonline:217 ../mdkupdate:141
-#: ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
-#, c-format
-msgid "Error"
-msgstr "Σφάλμα"
-
-#: ../mdkonline:152
-#, c-format
-msgid "Machine name must be 1 to 40 alphanumerical characters"
-msgstr ""
-"Το όνομα μηχανήματος πρέπει να είναι απο 1 εώς 40 αλφαριθμητικούς χαρακτήρες"
-
-#: ../mdkonline:155
-#, c-format
-msgid "Connecting to Mandriva Online website..."
-msgstr "Σύνδεση με τον δικτυακό τόπο Mandriva Online"
-
-#: ../mdkonline:167
-#, c-format
-msgid ""
-"In order to benefit from Mandriva Online services,\n"
-"we are about to upload your configuration.\n"
-"\n"
-"The Wizard will now send the following information to Mandriva:\n"
-"\n"
-"1) the list of packages you have installed on your system,\n"
-"\n"
-"2) your hardware configuration.\n"
-"\n"
-"If you feel uncomfortable by that idea, or do not want to benefit from this "
-"service,\n"
-"please press 'Cancel'. By pressing 'Next', you allow us to keep you "
-"informed\n"
-"about security updates and useful upgrades via personalized email alerts.\n"
-"Furthermore, you benefit from discounted paid support services on\n"
-"www.mandrivaexpert.com."
-msgstr ""
-"Για να επωφεληθείτε από τις υπηρεσίες Mandriva Online\n"
-"θα αποστείλουμε τις ρυθμίσεις σας καθώς και τα εγκατεστημένα πακέτα\n"
-"\n"
-"Ο οδηγός θα στείλει τώρα τα παρακάτω στοιχεία στην Mandriva:\n"
-"\n"
-"1) τα πακέτα που έχετε εγκατεστημένα στο σύστημά σας,\n"
-"\n"
-"2) τα στοιχεία των υλικών που αποτελούν τον υπολογιστή σας.\n"
-"\n"
-"Αν δεν νιώθετε άνετα με αυτό ή δεν θέλετε να επωφεληθείτε από την υπηρεσία "
-"επιλέξτε 'Άκυρο'.\n"
-"Επιλέγοντας 'Επόμενο', θα μας επιτρέψετε να σας κρατάμε ενήμερους\n"
-"σχετικά με ενημερώσεις ασφαλείας και χρήσιμες αναβαθμίσεις με προσωπικό e-"
-"mail\n"
-"Θα μπορείτε να επωφεληθείτε από έκπτωση στην υπηρεσία με πληρωμή στο \n"
-"www.mandrivaexpert.com"
-
-#: ../mdkonline:180
-#, c-format
-msgid "Connection problem"
-msgstr "Πρόβλημα σύνδεσης"
-
-#: ../mdkonline:180
-#, c-format
-msgid "Problem occurs when uploading files, please try again"
-msgstr ""
-"Παρουσιάστηκε πρόβλημα κατά την αποστολή των αρχείων,παρακαλώ δοκιμάστε ξανά"
-
-#: ../mdkonline:187
-#, c-format
-msgid "Create a Mandriva Online Account"
-msgstr "Δημιουργήστε ένα λογαριασμό Mandriva Online"
-
-#. -PO: that is for things like "Mr", "Ms",...
-#: ../mdkonline:192
-#, c-format
-msgid "Greeting:"
-msgstr "Χαιρετισμός:"
-
-#: ../mdkonline:193
-#, c-format
-msgid "First name:"
-msgstr "Όνομα:"
-
-#: ../mdkonline:194
-#, c-format
-msgid "Last name:"
-msgstr "Επίθετο:"
-
-#: ../mdkonline:197
-#, c-format
-msgid "Confirm Password:"
-msgstr "Επαλήθευση Κωδικού:"
-
-#: ../mdkonline:204
-#, c-format
-msgid ""
-"The passwords do not match\n"
-" Please try again\n"
-msgstr ""
-"Οι κωδικοί δεν συμπίπτουν\n"
-"Παρακαλώ προσπαθήστε ξανά\n"
-
-#: ../mdkonline:208
-#, c-format
-msgid "Please fill in each field"
-msgstr "Παρακαλώ συμπληρώστε τα παρακάτω πεδία"
-
-#: ../mdkonline:212
-#, c-format
-msgid "Not a valid mail address!\n"
-msgstr "Μη έγκυρη διεύθυνση ταχυδρομείου!\n"
-
-#: ../mdkonline:217
-#, c-format
-msgid "Creating account failed!"
-msgstr "Αποτυχία δημιουργίας λογαριασμού !"
-
-#: ../mdkonline:225
-#, c-format
-msgid ""
-"Mandriva Online Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
-msgstr ""
-"Επιτυχής δημιουργία λογαριασμού Mandriva Online\n"
-"Παρακαλώ κάντε κλικ \"Next/Επόμενο\"για πιστοποίηση ταυτότητας και αποστολή "
-"ρυθμίσεων\n"
-
-#: ../mdkonline:229
-#, c-format
-msgid "Your upload was successful!"
-msgstr "Η αποστολή ήταν επιτυχής!"
-
-#: ../mdkonline:229
+#: ../mdkapplet:478
 #, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandriva Online."
-msgstr ""
-"Από εδώ και πέρα θα παραλαμβάνετε ανακοινώσεις\n"
-"σχετικά με ενημερώσεις ασφαλείας και αναβαθμίσεις χάρη στο Mandriva Online."
+msgid "Online WebSite"
+msgstr "Online Δικτυακός τόπος"
 
-#: ../mdkonline:229
+#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
+#: ../mdkapplet:483
 #, c-format
-msgid ""
-"Mandriva Online offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
+msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
-"Το Mandriva Online σας παρέχει τη δυνατότητα αυτοματοποιημένων ενημερώσεων.\n"
-"Ένα πρόγραμμα θα εκτελείται τακτικά στο σύστημά σας αναμένοντας νέες "
-"αναβαθμίσεις\n"
 
-#: ../mdkonline:238
+#: ../mdkapplet:492
 #, c-format
-msgid "Congratulations"
-msgstr "Συγχαρητήρια"
-
-#: ../mdkonline:238
-#, c-format
-msgid "Your Mandriva Online account has been successfully configured\n"
-msgstr "Ο λογαριασμός σας Mandriva Online ρυθμίστηκε επιτυχώς\n"
-
-#: ../mdkonline:253
-#, c-format
-msgid "Configuration uploaded successfully"
-msgstr "Η αποστολή ρυθμίσεων ήταν επιτυχής!"
-
-#: ../mdkonline:254
-#, c-format
-msgid "Problem uploading configuration"
-msgstr "Πρόβλημα στην αποστολή Ρυθμίσεων"
+msgid "Always launch on startup"
+msgstr "Να εκτελείται πάντοτε στην εκκίνηση"
 
-#: ../mdkonline:256
+#: ../mdkapplet:494
 #, c-format
-msgid ""
-"Cannot connect to Mandriva Online website: wrong login/password or router/"
-"firewall bad settings"
-msgstr ""
-"Η σύνδεση με τον δικτυακό τόπο της Mandriva Online δεν είναι εφικτή:λάθος "
-"σύνδεση/κωδικός ή δρομολογητής/εσφαλμένες ρυθμίσεις  δικτυακού φίλτρου "
-"ασφάλειας"
+msgid "Quit"
+msgstr "Έξοδος"
 
 #: ../mdkonline.pm:207
 #, c-format
@@ -843,6 +372,11 @@ msgstr ""
 "\n"
 "χρήση:\n"
 
+#: ../mdkupdate:73
+#, c-format
+msgid "  --help\t\t- print this help message.\n"
+msgstr "  --help\t\t- εκτύπωση αυτού του μηνύματος βοήθειας.\n"
+
 #: ../mdkupdate:74
 #, c-format
 msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
@@ -872,11 +406,6 @@ msgstr ""
 "  --bundle file.bundle\t- ανάλυση και εγκατάσταση πακέτου από αρχείο δέσμης "
 "metainfo.\n"
 
-#: ../mdkupdate:118 ../mdkupdate:164
-#, c-format
-msgid "Warning"
-msgstr "Προσοχή"
-
 #. -PO: here Live Install is currently *NOT* translated on the desktop, so it's better to keep as it:
 #: ../mdkupdate:120
 #, c-format
@@ -887,11 +416,21 @@ msgstr ""
 "Αρχικά πρέπει να εγκαταστήσετε το σύστημα στο σκληρό σας δίσκο με τον "
 "αυτόματο οδηγό 'Live install'."
 
+#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
+#, c-format
+msgid "Please wait"
+msgstr "Παρακαλώ περιμένετε"
+
 #: ../mdkupdate:123 ../mdkupdate:174
 #, c-format
 msgid "Preparing..."
 msgstr "Προετοιμασία..."
 
+#: ../mdkupdate:141 ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
+#, c-format
+msgid "Error"
+msgstr "Σφάλμα"
+
 #: ../mdkupdate:141
 #, c-format
 msgid ""
@@ -903,6 +442,11 @@ msgstr ""
 "\n"
 "%s"
 
+#: ../mdkupdate:159 ../mdkupdate:188
+#, c-format
+msgid "An error occurred"
+msgstr "Προκλήθηκε σφάλμα"
+
 #: ../mdkupdate:164
 #, c-format
 msgid ""
@@ -931,6 +475,323 @@ msgstr "Εγκατάσταση πακέτων...\n"
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "Αδύνατη η αναβάθμιση των πακέτων από το μέσο update_source.\n"
 
+#~ msgid "New bundles are available for your system"
+#~ msgstr "Υπάρχουν νέες δέσμες για το σύστημα σας"
+
+#~ msgid "Service is not configured. Please click on \"Configure the service\""
+#~ msgstr ""
+#~ "Η υπηρεσία δεν εχει ρυθμιστεί.Παρακαλώ κάντε κλίκ στο \"Ρύθμιση υπηρεσίας"
+#~ "\" "
+
+#~ msgid "Configure the service"
+#~ msgstr "Ρύθμιση υπηρεσίας "
+
+#~ msgid "Check updates"
+#~ msgstr "Ελεγχος αναβαθμίσεων"
+
+#~ msgid "Configure Now!"
+#~ msgstr "Ρύθμιση τώρα !"
+
+#~ msgid "Actions"
+#~ msgstr "Ενέργειες"
+
+#~ msgid "Configure"
+#~ msgstr "Ρύθμιση"
+
+#~ msgid "See logs"
+#~ msgstr "Δές ημερολόγια"
+
+#~ msgid "Status"
+#~ msgstr "Κατάσταση"
+
+#~ msgid "Close"
+#~ msgstr "Κλείσιμο"
+
+#~ msgid "Network Connection: "
+#~ msgstr "Σύνδεση δικτύου:"
+
+#~ msgid "Up"
+#~ msgstr "Πάνω"
+
+#~ msgid "Down"
+#~ msgstr "Κάτω"
+
+#~ msgid "Last check: "
+#~ msgstr "Τελευταίος έλεγχος:"
+
+#~ msgid "Machine name:"
+#~ msgstr "Όνομα μηχανήματος:"
+
+#~ msgid "Updates: "
+#~ msgstr "Αναβαθμίσεις"
+
+#~ msgid "Development release not supported by service"
+#~ msgstr "Διανομή υπο εξέλιξη δεν υποστηρίζεται απο την υπηρεσία"
+
+#~ msgid "Too old release not supported by service"
+#~ msgstr "Πολύ παλιά διανομή δεν υποστηρίζεται απο την υπηρεσία"
+
+#~ msgid "Unknown state"
+#~ msgstr "Αγνωστη κατάσταση"
+
+#~ msgid "Online services disabled. Contact Mandriva Online site\n"
+#~ msgstr ""
+#~ "Υπηρεσία Online απενεργοποιημένη. Επικοινωνήστε με δικτυακό τόπο Manriva "
+#~ "Online\n"
+
+#~ msgid "Wrong Password.\n"
+#~ msgstr "Λάθος κωδικός πρόσβασης\n"
+
+#~ msgid "Wrong Action or host or login.\n"
+#~ msgstr ""
+#~ "Λανθασμένη ενέργεια ή λάθος κεντρικός υπολογιστής ή λάθος σύνδεση.\n"
+
+#~ msgid ""
+#~ "Something is wrong with your network settings (check your route, firewall "
+#~ "or proxy settings)\n"
+#~ msgstr ""
+#~ "Υπάρχει πρόβλημα με τις ρυθμίσεις του δικτύου σας (ελέγξτε τη δρομολόγηση "
+#~ "σας,το δικτυακό φίλτρο ασφάλειας ή τις ρυθμίσεις διαμεσολαβητή\n"
+
+#~ msgid ""
+#~ "Problem occured while connecting to the server, please contact the "
+#~ "support team"
+#~ msgstr ""
+#~ "Υπήρξε πρόβλημα κατά τη σύνδεση σας με τον διακομιστή,παρακαλώ "
+#~ "επικοινωνήστε με την ομάδα υποστήριξης"
+
+#~ msgid "Response from Mandriva Online server\n"
+#~ msgstr "Απάντηση απο τόν διακομιστή της Mandriva Online\n"
+
+#~ msgid "No check"
+#~ msgstr "Μη έλεγχος"
+
+#~ msgid "Checking config file: Not present\n"
+#~ msgstr "Έλεγχος αρχείου config:Δεν υπάρχει\n"
+
+#~ msgid "Logs"
+#~ msgstr "Ημερολόγια"
+
+#~ msgid "Clear"
+#~ msgstr "Καθαρισμός"
+
+#~ msgid ""
+#~ "mdonline version %s\n"
+#~ "Copyright (C) %s Mandriva.\n"
+#~ "This is free software and may be redistributed under the terms of the GNU "
+#~ "GPL.\n"
+#~ "\n"
+#~ "usage:\n"
+#~ msgstr ""
+#~ "mdkonline έκδοση %s\n"
+#~ "Copyright (C) %s Mandriva.\n"
+#~ "Αυτό είναι ελεύθερο λογισμικό και μπορεί να διανεμηθεί υπό τους όρους του "
+#~ "GNU GPL.\n"
+#~ "\n"
+#~ "χρήση:\n"
+
+#~ msgid "  --box=\t\t\t- hostname.\n"
+#~ msgstr "  --box=\t\t\t- όνομα κεντρικού υπολογιστή.\n"
+
+#~ msgid "  --country\t\t\t- name of country of the user. \n"
+#~ msgstr "  --country\t\t\t- όνομα χώρας του χρήστη. \n"
+
+#~ msgid "  --interactive\t\t- use the interactive mode.\n"
+#~ msgstr "  --interactive\t\t- χρήση διαδραστικής κατάστασης.\n"
+
+#~ msgid "  --nointeractive\t- use the non-interactive mode.\n"
+#~ msgstr "  --nointeractive\t -χρήση της μή διαδραστικής κατάστασης.\n"
+
+#~ msgid "  --login=\t\t     - login name of the user.\n"
+#~ msgstr "  --login=\t\t     - όνομα σύνδεσης του χρήστη.\n"
+
+#~ msgid "  --pass=\t\t\t- password  of the user.\n"
+#~ msgstr "  --pass=\t\t\t- κωδικός χρήστη.\n"
+
+#~ msgid "Mandriva Online"
+#~ msgstr "Mandriva Online"
+
+#~ msgid "I already have an account"
+#~ msgstr "Εχω ήδη ενα λογαριασμό"
+
+#~ msgid "I want to subscribe"
+#~ msgstr "Θέλω να εγγραφώ συνδρομητής"
+
+#~ msgid "Mr."
+#~ msgstr "Κος."
+
+#~ msgid "Mrs."
+#~ msgstr "Κα."
+
+#~ msgid "Ms."
+#~ msgstr "Δνις."
+
+#~ msgid "Reading configuration\n"
+#~ msgstr "Ανάγνωση Ρυθμίσεων\n"
+
+#~ msgid ""
+#~ "This assistant will help you to upload your configuration\n"
+#~ "(packages, hardware configuration) to a centralized database in\n"
+#~ "order to keep you informed about security updates and useful upgrades.\n"
+#~ msgstr ""
+#~ "Ο βοηθός θα σας διευκολύνει να στείλετε την σύνθεση σας\n"
+#~ "(πακέτα, υλικό του υπολογιστή σας) σε μια κεντρική βάση για να μπορείτε\n"
+#~ "να ενημερώνεστε για αναβαθμίσεις ασφαλείας και χρήσιμες αναβαθμίσεις.\n"
+
+#~ msgid "Account creation or authentication"
+#~ msgstr "Δημιουργία λογαριασμού ή πιστοποίηση ταυτότητας"
+
+#~ msgid "Enter your Mandriva Online login, password and machine name:"
+#~ msgstr ""
+#~ "Εισάγετε το όνομα χρήστη ,κωδικό πρόσβασης και το Όνομα μηχανήματος για "
+#~ "το Mandriva Online:"
+
+#~ msgid "Email address:"
+#~ msgstr "Διεύθυνση ηλεκτρονικού ταχυδρομείου"
+
+#~ msgid "Country"
+#~ msgstr "Χώρα"
+
+#~ msgid "Password:"
+#~ msgstr "Κωδικός πρόσβασης:               "
+
+#~ msgid "Machine description:"
+#~ msgstr "Περιγραφή μηχανήματος:"
+
+#~ msgid "(Ex: My Home Office's Computer)"
+#~ msgstr "(Εχ:"
+
+#~ msgid "Machine name must be 1 to 40 alphanumerical characters"
+#~ msgstr ""
+#~ "Το όνομα μηχανήματος πρέπει να είναι απο 1 εώς 40 αλφαριθμητικούς "
+#~ "χαρακτήρες"
+
+#~ msgid "Connecting to Mandriva Online website..."
+#~ msgstr "Σύνδεση με τον δικτυακό τόπο Mandriva Online"
+
+#~ msgid ""
+#~ "In order to benefit from Mandriva Online services,\n"
+#~ "we are about to upload your configuration.\n"
+#~ "\n"
+#~ "The Wizard will now send the following information to Mandriva:\n"
+#~ "\n"
+#~ "1) the list of packages you have installed on your system,\n"
+#~ "\n"
+#~ "2) your hardware configuration.\n"
+#~ "\n"
+#~ "If you feel uncomfortable by that idea, or do not want to benefit from "
+#~ "this service,\n"
+#~ "please press 'Cancel'. By pressing 'Next', you allow us to keep you "
+#~ "informed\n"
+#~ "about security updates and useful upgrades via personalized email "
+#~ "alerts.\n"
+#~ "Furthermore, you benefit from discounted paid support services on\n"
+#~ "www.mandrivaexpert.com."
+#~ msgstr ""
+#~ "Για να επωφεληθείτε από τις υπηρεσίες Mandriva Online\n"
+#~ "θα αποστείλουμε τις ρυθμίσεις σας καθώς και τα εγκατεστημένα πακέτα\n"
+#~ "\n"
+#~ "Ο οδηγός θα στείλει τώρα τα παρακάτω στοιχεία στην Mandriva:\n"
+#~ "\n"
+#~ "1) τα πακέτα που έχετε εγκατεστημένα στο σύστημά σας,\n"
+#~ "\n"
+#~ "2) τα στοιχεία των υλικών που αποτελούν τον υπολογιστή σας.\n"
+#~ "\n"
+#~ "Αν δεν νιώθετε άνετα με αυτό ή δεν θέλετε να επωφεληθείτε από την "
+#~ "υπηρεσία επιλέξτε 'Άκυρο'.\n"
+#~ "Επιλέγοντας 'Επόμενο', θα μας επιτρέψετε να σας κρατάμε ενήμερους\n"
+#~ "σχετικά με ενημερώσεις ασφαλείας και χρήσιμες αναβαθμίσεις με προσωπικό e-"
+#~ "mail\n"
+#~ "Θα μπορείτε να επωφεληθείτε από έκπτωση στην υπηρεσία με πληρωμή στο \n"
+#~ "www.mandrivaexpert.com"
+
+#~ msgid "Connection problem"
+#~ msgstr "Πρόβλημα σύνδεσης"
+
+#~ msgid "Problem occurs when uploading files, please try again"
+#~ msgstr ""
+#~ "Παρουσιάστηκε πρόβλημα κατά την αποστολή των αρχείων,παρακαλώ δοκιμάστε "
+#~ "ξανά"
+
+#~ msgid "Create a Mandriva Online Account"
+#~ msgstr "Δημιουργήστε ένα λογαριασμό Mandriva Online"
+
+#~ msgid "Greeting:"
+#~ msgstr "Χαιρετισμός:"
+
+#~ msgid "First name:"
+#~ msgstr "Όνομα:"
+
+#~ msgid "Last name:"
+#~ msgstr "Επίθετο:"
+
+#~ msgid "Confirm Password:"
+#~ msgstr "Επαλήθευση Κωδικού:"
+
+#~ msgid ""
+#~ "The passwords do not match\n"
+#~ " Please try again\n"
+#~ msgstr ""
+#~ "Οι κωδικοί δεν συμπίπτουν\n"
+#~ "Παρακαλώ προσπαθήστε ξανά\n"
+
+#~ msgid "Please fill in each field"
+#~ msgstr "Παρακαλώ συμπληρώστε τα παρακάτω πεδία"
+
+#~ msgid "Not a valid mail address!\n"
+#~ msgstr "Μη έγκυρη διεύθυνση ταχυδρομείου!\n"
+
+#~ msgid "Creating account failed!"
+#~ msgstr "Αποτυχία δημιουργίας λογαριασμού !"
+
+#~ msgid ""
+#~ "Mandriva Online Account successfully created.\n"
+#~ "Please click \"Next\" to authenticate and upload your configuration\n"
+#~ msgstr ""
+#~ "Επιτυχής δημιουργία λογαριασμού Mandriva Online\n"
+#~ "Παρακαλώ κάντε κλικ \"Next/Επόμενο\"για πιστοποίηση ταυτότητας και "
+#~ "αποστολή ρυθμίσεων\n"
+
+#~ msgid "Your upload was successful!"
+#~ msgstr "Η αποστολή ήταν επιτυχής!"
+
+#~ msgid ""
+#~ "From now you will receive on security and updates \n"
+#~ "announcements thanks to Mandriva Online."
+#~ msgstr ""
+#~ "Από εδώ και πέρα θα παραλαμβάνετε ανακοινώσεις\n"
+#~ "σχετικά με ενημερώσεις ασφαλείας και αναβαθμίσεις χάρη στο Mandriva "
+#~ "Online."
+
+#~ msgid ""
+#~ "Mandriva Online offers you the ability to automate the updates.\n"
+#~ "A program will run regulary in your system waiting for new updates\n"
+#~ msgstr ""
+#~ "Το Mandriva Online σας παρέχει τη δυνατότητα αυτοματοποιημένων "
+#~ "ενημερώσεων.\n"
+#~ "Ένα πρόγραμμα θα εκτελείται τακτικά στο σύστημά σας αναμένοντας νέες "
+#~ "αναβαθμίσεις\n"
+
+#~ msgid "Congratulations"
+#~ msgstr "Συγχαρητήρια"
+
+#~ msgid "Your Mandriva Online account has been successfully configured\n"
+#~ msgstr "Ο λογαριασμός σας Mandriva Online ρυθμίστηκε επιτυχώς\n"
+
+#~ msgid "Configuration uploaded successfully"
+#~ msgstr "Η αποστολή ρυθμίσεων ήταν επιτυχής!"
+
+#~ msgid "Problem uploading configuration"
+#~ msgstr "Πρόβλημα στην αποστολή Ρυθμίσεων"
+
+#~ msgid ""
+#~ "Cannot connect to Mandriva Online website: wrong login/password or router/"
+#~ "firewall bad settings"
+#~ msgstr ""
+#~ "Η σύνδεση με τον δικτυακό τόπο της Mandriva Online δεν είναι εφικτή:λάθος "
+#~ "σύνδεση/κωδικός ή δρομολογητής/εσφαλμένες ρυθμίσεις  δικτυακού φίλτρου "
+#~ "ασφάλειας"
+
 #~ msgid "  --applet\t\t- launch Mandriva Update.\n"
 #~ msgstr "  --applet\t\t- εκτέλεση Mandriva Update.\n"
 
diff --git a/po/eo.po b/po/eo.po
index 4d9ab314..5617329f 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline-eo\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-09 16:26+0200\n"
+"POT-Creation-Date: 2008-02-21 18:21+0100\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"
@@ -18,17 +18,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:94
+#: ../mdkapplet:88
 #, fuzzy, c-format
 msgid "Will check updates at %s"
 msgstr "Serĉu ĝisdatigojn"
 
-#: ../mdkapplet:103
+#: ../mdkapplet:97
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "Via sistemo estas ĝisdata"
 
-#: ../mdkapplet:109
+#: ../mdkapplet:103
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -37,54 +37,44 @@ msgstr ""
 "Problemo pri serva konfigurado. Bonvole sendu retmesaĝon al "
 "support@mandrivaonline.com"
 
-#: ../mdkapplet:115
+#: ../mdkapplet:110
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "Bonvole atendu, mi serĉas haveblajn pakaĵojn..."
 
-#: ../mdkapplet:121
+#: ../mdkapplet:116
 #, c-format
 msgid "New updates are available for your system"
 msgstr "Novaj ĝisdatigojn estas haveblajn por via sistemo"
 
-#: ../mdkapplet:127
-#, fuzzy, c-format
-msgid "New bundles are available for your system"
-msgstr "Novaj ĝisdatigojn estas haveblajn por via sistemo"
-
-#: ../mdkapplet:133
-#, c-format
-msgid "Service is not configured. Please click on \"Configure the service\""
-msgstr "Servo ne estas konfigurata. Bonvole musklaku \"Konfiguru la servon\""
-
-#: ../mdkapplet:139
+#: ../mdkapplet:122
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "Reto estas haltita. Bonvole konfiguru vian reton"
 
-#: ../mdkapplet:145
+#: ../mdkapplet:128
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "Servo ne estas aktiva. Bonvole musklaku \"TTT-a retejo\""
 
-#: ../mdkapplet:151 ../mdkapplet:182
+#: ../mdkapplet:134 ../mdkapplet:165
 #, fuzzy, c-format
 msgid "urpmi database locked"
 msgstr "urpmi-datenbazo ŝlosita"
 
-#: ../mdkapplet:157
+#: ../mdkapplet:140
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 "Sistemversiono ne konvenas (tro malnova versiono, aŭ disvolva versiono)"
 
-#: ../mdkapplet:163
+#: ../mdkapplet:146
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
 msgstr ""
 
-#: ../mdkapplet:169
+#: ../mdkapplet:152
 #, fuzzy, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -102,578 +92,131 @@ msgstr ""
 "\n"
 "Poste, restartigu Mandriva-Ĝisdatigilon (%s)."
 
-#: ../mdkapplet:174
+#: ../mdkapplet:157
 #, c-format
 msgid "Enabled"
 msgstr "Ĉu enŝaltita"
 
-#: ../mdkapplet:187
+#: ../mdkapplet:170
 #, c-format
 msgid "Error updating media"
 msgstr ""
 
-#: ../mdkapplet:202
+#: ../mdkapplet:185
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr "Kontrolante... Ĝisdatigojn haveblas\n"
 
-#: ../mdkapplet:207
+#: ../mdkapplet:190
 #, c-format
 msgid "Packages are up to date"
 msgstr ""
 
-#: ../mdkapplet:212
+#: ../mdkapplet:195
 #, fuzzy, c-format
 msgid "Failed to open urpmi database"
 msgstr "ne povis malfermi rpmdb"
 
-#: ../mdkapplet:217 ../mdkapplet:324
+#: ../mdkapplet:200
 #, c-format
 msgid "Install updates"
 msgstr "Instalu ĝisdatigojn"
 
-#: ../mdkapplet:218
-#, c-format
-msgid "Configure the service"
-msgstr "Konfiguru la servon"
-
-#: ../mdkapplet:219
+#: ../mdkapplet:201
 #, c-format
 msgid "Check Updates"
 msgstr "Serĉu ĝisdatigojn"
 
-#: ../mdkapplet:220 ../mdkapplet:327 ../mdkonline:114 ../mdkonline:155
-#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
-#, c-format
-msgid "Please wait"
-msgstr "Bonvole atendu"
-
-#: ../mdkapplet:220 ../mdkapplet:326 ../mdkapplet:327
-#, c-format
-msgid "Check updates"
-msgstr "Serĉu ĝisdatigojn"
-
-#: ../mdkapplet:223 ../mdkapplet:648
-#, c-format
-msgid "Online WebSite"
-msgstr "TTT-a retejo"
-
-#: ../mdkapplet:224
+#: ../mdkapplet:202
 #, c-format
 msgid "Configure Network"
 msgstr "Konfiguru la reton"
 
-#: ../mdkapplet:225
-#, c-format
-msgid "Configure Now!"
-msgstr "Konfiguru nun!"
-
-#: ../mdkapplet:313 ../mdkapplet:392
-#, c-format
-msgid "Mandriva Linux Updates Applet"
-msgstr "Mandriva Linux-Ĝisdatigajn programeto"
-
-#: ../mdkapplet:322
-#, c-format
-msgid "Actions"
-msgstr "Agoj"
-
-#: ../mdkapplet:325
-#, c-format
-msgid "Configure"
-msgstr "Konfiguru"
-
-#: ../mdkapplet:329
-#, c-format
-msgid "See logs"
-msgstr "Vidu logdosieron"
-
-#: ../mdkapplet:332
-#, c-format
-msgid "Status"
-msgstr "Statuso"
-
-#: ../mdkapplet:336 ../mdkapplet:597
-#, c-format
-msgid "Close"
-msgstr "Fermu"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Network Connection: "
-msgstr "Reta konekto: "
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Up"
-msgstr "Aktiva"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Down"
-msgstr "Malaktiva"
-
-#: ../mdkapplet:366
-#, c-format
-msgid "Last check: "
-msgstr "Lasta kontrolo: "
-
-#: ../mdkapplet:367 ../mdkonline:145
-#, c-format
-msgid "Machine name:"
-msgstr "Maŝinnomo:"
-
-#: ../mdkapplet:368
-#, c-format
-msgid "Updates: "
-msgstr "Ĝisdatigoj: "
-
-#: ../mdkapplet:372
+#: ../mdkapplet:283
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Lanĉu drakconnect\n"
 
-#: ../mdkapplet:375
+#: ../mdkapplet:286
 #, c-format
 msgid "Mandriva Online seems to be reinstalled, reloading applet ...."
 msgstr "Mandriva Online ŝajnas reinstalita, reŝarĝas programeton ...."
 
-#: ../mdkapplet:383
+#: ../mdkapplet:294
 #, c-format
 msgid "Launching MandrivaUpdate\n"
 msgstr "Lanĉu MandrivaUpdate\n"
 
-#: ../mdkapplet:398
+#: ../mdkapplet:303
+#, c-format
+msgid "Mandriva Linux Updates Applet"
+msgstr "Mandriva Linux-Ĝisdatigajn programeto"
+
+#: ../mdkapplet:308
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Kalkulu novajn ĝisdatigojn...\n"
 
-#: ../mdkapplet:399
+#: ../mdkapplet:309
 #, c-format
 msgid "Connecting to"
 msgstr "Konektiĝas al"
 
-#: ../mdkapplet:467 ../mdkupdate:159 ../mdkupdate:188
-#, c-format
-msgid "An error occurred"
-msgstr "Eraro okazis"
-
-#: ../mdkapplet:475
-#, c-format
-msgid "Development release not supported by service"
-msgstr "Servo ne funkcias kun disvolvaj versionoj"
-
-#: ../mdkapplet:476
-#, c-format
-msgid "Too old release not supported by service"
-msgstr "Servo ne funkcias kun tro malnovaj versionoj"
-
-#: ../mdkapplet:477
-#, c-format
-msgid "Unknown state"
-msgstr "Nekonata stato"
-
-#: ../mdkapplet:478
-#, c-format
-msgid "Online services disabled. Contact Mandriva Online site\n"
-msgstr "Retaj servoj haltitaj. Kontaktu Mandriva Online-retejon\n"
-
-#: ../mdkapplet:479
-#, c-format
-msgid "Wrong Password.\n"
-msgstr "Malĝusta pasvorto\n"
-
-#: ../mdkapplet:480
-#, c-format
-msgid "Wrong Action or host or login.\n"
-msgstr "Erara Ago aŭ gasto aŭ konektinformoj.\n"
-
-#: ../mdkapplet:481
-#, c-format
-msgid ""
-"Something is wrong with your network settings (check your route, firewall or "
-"proxy settings)\n"
-msgstr ""
-"Io fuŝas en via reta konfigurado (kontrolu la retan kurson, fajroŝirmilon aŭ "
-"la parametrojn de la prokura servilo)\n"
-
-#: ../mdkapplet:483
-#, c-format
-msgid ""
-"Problem occured while connecting to the server, please contact the support "
-"team"
-msgstr ""
-
-#: ../mdkapplet:487
-#, c-format
-msgid "Response from Mandriva Online server\n"
-msgstr "Respondo el Mandriva Online-servilo\n"
-
-#: ../mdkapplet:490
+#: ../mdkapplet:386
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Sistemo estas ĝisdata\n"
 
-#: ../mdkapplet:527
-#, c-format
-msgid "No check"
-msgstr "Neniu kontrolo"
-
-#: ../mdkapplet:541
-#, c-format
-msgid "Checking config file: Not present\n"
-msgstr "Kontrolante konfigurdosiero: Ne trovebla\n"
-
-#: ../mdkapplet:544
+#: ../mdkapplet:415
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Kontrolante Reton: ĝi ŝajnas haltita\n"
 
-#: ../mdkapplet:587
-#, c-format
-msgid "Logs"
-msgstr "Logdosieroj"
-
-#: ../mdkapplet:603
+#: ../mdkapplet:457 ../mdkupdate:118 ../mdkupdate:164
 #, c-format
-msgid "Clear"
-msgstr "Forviŝu"
+msgid "Warning"
+msgstr "Averto"
 
-#: ../mdkapplet:629
+#: ../mdkapplet:468
 #, c-format
 msgid "About..."
 msgstr "Pri..."
 
-#: ../mdkapplet:631
+#: ../mdkapplet:472
 #, fuzzy, c-format
 msgid "Mandriva Online %s"
 msgstr "Mandriva Online"
 
-#: ../mdkapplet:635
+#: ../mdkapplet:473
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr ""
 
-#: ../mdkapplet:647
+#: ../mdkapplet:476
 #, c-format
 msgid "Mandriva Online gives access to Mandriva web services."
 msgstr ""
 
-#: ../mdkapplet:655
-#, c-format
-msgid "Always launch on startup"
-msgstr "Ĉiam startu post sistemstartado"
-
-#: ../mdkapplet:657
-#, c-format
-msgid "Quit"
-msgstr "Eliru"
-
-#: ../mdkonline:58
-#, c-format
-msgid ""
-"mdonline version %s\n"
-"Copyright (C) %s Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"mdonline versio %s\n"
-"Kopirajto © %s Mandriva.\n"
-"Tio ĉi estas libera programaro kaj povas esti pludisdonata sub la termoj de "
-"GNU GPL.\n"
-"\n"
-"uzado:\n"
-
-#: ../mdkonline:63 ../mdkupdate:73
-#, c-format
-msgid "  --help\t\t- print this help message.\n"
-msgstr "  --help\t\t- presu tiun helpmesaĝon.\n"
-
-#: ../mdkonline:64
-#, c-format
-msgid "  --box=\t\t\t- hostname.\n"
-msgstr ""
-
-#: ../mdkonline:65
-#, c-format
-msgid "  --country\t\t\t- name of country of the user. \n"
-msgstr ""
-
-#: ../mdkonline:66
-#, c-format
-msgid "  --interactive\t\t- use the interactive mode.\n"
-msgstr ""
-
-#: ../mdkonline:67
-#, c-format
-msgid "  --nointeractive\t- use the non-interactive mode.\n"
-msgstr ""
-
-#: ../mdkonline:68
-#, c-format
-msgid "  --login=\t\t     - login name of the user.\n"
-msgstr ""
-
-#: ../mdkonline:69
-#, c-format
-msgid "  --pass=\t\t\t- password  of the user.\n"
-msgstr ""
-
-#: ../mdkonline:87 ../mdkonline:120
-#, c-format
-msgid "Mandriva Online"
-msgstr "Mandriva Online"
-
-#: ../mdkonline:90
-#, c-format
-msgid "I already have an account"
-msgstr "Mi jam havas konton"
-
-#: ../mdkonline:91
-#, c-format
-msgid "I want to subscribe"
-msgstr "Mi volas malfermi konton"
-
-#: ../mdkonline:96
-#, c-format
-msgid "Mr."
-msgstr "s-ro"
-
-#: ../mdkonline:96
-#, c-format
-msgid "Mrs."
-msgstr "s-ino"
-
-#: ../mdkonline:96
-#, c-format
-msgid "Ms."
-msgstr "s-ino"
-
-#: ../mdkonline:114
-#, c-format
-msgid "Reading configuration\n"
-msgstr "Legas konfiguradon\n"
-
-#: ../mdkonline:123
-#, c-format
-msgid ""
-"This assistant will help you to upload your configuration\n"
-"(packages, hardware configuration) to a centralized database in\n"
-"order to keep you informed about security updates and useful upgrades.\n"
-msgstr ""
-"Tiu helpilo alŝutos vian konfiguradon (pakaĵoj, sistem-konfigurado)\n"
-"al centrala datumbazo, por ke vi estu informita pri sekurecaj\n"
-"ĝisdatigojn kaj utilaj plibonigojn.\n"
-
-#: ../mdkonline:131
-#, c-format
-msgid "Account creation or authentication"
-msgstr "Kontokreado aŭ identiĝado"
-
-#: ../mdkonline:136
-#, c-format
-msgid "Enter your Mandriva Online login, password and machine name:"
-msgstr "Enigu vian Mandriva Online salutnomon, pasvorton kaj maŝinnomon:"
-
-#: ../mdkonline:142 ../mdkonline:195
-#, fuzzy, c-format
-msgid "Email address:"
-msgstr "IP-adreso"
-
-#: ../mdkonline:143
-#, c-format
-msgid "Country"
-msgstr "Lando"
-
-#: ../mdkonline:144 ../mdkonline:196
-#, c-format
-msgid "Password:"
-msgstr "Pasvorto:"
-
-#: ../mdkonline:146
-#, fuzzy, c-format
-msgid "Machine description:"
-msgstr "Maŝinnomo:"
-
-#: ../mdkonline:147
-#, c-format
-msgid "(Ex: My Home Office's Computer)"
-msgstr ""
-
-#: ../mdkonline:152 ../mdkonline:159 ../mdkonline:180 ../mdkonline:204
-#: ../mdkonline:208 ../mdkonline:212 ../mdkonline:217 ../mdkupdate:141
-#: ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
-#, c-format
-msgid "Error"
-msgstr "Eraro"
-
-#: ../mdkonline:152
-#, fuzzy, c-format
-msgid "Machine name must be 1 to 40 alphanumerical characters"
-msgstr "Surmetingoj devas enteni nur alfanumerajn signojn"
-
-#: ../mdkonline:155
-#, c-format
-msgid "Connecting to Mandriva Online website..."
-msgstr "Konektiĝas al Mandriva Online-retejo..."
-
-#: ../mdkonline:167
-#, c-format
-msgid ""
-"In order to benefit from Mandriva Online services,\n"
-"we are about to upload your configuration.\n"
-"\n"
-"The Wizard will now send the following information to Mandriva:\n"
-"\n"
-"1) the list of packages you have installed on your system,\n"
-"\n"
-"2) your hardware configuration.\n"
-"\n"
-"If you feel uncomfortable by that idea, or do not want to benefit from this "
-"service,\n"
-"please press 'Cancel'. By pressing 'Next', you allow us to keep you "
-"informed\n"
-"about security updates and useful upgrades via personalized email alerts.\n"
-"Furthermore, you benefit from discounted paid support services on\n"
-"www.mandrivaexpert.com."
-msgstr ""
-"Por ke vi profitu el Mandriva Online-servoj,\n"
-"ni tuj alŝutos vian konfiguradon.\n"
-"\n"
-"Tiu programo sendos la sekvaj informoj al Mandriva:\n"
-"\n"
-"1) la listo de pakaĵoj instalitaj,\n"
-"\n"
-"2) via hardvara konfigurado.\n"
-"\n"
-"Se tio funkcio ne plaĉas al vi, aŭ se vi ne volas tiun servon,\n"
-"bonvole musklaki 'Nuligu'. Se vi musklakas 'Sekva', vi permesas nin\n"
-"informi vin pri sekurecaj ĝisdatigoj kaj utilaj plibonigoj per personaj\n"
-"retmesaĝoj.\n"
-"Cetere, vi havos malpli kostaj servoj ĉe www.mandrivaexpert.com."
-
-#: ../mdkonline:180
-#, c-format
-msgid "Connection problem"
-msgstr "Konektproblemo"
-
-#: ../mdkonline:180
-#, c-format
-msgid "Problem occurs when uploading files, please try again"
-msgstr "Problemo okazis kiam alŝutante dosierojn, bonvole provu denove"
-
-#: ../mdkonline:187
-#, c-format
-msgid "Create a Mandriva Online Account"
-msgstr "Kreu Mandriva Online-konton"
-
-#. -PO: that is for things like "Mr", "Ms",...
-#: ../mdkonline:192
-#, fuzzy, c-format
-msgid "Greeting:"
-msgstr "Verda"
-
-#: ../mdkonline:193
-#, fuzzy, c-format
-msgid "First name:"
-msgstr "Poŝtejo:"
-
-#: ../mdkonline:194
-#, fuzzy, c-format
-msgid "Last name:"
-msgstr "Poŝtejo:"
-
-#: ../mdkonline:197
-#, c-format
-msgid "Confirm Password:"
-msgstr "Konfirmu pasvorton:"
-
-#: ../mdkonline:204
-#, c-format
-msgid ""
-"The passwords do not match\n"
-" Please try again\n"
-msgstr ""
-"La pasvortoj malsamas\n"
-" Bonvole provu denove\n"
-
-#: ../mdkonline:208
-#, fuzzy, c-format
-msgid "Please fill in each field"
-msgstr "Bonvole enigu ĉiuj informoj\n"
-
-#: ../mdkonline:212
-#, c-format
-msgid "Not a valid mail address!\n"
-msgstr "Nevalida retpoŝta adreso!\n"
-
-#: ../mdkonline:217
-#, c-format
-msgid "Creating account failed!"
-msgstr ""
-
-#: ../mdkonline:225
-#, c-format
-msgid ""
-"Mandriva Online Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
-msgstr ""
-"Mandriva Online konto sukcese kreita.\n"
-"Bonvole musklaku \"Sekva\" por enigi kaj alŝuti vian konfiguradon\n"
-
-#: ../mdkonline:229
-#, c-format
-msgid "Your upload was successful!"
-msgstr "La alŝuto sukcesis!"
-
-#: ../mdkonline:229
+#: ../mdkapplet:478
 #, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandriva Online."
-msgstr ""
-"Ekde nun, vi ricevos anoncojn pri sekureco kaj ĝisdatigojn\n"
-"danke al Mandriva Online."
+msgid "Online WebSite"
+msgstr "TTT-a retejo"
 
-#: ../mdkonline:229
+#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
+#: ../mdkapplet:483
 #, c-format
-msgid ""
-"Mandriva Online offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
+msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
-"Mandriva Online alportas al vi la aŭtomatigado de la ĝisdatigoj.\n"
-"Programo startos regule en via sistemo kaj atendos novaj ĝisdatigoj\n"
-
-#: ../mdkonline:238
-#, c-format
-msgid "Congratulations"
-msgstr "Gratulojn"
-
-#: ../mdkonline:238
-#, c-format
-msgid "Your Mandriva Online account has been successfully configured\n"
-msgstr "Via Mandriva Online-konto estis sukcese konfigurata\n"
 
-#: ../mdkonline:253
+#: ../mdkapplet:492
 #, c-format
-msgid "Configuration uploaded successfully"
-msgstr "Konfigurado sukcese alŝutita"
-
-#: ../mdkonline:254
-#, c-format
-msgid "Problem uploading configuration"
-msgstr "Problemo por alŝuti la konfiguradon"
+msgid "Always launch on startup"
+msgstr "Ĉiam startu post sistemstartado"
 
-#: ../mdkonline:256
+#: ../mdkapplet:494
 #, c-format
-msgid ""
-"Cannot connect to Mandriva Online website: wrong login/password or router/"
-"firewall bad settings"
-msgstr ""
-"Ne povas konekti al Mandriva Online-retejo: eraraj salutnomo/pasvorto "
-"aŭeraraj enkursigila/fajroŝirmila konfiguradoj"
+msgid "Quit"
+msgstr "Eliru"
 
 #: ../mdkonline.pm:207
 #, fuzzy, c-format
@@ -814,6 +357,11 @@ msgstr ""
 "\n"
 "uzado:\n"
 
+#: ../mdkupdate:73
+#, c-format
+msgid "  --help\t\t- print this help message.\n"
+msgstr "  --help\t\t- presu tiun helpmesaĝon.\n"
+
 #: ../mdkupdate:74
 #, c-format
 msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
@@ -841,11 +389,6 @@ msgid ""
 "file.\n"
 msgstr ""
 
-#: ../mdkupdate:118 ../mdkupdate:164
-#, c-format
-msgid "Warning"
-msgstr "Averto"
-
 #. -PO: here Live Install is currently *NOT* translated on the desktop, so it's better to keep as it:
 #: ../mdkupdate:120
 #, c-format
@@ -854,11 +397,21 @@ msgid ""
 "Install' wizard."
 msgstr ""
 
+#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
+#, c-format
+msgid "Please wait"
+msgstr "Bonvole atendu"
+
 #: ../mdkupdate:123 ../mdkupdate:174
 #, c-format
 msgid "Preparing..."
 msgstr "Mi preparas..."
 
+#: ../mdkupdate:141 ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
+#, c-format
+msgid "Error"
+msgstr "Eraro"
+
 #: ../mdkupdate:141
 #, c-format
 msgid ""
@@ -867,6 +420,11 @@ msgid ""
 "%s"
 msgstr ""
 
+#: ../mdkupdate:159 ../mdkupdate:188
+#, c-format
+msgid "An error occurred"
+msgstr "Eraro okazis"
+
 #: ../mdkupdate:164
 #, c-format
 msgid ""
@@ -891,6 +449,283 @@ msgstr "Instalanta pakaĵojn...\n"
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "Ne kapablas ĝisdatigi pakaĵojn el 'update_source medium'.\n"
 
+#, fuzzy
+#~ msgid "New bundles are available for your system"
+#~ msgstr "Novaj ĝisdatigojn estas haveblajn por via sistemo"
+
+#~ msgid "Service is not configured. Please click on \"Configure the service\""
+#~ msgstr ""
+#~ "Servo ne estas konfigurata. Bonvole musklaku \"Konfiguru la servon\""
+
+#~ msgid "Configure the service"
+#~ msgstr "Konfiguru la servon"
+
+#~ msgid "Check updates"
+#~ msgstr "Serĉu ĝisdatigojn"
+
+#~ msgid "Configure Now!"
+#~ msgstr "Konfiguru nun!"
+
+#~ msgid "Actions"
+#~ msgstr "Agoj"
+
+#~ msgid "Configure"
+#~ msgstr "Konfiguru"
+
+#~ msgid "See logs"
+#~ msgstr "Vidu logdosieron"
+
+#~ msgid "Status"
+#~ msgstr "Statuso"
+
+#~ msgid "Close"
+#~ msgstr "Fermu"
+
+#~ msgid "Network Connection: "
+#~ msgstr "Reta konekto: "
+
+#~ msgid "Up"
+#~ msgstr "Aktiva"
+
+#~ msgid "Down"
+#~ msgstr "Malaktiva"
+
+#~ msgid "Last check: "
+#~ msgstr "Lasta kontrolo: "
+
+#~ msgid "Machine name:"
+#~ msgstr "Maŝinnomo:"
+
+#~ msgid "Updates: "
+#~ msgstr "Ĝisdatigoj: "
+
+#~ msgid "Development release not supported by service"
+#~ msgstr "Servo ne funkcias kun disvolvaj versionoj"
+
+#~ msgid "Too old release not supported by service"
+#~ msgstr "Servo ne funkcias kun tro malnovaj versionoj"
+
+#~ msgid "Unknown state"
+#~ msgstr "Nekonata stato"
+
+#~ msgid "Online services disabled. Contact Mandriva Online site\n"
+#~ msgstr "Retaj servoj haltitaj. Kontaktu Mandriva Online-retejon\n"
+
+#~ msgid "Wrong Password.\n"
+#~ msgstr "Malĝusta pasvorto\n"
+
+#~ msgid "Wrong Action or host or login.\n"
+#~ msgstr "Erara Ago aŭ gasto aŭ konektinformoj.\n"
+
+#~ msgid ""
+#~ "Something is wrong with your network settings (check your route, firewall "
+#~ "or proxy settings)\n"
+#~ msgstr ""
+#~ "Io fuŝas en via reta konfigurado (kontrolu la retan kurson, fajroŝirmilon "
+#~ "aŭ la parametrojn de la prokura servilo)\n"
+
+#~ msgid "Response from Mandriva Online server\n"
+#~ msgstr "Respondo el Mandriva Online-servilo\n"
+
+#~ msgid "No check"
+#~ msgstr "Neniu kontrolo"
+
+#~ msgid "Checking config file: Not present\n"
+#~ msgstr "Kontrolante konfigurdosiero: Ne trovebla\n"
+
+#~ msgid "Logs"
+#~ msgstr "Logdosieroj"
+
+#~ msgid "Clear"
+#~ msgstr "Forviŝu"
+
+#~ msgid ""
+#~ "mdonline version %s\n"
+#~ "Copyright (C) %s Mandriva.\n"
+#~ "This is free software and may be redistributed under the terms of the GNU "
+#~ "GPL.\n"
+#~ "\n"
+#~ "usage:\n"
+#~ msgstr ""
+#~ "mdonline versio %s\n"
+#~ "Kopirajto © %s Mandriva.\n"
+#~ "Tio ĉi estas libera programaro kaj povas esti pludisdonata sub la termoj "
+#~ "de GNU GPL.\n"
+#~ "\n"
+#~ "uzado:\n"
+
+#~ msgid "Mandriva Online"
+#~ msgstr "Mandriva Online"
+
+#~ msgid "I already have an account"
+#~ msgstr "Mi jam havas konton"
+
+#~ msgid "I want to subscribe"
+#~ msgstr "Mi volas malfermi konton"
+
+#~ msgid "Mr."
+#~ msgstr "s-ro"
+
+#~ msgid "Mrs."
+#~ msgstr "s-ino"
+
+#~ msgid "Ms."
+#~ msgstr "s-ino"
+
+#~ msgid "Reading configuration\n"
+#~ msgstr "Legas konfiguradon\n"
+
+#~ msgid ""
+#~ "This assistant will help you to upload your configuration\n"
+#~ "(packages, hardware configuration) to a centralized database in\n"
+#~ "order to keep you informed about security updates and useful upgrades.\n"
+#~ msgstr ""
+#~ "Tiu helpilo alŝutos vian konfiguradon (pakaĵoj, sistem-konfigurado)\n"
+#~ "al centrala datumbazo, por ke vi estu informita pri sekurecaj\n"
+#~ "ĝisdatigojn kaj utilaj plibonigojn.\n"
+
+#~ msgid "Account creation or authentication"
+#~ msgstr "Kontokreado aŭ identiĝado"
+
+#~ msgid "Enter your Mandriva Online login, password and machine name:"
+#~ msgstr "Enigu vian Mandriva Online salutnomon, pasvorton kaj maŝinnomon:"
+
+#, fuzzy
+#~ msgid "Email address:"
+#~ msgstr "IP-adreso"
+
+#~ msgid "Country"
+#~ msgstr "Lando"
+
+#~ msgid "Password:"
+#~ msgstr "Pasvorto:"
+
+#, fuzzy
+#~ msgid "Machine description:"
+#~ msgstr "Maŝinnomo:"
+
+#, fuzzy
+#~ msgid "Machine name must be 1 to 40 alphanumerical characters"
+#~ msgstr "Surmetingoj devas enteni nur alfanumerajn signojn"
+
+#~ msgid "Connecting to Mandriva Online website..."
+#~ msgstr "Konektiĝas al Mandriva Online-retejo..."
+
+#~ msgid ""
+#~ "In order to benefit from Mandriva Online services,\n"
+#~ "we are about to upload your configuration.\n"
+#~ "\n"
+#~ "The Wizard will now send the following information to Mandriva:\n"
+#~ "\n"
+#~ "1) the list of packages you have installed on your system,\n"
+#~ "\n"
+#~ "2) your hardware configuration.\n"
+#~ "\n"
+#~ "If you feel uncomfortable by that idea, or do not want to benefit from "
+#~ "this service,\n"
+#~ "please press 'Cancel'. By pressing 'Next', you allow us to keep you "
+#~ "informed\n"
+#~ "about security updates and useful upgrades via personalized email "
+#~ "alerts.\n"
+#~ "Furthermore, you benefit from discounted paid support services on\n"
+#~ "www.mandrivaexpert.com."
+#~ msgstr ""
+#~ "Por ke vi profitu el Mandriva Online-servoj,\n"
+#~ "ni tuj alŝutos vian konfiguradon.\n"
+#~ "\n"
+#~ "Tiu programo sendos la sekvaj informoj al Mandriva:\n"
+#~ "\n"
+#~ "1) la listo de pakaĵoj instalitaj,\n"
+#~ "\n"
+#~ "2) via hardvara konfigurado.\n"
+#~ "\n"
+#~ "Se tio funkcio ne plaĉas al vi, aŭ se vi ne volas tiun servon,\n"
+#~ "bonvole musklaki 'Nuligu'. Se vi musklakas 'Sekva', vi permesas nin\n"
+#~ "informi vin pri sekurecaj ĝisdatigoj kaj utilaj plibonigoj per personaj\n"
+#~ "retmesaĝoj.\n"
+#~ "Cetere, vi havos malpli kostaj servoj ĉe www.mandrivaexpert.com."
+
+#~ msgid "Connection problem"
+#~ msgstr "Konektproblemo"
+
+#~ msgid "Problem occurs when uploading files, please try again"
+#~ msgstr "Problemo okazis kiam alŝutante dosierojn, bonvole provu denove"
+
+#~ msgid "Create a Mandriva Online Account"
+#~ msgstr "Kreu Mandriva Online-konton"
+
+#, fuzzy
+#~ msgid "Greeting:"
+#~ msgstr "Verda"
+
+#, fuzzy
+#~ msgid "First name:"
+#~ msgstr "Poŝtejo:"
+
+#, fuzzy
+#~ msgid "Last name:"
+#~ msgstr "Poŝtejo:"
+
+#~ msgid "Confirm Password:"
+#~ msgstr "Konfirmu pasvorton:"
+
+#~ msgid ""
+#~ "The passwords do not match\n"
+#~ " Please try again\n"
+#~ msgstr ""
+#~ "La pasvortoj malsamas\n"
+#~ " Bonvole provu denove\n"
+
+#, fuzzy
+#~ msgid "Please fill in each field"
+#~ msgstr "Bonvole enigu ĉiuj informoj\n"
+
+#~ msgid "Not a valid mail address!\n"
+#~ msgstr "Nevalida retpoŝta adreso!\n"
+
+#~ msgid ""
+#~ "Mandriva Online Account successfully created.\n"
+#~ "Please click \"Next\" to authenticate and upload your configuration\n"
+#~ msgstr ""
+#~ "Mandriva Online konto sukcese kreita.\n"
+#~ "Bonvole musklaku \"Sekva\" por enigi kaj alŝuti vian konfiguradon\n"
+
+#~ msgid "Your upload was successful!"
+#~ msgstr "La alŝuto sukcesis!"
+
+#~ msgid ""
+#~ "From now you will receive on security and updates \n"
+#~ "announcements thanks to Mandriva Online."
+#~ msgstr ""
+#~ "Ekde nun, vi ricevos anoncojn pri sekureco kaj ĝisdatigojn\n"
+#~ "danke al Mandriva Online."
+
+#~ msgid ""
+#~ "Mandriva Online offers you the ability to automate the updates.\n"
+#~ "A program will run regulary in your system waiting for new updates\n"
+#~ msgstr ""
+#~ "Mandriva Online alportas al vi la aŭtomatigado de la ĝisdatigoj.\n"
+#~ "Programo startos regule en via sistemo kaj atendos novaj ĝisdatigoj\n"
+
+#~ msgid "Congratulations"
+#~ msgstr "Gratulojn"
+
+#~ msgid "Your Mandriva Online account has been successfully configured\n"
+#~ msgstr "Via Mandriva Online-konto estis sukcese konfigurata\n"
+
+#~ msgid "Configuration uploaded successfully"
+#~ msgstr "Konfigurado sukcese alŝutita"
+
+#~ msgid "Problem uploading configuration"
+#~ msgstr "Problemo por alŝuti la konfiguradon"
+
+#~ msgid ""
+#~ "Cannot connect to Mandriva Online website: wrong login/password or router/"
+#~ "firewall bad settings"
+#~ msgstr ""
+#~ "Ne povas konekti al Mandriva Online-retejo: eraraj salutnomo/pasvorto "
+#~ "aŭeraraj enkursigila/fajroŝirmila konfiguradoj"
+
 #~ msgid "  --applet\t\t- launch Mandriva Update.\n"
 #~ msgstr "  --applet\t\t- startas Mandriva Update.\n"
 
diff --git a/po/es.po b/po/es.po
index c17f840d..c0d87fcd 100644
--- a/po/es.po
+++ b/po/es.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: es\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-09 16:26+0200\n"
+"POT-Creation-Date: 2008-02-21 18:21+0100\n"
 "PO-Revision-Date: 2007-10-02 14:42-0300\n"
 "Last-Translator: Fabián Mandelbaum <fmandelbaum@gmail.com>\n"
 "Language-Team: Español <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:94
+#: ../mdkapplet:88
 #, c-format
 msgid "Will check updates at %s"
 msgstr "Verificar actualizaciones a las %s"
 
-#: ../mdkapplet:103
+#: ../mdkapplet:97
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "Su sistema está al día"
 
-#: ../mdkapplet:109
+#: ../mdkapplet:103
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -44,54 +44,45 @@ msgstr ""
 "Problem de configuración del servicio. Por favor verifique sus archivos de "
 "bitácora y envie un correo a support@mandrivaonline.com"
 
-#: ../mdkapplet:115
+#: ../mdkapplet:110
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "Por favor espere, encontrando los paquetes disponibles..."
 
-#: ../mdkapplet:121
+#: ../mdkapplet:116
 #, c-format
 msgid "New updates are available for your system"
 msgstr "Hay nuevas actualizaciones disponibles para su sistema"
 
-#: ../mdkapplet:127
-#, c-format
-msgid "New bundles are available for your system"
-msgstr "Hay nuevos conjuntos de paquetes disponibles para su sistema"
-
-#: ../mdkapplet:133
-#, c-format
-msgid "Service is not configured. Please click on \"Configure the service\""
-msgstr "El servicio no está configurado. Haga clic sobre \"Configurar el servicio\""
-
-#: ../mdkapplet:139
+#: ../mdkapplet:122
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "La red no está activa. Configurela por favor"
 
-#: ../mdkapplet:145
+#: ../mdkapplet:128
 #, 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:151 ../mdkapplet:182
+#: ../mdkapplet:134 ../mdkapplet:165
 #, c-format
 msgid "urpmi database locked"
 msgstr "base de datos de urpmi bloqueada"
 
-#: ../mdkapplet:157
+#: ../mdkapplet:140
 #, 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:163
+#: ../mdkapplet:146
 #, c-format
-msgid "No medium found. You must add some media through 'Software Media Manager'."
+msgid ""
+"No medium found. You must add some media through 'Software Media Manager'."
 msgstr ""
 "No se encontró ningún soporte. Debe añadir uno con el \"Administrador de "
 "soportes de software\"."
 
-#: ../mdkapplet:169
+#: ../mdkapplet:152
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -104,592 +95,137 @@ msgstr ""
 "Ya tiene configurado al menos un soporte de actualizaciones, pero\n"
 "todos están deshabilitados en este momento. Debería ejecutar el\n"
 "Administrador de Soportes de Software para habilitar al menos uno\n"
-"(márquelo en la columna "
-"\"%s\"\n"
+"(márquelo en la columna \"%s\"\n"
 ").\n"
 "\n"
 "Luego, vuelva a iniciar \"%s\"."
 
-#: ../mdkapplet:174
+#: ../mdkapplet:157
 #, c-format
 msgid "Enabled"
 msgstr "¿Habilitada"
 
-#: ../mdkapplet:187
+#: ../mdkapplet:170
 #, c-format
 msgid "Error updating media"
 msgstr "Error actualizando el soporte"
 
-#: ../mdkapplet:202
+#: ../mdkapplet:185
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr "Verificando... Están disponibles actualizaciones\n"
 
-#: ../mdkapplet:207
+#: ../mdkapplet:190
 #, c-format
 msgid "Packages are up to date"
 msgstr "Los paquetes están actualizados"
 
-#: ../mdkapplet:212
+#: ../mdkapplet:195
 #, c-format
 msgid "Failed to open urpmi database"
 msgstr "Falló la apertura de la base de datos urpmi"
 
-#: ../mdkapplet:217 ../mdkapplet:324
+#: ../mdkapplet:200
 #, c-format
 msgid "Install updates"
 msgstr "Instalar actualizaciones"
 
-#: ../mdkapplet:218
-#, c-format
-msgid "Configure the service"
-msgstr "Configurar el servicio"
-
-#: ../mdkapplet:219
+#: ../mdkapplet:201
 #, c-format
 msgid "Check Updates"
 msgstr "Verificar actualizaciones"
 
-#: ../mdkapplet:220 ../mdkapplet:327 ../mdkonline:114 ../mdkonline:155
-#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
-#, c-format
-msgid "Please wait"
-msgstr "Espere, por favor"
-
-#: ../mdkapplet:220 ../mdkapplet:326 ../mdkapplet:327
-#, c-format
-msgid "Check updates"
-msgstr "Verificar actualizaciones"
-
-#: ../mdkapplet:223 ../mdkapplet:648
-#, c-format
-msgid "Online WebSite"
-msgstr "Sitio web en línea"
-
-#: ../mdkapplet:224
+#: ../mdkapplet:202
 #, c-format
 msgid "Configure Network"
 msgstr "Configurar red"
 
-#: ../mdkapplet:225
-#, c-format
-msgid "Configure Now!"
-msgstr "¡Configurar ahora!"
-
-#: ../mdkapplet:313 ../mdkapplet:392
-#, c-format
-msgid "Mandriva Linux Updates Applet"
-msgstr "Applet Mandriva Linux Update"
-
-#: ../mdkapplet:322
-#, c-format
-msgid "Actions"
-msgstr "Acciones"
-
-#: ../mdkapplet:325
-#, c-format
-msgid "Configure"
-msgstr "Configurar"
-
-#: ../mdkapplet:329
-#, c-format
-msgid "See logs"
-msgstr "Ver registros"
-
-#: ../mdkapplet:332
-#, c-format
-msgid "Status"
-msgstr "Estado"
-
-#: ../mdkapplet:336 ../mdkapplet:597
-#, c-format
-msgid "Close"
-msgstr "Cerrar"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Network Connection: "
-msgstr "Conexión de red: "
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Up"
-msgstr "Activa"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Down"
-msgstr "Inactiva"
-
-#: ../mdkapplet:366
-#, c-format
-msgid "Last check: "
-msgstr "Última verificación: "
-
-#: ../mdkapplet:367 ../mdkonline:145
-#, c-format
-msgid "Machine name:"
-msgstr "Nombre de máquina:"
-
-#: ../mdkapplet:368
-#, c-format
-msgid "Updates: "
-msgstr "Actualizaciones: "
-
-#: ../mdkapplet:372
+#: ../mdkapplet:283
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Lanzando drakconnect\n"
 
-#: ../mdkapplet:375
+#: ../mdkapplet:286
 #, c-format
 msgid "Mandriva Online seems to be reinstalled, reloading applet ...."
-msgstr "Mandriva Online parece haber sido reinstalado, volviendo a cargar applet..."
+msgstr ""
+"Mandriva Online parece haber sido reinstalado, volviendo a cargar applet..."
 
-#: ../mdkapplet:383
+#: ../mdkapplet:294
 #, c-format
 msgid "Launching MandrivaUpdate\n"
 msgstr "Lanzando MandrivaUpdate\n"
 
-#: ../mdkapplet:398
+#: ../mdkapplet:303
+#, c-format
+msgid "Mandriva Linux Updates Applet"
+msgstr "Applet Mandriva Linux Update"
+
+#: ../mdkapplet:308
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Computando actualizaciones nuevas...\n"
 
-#: ../mdkapplet:399
+#: ../mdkapplet:309
 #, c-format
 msgid "Connecting to"
 msgstr "Conectando con"
 
-#: ../mdkapplet:467 ../mdkupdate:159 ../mdkupdate:188
-#, c-format
-msgid "An error occurred"
-msgstr "Ocurrió un error"
-
-#: ../mdkapplet:475
-#, c-format
-msgid "Development release not supported by service"
-msgstr "Versión de desarrollo no soportada por el servicio"
-
-#: ../mdkapplet:476
-#, c-format
-msgid "Too old release not supported by service"
-msgstr "Versión muy antigua no soportada por el servicio"
-
-#: ../mdkapplet:477
-#, c-format
-msgid "Unknown state"
-msgstr "Estado desconocido"
-
-#: ../mdkapplet:478
-#, c-format
-msgid "Online services disabled. Contact Mandriva Online site\n"
-msgstr "Servicios en línea deshabilitados. Contacte al sitio Mandriva Online\n"
-
-#: ../mdkapplet:479
-#, c-format
-msgid "Wrong Password.\n"
-msgstr "Contraseña incorrecta\n"
-
-#: ../mdkapplet:480
-#, c-format
-msgid "Wrong Action or host or login.\n"
-msgstr "Acción, host o login incorrectos.\n"
-
-#: ../mdkapplet:481
-#, c-format
-msgid ""
-"Something is wrong with your network settings (check your route, firewall or "
-"proxy settings)\n"
-msgstr ""
-"Hay algún problema con la configuración de su red (verifique los ajustes de "
-"su ruta, cortafuegos o proxy)\n"
-
-#: ../mdkapplet:483
-#, c-format
-msgid ""
-"Problem occured while connecting to the server, please contact the support "
-"team"
-msgstr ""
-"Un problema ocurrió durante la conexión con el servidor, por favor, póngase "
-"en contacto con el equipo de apoyo"
-
-#: ../mdkapplet:487
-#, c-format
-msgid "Response from Mandriva Online server\n"
-msgstr "Respuesta desde el servidor de Mandriva Online\n"
-
-#: ../mdkapplet:490
+#: ../mdkapplet:386
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "El sistema está al día\n"
 
-#: ../mdkapplet:527
-#, c-format
-msgid "No check"
-msgstr "Sin verificación"
-
-#: ../mdkapplet:541
-#, c-format
-msgid "Checking config file: Not present\n"
-msgstr "Verificando archivo de configuración: No presente\n"
-
-#: ../mdkapplet:544
+#: ../mdkapplet:415
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Verificando red: parece estar deshabilitada\n"
 
-#: ../mdkapplet:587
-#, c-format
-msgid "Logs"
-msgstr "Registros"
-
-#: ../mdkapplet:603
+#: ../mdkapplet:457 ../mdkupdate:118 ../mdkupdate:164
 #, c-format
-msgid "Clear"
-msgstr "Limpiar"
+msgid "Warning"
+msgstr "Advertencia"
 
-#: ../mdkapplet:629
+#: ../mdkapplet:468
 #, c-format
 msgid "About..."
 msgstr "Acerca..."
 
-#: ../mdkapplet:631
+#: ../mdkapplet:472
 #, c-format
 msgid "Mandriva Online %s"
 msgstr "Mandriva Online %s"
 
-#: ../mdkapplet:635
+#: ../mdkapplet:473
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Copyright © %s por Mandriva"
 
-#: ../mdkapplet:647
+#: ../mdkapplet:476
 #, c-format
 msgid "Mandriva Online gives access to Mandriva web services."
 msgstr "Mandiva Online da acceso a los servicios web de Mandriva."
 
-#: ../mdkapplet:655
-#, c-format
-msgid "Always launch on startup"
-msgstr "Lanzar siempre al arrancar"
-
-#: ../mdkapplet:657
-#, c-format
-msgid "Quit"
-msgstr "Salir"
-
-#: ../mdkonline:58
-#, c-format
-msgid ""
-"mdonline version %s\n"
-"Copyright (C) %s Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"mdonline versión %s\n"
-"Copyright (C) %s Mandriva.\n"
-"Este es software libre y puede volver a ser distribuido bajo los términos de "
-"la GNU GPL.\n"
-"\n"
-"uso:\n"
-
-#: ../mdkonline:63 ../mdkupdate:73
-#, c-format
-msgid "  --help\t\t- print this help message.\n"
-msgstr "  --help\t\t- mostrar este mensaje de ayuda.\n"
-
-#: ../mdkonline:64
-#, c-format
-msgid "  --box=\t\t\t- hostname.\n"
-msgstr "  --box=\t\t\t- nombre de la máquina.\n"
-
-#: ../mdkonline:65
-#, c-format
-msgid "  --country\t\t\t- name of country of the user. \n"
-msgstr "  --country\t\t\t- nombre del pays del usuario.\n"
-
-#: ../mdkonline:66
-#, c-format
-msgid "  --interactive\t\t- use the interactive mode.\n"
-msgstr "  --interactive\t\t- usar el modo interactivo.\n"
-
-#: ../mdkonline:67
-#, c-format
-msgid "  --nointeractive\t- use the non-interactive mode.\n"
-msgstr "  --nointeractive\t- usar el modo no interactivo.\n"
-
-#: ../mdkonline:68
-#, c-format
-msgid "  --login=\t\t     - login name of the user.\n"
-msgstr "  --login=\t\t     - nombre de login del usuario.\n"
-
-#: ../mdkonline:69
-#, c-format
-msgid "  --pass=\t\t\t- password  of the user.\n"
-msgstr "  --pass=\t\t\t- contraseña del usuario.\n"
-
-#: ../mdkonline:87 ../mdkonline:120
-#, c-format
-msgid "Mandriva Online"
-msgstr "Mandriva Online"
-
-#: ../mdkonline:90
-#, c-format
-msgid "I already have an account"
-msgstr "Ya tengo una cuenta"
-
-#: ../mdkonline:91
-#, c-format
-msgid "I want to subscribe"
-msgstr "Deseo suscribirme"
-
-#: ../mdkonline:96
-#, c-format
-msgid "Mr."
-msgstr "Sr"
-
-#: ../mdkonline:96
-#, c-format
-msgid "Mrs."
-msgstr "Sra"
-
-#: ../mdkonline:96
-#, c-format
-msgid "Ms."
-msgstr "Srta"
-
-#: ../mdkonline:114
-#, c-format
-msgid "Reading configuration\n"
-msgstr "Leyendo la configuración\n"
-
-#: ../mdkonline:123
-#, c-format
-msgid ""
-"This assistant will help you to upload your configuration\n"
-"(packages, hardware configuration) to a centralized database in\n"
-"order to keep you informed about security updates and useful upgrades.\n"
-msgstr ""
-"Este asistente le ayudará a subir su configuración\n"
-"(paquetes, configuración del hardware) a una base de datos centralizada\n"
-"para mantenerle informado de actualizaciones de seguridad y mejoras útiles.\n"
-
-#: ../mdkonline:131
-#, c-format
-msgid "Account creation or authentication"
-msgstr "Creación de cuentas o autentificación"
-
-#: ../mdkonline:136
-#, c-format
-msgid "Enter your Mandriva Online login, password and machine name:"
-msgstr ""
-"Introduzca su nombre de usuario, contraseña y nombre de máquina de Mandriva "
-"Online:"
-
-#: ../mdkonline:142 ../mdkonline:195
-#, c-format
-msgid "Email address:"
-msgstr "Dirección de correo:"
-
-#: ../mdkonline:143
-#, c-format
-msgid "Country"
-msgstr "País"
-
-#: ../mdkonline:144 ../mdkonline:196
-#, c-format
-msgid "Password:"
-msgstr "Contraseña:"
-
-#: ../mdkonline:146
-#, c-format
-msgid "Machine description:"
-msgstr "Descripción de la máquina:"
-
-#: ../mdkonline:147
-#, c-format
-msgid "(Ex: My Home Office's Computer)"
-msgstr "(Ej: Ordenador de mi despacho)"
-
-#: ../mdkonline:152 ../mdkonline:159 ../mdkonline:180 ../mdkonline:204
-#: ../mdkonline:208 ../mdkonline:212 ../mdkonline:217 ../mdkupdate:141
-#: ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
-#, c-format
-msgid "Error"
-msgstr "Error"
-
-#: ../mdkonline:152
-#, c-format
-msgid "Machine name must be 1 to 40 alphanumerical characters"
-msgstr "El nombre de máquina puede sólo contener de 1 a 40 caracteres alfanuméricos"
-
-#: ../mdkonline:155
-#, c-format
-msgid "Connecting to Mandriva Online website..."
-msgstr "Conectando al sitio web Mandriva Online..."
-
-#: ../mdkonline:167
-#, c-format
-msgid ""
-"In order to benefit from Mandriva Online services,\n"
-"we are about to upload your configuration.\n"
-"\n"
-"The Wizard will now send the following information to Mandriva:\n"
-"\n"
-"1) the list of packages you have installed on your system,\n"
-"\n"
-"2) your hardware configuration.\n"
-"\n"
-"If you feel uncomfortable by that idea, or do not want to benefit from this "
-"service,\n"
-"please press 'Cancel'. By pressing 'Next', you allow us to keep you "
-"informed\n"
-"about security updates and useful upgrades via personalized email alerts.\n"
-"Furthermore, you benefit from discounted paid support services on\n"
-"www.mandrivaexpert.com."
-msgstr ""
-"Parar beneficiarse de los servicios de Mandriva Online,\n"
-"vamos a transferir su configuración.\n"
-"\n"
-"El asistente enviará ahora la siguiente información a Mandriva:\n"
-"\n"
-"1) los paquetes que tiene instalados en su sistema.\n"
-"\n"
-"2) la configuración de su hardware.\n"
-"\n"
-"Si no está cómodo con esta idea o no quiere beneficiarse de este\n"
-"servicio, pulse 'Cancelar'. Si presiona 'Siguiente', nos permitirá\n"
-"mantenerle informado sobre actualizaciones de seguridad y mejoras\n"
-"útiles por medio de alertas de correo.\n"
-"Además, se beneficia de descuentos en los servicios de soporte pagados\n"
-"en www.mandrivaexpert.com."
-
-#: ../mdkonline:180
-#, c-format
-msgid "Connection problem"
-msgstr "Problema de conexión"
-
-#: ../mdkonline:180
-#, c-format
-msgid "Problem occurs when uploading files, please try again"
-msgstr "Ocurrieron problemas al enviar archivos, por favor intentelo de nuevo"
-
-#: ../mdkonline:187
-#, c-format
-msgid "Create a Mandriva Online Account"
-msgstr "Crear una cuenta en Mandriva Online"
-
-#. -PO: that is for things like "Mr", "Ms",...
-#: ../mdkonline:192
-#, c-format
-msgid "Greeting:"
-msgstr "Tratamiento:"
-
-#: ../mdkonline:193
-#, c-format
-msgid "First name:"
-msgstr "Nombre:"
-
-#: ../mdkonline:194
-#, c-format
-msgid "Last name:"
-msgstr "Apellido:"
-
-#: ../mdkonline:197
-#, c-format
-msgid "Confirm Password:"
-msgstr "Confirmar contraseña:"
-
-#: ../mdkonline:204
-#, c-format
-msgid ""
-"The passwords do not match\n"
-" Please try again\n"
-msgstr ""
-"Las contraseñas no coinciden\n"
-" Por favor, intente de nuevo\n"
-
-#: ../mdkonline:208
-#, c-format
-msgid "Please fill in each field"
-msgstr "Por favor, rellene todos los campos"
-
-#: ../mdkonline:212
-#, c-format
-msgid "Not a valid mail address!\n"
-msgstr "¡No es una dirección de correo válida!\n"
-
-#: ../mdkonline:217
-#, c-format
-msgid "Creating account failed!"
-msgstr "¡Falló la cración de la cuenta!"
-
-#: ../mdkonline:225
-#, c-format
-msgid ""
-"Mandriva Online Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
-msgstr ""
-"Cuenta de Mandriva Online creada con éxito.\n"
-"Por favor, pulse \"Siguiente\" para autentificarse y enviar su "
-"configuración\n"
-
-#: ../mdkonline:229
-#, c-format
-msgid "Your upload was successful!"
-msgstr "Actualización exitosa"
-
-#: ../mdkonline:229
+#: ../mdkapplet:478
 #, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandriva Online."
-msgstr ""
-"Desde ahora, recibirá anuncions de seguridad\n"
-"y actualizaciones gracias a Mandriva Online."
+msgid "Online WebSite"
+msgstr "Sitio web en línea"
 
-#: ../mdkonline:229
+#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
+#: ../mdkapplet:483
 #, c-format
-msgid ""
-"Mandriva Online offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
+msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
-"Mandriva Online le ofrece la posibilidad de automatizar las "
-"actualizaciones.\n"
-"Se ejecutará regularmente un programa  en su sistema a la espera de nuevas "
-"actualizaciones\n"
-
-#: ../mdkonline:238
-#, c-format
-msgid "Congratulations"
-msgstr "Felicidades"
-
-#: ../mdkonline:238
-#, c-format
-msgid "Your Mandriva Online account has been successfully configured\n"
-msgstr "Su cuenta de Mandriva Online se ha configurado con éxito\n"
-
-#: ../mdkonline:253
-#, c-format
-msgid "Configuration uploaded successfully"
-msgstr "Configuración enviada con éxito"
 
-#: ../mdkonline:254
+#: ../mdkapplet:492
 #, c-format
-msgid "Problem uploading configuration"
-msgstr "Problema enviando la configuración"
+msgid "Always launch on startup"
+msgstr "Lanzar siempre al arrancar"
 
-#: ../mdkonline:256
+#: ../mdkapplet:494
 #, c-format
-msgid ""
-"Cannot connect to Mandriva Online website: wrong login/password or router/"
-"firewall bad settings"
-msgstr ""
-"No se pudo conectar con el sitio web de mandrivaonline: nombre de usuario/"
-"contraseña incorrectos o configuración errónea del router/firewall"
+msgid "Quit"
+msgstr "Salir"
 
 #: ../mdkonline.pm:207
 #, c-format
@@ -838,6 +374,11 @@ msgstr ""
 "\n"
 "uso:\n"
 
+#: ../mdkupdate:73
+#, c-format
+msgid "  --help\t\t- print this help message.\n"
+msgstr "  --help\t\t- mostrar este mensaje de ayuda.\n"
+
 #: ../mdkupdate:74
 #, c-format
 msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
@@ -867,11 +408,6 @@ msgstr ""
 "  --bundle archivo.bundle\t- interpretar e instalar paquetes a partir de un "
 "archivo .bundle de metainformaciones.\n"
 
-#: ../mdkupdate:118 ../mdkupdate:164
-#, c-format
-msgid "Warning"
-msgstr "Advertencia"
-
 #. -PO: here Live Install is currently *NOT* translated on the desktop, so it's better to keep as it:
 #: ../mdkupdate:120
 #, c-format
@@ -882,11 +418,21 @@ msgstr ""
 "Necesita primero instalar el sistema en su disco duro con el asistente «Live "
 "Install» (instalación en vivo)."
 
+#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
+#, c-format
+msgid "Please wait"
+msgstr "Espere, por favor"
+
 #: ../mdkupdate:123 ../mdkupdate:174
 #, c-format
 msgid "Preparing..."
 msgstr "Preparando..."
 
+#: ../mdkupdate:141 ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
+#, c-format
+msgid "Error"
+msgstr "Error"
+
 #: ../mdkupdate:141
 #, c-format
 msgid ""
@@ -898,6 +444,11 @@ msgstr ""
 "\n"
 "%s"
 
+#: ../mdkupdate:159 ../mdkupdate:188
+#, c-format
+msgid "An error occurred"
+msgstr "Ocurrió un error"
+
 #: ../mdkupdate:164
 #, c-format
 msgid ""
@@ -926,3 +477,314 @@ msgstr "Instalando paquetes...\n"
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "Incapaz de actualizar paquetes desde el soporte update_source.\n"
 
+#~ msgid "New bundles are available for your system"
+#~ msgstr "Hay nuevos conjuntos de paquetes disponibles para su sistema"
+
+#~ msgid "Service is not configured. Please click on \"Configure the service\""
+#~ msgstr ""
+#~ "El servicio no está configurado. Haga clic sobre \"Configurar el servicio"
+#~ "\""
+
+#~ msgid "Configure the service"
+#~ msgstr "Configurar el servicio"
+
+#~ msgid "Check updates"
+#~ msgstr "Verificar actualizaciones"
+
+#~ msgid "Configure Now!"
+#~ msgstr "¡Configurar ahora!"
+
+#~ msgid "Actions"
+#~ msgstr "Acciones"
+
+#~ msgid "Configure"
+#~ msgstr "Configurar"
+
+#~ msgid "See logs"
+#~ msgstr "Ver registros"
+
+#~ msgid "Status"
+#~ msgstr "Estado"
+
+#~ msgid "Close"
+#~ msgstr "Cerrar"
+
+#~ msgid "Network Connection: "
+#~ msgstr "Conexión de red: "
+
+#~ msgid "Up"
+#~ msgstr "Activa"
+
+#~ msgid "Down"
+#~ msgstr "Inactiva"
+
+#~ msgid "Last check: "
+#~ msgstr "Última verificación: "
+
+#~ msgid "Machine name:"
+#~ msgstr "Nombre de máquina:"
+
+#~ msgid "Updates: "
+#~ msgstr "Actualizaciones: "
+
+#~ msgid "Development release not supported by service"
+#~ msgstr "Versión de desarrollo no soportada por el servicio"
+
+#~ msgid "Too old release not supported by service"
+#~ msgstr "Versión muy antigua no soportada por el servicio"
+
+#~ msgid "Unknown state"
+#~ msgstr "Estado desconocido"
+
+#~ msgid "Online services disabled. Contact Mandriva Online site\n"
+#~ msgstr ""
+#~ "Servicios en línea deshabilitados. Contacte al sitio Mandriva Online\n"
+
+#~ msgid "Wrong Password.\n"
+#~ msgstr "Contraseña incorrecta\n"
+
+#~ msgid "Wrong Action or host or login.\n"
+#~ msgstr "Acción, host o login incorrectos.\n"
+
+#~ msgid ""
+#~ "Something is wrong with your network settings (check your route, firewall "
+#~ "or proxy settings)\n"
+#~ msgstr ""
+#~ "Hay algún problema con la configuración de su red (verifique los ajustes "
+#~ "de su ruta, cortafuegos o proxy)\n"
+
+#~ msgid ""
+#~ "Problem occured while connecting to the server, please contact the "
+#~ "support team"
+#~ msgstr ""
+#~ "Un problema ocurrió durante la conexión con el servidor, por favor, "
+#~ "póngase en contacto con el equipo de apoyo"
+
+#~ msgid "Response from Mandriva Online server\n"
+#~ msgstr "Respuesta desde el servidor de Mandriva Online\n"
+
+#~ msgid "No check"
+#~ msgstr "Sin verificación"
+
+#~ msgid "Checking config file: Not present\n"
+#~ msgstr "Verificando archivo de configuración: No presente\n"
+
+#~ msgid "Logs"
+#~ msgstr "Registros"
+
+#~ msgid "Clear"
+#~ msgstr "Limpiar"
+
+#~ msgid ""
+#~ "mdonline version %s\n"
+#~ "Copyright (C) %s Mandriva.\n"
+#~ "This is free software and may be redistributed under the terms of the GNU "
+#~ "GPL.\n"
+#~ "\n"
+#~ "usage:\n"
+#~ msgstr ""
+#~ "mdonline versión %s\n"
+#~ "Copyright (C) %s Mandriva.\n"
+#~ "Este es software libre y puede volver a ser distribuido bajo los términos "
+#~ "de la GNU GPL.\n"
+#~ "\n"
+#~ "uso:\n"
+
+#~ msgid "  --box=\t\t\t- hostname.\n"
+#~ msgstr "  --box=\t\t\t- nombre de la máquina.\n"
+
+#~ msgid "  --country\t\t\t- name of country of the user. \n"
+#~ msgstr "  --country\t\t\t- nombre del pays del usuario.\n"
+
+#~ msgid "  --interactive\t\t- use the interactive mode.\n"
+#~ msgstr "  --interactive\t\t- usar el modo interactivo.\n"
+
+#~ msgid "  --nointeractive\t- use the non-interactive mode.\n"
+#~ msgstr "  --nointeractive\t- usar el modo no interactivo.\n"
+
+#~ msgid "  --login=\t\t     - login name of the user.\n"
+#~ msgstr "  --login=\t\t     - nombre de login del usuario.\n"
+
+#~ msgid "  --pass=\t\t\t- password  of the user.\n"
+#~ msgstr "  --pass=\t\t\t- contraseña del usuario.\n"
+
+#~ msgid "Mandriva Online"
+#~ msgstr "Mandriva Online"
+
+#~ msgid "I already have an account"
+#~ msgstr "Ya tengo una cuenta"
+
+#~ msgid "I want to subscribe"
+#~ msgstr "Deseo suscribirme"
+
+#~ msgid "Mr."
+#~ msgstr "Sr"
+
+#~ msgid "Mrs."
+#~ msgstr "Sra"
+
+#~ msgid "Ms."
+#~ msgstr "Srta"
+
+#~ msgid "Reading configuration\n"
+#~ msgstr "Leyendo la configuración\n"
+
+#~ msgid ""
+#~ "This assistant will help you to upload your configuration\n"
+#~ "(packages, hardware configuration) to a centralized database in\n"
+#~ "order to keep you informed about security updates and useful upgrades.\n"
+#~ msgstr ""
+#~ "Este asistente le ayudará a subir su configuración\n"
+#~ "(paquetes, configuración del hardware) a una base de datos centralizada\n"
+#~ "para mantenerle informado de actualizaciones de seguridad y mejoras "
+#~ "útiles.\n"
+
+#~ msgid "Account creation or authentication"
+#~ msgstr "Creación de cuentas o autentificación"
+
+#~ msgid "Enter your Mandriva Online login, password and machine name:"
+#~ msgstr ""
+#~ "Introduzca su nombre de usuario, contraseña y nombre de máquina de "
+#~ "Mandriva Online:"
+
+#~ msgid "Email address:"
+#~ msgstr "Dirección de correo:"
+
+#~ msgid "Country"
+#~ msgstr "País"
+
+#~ msgid "Password:"
+#~ msgstr "Contraseña:"
+
+#~ msgid "Machine description:"
+#~ msgstr "Descripción de la máquina:"
+
+#~ msgid "(Ex: My Home Office's Computer)"
+#~ msgstr "(Ej: Ordenador de mi despacho)"
+
+#~ msgid "Machine name must be 1 to 40 alphanumerical characters"
+#~ msgstr ""
+#~ "El nombre de máquina puede sólo contener de 1 a 40 caracteres "
+#~ "alfanuméricos"
+
+#~ msgid "Connecting to Mandriva Online website..."
+#~ msgstr "Conectando al sitio web Mandriva Online..."
+
+#~ msgid ""
+#~ "In order to benefit from Mandriva Online services,\n"
+#~ "we are about to upload your configuration.\n"
+#~ "\n"
+#~ "The Wizard will now send the following information to Mandriva:\n"
+#~ "\n"
+#~ "1) the list of packages you have installed on your system,\n"
+#~ "\n"
+#~ "2) your hardware configuration.\n"
+#~ "\n"
+#~ "If you feel uncomfortable by that idea, or do not want to benefit from "
+#~ "this service,\n"
+#~ "please press 'Cancel'. By pressing 'Next', you allow us to keep you "
+#~ "informed\n"
+#~ "about security updates and useful upgrades via personalized email "
+#~ "alerts.\n"
+#~ "Furthermore, you benefit from discounted paid support services on\n"
+#~ "www.mandrivaexpert.com."
+#~ msgstr ""
+#~ "Parar beneficiarse de los servicios de Mandriva Online,\n"
+#~ "vamos a transferir su configuración.\n"
+#~ "\n"
+#~ "El asistente enviará ahora la siguiente información a Mandriva:\n"
+#~ "\n"
+#~ "1) los paquetes que tiene instalados en su sistema.\n"
+#~ "\n"
+#~ "2) la configuración de su hardware.\n"
+#~ "\n"
+#~ "Si no está cómodo con esta idea o no quiere beneficiarse de este\n"
+#~ "servicio, pulse 'Cancelar'. Si presiona 'Siguiente', nos permitirá\n"
+#~ "mantenerle informado sobre actualizaciones de seguridad y mejoras\n"
+#~ "útiles por medio de alertas de correo.\n"
+#~ "Además, se beneficia de descuentos en los servicios de soporte pagados\n"
+#~ "en www.mandrivaexpert.com."
+
+#~ msgid "Connection problem"
+#~ msgstr "Problema de conexión"
+
+#~ msgid "Problem occurs when uploading files, please try again"
+#~ msgstr ""
+#~ "Ocurrieron problemas al enviar archivos, por favor intentelo de nuevo"
+
+#~ msgid "Create a Mandriva Online Account"
+#~ msgstr "Crear una cuenta en Mandriva Online"
+
+#~ msgid "Greeting:"
+#~ msgstr "Tratamiento:"
+
+#~ msgid "First name:"
+#~ msgstr "Nombre:"
+
+#~ msgid "Last name:"
+#~ msgstr "Apellido:"
+
+#~ msgid "Confirm Password:"
+#~ msgstr "Confirmar contraseña:"
+
+#~ msgid ""
+#~ "The passwords do not match\n"
+#~ " Please try again\n"
+#~ msgstr ""
+#~ "Las contraseñas no coinciden\n"
+#~ " Por favor, intente de nuevo\n"
+
+#~ msgid "Please fill in each field"
+#~ msgstr "Por favor, rellene todos los campos"
+
+#~ msgid "Not a valid mail address!\n"
+#~ msgstr "¡No es una dirección de correo válida!\n"
+
+#~ msgid "Creating account failed!"
+#~ msgstr "¡Falló la cración de la cuenta!"
+
+#~ msgid ""
+#~ "Mandriva Online Account successfully created.\n"
+#~ "Please click \"Next\" to authenticate and upload your configuration\n"
+#~ msgstr ""
+#~ "Cuenta de Mandriva Online creada con éxito.\n"
+#~ "Por favor, pulse \"Siguiente\" para autentificarse y enviar su "
+#~ "configuración\n"
+
+#~ msgid "Your upload was successful!"
+#~ msgstr "Actualización exitosa"
+
+#~ msgid ""
+#~ "From now you will receive on security and updates \n"
+#~ "announcements thanks to Mandriva Online."
+#~ msgstr ""
+#~ "Desde ahora, recibirá anuncions de seguridad\n"
+#~ "y actualizaciones gracias a Mandriva Online."
+
+#~ msgid ""
+#~ "Mandriva Online offers you the ability to automate the updates.\n"
+#~ "A program will run regulary in your system waiting for new updates\n"
+#~ msgstr ""
+#~ "Mandriva Online le ofrece la posibilidad de automatizar las "
+#~ "actualizaciones.\n"
+#~ "Se ejecutará regularmente un programa  en su sistema a la espera de "
+#~ "nuevas actualizaciones\n"
+
+#~ msgid "Congratulations"
+#~ msgstr "Felicidades"
+
+#~ msgid "Your Mandriva Online account has been successfully configured\n"
+#~ msgstr "Su cuenta de Mandriva Online se ha configurado con éxito\n"
+
+#~ msgid "Configuration uploaded successfully"
+#~ msgstr "Configuración enviada con éxito"
+
+#~ msgid "Problem uploading configuration"
+#~ msgstr "Problema enviando la configuración"
+
+#~ msgid ""
+#~ "Cannot connect to Mandriva Online website: wrong login/password or router/"
+#~ "firewall bad settings"
+#~ msgstr ""
+#~ "No se pudo conectar con el sitio web de mandrivaonline: nombre de usuario/"
+#~ "contraseña incorrectos o configuración errónea del router/firewall"
diff --git a/po/et.po b/po/et.po
index 19d4cedc..e982c508 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: 2007-08-09 16:26+0200\n"
+"POT-Creation-Date: 2008-02-21 18:21+0100\n"
 "PO-Revision-Date: 2007-08-14 17:02+0200\n"
 "Last-Translator: Marek Laane <bald@starman.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
@@ -18,17 +18,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:94
+#: ../mdkapplet:88
 #, c-format
 msgid "Will check updates at %s"
 msgstr "Uuenduste kontrollimine kell %s"
 
-#: ../mdkapplet:103
+#: ../mdkapplet:97
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "Teie süsteemis pole midagi uuendada"
 
-#: ../mdkapplet:109
+#: ../mdkapplet:103
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -37,47 +37,37 @@ msgstr ""
 "Teenuse seadistamise probleem. Palun kontrollige logisid ja saatke e-kiri "
 "aadressile support@mandrivaonline.com"
 
-#: ../mdkapplet:115
+#: ../mdkapplet:110
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "Palun oodake, otsitakse kättesaadavaid pakette..."
 
-#: ../mdkapplet:121
+#: ../mdkapplet:116
 #, c-format
 msgid "New updates are available for your system"
 msgstr "Teie süsteemile on uuendusi"
 
-#: ../mdkapplet:127
-#, c-format
-msgid "New bundles are available for your system"
-msgstr "Teie süsteemile on uusi tarkvarakomplekte"
-
-#: ../mdkapplet:133
-#, c-format
-msgid "Service is not configured. Please click on \"Configure the service\""
-msgstr "Teenus pole seadistatud. Palun valige \"Teenuse seadistamine\""
-
-#: ../mdkapplet:139
+#: ../mdkapplet:122
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "Võrk on maas. Palun seadistage võrk"
 
-#: ../mdkapplet:145
+#: ../mdkapplet:128
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "Teenus pole aktiveeritud. Palun valige \"Veebilehekülg\""
 
-#: ../mdkapplet:151 ../mdkapplet:182
+#: ../mdkapplet:134 ../mdkapplet:165
 #, c-format
 msgid "urpmi database locked"
 msgstr "urpmi andmebaas on lukus"
 
-#: ../mdkapplet:157
+#: ../mdkapplet:140
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr "Väljalase pole toetatud (liiga vana või arendusversioon)"
 
-#: ../mdkapplet:163
+#: ../mdkapplet:146
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
@@ -85,7 +75,7 @@ msgstr ""
 "Andmekandjat ei leitud. Andmekandja tuleb lisada tarkvaraallikate halduri "
 "abil."
 
-#: ../mdkapplet:169
+#: ../mdkapplet:152
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -102,583 +92,133 @@ msgstr ""
 "\n"
 "Seejärel käivitage \"%s\" uuesti."
 
-#: ../mdkapplet:174
+#: ../mdkapplet:157
 #, c-format
 msgid "Enabled"
 msgstr "Lubatud"
 
-#: ../mdkapplet:187
+#: ../mdkapplet:170
 #, c-format
 msgid "Error updating media"
 msgstr "Viga andmekandja uuendamisel"
 
-#: ../mdkapplet:202
+#: ../mdkapplet:185
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr "Kontroll... On uuendusi\n"
 
-#: ../mdkapplet:207
+#: ../mdkapplet:190
 #, c-format
 msgid "Packages are up to date"
 msgstr "Pole ühtegi paketti uuendada"
 
-#: ../mdkapplet:212
+#: ../mdkapplet:195
 #, c-format
 msgid "Failed to open urpmi database"
 msgstr "Urpmi andmebaasi avamine ebaõnnestus"
 
-#: ../mdkapplet:217 ../mdkapplet:324
+#: ../mdkapplet:200
 #, c-format
 msgid "Install updates"
 msgstr "Uuenduste paigaldamine"
 
-#: ../mdkapplet:218
-#, c-format
-msgid "Configure the service"
-msgstr "Teenuse seadistamine"
-
-#: ../mdkapplet:219
+#: ../mdkapplet:201
 #, c-format
 msgid "Check Updates"
 msgstr "Uuenduste kontrollimine"
 
-#: ../mdkapplet:220 ../mdkapplet:327 ../mdkonline:114 ../mdkonline:155
-#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
-#, c-format
-msgid "Please wait"
-msgstr "Palun oodake"
-
-#: ../mdkapplet:220 ../mdkapplet:326 ../mdkapplet:327
-#, c-format
-msgid "Check updates"
-msgstr "Uuenduste kontrollimine"
-
-#: ../mdkapplet:223 ../mdkapplet:648
-#, c-format
-msgid "Online WebSite"
-msgstr "Veebilehekülg"
-
-#: ../mdkapplet:224
+#: ../mdkapplet:202
 #, c-format
 msgid "Configure Network"
 msgstr "Võrgu seadistamine"
 
-#: ../mdkapplet:225
-#, c-format
-msgid "Configure Now!"
-msgstr "Seadista"
-
-#: ../mdkapplet:313 ../mdkapplet:392
-#, c-format
-msgid "Mandriva Linux Updates Applet"
-msgstr "Mandriva Linuxi uuenduste aplett"
-
-#: ../mdkapplet:322
-#, c-format
-msgid "Actions"
-msgstr "Toimingud"
-
-#: ../mdkapplet:325
-#, c-format
-msgid "Configure"
-msgstr "Seadistused"
-
-#: ../mdkapplet:329
-#, c-format
-msgid "See logs"
-msgstr "Logide vaatamine"
-
-#: ../mdkapplet:332
-#, c-format
-msgid "Status"
-msgstr "Olek"
-
-#: ../mdkapplet:336 ../mdkapplet:597
-#, c-format
-msgid "Close"
-msgstr "Sulge"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Network Connection: "
-msgstr "Võrguühendus: "
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Up"
-msgstr "Olemas"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Down"
-msgstr "Puudub"
-
-#: ../mdkapplet:366
-#, c-format
-msgid "Last check: "
-msgstr "Viimati kontrollitud: "
-
-#: ../mdkapplet:367 ../mdkonline:145
-#, c-format
-msgid "Machine name:"
-msgstr "Masina nimi:"
-
-#: ../mdkapplet:368
-#, c-format
-msgid "Updates: "
-msgstr "Uuendused: "
-
-#: ../mdkapplet:372
+#: ../mdkapplet:283
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Drakconnecti käivitamine\n"
 
-#: ../mdkapplet:375
+#: ../mdkapplet:286
 #, c-format
 msgid "Mandriva Online seems to be reinstalled, reloading applet ...."
 msgstr ""
 "Mandriva Online paistab olevat uuesti paigaldatud, aplett laaditakse "
 "uuesti..."
 
-#: ../mdkapplet:383
+#: ../mdkapplet:294
 #, c-format
 msgid "Launching MandrivaUpdate\n"
 msgstr "MandrivaUpdate'i käivitamine\n"
 
-#: ../mdkapplet:398
+#: ../mdkapplet:303
+#, c-format
+msgid "Mandriva Linux Updates Applet"
+msgstr "Mandriva Linuxi uuenduste aplett"
+
+#: ../mdkapplet:308
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Uuenduste kontrollimine...\n"
 
-#: ../mdkapplet:399
+#: ../mdkapplet:309
 #, c-format
 msgid "Connecting to"
 msgstr "Ühendumine saidiga"
 
-#: ../mdkapplet:467 ../mdkupdate:159 ../mdkupdate:188
-#, c-format
-msgid "An error occurred"
-msgstr "Tekkis mingi viga"
-
-#: ../mdkapplet:475
-#, c-format
-msgid "Development release not supported by service"
-msgstr "Teenus ei toeta arendusversiooni"
-
-#: ../mdkapplet:476
-#, c-format
-msgid "Too old release not supported by service"
-msgstr "Teenus ei toeta liiga vanu väljalaskeid"
-
-#: ../mdkapplet:477
-#, c-format
-msgid "Unknown state"
-msgstr "Tundmatu olek"
-
-#: ../mdkapplet:478
-#, c-format
-msgid "Online services disabled. Contact Mandriva Online site\n"
-msgstr "Võrguteenused ei ole lubatud. Ühendumine Mandriva Online'i saidiga\n"
-
-#: ../mdkapplet:479
-#, c-format
-msgid "Wrong Password.\n"
-msgstr "Vale parool.\n"
-
-#: ../mdkapplet:480
-#, c-format
-msgid "Wrong Action or host or login.\n"
-msgstr "Vale toiming või masin või kasutajatunnus.\n"
-
-#: ../mdkapplet:481
-#, c-format
-msgid ""
-"Something is wrong with your network settings (check your route, firewall or "
-"proxy settings)\n"
-msgstr ""
-"Teie võrguseadistustega on midagi valesti (palun kontrollige ruuteri, "
-"tulemüüri või puhverserveri seadistusi)\n"
-
-#: ../mdkapplet:483
-#, c-format
-msgid ""
-"Problem occured while connecting to the server, please contact the support "
-"team"
-msgstr ""
-"Serveriga ühendumisel tekkis probleem, palun võtke ühendust tugimeeskonnaga"
-
-#: ../mdkapplet:487
-#, c-format
-msgid "Response from Mandriva Online server\n"
-msgstr "Mandriva Online'i serveri vastus\n"
-
-#: ../mdkapplet:490
+#: ../mdkapplet:386
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Midagi pole uuendada\n"
 
-#: ../mdkapplet:527
-#, c-format
-msgid "No check"
-msgstr "Pole kontrollitud"
-
-#: ../mdkapplet:541
-#, c-format
-msgid "Checking config file: Not present\n"
-msgstr "Konfiguratsioonifaili kontroll: puudub\n"
-
-#: ../mdkapplet:544
+#: ../mdkapplet:415
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Võrgu kontroll: paistab, et see pole aktiivne\n"
 
-#: ../mdkapplet:587
-#, c-format
-msgid "Logs"
-msgstr "Logid"
-
-#: ../mdkapplet:603
+#: ../mdkapplet:457 ../mdkupdate:118 ../mdkupdate:164
 #, c-format
-msgid "Clear"
-msgstr "Puhasta"
+msgid "Warning"
+msgstr "Hoiatus"
 
-#: ../mdkapplet:629
+#: ../mdkapplet:468
 #, c-format
 msgid "About..."
 msgstr "Info..."
 
-#: ../mdkapplet:631
+#: ../mdkapplet:472
 #, c-format
 msgid "Mandriva Online %s"
 msgstr "Mandriva Online %s"
 
-#: ../mdkapplet:635
+#: ../mdkapplet:473
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Autoriõigus (C) %s: Mandriva"
 
-#: ../mdkapplet:647
+#: ../mdkapplet:476
 #, c-format
 msgid "Mandriva Online gives access to Mandriva web services."
 msgstr "Mandriva Online võimaldab kasutada Mandriva veebiteenuseid."
 
-#: ../mdkapplet:655
-#, c-format
-msgid "Always launch on startup"
-msgstr "Käivitatakse alati käivitumisel"
-
-#: ../mdkapplet:657
-#, c-format
-msgid "Quit"
-msgstr "Välju"
-
-#: ../mdkonline:58
-#, c-format
-msgid ""
-"mdonline version %s\n"
-"Copyright (C) %s Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"mdkonline versioon %s\n"
-"Autoriõigus (C) %s Mandriva.\n"
-"See on vabavara, mida võib levitada vastavalt GNU Üldise Avaliku Litsentsi "
-"tingimustele.\n"
-"\n"
-"Kasutamine:\n"
-
-#: ../mdkonline:63 ../mdkupdate:73
-#, c-format
-msgid "  --help\t\t- print this help message.\n"
-msgstr "  --help\t\t- näitab seda abiteadet.\n"
-
-#: ../mdkonline:64
-#, c-format
-msgid "  --box=\t\t\t- hostname.\n"
-msgstr "  --box=\t\t\t- masinanimi.\n"
-
-#: ../mdkonline:65
-#, c-format
-msgid "  --country\t\t\t- name of country of the user. \n"
-msgstr "  --country\t\t\t- kasutaja riigi nimi. \n"
-
-#: ../mdkonline:66
-#, c-format
-msgid "  --interactive\t\t- use the interactive mode.\n"
-msgstr "  --interactive\t\t- interaktiivse režiimi kasutamine.\n"
-
-#: ../mdkonline:67
-#, c-format
-msgid "  --nointeractive\t- use the non-interactive mode.\n"
-msgstr "  --nointeractive\t- mitteinteraktiivse režiimi kasutamine.\n"
-
-#: ../mdkonline:68
-#, c-format
-msgid "  --login=\t\t     - login name of the user.\n"
-msgstr "  --login=\t\t     - kasutaja kasutajatunnus.\n"
-
-#: ../mdkonline:69
-#, c-format
-msgid "  --pass=\t\t\t- password  of the user.\n"
-msgstr "  --pass=\t\t\t- kasutaja parool.\n"
-
-#: ../mdkonline:87 ../mdkonline:120
-#, c-format
-msgid "Mandriva Online"
-msgstr "Mandriva Online"
-
-#: ../mdkonline:90
-#, c-format
-msgid "I already have an account"
-msgstr "Mul on juba konto"
-
-#: ../mdkonline:91
-#, c-format
-msgid "I want to subscribe"
-msgstr "Tahan konto luua"
-
-#: ../mdkonline:96
-#, c-format
-msgid "Mr."
-msgstr "Hr."
-
-#: ../mdkonline:96
-#, c-format
-msgid "Mrs."
-msgstr "Pr."
-
-#: ../mdkonline:96
-#, c-format
-msgid "Ms."
-msgstr "Prl."
-
-#: ../mdkonline:114
-#, c-format
-msgid "Reading configuration\n"
-msgstr "Konfiguratsiooni tuvastamine\n"
-
-#: ../mdkonline:123
-#, c-format
-msgid ""
-"This assistant will help you to upload your configuration\n"
-"(packages, hardware configuration) to a centralized database in\n"
-"order to keep you informed about security updates and useful upgrades.\n"
-msgstr ""
-"See abiline aitab saata Teie konfiguratsiooni\n"
-"(paketid, riistvara) tsentraalsesse andmebaasi, et edaspidi\n"
-"teavitada Teid turvaparandustest ja kasulikest uuendustest.\n"
-
-#: ../mdkonline:131
-#, c-format
-msgid "Account creation or authentication"
-msgstr "Konto loomine või autentimine"
-
-#: ../mdkonline:136
-#, c-format
-msgid "Enter your Mandriva Online login, password and machine name:"
-msgstr "Sisestage oma Mandriva Online'i kasutajatunnus, parool ja masina nimi:"
-
-#: ../mdkonline:142 ../mdkonline:195
-#, c-format
-msgid "Email address:"
-msgstr "E-posti aadress:"
-
-#: ../mdkonline:143
-#, c-format
-msgid "Country"
-msgstr "Riik"
-
-#: ../mdkonline:144 ../mdkonline:196
-#, c-format
-msgid "Password:"
-msgstr "Parool:"
-
-#: ../mdkonline:146
-#, c-format
-msgid "Machine description:"
-msgstr "Masina kirjeldus:"
-
-#: ../mdkonline:147
-#, c-format
-msgid "(Ex: My Home Office's Computer)"
-msgstr "(Näide: Minu koduarvuti)"
-
-#: ../mdkonline:152 ../mdkonline:159 ../mdkonline:180 ../mdkonline:204
-#: ../mdkonline:208 ../mdkonline:212 ../mdkonline:217 ../mdkupdate:141
-#: ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
-#, c-format
-msgid "Error"
-msgstr "Viga"
-
-#: ../mdkonline:152
-#, c-format
-msgid "Machine name must be 1 to 40 alphanumerical characters"
-msgstr "Haakepunkti nimi tohib sisaldada vaid 1 kuni 40 tähte ja numbrit"
-
-#: ../mdkonline:155
-#, c-format
-msgid "Connecting to Mandriva Online website..."
-msgstr "Ühendumine Mandriva Online'i saidiga..."
-
-#: ../mdkonline:167
-#, c-format
-msgid ""
-"In order to benefit from Mandriva Online services,\n"
-"we are about to upload your configuration.\n"
-"\n"
-"The Wizard will now send the following information to Mandriva:\n"
-"\n"
-"1) the list of packages you have installed on your system,\n"
-"\n"
-"2) your hardware configuration.\n"
-"\n"
-"If you feel uncomfortable by that idea, or do not want to benefit from this "
-"service,\n"
-"please press 'Cancel'. By pressing 'Next', you allow us to keep you "
-"informed\n"
-"about security updates and useful upgrades via personalized email alerts.\n"
-"Furthermore, you benefit from discounted paid support services on\n"
-"www.mandrivaexpert.com."
-msgstr ""
-"Et saaksite kasu Mandriva Online'i teenustest,\n"
-"saadame praegu teele Teie konfiguratsiooni.\n"
-"\n"
-"Nõustaja saadab nüüd Mandrivale järgmise info:\n"
-"\n"
-"1) Teie süsteemi paigaldatud pakettide nimekiri\n"
-"\n"
-"2) Teie riistvara kirjeldus\n"
-"\n"
-"Kui see mõte Teile ei meeldi või Te ei soovi meie teenustest kasu saada,\n"
-"vajutage nupule ' Loobu', Vajutades 'Järgmine', annate meile võimaluse\n"
-"teavitada Teid turvaparandustest ja kasulikest uuendustest isiklike e-"
-"kirjadega.\n"
-"Lisaks saate hinnaalandust www.mandrivaexpert.com tasuliste\n"
-"teenuste puhul."
-
-#: ../mdkonline:180
-#, c-format
-msgid "Connection problem"
-msgstr "Probleem ühendusega"
-
-#: ../mdkonline:180
-#, c-format
-msgid "Problem occurs when uploading files, please try again"
-msgstr "Tekkis viga failide saatmisel, palun proovige uuesti"
-
-#: ../mdkonline:187
-#, c-format
-msgid "Create a Mandriva Online Account"
-msgstr "Mandriva Online'i konto loomine"
-
-#. -PO: that is for things like "Mr", "Ms",...
-#: ../mdkonline:192
-#, c-format
-msgid "Greeting:"
-msgstr "Tiitel:"
-
-#: ../mdkonline:193
-#, c-format
-msgid "First name:"
-msgstr "Eesnimi:"
-
-#: ../mdkonline:194
-#, c-format
-msgid "Last name:"
-msgstr "Perekonnanimi:"
-
-#: ../mdkonline:197
-#, c-format
-msgid "Confirm Password:"
-msgstr "Parool teist korda:"
-
-#: ../mdkonline:204
-#, c-format
-msgid ""
-"The passwords do not match\n"
-" Please try again\n"
-msgstr ""
-"Paroolid ei klapi\n"
-" Palun proovige uuesti\n"
-
-#: ../mdkonline:208
-#, c-format
-msgid "Please fill in each field"
-msgstr "Palun täitke kõik väljad"
-
-#: ../mdkonline:212
-#, c-format
-msgid "Not a valid mail address!\n"
-msgstr "See ei ole korrektne e-posti aadress!\n"
-
-#: ../mdkonline:217
-#, c-format
-msgid "Creating account failed!"
-msgstr "Konto loomine ebaõnnestus!"
-
-#: ../mdkonline:225
-#, c-format
-msgid ""
-"Mandriva Online Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
-msgstr ""
-"Mandriva Online'i konto edukalt loodud.\n"
-"Palun klõpsake nupule \"Järgmine\" autentimiseks ja oma konfiguratsiooni "
-"saatmiseks\n"
-
-#: ../mdkonline:229
-#, c-format
-msgid "Your upload was successful!"
-msgstr "Saatmine õnnestus!"
-
-#: ../mdkonline:229
+#: ../mdkapplet:478
 #, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandriva Online."
-msgstr ""
-"Nüüdsest alates saate tänu Mandriva Online'ile \n"
-"teateid turvaparanduste ja uuenduste kohta."
+msgid "Online WebSite"
+msgstr "Veebilehekülg"
 
-#: ../mdkonline:229
+#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
+#: ../mdkapplet:483
 #, c-format
-msgid ""
-"Mandriva Online offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
+msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
-"Mandriva Online pakub võimalust uuendamine automaatseks muuta.\n"
-"Selleks käivitatakse Teie arvutis regulaarselt rakendus, mis otsib uuendusi\n"
-
-#: ../mdkonline:238
-#, c-format
-msgid "Congratulations"
-msgstr "Õnnitlused!"
 
-#: ../mdkonline:238
+#: ../mdkapplet:492
 #, c-format
-msgid "Your Mandriva Online account has been successfully configured\n"
-msgstr "Teie Mandriva Online'i konto on edukalt loodud\n"
-
-#: ../mdkonline:253
-#, c-format
-msgid "Configuration uploaded successfully"
-msgstr "Konfiguratsiooni saatmine õnnestus"
-
-#: ../mdkonline:254
-#, c-format
-msgid "Problem uploading configuration"
-msgstr "Probleem konfiguratsiooni saatmisel"
+msgid "Always launch on startup"
+msgstr "Käivitatakse alati käivitumisel"
 
-#: ../mdkonline:256
+#: ../mdkapplet:494
 #, c-format
-msgid ""
-"Cannot connect to Mandriva Online website: wrong login/password or router/"
-"firewall bad settings"
-msgstr ""
-"Mandriva Online'i veebileheküljega ei õnnestunud ühendust luua: vigane "
-"kasutajatunnus/parool või sobimatud ruuteri/tulemüüri seadistused"
+msgid "Quit"
+msgstr "Välju"
 
 #: ../mdkonline.pm:207
 #, c-format
@@ -827,6 +367,11 @@ msgstr ""
 "\n"
 "Kasutamine:\n"
 
+#: ../mdkupdate:73
+#, c-format
+msgid "  --help\t\t- print this help message.\n"
+msgstr "  --help\t\t- näitab seda abiteadet.\n"
+
 #: ../mdkupdate:74
 #, c-format
 msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
@@ -856,11 +401,6 @@ msgstr ""
 "  --bundle fail.bundle\t- parsitakse ja paigaldatakse pakett "
 "metainfofailist .bundle.\n"
 
-#: ../mdkupdate:118 ../mdkupdate:164
-#, c-format
-msgid "Warning"
-msgstr "Hoiatus"
-
 #. -PO: here Live Install is currently *NOT* translated on the desktop, so it's better to keep as it:
 #: ../mdkupdate:120
 #, c-format
@@ -870,11 +410,21 @@ msgid ""
 msgstr ""
 "Teil tuleb esmalt paigaldada süsteem kõvakettale 'Live Install' nõustajaga."
 
+#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
+#, c-format
+msgid "Please wait"
+msgstr "Palun oodake"
+
 #: ../mdkupdate:123 ../mdkupdate:174
 #, c-format
 msgid "Preparing..."
 msgstr "Valmistumine..."
 
+#: ../mdkupdate:141 ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
+#, c-format
+msgid "Error"
+msgstr "Viga"
+
 #: ../mdkupdate:141
 #, c-format
 msgid ""
@@ -886,6 +436,11 @@ msgstr ""
 "\n"
 "%s"
 
+#: ../mdkupdate:159 ../mdkupdate:188
+#, c-format
+msgid "An error occurred"
+msgstr "Tekkis mingi viga"
+
 #: ../mdkupdate:164
 #, c-format
 msgid ""
@@ -914,6 +469,310 @@ msgstr "Pakettide paigaldamine...\n"
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "Pakettide uuendamine update_source andmekandjalt ebaõnnestus.\n"
 
+#~ msgid "New bundles are available for your system"
+#~ msgstr "Teie süsteemile on uusi tarkvarakomplekte"
+
+#~ msgid "Service is not configured. Please click on \"Configure the service\""
+#~ msgstr "Teenus pole seadistatud. Palun valige \"Teenuse seadistamine\""
+
+#~ msgid "Configure the service"
+#~ msgstr "Teenuse seadistamine"
+
+#~ msgid "Check updates"
+#~ msgstr "Uuenduste kontrollimine"
+
+#~ msgid "Configure Now!"
+#~ msgstr "Seadista"
+
+#~ msgid "Actions"
+#~ msgstr "Toimingud"
+
+#~ msgid "Configure"
+#~ msgstr "Seadistused"
+
+#~ msgid "See logs"
+#~ msgstr "Logide vaatamine"
+
+#~ msgid "Status"
+#~ msgstr "Olek"
+
+#~ msgid "Close"
+#~ msgstr "Sulge"
+
+#~ msgid "Network Connection: "
+#~ msgstr "Võrguühendus: "
+
+#~ msgid "Up"
+#~ msgstr "Olemas"
+
+#~ msgid "Down"
+#~ msgstr "Puudub"
+
+#~ msgid "Last check: "
+#~ msgstr "Viimati kontrollitud: "
+
+#~ msgid "Machine name:"
+#~ msgstr "Masina nimi:"
+
+#~ msgid "Updates: "
+#~ msgstr "Uuendused: "
+
+#~ msgid "Development release not supported by service"
+#~ msgstr "Teenus ei toeta arendusversiooni"
+
+#~ msgid "Too old release not supported by service"
+#~ msgstr "Teenus ei toeta liiga vanu väljalaskeid"
+
+#~ msgid "Unknown state"
+#~ msgstr "Tundmatu olek"
+
+#~ msgid "Online services disabled. Contact Mandriva Online site\n"
+#~ msgstr ""
+#~ "Võrguteenused ei ole lubatud. Ühendumine Mandriva Online'i saidiga\n"
+
+#~ msgid "Wrong Password.\n"
+#~ msgstr "Vale parool.\n"
+
+#~ msgid "Wrong Action or host or login.\n"
+#~ msgstr "Vale toiming või masin või kasutajatunnus.\n"
+
+#~ msgid ""
+#~ "Something is wrong with your network settings (check your route, firewall "
+#~ "or proxy settings)\n"
+#~ msgstr ""
+#~ "Teie võrguseadistustega on midagi valesti (palun kontrollige ruuteri, "
+#~ "tulemüüri või puhverserveri seadistusi)\n"
+
+#~ msgid ""
+#~ "Problem occured while connecting to the server, please contact the "
+#~ "support team"
+#~ msgstr ""
+#~ "Serveriga ühendumisel tekkis probleem, palun võtke ühendust "
+#~ "tugimeeskonnaga"
+
+#~ msgid "Response from Mandriva Online server\n"
+#~ msgstr "Mandriva Online'i serveri vastus\n"
+
+#~ msgid "No check"
+#~ msgstr "Pole kontrollitud"
+
+#~ msgid "Checking config file: Not present\n"
+#~ msgstr "Konfiguratsioonifaili kontroll: puudub\n"
+
+#~ msgid "Logs"
+#~ msgstr "Logid"
+
+#~ msgid "Clear"
+#~ msgstr "Puhasta"
+
+#~ msgid ""
+#~ "mdonline version %s\n"
+#~ "Copyright (C) %s Mandriva.\n"
+#~ "This is free software and may be redistributed under the terms of the GNU "
+#~ "GPL.\n"
+#~ "\n"
+#~ "usage:\n"
+#~ msgstr ""
+#~ "mdkonline versioon %s\n"
+#~ "Autoriõigus (C) %s Mandriva.\n"
+#~ "See on vabavara, mida võib levitada vastavalt GNU Üldise Avaliku "
+#~ "Litsentsi tingimustele.\n"
+#~ "\n"
+#~ "Kasutamine:\n"
+
+#~ msgid "  --box=\t\t\t- hostname.\n"
+#~ msgstr "  --box=\t\t\t- masinanimi.\n"
+
+#~ msgid "  --country\t\t\t- name of country of the user. \n"
+#~ msgstr "  --country\t\t\t- kasutaja riigi nimi. \n"
+
+#~ msgid "  --interactive\t\t- use the interactive mode.\n"
+#~ msgstr "  --interactive\t\t- interaktiivse režiimi kasutamine.\n"
+
+#~ msgid "  --nointeractive\t- use the non-interactive mode.\n"
+#~ msgstr "  --nointeractive\t- mitteinteraktiivse režiimi kasutamine.\n"
+
+#~ msgid "  --login=\t\t     - login name of the user.\n"
+#~ msgstr "  --login=\t\t     - kasutaja kasutajatunnus.\n"
+
+#~ msgid "  --pass=\t\t\t- password  of the user.\n"
+#~ msgstr "  --pass=\t\t\t- kasutaja parool.\n"
+
+#~ msgid "Mandriva Online"
+#~ msgstr "Mandriva Online"
+
+#~ msgid "I already have an account"
+#~ msgstr "Mul on juba konto"
+
+#~ msgid "I want to subscribe"
+#~ msgstr "Tahan konto luua"
+
+#~ msgid "Mr."
+#~ msgstr "Hr."
+
+#~ msgid "Mrs."
+#~ msgstr "Pr."
+
+#~ msgid "Ms."
+#~ msgstr "Prl."
+
+#~ msgid "Reading configuration\n"
+#~ msgstr "Konfiguratsiooni tuvastamine\n"
+
+#~ msgid ""
+#~ "This assistant will help you to upload your configuration\n"
+#~ "(packages, hardware configuration) to a centralized database in\n"
+#~ "order to keep you informed about security updates and useful upgrades.\n"
+#~ msgstr ""
+#~ "See abiline aitab saata Teie konfiguratsiooni\n"
+#~ "(paketid, riistvara) tsentraalsesse andmebaasi, et edaspidi\n"
+#~ "teavitada Teid turvaparandustest ja kasulikest uuendustest.\n"
+
+#~ msgid "Account creation or authentication"
+#~ msgstr "Konto loomine või autentimine"
+
+#~ msgid "Enter your Mandriva Online login, password and machine name:"
+#~ msgstr ""
+#~ "Sisestage oma Mandriva Online'i kasutajatunnus, parool ja masina nimi:"
+
+#~ msgid "Email address:"
+#~ msgstr "E-posti aadress:"
+
+#~ msgid "Country"
+#~ msgstr "Riik"
+
+#~ msgid "Password:"
+#~ msgstr "Parool:"
+
+#~ msgid "Machine description:"
+#~ msgstr "Masina kirjeldus:"
+
+#~ msgid "(Ex: My Home Office's Computer)"
+#~ msgstr "(Näide: Minu koduarvuti)"
+
+#~ msgid "Machine name must be 1 to 40 alphanumerical characters"
+#~ msgstr "Haakepunkti nimi tohib sisaldada vaid 1 kuni 40 tähte ja numbrit"
+
+#~ msgid "Connecting to Mandriva Online website..."
+#~ msgstr "Ühendumine Mandriva Online'i saidiga..."
+
+#~ msgid ""
+#~ "In order to benefit from Mandriva Online services,\n"
+#~ "we are about to upload your configuration.\n"
+#~ "\n"
+#~ "The Wizard will now send the following information to Mandriva:\n"
+#~ "\n"
+#~ "1) the list of packages you have installed on your system,\n"
+#~ "\n"
+#~ "2) your hardware configuration.\n"
+#~ "\n"
+#~ "If you feel uncomfortable by that idea, or do not want to benefit from "
+#~ "this service,\n"
+#~ "please press 'Cancel'. By pressing 'Next', you allow us to keep you "
+#~ "informed\n"
+#~ "about security updates and useful upgrades via personalized email "
+#~ "alerts.\n"
+#~ "Furthermore, you benefit from discounted paid support services on\n"
+#~ "www.mandrivaexpert.com."
+#~ msgstr ""
+#~ "Et saaksite kasu Mandriva Online'i teenustest,\n"
+#~ "saadame praegu teele Teie konfiguratsiooni.\n"
+#~ "\n"
+#~ "Nõustaja saadab nüüd Mandrivale järgmise info:\n"
+#~ "\n"
+#~ "1) Teie süsteemi paigaldatud pakettide nimekiri\n"
+#~ "\n"
+#~ "2) Teie riistvara kirjeldus\n"
+#~ "\n"
+#~ "Kui see mõte Teile ei meeldi või Te ei soovi meie teenustest kasu saada,\n"
+#~ "vajutage nupule ' Loobu', Vajutades 'Järgmine', annate meile võimaluse\n"
+#~ "teavitada Teid turvaparandustest ja kasulikest uuendustest isiklike e-"
+#~ "kirjadega.\n"
+#~ "Lisaks saate hinnaalandust www.mandrivaexpert.com tasuliste\n"
+#~ "teenuste puhul."
+
+#~ msgid "Connection problem"
+#~ msgstr "Probleem ühendusega"
+
+#~ msgid "Problem occurs when uploading files, please try again"
+#~ msgstr "Tekkis viga failide saatmisel, palun proovige uuesti"
+
+#~ msgid "Create a Mandriva Online Account"
+#~ msgstr "Mandriva Online'i konto loomine"
+
+#~ msgid "Greeting:"
+#~ msgstr "Tiitel:"
+
+#~ msgid "First name:"
+#~ msgstr "Eesnimi:"
+
+#~ msgid "Last name:"
+#~ msgstr "Perekonnanimi:"
+
+#~ msgid "Confirm Password:"
+#~ msgstr "Parool teist korda:"
+
+#~ msgid ""
+#~ "The passwords do not match\n"
+#~ " Please try again\n"
+#~ msgstr ""
+#~ "Paroolid ei klapi\n"
+#~ " Palun proovige uuesti\n"
+
+#~ msgid "Please fill in each field"
+#~ msgstr "Palun täitke kõik väljad"
+
+#~ msgid "Not a valid mail address!\n"
+#~ msgstr "See ei ole korrektne e-posti aadress!\n"
+
+#~ msgid "Creating account failed!"
+#~ msgstr "Konto loomine ebaõnnestus!"
+
+#~ msgid ""
+#~ "Mandriva Online Account successfully created.\n"
+#~ "Please click \"Next\" to authenticate and upload your configuration\n"
+#~ msgstr ""
+#~ "Mandriva Online'i konto edukalt loodud.\n"
+#~ "Palun klõpsake nupule \"Järgmine\" autentimiseks ja oma konfiguratsiooni "
+#~ "saatmiseks\n"
+
+#~ msgid "Your upload was successful!"
+#~ msgstr "Saatmine õnnestus!"
+
+#~ msgid ""
+#~ "From now you will receive on security and updates \n"
+#~ "announcements thanks to Mandriva Online."
+#~ msgstr ""
+#~ "Nüüdsest alates saate tänu Mandriva Online'ile \n"
+#~ "teateid turvaparanduste ja uuenduste kohta."
+
+#~ msgid ""
+#~ "Mandriva Online offers you the ability to automate the updates.\n"
+#~ "A program will run regulary in your system waiting for new updates\n"
+#~ msgstr ""
+#~ "Mandriva Online pakub võimalust uuendamine automaatseks muuta.\n"
+#~ "Selleks käivitatakse Teie arvutis regulaarselt rakendus, mis otsib "
+#~ "uuendusi\n"
+
+#~ msgid "Congratulations"
+#~ msgstr "Õnnitlused!"
+
+#~ msgid "Your Mandriva Online account has been successfully configured\n"
+#~ msgstr "Teie Mandriva Online'i konto on edukalt loodud\n"
+
+#~ msgid "Configuration uploaded successfully"
+#~ msgstr "Konfiguratsiooni saatmine õnnestus"
+
+#~ msgid "Problem uploading configuration"
+#~ msgstr "Probleem konfiguratsiooni saatmisel"
+
+#~ msgid ""
+#~ "Cannot connect to Mandriva Online website: wrong login/password or router/"
+#~ "firewall bad settings"
+#~ msgstr ""
+#~ "Mandriva Online'i veebileheküljega ei õnnestunud ühendust luua: vigane "
+#~ "kasutajatunnus/parool või sobimatud ruuteri/tulemüüri seadistused"
+
 #~ msgid "  --applet\t\t- launch Mandriva Update.\n"
 #~ msgstr "  --applet\t\t- käivitatakse Mandriva Update.\n"
 
diff --git a/po/eu.po b/po/eu.po
index 34bff205..029d28e6 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-09 16:26+0200\n"
+"POT-Creation-Date: 2008-02-21 18:21+0100\n"
 "PO-Revision-Date: 2008-02-02 10:12+0100\n"
 "Last-Translator: Iñigo Salvador Azurmendi <xalba@euskalnet.net>\n"
 "Language-Team: Euskara <eu@li.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:94
+#: ../mdkapplet:88
 #, c-format
 msgid "Will check updates at %s"
 msgstr "Eguneraketak egiaztatu %s-n"
 
-#: ../mdkapplet:103
+#: ../mdkapplet:97
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "Zure sistema eguneratuta dago"
 
-#: ../mdkapplet:109
+#: ../mdkapplet:103
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -38,52 +38,46 @@ msgstr ""
 "Zerbitzuaren konfigurazio arazoa. Mesedez aztertu erregistroak eta bidali "
 "posta support@mandrivaonline.com helbidera"
 
-#: ../mdkapplet:115
+#: ../mdkapplet:110
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "Itxaron, pakete erabilgarriak bilatzen..."
 
-#: ../mdkapplet:121
+#: ../mdkapplet:116
 #, c-format
 msgid "New updates are available for your system"
 msgstr "Zure sistemarentzako eguneraketa berriak eskuragarri daude"
 
-#: ../mdkapplet:127
-#, c-format
-msgid "New bundles are available for your system"
-msgstr "Zure sistemarentzako fardel berriak eskuragarri daude"
-
-#: ../mdkapplet:133
-#, c-format
-msgid "Service is not configured. Please click on \"Configure the service\""
-msgstr "Zerbitzua ez dago konfiguratuta. Mesedez sakatu \"Zerbitzua konfiguratu\""
-
-#: ../mdkapplet:139
+#: ../mdkapplet:122
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "Sarea erorita dago. Mesedez konfiguratu zure sarea"
 
-#: ../mdkapplet:145
+#: ../mdkapplet:128
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "Zerbitzua ez dago aktibatuta. Mesedez klikatu \"Lerroko Webgunea\""
 
-#: ../mdkapplet:151 ../mdkapplet:182
+#: ../mdkapplet:134 ../mdkapplet:165
 #, c-format
 msgid "urpmi database locked"
 msgstr "urpmi datubasea blokeatuta"
 
-#: ../mdkapplet:157
+#: ../mdkapplet:140
 #, c-format
 msgid "Release not supported (too old release, or development release)"
-msgstr "Bertsio hau ez dago sostengaturik (bertsio zaharregia, edo garapen bertsioa)"
+msgstr ""
+"Bertsio hau ez dago sostengaturik (bertsio zaharregia, edo garapen bertsioa)"
 
-#: ../mdkapplet:163
+#: ../mdkapplet:146
 #, c-format
-msgid "No medium found. You must add some media through 'Software Media Manager'."
-msgstr "Ez da euskarririk aurkitu. Euskarriren bat erantsi behar duzu 'Software Euskarri Kudeatzailea' bitartez."
+msgid ""
+"No medium found. You must add some media through 'Software Media Manager'."
+msgstr ""
+"Ez da euskarririk aurkitu. Euskarriren bat erantsi behar duzu 'Software "
+"Euskarri Kudeatzailea' bitartez."
 
-#: ../mdkapplet:169
+#: ../mdkapplet:152
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -95,587 +89,136 @@ msgid ""
 msgstr ""
 "Dagoeneko gutxienez eguneraketa euskarri bat konfiguratuta\n"
 "daukazu, baina une honetan guztiak ezgaituta daude. Software\n"
-"Euskarrien Kudeatzailea exekutatu beharko zenuke gutxienez\n bat gaitzeko (markatu \"%s\" zutabean).\n"
+"Euskarrien Kudeatzailea exekutatu beharko zenuke gutxienez\n"
+" bat gaitzeko (markatu \"%s\" zutabean).\n"
 "\n"
 "Ondoren, \"%s\" berrabiarazi."
 
-#: ../mdkapplet:174
+#: ../mdkapplet:157
 #, c-format
 msgid "Enabled"
 msgstr "Gaituta"
 
-#: ../mdkapplet:187
+#: ../mdkapplet:170
 #, c-format
 msgid "Error updating media"
 msgstr "Akatsa euskarri eguneratzerakoan"
 
-#: ../mdkapplet:202
+#: ../mdkapplet:185
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr "Egiaztaketa... Dauden eguneraketak\n"
 
-#: ../mdkapplet:207
+#: ../mdkapplet:190
 #, c-format
 msgid "Packages are up to date"
 msgstr "Paketeak egunean daude"
 
-#: ../mdkapplet:212
+#: ../mdkapplet:195
 #, c-format
 msgid "Failed to open urpmi database"
 msgstr "urpmi datubasea irekitzean huts egin du"
 
-#: ../mdkapplet:217 ../mdkapplet:324
+#: ../mdkapplet:200
 #, c-format
 msgid "Install updates"
 msgstr "Instalatu eguneratzeak"
 
-#: ../mdkapplet:218
-#, c-format
-msgid "Configure the service"
-msgstr "Zerbitzua konfiguratu"
-
-#: ../mdkapplet:219
+#: ../mdkapplet:201
 #, c-format
 msgid "Check Updates"
 msgstr "Egiaztatu eguneratzeak"
 
-#: ../mdkapplet:220 ../mdkapplet:327 ../mdkonline:114 ../mdkonline:155
-#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
-#, c-format
-msgid "Please wait"
-msgstr "Itxaron"
-
-#: ../mdkapplet:220 ../mdkapplet:326 ../mdkapplet:327
-#, c-format
-msgid "Check updates"
-msgstr "Egiaztatu eguneratzeak"
-
-#: ../mdkapplet:223 ../mdkapplet:648
-#, c-format
-msgid "Online WebSite"
-msgstr "Lerroko Webgunea"
-
-#: ../mdkapplet:224
+#: ../mdkapplet:202
 #, c-format
 msgid "Configure Network"
 msgstr "Konfiguratu sarea"
 
-#: ../mdkapplet:225
-#, c-format
-msgid "Configure Now!"
-msgstr "Konfiguratu orain!"
-
-#: ../mdkapplet:313 ../mdkapplet:392
-#, c-format
-msgid "Mandriva Linux Updates Applet"
-msgstr "Mandriva Linux eguneratzeen applet-a"
-
-#: ../mdkapplet:322
-#, c-format
-msgid "Actions"
-msgstr "Ekintzak"
-
-#: ../mdkapplet:325
-#, c-format
-msgid "Configure"
-msgstr "Konfiguratu"
-
-#: ../mdkapplet:329
-#, c-format
-msgid "See logs"
-msgstr "Ikusi egunkariak"
-
-#: ../mdkapplet:332
-#, c-format
-msgid "Status"
-msgstr "Egoera"
-
-#: ../mdkapplet:336 ../mdkapplet:597
-#, c-format
-msgid "Close"
-msgstr "Itxi"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Network Connection: "
-msgstr "Sare-konexioa: "
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Up"
-msgstr "Badabil"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Down"
-msgstr "Ez dabil"
-
-#: ../mdkapplet:366
-#, c-format
-msgid "Last check: "
-msgstr "Azken egiaztatzea: "
-
-#: ../mdkapplet:367 ../mdkonline:145
-#, c-format
-msgid "Machine name:"
-msgstr "Makina-izena:"
-
-#: ../mdkapplet:368
-#, c-format
-msgid "Updates: "
-msgstr "Eguneraketak: "
-
-#: ../mdkapplet:372
+#: ../mdkapplet:283
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "drakconect abiarazten\n"
 
-#: ../mdkapplet:375
+#: ../mdkapplet:286
 #, c-format
 msgid "Mandriva Online seems to be reinstalled, reloading applet ...."
 msgstr "Mandriva Online berrinstalatu dela dirudi, appleta birzamatzen ..."
 
-#: ../mdkapplet:383
+#: ../mdkapplet:294
 #, c-format
 msgid "Launching MandrivaUpdate\n"
 msgstr "MandrivaUpdate abiarazten\n"
 
-#: ../mdkapplet:398
+#: ../mdkapplet:303
+#, c-format
+msgid "Mandriva Linux Updates Applet"
+msgstr "Mandriva Linux eguneratzeen applet-a"
+
+#: ../mdkapplet:308
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Eguneraketa berriak kalkulatzen...\n"
 
-#: ../mdkapplet:399
+#: ../mdkapplet:309
 #, c-format
 msgid "Connecting to"
 msgstr "Hona konektatzen"
 
-#: ../mdkapplet:467 ../mdkupdate:159 ../mdkupdate:188
-#, c-format
-msgid "An error occurred"
-msgstr "Errore bat izan da"
-
-#: ../mdkapplet:475
-#, c-format
-msgid "Development release not supported by service"
-msgstr "Garapen bertsioa zerbitzuaren sostengurik gabe"
-
-#: ../mdkapplet:476
-#, c-format
-msgid "Too old release not supported by service"
-msgstr "Bertsio zaharregia zerbitzuaren sostengurik gabe"
-
-#: ../mdkapplet:477
-#, c-format
-msgid "Unknown state"
-msgstr "Egoera ezezaguna"
-
-#: ../mdkapplet:478
-#, c-format
-msgid "Online services disabled. Contact Mandriva Online site\n"
-msgstr "Lineako zerbitzua desgaituta. Kontaktatu Mandriva Online gunearekin\n"
-
-#: ../mdkapplet:479
-#, c-format
-msgid "Wrong Password.\n"
-msgstr "Pasahitza ez da zuzena\n"
-
-#: ../mdkapplet:480
-#, c-format
-msgid "Wrong Action or host or login.\n"
-msgstr "Okerreko akzioa, ostalaria edo saio_hasiera.\n"
-
-#: ../mdkapplet:481
-#, c-format
-msgid ""
-"Something is wrong with your network settings (check your route, firewall or "
-"proxy settings)\n"
-msgstr ""
-"Zerbait gaizki dago zure sareko ezarpenetan (aztertu zure ibilbide, suhesi "
-"edo proxy ezarpenak)\n"
-
-#: ../mdkapplet:483
-#, c-format
-msgid ""
-"Problem occured while connecting to the server, please contact the support "
-"team"
-msgstr ""
-"Arazo bat gertatu da zerbitzariarekin konektatzerakoan, mesedez jarri "
-"euskarri taldearekin harremanetan"
-
-#: ../mdkapplet:487
-#, c-format
-msgid "Response from Mandriva Online server\n"
-msgstr "Mandriva Online zerbitzaritik erantzuna\n"
-
-#: ../mdkapplet:490
+#: ../mdkapplet:386
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Sistema eguneratzera doa\n"
 
-#: ../mdkapplet:527
-#, c-format
-msgid "No check"
-msgstr "Egiaztatzerik ez"
-
-#: ../mdkapplet:541
-#, c-format
-msgid "Checking config file: Not present\n"
-msgstr "Konfigurazio-fitxategia egiaztatzea: ez dago\n"
-
-#: ../mdkapplet:544
+#: ../mdkapplet:415
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Sare egiaztaketa: desgaituta dagoela dirudi\n"
 
-#: ../mdkapplet:587
+#: ../mdkapplet:457 ../mdkupdate:118 ../mdkupdate:164
 #, c-format
-msgid "Logs"
-msgstr "Egunkariak"
-
-#: ../mdkapplet:603
-#, c-format
-msgid "Clear"
-msgstr "Garbitu"
+msgid "Warning"
+msgstr "Kontuz"
 
-#: ../mdkapplet:629
+#: ../mdkapplet:468
 #, c-format
 msgid "About..."
 msgstr "Honi buruz..."
 
-#: ../mdkapplet:631
+#: ../mdkapplet:472
 #, c-format
 msgid "Mandriva Online %s"
 msgstr "Mandriva Online %s"
 
-#: ../mdkapplet:635
+#: ../mdkapplet:473
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Copyright (C) %s Mandriva"
 
-#: ../mdkapplet:647
+#: ../mdkapplet:476
 #, c-format
 msgid "Mandriva Online gives access to Mandriva web services."
 msgstr "Mandriva Online-k Mandriva web zerbitzuetara sarbidea ematen du."
 
-#: ../mdkapplet:655
-#, c-format
-msgid "Always launch on startup"
-msgstr "Jaurti beti hasterakoan"
-
-#: ../mdkapplet:657
-#, c-format
-msgid "Quit"
-msgstr "Irten"
-
-#: ../mdkonline:58
-#, c-format
-msgid ""
-"mdonline version %s\n"
-"Copyright (C) %s Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"mdonline %s bertsioa\n"
-"Copyright © %s Mandriva.\n"
-"Software librea da, eta birbana daiteke GNU GPL lizentziaren baldintzak "
-"betetzen badira.\n"
-"\n"
-"erabilera:\n"
-
-#: ../mdkonline:63 ../mdkupdate:73
-#, c-format
-msgid "  --help\t\t- print this help message.\n"
-msgstr "  --help\t\t- laguntza-mezu hau inprimatzen du.\n"
-
-#: ../mdkonline:64
-#, c-format
-msgid "  --box=\t\t\t- hostname.\n"
-msgstr "  --box=\t\t\t- ostalarizena.\n"
-
-#: ../mdkonline:65
-#, c-format
-msgid "  --country\t\t\t- name of country of the user. \n"
-msgstr "  --country\t\t\t- erabiltzaile herrialdearen izena. \n"
-
-#: ../mdkonline:66
-#, c-format
-msgid "  --interactive\t\t- use the interactive mode.\n"
-msgstr "  --interactive\t\t- erabili modu interaktiboa.\n"
-
-#: ../mdkonline:67
-#, c-format
-msgid "  --nointeractive\t- use the non-interactive mode.\n"
-msgstr "  --nointeractive\t- erabili modu ez interaktiboa.\n"
-
-#: ../mdkonline:68
-#, c-format
-msgid "  --login=\t\t     - login name of the user.\n"
-msgstr "  --login=\t\t     - erabiltzailearen sarrera izena.\n"
-
-#: ../mdkonline:69
-#, c-format
-msgid "  --pass=\t\t\t- password  of the user.\n"
-msgstr "  --pass=\t\t\t- erabiltzailearen pasahitza.\n"
-
-#: ../mdkonline:87 ../mdkonline:120
-#, c-format
-msgid "Mandriva Online"
-msgstr "Mandriva Online"
-
-#: ../mdkonline:90
-#, c-format
-msgid "I already have an account"
-msgstr "Dagoeneko kontu bat daukat"
-
-#: ../mdkonline:91
-#, c-format
-msgid "I want to subscribe"
-msgstr "Harpidetu nahi dut"
-
-#: ../mdkonline:96
-#, c-format
-msgid "Mr."
-msgstr "Jn."
-
-#: ../mdkonline:96
-#, c-format
-msgid "Mrs."
-msgstr "And."
-
-#: ../mdkonline:96
-#, c-format
-msgid "Ms."
-msgstr "Adño."
-
-#: ../mdkonline:114
-#, c-format
-msgid "Reading configuration\n"
-msgstr "Konfigurazioa irakurtzen\n"
-
-#: ../mdkonline:123
-#, c-format
-msgid ""
-"This assistant will help you to upload your configuration\n"
-"(packages, hardware configuration) to a centralized database in\n"
-"order to keep you informed about security updates and useful upgrades.\n"
-msgstr ""
-"honek zure konfigurazioa (paketeak, hardware-konfigurazioa) datu-base\n"
-"zentralizatu batera kargatzen lagunduko dizu, segurtasun-eguneratzeeieta "
-"bertsio-berritzeei buruzko informazioa jaso ahal izan dezazun.\n"
-
-#: ../mdkonline:131
-#, c-format
-msgid "Account creation or authentication"
-msgstr "Kontu sorrera edo egiaztapena"
-
-#: ../mdkonline:136
-#, c-format
-msgid "Enter your Mandriva Online login, password and machine name:"
-msgstr ""
-"Idatzi Mandriva Online-n sartzeko erabiltzaile-izena, pasahitza eta makina-"
-"izena:"
-
-#: ../mdkonline:142 ../mdkonline:195
-#, c-format
-msgid "Email address:"
-msgstr "Post@ helbidea:"
-
-#: ../mdkonline:143
-#, c-format
-msgid "Country"
-msgstr "Estatua"
-
-#: ../mdkonline:144 ../mdkonline:196
-#, c-format
-msgid "Password:"
-msgstr "Pasahitza:"
-
-#: ../mdkonline:146
-#, c-format
-msgid "Machine description:"
-msgstr "Makinaren deskribapena :"
-
-#: ../mdkonline:147
-#, c-format
-msgid "(Ex: My Home Office's Computer)"
-msgstr "(Adib: Nere Bulegoko Konputagailua)"
-
-#: ../mdkonline:152 ../mdkonline:159 ../mdkonline:180 ../mdkonline:204
-#: ../mdkonline:208 ../mdkonline:212 ../mdkonline:217 ../mdkupdate:141
-#: ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
-#, c-format
-msgid "Error"
-msgstr "Errorea"
-
-#: ../mdkonline:152
-#, c-format
-msgid "Machine name must be 1 to 40 alphanumerical characters"
-msgstr "Makina izena 1 eta 40 alfazenbakizko karaktere artean izan behar ditu"
-
-#: ../mdkonline:155
-#, c-format
-msgid "Connecting to Mandriva Online website..."
-msgstr "Mandriva Online webgunera konektatzen..."
-
-#: ../mdkonline:167
-#, c-format
-msgid ""
-"In order to benefit from Mandriva Online services,\n"
-"we are about to upload your configuration.\n"
-"\n"
-"The Wizard will now send the following information to Mandriva:\n"
-"\n"
-"1) the list of packages you have installed on your system,\n"
-"\n"
-"2) your hardware configuration.\n"
-"\n"
-"If you feel uncomfortable by that idea, or do not want to benefit from this "
-"service,\n"
-"please press 'Cancel'. By pressing 'Next', you allow us to keep you "
-"informed\n"
-"about security updates and useful upgrades via personalized email alerts.\n"
-"Furthermore, you benefit from discounted paid support services on\n"
-"www.mandrivaexpert.com."
-msgstr ""
-"Zure konfigurazioa kargatzera goaz, Mandriva Online\n"
-"zerbitzuez balia zaitezen.\n"
-"\n"
-"Morroiak honako informazioa bidaliko du Mandriva-era:\n"
-"\n"
-"1) sisteman instalatuta dituzun paketeen zerrenda,\n"
-"\n"
-"2) zure hardware-konfigurazioa.\n"
-"\n"
-"Ondo iruditzen ez bazaizu, edo zerbitzu hori erabili nahi ez baduzu,\n"
-"hautatu 'Utzi'. 'Hurrengoa' hautatzen baduzu, posta-alerta "
-"pertsonalizatuen \n"
-"bidez segurtasun-eguneratzeei eta bertsio-berriei buruzko informazioa \n"
-"bidaltzeko baimena emango diguzu. Horretaz gainera, \n"
-"www.mandrivaexpert.com guneko zerbitzuetan deskontua izango duzu."
-
-#: ../mdkonline:180
-#, c-format
-msgid "Connection problem"
-msgstr "Konexio-arazoa"
-
-#: ../mdkonline:180
-#, c-format
-msgid "Problem occurs when uploading files, please try again"
-msgstr "Arazoa fitxategiak igotzerakoan gertatzen da, saiatu berriro mesedez"
-
-#: ../mdkonline:187
-#, c-format
-msgid "Create a Mandriva Online Account"
-msgstr "Sortu Mandriva Online kontua"
-
-#. -PO: that is for things like "Mr", "Ms",...
-#: ../mdkonline:192
-#, c-format
-msgid "Greeting:"
-msgstr "Ongietorri:"
-
-#: ../mdkonline:193
-#, c-format
-msgid "First name:"
-msgstr "Izena:"
-
-#: ../mdkonline:194
-#, c-format
-msgid "Last name:"
-msgstr "Abizena:"
-
-#: ../mdkonline:197
-#, c-format
-msgid "Confirm Password:"
-msgstr "Berretsi pasahitza:"
-
-#: ../mdkonline:204
-#, c-format
-msgid ""
-"The passwords do not match\n"
-" Please try again\n"
-msgstr ""
-"Pasahitzak ez datoz bat\n"
-" Saiatu berriro\n"
-
-#: ../mdkonline:208
-#, c-format
-msgid "Please fill in each field"
-msgstr "Mesedez bete eremu bakoitza"
-
-#: ../mdkonline:212
-#, c-format
-msgid "Not a valid mail address!\n"
-msgstr "Helbide elektronikoa baliogabea da!\n"
-
-#: ../mdkonline:217
-#, c-format
-msgid "Creating account failed!"
-msgstr "Kontu sorrerak huts egin du!"
-
-#: ../mdkonline:225
-#, c-format
-msgid ""
-"Mandriva Online Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
-msgstr ""
-"Mandriva Online Kontu sorrera arrakastatsua.\n"
-"Mesedez klikatu \"Hurrengoa\" egiaztatu eta zure konfigurazioa igotzeko\n"
-
-#: ../mdkonline:229
-#, c-format
-msgid "Your upload was successful!"
-msgstr "Behar bezala kargatu da!"
-
-#: ../mdkonline:229
+#: ../mdkapplet:478
 #, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandriva Online."
-msgstr ""
-"Hemendik aurrera, segurtasunari eta eguneratzeei buruzko \n"
-"berriak jasoko dituzu Mandriva Online-ri esker."
+msgid "Online WebSite"
+msgstr "Lerroko Webgunea"
 
-#: ../mdkonline:229
+#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
+#: ../mdkapplet:483
 #, c-format
-msgid ""
-"Mandriva Online offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
+msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
-"Mandriva Online-k eguneratzeak automatizatzeko aukera eskaintzen dizu.\n"
-"Aldika programa bat exekutatuko da zure sisteman eguneratzeak bilatzeko.\n"
-
-#: ../mdkonline:238
-#, c-format
-msgid "Congratulations"
-msgstr "Zorionak"
-
-#: ../mdkonline:238
-#, c-format
-msgid "Your Mandriva Online account has been successfully configured\n"
-msgstr "Zure Mandriva Online kontuaren konfiguraketa arrakastatsua izan da\n"
-
-#: ../mdkonline:253
-#, c-format
-msgid "Configuration uploaded successfully"
-msgstr "Konfigurazioa gorantz arrakastaz zamatu da"
 
-#: ../mdkonline:254
+#: ../mdkapplet:492
 #, c-format
-msgid "Problem uploading configuration"
-msgstr "Arazoa konfigurazioa gorantz zamatzean"
+msgid "Always launch on startup"
+msgstr "Jaurti beti hasterakoan"
 
-#: ../mdkonline:256
+#: ../mdkapplet:494
 #, c-format
-msgid ""
-"Cannot connect to Mandriva Online website: wrong login/password or router/"
-"firewall bad settings"
-msgstr ""
-"Ezin da mandrivaonline webgunera konektatu: erabiltzaile/pasahitz okerra edo "
-"bideratzaile/suhesi ezarpen okerrak"
+msgid "Quit"
+msgstr "Irten"
 
 #: ../mdkonline.pm:207
 #, c-format
@@ -824,6 +367,11 @@ msgstr ""
 "\n"
 "erabilera:\n"
 
+#: ../mdkupdate:73
+#, c-format
+msgid "  --help\t\t- print this help message.\n"
+msgstr "  --help\t\t- laguntza-mezu hau inprimatzen du.\n"
+
 #: ../mdkupdate:74
 #, c-format
 msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
@@ -853,11 +401,6 @@ msgstr ""
 "  --bundle file.bundle\t- sintaktikoki egiaztatu eta instalatu .bundle "
 "metainfo fitxategiko paketea.\n"
 
-#: ../mdkupdate:118 ../mdkupdate:164
-#, c-format
-msgid "Warning"
-msgstr "Kontuz"
-
 #. -PO: here Live Install is currently *NOT* translated on the desktop, so it's better to keep as it:
 #: ../mdkupdate:120
 #, c-format
@@ -868,11 +411,21 @@ msgstr ""
 "Aurrena sistema zure disko zurrunean instalatu behar duzu 'Live install' "
 "morroiarekin."
 
+#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
+#, c-format
+msgid "Please wait"
+msgstr "Itxaron"
+
 #: ../mdkupdate:123 ../mdkupdate:174
 #, c-format
 msgid "Preparing..."
 msgstr "Prestatzen..."
 
+#: ../mdkupdate:141 ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
+#, c-format
+msgid "Error"
+msgstr "Errorea"
+
 #: ../mdkupdate:141
 #, c-format
 msgid ""
@@ -884,6 +437,11 @@ msgstr ""
 "\n"
 "%s"
 
+#: ../mdkupdate:159 ../mdkupdate:188
+#, c-format
+msgid "An error occurred"
+msgstr "Errore bat izan da"
+
 #: ../mdkupdate:164
 #, c-format
 msgid ""
@@ -912,3 +470,309 @@ msgstr "Paketeak instalatzen...\n"
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "Ezin dira update_source euskarritik paketeak eguneratu.\n"
 
+#~ msgid "New bundles are available for your system"
+#~ msgstr "Zure sistemarentzako fardel berriak eskuragarri daude"
+
+#~ msgid "Service is not configured. Please click on \"Configure the service\""
+#~ msgstr ""
+#~ "Zerbitzua ez dago konfiguratuta. Mesedez sakatu \"Zerbitzua konfiguratu\""
+
+#~ msgid "Configure the service"
+#~ msgstr "Zerbitzua konfiguratu"
+
+#~ msgid "Check updates"
+#~ msgstr "Egiaztatu eguneratzeak"
+
+#~ msgid "Configure Now!"
+#~ msgstr "Konfiguratu orain!"
+
+#~ msgid "Actions"
+#~ msgstr "Ekintzak"
+
+#~ msgid "Configure"
+#~ msgstr "Konfiguratu"
+
+#~ msgid "See logs"
+#~ msgstr "Ikusi egunkariak"
+
+#~ msgid "Status"
+#~ msgstr "Egoera"
+
+#~ msgid "Close"
+#~ msgstr "Itxi"
+
+#~ msgid "Network Connection: "
+#~ msgstr "Sare-konexioa: "
+
+#~ msgid "Up"
+#~ msgstr "Badabil"
+
+#~ msgid "Down"
+#~ msgstr "Ez dabil"
+
+#~ msgid "Last check: "
+#~ msgstr "Azken egiaztatzea: "
+
+#~ msgid "Machine name:"
+#~ msgstr "Makina-izena:"
+
+#~ msgid "Updates: "
+#~ msgstr "Eguneraketak: "
+
+#~ msgid "Development release not supported by service"
+#~ msgstr "Garapen bertsioa zerbitzuaren sostengurik gabe"
+
+#~ msgid "Too old release not supported by service"
+#~ msgstr "Bertsio zaharregia zerbitzuaren sostengurik gabe"
+
+#~ msgid "Unknown state"
+#~ msgstr "Egoera ezezaguna"
+
+#~ msgid "Online services disabled. Contact Mandriva Online site\n"
+#~ msgstr ""
+#~ "Lineako zerbitzua desgaituta. Kontaktatu Mandriva Online gunearekin\n"
+
+#~ msgid "Wrong Password.\n"
+#~ msgstr "Pasahitza ez da zuzena\n"
+
+#~ msgid "Wrong Action or host or login.\n"
+#~ msgstr "Okerreko akzioa, ostalaria edo saio_hasiera.\n"
+
+#~ msgid ""
+#~ "Something is wrong with your network settings (check your route, firewall "
+#~ "or proxy settings)\n"
+#~ msgstr ""
+#~ "Zerbait gaizki dago zure sareko ezarpenetan (aztertu zure ibilbide, "
+#~ "suhesi edo proxy ezarpenak)\n"
+
+#~ msgid ""
+#~ "Problem occured while connecting to the server, please contact the "
+#~ "support team"
+#~ msgstr ""
+#~ "Arazo bat gertatu da zerbitzariarekin konektatzerakoan, mesedez jarri "
+#~ "euskarri taldearekin harremanetan"
+
+#~ msgid "Response from Mandriva Online server\n"
+#~ msgstr "Mandriva Online zerbitzaritik erantzuna\n"
+
+#~ msgid "No check"
+#~ msgstr "Egiaztatzerik ez"
+
+#~ msgid "Checking config file: Not present\n"
+#~ msgstr "Konfigurazio-fitxategia egiaztatzea: ez dago\n"
+
+#~ msgid "Logs"
+#~ msgstr "Egunkariak"
+
+#~ msgid "Clear"
+#~ msgstr "Garbitu"
+
+#~ msgid ""
+#~ "mdonline version %s\n"
+#~ "Copyright (C) %s Mandriva.\n"
+#~ "This is free software and may be redistributed under the terms of the GNU "
+#~ "GPL.\n"
+#~ "\n"
+#~ "usage:\n"
+#~ msgstr ""
+#~ "mdonline %s bertsioa\n"
+#~ "Copyright © %s Mandriva.\n"
+#~ "Software librea da, eta birbana daiteke GNU GPL lizentziaren baldintzak "
+#~ "betetzen badira.\n"
+#~ "\n"
+#~ "erabilera:\n"
+
+#~ msgid "  --box=\t\t\t- hostname.\n"
+#~ msgstr "  --box=\t\t\t- ostalarizena.\n"
+
+#~ msgid "  --country\t\t\t- name of country of the user. \n"
+#~ msgstr "  --country\t\t\t- erabiltzaile herrialdearen izena. \n"
+
+#~ msgid "  --interactive\t\t- use the interactive mode.\n"
+#~ msgstr "  --interactive\t\t- erabili modu interaktiboa.\n"
+
+#~ msgid "  --nointeractive\t- use the non-interactive mode.\n"
+#~ msgstr "  --nointeractive\t- erabili modu ez interaktiboa.\n"
+
+#~ msgid "  --login=\t\t     - login name of the user.\n"
+#~ msgstr "  --login=\t\t     - erabiltzailearen sarrera izena.\n"
+
+#~ msgid "  --pass=\t\t\t- password  of the user.\n"
+#~ msgstr "  --pass=\t\t\t- erabiltzailearen pasahitza.\n"
+
+#~ msgid "Mandriva Online"
+#~ msgstr "Mandriva Online"
+
+#~ msgid "I already have an account"
+#~ msgstr "Dagoeneko kontu bat daukat"
+
+#~ msgid "I want to subscribe"
+#~ msgstr "Harpidetu nahi dut"
+
+#~ msgid "Mr."
+#~ msgstr "Jn."
+
+#~ msgid "Mrs."
+#~ msgstr "And."
+
+#~ msgid "Ms."
+#~ msgstr "Adño."
+
+#~ msgid "Reading configuration\n"
+#~ msgstr "Konfigurazioa irakurtzen\n"
+
+#~ msgid ""
+#~ "This assistant will help you to upload your configuration\n"
+#~ "(packages, hardware configuration) to a centralized database in\n"
+#~ "order to keep you informed about security updates and useful upgrades.\n"
+#~ msgstr ""
+#~ "honek zure konfigurazioa (paketeak, hardware-konfigurazioa) datu-base\n"
+#~ "zentralizatu batera kargatzen lagunduko dizu, segurtasun-eguneratzeeieta "
+#~ "bertsio-berritzeei buruzko informazioa jaso ahal izan dezazun.\n"
+
+#~ msgid "Account creation or authentication"
+#~ msgstr "Kontu sorrera edo egiaztapena"
+
+#~ msgid "Enter your Mandriva Online login, password and machine name:"
+#~ msgstr ""
+#~ "Idatzi Mandriva Online-n sartzeko erabiltzaile-izena, pasahitza eta "
+#~ "makina-izena:"
+
+#~ msgid "Email address:"
+#~ msgstr "Post@ helbidea:"
+
+#~ msgid "Country"
+#~ msgstr "Estatua"
+
+#~ msgid "Password:"
+#~ msgstr "Pasahitza:"
+
+#~ msgid "Machine description:"
+#~ msgstr "Makinaren deskribapena :"
+
+#~ msgid "(Ex: My Home Office's Computer)"
+#~ msgstr "(Adib: Nere Bulegoko Konputagailua)"
+
+#~ msgid "Machine name must be 1 to 40 alphanumerical characters"
+#~ msgstr ""
+#~ "Makina izena 1 eta 40 alfazenbakizko karaktere artean izan behar ditu"
+
+#~ msgid "Connecting to Mandriva Online website..."
+#~ msgstr "Mandriva Online webgunera konektatzen..."
+
+#~ msgid ""
+#~ "In order to benefit from Mandriva Online services,\n"
+#~ "we are about to upload your configuration.\n"
+#~ "\n"
+#~ "The Wizard will now send the following information to Mandriva:\n"
+#~ "\n"
+#~ "1) the list of packages you have installed on your system,\n"
+#~ "\n"
+#~ "2) your hardware configuration.\n"
+#~ "\n"
+#~ "If you feel uncomfortable by that idea, or do not want to benefit from "
+#~ "this service,\n"
+#~ "please press 'Cancel'. By pressing 'Next', you allow us to keep you "
+#~ "informed\n"
+#~ "about security updates and useful upgrades via personalized email "
+#~ "alerts.\n"
+#~ "Furthermore, you benefit from discounted paid support services on\n"
+#~ "www.mandrivaexpert.com."
+#~ msgstr ""
+#~ "Zure konfigurazioa kargatzera goaz, Mandriva Online\n"
+#~ "zerbitzuez balia zaitezen.\n"
+#~ "\n"
+#~ "Morroiak honako informazioa bidaliko du Mandriva-era:\n"
+#~ "\n"
+#~ "1) sisteman instalatuta dituzun paketeen zerrenda,\n"
+#~ "\n"
+#~ "2) zure hardware-konfigurazioa.\n"
+#~ "\n"
+#~ "Ondo iruditzen ez bazaizu, edo zerbitzu hori erabili nahi ez baduzu,\n"
+#~ "hautatu 'Utzi'. 'Hurrengoa' hautatzen baduzu, posta-alerta "
+#~ "pertsonalizatuen \n"
+#~ "bidez segurtasun-eguneratzeei eta bertsio-berriei buruzko informazioa \n"
+#~ "bidaltzeko baimena emango diguzu. Horretaz gainera, \n"
+#~ "www.mandrivaexpert.com guneko zerbitzuetan deskontua izango duzu."
+
+#~ msgid "Connection problem"
+#~ msgstr "Konexio-arazoa"
+
+#~ msgid "Problem occurs when uploading files, please try again"
+#~ msgstr ""
+#~ "Arazoa fitxategiak igotzerakoan gertatzen da, saiatu berriro mesedez"
+
+#~ msgid "Create a Mandriva Online Account"
+#~ msgstr "Sortu Mandriva Online kontua"
+
+#~ msgid "Greeting:"
+#~ msgstr "Ongietorri:"
+
+#~ msgid "First name:"
+#~ msgstr "Izena:"
+
+#~ msgid "Last name:"
+#~ msgstr "Abizena:"
+
+#~ msgid "Confirm Password:"
+#~ msgstr "Berretsi pasahitza:"
+
+#~ msgid ""
+#~ "The passwords do not match\n"
+#~ " Please try again\n"
+#~ msgstr ""
+#~ "Pasahitzak ez datoz bat\n"
+#~ " Saiatu berriro\n"
+
+#~ msgid "Please fill in each field"
+#~ msgstr "Mesedez bete eremu bakoitza"
+
+#~ msgid "Not a valid mail address!\n"
+#~ msgstr "Helbide elektronikoa baliogabea da!\n"
+
+#~ msgid "Creating account failed!"
+#~ msgstr "Kontu sorrerak huts egin du!"
+
+#~ msgid ""
+#~ "Mandriva Online Account successfully created.\n"
+#~ "Please click \"Next\" to authenticate and upload your configuration\n"
+#~ msgstr ""
+#~ "Mandriva Online Kontu sorrera arrakastatsua.\n"
+#~ "Mesedez klikatu \"Hurrengoa\" egiaztatu eta zure konfigurazioa igotzeko\n"
+
+#~ msgid "Your upload was successful!"
+#~ msgstr "Behar bezala kargatu da!"
+
+#~ msgid ""
+#~ "From now you will receive on security and updates \n"
+#~ "announcements thanks to Mandriva Online."
+#~ msgstr ""
+#~ "Hemendik aurrera, segurtasunari eta eguneratzeei buruzko \n"
+#~ "berriak jasoko dituzu Mandriva Online-ri esker."
+
+#~ msgid ""
+#~ "Mandriva Online offers you the ability to automate the updates.\n"
+#~ "A program will run regulary in your system waiting for new updates\n"
+#~ msgstr ""
+#~ "Mandriva Online-k eguneratzeak automatizatzeko aukera eskaintzen dizu.\n"
+#~ "Aldika programa bat exekutatuko da zure sisteman eguneratzeak bilatzeko.\n"
+
+#~ msgid "Congratulations"
+#~ msgstr "Zorionak"
+
+#~ msgid "Your Mandriva Online account has been successfully configured\n"
+#~ msgstr ""
+#~ "Zure Mandriva Online kontuaren konfiguraketa arrakastatsua izan da\n"
+
+#~ msgid "Configuration uploaded successfully"
+#~ msgstr "Konfigurazioa gorantz arrakastaz zamatu da"
+
+#~ msgid "Problem uploading configuration"
+#~ msgstr "Arazoa konfigurazioa gorantz zamatzean"
+
+#~ msgid ""
+#~ "Cannot connect to Mandriva Online website: wrong login/password or router/"
+#~ "firewall bad settings"
+#~ msgstr ""
+#~ "Ezin da mandrivaonline webgunera konektatu: erabiltzaile/pasahitz okerra "
+#~ "edo bideratzaile/suhesi ezarpen okerrak"
diff --git a/po/fa.po b/po/fa.po
index ba00ea6a..9fc73d79 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline-fa\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-09 16:26+0200\n"
+"POT-Creation-Date: 2008-02-21 18:21+0100\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"
@@ -21,17 +21,17 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. -PO: here %s will be replaced by the local time (eg: "Will check updates at 14:03:50"
-#: ../mdkapplet:94
+#: ../mdkapplet:88
 #, fuzzy, c-format
 msgid "Will check updates at %s"
 msgstr "بررسی بروزسازی‌ها"
 
-#: ../mdkapplet:103
+#: ../mdkapplet:97
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "سیستم‌تان بروز است"
 
-#: ../mdkapplet:109
+#: ../mdkapplet:103
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -40,53 +40,43 @@ msgstr ""
 "اشکال تنظیم سرویس. لطفا ثبت‌ها را کنترل کرده و پستی را به "
 "support@mandrivaonline.com ارسال کنید"
 
-#: ../mdkapplet:115
+#: ../mdkapplet:110
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "لطفا صبر کنید، در حال یافتن بسته‌های موجود..."
 
-#: ../mdkapplet:121
+#: ../mdkapplet:116
 #, c-format
 msgid "New updates are available for your system"
 msgstr "بروزسازی‌هایی برای سیستم‌تان در دسترس است"
 
-#: ../mdkapplet:127
-#, fuzzy, c-format
-msgid "New bundles are available for your system"
-msgstr "بروزسازی‌هایی برای سیستم‌تان در دسترس است"
-
-#: ../mdkapplet:133
-#, c-format
-msgid "Service is not configured. Please click on \"Configure the service\""
-msgstr "سرویس تنظیم نشده است. لطفا بر \"تنظیم سرویس\" کلیک کنید"
-
-#: ../mdkapplet:139
+#: ../mdkapplet:122
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "شبکه پایین است. لطفا شبکه‌تان را تنظیم کنید"
 
-#: ../mdkapplet:145
+#: ../mdkapplet:128
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "سرویس فعال نشده است. لطفا بر \"وب‌گاه اینترنتی\" کلیک کنید"
 
-#: ../mdkapplet:151 ../mdkapplet:182
+#: ../mdkapplet:134 ../mdkapplet:165
 #, fuzzy, c-format
 msgid "urpmi database locked"
 msgstr "بانک اطلاعات urpmi قفل شده است"
 
-#: ../mdkapplet:157
+#: ../mdkapplet:140
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr "انتشار پشتیبانی نشده است (انتشار بسیار قدیمی، یا انتشار توسعه‌ای)"
 
-#: ../mdkapplet:163
+#: ../mdkapplet:146
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
 msgstr ""
 
-#: ../mdkapplet:169
+#: ../mdkapplet:152
 #, fuzzy, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -103,583 +93,133 @@ msgstr ""
 "\n"
 "پس از آن %s را دوباره شروع کنید."
 
-#: ../mdkapplet:174
+#: ../mdkapplet:157
 #, c-format
 msgid "Enabled"
 msgstr "به‌کارافتاده؟"
 
-#: ../mdkapplet:187
+#: ../mdkapplet:170
 #, c-format
 msgid "Error updating media"
 msgstr ""
 
-#: ../mdkapplet:202
+#: ../mdkapplet:185
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr "در حال بررسی... بروزسازی‌هایی در دسترس هستند\n"
 
-#: ../mdkapplet:207
+#: ../mdkapplet:190
 #, c-format
 msgid "Packages are up to date"
 msgstr ""
 
-#: ../mdkapplet:212
+#: ../mdkapplet:195
 #, fuzzy, c-format
 msgid "Failed to open urpmi database"
 msgstr "نمی‌توان rpmdb را باز کرد"
 
-#: ../mdkapplet:217 ../mdkapplet:324
+#: ../mdkapplet:200
 #, c-format
 msgid "Install updates"
 msgstr "نصب کردن بروزسازی‌ها"
 
-#: ../mdkapplet:218
-#, c-format
-msgid "Configure the service"
-msgstr "تنظیم سرویس"
-
-#: ../mdkapplet:219
+#: ../mdkapplet:201
 #, c-format
 msgid "Check Updates"
 msgstr "بررسی بروزسازی‌ها"
 
-#: ../mdkapplet:220 ../mdkapplet:327 ../mdkonline:114 ../mdkonline:155
-#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
-#, c-format
-msgid "Please wait"
-msgstr "لطفاً صبر کنید"
-
-#: ../mdkapplet:220 ../mdkapplet:326 ../mdkapplet:327
-#, c-format
-msgid "Check updates"
-msgstr "بررسی بروزسازی‌ها"
-
-#: ../mdkapplet:223 ../mdkapplet:648
-#, c-format
-msgid "Online WebSite"
-msgstr "وب‌گاه اینترنت"
-
-#: ../mdkapplet:224
+#: ../mdkapplet:202
 #, c-format
 msgid "Configure Network"
 msgstr "تنظیم شبکه"
 
-#: ../mdkapplet:225
-#, c-format
-msgid "Configure Now!"
-msgstr "تنظیم اکنون!"
-
-#: ../mdkapplet:313 ../mdkapplet:392
-#, c-format
-msgid "Mandriva Linux Updates Applet"
-msgstr "برنامک بروزسازی ﻡﺎﻧﺩﺭیﺑﺍ "
-
-#: ../mdkapplet:322
-#, c-format
-msgid "Actions"
-msgstr "کنش‌ها"
-
-#: ../mdkapplet:325
-#, c-format
-msgid "Configure"
-msgstr "تنظیم"
-
-#: ../mdkapplet:329
-#, c-format
-msgid "See logs"
-msgstr "دیدن ثبت‌ها"
-
-#: ../mdkapplet:332
-#, c-format
-msgid "Status"
-msgstr "وضعیت"
-
-#: ../mdkapplet:336 ../mdkapplet:597
-#, c-format
-msgid "Close"
-msgstr "بستن"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Network Connection: "
-msgstr "اتصال شبکه: "
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Up"
-msgstr "بالا"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Down"
-msgstr "پایین"
-
-#: ../mdkapplet:366
-#, c-format
-msgid "Last check: "
-msgstr "آخرین بررسی: "
-
-#: ../mdkapplet:367 ../mdkonline:145
-#, c-format
-msgid "Machine name:"
-msgstr "نام ماشین:"
-
-#: ../mdkapplet:368
-#, c-format
-msgid "Updates: "
-msgstr "بروزسازی‌ها: "
-
-#: ../mdkapplet:372
+#: ../mdkapplet:283
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "راه انداختن drakconnect\n"
 
-#: ../mdkapplet:375
+#: ../mdkapplet:286
 #, c-format
 msgid "Mandriva Online seems to be reinstalled, reloading applet ...."
 msgstr ""
 "بنظر می‌رسد که Mandriva Online نصب مجدد شده است، برنامک بارگذاری مجدد "
 "می‌شود ..."
 
-#: ../mdkapplet:383
+#: ../mdkapplet:294
 #, c-format
 msgid "Launching MandrivaUpdate\n"
 msgstr "به راه انداختن MandrivaUpdate\n"
 
-#: ../mdkapplet:398
+#: ../mdkapplet:303
+#, c-format
+msgid "Mandriva Linux Updates Applet"
+msgstr "برنامک بروزسازی ﻡﺎﻧﺩﺭیﺑﺍ "
+
+#: ../mdkapplet:308
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "در حال محاسبه کردن بروزسازی‌های جدید...\n"
 
-#: ../mdkapplet:399
+#: ../mdkapplet:309
 #, c-format
 msgid "Connecting to"
 msgstr "در حال اتصال به"
 
-#: ../mdkapplet:467 ../mdkupdate:159 ../mdkupdate:188
-#, c-format
-msgid "An error occurred"
-msgstr "خطائی رخ داد"
-
-#: ../mdkapplet:475
-#, c-format
-msgid "Development release not supported by service"
-msgstr "انتشار توسعه‌ای بوسیله‌ی سرویس پشتیبانی نمی‌شود"
-
-#: ../mdkapplet:476
-#, c-format
-msgid "Too old release not supported by service"
-msgstr "انتشار بسیار قدیمی بوسیله‌ی سرویس پشتیبانی نمی‌شود"
-
-#: ../mdkapplet:477
-#, c-format
-msgid "Unknown state"
-msgstr "وضعیت ناشناخته"
-
-#: ../mdkapplet:478
-#, c-format
-msgid "Online services disabled. Contact Mandriva Online site\n"
-msgstr ""
-"سرویس‌های اینترنتی از کار افتاده‌اند. با وبگاه Mandriva Online تماس بگیرید\n"
-
-#: ../mdkapplet:479
-#, c-format
-msgid "Wrong Password.\n"
-msgstr "گذرواژه‌ی اشتباه\n"
-
-#: ../mdkapplet:480
-#, c-format
-msgid "Wrong Action or host or login.\n"
-msgstr "کنش یا میزبان یا ثبت‌ورود اشتباه.\n"
-
-#: ../mdkapplet:481
-#, c-format
-msgid ""
-"Something is wrong with your network settings (check your route, firewall or "
-"proxy settings)\n"
-msgstr ""
-"تنظیمات شبکه شما اشکال دارد (تنظیمات مسیریاب، دیوار آتش یا پراکسی خود را "
-"بررسی کنید)\n"
-
-#: ../mdkapplet:483
-#, c-format
-msgid ""
-"Problem occured while connecting to the server, please contact the support "
-"team"
-msgstr ""
-"اشکالی هنگام اتصال به کارگزار رخ داد، لطفا با گروه پشتیبانی تماس بگیرید"
-
-#: ../mdkapplet:487
-#, c-format
-msgid "Response from Mandriva Online server\n"
-msgstr "پاسخ از کارگزار Mandriva Online\n"
-
-#: ../mdkapplet:490
+#: ../mdkapplet:386
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "سیستم به روز است\n"
 
-#: ../mdkapplet:527
-#, c-format
-msgid "No check"
-msgstr "بدون بررسی"
-
-#: ../mdkapplet:541
-#, c-format
-msgid "Checking config file: Not present\n"
-msgstr "بررسی کردن پرونده‌ی config: حضور ندارد\n"
-
-#: ../mdkapplet:544
+#: ../mdkapplet:415
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "بررسی کردن شبکه: بنظر از کار افتاده است\n"
 
-#: ../mdkapplet:587
-#, c-format
-msgid "Logs"
-msgstr "ثبت‌ها"
-
-#: ../mdkapplet:603
+#: ../mdkapplet:457 ../mdkupdate:118 ../mdkupdate:164
 #, c-format
-msgid "Clear"
-msgstr "پاک کردن"
+msgid "Warning"
+msgstr "هشدار"
 
-#: ../mdkapplet:629
+#: ../mdkapplet:468
 #, c-format
 msgid "About..."
 msgstr "درباره‌ی.."
 
-#: ../mdkapplet:631
+#: ../mdkapplet:472
 #, fuzzy, c-format
 msgid "Mandriva Online %s"
 msgstr "ﻡﺎﻧﺩﺭیﺑﺍ بر اینترنت"
 
-#: ../mdkapplet:635
+#: ../mdkapplet:473
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr ""
 
-#: ../mdkapplet:647
+#: ../mdkapplet:476
 #, c-format
 msgid "Mandriva Online gives access to Mandriva web services."
 msgstr ""
 
-#: ../mdkapplet:655
-#, c-format
-msgid "Always launch on startup"
-msgstr "راه‌اندازی همیشگی در شروع"
-
-#: ../mdkapplet:657
-#, c-format
-msgid "Quit"
-msgstr "ترک"
-
-#: ../mdkonline:58
-#, c-format
-msgid ""
-"mdonline version %s\n"
-"Copyright (C) %s Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"mdonline نسخه %s\n"
-"حق نسخه‌برداری (C) %s Mandriva.\n"
-"این نرم‌ افزار آزاد است ومی‌تواند تحت شروط GNU GPL پخش مجدد گردد.\n"
-"\n"
-"طرز استفاده:\n"
-
-#: ../mdkonline:63 ../mdkupdate:73
-#, c-format
-msgid "  --help\t\t- print this help message.\n"
-msgstr "  --help\t\t- چاپ این پیام راهنما.\n"
-
-#: ../mdkonline:64
-#, c-format
-msgid "  --box=\t\t\t- hostname.\n"
-msgstr ""
-
-#: ../mdkonline:65
-#, c-format
-msgid "  --country\t\t\t- name of country of the user. \n"
-msgstr ""
-
-#: ../mdkonline:66
-#, c-format
-msgid "  --interactive\t\t- use the interactive mode.\n"
-msgstr ""
-
-#: ../mdkonline:67
-#, c-format
-msgid "  --nointeractive\t- use the non-interactive mode.\n"
-msgstr ""
-
-#: ../mdkonline:68
-#, c-format
-msgid "  --login=\t\t     - login name of the user.\n"
-msgstr ""
-
-#: ../mdkonline:69
-#, c-format
-msgid "  --pass=\t\t\t- password  of the user.\n"
-msgstr ""
-
-#: ../mdkonline:87 ../mdkonline:120
-#, c-format
-msgid "Mandriva Online"
-msgstr "ﻡﺎﻧﺩﺭیﺑﺍ بر اینترنت"
-
-#: ../mdkonline:90
-#, c-format
-msgid "I already have an account"
-msgstr "من از قبل یک حساب دارم"
-
-#: ../mdkonline:91
-#, c-format
-msgid "I want to subscribe"
-msgstr "میخواهم مشترک شوم"
-
-#: ../mdkonline:96
-#, c-format
-msgid "Mr."
-msgstr "آقای"
-
-#: ../mdkonline:96
-#, c-format
-msgid "Mrs."
-msgstr "خانم"
-
-#: ../mdkonline:96
-#, c-format
-msgid "Ms."
-msgstr "خانم"
-
-#: ../mdkonline:114
-#, c-format
-msgid "Reading configuration\n"
-msgstr "خواندن پیکربندی\n"
-
-#: ../mdkonline:123
-#, c-format
-msgid ""
-"This assistant will help you to upload your configuration\n"
-"(packages, hardware configuration) to a centralized database in\n"
-"order to keep you informed about security updates and useful upgrades.\n"
-msgstr ""
-"این دستیار به شما در باردهی پیکربندی‌تان (بسته‌ها، پیکربندی سخت‌افزار)\n"
-"به بانک اطلاعاتی مرکزی بمنظور اطلاع رسانی به شما درباره‌ی بروزسازی‌ها و\n"
-"ارتقاهای مفید کمک خواهد کرد.\n"
-
-#: ../mdkonline:131
-#, c-format
-msgid "Account creation or authentication"
-msgstr "ایجاد حساب یا تأیید هویت"
-
-#: ../mdkonline:136
-#, c-format
-msgid "Enter your Mandriva Online login, password and machine name:"
-msgstr "نام ماشین، گذرواژه و ثبت‌ورود Mandriva Online خود را وارد کنید:"
-
-#: ../mdkonline:142 ../mdkonline:195
-#, fuzzy, c-format
-msgid "Email address:"
-msgstr "نشانی پست ارسال شونده"
-
-#: ../mdkonline:143
-#, c-format
-msgid "Country"
-msgstr "کانتری"
-
-#: ../mdkonline:144 ../mdkonline:196
-#, c-format
-msgid "Password:"
-msgstr "گذرواژه:"
-
-#: ../mdkonline:146
-#, fuzzy, c-format
-msgid "Machine description:"
-msgstr "نام ماشین:"
-
-#: ../mdkonline:147
-#, c-format
-msgid "(Ex: My Home Office's Computer)"
-msgstr ""
-
-#: ../mdkonline:152 ../mdkonline:159 ../mdkonline:180 ../mdkonline:204
-#: ../mdkonline:208 ../mdkonline:212 ../mdkonline:217 ../mdkupdate:141
-#: ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
-#, c-format
-msgid "Error"
-msgstr "خطا"
-
-#: ../mdkonline:152
-#, fuzzy, c-format
-msgid "Machine name must be 1 to 40 alphanumerical characters"
-msgstr "نقاط سوارسازی فقط باید حاوی نویسه‌های الفبا باشند"
-
-#: ../mdkonline:155
-#, c-format
-msgid "Connecting to Mandriva Online website..."
-msgstr "در حال اتصال به وبگاه اینترنتی ﻡﺎﻧﺩﺭیﺑﺍ ..."
-
-#: ../mdkonline:167
-#, c-format
-msgid ""
-"In order to benefit from Mandriva Online services,\n"
-"we are about to upload your configuration.\n"
-"\n"
-"The Wizard will now send the following information to Mandriva:\n"
-"\n"
-"1) the list of packages you have installed on your system,\n"
-"\n"
-"2) your hardware configuration.\n"
-"\n"
-"If you feel uncomfortable by that idea, or do not want to benefit from this "
-"service,\n"
-"please press 'Cancel'. By pressing 'Next', you allow us to keep you "
-"informed\n"
-"about security updates and useful upgrades via personalized email alerts.\n"
-"Furthermore, you benefit from discounted paid support services on\n"
-"www.mandrivaexpert.com."
-msgstr ""
-"برای بهره بردن از خدمات اینترنتی ﻡﺎﻧﺩﺭیﺑﺍ ،\n"
-"ما در شرف باردهی پیکربندیتان هستیم.\n"
-"\n"
-"این جادوگر اطلاعات بدنبال آمده را اکنون به نرم افزار ﻡﺎﻧﺩﺭیﺑﺍ خواهد فرستاد:\n"
-"\n"
-"۱) لیست بسته‌هایی که بر سیستم‌تان نصب شده‌اند،\n"
-"\n"
-"۲) تنظیم سخت‌افزارتان.\n"
-"\n"
-"اگر با این نظر موافق نیستید، یا نمیخواهید از این خدمات بهره ببرید،\n"
-"لطفاً 'لغو' را فشار دهید. با فشار دادن 'بعدی'، به ما اجازه میدهید تا\n"
-"شما را از بروزسازیهای امنیتی و ارتقاهای مفید از طریق هشدارهای\n"
-"پست خصوصی آگاه سازیم.\n"
-"بعلاوه، شما از تخفیف پرداخت خدمات پشتیبانی بر\n"
-"www.mandrivaexpert.com بهره میگیرید."
-
-#: ../mdkonline:180
-#, c-format
-msgid "Connection problem"
-msgstr "مشکل اتصال"
-
-#: ../mdkonline:180
-#, c-format
-msgid "Problem occurs when uploading files, please try again"
-msgstr "اشکالی هنگام باردهی پرونده‌ها رخ داد، لطفا دوباره تلاش کنید"
-
-#: ../mdkonline:187
-#, c-format
-msgid "Create a Mandriva Online Account"
-msgstr "ایجاد حساب Mandriva Online"
-
-#. -PO: that is for things like "Mr", "Ms",...
-#: ../mdkonline:192
-#, fuzzy, c-format
-msgid "Greeting:"
-msgstr "سبز"
-
-#: ../mdkonline:193
-#, c-format
-msgid "First name:"
-msgstr "نام کوچک:"
-
-#: ../mdkonline:194
-#, fuzzy, c-format
-msgid "Last name:"
-msgstr "نام کوچک:"
-
-#: ../mdkonline:197
-#, c-format
-msgid "Confirm Password:"
-msgstr "تصدیق گذرواژه:"
-
-#: ../mdkonline:204
-#, c-format
-msgid ""
-"The passwords do not match\n"
-" Please try again\n"
-msgstr ""
-"گذرواژه‌ها مطابقت نمی‌کنند\n"
-" لطفاً دوباره امتحان کنید\n"
-
-#: ../mdkonline:208
-#, fuzzy, c-format
-msgid "Please fill in each field"
-msgstr "لطفاً همه‌ی محوطه‌ها را پر کنید\n"
-
-#: ../mdkonline:212
-#, c-format
-msgid "Not a valid mail address!\n"
-msgstr "نشانی پست معتبری نیست!\n"
-
-#: ../mdkonline:217
-#, c-format
-msgid "Creating account failed!"
-msgstr ""
-
-#: ../mdkonline:225
-#, c-format
-msgid ""
-"Mandriva Online Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
-msgstr ""
-"حساب اینترنتی ﻡﺎﻧﺩﺭیﺑﺍ با موفقیت ایجاد گردید.\n"
-"لطفا برای تأیید باردهی پیکربندیتان \"بعدی\" را کلیک کنید\n"
-
-#: ../mdkonline:229
-#, c-format
-msgid "Your upload was successful!"
-msgstr "باردهی‌تان موفق بود!"
-
-#: ../mdkonline:229
+#: ../mdkapplet:478
 #, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandriva Online."
-msgstr ""
-"از اکنون شما آگهی‌های بروزسازی‌های امنیتی را به\n"
-"لطف Mandriva Online دریافت خواهید کرد."
+msgid "Online WebSite"
+msgstr "وب‌گاه اینترنت"
 
-#: ../mdkonline:229
+#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
+#: ../mdkapplet:483
 #, c-format
-msgid ""
-"Mandriva Online offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
+msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
-"Mandriva Online به شما توانائی بروزسازی خودکار را ارائه می‌دهد.\n"
-"برنامه‌ای در سیستم‌تان بطور متناوب اجرا شده و منتظر بروزسازی‌های جدید خواهد "
-"بود\n"
 
-#: ../mdkonline:238
+#: ../mdkapplet:492
 #, c-format
-msgid "Congratulations"
-msgstr "تبریکات"
-
-#: ../mdkonline:238
-#, c-format
-msgid "Your Mandriva Online account has been successfully configured\n"
-msgstr "حساب اینترنتی ﻡﺎﻧﺩﺭیﺑﺍ شما با موفقیت پیکربندی شده است\n"
-
-#: ../mdkonline:253
-#, c-format
-msgid "Configuration uploaded successfully"
-msgstr "تنظیمات با موفقیت باردهی‌ شد"
-
-#: ../mdkonline:254
-#, c-format
-msgid "Problem uploading configuration"
-msgstr "اشکالی در باردهی پیکربندی وجود دارد"
+msgid "Always launch on startup"
+msgstr "راه‌اندازی همیشگی در شروع"
 
-#: ../mdkonline:256
+#: ../mdkapplet:494
 #, c-format
-msgid ""
-"Cannot connect to Mandriva Online website: wrong login/password or router/"
-"firewall bad settings"
-msgstr ""
-"نمی‌توان به پایگاه mandrivaonline متصل شد: ثبت‌ورود/گذرواژه اشتباه یا تنظیمهای "
-"بد مسیریاب/دیوارآتش"
+msgid "Quit"
+msgstr "ترک"
 
 #: ../mdkonline.pm:207
 #, fuzzy, c-format
@@ -817,6 +357,11 @@ msgstr ""
 "\n"
 "طرز استفاده:\n"
 
+#: ../mdkupdate:73
+#, c-format
+msgid "  --help\t\t- print this help message.\n"
+msgstr "  --help\t\t- چاپ این پیام راهنما.\n"
+
 #: ../mdkupdate:74
 #, c-format
 msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
@@ -844,11 +389,6 @@ msgid ""
 "file.\n"
 msgstr ""
 
-#: ../mdkupdate:118 ../mdkupdate:164
-#, c-format
-msgid "Warning"
-msgstr "هشدار"
-
 #. -PO: here Live Install is currently *NOT* translated on the desktop, so it's better to keep as it:
 #: ../mdkupdate:120
 #, c-format
@@ -857,11 +397,21 @@ msgid ""
 "Install' wizard."
 msgstr ""
 
+#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
+#, c-format
+msgid "Please wait"
+msgstr "لطفاً صبر کنید"
+
 #: ../mdkupdate:123 ../mdkupdate:174
 #, c-format
 msgid "Preparing..."
 msgstr "در حال آماده کردن..."
 
+#: ../mdkupdate:141 ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
+#, c-format
+msgid "Error"
+msgstr "خطا"
+
 #: ../mdkupdate:141
 #, c-format
 msgid ""
@@ -870,6 +420,11 @@ msgid ""
 "%s"
 msgstr ""
 
+#: ../mdkupdate:159 ../mdkupdate:188
+#, c-format
+msgid "An error occurred"
+msgstr "خطائی رخ داد"
+
 #: ../mdkupdate:164
 #, c-format
 msgid ""
@@ -894,6 +449,290 @@ msgstr "نصب بسته‌ها...\n"
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "قادر نبودن به بروزسازی بسته‌ها از رسانه‌ی update_source.\n"
 
+#, fuzzy
+#~ msgid "New bundles are available for your system"
+#~ msgstr "بروزسازی‌هایی برای سیستم‌تان در دسترس است"
+
+#~ msgid "Service is not configured. Please click on \"Configure the service\""
+#~ msgstr "سرویس تنظیم نشده است. لطفا بر \"تنظیم سرویس\" کلیک کنید"
+
+#~ msgid "Configure the service"
+#~ msgstr "تنظیم سرویس"
+
+#~ msgid "Check updates"
+#~ msgstr "بررسی بروزسازی‌ها"
+
+#~ msgid "Configure Now!"
+#~ msgstr "تنظیم اکنون!"
+
+#~ msgid "Actions"
+#~ msgstr "کنش‌ها"
+
+#~ msgid "Configure"
+#~ msgstr "تنظیم"
+
+#~ msgid "See logs"
+#~ msgstr "دیدن ثبت‌ها"
+
+#~ msgid "Status"
+#~ msgstr "وضعیت"
+
+#~ msgid "Close"
+#~ msgstr "بستن"
+
+#~ msgid "Network Connection: "
+#~ msgstr "اتصال شبکه: "
+
+#~ msgid "Up"
+#~ msgstr "بالا"
+
+#~ msgid "Down"
+#~ msgstr "پایین"
+
+#~ msgid "Last check: "
+#~ msgstr "آخرین بررسی: "
+
+#~ msgid "Machine name:"
+#~ msgstr "نام ماشین:"
+
+#~ msgid "Updates: "
+#~ msgstr "بروزسازی‌ها: "
+
+#~ msgid "Development release not supported by service"
+#~ msgstr "انتشار توسعه‌ای بوسیله‌ی سرویس پشتیبانی نمی‌شود"
+
+#~ msgid "Too old release not supported by service"
+#~ msgstr "انتشار بسیار قدیمی بوسیله‌ی سرویس پشتیبانی نمی‌شود"
+
+#~ msgid "Unknown state"
+#~ msgstr "وضعیت ناشناخته"
+
+#~ msgid "Online services disabled. Contact Mandriva Online site\n"
+#~ msgstr ""
+#~ "سرویس‌های اینترنتی از کار افتاده‌اند. با وبگاه Mandriva Online تماس بگیرید\n"
+
+#~ msgid "Wrong Password.\n"
+#~ msgstr "گذرواژه‌ی اشتباه\n"
+
+#~ msgid "Wrong Action or host or login.\n"
+#~ msgstr "کنش یا میزبان یا ثبت‌ورود اشتباه.\n"
+
+#~ msgid ""
+#~ "Something is wrong with your network settings (check your route, firewall "
+#~ "or proxy settings)\n"
+#~ msgstr ""
+#~ "تنظیمات شبکه شما اشکال دارد (تنظیمات مسیریاب، دیوار آتش یا پراکسی خود را "
+#~ "بررسی کنید)\n"
+
+#~ msgid ""
+#~ "Problem occured while connecting to the server, please contact the "
+#~ "support team"
+#~ msgstr ""
+#~ "اشکالی هنگام اتصال به کارگزار رخ داد، لطفا با گروه پشتیبانی تماس بگیرید"
+
+#~ msgid "Response from Mandriva Online server\n"
+#~ msgstr "پاسخ از کارگزار Mandriva Online\n"
+
+#~ msgid "No check"
+#~ msgstr "بدون بررسی"
+
+#~ msgid "Checking config file: Not present\n"
+#~ msgstr "بررسی کردن پرونده‌ی config: حضور ندارد\n"
+
+#~ msgid "Logs"
+#~ msgstr "ثبت‌ها"
+
+#~ msgid "Clear"
+#~ msgstr "پاک کردن"
+
+#~ msgid ""
+#~ "mdonline version %s\n"
+#~ "Copyright (C) %s Mandriva.\n"
+#~ "This is free software and may be redistributed under the terms of the GNU "
+#~ "GPL.\n"
+#~ "\n"
+#~ "usage:\n"
+#~ msgstr ""
+#~ "mdonline نسخه %s\n"
+#~ "حق نسخه‌برداری (C) %s Mandriva.\n"
+#~ "این نرم‌ افزار آزاد است ومی‌تواند تحت شروط GNU GPL پخش مجدد گردد.\n"
+#~ "\n"
+#~ "طرز استفاده:\n"
+
+#~ msgid "Mandriva Online"
+#~ msgstr "ﻡﺎﻧﺩﺭیﺑﺍ بر اینترنت"
+
+#~ msgid "I already have an account"
+#~ msgstr "من از قبل یک حساب دارم"
+
+#~ msgid "I want to subscribe"
+#~ msgstr "میخواهم مشترک شوم"
+
+#~ msgid "Mr."
+#~ msgstr "آقای"
+
+#~ msgid "Mrs."
+#~ msgstr "خانم"
+
+#~ msgid "Ms."
+#~ msgstr "خانم"
+
+#~ msgid "Reading configuration\n"
+#~ msgstr "خواندن پیکربندی\n"
+
+#~ msgid ""
+#~ "This assistant will help you to upload your configuration\n"
+#~ "(packages, hardware configuration) to a centralized database in\n"
+#~ "order to keep you informed about security updates and useful upgrades.\n"
+#~ msgstr ""
+#~ "این دستیار به شما در باردهی پیکربندی‌تان (بسته‌ها، پیکربندی سخت‌افزار)\n"
+#~ "به بانک اطلاعاتی مرکزی بمنظور اطلاع رسانی به شما درباره‌ی بروزسازی‌ها و\n"
+#~ "ارتقاهای مفید کمک خواهد کرد.\n"
+
+#~ msgid "Account creation or authentication"
+#~ msgstr "ایجاد حساب یا تأیید هویت"
+
+#~ msgid "Enter your Mandriva Online login, password and machine name:"
+#~ msgstr "نام ماشین، گذرواژه و ثبت‌ورود Mandriva Online خود را وارد کنید:"
+
+#, fuzzy
+#~ msgid "Email address:"
+#~ msgstr "نشانی پست ارسال شونده"
+
+#~ msgid "Country"
+#~ msgstr "کانتری"
+
+#~ msgid "Password:"
+#~ msgstr "گذرواژه:"
+
+#, fuzzy
+#~ msgid "Machine description:"
+#~ msgstr "نام ماشین:"
+
+#, fuzzy
+#~ msgid "Machine name must be 1 to 40 alphanumerical characters"
+#~ msgstr "نقاط سوارسازی فقط باید حاوی نویسه‌های الفبا باشند"
+
+#~ msgid "Connecting to Mandriva Online website..."
+#~ msgstr "در حال اتصال به وبگاه اینترنتی ﻡﺎﻧﺩﺭیﺑﺍ ..."
+
+#~ msgid ""
+#~ "In order to benefit from Mandriva Online services,\n"
+#~ "we are about to upload your configuration.\n"
+#~ "\n"
+#~ "The Wizard will now send the following information to Mandriva:\n"
+#~ "\n"
+#~ "1) the list of packages you have installed on your system,\n"
+#~ "\n"
+#~ "2) your hardware configuration.\n"
+#~ "\n"
+#~ "If you feel uncomfortable by that idea, or do not want to benefit from "
+#~ "this service,\n"
+#~ "please press 'Cancel'. By pressing 'Next', you allow us to keep you "
+#~ "informed\n"
+#~ "about security updates and useful upgrades via personalized email "
+#~ "alerts.\n"
+#~ "Furthermore, you benefit from discounted paid support services on\n"
+#~ "www.mandrivaexpert.com."
+#~ msgstr ""
+#~ "برای بهره بردن از خدمات اینترنتی ﻡﺎﻧﺩﺭیﺑﺍ ،\n"
+#~ "ما در شرف باردهی پیکربندیتان هستیم.\n"
+#~ "\n"
+#~ "این جادوگر اطلاعات بدنبال آمده را اکنون به نرم افزار ﻡﺎﻧﺩﺭیﺑﺍ خواهد "
+#~ "فرستاد:\n"
+#~ "\n"
+#~ "۱) لیست بسته‌هایی که بر سیستم‌تان نصب شده‌اند،\n"
+#~ "\n"
+#~ "۲) تنظیم سخت‌افزارتان.\n"
+#~ "\n"
+#~ "اگر با این نظر موافق نیستید، یا نمیخواهید از این خدمات بهره ببرید،\n"
+#~ "لطفاً 'لغو' را فشار دهید. با فشار دادن 'بعدی'، به ما اجازه میدهید تا\n"
+#~ "شما را از بروزسازیهای امنیتی و ارتقاهای مفید از طریق هشدارهای\n"
+#~ "پست خصوصی آگاه سازیم.\n"
+#~ "بعلاوه، شما از تخفیف پرداخت خدمات پشتیبانی بر\n"
+#~ "www.mandrivaexpert.com بهره میگیرید."
+
+#~ msgid "Connection problem"
+#~ msgstr "مشکل اتصال"
+
+#~ msgid "Problem occurs when uploading files, please try again"
+#~ msgstr "اشکالی هنگام باردهی پرونده‌ها رخ داد، لطفا دوباره تلاش کنید"
+
+#~ msgid "Create a Mandriva Online Account"
+#~ msgstr "ایجاد حساب Mandriva Online"
+
+#, fuzzy
+#~ msgid "Greeting:"
+#~ msgstr "سبز"
+
+#~ msgid "First name:"
+#~ msgstr "نام کوچک:"
+
+#, fuzzy
+#~ msgid "Last name:"
+#~ msgstr "نام کوچک:"
+
+#~ msgid "Confirm Password:"
+#~ msgstr "تصدیق گذرواژه:"
+
+#~ msgid ""
+#~ "The passwords do not match\n"
+#~ " Please try again\n"
+#~ msgstr ""
+#~ "گذرواژه‌ها مطابقت نمی‌کنند\n"
+#~ " لطفاً دوباره امتحان کنید\n"
+
+#, fuzzy
+#~ msgid "Please fill in each field"
+#~ msgstr "لطفاً همه‌ی محوطه‌ها را پر کنید\n"
+
+#~ msgid "Not a valid mail address!\n"
+#~ msgstr "نشانی پست معتبری نیست!\n"
+
+#~ msgid ""
+#~ "Mandriva Online Account successfully created.\n"
+#~ "Please click \"Next\" to authenticate and upload your configuration\n"
+#~ msgstr ""
+#~ "حساب اینترنتی ﻡﺎﻧﺩﺭیﺑﺍ با موفقیت ایجاد گردید.\n"
+#~ "لطفا برای تأیید باردهی پیکربندیتان \"بعدی\" را کلیک کنید\n"
+
+#~ msgid "Your upload was successful!"
+#~ msgstr "باردهی‌تان موفق بود!"
+
+#~ msgid ""
+#~ "From now you will receive on security and updates \n"
+#~ "announcements thanks to Mandriva Online."
+#~ msgstr ""
+#~ "از اکنون شما آگهی‌های بروزسازی‌های امنیتی را به\n"
+#~ "لطف Mandriva Online دریافت خواهید کرد."
+
+#~ msgid ""
+#~ "Mandriva Online offers you the ability to automate the updates.\n"
+#~ "A program will run regulary in your system waiting for new updates\n"
+#~ msgstr ""
+#~ "Mandriva Online به شما توانائی بروزسازی خودکار را ارائه می‌دهد.\n"
+#~ "برنامه‌ای در سیستم‌تان بطور متناوب اجرا شده و منتظر بروزسازی‌های جدید خواهد "
+#~ "بود\n"
+
+#~ msgid "Congratulations"
+#~ msgstr "تبریکات"
+
+#~ msgid "Your Mandriva Online account has been successfully configured\n"
+#~ msgstr "حساب اینترنتی ﻡﺎﻧﺩﺭیﺑﺍ شما با موفقیت پیکربندی شده است\n"
+
+#~ msgid "Configuration uploaded successfully"
+#~ msgstr "تنظیمات با موفقیت باردهی‌ شد"
+
+#~ msgid "Problem uploading configuration"
+#~ msgstr "اشکالی در باردهی پیکربندی وجود دارد"
+
+#~ msgid ""
+#~ "Cannot connect to Mandriva Online website: wrong login/password or router/"
+#~ "firewall bad settings"
+#~ msgstr ""
+#~ "نمی‌توان به پایگاه mandrivaonline متصل شد: ثبت‌ورود/گذرواژه اشتباه یا "
+#~ "تنظیمهای بد مسیریاب/دیوارآتش"
+
 #~ msgid "  --applet\t\t- launch Mandriva Update.\n"
 #~ msgstr "  --applet\t\t- اجرای Mandriva Update.\n"
 
diff --git a/po/fi.po b/po/fi.po
index c84497a9..37ff4384 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline-fi - Mandriva 2007 Release\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-09 16:26+0200\n"
+"POT-Creation-Date: 2008-02-21 18:21+0100\n"
 "PO-Revision-Date: 2006-08-27 14:38+0300\n"
 "Last-Translator: Thomas Backlund <tmb@mandriva.org>\n"
 "Language-Team: Finnish <fi@li.org>\n"
@@ -23,17 +23,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:94
+#: ../mdkapplet:88
 #, fuzzy, c-format
 msgid "Will check updates at %s"
 msgstr "Tarkista päivitykset"
 
-#: ../mdkapplet:103
+#: ../mdkapplet:97
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "Järjestelmäsi on ajan tasalla"
 
-#: ../mdkapplet:109
+#: ../mdkapplet:103
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -42,53 +42,43 @@ msgstr ""
 "Palvelun asetusongelma. Tarkista lokista ja lähetä viesti osoitteeseen: "
 "support@mandrivaonline.com"
 
-#: ../mdkapplet:115
+#: ../mdkapplet:110
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "Odota, etsitään saatavilla olevia paketteja"
 
-#: ../mdkapplet:121
+#: ../mdkapplet:116
 #, c-format
 msgid "New updates are available for your system"
 msgstr "Päivityksiä järjestelmällesi on saatavilla"
 
-#: ../mdkapplet:127
-#, c-format
-msgid "New bundles are available for your system"
-msgstr "Uusia ohelmistokokonaisuuksia järjestelmällesi on saatavilla"
-
-#: ../mdkapplet:133
-#, c-format
-msgid "Service is not configured. Please click on \"Configure the service\""
-msgstr "Palvelu ei ole asetettu. Paina \"Aseta palvelu\""
-
-#: ../mdkapplet:139
+#: ../mdkapplet:122
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "Verkko on alhaalla. Ole hyvä ja aseta verkkosi"
 
-#: ../mdkapplet:145
+#: ../mdkapplet:128
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "Palvelu ei ole otettu käyttöön. Paina \"Online Webbisivusto\""
 
-#: ../mdkapplet:151 ../mdkapplet:182
+#: ../mdkapplet:134 ../mdkapplet:165
 #, fuzzy, c-format
 msgid "urpmi database locked"
 msgstr "urpmi-tietokanta lukittu"
 
-#: ../mdkapplet:157
+#: ../mdkapplet:140
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr "Jakelu ei tuettu (liian vanha jakelu, tai kehitysjakelu)"
 
-#: ../mdkapplet:163
+#: ../mdkapplet:146
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
 msgstr ""
 
-#: ../mdkapplet:169
+#: ../mdkapplet:152
 #, fuzzy, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -105,584 +95,132 @@ msgstr ""
 "\n"
 "Käynnistä tämän jälkeen %s uudelleen."
 
-#: ../mdkapplet:174
+#: ../mdkapplet:157
 #, c-format
 msgid "Enabled"
 msgstr "Käytössä"
 
-#: ../mdkapplet:187
+#: ../mdkapplet:170
 #, c-format
 msgid "Error updating media"
 msgstr ""
 
-#: ../mdkapplet:202
+#: ../mdkapplet:185
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr "Tarkistetaan... Päivityksiä on saatavilla\n"
 
-#: ../mdkapplet:207
+#: ../mdkapplet:190
 #, c-format
 msgid "Packages are up to date"
 msgstr ""
 
-#: ../mdkapplet:212
+#: ../mdkapplet:195
 #, fuzzy, c-format
 msgid "Failed to open urpmi database"
 msgstr "rpm-tietokantaa ei voitu avata"
 
-#: ../mdkapplet:217 ../mdkapplet:324
+#: ../mdkapplet:200
 #, c-format
 msgid "Install updates"
 msgstr "Asenna päivitykset"
 
-#: ../mdkapplet:218
-#, c-format
-msgid "Configure the service"
-msgstr "Aseta palvelu"
-
-#: ../mdkapplet:219
+#: ../mdkapplet:201
 #, c-format
 msgid "Check Updates"
 msgstr "Tarkista päivitykset"
 
-#: ../mdkapplet:220 ../mdkapplet:327 ../mdkonline:114 ../mdkonline:155
-#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
-#, c-format
-msgid "Please wait"
-msgstr "Odota hetki"
-
-#: ../mdkapplet:220 ../mdkapplet:326 ../mdkapplet:327
-#, c-format
-msgid "Check updates"
-msgstr "Tarkista päivitykset"
-
-#: ../mdkapplet:223 ../mdkapplet:648
-#, c-format
-msgid "Online WebSite"
-msgstr "Online-sivusto"
-
-#: ../mdkapplet:224
+#: ../mdkapplet:202
 #, c-format
 msgid "Configure Network"
 msgstr "Aseta verkko"
 
-#: ../mdkapplet:225
-#, c-format
-msgid "Configure Now!"
-msgstr "Aseta Nyt!"
-
-#: ../mdkapplet:313 ../mdkapplet:392
-#, c-format
-msgid "Mandriva Linux Updates Applet"
-msgstr "Mandrivan päivityssovelma"
-
-#: ../mdkapplet:322
-#, c-format
-msgid "Actions"
-msgstr "Toiminnot"
-
-#: ../mdkapplet:325
-#, c-format
-msgid "Configure"
-msgstr "Aseta"
-
-#: ../mdkapplet:329
-#, c-format
-msgid "See logs"
-msgstr "Katso lokitiedostot"
-
-#: ../mdkapplet:332
-#, c-format
-msgid "Status"
-msgstr "Tila"
-
-#: ../mdkapplet:336 ../mdkapplet:597
-#, c-format
-msgid "Close"
-msgstr "Sulje"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Network Connection: "
-msgstr "Verkkoyhteys:"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Up"
-msgstr "päällä"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Down"
-msgstr "pois päältä"
-
-#: ../mdkapplet:366
-#, c-format
-msgid "Last check: "
-msgstr "Viimeisin tarkistus:"
-
-#: ../mdkapplet:367 ../mdkonline:145
-#, c-format
-msgid "Machine name:"
-msgstr "Koneen nimi:"
-
-#: ../mdkapplet:368
-#, c-format
-msgid "Updates: "
-msgstr "Päivitykset:"
-
-#: ../mdkapplet:372
+#: ../mdkapplet:283
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Käynnistetään drakconnect\n"
 
-#: ../mdkapplet:375
+#: ../mdkapplet:286
 #, c-format
 msgid "Mandriva Online seems to be reinstalled, reloading applet ...."
 msgstr ""
 "Mandriva Online on asennettu uudelleen, käynnistetäänsovelma uudestan ..."
 
-#: ../mdkapplet:383
+#: ../mdkapplet:294
 #, c-format
 msgid "Launching MandrivaUpdate\n"
 msgstr "käynnistetään MandrivaUpdate\n"
 
-#: ../mdkapplet:398
+#: ../mdkapplet:303
+#, c-format
+msgid "Mandriva Linux Updates Applet"
+msgstr "Mandrivan päivityssovelma"
+
+#: ../mdkapplet:308
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Lasketaan  uudet päivitykset...\n"
 
-#: ../mdkapplet:399
+#: ../mdkapplet:309
 #, c-format
 msgid "Connecting to"
 msgstr "Yhdistetään kohteeseen"
 
-#: ../mdkapplet:467 ../mdkupdate:159 ../mdkupdate:188
-#, c-format
-msgid "An error occurred"
-msgstr "Ilmeni virhe"
-
-#: ../mdkapplet:475
-#, c-format
-msgid "Development release not supported by service"
-msgstr "Kehitysjakelu ei ole tuettu tässä palvelussa"
-
-#: ../mdkapplet:476
-#, c-format
-msgid "Too old release not supported by service"
-msgstr "Liian vanha jakelu ei ole tuettu tässä palvelussa"
-
-#: ../mdkapplet:477
-#, c-format
-msgid "Unknown state"
-msgstr "Tuntematon tila"
-
-#: ../mdkapplet:478
-#, c-format
-msgid "Online services disabled. Contact Mandriva Online site\n"
-msgstr "Online palvelut pois käytöstä. Ota yhteys Mandriva Online sivustoon\n"
-
-#: ../mdkapplet:479
-#, c-format
-msgid "Wrong Password.\n"
-msgstr "Väärä salasana\n"
-
-#: ../mdkapplet:480
-#, c-format
-msgid "Wrong Action or host or login.\n"
-msgstr "Väärä tili, kone tai kirjautuminen.\n"
-
-#: ../mdkapplet:481
-#, c-format
-msgid ""
-"Something is wrong with your network settings (check your route, firewall or "
-"proxy settings)\n"
-msgstr ""
-"Jotain on vialla verkkoasetuksissasi (tarkista reittim palomuuri tai "
-"välityspalvelinten asetukset)\n"
-
-#: ../mdkapplet:483
-#, c-format
-msgid ""
-"Problem occured while connecting to the server, please contact the support "
-"team"
-msgstr ""
-"Tapahtui virhe yhteydenotossa palvelimeen, ole hyvä ja ota yhteys tukiryhmään"
-
-#: ../mdkapplet:487
-#, c-format
-msgid "Response from Mandriva Online server\n"
-msgstr "Vastaus Mandriva Online palvelimelta\n"
-
-#: ../mdkapplet:490
+#: ../mdkapplet:386
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Järjestelmäsi on ajan tasalla\n"
 
-#: ../mdkapplet:527
-#, c-format
-msgid "No check"
-msgstr "Ei tarkistusta"
-
-#: ../mdkapplet:541
-#, c-format
-msgid "Checking config file: Not present\n"
-msgstr "Tarkistetaan asetustiedostoa: Ei olemassa\n"
-
-#: ../mdkapplet:544
+#: ../mdkapplet:415
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Tarkistetaan verkko: Näyttää poistettu käytöstä\n"
 
-#: ../mdkapplet:587
-#, c-format
-msgid "Logs"
-msgstr "Lokit"
-
-#: ../mdkapplet:603
+#: ../mdkapplet:457 ../mdkupdate:118 ../mdkupdate:164
 #, c-format
-msgid "Clear"
-msgstr "Tyhjennä"
+msgid "Warning"
+msgstr "Varoitus"
 
-#: ../mdkapplet:629
+#: ../mdkapplet:468
 #, c-format
 msgid "About..."
 msgstr "Tietoa.."
 
-#: ../mdkapplet:631
+#: ../mdkapplet:472
 #, c-format
 msgid "Mandriva Online %s"
 msgstr "Mandriva Online %s"
 
-#: ../mdkapplet:635
+#: ../mdkapplet:473
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Copyright (C) %s, Mandriva"
 
-#: ../mdkapplet:647
+#: ../mdkapplet:476
 #, c-format
 msgid "Mandriva Online gives access to Mandriva web services."
 msgstr "Mandriva Online avaa pääsyn Mandrivan webbipalveluihin."
 
-#: ../mdkapplet:655
-#, c-format
-msgid "Always launch on startup"
-msgstr "Käynnistä ainä käynnistyksen yhteydessä"
-
-#: ../mdkapplet:657
-#, c-format
-msgid "Quit"
-msgstr "Poistu"
-
-#: ../mdkonline:58
-#, c-format
-msgid ""
-"mdonline version %s\n"
-"Copyright (C) %s Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"mdonline version %s\n"
-"Copyright (C) %s Mandriva.\n"
-"Tämä on vapaata ohjelmistoa ja saadaan levittää uudelleen GNU GPL lisenssin "
-"alaisuudessa.\n"
-"\n"
-"Käyttö:\n"
-
-#: ../mdkonline:63 ../mdkupdate:73
-#, c-format
-msgid "  --help\t\t- print this help message.\n"
-msgstr "  --help\t\t- tulosta tämä apuviesti.\n"
-
-#: ../mdkonline:64
-#, c-format
-msgid "  --box=\t\t\t- hostname.\n"
-msgstr "  --box=\t\t\t- konenimi.\n"
-
-#: ../mdkonline:65
-#, c-format
-msgid "  --country\t\t\t- name of country of the user. \n"
-msgstr "  --country\t\t\t- käyttäjän maan nimi. \n"
-
-#: ../mdkonline:66
-#, c-format
-msgid "  --interactive\t\t- use the interactive mode.\n"
-msgstr "  --interactive\t\t- käytä interaktiivinen tila.\n"
-
-#: ../mdkonline:67
-#, c-format
-msgid "  --nointeractive\t- use the non-interactive mode.\n"
-msgstr "  --nointeractive\t- käytä ei-interaktiivista tilaa.\n"
-
-#: ../mdkonline:68
-#, c-format
-msgid "  --login=\t\t     - login name of the user.\n"
-msgstr "  --login=\t\t     - käyttäjän kirjautumistunnus.\n"
-
-#: ../mdkonline:69
-#, c-format
-msgid "  --pass=\t\t\t- password  of the user.\n"
-msgstr "  --pass=\t\t\t- käyttäjän salasanaa.\n"
-
-#: ../mdkonline:87 ../mdkonline:120
-#, c-format
-msgid "Mandriva Online"
-msgstr "Mandriva Online"
-
-#: ../mdkonline:90
-#, c-format
-msgid "I already have an account"
-msgstr "Minulla on jo tili"
-
-#: ../mdkonline:91
-#, c-format
-msgid "I want to subscribe"
-msgstr "Haluan rekisteröityä"
-
-#: ../mdkonline:96
-#, c-format
-msgid "Mr."
-msgstr "Hra."
-
-#: ../mdkonline:96
-#, c-format
-msgid "Mrs."
-msgstr "Rouva"
-
-#: ../mdkonline:96
-#, c-format
-msgid "Ms."
-msgstr "Nti"
-
-#: ../mdkonline:114
-#, c-format
-msgid "Reading configuration\n"
-msgstr "Luetaan asetukset\n"
-
-#: ../mdkonline:123
-#, c-format
-msgid ""
-"This assistant will help you to upload your configuration\n"
-"(packages, hardware configuration) to a centralized database in\n"
-"order to keep you informed about security updates and useful upgrades.\n"
-msgstr ""
-"Tämä apuohjelma auttaa sinua lähettämään asetuksesi\n"
-"(paketit, laitteiston asetukset) keskitettyyn tietokantaan, jotta\n"
-"sinut voitaisiin pitää ajan tasalla turvapäivityksistä ja hyödyllisistä\n"
-"päivityksistä.\n"
-
-#: ../mdkonline:131
-#, c-format
-msgid "Account creation or authentication"
-msgstr "Tilin luonti tai kirjautuminen"
-
-#: ../mdkonline:136
-#, c-format
-msgid "Enter your Mandriva Online login, password and machine name:"
-msgstr ""
-"Syötä Mandriva Online-käyttäjätunnuksesi, salasanasi sekä koneesi nimi:"
-
-#: ../mdkonline:142 ../mdkonline:195
-#, c-format
-msgid "Email address:"
-msgstr "Sähköpostiosoite:"
-
-#: ../mdkonline:143
-#, c-format
-msgid "Country"
-msgstr "Maa"
-
-#: ../mdkonline:144 ../mdkonline:196
-#, c-format
-msgid "Password:"
-msgstr "Salasana:"
-
-#: ../mdkonline:146
-#, c-format
-msgid "Machine description:"
-msgstr "Koneen kuvaus:"
-
-#: ../mdkonline:147
-#, c-format
-msgid "(Ex: My Home Office's Computer)"
-msgstr "(Esim: Kotitoimistoni kone)"
-
-#: ../mdkonline:152 ../mdkonline:159 ../mdkonline:180 ../mdkonline:204
-#: ../mdkonline:208 ../mdkonline:212 ../mdkonline:217 ../mdkupdate:141
-#: ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
-#, c-format
-msgid "Error"
-msgstr "Virhe"
-
-#: ../mdkonline:152
-#, c-format
-msgid "Machine name must be 1 to 40 alphanumerical characters"
-msgstr "Koneen nimi pitää olla 1-40 kirjaimia ja numeroita"
-
-#: ../mdkonline:155
-#, c-format
-msgid "Connecting to Mandriva Online website..."
-msgstr "Yhdistetään Mandriva Online webbisivustoon..."
-
-#: ../mdkonline:167
-#, c-format
-msgid ""
-"In order to benefit from Mandriva Online services,\n"
-"we are about to upload your configuration.\n"
-"\n"
-"The Wizard will now send the following information to Mandriva:\n"
-"\n"
-"1) the list of packages you have installed on your system,\n"
-"\n"
-"2) your hardware configuration.\n"
-"\n"
-"If you feel uncomfortable by that idea, or do not want to benefit from this "
-"service,\n"
-"please press 'Cancel'. By pressing 'Next', you allow us to keep you "
-"informed\n"
-"about security updates and useful upgrades via personalized email alerts.\n"
-"Furthermore, you benefit from discounted paid support services on\n"
-"www.mandrivaexpert.com."
-msgstr ""
-"Saadaksesi hyödyn Mandriva Online palveluista,\n"
-"olemme lähettämässä asetuksesi palvelimelle.\n"
-"\n"
-"Velho lähettää seuraavat tiedot Mandriva:ille.\n"
-"\n"
-"1) listauksen asennetuista paketeista, \n"
-"\n"
-"2) laitteistolistauksen.\n"
-"Jos et ole tyytyväinen tähän ajatukseen, tai et halua hyötyä\n"
-"tästä palvelusta, ole hyvä ja paina 'Peruuta'. Painamalla 'Jatka'\n"
-"sallit meidän pitämään sinut ajan tasalla koskien turvallisuus-\n"
-"päivityksiä ja hyödyllisiä päivityksiä henkilökohtaisilla viesteillä.\n"
-"\n"
-"Sen lisäksi hyödyt alennuksista www.mandrivaexpert.com:in\n"
-"maksullisissa tukipalveluissa."
-
-#: ../mdkonline:180
-#, c-format
-msgid "Connection problem"
-msgstr "Yhteysongelma"
-
-#: ../mdkonline:180
-#, c-format
-msgid "Problem occurs when uploading files, please try again"
-msgstr "Virheitä tietdostojen lähettämisessä, ole hyvä ja yritä uudelleen"
-
-#: ../mdkonline:187
-#, c-format
-msgid "Create a Mandriva Online Account"
-msgstr "Luo Mandriva Online-tunnus"
-
-#. -PO: that is for things like "Mr", "Ms",...
-#: ../mdkonline:192
-#, c-format
-msgid "Greeting:"
-msgstr "Tervehdys:"
-
-#: ../mdkonline:193
-#, c-format
-msgid "First name:"
-msgstr "Etunimi:"
-
-#: ../mdkonline:194
-#, c-format
-msgid "Last name:"
-msgstr "Sukunimi:"
-
-#: ../mdkonline:197
-#, c-format
-msgid "Confirm Password:"
-msgstr "Varmista salasana:"
-
-#: ../mdkonline:204
-#, c-format
-msgid ""
-"The passwords do not match\n"
-" Please try again\n"
-msgstr ""
-"Salasanat eivät kelpaa\n"
-"Yritä uudestaan\n"
-
-#: ../mdkonline:208
-#, c-format
-msgid "Please fill in each field"
-msgstr "Täytä kaikki kentät"
-
-#: ../mdkonline:212
-#, c-format
-msgid "Not a valid mail address!\n"
-msgstr "Sähköpostiosoite ei kelpaa!\n"
-
-#: ../mdkonline:217
-#, c-format
-msgid "Creating account failed!"
-msgstr "Tilin luonti ei onnistunut!"
-
-#: ../mdkonline:225
-#, c-format
-msgid ""
-"Mandriva Online Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
-msgstr ""
-"Mandriva Online tili luotiin onnistuneesti.\n"
-"Paina \"Seuraava\" kirjautuaaksesi ja lähettääksesi laitteistotietojasi\n"
-
-#: ../mdkonline:229
-#, c-format
-msgid "Your upload was successful!"
-msgstr "Tietojen siirto onnistui!"
-
-#: ../mdkonline:229
+#: ../mdkapplet:478
 #, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandriva Online."
-msgstr ""
-"Tästä lähtien saat turva- ja päivitysilmoitukset\n"
-"suoraan Mandriva Onlinesta."
+msgid "Online WebSite"
+msgstr "Online-sivusto"
 
-#: ../mdkonline:229
+#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
+#: ../mdkapplet:483
 #, c-format
-msgid ""
-"Mandriva Online offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
+msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
-"Mandriva Online mahdollistaa päivitysten automatisoinnin.\n"
-"Ohjelma käynnistyy säännöllisesti järjestelmässäsi odottamaan uusia "
-"päivityksiä\n"
-
-#: ../mdkonline:238
-#, c-format
-msgid "Congratulations"
-msgstr "Onnittelut"
 
-#: ../mdkonline:238
+#: ../mdkapplet:492
 #, c-format
-msgid "Your Mandriva Online account has been successfully configured\n"
-msgstr "Mandriva Online tilisi on asetettu onnistuneesti.\n"
-
-#: ../mdkonline:253
-#, c-format
-msgid "Configuration uploaded successfully"
-msgstr "Järjestelmätietojen lähetys onnistui!"
-
-#: ../mdkonline:254
-#, c-format
-msgid "Problem uploading configuration"
-msgstr "Ongelmia järjestelmätietojen lähetyksessä"
+msgid "Always launch on startup"
+msgstr "Käynnistä ainä käynnistyksen yhteydessä"
 
-#: ../mdkonline:256
+#: ../mdkapplet:494
 #, c-format
-msgid ""
-"Cannot connect to Mandriva Online website: wrong login/password or router/"
-"firewall bad settings"
-msgstr ""
-"En saa yhteyttä mandrivaonline sivustoon: väärä tunnus/salasana tai reitin/"
-"palomuuri on asetettu väärin."
+msgid "Quit"
+msgstr "Poistu"
 
 #: ../mdkonline.pm:207
 #, c-format
@@ -831,6 +369,11 @@ msgstr ""
 "\n"
 "Käyttö:\n"
 
+#: ../mdkupdate:73
+#, c-format
+msgid "  --help\t\t- print this help message.\n"
+msgstr "  --help\t\t- tulosta tämä apuviesti.\n"
+
 #: ../mdkupdate:74
 #, c-format
 msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
@@ -860,11 +403,6 @@ msgstr ""
 "  --bundle file.bundle\t- tulkitse ja asenna paketteja .bundle metainfo "
 "tiedostosta.\n"
 
-#: ../mdkupdate:118 ../mdkupdate:164
-#, c-format
-msgid "Warning"
-msgstr "Varoitus"
-
 #. -PO: here Live Install is currently *NOT* translated on the desktop, so it's better to keep as it:
 #: ../mdkupdate:120
 #, c-format
@@ -875,11 +413,21 @@ msgstr ""
 "Sinun pitää ensin asenna järjestelmäsi kovalevylle käyttäen Live-"
 "asennusvelhoa."
 
+#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
+#, c-format
+msgid "Please wait"
+msgstr "Odota hetki"
+
 #: ../mdkupdate:123 ../mdkupdate:174
 #, c-format
 msgid "Preparing..."
 msgstr "Valmistellaan..."
 
+#: ../mdkupdate:141 ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
+#, c-format
+msgid "Error"
+msgstr "Virhe"
+
 #: ../mdkupdate:141
 #, c-format
 msgid ""
@@ -891,6 +439,11 @@ msgstr ""
 "\n"
 "%s"
 
+#: ../mdkupdate:159 ../mdkupdate:188
+#, c-format
+msgid "An error occurred"
+msgstr "Ilmeni virhe"
+
 #: ../mdkupdate:164
 #, c-format
 msgid ""
@@ -919,6 +472,310 @@ msgstr "Asennetaan paketteja...\n"
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "Ei pystytty päivittämään paketteja update_source-lähteestä.\n"
 
+#~ msgid "New bundles are available for your system"
+#~ msgstr "Uusia ohelmistokokonaisuuksia järjestelmällesi on saatavilla"
+
+#~ msgid "Service is not configured. Please click on \"Configure the service\""
+#~ msgstr "Palvelu ei ole asetettu. Paina \"Aseta palvelu\""
+
+#~ msgid "Configure the service"
+#~ msgstr "Aseta palvelu"
+
+#~ msgid "Check updates"
+#~ msgstr "Tarkista päivitykset"
+
+#~ msgid "Configure Now!"
+#~ msgstr "Aseta Nyt!"
+
+#~ msgid "Actions"
+#~ msgstr "Toiminnot"
+
+#~ msgid "Configure"
+#~ msgstr "Aseta"
+
+#~ msgid "See logs"
+#~ msgstr "Katso lokitiedostot"
+
+#~ msgid "Status"
+#~ msgstr "Tila"
+
+#~ msgid "Close"
+#~ msgstr "Sulje"
+
+#~ msgid "Network Connection: "
+#~ msgstr "Verkkoyhteys:"
+
+#~ msgid "Up"
+#~ msgstr "päällä"
+
+#~ msgid "Down"
+#~ msgstr "pois päältä"
+
+#~ msgid "Last check: "
+#~ msgstr "Viimeisin tarkistus:"
+
+#~ msgid "Machine name:"
+#~ msgstr "Koneen nimi:"
+
+#~ msgid "Updates: "
+#~ msgstr "Päivitykset:"
+
+#~ msgid "Development release not supported by service"
+#~ msgstr "Kehitysjakelu ei ole tuettu tässä palvelussa"
+
+#~ msgid "Too old release not supported by service"
+#~ msgstr "Liian vanha jakelu ei ole tuettu tässä palvelussa"
+
+#~ msgid "Unknown state"
+#~ msgstr "Tuntematon tila"
+
+#~ msgid "Online services disabled. Contact Mandriva Online site\n"
+#~ msgstr ""
+#~ "Online palvelut pois käytöstä. Ota yhteys Mandriva Online sivustoon\n"
+
+#~ msgid "Wrong Password.\n"
+#~ msgstr "Väärä salasana\n"
+
+#~ msgid "Wrong Action or host or login.\n"
+#~ msgstr "Väärä tili, kone tai kirjautuminen.\n"
+
+#~ msgid ""
+#~ "Something is wrong with your network settings (check your route, firewall "
+#~ "or proxy settings)\n"
+#~ msgstr ""
+#~ "Jotain on vialla verkkoasetuksissasi (tarkista reittim palomuuri tai "
+#~ "välityspalvelinten asetukset)\n"
+
+#~ msgid ""
+#~ "Problem occured while connecting to the server, please contact the "
+#~ "support team"
+#~ msgstr ""
+#~ "Tapahtui virhe yhteydenotossa palvelimeen, ole hyvä ja ota yhteys "
+#~ "tukiryhmään"
+
+#~ msgid "Response from Mandriva Online server\n"
+#~ msgstr "Vastaus Mandriva Online palvelimelta\n"
+
+#~ msgid "No check"
+#~ msgstr "Ei tarkistusta"
+
+#~ msgid "Checking config file: Not present\n"
+#~ msgstr "Tarkistetaan asetustiedostoa: Ei olemassa\n"
+
+#~ msgid "Logs"
+#~ msgstr "Lokit"
+
+#~ msgid "Clear"
+#~ msgstr "Tyhjennä"
+
+#~ msgid ""
+#~ "mdonline version %s\n"
+#~ "Copyright (C) %s Mandriva.\n"
+#~ "This is free software and may be redistributed under the terms of the GNU "
+#~ "GPL.\n"
+#~ "\n"
+#~ "usage:\n"
+#~ msgstr ""
+#~ "mdonline version %s\n"
+#~ "Copyright (C) %s Mandriva.\n"
+#~ "Tämä on vapaata ohjelmistoa ja saadaan levittää uudelleen GNU GPL "
+#~ "lisenssin alaisuudessa.\n"
+#~ "\n"
+#~ "Käyttö:\n"
+
+#~ msgid "  --box=\t\t\t- hostname.\n"
+#~ msgstr "  --box=\t\t\t- konenimi.\n"
+
+#~ msgid "  --country\t\t\t- name of country of the user. \n"
+#~ msgstr "  --country\t\t\t- käyttäjän maan nimi. \n"
+
+#~ msgid "  --interactive\t\t- use the interactive mode.\n"
+#~ msgstr "  --interactive\t\t- käytä interaktiivinen tila.\n"
+
+#~ msgid "  --nointeractive\t- use the non-interactive mode.\n"
+#~ msgstr "  --nointeractive\t- käytä ei-interaktiivista tilaa.\n"
+
+#~ msgid "  --login=\t\t     - login name of the user.\n"
+#~ msgstr "  --login=\t\t     - käyttäjän kirjautumistunnus.\n"
+
+#~ msgid "  --pass=\t\t\t- password  of the user.\n"
+#~ msgstr "  --pass=\t\t\t- käyttäjän salasanaa.\n"
+
+#~ msgid "Mandriva Online"
+#~ msgstr "Mandriva Online"
+
+#~ msgid "I already have an account"
+#~ msgstr "Minulla on jo tili"
+
+#~ msgid "I want to subscribe"
+#~ msgstr "Haluan rekisteröityä"
+
+#~ msgid "Mr."
+#~ msgstr "Hra."
+
+#~ msgid "Mrs."
+#~ msgstr "Rouva"
+
+#~ msgid "Ms."
+#~ msgstr "Nti"
+
+#~ msgid "Reading configuration\n"
+#~ msgstr "Luetaan asetukset\n"
+
+#~ msgid ""
+#~ "This assistant will help you to upload your configuration\n"
+#~ "(packages, hardware configuration) to a centralized database in\n"
+#~ "order to keep you informed about security updates and useful upgrades.\n"
+#~ msgstr ""
+#~ "Tämä apuohjelma auttaa sinua lähettämään asetuksesi\n"
+#~ "(paketit, laitteiston asetukset) keskitettyyn tietokantaan, jotta\n"
+#~ "sinut voitaisiin pitää ajan tasalla turvapäivityksistä ja hyödyllisistä\n"
+#~ "päivityksistä.\n"
+
+#~ msgid "Account creation or authentication"
+#~ msgstr "Tilin luonti tai kirjautuminen"
+
+#~ msgid "Enter your Mandriva Online login, password and machine name:"
+#~ msgstr ""
+#~ "Syötä Mandriva Online-käyttäjätunnuksesi, salasanasi sekä koneesi nimi:"
+
+#~ msgid "Email address:"
+#~ msgstr "Sähköpostiosoite:"
+
+#~ msgid "Country"
+#~ msgstr "Maa"
+
+#~ msgid "Password:"
+#~ msgstr "Salasana:"
+
+#~ msgid "Machine description:"
+#~ msgstr "Koneen kuvaus:"
+
+#~ msgid "(Ex: My Home Office's Computer)"
+#~ msgstr "(Esim: Kotitoimistoni kone)"
+
+#~ msgid "Machine name must be 1 to 40 alphanumerical characters"
+#~ msgstr "Koneen nimi pitää olla 1-40 kirjaimia ja numeroita"
+
+#~ msgid "Connecting to Mandriva Online website..."
+#~ msgstr "Yhdistetään Mandriva Online webbisivustoon..."
+
+#~ msgid ""
+#~ "In order to benefit from Mandriva Online services,\n"
+#~ "we are about to upload your configuration.\n"
+#~ "\n"
+#~ "The Wizard will now send the following information to Mandriva:\n"
+#~ "\n"
+#~ "1) the list of packages you have installed on your system,\n"
+#~ "\n"
+#~ "2) your hardware configuration.\n"
+#~ "\n"
+#~ "If you feel uncomfortable by that idea, or do not want to benefit from "
+#~ "this service,\n"
+#~ "please press 'Cancel'. By pressing 'Next', you allow us to keep you "
+#~ "informed\n"
+#~ "about security updates and useful upgrades via personalized email "
+#~ "alerts.\n"
+#~ "Furthermore, you benefit from discounted paid support services on\n"
+#~ "www.mandrivaexpert.com."
+#~ msgstr ""
+#~ "Saadaksesi hyödyn Mandriva Online palveluista,\n"
+#~ "olemme lähettämässä asetuksesi palvelimelle.\n"
+#~ "\n"
+#~ "Velho lähettää seuraavat tiedot Mandriva:ille.\n"
+#~ "\n"
+#~ "1) listauksen asennetuista paketeista, \n"
+#~ "\n"
+#~ "2) laitteistolistauksen.\n"
+#~ "Jos et ole tyytyväinen tähän ajatukseen, tai et halua hyötyä\n"
+#~ "tästä palvelusta, ole hyvä ja paina 'Peruuta'. Painamalla 'Jatka'\n"
+#~ "sallit meidän pitämään sinut ajan tasalla koskien turvallisuus-\n"
+#~ "päivityksiä ja hyödyllisiä päivityksiä henkilökohtaisilla viesteillä.\n"
+#~ "\n"
+#~ "Sen lisäksi hyödyt alennuksista www.mandrivaexpert.com:in\n"
+#~ "maksullisissa tukipalveluissa."
+
+#~ msgid "Connection problem"
+#~ msgstr "Yhteysongelma"
+
+#~ msgid "Problem occurs when uploading files, please try again"
+#~ msgstr "Virheitä tietdostojen lähettämisessä, ole hyvä ja yritä uudelleen"
+
+#~ msgid "Create a Mandriva Online Account"
+#~ msgstr "Luo Mandriva Online-tunnus"
+
+#~ msgid "Greeting:"
+#~ msgstr "Tervehdys:"
+
+#~ msgid "First name:"
+#~ msgstr "Etunimi:"
+
+#~ msgid "Last name:"
+#~ msgstr "Sukunimi:"
+
+#~ msgid "Confirm Password:"
+#~ msgstr "Varmista salasana:"
+
+#~ msgid ""
+#~ "The passwords do not match\n"
+#~ " Please try again\n"
+#~ msgstr ""
+#~ "Salasanat eivät kelpaa\n"
+#~ "Yritä uudestaan\n"
+
+#~ msgid "Please fill in each field"
+#~ msgstr "Täytä kaikki kentät"
+
+#~ msgid "Not a valid mail address!\n"
+#~ msgstr "Sähköpostiosoite ei kelpaa!\n"
+
+#~ msgid "Creating account failed!"
+#~ msgstr "Tilin luonti ei onnistunut!"
+
+#~ msgid ""
+#~ "Mandriva Online Account successfully created.\n"
+#~ "Please click \"Next\" to authenticate and upload your configuration\n"
+#~ msgstr ""
+#~ "Mandriva Online tili luotiin onnistuneesti.\n"
+#~ "Paina \"Seuraava\" kirjautuaaksesi ja lähettääksesi laitteistotietojasi\n"
+
+#~ msgid "Your upload was successful!"
+#~ msgstr "Tietojen siirto onnistui!"
+
+#~ msgid ""
+#~ "From now you will receive on security and updates \n"
+#~ "announcements thanks to Mandriva Online."
+#~ msgstr ""
+#~ "Tästä lähtien saat turva- ja päivitysilmoitukset\n"
+#~ "suoraan Mandriva Onlinesta."
+
+#~ msgid ""
+#~ "Mandriva Online offers you the ability to automate the updates.\n"
+#~ "A program will run regulary in your system waiting for new updates\n"
+#~ msgstr ""
+#~ "Mandriva Online mahdollistaa päivitysten automatisoinnin.\n"
+#~ "Ohjelma käynnistyy säännöllisesti järjestelmässäsi odottamaan uusia "
+#~ "päivityksiä\n"
+
+#~ msgid "Congratulations"
+#~ msgstr "Onnittelut"
+
+#~ msgid "Your Mandriva Online account has been successfully configured\n"
+#~ msgstr "Mandriva Online tilisi on asetettu onnistuneesti.\n"
+
+#~ msgid "Configuration uploaded successfully"
+#~ msgstr "Järjestelmätietojen lähetys onnistui!"
+
+#~ msgid "Problem uploading configuration"
+#~ msgstr "Ongelmia järjestelmätietojen lähetyksessä"
+
+#~ msgid ""
+#~ "Cannot connect to Mandriva Online website: wrong login/password or router/"
+#~ "firewall bad settings"
+#~ msgstr ""
+#~ "En saa yhteyttä mandrivaonline sivustoon: väärä tunnus/salasana tai "
+#~ "reitin/palomuuri on asetettu väärin."
+
 #~ msgid "  --applet\t\t- launch Mandriva Update.\n"
 #~ msgstr "  --applet\t\t- käynnistä Mandriva Update.\n"
 
diff --git a/po/fr.po b/po/fr.po
index 86ac78f5..6723b91b 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -14,7 +14,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline-fr\n"
-"POT-Creation-Date: 2007-08-09 16:26+0200\n"
+"POT-Creation-Date: 2008-02-21 18:21+0100\n"
 "PO-Revision-Date: 2007-08-09 16:27+0200\n"
 "Last-Translator: Christophe Berthelé <cpjc@free.fr>\n"
 "Language-Team: Français <cooker-i18n@mandrivalinux.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:94
+#: ../mdkapplet:88
 #, c-format
 msgid "Will check updates at %s"
 msgstr "Vérification de la disponibilité de mises à jour à %s"
 
-#: ../mdkapplet:103
+#: ../mdkapplet:97
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "Votre système est à jour"
 
-#: ../mdkapplet:109
+#: ../mdkapplet:103
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -45,49 +45,39 @@ msgstr ""
 "envoyez-les à : \n"
 "support@mandrivaonline.com"
 
-#: ../mdkapplet:115
+#: ../mdkapplet:110
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "Veuillez patienter, recherche des paquetages disponibles..."
 
-#: ../mdkapplet:121
+#: ../mdkapplet:116
 #, c-format
 msgid "New updates are available for your system"
 msgstr "De nouvelles mises à jour sont disponibles pour votre système"
 
-#: ../mdkapplet:127
-#, c-format
-msgid "New bundles are available for your system"
-msgstr "De nouveaux paquets sont disponibles pour votre système"
-
-#: ../mdkapplet:133
-#, c-format
-msgid "Service is not configured. Please click on \"Configure the service\""
-msgstr "Service non configuré. Cliquez sur « Configuration »"
-
-#: ../mdkapplet:139
+#: ../mdkapplet:122
 #, 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:145
+#: ../mdkapplet:128
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "Service non activé. Cliquez sur « Site Mandriva Online »"
 
-#: ../mdkapplet:151 ../mdkapplet:182
+#: ../mdkapplet:134 ../mdkapplet:165
 #, c-format
 msgid "urpmi database locked"
 msgstr "base de donnée urpmi verrouillée"
 
-#: ../mdkapplet:157
+#: ../mdkapplet:140
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 "Cette version de Mandriva Linux n'est pas supportée (obsolète ou en "
 "développement)"
 
-#: ../mdkapplet:163
+#: ../mdkapplet:146
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
@@ -95,7 +85,7 @@ msgstr ""
 "Aucun médium n'a été trouvé. Vous devez ajouter des media via le "
 "« Gestionnaire de Médias Logiciels »."
 
-#: ../mdkapplet:169
+#: ../mdkapplet:152
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -112,591 +102,133 @@ msgstr ""
 "\n"
 "Ensuite, redémarrez « %s »."
 
-#: ../mdkapplet:174
+#: ../mdkapplet:157
 #, c-format
 msgid "Enabled"
 msgstr "Activé"
 
-#: ../mdkapplet:187
+#: ../mdkapplet:170
 #, c-format
 msgid "Error updating media"
 msgstr "Erreur lors de la mise à jour des médias"
 
-#: ../mdkapplet:202
+#: ../mdkapplet:185
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr "Vérification ... Des mises à jour sont disponibles\n"
 
-#: ../mdkapplet:207
+#: ../mdkapplet:190
 #, c-format
 msgid "Packages are up to date"
 msgstr "Les paquetages sont à jour"
 
-#: ../mdkapplet:212
+#: ../mdkapplet:195
 #, c-format
 msgid "Failed to open urpmi database"
 msgstr "Impossible d'ouvrir la base de donnée urpm"
 
-#: ../mdkapplet:217 ../mdkapplet:324
+#: ../mdkapplet:200
 #, c-format
 msgid "Install updates"
 msgstr "Installer les mises à jour"
 
-#: ../mdkapplet:218
-#, c-format
-msgid "Configure the service"
-msgstr "Configurer le service"
-
-#: ../mdkapplet:219
+#: ../mdkapplet:201
 #, c-format
 msgid "Check Updates"
 msgstr "Vérifier la disponibilité de mises à jour"
 
-#: ../mdkapplet:220 ../mdkapplet:327 ../mdkonline:114 ../mdkonline:155
-#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
-#, c-format
-msgid "Please wait"
-msgstr "Veuillez patienter"
-
-#: ../mdkapplet:220 ../mdkapplet:326 ../mdkapplet:327
-#, c-format
-msgid "Check updates"
-msgstr "Vérifier la disponibilité de mises à jour"
-
-#: ../mdkapplet:223 ../mdkapplet:648
-#, c-format
-msgid "Online WebSite"
-msgstr "Site Mandriva Online"
-
-#: ../mdkapplet:224
+#: ../mdkapplet:202
 #, c-format
 msgid "Configure Network"
 msgstr "Configurer le réseau"
 
-#: ../mdkapplet:225
-#, c-format
-msgid "Configure Now!"
-msgstr "Configurer maintenant !"
-
-#: ../mdkapplet:313 ../mdkapplet:392
-#, c-format
-msgid "Mandriva Linux Updates Applet"
-msgstr "Appliquette des mises à jour Mandriva Linux"
-
-#: ../mdkapplet:322
-#, c-format
-msgid "Actions"
-msgstr "Actions"
-
-#: ../mdkapplet:325
-#, c-format
-msgid "Configure"
-msgstr "Configurer"
-
-#: ../mdkapplet:329
-#, c-format
-msgid "See logs"
-msgstr "Voir les journaux"
-
-#: ../mdkapplet:332
-#, c-format
-msgid "Status"
-msgstr "Statut"
-
-#: ../mdkapplet:336 ../mdkapplet:597
-#, c-format
-msgid "Close"
-msgstr "Fermer"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Network Connection: "
-msgstr "Connexion réseau : "
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Up"
-msgstr "Activé"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Down"
-msgstr "Arrêté"
-
-#: ../mdkapplet:366
-#, c-format
-msgid "Last check: "
-msgstr "Dernière vérification : "
-
-#: ../mdkapplet:367 ../mdkonline:145
-#, c-format
-msgid "Machine name:"
-msgstr "Nom de l'ordinateur :"
-
-#: ../mdkapplet:368
-#, c-format
-msgid "Updates: "
-msgstr "Mises à jour : "
-
-#: ../mdkapplet:372
+#: ../mdkapplet:283
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Lancement de drakconnect\n"
 
-#: ../mdkapplet:375
+#: ../mdkapplet:286
 #, c-format
 msgid "Mandriva Online seems to be reinstalled, reloading applet ...."
 msgstr ""
 "Mandriva Online semble avoir été réinstallé, rechargement de "
 "l'appliquette ..."
 
-#: ../mdkapplet:383
+#: ../mdkapplet:294
 #, c-format
 msgid "Launching MandrivaUpdate\n"
 msgstr "Lancement de MandrivaUpdate\n"
 
-#: ../mdkapplet:398
+#: ../mdkapplet:303
+#, c-format
+msgid "Mandriva Linux Updates Applet"
+msgstr "Appliquette des mises à jour Mandriva Linux"
+
+#: ../mdkapplet:308
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Calcul des nouvelles mises à jour ...\n"
 
-#: ../mdkapplet:399
+#: ../mdkapplet:309
 #, c-format
 msgid "Connecting to"
 msgstr "Connexion à"
 
-#: ../mdkapplet:467 ../mdkupdate:159 ../mdkupdate:188
-#, c-format
-msgid "An error occurred"
-msgstr "Une erreur est survenue"
-
-#: ../mdkapplet:475
-#, c-format
-msgid "Development release not supported by service"
-msgstr "Version de développement non supportée par le service"
-
-#: ../mdkapplet:476
-#, c-format
-msgid "Too old release not supported by service"
-msgstr "Version de Mandriva Linux obsolète, non supportée par le service"
-
-#: ../mdkapplet:477
-#, c-format
-msgid "Unknown state"
-msgstr "État inconnu"
-
-#: ../mdkapplet:478
-#, c-format
-msgid "Online services disabled. Contact Mandriva Online site\n"
-msgstr ""
-"Service en-ligne désactivé. Veuillez contacter le site Mandriva Online\n"
-
-#: ../mdkapplet:479
-#, c-format
-msgid "Wrong Password.\n"
-msgstr "Mot de passe incorrect.\n"
-
-#: ../mdkapplet:480
-#, c-format
-msgid "Wrong Action or host or login.\n"
-msgstr "Mauvais hôte, identifiant ou action\n"
-
-#: ../mdkapplet:481
-#, c-format
-msgid ""
-"Something is wrong with your network settings (check your route, firewall or "
-"proxy settings)\n"
-msgstr ""
-"Une erreur semble être présente dans vos paramètres réseau (vérifiez votre "
-"table de routage, les paramètres de votre pare-feu ou de votre serveur "
-"mandataire (proxy))\n"
-
-#: ../mdkapplet:483
-#, c-format
-msgid ""
-"Problem occured while connecting to the server, please contact the support "
-"team"
-msgstr ""
-"Un problème est intervenu lors de la connexion au serveur, veuillez "
-"contacter le support technique"
-
-#: ../mdkapplet:487
-#, c-format
-msgid "Response from Mandriva Online server\n"
-msgstr "Réponse du serveur Mandriva Online\n"
-
-#: ../mdkapplet:490
+#: ../mdkapplet:386
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Le système est à jour\n"
 
-#: ../mdkapplet:527
-#, c-format
-msgid "No check"
-msgstr "Pas de vérification"
-
-#: ../mdkapplet:541
-#, c-format
-msgid "Checking config file: Not present\n"
-msgstr "Vérification du fichier de configuration : absent\n"
-
-#: ../mdkapplet:544
+#: ../mdkapplet:415
 #, 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:587
+#: ../mdkapplet:457 ../mdkupdate:118 ../mdkupdate:164
 #, c-format
-msgid "Logs"
-msgstr "Journaux"
-
-#: ../mdkapplet:603
-#, c-format
-msgid "Clear"
-msgstr "Effacer"
+msgid "Warning"
+msgstr "Attention"
 
-#: ../mdkapplet:629
+#: ../mdkapplet:468
 #, c-format
 msgid "About..."
 msgstr "À propos ..."
 
-#: ../mdkapplet:631
+#: ../mdkapplet:472
 #, c-format
 msgid "Mandriva Online %s"
 msgstr "Mandriva Online %s"
 
-#: ../mdkapplet:635
+#: ../mdkapplet:473
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Copyright (C) %s par Mandriva"
 
-#: ../mdkapplet:647
+#: ../mdkapplet:476
 #, c-format
 msgid "Mandriva Online gives access to Mandriva web services."
 msgstr "Mandriva Online donne accès aux services web de Mandriva."
 
-#: ../mdkapplet:655
-#, c-format
-msgid "Always launch on startup"
-msgstr "Toujours lancer au démarrage"
-
-#: ../mdkapplet:657
-#, c-format
-msgid "Quit"
-msgstr "Quitter"
-
-#: ../mdkonline:58
-#, c-format
-msgid ""
-"mdonline version %s\n"
-"Copyright (C) %s Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"mdkonline version %s\n"
-"Copyright © %s Mandriva.\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"
-
-#: ../mdkonline:63 ../mdkupdate:73
-#, c-format
-msgid "  --help\t\t- print this help message.\n"
-msgstr "  --help\t\t- affiche ce message d'aide.\n"
-
-#: ../mdkonline:64
-#, c-format
-msgid "  --box=\t\t\t- hostname.\n"
-msgstr "  --box=\t\t\t- nom d'hôte.\n"
-
-#: ../mdkonline:65
-#, c-format
-msgid "  --country\t\t\t- name of country of the user. \n"
-msgstr "  --country\t\t\t- nom du pays de l'utilisateur.\n"
-
-#: ../mdkonline:66
-#, c-format
-msgid "  --interactive\t\t- use the interactive mode.\n"
-msgstr "  --interactive\t\t- mode interactif.\n"
-
-#: ../mdkonline:67
-#, c-format
-msgid "  --nointeractive\t- use the non-interactive mode.\n"
-msgstr "  --nointeractive\t- mode non interactif.\n"
-
-#: ../mdkonline:68
-#, c-format
-msgid "  --login=\t\t     - login name of the user.\n"
-msgstr "  --login=\t\t     - login de l'utilisateur.\n"
-
-#: ../mdkonline:69
-#, c-format
-msgid "  --pass=\t\t\t- password  of the user.\n"
-msgstr "  --pass=\t\t\t- mot de passe de l'utilisateur.\n"
-
-#: ../mdkonline:87 ../mdkonline:120
-#, c-format
-msgid "Mandriva Online"
-msgstr "Mandriva Online"
-
-#: ../mdkonline:90
-#, c-format
-msgid "I already have an account"
-msgstr "J'ai déjà un compte"
-
-#: ../mdkonline:91
-#, c-format
-msgid "I want to subscribe"
-msgstr "Je veux m'inscrire"
-
-#: ../mdkonline:96
-#, c-format
-msgid "Mr."
-msgstr "M."
-
-#: ../mdkonline:96
-#, c-format
-msgid "Mrs."
-msgstr "Mme"
-
-#: ../mdkonline:96
-#, c-format
-msgid "Ms."
-msgstr "Mlle"
-
-#: ../mdkonline:114
-#, c-format
-msgid "Reading configuration\n"
-msgstr "Lecture de la configuration\n"
-
-#: ../mdkonline:123
-#, c-format
-msgid ""
-"This assistant will help you to upload your configuration\n"
-"(packages, hardware configuration) to a centralized database in\n"
-"order to keep you informed about security updates and useful upgrades.\n"
-msgstr ""
-"Cet assistant va vous aider à envoyer votre configuration (liste des "
-"paquetages,\n"
-"configuration matérielle) vers une base de données centralisée, afin de "
-"vous\n"
-"maintenir informé des mises à jour de sécurité ou des nouvelles versions.\n"
-
-#: ../mdkonline:131
-#, c-format
-msgid "Account creation or authentication"
-msgstr "Création de compte ou authentification"
-
-#: ../mdkonline:136
-#, c-format
-msgid "Enter your Mandriva Online login, password and machine name:"
-msgstr ""
-"Entrez vos identifiant, mot de passe Mandriva Online et le nom de machine :"
-
-#: ../mdkonline:142 ../mdkonline:195
-#, c-format
-msgid "Email address:"
-msgstr "Adresse courriel :"
-
-#: ../mdkonline:143
-#, c-format
-msgid "Country"
-msgstr "Pays"
-
-#: ../mdkonline:144 ../mdkonline:196
-#, c-format
-msgid "Password:"
-msgstr "Mot de passe :"
-
-#: ../mdkonline:146
-#, c-format
-msgid "Machine description:"
-msgstr "Description de l'ordinateur :"
-
-#: ../mdkonline:147
-#, c-format
-msgid "(Ex: My Home Office's Computer)"
-msgstr "(Ex : L'ordinateur de mon bureau)"
-
-#: ../mdkonline:152 ../mdkonline:159 ../mdkonline:180 ../mdkonline:204
-#: ../mdkonline:208 ../mdkonline:212 ../mdkonline:217 ../mdkupdate:141
-#: ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
-#, c-format
-msgid "Error"
-msgstr "Erreur"
-
-#: ../mdkonline:152
-#, c-format
-msgid "Machine name must be 1 to 40 alphanumerical characters"
-msgstr "Le nom de machine doit comprendre de 1 à 40 caractères alphanumériques"
-
-#: ../mdkonline:155
-#, c-format
-msgid "Connecting to Mandriva Online website..."
-msgstr "Connexion au site Mandriva Online en cours..."
-
-#: ../mdkonline:167
-#, c-format
-msgid ""
-"In order to benefit from Mandriva Online services,\n"
-"we are about to upload your configuration.\n"
-"\n"
-"The Wizard will now send the following information to Mandriva:\n"
-"\n"
-"1) the list of packages you have installed on your system,\n"
-"\n"
-"2) your hardware configuration.\n"
-"\n"
-"If you feel uncomfortable by that idea, or do not want to benefit from this "
-"service,\n"
-"please press 'Cancel'. By pressing 'Next', you allow us to keep you "
-"informed\n"
-"about security updates and useful upgrades via personalized email alerts.\n"
-"Furthermore, you benefit from discounted paid support services on\n"
-"www.mandrivaexpert.com."
-msgstr ""
-"Afin de bénéficier des services Mandriva Online,\n"
-"nous allons récupérer votre configuration.\n"
-"\n"
-"L'assistant va communiquer les informations suivantes à Mandriva :\n"
-"\n"
-"1) la liste des paquets installés sur votre système,\n"
-"\n"
-"2) votre configuration matérielle.\n"
-"\n"
-"Si cette idée vous déplaît, ou si vous ne souhaitez pas profiter\n"
-"de ce service, veuillez appuyer sur Annuler. En appuyant sur Suivant, vous\n"
-"nous permettrez de vous tenir informé des mises-à-jour de sécurité et des\n"
-"améliorations utiles via des courriers électroniques personnalisés. De\n"
-"plus, vous bénéficierez de remises sur les services d'aide payants sur\n"
-"www.mandrivaexpert.com."
-
-#: ../mdkonline:180
-#, c-format
-msgid "Connection problem"
-msgstr "Problème de connexion"
-
-#: ../mdkonline:180
-#, c-format
-msgid "Problem occurs when uploading files, please try again"
-msgstr ""
-"Une erreur est survenue lors de l'envoi des fichiers, veuillez rééssayer"
-
-#: ../mdkonline:187
-#, c-format
-msgid "Create a Mandriva Online Account"
-msgstr "Créer un compte Mandriva Online"
-
-#. -PO: that is for things like "Mr", "Ms",...
-#: ../mdkonline:192
-#, c-format
-msgid "Greeting:"
-msgstr "Titre :"
-
-#: ../mdkonline:193
-#, c-format
-msgid "First name:"
-msgstr "Prénom :"
-
-#: ../mdkonline:194
-#, c-format
-msgid "Last name:"
-msgstr "Nom de famille :"
-
-#: ../mdkonline:197
-#, c-format
-msgid "Confirm Password:"
-msgstr "Confirmer le mot de passe :"
-
-#: ../mdkonline:204
-#, c-format
-msgid ""
-"The passwords do not match\n"
-" Please try again\n"
-msgstr ""
-"Les mots de passe ne correspondent pas.\n"
-"Veuillez essayer à nouveau\n"
-
-#: ../mdkonline:208
-#, c-format
-msgid "Please fill in each field"
-msgstr "Veuillez remplir tous les champs"
-
-#: ../mdkonline:212
-#, c-format
-msgid "Not a valid mail address!\n"
-msgstr "Cette adresse courriel n'est pas valide !\n"
-
-#: ../mdkonline:217
-#, c-format
-msgid "Creating account failed!"
-msgstr "La création du compte a échoué !"
-
-#: ../mdkonline:225
-#, c-format
-msgid ""
-"Mandriva Online Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
-msgstr ""
-"Compte Mandriva Online créé avec succès.\n"
-"Cliquez sur « Suivant » pour vous authentifier et envoyer votre "
-"configuration au serveur\n"
-
-#: ../mdkonline:229
-#, c-format
-msgid "Your upload was successful!"
-msgstr "Votre configuration a été envoyée avec succès !"
-
-#: ../mdkonline:229
+#: ../mdkapplet:478
 #, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandriva Online."
-msgstr ""
-"À partir de maintenant, vous recevrez les annonces\n"
-"de sécurité et de mises-à-jour grâce à Mandriva Online."
+msgid "Online WebSite"
+msgstr "Site Mandriva Online"
 
-#: ../mdkonline:229
+#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
+#: ../mdkapplet:483
 #, c-format
-msgid ""
-"Mandriva Online offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
+msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
-"Mandriva Online donne la possibilité d'automatiser les mises à jour.\n"
-"Un programme se lancera régulièrement sur votre machine\n"
-"pour vérifier la présence de nouvelles mises à jour.\n"
 
-#: ../mdkonline:238
+#: ../mdkapplet:492
 #, c-format
-msgid "Congratulations"
-msgstr "Félicitations"
-
-#: ../mdkonline:238
-#, c-format
-msgid "Your Mandriva Online account has been successfully configured\n"
-msgstr "Votre compte Mandriva Online est correctement configuré\n"
-
-#: ../mdkonline:253
-#, c-format
-msgid "Configuration uploaded successfully"
-msgstr "Votre configuration a été envoyée avec succès"
-
-#: ../mdkonline:254
-#, c-format
-msgid "Problem uploading configuration"
-msgstr "Problème lors de l'envoi de votre configuration"
+msgid "Always launch on startup"
+msgstr "Toujours lancer au démarrage"
 
-#: ../mdkonline:256
+#: ../mdkapplet:494
 #, c-format
-msgid ""
-"Cannot connect to Mandriva Online website: wrong login/password or router/"
-"firewall bad settings"
-msgstr ""
-"Ne peut se connecter au site internet Mandriva Online : identifiant/mot de "
-"passe incorrects ou mauvaise configuration routeur/pare-feu"
+msgid "Quit"
+msgstr "Quitter"
 
 #: ../mdkonline.pm:207
 #, c-format
@@ -845,6 +377,11 @@ msgstr ""
 "\n"
 "utilisation :\n"
 
+#: ../mdkupdate:73
+#, c-format
+msgid "  --help\t\t- print this help message.\n"
+msgstr "  --help\t\t- affiche ce message d'aide.\n"
+
 #: ../mdkupdate:74
 #, c-format
 msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
@@ -874,11 +411,6 @@ msgstr ""
 "  --bundle file.bundle\t- lit et installe un paquet depuis un fichier "
 "metainfo .bundle.\n"
 
-#: ../mdkupdate:118 ../mdkupdate:164
-#, c-format
-msgid "Warning"
-msgstr "Attention"
-
 #. -PO: here Live Install is currently *NOT* translated on the desktop, so it's better to keep as it:
 #: ../mdkupdate:120
 #, c-format
@@ -889,11 +421,21 @@ msgstr ""
 "Vous devez d'abord installer le système sur votre disque dur avec "
 "l'assistant « Live install »"
 
+#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
+#, c-format
+msgid "Please wait"
+msgstr "Veuillez patienter"
+
 #: ../mdkupdate:123 ../mdkupdate:174
 #, c-format
 msgid "Preparing..."
 msgstr "Préparation ..."
 
+#: ../mdkupdate:141 ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
+#, c-format
+msgid "Error"
+msgstr "Erreur"
+
 #: ../mdkupdate:141
 #, c-format
 msgid ""
@@ -905,6 +447,11 @@ msgstr ""
 "\n"
 "%s"
 
+#: ../mdkupdate:159 ../mdkupdate:188
+#, c-format
+msgid "An error occurred"
+msgstr "Une erreur est survenue"
+
 #: ../mdkupdate:164
 #, c-format
 msgid ""
@@ -933,6 +480,319 @@ msgstr "Installation des paquetages...\n"
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "Impossible de mettre à jour les paquetages du média update_source.\n"
 
+#~ msgid "New bundles are available for your system"
+#~ msgstr "De nouveaux paquets sont disponibles pour votre système"
+
+#~ msgid "Service is not configured. Please click on \"Configure the service\""
+#~ msgstr "Service non configuré. Cliquez sur « Configuration »"
+
+#~ msgid "Configure the service"
+#~ msgstr "Configurer le service"
+
+#~ msgid "Check updates"
+#~ msgstr "Vérifier la disponibilité de mises à jour"
+
+#~ msgid "Configure Now!"
+#~ msgstr "Configurer maintenant !"
+
+#~ msgid "Actions"
+#~ msgstr "Actions"
+
+#~ msgid "Configure"
+#~ msgstr "Configurer"
+
+#~ msgid "See logs"
+#~ msgstr "Voir les journaux"
+
+#~ msgid "Status"
+#~ msgstr "Statut"
+
+#~ msgid "Close"
+#~ msgstr "Fermer"
+
+#~ msgid "Network Connection: "
+#~ msgstr "Connexion réseau : "
+
+#~ msgid "Up"
+#~ msgstr "Activé"
+
+#~ msgid "Down"
+#~ msgstr "Arrêté"
+
+#~ msgid "Last check: "
+#~ msgstr "Dernière vérification : "
+
+#~ msgid "Machine name:"
+#~ msgstr "Nom de l'ordinateur :"
+
+#~ msgid "Updates: "
+#~ msgstr "Mises à jour : "
+
+#~ msgid "Development release not supported by service"
+#~ msgstr "Version de développement non supportée par le service"
+
+#~ msgid "Too old release not supported by service"
+#~ msgstr "Version de Mandriva Linux obsolète, non supportée par le service"
+
+#~ msgid "Unknown state"
+#~ msgstr "État inconnu"
+
+#~ msgid "Online services disabled. Contact Mandriva Online site\n"
+#~ msgstr ""
+#~ "Service en-ligne désactivé. Veuillez contacter le site Mandriva Online\n"
+
+#~ msgid "Wrong Password.\n"
+#~ msgstr "Mot de passe incorrect.\n"
+
+#~ msgid "Wrong Action or host or login.\n"
+#~ msgstr "Mauvais hôte, identifiant ou action\n"
+
+#~ msgid ""
+#~ "Something is wrong with your network settings (check your route, firewall "
+#~ "or proxy settings)\n"
+#~ msgstr ""
+#~ "Une erreur semble être présente dans vos paramètres réseau (vérifiez "
+#~ "votre table de routage, les paramètres de votre pare-feu ou de votre "
+#~ "serveur mandataire (proxy))\n"
+
+#~ msgid ""
+#~ "Problem occured while connecting to the server, please contact the "
+#~ "support team"
+#~ msgstr ""
+#~ "Un problème est intervenu lors de la connexion au serveur, veuillez "
+#~ "contacter le support technique"
+
+#~ msgid "Response from Mandriva Online server\n"
+#~ msgstr "Réponse du serveur Mandriva Online\n"
+
+#~ msgid "No check"
+#~ msgstr "Pas de vérification"
+
+#~ msgid "Checking config file: Not present\n"
+#~ msgstr "Vérification du fichier de configuration : absent\n"
+
+#~ msgid "Logs"
+#~ msgstr "Journaux"
+
+#~ msgid "Clear"
+#~ msgstr "Effacer"
+
+#~ msgid ""
+#~ "mdonline version %s\n"
+#~ "Copyright (C) %s Mandriva.\n"
+#~ "This is free software and may be redistributed under the terms of the GNU "
+#~ "GPL.\n"
+#~ "\n"
+#~ "usage:\n"
+#~ msgstr ""
+#~ "mdkonline version %s\n"
+#~ "Copyright © %s Mandriva.\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"
+
+#~ msgid "  --box=\t\t\t- hostname.\n"
+#~ msgstr "  --box=\t\t\t- nom d'hôte.\n"
+
+#~ msgid "  --country\t\t\t- name of country of the user. \n"
+#~ msgstr "  --country\t\t\t- nom du pays de l'utilisateur.\n"
+
+#~ msgid "  --interactive\t\t- use the interactive mode.\n"
+#~ msgstr "  --interactive\t\t- mode interactif.\n"
+
+#~ msgid "  --nointeractive\t- use the non-interactive mode.\n"
+#~ msgstr "  --nointeractive\t- mode non interactif.\n"
+
+#~ msgid "  --login=\t\t     - login name of the user.\n"
+#~ msgstr "  --login=\t\t     - login de l'utilisateur.\n"
+
+#~ msgid "  --pass=\t\t\t- password  of the user.\n"
+#~ msgstr "  --pass=\t\t\t- mot de passe de l'utilisateur.\n"
+
+#~ msgid "Mandriva Online"
+#~ msgstr "Mandriva Online"
+
+#~ msgid "I already have an account"
+#~ msgstr "J'ai déjà un compte"
+
+#~ msgid "I want to subscribe"
+#~ msgstr "Je veux m'inscrire"
+
+#~ msgid "Mr."
+#~ msgstr "M."
+
+#~ msgid "Mrs."
+#~ msgstr "Mme"
+
+#~ msgid "Ms."
+#~ msgstr "Mlle"
+
+#~ msgid "Reading configuration\n"
+#~ msgstr "Lecture de la configuration\n"
+
+#~ msgid ""
+#~ "This assistant will help you to upload your configuration\n"
+#~ "(packages, hardware configuration) to a centralized database in\n"
+#~ "order to keep you informed about security updates and useful upgrades.\n"
+#~ msgstr ""
+#~ "Cet assistant va vous aider à envoyer votre configuration (liste des "
+#~ "paquetages,\n"
+#~ "configuration matérielle) vers une base de données centralisée, afin de "
+#~ "vous\n"
+#~ "maintenir informé des mises à jour de sécurité ou des nouvelles "
+#~ "versions.\n"
+
+#~ msgid "Account creation or authentication"
+#~ msgstr "Création de compte ou authentification"
+
+#~ msgid "Enter your Mandriva Online login, password and machine name:"
+#~ msgstr ""
+#~ "Entrez vos identifiant, mot de passe Mandriva Online et le nom de "
+#~ "machine :"
+
+#~ msgid "Email address:"
+#~ msgstr "Adresse courriel :"
+
+#~ msgid "Country"
+#~ msgstr "Pays"
+
+#~ msgid "Password:"
+#~ msgstr "Mot de passe :"
+
+#~ msgid "Machine description:"
+#~ msgstr "Description de l'ordinateur :"
+
+#~ msgid "(Ex: My Home Office's Computer)"
+#~ msgstr "(Ex : L'ordinateur de mon bureau)"
+
+#~ msgid "Machine name must be 1 to 40 alphanumerical characters"
+#~ msgstr ""
+#~ "Le nom de machine doit comprendre de 1 à 40 caractères alphanumériques"
+
+#~ msgid "Connecting to Mandriva Online website..."
+#~ msgstr "Connexion au site Mandriva Online en cours..."
+
+#~ msgid ""
+#~ "In order to benefit from Mandriva Online services,\n"
+#~ "we are about to upload your configuration.\n"
+#~ "\n"
+#~ "The Wizard will now send the following information to Mandriva:\n"
+#~ "\n"
+#~ "1) the list of packages you have installed on your system,\n"
+#~ "\n"
+#~ "2) your hardware configuration.\n"
+#~ "\n"
+#~ "If you feel uncomfortable by that idea, or do not want to benefit from "
+#~ "this service,\n"
+#~ "please press 'Cancel'. By pressing 'Next', you allow us to keep you "
+#~ "informed\n"
+#~ "about security updates and useful upgrades via personalized email "
+#~ "alerts.\n"
+#~ "Furthermore, you benefit from discounted paid support services on\n"
+#~ "www.mandrivaexpert.com."
+#~ msgstr ""
+#~ "Afin de bénéficier des services Mandriva Online,\n"
+#~ "nous allons récupérer votre configuration.\n"
+#~ "\n"
+#~ "L'assistant va communiquer les informations suivantes à Mandriva :\n"
+#~ "\n"
+#~ "1) la liste des paquets installés sur votre système,\n"
+#~ "\n"
+#~ "2) votre configuration matérielle.\n"
+#~ "\n"
+#~ "Si cette idée vous déplaît, ou si vous ne souhaitez pas profiter\n"
+#~ "de ce service, veuillez appuyer sur Annuler. En appuyant sur Suivant, "
+#~ "vous\n"
+#~ "nous permettrez de vous tenir informé des mises-à-jour de sécurité et "
+#~ "des\n"
+#~ "améliorations utiles via des courriers électroniques personnalisés. De\n"
+#~ "plus, vous bénéficierez de remises sur les services d'aide payants sur\n"
+#~ "www.mandrivaexpert.com."
+
+#~ msgid "Connection problem"
+#~ msgstr "Problème de connexion"
+
+#~ msgid "Problem occurs when uploading files, please try again"
+#~ msgstr ""
+#~ "Une erreur est survenue lors de l'envoi des fichiers, veuillez rééssayer"
+
+#~ msgid "Create a Mandriva Online Account"
+#~ msgstr "Créer un compte Mandriva Online"
+
+#~ msgid "Greeting:"
+#~ msgstr "Titre :"
+
+#~ msgid "First name:"
+#~ msgstr "Prénom :"
+
+#~ msgid "Last name:"
+#~ msgstr "Nom de famille :"
+
+#~ msgid "Confirm Password:"
+#~ msgstr "Confirmer le mot de passe :"
+
+#~ msgid ""
+#~ "The passwords do not match\n"
+#~ " Please try again\n"
+#~ msgstr ""
+#~ "Les mots de passe ne correspondent pas.\n"
+#~ "Veuillez essayer à nouveau\n"
+
+#~ msgid "Please fill in each field"
+#~ msgstr "Veuillez remplir tous les champs"
+
+#~ msgid "Not a valid mail address!\n"
+#~ msgstr "Cette adresse courriel n'est pas valide !\n"
+
+#~ msgid "Creating account failed!"
+#~ msgstr "La création du compte a échoué !"
+
+#~ msgid ""
+#~ "Mandriva Online Account successfully created.\n"
+#~ "Please click \"Next\" to authenticate and upload your configuration\n"
+#~ msgstr ""
+#~ "Compte Mandriva Online créé avec succès.\n"
+#~ "Cliquez sur « Suivant » pour vous authentifier et envoyer votre "
+#~ "configuration au serveur\n"
+
+#~ msgid "Your upload was successful!"
+#~ msgstr "Votre configuration a été envoyée avec succès !"
+
+#~ msgid ""
+#~ "From now you will receive on security and updates \n"
+#~ "announcements thanks to Mandriva Online."
+#~ msgstr ""
+#~ "À partir de maintenant, vous recevrez les annonces\n"
+#~ "de sécurité et de mises-à-jour grâce à Mandriva Online."
+
+#~ msgid ""
+#~ "Mandriva Online offers you the ability to automate the updates.\n"
+#~ "A program will run regulary in your system waiting for new updates\n"
+#~ msgstr ""
+#~ "Mandriva Online donne la possibilité d'automatiser les mises à jour.\n"
+#~ "Un programme se lancera régulièrement sur votre machine\n"
+#~ "pour vérifier la présence de nouvelles mises à jour.\n"
+
+#~ msgid "Congratulations"
+#~ msgstr "Félicitations"
+
+#~ msgid "Your Mandriva Online account has been successfully configured\n"
+#~ msgstr "Votre compte Mandriva Online est correctement configuré\n"
+
+#~ msgid "Configuration uploaded successfully"
+#~ msgstr "Votre configuration a été envoyée avec succès"
+
+#~ msgid "Problem uploading configuration"
+#~ msgstr "Problème lors de l'envoi de votre configuration"
+
+#~ msgid ""
+#~ "Cannot connect to Mandriva Online website: wrong login/password or router/"
+#~ "firewall bad settings"
+#~ msgstr ""
+#~ "Ne peut se connecter au site internet Mandriva Online : identifiant/mot "
+#~ "de passe incorrects ou mauvaise configuration routeur/pare-feu"
+
 #~ msgid "  --applet\t\t- launch Mandriva Update.\n"
 #~ msgstr "  --applet\t\t- lance Mandriva Update.\n"
 
diff --git a/po/fur.po b/po/fur.po
index 3dea64b5..172aac7a 100644
--- a/po/fur.po
+++ b/po/fur.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-09 16:26+0200\n"
+"POT-Creation-Date: 2008-02-21 18:21+0100\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"
@@ -23,70 +23,60 @@ 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:94
+#: ../mdkapplet:88
 #, fuzzy, c-format
 msgid "Will check updates at %s"
 msgstr "Controle atualizazions"
 
-#: ../mdkapplet:103
+#: ../mdkapplet:97
 #, fuzzy, c-format
 msgid "Your system is up-to-date"
 msgstr "Il sisteme al è atualizât\n"
 
-#: ../mdkapplet:109
+#: ../mdkapplet:103
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
 "support@mandrivaonline.com"
 msgstr ""
 
-#: ../mdkapplet:115
+#: ../mdkapplet:110
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "Par plasè spiete, o cîr pachets disponibii..."
 
-#: ../mdkapplet:121
+#: ../mdkapplet:116
 #, fuzzy, c-format
 msgid "New updates are available for your system"
 msgstr "Nissune atualizazion dispunibile pal to sistem"
 
-#: ../mdkapplet:127
-#, fuzzy, c-format
-msgid "New bundles are available for your system"
-msgstr "Nissune atualizazion dispunibile pal to sistem"
-
-#: ../mdkapplet:133
-#, fuzzy, c-format
-msgid "Service is not configured. Please click on \"Configure the service\""
-msgstr "Servizi no disponibil. Frache su \"configurazion\""
-
-#: ../mdkapplet:139
+#: ../mdkapplet:122
 #, 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:145
+#: ../mdkapplet:128
 #, fuzzy, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "Servizi no disponibil. Frache su \"configurazion\""
 
-#: ../mdkapplet:151 ../mdkapplet:182
+#: ../mdkapplet:134 ../mdkapplet:165
 #, fuzzy, c-format
 msgid "urpmi database locked"
 msgstr "database urpmi blocât"
 
-#: ../mdkapplet:157
+#: ../mdkapplet:140
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
-#: ../mdkapplet:163
+#: ../mdkapplet:146
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
 msgstr ""
 
-#: ../mdkapplet:169
+#: ../mdkapplet:152
 #, fuzzy, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -103,578 +93,133 @@ msgstr ""
 "\n"
 "Daspò, torne a inviâ %s."
 
-#: ../mdkapplet:174
+#: ../mdkapplet:157
 #, c-format
 msgid "Enabled"
 msgstr "Abilitade"
 
-#: ../mdkapplet:187
+#: ../mdkapplet:170
 #, c-format
 msgid "Error updating media"
 msgstr ""
 
-#: ../mdkapplet:202
+#: ../mdkapplet:185
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr "Controlant... Atualizazions e son disponibilis\n"
 
-#: ../mdkapplet:207
+#: ../mdkapplet:190
 #, c-format
 msgid "Packages are up to date"
 msgstr ""
 
-#: ../mdkapplet:212
+#: ../mdkapplet:195
 #, fuzzy, c-format
 msgid "Failed to open urpmi database"
 msgstr "no rivi a vierzi il database rpm"
 
-#: ../mdkapplet:217 ../mdkapplet:324
+#: ../mdkapplet:200
 #, c-format
 msgid "Install updates"
 msgstr "Instale atualizazions"
 
-#: ../mdkapplet:218
-#, fuzzy, c-format
-msgid "Configure the service"
-msgstr "Configure le rêt"
-
-#: ../mdkapplet:219
+#: ../mdkapplet:201
 #, c-format
 msgid "Check Updates"
 msgstr "Controle Atualizazions"
 
-#: ../mdkapplet:220 ../mdkapplet:327 ../mdkonline:114 ../mdkonline:155
-#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
-#, c-format
-msgid "Please wait"
-msgstr "Par plasè, spiete"
-
-#: ../mdkapplet:220 ../mdkapplet:326 ../mdkapplet:327
-#, c-format
-msgid "Check updates"
-msgstr "Controle atualizazions"
-
-#: ../mdkapplet:223 ../mdkapplet:648
-#, c-format
-msgid "Online WebSite"
-msgstr "Sît online"
-
-#: ../mdkapplet:224
+#: ../mdkapplet:202
 #, c-format
 msgid "Configure Network"
 msgstr "Configure le rêt"
 
-#: ../mdkapplet:225
-#, c-format
-msgid "Configure Now!"
-msgstr "Configure Daurman!"
-
-#: ../mdkapplet:313 ../mdkapplet:392
-#, c-format
-msgid "Mandriva Linux Updates Applet"
-msgstr "Applet Atualizazions Mandriva Linux"
-
-#: ../mdkapplet:322
-#, c-format
-msgid "Actions"
-msgstr "Azions"
-
-#: ../mdkapplet:325
-#, c-format
-msgid "Configure"
-msgstr "Configure"
-
-#: ../mdkapplet:329
-#, c-format
-msgid "See logs"
-msgstr "Cjale i log"
-
-#: ../mdkapplet:332
-#, c-format
-msgid "Status"
-msgstr "Stât"
-
-#: ../mdkapplet:336 ../mdkapplet:597
-#, c-format
-msgid "Close"
-msgstr "Siere"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Network Connection: "
-msgstr "Conession a le rêt"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Up"
-msgstr "Su"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Down"
-msgstr "Jù"
-
-#: ../mdkapplet:366
-#, c-format
-msgid "Last check: "
-msgstr "Ultin control"
-
-#: ../mdkapplet:367 ../mdkonline:145
-#, c-format
-msgid "Machine name:"
-msgstr "Non dal computer:"
-
-#: ../mdkapplet:368
-#, fuzzy, c-format
-msgid "Updates: "
-msgstr "Gnovis Atualizazions"
-
-#: ../mdkapplet:372
+#: ../mdkapplet:283
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Fâs lâ drakconnect\n"
 
-#: ../mdkapplet:375
+#: ../mdkapplet:286
 #, c-format
 msgid "Mandriva Online seems to be reinstalled, reloading applet ...."
 msgstr ""
 "Mandriva Online al somee sedi stât tornât a instalâ, o torni a cjariâ le "
 "applet ...."
 
-#: ../mdkapplet:383
+#: ../mdkapplet:294
 #, c-format
 msgid "Launching MandrivaUpdate\n"
 msgstr "Inviament de MandrivaUpdate\n"
 
-#: ../mdkapplet:398
+#: ../mdkapplet:303
+#, c-format
+msgid "Mandriva Linux Updates Applet"
+msgstr "Applet Atualizazions Mandriva Linux"
+
+#: ../mdkapplet:308
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Instalant gnovis atualizazion...\n"
 
-#: ../mdkapplet:399
+#: ../mdkapplet:309
 #, c-format
 msgid "Connecting to"
 msgstr "Conesion in vore a"
 
-#: ../mdkapplet:467 ../mdkupdate:159 ../mdkupdate:188
-#, c-format
-msgid "An error occurred"
-msgstr "Al è intravignût un fal"
-
-#: ../mdkapplet:475
-#, c-format
-msgid "Development release not supported by service"
-msgstr ""
-
-#: ../mdkapplet:476
-#, c-format
-msgid "Too old release not supported by service"
-msgstr ""
-
-#: ../mdkapplet:477
-#, c-format
-msgid "Unknown state"
-msgstr "Stât no cognossût"
-
-#: ../mdkapplet:478
-#, c-format
-msgid "Online services disabled. Contact Mandriva Online site\n"
-msgstr "Servizis Online no facoltizâs. Contate il sît Mandriva Online\n"
-
-#: ../mdkapplet:479
-#, c-format
-msgid "Wrong Password.\n"
-msgstr "Password falade.\n"
-
-#: ../mdkapplet:480
-#, c-format
-msgid "Wrong Action or host or login.\n"
-msgstr "Azion o host o login falâs.\n"
-
-#: ../mdkapplet:481
-#, c-format
-msgid ""
-"Something is wrong with your network settings (check your route, firewall or "
-"proxy settings)\n"
-msgstr ""
-"Al è alc che nol va tes tôs impostazions di rêt (controle les impostazions "
-"di instradament, firewall o proxy)\n"
-
-#: ../mdkapplet:483
-#, c-format
-msgid ""
-"Problem occured while connecting to the server, please contact the support "
-"team"
-msgstr ""
-
-#: ../mdkapplet:487
-#, fuzzy, c-format
-msgid "Response from Mandriva Online server\n"
-msgstr "Benvignût su Mandriva Online"
-
-#: ../mdkapplet:490
+#: ../mdkapplet:386
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Il sisteme al è atualizât\n"
 
-#: ../mdkapplet:527
-#, c-format
-msgid "No check"
-msgstr "Nissun control"
-
-#: ../mdkapplet:541
-#, c-format
-msgid "Checking config file: Not present\n"
-msgstr "Controlant il file di configurazion: No l'è presint\n"
-
-#: ../mdkapplet:544
+#: ../mdkapplet:415
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Controlant le rêt: e somee no facoltizade\n"
 
-#: ../mdkapplet:587
-#, c-format
-msgid "Logs"
-msgstr "File di log"
-
-#: ../mdkapplet:603
+#: ../mdkapplet:457 ../mdkupdate:118 ../mdkupdate:164
 #, c-format
-msgid "Clear"
-msgstr "Scancele"
+msgid "Warning"
+msgstr "Avertence"
 
-#: ../mdkapplet:629
+#: ../mdkapplet:468
 #, c-format
 msgid "About..."
 msgstr "Informazions su.."
 
-#: ../mdkapplet:631
+#: ../mdkapplet:472
 #, fuzzy, c-format
 msgid "Mandriva Online %s"
 msgstr "Benvignût su Mandriva Online"
 
-#: ../mdkapplet:635
+#: ../mdkapplet:473
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr ""
 
-#: ../mdkapplet:647
+#: ../mdkapplet:476
 #, c-format
 msgid "Mandriva Online gives access to Mandriva web services."
 msgstr ""
 
-#: ../mdkapplet:655
-#, c-format
-msgid "Always launch on startup"
-msgstr ""
-
-#: ../mdkapplet:657
-#, c-format
-msgid "Quit"
-msgstr "Jessî"
-
-#: ../mdkonline:58
-#, c-format
-msgid ""
-"mdonline version %s\n"
-"Copyright (C) %s Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"mdonline version %s\n"
-"Copyright (C) %s Mandriva.\n"
-"Chest software al è libar e al po sedi distribuît sot dai termins de GNU "
-"GPL.\n"
-"\n"
-"ûs:\n"
-
-#: ../mdkonline:63 ../mdkupdate:73
-#, c-format
-msgid "  --help\t\t- print this help message.\n"
-msgstr "  --help\t\t- stampe chest mes di jutori.\n"
-
-#: ../mdkonline:64
-#, c-format
-msgid "  --box=\t\t\t- hostname.\n"
-msgstr ""
-
-#: ../mdkonline:65
-#, c-format
-msgid "  --country\t\t\t- name of country of the user. \n"
-msgstr ""
-
-#: ../mdkonline:66
-#, c-format
-msgid "  --interactive\t\t- use the interactive mode.\n"
-msgstr ""
-
-#: ../mdkonline:67
-#, c-format
-msgid "  --nointeractive\t- use the non-interactive mode.\n"
-msgstr ""
-
-#: ../mdkonline:68
-#, c-format
-msgid "  --login=\t\t     - login name of the user.\n"
-msgstr ""
-
-#: ../mdkonline:69
-#, c-format
-msgid "  --pass=\t\t\t- password  of the user.\n"
-msgstr ""
-
-#: ../mdkonline:87 ../mdkonline:120
-#, fuzzy, c-format
-msgid "Mandriva Online"
-msgstr "Benvignût su Mandriva Online"
-
-#: ../mdkonline:90
-#, c-format
-msgid "I already have an account"
-msgstr ""
-
-#: ../mdkonline:91
-#, c-format
-msgid "I want to subscribe"
-msgstr ""
-
-#: ../mdkonline:96
-#, c-format
-msgid "Mr."
-msgstr ""
-
-#: ../mdkonline:96
-#, c-format
-msgid "Mrs."
-msgstr ""
-
-#: ../mdkonline:96
-#, c-format
-msgid "Ms."
-msgstr ""
-
-#: ../mdkonline:114
-#, c-format
-msgid "Reading configuration\n"
-msgstr "Leture de configurazion in vore\n"
-
-#: ../mdkonline:123
-#, c-format
-msgid ""
-"This assistant will help you to upload your configuration\n"
-"(packages, hardware configuration) to a centralized database in\n"
-"order to keep you informed about security updates and useful upgrades.\n"
-msgstr ""
-"Chest asistent ti judarà a cjariâ le to configurazion\n"
-"(pachets, configurazion hardware) a un database centralizât in\n"
-"maniere di tignîti informât su atualizazions di sigurece e utii mioraments.\n"
-
-#: ../mdkonline:131
-#, c-format
-msgid "Account creation or authentication"
-msgstr ""
-
-#: ../mdkonline:136
-#, c-format
-msgid "Enter your Mandriva Online login, password and machine name:"
-msgstr "Insede il to login, password e non dal computer par Mandriva Online:"
-
-#: ../mdkonline:142 ../mdkonline:195
-#, fuzzy, c-format
-msgid "Email address:"
-msgstr "Recapit mail di jessude"
-
-#: ../mdkonline:143
-#, c-format
-msgid "Country"
-msgstr "Nazion"
-
-#: ../mdkonline:144 ../mdkonline:196
-#, c-format
-msgid "Password:"
-msgstr "Password:"
-
-#: ../mdkonline:146
-#, fuzzy, c-format
-msgid "Machine description:"
-msgstr "Non dal computer:"
-
-#: ../mdkonline:147
-#, c-format
-msgid "(Ex: My Home Office's Computer)"
-msgstr ""
-
-#: ../mdkonline:152 ../mdkonline:159 ../mdkonline:180 ../mdkonline:204
-#: ../mdkonline:208 ../mdkonline:212 ../mdkonline:217 ../mdkupdate:141
-#: ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
-#, c-format
-msgid "Error"
-msgstr "Fal"
-
-#: ../mdkonline:152
-#, c-format
-msgid "Machine name must be 1 to 40 alphanumerical characters"
-msgstr ""
-
-#: ../mdkonline:155
-#, fuzzy, c-format
-msgid "Connecting to Mandriva Online website..."
-msgstr "Benvignût su Mandriva Online"
-
-#: ../mdkonline:167
-#, c-format
-msgid ""
-"In order to benefit from Mandriva Online services,\n"
-"we are about to upload your configuration.\n"
-"\n"
-"The Wizard will now send the following information to Mandriva:\n"
-"\n"
-"1) the list of packages you have installed on your system,\n"
-"\n"
-"2) your hardware configuration.\n"
-"\n"
-"If you feel uncomfortable by that idea, or do not want to benefit from this "
-"service,\n"
-"please press 'Cancel'. By pressing 'Next', you allow us to keep you "
-"informed\n"
-"about security updates and useful upgrades via personalized email alerts.\n"
-"Furthermore, you benefit from discounted paid support services on\n"
-"www.mandrivaexpert.com."
-msgstr ""
-"Par permetiti di podê doprâ i servizis Mandriva Online,\n"
-"o stin par cjariâ le to configurazion.\n"
-"\n"
-"Il Wizard al mandarâ a Mandriva les seguintis informazions:\n"
-"\n"
-"1) le liste dai pachets che tu âs instalât tal to sisteme,\n"
-"\n"
-"2) le to configurazion hardware.\n"
-"\n"
-"Se no ti va, o se no tu vuelis beneficiâ di chest servizi,\n"
-"par plasè frache 'Scancele'. Fracant 'Indenant', tu nus permetarâs di "
-"tignîti informât\n"
-"su atualizazions pe sigurece e mioraments vie email personalizadis di avîs\n"
-"Dongje, tu podarâs beneficiâ di sconts sul servizi di supuart su\n"
-"www.mandrivaexpert.com."
-
-#: ../mdkonline:180
-#, c-format
-msgid "Connection problem"
-msgstr "Probleme di conession"
-
-#: ../mdkonline:180
-#, c-format
-msgid "Problem occurs when uploading files, please try again"
-msgstr ""
-
-#: ../mdkonline:187
-#, c-format
-msgid "Create a Mandriva Online Account"
-msgstr "Cree un account Mandriva Online"
-
-#. -PO: that is for things like "Mr", "Ms",...
-#: ../mdkonline:192
-#, fuzzy, c-format
-msgid "Greeting:"
-msgstr "Vert"
-
-#: ../mdkonline:193
-#, fuzzy, c-format
-msgid "First name:"
-msgstr "Non:"
-
-#: ../mdkonline:194
-#, fuzzy, c-format
-msgid "Last name:"
-msgstr "Non host:"
-
-#: ../mdkonline:197
-#, c-format
-msgid "Confirm Password:"
-msgstr "Confirme Password:"
-
-#: ../mdkonline:204
-#, c-format
-msgid ""
-"The passwords do not match\n"
-" Please try again\n"
-msgstr ""
-"Les password no corispuindin\n"
-"Par plasè prove ancjemò\n"
-
-#: ../mdkonline:208
-#, fuzzy, c-format
-msgid "Please fill in each field"
-msgstr "Par plase jemple ducj i cjamps\n"
-
-#: ../mdkonline:212
-#, c-format
-msgid "Not a valid mail address!\n"
-msgstr "No l'è un recapit mail valevul!\n"
-
-#: ../mdkonline:217
-#, fuzzy, c-format
-msgid "Creating account failed!"
-msgstr "Mude account"
-
-#: ../mdkonline:225
-#, c-format
-msgid ""
-"Mandriva Online Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
-msgstr ""
-
-#: ../mdkonline:229
+#: ../mdkapplet:478
 #, c-format
-msgid "Your upload was successful!"
-msgstr "Cjariament completât cun sucès!"
+msgid "Online WebSite"
+msgstr "Sît online"
 
-#: ../mdkonline:229
+#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
+#: ../mdkapplet:483
 #, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandriva Online."
+msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
-"Di cumò indenant, tu ricevarâs avîs su le sigurece\n"
-" e su lis atualizazions graziis a Mandriva Online."
 
-#: ../mdkonline:229
+#: ../mdkapplet:492
 #, c-format
-msgid ""
-"Mandriva Online offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
+msgid "Always launch on startup"
 msgstr ""
-"Mandriva Online a ti ufrìs le pussibilitât di automatizâ les atualizazions.\n"
-"Un program in spiete di gnovis atualizazions al sarà fat partî "
-"periodichementri\n"
 
-#: ../mdkonline:238
+#: ../mdkapplet:494
 #, c-format
-msgid "Congratulations"
-msgstr "Congratulazions"
-
-#: ../mdkonline:238
-#, c-format
-msgid "Your Mandriva Online account has been successfully configured\n"
-msgstr ""
-
-#: ../mdkonline:253
-#, fuzzy, c-format
-msgid "Configuration uploaded successfully"
-msgstr "Cjariament completât cun sucès!"
-
-#: ../mdkonline:254
-#, fuzzy, c-format
-msgid "Problem uploading configuration"
-msgstr "Leture de configurazion in vore\n"
-
-#: ../mdkonline:256
-#, c-format
-msgid ""
-"Cannot connect to Mandriva Online website: wrong login/password or router/"
-"firewall bad settings"
-msgstr ""
+msgid "Quit"
+msgstr "Jessî"
 
 #: ../mdkonline.pm:207
 #, fuzzy, c-format
@@ -813,6 +358,11 @@ msgstr ""
 "\n"
 "ûs:\n"
 
+#: ../mdkupdate:73
+#, c-format
+msgid "  --help\t\t- print this help message.\n"
+msgstr "  --help\t\t- stampe chest mes di jutori.\n"
+
 #: ../mdkupdate:74
 #, c-format
 msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
@@ -840,11 +390,6 @@ msgid ""
 "file.\n"
 msgstr ""
 
-#: ../mdkupdate:118 ../mdkupdate:164
-#, c-format
-msgid "Warning"
-msgstr "Avertence"
-
 #. -PO: here Live Install is currently *NOT* translated on the desktop, so it's better to keep as it:
 #: ../mdkupdate:120
 #, c-format
@@ -853,11 +398,21 @@ msgid ""
 "Install' wizard."
 msgstr ""
 
+#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
+#, c-format
+msgid "Please wait"
+msgstr "Par plasè, spiete"
+
 #: ../mdkupdate:123 ../mdkupdate:174
 #, c-format
 msgid "Preparing..."
 msgstr "In preparazion..."
 
+#: ../mdkupdate:141 ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
+#, c-format
+msgid "Error"
+msgstr "Fal"
+
 #: ../mdkupdate:141
 #, c-format
 msgid ""
@@ -866,6 +421,11 @@ msgid ""
 "%s"
 msgstr ""
 
+#: ../mdkupdate:159 ../mdkupdate:188
+#, c-format
+msgid "An error occurred"
+msgstr "Al è intravignût un fal"
+
 #: ../mdkupdate:164
 #, c-format
 msgid ""
@@ -890,6 +450,252 @@ msgstr "O instali i pachets...\n"
 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 "New bundles are available for your system"
+#~ msgstr "Nissune atualizazion dispunibile pal to sistem"
+
+#, fuzzy
+#~ msgid "Service is not configured. Please click on \"Configure the service\""
+#~ msgstr "Servizi no disponibil. Frache su \"configurazion\""
+
+#, fuzzy
+#~ msgid "Configure the service"
+#~ msgstr "Configure le rêt"
+
+#~ msgid "Check updates"
+#~ msgstr "Controle atualizazions"
+
+#~ msgid "Configure Now!"
+#~ msgstr "Configure Daurman!"
+
+#~ msgid "Actions"
+#~ msgstr "Azions"
+
+#~ msgid "Configure"
+#~ msgstr "Configure"
+
+#~ msgid "See logs"
+#~ msgstr "Cjale i log"
+
+#~ msgid "Status"
+#~ msgstr "Stât"
+
+#~ msgid "Close"
+#~ msgstr "Siere"
+
+#~ msgid "Network Connection: "
+#~ msgstr "Conession a le rêt"
+
+#~ msgid "Up"
+#~ msgstr "Su"
+
+#~ msgid "Down"
+#~ msgstr "Jù"
+
+#~ msgid "Last check: "
+#~ msgstr "Ultin control"
+
+#~ msgid "Machine name:"
+#~ msgstr "Non dal computer:"
+
+#, fuzzy
+#~ msgid "Updates: "
+#~ msgstr "Gnovis Atualizazions"
+
+#~ msgid "Unknown state"
+#~ msgstr "Stât no cognossût"
+
+#~ msgid "Online services disabled. Contact Mandriva Online site\n"
+#~ msgstr "Servizis Online no facoltizâs. Contate il sît Mandriva Online\n"
+
+#~ msgid "Wrong Password.\n"
+#~ msgstr "Password falade.\n"
+
+#~ msgid "Wrong Action or host or login.\n"
+#~ msgstr "Azion o host o login falâs.\n"
+
+#~ msgid ""
+#~ "Something is wrong with your network settings (check your route, firewall "
+#~ "or proxy settings)\n"
+#~ msgstr ""
+#~ "Al è alc che nol va tes tôs impostazions di rêt (controle les "
+#~ "impostazions di instradament, firewall o proxy)\n"
+
+#, fuzzy
+#~ msgid "Response from Mandriva Online server\n"
+#~ msgstr "Benvignût su Mandriva Online"
+
+#~ msgid "No check"
+#~ msgstr "Nissun control"
+
+#~ msgid "Checking config file: Not present\n"
+#~ msgstr "Controlant il file di configurazion: No l'è presint\n"
+
+#~ msgid "Logs"
+#~ msgstr "File di log"
+
+#~ msgid "Clear"
+#~ msgstr "Scancele"
+
+#~ msgid ""
+#~ "mdonline version %s\n"
+#~ "Copyright (C) %s Mandriva.\n"
+#~ "This is free software and may be redistributed under the terms of the GNU "
+#~ "GPL.\n"
+#~ "\n"
+#~ "usage:\n"
+#~ msgstr ""
+#~ "mdonline version %s\n"
+#~ "Copyright (C) %s Mandriva.\n"
+#~ "Chest software al è libar e al po sedi distribuît sot dai termins de GNU "
+#~ "GPL.\n"
+#~ "\n"
+#~ "ûs:\n"
+
+#, fuzzy
+#~ msgid "Mandriva Online"
+#~ msgstr "Benvignût su Mandriva Online"
+
+#~ msgid "Reading configuration\n"
+#~ msgstr "Leture de configurazion in vore\n"
+
+#~ msgid ""
+#~ "This assistant will help you to upload your configuration\n"
+#~ "(packages, hardware configuration) to a centralized database in\n"
+#~ "order to keep you informed about security updates and useful upgrades.\n"
+#~ msgstr ""
+#~ "Chest asistent ti judarà a cjariâ le to configurazion\n"
+#~ "(pachets, configurazion hardware) a un database centralizât in\n"
+#~ "maniere di tignîti informât su atualizazions di sigurece e utii "
+#~ "mioraments.\n"
+
+#~ msgid "Enter your Mandriva Online login, password and machine name:"
+#~ msgstr ""
+#~ "Insede il to login, password e non dal computer par Mandriva Online:"
+
+#, fuzzy
+#~ msgid "Email address:"
+#~ msgstr "Recapit mail di jessude"
+
+#~ msgid "Country"
+#~ msgstr "Nazion"
+
+#~ msgid "Password:"
+#~ msgstr "Password:"
+
+#, fuzzy
+#~ msgid "Machine description:"
+#~ msgstr "Non dal computer:"
+
+#, fuzzy
+#~ msgid "Connecting to Mandriva Online website..."
+#~ msgstr "Benvignût su Mandriva Online"
+
+#~ msgid ""
+#~ "In order to benefit from Mandriva Online services,\n"
+#~ "we are about to upload your configuration.\n"
+#~ "\n"
+#~ "The Wizard will now send the following information to Mandriva:\n"
+#~ "\n"
+#~ "1) the list of packages you have installed on your system,\n"
+#~ "\n"
+#~ "2) your hardware configuration.\n"
+#~ "\n"
+#~ "If you feel uncomfortable by that idea, or do not want to benefit from "
+#~ "this service,\n"
+#~ "please press 'Cancel'. By pressing 'Next', you allow us to keep you "
+#~ "informed\n"
+#~ "about security updates and useful upgrades via personalized email "
+#~ "alerts.\n"
+#~ "Furthermore, you benefit from discounted paid support services on\n"
+#~ "www.mandrivaexpert.com."
+#~ msgstr ""
+#~ "Par permetiti di podê doprâ i servizis Mandriva Online,\n"
+#~ "o stin par cjariâ le to configurazion.\n"
+#~ "\n"
+#~ "Il Wizard al mandarâ a Mandriva les seguintis informazions:\n"
+#~ "\n"
+#~ "1) le liste dai pachets che tu âs instalât tal to sisteme,\n"
+#~ "\n"
+#~ "2) le to configurazion hardware.\n"
+#~ "\n"
+#~ "Se no ti va, o se no tu vuelis beneficiâ di chest servizi,\n"
+#~ "par plasè frache 'Scancele'. Fracant 'Indenant', tu nus permetarâs di "
+#~ "tignîti informât\n"
+#~ "su atualizazions pe sigurece e mioraments vie email personalizadis di "
+#~ "avîs\n"
+#~ "Dongje, tu podarâs beneficiâ di sconts sul servizi di supuart su\n"
+#~ "www.mandrivaexpert.com."
+
+#~ msgid "Connection problem"
+#~ msgstr "Probleme di conession"
+
+#~ msgid "Create a Mandriva Online Account"
+#~ msgstr "Cree un account Mandriva Online"
+
+#, fuzzy
+#~ msgid "Greeting:"
+#~ msgstr "Vert"
+
+#, fuzzy
+#~ msgid "First name:"
+#~ msgstr "Non:"
+
+#, fuzzy
+#~ msgid "Last name:"
+#~ msgstr "Non host:"
+
+#~ msgid "Confirm Password:"
+#~ msgstr "Confirme Password:"
+
+#~ msgid ""
+#~ "The passwords do not match\n"
+#~ " Please try again\n"
+#~ msgstr ""
+#~ "Les password no corispuindin\n"
+#~ "Par plasè prove ancjemò\n"
+
+#, fuzzy
+#~ msgid "Please fill in each field"
+#~ msgstr "Par plase jemple ducj i cjamps\n"
+
+#~ msgid "Not a valid mail address!\n"
+#~ msgstr "No l'è un recapit mail valevul!\n"
+
+#, fuzzy
+#~ msgid "Creating account failed!"
+#~ msgstr "Mude account"
+
+#~ msgid "Your upload was successful!"
+#~ msgstr "Cjariament completât cun sucès!"
+
+#~ msgid ""
+#~ "From now you will receive on security and updates \n"
+#~ "announcements thanks to Mandriva Online."
+#~ msgstr ""
+#~ "Di cumò indenant, tu ricevarâs avîs su le sigurece\n"
+#~ " e su lis atualizazions graziis a Mandriva Online."
+
+#~ msgid ""
+#~ "Mandriva Online offers you the ability to automate the updates.\n"
+#~ "A program will run regulary in your system waiting for new updates\n"
+#~ msgstr ""
+#~ "Mandriva Online a ti ufrìs le pussibilitât di automatizâ les "
+#~ "atualizazions.\n"
+#~ "Un program in spiete di gnovis atualizazions al sarà fat partî "
+#~ "periodichementri\n"
+
+#~ msgid "Congratulations"
+#~ msgstr "Congratulazions"
+
+#, fuzzy
+#~ msgid "Configuration uploaded successfully"
+#~ msgstr "Cjariament completât cun sucès!"
+
+#, fuzzy
+#~ msgid "Problem uploading configuration"
+#~ msgstr "Leture de configurazion in vore\n"
+
 #~ msgid "  --applet\t\t- launch Mandriva Update.\n"
 #~ msgstr "  --applet\t\t- invie Mandriva Update.\n"
 
diff --git a/po/ga.po b/po/ga.po
index cdf2ebec..12bd7fd9 100644
--- a/po/ga.po
+++ b/po/ga.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: all2.po\n"
-"POT-Creation-Date: 2007-08-09 16:26+0200\n"
+"POT-Creation-Date: 2008-02-21 18:21+0100\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"
@@ -15,72 +15,62 @@ 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:94
+#: ../mdkapplet:88
 #, c-format
 msgid "Will check updates at %s"
 msgstr ""
 
-#: ../mdkapplet:103
+#: ../mdkapplet:97
 #, c-format
 msgid "Your system is up-to-date"
 msgstr ""
 
-#: ../mdkapplet:109
+#: ../mdkapplet:103
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
 "support@mandrivaonline.com"
 msgstr ""
 
-#: ../mdkapplet:115
+#: ../mdkapplet:110
 #, fuzzy, c-format
 msgid "Please wait, finding available packages..."
 msgstr ""
 "Fan tamall\n"
 "Ag scrios pacáistí"
 
-#: ../mdkapplet:121
+#: ../mdkapplet:116
 #, c-format
 msgid "New updates are available for your system"
 msgstr ""
 
-#: ../mdkapplet:127
-#, c-format
-msgid "New bundles are available for your system"
-msgstr ""
-
-#: ../mdkapplet:133
-#, c-format
-msgid "Service is not configured. Please click on \"Configure the service\""
-msgstr ""
-
-#: ../mdkapplet:139
+#: ../mdkapplet:122
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr ""
 
-#: ../mdkapplet:145
+#: ../mdkapplet:128
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr ""
 
-#: ../mdkapplet:151 ../mdkapplet:182
+#: ../mdkapplet:134 ../mdkapplet:165
 #, c-format
 msgid "urpmi database locked"
 msgstr ""
 
-#: ../mdkapplet:157
+#: ../mdkapplet:140
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
-#: ../mdkapplet:163
+#: ../mdkapplet:146
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
 msgstr ""
 
-#: ../mdkapplet:169
+#: ../mdkapplet:152
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -91,543 +81,131 @@ msgid ""
 "Then, restart \"%s\"."
 msgstr ""
 
-#: ../mdkapplet:174
+#: ../mdkapplet:157
 #, c-format
 msgid "Enabled"
 msgstr "Cumasaithe"
 
-#: ../mdkapplet:187
+#: ../mdkapplet:170
 #, c-format
 msgid "Error updating media"
 msgstr ""
 
-#: ../mdkapplet:202
+#: ../mdkapplet:185
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr ""
 
-#: ../mdkapplet:207
+#: ../mdkapplet:190
 #, c-format
 msgid "Packages are up to date"
 msgstr ""
 
-#: ../mdkapplet:212
+#: ../mdkapplet:195
 #, fuzzy, c-format
 msgid "Failed to open urpmi database"
 msgstr "Téip ag oscailt comhad: %s\n"
 
-#: ../mdkapplet:217 ../mdkapplet:324
+#: ../mdkapplet:200
 #, fuzzy, c-format
 msgid "Install updates"
 msgstr "Feistigh córas"
 
-#: ../mdkapplet:218
-#, c-format
-msgid "Configure the service"
-msgstr ""
-
-#: ../mdkapplet:219
+#: ../mdkapplet:201
 #, c-format
 msgid "Check Updates"
 msgstr ""
 
-#: ../mdkapplet:220 ../mdkapplet:327 ../mdkonline:114 ../mdkonline:155
-#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
-#, c-format
-msgid "Please wait"
-msgstr "Fan go fóill, le do thoil"
-
-#: ../mdkapplet:220 ../mdkapplet:326 ../mdkapplet:327
-#, c-format
-msgid "Check updates"
-msgstr ""
-
-#: ../mdkapplet:223 ../mdkapplet:648
-#, c-format
-msgid "Online WebSite"
-msgstr ""
-
-#: ../mdkapplet:224
+#: ../mdkapplet:202
 #, fuzzy, c-format
 msgid "Configure Network"
 msgstr "Cumraigh gréasánú"
 
-#: ../mdkapplet:225
-#, c-format
-msgid "Configure Now!"
-msgstr ""
-
-#: ../mdkapplet:313 ../mdkapplet:392
-#, c-format
-msgid "Mandriva Linux Updates Applet"
-msgstr ""
-
-#: ../mdkapplet:322
-#, c-format
-msgid "Actions"
-msgstr "Gníomhartha"
-
-#: ../mdkapplet:325
-#, c-format
-msgid "Configure"
-msgstr "Cumraigh"
-
-#: ../mdkapplet:329
-#, c-format
-msgid "See logs"
-msgstr ""
-
-#: ../mdkapplet:332
-#, c-format
-msgid "Status"
-msgstr "Stádas"
-
-#: ../mdkapplet:336 ../mdkapplet:597
-#, c-format
-msgid "Close"
-msgstr "Dún"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Network Connection: "
-msgstr ""
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Up"
-msgstr "Suas"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Down"
-msgstr "Síos"
-
-#: ../mdkapplet:366
-#, c-format
-msgid "Last check: "
-msgstr ""
-
-#: ../mdkapplet:367 ../mdkonline:145
-#, c-format
-msgid "Machine name:"
-msgstr ""
-
-#: ../mdkapplet:368
-#, c-format
-msgid "Updates: "
-msgstr ""
-
-#: ../mdkapplet:372
+#: ../mdkapplet:283
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr ""
 
-#: ../mdkapplet:375
+#: ../mdkapplet:286
 #, c-format
 msgid "Mandriva Online seems to be reinstalled, reloading applet ...."
 msgstr ""
 
-#: ../mdkapplet:383
+#: ../mdkapplet:294
 #, c-format
 msgid "Launching MandrivaUpdate\n"
 msgstr ""
 
-#: ../mdkapplet:398
-#, c-format
-msgid "Computing new updates...\n"
-msgstr ""
-
-#: ../mdkapplet:399
-#, c-format
-msgid "Connecting to"
-msgstr ""
-
-#: ../mdkapplet:467 ../mdkupdate:159 ../mdkupdate:188
-#, c-format
-msgid "An error occurred"
-msgstr "Tharla earráid"
-
-#: ../mdkapplet:475
-#, c-format
-msgid "Development release not supported by service"
-msgstr ""
-
-#: ../mdkapplet:476
-#, c-format
-msgid "Too old release not supported by service"
-msgstr ""
-
-#: ../mdkapplet:477
-#, c-format
-msgid "Unknown state"
-msgstr ""
-
-#: ../mdkapplet:478
+#: ../mdkapplet:303
 #, c-format
-msgid "Online services disabled. Contact Mandriva Online site\n"
-msgstr ""
-
-#: ../mdkapplet:479
-#, c-format
-msgid "Wrong Password.\n"
-msgstr ""
-
-#: ../mdkapplet:480
-#, c-format
-msgid "Wrong Action or host or login.\n"
-msgstr ""
-
-#: ../mdkapplet:481
-#, c-format
-msgid ""
-"Something is wrong with your network settings (check your route, firewall or "
-"proxy settings)\n"
+msgid "Mandriva Linux Updates Applet"
 msgstr ""
 
-#: ../mdkapplet:483
+#: ../mdkapplet:308
 #, c-format
-msgid ""
-"Problem occured while connecting to the server, please contact the support "
-"team"
+msgid "Computing new updates...\n"
 msgstr ""
 
-#: ../mdkapplet:487
+#: ../mdkapplet:309
 #, c-format
-msgid "Response from Mandriva Online server\n"
+msgid "Connecting to"
 msgstr ""
 
-#: ../mdkapplet:490
+#: ../mdkapplet:386
 #, c-format
 msgid "System is up-to-date\n"
 msgstr ""
 
-#: ../mdkapplet:527
-#, c-format
-msgid "No check"
-msgstr ""
-
-#: ../mdkapplet:541
-#, c-format
-msgid "Checking config file: Not present\n"
-msgstr ""
-
-#: ../mdkapplet:544
+#: ../mdkapplet:415
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr ""
 
-#: ../mdkapplet:587
+#: ../mdkapplet:457 ../mdkupdate:118 ../mdkupdate:164
 #, c-format
-msgid "Logs"
-msgstr "Iarchomhaid"
-
-#: ../mdkapplet:603
-#, c-format
-msgid "Clear"
-msgstr "Glan"
+msgid "Warning"
+msgstr "Rabhadh"
 
-#: ../mdkapplet:629
+#: ../mdkapplet:468
 #, c-format
 msgid "About..."
 msgstr "Faoi..."
 
-#: ../mdkapplet:631
+#: ../mdkapplet:472
 #, fuzzy, c-format
 msgid "Mandriva Online %s"
 msgstr "Ionad Rialaithe Mandriva Linux"
 
-#: ../mdkapplet:635
+#: ../mdkapplet:473
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr ""
 
-#: ../mdkapplet:647
+#: ../mdkapplet:476
 #, c-format
 msgid "Mandriva Online gives access to Mandriva web services."
 msgstr ""
 
-#: ../mdkapplet:655
-#, c-format
-msgid "Always launch on startup"
-msgstr ""
-
-#: ../mdkapplet:657
-#, c-format
-msgid "Quit"
-msgstr "Scoir"
-
-#: ../mdkonline:58
-#, c-format
-msgid ""
-"mdonline version %s\n"
-"Copyright (C) %s Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-
-#: ../mdkonline:63 ../mdkupdate:73
-#, c-format
-msgid "  --help\t\t- print this help message.\n"
-msgstr ""
-
-#: ../mdkonline:64
-#, c-format
-msgid "  --box=\t\t\t- hostname.\n"
-msgstr ""
-
-#: ../mdkonline:65
-#, c-format
-msgid "  --country\t\t\t- name of country of the user. \n"
-msgstr ""
-
-#: ../mdkonline:66
-#, c-format
-msgid "  --interactive\t\t- use the interactive mode.\n"
-msgstr ""
-
-#: ../mdkonline:67
-#, c-format
-msgid "  --nointeractive\t- use the non-interactive mode.\n"
-msgstr ""
-
-#: ../mdkonline:68
-#, c-format
-msgid "  --login=\t\t     - login name of the user.\n"
-msgstr ""
-
-#: ../mdkonline:69
-#, c-format
-msgid "  --pass=\t\t\t- password  of the user.\n"
-msgstr ""
-
-#: ../mdkonline:87 ../mdkonline:120
-#, fuzzy, c-format
-msgid "Mandriva Online"
-msgstr "Ionad Rialaithe Mandriva Linux"
-
-#: ../mdkonline:90
-#, c-format
-msgid "I already have an account"
-msgstr ""
-
-#: ../mdkonline:91
-#, c-format
-msgid "I want to subscribe"
-msgstr ""
-
-#: ../mdkonline:96
-#, c-format
-msgid "Mr."
-msgstr "An t-Uas."
-
-#: ../mdkonline:96
-#, c-format
-msgid "Mrs."
-msgstr "Bean"
-
-#: ../mdkonline:96
-#, c-format
-msgid "Ms."
-msgstr "Ms."
-
-#: ../mdkonline:114
-#, c-format
-msgid "Reading configuration\n"
-msgstr ""
-
-#: ../mdkonline:123
-#, c-format
-msgid ""
-"This assistant will help you to upload your configuration\n"
-"(packages, hardware configuration) to a centralized database in\n"
-"order to keep you informed about security updates and useful upgrades.\n"
-msgstr ""
-
-#: ../mdkonline:131
-#, c-format
-msgid "Account creation or authentication"
-msgstr ""
-
-#: ../mdkonline:136
-#, c-format
-msgid "Enter your Mandriva Online login, password and machine name:"
-msgstr ""
-
-#: ../mdkonline:142 ../mdkonline:195
-#, c-format
-msgid "Email address:"
-msgstr "Seoladh Ríomhphoist:"
-
-#: ../mdkonline:143
-#, c-format
-msgid "Country"
-msgstr "Tír"
-
-#: ../mdkonline:144 ../mdkonline:196
-#, c-format
-msgid "Password:"
-msgstr "Focal Faire:"
-
-#: ../mdkonline:146
-#, c-format
-msgid "Machine description:"
-msgstr ""
-
-#: ../mdkonline:147
-#, c-format
-msgid "(Ex: My Home Office's Computer)"
-msgstr ""
-
-#: ../mdkonline:152 ../mdkonline:159 ../mdkonline:180 ../mdkonline:204
-#: ../mdkonline:208 ../mdkonline:212 ../mdkonline:217 ../mdkupdate:141
-#: ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
-#, c-format
-msgid "Error"
-msgstr "Earráid"
-
-#: ../mdkonline:152
-#, c-format
-msgid "Machine name must be 1 to 40 alphanumerical characters"
-msgstr ""
-
-#: ../mdkonline:155
-#, c-format
-msgid "Connecting to Mandriva Online website..."
-msgstr ""
-
-#: ../mdkonline:167
-#, c-format
-msgid ""
-"In order to benefit from Mandriva Online services,\n"
-"we are about to upload your configuration.\n"
-"\n"
-"The Wizard will now send the following information to Mandriva:\n"
-"\n"
-"1) the list of packages you have installed on your system,\n"
-"\n"
-"2) your hardware configuration.\n"
-"\n"
-"If you feel uncomfortable by that idea, or do not want to benefit from this "
-"service,\n"
-"please press 'Cancel'. By pressing 'Next', you allow us to keep you "
-"informed\n"
-"about security updates and useful upgrades via personalized email alerts.\n"
-"Furthermore, you benefit from discounted paid support services on\n"
-"www.mandrivaexpert.com."
-msgstr ""
-
-#: ../mdkonline:180
-#, c-format
-msgid "Connection problem"
-msgstr ""
-
-#: ../mdkonline:180
-#, c-format
-msgid "Problem occurs when uploading files, please try again"
-msgstr ""
-
-#: ../mdkonline:187
-#, c-format
-msgid "Create a Mandriva Online Account"
-msgstr ""
-
-#. -PO: that is for things like "Mr", "Ms",...
-#: ../mdkonline:192
-#, fuzzy, c-format
-msgid "Greeting:"
-msgstr "Glas"
-
-#: ../mdkonline:193
-#, c-format
-msgid "First name:"
-msgstr "Ainm baiste:"
-
-#: ../mdkonline:194
-#, c-format
-msgid "Last name:"
-msgstr "Sloinne:"
-
-#: ../mdkonline:197
-#, c-format
-msgid "Confirm Password:"
-msgstr "Dearbhaigh an Focal Faire:"
-
-#: ../mdkonline:204
-#, c-format
-msgid ""
-"The passwords do not match\n"
-" Please try again\n"
-msgstr ""
-
-#: ../mdkonline:208
-#, c-format
-msgid "Please fill in each field"
-msgstr ""
-
-#: ../mdkonline:212
-#, c-format
-msgid "Not a valid mail address!\n"
-msgstr ""
-
-#: ../mdkonline:217
-#, c-format
-msgid "Creating account failed!"
-msgstr ""
-
-#: ../mdkonline:225
-#, c-format
-msgid ""
-"Mandriva Online Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
-msgstr ""
-
-#: ../mdkonline:229
-#, c-format
-msgid "Your upload was successful!"
-msgstr ""
-
-#: ../mdkonline:229
-#, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandriva Online."
-msgstr ""
-
-#: ../mdkonline:229
-#, c-format
-msgid ""
-"Mandriva Online offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
-msgstr ""
-
-#: ../mdkonline:238
-#, c-format
-msgid "Congratulations"
-msgstr "Comhghairdeas"
-
-#: ../mdkonline:238
+#: ../mdkapplet:478
 #, c-format
-msgid "Your Mandriva Online account has been successfully configured\n"
+msgid "Online WebSite"
 msgstr ""
 
-#: ../mdkonline:253
+#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
+#: ../mdkapplet:483
 #, c-format
-msgid "Configuration uploaded successfully"
+msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
 
-#: ../mdkonline:254
+#: ../mdkapplet:492
 #, c-format
-msgid "Problem uploading configuration"
+msgid "Always launch on startup"
 msgstr ""
 
-#: ../mdkonline:256
+#: ../mdkapplet:494
 #, c-format
-msgid ""
-"Cannot connect to Mandriva Online website: wrong login/password or router/"
-"firewall bad settings"
-msgstr ""
+msgid "Quit"
+msgstr "Scoir"
 
 #: ../mdkonline.pm:207
 #, fuzzy, c-format
@@ -760,6 +338,11 @@ msgid ""
 "usage:\n"
 msgstr ""
 
+#: ../mdkupdate:73
+#, c-format
+msgid "  --help\t\t- print this help message.\n"
+msgstr ""
+
 #: ../mdkupdate:74
 #, c-format
 msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
@@ -787,11 +370,6 @@ msgid ""
 "file.\n"
 msgstr ""
 
-#: ../mdkupdate:118 ../mdkupdate:164
-#, c-format
-msgid "Warning"
-msgstr "Rabhadh"
-
 #. -PO: here Live Install is currently *NOT* translated on the desktop, so it's better to keep as it:
 #: ../mdkupdate:120
 #, c-format
@@ -800,11 +378,21 @@ msgid ""
 "Install' wizard."
 msgstr ""
 
+#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
+#, c-format
+msgid "Please wait"
+msgstr "Fan go fóill, le do thoil"
+
 #: ../mdkupdate:123 ../mdkupdate:174
 #, c-format
 msgid "Preparing..."
 msgstr "Á Ullmhú..."
 
+#: ../mdkupdate:141 ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
+#, c-format
+msgid "Error"
+msgstr "Earráid"
+
 #: ../mdkupdate:141
 #, c-format
 msgid ""
@@ -813,6 +401,11 @@ msgid ""
 "%s"
 msgstr ""
 
+#: ../mdkupdate:159 ../mdkupdate:188
+#, c-format
+msgid "An error occurred"
+msgstr "Tharla earráid"
+
 #: ../mdkupdate:164
 #, c-format
 msgid ""
@@ -837,6 +430,68 @@ msgstr "Ag suiteáil pacáistí...\n"
 msgid "Unable to update packages from update_source medium.\n"
 msgstr ""
 
+#~ msgid "Actions"
+#~ msgstr "Gníomhartha"
+
+#~ msgid "Configure"
+#~ msgstr "Cumraigh"
+
+#~ msgid "Status"
+#~ msgstr "Stádas"
+
+#~ msgid "Close"
+#~ msgstr "Dún"
+
+#~ msgid "Up"
+#~ msgstr "Suas"
+
+#~ msgid "Down"
+#~ msgstr "Síos"
+
+#~ msgid "Logs"
+#~ msgstr "Iarchomhaid"
+
+#~ msgid "Clear"
+#~ msgstr "Glan"
+
+#, fuzzy
+#~ msgid "Mandriva Online"
+#~ msgstr "Ionad Rialaithe Mandriva Linux"
+
+#~ msgid "Mr."
+#~ msgstr "An t-Uas."
+
+#~ msgid "Mrs."
+#~ msgstr "Bean"
+
+#~ msgid "Ms."
+#~ msgstr "Ms."
+
+#~ msgid "Email address:"
+#~ msgstr "Seoladh Ríomhphoist:"
+
+#~ msgid "Country"
+#~ msgstr "Tír"
+
+#~ msgid "Password:"
+#~ msgstr "Focal Faire:"
+
+#, fuzzy
+#~ msgid "Greeting:"
+#~ msgstr "Glas"
+
+#~ msgid "First name:"
+#~ msgstr "Ainm baiste:"
+
+#~ msgid "Last name:"
+#~ msgstr "Sloinne:"
+
+#~ msgid "Confirm Password:"
+#~ msgstr "Dearbhaigh an Focal Faire:"
+
+#~ msgid "Congratulations"
+#~ msgstr "Comhghairdeas"
+
 #~ msgid "Login:"
 #~ msgstr "Log isteach:"
 
diff --git a/po/gl.po b/po/gl.po
index 722bb28d..dd9c221c 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline-gl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-09 16:26+0200\n"
+"POT-Creation-Date: 2008-02-21 18:21+0100\n"
 "PO-Revision-Date: 2006-05-10 13:21+0200\n"
 "Last-Translator: Leandro Regueiro <leandro.regueiro@gmail.com>\n"
 "Language-Team: Galician <gpul-traduccion@ceu.fi.udc.es>\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:94
+#: ../mdkapplet:88
 #, fuzzy, c-format
 msgid "Will check updates at %s"
 msgstr "Comprobar actualizacións"
 
-#: ../mdkapplet:103
+#: ../mdkapplet:97
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "O seu sistema está actualizado"
 
-#: ../mdkapplet:109
+#: ../mdkapplet:103
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -38,53 +38,43 @@ msgstr ""
 "Problema na configuración do servicio. Por favor comprobe os logs e envíe un "
 "correo-e a support@mandrivaonline.com"
 
-#: ../mdkapplet:115
+#: ../mdkapplet:110
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "Por favor agarde, buscando os paquetes dispoñibles..."
 
-#: ../mdkapplet:121
+#: ../mdkapplet:116
 #, c-format
 msgid "New updates are available for your system"
 msgstr "Hai novas actualizacións dispoñibles para o seu sistema"
 
-#: ../mdkapplet:127
-#, fuzzy, c-format
-msgid "New bundles are available for your system"
-msgstr "Hai novas actualizacións dispoñibles para o seu sistema"
-
-#: ../mdkapplet:133
-#, c-format
-msgid "Service is not configured. Please click on \"Configure the service\""
-msgstr "O servicio non está configurado. Clique en \"Configura-lo servicio\""
-
-#: ../mdkapplet:139
+#: ../mdkapplet:122
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "A rede está caída. Configure a súa rede"
 
-#: ../mdkapplet:145
+#: ../mdkapplet:128
 #, 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:151 ../mdkapplet:182
+#: ../mdkapplet:134 ../mdkapplet:165
 #, fuzzy, c-format
 msgid "urpmi database locked"
 msgstr "a base de datos de urpmi está bloqueada"
 
-#: ../mdkapplet:157
+#: ../mdkapplet:140
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr "Versión non soportada (versión antiga ou de desenvolvemento)"
 
-#: ../mdkapplet:163
+#: ../mdkapplet:146
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
 msgstr ""
 
-#: ../mdkapplet:169
+#: ../mdkapplet:152
 #, fuzzy, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -101,584 +91,131 @@ msgstr ""
 "\n"
 "Despois, reinicie %s."
 
-#: ../mdkapplet:174
+#: ../mdkapplet:157
 #, c-format
 msgid "Enabled"
 msgstr "¿Habilitado"
 
-#: ../mdkapplet:187
+#: ../mdkapplet:170
 #, fuzzy, c-format
 msgid "Error updating media"
 msgstr "Actualizando soporte...\n"
 
-#: ../mdkapplet:202
+#: ../mdkapplet:185
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr "Comprobando... As actualizacións están dispoñibles\n"
 
-#: ../mdkapplet:207
+#: ../mdkapplet:190
 #, c-format
 msgid "Packages are up to date"
 msgstr ""
 
-#: ../mdkapplet:212
+#: ../mdkapplet:195
 #, fuzzy, c-format
 msgid "Failed to open urpmi database"
 msgstr "non foi posible abrir rpmdb"
 
-#: ../mdkapplet:217 ../mdkapplet:324
+#: ../mdkapplet:200
 #, c-format
 msgid "Install updates"
 msgstr "Instala-las actualizacións"
 
-#: ../mdkapplet:218
-#, c-format
-msgid "Configure the service"
-msgstr "Configura-lo servicio"
-
-#: ../mdkapplet:219
+#: ../mdkapplet:201
 #, c-format
 msgid "Check Updates"
 msgstr "Comprobar se hai Actualizacións"
 
-#: ../mdkapplet:220 ../mdkapplet:327 ../mdkonline:114 ../mdkonline:155
-#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
-#, c-format
-msgid "Please wait"
-msgstr "Por favor, agarde"
-
-#: ../mdkapplet:220 ../mdkapplet:326 ../mdkapplet:327
-#, c-format
-msgid "Check updates"
-msgstr "Comprobar actualizacións"
-
-#: ../mdkapplet:223 ../mdkapplet:648
-#, c-format
-msgid "Online WebSite"
-msgstr "Sitio Web en Liña"
-
-#: ../mdkapplet:224
+#: ../mdkapplet:202
 #, c-format
 msgid "Configure Network"
 msgstr "Configura-la Rede"
 
-#: ../mdkapplet:225
-#, c-format
-msgid "Configure Now!"
-msgstr "Configurar agora!"
-
-#: ../mdkapplet:313 ../mdkapplet:392
-#, c-format
-msgid "Mandriva Linux Updates Applet"
-msgstr "Applet de Actualización de Mandriva Linux"
-
-#: ../mdkapplet:322
-#, c-format
-msgid "Actions"
-msgstr "Accións"
-
-#: ../mdkapplet:325
-#, c-format
-msgid "Configure"
-msgstr "Configurar"
-
-#: ../mdkapplet:329
-#, c-format
-msgid "See logs"
-msgstr "Ve-los logs"
-
-#: ../mdkapplet:332
-#, c-format
-msgid "Status"
-msgstr "Estado"
-
-#: ../mdkapplet:336 ../mdkapplet:597
-#, c-format
-msgid "Close"
-msgstr "Pechar"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Network Connection: "
-msgstr "Conexión á Rede: "
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Up"
-msgstr "Arriba"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Down"
-msgstr "Abaixo"
-
-#: ../mdkapplet:366
-#, c-format
-msgid "Last check: "
-msgstr "Última comprobación: "
-
-#: ../mdkapplet:367 ../mdkonline:145
-#, c-format
-msgid "Machine name:"
-msgstr "Nome do ordenador:"
-
-#: ../mdkapplet:368
-#, c-format
-msgid "Updates: "
-msgstr "Actualizacións: "
-
-#: ../mdkapplet:372
+#: ../mdkapplet:283
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Executando drakconnect\n"
 
-#: ../mdkapplet:375
+#: ../mdkapplet:286
 #, c-format
 msgid "Mandriva Online seems to be reinstalled, reloading applet ...."
 msgstr "Semella ser que se reinstalou Mandriva Online, recargando applet ...."
 
-#: ../mdkapplet:383
+#: ../mdkapplet:294
 #, c-format
 msgid "Launching MandrivaUpdate\n"
 msgstr "Executando MandrivaUpdate\n"
 
-#: ../mdkapplet:398
+#: ../mdkapplet:303
+#, c-format
+msgid "Mandriva Linux Updates Applet"
+msgstr "Applet de Actualización de Mandriva Linux"
+
+#: ../mdkapplet:308
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Procesando as novas actualizacións...\n"
 
-#: ../mdkapplet:399
+#: ../mdkapplet:309
 #, c-format
 msgid "Connecting to"
 msgstr "Conectando a"
 
-#: ../mdkapplet:467 ../mdkupdate:159 ../mdkupdate:188
-#, c-format
-msgid "An error occurred"
-msgstr "Ocorreu un erro"
-
-#: ../mdkapplet:475
-#, c-format
-msgid "Development release not supported by service"
-msgstr "Versión de desenvolvemento non soportada polo servicio"
-
-#: ../mdkapplet:476
-#, c-format
-msgid "Too old release not supported by service"
-msgstr "Versión antiga non soportada polo servicio"
-
-#: ../mdkapplet:477
-#, c-format
-msgid "Unknown state"
-msgstr "Estado descoñecido"
-
-#: ../mdkapplet:478
-#, c-format
-msgid "Online services disabled. Contact Mandriva Online site\n"
-msgstr ""
-"Os sevicios en liña están deshabilitados. Contacte co sitio Mandriva Online\n"
-
-#: ../mdkapplet:479
-#, c-format
-msgid "Wrong Password.\n"
-msgstr "Contrasinal Non Válido.\n"
-
-#: ../mdkapplet:480
-#, c-format
-msgid "Wrong Action or host or login.\n"
-msgstr "Acción ou máquina ou nome de usuario incorrecto.\n"
-
-#: ../mdkapplet:481
-#, c-format
-msgid ""
-"Something is wrong with your network settings (check your route, firewall or "
-"proxy settings)\n"
-msgstr ""
-"Algo está mal na configuración da súa rede (verifique a configuración do seu "
-"encamiñador, cortalumes ou proxy)\n"
-
-#: ../mdkapplet:483
-#, c-format
-msgid ""
-"Problem occured while connecting to the server, please contact the support "
-"team"
-msgstr ""
-"Ocorreu un problema mentres se conectaba co servidor, por favor contacte co "
-"equipo de soporte"
-
-#: ../mdkapplet:487
-#, c-format
-msgid "Response from Mandriva Online server\n"
-msgstr "Resposta do servidor de Mandriva Online\n"
-
-#: ../mdkapplet:490
+#: ../mdkapplet:386
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "O sistema está actualizado\n"
 
-#: ../mdkapplet:527
-#, c-format
-msgid "No check"
-msgstr "Sen comprobar"
-
-#: ../mdkapplet:541
-#, c-format
-msgid "Checking config file: Not present\n"
-msgstr "Comprobando o ficheiro de configuración: Non existe\n"
-
-#: ../mdkapplet:544
+#: ../mdkapplet:415
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Comprobando a Rede: parece que está deshabilitada\n"
 
-#: ../mdkapplet:587
+#: ../mdkapplet:457 ../mdkupdate:118 ../mdkupdate:164
 #, c-format
-msgid "Logs"
-msgstr "Logs"
-
-#: ../mdkapplet:603
-#, c-format
-msgid "Clear"
-msgstr "Limpar"
+msgid "Warning"
+msgstr "Advertencia"
 
-#: ../mdkapplet:629
+#: ../mdkapplet:468
 #, c-format
 msgid "About..."
 msgstr "Acerca de..."
 
-#: ../mdkapplet:631
+#: ../mdkapplet:472
 #, c-format
 msgid "Mandriva Online %s"
 msgstr "Mandriva Online %s"
 
-#: ../mdkapplet:635
+#: ../mdkapplet:473
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Copyright (C) %s de Mandriva"
 
-#: ../mdkapplet:647
+#: ../mdkapplet:476
 #, c-format
 msgid "Mandriva Online gives access to Mandriva web services."
 msgstr "Mandriva Online da acceso ós servicios web de Mandriva."
 
-#: ../mdkapplet:655
-#, c-format
-msgid "Always launch on startup"
-msgstr "Executar sempre ó inicia-lo sistema"
-
-#: ../mdkapplet:657
-#, c-format
-msgid "Quit"
-msgstr "Pechar"
-
-#: ../mdkonline:58
-#, c-format
-msgid ""
-"mdonline version %s\n"
-"Copyright (C) %s Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"mdonline versión %s\n"
-"Copyright © %s Mandriva.\n"
-"Isto é software libre e pode redistribuirse baixo os termos da GNU GPL.\n"
-"\n"
-"uso:\n"
-
-#: ../mdkonline:63 ../mdkupdate:73
-#, c-format
-msgid "  --help\t\t- print this help message.\n"
-msgstr "  --help\t\t- amosa esta mensaxe de axuda.\n"
-
-#: ../mdkonline:64
-#, c-format
-msgid "  --box=\t\t\t- hostname.\n"
-msgstr "  --box=\t\t\t- nome de máquina.\n"
-
-#: ../mdkonline:65
-#, c-format
-msgid "  --country\t\t\t- name of country of the user. \n"
-msgstr "  --country\t\t\t- nome do país do usuario. \n"
-
-#: ../mdkonline:66
-#, c-format
-msgid "  --interactive\t\t- use the interactive mode.\n"
-msgstr "  --interactive\t\t- usar o modo interactivo.\n"
-
-#: ../mdkonline:67
-#, c-format
-msgid "  --nointeractive\t- use the non-interactive mode.\n"
-msgstr "  --nointeractive\t- usar o modo non interactivo.\n"
-
-#: ../mdkonline:68
-#, c-format
-msgid "  --login=\t\t     - login name of the user.\n"
-msgstr "  --login=\t\t     - nome de usuario do usuario.\n"
-
-#: ../mdkonline:69
-#, c-format
-msgid "  --pass=\t\t\t- password  of the user.\n"
-msgstr "  --pass=\t\t\t- contrasinal do usuario.\n"
-
-#: ../mdkonline:87 ../mdkonline:120
-#, c-format
-msgid "Mandriva Online"
-msgstr "Mandriva Online"
-
-#: ../mdkonline:90
-#, c-format
-msgid "I already have an account"
-msgstr "Xa teño unha conta"
-
-#: ../mdkonline:91
-#, c-format
-msgid "I want to subscribe"
-msgstr "Desexo subscribirme"
-
-#: ../mdkonline:96
-#, c-format
-msgid "Mr."
-msgstr "Sr."
-
-#: ../mdkonline:96
-#, c-format
-msgid "Mrs."
-msgstr "Sra."
-
-#: ../mdkonline:96
-#, c-format
-msgid "Ms."
-msgstr "Srta."
-
-#: ../mdkonline:114
-#, c-format
-msgid "Reading configuration\n"
-msgstr "Lendo a configuración\n"
-
-#: ../mdkonline:123
-#, c-format
-msgid ""
-"This assistant will help you to upload your configuration\n"
-"(packages, hardware configuration) to a centralized database in\n"
-"order to keep you informed about security updates and useful upgrades.\n"
-msgstr ""
-"Este asistente axudaralle a subi-la sua configuración\n"
-"(paquetes, configuración do hardware) a unha base de datos central para\n"
-"mantelo informado acerca de actualizacións útiles e de seguridade.\n"
-
-#: ../mdkonline:131
-#, c-format
-msgid "Account creation or authentication"
-msgstr "Creación da conta ou autenticación"
-
-#: ../mdkonline:136
-#, c-format
-msgid "Enter your Mandriva Online login, password and machine name:"
-msgstr ""
-"Introduza o seu login e contrasinal de Mandriva Online e o nome do ordenador:"
-
-#: ../mdkonline:142 ../mdkonline:195
-#, c-format
-msgid "Email address:"
-msgstr "Enderezo de correo-e:"
-
-#: ../mdkonline:143
-#, c-format
-msgid "Country"
-msgstr "País"
-
-#: ../mdkonline:144 ../mdkonline:196
-#, c-format
-msgid "Password:"
-msgstr "Contrasinal:"
-
-#: ../mdkonline:146
-#, c-format
-msgid "Machine description:"
-msgstr "Descrición da máquina:"
-
-#: ../mdkonline:147
-#, c-format
-msgid "(Ex: My Home Office's Computer)"
-msgstr "(P.Ex: O Meu Ordenador Na Oficina)"
-
-#: ../mdkonline:152 ../mdkonline:159 ../mdkonline:180 ../mdkonline:204
-#: ../mdkonline:208 ../mdkonline:212 ../mdkonline:217 ../mdkupdate:141
-#: ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
-#, c-format
-msgid "Error"
-msgstr "Erro"
-
-#: ../mdkonline:152
-#, c-format
-msgid "Machine name must be 1 to 40 alphanumerical characters"
-msgstr "O nome de máquina debe ter entre 1 e 40 caracteres alfanuméricos"
-
-#: ../mdkonline:155
-#, c-format
-msgid "Connecting to Mandriva Online website..."
-msgstr "Conectando ó sitio web de Mandriva Online..."
-
-#: ../mdkonline:167
-#, c-format
-msgid ""
-"In order to benefit from Mandriva Online services,\n"
-"we are about to upload your configuration.\n"
-"\n"
-"The Wizard will now send the following information to Mandriva:\n"
-"\n"
-"1) the list of packages you have installed on your system,\n"
-"\n"
-"2) your hardware configuration.\n"
-"\n"
-"If you feel uncomfortable by that idea, or do not want to benefit from this "
-"service,\n"
-"please press 'Cancel'. By pressing 'Next', you allow us to keep you "
-"informed\n"
-"about security updates and useful upgrades via personalized email alerts.\n"
-"Furthermore, you benefit from discounted paid support services on\n"
-"www.mandrivaexpert.com."
-msgstr ""
-"Para poder beneficiarse dos servicios de Mandriva Online,\n"
-"estamos a piques de subir a súa configuración.\n"
-"\n"
-"O asistente vai envia-la seguinte información a Mandriva:\n"
-"\n"
-"1) a lista dos paquetes que ten instalados no seu sistema,\n"
-"\n"
-"2) a configuración do seu hardware.\n"
-"\n"
-"Se non lle gusta esta idea, ou non desexa beneficiarse deste servicio,\n"
-"prema 'Cancelar'. Premendo 'Seguinte', vostede permítenos mantelo informado\n"
-"das actualizacións de seguridade e as actualizacións útiles a través de\n"
-"mensaxes de correo-e personalizadas.\n"
-"Ademais, vostede beneficiarase con descontos nos servicios de soporte de "
-"pago\n"
-"en www.mandrivaexpert.com."
-
-#: ../mdkonline:180
-#, c-format
-msgid "Connection problem"
-msgstr "Problema de conexión"
-
-#: ../mdkonline:180
-#, c-format
-msgid "Problem occurs when uploading files, please try again"
-msgstr "Ocorreu un problema ó subi-los ficheiros, inténteo de novo"
-
-#: ../mdkonline:187
-#, c-format
-msgid "Create a Mandriva Online Account"
-msgstr "Crear unha Conta en Mandriva Online"
-
-#. -PO: that is for things like "Mr", "Ms",...
-#: ../mdkonline:192
-#, c-format
-msgid "Greeting:"
-msgstr "Benvida:"
-
-#: ../mdkonline:193
-#, c-format
-msgid "First name:"
-msgstr "Nome:"
-
-#: ../mdkonline:194
-#, c-format
-msgid "Last name:"
-msgstr "Apelidos:"
-
-#: ../mdkonline:197
-#, c-format
-msgid "Confirm Password:"
-msgstr "Confirma-lo Contrasinal:"
-
-#: ../mdkonline:204
-#, c-format
-msgid ""
-"The passwords do not match\n"
-" Please try again\n"
-msgstr ""
-"Os contrasinais non coinciden\n"
-"Por favor, inténteo de novo\n"
-
-#: ../mdkonline:208
-#, c-format
-msgid "Please fill in each field"
-msgstr "Complete tódolos campos"
-
-#: ../mdkonline:212
-#, c-format
-msgid "Not a valid mail address!\n"
-msgstr "Non é un enderezo de email válido!\n"
-
-#: ../mdkonline:217
-#, c-format
-msgid "Creating account failed!"
-msgstr "Erro ó crea-la conta!"
-
-#: ../mdkonline:225
-#, c-format
-msgid ""
-"Mandriva Online Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
-msgstr ""
-"A Conta de Mandriva Online creouse con éxito.\n"
-"Prema \"Seguinte\" para autenticarse e subir a súa configuración\n"
-
-#: ../mdkonline:229
-#, c-format
-msgid "Your upload was successful!"
-msgstr "O envio de datos tivo éxito!"
-
-#: ../mdkonline:229
+#: ../mdkapplet:478
 #, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandriva Online."
-msgstr ""
-"Dende agora recibirá avisos referentes á seguridade \n"
-"e ás actualizacións gracias a Mandriva Online."
+msgid "Online WebSite"
+msgstr "Sitio Web en Liña"
 
-#: ../mdkonline:229
+#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
+#: ../mdkapplet:483
 #, c-format
-msgid ""
-"Mandriva Online offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
+msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
-"Mandriva Online ofrécelle a posibilidade de automatiza-las actualizacións.\n"
-"Un programa executarase regularmente no seu sistema agardando novas "
-"actualizacións\n"
-
-#: ../mdkonline:238
-#, c-format
-msgid "Congratulations"
-msgstr "Noraboa"
 
-#: ../mdkonline:238
+#: ../mdkapplet:492
 #, c-format
-msgid "Your Mandriva Online account has been successfully configured\n"
-msgstr "A súa conta de Mandriva Online configurouse con éxito\n"
-
-#: ../mdkonline:253
-#, c-format
-msgid "Configuration uploaded successfully"
-msgstr "A configuración subiuse con éxito"
-
-#: ../mdkonline:254
-#, c-format
-msgid "Problem uploading configuration"
-msgstr "Problema ó subir a configuración"
+msgid "Always launch on startup"
+msgstr "Executar sempre ó inicia-lo sistema"
 
-#: ../mdkonline:256
+#: ../mdkapplet:494
 #, c-format
-msgid ""
-"Cannot connect to Mandriva Online website: wrong login/password or router/"
-"firewall bad settings"
-msgstr ""
-"Non se puido conectar ó sitio web de mandrivaonline: nome de usuario/"
-"contrasinal incorrecto ou mala configuración do encamiñador/cortalumes"
+msgid "Quit"
+msgstr "Pechar"
 
 #: ../mdkonline.pm:207
 #, c-format
@@ -826,6 +363,11 @@ msgstr ""
 "\n"
 "uso:\n"
 
+#: ../mdkupdate:73
+#, c-format
+msgid "  --help\t\t- print this help message.\n"
+msgstr "  --help\t\t- amosa esta mensaxe de axuda.\n"
+
 #: ../mdkupdate:74
 #, c-format
 msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
@@ -853,11 +395,6 @@ msgid ""
 "file.\n"
 msgstr ""
 
-#: ../mdkupdate:118 ../mdkupdate:164
-#, c-format
-msgid "Warning"
-msgstr "Advertencia"
-
 #. -PO: here Live Install is currently *NOT* translated on the desktop, so it's better to keep as it:
 #: ../mdkupdate:120
 #, c-format
@@ -868,11 +405,21 @@ msgstr ""
 "Primeiro ten que instalar o sistema no seu disco duro co asistente de "
 "'Instalación Live'."
 
+#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
+#, c-format
+msgid "Please wait"
+msgstr "Por favor, agarde"
+
 #: ../mdkupdate:123 ../mdkupdate:174
 #, c-format
 msgid "Preparing..."
 msgstr "Preparando..."
 
+#: ../mdkupdate:141 ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
+#, c-format
+msgid "Error"
+msgstr "Erro"
+
 #: ../mdkupdate:141
 #, c-format
 msgid ""
@@ -881,6 +428,11 @@ msgid ""
 "%s"
 msgstr ""
 
+#: ../mdkupdate:159 ../mdkupdate:188
+#, c-format
+msgid "An error occurred"
+msgstr "Ocorreu un erro"
+
 #: ../mdkupdate:164
 #, c-format
 msgid ""
@@ -910,6 +462,315 @@ 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 "New bundles are available for your system"
+#~ msgstr "Hai novas actualizacións dispoñibles para o seu sistema"
+
+#~ msgid "Service is not configured. Please click on \"Configure the service\""
+#~ msgstr ""
+#~ "O servicio non está configurado. Clique en \"Configura-lo servicio\""
+
+#~ msgid "Configure the service"
+#~ msgstr "Configura-lo servicio"
+
+#~ msgid "Check updates"
+#~ msgstr "Comprobar actualizacións"
+
+#~ msgid "Configure Now!"
+#~ msgstr "Configurar agora!"
+
+#~ msgid "Actions"
+#~ msgstr "Accións"
+
+#~ msgid "Configure"
+#~ msgstr "Configurar"
+
+#~ msgid "See logs"
+#~ msgstr "Ve-los logs"
+
+#~ msgid "Status"
+#~ msgstr "Estado"
+
+#~ msgid "Close"
+#~ msgstr "Pechar"
+
+#~ msgid "Network Connection: "
+#~ msgstr "Conexión á Rede: "
+
+#~ msgid "Up"
+#~ msgstr "Arriba"
+
+#~ msgid "Down"
+#~ msgstr "Abaixo"
+
+#~ msgid "Last check: "
+#~ msgstr "Última comprobación: "
+
+#~ msgid "Machine name:"
+#~ msgstr "Nome do ordenador:"
+
+#~ msgid "Updates: "
+#~ msgstr "Actualizacións: "
+
+#~ msgid "Development release not supported by service"
+#~ msgstr "Versión de desenvolvemento non soportada polo servicio"
+
+#~ msgid "Too old release not supported by service"
+#~ msgstr "Versión antiga non soportada polo servicio"
+
+#~ msgid "Unknown state"
+#~ msgstr "Estado descoñecido"
+
+#~ msgid "Online services disabled. Contact Mandriva Online site\n"
+#~ msgstr ""
+#~ "Os sevicios en liña están deshabilitados. Contacte co sitio Mandriva "
+#~ "Online\n"
+
+#~ msgid "Wrong Password.\n"
+#~ msgstr "Contrasinal Non Válido.\n"
+
+#~ msgid "Wrong Action or host or login.\n"
+#~ msgstr "Acción ou máquina ou nome de usuario incorrecto.\n"
+
+#~ msgid ""
+#~ "Something is wrong with your network settings (check your route, firewall "
+#~ "or proxy settings)\n"
+#~ msgstr ""
+#~ "Algo está mal na configuración da súa rede (verifique a configuración do "
+#~ "seu encamiñador, cortalumes ou proxy)\n"
+
+#~ msgid ""
+#~ "Problem occured while connecting to the server, please contact the "
+#~ "support team"
+#~ msgstr ""
+#~ "Ocorreu un problema mentres se conectaba co servidor, por favor contacte "
+#~ "co equipo de soporte"
+
+#~ msgid "Response from Mandriva Online server\n"
+#~ msgstr "Resposta do servidor de Mandriva Online\n"
+
+#~ msgid "No check"
+#~ msgstr "Sen comprobar"
+
+#~ msgid "Checking config file: Not present\n"
+#~ msgstr "Comprobando o ficheiro de configuración: Non existe\n"
+
+#~ msgid "Logs"
+#~ msgstr "Logs"
+
+#~ msgid "Clear"
+#~ msgstr "Limpar"
+
+#~ msgid ""
+#~ "mdonline version %s\n"
+#~ "Copyright (C) %s Mandriva.\n"
+#~ "This is free software and may be redistributed under the terms of the GNU "
+#~ "GPL.\n"
+#~ "\n"
+#~ "usage:\n"
+#~ msgstr ""
+#~ "mdonline versión %s\n"
+#~ "Copyright © %s Mandriva.\n"
+#~ "Isto é software libre e pode redistribuirse baixo os termos da GNU GPL.\n"
+#~ "\n"
+#~ "uso:\n"
+
+#~ msgid "  --box=\t\t\t- hostname.\n"
+#~ msgstr "  --box=\t\t\t- nome de máquina.\n"
+
+#~ msgid "  --country\t\t\t- name of country of the user. \n"
+#~ msgstr "  --country\t\t\t- nome do país do usuario. \n"
+
+#~ msgid "  --interactive\t\t- use the interactive mode.\n"
+#~ msgstr "  --interactive\t\t- usar o modo interactivo.\n"
+
+#~ msgid "  --nointeractive\t- use the non-interactive mode.\n"
+#~ msgstr "  --nointeractive\t- usar o modo non interactivo.\n"
+
+#~ msgid "  --login=\t\t     - login name of the user.\n"
+#~ msgstr "  --login=\t\t     - nome de usuario do usuario.\n"
+
+#~ msgid "  --pass=\t\t\t- password  of the user.\n"
+#~ msgstr "  --pass=\t\t\t- contrasinal do usuario.\n"
+
+#~ msgid "Mandriva Online"
+#~ msgstr "Mandriva Online"
+
+#~ msgid "I already have an account"
+#~ msgstr "Xa teño unha conta"
+
+#~ msgid "I want to subscribe"
+#~ msgstr "Desexo subscribirme"
+
+#~ msgid "Mr."
+#~ msgstr "Sr."
+
+#~ msgid "Mrs."
+#~ msgstr "Sra."
+
+#~ msgid "Ms."
+#~ msgstr "Srta."
+
+#~ msgid "Reading configuration\n"
+#~ msgstr "Lendo a configuración\n"
+
+#~ msgid ""
+#~ "This assistant will help you to upload your configuration\n"
+#~ "(packages, hardware configuration) to a centralized database in\n"
+#~ "order to keep you informed about security updates and useful upgrades.\n"
+#~ msgstr ""
+#~ "Este asistente axudaralle a subi-la sua configuración\n"
+#~ "(paquetes, configuración do hardware) a unha base de datos central para\n"
+#~ "mantelo informado acerca de actualizacións útiles e de seguridade.\n"
+
+#~ msgid "Account creation or authentication"
+#~ msgstr "Creación da conta ou autenticación"
+
+#~ msgid "Enter your Mandriva Online login, password and machine name:"
+#~ msgstr ""
+#~ "Introduza o seu login e contrasinal de Mandriva Online e o nome do "
+#~ "ordenador:"
+
+#~ msgid "Email address:"
+#~ msgstr "Enderezo de correo-e:"
+
+#~ msgid "Country"
+#~ msgstr "País"
+
+#~ msgid "Password:"
+#~ msgstr "Contrasinal:"
+
+#~ msgid "Machine description:"
+#~ msgstr "Descrición da máquina:"
+
+#~ msgid "(Ex: My Home Office's Computer)"
+#~ msgstr "(P.Ex: O Meu Ordenador Na Oficina)"
+
+#~ msgid "Machine name must be 1 to 40 alphanumerical characters"
+#~ msgstr "O nome de máquina debe ter entre 1 e 40 caracteres alfanuméricos"
+
+#~ msgid "Connecting to Mandriva Online website..."
+#~ msgstr "Conectando ó sitio web de Mandriva Online..."
+
+#~ msgid ""
+#~ "In order to benefit from Mandriva Online services,\n"
+#~ "we are about to upload your configuration.\n"
+#~ "\n"
+#~ "The Wizard will now send the following information to Mandriva:\n"
+#~ "\n"
+#~ "1) the list of packages you have installed on your system,\n"
+#~ "\n"
+#~ "2) your hardware configuration.\n"
+#~ "\n"
+#~ "If you feel uncomfortable by that idea, or do not want to benefit from "
+#~ "this service,\n"
+#~ "please press 'Cancel'. By pressing 'Next', you allow us to keep you "
+#~ "informed\n"
+#~ "about security updates and useful upgrades via personalized email "
+#~ "alerts.\n"
+#~ "Furthermore, you benefit from discounted paid support services on\n"
+#~ "www.mandrivaexpert.com."
+#~ msgstr ""
+#~ "Para poder beneficiarse dos servicios de Mandriva Online,\n"
+#~ "estamos a piques de subir a súa configuración.\n"
+#~ "\n"
+#~ "O asistente vai envia-la seguinte información a Mandriva:\n"
+#~ "\n"
+#~ "1) a lista dos paquetes que ten instalados no seu sistema,\n"
+#~ "\n"
+#~ "2) a configuración do seu hardware.\n"
+#~ "\n"
+#~ "Se non lle gusta esta idea, ou non desexa beneficiarse deste servicio,\n"
+#~ "prema 'Cancelar'. Premendo 'Seguinte', vostede permítenos mantelo "
+#~ "informado\n"
+#~ "das actualizacións de seguridade e as actualizacións útiles a través de\n"
+#~ "mensaxes de correo-e personalizadas.\n"
+#~ "Ademais, vostede beneficiarase con descontos nos servicios de soporte de "
+#~ "pago\n"
+#~ "en www.mandrivaexpert.com."
+
+#~ msgid "Connection problem"
+#~ msgstr "Problema de conexión"
+
+#~ msgid "Problem occurs when uploading files, please try again"
+#~ msgstr "Ocorreu un problema ó subi-los ficheiros, inténteo de novo"
+
+#~ msgid "Create a Mandriva Online Account"
+#~ msgstr "Crear unha Conta en Mandriva Online"
+
+#~ msgid "Greeting:"
+#~ msgstr "Benvida:"
+
+#~ msgid "First name:"
+#~ msgstr "Nome:"
+
+#~ msgid "Last name:"
+#~ msgstr "Apelidos:"
+
+#~ msgid "Confirm Password:"
+#~ msgstr "Confirma-lo Contrasinal:"
+
+#~ msgid ""
+#~ "The passwords do not match\n"
+#~ " Please try again\n"
+#~ msgstr ""
+#~ "Os contrasinais non coinciden\n"
+#~ "Por favor, inténteo de novo\n"
+
+#~ msgid "Please fill in each field"
+#~ msgstr "Complete tódolos campos"
+
+#~ msgid "Not a valid mail address!\n"
+#~ msgstr "Non é un enderezo de email válido!\n"
+
+#~ msgid "Creating account failed!"
+#~ msgstr "Erro ó crea-la conta!"
+
+#~ msgid ""
+#~ "Mandriva Online Account successfully created.\n"
+#~ "Please click \"Next\" to authenticate and upload your configuration\n"
+#~ msgstr ""
+#~ "A Conta de Mandriva Online creouse con éxito.\n"
+#~ "Prema \"Seguinte\" para autenticarse e subir a súa configuración\n"
+
+#~ msgid "Your upload was successful!"
+#~ msgstr "O envio de datos tivo éxito!"
+
+#~ msgid ""
+#~ "From now you will receive on security and updates \n"
+#~ "announcements thanks to Mandriva Online."
+#~ msgstr ""
+#~ "Dende agora recibirá avisos referentes á seguridade \n"
+#~ "e ás actualizacións gracias a Mandriva Online."
+
+#~ msgid ""
+#~ "Mandriva Online offers you the ability to automate the updates.\n"
+#~ "A program will run regulary in your system waiting for new updates\n"
+#~ msgstr ""
+#~ "Mandriva Online ofrécelle a posibilidade de automatiza-las "
+#~ "actualizacións.\n"
+#~ "Un programa executarase regularmente no seu sistema agardando novas "
+#~ "actualizacións\n"
+
+#~ msgid "Congratulations"
+#~ msgstr "Noraboa"
+
+#~ msgid "Your Mandriva Online account has been successfully configured\n"
+#~ msgstr "A súa conta de Mandriva Online configurouse con éxito\n"
+
+#~ msgid "Configuration uploaded successfully"
+#~ msgstr "A configuración subiuse con éxito"
+
+#~ msgid "Problem uploading configuration"
+#~ msgstr "Problema ó subir a configuración"
+
+#~ msgid ""
+#~ "Cannot connect to Mandriva Online website: wrong login/password or router/"
+#~ "firewall bad settings"
+#~ msgstr ""
+#~ "Non se puido conectar ó sitio web de mandrivaonline: nome de usuario/"
+#~ "contrasinal incorrecto ou mala configuración do encamiñador/cortalumes"
+
 #~ msgid "  --applet\t\t- launch Mandriva Update.\n"
 #~ msgstr "  --applet\t\t- executar Mandriva Update.\n"
 
diff --git a/po/he.po b/po/he.po
index ec561563..1211b40e 100644
--- a/po/he.po
+++ b/po/he.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-09 16:26+0200\n"
+"POT-Creation-Date: 2008-02-21 18:21+0100\n"
 "PO-Revision-Date: 2007-09-08 23:57+0300\n"
 "Last-Translator: Dotan Kamber <kamberd@yahoo.com>\n"
 "Language-Team: Hebrew\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:94
+#: ../mdkapplet:88
 #, c-format
 msgid "Will check updates at %s"
 msgstr "עדכונים יבדקו ב-%s"
 
-#: ../mdkapplet:103
+#: ../mdkapplet:97
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "המערכת מעודכנת"
 
-#: ../mdkapplet:109
+#: ../mdkapplet:103
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -40,52 +40,43 @@ msgstr ""
 "חלה תקלה בעת הגדרת השרות. באפשרותך לדווח על התקלה ל: support@mandrivaonline."
 "net"
 
-#: ../mdkapplet:115
+#: ../mdkapplet:110
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "נא להמתין בעת קריאת מסד הנתונים של החבילות..."
 
-#: ../mdkapplet:121
+#: ../mdkapplet:116
 #, c-format
 msgid "New updates are available for your system"
 msgstr "עדכונים חדשים זמינים עבור המערכת שלך"
 
-#: ../mdkapplet:127
-#, c-format
-msgid "New bundles are available for your system"
-msgstr "ערכות חדשות זמינות עבור המערכת שלך"
-
-#: ../mdkapplet:133
-#, c-format
-msgid "Service is not configured. Please click on \"Configure the service\""
-msgstr "השירות לא מוגדר. עליך ללחוץ על \"הגדרת השרות\"."
-
-#: ../mdkapplet:139
+#: ../mdkapplet:122
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "הרשת לא פעילה. עליך להגדיר את הרשת"
 
-#: ../mdkapplet:145
+#: ../mdkapplet:128
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "השירות לא הופעל. עליך ללחוץ על \"אתר מקוון\""
 
-#: ../mdkapplet:151 ../mdkapplet:182
+#: ../mdkapplet:134 ../mdkapplet:165
 #, c-format
 msgid "urpmi database locked"
 msgstr "בסיס הנתונים של urpmi נעול"
 
-#: ../mdkapplet:157
+#: ../mdkapplet:140
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr "גרסה לא נתמכת (גרסה ישנה מדי או גרסת פיתוח)"
 
-#: ../mdkapplet:163
+#: ../mdkapplet:146
 #, c-format
-msgid "No medium found. You must add some media through 'Software Media Manager'."
+msgid ""
+"No medium found. You must add some media through 'Software Media Manager'."
 msgstr "לא נמצאו מקורות תוכנה, עליך להוסיף מקורות דרך 'ניהול מקורות תוכנה'."
 
-#: ../mdkapplet:169
+#: ../mdkapplet:152
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -101,577 +92,131 @@ msgstr ""
 "\n"
 "לאחר מכן יש לאתחל את \"%s\" מחדש."
 
-#: ../mdkapplet:174
+#: ../mdkapplet:157
 #, c-format
 msgid "Enabled"
 msgstr "מופעל"
 
-#: ../mdkapplet:187
+#: ../mdkapplet:170
 #, c-format
 msgid "Error updating media"
 msgstr "שגיאה בעדכון המקור"
 
-#: ../mdkapplet:202
+#: ../mdkapplet:185
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr "בודק... יש עדכונים זמינים\n"
 
-#: ../mdkapplet:207
+#: ../mdkapplet:190
 #, c-format
 msgid "Packages are up to date"
 msgstr "החבילות מעודכנות"
 
-#: ../mdkapplet:212
+#: ../mdkapplet:195
 #, c-format
 msgid "Failed to open urpmi database"
 msgstr "כשל בפתיחת בסיס הנתונים של urpmi"
 
-#: ../mdkapplet:217 ../mdkapplet:324
+#: ../mdkapplet:200
 #, c-format
 msgid "Install updates"
 msgstr "התקן עדכונים"
 
-#: ../mdkapplet:218
-#, c-format
-msgid "Configure the service"
-msgstr "הגדרת השרות"
-
-#: ../mdkapplet:219
+#: ../mdkapplet:201
 #, c-format
 msgid "Check Updates"
 msgstr "בדוק עדכונים"
 
-#: ../mdkapplet:220 ../mdkapplet:327 ../mdkonline:114 ../mdkonline:155
-#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
-#, c-format
-msgid "Please wait"
-msgstr "נא להמתין"
-
-#: ../mdkapplet:220 ../mdkapplet:326 ../mdkapplet:327
-#, c-format
-msgid "Check updates"
-msgstr "בדוק עדכונים"
-
-#: ../mdkapplet:223 ../mdkapplet:648
-#, c-format
-msgid "Online WebSite"
-msgstr "אתר מקוון"
-
-#: ../mdkapplet:224
+#: ../mdkapplet:202
 #, c-format
 msgid "Configure Network"
 msgstr "הגדר את הרשת"
 
-#: ../mdkapplet:225
-#, c-format
-msgid "Configure Now!"
-msgstr "הגדר כעת"
-
-#: ../mdkapplet:313 ../mdkapplet:392
-#, c-format
-msgid "Mandriva Linux Updates Applet"
-msgstr "יישומון עדכוני מנדרייבה-לינוקס"
-
-#: ../mdkapplet:322
-#, c-format
-msgid "Actions"
-msgstr "פעולות"
-
-#: ../mdkapplet:325
-#, c-format
-msgid "Configure"
-msgstr "הגדר"
-
-#: ../mdkapplet:329
-#, c-format
-msgid "See logs"
-msgstr "צפה ברישומי המערכת"
-
-#: ../mdkapplet:332
-#, c-format
-msgid "Status"
-msgstr "מצב"
-
-#: ../mdkapplet:336 ../mdkapplet:597
-#, c-format
-msgid "Close"
-msgstr "סגור"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Network Connection: "
-msgstr "חיבור רשת: "
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Up"
-msgstr "למעלה"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Down"
-msgstr "למטה"
-
-#: ../mdkapplet:366
-#, c-format
-msgid "Last check: "
-msgstr "בדיקה אחרונה:"
-
-#: ../mdkapplet:367 ../mdkonline:145
-#, c-format
-msgid "Machine name:"
-msgstr "שם המחשב:"
-
-#: ../mdkapplet:368
-#, c-format
-msgid "Updates: "
-msgstr "עדכונים: "
-
-#: ../mdkapplet:372
+#: ../mdkapplet:283
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "מפעיל את drakconnect\n"
 
-#: ../mdkapplet:375
+#: ../mdkapplet:286
 #, c-format
 msgid "Mandriva Online seems to be reinstalled, reloading applet ...."
 msgstr "נראה ש Mandriva Online הותקן מחדש, טוען את היישומון ..."
 
-#: ../mdkapplet:383
+#: ../mdkapplet:294
 #, c-format
 msgid "Launching MandrivaUpdate\n"
 msgstr "מפעיל את MandrivaUpdate\n"
 
-#: ../mdkapplet:398
+#: ../mdkapplet:303
+#, c-format
+msgid "Mandriva Linux Updates Applet"
+msgstr "יישומון עדכוני מנדרייבה-לינוקס"
+
+#: ../mdkapplet:308
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "מנתח עדכונים חדשים...\n"
 
-#: ../mdkapplet:399
+#: ../mdkapplet:309
 #, c-format
 msgid "Connecting to"
 msgstr "מתחבר אל"
 
-#: ../mdkapplet:467 ../mdkupdate:159 ../mdkupdate:188
-#, c-format
-msgid "An error occurred"
-msgstr "חלה שגיאה"
-
-#: ../mdkapplet:475
-#, c-format
-msgid "Development release not supported by service"
-msgstr "גרסאת פיתוח לא נתמכת על ידי שרות זה"
-
-#: ../mdkapplet:476
-#, c-format
-msgid "Too old release not supported by service"
-msgstr "גרסה ישנה מדי לא נתמכת בשרות זה"
-
-#: ../mdkapplet:477
-#, c-format
-msgid "Unknown state"
-msgstr "מצב לא מוכר"
-
-#: ../mdkapplet:478
-#, c-format
-msgid "Online services disabled. Contact Mandriva Online site\n"
-msgstr "השירותים המקוונים הופסקו. עליך להתעדכן באתר מנדרייבה-אונליין\n"
-
-#: ../mdkapplet:479
-#, c-format
-msgid "Wrong Password.\n"
-msgstr "סיסמה שגוייה.\n"
-
-#: ../mdkapplet:480
-#, c-format
-msgid "Wrong Action or host or login.\n"
-msgstr "הפעולה או שם מחשב או שם משתמש שגויים.\n"
-
-#: ../mdkapplet:481
-#, c-format
-msgid ""
-"Something is wrong with your network settings (check your route, firewall or "
-"proxy settings)\n"
-msgstr ""
-"כנראה קיימת בעיה עם הגדרות הרשת שלך )עליך לבדוק את ה routing, חומת האש "
-"והגדרות השרת המתווך)\n"
-
-#: ../mdkapplet:483
-#, c-format
-msgid ""
-"Problem occured while connecting to the server, please contact the support "
-"team"
-msgstr "חלה תקלה בעת חיבור לשרת. עליך ליצור קשר עם צוות התמיכה"
-
-#: ../mdkapplet:487
-#, c-format
-msgid "Response from Mandriva Online server\n"
-msgstr "ברוך בואך לשרת מנדרייבה-אונליין\n"
-
-#: ../mdkapplet:490
+#: ../mdkapplet:386
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "המערכת מעודכנת\n"
 
-#: ../mdkapplet:527
-#, c-format
-msgid "No check"
-msgstr "ללא בדיקה"
-
-#: ../mdkapplet:541
-#, c-format
-msgid "Checking config file: Not present\n"
-msgstr "בודק קובץ הגדרות: לא קיים\n"
-
-#: ../mdkapplet:544
+#: ../mdkapplet:415
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "בודק זמינות רשת: אין תגובה\n"
 
-#: ../mdkapplet:587
+#: ../mdkapplet:457 ../mdkupdate:118 ../mdkupdate:164
 #, c-format
-msgid "Logs"
-msgstr "רישומים"
-
-#: ../mdkapplet:603
-#, c-format
-msgid "Clear"
-msgstr "נקה"
+msgid "Warning"
+msgstr "אזהרה"
 
-#: ../mdkapplet:629
+#: ../mdkapplet:468
 #, c-format
 msgid "About..."
 msgstr "אודות..."
 
-#: ../mdkapplet:631
+#: ../mdkapplet:472
 #, c-format
 msgid "Mandriva Online %s"
 msgstr "מנדריבה-אונליין %s"
 
-#: ../mdkapplet:635
+#: ../mdkapplet:473
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "זכויות היוצרים (C) %s שמורות למנדריבה"
 
-#: ../mdkapplet:647
+#: ../mdkapplet:476
 #, c-format
 msgid "Mandriva Online gives access to Mandriva web services."
 msgstr "מנדריבה-אונליין מאפשר גישה לשירותי הרשת של מנדריבה."
 
-#: ../mdkapplet:655
-#, c-format
-msgid "Always launch on startup"
-msgstr "הפעל תמיד באתחול המערכת"
-
-#: ../mdkapplet:657
-#, c-format
-msgid "Quit"
-msgstr "יציאה"
-
-#: ../mdkonline:58
-#, c-format
-msgid ""
-"mdonline version %s\n"
-"Copyright (C) %s Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"mdonline, גרסה %s\n"
-"כל הזכויות שמורות (C)  %s Mandriva.\n"
-"תוכנה זו היא חופשית וניתנת להפצה בהתאם לתנאי הרישיון של GNU GPL.\n"
-"\n"
-"שימוש:\n"
-
-#: ../mdkonline:63 ../mdkupdate:73
-#, c-format
-msgid "  --help\t\t- print this help message.\n"
-msgstr "  --help\t\t- הדפס הודעת עזרה זו.\n"
-
-#: ../mdkonline:64
-#, c-format
-msgid "  --box=\t\t\t- hostname.\n"
-msgstr "  --box=\t\t\t- שם מארח.\n"
-
-#: ../mdkonline:65
-#, c-format
-msgid "  --country\t\t\t- name of country of the user. \n"
-msgstr "  --country\t\t\t- שם המדינה של המשתמש. \n"
-
-#: ../mdkonline:66
-#, c-format
-msgid "  --interactive\t\t- use the interactive mode.\n"
-msgstr "  --interactive\t\t- השתמש במצב האינטראקטיבי.\n"
-
-#: ../mdkonline:67
-#, c-format
-msgid "  --nointeractive\t- use the non-interactive mode.\n"
-msgstr "  --nointeractive\t- השתמש במצב לא אינטראקטיבי.\n"
-
-#: ../mdkonline:68
-#, c-format
-msgid "  --login=\t\t     - login name of the user.\n"
-msgstr "  --login=\t\t     - שם המשתמש.\n"
-
-#: ../mdkonline:69
-#, c-format
-msgid "  --pass=\t\t\t- password  of the user.\n"
-msgstr "  --pass=\t\t\t- סיסמת המשתמש.\n"
-
-#: ../mdkonline:87 ../mdkonline:120
-#, c-format
-msgid "Mandriva Online"
-msgstr "מנדרייבה-אונליין"
-
-#: ../mdkonline:90
-#, c-format
-msgid "I already have an account"
-msgstr "כבר יש לי חשבון"
-
-#: ../mdkonline:91
-#, c-format
-msgid "I want to subscribe"
-msgstr "ברצוני להרשם"
-
-#: ../mdkonline:96
-#, c-format
-msgid "Mr."
-msgstr "מר"
-
-#: ../mdkonline:96
-#, c-format
-msgid "Mrs."
-msgstr "מרת"
-
-#: ../mdkonline:96
-#, c-format
-msgid "Ms."
-msgstr "מרת"
-
-#: ../mdkonline:114
-#, c-format
-msgid "Reading configuration\n"
-msgstr "קורא את קובץ התצורה \n"
-
-#: ../mdkonline:123
-#, c-format
-msgid ""
-"This assistant will help you to upload your configuration\n"
-"(packages, hardware configuration) to a centralized database in\n"
-"order to keep you informed about security updates and useful upgrades.\n"
-msgstr ""
-"אשף זה יעזור לך להעלות את התצורה שלך (חבילות,\n"
-"תצורת חומרה) לבסיס מידע מקוון במטרה לעדכן\n"
-"אותך אודות עדכוני אבטחה ושדרוגים שימושיים\n"
-
-#: ../mdkonline:131
-#, c-format
-msgid "Account creation or authentication"
-msgstr "יצירת חשבון או הזדהות"
-
-#: ../mdkonline:136
-#, c-format
-msgid "Enter your Mandriva Online login, password and machine name:"
-msgstr "עליך להכניס את שם המשתמש, הסיסמה ושם המחשב שלך במנדרייבה-אונליין:"
-
-#: ../mdkonline:142 ../mdkonline:195
-#, c-format
-msgid "Email address:"
-msgstr "כתובת דוא\"ל:"
-
-#: ../mdkonline:143
-#, c-format
-msgid "Country"
-msgstr "מדינה"
-
-#: ../mdkonline:144 ../mdkonline:196
-#, c-format
-msgid "Password:"
-msgstr "סיסמה:"
-
-#: ../mdkonline:146
-#, c-format
-msgid "Machine description:"
-msgstr "תיאור המכונה:"
-
-#: ../mdkonline:147
-#, c-format
-msgid "(Ex: My Home Office's Computer)"
-msgstr "(לדוגמה: המחשב הביתי שלי)"
-
-#: ../mdkonline:152 ../mdkonline:159 ../mdkonline:180 ../mdkonline:204
-#: ../mdkonline:208 ../mdkonline:212 ../mdkonline:217 ../mdkupdate:141
-#: ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
-#, c-format
-msgid "Error"
-msgstr "שגיאה"
-
-#: ../mdkonline:152
-#, c-format
-msgid "Machine name must be 1 to 40 alphanumerical characters"
-msgstr "שם המכונה חייב להיות בן 1 עד 40 תווי אותיות, ספרות וקו תחתון"
-
-#: ../mdkonline:155
-#, c-format
-msgid "Connecting to Mandriva Online website..."
-msgstr "מתחבר לאתר מנדרייבה-אונליין..."
-
-#: ../mdkonline:167
-#, c-format
-msgid ""
-"In order to benefit from Mandriva Online services,\n"
-"we are about to upload your configuration.\n"
-"\n"
-"The Wizard will now send the following information to Mandriva:\n"
-"\n"
-"1) the list of packages you have installed on your system,\n"
-"\n"
-"2) your hardware configuration.\n"
-"\n"
-"If you feel uncomfortable by that idea, or do not want to benefit from this "
-"service,\n"
-"please press 'Cancel'. By pressing 'Next', you allow us to keep you "
-"informed\n"
-"about security updates and useful upgrades via personalized email alerts.\n"
-"Furthermore, you benefit from discounted paid support services on\n"
-"www.mandrivaexpert.com."
-msgstr ""
-"על מנת לאפשר לך ליהנות משירותי מנדרייבה-אונליין,\n"
-"אנו נעלה כעת את התצורה שלך לשרת.\n"
-"\n"
-"האשף ישלח כעת את המידע הבא אל מנדרייבהסופט:\n"
-"\n"
-"1) רשימת החבילות שמותקנות במערכת שלך,\n"
-"\n"
-"2) תצורת החומרה שלך.\n"
-"\n"
-"אם אין ברצונך לשלוח אלינו מידע זה, או שאינך רוצה בשירות,\n"
-"עליך ללחוץ על 'ביטול'. לחיצה על 'המשך' פירושה שאנו רשאים\n"
-"לידע אותך אודות עדכוני אבטחה ועדכונים שימושיים דרך דוא\"ל.\n"
-"בנוסף, נאפשר לך ליהנות מהנחות עבור שירותי תמיכה הניתנים\n"
-"בתשלום באתר www.mandrivaexpert.com."
-
-#: ../mdkonline:180
-#, c-format
-msgid "Connection problem"
-msgstr "ההתחברות נכשלה"
-
-#: ../mdkonline:180
-#, c-format
-msgid "Problem occurs when uploading files, please try again"
-msgstr "ישנה בעיה בעת העלאת קבצים, עליך לנסות שנית"
-
-#: ../mdkonline:187
-#, c-format
-msgid "Create a Mandriva Online Account"
-msgstr "צור חשבון מנדרייבה-אונליין"
-
-#. -PO: that is for things like "Mr", "Ms",...
-#: ../mdkonline:192
-#, c-format
-msgid "Greeting:"
-msgstr "קידומת לשם:"
-
-#: ../mdkonline:193
-#, c-format
-msgid "First name:"
-msgstr "שם פרטי:"
-
-#: ../mdkonline:194
-#, c-format
-msgid "Last name:"
-msgstr "שם משפחה:"
-
-#: ../mdkonline:197
-#, c-format
-msgid "Confirm Password:"
-msgstr "אישור סיסמה:"
-
-#: ../mdkonline:204
-#, c-format
-msgid ""
-"The passwords do not match\n"
-" Please try again\n"
-msgstr ""
-"הסיסמאות אינן תואמות\n"
-"עליך לנסות שנית\n"
-
-#: ../mdkonline:208
-#, c-format
-msgid "Please fill in each field"
-msgstr "נא למלא את כל השדות"
-
-#: ../mdkonline:212
-#, c-format
-msgid "Not a valid mail address!\n"
-msgstr "זו אינה כתובת דוא\"ל תקינה!\n"
-
-#: ../mdkonline:217
-#, c-format
-msgid "Creating account failed!"
-msgstr "יצירת החשבון כשלה!"
-
-#: ../mdkonline:225
-#, c-format
-msgid ""
-"Mandriva Online Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
-msgstr ""
-"חשבונך במנדרייבה-אונליין הוקם בהצלחה.\n"
-"עליך ללחוץ על \"המשך\" בכדי להזדהות ולטעון את תצורת מחשבך\n"
-
-#: ../mdkonline:229
-#, c-format
-msgid "Your upload was successful!"
-msgstr "העלאת הנתונים הסתימה בהצלחה"
-
-#: ../mdkonline:229
+#: ../mdkapplet:478
 #, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandriva Online."
-msgstr ""
-"מעתה ישלחו לך עדכונים לגבי עדכוני אבטחה\n"
-"ועדכונים הודות למנדרייבה-אונליין."
+msgid "Online WebSite"
+msgstr "אתר מקוון"
 
-#: ../mdkonline:229
+#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
+#: ../mdkapplet:483
 #, c-format
-msgid ""
-"Mandriva Online offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
+msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
-"מנדרייבה-אונליין מאפשר לך לעדכן את מחשבך באופן אוטומטי.\n"
-"במערכת שלך תורץ תוכנה באופן סדיר שתחכה לעדכונים.\n"
-
-#: ../mdkonline:238
-#, c-format
-msgid "Congratulations"
-msgstr "ברכותינו"
 
-#: ../mdkonline:238
+#: ../mdkapplet:492
 #, c-format
-msgid "Your Mandriva Online account has been successfully configured\n"
-msgstr "חשבונך במנדרייבה-אונליין הוגדר בהצלחה\n"
-
-#: ../mdkonline:253
-#, c-format
-msgid "Configuration uploaded successfully"
-msgstr "טעינת התצורה הושלמה בהצלחה"
-
-#: ../mdkonline:254
-#, c-format
-msgid "Problem uploading configuration"
-msgstr "חלה תקלה בעת טעינת התצורה"
+msgid "Always launch on startup"
+msgstr "הפעל תמיד באתחול המערכת"
 
-#: ../mdkonline:256
+#: ../mdkapplet:494
 #, c-format
-msgid ""
-"Cannot connect to Mandriva Online website: wrong login/password or router/"
-"firewall bad settings"
-msgstr ""
-"ההתקשרות לאתר מנדרייבה-אונליין נכשלה עקב שם משתמש/סיסמה שגויים או הגדרות לא "
-"תקינות של הנתב/חומת האש"
+msgid "Quit"
+msgstr "יציאה"
 
 #: ../mdkonline.pm:207
 #, c-format
@@ -819,6 +364,11 @@ msgstr ""
 "\n"
 "שימוש:\n"
 
+#: ../mdkupdate:73
+#, c-format
+msgid "  --help\t\t- print this help message.\n"
+msgstr "  --help\t\t- הדפס הודעת עזרה זו.\n"
+
 #: ../mdkupdate:74
 #, c-format
 msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
@@ -846,11 +396,6 @@ msgid ""
 "file.\n"
 msgstr "  --bundle file.bundle\t- השג והתקן חבילה מקובץ ה- metainfo .bundle\n"
 
-#: ../mdkupdate:118 ../mdkupdate:164
-#, c-format
-msgid "Warning"
-msgstr "אזהרה"
-
 #. -PO: here Live Install is currently *NOT* translated on the desktop, so it's better to keep as it:
 #: ../mdkupdate:120
 #, c-format
@@ -859,11 +404,21 @@ msgid ""
 "Install' wizard."
 msgstr "ראשית עליך להתקין את המערכת לדיסק הקשיח שלך בעזרת האשף  'Live Install'"
 
+#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
+#, c-format
+msgid "Please wait"
+msgstr "נא להמתין"
+
 #: ../mdkupdate:123 ../mdkupdate:174
 #, c-format
 msgid "Preparing..."
 msgstr "הכנה..."
 
+#: ../mdkupdate:141 ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
+#, c-format
+msgid "Error"
+msgstr "שגיאה"
+
 #: ../mdkupdate:141
 #, c-format
 msgid ""
@@ -875,6 +430,11 @@ msgstr ""
 "\n"
 "%s"
 
+#: ../mdkupdate:159 ../mdkupdate:188
+#, c-format
+msgid "An error occurred"
+msgstr "חלה שגיאה"
+
 #: ../mdkupdate:164
 #, c-format
 msgid ""
@@ -902,3 +462,298 @@ msgstr "מתקין חבילות...\n"
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "לא ניתן לעדכן חבילות ממדיית update_source.\n"
 
+#~ msgid "New bundles are available for your system"
+#~ msgstr "ערכות חדשות זמינות עבור המערכת שלך"
+
+#~ msgid "Service is not configured. Please click on \"Configure the service\""
+#~ msgstr "השירות לא מוגדר. עליך ללחוץ על \"הגדרת השרות\"."
+
+#~ msgid "Configure the service"
+#~ msgstr "הגדרת השרות"
+
+#~ msgid "Check updates"
+#~ msgstr "בדוק עדכונים"
+
+#~ msgid "Configure Now!"
+#~ msgstr "הגדר כעת"
+
+#~ msgid "Actions"
+#~ msgstr "פעולות"
+
+#~ msgid "Configure"
+#~ msgstr "הגדר"
+
+#~ msgid "See logs"
+#~ msgstr "צפה ברישומי המערכת"
+
+#~ msgid "Status"
+#~ msgstr "מצב"
+
+#~ msgid "Close"
+#~ msgstr "סגור"
+
+#~ msgid "Network Connection: "
+#~ msgstr "חיבור רשת: "
+
+#~ msgid "Up"
+#~ msgstr "למעלה"
+
+#~ msgid "Down"
+#~ msgstr "למטה"
+
+#~ msgid "Last check: "
+#~ msgstr "בדיקה אחרונה:"
+
+#~ msgid "Machine name:"
+#~ msgstr "שם המחשב:"
+
+#~ msgid "Updates: "
+#~ msgstr "עדכונים: "
+
+#~ msgid "Development release not supported by service"
+#~ msgstr "גרסאת פיתוח לא נתמכת על ידי שרות זה"
+
+#~ msgid "Too old release not supported by service"
+#~ msgstr "גרסה ישנה מדי לא נתמכת בשרות זה"
+
+#~ msgid "Unknown state"
+#~ msgstr "מצב לא מוכר"
+
+#~ msgid "Online services disabled. Contact Mandriva Online site\n"
+#~ msgstr "השירותים המקוונים הופסקו. עליך להתעדכן באתר מנדרייבה-אונליין\n"
+
+#~ msgid "Wrong Password.\n"
+#~ msgstr "סיסמה שגוייה.\n"
+
+#~ msgid "Wrong Action or host or login.\n"
+#~ msgstr "הפעולה או שם מחשב או שם משתמש שגויים.\n"
+
+#~ msgid ""
+#~ "Something is wrong with your network settings (check your route, firewall "
+#~ "or proxy settings)\n"
+#~ msgstr ""
+#~ "כנראה קיימת בעיה עם הגדרות הרשת שלך )עליך לבדוק את ה routing, חומת האש "
+#~ "והגדרות השרת המתווך)\n"
+
+#~ msgid ""
+#~ "Problem occured while connecting to the server, please contact the "
+#~ "support team"
+#~ msgstr "חלה תקלה בעת חיבור לשרת. עליך ליצור קשר עם צוות התמיכה"
+
+#~ msgid "Response from Mandriva Online server\n"
+#~ msgstr "ברוך בואך לשרת מנדרייבה-אונליין\n"
+
+#~ msgid "No check"
+#~ msgstr "ללא בדיקה"
+
+#~ msgid "Checking config file: Not present\n"
+#~ msgstr "בודק קובץ הגדרות: לא קיים\n"
+
+#~ msgid "Logs"
+#~ msgstr "רישומים"
+
+#~ msgid "Clear"
+#~ msgstr "נקה"
+
+#~ msgid ""
+#~ "mdonline version %s\n"
+#~ "Copyright (C) %s Mandriva.\n"
+#~ "This is free software and may be redistributed under the terms of the GNU "
+#~ "GPL.\n"
+#~ "\n"
+#~ "usage:\n"
+#~ msgstr ""
+#~ "mdonline, גרסה %s\n"
+#~ "כל הזכויות שמורות (C)  %s Mandriva.\n"
+#~ "תוכנה זו היא חופשית וניתנת להפצה בהתאם לתנאי הרישיון של GNU GPL.\n"
+#~ "\n"
+#~ "שימוש:\n"
+
+#~ msgid "  --box=\t\t\t- hostname.\n"
+#~ msgstr "  --box=\t\t\t- שם מארח.\n"
+
+#~ msgid "  --country\t\t\t- name of country of the user. \n"
+#~ msgstr "  --country\t\t\t- שם המדינה של המשתמש. \n"
+
+#~ msgid "  --interactive\t\t- use the interactive mode.\n"
+#~ msgstr "  --interactive\t\t- השתמש במצב האינטראקטיבי.\n"
+
+#~ msgid "  --nointeractive\t- use the non-interactive mode.\n"
+#~ msgstr "  --nointeractive\t- השתמש במצב לא אינטראקטיבי.\n"
+
+#~ msgid "  --login=\t\t     - login name of the user.\n"
+#~ msgstr "  --login=\t\t     - שם המשתמש.\n"
+
+#~ msgid "  --pass=\t\t\t- password  of the user.\n"
+#~ msgstr "  --pass=\t\t\t- סיסמת המשתמש.\n"
+
+#~ msgid "Mandriva Online"
+#~ msgstr "מנדרייבה-אונליין"
+
+#~ msgid "I already have an account"
+#~ msgstr "כבר יש לי חשבון"
+
+#~ msgid "I want to subscribe"
+#~ msgstr "ברצוני להרשם"
+
+#~ msgid "Mr."
+#~ msgstr "מר"
+
+#~ msgid "Mrs."
+#~ msgstr "מרת"
+
+#~ msgid "Ms."
+#~ msgstr "מרת"
+
+#~ msgid "Reading configuration\n"
+#~ msgstr "קורא את קובץ התצורה \n"
+
+#~ msgid ""
+#~ "This assistant will help you to upload your configuration\n"
+#~ "(packages, hardware configuration) to a centralized database in\n"
+#~ "order to keep you informed about security updates and useful upgrades.\n"
+#~ msgstr ""
+#~ "אשף זה יעזור לך להעלות את התצורה שלך (חבילות,\n"
+#~ "תצורת חומרה) לבסיס מידע מקוון במטרה לעדכן\n"
+#~ "אותך אודות עדכוני אבטחה ושדרוגים שימושיים\n"
+
+#~ msgid "Account creation or authentication"
+#~ msgstr "יצירת חשבון או הזדהות"
+
+#~ msgid "Enter your Mandriva Online login, password and machine name:"
+#~ msgstr "עליך להכניס את שם המשתמש, הסיסמה ושם המחשב שלך במנדרייבה-אונליין:"
+
+#~ msgid "Email address:"
+#~ msgstr "כתובת דוא\"ל:"
+
+#~ msgid "Country"
+#~ msgstr "מדינה"
+
+#~ msgid "Password:"
+#~ msgstr "סיסמה:"
+
+#~ msgid "Machine description:"
+#~ msgstr "תיאור המכונה:"
+
+#~ msgid "(Ex: My Home Office's Computer)"
+#~ msgstr "(לדוגמה: המחשב הביתי שלי)"
+
+#~ msgid "Machine name must be 1 to 40 alphanumerical characters"
+#~ msgstr "שם המכונה חייב להיות בן 1 עד 40 תווי אותיות, ספרות וקו תחתון"
+
+#~ msgid "Connecting to Mandriva Online website..."
+#~ msgstr "מתחבר לאתר מנדרייבה-אונליין..."
+
+#~ msgid ""
+#~ "In order to benefit from Mandriva Online services,\n"
+#~ "we are about to upload your configuration.\n"
+#~ "\n"
+#~ "The Wizard will now send the following information to Mandriva:\n"
+#~ "\n"
+#~ "1) the list of packages you have installed on your system,\n"
+#~ "\n"
+#~ "2) your hardware configuration.\n"
+#~ "\n"
+#~ "If you feel uncomfortable by that idea, or do not want to benefit from "
+#~ "this service,\n"
+#~ "please press 'Cancel'. By pressing 'Next', you allow us to keep you "
+#~ "informed\n"
+#~ "about security updates and useful upgrades via personalized email "
+#~ "alerts.\n"
+#~ "Furthermore, you benefit from discounted paid support services on\n"
+#~ "www.mandrivaexpert.com."
+#~ msgstr ""
+#~ "על מנת לאפשר לך ליהנות משירותי מנדרייבה-אונליין,\n"
+#~ "אנו נעלה כעת את התצורה שלך לשרת.\n"
+#~ "\n"
+#~ "האשף ישלח כעת את המידע הבא אל מנדרייבהסופט:\n"
+#~ "\n"
+#~ "1) רשימת החבילות שמותקנות במערכת שלך,\n"
+#~ "\n"
+#~ "2) תצורת החומרה שלך.\n"
+#~ "\n"
+#~ "אם אין ברצונך לשלוח אלינו מידע זה, או שאינך רוצה בשירות,\n"
+#~ "עליך ללחוץ על 'ביטול'. לחיצה על 'המשך' פירושה שאנו רשאים\n"
+#~ "לידע אותך אודות עדכוני אבטחה ועדכונים שימושיים דרך דוא\"ל.\n"
+#~ "בנוסף, נאפשר לך ליהנות מהנחות עבור שירותי תמיכה הניתנים\n"
+#~ "בתשלום באתר www.mandrivaexpert.com."
+
+#~ msgid "Connection problem"
+#~ msgstr "ההתחברות נכשלה"
+
+#~ msgid "Problem occurs when uploading files, please try again"
+#~ msgstr "ישנה בעיה בעת העלאת קבצים, עליך לנסות שנית"
+
+#~ msgid "Create a Mandriva Online Account"
+#~ msgstr "צור חשבון מנדרייבה-אונליין"
+
+#~ msgid "Greeting:"
+#~ msgstr "קידומת לשם:"
+
+#~ msgid "First name:"
+#~ msgstr "שם פרטי:"
+
+#~ msgid "Last name:"
+#~ msgstr "שם משפחה:"
+
+#~ msgid "Confirm Password:"
+#~ msgstr "אישור סיסמה:"
+
+#~ msgid ""
+#~ "The passwords do not match\n"
+#~ " Please try again\n"
+#~ msgstr ""
+#~ "הסיסמאות אינן תואמות\n"
+#~ "עליך לנסות שנית\n"
+
+#~ msgid "Please fill in each field"
+#~ msgstr "נא למלא את כל השדות"
+
+#~ msgid "Not a valid mail address!\n"
+#~ msgstr "זו אינה כתובת דוא\"ל תקינה!\n"
+
+#~ msgid "Creating account failed!"
+#~ msgstr "יצירת החשבון כשלה!"
+
+#~ msgid ""
+#~ "Mandriva Online Account successfully created.\n"
+#~ "Please click \"Next\" to authenticate and upload your configuration\n"
+#~ msgstr ""
+#~ "חשבונך במנדרייבה-אונליין הוקם בהצלחה.\n"
+#~ "עליך ללחוץ על \"המשך\" בכדי להזדהות ולטעון את תצורת מחשבך\n"
+
+#~ msgid "Your upload was successful!"
+#~ msgstr "העלאת הנתונים הסתימה בהצלחה"
+
+#~ msgid ""
+#~ "From now you will receive on security and updates \n"
+#~ "announcements thanks to Mandriva Online."
+#~ msgstr ""
+#~ "מעתה ישלחו לך עדכונים לגבי עדכוני אבטחה\n"
+#~ "ועדכונים הודות למנדרייבה-אונליין."
+
+#~ msgid ""
+#~ "Mandriva Online offers you the ability to automate the updates.\n"
+#~ "A program will run regulary in your system waiting for new updates\n"
+#~ msgstr ""
+#~ "מנדרייבה-אונליין מאפשר לך לעדכן את מחשבך באופן אוטומטי.\n"
+#~ "במערכת שלך תורץ תוכנה באופן סדיר שתחכה לעדכונים.\n"
+
+#~ msgid "Congratulations"
+#~ msgstr "ברכותינו"
+
+#~ msgid "Your Mandriva Online account has been successfully configured\n"
+#~ msgstr "חשבונך במנדרייבה-אונליין הוגדר בהצלחה\n"
+
+#~ msgid "Configuration uploaded successfully"
+#~ msgstr "טעינת התצורה הושלמה בהצלחה"
+
+#~ msgid "Problem uploading configuration"
+#~ msgstr "חלה תקלה בעת טעינת התצורה"
+
+#~ msgid ""
+#~ "Cannot connect to Mandriva Online website: wrong login/password or router/"
+#~ "firewall bad settings"
+#~ msgstr ""
+#~ "ההתקשרות לאתר מנדרייבה-אונליין נכשלה עקב שם משתמש/סיסמה שגויים או הגדרות "
+#~ "לא תקינות של הנתב/חומת האש"
diff --git a/po/hi.po b/po/hi.po
index 0619c954..512c18de 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline-hi\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-09 16:26+0200\n"
+"POT-Creation-Date: 2008-02-21 18:21+0100\n"
 "PO-Revision-Date: 2005-08-21 14:31+0530\n"
 "Last-Translator: धनञ्जय शर्मा (Dhananjaya Sharma)\n"
 "Language-Team: Hindi, India\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:94
+#: ../mdkapplet:88
 #, fuzzy, c-format
 msgid "Will check updates at %s"
 msgstr "अपडेटो की जाँच"
 
-#: ../mdkapplet:103
+#: ../mdkapplet:97
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "आपका तंत्र आज-तक अप-टू-डेट है"
 
-#: ../mdkapplet:109
+#: ../mdkapplet:103
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -38,54 +38,44 @@ msgstr ""
 "सेवा संरचना समस्या । कॄपया लॉग की जाँच करें और निम्न पते पर एक विपत्र संदेश भेजें "
 "support@mandrivaonline.com"
 
-#: ../mdkapplet:115
+#: ../mdkapplet:110
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "कृपया प्रतीक्षा करें, उपलब्ध पैकेजों को पता लगाया जा रहा है..."
 
-#: ../mdkapplet:121
+#: ../mdkapplet:116
 #, c-format
 msgid "New updates are available for your system"
 msgstr "आपके तंत्र हेतु नये अपडेट उपलब्ध है"
 
-#: ../mdkapplet:127
-#, fuzzy, c-format
-msgid "New bundles are available for your system"
-msgstr "आपके तंत्र हेतु नये अपडेट उपलब्ध है"
-
-#: ../mdkapplet:133
-#, c-format
-msgid "Service is not configured. Please click on \"Configure the service\""
-msgstr "सेवा संरचित नहीं है । कृपया \"सेवा संरचना\" पर क्लिक करें"
-
-#: ../mdkapplet:139
+#: ../mdkapplet:122
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "नेटवर्क डॉउन है । कृपया अपने नेटवर्क की संरचना करें"
 
-#: ../mdkapplet:145
+#: ../mdkapplet:128
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "सेवा सक्रिय नहीं है । कृपया \"ऑनलाइन वेब-स्थल\" पर क्लिक करें"
 
-#: ../mdkapplet:151 ../mdkapplet:182
+#: ../mdkapplet:134 ../mdkapplet:165
 #, fuzzy, c-format
 msgid "urpmi database locked"
 msgstr "यू०आर०पी०एम०आई० डाटाबेस बंद है"
 
-#: ../mdkapplet:157
+#: ../mdkapplet:140
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 "यह विमोचन संस्मरण समर्थित नहीं है (या तो बहुत प्राचीन या फ़िर विकास विमोचन संस्मरण है)"
 
-#: ../mdkapplet:163
+#: ../mdkapplet:146
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
 msgstr ""
 
-#: ../mdkapplet:169
+#: ../mdkapplet:152
 #, fuzzy, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -102,583 +92,133 @@ msgstr ""
 "\n"
 "इसके बाद, %s को पुनः आरम्भ करें।"
 
-#: ../mdkapplet:174
+#: ../mdkapplet:157
 #, c-format
 msgid "Enabled"
 msgstr "सक्रिय"
 
-#: ../mdkapplet:187
+#: ../mdkapplet:170
 #, c-format
 msgid "Error updating media"
 msgstr ""
 
-#: ../mdkapplet:202
+#: ../mdkapplet:185
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr "जाँच की जा रही है... अपडेट्स उपलब्ध है\n"
 
-#: ../mdkapplet:207
+#: ../mdkapplet:190
 #, c-format
 msgid "Packages are up to date"
 msgstr ""
 
-#: ../mdkapplet:212
+#: ../mdkapplet:195
 #, fuzzy, c-format
 msgid "Failed to open urpmi database"
 msgstr "आर०पी०एम०डी०बी० को खोलने में असमर्थ"
 
-#: ../mdkapplet:217 ../mdkapplet:324
+#: ../mdkapplet:200
 #, c-format
 msgid "Install updates"
 msgstr "अपडेटों का संसाधन"
 
-#: ../mdkapplet:218
-#, c-format
-msgid "Configure the service"
-msgstr "सेवा की संरचना"
-
-#: ../mdkapplet:219
+#: ../mdkapplet:201
 #, c-format
 msgid "Check Updates"
 msgstr "अपडेटो की जाँच"
 
-#: ../mdkapplet:220 ../mdkapplet:327 ../mdkonline:114 ../mdkonline:155
-#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
-#, c-format
-msgid "Please wait"
-msgstr "कृपया प्रतीक्षा करें"
-
-#: ../mdkapplet:220 ../mdkapplet:326 ../mdkapplet:327
-#, c-format
-msgid "Check updates"
-msgstr "अपडेटो की जाँच"
-
-#: ../mdkapplet:223 ../mdkapplet:648
-#, c-format
-msgid "Online WebSite"
-msgstr "ऑनलाइन वेबस्थल"
-
-#: ../mdkapplet:224
+#: ../mdkapplet:202
 #, c-format
 msgid "Configure Network"
 msgstr "नेटवर्क की संरचना"
 
-#: ../mdkapplet:225
-#, c-format
-msgid "Configure Now!"
-msgstr "अभी संरचित करें!"
-
-#: ../mdkapplet:313 ../mdkapplet:392
-#, c-format
-msgid "Mandriva Linux Updates Applet"
-msgstr "मैनड्रिव अपडेटो का एपलेट"
-
-#: ../mdkapplet:322
-#, c-format
-msgid "Actions"
-msgstr "कार्यवाहिया"
-
-#: ../mdkapplet:325
-#, c-format
-msgid "Configure"
-msgstr "संरचना"
-
-#: ../mdkapplet:329
-#, c-format
-msgid "See logs"
-msgstr "लॉगो को देखना"
-
-#: ../mdkapplet:332
-#, c-format
-msgid "Status"
-msgstr "स्थिति"
-
-#: ../mdkapplet:336 ../mdkapplet:597
-#, c-format
-msgid "Close"
-msgstr "बन्द"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Network Connection: "
-msgstr "नेटवर्क कनेक्शन: "
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Up"
-msgstr "ऊपर"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Down"
-msgstr "नीचे"
-
-#: ../mdkapplet:366
-#, c-format
-msgid "Last check: "
-msgstr "अंतिम जाँच: "
-
-#: ../mdkapplet:367 ../mdkonline:145
-#, c-format
-msgid "Machine name:"
-msgstr "मशीन नाम:"
-
-#: ../mdkapplet:368
-#, c-format
-msgid "Updates: "
-msgstr "अपडेट्स: "
-
-#: ../mdkapplet:372
+#: ../mdkapplet:283
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "ड्रैककनेक्ट को आरम्भ किया जा रहा है\n"
 
-#: ../mdkapplet:375
+#: ../mdkapplet:286
 #, c-format
 msgid "Mandriva Online seems to be reinstalled, reloading applet ...."
 msgstr ""
 "एमडीकेऑनलाइन का लगता है कि पुनः संसाधन किया गया है, एपलेट को पुनः लाया जा रहा "
 "है .... "
 
-#: ../mdkapplet:383
+#: ../mdkapplet:294
 #, fuzzy, c-format
 msgid "Launching MandrivaUpdate\n"
 msgstr "एमडीकेअपडेट को आरम्भ किया जा रहा है\n"
 
-#: ../mdkapplet:398
+#: ../mdkapplet:303
+#, c-format
+msgid "Mandriva Linux Updates Applet"
+msgstr "मैनड्रिव अपडेटो का एपलेट"
+
+#: ../mdkapplet:308
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "नये अपडेटो की गणना की जा रही है...\n"
 
-#: ../mdkapplet:399
+#: ../mdkapplet:309
 #, c-format
 msgid "Connecting to"
 msgstr "से सम्बन्ध स्थापित हो रहा है"
 
-#: ../mdkapplet:467 ../mdkupdate:159 ../mdkupdate:188
-#, c-format
-msgid "An error occurred"
-msgstr "एक त्रुटि हो गयी है"
-
-#: ../mdkapplet:475
-#, c-format
-msgid "Development release not supported by service"
-msgstr "विकास संस्मरणों को इस सेवा द्वारा समर्थन नहीं प्राप्त है"
-
-#: ../mdkapplet:476
-#, c-format
-msgid "Too old release not supported by service"
-msgstr "बहुत अधिक प्राचीन संस्मरणों को इस सेवा द्वारा समर्थन नहीं प्राप्त है"
-
-#: ../mdkapplet:477
-#, c-format
-msgid "Unknown state"
-msgstr "अज्ञात अवस्था"
-
-#: ../mdkapplet:478
-#, c-format
-msgid "Online services disabled. Contact Mandriva Online site\n"
-msgstr "ऑनलाइन सेवायें निष्क्रिय है । मैनड्रिवऑनलाइन स्थल से सम्पर्क करें\n"
-
-#: ../mdkapplet:479
-#, c-format
-msgid "Wrong Password.\n"
-msgstr "गलत कूटशब्द।\n"
-
-#: ../mdkapplet:480
-#, c-format
-msgid "Wrong Action or host or login.\n"
-msgstr "गलत एक्शन या होस्ट या लॉग-इन।\n"
-
-#: ../mdkapplet:481
-#, c-format
-msgid ""
-"Something is wrong with your network settings (check your route, firewall or "
-"proxy settings)\n"
-msgstr ""
-"आपकी नेटवर्क समायोजनाओं में कुछ त्रुटि है (अपने पथ, अग्नि-भीतिका या प्रोक्सी समायोजनाओं की "
-"जाँच करें)\n"
-
-#: ../mdkapplet:483
-#, c-format
-msgid ""
-"Problem occured while connecting to the server, please contact the support "
-"team"
-msgstr "सर्वर से संबंध स्थापित करते समय समस्या हुई, कृपया सहायता दल से सम्पर्क करें"
-
-#: ../mdkapplet:487
-#, c-format
-msgid "Response from Mandriva Online server\n"
-msgstr "मैनड्रिवऑनलाइन सर्वर से प्रतिउत्तर\n"
-
-#: ../mdkapplet:490
+#: ../mdkapplet:386
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "तंत्र आज-तक अपडेट है\n"
 
-#: ../mdkapplet:527
-#, c-format
-msgid "No check"
-msgstr "कोई जाँच नहीं"
-
-#: ../mdkapplet:541
-#, c-format
-msgid "Checking config file: Not present\n"
-msgstr "कॉन्फ़िग संचिका की जाँच की जा रही है: विलुप्त है\n"
-
-#: ../mdkapplet:544
+#: ../mdkapplet:415
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "नेटवर्क की जाँच की जा रही है: लगता है निष्क्रिय है\n"
 
-#: ../mdkapplet:587
+#: ../mdkapplet:457 ../mdkupdate:118 ../mdkupdate:164
 #, c-format
-msgid "Logs"
-msgstr "रोज़नामचे"
-
-#: ../mdkapplet:603
-#, c-format
-msgid "Clear"
-msgstr "साफ़ करना "
+msgid "Warning"
+msgstr "चेतावनी"
 
-#: ../mdkapplet:629
+#: ../mdkapplet:468
 #, c-format
 msgid "About..."
 msgstr "के बारे में ।"
 
-#: ../mdkapplet:631
+#: ../mdkapplet:472
 #, fuzzy, c-format
 msgid "Mandriva Online %s"
 msgstr "मैनड्रिवऑनलाइन"
 
-#: ../mdkapplet:635
+#: ../mdkapplet:473
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr ""
 
-#: ../mdkapplet:647
+#: ../mdkapplet:476
 #, c-format
 msgid "Mandriva Online gives access to Mandriva web services."
 msgstr ""
 
-#: ../mdkapplet:655
-#, c-format
-msgid "Always launch on startup"
-msgstr "शुरूवात में सदैव आरम्भ करें"
-
-#: ../mdkapplet:657
-#, c-format
-msgid "Quit"
-msgstr "निकास"
-
-#: ../mdkonline:58
-#, fuzzy, c-format
-msgid ""
-"mdonline version %s\n"
-"Copyright (C) %s Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"mdonline संस्मरण  %s\n"
-"। सर्वाधिकार (C) %s मैनडैकसाफ़्ट ।\n"
-"यह एक मुक्त साफ़्टवेयर है और इसे जी०एन०यू० जी०पी०एल० की शर्तों के अन्तर्गत बाँटा जा सकता "
-"है।\n"
-"\n"
-"प्रयोग:\n"
-
-#: ../mdkonline:63 ../mdkupdate:73
-#, c-format
-msgid "  --help\t\t- print this help message.\n"
-msgstr "  --help\t\t- यह सहायता संदेश छापें ।\n"
-
-#: ../mdkonline:64
-#, c-format
-msgid "  --box=\t\t\t- hostname.\n"
-msgstr ""
-
-#: ../mdkonline:65
-#, c-format
-msgid "  --country\t\t\t- name of country of the user. \n"
-msgstr ""
-
-#: ../mdkonline:66
-#, c-format
-msgid "  --interactive\t\t- use the interactive mode.\n"
-msgstr ""
-
-#: ../mdkonline:67
-#, c-format
-msgid "  --nointeractive\t- use the non-interactive mode.\n"
-msgstr ""
-
-#: ../mdkonline:68
-#, c-format
-msgid "  --login=\t\t     - login name of the user.\n"
-msgstr ""
-
-#: ../mdkonline:69
-#, c-format
-msgid "  --pass=\t\t\t- password  of the user.\n"
-msgstr ""
-
-#: ../mdkonline:87 ../mdkonline:120
-#, c-format
-msgid "Mandriva Online"
-msgstr "मैनड्रिवऑनलाइन"
-
-#: ../mdkonline:90
-#, c-format
-msgid "I already have an account"
-msgstr "मेरे पास पहिले से एक खाता है"
-
-#: ../mdkonline:91
-#, c-format
-msgid "I want to subscribe"
-msgstr "मै एक खाता खोलना चाहता हूँ"
-
-#: ../mdkonline:96
-#, c-format
-msgid "Mr."
-msgstr ""
-
-#: ../mdkonline:96
-#, fuzzy, c-format
-msgid "Mrs."
-msgstr "एक्समर्ल्स"
-
-#: ../mdkonline:96
-#, c-format
-msgid "Ms."
-msgstr ""
-
-#: ../mdkonline:114
-#, c-format
-msgid "Reading configuration\n"
-msgstr "संरचना पढ़ी जा रही है\n"
-
-#: ../mdkonline:123
-#, c-format
-msgid ""
-"This assistant will help you to upload your configuration\n"
-"(packages, hardware configuration) to a centralized database in\n"
-"order to keep you informed about security updates and useful upgrades.\n"
-msgstr ""
-"आपको सुरक्षा अपडेटों व उपयोगी अपग्रेडों के बारे में सूचित करते रहने के लिए, \n"
-"आपके तंत्र की संरचना को (पैकेजों, हार्डवेयर संरचना), एक केन्द्रीय डाटाबेस में\n"
-"अपलोड करने के लिए, यह सहायक आपकी सहायता करेगा ।\n"
-
-#: ../mdkonline:131
-#, c-format
-msgid "Account creation or authentication"
-msgstr "खाते का निर्माण या प्रमाणीकरण"
-
-#: ../mdkonline:136
-#, c-format
-msgid "Enter your Mandriva Online login, password and machine name:"
-msgstr "अपना मैनड्रिवऑनलाइन लॉग-इन, कूटशब्द और मशीन नाम बतायें:"
-
-#: ../mdkonline:142 ../mdkonline:195
-#, fuzzy, c-format
-msgid "Email address:"
-msgstr "बर्हिगमन विपत्र पता"
-
-#: ../mdkonline:143
-#, c-format
-msgid "Country"
-msgstr "देश"
-
-#: ../mdkonline:144 ../mdkonline:196
-#, c-format
-msgid "Password:"
-msgstr "कूटशब्द: "
-
-#: ../mdkonline:146
-#, fuzzy, c-format
-msgid "Machine description:"
-msgstr "मशीन नाम:"
-
-#: ../mdkonline:147
-#, c-format
-msgid "(Ex: My Home Office's Computer)"
-msgstr ""
-
-#: ../mdkonline:152 ../mdkonline:159 ../mdkonline:180 ../mdkonline:204
-#: ../mdkonline:208 ../mdkonline:212 ../mdkonline:217 ../mdkupdate:141
-#: ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
-#, c-format
-msgid "Error"
-msgstr "त्रुटि"
-
-#: ../mdkonline:152
-#, fuzzy, c-format
-msgid "Machine name must be 1 to 40 alphanumerical characters"
-msgstr "आरोह बिन्दुओं के नाम में सिर्फ़ शब्द व संख्या होना चाहिए"
-
-#: ../mdkonline:155
-#, c-format
-msgid "Connecting to Mandriva Online website..."
-msgstr "मैनड्रिवऑनलाइन वेब-स्थल से जुड़ा जा रहा है..."
-
-#: ../mdkonline:167
-#, c-format
-msgid ""
-"In order to benefit from Mandriva Online services,\n"
-"we are about to upload your configuration.\n"
-"\n"
-"The Wizard will now send the following information to Mandriva:\n"
-"\n"
-"1) the list of packages you have installed on your system,\n"
-"\n"
-"2) your hardware configuration.\n"
-"\n"
-"If you feel uncomfortable by that idea, or do not want to benefit from this "
-"service,\n"
-"please press 'Cancel'. By pressing 'Next', you allow us to keep you "
-"informed\n"
-"about security updates and useful upgrades via personalized email alerts.\n"
-"Furthermore, you benefit from discounted paid support services on\n"
-"www.mandrivaexpert.com."
-msgstr ""
-"मैनड्रिवऑनलाइन सेवाओं से लाभ उठाने हेतु, \n"
-"हम आपकी तंत्र संरचना को अब अपलोड ही करने जा रहे है । \n"
-"\n"
-"यह विजार्ड निम्नलिखित सूचना को अब मैनड्रिवसॉफ़्ट को भेजने वाला है:\n"
-"\n"
-"१) पैकेजों की सूची जिन्हें आपने अपने तंत्र पर संसाधित किया हुआ है,\n"
-"\n"
-"२) आपके हार्डवेयर की संरचना ।\n"
-"\n"
-"यदि इस विचार से आश्वासित नहीं महसूस कर रहे है, या इस सेवा से लाभ ,नहीं उठाना चाहते है,\n"
-"ति कृपया 'निरस्त' को दबायें । 'अगला' को दबाने पर, सुरक्षा अपडेटो वउपयोगी अपग्रेडों के "
-"बारे में,\n"
-"व्यक्ति-विशेष-के-लिए बनाये हुए विपत्र सचेतकों द्वारा, आप हमें आपको सूचित करने की अनुमति देते "
-"है।\n"
-"और भी, www.mandrivaexpert.com से आप छूट-सहित पेड सहायता सेवाओं से \n"
-"लाभान्वित हो सकते है ।"
-
-#: ../mdkonline:180
-#, c-format
-msgid "Connection problem"
-msgstr "सम्बन्ध स्थापन समस्या"
-
-#: ../mdkonline:180
-#, c-format
-msgid "Problem occurs when uploading files, please try again"
-msgstr "संचिकाओं को अपलोड करते समय समस्या हुई, कॄपया पुनः प्रयास करें"
-
-#: ../mdkonline:187
-#, c-format
-msgid "Create a Mandriva Online Account"
-msgstr "एक मैनड्रिवऑनलाइन खाता खोलें"
-
-#. -PO: that is for things like "Mr", "Ms",...
-#: ../mdkonline:192
-#, fuzzy, c-format
-msgid "Greeting:"
-msgstr "हरा"
-
-#: ../mdkonline:193
-#, c-format
-msgid "First name:"
-msgstr "प्रथमनाम:"
-
-#: ../mdkonline:194
-#, fuzzy, c-format
-msgid "Last name:"
-msgstr "प्रथमनाम:"
-
-#: ../mdkonline:197
-#, c-format
-msgid "Confirm Password:"
-msgstr "कूटशब्द की संपुष्टि करें:"
-
-#: ../mdkonline:204
-#, c-format
-msgid ""
-"The passwords do not match\n"
-" Please try again\n"
-msgstr ""
-"कूटशब्द मेल नहीं खाते है\n"
-"कृपया पुनः प्रयास करें\n"
-
-#: ../mdkonline:208
-#, fuzzy, c-format
-msgid "Please fill in each field"
-msgstr "कृपया सभी प्रविष्टियों को भरें\n"
-
-#: ../mdkonline:212
-#, c-format
-msgid "Not a valid mail address!\n"
-msgstr "एक वैध विपत्र पता नहीं!\n"
-
-#: ../mdkonline:217
-#, c-format
-msgid "Creating account failed!"
-msgstr ""
-
-#: ../mdkonline:225
-#, c-format
-msgid ""
-"Mandriva Online Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
-msgstr ""
-"मैनड्रिवऑनलाइन खाते को सफ़लता-पूर्वक निर्मित किया गया ।\n"
-"कॄपया  \"अगला\" पर क्लिक करके प्रमाणीकरण करें और अपने तंत्र की संरचना को अपलोड करें\n"
-
-#: ../mdkonline:229
-#, c-format
-msgid "Your upload was successful!"
-msgstr "आपका अपलोड सफ़ल रहा था !"
-
-#: ../mdkonline:229
+#: ../mdkapplet:478
 #, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandriva Online."
-msgstr ""
-"अब से आप सुरक्षा व अपडेटो की घोषणाओं को प्राप्त करेगें \n"
-"मैनड्रिवऑनलाइन को धन्यवाद।"
+msgid "Online WebSite"
+msgstr "ऑनलाइन वेबस्थल"
 
-#: ../mdkonline:229
+#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
+#: ../mdkapplet:483
 #, c-format
-msgid ""
-"Mandriva Online offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
+msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
-"मैनड्रिवऑनलाइन आपको अपडेटो को स्वचालित रूप से करने की क्षमता प्रदान करने को प्रस्तावित "
-"करता है।\n"
-"आपके तंत्र में एक कार्यक्रम लगातार नये अपडेटो की प्रतीक्षा में चलता रहेगा\n"
-
-#: ../mdkonline:238
-#, c-format
-msgid "Congratulations"
-msgstr "बधाई हो"
-
-#: ../mdkonline:238
-#, c-format
-msgid "Your Mandriva Online account has been successfully configured\n"
-msgstr "आपके मैनड्रिवऑनलाइन खाते को सफ़लता-पूर्वक संरचित किया गया\n"
 
-#: ../mdkonline:253
+#: ../mdkapplet:492
 #, c-format
-msgid "Configuration uploaded successfully"
-msgstr "संरचना-सूचना सफ़लता-पूर्वक अपलोड हुई ।"
-
-#: ../mdkonline:254
-#, c-format
-msgid "Problem uploading configuration"
-msgstr "संरचना-सूचना को अपलोड करने में समस्या"
+msgid "Always launch on startup"
+msgstr "शुरूवात में सदैव आरम्भ करें"
 
-#: ../mdkonline:256
+#: ../mdkapplet:494
 #, c-format
-msgid ""
-"Cannot connect to Mandriva Online website: wrong login/password or router/"
-"firewall bad settings"
-msgstr ""
-"मैनड्रिवऑनलाइन वेब-स्थल से जुड़ा नहीं जा सका: गलत लॉग-इन/पासवर्ड या रूटर/फ़ायरवाल की "
-"खराब सेटिंग्स"
+msgid "Quit"
+msgstr "निकास"
 
 #: ../mdkonline.pm:207
 #, fuzzy, c-format
@@ -817,6 +357,11 @@ msgstr ""
 "\n"
 "प्रयोग:\n"
 
+#: ../mdkupdate:73
+#, c-format
+msgid "  --help\t\t- print this help message.\n"
+msgstr "  --help\t\t- यह सहायता संदेश छापें ।\n"
+
 #: ../mdkupdate:74
 #, c-format
 msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
@@ -844,11 +389,6 @@ msgid ""
 "file.\n"
 msgstr ""
 
-#: ../mdkupdate:118 ../mdkupdate:164
-#, c-format
-msgid "Warning"
-msgstr "चेतावनी"
-
 #. -PO: here Live Install is currently *NOT* translated on the desktop, so it's better to keep as it:
 #: ../mdkupdate:120
 #, c-format
@@ -857,11 +397,21 @@ msgid ""
 "Install' wizard."
 msgstr ""
 
+#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
+#, c-format
+msgid "Please wait"
+msgstr "कृपया प्रतीक्षा करें"
+
 #: ../mdkupdate:123 ../mdkupdate:174
 #, c-format
 msgid "Preparing..."
 msgstr "तैयारी की जा रही है..."
 
+#: ../mdkupdate:141 ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
+#, c-format
+msgid "Error"
+msgstr "त्रुटि"
+
 #: ../mdkupdate:141
 #, c-format
 msgid ""
@@ -870,6 +420,11 @@ msgid ""
 "%s"
 msgstr ""
 
+#: ../mdkupdate:159 ../mdkupdate:188
+#, c-format
+msgid "An error occurred"
+msgstr "एक त्रुटि हो गयी है"
+
 #: ../mdkupdate:164
 #, c-format
 msgid ""
@@ -894,6 +449,286 @@ msgstr "पैकेजों का संसाधन किया जा र�
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "एमडीकेअपडेट माध्यम से पैकेजों को अपडेट करने में असमर्थ ।\n"
 
+#, fuzzy
+#~ msgid "New bundles are available for your system"
+#~ msgstr "आपके तंत्र हेतु नये अपडेट उपलब्ध है"
+
+#~ msgid "Service is not configured. Please click on \"Configure the service\""
+#~ msgstr "सेवा संरचित नहीं है । कृपया \"सेवा संरचना\" पर क्लिक करें"
+
+#~ msgid "Configure the service"
+#~ msgstr "सेवा की संरचना"
+
+#~ msgid "Check updates"
+#~ msgstr "अपडेटो की जाँच"
+
+#~ msgid "Configure Now!"
+#~ msgstr "अभी संरचित करें!"
+
+#~ msgid "Actions"
+#~ msgstr "कार्यवाहिया"
+
+#~ msgid "Configure"
+#~ msgstr "संरचना"
+
+#~ msgid "See logs"
+#~ msgstr "लॉगो को देखना"
+
+#~ msgid "Status"
+#~ msgstr "स्थिति"
+
+#~ msgid "Close"
+#~ msgstr "बन्द"
+
+#~ msgid "Network Connection: "
+#~ msgstr "नेटवर्क कनेक्शन: "
+
+#~ msgid "Up"
+#~ msgstr "ऊपर"
+
+#~ msgid "Down"
+#~ msgstr "नीचे"
+
+#~ msgid "Last check: "
+#~ msgstr "अंतिम जाँच: "
+
+#~ msgid "Machine name:"
+#~ msgstr "मशीन नाम:"
+
+#~ msgid "Updates: "
+#~ msgstr "अपडेट्स: "
+
+#~ msgid "Development release not supported by service"
+#~ msgstr "विकास संस्मरणों को इस सेवा द्वारा समर्थन नहीं प्राप्त है"
+
+#~ msgid "Too old release not supported by service"
+#~ msgstr "बहुत अधिक प्राचीन संस्मरणों को इस सेवा द्वारा समर्थन नहीं प्राप्त है"
+
+#~ msgid "Unknown state"
+#~ msgstr "अज्ञात अवस्था"
+
+#~ msgid "Online services disabled. Contact Mandriva Online site\n"
+#~ msgstr "ऑनलाइन सेवायें निष्क्रिय है । मैनड्रिवऑनलाइन स्थल से सम्पर्क करें\n"
+
+#~ msgid "Wrong Password.\n"
+#~ msgstr "गलत कूटशब्द।\n"
+
+#~ msgid "Wrong Action or host or login.\n"
+#~ msgstr "गलत एक्शन या होस्ट या लॉग-इन।\n"
+
+#~ msgid ""
+#~ "Something is wrong with your network settings (check your route, firewall "
+#~ "or proxy settings)\n"
+#~ msgstr ""
+#~ "आपकी नेटवर्क समायोजनाओं में कुछ त्रुटि है (अपने पथ, अग्नि-भीतिका या प्रोक्सी समायोजनाओं "
+#~ "की जाँच करें)\n"
+
+#~ msgid ""
+#~ "Problem occured while connecting to the server, please contact the "
+#~ "support team"
+#~ msgstr "सर्वर से संबंध स्थापित करते समय समस्या हुई, कृपया सहायता दल से सम्पर्क करें"
+
+#~ msgid "Response from Mandriva Online server\n"
+#~ msgstr "मैनड्रिवऑनलाइन सर्वर से प्रतिउत्तर\n"
+
+#~ msgid "No check"
+#~ msgstr "कोई जाँच नहीं"
+
+#~ msgid "Checking config file: Not present\n"
+#~ msgstr "कॉन्फ़िग संचिका की जाँच की जा रही है: विलुप्त है\n"
+
+#~ msgid "Logs"
+#~ msgstr "रोज़नामचे"
+
+#~ msgid "Clear"
+#~ msgstr "साफ़ करना "
+
+#, fuzzy
+#~ msgid ""
+#~ "mdonline version %s\n"
+#~ "Copyright (C) %s Mandriva.\n"
+#~ "This is free software and may be redistributed under the terms of the GNU "
+#~ "GPL.\n"
+#~ "\n"
+#~ "usage:\n"
+#~ msgstr ""
+#~ "mdonline संस्मरण  %s\n"
+#~ "। सर्वाधिकार (C) %s मैनडैकसाफ़्ट ।\n"
+#~ "यह एक मुक्त साफ़्टवेयर है और इसे जी०एन०यू० जी०पी०एल० की शर्तों के अन्तर्गत बाँटा जा "
+#~ "सकता है।\n"
+#~ "\n"
+#~ "प्रयोग:\n"
+
+#~ msgid "Mandriva Online"
+#~ msgstr "मैनड्रिवऑनलाइन"
+
+#~ msgid "I already have an account"
+#~ msgstr "मेरे पास पहिले से एक खाता है"
+
+#~ msgid "I want to subscribe"
+#~ msgstr "मै एक खाता खोलना चाहता हूँ"
+
+#, fuzzy
+#~ msgid "Mrs."
+#~ msgstr "एक्समर्ल्स"
+
+#~ msgid "Reading configuration\n"
+#~ msgstr "संरचना पढ़ी जा रही है\n"
+
+#~ msgid ""
+#~ "This assistant will help you to upload your configuration\n"
+#~ "(packages, hardware configuration) to a centralized database in\n"
+#~ "order to keep you informed about security updates and useful upgrades.\n"
+#~ msgstr ""
+#~ "आपको सुरक्षा अपडेटों व उपयोगी अपग्रेडों के बारे में सूचित करते रहने के लिए, \n"
+#~ "आपके तंत्र की संरचना को (पैकेजों, हार्डवेयर संरचना), एक केन्द्रीय डाटाबेस में\n"
+#~ "अपलोड करने के लिए, यह सहायक आपकी सहायता करेगा ।\n"
+
+#~ msgid "Account creation or authentication"
+#~ msgstr "खाते का निर्माण या प्रमाणीकरण"
+
+#~ msgid "Enter your Mandriva Online login, password and machine name:"
+#~ msgstr "अपना मैनड्रिवऑनलाइन लॉग-इन, कूटशब्द और मशीन नाम बतायें:"
+
+#, fuzzy
+#~ msgid "Email address:"
+#~ msgstr "बर्हिगमन विपत्र पता"
+
+#~ msgid "Country"
+#~ msgstr "देश"
+
+#~ msgid "Password:"
+#~ msgstr "कूटशब्द: "
+
+#, fuzzy
+#~ msgid "Machine description:"
+#~ msgstr "मशीन नाम:"
+
+#, fuzzy
+#~ msgid "Machine name must be 1 to 40 alphanumerical characters"
+#~ msgstr "आरोह बिन्दुओं के नाम में सिर्फ़ शब्द व संख्या होना चाहिए"
+
+#~ msgid "Connecting to Mandriva Online website..."
+#~ msgstr "मैनड्रिवऑनलाइन वेब-स्थल से जुड़ा जा रहा है..."
+
+#~ msgid ""
+#~ "In order to benefit from Mandriva Online services,\n"
+#~ "we are about to upload your configuration.\n"
+#~ "\n"
+#~ "The Wizard will now send the following information to Mandriva:\n"
+#~ "\n"
+#~ "1) the list of packages you have installed on your system,\n"
+#~ "\n"
+#~ "2) your hardware configuration.\n"
+#~ "\n"
+#~ "If you feel uncomfortable by that idea, or do not want to benefit from "
+#~ "this service,\n"
+#~ "please press 'Cancel'. By pressing 'Next', you allow us to keep you "
+#~ "informed\n"
+#~ "about security updates and useful upgrades via personalized email "
+#~ "alerts.\n"
+#~ "Furthermore, you benefit from discounted paid support services on\n"
+#~ "www.mandrivaexpert.com."
+#~ msgstr ""
+#~ "मैनड्रिवऑनलाइन सेवाओं से लाभ उठाने हेतु, \n"
+#~ "हम आपकी तंत्र संरचना को अब अपलोड ही करने जा रहे है । \n"
+#~ "\n"
+#~ "यह विजार्ड निम्नलिखित सूचना को अब मैनड्रिवसॉफ़्ट को भेजने वाला है:\n"
+#~ "\n"
+#~ "१) पैकेजों की सूची जिन्हें आपने अपने तंत्र पर संसाधित किया हुआ है,\n"
+#~ "\n"
+#~ "२) आपके हार्डवेयर की संरचना ।\n"
+#~ "\n"
+#~ "यदि इस विचार से आश्वासित नहीं महसूस कर रहे है, या इस सेवा से लाभ ,नहीं उठाना चाहते "
+#~ "है,\n"
+#~ "ति कृपया 'निरस्त' को दबायें । 'अगला' को दबाने पर, सुरक्षा अपडेटो वउपयोगी अपग्रेडों के "
+#~ "बारे में,\n"
+#~ "व्यक्ति-विशेष-के-लिए बनाये हुए विपत्र सचेतकों द्वारा, आप हमें आपको सूचित करने की अनुमति "
+#~ "देते है।\n"
+#~ "और भी, www.mandrivaexpert.com से आप छूट-सहित पेड सहायता सेवाओं से \n"
+#~ "लाभान्वित हो सकते है ।"
+
+#~ msgid "Connection problem"
+#~ msgstr "सम्बन्ध स्थापन समस्या"
+
+#~ msgid "Problem occurs when uploading files, please try again"
+#~ msgstr "संचिकाओं को अपलोड करते समय समस्या हुई, कॄपया पुनः प्रयास करें"
+
+#~ msgid "Create a Mandriva Online Account"
+#~ msgstr "एक मैनड्रिवऑनलाइन खाता खोलें"
+
+#, fuzzy
+#~ msgid "Greeting:"
+#~ msgstr "हरा"
+
+#~ msgid "First name:"
+#~ msgstr "प्रथमनाम:"
+
+#, fuzzy
+#~ msgid "Last name:"
+#~ msgstr "प्रथमनाम:"
+
+#~ msgid "Confirm Password:"
+#~ msgstr "कूटशब्द की संपुष्टि करें:"
+
+#~ msgid ""
+#~ "The passwords do not match\n"
+#~ " Please try again\n"
+#~ msgstr ""
+#~ "कूटशब्द मेल नहीं खाते है\n"
+#~ "कृपया पुनः प्रयास करें\n"
+
+#, fuzzy
+#~ msgid "Please fill in each field"
+#~ msgstr "कृपया सभी प्रविष्टियों को भरें\n"
+
+#~ msgid "Not a valid mail address!\n"
+#~ msgstr "एक वैध विपत्र पता नहीं!\n"
+
+#~ msgid ""
+#~ "Mandriva Online Account successfully created.\n"
+#~ "Please click \"Next\" to authenticate and upload your configuration\n"
+#~ msgstr ""
+#~ "मैनड्रिवऑनलाइन खाते को सफ़लता-पूर्वक निर्मित किया गया ।\n"
+#~ "कॄपया  \"अगला\" पर क्लिक करके प्रमाणीकरण करें और अपने तंत्र की संरचना को अपलोड करें\n"
+
+#~ msgid "Your upload was successful!"
+#~ msgstr "आपका अपलोड सफ़ल रहा था !"
+
+#~ msgid ""
+#~ "From now you will receive on security and updates \n"
+#~ "announcements thanks to Mandriva Online."
+#~ msgstr ""
+#~ "अब से आप सुरक्षा व अपडेटो की घोषणाओं को प्राप्त करेगें \n"
+#~ "मैनड्रिवऑनलाइन को धन्यवाद।"
+
+#~ msgid ""
+#~ "Mandriva Online offers you the ability to automate the updates.\n"
+#~ "A program will run regulary in your system waiting for new updates\n"
+#~ msgstr ""
+#~ "मैनड्रिवऑनलाइन आपको अपडेटो को स्वचालित रूप से करने की क्षमता प्रदान करने को "
+#~ "प्रस्तावित करता है।\n"
+#~ "आपके तंत्र में एक कार्यक्रम लगातार नये अपडेटो की प्रतीक्षा में चलता रहेगा\n"
+
+#~ msgid "Congratulations"
+#~ msgstr "बधाई हो"
+
+#~ msgid "Your Mandriva Online account has been successfully configured\n"
+#~ msgstr "आपके मैनड्रिवऑनलाइन खाते को सफ़लता-पूर्वक संरचित किया गया\n"
+
+#~ msgid "Configuration uploaded successfully"
+#~ msgstr "संरचना-सूचना सफ़लता-पूर्वक अपलोड हुई ।"
+
+#~ msgid "Problem uploading configuration"
+#~ msgstr "संरचना-सूचना को अपलोड करने में समस्या"
+
+#~ msgid ""
+#~ "Cannot connect to Mandriva Online website: wrong login/password or router/"
+#~ "firewall bad settings"
+#~ msgstr ""
+#~ "मैनड्रिवऑनलाइन वेब-स्थल से जुड़ा नहीं जा सका: गलत लॉग-इन/पासवर्ड या रूटर/फ़ायरवाल की "
+#~ "खराब सेटिंग्स"
+
 #~ msgid "  --applet\t\t- launch Mandriva Update.\n"
 #~ msgstr "  --applet\t\t- मैनड्रिवअपडेट की शुरूवात।\n"
 
diff --git a/po/hr.po b/po/hr.po
index d1789bd0..8c22554e 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline 0\n"
-"POT-Creation-Date: 2007-08-09 16:26+0200\n"
+"POT-Creation-Date: 2008-02-21 18:21+0100\n"
 "PO-Revision-Date: 2005-01-04 21:26+CET\n"
 "Last-Translator: auto\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
@@ -16,17 +16,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:94
+#: ../mdkapplet:88
 #, fuzzy, c-format
 msgid "Will check updates at %s"
 msgstr "Provjeri nadogradnje"
 
-#: ../mdkapplet:103
+#: ../mdkapplet:97
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "Vaš sistem je ažuran"
 
-#: ../mdkapplet:109
+#: ../mdkapplet:103
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -35,55 +35,45 @@ msgstr ""
 "Problem s konfiguracijom servisa. Molimo provjerite logove i pošaljite mail "
 "na support@mandrivaonline.com"
 
-#: ../mdkapplet:115
+#: ../mdkapplet:110
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr ""
 "Molimo pričekajte\n"
 "Sortiram pakete"
 
-#: ../mdkapplet:121
+#: ../mdkapplet:116
 #, c-format
 msgid "New updates are available for your system"
 msgstr "Nema novih datoteka dostupnih za Vas sistem!"
 
-#: ../mdkapplet:127
-#, fuzzy, c-format
-msgid "New bundles are available for your system"
-msgstr "Nema novih datoteka dostupnih za Vas sistem!"
-
-#: ../mdkapplet:133
-#, c-format
-msgid "Service is not configured. Please click on \"Configure the service\""
-msgstr "Servis nije podešen. Molimo kliknite na \"Configure the service\""
-
-#: ../mdkapplet:139
+#: ../mdkapplet:122
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "Mreža je pala. Molimo podesite mrežu"
 
-#: ../mdkapplet:145
+#: ../mdkapplet:128
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "Servis nije aktivan. Molimo kliknite na \"Online Website\""
 
-#: ../mdkapplet:151 ../mdkapplet:182
+#: ../mdkapplet:134 ../mdkapplet:165
 #, fuzzy, c-format
 msgid "urpmi database locked"
 msgstr "urpmi baza zaključana"
 
-#: ../mdkapplet:157
+#: ../mdkapplet:140
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
-#: ../mdkapplet:163
+#: ../mdkapplet:146
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
 msgstr ""
 
-#: ../mdkapplet:169
+#: ../mdkapplet:152
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -94,570 +84,131 @@ msgid ""
 "Then, restart \"%s\"."
 msgstr ""
 
-#: ../mdkapplet:174
+#: ../mdkapplet:157
 #, c-format
 msgid "Enabled"
 msgstr "Aktivirano"
 
-#: ../mdkapplet:187
+#: ../mdkapplet:170
 #, c-format
 msgid "Error updating media"
 msgstr ""
 
-#: ../mdkapplet:202
+#: ../mdkapplet:185
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr "Provjeravam... Nadogradnje su dostupne\n"
 
-#: ../mdkapplet:207
+#: ../mdkapplet:190
 #, c-format
 msgid "Packages are up to date"
 msgstr ""
 
-#: ../mdkapplet:212
+#: ../mdkapplet:195
 #, fuzzy, c-format
 msgid "Failed to open urpmi database"
 msgstr "Ne mogu otvoriti datoteku %s\n"
 
-#: ../mdkapplet:217 ../mdkapplet:324
+#: ../mdkapplet:200
 #, fuzzy, c-format
 msgid "Install updates"
 msgstr "Instaliraj zakrpe"
 
-#: ../mdkapplet:218
-#, c-format
-msgid "Configure the service"
-msgstr "Podesi servise"
-
-#: ../mdkapplet:219
+#: ../mdkapplet:201
 #, c-format
 msgid "Check Updates"
 msgstr "Provjeri nadogradnje"
 
-#: ../mdkapplet:220 ../mdkapplet:327 ../mdkonline:114 ../mdkonline:155
-#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
-#, c-format
-msgid "Please wait"
-msgstr "Molim pričekajte"
-
-#: ../mdkapplet:220 ../mdkapplet:326 ../mdkapplet:327
-#, c-format
-msgid "Check updates"
-msgstr "Provjeri nadogradnje"
-
-#: ../mdkapplet:223 ../mdkapplet:648
-#, c-format
-msgid "Online WebSite"
-msgstr "Online web stranica"
-
-#: ../mdkapplet:224
+#: ../mdkapplet:202
 #, c-format
 msgid "Configure Network"
 msgstr "Podesi mrežu"
 
-#: ../mdkapplet:225
-#, c-format
-msgid "Configure Now!"
-msgstr "Podesi sada"
-
-#: ../mdkapplet:313 ../mdkapplet:392
-#, c-format
-msgid "Mandriva Linux Updates Applet"
-msgstr "Mandriva Linux nadograđuje applete"
-
-#: ../mdkapplet:322
-#, c-format
-msgid "Actions"
-msgstr "Akcije"
-
-#: ../mdkapplet:325
-#, c-format
-msgid "Configure"
-msgstr "Podesi"
-
-#: ../mdkapplet:329
-#, c-format
-msgid "See logs"
-msgstr "Vidi logove"
-
-#: ../mdkapplet:332
-#, c-format
-msgid "Status"
-msgstr "Stanje"
-
-#: ../mdkapplet:336 ../mdkapplet:597
-#, c-format
-msgid "Close"
-msgstr "Zatvori"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Network Connection: "
-msgstr "Mrežne veze:"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Up"
-msgstr "Gore"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Down"
-msgstr "Dolje"
-
-#: ../mdkapplet:366
-#, c-format
-msgid "Last check: "
-msgstr "Posljednja provjera:"
-
-#: ../mdkapplet:367 ../mdkonline:145
-#, c-format
-msgid "Machine name:"
-msgstr "Ime računala:"
-
-#: ../mdkapplet:368
-#, c-format
-msgid "Updates: "
-msgstr "Nadogradnje:"
-
-#: ../mdkapplet:372
+#: ../mdkapplet:283
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Pokrećem drakconnect\n"
 
-#: ../mdkapplet:375
+#: ../mdkapplet:286
 #, c-format
 msgid "Mandriva Online seems to be reinstalled, reloading applet ...."
 msgstr "Mandriva Online se čini da je reinstaliran, ponovo pokrećem aplet ... "
 
-#: ../mdkapplet:383
+#: ../mdkapplet:294
 #, c-format
 msgid "Launching MandrivaUpdate\n"
 msgstr "Pokrećem MandrivaUpdate\n"
 
-#: ../mdkapplet:398
+#: ../mdkapplet:303
+#, c-format
+msgid "Mandriva Linux Updates Applet"
+msgstr "Mandriva Linux nadograđuje applete"
+
+#: ../mdkapplet:308
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Proračunavam nove nadogradnje...\n"
 
-#: ../mdkapplet:399
+#: ../mdkapplet:309
 #, fuzzy, c-format
 msgid "Connecting to"
 msgstr "Povezujem se sa"
 
-#: ../mdkapplet:467 ../mdkupdate:159 ../mdkupdate:188
-#, c-format
-msgid "An error occurred"
-msgstr "Pojavila se greška"
-
-#: ../mdkapplet:475
-#, c-format
-msgid "Development release not supported by service"
-msgstr ""
-
-#: ../mdkapplet:476
-#, c-format
-msgid "Too old release not supported by service"
-msgstr ""
-
-#: ../mdkapplet:477
-#, fuzzy, c-format
-msgid "Unknown state"
-msgstr "Nepoznato stanje"
-
-#: ../mdkapplet:478
-#, c-format
-msgid "Online services disabled. Contact Mandriva Online site\n"
-msgstr "Online servis je isključen. Kontaktirajte Mandriva Online stranicu\n"
-
-#: ../mdkapplet:479
-#, c-format
-msgid "Wrong Password.\n"
-msgstr "Kriva lozinka.\n"
-
-#: ../mdkapplet:480
-#, c-format
-msgid "Wrong Action or host or login.\n"
-msgstr "Kriva akcija, host ili login.\n"
-
-#: ../mdkapplet:481
-#, c-format
-msgid ""
-"Something is wrong with your network settings (check your route, firewall or "
-"proxy settings)\n"
-msgstr ""
-"Nešto nije u redu s Vašim mrežnim postavkama (provjerite router, firewall "
-"ili postavke proxya)\n"
-
-#: ../mdkapplet:483
-#, c-format
-msgid ""
-"Problem occured while connecting to the server, please contact the support "
-"team"
-msgstr ""
-
-#: ../mdkapplet:487
-#, fuzzy, c-format
-msgid "Response from Mandriva Online server\n"
-msgstr "Dobro došli u Mandriva Online"
-
-#: ../mdkapplet:490
+#: ../mdkapplet:386
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Sistem je nadograđen\n"
 
-#: ../mdkapplet:527
-#, c-format
-msgid "No check"
-msgstr "Ne provjeravaj"
-
-#: ../mdkapplet:541
-#, c-format
-msgid "Checking config file: Not present\n"
-msgstr "Provjeravam config datoteku: Nije prisutna\n"
-
-#: ../mdkapplet:544
+#: ../mdkapplet:415
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Provjeravam mreži: čini se da je isključena\n"
 
-#: ../mdkapplet:587
+#: ../mdkapplet:457 ../mdkupdate:118 ../mdkupdate:164
 #, c-format
-msgid "Logs"
-msgstr "Zapisi"
-
-#: ../mdkapplet:603
-#, c-format
-msgid "Clear"
-msgstr "Očisti"
+msgid "Warning"
+msgstr "Upozorenje"
 
-#: ../mdkapplet:629
+#: ../mdkapplet:468
 #, c-format
 msgid "About..."
 msgstr "O programu..."
 
-#: ../mdkapplet:631
+#: ../mdkapplet:472
 #, fuzzy, c-format
 msgid "Mandriva Online %s"
 msgstr "Mandriva Online"
 
-#: ../mdkapplet:635
+#: ../mdkapplet:473
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr ""
 
-#: ../mdkapplet:647
+#: ../mdkapplet:476
 #, c-format
 msgid "Mandriva Online gives access to Mandriva web services."
 msgstr ""
 
-#: ../mdkapplet:655
-#, c-format
-msgid "Always launch on startup"
-msgstr "Pokreni pri podizanju sustava"
-
-#: ../mdkapplet:657
-#, c-format
-msgid "Quit"
-msgstr "Izlaz"
-
-#: ../mdkonline:58
-#, c-format
-msgid ""
-"mdonline version %s\n"
-"Copyright (C) %s Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-
-#: ../mdkonline:63 ../mdkupdate:73
-#, c-format
-msgid "  --help\t\t- print this help message.\n"
-msgstr "  --help\t\t- ispiši ovaj tekst s pomoći.\n"
-
-#: ../mdkonline:64
-#, c-format
-msgid "  --box=\t\t\t- hostname.\n"
-msgstr ""
-
-#: ../mdkonline:65
-#, c-format
-msgid "  --country\t\t\t- name of country of the user. \n"
-msgstr ""
-
-#: ../mdkonline:66
-#, c-format
-msgid "  --interactive\t\t- use the interactive mode.\n"
-msgstr ""
-
-#: ../mdkonline:67
-#, c-format
-msgid "  --nointeractive\t- use the non-interactive mode.\n"
-msgstr ""
-
-#: ../mdkonline:68
-#, c-format
-msgid "  --login=\t\t     - login name of the user.\n"
-msgstr ""
-
-#: ../mdkonline:69
-#, c-format
-msgid "  --pass=\t\t\t- password  of the user.\n"
-msgstr ""
-
-#: ../mdkonline:87 ../mdkonline:120
-#, c-format
-msgid "Mandriva Online"
-msgstr "Mandriva Online"
-
-#: ../mdkonline:90
-#, c-format
-msgid "I already have an account"
-msgstr ""
-
-#: ../mdkonline:91
-#, c-format
-msgid "I want to subscribe"
-msgstr ""
-
-#: ../mdkonline:96
-#, c-format
-msgid "Mr."
-msgstr ""
-
-#: ../mdkonline:96
-#, c-format
-msgid "Mrs."
-msgstr ""
-
-#: ../mdkonline:96
-#, c-format
-msgid "Ms."
-msgstr ""
-
-#: ../mdkonline:114
-#, c-format
-msgid "Reading configuration\n"
-msgstr "Čitam postavke\n"
-
-#: ../mdkonline:123
-#, c-format
-msgid ""
-"This assistant will help you to upload your configuration\n"
-"(packages, hardware configuration) to a centralized database in\n"
-"order to keep you informed about security updates and useful upgrades.\n"
-msgstr ""
-"Ovaj pomoćnik će vam pomoći da pošaljete svoju konfiguraciju\n"
-"(pakete, hardwaresku konfiguraciju) u centralnu bazu kako\n"
-"bih vas mogli informirati o sigurnosnim i korisnim dogradnjama.\n"
-
-#: ../mdkonline:131
-#, c-format
-msgid "Account creation or authentication"
-msgstr ""
-
-#: ../mdkonline:136
-#, c-format
-msgid "Enter your Mandriva Online login, password and machine name:"
-msgstr "Unesite vaš Mandriva Online login,lozinku i ime računala:"
-
-#: ../mdkonline:142 ../mdkonline:195
-#, fuzzy, c-format
-msgid "Email address:"
-msgstr "IP adresa"
-
-#: ../mdkonline:143
-#, c-format
-msgid "Country"
-msgstr "Država"
-
-#: ../mdkonline:144 ../mdkonline:196
-#, c-format
-msgid "Password:"
-msgstr "Lozinka:"
-
-#: ../mdkonline:146
-#, fuzzy, c-format
-msgid "Machine description:"
-msgstr "Ime računala:"
-
-#: ../mdkonline:147
-#, c-format
-msgid "(Ex: My Home Office's Computer)"
-msgstr ""
-
-#: ../mdkonline:152 ../mdkonline:159 ../mdkonline:180 ../mdkonline:204
-#: ../mdkonline:208 ../mdkonline:212 ../mdkonline:217 ../mdkupdate:141
-#: ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
-#, c-format
-msgid "Error"
-msgstr "Greška"
-
-#: ../mdkonline:152
-#, c-format
-msgid "Machine name must be 1 to 40 alphanumerical characters"
-msgstr ""
-
-#: ../mdkonline:155
-#, fuzzy, c-format
-msgid "Connecting to Mandriva Online website..."
-msgstr "Dobro došli u Mandriva Online"
-
-#: ../mdkonline:167
-#, c-format
-msgid ""
-"In order to benefit from Mandriva Online services,\n"
-"we are about to upload your configuration.\n"
-"\n"
-"The Wizard will now send the following information to Mandriva:\n"
-"\n"
-"1) the list of packages you have installed on your system,\n"
-"\n"
-"2) your hardware configuration.\n"
-"\n"
-"If you feel uncomfortable by that idea, or do not want to benefit from this "
-"service,\n"
-"please press 'Cancel'. By pressing 'Next', you allow us to keep you "
-"informed\n"
-"about security updates and useful upgrades via personalized email alerts.\n"
-"Furthermore, you benefit from discounted paid support services on\n"
-"www.mandrivaexpert.com."
-msgstr ""
-"U pravilu da imate koristi od Mandriva Online usluga,\n"
-"trebate nam poslati vašu konfiguraciju.\n"
-"\n"
-"Čarobnjak će poslati slijedeće informacije Mandrivau:\n"
-"\n"
-"1) pakete koje ste instalirali na vaš sustav,\n"
-"\n"
-"2) vašu hardware konfiguraciju.\n"
-"\n"
-"Ukoliko vam se ne sviđa ta ideja, ili ne želite imati koristi od navedene "
-"usluge pritisnite 'Odustani'.\n"
-"Pritiskom na 'Slijedeće', dozvolit ćete nam da vas možemo\n"
-"obavijestiti o sigurnosnim i korisnim dogradnjama preko osobnih upozorenja "
-"na e-mail.\n"
-"Dalje, imate koristi od snižene cijene podrške na\n"
-"www.mandrivaexpert.com."
-
-#: ../mdkonline:180
-#, c-format
-msgid "Connection problem"
-msgstr "Problem s vezom"
-
-#: ../mdkonline:180
-#, c-format
-msgid "Problem occurs when uploading files, please try again"
-msgstr "Problem kod uploada datoteka, molimo pokušajte ponovo"
-
-#: ../mdkonline:187
-#, c-format
-msgid "Create a Mandriva Online Account"
-msgstr "Napravi Mandriva Online račun"
-
-#. -PO: that is for things like "Mr", "Ms",...
-#: ../mdkonline:192
-#, fuzzy, c-format
-msgid "Greeting:"
-msgstr "Zelena"
-
-#: ../mdkonline:193
-#, c-format
-msgid "First name:"
-msgstr "Ime:"
-
-#: ../mdkonline:194
-#, fuzzy, c-format
-msgid "Last name:"
-msgstr "Ime:"
-
-#: ../mdkonline:197
-#, c-format
-msgid "Confirm Password:"
-msgstr "Provjera lozinke:"
-
-#: ../mdkonline:204
-#, c-format
-msgid ""
-"The passwords do not match\n"
-" Please try again\n"
-msgstr ""
-"Lozinke se ne podudaraju\n"
-"Molimo pokušajte ponovo\n"
-
-#: ../mdkonline:208
-#, fuzzy, c-format
-msgid "Please fill in each field"
-msgstr "Molim ispunite ili provjerite vrijednost doljnjeg polja"
-
-#: ../mdkonline:212
-#, c-format
-msgid "Not a valid mail address!\n"
-msgstr "Unesite ispravnu adresu molim!\n"
-
-#: ../mdkonline:217
-#, c-format
-msgid "Creating account failed!"
-msgstr ""
-
-#: ../mdkonline:225
-#, c-format
-msgid ""
-"Mandriva Online Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
-msgstr ""
-
-#: ../mdkonline:229
-#, c-format
-msgid "Your upload was successful!"
-msgstr "Vaše slanje je bilo uspješno!"
-
-#: ../mdkonline:229
+#: ../mdkapplet:478
 #, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandriva Online."
-msgstr ""
-"Od sada ćete primati obavijesti o sigurnosti\n"
-"i dogradnjama zahvaljujući Mandriva Onlineu."
+msgid "Online WebSite"
+msgstr "Online web stranica"
 
-#: ../mdkonline:229
+#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
+#: ../mdkapplet:483
 #, c-format
-msgid ""
-"Mandriva Online offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
+msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
-"Mandriva Online nudi vam mogućnost automatiziranja dogradnji.\n"
-"Program će se pokrenuti redovno na vašem sustavu čekajući nove dogradnje\n"
-
-#: ../mdkonline:238
-#, c-format
-msgid "Congratulations"
-msgstr "Čestitamo, pobijedili ste!"
 
-#: ../mdkonline:238
+#: ../mdkapplet:492
 #, c-format
-msgid "Your Mandriva Online account has been successfully configured\n"
-msgstr ""
-
-#: ../mdkonline:253
-#, fuzzy, c-format
-msgid "Configuration uploaded successfully"
-msgstr "Vaše slanje je bilo uspješno!"
-
-#: ../mdkonline:254
-#, fuzzy, c-format
-msgid "Problem uploading configuration"
-msgstr "Čitam postavke\n"
+msgid "Always launch on startup"
+msgstr "Pokreni pri podizanju sustava"
 
-#: ../mdkonline:256
+#: ../mdkapplet:494
 #, c-format
-msgid ""
-"Cannot connect to Mandriva Online website: wrong login/password or router/"
-"firewall bad settings"
-msgstr ""
+msgid "Quit"
+msgstr "Izlaz"
 
 #: ../mdkonline.pm:207
 #, fuzzy, c-format
@@ -792,6 +343,11 @@ msgid ""
 "usage:\n"
 msgstr ""
 
+#: ../mdkupdate:73
+#, c-format
+msgid "  --help\t\t- print this help message.\n"
+msgstr "  --help\t\t- ispiši ovaj tekst s pomoći.\n"
+
 #: ../mdkupdate:74
 #, c-format
 msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
@@ -819,11 +375,6 @@ msgid ""
 "file.\n"
 msgstr ""
 
-#: ../mdkupdate:118 ../mdkupdate:164
-#, c-format
-msgid "Warning"
-msgstr "Upozorenje"
-
 #. -PO: here Live Install is currently *NOT* translated on the desktop, so it's better to keep as it:
 #: ../mdkupdate:120
 #, c-format
@@ -832,11 +383,21 @@ msgid ""
 "Install' wizard."
 msgstr ""
 
+#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
+#, c-format
+msgid "Please wait"
+msgstr "Molim pričekajte"
+
 #: ../mdkupdate:123 ../mdkupdate:174
 #, c-format
 msgid "Preparing..."
 msgstr "Pripremam..."
 
+#: ../mdkupdate:141 ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
+#, c-format
+msgid "Error"
+msgstr "Greška"
+
 #: ../mdkupdate:141
 #, c-format
 msgid ""
@@ -845,6 +406,11 @@ msgid ""
 "%s"
 msgstr ""
 
+#: ../mdkupdate:159 ../mdkupdate:188
+#, c-format
+msgid "An error occurred"
+msgstr "Pojavila se greška"
+
 #: ../mdkupdate:164
 #, c-format
 msgid ""
@@ -869,6 +435,229 @@ msgstr "Instaliram pakete...\n"
 msgid "Unable to update packages from update_source medium.\n"
 msgstr ""
 
+#, fuzzy
+#~ msgid "New bundles are available for your system"
+#~ msgstr "Nema novih datoteka dostupnih za Vas sistem!"
+
+#~ msgid "Service is not configured. Please click on \"Configure the service\""
+#~ msgstr "Servis nije podešen. Molimo kliknite na \"Configure the service\""
+
+#~ msgid "Configure the service"
+#~ msgstr "Podesi servise"
+
+#~ msgid "Check updates"
+#~ msgstr "Provjeri nadogradnje"
+
+#~ msgid "Configure Now!"
+#~ msgstr "Podesi sada"
+
+#~ msgid "Actions"
+#~ msgstr "Akcije"
+
+#~ msgid "Configure"
+#~ msgstr "Podesi"
+
+#~ msgid "See logs"
+#~ msgstr "Vidi logove"
+
+#~ msgid "Status"
+#~ msgstr "Stanje"
+
+#~ msgid "Close"
+#~ msgstr "Zatvori"
+
+#~ msgid "Network Connection: "
+#~ msgstr "Mrežne veze:"
+
+#~ msgid "Up"
+#~ msgstr "Gore"
+
+#~ msgid "Down"
+#~ msgstr "Dolje"
+
+#~ msgid "Last check: "
+#~ msgstr "Posljednja provjera:"
+
+#~ msgid "Machine name:"
+#~ msgstr "Ime računala:"
+
+#~ msgid "Updates: "
+#~ msgstr "Nadogradnje:"
+
+#, fuzzy
+#~ msgid "Unknown state"
+#~ msgstr "Nepoznato stanje"
+
+#~ msgid "Online services disabled. Contact Mandriva Online site\n"
+#~ msgstr ""
+#~ "Online servis je isključen. Kontaktirajte Mandriva Online stranicu\n"
+
+#~ msgid "Wrong Password.\n"
+#~ msgstr "Kriva lozinka.\n"
+
+#~ msgid "Wrong Action or host or login.\n"
+#~ msgstr "Kriva akcija, host ili login.\n"
+
+#~ msgid ""
+#~ "Something is wrong with your network settings (check your route, firewall "
+#~ "or proxy settings)\n"
+#~ msgstr ""
+#~ "Nešto nije u redu s Vašim mrežnim postavkama (provjerite router, firewall "
+#~ "ili postavke proxya)\n"
+
+#, fuzzy
+#~ msgid "Response from Mandriva Online server\n"
+#~ msgstr "Dobro došli u Mandriva Online"
+
+#~ msgid "No check"
+#~ msgstr "Ne provjeravaj"
+
+#~ msgid "Checking config file: Not present\n"
+#~ msgstr "Provjeravam config datoteku: Nije prisutna\n"
+
+#~ msgid "Logs"
+#~ msgstr "Zapisi"
+
+#~ msgid "Clear"
+#~ msgstr "Očisti"
+
+#~ msgid "Mandriva Online"
+#~ msgstr "Mandriva Online"
+
+#~ msgid "Reading configuration\n"
+#~ msgstr "Čitam postavke\n"
+
+#~ msgid ""
+#~ "This assistant will help you to upload your configuration\n"
+#~ "(packages, hardware configuration) to a centralized database in\n"
+#~ "order to keep you informed about security updates and useful upgrades.\n"
+#~ msgstr ""
+#~ "Ovaj pomoćnik će vam pomoći da pošaljete svoju konfiguraciju\n"
+#~ "(pakete, hardwaresku konfiguraciju) u centralnu bazu kako\n"
+#~ "bih vas mogli informirati o sigurnosnim i korisnim dogradnjama.\n"
+
+#~ msgid "Enter your Mandriva Online login, password and machine name:"
+#~ msgstr "Unesite vaš Mandriva Online login,lozinku i ime računala:"
+
+#, fuzzy
+#~ msgid "Email address:"
+#~ msgstr "IP adresa"
+
+#~ msgid "Country"
+#~ msgstr "Država"
+
+#~ msgid "Password:"
+#~ msgstr "Lozinka:"
+
+#, fuzzy
+#~ msgid "Machine description:"
+#~ msgstr "Ime računala:"
+
+#, fuzzy
+#~ msgid "Connecting to Mandriva Online website..."
+#~ msgstr "Dobro došli u Mandriva Online"
+
+#~ msgid ""
+#~ "In order to benefit from Mandriva Online services,\n"
+#~ "we are about to upload your configuration.\n"
+#~ "\n"
+#~ "The Wizard will now send the following information to Mandriva:\n"
+#~ "\n"
+#~ "1) the list of packages you have installed on your system,\n"
+#~ "\n"
+#~ "2) your hardware configuration.\n"
+#~ "\n"
+#~ "If you feel uncomfortable by that idea, or do not want to benefit from "
+#~ "this service,\n"
+#~ "please press 'Cancel'. By pressing 'Next', you allow us to keep you "
+#~ "informed\n"
+#~ "about security updates and useful upgrades via personalized email "
+#~ "alerts.\n"
+#~ "Furthermore, you benefit from discounted paid support services on\n"
+#~ "www.mandrivaexpert.com."
+#~ msgstr ""
+#~ "U pravilu da imate koristi od Mandriva Online usluga,\n"
+#~ "trebate nam poslati vašu konfiguraciju.\n"
+#~ "\n"
+#~ "Čarobnjak će poslati slijedeće informacije Mandrivau:\n"
+#~ "\n"
+#~ "1) pakete koje ste instalirali na vaš sustav,\n"
+#~ "\n"
+#~ "2) vašu hardware konfiguraciju.\n"
+#~ "\n"
+#~ "Ukoliko vam se ne sviđa ta ideja, ili ne želite imati koristi od navedene "
+#~ "usluge pritisnite 'Odustani'.\n"
+#~ "Pritiskom na 'Slijedeće', dozvolit ćete nam da vas možemo\n"
+#~ "obavijestiti o sigurnosnim i korisnim dogradnjama preko osobnih "
+#~ "upozorenja na e-mail.\n"
+#~ "Dalje, imate koristi od snižene cijene podrške na\n"
+#~ "www.mandrivaexpert.com."
+
+#~ msgid "Connection problem"
+#~ msgstr "Problem s vezom"
+
+#~ msgid "Problem occurs when uploading files, please try again"
+#~ msgstr "Problem kod uploada datoteka, molimo pokušajte ponovo"
+
+#~ msgid "Create a Mandriva Online Account"
+#~ msgstr "Napravi Mandriva Online račun"
+
+#, fuzzy
+#~ msgid "Greeting:"
+#~ msgstr "Zelena"
+
+#~ msgid "First name:"
+#~ msgstr "Ime:"
+
+#, fuzzy
+#~ msgid "Last name:"
+#~ msgstr "Ime:"
+
+#~ msgid "Confirm Password:"
+#~ msgstr "Provjera lozinke:"
+
+#~ msgid ""
+#~ "The passwords do not match\n"
+#~ " Please try again\n"
+#~ msgstr ""
+#~ "Lozinke se ne podudaraju\n"
+#~ "Molimo pokušajte ponovo\n"
+
+#, fuzzy
+#~ msgid "Please fill in each field"
+#~ msgstr "Molim ispunite ili provjerite vrijednost doljnjeg polja"
+
+#~ msgid "Not a valid mail address!\n"
+#~ msgstr "Unesite ispravnu adresu molim!\n"
+
+#~ msgid "Your upload was successful!"
+#~ msgstr "Vaše slanje je bilo uspješno!"
+
+#~ msgid ""
+#~ "From now you will receive on security and updates \n"
+#~ "announcements thanks to Mandriva Online."
+#~ msgstr ""
+#~ "Od sada ćete primati obavijesti o sigurnosti\n"
+#~ "i dogradnjama zahvaljujući Mandriva Onlineu."
+
+#~ msgid ""
+#~ "Mandriva Online offers you the ability to automate the updates.\n"
+#~ "A program will run regulary in your system waiting for new updates\n"
+#~ msgstr ""
+#~ "Mandriva Online nudi vam mogućnost automatiziranja dogradnji.\n"
+#~ "Program će se pokrenuti redovno na vašem sustavu čekajući nove dogradnje\n"
+
+#~ msgid "Congratulations"
+#~ msgstr "Čestitamo, pobijedili ste!"
+
+#, fuzzy
+#~ msgid "Configuration uploaded successfully"
+#~ msgstr "Vaše slanje je bilo uspješno!"
+
+#, fuzzy
+#~ msgid "Problem uploading configuration"
+#~ msgstr "Čitam postavke\n"
+
 #~ msgid "  --applet\t\t- launch Mandriva Update.\n"
 #~ msgstr "  --applet\t\t- pokreni Mandriva Update.\n"
 
diff --git a/po/hu.po b/po/hu.po
index 7ad4ec45..cbfe0e24 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: hu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-09 16:26+0200\n"
+"POT-Creation-Date: 2008-02-21 18:21+0100\n"
 "PO-Revision-Date: 2007-09-11 22:04+0200\n"
 "Last-Translator: Arpad Biro <biro_arpad@yahoo.com>\n"
 "Language-Team: \n"
@@ -18,17 +18,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:94
+#: ../mdkapplet:88
 #, c-format
 msgid "Will check updates at %s"
 msgstr "Frissítések keresésének következő időpontja: %s"
 
-#: ../mdkapplet:103
+#: ../mdkapplet:97
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "A rendszer naprakész"
 
-#: ../mdkapplet:109
+#: ../mdkapplet:103
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -37,56 +37,46 @@ 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@mandrivaonline.com"
 
-#: ../mdkapplet:115
+#: ../mdkapplet:110
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "A rendelkezésre álló csomagok lekérdezése..."
 
-#: ../mdkapplet:121
+#: ../mdkapplet:116
 #, c-format
 msgid "New updates are available for your system"
 msgstr "Új frissítések érhetők el az Ön rendszeréhez"
 
-#: ../mdkapplet:127
-#, c-format
-msgid "New bundles are available for your system"
-msgstr "Új kötegek érhetők el az Ön rendszeréhez"
-
-#: ../mdkapplet:133
-#, c-format
-msgid "Service is not configured. Please click on \"Configure the service\""
-msgstr ""
-"A szolgáltatás nincs beállítva. Kattintson \"A szolgáltatás beállítása\" "
-"funkcióra."
-
-#: ../mdkapplet:139
+#: ../mdkapplet:122
 #, 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:145
+#: ../mdkapplet:128
 #, 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."
+msgstr ""
+"A szolgáltatás nincs aktiválva. Kattintson az \"Online weboldal\" funkcióra."
 
-#: ../mdkapplet:151 ../mdkapplet:182
+#: ../mdkapplet:134 ../mdkapplet:165
 #, c-format
 msgid "urpmi database locked"
 msgstr "A(z) \"urpmi\" adatbázis zárolt"
 
-#: ../mdkapplet:157
+#: ../mdkapplet:140
 #, 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:163
+#: ../mdkapplet:146
 #, c-format
-msgid "No medium found. You must add some media through 'Software Media Manager'."
+msgid ""
+"No medium found. You must add some media through 'Software Media Manager'."
 msgstr ""
 "Adatforrás nem található. Fel kell venni egy vagy több adatforrást a "
 "szoftverforrás-kezelővel."
 
-#: ../mdkapplet:169
+#: ../mdkapplet:152
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -103,590 +93,136 @@ msgstr ""
 "\n"
 "Ez után indítsa el újra a(z) %s programot."
 
-#: ../mdkapplet:174
+#: ../mdkapplet:157
 #, c-format
 msgid "Enabled"
 msgstr "Engedélyezve"
 
-#: ../mdkapplet:187
+#: ../mdkapplet:170
 #, c-format
 msgid "Error updating media"
 msgstr "Hiba az adatforrás frissítésekor"
 
-#: ../mdkapplet:202
+#: ../mdkapplet:185
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr "Ellenőrzés... vannak elérhető frissítések\n"
 
-#: ../mdkapplet:207
+#: ../mdkapplet:190
 #, c-format
 msgid "Packages are up to date"
 msgstr "A csomagok naprakészek"
 
-#: ../mdkapplet:212
+#: ../mdkapplet:195
 #, c-format
 msgid "Failed to open urpmi database"
 msgstr "Nem sikerült megnyitni az Urpmi-adatbázist"
 
 # "Rendszerfrissítések telepítése" volt a 8.2-ben,
 #  ebből az utolsó 2 betű nem fért ki
-#: ../mdkapplet:217 ../mdkapplet:324
+#: ../mdkapplet:200
 #, c-format
 msgid "Install updates"
 msgstr "Frissítések telepítése"
 
-#: ../mdkapplet:218
-#, c-format
-msgid "Configure the service"
-msgstr "A szolgáltatás beállítása"
-
-#: ../mdkapplet:219
+#: ../mdkapplet:201
 #, c-format
 msgid "Check Updates"
 msgstr "Frissítések keresése"
 
-#: ../mdkapplet:220 ../mdkapplet:327 ../mdkonline:114 ../mdkonline:155
-#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
-#, c-format
-msgid "Please wait"
-msgstr "Kis türelmet"
-
-#: ../mdkapplet:220 ../mdkapplet:326 ../mdkapplet:327
-#, c-format
-msgid "Check updates"
-msgstr "Frissítések keresése"
-
-#: ../mdkapplet:223 ../mdkapplet:648
-#, c-format
-msgid "Online WebSite"
-msgstr "Online weboldal"
-
-#: ../mdkapplet:224
+#: ../mdkapplet:202
 #, c-format
 msgid "Configure Network"
 msgstr "A hálózat beállítása"
 
-#: ../mdkapplet:225
-#, c-format
-msgid "Configure Now!"
-msgstr "Beállítás most"
-
-#: ../mdkapplet:313 ../mdkapplet:392
-#, c-format
-msgid "Mandriva Linux Updates Applet"
-msgstr "Mandriva Linux-frissítési alkalmazás"
-
-#: ../mdkapplet:322
-#, c-format
-msgid "Actions"
-msgstr "Műveletek"
-
-#: ../mdkapplet:325
-#, c-format
-msgid "Configure"
-msgstr "Beállítás"
-
-#: ../mdkapplet:329
-#, c-format
-msgid "See logs"
-msgstr "Információ a naplóban"
-
-#: ../mdkapplet:332
-#, c-format
-msgid "Status"
-msgstr "Állapot"
-
-#: ../mdkapplet:336 ../mdkapplet:597
-#, c-format
-msgid "Close"
-msgstr "Bezárás"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Network Connection: "
-msgstr "Hálózati kapcsolat: "
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Up"
-msgstr "Aktív"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Down"
-msgstr "Inaktív"
-
-#: ../mdkapplet:366
-#, c-format
-msgid "Last check: "
-msgstr "Legutóbbi ellenőrzés: "
-
-#: ../mdkapplet:367 ../mdkonline:145
-#, c-format
-msgid "Machine name:"
-msgstr "Gépnév:"
-
-#: ../mdkapplet:368
-#, c-format
-msgid "Updates: "
-msgstr "Frissítések: "
-
-#: ../mdkapplet:372
+#: ../mdkapplet:283
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "A DrakConnect indítása\n"
 
-#: ../mdkapplet:375
+#: ../mdkapplet:286
 #, c-format
 msgid "Mandriva Online seems to be reinstalled, reloading applet ...."
 msgstr ""
 "Úgy tűnik, a Mandriva Online újra lett telepítve - az alkalmazás "
 "újratöltése..."
 
-#: ../mdkapplet:383
+#: ../mdkapplet:294
 #, c-format
 msgid "Launching MandrivaUpdate\n"
 msgstr "\"MandrivaUpdate\" indítása\n"
 
-#: ../mdkapplet:398
+#: ../mdkapplet:303
+#, c-format
+msgid "Mandriva Linux Updates Applet"
+msgstr "Mandriva Linux-frissítési alkalmazás"
+
+#: ../mdkapplet:308
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Új frissítések meghatározása...\n"
 
-#: ../mdkapplet:399
+#: ../mdkapplet:309
 #, c-format
 msgid "Connecting to"
 msgstr "Kapcsolódás:"
 
-#: ../mdkapplet:467 ../mdkupdate:159 ../mdkupdate:188
-#, c-format
-msgid "An error occurred"
-msgstr "Hiba lépett fel"
-
-#: ../mdkapplet:475
-#, c-format
-msgid "Development release not supported by service"
-msgstr "A szolgáltatás nem támogat fejlesztői verziókat"
-
-#: ../mdkapplet:476
-#, c-format
-msgid "Too old release not supported by service"
-msgstr "Túl régi, a szolgáltatás által nem támogatott verzió"
-
-#: ../mdkapplet:477
-#, c-format
-msgid "Unknown state"
-msgstr "Ismeretlen állapot"
-
-#: ../mdkapplet:478
-#, c-format
-msgid "Online services disabled. Contact Mandriva Online site\n"
-msgstr ""
-"Az online szolgáltatások inaktiválva vannak. Lépjen kapcsolatba a Mandriva "
-"Online weboldallal.\n"
-
-#: ../mdkapplet:479
-#, c-format
-msgid "Wrong Password.\n"
-msgstr "Helytelen jelszó.\n"
-
-#: ../mdkapplet:480
-#, c-format
-msgid "Wrong Action or host or login.\n"
-msgstr "Helytelen művelet, gép, vagy bejelentkezési név.\n"
-
-#: ../mdkapplet:481
-#, c-format
-msgid ""
-"Something is wrong with your network settings (check your route, firewall or "
-"proxy settings)\n"
-msgstr ""
-"A hálózatbeállítások nem megfelelők (ellenőrizze az útválasztást, a tűzfalat "
-"és a proxybeállításokat).\n"
-
-#: ../mdkapplet:483
-#, c-format
-msgid ""
-"Problem occured while connecting to the server, please contact the support "
-"team"
-msgstr ""
-"Probléma lépett fel a kiszolgálóhoz való kapcsolódáskor. Lépjen kapcsolatba "
-"a támogatási csapattal."
-
-#: ../mdkapplet:487
-#, c-format
-msgid "Response from Mandriva Online server\n"
-msgstr "Válasz a Mandriva Online-kiszolgálótól\n"
-
-#: ../mdkapplet:490
+#: ../mdkapplet:386
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "A rendszer naprakész.\n"
 
-#: ../mdkapplet:527
-#, c-format
-msgid "No check"
-msgstr "Nincs ellenőrzés"
-
-#: ../mdkapplet:541
-#, c-format
-msgid "Checking config file: Not present\n"
-msgstr "Beállításfájl ellenőrzése: nem található\n"
-
-#: ../mdkapplet:544
+#: ../mdkapplet:415
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "A hálózat ellenőrzése: úgy tűnik, nem aktív\n"
 
-#: ../mdkapplet:587
-#, c-format
-msgid "Logs"
-msgstr "Naplók"
-
-#: ../mdkapplet:603
+#: ../mdkapplet:457 ../mdkupdate:118 ../mdkupdate:164
 #, c-format
-msgid "Clear"
-msgstr "Törlés"
+msgid "Warning"
+msgstr "Figyelmeztetés"
 
-#: ../mdkapplet:629
+#: ../mdkapplet:468
 #, c-format
 msgid "About..."
 msgstr "Névjegy..."
 
-#: ../mdkapplet:631
+#: ../mdkapplet:472
 #, c-format
 msgid "Mandriva Online %s"
 msgstr "Mandriva Online %s"
 
-#: ../mdkapplet:635
+#: ../mdkapplet:473
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Copyright (C) %s, Mandriva"
 
-#: ../mdkapplet:647
+#: ../mdkapplet:476
 #, c-format
 msgid "Mandriva Online gives access to Mandriva web services."
-msgstr "A Mandriva Online hozzáférést biztosít a Mandriva webes szolgáltatásaihoz."
-
-#: ../mdkapplet:655
-#, c-format
-msgid "Always launch on startup"
-msgstr "Minden rendszerindításnál induljon el"
-
-#: ../mdkapplet:657
-#, c-format
-msgid "Quit"
-msgstr "Kilépés"
-
-#: ../mdkonline:58
-#, c-format
-msgid ""
-"mdonline version %s\n"
-"Copyright (C) %s Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"mdonline %s\n"
-"Copyright (C) %s Mandriva.\n"
-"Ez a program szabad szoftver; a GNU GPL alapján terjeszthető.\n"
-"\n"
-"Használat:\n"
-
-#: ../mdkonline:63 ../mdkupdate:73
-#, c-format
-msgid "  --help\t\t- print this help message.\n"
-msgstr "  --help\t\t- jelen segítség megjelenítése\n"
-
-#: ../mdkonline:64
-#, c-format
-msgid "  --box=\t\t\t- hostname.\n"
-msgstr "  --box=\t\t\t- gépnév\n"
-
-#: ../mdkonline:65
-#, c-format
-msgid "  --country\t\t\t- name of country of the user. \n"
-msgstr "  --country\t\t\t- a felhasználó országának neve\n"
-
-#: ../mdkonline:66
-#, c-format
-msgid "  --interactive\t\t- use the interactive mode.\n"
-msgstr "  --interactive\t\t- interaktív mód használata\n"
-
-#: ../mdkonline:67
-#, c-format
-msgid "  --nointeractive\t- use the non-interactive mode.\n"
-msgstr "  --nointeractive\t- nem-interaktív mód használata\n"
-
-#: ../mdkonline:68
-#, c-format
-msgid "  --login=\t\t     - login name of the user.\n"
-msgstr "  --login=\t\t     - a felhasználó bejelentkezési neve\n"
-
-#: ../mdkonline:69
-#, c-format
-msgid "  --pass=\t\t\t- password  of the user.\n"
-msgstr "  --pass=\t\t\t- a felhasználó jelszava\n"
-
-#: ../mdkonline:87 ../mdkonline:120
-#, c-format
-msgid "Mandriva Online"
-msgstr "Mandriva Online"
-
-#: ../mdkonline:90
-#, c-format
-msgid "I already have an account"
-msgstr "Már van azonosítóm"
-
-#: ../mdkonline:91
-#, c-format
-msgid "I want to subscribe"
-msgstr "Szeretnék feliratkozni"
-
-#: ../mdkonline:96
-#, c-format
-msgid "Mr."
-msgstr "Mr."
-
-#: ../mdkonline:96
-#, c-format
-msgid "Mrs."
-msgstr "Mrs."
-
-#: ../mdkonline:96
-#, c-format
-msgid "Ms."
-msgstr "Ms."
-
-#: ../mdkonline:114
-#, c-format
-msgid "Reading configuration\n"
-msgstr "Konfiguráció beolvasása\n"
-
-# \n-ek szandekosan hianyoznak: automatikus tordeles legyen
-#: ../mdkonline:123
-#, c-format
-msgid ""
-"This assistant will help you to upload your configuration\n"
-"(packages, hardware configuration) to a centralized database in\n"
-"order to keep you informed about security updates and useful upgrades.\n"
-msgstr ""
-"Jelen segédprogram segítséget nyújt ahhoz, hogy feltöltse a gépe adatait "
-"(csomagok és hardverkonfiguráció) egy központi adatbázisba annak érdekében, "
-"hogy informálhassuk a biztonsági és egyéb frissítésekről.\n"
-
-#: ../mdkonline:131
-#, c-format
-msgid "Account creation or authentication"
-msgstr "Azonosító létrehozása vagy azonosítás"
-
-#: ../mdkonline:136
-#, c-format
-msgid "Enter your Mandriva Online login, password and machine name:"
-msgstr "Adja meg Mandriva Online-azonosítóját, jelszavát és a gépnevet:"
-
-#: ../mdkonline:142 ../mdkonline:195
-#, c-format
-msgid "Email address:"
-msgstr "Email-cím:"
-
-#: ../mdkonline:143
-#, c-format
-msgid "Country"
-msgstr "Ország"
-
-#: ../mdkonline:144 ../mdkonline:196
-#, c-format
-msgid "Password:"
-msgstr "Jelszó:"
-
-#: ../mdkonline:146
-#, c-format
-msgid "Machine description:"
-msgstr "Gépleírás:"
-
-#: ../mdkonline:147
-#, c-format
-msgid "(Ex: My Home Office's Computer)"
-msgstr "(példa: az otthoni irodám számítógépe)"
-
-#: ../mdkonline:152 ../mdkonline:159 ../mdkonline:180 ../mdkonline:204
-#: ../mdkonline:208 ../mdkonline:212 ../mdkonline:217 ../mdkupdate:141
-#: ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
-#, c-format
-msgid "Error"
-msgstr "Hiba"
-
-#: ../mdkonline:152
-#, c-format
-msgid "Machine name must be 1 to 40 alphanumerical characters"
-msgstr "A gépnévnek 1-40 darab betűből illetve számból kell állnia"
-
-#: ../mdkonline:155
-#, c-format
-msgid "Connecting to Mandriva Online website..."
-msgstr "Kapcsolódás a Mandriva Online weboldalhoz..."
-
-#: ../mdkonline:167
-#, c-format
-msgid ""
-"In order to benefit from Mandriva Online services,\n"
-"we are about to upload your configuration.\n"
-"\n"
-"The Wizard will now send the following information to Mandriva:\n"
-"\n"
-"1) the list of packages you have installed on your system,\n"
-"\n"
-"2) your hardware configuration.\n"
-"\n"
-"If you feel uncomfortable by that idea, or do not want to benefit from this "
-"service,\n"
-"please press 'Cancel'. By pressing 'Next', you allow us to keep you "
-"informed\n"
-"about security updates and useful upgrades via personalized email alerts.\n"
-"Furthermore, you benefit from discounted paid support services on\n"
-"www.mandrivaexpert.com."
-msgstr ""
-"Annak érdekében, hogy használatba vehesse a Mandriva Online "
-"szolgáltatásait,\n"
-"fel kell tölteni a konfigurációs adatait.\n"
-"\n"
-"A Varázsló most a következő adatokat fogja elküldeni a Mandriva részére:\n"
-"\n"
-"  1.  a rendszeren telepített csomagok listája,\n"
-"\n"
-"  2.  az Ön hardverkonfigurációja.\n"
-"\n"
-"Ha Önnek ez nem felel meg, illetve nem kívánja igénybe venni ezt a\n"
-"szolgáltatást, akkor nyomjon \"Mégsem\"-et.\n"
-"A \"Következő\" gomb lenyomásával lehetővé teszi számunkra, hogy\n"
-"rendszeresen informáljuk Önt e-mail-en keresztül a biztonsági és egyéb\n"
-"frissítésekkel kapcsolatosan. Ezen felül Önnek lehetősége lesz arra,\n"
-"hogy a megszokottnál kedvezőbb feltételekkel vegye igénybe a\n"
-"www.mandrivaexpert.com honlapon elérhető szolgáltatásokat."
-
-#: ../mdkonline:180
-#, c-format
-msgid "Connection problem"
-msgstr "Kapcsolati hiba"
-
-#: ../mdkonline:180
-#, c-format
-msgid "Problem occurs when uploading files, please try again"
-msgstr "A fájlok feltöltésénél probléma lépett fel - próbálja meg ismét."
-
-#: ../mdkonline:187
-#, c-format
-msgid "Create a Mandriva Online Account"
-msgstr "Mandriva Online-azonosító létrehozása"
-
-#. -PO: that is for things like "Mr", "Ms",...
-#: ../mdkonline:192
-#, c-format
-msgid "Greeting:"
-msgstr "Megszólítás:"
-
-#: ../mdkonline:193
-#, c-format
-msgid "First name:"
-msgstr "Keresztnév:"
-
-#: ../mdkonline:194
-#, c-format
-msgid "Last name:"
-msgstr "Vezetéknév:"
-
-#: ../mdkonline:197
-#, c-format
-msgid "Confirm Password:"
-msgstr "Jelszó (még egyszer):"
-
-#: ../mdkonline:204
-#, c-format
-msgid ""
-"The passwords do not match\n"
-" Please try again\n"
-msgstr ""
-"A jelszavak nem egyeznek meg.\n"
-"Adja meg azokat még egyszer.\n"
-
-#: ../mdkonline:208
-#, c-format
-msgid "Please fill in each field"
-msgstr "Töltse ki az összes mezőt"
-
-#: ../mdkonline:212
-#, c-format
-msgid "Not a valid mail address!\n"
-msgstr "Helytelen levélcím.\n"
-
-#: ../mdkonline:217
-#, c-format
-msgid "Creating account failed!"
-msgstr "Nem sikerült létrehozni az azonosítót."
-
-#: ../mdkonline:225
-#, c-format
-msgid ""
-"Mandriva Online Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
 msgstr ""
-"A Mandriva Online-azonosító létrehozása megtörtént.\n"
-"A felhasználóazonosításhoz és a beállítások feltöltéséhez kattintson a "
-"\"Következő\" gombra.\n"
+"A Mandriva Online hozzáférést biztosít a Mandriva webes szolgáltatásaihoz."
 
-#: ../mdkonline:229
-#, c-format
-msgid "Your upload was successful!"
-msgstr "A feltöltés megtörtént."
-
-#: ../mdkonline:229
+#: ../mdkapplet:478
 #, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandriva Online."
-msgstr ""
-"Mostantól kezdve információkat fog kapni a biztonsági\n"
-"és egyéb frissítésekről - a Mandriva Online-nak köszönhetően."
+msgid "Online WebSite"
+msgstr "Online weboldal"
 
-#: ../mdkonline:229
+#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
+#: ../mdkapplet:483
 #, c-format
-msgid ""
-"Mandriva Online offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
+msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
-"A Mandriva Online lehetőséget nyújt a frissítések automatizálására.\n"
-"Egy program fog futni rendszeresen az Ön gépén, a frissítéseket figyelve.\n"
-
-#: ../mdkonline:238
-#, c-format
-msgid "Congratulations"
-msgstr "Gratulálunk"
 
-#: ../mdkonline:238
+#: ../mdkapplet:492
 #, c-format
-msgid "Your Mandriva Online account has been successfully configured\n"
-msgstr "A Mandriva Online-azonosító beállítása megtörtént\n"
-
-#: ../mdkonline:253
-#, c-format
-msgid "Configuration uploaded successfully"
-msgstr "A konfiguráció feltöltése megtörtént"
-
-#: ../mdkonline:254
-#, c-format
-msgid "Problem uploading configuration"
-msgstr "A konfiguráció feltöltése közben probléma lépett fel"
+msgid "Always launch on startup"
+msgstr "Minden rendszerindításnál induljon el"
 
-#: ../mdkonline:256
+#: ../mdkapplet:494
 #, c-format
-msgid ""
-"Cannot connect to Mandriva Online website: wrong login/password or router/"
-"firewall bad settings"
-msgstr ""
-"Nem sikerült kapcsolódni a Mandriva Online weboldalhoz: helytelen azonosító, "
-"jelszó, útválasztó-beállítás vagy tűzfalbeállítás"
+msgid "Quit"
+msgstr "Kilépés"
 
 #: ../mdkonline.pm:207
 #, c-format
@@ -806,7 +342,8 @@ msgstr "A felhasználó le van tiltva"
 #: ../mdkonline.pm:218
 #, c-format
 msgid "User account forbidden by Mandriva web services"
-msgstr "A felhasználói azonosító le van tiltva a Mandriva webes szolgáltatásain"
+msgstr ""
+"A felhasználói azonosító le van tiltva a Mandriva webes szolgáltatásain"
 
 #: ../mdkonline.pm:219
 #, c-format
@@ -834,6 +371,11 @@ msgstr ""
 "\n"
 "Használat:\n"
 
+#: ../mdkupdate:73
+#, c-format
+msgid "  --help\t\t- print this help message.\n"
+msgstr "  --help\t\t- jelen segítség megjelenítése\n"
+
 #: ../mdkupdate:74
 #, c-format
 msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
@@ -863,11 +405,6 @@ msgstr ""
 "  --bundle fájl.bundle\t- csomagelemzés és -telepítés .bundle metainfó-"
 "fájlból\n"
 
-#: ../mdkupdate:118 ../mdkupdate:164
-#, c-format
-msgid "Warning"
-msgstr "Figyelmeztetés"
-
 #. -PO: here Live Install is currently *NOT* translated on the desktop, so it's better to keep as it:
 #: ../mdkupdate:120
 #, c-format
@@ -878,11 +415,21 @@ msgstr ""
 "Előbb telepítenie kell a rendszert a merevlemezre a \"Live Install\" "
 "varázslóval."
 
+#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
+#, c-format
+msgid "Please wait"
+msgstr "Kis türelmet"
+
 #: ../mdkupdate:123 ../mdkupdate:174
 #, c-format
 msgid "Preparing..."
 msgstr "Előkészítés..."
 
+#: ../mdkupdate:141 ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
+#, c-format
+msgid "Error"
+msgstr "Hiba"
+
 #: ../mdkupdate:141
 #, c-format
 msgid ""
@@ -894,6 +441,11 @@ msgstr ""
 "\n"
 "%s"
 
+#: ../mdkupdate:159 ../mdkupdate:188
+#, c-format
+msgid "An error occurred"
+msgstr "Hiba lépett fel"
+
 #: ../mdkupdate:164
 #, c-format
 msgid ""
@@ -922,3 +474,310 @@ msgstr "Csomagok telepítése...\n"
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "A csomagok Mandriva Update-adatforrásból való frissítése sikertelen.\n"
 
+#~ msgid "New bundles are available for your system"
+#~ msgstr "Új kötegek érhetők el az Ön rendszeréhez"
+
+#~ msgid "Service is not configured. Please click on \"Configure the service\""
+#~ msgstr ""
+#~ "A szolgáltatás nincs beállítva. Kattintson \"A szolgáltatás beállítása\" "
+#~ "funkcióra."
+
+#~ msgid "Configure the service"
+#~ msgstr "A szolgáltatás beállítása"
+
+#~ msgid "Check updates"
+#~ msgstr "Frissítések keresése"
+
+#~ msgid "Configure Now!"
+#~ msgstr "Beállítás most"
+
+#~ msgid "Actions"
+#~ msgstr "Műveletek"
+
+#~ msgid "Configure"
+#~ msgstr "Beállítás"
+
+#~ msgid "See logs"
+#~ msgstr "Információ a naplóban"
+
+#~ msgid "Status"
+#~ msgstr "Állapot"
+
+#~ msgid "Close"
+#~ msgstr "Bezárás"
+
+#~ msgid "Network Connection: "
+#~ msgstr "Hálózati kapcsolat: "
+
+#~ msgid "Up"
+#~ msgstr "Aktív"
+
+#~ msgid "Down"
+#~ msgstr "Inaktív"
+
+#~ msgid "Last check: "
+#~ msgstr "Legutóbbi ellenőrzés: "
+
+#~ msgid "Machine name:"
+#~ msgstr "Gépnév:"
+
+#~ msgid "Updates: "
+#~ msgstr "Frissítések: "
+
+#~ msgid "Development release not supported by service"
+#~ msgstr "A szolgáltatás nem támogat fejlesztői verziókat"
+
+#~ msgid "Too old release not supported by service"
+#~ msgstr "Túl régi, a szolgáltatás által nem támogatott verzió"
+
+#~ msgid "Unknown state"
+#~ msgstr "Ismeretlen állapot"
+
+#~ msgid "Online services disabled. Contact Mandriva Online site\n"
+#~ msgstr ""
+#~ "Az online szolgáltatások inaktiválva vannak. Lépjen kapcsolatba a "
+#~ "Mandriva Online weboldallal.\n"
+
+#~ msgid "Wrong Password.\n"
+#~ msgstr "Helytelen jelszó.\n"
+
+#~ msgid "Wrong Action or host or login.\n"
+#~ msgstr "Helytelen művelet, gép, vagy bejelentkezési név.\n"
+
+#~ msgid ""
+#~ "Something is wrong with your network settings (check your route, firewall "
+#~ "or proxy settings)\n"
+#~ msgstr ""
+#~ "A hálózatbeállítások nem megfelelők (ellenőrizze az útválasztást, a "
+#~ "tűzfalat és a proxybeállításokat).\n"
+
+#~ msgid ""
+#~ "Problem occured while connecting to the server, please contact the "
+#~ "support team"
+#~ msgstr ""
+#~ "Probléma lépett fel a kiszolgálóhoz való kapcsolódáskor. Lépjen "
+#~ "kapcsolatba a támogatási csapattal."
+
+#~ msgid "Response from Mandriva Online server\n"
+#~ msgstr "Válasz a Mandriva Online-kiszolgálótól\n"
+
+#~ msgid "No check"
+#~ msgstr "Nincs ellenőrzés"
+
+#~ msgid "Checking config file: Not present\n"
+#~ msgstr "Beállításfájl ellenőrzése: nem található\n"
+
+#~ msgid "Logs"
+#~ msgstr "Naplók"
+
+#~ msgid "Clear"
+#~ msgstr "Törlés"
+
+#~ msgid ""
+#~ "mdonline version %s\n"
+#~ "Copyright (C) %s Mandriva.\n"
+#~ "This is free software and may be redistributed under the terms of the GNU "
+#~ "GPL.\n"
+#~ "\n"
+#~ "usage:\n"
+#~ msgstr ""
+#~ "mdonline %s\n"
+#~ "Copyright (C) %s Mandriva.\n"
+#~ "Ez a program szabad szoftver; a GNU GPL alapján terjeszthető.\n"
+#~ "\n"
+#~ "Használat:\n"
+
+#~ msgid "  --box=\t\t\t- hostname.\n"
+#~ msgstr "  --box=\t\t\t- gépnév\n"
+
+#~ msgid "  --country\t\t\t- name of country of the user. \n"
+#~ msgstr "  --country\t\t\t- a felhasználó országának neve\n"
+
+#~ msgid "  --interactive\t\t- use the interactive mode.\n"
+#~ msgstr "  --interactive\t\t- interaktív mód használata\n"
+
+#~ msgid "  --nointeractive\t- use the non-interactive mode.\n"
+#~ msgstr "  --nointeractive\t- nem-interaktív mód használata\n"
+
+#~ msgid "  --login=\t\t     - login name of the user.\n"
+#~ msgstr "  --login=\t\t     - a felhasználó bejelentkezési neve\n"
+
+#~ msgid "  --pass=\t\t\t- password  of the user.\n"
+#~ msgstr "  --pass=\t\t\t- a felhasználó jelszava\n"
+
+#~ msgid "Mandriva Online"
+#~ msgstr "Mandriva Online"
+
+#~ msgid "I already have an account"
+#~ msgstr "Már van azonosítóm"
+
+#~ msgid "I want to subscribe"
+#~ msgstr "Szeretnék feliratkozni"
+
+#~ msgid "Mr."
+#~ msgstr "Mr."
+
+#~ msgid "Mrs."
+#~ msgstr "Mrs."
+
+#~ msgid "Ms."
+#~ msgstr "Ms."
+
+#~ msgid "Reading configuration\n"
+#~ msgstr "Konfiguráció beolvasása\n"
+
+# \n-ek szandekosan hianyoznak: automatikus tordeles legyen
+#~ msgid ""
+#~ "This assistant will help you to upload your configuration\n"
+#~ "(packages, hardware configuration) to a centralized database in\n"
+#~ "order to keep you informed about security updates and useful upgrades.\n"
+#~ msgstr ""
+#~ "Jelen segédprogram segítséget nyújt ahhoz, hogy feltöltse a gépe adatait "
+#~ "(csomagok és hardverkonfiguráció) egy központi adatbázisba annak "
+#~ "érdekében, hogy informálhassuk a biztonsági és egyéb frissítésekről.\n"
+
+#~ msgid "Account creation or authentication"
+#~ msgstr "Azonosító létrehozása vagy azonosítás"
+
+#~ msgid "Enter your Mandriva Online login, password and machine name:"
+#~ msgstr "Adja meg Mandriva Online-azonosítóját, jelszavát és a gépnevet:"
+
+#~ msgid "Email address:"
+#~ msgstr "Email-cím:"
+
+#~ msgid "Country"
+#~ msgstr "Ország"
+
+#~ msgid "Password:"
+#~ msgstr "Jelszó:"
+
+#~ msgid "Machine description:"
+#~ msgstr "Gépleírás:"
+
+#~ msgid "(Ex: My Home Office's Computer)"
+#~ msgstr "(példa: az otthoni irodám számítógépe)"
+
+#~ msgid "Machine name must be 1 to 40 alphanumerical characters"
+#~ msgstr "A gépnévnek 1-40 darab betűből illetve számból kell állnia"
+
+#~ msgid "Connecting to Mandriva Online website..."
+#~ msgstr "Kapcsolódás a Mandriva Online weboldalhoz..."
+
+#~ msgid ""
+#~ "In order to benefit from Mandriva Online services,\n"
+#~ "we are about to upload your configuration.\n"
+#~ "\n"
+#~ "The Wizard will now send the following information to Mandriva:\n"
+#~ "\n"
+#~ "1) the list of packages you have installed on your system,\n"
+#~ "\n"
+#~ "2) your hardware configuration.\n"
+#~ "\n"
+#~ "If you feel uncomfortable by that idea, or do not want to benefit from "
+#~ "this service,\n"
+#~ "please press 'Cancel'. By pressing 'Next', you allow us to keep you "
+#~ "informed\n"
+#~ "about security updates and useful upgrades via personalized email "
+#~ "alerts.\n"
+#~ "Furthermore, you benefit from discounted paid support services on\n"
+#~ "www.mandrivaexpert.com."
+#~ msgstr ""
+#~ "Annak érdekében, hogy használatba vehesse a Mandriva Online "
+#~ "szolgáltatásait,\n"
+#~ "fel kell tölteni a konfigurációs adatait.\n"
+#~ "\n"
+#~ "A Varázsló most a következő adatokat fogja elküldeni a Mandriva részére:\n"
+#~ "\n"
+#~ "  1.  a rendszeren telepített csomagok listája,\n"
+#~ "\n"
+#~ "  2.  az Ön hardverkonfigurációja.\n"
+#~ "\n"
+#~ "Ha Önnek ez nem felel meg, illetve nem kívánja igénybe venni ezt a\n"
+#~ "szolgáltatást, akkor nyomjon \"Mégsem\"-et.\n"
+#~ "A \"Következő\" gomb lenyomásával lehetővé teszi számunkra, hogy\n"
+#~ "rendszeresen informáljuk Önt e-mail-en keresztül a biztonsági és egyéb\n"
+#~ "frissítésekkel kapcsolatosan. Ezen felül Önnek lehetősége lesz arra,\n"
+#~ "hogy a megszokottnál kedvezőbb feltételekkel vegye igénybe a\n"
+#~ "www.mandrivaexpert.com honlapon elérhető szolgáltatásokat."
+
+#~ msgid "Connection problem"
+#~ msgstr "Kapcsolati hiba"
+
+#~ msgid "Problem occurs when uploading files, please try again"
+#~ msgstr "A fájlok feltöltésénél probléma lépett fel - próbálja meg ismét."
+
+#~ msgid "Create a Mandriva Online Account"
+#~ msgstr "Mandriva Online-azonosító létrehozása"
+
+#~ msgid "Greeting:"
+#~ msgstr "Megszólítás:"
+
+#~ msgid "First name:"
+#~ msgstr "Keresztnév:"
+
+#~ msgid "Last name:"
+#~ msgstr "Vezetéknév:"
+
+#~ msgid "Confirm Password:"
+#~ msgstr "Jelszó (még egyszer):"
+
+#~ msgid ""
+#~ "The passwords do not match\n"
+#~ " Please try again\n"
+#~ msgstr ""
+#~ "A jelszavak nem egyeznek meg.\n"
+#~ "Adja meg azokat még egyszer.\n"
+
+#~ msgid "Please fill in each field"
+#~ msgstr "Töltse ki az összes mezőt"
+
+#~ msgid "Not a valid mail address!\n"
+#~ msgstr "Helytelen levélcím.\n"
+
+#~ msgid "Creating account failed!"
+#~ msgstr "Nem sikerült létrehozni az azonosítót."
+
+#~ msgid ""
+#~ "Mandriva Online Account successfully created.\n"
+#~ "Please click \"Next\" to authenticate and upload your configuration\n"
+#~ msgstr ""
+#~ "A Mandriva Online-azonosító létrehozása megtörtént.\n"
+#~ "A felhasználóazonosításhoz és a beállítások feltöltéséhez kattintson a "
+#~ "\"Következő\" gombra.\n"
+
+#~ msgid "Your upload was successful!"
+#~ msgstr "A feltöltés megtörtént."
+
+#~ msgid ""
+#~ "From now you will receive on security and updates \n"
+#~ "announcements thanks to Mandriva Online."
+#~ msgstr ""
+#~ "Mostantól kezdve információkat fog kapni a biztonsági\n"
+#~ "és egyéb frissítésekről - a Mandriva Online-nak köszönhetően."
+
+#~ msgid ""
+#~ "Mandriva Online offers you the ability to automate the updates.\n"
+#~ "A program will run regulary in your system waiting for new updates\n"
+#~ msgstr ""
+#~ "A Mandriva Online lehetőséget nyújt a frissítések automatizálására.\n"
+#~ "Egy program fog futni rendszeresen az Ön gépén, a frissítéseket "
+#~ "figyelve.\n"
+
+#~ msgid "Congratulations"
+#~ msgstr "Gratulálunk"
+
+#~ msgid "Your Mandriva Online account has been successfully configured\n"
+#~ msgstr "A Mandriva Online-azonosító beállítása megtörtént\n"
+
+#~ msgid "Configuration uploaded successfully"
+#~ msgstr "A konfiguráció feltöltése megtörtént"
+
+#~ msgid "Problem uploading configuration"
+#~ msgstr "A konfiguráció feltöltése közben probléma lépett fel"
+
+#~ msgid ""
+#~ "Cannot connect to Mandriva Online website: wrong login/password or router/"
+#~ "firewall bad settings"
+#~ msgstr ""
+#~ "Nem sikerült kapcsolódni a Mandriva Online weboldalhoz: helytelen "
+#~ "azonosító, jelszó, útválasztó-beállítás vagy tűzfalbeállítás"
diff --git a/po/hy.po b/po/hy.po
index bc82a9d1..2d32e773 100644
--- a/po/hy.po
+++ b/po/hy.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-09 16:26+0200\n"
+"POT-Creation-Date: 2008-02-21 18:21+0100\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"
@@ -17,70 +17,60 @@ 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:94
+#: ../mdkapplet:88
 #, fuzzy, c-format
 msgid "Will check updates at %s"
 msgstr "Ստուգել նորացումները"
 
-#: ../mdkapplet:103
+#: ../mdkapplet:97
 #, fuzzy, c-format
 msgid "Your system is up-to-date"
 msgstr "Համակարգը զբաղված է: Սպասեք..."
 
-#: ../mdkapplet:109
+#: ../mdkapplet:103
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
 "support@mandrivaonline.com"
 msgstr ""
 
-#: ../mdkapplet:115
+#: ../mdkapplet:110
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr ""
 
-#: ../mdkapplet:121
+#: ../mdkapplet:116
 #, fuzzy, c-format
 msgid "New updates are available for your system"
 msgstr "Ձեր համակարգի համար չկան առկա նորացումներ"
 
-#: ../mdkapplet:127
-#, fuzzy, c-format
-msgid "New bundles are available for your system"
-msgstr "Ձեր համակարգի համար չկան առկա նորացումներ"
-
-#: ../mdkapplet:133
-#, fuzzy, c-format
-msgid "Service is not configured. Please click on \"Configure the service\""
-msgstr "Ծառայությունը մատչելի չէ: Հպեք \"ձևակերպել\""
-
-#: ../mdkapplet:139
+#: ../mdkapplet:122
 #, fuzzy, c-format
 msgid "Network is down. Please configure your network"
 msgstr "Ցանցը անհասանելի է: Ստուգեք \"Ցանցի ձևակերպումը\""
 
-#: ../mdkapplet:145
+#: ../mdkapplet:128
 #, fuzzy, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "Ծառայությունը մատչելի չէ: Հպեք \"ձևակերպել\""
 
-#: ../mdkapplet:151 ../mdkapplet:182
+#: ../mdkapplet:134 ../mdkapplet:165
 #, c-format
 msgid "urpmi database locked"
 msgstr ""
 
-#: ../mdkapplet:157
+#: ../mdkapplet:140
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
-#: ../mdkapplet:163
+#: ../mdkapplet:146
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
 msgstr ""
 
-#: ../mdkapplet:169
+#: ../mdkapplet:152
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -91,571 +81,131 @@ msgid ""
 "Then, restart \"%s\"."
 msgstr ""
 
-#: ../mdkapplet:174
+#: ../mdkapplet:157
 #, c-format
 msgid "Enabled"
 msgstr ""
 
-#: ../mdkapplet:187
+#: ../mdkapplet:170
 #, c-format
 msgid "Error updating media"
 msgstr ""
 
-#: ../mdkapplet:202
+#: ../mdkapplet:185
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr ""
 
-#: ../mdkapplet:207
+#: ../mdkapplet:190
 #, fuzzy, c-format
 msgid "Packages are up to date"
 msgstr "%s փաթեթներ առկա են նորացման"
 
-#: ../mdkapplet:212
+#: ../mdkapplet:195
 #, c-format
 msgid "Failed to open urpmi database"
 msgstr ""
 
-#: ../mdkapplet:217 ../mdkapplet:324
+#: ../mdkapplet:200
 #, c-format
 msgid "Install updates"
 msgstr "Տեղադրել Նորացումները"
 
-#: ../mdkapplet:218
-#, fuzzy, c-format
-msgid "Configure the service"
-msgstr "Ցանցի Ձևակերպում"
-
-#: ../mdkapplet:219
+#: ../mdkapplet:201
 #, c-format
 msgid "Check Updates"
 msgstr "Ստուգել Նորացումները"
 
-#: ../mdkapplet:220 ../mdkapplet:327 ../mdkonline:114 ../mdkonline:155
-#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
-#, c-format
-msgid "Please wait"
-msgstr ""
-
-#: ../mdkapplet:220 ../mdkapplet:326 ../mdkapplet:327
-#, c-format
-msgid "Check updates"
-msgstr "Ստուգել նորացումները"
-
-#: ../mdkapplet:223 ../mdkapplet:648
-#, c-format
-msgid "Online WebSite"
-msgstr "Օնլայն ՎեբԷջ"
-
-#: ../mdkapplet:224
+#: ../mdkapplet:202
 #, c-format
 msgid "Configure Network"
 msgstr "Ցանցի Ձևակերպում"
 
-#: ../mdkapplet:225
-#, c-format
-msgid "Configure Now!"
-msgstr "Ձևակերպել"
-
-#: ../mdkapplet:313 ../mdkapplet:392
-#, c-format
-msgid "Mandriva Linux Updates Applet"
-msgstr "Mandriva Linux Նորացումների Ապլետ"
-
-#: ../mdkapplet:322
-#, c-format
-msgid "Actions"
-msgstr "Գործողություններ"
-
-#: ../mdkapplet:325
-#, c-format
-msgid "Configure"
-msgstr "Ձևակերպել"
-
-#: ../mdkapplet:329
-#, c-format
-msgid "See logs"
-msgstr "Ընթերցել արձանագրերը"
-
-#: ../mdkapplet:332
-#, c-format
-msgid "Status"
-msgstr "Կարգավիճակ"
-
-#: ../mdkapplet:336 ../mdkapplet:597
-#, c-format
-msgid "Close"
-msgstr "Փակել"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Network Connection: "
-msgstr "Ցանցի Միացում`"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Up"
-msgstr "Վերև"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Down"
-msgstr "Ներքև"
-
-#: ../mdkapplet:366
-#, c-format
-msgid "Last check: "
-msgstr "Նախորդ ստուգում` "
-
-#: ../mdkapplet:367 ../mdkonline:145
-#, c-format
-msgid "Machine name:"
-msgstr "Մեքենայի անունը`"
-
-#: ../mdkapplet:368
-#, fuzzy, c-format
-msgid "Updates: "
-msgstr "Վերջին Նորացումներ` "
-
-#: ../mdkapplet:372
+#: ../mdkapplet:283
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr ""
 
-#: ../mdkapplet:375
+#: ../mdkapplet:286
 #, c-format
 msgid "Mandriva Online seems to be reinstalled, reloading applet ...."
 msgstr ""
 
-#: ../mdkapplet:383
+#: ../mdkapplet:294
 #, c-format
 msgid "Launching MandrivaUpdate\n"
 msgstr ""
 
-#: ../mdkapplet:398
+#: ../mdkapplet:303
+#, c-format
+msgid "Mandriva Linux Updates Applet"
+msgstr "Mandriva Linux Նորացումների Ապլետ"
+
+#: ../mdkapplet:308
 #, fuzzy, c-format
 msgid "Computing new updates...\n"
 msgstr "Ստուգել Նորացումները"
 
-#: ../mdkapplet:399
+#: ../mdkapplet:309
 #, fuzzy, c-format
 msgid "Connecting to"
 msgstr "Միացման պրոբլեմ"
 
-#: ../mdkapplet:467 ../mdkupdate:159 ../mdkupdate:188
-#, c-format
-msgid "An error occurred"
-msgstr ""
-
-#: ../mdkapplet:475
-#, c-format
-msgid "Development release not supported by service"
-msgstr ""
-
-#: ../mdkapplet:476
-#, c-format
-msgid "Too old release not supported by service"
-msgstr ""
-
-#: ../mdkapplet:477
-#, c-format
-msgid "Unknown state"
-msgstr ""
-
-#: ../mdkapplet:478
-#, c-format
-msgid "Online services disabled. Contact Mandriva Online site\n"
-msgstr ""
-
-#: ../mdkapplet:479
-#, c-format
-msgid "Wrong Password.\n"
-msgstr "Սխալ գաղտնաբառ է\n"
-
-#: ../mdkapplet:480
-#, c-format
-msgid "Wrong Action or host or login.\n"
-msgstr ""
-
-#: ../mdkapplet:481
-#, c-format
-msgid ""
-"Something is wrong with your network settings (check your route, firewall or "
-"proxy settings)\n"
-msgstr ""
-
-#: ../mdkapplet:483
-#, c-format
-msgid ""
-"Problem occured while connecting to the server, please contact the support "
-"team"
-msgstr ""
-
-#: ../mdkapplet:487
-#, fuzzy, c-format
-msgid "Response from Mandriva Online server\n"
-msgstr "Բարի գալուստ Mandriva Online"
-
-#: ../mdkapplet:490
+#: ../mdkapplet:386
 #, fuzzy, c-format
 msgid "System is up-to-date\n"
 msgstr "Համակարգը զբաղված է: Սպասեք..."
 
-#: ../mdkapplet:527
-#, c-format
-msgid "No check"
-msgstr "Ստուգված չէ"
-
-#: ../mdkapplet:541
-#, c-format
-msgid "Checking config file: Not present\n"
-msgstr ""
-
-#: ../mdkapplet:544
+#: ../mdkapplet:415
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr ""
 
-#: ../mdkapplet:587
-#, fuzzy, c-format
-msgid "Logs"
-msgstr "Մուտք`"
-
-#: ../mdkapplet:603
+#: ../mdkapplet:457 ../mdkupdate:118 ../mdkupdate:164
 #, c-format
-msgid "Clear"
-msgstr "Մաքրել"
+msgid "Warning"
+msgstr "Զգուշացում"
 
-#: ../mdkapplet:629
+#: ../mdkapplet:468
 #, c-format
 msgid "About..."
 msgstr "Ծրագրի մասին.."
 
-#: ../mdkapplet:631
+#: ../mdkapplet:472
 #, fuzzy, c-format
 msgid "Mandriva Online %s"
 msgstr "Բարի գալուստ Mandriva Online"
 
-#: ../mdkapplet:635
+#: ../mdkapplet:473
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr ""
 
-#: ../mdkapplet:647
+#: ../mdkapplet:476
 #, c-format
 msgid "Mandriva Online gives access to Mandriva web services."
 msgstr ""
 
-#: ../mdkapplet:655
-#, c-format
-msgid "Always launch on startup"
-msgstr ""
-
-#: ../mdkapplet:657
-#, c-format
-msgid "Quit"
-msgstr "Ելք"
-
-#: ../mdkonline:58
-#, c-format
-msgid ""
-"mdonline version %s\n"
-"Copyright (C) %s Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"mdonline %s տարբերակը\n"
-"Copyright (C) %s Mandriva.\n"
-"Այս բաց ծրագրաշարը և կարող է տարածվել համաձայն GNU GPL պայմանների:\n"
-"\n"
-"կիրառում`\n"
-
-#: ../mdkonline:63 ../mdkupdate:73
-#, c-format
-msgid "  --help\t\t- print this help message.\n"
-msgstr "  --help\t\t- ցուցադրել այս տեղեկանքը:\n"
-
-#: ../mdkonline:64
-#, c-format
-msgid "  --box=\t\t\t- hostname.\n"
-msgstr ""
-
-#: ../mdkonline:65
-#, c-format
-msgid "  --country\t\t\t- name of country of the user. \n"
-msgstr ""
-
-#: ../mdkonline:66
-#, c-format
-msgid "  --interactive\t\t- use the interactive mode.\n"
-msgstr ""
-
-#: ../mdkonline:67
-#, c-format
-msgid "  --nointeractive\t- use the non-interactive mode.\n"
-msgstr ""
-
-#: ../mdkonline:68
-#, c-format
-msgid "  --login=\t\t     - login name of the user.\n"
-msgstr ""
-
-#: ../mdkonline:69
-#, c-format
-msgid "  --pass=\t\t\t- password  of the user.\n"
-msgstr ""
-
-#: ../mdkonline:87 ../mdkonline:120
-#, fuzzy, c-format
-msgid "Mandriva Online"
-msgstr "Բարի գալուստ Mandriva Online"
-
-#: ../mdkonline:90
-#, c-format
-msgid "I already have an account"
-msgstr ""
-
-#: ../mdkonline:91
-#, c-format
-msgid "I want to subscribe"
-msgstr ""
-
-#: ../mdkonline:96
-#, c-format
-msgid "Mr."
-msgstr ""
-
-#: ../mdkonline:96
-#, c-format
-msgid "Mrs."
-msgstr ""
-
-#: ../mdkonline:96
-#, c-format
-msgid "Ms."
-msgstr ""
-
-#: ../mdkonline:114
-#, c-format
-msgid "Reading configuration\n"
-msgstr "Ձևակերպման ընթերցում\n"
-
-#: ../mdkonline:123
-#, c-format
-msgid ""
-"This assistant will help you to upload your configuration\n"
-"(packages, hardware configuration) to a centralized database in\n"
-"order to keep you informed about security updates and useful upgrades.\n"
-msgstr ""
-"Այս օգնականը կաջակցի լցնել ձեր ձևակերպումը\n"
-"(փաթեթները, սարքի տվյալները) կենտրոնական բազա` ձեզ տեղյակ\n"
-"պահելու անվտանգության և այլ օգտակար նորացումների մասին:\n"
-
-#: ../mdkonline:131
-#, c-format
-msgid "Account creation or authentication"
-msgstr ""
-
-#: ../mdkonline:136
-#, c-format
-msgid "Enter your Mandriva Online login, password and machine name:"
-msgstr "Ներմուծեք ձեր Mandriva Online հաշիվը, գաղտնաբառը և մեքենայի անունը`"
-
-#: ../mdkonline:142 ../mdkonline:195
-#, fuzzy, c-format
-msgid "Email address:"
-msgstr "Անվավեր էլփոստի հասցե!\n"
-
-#: ../mdkonline:143
-#, c-format
-msgid "Country"
-msgstr "Երկիր"
-
-#: ../mdkonline:144 ../mdkonline:196
-#, c-format
-msgid "Password:"
-msgstr "Գաղտնաբառը`"
-
-#: ../mdkonline:146
-#, fuzzy, c-format
-msgid "Machine description:"
-msgstr "Մեքենայի անունը`"
-
-#: ../mdkonline:147
-#, c-format
-msgid "(Ex: My Home Office's Computer)"
-msgstr ""
-
-#: ../mdkonline:152 ../mdkonline:159 ../mdkonline:180 ../mdkonline:204
-#: ../mdkonline:208 ../mdkonline:212 ../mdkonline:217 ../mdkupdate:141
-#: ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
-#, c-format
-msgid "Error"
-msgstr "Սխալ"
-
-#: ../mdkonline:152
-#, c-format
-msgid "Machine name must be 1 to 40 alphanumerical characters"
-msgstr ""
-
-#: ../mdkonline:155
-#, fuzzy, c-format
-msgid "Connecting to Mandriva Online website..."
-msgstr "Բարի գալուստ Mandriva Online"
-
-#: ../mdkonline:167
-#, c-format
-msgid ""
-"In order to benefit from Mandriva Online services,\n"
-"we are about to upload your configuration.\n"
-"\n"
-"The Wizard will now send the following information to Mandriva:\n"
-"\n"
-"1) the list of packages you have installed on your system,\n"
-"\n"
-"2) your hardware configuration.\n"
-"\n"
-"If you feel uncomfortable by that idea, or do not want to benefit from this "
-"service,\n"
-"please press 'Cancel'. By pressing 'Next', you allow us to keep you "
-"informed\n"
-"about security updates and useful upgrades via personalized email alerts.\n"
-"Furthermore, you benefit from discounted paid support services on\n"
-"www.mandrivaexpert.com."
-msgstr ""
-"Mandriva Online ծառայություններից օգուտ քաղելու համար\n"
-"      խորհուրդ ենք տալիս լցնել ձեր ձևակերպումը:\n"
-"\n"
-"Հիմա Ուղեկցորդը կուղարկի Mandriva հետևյալ տվյալները`\n"
-"\n"
-"1)համակարգում տեղադրված փաթեթների ցուցակը,\n"
-"\n"
-"2)սարքավորումների ձևակերպումը:\n"
-"\n"
-"Եթե անհարմար եք գտնում այս առաջառկությունը կամ չեք ցանկանում օգուտ քաղել\n"
-"հպեք 'Հրաժարվել': Հպելով 'Հաջորդ', թույլ կտաք տեղյակ պահել ձեզ\n"
-"անվտանգության և այլ օգտակար նորացումների մասին էլփոստի միջոցով:\n"
-"Ավելին, կստանաք աջակցության ծառայության վճարումների զեղչեր այստեղ`\n"
-"www.mandrivaexpert.com."
-
-#: ../mdkonline:180
-#, c-format
-msgid "Connection problem"
-msgstr "Միացման պրոբլեմ"
-
-#: ../mdkonline:180
-#, c-format
-msgid "Problem occurs when uploading files, please try again"
-msgstr ""
-
-#: ../mdkonline:187
-#, c-format
-msgid "Create a Mandriva Online Account"
-msgstr "Ստեղծել Mandriva Online Հաշիվ"
-
-#. -PO: that is for things like "Mr", "Ms",...
-#: ../mdkonline:192
-#, fuzzy, c-format
-msgid "Greeting:"
-msgstr "Կանաչ"
-
-#: ../mdkonline:193
-#, fuzzy, c-format
-msgid "First name:"
-msgstr "Ֆայրստարտեր"
-
-#: ../mdkonline:194
-#, fuzzy, c-format
-msgid "Last name:"
-msgstr "Նախորդ ստուգում` "
-
-#: ../mdkonline:197
-#, c-format
-msgid "Confirm Password:"
-msgstr "Հաստատեք գաղտնաբառը`"
-
-#: ../mdkonline:204
-#, c-format
-msgid ""
-"The passwords do not match\n"
-" Please try again\n"
-msgstr ""
-"Գաղտնաբառերը չեն համընկնում\n"
-"Կրկին փորձեք\n"
-
-#: ../mdkonline:208
-#, fuzzy, c-format
-msgid "Please fill in each field"
-msgstr "Լրացրեք բոլոր դատարկ տողերը\n"
-
-#: ../mdkonline:212
-#, c-format
-msgid "Not a valid mail address!\n"
-msgstr "Անվավեր էլփոստի հասցե!\n"
-
-#: ../mdkonline:217
-#, fuzzy, c-format
-msgid "Creating account failed!"
-msgstr "Փոխել հաշիվը"
-
-#: ../mdkonline:225
-#, c-format
-msgid ""
-"Mandriva Online Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
-msgstr ""
-
-#: ../mdkonline:229
+#: ../mdkapplet:478
 #, c-format
-msgid "Your upload was successful!"
-msgstr "Ափլոադը հաջողությամբ ավարտվեց!"
+msgid "Online WebSite"
+msgstr "Օնլայն ՎեբԷջ"
 
-#: ../mdkonline:229
+#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
+#: ../mdkapplet:483
 #, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandriva Online."
+msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
-"Այսուհետև շնորհիվ Mandriva Online-ի ստանալու եք \n"
-"նորացումների և անվտանգության  ծանուցումներ:"
 
-#: ../mdkonline:229
+#: ../mdkapplet:492
 #, c-format
-msgid ""
-"Mandriva Online offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
-msgstr ""
-"Mandriva Online-ը առաջարկում է ավտոմատացնել նորացումները:\n"
-"Ծրագիրը համակարգում ինքնուրույն աշխատացվելու է` ստուգելու նորացումները\n"
-
-#: ../mdkonline:238
-#, fuzzy, c-format
-msgid "Congratulations"
-msgstr "Ձևակերպում"
-
-#: ../mdkonline:238
-#, c-format
-msgid "Your Mandriva Online account has been successfully configured\n"
+msgid "Always launch on startup"
 msgstr ""
 
-#: ../mdkonline:253
-#, fuzzy, c-format
-msgid "Configuration uploaded successfully"
-msgstr "Ափլոադը հաջողությամբ ավարտվեց!"
-
-#: ../mdkonline:254
-#, fuzzy, c-format
-msgid "Problem uploading configuration"
-msgstr "Ձևակերպման ընթերցում\n"
-
-#: ../mdkonline:256
+#: ../mdkapplet:494
 #, c-format
-msgid ""
-"Cannot connect to Mandriva Online website: wrong login/password or router/"
-"firewall bad settings"
-msgstr ""
+msgid "Quit"
+msgstr "Ելք"
 
 #: ../mdkonline.pm:207
 #, fuzzy, c-format
@@ -795,6 +345,11 @@ msgstr ""
 "\n"
 "կիրառում`\n"
 
+#: ../mdkupdate:73
+#, c-format
+msgid "  --help\t\t- print this help message.\n"
+msgstr "  --help\t\t- ցուցադրել այս տեղեկանքը:\n"
+
 #: ../mdkupdate:74
 #, c-format
 msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
@@ -822,11 +377,6 @@ msgid ""
 "file.\n"
 msgstr ""
 
-#: ../mdkupdate:118 ../mdkupdate:164
-#, c-format
-msgid "Warning"
-msgstr "Զգուշացում"
-
 #. -PO: here Live Install is currently *NOT* translated on the desktop, so it's better to keep as it:
 #: ../mdkupdate:120
 #, c-format
@@ -835,11 +385,21 @@ msgid ""
 "Install' wizard."
 msgstr ""
 
+#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
+#, c-format
+msgid "Please wait"
+msgstr ""
+
 #: ../mdkupdate:123 ../mdkupdate:174
 #, c-format
 msgid "Preparing..."
 msgstr ""
 
+#: ../mdkupdate:141 ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
+#, c-format
+msgid "Error"
+msgstr "Սխալ"
+
 #: ../mdkupdate:141
 #, c-format
 msgid ""
@@ -848,6 +408,11 @@ msgid ""
 "%s"
 msgstr ""
 
+#: ../mdkupdate:159 ../mdkupdate:188
+#, c-format
+msgid "An error occurred"
+msgstr ""
+
 #: ../mdkupdate:164
 #, c-format
 msgid ""
@@ -872,6 +437,228 @@ msgstr "Տեղադրել Նորացումները\n"
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "Անհնար է նորացնել փաթեթները update_source - ից:\n"
 
+#, fuzzy
+#~ msgid "New bundles are available for your system"
+#~ msgstr "Ձեր համակարգի համար չկան առկա նորացումներ"
+
+#, fuzzy
+#~ msgid "Service is not configured. Please click on \"Configure the service\""
+#~ msgstr "Ծառայությունը մատչելի չէ: Հպեք \"ձևակերպել\""
+
+#, fuzzy
+#~ msgid "Configure the service"
+#~ msgstr "Ցանցի Ձևակերպում"
+
+#~ msgid "Check updates"
+#~ msgstr "Ստուգել նորացումները"
+
+#~ msgid "Configure Now!"
+#~ msgstr "Ձևակերպել"
+
+#~ msgid "Actions"
+#~ msgstr "Գործողություններ"
+
+#~ msgid "Configure"
+#~ msgstr "Ձևակերպել"
+
+#~ msgid "See logs"
+#~ msgstr "Ընթերցել արձանագրերը"
+
+#~ msgid "Status"
+#~ msgstr "Կարգավիճակ"
+
+#~ msgid "Close"
+#~ msgstr "Փակել"
+
+#~ msgid "Network Connection: "
+#~ msgstr "Ցանցի Միացում`"
+
+#~ msgid "Up"
+#~ msgstr "Վերև"
+
+#~ msgid "Down"
+#~ msgstr "Ներքև"
+
+#~ msgid "Last check: "
+#~ msgstr "Նախորդ ստուգում` "
+
+#~ msgid "Machine name:"
+#~ msgstr "Մեքենայի անունը`"
+
+#, fuzzy
+#~ msgid "Updates: "
+#~ msgstr "Վերջին Նորացումներ` "
+
+#~ msgid "Wrong Password.\n"
+#~ msgstr "Սխալ գաղտնաբառ է\n"
+
+#, fuzzy
+#~ msgid "Response from Mandriva Online server\n"
+#~ msgstr "Բարի գալուստ Mandriva Online"
+
+#~ msgid "No check"
+#~ msgstr "Ստուգված չէ"
+
+#, fuzzy
+#~ msgid "Logs"
+#~ msgstr "Մուտք`"
+
+#~ msgid "Clear"
+#~ msgstr "Մաքրել"
+
+#~ msgid ""
+#~ "mdonline version %s\n"
+#~ "Copyright (C) %s Mandriva.\n"
+#~ "This is free software and may be redistributed under the terms of the GNU "
+#~ "GPL.\n"
+#~ "\n"
+#~ "usage:\n"
+#~ msgstr ""
+#~ "mdonline %s տարբերակը\n"
+#~ "Copyright (C) %s Mandriva.\n"
+#~ "Այս բաց ծրագրաշարը և կարող է տարածվել համաձայն GNU GPL պայմանների:\n"
+#~ "\n"
+#~ "կիրառում`\n"
+
+#, fuzzy
+#~ msgid "Mandriva Online"
+#~ msgstr "Բարի գալուստ Mandriva Online"
+
+#~ msgid "Reading configuration\n"
+#~ msgstr "Ձևակերպման ընթերցում\n"
+
+#~ msgid ""
+#~ "This assistant will help you to upload your configuration\n"
+#~ "(packages, hardware configuration) to a centralized database in\n"
+#~ "order to keep you informed about security updates and useful upgrades.\n"
+#~ msgstr ""
+#~ "Այս օգնականը կաջակցի լցնել ձեր ձևակերպումը\n"
+#~ "(փաթեթները, սարքի տվյալները) կենտրոնական բազա` ձեզ տեղյակ\n"
+#~ "պահելու անվտանգության և այլ օգտակար նորացումների մասին:\n"
+
+#~ msgid "Enter your Mandriva Online login, password and machine name:"
+#~ msgstr "Ներմուծեք ձեր Mandriva Online հաշիվը, գաղտնաբառը և մեքենայի անունը`"
+
+#, fuzzy
+#~ msgid "Email address:"
+#~ msgstr "Անվավեր էլփոստի հասցե!\n"
+
+#~ msgid "Country"
+#~ msgstr "Երկիր"
+
+#~ msgid "Password:"
+#~ msgstr "Գաղտնաբառը`"
+
+#, fuzzy
+#~ msgid "Machine description:"
+#~ msgstr "Մեքենայի անունը`"
+
+#, fuzzy
+#~ msgid "Connecting to Mandriva Online website..."
+#~ msgstr "Բարի գալուստ Mandriva Online"
+
+#~ msgid ""
+#~ "In order to benefit from Mandriva Online services,\n"
+#~ "we are about to upload your configuration.\n"
+#~ "\n"
+#~ "The Wizard will now send the following information to Mandriva:\n"
+#~ "\n"
+#~ "1) the list of packages you have installed on your system,\n"
+#~ "\n"
+#~ "2) your hardware configuration.\n"
+#~ "\n"
+#~ "If you feel uncomfortable by that idea, or do not want to benefit from "
+#~ "this service,\n"
+#~ "please press 'Cancel'. By pressing 'Next', you allow us to keep you "
+#~ "informed\n"
+#~ "about security updates and useful upgrades via personalized email "
+#~ "alerts.\n"
+#~ "Furthermore, you benefit from discounted paid support services on\n"
+#~ "www.mandrivaexpert.com."
+#~ msgstr ""
+#~ "Mandriva Online ծառայություններից օգուտ քաղելու համար\n"
+#~ "      խորհուրդ ենք տալիս լցնել ձեր ձևակերպումը:\n"
+#~ "\n"
+#~ "Հիմա Ուղեկցորդը կուղարկի Mandriva հետևյալ տվյալները`\n"
+#~ "\n"
+#~ "1)համակարգում տեղադրված փաթեթների ցուցակը,\n"
+#~ "\n"
+#~ "2)սարքավորումների ձևակերպումը:\n"
+#~ "\n"
+#~ "Եթե անհարմար եք գտնում այս առաջառկությունը կամ չեք ցանկանում օգուտ քաղել\n"
+#~ "հպեք 'Հրաժարվել': Հպելով 'Հաջորդ', թույլ կտաք տեղյակ պահել ձեզ\n"
+#~ "անվտանգության և այլ օգտակար նորացումների մասին էլփոստի միջոցով:\n"
+#~ "Ավելին, կստանաք աջակցության ծառայության վճարումների զեղչեր այստեղ`\n"
+#~ "www.mandrivaexpert.com."
+
+#~ msgid "Connection problem"
+#~ msgstr "Միացման պրոբլեմ"
+
+#~ msgid "Create a Mandriva Online Account"
+#~ msgstr "Ստեղծել Mandriva Online Հաշիվ"
+
+#, fuzzy
+#~ msgid "Greeting:"
+#~ msgstr "Կանաչ"
+
+#, fuzzy
+#~ msgid "First name:"
+#~ msgstr "Ֆայրստարտեր"
+
+#, fuzzy
+#~ msgid "Last name:"
+#~ msgstr "Նախորդ ստուգում` "
+
+#~ msgid "Confirm Password:"
+#~ msgstr "Հաստատեք գաղտնաբառը`"
+
+#~ msgid ""
+#~ "The passwords do not match\n"
+#~ " Please try again\n"
+#~ msgstr ""
+#~ "Գաղտնաբառերը չեն համընկնում\n"
+#~ "Կրկին փորձեք\n"
+
+#, fuzzy
+#~ msgid "Please fill in each field"
+#~ msgstr "Լրացրեք բոլոր դատարկ տողերը\n"
+
+#~ msgid "Not a valid mail address!\n"
+#~ msgstr "Անվավեր էլփոստի հասցե!\n"
+
+#, fuzzy
+#~ msgid "Creating account failed!"
+#~ msgstr "Փոխել հաշիվը"
+
+#~ msgid "Your upload was successful!"
+#~ msgstr "Ափլոադը հաջողությամբ ավարտվեց!"
+
+#~ msgid ""
+#~ "From now you will receive on security and updates \n"
+#~ "announcements thanks to Mandriva Online."
+#~ msgstr ""
+#~ "Այսուհետև շնորհիվ Mandriva Online-ի ստանալու եք \n"
+#~ "նորացումների և անվտանգության  ծանուցումներ:"
+
+#~ msgid ""
+#~ "Mandriva Online offers you the ability to automate the updates.\n"
+#~ "A program will run regulary in your system waiting for new updates\n"
+#~ msgstr ""
+#~ "Mandriva Online-ը առաջարկում է ավտոմատացնել նորացումները:\n"
+#~ "Ծրագիրը համակարգում ինքնուրույն աշխատացվելու է` ստուգելու նորացումները\n"
+
+#, fuzzy
+#~ msgid "Congratulations"
+#~ msgstr "Ձևակերպում"
+
+#, fuzzy
+#~ msgid "Configuration uploaded successfully"
+#~ msgstr "Ափլոադը հաջողությամբ ավարտվեց!"
+
+#, fuzzy
+#~ msgid "Problem uploading configuration"
+#~ msgstr "Ձևակերպման ընթերցում\n"
+
 #~ msgid "  --applet\t\t- launch Mandriva Update.\n"
 #~ msgstr "  --applet\t\t- աշխատացնել Mandriva Update:\n"
 
diff --git a/po/id.po b/po/id.po
index 8699da76..6614aa3a 100644
--- a/po/id.po
+++ b/po/id.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-09 16:26+0200\n"
+"POT-Creation-Date: 2008-02-21 18:21+0100\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"
@@ -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:94
+#: ../mdkapplet:88
 #, c-format
 msgid "Will check updates at %s"
 msgstr "Akan memeriksa update pada %s"
 
-#: ../mdkapplet:103
+#: ../mdkapplet:97
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "Sistem Anda sudah up-to-date"
 
-#: ../mdkapplet:109
+#: ../mdkapplet:103
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -41,48 +41,37 @@ msgstr ""
 "Masalah konfigurasi layanan. Harap perika file log dan kirimkan mail ke "
 "support@mandrivaonline.com"
 
-#: ../mdkapplet:115
+#: ../mdkapplet:110
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "Harap tunggu, mencari paket yang tersedia..."
 
-#: ../mdkapplet:121
+#: ../mdkapplet:116
 #, c-format
 msgid "New updates are available for your system"
 msgstr "Update baru tersedia untuk sistem Anda"
 
-#: ../mdkapplet:127
-#, c-format
-msgid "New bundles are available for your system"
-msgstr "Bundel baru tersedia untuk sistem Anda"
-
-#: ../mdkapplet:133
-#, c-format
-msgid "Service is not configured. Please click on \"Configure the service\""
-msgstr ""
-"Layanan belum terkonfigurasi. Silahkan klik pada \"Konfigurasikan layanan\""
-
-#: ../mdkapplet:139
+#: ../mdkapplet:122
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "Jaringan sedang non-aktif. Harap konfigurasikan jaringan Anda"
 
-#: ../mdkapplet:145
+#: ../mdkapplet:128
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "Layanan tidak diaktifkan. Silahkan klik pada \"Website Online\""
 
-#: ../mdkapplet:151 ../mdkapplet:182
+#: ../mdkapplet:134 ../mdkapplet:165
 #, c-format
 msgid "urpmi database locked"
 msgstr "database urpmi terkunci"
 
-#: ../mdkapplet:157
+#: ../mdkapplet:140
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr "Rilis tidak didukung (rilis terlalu lama, atau rilis pengembangan)"
 
-#: ../mdkapplet:163
+#: ../mdkapplet:146
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
@@ -90,7 +79,7 @@ msgstr ""
 "Tidak ditemukan media. Anda harus menambahkan media melalui 'Manajemen Media "
 "Perangkat Lunak'"
 
-#: ../mdkapplet:169
+#: ../mdkapplet:152
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -106,580 +95,132 @@ msgstr ""
 "\n"
 "Lalu jalankan ulang \"%s\"."
 
-#: ../mdkapplet:174
+#: ../mdkapplet:157
 #, c-format
 msgid "Enabled"
 msgstr "Aktifkan"
 
-#: ../mdkapplet:187
+#: ../mdkapplet:170
 #, c-format
 msgid "Error updating media"
 msgstr "Kesalahan mengupdate media"
 
-#: ../mdkapplet:202
+#: ../mdkapplet:185
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr "Memeriksa... Update tersedia\n"
 
-#: ../mdkapplet:207
+#: ../mdkapplet:190
 #, c-format
 msgid "Packages are up to date"
 msgstr "Paket-paket sudah update"
 
-#: ../mdkapplet:212
+#: ../mdkapplet:195
 #, c-format
 msgid "Failed to open urpmi database"
 msgstr "Gagal membuka basis data rpmdb"
 
-#: ../mdkapplet:217 ../mdkapplet:324
+#: ../mdkapplet:200
 #, c-format
 msgid "Install updates"
 msgstr "Installasikan update-update"
 
-#: ../mdkapplet:218
-#, c-format
-msgid "Configure the service"
-msgstr "Konfigurasikan layanan"
-
-#: ../mdkapplet:219
+#: ../mdkapplet:201
 #, c-format
 msgid "Check Updates"
 msgstr "Cek Update"
 
-#: ../mdkapplet:220 ../mdkapplet:327 ../mdkonline:114 ../mdkonline:155
-#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
-#, c-format
-msgid "Please wait"
-msgstr "Harap tunggu..."
-
-#: ../mdkapplet:220 ../mdkapplet:326 ../mdkapplet:327
-#, c-format
-msgid "Check updates"
-msgstr "Cek update"
-
-#: ../mdkapplet:223 ../mdkapplet:648
-#, c-format
-msgid "Online WebSite"
-msgstr "WebSite Online"
-
-#: ../mdkapplet:224
+#: ../mdkapplet:202
 #, c-format
 msgid "Configure Network"
 msgstr "Konfigurasikan Jaringan"
 
-#: ../mdkapplet:225
-#, c-format
-msgid "Configure Now!"
-msgstr "Konfigurasi Sekarang!"
-
-#: ../mdkapplet:313 ../mdkapplet:392
-#, c-format
-msgid "Mandriva Linux Updates Applet"
-msgstr "Applet Update Mandriva Linux"
-
-#: ../mdkapplet:322
-#, c-format
-msgid "Actions"
-msgstr "Aksi"
-
-#: ../mdkapplet:325
-#, c-format
-msgid "Configure"
-msgstr "Konfigurasikan"
-
-#: ../mdkapplet:329
-#, c-format
-msgid "See logs"
-msgstr "Lihat log"
-
-#: ../mdkapplet:332
-#, c-format
-msgid "Status"
-msgstr "Status"
-
-#: ../mdkapplet:336 ../mdkapplet:597
-#, c-format
-msgid "Close"
-msgstr "Tutup"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Network Connection: "
-msgstr "Koneksi Jaringan: "
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Up"
-msgstr "Aktif"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Down"
-msgstr "Non-aktif"
-
-#: ../mdkapplet:366
-#, c-format
-msgid "Last check: "
-msgstr "Pengujian terakhir: "
-
-#: ../mdkapplet:367 ../mdkonline:145
-#, c-format
-msgid "Machine name:"
-msgstr "Nama mesin:"
-
-#: ../mdkapplet:368
-#, c-format
-msgid "Updates: "
-msgstr "Update"
-
-#: ../mdkapplet:372
+#: ../mdkapplet:283
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Menjalankan drakconnect\n"
 
-#: ../mdkapplet:375
+#: ../mdkapplet:286
 #, c-format
 msgid "Mandriva Online seems to be reinstalled, reloading applet ...."
 msgstr ""
 "Mandriva Online tampaknya baru saja diinstall ulang, memuat ulang applet ...."
 
-#: ../mdkapplet:383
+#: ../mdkapplet:294
 #, c-format
 msgid "Launching MandrivaUpdate\n"
 msgstr "Menjalankan MandrivaUpdate\n"
 
-#: ../mdkapplet:398
+#: ../mdkapplet:303
+#, c-format
+msgid "Mandriva Linux Updates Applet"
+msgstr "Applet Update Mandriva Linux"
+
+#: ../mdkapplet:308
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Menghitung update baru...\n"
 
-#: ../mdkapplet:399
+#: ../mdkapplet:309
 #, c-format
 msgid "Connecting to"
 msgstr "Menghubungkan ke"
 
-#: ../mdkapplet:467 ../mdkupdate:159 ../mdkupdate:188
-#, c-format
-msgid "An error occurred"
-msgstr "Terjadi kesalahan"
-
-#: ../mdkapplet:475
-#, c-format
-msgid "Development release not supported by service"
-msgstr "Rilis pengembangan tidak didukung oleh layanan"
-
-#: ../mdkapplet:476
-#, c-format
-msgid "Too old release not supported by service"
-msgstr "Rilis terlalu lama tidak didukung oleh layanan"
-
-#: ../mdkapplet:477
-#, c-format
-msgid "Unknown state"
-msgstr "Kondisi tidak diketahui"
-
-#: ../mdkapplet:478
-#, c-format
-msgid "Online services disabled. Contact Mandriva Online site\n"
-msgstr "Layanan Online dinonaktifkan. Hubungi situs Mandriva Online\n"
-
-#: ../mdkapplet:479
-#, c-format
-msgid "Wrong Password.\n"
-msgstr "Kata sandi salah.\n"
-
-#: ../mdkapplet:480
-#, c-format
-msgid "Wrong Action or host or login.\n"
-msgstr "Aksi, host, atau login salah.\n"
-
-#: ../mdkapplet:481
-#, c-format
-msgid ""
-"Something is wrong with your network settings (check your route, firewall or "
-"proxy settings)\n"
-msgstr ""
-"Terjadi kesalahan dengan setting jaringan Anda (periksa rute, firewall atau "
-"setting proxy Anda)\n"
-
-#: ../mdkapplet:483
-#, c-format
-msgid ""
-"Problem occured while connecting to the server, please contact the support "
-"team"
-msgstr ""
-"Masalah muncul ketika melakukan koneksi ke server, silakan menghubungi tim "
-"pendukung."
-
-#: ../mdkapplet:487
-#, c-format
-msgid "Response from Mandriva Online server\n"
-msgstr "Jawaban dari server Mandriva Online\n"
-
-#: ../mdkapplet:490
+#: ../mdkapplet:386
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Sistem up-to-date\n"
 
-#: ../mdkapplet:527
-#, c-format
-msgid "No check"
-msgstr "Tidak ada pemeriksaan"
-
-#: ../mdkapplet:541
-#, c-format
-msgid "Checking config file: Not present\n"
-msgstr "Memeriksa file konfigurasi: Tidak ada\n"
-
-#: ../mdkapplet:544
+#: ../mdkapplet:415
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Memeriksa Jaringan: tampaknya dinonaktifkan\n"
 
-#: ../mdkapplet:587
-#, c-format
-msgid "Logs"
-msgstr "Log"
-
-#: ../mdkapplet:603
+#: ../mdkapplet:457 ../mdkupdate:118 ../mdkupdate:164
 #, c-format
-msgid "Clear"
-msgstr "Bersihkan"
+msgid "Warning"
+msgstr "Peringatan"
 
-#: ../mdkapplet:629
+#: ../mdkapplet:468
 #, c-format
 msgid "About..."
 msgstr "Keterangan..."
 
-#: ../mdkapplet:631
+#: ../mdkapplet:472
 #, c-format
 msgid "Mandriva Online %s"
 msgstr "Mandriva Online %s"
 
-#: ../mdkapplet:635
+#: ../mdkapplet:473
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Hak cipta (C) %s oleh Mandriva"
 
-#: ../mdkapplet:647
+#: ../mdkapplet:476
 #, c-format
 msgid "Mandriva Online gives access to Mandriva web services."
 msgstr "Mandriva Online memberikan akses ke layanan web Mandriva."
 
-#: ../mdkapplet:655
-#, c-format
-msgid "Always launch on startup"
-msgstr "Selalu jalankan ketika pembukaan"
-
-#: ../mdkapplet:657
-#, c-format
-msgid "Quit"
-msgstr "Keluar"
-
-#: ../mdkonline:58
-#, c-format
-msgid ""
-"mdonline version %s\n"
-"Copyright (C) %s Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"mdkonline versi %s\n"
-"Hak cipta (C) %s Mandriva.\n"
-"Ini adalah software bebas dan boleh didistribusikan ulang di bawah syarat "
-"GPL GNU.\n"
-"\n"
-"pemakaian:\n"
-
-#: ../mdkonline:63 ../mdkupdate:73
-#, c-format
-msgid "  --help\t\t- print this help message.\n"
-msgstr "  --help\t\t- cetak pesan bantuan ini.\n"
-
-#: ../mdkonline:64
-#, c-format
-msgid "  --box=\t\t\t- hostname.\n"
-msgstr "  --box=\t\t\t- namahost.\n"
-
-#: ../mdkonline:65
-#, c-format
-msgid "  --country\t\t\t- name of country of the user. \n"
-msgstr "  --country\t\t\t- nama negara pengguna. \n"
-
-#: ../mdkonline:66
-#, c-format
-msgid "  --interactive\t\t- use the interactive mode.\n"
-msgstr "  --interactive\t\t- gunakan mode interaktif.\n"
-
-#: ../mdkonline:67
-#, c-format
-msgid "  --nointeractive\t- use the non-interactive mode.\n"
-msgstr "  --nointeractive\t- gundakan mode non-interaktif.\n"
-
-#: ../mdkonline:68
-#, c-format
-msgid "  --login=\t\t     - login name of the user.\n"
-msgstr "  --login=\t\t     - nama login pengguna.\n"
-
-#: ../mdkonline:69
-#, c-format
-msgid "  --pass=\t\t\t- password  of the user.\n"
-msgstr "  --pass=\t\t\t- kata sandi pengguna.\n"
-
-#: ../mdkonline:87 ../mdkonline:120
-#, c-format
-msgid "Mandriva Online"
-msgstr "Mandriva Online"
-
-#: ../mdkonline:90
-#, c-format
-msgid "I already have an account"
-msgstr "Saya sudah memiliki account"
-
-#: ../mdkonline:91
-#, c-format
-msgid "I want to subscribe"
-msgstr "Saya ingin mendaftar"
-
-#: ../mdkonline:96
-#, c-format
-msgid "Mr."
-msgstr "Tuan"
-
-#: ../mdkonline:96
-#, c-format
-msgid "Mrs."
-msgstr "Nyonya"
-
-#: ../mdkonline:96
-#, c-format
-msgid "Ms."
-msgstr "Nona"
-
-#: ../mdkonline:114
-#, c-format
-msgid "Reading configuration\n"
-msgstr "Membaca konfigurasi\n"
-
-#: ../mdkonline:123
-#, c-format
-msgid ""
-"This assistant will help you to upload your configuration\n"
-"(packages, hardware configuration) to a centralized database in\n"
-"order to keep you informed about security updates and useful upgrades.\n"
-msgstr ""
-"Asisten ini akan menolong Anda meng-upload konfigurasi Anda\n"
-"(paket, konfigurasi perangkat keras) ke database terpusat agar Anda selalu\n"
-"diberi tahu update keamanan dan upgrade yang berguna.\n"
-
-#: ../mdkonline:131
-#, c-format
-msgid "Account creation or authentication"
-msgstr "Pembuatan atau authentikasi account"
-
-#: ../mdkonline:136
-#, c-format
-msgid "Enter your Mandriva Online login, password and machine name:"
-msgstr "Masukkan login dan kata sandi Mandriva Online serta nama mesin  Anda:"
-
-#: ../mdkonline:142 ../mdkonline:195
-#, c-format
-msgid "Email address:"
-msgstr "Alamat email:"
-
-#: ../mdkonline:143
-#, c-format
-msgid "Country"
-msgstr "Negara:"
-
-#: ../mdkonline:144 ../mdkonline:196
-#, c-format
-msgid "Password:"
-msgstr "Kata sandi:"
-
-#: ../mdkonline:146
-#, c-format
-msgid "Machine description:"
-msgstr "Deskripsi mesin:"
-
-#: ../mdkonline:147
-#, c-format
-msgid "(Ex: My Home Office's Computer)"
-msgstr "(Contoh: Komputer Kantor Saya)"
-
-#: ../mdkonline:152 ../mdkonline:159 ../mdkonline:180 ../mdkonline:204
-#: ../mdkonline:208 ../mdkonline:212 ../mdkonline:217 ../mdkupdate:141
-#: ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
-#, c-format
-msgid "Error"
-msgstr "Kesalahan"
-
-#: ../mdkonline:152
-#, c-format
-msgid "Machine name must be 1 to 40 alphanumerical characters"
-msgstr "Nama komputer harus berupa karakter alphanumerik sebanyak 1 - 40"
-
-#: ../mdkonline:155
-#, c-format
-msgid "Connecting to Mandriva Online website..."
-msgstr "Terhubung ke website Mandriva Online..."
-
-#: ../mdkonline:167
-#, c-format
-msgid ""
-"In order to benefit from Mandriva Online services,\n"
-"we are about to upload your configuration.\n"
-"\n"
-"The Wizard will now send the following information to Mandriva:\n"
-"\n"
-"1) the list of packages you have installed on your system,\n"
-"\n"
-"2) your hardware configuration.\n"
-"\n"
-"If you feel uncomfortable by that idea, or do not want to benefit from this "
-"service,\n"
-"please press 'Cancel'. By pressing 'Next', you allow us to keep you "
-"informed\n"
-"about security updates and useful upgrades via personalized email alerts.\n"
-"Furthermore, you benefit from discounted paid support services on\n"
-"www.mandrivaexpert.com."
-msgstr ""
-"Agar mendapat manfaat layanan Mandriva Online,\n"
-"kami akan meng-upload konfigurasi Anda.\n"
-"\n"
-"Wizard kini akan mengirim informasi berikut ke Mandriva:\n"
-"\n"
-"1) daftar paket yang terinstall pada sistem Anda,\n"
-"\n"
-"2) konfigurasi perangkat keras Anda.\n"
-"\n"
-"Jika Anda merasa tak nyaman dengan ide ini, atau tak ingin memanfaatkan\n"
-"layanan ini, tekan 'Batal'. Dengan menekan 'Lanjut', Anda mengizinkan kami\n"
-"memberi tahu Anda tentang update keamanan dan upgrade bermanfaat via email.\n"
-"Tambah lagi, Anda akan mendapat diskon servis di www.mandrivaexpert.com."
-
-#: ../mdkonline:180
-#, c-format
-msgid "Connection problem"
-msgstr "Masalah koneksi"
-
-#: ../mdkonline:180
-#, c-format
-msgid "Problem occurs when uploading files, please try again"
-msgstr "Masalah terjadi ketika mengupload file, harap mencoba lagi"
-
-#: ../mdkonline:187
-#, c-format
-msgid "Create a Mandriva Online Account"
-msgstr "Buat Account Mandriva Online"
-
-#. -PO: that is for things like "Mr", "Ms",...
-#: ../mdkonline:192
-#, c-format
-msgid "Greeting:"
-msgstr "Salam:"
-
-#: ../mdkonline:193
-#, c-format
-msgid "First name:"
-msgstr "Nama Depan:"
-
-#: ../mdkonline:194
-#, c-format
-msgid "Last name:"
-msgstr "Nama belakang:"
-
-#: ../mdkonline:197
-#, c-format
-msgid "Confirm Password:"
-msgstr "Konfirmasi Kata sandi:"
-
-#: ../mdkonline:204
-#, c-format
-msgid ""
-"The passwords do not match\n"
-" Please try again\n"
-msgstr ""
-"Kata sandi tidak cocok\n"
-"Harap coba lagi!\n"
-
-#: ../mdkonline:208
-#, c-format
-msgid "Please fill in each field"
-msgstr "Harap mengisi semua field"
-
-#: ../mdkonline:212
-#, c-format
-msgid "Not a valid mail address!\n"
-msgstr "Alamat mail tak valid!\n"
-
-#: ../mdkonline:217
-#, c-format
-msgid "Creating account failed!"
-msgstr "Pembuatan account gagal!"
-
-#: ../mdkonline:225
-#, c-format
-msgid ""
-"Mandriva Online Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
-msgstr ""
-"Account Mandriva Online berhasil dibuat.\n"
-"Silahkan klik \"Lanjut\" untuk authentikasi dan mengupload konfigurasi Anda\n"
-
-#: ../mdkonline:229
-#, c-format
-msgid "Your upload was successful!"
-msgstr "Upload Anda sukses!"
-
-#: ../mdkonline:229
+#: ../mdkapplet:478
 #, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandriva Online."
-msgstr ""
-"Mulai saat ini Anda akan menerima pemberitahuan keamanan dan upgrade\n"
-"dari Mandriva Online."
+msgid "Online WebSite"
+msgstr "WebSite Online"
 
-#: ../mdkonline:229
+#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
+#: ../mdkapplet:483
 #, c-format
-msgid ""
-"Mandriva Online offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
+msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
-"Mandriva Online memberi Anda kemampuan update otomatis.\n"
-"Sebuah program akan secara periodik menunggu update baru\n"
-
-#: ../mdkonline:238
-#, c-format
-msgid "Congratulations"
-msgstr "Selamat"
-
-#: ../mdkonline:238
-#, c-format
-msgid "Your Mandriva Online account has been successfully configured\n"
-msgstr "Account Mandriva Online Anda telah sukses dikonfigurasi\n"
-
-#: ../mdkonline:253
-#, c-format
-msgid "Configuration uploaded successfully"
-msgstr "Konfigurasi Anda telah sukses diupload"
 
-#: ../mdkonline:254
+#: ../mdkapplet:492
 #, c-format
-msgid "Problem uploading configuration"
-msgstr "Kesalahan mengupload konfigurasi"
+msgid "Always launch on startup"
+msgstr "Selalu jalankan ketika pembukaan"
 
-#: ../mdkonline:256
+#: ../mdkapplet:494
 #, c-format
-msgid ""
-"Cannot connect to Mandriva Online website: wrong login/password or router/"
-"firewall bad settings"
-msgstr ""
-"Tidak bisa terhubung ke website Mandriva Online: login/kata sandi salah atau "
-"settingrouter/firewall yang buruk"
+msgid "Quit"
+msgstr "Keluar"
 
 #: ../mdkonline.pm:207
 #, c-format
@@ -828,6 +369,11 @@ msgstr ""
 "\n"
 "pemakaian:\n"
 
+#: ../mdkupdate:73
+#, c-format
+msgid "  --help\t\t- print this help message.\n"
+msgstr "  --help\t\t- cetak pesan bantuan ini.\n"
+
 #: ../mdkupdate:74
 #, c-format
 msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
@@ -857,11 +403,6 @@ msgstr ""
 "  --bundel file.bundle\t- parsing dan install paket dari file .bundle "
 "metainfo.\n"
 
-#: ../mdkupdate:118 ../mdkupdate:164
-#, c-format
-msgid "Warning"
-msgstr "Peringatan"
-
 #. -PO: here Live Install is currently *NOT* translated on the desktop, so it's better to keep as it:
 #: ../mdkupdate:120
 #, c-format
@@ -872,11 +413,21 @@ msgstr ""
 "Anda pertama-tama perlu menginstall sistem pada harddisk dengan wizard 'Live "
 "Install'."
 
+#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
+#, c-format
+msgid "Please wait"
+msgstr "Harap tunggu..."
+
 #: ../mdkupdate:123 ../mdkupdate:174
 #, c-format
 msgid "Preparing..."
 msgstr "Persiapan..."
 
+#: ../mdkupdate:141 ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
+#, c-format
+msgid "Error"
+msgstr "Kesalahan"
+
 #: ../mdkupdate:141
 #, c-format
 msgid ""
@@ -888,6 +439,11 @@ msgstr ""
 "\n"
 "%s"
 
+#: ../mdkupdate:159 ../mdkupdate:188
+#, c-format
+msgid "An error occurred"
+msgstr "Terjadi kesalahan"
+
 #: ../mdkupdate:164
 #, c-format
 msgid ""
@@ -916,6 +472,311 @@ msgstr "Menginstall paket...\n"
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "Gagal meng-update paket dari media update_source.\n"
 
+#~ msgid "New bundles are available for your system"
+#~ msgstr "Bundel baru tersedia untuk sistem Anda"
+
+#~ msgid "Service is not configured. Please click on \"Configure the service\""
+#~ msgstr ""
+#~ "Layanan belum terkonfigurasi. Silahkan klik pada \"Konfigurasikan layanan"
+#~ "\""
+
+#~ msgid "Configure the service"
+#~ msgstr "Konfigurasikan layanan"
+
+#~ msgid "Check updates"
+#~ msgstr "Cek update"
+
+#~ msgid "Configure Now!"
+#~ msgstr "Konfigurasi Sekarang!"
+
+#~ msgid "Actions"
+#~ msgstr "Aksi"
+
+#~ msgid "Configure"
+#~ msgstr "Konfigurasikan"
+
+#~ msgid "See logs"
+#~ msgstr "Lihat log"
+
+#~ msgid "Status"
+#~ msgstr "Status"
+
+#~ msgid "Close"
+#~ msgstr "Tutup"
+
+#~ msgid "Network Connection: "
+#~ msgstr "Koneksi Jaringan: "
+
+#~ msgid "Up"
+#~ msgstr "Aktif"
+
+#~ msgid "Down"
+#~ msgstr "Non-aktif"
+
+#~ msgid "Last check: "
+#~ msgstr "Pengujian terakhir: "
+
+#~ msgid "Machine name:"
+#~ msgstr "Nama mesin:"
+
+#~ msgid "Updates: "
+#~ msgstr "Update"
+
+#~ msgid "Development release not supported by service"
+#~ msgstr "Rilis pengembangan tidak didukung oleh layanan"
+
+#~ msgid "Too old release not supported by service"
+#~ msgstr "Rilis terlalu lama tidak didukung oleh layanan"
+
+#~ msgid "Unknown state"
+#~ msgstr "Kondisi tidak diketahui"
+
+#~ msgid "Online services disabled. Contact Mandriva Online site\n"
+#~ msgstr "Layanan Online dinonaktifkan. Hubungi situs Mandriva Online\n"
+
+#~ msgid "Wrong Password.\n"
+#~ msgstr "Kata sandi salah.\n"
+
+#~ msgid "Wrong Action or host or login.\n"
+#~ msgstr "Aksi, host, atau login salah.\n"
+
+#~ msgid ""
+#~ "Something is wrong with your network settings (check your route, firewall "
+#~ "or proxy settings)\n"
+#~ msgstr ""
+#~ "Terjadi kesalahan dengan setting jaringan Anda (periksa rute, firewall "
+#~ "atau setting proxy Anda)\n"
+
+#~ msgid ""
+#~ "Problem occured while connecting to the server, please contact the "
+#~ "support team"
+#~ msgstr ""
+#~ "Masalah muncul ketika melakukan koneksi ke server, silakan menghubungi "
+#~ "tim pendukung."
+
+#~ msgid "Response from Mandriva Online server\n"
+#~ msgstr "Jawaban dari server Mandriva Online\n"
+
+#~ msgid "No check"
+#~ msgstr "Tidak ada pemeriksaan"
+
+#~ msgid "Checking config file: Not present\n"
+#~ msgstr "Memeriksa file konfigurasi: Tidak ada\n"
+
+#~ msgid "Logs"
+#~ msgstr "Log"
+
+#~ msgid "Clear"
+#~ msgstr "Bersihkan"
+
+#~ msgid ""
+#~ "mdonline version %s\n"
+#~ "Copyright (C) %s Mandriva.\n"
+#~ "This is free software and may be redistributed under the terms of the GNU "
+#~ "GPL.\n"
+#~ "\n"
+#~ "usage:\n"
+#~ msgstr ""
+#~ "mdkonline versi %s\n"
+#~ "Hak cipta (C) %s Mandriva.\n"
+#~ "Ini adalah software bebas dan boleh didistribusikan ulang di bawah syarat "
+#~ "GPL GNU.\n"
+#~ "\n"
+#~ "pemakaian:\n"
+
+#~ msgid "  --box=\t\t\t- hostname.\n"
+#~ msgstr "  --box=\t\t\t- namahost.\n"
+
+#~ msgid "  --country\t\t\t- name of country of the user. \n"
+#~ msgstr "  --country\t\t\t- nama negara pengguna. \n"
+
+#~ msgid "  --interactive\t\t- use the interactive mode.\n"
+#~ msgstr "  --interactive\t\t- gunakan mode interaktif.\n"
+
+#~ msgid "  --nointeractive\t- use the non-interactive mode.\n"
+#~ msgstr "  --nointeractive\t- gundakan mode non-interaktif.\n"
+
+#~ msgid "  --login=\t\t     - login name of the user.\n"
+#~ msgstr "  --login=\t\t     - nama login pengguna.\n"
+
+#~ msgid "  --pass=\t\t\t- password  of the user.\n"
+#~ msgstr "  --pass=\t\t\t- kata sandi pengguna.\n"
+
+#~ msgid "Mandriva Online"
+#~ msgstr "Mandriva Online"
+
+#~ msgid "I already have an account"
+#~ msgstr "Saya sudah memiliki account"
+
+#~ msgid "I want to subscribe"
+#~ msgstr "Saya ingin mendaftar"
+
+#~ msgid "Mr."
+#~ msgstr "Tuan"
+
+#~ msgid "Mrs."
+#~ msgstr "Nyonya"
+
+#~ msgid "Ms."
+#~ msgstr "Nona"
+
+#~ msgid "Reading configuration\n"
+#~ msgstr "Membaca konfigurasi\n"
+
+#~ msgid ""
+#~ "This assistant will help you to upload your configuration\n"
+#~ "(packages, hardware configuration) to a centralized database in\n"
+#~ "order to keep you informed about security updates and useful upgrades.\n"
+#~ msgstr ""
+#~ "Asisten ini akan menolong Anda meng-upload konfigurasi Anda\n"
+#~ "(paket, konfigurasi perangkat keras) ke database terpusat agar Anda "
+#~ "selalu\n"
+#~ "diberi tahu update keamanan dan upgrade yang berguna.\n"
+
+#~ msgid "Account creation or authentication"
+#~ msgstr "Pembuatan atau authentikasi account"
+
+#~ msgid "Enter your Mandriva Online login, password and machine name:"
+#~ msgstr ""
+#~ "Masukkan login dan kata sandi Mandriva Online serta nama mesin  Anda:"
+
+#~ msgid "Email address:"
+#~ msgstr "Alamat email:"
+
+#~ msgid "Country"
+#~ msgstr "Negara:"
+
+#~ msgid "Password:"
+#~ msgstr "Kata sandi:"
+
+#~ msgid "Machine description:"
+#~ msgstr "Deskripsi mesin:"
+
+#~ msgid "(Ex: My Home Office's Computer)"
+#~ msgstr "(Contoh: Komputer Kantor Saya)"
+
+#~ msgid "Machine name must be 1 to 40 alphanumerical characters"
+#~ msgstr "Nama komputer harus berupa karakter alphanumerik sebanyak 1 - 40"
+
+#~ msgid "Connecting to Mandriva Online website..."
+#~ msgstr "Terhubung ke website Mandriva Online..."
+
+#~ msgid ""
+#~ "In order to benefit from Mandriva Online services,\n"
+#~ "we are about to upload your configuration.\n"
+#~ "\n"
+#~ "The Wizard will now send the following information to Mandriva:\n"
+#~ "\n"
+#~ "1) the list of packages you have installed on your system,\n"
+#~ "\n"
+#~ "2) your hardware configuration.\n"
+#~ "\n"
+#~ "If you feel uncomfortable by that idea, or do not want to benefit from "
+#~ "this service,\n"
+#~ "please press 'Cancel'. By pressing 'Next', you allow us to keep you "
+#~ "informed\n"
+#~ "about security updates and useful upgrades via personalized email "
+#~ "alerts.\n"
+#~ "Furthermore, you benefit from discounted paid support services on\n"
+#~ "www.mandrivaexpert.com."
+#~ msgstr ""
+#~ "Agar mendapat manfaat layanan Mandriva Online,\n"
+#~ "kami akan meng-upload konfigurasi Anda.\n"
+#~ "\n"
+#~ "Wizard kini akan mengirim informasi berikut ke Mandriva:\n"
+#~ "\n"
+#~ "1) daftar paket yang terinstall pada sistem Anda,\n"
+#~ "\n"
+#~ "2) konfigurasi perangkat keras Anda.\n"
+#~ "\n"
+#~ "Jika Anda merasa tak nyaman dengan ide ini, atau tak ingin memanfaatkan\n"
+#~ "layanan ini, tekan 'Batal'. Dengan menekan 'Lanjut', Anda mengizinkan "
+#~ "kami\n"
+#~ "memberi tahu Anda tentang update keamanan dan upgrade bermanfaat via "
+#~ "email.\n"
+#~ "Tambah lagi, Anda akan mendapat diskon servis di www.mandrivaexpert.com."
+
+#~ msgid "Connection problem"
+#~ msgstr "Masalah koneksi"
+
+#~ msgid "Problem occurs when uploading files, please try again"
+#~ msgstr "Masalah terjadi ketika mengupload file, harap mencoba lagi"
+
+#~ msgid "Create a Mandriva Online Account"
+#~ msgstr "Buat Account Mandriva Online"
+
+#~ msgid "Greeting:"
+#~ msgstr "Salam:"
+
+#~ msgid "First name:"
+#~ msgstr "Nama Depan:"
+
+#~ msgid "Last name:"
+#~ msgstr "Nama belakang:"
+
+#~ msgid "Confirm Password:"
+#~ msgstr "Konfirmasi Kata sandi:"
+
+#~ msgid ""
+#~ "The passwords do not match\n"
+#~ " Please try again\n"
+#~ msgstr ""
+#~ "Kata sandi tidak cocok\n"
+#~ "Harap coba lagi!\n"
+
+#~ msgid "Please fill in each field"
+#~ msgstr "Harap mengisi semua field"
+
+#~ msgid "Not a valid mail address!\n"
+#~ msgstr "Alamat mail tak valid!\n"
+
+#~ msgid "Creating account failed!"
+#~ msgstr "Pembuatan account gagal!"
+
+#~ msgid ""
+#~ "Mandriva Online Account successfully created.\n"
+#~ "Please click \"Next\" to authenticate and upload your configuration\n"
+#~ msgstr ""
+#~ "Account Mandriva Online berhasil dibuat.\n"
+#~ "Silahkan klik \"Lanjut\" untuk authentikasi dan mengupload konfigurasi "
+#~ "Anda\n"
+
+#~ msgid "Your upload was successful!"
+#~ msgstr "Upload Anda sukses!"
+
+#~ msgid ""
+#~ "From now you will receive on security and updates \n"
+#~ "announcements thanks to Mandriva Online."
+#~ msgstr ""
+#~ "Mulai saat ini Anda akan menerima pemberitahuan keamanan dan upgrade\n"
+#~ "dari Mandriva Online."
+
+#~ msgid ""
+#~ "Mandriva Online offers you the ability to automate the updates.\n"
+#~ "A program will run regulary in your system waiting for new updates\n"
+#~ msgstr ""
+#~ "Mandriva Online memberi Anda kemampuan update otomatis.\n"
+#~ "Sebuah program akan secara periodik menunggu update baru\n"
+
+#~ msgid "Congratulations"
+#~ msgstr "Selamat"
+
+#~ msgid "Your Mandriva Online account has been successfully configured\n"
+#~ msgstr "Account Mandriva Online Anda telah sukses dikonfigurasi\n"
+
+#~ msgid "Configuration uploaded successfully"
+#~ msgstr "Konfigurasi Anda telah sukses diupload"
+
+#~ msgid "Problem uploading configuration"
+#~ msgstr "Kesalahan mengupload konfigurasi"
+
+#~ msgid ""
+#~ "Cannot connect to Mandriva Online website: wrong login/password or router/"
+#~ "firewall bad settings"
+#~ msgstr ""
+#~ "Tidak bisa terhubung ke website Mandriva Online: login/kata sandi salah "
+#~ "atau settingrouter/firewall yang buruk"
+
 #~ msgid "  --applet\t\t- launch Mandriva Update.\n"
 #~ msgstr "  --applet\t\t- jalankan Mandriva Update.\n"
 
diff --git a/po/is.po b/po/is.po
index c9241a48..c174a573 100644
--- a/po/is.po
+++ b/po/is.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-09 16:26+0200\n"
+"POT-Creation-Date: 2008-02-21 18:21+0100\n"
 "PO-Revision-Date: 2006-09-12 22:16+0000\n"
 "Last-Translator: Pjetur G. Hjaltason <pjetur@pjetur.net>\n"
 "Language-Team: Icelandic <kde-isl@molar.is>\n"
@@ -18,17 +18,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:94
+#: ../mdkapplet:88
 #, fuzzy, c-format
 msgid "Will check updates at %s"
 msgstr "Athuga með uppfærslur"
 
-#: ../mdkapplet:103
+#: ../mdkapplet:97
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "Kerfið þitt er uppfært"
 
-#: ../mdkapplet:109
+#: ../mdkapplet:103
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -37,53 +37,43 @@ msgstr ""
 "Vandræði með þjónustustillingar, Vinsamlega athugið annála og sendið póst "
 "til support@mandrivaonline.com"
 
-#: ../mdkapplet:115
+#: ../mdkapplet:110
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "Augnablik, leita að tiltækum pökkum..."
 
-#: ../mdkapplet:121
+#: ../mdkapplet:116
 #, c-format
 msgid "New updates are available for your system"
 msgstr "Nýjar uppfærslur eru tiltækar fyrir kerfið þitt"
 
-#: ../mdkapplet:127
-#, c-format
-msgid "New bundles are available for your system"
-msgstr "Ný uppfærslusöfn eru tiltæk fyrir kerfið þitt"
-
-#: ../mdkapplet:133
-#, c-format
-msgid "Service is not configured. Please click on \"Configure the service\""
-msgstr "Þjónusta ekki skilgreind. Vinsamlega smellið á \"Stilla þjónustu\""
-
-#: ../mdkapplet:139
+#: ../mdkapplet:122
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "Netið er ekki tengt. Vinsamlega stillið nettengingu"
 
-#: ../mdkapplet:145
+#: ../mdkapplet:128
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "Þjónusta ekki virk, Vinsamlega smellið á \"Tengjast vefsvæði\""
 
-#: ../mdkapplet:151 ../mdkapplet:182
+#: ../mdkapplet:134 ../mdkapplet:165
 #, c-format
 msgid "urpmi database locked"
 msgstr "urpmi gagnagrunnur læstur"
 
-#: ../mdkapplet:157
+#: ../mdkapplet:140
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr "Útgáfa ekki þjónustuð (of gömul útgáfa, eða tilraunaútgáfa)"
 
-#: ../mdkapplet:163
+#: ../mdkapplet:146
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
 msgstr ""
 
-#: ../mdkapplet:169
+#: ../mdkapplet:152
 #, fuzzy, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -99,585 +89,131 @@ msgstr ""
 "\n"
 "Endurræstu síðan %s."
 
-#: ../mdkapplet:174
+#: ../mdkapplet:157
 #, c-format
 msgid "Enabled"
 msgstr "Virkur"
 
-#: ../mdkapplet:187
+#: ../mdkapplet:170
 #, fuzzy, c-format
 msgid "Error updating media"
 msgstr "Uppfæri miðil...\n"
 
-#: ../mdkapplet:202
+#: ../mdkapplet:185
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr "Athuga...Uppfærslur eru tiltækar\n"
 
-#: ../mdkapplet:207
+#: ../mdkapplet:190
 #, c-format
 msgid "Packages are up to date"
 msgstr "Pakkar eru uppfærðir"
 
-#: ../mdkapplet:212
+#: ../mdkapplet:195
 #, fuzzy, c-format
 msgid "Failed to open urpmi database"
 msgstr "gat ekki opnað rpmdb"
 
-#: ../mdkapplet:217 ../mdkapplet:324
+#: ../mdkapplet:200
 #, c-format
 msgid "Install updates"
 msgstr "Setja inn uppfærslur"
 
-#: ../mdkapplet:218
-#, c-format
-msgid "Configure the service"
-msgstr "Stilla þjónustu"
-
-#: ../mdkapplet:219
+#: ../mdkapplet:201
 #, c-format
 msgid "Check Updates"
 msgstr "Athuga með uppfærslur"
 
-#: ../mdkapplet:220 ../mdkapplet:327 ../mdkonline:114 ../mdkonline:155
-#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
-#, c-format
-msgid "Please wait"
-msgstr "Augnablik..."
-
-#: ../mdkapplet:220 ../mdkapplet:326 ../mdkapplet:327
-#, c-format
-msgid "Check updates"
-msgstr "Athuga með uppfærslur"
-
-#: ../mdkapplet:223 ../mdkapplet:648
-#, c-format
-msgid "Online WebSite"
-msgstr "Tengjast vefsvæði"
-
-#: ../mdkapplet:224
+#: ../mdkapplet:202
 #, c-format
 msgid "Configure Network"
 msgstr "Stilla nettengingu"
 
-#: ../mdkapplet:225
-#, c-format
-msgid "Configure Now!"
-msgstr "Stilla núna!"
-
-#: ../mdkapplet:313 ../mdkapplet:392
-#, c-format
-msgid "Mandriva Linux Updates Applet"
-msgstr "Mandriva Linux uppfærslubakkaforrit"
-
-#: ../mdkapplet:322
-#, c-format
-msgid "Actions"
-msgstr "Aðgerðir"
-
-#: ../mdkapplet:325
-#, c-format
-msgid "Configure"
-msgstr "Stilla"
-
-#: ../mdkapplet:329
-#, c-format
-msgid "See logs"
-msgstr "Skoða annála"
-
-#: ../mdkapplet:332
-#, c-format
-msgid "Status"
-msgstr "Staða"
-
-#: ../mdkapplet:336 ../mdkapplet:597
-#, c-format
-msgid "Close"
-msgstr "Loka"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Network Connection: "
-msgstr "Nettenging: "
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Up"
-msgstr "Upp"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Down"
-msgstr "Niður"
-
-#: ../mdkapplet:366
-#, c-format
-msgid "Last check: "
-msgstr "Síðasta athugun: "
-
-#: ../mdkapplet:367 ../mdkonline:145
-#, c-format
-msgid "Machine name:"
-msgstr "Vélarnafn:"
-
-#: ../mdkapplet:368
-#, c-format
-msgid "Updates: "
-msgstr "Uppfærslur: "
-
-#: ../mdkapplet:372
+#: ../mdkapplet:283
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Ræsi drakconnect\n"
 
-#: ../mdkapplet:375
+#: ../mdkapplet:286
 #, c-format
 msgid "Mandriva Online seems to be reinstalled, reloading applet ...."
 msgstr "Mandriva Online virðist vera enduruppsett, enduræsi smáforrit ...."
 
-#: ../mdkapplet:383
+#: ../mdkapplet:294
 #, c-format
 msgid "Launching MandrivaUpdate\n"
 msgstr "Ræsi MandrivaUpdate\n"
 
-#: ../mdkapplet:398
+#: ../mdkapplet:303
+#, c-format
+msgid "Mandriva Linux Updates Applet"
+msgstr "Mandriva Linux uppfærslubakkaforrit"
+
+#: ../mdkapplet:308
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Vel nýjar uppfærslur ...\n"
 
-#: ../mdkapplet:399
+#: ../mdkapplet:309
 #, c-format
 msgid "Connecting to"
 msgstr "Tengist við"
 
-#: ../mdkapplet:467 ../mdkupdate:159 ../mdkupdate:188
-#, c-format
-msgid "An error occurred"
-msgstr "Villa kom upp"
-
-#: ../mdkapplet:475
-#, c-format
-msgid "Development release not supported by service"
-msgstr "Tilraunaútgáfa, ekki studd af þjónustu"
-
-#: ../mdkapplet:476
-#, c-format
-msgid "Too old release not supported by service"
-msgstr "Of gömul útgáfa, ekki studd af þjónustu"
-
-#: ../mdkapplet:477
-#, c-format
-msgid "Unknown state"
-msgstr "Óþekkt staða"
-
-#: ../mdkapplet:478
-#, c-format
-msgid "Online services disabled. Contact Mandriva Online site\n"
-msgstr "Þjónusta ekki virk. hafið samband við Mandriva Online \n"
-
-#: ../mdkapplet:479
-#, c-format
-msgid "Wrong Password.\n"
-msgstr "Rangt lykilorð.\n"
-
-#: ../mdkapplet:480
-#, c-format
-msgid "Wrong Action or host or login.\n"
-msgstr "Röng aðgerð, vél eða auðkenni.\n"
-
-#: ../mdkapplet:481
-#, c-format
-msgid ""
-"Something is wrong with your network settings (check your route, firewall or "
-"proxy settings)\n"
-msgstr ""
-"Eitthvað er rangt við uppsetningu netsins (Athugaðu beinir, eldvegg eða "
-"uppsetningu vefsels)\n"
-
-#: ../mdkapplet:483
-#, c-format
-msgid ""
-"Problem occured while connecting to the server, please contact the support "
-"team"
-msgstr ""
-"Villa kom upp þegar reynt var að tengjast miðlara, vinsamlega hafðu samband "
-"við þjónustuhópinn"
-
-#: ../mdkapplet:487
-#, c-format
-msgid "Response from Mandriva Online server\n"
-msgstr "Svar frá Mandriva Online miðlara\n"
-
-#: ../mdkapplet:490
+#: ../mdkapplet:386
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Kerfi er uppfært\n"
 
-#: ../mdkapplet:527
-#, c-format
-msgid "No check"
-msgstr "Engin athugun"
-
-#: ../mdkapplet:541
-#, c-format
-msgid "Checking config file: Not present\n"
-msgstr "Athuga stillingaskrá: ekki til staðar\n"
-
-#: ../mdkapplet:544
+#: ../mdkapplet:415
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Athuga net: virðist aftengt\n"
 
-#: ../mdkapplet:587
-#, c-format
-msgid "Logs"
-msgstr "Annálar"
-
-#: ../mdkapplet:603
+#: ../mdkapplet:457 ../mdkupdate:118 ../mdkupdate:164
 #, c-format
-msgid "Clear"
-msgstr "Hreinsa"
+msgid "Warning"
+msgstr "Aðvörun"
 
-#: ../mdkapplet:629
+#: ../mdkapplet:468
 #, c-format
 msgid "About..."
 msgstr "Um..."
 
-#: ../mdkapplet:631
+#: ../mdkapplet:472
 #, c-format
 msgid "Mandriva Online %s"
 msgstr "Mandriva Online %s"
 
-#: ../mdkapplet:635
+#: ../mdkapplet:473
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Höfundaréttur (C) %s Mandriva"
 
-#: ../mdkapplet:647
+#: ../mdkapplet:476
 #, c-format
 msgid "Mandriva Online gives access to Mandriva web services."
 msgstr "Mandriva Online gefur aðgang að Mandriva vefþjónustu."
 
-#: ../mdkapplet:655
-#, c-format
-msgid "Always launch on startup"
-msgstr "Ræsa alltaf þegar kveikt á vél"
-
-#: ../mdkapplet:657
-#, c-format
-msgid "Quit"
-msgstr "Hætta"
-
-#: ../mdkonline:58
-#, c-format
-msgid ""
-"mdonline version %s\n"
-"Copyright (C) %s Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"mdonline útgáfa %s\n"
-"Höfundaréttur © %s Mandriva.\n"
-"þetta er frjáls hugbúnaður og má dreifa samkvæmt skilmálum GNU GPL.\n"
-"\n"
-"notkun:\n"
-
-#: ../mdkonline:63 ../mdkupdate:73
-#, c-format
-msgid "  --help\t\t- print this help message.\n"
-msgstr "  --help\t\t- prenta þessa hjálp.\n"
-
-#: ../mdkonline:64
-#, c-format
-msgid "  --box=\t\t\t- hostname.\n"
-msgstr "  --box=\t\t\t- vélarnafn.\n"
-
-#: ../mdkonline:65
-#, c-format
-msgid "  --country\t\t\t- name of country of the user. \n"
-msgstr "  --country\t\t\t- Nafn lands notanda. \n"
-
-#: ../mdkonline:66
-#, c-format
-msgid "  --interactive\t\t- use the interactive mode.\n"
-msgstr "  --interactive\t\t- nota gagnvirkan ham.\n"
-
-#: ../mdkonline:67
-#, c-format
-msgid "  --nointeractive\t- use the non-interactive mode.\n"
-msgstr "  --nointeractive\t- ekki nota gagnvirkan ham.\n"
-
-#: ../mdkonline:68
-#, c-format
-msgid "  --login=\t\t     - login name of the user.\n"
-msgstr "  --login=\t\t     - notandanafn.\n"
-
-#: ../mdkonline:69
-#, c-format
-msgid "  --pass=\t\t\t- password  of the user.\n"
-msgstr "  --pass=\t\t\t- lykilorð notanda.\n"
-
-#: ../mdkonline:87 ../mdkonline:120
-#, c-format
-msgid "Mandriva Online"
-msgstr "Mandriva Online"
-
-#: ../mdkonline:90
-#, c-format
-msgid "I already have an account"
-msgstr "Ég er nú þegar áskrifandi"
-
-#: ../mdkonline:91
-#, c-format
-msgid "I want to subscribe"
-msgstr "Ég vil gerast áskrifandi"
-
-#: ../mdkonline:96
-#, c-format
-msgid "Mr."
-msgstr "Hr."
-
-#: ../mdkonline:96
-#, c-format
-msgid "Mrs."
-msgstr "Frk."
-
-#: ../mdkonline:96
-#, c-format
-msgid "Ms."
-msgstr "Frú."
-
-#: ../mdkonline:114
-#, c-format
-msgid "Reading configuration\n"
-msgstr "Les stillingar\n"
-
-#: ../mdkonline:123
-#, c-format
-msgid ""
-"This assistant will help you to upload your configuration\n"
-"(packages, hardware configuration) to a centralized database in\n"
-"order to keep you informed about security updates and useful upgrades.\n"
-msgstr ""
-"Þessi ráðgjafi hjálpar þér við að senda inn stillingar þínar\n"
-"(pakka, vélbúnaðarstillingar) í miðlægan gagnagrunn svo\n"
-"hæg sé að veita þér upplýsingar um öryggisuppfærslur og\n"
-"nytsamlegar uppfærslur.\n"
-
-#: ../mdkonline:131
-#, c-format
-msgid "Account creation or authentication"
-msgstr "Stofna áskrift eða auðkenna"
-
-#: ../mdkonline:136
-#, c-format
-msgid "Enter your Mandriva Online login, password and machine name:"
-msgstr "Skráðu Mandriva Online notandanafn, lykilorð og vélarnafn:"
-
-#: ../mdkonline:142 ../mdkonline:195
-#, c-format
-msgid "Email address:"
-msgstr "Netfang:"
-
-#: ../mdkonline:143
-#, c-format
-msgid "Country"
-msgstr "Land"
-
-#: ../mdkonline:144 ../mdkonline:196
-#, c-format
-msgid "Password:"
-msgstr "Lykilorð:"
-
-#: ../mdkonline:146
-#, c-format
-msgid "Machine description:"
-msgstr "Lýsing vélar:"
-
-#: ../mdkonline:147
-#, c-format
-msgid "(Ex: My Home Office's Computer)"
-msgstr "(T.d: Heima-vinnu-vélin mín)"
-
-#: ../mdkonline:152 ../mdkonline:159 ../mdkonline:180 ../mdkonline:204
-#: ../mdkonline:208 ../mdkonline:212 ../mdkonline:217 ../mdkupdate:141
-#: ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
-#, c-format
-msgid "Error"
-msgstr "Villa"
-
-#: ../mdkonline:152
-#, c-format
-msgid "Machine name must be 1 to 40 alphanumerical characters"
-msgstr ""
-"Vélarnafn verður að vera 1 til 40 stafir og má aðeins innihalda bókstafi og "
-"tölur"
-
-#: ../mdkonline:155
-#, c-format
-msgid "Connecting to Mandriva Online website..."
-msgstr "Tengist Mandriva Online vefsíðu..."
-
-#: ../mdkonline:167
-#, c-format
-msgid ""
-"In order to benefit from Mandriva Online services,\n"
-"we are about to upload your configuration.\n"
-"\n"
-"The Wizard will now send the following information to Mandriva:\n"
-"\n"
-"1) the list of packages you have installed on your system,\n"
-"\n"
-"2) your hardware configuration.\n"
-"\n"
-"If you feel uncomfortable by that idea, or do not want to benefit from this "
-"service,\n"
-"please press 'Cancel'. By pressing 'Next', you allow us to keep you "
-"informed\n"
-"about security updates and useful upgrades via personalized email alerts.\n"
-"Furthermore, you benefit from discounted paid support services on\n"
-"www.mandrivaexpert.com."
-msgstr ""
-"Til að geta notið þjónustu Mandriva Online,\n"
-"Þá munum við nú senda upplýsingar um stillingar þínar.\n"
-"\n"
-"Þessi ráðgjafi mun senda eftirfarandi upplýsingar til Mandriva:\n"
-"\n"
-"1) lista uppsettra pakka á vélinni þinni,\n"
-"\n"
-"2) vélbúnaðaruppsetningu.\n"
-"\n"
-"Ef þér þykir þetta óþægilegt, eða vilt ekki njóta þessarar þjónustu,\n"
-"vinsamlega ýttu á 'Hætta við'. Með því að ýta á 'Næsta' hjálpar þú okkur\n"
-"við að upplýsa þig um öryggisuppfærslur og nytsamar uppfærslur með\n"
-"persónulegum tölvupósti.\n"
-"Þess utan færð þú afslátt af þjónustu sem þú kaupir á\n"
-"www.mandrivaexpert.com."
-
-#: ../mdkonline:180
-#, c-format
-msgid "Connection problem"
-msgstr "Tenging mistókst"
-
-#: ../mdkonline:180
-#, c-format
-msgid "Problem occurs when uploading files, please try again"
-msgstr "Vandamál kom upp þegar skrár voru sóttar, vinsamlega reyndu aftur"
-
-#: ../mdkonline:187
-#, c-format
-msgid "Create a Mandriva Online Account"
-msgstr "Skrá sig hjá Mandriva Online"
-
-#. -PO: that is for things like "Mr", "Ms",...
-#: ../mdkonline:192
-#, c-format
-msgid "Greeting:"
-msgstr "Kveðja:"
-
-#: ../mdkonline:193
-#, c-format
-msgid "First name:"
-msgstr "Eiginnafn:"
-
-#: ../mdkonline:194
-#, c-format
-msgid "Last name:"
-msgstr "Kenninafn:"
-
-#: ../mdkonline:197
-#, c-format
-msgid "Confirm Password:"
-msgstr "Staðfestu lykilorð:"
-
-#: ../mdkonline:204
-#, c-format
-msgid ""
-"The passwords do not match\n"
-" Please try again\n"
-msgstr ""
-"Lykilorðin eru ekki eins\n"
-" Vinsamlega reyndu aftur\n"
-
-#: ../mdkonline:208
-#, c-format
-msgid "Please fill in each field"
-msgstr "Vinsamlega fyllið í öll svæði"
-
-#: ../mdkonline:212
-#, c-format
-msgid "Not a valid mail address!\n"
-msgstr "Ekki gilt netfang!\n"
-
-#: ../mdkonline:217
-#, c-format
-msgid "Creating account failed!"
-msgstr "Ekki tókst að búa til auðkenni!"
-
-#: ../mdkonline:225
-#, c-format
-msgid ""
-"Mandriva Online Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
-msgstr ""
-"Það tókst að búa til Mandriva Online auðkenni.\n"
-"Vinsamlega smelltu á \"Næst\" til að auðkenna þig og senda inn stillingar "
-"þinar\n"
-
-#: ../mdkonline:229
-#, c-format
-msgid "Your upload was successful!"
-msgstr "Tókst að senda upplýsingar!"
-
-#: ../mdkonline:229
+#: ../mdkapplet:478
 #, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandriva Online."
-msgstr ""
-"Héðan í frá munt þú fá tilkynningar um öryggisuppfærslur \n"
-"og lagfæringar, þökk sé Mandriva Online."
+msgid "Online WebSite"
+msgstr "Tengjast vefsvæði"
 
-#: ../mdkonline:229
+#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
+#: ../mdkapplet:483
 #, c-format
-msgid ""
-"Mandriva Online offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
+msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
-"Mandriva Online býður upp á þann möguleika að uppfæra sjálfvirkt.\n"
-"Forrit mun keyra reglulega á vélinni þinni til að athuga með nýjar "
-"uppfærslur\n"
-
-#: ../mdkonline:238
-#, c-format
-msgid "Congratulations"
-msgstr "Til hamingju"
-
-#: ../mdkonline:238
-#, c-format
-msgid "Your Mandriva Online account has been successfully configured\n"
-msgstr "Þú ert nú skráður hjá Mandriva Online\n"
-
-#: ../mdkonline:253
-#, c-format
-msgid "Configuration uploaded successfully"
-msgstr "Tókst að senda stillingar"
 
-#: ../mdkonline:254
+#: ../mdkapplet:492
 #, c-format
-msgid "Problem uploading configuration"
-msgstr "Vandamál við að senda stillingar"
+msgid "Always launch on startup"
+msgstr "Ræsa alltaf þegar kveikt á vél"
 
-#: ../mdkonline:256
+#: ../mdkapplet:494
 #, c-format
-msgid ""
-"Cannot connect to Mandriva Online website: wrong login/password or router/"
-"firewall bad settings"
-msgstr ""
-"Get ekki tengst Mandriva Online vefsíðunni: rangur notandi/lykilorð eða "
-"vandamál með beinir/eldvegg"
+msgid "Quit"
+msgstr "Hætta"
 
 #: ../mdkonline.pm:207
 #, c-format
@@ -825,6 +361,11 @@ msgstr ""
 "\n"
 "notkun:\n"
 
+#: ../mdkupdate:73
+#, c-format
+msgid "  --help\t\t- print this help message.\n"
+msgstr "  --help\t\t- prenta þessa hjálp.\n"
+
 #: ../mdkupdate:74
 #, c-format
 msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
@@ -854,11 +395,6 @@ msgstr ""
 "  --bundle file.bundle\t- vinna úr og setja inn pakka samkvæmt lýsigögnum "
 "uppfærslusafni.\n"
 
-#: ../mdkupdate:118 ../mdkupdate:164
-#, c-format
-msgid "Warning"
-msgstr "Aðvörun"
-
 #. -PO: here Live Install is currently *NOT* translated on the desktop, so it's better to keep as it:
 #: ../mdkupdate:120
 #, c-format
@@ -869,11 +405,21 @@ msgstr ""
 "Þú verður fyrst að setja kerfið inn á diskinn þinn með \"Live Install\" "
 "ráðgjafanum."
 
+#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
+#, c-format
+msgid "Please wait"
+msgstr "Augnablik..."
+
 #: ../mdkupdate:123 ../mdkupdate:174
 #, c-format
 msgid "Preparing..."
 msgstr "Undirbý..."
 
+#: ../mdkupdate:141 ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
+#, c-format
+msgid "Error"
+msgstr "Villa"
+
 #: ../mdkupdate:141
 #, c-format
 msgid ""
@@ -885,6 +431,11 @@ msgstr ""
 "\n"
 "%s"
 
+#: ../mdkupdate:159 ../mdkupdate:188
+#, c-format
+msgid "An error occurred"
+msgstr "Villa kom upp"
+
 #: ../mdkupdate:164
 #, c-format
 msgid ""
@@ -913,6 +464,310 @@ msgstr "Set inn pakka...\n"
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "Gat ekki uppfært pakka frá uppfærslumiðli.\n"
 
+#~ msgid "New bundles are available for your system"
+#~ msgstr "Ný uppfærslusöfn eru tiltæk fyrir kerfið þitt"
+
+#~ msgid "Service is not configured. Please click on \"Configure the service\""
+#~ msgstr "Þjónusta ekki skilgreind. Vinsamlega smellið á \"Stilla þjónustu\""
+
+#~ msgid "Configure the service"
+#~ msgstr "Stilla þjónustu"
+
+#~ msgid "Check updates"
+#~ msgstr "Athuga með uppfærslur"
+
+#~ msgid "Configure Now!"
+#~ msgstr "Stilla núna!"
+
+#~ msgid "Actions"
+#~ msgstr "Aðgerðir"
+
+#~ msgid "Configure"
+#~ msgstr "Stilla"
+
+#~ msgid "See logs"
+#~ msgstr "Skoða annála"
+
+#~ msgid "Status"
+#~ msgstr "Staða"
+
+#~ msgid "Close"
+#~ msgstr "Loka"
+
+#~ msgid "Network Connection: "
+#~ msgstr "Nettenging: "
+
+#~ msgid "Up"
+#~ msgstr "Upp"
+
+#~ msgid "Down"
+#~ msgstr "Niður"
+
+#~ msgid "Last check: "
+#~ msgstr "Síðasta athugun: "
+
+#~ msgid "Machine name:"
+#~ msgstr "Vélarnafn:"
+
+#~ msgid "Updates: "
+#~ msgstr "Uppfærslur: "
+
+#~ msgid "Development release not supported by service"
+#~ msgstr "Tilraunaútgáfa, ekki studd af þjónustu"
+
+#~ msgid "Too old release not supported by service"
+#~ msgstr "Of gömul útgáfa, ekki studd af þjónustu"
+
+#~ msgid "Unknown state"
+#~ msgstr "Óþekkt staða"
+
+#~ msgid "Online services disabled. Contact Mandriva Online site\n"
+#~ msgstr "Þjónusta ekki virk. hafið samband við Mandriva Online \n"
+
+#~ msgid "Wrong Password.\n"
+#~ msgstr "Rangt lykilorð.\n"
+
+#~ msgid "Wrong Action or host or login.\n"
+#~ msgstr "Röng aðgerð, vél eða auðkenni.\n"
+
+#~ msgid ""
+#~ "Something is wrong with your network settings (check your route, firewall "
+#~ "or proxy settings)\n"
+#~ msgstr ""
+#~ "Eitthvað er rangt við uppsetningu netsins (Athugaðu beinir, eldvegg eða "
+#~ "uppsetningu vefsels)\n"
+
+#~ msgid ""
+#~ "Problem occured while connecting to the server, please contact the "
+#~ "support team"
+#~ msgstr ""
+#~ "Villa kom upp þegar reynt var að tengjast miðlara, vinsamlega hafðu "
+#~ "samband við þjónustuhópinn"
+
+#~ msgid "Response from Mandriva Online server\n"
+#~ msgstr "Svar frá Mandriva Online miðlara\n"
+
+#~ msgid "No check"
+#~ msgstr "Engin athugun"
+
+#~ msgid "Checking config file: Not present\n"
+#~ msgstr "Athuga stillingaskrá: ekki til staðar\n"
+
+#~ msgid "Logs"
+#~ msgstr "Annálar"
+
+#~ msgid "Clear"
+#~ msgstr "Hreinsa"
+
+#~ msgid ""
+#~ "mdonline version %s\n"
+#~ "Copyright (C) %s Mandriva.\n"
+#~ "This is free software and may be redistributed under the terms of the GNU "
+#~ "GPL.\n"
+#~ "\n"
+#~ "usage:\n"
+#~ msgstr ""
+#~ "mdonline útgáfa %s\n"
+#~ "Höfundaréttur © %s Mandriva.\n"
+#~ "þetta er frjáls hugbúnaður og má dreifa samkvæmt skilmálum GNU GPL.\n"
+#~ "\n"
+#~ "notkun:\n"
+
+#~ msgid "  --box=\t\t\t- hostname.\n"
+#~ msgstr "  --box=\t\t\t- vélarnafn.\n"
+
+#~ msgid "  --country\t\t\t- name of country of the user. \n"
+#~ msgstr "  --country\t\t\t- Nafn lands notanda. \n"
+
+#~ msgid "  --interactive\t\t- use the interactive mode.\n"
+#~ msgstr "  --interactive\t\t- nota gagnvirkan ham.\n"
+
+#~ msgid "  --nointeractive\t- use the non-interactive mode.\n"
+#~ msgstr "  --nointeractive\t- ekki nota gagnvirkan ham.\n"
+
+#~ msgid "  --login=\t\t     - login name of the user.\n"
+#~ msgstr "  --login=\t\t     - notandanafn.\n"
+
+#~ msgid "  --pass=\t\t\t- password  of the user.\n"
+#~ msgstr "  --pass=\t\t\t- lykilorð notanda.\n"
+
+#~ msgid "Mandriva Online"
+#~ msgstr "Mandriva Online"
+
+#~ msgid "I already have an account"
+#~ msgstr "Ég er nú þegar áskrifandi"
+
+#~ msgid "I want to subscribe"
+#~ msgstr "Ég vil gerast áskrifandi"
+
+#~ msgid "Mr."
+#~ msgstr "Hr."
+
+#~ msgid "Mrs."
+#~ msgstr "Frk."
+
+#~ msgid "Ms."
+#~ msgstr "Frú."
+
+#~ msgid "Reading configuration\n"
+#~ msgstr "Les stillingar\n"
+
+#~ msgid ""
+#~ "This assistant will help you to upload your configuration\n"
+#~ "(packages, hardware configuration) to a centralized database in\n"
+#~ "order to keep you informed about security updates and useful upgrades.\n"
+#~ msgstr ""
+#~ "Þessi ráðgjafi hjálpar þér við að senda inn stillingar þínar\n"
+#~ "(pakka, vélbúnaðarstillingar) í miðlægan gagnagrunn svo\n"
+#~ "hæg sé að veita þér upplýsingar um öryggisuppfærslur og\n"
+#~ "nytsamlegar uppfærslur.\n"
+
+#~ msgid "Account creation or authentication"
+#~ msgstr "Stofna áskrift eða auðkenna"
+
+#~ msgid "Enter your Mandriva Online login, password and machine name:"
+#~ msgstr "Skráðu Mandriva Online notandanafn, lykilorð og vélarnafn:"
+
+#~ msgid "Email address:"
+#~ msgstr "Netfang:"
+
+#~ msgid "Country"
+#~ msgstr "Land"
+
+#~ msgid "Password:"
+#~ msgstr "Lykilorð:"
+
+#~ msgid "Machine description:"
+#~ msgstr "Lýsing vélar:"
+
+#~ msgid "(Ex: My Home Office's Computer)"
+#~ msgstr "(T.d: Heima-vinnu-vélin mín)"
+
+#~ msgid "Machine name must be 1 to 40 alphanumerical characters"
+#~ msgstr ""
+#~ "Vélarnafn verður að vera 1 til 40 stafir og má aðeins innihalda bókstafi "
+#~ "og tölur"
+
+#~ msgid "Connecting to Mandriva Online website..."
+#~ msgstr "Tengist Mandriva Online vefsíðu..."
+
+#~ msgid ""
+#~ "In order to benefit from Mandriva Online services,\n"
+#~ "we are about to upload your configuration.\n"
+#~ "\n"
+#~ "The Wizard will now send the following information to Mandriva:\n"
+#~ "\n"
+#~ "1) the list of packages you have installed on your system,\n"
+#~ "\n"
+#~ "2) your hardware configuration.\n"
+#~ "\n"
+#~ "If you feel uncomfortable by that idea, or do not want to benefit from "
+#~ "this service,\n"
+#~ "please press 'Cancel'. By pressing 'Next', you allow us to keep you "
+#~ "informed\n"
+#~ "about security updates and useful upgrades via personalized email "
+#~ "alerts.\n"
+#~ "Furthermore, you benefit from discounted paid support services on\n"
+#~ "www.mandrivaexpert.com."
+#~ msgstr ""
+#~ "Til að geta notið þjónustu Mandriva Online,\n"
+#~ "Þá munum við nú senda upplýsingar um stillingar þínar.\n"
+#~ "\n"
+#~ "Þessi ráðgjafi mun senda eftirfarandi upplýsingar til Mandriva:\n"
+#~ "\n"
+#~ "1) lista uppsettra pakka á vélinni þinni,\n"
+#~ "\n"
+#~ "2) vélbúnaðaruppsetningu.\n"
+#~ "\n"
+#~ "Ef þér þykir þetta óþægilegt, eða vilt ekki njóta þessarar þjónustu,\n"
+#~ "vinsamlega ýttu á 'Hætta við'. Með því að ýta á 'Næsta' hjálpar þú okkur\n"
+#~ "við að upplýsa þig um öryggisuppfærslur og nytsamar uppfærslur með\n"
+#~ "persónulegum tölvupósti.\n"
+#~ "Þess utan færð þú afslátt af þjónustu sem þú kaupir á\n"
+#~ "www.mandrivaexpert.com."
+
+#~ msgid "Connection problem"
+#~ msgstr "Tenging mistókst"
+
+#~ msgid "Problem occurs when uploading files, please try again"
+#~ msgstr "Vandamál kom upp þegar skrár voru sóttar, vinsamlega reyndu aftur"
+
+#~ msgid "Create a Mandriva Online Account"
+#~ msgstr "Skrá sig hjá Mandriva Online"
+
+#~ msgid "Greeting:"
+#~ msgstr "Kveðja:"
+
+#~ msgid "First name:"
+#~ msgstr "Eiginnafn:"
+
+#~ msgid "Last name:"
+#~ msgstr "Kenninafn:"
+
+#~ msgid "Confirm Password:"
+#~ msgstr "Staðfestu lykilorð:"
+
+#~ msgid ""
+#~ "The passwords do not match\n"
+#~ " Please try again\n"
+#~ msgstr ""
+#~ "Lykilorðin eru ekki eins\n"
+#~ " Vinsamlega reyndu aftur\n"
+
+#~ msgid "Please fill in each field"
+#~ msgstr "Vinsamlega fyllið í öll svæði"
+
+#~ msgid "Not a valid mail address!\n"
+#~ msgstr "Ekki gilt netfang!\n"
+
+#~ msgid "Creating account failed!"
+#~ msgstr "Ekki tókst að búa til auðkenni!"
+
+#~ msgid ""
+#~ "Mandriva Online Account successfully created.\n"
+#~ "Please click \"Next\" to authenticate and upload your configuration\n"
+#~ msgstr ""
+#~ "Það tókst að búa til Mandriva Online auðkenni.\n"
+#~ "Vinsamlega smelltu á \"Næst\" til að auðkenna þig og senda inn stillingar "
+#~ "þinar\n"
+
+#~ msgid "Your upload was successful!"
+#~ msgstr "Tókst að senda upplýsingar!"
+
+#~ msgid ""
+#~ "From now you will receive on security and updates \n"
+#~ "announcements thanks to Mandriva Online."
+#~ msgstr ""
+#~ "Héðan í frá munt þú fá tilkynningar um öryggisuppfærslur \n"
+#~ "og lagfæringar, þökk sé Mandriva Online."
+
+#~ msgid ""
+#~ "Mandriva Online offers you the ability to automate the updates.\n"
+#~ "A program will run regulary in your system waiting for new updates\n"
+#~ msgstr ""
+#~ "Mandriva Online býður upp á þann möguleika að uppfæra sjálfvirkt.\n"
+#~ "Forrit mun keyra reglulega á vélinni þinni til að athuga með nýjar "
+#~ "uppfærslur\n"
+
+#~ msgid "Congratulations"
+#~ msgstr "Til hamingju"
+
+#~ msgid "Your Mandriva Online account has been successfully configured\n"
+#~ msgstr "Þú ert nú skráður hjá Mandriva Online\n"
+
+#~ msgid "Configuration uploaded successfully"
+#~ msgstr "Tókst að senda stillingar"
+
+#~ msgid "Problem uploading configuration"
+#~ msgstr "Vandamál við að senda stillingar"
+
+#~ msgid ""
+#~ "Cannot connect to Mandriva Online website: wrong login/password or router/"
+#~ "firewall bad settings"
+#~ msgstr ""
+#~ "Get ekki tengst Mandriva Online vefsíðunni: rangur notandi/lykilorð eða "
+#~ "vandamál með beinir/eldvegg"
+
 #~ msgid "  --applet\t\t- launch Mandriva Update.\n"
 #~ msgstr "  --applet\t\t- ræsa Mandriva Uppfærslur.\n"
 
diff --git a/po/it.po b/po/it.po
index 76b3bcc7..465c7616 100644
--- a/po/it.po
+++ b/po/it.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: it\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-09 16:26+0200\n"
+"POT-Creation-Date: 2008-02-21 18:21+0100\n"
 "PO-Revision-Date: 2007-09-13 21:58+0200\n"
 "Last-Translator: Andrea Celli <andrea.celli@libero.it>\n"
 "Language-Team: Italian <timl@freelists.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:94
+#: ../mdkapplet:88
 #, c-format
 msgid "Will check updates at %s"
 msgstr "Controlla aggiornamenti per %s"
 
-#: ../mdkapplet:103
+#: ../mdkapplet:97
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "Il sistema è aggiornato"
 
-#: ../mdkapplet:109
+#: ../mdkapplet:103
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -40,54 +40,45 @@ msgstr ""
 "Problema di configurazione del server. Controlla i log e scrivi a "
 "support@mandrivaonline.com"
 
-#: ../mdkapplet:115
+#: ../mdkapplet:110
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "Attendere, è in corso la ricerca dei pacchetti disponibili..."
 
-#: ../mdkapplet:121
+#: ../mdkapplet:116
 #, c-format
 msgid "New updates are available for your system"
 msgstr "Nuovi aggiornamenti disponibili per il tuo sistema"
 
-#: ../mdkapplet:127
-#, c-format
-msgid "New bundles are available for your system"
-msgstr "Nuovi pacchetti disponibili per il tuo sistema"
-
-#: ../mdkapplet:133
-#, c-format
-msgid "Service is not configured. Please click on \"Configure the service\""
-msgstr "Servizio non configurato. Clicca su \"Configura il servizio\""
-
-#: ../mdkapplet:139
+#: ../mdkapplet:122
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "La rete è disattivata. Prova a riconfigurare la rete"
 
-#: ../mdkapplet:145
+#: ../mdkapplet:128
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "Servizio non attivato. Clicca su \"Sito web online\""
 
-#: ../mdkapplet:151 ../mdkapplet:182
+#: ../mdkapplet:134 ../mdkapplet:165
 #, c-format
 msgid "urpmi database locked"
 msgstr "database urpmi bloccato"
 
-#: ../mdkapplet:157
+#: ../mdkapplet:140
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr "Versione non supportata (troppo vecchia o di sviluppo)"
 
-#: ../mdkapplet:163
+#: ../mdkapplet:146
 #, c-format
-msgid "No medium found. You must add some media through 'Software Media Manager'."
+msgid ""
+"No medium found. You must add some media through 'Software Media Manager'."
 msgstr ""
 "Nessun supporto trovato.\n"
 "Bisogna aggiungerne uno usando la \"Gestione sorgenti software\"."
 
-#: ../mdkapplet:169
+#: ../mdkapplet:152
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -104,582 +95,132 @@ msgstr ""
 "\n"
 "Poi riavvia %s."
 
-#: ../mdkapplet:174
+#: ../mdkapplet:157
 #, c-format
 msgid "Enabled"
 msgstr "Abilitata"
 
-#: ../mdkapplet:187
+#: ../mdkapplet:170
 #, c-format
 msgid "Error updating media"
 msgstr "Errore nell'aggiornare il supporto"
 
-#: ../mdkapplet:202
+#: ../mdkapplet:185
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr "Sto controllando... Ci sono aggiornamenti disponibili\n"
 
-#: ../mdkapplet:207
+#: ../mdkapplet:190
 #, c-format
 msgid "Packages are up to date"
 msgstr "I pacchetti sono aggiornati"
 
-#: ../mdkapplet:212
+#: ../mdkapplet:195
 #, c-format
 msgid "Failed to open urpmi database"
 msgstr "Impossibile aprire il database urpmi"
 
-#: ../mdkapplet:217 ../mdkapplet:324
+#: ../mdkapplet:200
 #, c-format
 msgid "Install updates"
 msgstr "Installa aggiornamenti"
 
-#: ../mdkapplet:218
-#, c-format
-msgid "Configure the service"
-msgstr "Configura il servizio"
-
-#: ../mdkapplet:219
+#: ../mdkapplet:201
 #, c-format
 msgid "Check Updates"
 msgstr "Controlla aggiornamenti"
 
-#: ../mdkapplet:220 ../mdkapplet:327 ../mdkonline:114 ../mdkonline:155
-#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
-#, c-format
-msgid "Please wait"
-msgstr "Attendere prego"
-
-#: ../mdkapplet:220 ../mdkapplet:326 ../mdkapplet:327
-#, c-format
-msgid "Check updates"
-msgstr "Controlla aggiornamenti"
-
-#: ../mdkapplet:223 ../mdkapplet:648
-#, c-format
-msgid "Online WebSite"
-msgstr "Sito online"
-
-#: ../mdkapplet:224
+#: ../mdkapplet:202
 #, c-format
 msgid "Configure Network"
 msgstr "Configura la rete"
 
-#: ../mdkapplet:225
-#, c-format
-msgid "Configure Now!"
-msgstr "Configura adesso!"
-
-#: ../mdkapplet:313 ../mdkapplet:392
-#, c-format
-msgid "Mandriva Linux Updates Applet"
-msgstr "Applet aggiornamenti Mandriva Linux"
-
-#: ../mdkapplet:322
-#, c-format
-msgid "Actions"
-msgstr "Azioni"
-
-#: ../mdkapplet:325
-#, c-format
-msgid "Configure"
-msgstr "Configura"
-
-#: ../mdkapplet:329
-#, c-format
-msgid "See logs"
-msgstr "Visualizza i log"
-
-#: ../mdkapplet:332
-#, c-format
-msgid "Status"
-msgstr "Stato"
-
-#: ../mdkapplet:336 ../mdkapplet:597
-#, c-format
-msgid "Close"
-msgstr "Chiudi"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Network Connection: "
-msgstr "Connessione alla rete: "
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Up"
-msgstr "Attiva"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Down"
-msgstr "Disattiva"
-
-#: ../mdkapplet:366
-#, c-format
-msgid "Last check: "
-msgstr "Ultimo controllo: "
-
-#: ../mdkapplet:367 ../mdkonline:145
-#, c-format
-msgid "Machine name:"
-msgstr "Nome computer:"
-
-#: ../mdkapplet:368
-#, c-format
-msgid "Updates: "
-msgstr "Aggiornamenti: "
-
-#: ../mdkapplet:372
+#: ../mdkapplet:283
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Sto avviando drakconnect\n"
 
-#: ../mdkapplet:375
+#: ../mdkapplet:286
 #, c-format
 msgid "Mandriva Online seems to be reinstalled, reloading applet ...."
-msgstr "Sembra che Mandriva Online sia stato reinstallato, ricarico l'applet ..."
+msgstr ""
+"Sembra che Mandriva Online sia stato reinstallato, ricarico l'applet ..."
 
-#: ../mdkapplet:383
+#: ../mdkapplet:294
 #, c-format
 msgid "Launching MandrivaUpdate\n"
 msgstr "Sto avviando MandrivaUpdate\n"
 
-#: ../mdkapplet:398
+#: ../mdkapplet:303
+#, c-format
+msgid "Mandriva Linux Updates Applet"
+msgstr "Applet aggiornamenti Mandriva Linux"
+
+#: ../mdkapplet:308
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Calcolo dei nuovi aggiornamenti in corso...\n"
 
-#: ../mdkapplet:399
+#: ../mdkapplet:309
 #, c-format
 msgid "Connecting to"
 msgstr "Connessione in corso con"
 
-#: ../mdkapplet:467 ../mdkupdate:159 ../mdkupdate:188
-#, c-format
-msgid "An error occurred"
-msgstr "Si è verificato un errore"
-
-#: ../mdkapplet:475
-#, c-format
-msgid "Development release not supported by service"
-msgstr "Versione di sviluppo non supportata dal servizio"
-
-#: ../mdkapplet:476
-#, c-format
-msgid "Too old release not supported by service"
-msgstr "Release troppo vecchia non supportata dal servizio"
-
-#: ../mdkapplet:477
-#, c-format
-msgid "Unknown state"
-msgstr "Stato ignoto"
-
-#: ../mdkapplet:478
-#, c-format
-msgid "Online services disabled. Contact Mandriva Online site\n"
-msgstr "Servizi online disabilitati .Contatta il sito Mandriva Online\n"
-
-#: ../mdkapplet:479
-#, c-format
-msgid "Wrong Password.\n"
-msgstr "Password errata.\n"
-
-#: ../mdkapplet:480
-#, c-format
-msgid "Wrong Action or host or login.\n"
-msgstr "Azione, host o login errati.\n"
-
-#: ../mdkapplet:481
-#, c-format
-msgid ""
-"Something is wrong with your network settings (check your route, firewall or "
-"proxy settings)\n"
-msgstr ""
-"C'è qualcosa di sbagliato nei tuoi parametri di rete (controlla i percorsi, "
-"il firewall o le impostazioni del proxy)\n"
-
-#: ../mdkapplet:483
-#, c-format
-msgid ""
-"Problem occured while connecting to the server, please contact the support "
-"team"
-msgstr ""
-"C'è stato un problema cercando di contattare il server. Contatta il team di "
-"supporto"
-
-#: ../mdkapplet:487
-#, c-format
-msgid "Response from Mandriva Online server\n"
-msgstr "Risposta del server Mandriva Online\n"
-
-#: ../mdkapplet:490
+#: ../mdkapplet:386
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Il sistema è aggiornato\n"
 
-#: ../mdkapplet:527
-#, c-format
-msgid "No check"
-msgstr "Nessun controllo"
-
-#: ../mdkapplet:541
-#, c-format
-msgid "Checking config file: Not present\n"
-msgstr "Controllo il file di configurazione: Non presente\n"
-
-#: ../mdkapplet:544
+#: ../mdkapplet:415
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Controllo la rete: sembra disattivata\n"
 
-#: ../mdkapplet:587
-#, c-format
-msgid "Logs"
-msgstr "Log"
-
-#: ../mdkapplet:603
+#: ../mdkapplet:457 ../mdkupdate:118 ../mdkupdate:164
 #, c-format
-msgid "Clear"
-msgstr "Cancella"
+msgid "Warning"
+msgstr "Attenzione"
 
-#: ../mdkapplet:629
+#: ../mdkapplet:468
 #, c-format
 msgid "About..."
 msgstr "Informazioni su..."
 
-#: ../mdkapplet:631
+#: ../mdkapplet:472
 #, c-format
 msgid "Mandriva Online %s"
 msgstr "Mandriva Online %s"
 
-#: ../mdkapplet:635
+#: ../mdkapplet:473
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Copyright (C) %s di Mandriva"
 
-#: ../mdkapplet:647
+#: ../mdkapplet:476
 #, c-format
 msgid "Mandriva Online gives access to Mandriva web services."
 msgstr "Mandriva Online dà accesso ai servizi web di Mandriva."
 
-#: ../mdkapplet:655
-#, c-format
-msgid "Always launch on startup"
-msgstr "Lanciare sempre all'avvio"
-
-#: ../mdkapplet:657
-#, c-format
-msgid "Quit"
-msgstr "Esci"
-
-#: ../mdkonline:58
-#, c-format
-msgid ""
-"mdonline version %s\n"
-"Copyright (C) %s Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"mdonline versione %s\n"
-"Copyright (C) %s Mandriva.\n"
-"Questo è software libero e può essere ridistribuito secondo i termini della "
-"GNU GPL.\n"
-"\n"
-"uso:\n"
-
-#: ../mdkonline:63 ../mdkupdate:73
-#, c-format
-msgid "  --help\t\t- print this help message.\n"
-msgstr "  --help\t\t- stampa questo messaggio d'aiuto.\n"
-
-#: ../mdkonline:64
-#, c-format
-msgid "  --box=\t\t\t- hostname.\n"
-msgstr "  --box=\t\t\t- nome host.\n"
-
-#: ../mdkonline:65
-#, c-format
-msgid "  --country\t\t\t- name of country of the user. \n"
-msgstr "  --country\t\t\t- Paese dell'utente. \n"
-
-#: ../mdkonline:66
-#, c-format
-msgid "  --interactive\t\t- use the interactive mode.\n"
-msgstr "  --interactive\t\t- usa modalità interattiva.\n"
-
-#: ../mdkonline:67
-#, c-format
-msgid "  --nointeractive\t- use the non-interactive mode.\n"
-msgstr "  --nointeractive\t- usa modalità non-interattiva.\n"
-
-#: ../mdkonline:68
-#, c-format
-msgid "  --login=\t\t     - login name of the user.\n"
-msgstr "  --login=\t\t     - nome con cui l'utente accede.\n"
-
-#: ../mdkonline:69
-#, c-format
-msgid "  --pass=\t\t\t- password  of the user.\n"
-msgstr "  --pass=\t\t\t- password  dell'utente.\n"
-
-#: ../mdkonline:87 ../mdkonline:120
-#, c-format
-msgid "Mandriva Online"
-msgstr "Mandriva Online"
-
-#: ../mdkonline:90
-#, c-format
-msgid "I already have an account"
-msgstr "Ho già un account"
-
-#: ../mdkonline:91
-#, c-format
-msgid "I want to subscribe"
-msgstr "Voglio iscrivermi"
-
-#: ../mdkonline:96
-#, c-format
-msgid "Mr."
-msgstr "Sig."
-
-#: ../mdkonline:96
-#, c-format
-msgid "Mrs."
-msgstr "Sig.ra"
-
-#: ../mdkonline:96
-#, c-format
-msgid "Ms."
-msgstr "Sig.na"
-
-#: ../mdkonline:114
-#, c-format
-msgid "Reading configuration\n"
-msgstr "Lettura della configurazione in corso\n"
-
-#: ../mdkonline:123
-#, c-format
-msgid ""
-"This assistant will help you to upload your configuration\n"
-"(packages, hardware configuration) to a centralized database in\n"
-"order to keep you informed about security updates and useful upgrades.\n"
-msgstr ""
-"L'assistente ti aiuterà ad inviare la tua configurazione\n"
-"(pacchetti, hardware installato) ad un database centralizzato per tenerti\n"
-"informato su aggiornamenti del software mirati alla produttività e alla "
-"sicurezza.\n"
-
-#: ../mdkonline:131
-#, c-format
-msgid "Account creation or authentication"
-msgstr "Creazione dell'account o autenticazione"
-
-#: ../mdkonline:136
-#, c-format
-msgid "Enter your Mandriva Online login, password and machine name:"
-msgstr "Immetti nome utente, password e nome computer per Mandriva Online:"
-
-#: ../mdkonline:142 ../mdkonline:195
-#, c-format
-msgid "Email address:"
-msgstr "Indirizzo email:"
-
-#: ../mdkonline:143
-#, c-format
-msgid "Country"
-msgstr "Paese"
-
-#: ../mdkonline:144 ../mdkonline:196
-#, c-format
-msgid "Password:"
-msgstr "Password:"
-
-#: ../mdkonline:146
-#, c-format
-msgid "Machine description:"
-msgstr "Descrizione computer:"
-
-#: ../mdkonline:147
-#, c-format
-msgid "(Ex: My Home Office's Computer)"
-msgstr "(Ad es.: Il computer su cui lavoro)"
-
-#: ../mdkonline:152 ../mdkonline:159 ../mdkonline:180 ../mdkonline:204
-#: ../mdkonline:208 ../mdkonline:212 ../mdkonline:217 ../mdkupdate:141
-#: ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
-#, c-format
-msgid "Error"
-msgstr "Errore"
-
-#: ../mdkonline:152
-#, c-format
-msgid "Machine name must be 1 to 40 alphanumerical characters"
-msgstr "Il nome della macchina deve contenere solo lettere e numeri, non più di 40"
-
-#: ../mdkonline:155
-#, c-format
-msgid "Connecting to Mandriva Online website..."
-msgstr "Connessione in corso al sito Mandriva Online..."
-
-#: ../mdkonline:167
-#, c-format
-msgid ""
-"In order to benefit from Mandriva Online services,\n"
-"we are about to upload your configuration.\n"
-"\n"
-"The Wizard will now send the following information to Mandriva:\n"
-"\n"
-"1) the list of packages you have installed on your system,\n"
-"\n"
-"2) your hardware configuration.\n"
-"\n"
-"If you feel uncomfortable by that idea, or do not want to benefit from this "
-"service,\n"
-"please press 'Cancel'. By pressing 'Next', you allow us to keep you "
-"informed\n"
-"about security updates and useful upgrades via personalized email alerts.\n"
-"Furthermore, you benefit from discounted paid support services on\n"
-"www.mandrivaexpert.com."
-msgstr ""
-"Per permetterti di beneficiare dei servizi offerti da Mandriva Online,\n"
-"la configurazione del tuo PC sta per essere trasmessa attraverso Internet.\n"
-"\n"
-"Alla Mandriva saranno inviate le seguenti informazioni:\n"
-"\n"
-"1) la lista dei pacchetti installati sul tuo sistema,\n"
-"\n"
-"2) la tua configurazione hardware.\n"
-"\n"
-"Se la cosa non ti piace, o se non vuoi usufruire di questo servizio,\n"
-"fai clic su \"Annulla\". Premendo \"Avanti\", ci consenti di tenerti informato\n"
-"su aggiornamenti del software e della sicurezza con email personalizzate.\n"
-"Inoltre, potrai accedere a sconti sul supporto tecnico presso\n"
-"www.mandrivaexpert.com."
-
-#: ../mdkonline:180
-#, c-format
-msgid "Connection problem"
-msgstr "Problema di connessione"
-
-#: ../mdkonline:180
-#, c-format
-msgid "Problem occurs when uploading files, please try again"
-msgstr "C'è stato un problema in upload, per favore riprova"
-
-#: ../mdkonline:187
-#, c-format
-msgid "Create a Mandriva Online Account"
-msgstr "Crea un account per Mandriva Online"
-
-#. -PO: that is for things like "Mr", "Ms",...
-#: ../mdkonline:192
-#, c-format
-msgid "Greeting:"
-msgstr "Titolo:"
-
-#: ../mdkonline:193
-#, c-format
-msgid "First name:"
-msgstr "Nome:"
-
-#: ../mdkonline:194
-#, c-format
-msgid "Last name:"
-msgstr "Cognome:"
-
-#: ../mdkonline:197
-#, c-format
-msgid "Confirm Password:"
-msgstr "Conferma password:"
-
-#: ../mdkonline:204
-#, c-format
-msgid ""
-"The passwords do not match\n"
-" Please try again\n"
-msgstr ""
-"Le password non coincidono\n"
-"Per favore, riprova\n"
-
-#: ../mdkonline:208
-#, c-format
-msgid "Please fill in each field"
-msgstr "Per favore compila tutti i campi"
-
-#: ../mdkonline:212
-#, c-format
-msgid "Not a valid mail address!\n"
-msgstr "Non è un indirizzo di email valido!\n"
-
-#: ../mdkonline:217
-#, c-format
-msgid "Creating account failed!"
-msgstr "È stato impossibile creare questo account!"
-
-#: ../mdkonline:225
-#, c-format
-msgid ""
-"Mandriva Online Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
-msgstr ""
-"Account Mandriva Online creato correttamente.\n"
-"Clicca su \"Avanti\" per autenticarti e fare l'upload della tua "
-"configurazione\n"
-
-#: ../mdkonline:229
-#, c-format
-msgid "Your upload was successful!"
-msgstr "Trasmissione completata con successo!"
-
-#: ../mdkonline:229
+#: ../mdkapplet:478
 #, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandriva Online."
-msgstr ""
-"Da ora in poi riceverai avvisi sulla sicurezza e sugli\n"
-"aggiornamenti grazie a Mandriva Online."
+msgid "Online WebSite"
+msgstr "Sito online"
 
-#: ../mdkonline:229
+#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
+#: ../mdkapplet:483
 #, c-format
-msgid ""
-"Mandriva Online offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
+msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
-"Mandriva Online ti offre la possibilità di automatizzare gli aggiornamenti.\n"
-"Un programma in attesa di nuovi aggiornamenti sarà eseguito periodicamente\n"
-
-#: ../mdkonline:238
-#, c-format
-msgid "Congratulations"
-msgstr "Congratulazioni"
 
-#: ../mdkonline:238
+#: ../mdkapplet:492
 #, c-format
-msgid "Your Mandriva Online account has been successfully configured\n"
-msgstr "Il tuo account presso Mandriva Online è stato configurato correttamente\n"
-
-#: ../mdkonline:253
-#, c-format
-msgid "Configuration uploaded successfully"
-msgstr "Configurazione inviata con successo"
-
-#: ../mdkonline:254
-#, c-format
-msgid "Problem uploading configuration"
-msgstr "Problema durante l'invio della configurazione"
+msgid "Always launch on startup"
+msgstr "Lanciare sempre all'avvio"
 
-#: ../mdkonline:256
+#: ../mdkapplet:494
 #, c-format
-msgid ""
-"Cannot connect to Mandriva Online website: wrong login/password or router/"
-"firewall bad settings"
-msgstr ""
-"Non è possibile stabilire una connessione con il sito Mandriva Online: "
-"errore nella login/password o nella configurazione del router/firewall"
+msgid "Quit"
+msgstr "Esci"
 
 #: ../mdkonline.pm:207
 #, c-format
@@ -828,6 +369,11 @@ msgstr ""
 "\n"
 "uso:\n"
 
+#: ../mdkupdate:73
+#, c-format
+msgid "  --help\t\t- print this help message.\n"
+msgstr "  --help\t\t- stampa questo messaggio d'aiuto.\n"
+
 #: ../mdkupdate:74
 #, c-format
 msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
@@ -857,11 +403,6 @@ msgstr ""
 "  --bundle file.bundle\t- esamina e installa un pacchetto da un file "
 "metainfo .bundle.\n"
 
-#: ../mdkupdate:118 ../mdkupdate:164
-#, c-format
-msgid "Warning"
-msgstr "Attenzione"
-
 #. -PO: here Live Install is currently *NOT* translated on the desktop, so it's better to keep as it:
 #: ../mdkupdate:120
 #, c-format
@@ -872,11 +413,21 @@ msgstr ""
 "Bisogna prima installare il sistema sul disco fisso seguendo la procedura "
 "guidata \"Live install\"."
 
+#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
+#, c-format
+msgid "Please wait"
+msgstr "Attendere prego"
+
 #: ../mdkupdate:123 ../mdkupdate:174
 #, c-format
 msgid "Preparing..."
 msgstr "In preparazione..."
 
+#: ../mdkupdate:141 ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
+#, c-format
+msgid "Error"
+msgstr "Errore"
+
 #: ../mdkupdate:141
 #, c-format
 msgid ""
@@ -888,6 +439,11 @@ msgstr ""
 "\n"
 "%s"
 
+#: ../mdkupdate:159 ../mdkupdate:188
+#, c-format
+msgid "An error occurred"
+msgstr "Si è verificato un errore"
+
 #: ../mdkupdate:164
 #, c-format
 msgid ""
@@ -904,7 +460,8 @@ msgstr ""
 #: ../mdkupdate:207
 #, c-format
 msgid "This bundle is not well formated. Aborting."
-msgstr "Questo pacchetto non è formattato correttamente. Annullamento in corso."
+msgstr ""
+"Questo pacchetto non è formattato correttamente. Annullamento in corso."
 
 #: ../mdkupdate:219
 #, c-format
@@ -916,3 +473,311 @@ msgstr "Installazione dei pacchetti ...\n"
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "Impossibile aggiornare i pacchetti dalla sorgente update_source.\n"
 
+#~ msgid "New bundles are available for your system"
+#~ msgstr "Nuovi pacchetti disponibili per il tuo sistema"
+
+#~ msgid "Service is not configured. Please click on \"Configure the service\""
+#~ msgstr "Servizio non configurato. Clicca su \"Configura il servizio\""
+
+#~ msgid "Configure the service"
+#~ msgstr "Configura il servizio"
+
+#~ msgid "Check updates"
+#~ msgstr "Controlla aggiornamenti"
+
+#~ msgid "Configure Now!"
+#~ msgstr "Configura adesso!"
+
+#~ msgid "Actions"
+#~ msgstr "Azioni"
+
+#~ msgid "Configure"
+#~ msgstr "Configura"
+
+#~ msgid "See logs"
+#~ msgstr "Visualizza i log"
+
+#~ msgid "Status"
+#~ msgstr "Stato"
+
+#~ msgid "Close"
+#~ msgstr "Chiudi"
+
+#~ msgid "Network Connection: "
+#~ msgstr "Connessione alla rete: "
+
+#~ msgid "Up"
+#~ msgstr "Attiva"
+
+#~ msgid "Down"
+#~ msgstr "Disattiva"
+
+#~ msgid "Last check: "
+#~ msgstr "Ultimo controllo: "
+
+#~ msgid "Machine name:"
+#~ msgstr "Nome computer:"
+
+#~ msgid "Updates: "
+#~ msgstr "Aggiornamenti: "
+
+#~ msgid "Development release not supported by service"
+#~ msgstr "Versione di sviluppo non supportata dal servizio"
+
+#~ msgid "Too old release not supported by service"
+#~ msgstr "Release troppo vecchia non supportata dal servizio"
+
+#~ msgid "Unknown state"
+#~ msgstr "Stato ignoto"
+
+#~ msgid "Online services disabled. Contact Mandriva Online site\n"
+#~ msgstr "Servizi online disabilitati .Contatta il sito Mandriva Online\n"
+
+#~ msgid "Wrong Password.\n"
+#~ msgstr "Password errata.\n"
+
+#~ msgid "Wrong Action or host or login.\n"
+#~ msgstr "Azione, host o login errati.\n"
+
+#~ msgid ""
+#~ "Something is wrong with your network settings (check your route, firewall "
+#~ "or proxy settings)\n"
+#~ msgstr ""
+#~ "C'è qualcosa di sbagliato nei tuoi parametri di rete (controlla i "
+#~ "percorsi, il firewall o le impostazioni del proxy)\n"
+
+#~ msgid ""
+#~ "Problem occured while connecting to the server, please contact the "
+#~ "support team"
+#~ msgstr ""
+#~ "C'è stato un problema cercando di contattare il server. Contatta il team "
+#~ "di supporto"
+
+#~ msgid "Response from Mandriva Online server\n"
+#~ msgstr "Risposta del server Mandriva Online\n"
+
+#~ msgid "No check"
+#~ msgstr "Nessun controllo"
+
+#~ msgid "Checking config file: Not present\n"
+#~ msgstr "Controllo il file di configurazione: Non presente\n"
+
+#~ msgid "Logs"
+#~ msgstr "Log"
+
+#~ msgid "Clear"
+#~ msgstr "Cancella"
+
+#~ msgid ""
+#~ "mdonline version %s\n"
+#~ "Copyright (C) %s Mandriva.\n"
+#~ "This is free software and may be redistributed under the terms of the GNU "
+#~ "GPL.\n"
+#~ "\n"
+#~ "usage:\n"
+#~ msgstr ""
+#~ "mdonline versione %s\n"
+#~ "Copyright (C) %s Mandriva.\n"
+#~ "Questo è software libero e può essere ridistribuito secondo i termini "
+#~ "della GNU GPL.\n"
+#~ "\n"
+#~ "uso:\n"
+
+#~ msgid "  --box=\t\t\t- hostname.\n"
+#~ msgstr "  --box=\t\t\t- nome host.\n"
+
+#~ msgid "  --country\t\t\t- name of country of the user. \n"
+#~ msgstr "  --country\t\t\t- Paese dell'utente. \n"
+
+#~ msgid "  --interactive\t\t- use the interactive mode.\n"
+#~ msgstr "  --interactive\t\t- usa modalità interattiva.\n"
+
+#~ msgid "  --nointeractive\t- use the non-interactive mode.\n"
+#~ msgstr "  --nointeractive\t- usa modalità non-interattiva.\n"
+
+#~ msgid "  --login=\t\t     - login name of the user.\n"
+#~ msgstr "  --login=\t\t     - nome con cui l'utente accede.\n"
+
+#~ msgid "  --pass=\t\t\t- password  of the user.\n"
+#~ msgstr "  --pass=\t\t\t- password  dell'utente.\n"
+
+#~ msgid "Mandriva Online"
+#~ msgstr "Mandriva Online"
+
+#~ msgid "I already have an account"
+#~ msgstr "Ho già un account"
+
+#~ msgid "I want to subscribe"
+#~ msgstr "Voglio iscrivermi"
+
+#~ msgid "Mr."
+#~ msgstr "Sig."
+
+#~ msgid "Mrs."
+#~ msgstr "Sig.ra"
+
+#~ msgid "Ms."
+#~ msgstr "Sig.na"
+
+#~ msgid "Reading configuration\n"
+#~ msgstr "Lettura della configurazione in corso\n"
+
+#~ msgid ""
+#~ "This assistant will help you to upload your configuration\n"
+#~ "(packages, hardware configuration) to a centralized database in\n"
+#~ "order to keep you informed about security updates and useful upgrades.\n"
+#~ msgstr ""
+#~ "L'assistente ti aiuterà ad inviare la tua configurazione\n"
+#~ "(pacchetti, hardware installato) ad un database centralizzato per "
+#~ "tenerti\n"
+#~ "informato su aggiornamenti del software mirati alla produttività e alla "
+#~ "sicurezza.\n"
+
+#~ msgid "Account creation or authentication"
+#~ msgstr "Creazione dell'account o autenticazione"
+
+#~ msgid "Enter your Mandriva Online login, password and machine name:"
+#~ msgstr "Immetti nome utente, password e nome computer per Mandriva Online:"
+
+#~ msgid "Email address:"
+#~ msgstr "Indirizzo email:"
+
+#~ msgid "Country"
+#~ msgstr "Paese"
+
+#~ msgid "Password:"
+#~ msgstr "Password:"
+
+#~ msgid "Machine description:"
+#~ msgstr "Descrizione computer:"
+
+#~ msgid "(Ex: My Home Office's Computer)"
+#~ msgstr "(Ad es.: Il computer su cui lavoro)"
+
+#~ msgid "Machine name must be 1 to 40 alphanumerical characters"
+#~ msgstr ""
+#~ "Il nome della macchina deve contenere solo lettere e numeri, non più di 40"
+
+#~ msgid "Connecting to Mandriva Online website..."
+#~ msgstr "Connessione in corso al sito Mandriva Online..."
+
+#~ msgid ""
+#~ "In order to benefit from Mandriva Online services,\n"
+#~ "we are about to upload your configuration.\n"
+#~ "\n"
+#~ "The Wizard will now send the following information to Mandriva:\n"
+#~ "\n"
+#~ "1) the list of packages you have installed on your system,\n"
+#~ "\n"
+#~ "2) your hardware configuration.\n"
+#~ "\n"
+#~ "If you feel uncomfortable by that idea, or do not want to benefit from "
+#~ "this service,\n"
+#~ "please press 'Cancel'. By pressing 'Next', you allow us to keep you "
+#~ "informed\n"
+#~ "about security updates and useful upgrades via personalized email "
+#~ "alerts.\n"
+#~ "Furthermore, you benefit from discounted paid support services on\n"
+#~ "www.mandrivaexpert.com."
+#~ msgstr ""
+#~ "Per permetterti di beneficiare dei servizi offerti da Mandriva Online,\n"
+#~ "la configurazione del tuo PC sta per essere trasmessa attraverso "
+#~ "Internet.\n"
+#~ "\n"
+#~ "Alla Mandriva saranno inviate le seguenti informazioni:\n"
+#~ "\n"
+#~ "1) la lista dei pacchetti installati sul tuo sistema,\n"
+#~ "\n"
+#~ "2) la tua configurazione hardware.\n"
+#~ "\n"
+#~ "Se la cosa non ti piace, o se non vuoi usufruire di questo servizio,\n"
+#~ "fai clic su \"Annulla\". Premendo \"Avanti\", ci consenti di tenerti "
+#~ "informato\n"
+#~ "su aggiornamenti del software e della sicurezza con email "
+#~ "personalizzate.\n"
+#~ "Inoltre, potrai accedere a sconti sul supporto tecnico presso\n"
+#~ "www.mandrivaexpert.com."
+
+#~ msgid "Connection problem"
+#~ msgstr "Problema di connessione"
+
+#~ msgid "Problem occurs when uploading files, please try again"
+#~ msgstr "C'è stato un problema in upload, per favore riprova"
+
+#~ msgid "Create a Mandriva Online Account"
+#~ msgstr "Crea un account per Mandriva Online"
+
+#~ msgid "Greeting:"
+#~ msgstr "Titolo:"
+
+#~ msgid "First name:"
+#~ msgstr "Nome:"
+
+#~ msgid "Last name:"
+#~ msgstr "Cognome:"
+
+#~ msgid "Confirm Password:"
+#~ msgstr "Conferma password:"
+
+#~ msgid ""
+#~ "The passwords do not match\n"
+#~ " Please try again\n"
+#~ msgstr ""
+#~ "Le password non coincidono\n"
+#~ "Per favore, riprova\n"
+
+#~ msgid "Please fill in each field"
+#~ msgstr "Per favore compila tutti i campi"
+
+#~ msgid "Not a valid mail address!\n"
+#~ msgstr "Non è un indirizzo di email valido!\n"
+
+#~ msgid "Creating account failed!"
+#~ msgstr "È stato impossibile creare questo account!"
+
+#~ msgid ""
+#~ "Mandriva Online Account successfully created.\n"
+#~ "Please click \"Next\" to authenticate and upload your configuration\n"
+#~ msgstr ""
+#~ "Account Mandriva Online creato correttamente.\n"
+#~ "Clicca su \"Avanti\" per autenticarti e fare l'upload della tua "
+#~ "configurazione\n"
+
+#~ msgid "Your upload was successful!"
+#~ msgstr "Trasmissione completata con successo!"
+
+#~ msgid ""
+#~ "From now you will receive on security and updates \n"
+#~ "announcements thanks to Mandriva Online."
+#~ msgstr ""
+#~ "Da ora in poi riceverai avvisi sulla sicurezza e sugli\n"
+#~ "aggiornamenti grazie a Mandriva Online."
+
+#~ msgid ""
+#~ "Mandriva Online offers you the ability to automate the updates.\n"
+#~ "A program will run regulary in your system waiting for new updates\n"
+#~ msgstr ""
+#~ "Mandriva Online ti offre la possibilità di automatizzare gli "
+#~ "aggiornamenti.\n"
+#~ "Un programma in attesa di nuovi aggiornamenti sarà eseguito "
+#~ "periodicamente\n"
+
+#~ msgid "Congratulations"
+#~ msgstr "Congratulazioni"
+
+#~ msgid "Your Mandriva Online account has been successfully configured\n"
+#~ msgstr ""
+#~ "Il tuo account presso Mandriva Online è stato configurato correttamente\n"
+
+#~ msgid "Configuration uploaded successfully"
+#~ msgstr "Configurazione inviata con successo"
+
+#~ msgid "Problem uploading configuration"
+#~ msgstr "Problema durante l'invio della configurazione"
+
+#~ msgid ""
+#~ "Cannot connect to Mandriva Online website: wrong login/password or router/"
+#~ "firewall bad settings"
+#~ msgstr ""
+#~ "Non è possibile stabilire una connessione con il sito Mandriva Online: "
+#~ "errore nella login/password o nella configurazione del router/firewall"
diff --git a/po/ja.po b/po/ja.po
index 49cf6e8a..9adf0f1a 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline-ja\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-09 16:26+0200\n"
+"POT-Creation-Date: 2008-02-21 18:21+0100\n"
 "PO-Revision-Date: 2007-08-17 11:00+0900\n"
 "Last-Translator: BANDO Yukiko\n"
 "Language-Team: Japanese <cooker-i18n@mandrivalinux.org>\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:94
+#: ../mdkapplet:88
 #, c-format
 msgid "Will check updates at %s"
 msgstr "%s に更新をチェックします"
 
-#: ../mdkapplet:103
+#: ../mdkapplet:97
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "新しい更新はありません"
 
-#: ../mdkapplet:109
+#: ../mdkapplet:103
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -38,48 +38,38 @@ msgstr ""
 "サービスの設定に問題があります。ログを調べて support@mandrivaonline.com に"
 "メールしてください。"
 
-#: ../mdkapplet:115
+#: ../mdkapplet:110
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "利用可能なパッケージを探しています。お待ちください..."
 
-#: ../mdkapplet:121
+#: ../mdkapplet:116
 #, c-format
 msgid "New updates are available for your system"
 msgstr "新しい更新があります"
 
-#: ../mdkapplet:127
-#, c-format
-msgid "New bundles are available for your system"
-msgstr "新しいバンドルが利用可能です"
-
-#: ../mdkapplet:133
-#, c-format
-msgid "Service is not configured. Please click on \"Configure the service\""
-msgstr "サービスが設定されていません。「サービスの設定」を選択してください。"
-
-#: ../mdkapplet:139
+#: ../mdkapplet:122
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "ネットワークが未接続です。ネットワークを設定してください。"
 
-#: ../mdkapplet:145
+#: ../mdkapplet:128
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr ""
 "サービスが有効になっていません。「Online ウェブサイト」を選択してください。"
 
-#: ../mdkapplet:151 ../mdkapplet:182
+#: ../mdkapplet:134 ../mdkapplet:165
 #, c-format
 msgid "urpmi database locked"
 msgstr "urpmi データベースがロックされています"
 
-#: ../mdkapplet:157
+#: ../mdkapplet:140
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr "お使いのバージョンはサービスの対象外です (期限切れ/開発版)"
 
-#: ../mdkapplet:163
+#: ../mdkapplet:146
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
@@ -87,7 +77,7 @@ msgstr ""
 "メディアが見つかりません。RPM メディアマネージャでメディアを追加してくださ"
 "い。"
 
-#: ../mdkapplet:169
+#: ../mdkapplet:152
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -103,581 +93,131 @@ msgstr ""
 "\n"
 "その後、%s を再起動してください。"
 
-#: ../mdkapplet:174
+#: ../mdkapplet:157
 #, c-format
 msgid "Enabled"
 msgstr "有効"
 
-#: ../mdkapplet:187
+#: ../mdkapplet:170
 #, c-format
 msgid "Error updating media"
 msgstr "メディアの更新でエラー"
 
-#: ../mdkapplet:202
+#: ../mdkapplet:185
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr "チェック中... 新しい更新があります\n"
 
-#: ../mdkapplet:207
+#: ../mdkapplet:190
 #, c-format
 msgid "Packages are up to date"
 msgstr "パッケージは最新です"
 
-#: ../mdkapplet:212
+#: ../mdkapplet:195
 #, c-format
 msgid "Failed to open urpmi database"
 msgstr "urpmi データベースを開けません"
 
-#: ../mdkapplet:217 ../mdkapplet:324
+#: ../mdkapplet:200
 #, c-format
 msgid "Install updates"
 msgstr "システムを更新"
 
-#: ../mdkapplet:218
-#, c-format
-msgid "Configure the service"
-msgstr "サービスの設定"
-
-#: ../mdkapplet:219
+#: ../mdkapplet:201
 #, c-format
 msgid "Check Updates"
 msgstr "更新をチェック"
 
-#: ../mdkapplet:220 ../mdkapplet:327 ../mdkonline:114 ../mdkonline:155
-#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
-#, c-format
-msgid "Please wait"
-msgstr "お待ちください"
-
-#: ../mdkapplet:220 ../mdkapplet:326 ../mdkapplet:327
-#, c-format
-msgid "Check updates"
-msgstr "更新をチェック"
-
-#: ../mdkapplet:223 ../mdkapplet:648
-#, c-format
-msgid "Online WebSite"
-msgstr "Online ウェブサイト"
-
-#: ../mdkapplet:224
+#: ../mdkapplet:202
 #, c-format
 msgid "Configure Network"
 msgstr "ネットワークの設定"
 
-#: ../mdkapplet:225
-#, c-format
-msgid "Configure Now!"
-msgstr "設定してください"
-
-#: ../mdkapplet:313 ../mdkapplet:392
-#, c-format
-msgid "Mandriva Linux Updates Applet"
-msgstr "Mandriva Linux 更新アプレット"
-
-#: ../mdkapplet:322
-#, c-format
-msgid "Actions"
-msgstr "動作"
-
-#: ../mdkapplet:325
-#, c-format
-msgid "Configure"
-msgstr "設定"
-
-#: ../mdkapplet:329
-#, c-format
-msgid "See logs"
-msgstr "ログを見る"
-
-#: ../mdkapplet:332
-#, c-format
-msgid "Status"
-msgstr "状態"
-
-#: ../mdkapplet:336 ../mdkapplet:597
-#, c-format
-msgid "Close"
-msgstr "閉じる"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Network Connection: "
-msgstr "ネットワーク接続: "
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Up"
-msgstr "接続"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Down"
-msgstr "未接続"
-
-#: ../mdkapplet:366
-#, c-format
-msgid "Last check: "
-msgstr "前回チェック: "
-
-#: ../mdkapplet:367 ../mdkonline:145
-#, c-format
-msgid "Machine name:"
-msgstr "マシン名:"
-
-#: ../mdkapplet:368
-#, c-format
-msgid "Updates: "
-msgstr "更新: "
-
-#: ../mdkapplet:372
+#: ../mdkapplet:283
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Drakconnect を起動\n"
 
-#: ../mdkapplet:375
+#: ../mdkapplet:286
 #, c-format
 msgid "Mandriva Online seems to be reinstalled, reloading applet ...."
 msgstr "Mandriva Online が再インストールされたようです。アプレットを更新中 ..."
 
-#: ../mdkapplet:383
+#: ../mdkapplet:294
 #, c-format
 msgid "Launching MandrivaUpdate\n"
 msgstr "MandrivaUpdate を起動\n"
 
-#: ../mdkapplet:398
+#: ../mdkapplet:303
+#, c-format
+msgid "Mandriva Linux Updates Applet"
+msgstr "Mandriva Linux 更新アプレット"
+
+#: ../mdkapplet:308
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "新しい更新を計算中...\n"
 
-#: ../mdkapplet:399
+#: ../mdkapplet:309
 #, c-format
 msgid "Connecting to"
 msgstr "接続しています"
 
-#: ../mdkapplet:467 ../mdkupdate:159 ../mdkupdate:188
-#, c-format
-msgid "An error occurred"
-msgstr "エラーが発生しました"
-
-#: ../mdkapplet:475
-#, c-format
-msgid "Development release not supported by service"
-msgstr "開発版 (cooker) はサービスの対象外です"
-
-#: ../mdkapplet:476
-#, c-format
-msgid "Too old release not supported by service"
-msgstr "サポート期限の切れたバージョンはサービスの対象外です"
-
-#: ../mdkapplet:477
-#, c-format
-msgid "Unknown state"
-msgstr "不明な状態"
-
-#: ../mdkapplet:478
-#, c-format
-msgid "Online services disabled. Contact Mandriva Online site\n"
-msgstr ""
-"Online サービスが無効になっています。Mandriva Online に連絡してください。\n"
-
-#: ../mdkapplet:479
-#, c-format
-msgid "Wrong Password.\n"
-msgstr "パスワードが間違っています。\n"
-
-#: ../mdkapplet:480
-#, c-format
-msgid "Wrong Action or host or login.\n"
-msgstr "動作、ホスト、ログイン名のいずれかが間違っています。\n"
-
-#: ../mdkapplet:481
-#, c-format
-msgid ""
-"Something is wrong with your network settings (check your route, firewall or "
-"proxy settings)\n"
-msgstr ""
-"ネットワークの設定に問題があります (ルート、ファイアウォール、プロキシの設定"
-"を確認してください)\n"
-
-#: ../mdkapplet:483
-#, c-format
-msgid ""
-"Problem occured while connecting to the server, please contact the support "
-"team"
-msgstr "サーバ接続中に問題が発生しました。サポートチームに連絡してください"
-
-#: ../mdkapplet:487
-#, c-format
-msgid "Response from Mandriva Online server\n"
-msgstr "Mandriva Online サーバからの応答\n"
-
-#: ../mdkapplet:490
+#: ../mdkapplet:386
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "新しい更新はありません\n"
 
-#: ../mdkapplet:527
-#, c-format
-msgid "No check"
-msgstr "チェックなし"
-
-#: ../mdkapplet:541
-#, c-format
-msgid "Checking config file: Not present\n"
-msgstr "設定ファイル確認: ファイルがありません\n"
-
-#: ../mdkapplet:544
+#: ../mdkapplet:415
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "ネットワーク確認: 無効になっているようです\n"
 
-#: ../mdkapplet:587
-#, c-format
-msgid "Logs"
-msgstr "ログ"
-
-#: ../mdkapplet:603
+#: ../mdkapplet:457 ../mdkupdate:118 ../mdkupdate:164
 #, c-format
-msgid "Clear"
-msgstr "クリア"
+msgid "Warning"
+msgstr "警告"
 
-#: ../mdkapplet:629
+#: ../mdkapplet:468
 #, c-format
 msgid "About..."
 msgstr "情報..."
 
-#: ../mdkapplet:631
+#: ../mdkapplet:472
 #, c-format
 msgid "Mandriva Online %s"
 msgstr "Mandriva Online %s"
 
-#: ../mdkapplet:635
+#: ../mdkapplet:473
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Copyright (C) %s by Mandriva"
 
-#: ../mdkapplet:647
+#: ../mdkapplet:476
 #, c-format
 msgid "Mandriva Online gives access to Mandriva web services."
 msgstr "Mandriva Online は Mandriva ウェブサービスへのアクセスを提供します。"
 
-#: ../mdkapplet:655
-#, c-format
-msgid "Always launch on startup"
-msgstr "起動時に常に開始する"
-
-#: ../mdkapplet:657
-#, c-format
-msgid "Quit"
-msgstr "終了"
-
-#: ../mdkonline:58
-#, c-format
-msgid ""
-"mdonline version %s\n"
-"Copyright (C) %s Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"mdonline バージョン %s\n"
-"Copyright (C) %s Mandriva.\n"
-"これはフリーソフトウェアであり、GNU GPL の下で再配布することができます。\n"
-"\n"
-"使用方法 :\n"
-
-#: ../mdkonline:63 ../mdkupdate:73
-#, c-format
-msgid "  --help\t\t- print this help message.\n"
-msgstr "  --help\t\t- このヘルプメッセージを出力\n"
-
-#: ../mdkonline:64
-#, c-format
-msgid "  --box=\t\t\t- hostname.\n"
-msgstr "  --box=\t\t\t- ホスト名\n"
-
-#: ../mdkonline:65
-#, c-format
-msgid "  --country\t\t\t- name of country of the user. \n"
-msgstr "  --country\t\t\t- ユーザが住んでいる国の名前\n"
-
-#: ../mdkonline:66
-#, c-format
-msgid "  --interactive\t\t- use the interactive mode.\n"
-msgstr "  --interactive\t\t- 対話式モードを使う\n"
-
-#: ../mdkonline:67
-#, c-format
-msgid "  --nointeractive\t- use the non-interactive mode.\n"
-msgstr "  --nointeractive\t- 非対話式モードを使う\n"
-
-#: ../mdkonline:68
-#, c-format
-msgid "  --login=\t\t     - login name of the user.\n"
-msgstr "  --login=\t\t     - ユーザのログイン名\n"
-
-#: ../mdkonline:69
-#, c-format
-msgid "  --pass=\t\t\t- password  of the user.\n"
-msgstr "  --pass=\t\t\t- ユーザのパスワード\n"
-
-#: ../mdkonline:87 ../mdkonline:120
-#, c-format
-msgid "Mandriva Online"
-msgstr "Mandriva Online"
-
-#: ../mdkonline:90
-#, c-format
-msgid "I already have an account"
-msgstr "既にアカウントを持っています"
-
-#: ../mdkonline:91
-#, c-format
-msgid "I want to subscribe"
-msgstr "入会します"
-
-#: ../mdkonline:96
-#, c-format
-msgid "Mr."
-msgstr "Mr."
-
-#: ../mdkonline:96
-#, c-format
-msgid "Mrs."
-msgstr "Mrs."
-
-#: ../mdkonline:96
-#, c-format
-msgid "Ms."
-msgstr "Ms."
-
-#: ../mdkonline:114
-#, c-format
-msgid "Reading configuration\n"
-msgstr "設定を読み込み中\n"
-
-#: ../mdkonline:123
-#, c-format
-msgid ""
-"This assistant will help you to upload your configuration\n"
-"(packages, hardware configuration) to a centralized database in\n"
-"order to keep you informed about security updates and useful upgrades.\n"
-msgstr ""
-"この支援ツールは、セキュリティアップデートや通常の更新情報を\n"
-"個別にお知らせするために、あなたのシステムに関する情報\n"
-"(パッケージやハードウェアの設定) を集中データベースに送信します。\n"
-
-#: ../mdkonline:131
-#, c-format
-msgid "Account creation or authentication"
-msgstr "アカウントの作成または認証"
-
-#: ../mdkonline:136
-#, c-format
-msgid "Enter your Mandriva Online login, password and machine name:"
-msgstr "Mandriva Online のログイン名、パスワード、マシン名を入力してください:"
-
-#: ../mdkonline:142 ../mdkonline:195
-#, c-format
-msgid "Email address:"
-msgstr "メールアドレス:"
-
-#: ../mdkonline:143
-#, c-format
-msgid "Country"
-msgstr "国名"
-
-#: ../mdkonline:144 ../mdkonline:196
-#, c-format
-msgid "Password:"
-msgstr "パスワード:"
-
-#: ../mdkonline:146
-#, c-format
-msgid "Machine description:"
-msgstr "マシンの説明:"
-
-#: ../mdkonline:147
-#, c-format
-msgid "(Ex: My Home Office's Computer)"
-msgstr "(例: ホームオフィスのコンピュータ)"
-
-#: ../mdkonline:152 ../mdkonline:159 ../mdkonline:180 ../mdkonline:204
-#: ../mdkonline:208 ../mdkonline:212 ../mdkonline:217 ../mdkupdate:141
-#: ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
-#, c-format
-msgid "Error"
-msgstr "エラー"
-
-#: ../mdkonline:152
-#, c-format
-msgid "Machine name must be 1 to 40 alphanumerical characters"
-msgstr "マシン名はアルファベットと数字 (1 から 40 まで) で指定してください"
-
-#: ../mdkonline:155
-#, c-format
-msgid "Connecting to Mandriva Online website..."
-msgstr "Mandriva Online ウェブサイトに接続中..."
-
-#: ../mdkonline:167
-#, c-format
-msgid ""
-"In order to benefit from Mandriva Online services,\n"
-"we are about to upload your configuration.\n"
-"\n"
-"The Wizard will now send the following information to Mandriva:\n"
-"\n"
-"1) the list of packages you have installed on your system,\n"
-"\n"
-"2) your hardware configuration.\n"
-"\n"
-"If you feel uncomfortable by that idea, or do not want to benefit from this "
-"service,\n"
-"please press 'Cancel'. By pressing 'Next', you allow us to keep you "
-"informed\n"
-"about security updates and useful upgrades via personalized email alerts.\n"
-"Furthermore, you benefit from discounted paid support services on\n"
-"www.mandrivaexpert.com."
-msgstr ""
-"Mandriva Online サービスをご利用いただくために、\n"
-"今からあなたのシステムの設定情報を送信します。\n"
-"\n"
-"このウィザードは以下の情報を Mandriva に送ります:\n"
-"\n"
-"1) インストールされているパッケージのリスト\n"
-"\n"
-"2) ハードウェアの設定\n"
-"\n"
-"これらの情報を送信したくない、またはこのサービスを利用しない場合は「キャンセ"
-"ル」を\n"
-"押してください。「次へ」を選択すると、送信された情報をもとにセキュリティアッ"
-"プデート\n"
-"と通常の更新情報をお客様ごとにメールでお知らせします。\n"
-"また、このサービスをご利用頂くと www.mandrivaexpert.com の有料サポートにも割"
-"引が\n"
-"適用されます。"
-
-#: ../mdkonline:180
-#, c-format
-msgid "Connection problem"
-msgstr "接続トラブル"
-
-#: ../mdkonline:180
-#, c-format
-msgid "Problem occurs when uploading files, please try again"
-msgstr "ファイル送信中に問題が発生しました。やり直してください。"
-
-#: ../mdkonline:187
-#, c-format
-msgid "Create a Mandriva Online Account"
-msgstr "Mandriva Online のアカウント作成"
-
-#. -PO: that is for things like "Mr", "Ms",...
-#: ../mdkonline:192
-#, c-format
-msgid "Greeting:"
-msgstr "敬称:"
-
-#: ../mdkonline:193
-#, c-format
-msgid "First name:"
-msgstr "名:"
-
-#: ../mdkonline:194
-#, c-format
-msgid "Last name:"
-msgstr "姓:"
-
-#: ../mdkonline:197
-#, c-format
-msgid "Confirm Password:"
-msgstr "パスワード確認:"
-
-#: ../mdkonline:204
-#, c-format
-msgid ""
-"The passwords do not match\n"
-" Please try again\n"
-msgstr ""
-"パスワードが合っていません\n"
-"やり直してください\n"
-
-#: ../mdkonline:208
-#, c-format
-msgid "Please fill in each field"
-msgstr "すべての項目を埋めてください"
-
-#: ../mdkonline:212
-#, c-format
-msgid "Not a valid mail address!\n"
-msgstr "メールアドレスが無効です\n"
-
-#: ../mdkonline:217
-#, c-format
-msgid "Creating account failed!"
-msgstr "アカウントの作成に失敗しました"
-
-#: ../mdkonline:225
-#, c-format
-msgid ""
-"Mandriva Online Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
-msgstr ""
-"Mandriva Online アカウントを作成しました。\n"
-"「次へ」をクリックし、認証と設定の送信を行ってください。\n"
-
-#: ../mdkonline:229
-#, c-format
-msgid "Your upload was successful!"
-msgstr "送信成功"
-
-#: ../mdkonline:229
+#: ../mdkapplet:478
 #, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandriva Online."
-msgstr ""
-"これからはセキュリティその他の更新情報を Mandriva Online \n"
-"がお知らせします。"
+msgid "Online WebSite"
+msgstr "Online ウェブサイト"
 
-#: ../mdkonline:229
+#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
+#: ../mdkapplet:483
 #, c-format
-msgid ""
-"Mandriva Online offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
+msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
-"Mandriva Online をご利用いただくとシステムの更新を自動化できます。\n"
-"チェックプログラムが新しい更新情報を定期的に調べに行きます。\n"
-
-#: ../mdkonline:238
-#, c-format
-msgid "Congratulations"
-msgstr "設定"
-
-#: ../mdkonline:238
-#, c-format
-msgid "Your Mandriva Online account has been successfully configured\n"
-msgstr "Mandriva Online アカウントの設定が完了しました\n"
-
-#: ../mdkonline:253
-#, c-format
-msgid "Configuration uploaded successfully"
-msgstr "設定を送信しました"
 
-#: ../mdkonline:254
+#: ../mdkapplet:492
 #, c-format
-msgid "Problem uploading configuration"
-msgstr "設定を送信中に問題が発生しました"
+msgid "Always launch on startup"
+msgstr "起動時に常に開始する"
 
-#: ../mdkonline:256
+#: ../mdkapplet:494
 #, c-format
-msgid ""
-"Cannot connect to Mandriva Online website: wrong login/password or router/"
-"firewall bad settings"
-msgstr ""
-"Mandriva Online ウェブサイトに接続できません (ログイン名/パスワードが間違って"
-"いるか、ルータ/ファイアウォールの設定に問題があります)"
+msgid "Quit"
+msgstr "終了"
 
 #: ../mdkonline.pm:207
 #, c-format
@@ -825,6 +365,11 @@ msgstr ""
 "\n"
 "使用方法 :\n"
 
+#: ../mdkupdate:73
+#, c-format
+msgid "  --help\t\t- print this help message.\n"
+msgstr "  --help\t\t- このヘルプメッセージを出力\n"
+
 #: ../mdkupdate:74
 #, c-format
 msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
@@ -854,11 +399,6 @@ msgstr ""
 "  --bundle file.bundle\t- .bundle メタ情報ファイルをパースしてパッケージをイ"
 "ンストールする。\n"
 
-#: ../mdkupdate:118 ../mdkupdate:164
-#, c-format
-msgid "Warning"
-msgstr "警告"
-
 #. -PO: here Live Install is currently *NOT* translated on the desktop, so it's better to keep as it:
 #: ../mdkupdate:120
 #, c-format
@@ -869,11 +409,21 @@ msgstr ""
 "Live インストールウィザードを使って、先にシステムをハードドライブにインストー"
 "ルする必要があります。"
 
+#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
+#, c-format
+msgid "Please wait"
+msgstr "お待ちください"
+
 #: ../mdkupdate:123 ../mdkupdate:174
 #, c-format
 msgid "Preparing..."
 msgstr "準備中..."
 
+#: ../mdkupdate:141 ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
+#, c-format
+msgid "Error"
+msgstr "エラー"
+
 #: ../mdkupdate:141
 #, c-format
 msgid ""
@@ -885,6 +435,11 @@ msgstr ""
 "\n"
 "%s"
 
+#: ../mdkupdate:159 ../mdkupdate:188
+#, c-format
+msgid "An error occurred"
+msgstr "エラーが発生しました"
+
 #: ../mdkupdate:164
 #, c-format
 msgid ""
@@ -912,3 +467,306 @@ msgstr "パッケージをインストール中...\n"
 #, c-format
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "update_source メディアからパッケージを更新できません。\n"
+
+#~ msgid "New bundles are available for your system"
+#~ msgstr "新しいバンドルが利用可能です"
+
+#~ msgid "Service is not configured. Please click on \"Configure the service\""
+#~ msgstr ""
+#~ "サービスが設定されていません。「サービスの設定」を選択してください。"
+
+#~ msgid "Configure the service"
+#~ msgstr "サービスの設定"
+
+#~ msgid "Check updates"
+#~ msgstr "更新をチェック"
+
+#~ msgid "Configure Now!"
+#~ msgstr "設定してください"
+
+#~ msgid "Actions"
+#~ msgstr "動作"
+
+#~ msgid "Configure"
+#~ msgstr "設定"
+
+#~ msgid "See logs"
+#~ msgstr "ログを見る"
+
+#~ msgid "Status"
+#~ msgstr "状態"
+
+#~ msgid "Close"
+#~ msgstr "閉じる"
+
+#~ msgid "Network Connection: "
+#~ msgstr "ネットワーク接続: "
+
+#~ msgid "Up"
+#~ msgstr "接続"
+
+#~ msgid "Down"
+#~ msgstr "未接続"
+
+#~ msgid "Last check: "
+#~ msgstr "前回チェック: "
+
+#~ msgid "Machine name:"
+#~ msgstr "マシン名:"
+
+#~ msgid "Updates: "
+#~ msgstr "更新: "
+
+#~ msgid "Development release not supported by service"
+#~ msgstr "開発版 (cooker) はサービスの対象外です"
+
+#~ msgid "Too old release not supported by service"
+#~ msgstr "サポート期限の切れたバージョンはサービスの対象外です"
+
+#~ msgid "Unknown state"
+#~ msgstr "不明な状態"
+
+#~ msgid "Online services disabled. Contact Mandriva Online site\n"
+#~ msgstr ""
+#~ "Online サービスが無効になっています。Mandriva Online に連絡してくださ"
+#~ "い。\n"
+
+#~ msgid "Wrong Password.\n"
+#~ msgstr "パスワードが間違っています。\n"
+
+#~ msgid "Wrong Action or host or login.\n"
+#~ msgstr "動作、ホスト、ログイン名のいずれかが間違っています。\n"
+
+#~ msgid ""
+#~ "Something is wrong with your network settings (check your route, firewall "
+#~ "or proxy settings)\n"
+#~ msgstr ""
+#~ "ネットワークの設定に問題があります (ルート、ファイアウォール、プロキシの設"
+#~ "定を確認してください)\n"
+
+#~ msgid ""
+#~ "Problem occured while connecting to the server, please contact the "
+#~ "support team"
+#~ msgstr "サーバ接続中に問題が発生しました。サポートチームに連絡してください"
+
+#~ msgid "Response from Mandriva Online server\n"
+#~ msgstr "Mandriva Online サーバからの応答\n"
+
+#~ msgid "No check"
+#~ msgstr "チェックなし"
+
+#~ msgid "Checking config file: Not present\n"
+#~ msgstr "設定ファイル確認: ファイルがありません\n"
+
+#~ msgid "Logs"
+#~ msgstr "ログ"
+
+#~ msgid "Clear"
+#~ msgstr "クリア"
+
+#~ msgid ""
+#~ "mdonline version %s\n"
+#~ "Copyright (C) %s Mandriva.\n"
+#~ "This is free software and may be redistributed under the terms of the GNU "
+#~ "GPL.\n"
+#~ "\n"
+#~ "usage:\n"
+#~ msgstr ""
+#~ "mdonline バージョン %s\n"
+#~ "Copyright (C) %s Mandriva.\n"
+#~ "これはフリーソフトウェアであり、GNU GPL の下で再配布することができます。\n"
+#~ "\n"
+#~ "使用方法 :\n"
+
+#~ msgid "  --box=\t\t\t- hostname.\n"
+#~ msgstr "  --box=\t\t\t- ホスト名\n"
+
+#~ msgid "  --country\t\t\t- name of country of the user. \n"
+#~ msgstr "  --country\t\t\t- ユーザが住んでいる国の名前\n"
+
+#~ msgid "  --interactive\t\t- use the interactive mode.\n"
+#~ msgstr "  --interactive\t\t- 対話式モードを使う\n"
+
+#~ msgid "  --nointeractive\t- use the non-interactive mode.\n"
+#~ msgstr "  --nointeractive\t- 非対話式モードを使う\n"
+
+#~ msgid "  --login=\t\t     - login name of the user.\n"
+#~ msgstr "  --login=\t\t     - ユーザのログイン名\n"
+
+#~ msgid "  --pass=\t\t\t- password  of the user.\n"
+#~ msgstr "  --pass=\t\t\t- ユーザのパスワード\n"
+
+#~ msgid "Mandriva Online"
+#~ msgstr "Mandriva Online"
+
+#~ msgid "I already have an account"
+#~ msgstr "既にアカウントを持っています"
+
+#~ msgid "I want to subscribe"
+#~ msgstr "入会します"
+
+#~ msgid "Mr."
+#~ msgstr "Mr."
+
+#~ msgid "Mrs."
+#~ msgstr "Mrs."
+
+#~ msgid "Ms."
+#~ msgstr "Ms."
+
+#~ msgid "Reading configuration\n"
+#~ msgstr "設定を読み込み中\n"
+
+#~ msgid ""
+#~ "This assistant will help you to upload your configuration\n"
+#~ "(packages, hardware configuration) to a centralized database in\n"
+#~ "order to keep you informed about security updates and useful upgrades.\n"
+#~ msgstr ""
+#~ "この支援ツールは、セキュリティアップデートや通常の更新情報を\n"
+#~ "個別にお知らせするために、あなたのシステムに関する情報\n"
+#~ "(パッケージやハードウェアの設定) を集中データベースに送信します。\n"
+
+#~ msgid "Account creation or authentication"
+#~ msgstr "アカウントの作成または認証"
+
+#~ msgid "Enter your Mandriva Online login, password and machine name:"
+#~ msgstr ""
+#~ "Mandriva Online のログイン名、パスワード、マシン名を入力してください:"
+
+#~ msgid "Email address:"
+#~ msgstr "メールアドレス:"
+
+#~ msgid "Country"
+#~ msgstr "国名"
+
+#~ msgid "Password:"
+#~ msgstr "パスワード:"
+
+#~ msgid "Machine description:"
+#~ msgstr "マシンの説明:"
+
+#~ msgid "(Ex: My Home Office's Computer)"
+#~ msgstr "(例: ホームオフィスのコンピュータ)"
+
+#~ msgid "Machine name must be 1 to 40 alphanumerical characters"
+#~ msgstr "マシン名はアルファベットと数字 (1 から 40 まで) で指定してください"
+
+#~ msgid "Connecting to Mandriva Online website..."
+#~ msgstr "Mandriva Online ウェブサイトに接続中..."
+
+#~ msgid ""
+#~ "In order to benefit from Mandriva Online services,\n"
+#~ "we are about to upload your configuration.\n"
+#~ "\n"
+#~ "The Wizard will now send the following information to Mandriva:\n"
+#~ "\n"
+#~ "1) the list of packages you have installed on your system,\n"
+#~ "\n"
+#~ "2) your hardware configuration.\n"
+#~ "\n"
+#~ "If you feel uncomfortable by that idea, or do not want to benefit from "
+#~ "this service,\n"
+#~ "please press 'Cancel'. By pressing 'Next', you allow us to keep you "
+#~ "informed\n"
+#~ "about security updates and useful upgrades via personalized email "
+#~ "alerts.\n"
+#~ "Furthermore, you benefit from discounted paid support services on\n"
+#~ "www.mandrivaexpert.com."
+#~ msgstr ""
+#~ "Mandriva Online サービスをご利用いただくために、\n"
+#~ "今からあなたのシステムの設定情報を送信します。\n"
+#~ "\n"
+#~ "このウィザードは以下の情報を Mandriva に送ります:\n"
+#~ "\n"
+#~ "1) インストールされているパッケージのリスト\n"
+#~ "\n"
+#~ "2) ハードウェアの設定\n"
+#~ "\n"
+#~ "これらの情報を送信したくない、またはこのサービスを利用しない場合は「キャン"
+#~ "セル」を\n"
+#~ "押してください。「次へ」を選択すると、送信された情報をもとにセキュリティ"
+#~ "アップデート\n"
+#~ "と通常の更新情報をお客様ごとにメールでお知らせします。\n"
+#~ "また、このサービスをご利用頂くと www.mandrivaexpert.com の有料サポートにも"
+#~ "割引が\n"
+#~ "適用されます。"
+
+#~ msgid "Connection problem"
+#~ msgstr "接続トラブル"
+
+#~ msgid "Problem occurs when uploading files, please try again"
+#~ msgstr "ファイル送信中に問題が発生しました。やり直してください。"
+
+#~ msgid "Create a Mandriva Online Account"
+#~ msgstr "Mandriva Online のアカウント作成"
+
+#~ msgid "Greeting:"
+#~ msgstr "敬称:"
+
+#~ msgid "First name:"
+#~ msgstr "名:"
+
+#~ msgid "Last name:"
+#~ msgstr "姓:"
+
+#~ msgid "Confirm Password:"
+#~ msgstr "パスワード確認:"
+
+#~ msgid ""
+#~ "The passwords do not match\n"
+#~ " Please try again\n"
+#~ msgstr ""
+#~ "パスワードが合っていません\n"
+#~ "やり直してください\n"
+
+#~ msgid "Please fill in each field"
+#~ msgstr "すべての項目を埋めてください"
+
+#~ msgid "Not a valid mail address!\n"
+#~ msgstr "メールアドレスが無効です\n"
+
+#~ msgid "Creating account failed!"
+#~ msgstr "アカウントの作成に失敗しました"
+
+#~ msgid ""
+#~ "Mandriva Online Account successfully created.\n"
+#~ "Please click \"Next\" to authenticate and upload your configuration\n"
+#~ msgstr ""
+#~ "Mandriva Online アカウントを作成しました。\n"
+#~ "「次へ」をクリックし、認証と設定の送信を行ってください。\n"
+
+#~ msgid "Your upload was successful!"
+#~ msgstr "送信成功"
+
+#~ msgid ""
+#~ "From now you will receive on security and updates \n"
+#~ "announcements thanks to Mandriva Online."
+#~ msgstr ""
+#~ "これからはセキュリティその他の更新情報を Mandriva Online \n"
+#~ "がお知らせします。"
+
+#~ msgid ""
+#~ "Mandriva Online offers you the ability to automate the updates.\n"
+#~ "A program will run regulary in your system waiting for new updates\n"
+#~ msgstr ""
+#~ "Mandriva Online をご利用いただくとシステムの更新を自動化できます。\n"
+#~ "チェックプログラムが新しい更新情報を定期的に調べに行きます。\n"
+
+#~ msgid "Congratulations"
+#~ msgstr "設定"
+
+#~ msgid "Your Mandriva Online account has been successfully configured\n"
+#~ msgstr "Mandriva Online アカウントの設定が完了しました\n"
+
+#~ msgid "Configuration uploaded successfully"
+#~ msgstr "設定を送信しました"
+
+#~ msgid "Problem uploading configuration"
+#~ msgstr "設定を送信中に問題が発生しました"
+
+#~ msgid ""
+#~ "Cannot connect to Mandriva Online website: wrong login/password or router/"
+#~ "firewall bad settings"
+#~ msgstr ""
+#~ "Mandriva Online ウェブサイトに接続できません (ログイン名/パスワードが間"
+#~ "違っているか、ルータ/ファイアウォールの設定に問題があります)"
diff --git a/po/ka.po b/po/ka.po
index 137d693a..16cb02d6 100644
--- a/po/ka.po
+++ b/po/ka.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline 0.15\n"
-"POT-Creation-Date: 2007-08-09 16:26+0200\n"
+"POT-Creation-Date: 2008-02-21 18:21+0100\n"
 "PO-Revision-Date: 2004-09-29 19:58+0400\n"
 "Last-Translator: \n"
 "Language-Team: Georgian <aiet@qartuli.com>\n"
@@ -15,17 +15,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:94
+#: ../mdkapplet:88
 #, fuzzy, c-format
 msgid "Will check updates at %s"
 msgstr "განახლებების შემოწმება"
 
-#: ../mdkapplet:103
+#: ../mdkapplet:97
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "თქვენი სისტემა განახლებულია"
 
-#: ../mdkapplet:109
+#: ../mdkapplet:103
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -34,56 +34,45 @@ msgstr ""
 "პრობლემა სერვისების კონფიგურაციაში. გთხოვთ გადაამოწმოთ აღრიცხვის ფაილები "
 "(logs) დაგამოაგზავნოთ ფოსტა მისმართზე support@mandrivaonline.com"
 
-#: ../mdkapplet:115
+#: ../mdkapplet:110
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr ""
 
-#: ../mdkapplet:121
+#: ../mdkapplet:116
 #, c-format
 msgid "New updates are available for your system"
 msgstr "თქვენი სისტემა განახლებას საჭიროებს"
 
-#: ../mdkapplet:127
-#, fuzzy, c-format
-msgid "New bundles are available for your system"
-msgstr "თქვენი სისტემა განახლებას საჭიროებს"
-
-#: ../mdkapplet:133
-#, c-format
-msgid "Service is not configured. Please click on \"Configure the service\""
-msgstr ""
-"სერვისი არ არის კონფიგურირებული. დააწკაპუნეთ „სერვისების კონფიგურირება“-ზე"
-
-#: ../mdkapplet:139
+#: ../mdkapplet:122
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "ქსელი მიუწვდომელია. შეასწორეთ ქსელის კონფიგურაცია"
 
-#: ../mdkapplet:145
+#: ../mdkapplet:128
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "სერვისი არ არის აქტივირებული. დააწკაპუნეთ „Online Website“-ზე"
 
-#: ../mdkapplet:151 ../mdkapplet:182
+#: ../mdkapplet:134 ../mdkapplet:165
 #, fuzzy, c-format
 msgid "urpmi database locked"
 msgstr "urpmi მონაცემთა ბაზა ჩაკეტილია"
 
-#: ../mdkapplet:157
+#: ../mdkapplet:140
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 "ამ გამოშვების (Release) მხარდაჭერა არ გამაჩნია (ან მოძველებულია, ან "
 "development release არის)"
 
-#: ../mdkapplet:163
+#: ../mdkapplet:146
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
 msgstr ""
 
-#: ../mdkapplet:169
+#: ../mdkapplet:152
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -94,590 +83,133 @@ msgid ""
 "Then, restart \"%s\"."
 msgstr ""
 
-#: ../mdkapplet:174
+#: ../mdkapplet:157
 #, c-format
 msgid "Enabled"
 msgstr "აქტიური"
 
-#: ../mdkapplet:187
+#: ../mdkapplet:170
 #, c-format
 msgid "Error updating media"
 msgstr ""
 
-#: ../mdkapplet:202
+#: ../mdkapplet:185
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr "ვამოწმებ... არსებობს გასაახლებელი პაკეტები\n"
 
-#: ../mdkapplet:207
+#: ../mdkapplet:190
 #, c-format
 msgid "Packages are up to date"
 msgstr ""
 
-#: ../mdkapplet:212
+#: ../mdkapplet:195
 #, fuzzy, c-format
 msgid "Failed to open urpmi database"
 msgstr "ვერ ვიძახებ ფაილს %s\n"
 
-#: ../mdkapplet:217 ../mdkapplet:324
+#: ../mdkapplet:200
 #, c-format
 msgid "Install updates"
 msgstr "განახლებების ინსტალირება"
 
-#: ../mdkapplet:218
-#, c-format
-msgid "Configure the service"
-msgstr "სერვისის კონფიგურირება"
-
-#: ../mdkapplet:219
+#: ../mdkapplet:201
 #, c-format
 msgid "Check Updates"
 msgstr "განახლებების შეამოწმება"
 
-#: ../mdkapplet:220 ../mdkapplet:327 ../mdkonline:114 ../mdkonline:155
-#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
-#, c-format
-msgid "Please wait"
-msgstr "გთხოვთ იქონიოთ მოთმინება"
-
-#: ../mdkapplet:220 ../mdkapplet:326 ../mdkapplet:327
-#, c-format
-msgid "Check updates"
-msgstr "განახლებების შემოწმება"
-
-#: ../mdkapplet:223 ../mdkapplet:648
-#, c-format
-msgid "Online WebSite"
-msgstr "Online WebSite"
-
-#: ../mdkapplet:224
+#: ../mdkapplet:202
 #, c-format
 msgid "Configure Network"
 msgstr "ქსელის კონფიგურირება"
 
-#: ../mdkapplet:225
-#, c-format
-msgid "Configure Now!"
-msgstr "კონფიგურირება ახლა!"
-
-#: ../mdkapplet:313 ../mdkapplet:392
-#, c-format
-msgid "Mandriva Linux Updates Applet"
-msgstr "მენდრეიქის განახლების აპლეტი"
-
-#: ../mdkapplet:322
-#, c-format
-msgid "Actions"
-msgstr "მოქმედებები"
-
-#: ../mdkapplet:325
-#, c-format
-msgid "Configure"
-msgstr "კონფიგურაცია"
-
-#: ../mdkapplet:329
-#, c-format
-msgid "See logs"
-msgstr "აჩვენე აღრიცხვები"
-
-#: ../mdkapplet:332
-#, c-format
-msgid "Status"
-msgstr "სტატუსი"
-
-#: ../mdkapplet:336 ../mdkapplet:597
-#, c-format
-msgid "Close"
-msgstr "დახურვა"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Network Connection: "
-msgstr "ქსელის კავშირი:"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Up"
-msgstr "ღვიძავს"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Down"
-msgstr "ძინავს"
-
-#: ../mdkapplet:366
-#, c-format
-msgid "Last check: "
-msgstr "ბოლო შემოწმება:"
-
-#: ../mdkapplet:367 ../mdkonline:145
-#, c-format
-msgid "Machine name:"
-msgstr "სისტემის სახელი (Machine name):"
-
-#: ../mdkapplet:368
-#, c-format
-msgid "Updates: "
-msgstr "განახლებები:"
-
-#: ../mdkapplet:372
+#: ../mdkapplet:283
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "ვიძახებ drakconnect-ს\n"
 
-#: ../mdkapplet:375
+#: ../mdkapplet:286
 #, c-format
 msgid "Mandriva Online seems to be reinstalled, reloading applet ...."
 msgstr ""
 "როგორ ჩანს Mandriva Online ხელმეორედ იქნა ინსტალირებული. ხელახლა ვიძახებ "
 "აპლეტს..."
 
-#: ../mdkapplet:383
+#: ../mdkapplet:294
 #, c-format
 msgid "Launching MandrivaUpdate\n"
 msgstr "ვიძახებ MandrivaUpdate-ს\n"
 
-#: ../mdkapplet:398
+#: ../mdkapplet:303
+#, c-format
+msgid "Mandriva Linux Updates Applet"
+msgstr "მენდრეიქის განახლების აპლეტი"
+
+#: ../mdkapplet:308
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "ვანგარიშობ გასაახლებელ პაკეტებს...\n"
 
-#: ../mdkapplet:399
+#: ../mdkapplet:309
 #, c-format
 msgid "Connecting to"
 msgstr "ვუკავშირდები:"
 
-#: ../mdkapplet:467 ../mdkupdate:159 ../mdkupdate:188
-#, c-format
-msgid "An error occurred"
-msgstr ""
-
-#: ../mdkapplet:475
-#, c-format
-msgid "Development release not supported by service"
-msgstr "Development release-ის მხარდაჭერა სერვისს არ გააჩნია"
-
-#: ../mdkapplet:476
-#, c-format
-msgid "Too old release not supported by service"
-msgstr "release ძალიან ძველია და service-ს მისი მხარდაჭერა არ გააჩნია"
-
-#: ../mdkapplet:477
-#, c-format
-msgid "Unknown state"
-msgstr "უცნობი მდგომარეობა"
-
-#: ../mdkapplet:478
-#, c-format
-msgid "Online services disabled. Contact Mandriva Online site\n"
-msgstr ""
-"ონლაინ მომსახურებები შეწყვეტილია. მიაკითხეთ Mandriva Online-ის ვებგვერდს\n"
-
-#: ../mdkapplet:479
-#, c-format
-msgid "Wrong Password.\n"
-msgstr "არასწორი პაროლი\n"
-
-#: ../mdkapplet:480
-#, c-format
-msgid "Wrong Action or host or login.\n"
-msgstr "არასწორი მოქმედება, ჰოსტი ან შესვლა.\n"
-
-#: ../mdkapplet:481
-#, c-format
-msgid ""
-"Something is wrong with your network settings (check your route, firewall or "
-"proxy settings)\n"
-msgstr ""
-"თქვენი ქსელის პარამეტრებში რაღაც გაუგებრობაა (გადაამოწმეთ route, firewall ან "
-"proxy პარამეტრები)\n"
-
-#: ../mdkapplet:483
-#, c-format
-msgid ""
-"Problem occured while connecting to the server, please contact the support "
-"team"
-msgstr ""
-"პრობლემა სერვერთან დაკავშირებისას, გთხოვთ დაუკავშირდეთ ტექნიკურ დახმარების "
-"ჯგუფს"
-
-#: ../mdkapplet:487
-#, fuzzy, c-format
-msgid "Response from Mandriva Online server\n"
-msgstr "კეთილი იყოს თქვენი ფეხი Mandriva Online-ზე."
-
-#: ../mdkapplet:490
+#: ../mdkapplet:386
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "სისტემა განახლებულია\n"
 
-#: ../mdkapplet:527
-#, c-format
-msgid "No check"
-msgstr "შეამოწმების გარეშე"
-
-#: ../mdkapplet:541
-#, c-format
-msgid "Checking config file: Not present\n"
-msgstr "ვამოწმებ config ფაილს: არა იძებნება\n"
-
-#: ../mdkapplet:544
+#: ../mdkapplet:415
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "ვამოწმებ ქსელს: როგორც ჩანს გამორთულია\n"
 
-#: ../mdkapplet:587
+#: ../mdkapplet:457 ../mdkupdate:118 ../mdkupdate:164
 #, c-format
-msgid "Logs"
-msgstr "ლოგები (აღრიცხვები)"
-
-#: ../mdkapplet:603
-#, c-format
-msgid "Clear"
-msgstr "ამოშლა"
+msgid "Warning"
+msgstr "გაფრთხილება"
 
-#: ../mdkapplet:629
+#: ../mdkapplet:468
 #, c-format
 msgid "About..."
 msgstr "შესახებ..."
 
-#: ../mdkapplet:631
+#: ../mdkapplet:472
 #, fuzzy, c-format
 msgid "Mandriva Online %s"
 msgstr "Mandriva Online"
 
-#: ../mdkapplet:635
+#: ../mdkapplet:473
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr ""
 
-#: ../mdkapplet:647
+#: ../mdkapplet:476
 #, c-format
 msgid "Mandriva Online gives access to Mandriva web services."
 msgstr ""
 
-#: ../mdkapplet:655
-#, c-format
-msgid "Always launch on startup"
-msgstr "მუდამ გამოიძახე სისტემის ჩატვირთვისას (startup)"
-
-#: ../mdkapplet:657
-#, c-format
-msgid "Quit"
-msgstr "გასვლა"
-
-#: ../mdkonline:58
-#, c-format
-msgid ""
-"mdonline version %s\n"
-"Copyright (C) %s Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"mdonline ვერსია %s\n"
-"საავტორო უფლებები (C) %s Mandriva.\n"
-"პროგრამა უფასო გახლავთ და ნებადართულია მისი GNU GPL ლიცენზიის პირობების "
-"თანახმად გავრცელება.\n"
-"\n"
-"გამოყენება:\n"
-
-#: ../mdkonline:63 ../mdkupdate:73
-#, c-format
-msgid "  --help\t\t- print this help message.\n"
-msgstr "  --help\t\t- აჩვენე ეს დამხმარე ტექსტი.\n"
-
-#: ../mdkonline:64
-#, c-format
-msgid "  --box=\t\t\t- hostname.\n"
-msgstr ""
-
-#: ../mdkonline:65
-#, c-format
-msgid "  --country\t\t\t- name of country of the user. \n"
-msgstr ""
-
-#: ../mdkonline:66
-#, c-format
-msgid "  --interactive\t\t- use the interactive mode.\n"
-msgstr ""
-
-#: ../mdkonline:67
-#, c-format
-msgid "  --nointeractive\t- use the non-interactive mode.\n"
-msgstr ""
-
-#: ../mdkonline:68
-#, c-format
-msgid "  --login=\t\t     - login name of the user.\n"
-msgstr ""
-
-#: ../mdkonline:69
-#, c-format
-msgid "  --pass=\t\t\t- password  of the user.\n"
-msgstr ""
-
-#: ../mdkonline:87 ../mdkonline:120
-#, c-format
-msgid "Mandriva Online"
-msgstr "Mandriva Online"
-
-#: ../mdkonline:90
-#, c-format
-msgid "I already have an account"
-msgstr "მე უკვე გამაჩნია ანგარიში"
-
-#: ../mdkonline:91
-#, c-format
-msgid "I want to subscribe"
-msgstr "მინდა გავწევრიანდე"
-
-#: ../mdkonline:96
-#, c-format
-msgid "Mr."
-msgstr ""
-
-#: ../mdkonline:96
-#, c-format
-msgid "Mrs."
-msgstr ""
-
-#: ../mdkonline:96
-#, c-format
-msgid "Ms."
-msgstr ""
-
-#: ../mdkonline:114
-#, c-format
-msgid "Reading configuration\n"
-msgstr "ვკითხულობ კონფიგურაცას\n"
-
-#: ../mdkonline:123
-#, c-format
-msgid ""
-"This assistant will help you to upload your configuration\n"
-"(packages, hardware configuration) to a centralized database in\n"
-"order to keep you informed about security updates and useful upgrades.\n"
-msgstr ""
-"ეს ასისტენტი დაგეხმარებათ თქვენი კონფიგურაციის განახლებაში\n"
-"(პაკეტები, აპარატურის კონფიგურაცია) ცენტრალურ მონაცემთა ბაზაში, იმისთვის, "
-"რომ\n"
-"თქვენ ავტომატურად შეიტყოთ უსაფრთხობასთან დაკავშირებულ და მნიშვნელოვან "
-"გაუმჯობესებებზე.\n"
-
-#: ../mdkonline:131
-#, c-format
-msgid "Account creation or authentication"
-msgstr "ანგარიშის შექმნა ან ავტორიზაცია"
-
-#: ../mdkonline:136
-#, c-format
-msgid "Enter your Mandriva Online login, password and machine name:"
-msgstr ""
-"შეიყვანეთ თქვენი Mandriva Online-ის მომხმარებლის სახელი, პაროლი და სისტემის "
-"სახელი:"
-
-#: ../mdkonline:142 ../mdkonline:195
-#, fuzzy, c-format
-msgid "Email address:"
-msgstr "გთხოვთ სწორი მისამართი შეიყვანოთ!\n"
-
-#: ../mdkonline:143
-#, c-format
-msgid "Country"
-msgstr "ქვეყანა"
-
-#: ../mdkonline:144 ../mdkonline:196
-#, c-format
-msgid "Password:"
-msgstr "პაროლი:"
-
-#: ../mdkonline:146
-#, fuzzy, c-format
-msgid "Machine description:"
-msgstr "სისტემის სახელი (Machine name):"
-
-#: ../mdkonline:147
-#, c-format
-msgid "(Ex: My Home Office's Computer)"
-msgstr ""
-
-#: ../mdkonline:152 ../mdkonline:159 ../mdkonline:180 ../mdkonline:204
-#: ../mdkonline:208 ../mdkonline:212 ../mdkonline:217 ../mdkupdate:141
-#: ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
-#, c-format
-msgid "Error"
-msgstr "შეცდომა"
-
-#: ../mdkonline:152
-#, c-format
-msgid "Machine name must be 1 to 40 alphanumerical characters"
-msgstr ""
-
-#: ../mdkonline:155
-#, c-format
-msgid "Connecting to Mandriva Online website..."
-msgstr "უკავშირდები Mandriva Online ვებგვერდს..."
-
-#: ../mdkonline:167
-#, c-format
-msgid ""
-"In order to benefit from Mandriva Online services,\n"
-"we are about to upload your configuration.\n"
-"\n"
-"The Wizard will now send the following information to Mandriva:\n"
-"\n"
-"1) the list of packages you have installed on your system,\n"
-"\n"
-"2) your hardware configuration.\n"
-"\n"
-"If you feel uncomfortable by that idea, or do not want to benefit from this "
-"service,\n"
-"please press 'Cancel'. By pressing 'Next', you allow us to keep you "
-"informed\n"
-"about security updates and useful upgrades via personalized email alerts.\n"
-"Furthermore, you benefit from discounted paid support services on\n"
-"www.mandrivaexpert.com."
-msgstr ""
-"იმისათვის, რომ გამოიყენოთ Mandriva Online-ის სერვისი, ჩვენ ვაპირებთ\n"
-"თქვენი კონფიგურაციის ატვირთვას.\n"
-"\n"
-"თუ გააგრძელებთ, შემდეგი ინფორმაცია გადაიგზავნება Mandriva-ში:\n"
-"\n"
-"1) თქვენ სისტემაში ინსტალირებულ პაკეტთა სია,\n"
-"\n"
-"2) თქვენი აპარატურის კონფიგურაცია\n"
-"\n"
-"თუ თქვენ ეს არ გსურთ, ან არ გინდათ სერვისის გამოყენება, გთხოვთ\n"
-"დააჭიროთ 'სტოპ!'-ს. თუ 'შემდეგი'-ს დააჭერთ, მაშინ უფლებას გვეძლევა\n"
-"შეგატყობინოთ უსაფრთხოებასთან დაკავშირებული და მნიშვნელოვანი\n"
-"განახლებების შესახებ. ასევე, თქვენ საშუალება მოგეცემათ ისარგებლოთ\n"
-"ფასდაკლებებით www.mandrivaexpert.com-ზე არსებული ფასიან მომსახურებებზე."
-
-#: ../mdkonline:180
-#, c-format
-msgid "Connection problem"
-msgstr "კავშირის პრობლემა"
-
-#: ../mdkonline:180
-#, c-format
-msgid "Problem occurs when uploading files, please try again"
-msgstr "ფაილების ატვირთვისას პრობლემებია. გთხოვთ კვლავ ცადოთ"
-
-#: ../mdkonline:187
-#, c-format
-msgid "Create a Mandriva Online Account"
-msgstr "Mandriva Online-ზე ანგარიშის გახსნა"
-
-#. -PO: that is for things like "Mr", "Ms",...
-#: ../mdkonline:192
-#, fuzzy, c-format
-msgid "Greeting:"
-msgstr "მწვანე"
-
-#: ../mdkonline:193
-#, fuzzy, c-format
-msgid "First name:"
-msgstr "ფაილის სახელი:"
-
-#: ../mdkonline:194
-#, fuzzy, c-format
-msgid "Last name:"
-msgstr "სიმღერების სახელები:"
-
-#: ../mdkonline:197
-#, c-format
-msgid "Confirm Password:"
-msgstr "გაიმეორეთ პაროლი:"
-
-#: ../mdkonline:204
-#, c-format
-msgid ""
-"The passwords do not match\n"
-" Please try again\n"
-msgstr ""
-"პროლები არ ემთხვევა\n"
-" გთხოვთ ცადოთ ისევ\n"
-
-#: ../mdkonline:208
-#, fuzzy, c-format
-msgid "Please fill in each field"
-msgstr "გთხოვთ შეავსოთ ყველა ველი\n"
-
-#: ../mdkonline:212
-#, c-format
-msgid "Not a valid mail address!\n"
-msgstr "გთხოვთ სწორი მისამართი შეიყვანოთ!\n"
-
-#: ../mdkonline:217
-#, c-format
-msgid "Creating account failed!"
-msgstr ""
-
-#: ../mdkonline:225
-#, c-format
-msgid ""
-"Mandriva Online Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
-msgstr ""
-"Mandriva Online-ზე წარმატებით განხორციელდა თქვენი ანგარიშის რეგისტრაცია.\n"
-"გთხოვთ დააჭიროთ \"შემდეგ\" ღილაკს რათა გაიაროთ ვტორიზაცია და ატვირთოთ თვენი "
-"კონფიგურაცია\n"
-
-#: ../mdkonline:229
-#, c-format
-msgid "Your upload was successful!"
-msgstr "განახლება წარმატებით დაგვირგვინდა!"
-
-#: ../mdkonline:229
+#: ../mdkapplet:478
 #, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandriva Online."
-msgstr ""
-"Mandriva Online-ის მეშვეობით დღეიდან თქვენ მიიღებთ უსაფრთხოებასთან "
-"დაკავშირებულ\n"
-"და მნიშვნელოვან გაუმჯობესებების განცხადებებს."
+msgid "Online WebSite"
+msgstr "Online WebSite"
 
-#: ../mdkonline:229
+#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
+#: ../mdkapplet:483
 #, c-format
-msgid ""
-"Mandriva Online offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
+msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
-"Mandriva Online გაძლევთ საშუალებას ავტომატურად განაახლოთ სისტემა.\n"
-"თქვენს სისტემაზე რეგულარურად გაიშვება პროგრამა, რომელიც განახლებებს "
-"დაელოდება\n"
 
-#: ../mdkonline:238
-#, fuzzy, c-format
-msgid "Congratulations"
-msgstr "კონფიგურაცის გადაგზავნა"
-
-#: ../mdkonline:238
+#: ../mdkapplet:492
 #, c-format
-msgid "Your Mandriva Online account has been successfully configured\n"
-msgstr "თქვენი Mandriva Online ანგარიშის კონფიგურაცია  წარმატებით დასრულდა\n"
-
-#: ../mdkonline:253
-#, fuzzy, c-format
-msgid "Configuration uploaded successfully"
-msgstr "განახლება წარმატებით დაგვირგვინდა!"
-
-#: ../mdkonline:254
-#, fuzzy, c-format
-msgid "Problem uploading configuration"
-msgstr "ვკითხულობ კონფიგურაცას\n"
+msgid "Always launch on startup"
+msgstr "მუდამ გამოიძახე სისტემის ჩატვირთვისას (startup)"
 
-#: ../mdkonline:256
+#: ../mdkapplet:494
 #, c-format
-msgid ""
-"Cannot connect to Mandriva Online website: wrong login/password or router/"
-"firewall bad settings"
-msgstr ""
-"ვერ ვუკავშირდები Mandriva Online ვებ-გვერდს: ან მომხმ. სახელი და პაროლია "
-"არასწორი, ან თქვენი როუტერი/firewall არის ცუდად კონფიგურირებული"
+msgid "Quit"
+msgstr "გასვლა"
 
 #: ../mdkonline.pm:207
 #, fuzzy, c-format
@@ -816,6 +348,11 @@ msgstr ""
 "\n"
 "გამოყენება:\n"
 
+#: ../mdkupdate:73
+#, c-format
+msgid "  --help\t\t- print this help message.\n"
+msgstr "  --help\t\t- აჩვენე ეს დამხმარე ტექსტი.\n"
+
 #: ../mdkupdate:74
 #, c-format
 msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
@@ -843,11 +380,6 @@ msgid ""
 "file.\n"
 msgstr ""
 
-#: ../mdkupdate:118 ../mdkupdate:164
-#, c-format
-msgid "Warning"
-msgstr "გაფრთხილება"
-
 #. -PO: here Live Install is currently *NOT* translated on the desktop, so it's better to keep as it:
 #: ../mdkupdate:120
 #, c-format
@@ -856,11 +388,21 @@ msgid ""
 "Install' wizard."
 msgstr ""
 
+#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
+#, c-format
+msgid "Please wait"
+msgstr "გთხოვთ იქონიოთ მოთმინება"
+
 #: ../mdkupdate:123 ../mdkupdate:174
 #, c-format
 msgid "Preparing..."
 msgstr ""
 
+#: ../mdkupdate:141 ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
+#, c-format
+msgid "Error"
+msgstr "შეცდომა"
+
 #: ../mdkupdate:141
 #, c-format
 msgid ""
@@ -869,6 +411,11 @@ msgid ""
 "%s"
 msgstr ""
 
+#: ../mdkupdate:159 ../mdkupdate:188
+#, c-format
+msgid "An error occurred"
+msgstr ""
+
 #: ../mdkupdate:164
 #, c-format
 msgid ""
@@ -893,6 +440,290 @@ msgstr "მიმდინარეობს პაკეტების ინ�
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "update_source-ის მედიუმიდან პაკეტები ვერ განვაახლე.\n"
 
+#, fuzzy
+#~ msgid "New bundles are available for your system"
+#~ msgstr "თქვენი სისტემა განახლებას საჭიროებს"
+
+#~ msgid "Service is not configured. Please click on \"Configure the service\""
+#~ msgstr ""
+#~ "სერვისი არ არის კონფიგურირებული. დააწკაპუნეთ „სერვისების კონფიგურირება“-ზე"
+
+#~ msgid "Configure the service"
+#~ msgstr "სერვისის კონფიგურირება"
+
+#~ msgid "Check updates"
+#~ msgstr "განახლებების შემოწმება"
+
+#~ msgid "Configure Now!"
+#~ msgstr "კონფიგურირება ახლა!"
+
+#~ msgid "Actions"
+#~ msgstr "მოქმედებები"
+
+#~ msgid "Configure"
+#~ msgstr "კონფიგურაცია"
+
+#~ msgid "See logs"
+#~ msgstr "აჩვენე აღრიცხვები"
+
+#~ msgid "Status"
+#~ msgstr "სტატუსი"
+
+#~ msgid "Close"
+#~ msgstr "დახურვა"
+
+#~ msgid "Network Connection: "
+#~ msgstr "ქსელის კავშირი:"
+
+#~ msgid "Up"
+#~ msgstr "ღვიძავს"
+
+#~ msgid "Down"
+#~ msgstr "ძინავს"
+
+#~ msgid "Last check: "
+#~ msgstr "ბოლო შემოწმება:"
+
+#~ msgid "Machine name:"
+#~ msgstr "სისტემის სახელი (Machine name):"
+
+#~ msgid "Updates: "
+#~ msgstr "განახლებები:"
+
+#~ msgid "Development release not supported by service"
+#~ msgstr "Development release-ის მხარდაჭერა სერვისს არ გააჩნია"
+
+#~ msgid "Too old release not supported by service"
+#~ msgstr "release ძალიან ძველია და service-ს მისი მხარდაჭერა არ გააჩნია"
+
+#~ msgid "Unknown state"
+#~ msgstr "უცნობი მდგომარეობა"
+
+#~ msgid "Online services disabled. Contact Mandriva Online site\n"
+#~ msgstr ""
+#~ "ონლაინ მომსახურებები შეწყვეტილია. მიაკითხეთ Mandriva Online-ის ვებგვერდს\n"
+
+#~ msgid "Wrong Password.\n"
+#~ msgstr "არასწორი პაროლი\n"
+
+#~ msgid "Wrong Action or host or login.\n"
+#~ msgstr "არასწორი მოქმედება, ჰოსტი ან შესვლა.\n"
+
+#~ msgid ""
+#~ "Something is wrong with your network settings (check your route, firewall "
+#~ "or proxy settings)\n"
+#~ msgstr ""
+#~ "თქვენი ქსელის პარამეტრებში რაღაც გაუგებრობაა (გადაამოწმეთ route, firewall "
+#~ "ან proxy პარამეტრები)\n"
+
+#~ msgid ""
+#~ "Problem occured while connecting to the server, please contact the "
+#~ "support team"
+#~ msgstr ""
+#~ "პრობლემა სერვერთან დაკავშირებისას, გთხოვთ დაუკავშირდეთ ტექნიკურ "
+#~ "დახმარების ჯგუფს"
+
+#, fuzzy
+#~ msgid "Response from Mandriva Online server\n"
+#~ msgstr "კეთილი იყოს თქვენი ფეხი Mandriva Online-ზე."
+
+#~ msgid "No check"
+#~ msgstr "შეამოწმების გარეშე"
+
+#~ msgid "Checking config file: Not present\n"
+#~ msgstr "ვამოწმებ config ფაილს: არა იძებნება\n"
+
+#~ msgid "Logs"
+#~ msgstr "ლოგები (აღრიცხვები)"
+
+#~ msgid "Clear"
+#~ msgstr "ამოშლა"
+
+#~ msgid ""
+#~ "mdonline version %s\n"
+#~ "Copyright (C) %s Mandriva.\n"
+#~ "This is free software and may be redistributed under the terms of the GNU "
+#~ "GPL.\n"
+#~ "\n"
+#~ "usage:\n"
+#~ msgstr ""
+#~ "mdonline ვერსია %s\n"
+#~ "საავტორო უფლებები (C) %s Mandriva.\n"
+#~ "პროგრამა უფასო გახლავთ და ნებადართულია მისი GNU GPL ლიცენზიის პირობების "
+#~ "თანახმად გავრცელება.\n"
+#~ "\n"
+#~ "გამოყენება:\n"
+
+#~ msgid "Mandriva Online"
+#~ msgstr "Mandriva Online"
+
+#~ msgid "I already have an account"
+#~ msgstr "მე უკვე გამაჩნია ანგარიში"
+
+#~ msgid "I want to subscribe"
+#~ msgstr "მინდა გავწევრიანდე"
+
+#~ msgid "Reading configuration\n"
+#~ msgstr "ვკითხულობ კონფიგურაცას\n"
+
+#~ msgid ""
+#~ "This assistant will help you to upload your configuration\n"
+#~ "(packages, hardware configuration) to a centralized database in\n"
+#~ "order to keep you informed about security updates and useful upgrades.\n"
+#~ msgstr ""
+#~ "ეს ასისტენტი დაგეხმარებათ თქვენი კონფიგურაციის განახლებაში\n"
+#~ "(პაკეტები, აპარატურის კონფიგურაცია) ცენტრალურ მონაცემთა ბაზაში, იმისთვის, "
+#~ "რომ\n"
+#~ "თქვენ ავტომატურად შეიტყოთ უსაფრთხობასთან დაკავშირებულ და მნიშვნელოვან "
+#~ "გაუმჯობესებებზე.\n"
+
+#~ msgid "Account creation or authentication"
+#~ msgstr "ანგარიშის შექმნა ან ავტორიზაცია"
+
+#~ msgid "Enter your Mandriva Online login, password and machine name:"
+#~ msgstr ""
+#~ "შეიყვანეთ თქვენი Mandriva Online-ის მომხმარებლის სახელი, პაროლი და "
+#~ "სისტემის სახელი:"
+
+#, fuzzy
+#~ msgid "Email address:"
+#~ msgstr "გთხოვთ სწორი მისამართი შეიყვანოთ!\n"
+
+#~ msgid "Country"
+#~ msgstr "ქვეყანა"
+
+#~ msgid "Password:"
+#~ msgstr "პაროლი:"
+
+#, fuzzy
+#~ msgid "Machine description:"
+#~ msgstr "სისტემის სახელი (Machine name):"
+
+#~ msgid "Connecting to Mandriva Online website..."
+#~ msgstr "უკავშირდები Mandriva Online ვებგვერდს..."
+
+#~ msgid ""
+#~ "In order to benefit from Mandriva Online services,\n"
+#~ "we are about to upload your configuration.\n"
+#~ "\n"
+#~ "The Wizard will now send the following information to Mandriva:\n"
+#~ "\n"
+#~ "1) the list of packages you have installed on your system,\n"
+#~ "\n"
+#~ "2) your hardware configuration.\n"
+#~ "\n"
+#~ "If you feel uncomfortable by that idea, or do not want to benefit from "
+#~ "this service,\n"
+#~ "please press 'Cancel'. By pressing 'Next', you allow us to keep you "
+#~ "informed\n"
+#~ "about security updates and useful upgrades via personalized email "
+#~ "alerts.\n"
+#~ "Furthermore, you benefit from discounted paid support services on\n"
+#~ "www.mandrivaexpert.com."
+#~ msgstr ""
+#~ "იმისათვის, რომ გამოიყენოთ Mandriva Online-ის სერვისი, ჩვენ ვაპირებთ\n"
+#~ "თქვენი კონფიგურაციის ატვირთვას.\n"
+#~ "\n"
+#~ "თუ გააგრძელებთ, შემდეგი ინფორმაცია გადაიგზავნება Mandriva-ში:\n"
+#~ "\n"
+#~ "1) თქვენ სისტემაში ინსტალირებულ პაკეტთა სია,\n"
+#~ "\n"
+#~ "2) თქვენი აპარატურის კონფიგურაცია\n"
+#~ "\n"
+#~ "თუ თქვენ ეს არ გსურთ, ან არ გინდათ სერვისის გამოყენება, გთხოვთ\n"
+#~ "დააჭიროთ 'სტოპ!'-ს. თუ 'შემდეგი'-ს დააჭერთ, მაშინ უფლებას გვეძლევა\n"
+#~ "შეგატყობინოთ უსაფრთხოებასთან დაკავშირებული და მნიშვნელოვანი\n"
+#~ "განახლებების შესახებ. ასევე, თქვენ საშუალება მოგეცემათ ისარგებლოთ\n"
+#~ "ფასდაკლებებით www.mandrivaexpert.com-ზე არსებული ფასიან მომსახურებებზე."
+
+#~ msgid "Connection problem"
+#~ msgstr "კავშირის პრობლემა"
+
+#~ msgid "Problem occurs when uploading files, please try again"
+#~ msgstr "ფაილების ატვირთვისას პრობლემებია. გთხოვთ კვლავ ცადოთ"
+
+#~ msgid "Create a Mandriva Online Account"
+#~ msgstr "Mandriva Online-ზე ანგარიშის გახსნა"
+
+#, fuzzy
+#~ msgid "Greeting:"
+#~ msgstr "მწვანე"
+
+#, fuzzy
+#~ msgid "First name:"
+#~ msgstr "ფაილის სახელი:"
+
+#, fuzzy
+#~ msgid "Last name:"
+#~ msgstr "სიმღერების სახელები:"
+
+#~ msgid "Confirm Password:"
+#~ msgstr "გაიმეორეთ პაროლი:"
+
+#~ msgid ""
+#~ "The passwords do not match\n"
+#~ " Please try again\n"
+#~ msgstr ""
+#~ "პროლები არ ემთხვევა\n"
+#~ " გთხოვთ ცადოთ ისევ\n"
+
+#, fuzzy
+#~ msgid "Please fill in each field"
+#~ msgstr "გთხოვთ შეავსოთ ყველა ველი\n"
+
+#~ msgid "Not a valid mail address!\n"
+#~ msgstr "გთხოვთ სწორი მისამართი შეიყვანოთ!\n"
+
+#~ msgid ""
+#~ "Mandriva Online Account successfully created.\n"
+#~ "Please click \"Next\" to authenticate and upload your configuration\n"
+#~ msgstr ""
+#~ "Mandriva Online-ზე წარმატებით განხორციელდა თქვენი ანგარიშის რეგისტრაცია.\n"
+#~ "გთხოვთ დააჭიროთ \"შემდეგ\" ღილაკს რათა გაიაროთ ვტორიზაცია და ატვირთოთ "
+#~ "თვენი კონფიგურაცია\n"
+
+#~ msgid "Your upload was successful!"
+#~ msgstr "განახლება წარმატებით დაგვირგვინდა!"
+
+#~ msgid ""
+#~ "From now you will receive on security and updates \n"
+#~ "announcements thanks to Mandriva Online."
+#~ msgstr ""
+#~ "Mandriva Online-ის მეშვეობით დღეიდან თქვენ მიიღებთ უსაფრთხოებასთან "
+#~ "დაკავშირებულ\n"
+#~ "და მნიშვნელოვან გაუმჯობესებების განცხადებებს."
+
+#~ msgid ""
+#~ "Mandriva Online offers you the ability to automate the updates.\n"
+#~ "A program will run regulary in your system waiting for new updates\n"
+#~ msgstr ""
+#~ "Mandriva Online გაძლევთ საშუალებას ავტომატურად განაახლოთ სისტემა.\n"
+#~ "თქვენს სისტემაზე რეგულარურად გაიშვება პროგრამა, რომელიც განახლებებს "
+#~ "დაელოდება\n"
+
+#, fuzzy
+#~ msgid "Congratulations"
+#~ msgstr "კონფიგურაცის გადაგზავნა"
+
+#~ msgid "Your Mandriva Online account has been successfully configured\n"
+#~ msgstr ""
+#~ "თქვენი Mandriva Online ანგარიშის კონფიგურაცია  წარმატებით დასრულდა\n"
+
+#, fuzzy
+#~ msgid "Configuration uploaded successfully"
+#~ msgstr "განახლება წარმატებით დაგვირგვინდა!"
+
+#, fuzzy
+#~ msgid "Problem uploading configuration"
+#~ msgstr "ვკითხულობ კონფიგურაცას\n"
+
+#~ msgid ""
+#~ "Cannot connect to Mandriva Online website: wrong login/password or router/"
+#~ "firewall bad settings"
+#~ msgstr ""
+#~ "ვერ ვუკავშირდები Mandriva Online ვებ-გვერდს: ან მომხმ. სახელი და პაროლია "
+#~ "არასწორი, ან თქვენი როუტერი/firewall არის ცუდად კონფიგურირებული"
+
 #~ msgid "  --applet\t\t- launch Mandriva Update.\n"
 #~ msgstr "  --applet\t\t- გამოიძახე Mandriva Update.\n"
 
diff --git a/po/ko.po b/po/ko.po
index 97a1c454..05e9765f 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline 1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-09 16:26+0200\n"
+"POT-Creation-Date: 2008-02-21 18:21+0100\n"
 "PO-Revision-Date: 2002-08-16 12:34+0900\n"
 "Last-Translator: Jaegeum Cze <baedaron@hanafos.com>\n"
 "Language-Team: korean <baedaron@hanafos.com>\n"
@@ -16,70 +16,60 @@ 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:94
+#: ../mdkapplet:88
 #, fuzzy, c-format
 msgid "Will check updates at %s"
 msgstr "보안 업데이트"
 
-#: ../mdkapplet:103
+#: ../mdkapplet:97
 #, c-format
 msgid "Your system is up-to-date"
 msgstr ""
 
-#: ../mdkapplet:109
+#: ../mdkapplet:103
 #, fuzzy, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
 "support@mandrivaonline.com"
 msgstr "문의사항은 support@mandrivaonline.com로 메일 주세요.\n"
 
-#: ../mdkapplet:115
+#: ../mdkapplet:110
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "기다려 주세요. 유효한 팩키지 검색 중..."
 
-#: ../mdkapplet:121
+#: ../mdkapplet:116
 #, fuzzy, c-format
 msgid "New updates are available for your system"
 msgstr "네트웍 어댑터를 찾을 수 없습니다!"
 
-#: ../mdkapplet:127
-#, fuzzy, c-format
-msgid "New bundles are available for your system"
-msgstr "네트웍 어댑터를 찾을 수 없습니다!"
-
-#: ../mdkapplet:133
-#, c-format
-msgid "Service is not configured. Please click on \"Configure the service\""
-msgstr ""
-
-#: ../mdkapplet:139
+#: ../mdkapplet:122
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr ""
 
-#: ../mdkapplet:145
+#: ../mdkapplet:128
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr ""
 
-#: ../mdkapplet:151 ../mdkapplet:182
+#: ../mdkapplet:134 ../mdkapplet:165
 #, c-format
 msgid "urpmi database locked"
 msgstr ""
 
-#: ../mdkapplet:157
+#: ../mdkapplet:140
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
-#: ../mdkapplet:163
+#: ../mdkapplet:146
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
 msgstr ""
 
-#: ../mdkapplet:169
+#: ../mdkapplet:152
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -90,572 +80,131 @@ msgid ""
 "Then, restart \"%s\"."
 msgstr ""
 
-#: ../mdkapplet:174
+#: ../mdkapplet:157
 #, c-format
 msgid "Enabled"
 msgstr "사용가"
 
-#: ../mdkapplet:187
+#: ../mdkapplet:170
 #, c-format
 msgid "Error updating media"
 msgstr ""
 
-#: ../mdkapplet:202
+#: ../mdkapplet:185
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr ""
 
-#: ../mdkapplet:207
+#: ../mdkapplet:190
 #, c-format
 msgid "Packages are up to date"
 msgstr ""
 
-#: ../mdkapplet:212
+#: ../mdkapplet:195
 #, fuzzy, c-format
 msgid "Failed to open urpmi database"
 msgstr "%s 파일을 열 수 없습니다.\n"
 
-#: ../mdkapplet:217 ../mdkapplet:324
+#: ../mdkapplet:200
 #, fuzzy, c-format
 msgid "Install updates"
 msgstr "테마 설치"
 
-#: ../mdkapplet:218
-#, fuzzy, c-format
-msgid "Configure the service"
-msgstr "서비스 설정"
-
-#: ../mdkapplet:219
+#: ../mdkapplet:201
 #, fuzzy, c-format
 msgid "Check Updates"
 msgstr "업데이트 버전"
 
-#: ../mdkapplet:220 ../mdkapplet:327 ../mdkonline:114 ../mdkonline:155
-#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
-#, c-format
-msgid "Please wait"
-msgstr "기다려 주세요"
-
-#: ../mdkapplet:220 ../mdkapplet:326 ../mdkapplet:327
-#, fuzzy, c-format
-msgid "Check updates"
-msgstr "보안 업데이트"
-
-#: ../mdkapplet:223 ../mdkapplet:648
-#, c-format
-msgid "Online WebSite"
-msgstr ""
-
-#: ../mdkapplet:224
+#: ../mdkapplet:202
 #, c-format
 msgid "Configure Network"
 msgstr "네트웍 설정"
 
-#: ../mdkapplet:225
-#, fuzzy, c-format
-msgid "Configure Now!"
-msgstr "설정사항 읽는 중\n"
-
-#: ../mdkapplet:313 ../mdkapplet:392
-#, fuzzy, c-format
-msgid "Mandriva Linux Updates Applet"
-msgstr "맨드리바 프라이버시 정책"
-
-#: ../mdkapplet:322
-#, c-format
-msgid "Actions"
-msgstr "동작"
-
-#: ../mdkapplet:325
-#, c-format
-msgid "Configure"
-msgstr "설정"
-
-#: ../mdkapplet:329
-#, c-format
-msgid "See logs"
-msgstr "기록 보기"
-
-#: ../mdkapplet:332
-#, c-format
-msgid "Status"
-msgstr "상태"
-
-#: ../mdkapplet:336 ../mdkapplet:597
-#, c-format
-msgid "Close"
-msgstr "닫기"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Network Connection: "
-msgstr "네트워크 연결: "
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Up"
-msgstr "위로"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Down"
-msgstr "아래로"
-
-#: ../mdkapplet:366
-#, c-format
-msgid "Last check: "
-msgstr ""
-
-#: ../mdkapplet:367 ../mdkonline:145
-#, c-format
-msgid "Machine name:"
-msgstr "컴퓨터 이름:"
-
-#: ../mdkapplet:368
-#, c-format
-msgid "Updates: "
-msgstr "업데이트: "
-
-#: ../mdkapplet:372
+#: ../mdkapplet:283
 #, fuzzy, c-format
 msgid "Launching drakconnect\n"
 msgstr "사용자드레이크 실행"
 
-#: ../mdkapplet:375
+#: ../mdkapplet:286
 #, c-format
 msgid "Mandriva Online seems to be reinstalled, reloading applet ...."
 msgstr ""
 
-#: ../mdkapplet:383
+#: ../mdkapplet:294
 #, c-format
 msgid "Launching MandrivaUpdate\n"
 msgstr ""
 
-#: ../mdkapplet:398
+#: ../mdkapplet:303
+#, fuzzy, c-format
+msgid "Mandriva Linux Updates Applet"
+msgstr "맨드리바 프라이버시 정책"
+
+#: ../mdkapplet:308
 #, fuzzy, c-format
 msgid "Computing new updates...\n"
 msgstr "연결 문제"
 
-#: ../mdkapplet:399
+#: ../mdkapplet:309
 #, fuzzy, c-format
 msgid "Connecting to"
 msgstr "연결 문제"
 
-#: ../mdkapplet:467 ../mdkupdate:159 ../mdkupdate:188
-#, c-format
-msgid "An error occurred"
-msgstr "오류 발생"
-
-#: ../mdkapplet:475
-#, c-format
-msgid "Development release not supported by service"
-msgstr ""
-
-#: ../mdkapplet:476
-#, c-format
-msgid "Too old release not supported by service"
-msgstr ""
-
-#: ../mdkapplet:477
-#, fuzzy, c-format
-msgid "Unknown state"
-msgstr "알 수 없는 호스트 이름"
-
-#: ../mdkapplet:478
-#, c-format
-msgid "Online services disabled. Contact Mandriva Online site\n"
-msgstr ""
-
-#: ../mdkapplet:479
-#, c-format
-msgid "Wrong Password.\n"
-msgstr "잘못된 암호\n"
-
-#: ../mdkapplet:480
-#, c-format
-msgid "Wrong Action or host or login.\n"
-msgstr ""
-
-#: ../mdkapplet:481
-#, c-format
-msgid ""
-"Something is wrong with your network settings (check your route, firewall or "
-"proxy settings)\n"
-msgstr ""
-
-#: ../mdkapplet:483
-#, c-format
-msgid ""
-"Problem occured while connecting to the server, please contact the support "
-"team"
-msgstr ""
-
-#: ../mdkapplet:487
-#, fuzzy, c-format
-msgid "Response from Mandriva Online server\n"
-msgstr "맨드리바 온라인에 잘 오셨습니다."
-
-#: ../mdkapplet:490
+#: ../mdkapplet:386
 #, fuzzy, c-format
 msgid "System is up-to-date\n"
 msgstr "시스템 모드"
 
-#: ../mdkapplet:527
-#, c-format
-msgid "No check"
-msgstr ""
-
-#: ../mdkapplet:541
-#, c-format
-msgid "Checking config file: Not present\n"
-msgstr ""
-
-#: ../mdkapplet:544
+#: ../mdkapplet:415
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr ""
 
-#: ../mdkapplet:587
+#: ../mdkapplet:457 ../mdkupdate:118 ../mdkupdate:164
 #, c-format
-msgid "Logs"
-msgstr "로그"
-
-#: ../mdkapplet:603
-#, c-format
-msgid "Clear"
-msgstr "지우기"
+msgid "Warning"
+msgstr "경고"
 
-#: ../mdkapplet:629
+#: ../mdkapplet:468
 #, c-format
 msgid "About..."
 msgstr "정보..."
 
-#: ../mdkapplet:631
+#: ../mdkapplet:472
 #, fuzzy, c-format
 msgid "Mandriva Online %s"
 msgstr "맨드리바 온라인"
 
-#: ../mdkapplet:635
+#: ../mdkapplet:473
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr ""
 
-#: ../mdkapplet:647
+#: ../mdkapplet:476
 #, c-format
 msgid "Mandriva Online gives access to Mandriva web services."
 msgstr ""
 
-#: ../mdkapplet:655
-#, c-format
-msgid "Always launch on startup"
-msgstr ""
-
-#: ../mdkapplet:657
-#, c-format
-msgid "Quit"
-msgstr "종료"
-
-#: ../mdkonline:58
-#, c-format
-msgid ""
-"mdonline version %s\n"
-"Copyright (C) %s Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"mdonline 버전 %s\n"
-"저작권(C) %s Mandriva.\n"
-"공개 소프트웨어이며, GNU GPL 조건하에서 재배포될 수 있습니다.\n"
-"\n"
-"usage:\n"
-
-#: ../mdkonline:63 ../mdkupdate:73
-#, c-format
-msgid "  --help\t\t- print this help message.\n"
-msgstr "  --help\t\t- 이 도움말 출력.\n"
-
-#: ../mdkonline:64
-#, c-format
-msgid "  --box=\t\t\t- hostname.\n"
-msgstr ""
-
-#: ../mdkonline:65
-#, c-format
-msgid "  --country\t\t\t- name of country of the user. \n"
-msgstr ""
-
-#: ../mdkonline:66
-#, c-format
-msgid "  --interactive\t\t- use the interactive mode.\n"
-msgstr ""
-
-#: ../mdkonline:67
-#, c-format
-msgid "  --nointeractive\t- use the non-interactive mode.\n"
-msgstr ""
-
-#: ../mdkonline:68
-#, c-format
-msgid "  --login=\t\t     - login name of the user.\n"
-msgstr ""
-
-#: ../mdkonline:69
-#, c-format
-msgid "  --pass=\t\t\t- password  of the user.\n"
-msgstr ""
-
-#: ../mdkonline:87 ../mdkonline:120
-#, c-format
-msgid "Mandriva Online"
-msgstr "맨드리바 온라인"
-
-#: ../mdkonline:90
-#, c-format
-msgid "I already have an account"
-msgstr ""
-
-#: ../mdkonline:91
-#, c-format
-msgid "I want to subscribe"
-msgstr ""
-
-#: ../mdkonline:96
-#, c-format
-msgid "Mr."
-msgstr ""
-
-#: ../mdkonline:96
-#, fuzzy, c-format
-msgid "Mrs."
-msgstr "벽"
-
-#: ../mdkonline:96
-#, c-format
-msgid "Ms."
-msgstr ""
-
-#: ../mdkonline:114
-#, c-format
-msgid "Reading configuration\n"
-msgstr "설정사항 읽는 중\n"
-
-#: ../mdkonline:123
-#, c-format
-msgid ""
-"This assistant will help you to upload your configuration\n"
-"(packages, hardware configuration) to a centralized database in\n"
-"order to keep you informed about security updates and useful upgrades.\n"
-msgstr ""
-"이 마법사는 님의 설정(팩키지들, 하드웨어 설정)을\n"
-"중앙 데이터베이스에 올리는 것을 도울 것입니다.\n"
-"이는 님께 보안 업데이트나 유용한 업그레이드에 대해 지속적으로 알리기 위함입니"
-"다.\n"
-
-#: ../mdkonline:131
-#, c-format
-msgid "Account creation or authentication"
-msgstr ""
-
-#: ../mdkonline:136
-#, c-format
-msgid "Enter your Mandriva Online login, password and machine name:"
-msgstr "맨드리바온라인 사용자명, 암호, 컴퓨터 이름을 입력하세요:"
-
-#: ../mdkonline:142 ../mdkonline:195
-#, fuzzy, c-format
-msgid "Email address:"
-msgstr "IP 주소 :"
-
-#: ../mdkonline:143
-#, c-format
-msgid "Country"
-msgstr "컨트리"
-
-#: ../mdkonline:144 ../mdkonline:196
-#, c-format
-msgid "Password:"
-msgstr "암호:"
-
-#: ../mdkonline:146
-#, fuzzy, c-format
-msgid "Machine description:"
-msgstr "컴퓨터 이름:"
-
-#: ../mdkonline:147
-#, c-format
-msgid "(Ex: My Home Office's Computer)"
-msgstr ""
-
-#: ../mdkonline:152 ../mdkonline:159 ../mdkonline:180 ../mdkonline:204
-#: ../mdkonline:208 ../mdkonline:212 ../mdkonline:217 ../mdkupdate:141
-#: ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
-#, c-format
-msgid "Error"
-msgstr "오류"
-
-#: ../mdkonline:152
-#, c-format
-msgid "Machine name must be 1 to 40 alphanumerical characters"
-msgstr ""
-
-#: ../mdkonline:155
-#, fuzzy, c-format
-msgid "Connecting to Mandriva Online website..."
-msgstr "맨드리바 온라인에 잘 오셨습니다."
-
-#: ../mdkonline:167
-#, c-format
-msgid ""
-"In order to benefit from Mandriva Online services,\n"
-"we are about to upload your configuration.\n"
-"\n"
-"The Wizard will now send the following information to Mandriva:\n"
-"\n"
-"1) the list of packages you have installed on your system,\n"
-"\n"
-"2) your hardware configuration.\n"
-"\n"
-"If you feel uncomfortable by that idea, or do not want to benefit from this "
-"service,\n"
-"please press 'Cancel'. By pressing 'Next', you allow us to keep you "
-"informed\n"
-"about security updates and useful upgrades via personalized email alerts.\n"
-"Furthermore, you benefit from discounted paid support services on\n"
-"www.mandrivaexpert.com."
-msgstr ""
-"맨드리바 온라인으로부터 혜택을 받기위해서는,\n"
-"님의 설정사항을 전송해야 합니다.\n"
-"\n"
-"마법사는 이제 다음의 정보를 맨드리바소프트로 전송할 것입니다:\n"
-"\n"
-"1) 시스템에 설치된 팩키지 정보.\n"
-"\n"
-"2) 하드웨어 설정 정보.\n"
-"\n"
-"만약 정보누출이 우려되거나 원하지 않는다면, 「취소」를 누르세요.\n"
-"「다음」을 누르면, 님은 보안 및 기타 유용한 업그레이드에 대한 정보를\n"
-"개인 이메일을 통해 지속적으로 받아 보실 수 있게 됩니다.\n"
-"그리고 「www.mandrivaexpert.com」에서 할인된 지원 서비스를\n"
-"받으실 수도 있습니다."
-
-#: ../mdkonline:180
-#, c-format
-msgid "Connection problem"
-msgstr "연결 문제"
-
-#: ../mdkonline:180
-#, c-format
-msgid "Problem occurs when uploading files, please try again"
-msgstr ""
-
-#: ../mdkonline:187
-#, fuzzy, c-format
-msgid "Create a Mandriva Online Account"
-msgstr "맨드리바 온라인에 잘 오셨습니다."
-
-#. -PO: that is for things like "Mr", "Ms",...
-#: ../mdkonline:192
-#, fuzzy, c-format
-msgid "Greeting:"
-msgstr "초록색"
-
-#: ../mdkonline:193
-#, c-format
-msgid "First name:"
-msgstr "이름:"
-
-#: ../mdkonline:194
-#, fuzzy, c-format
-msgid "Last name:"
-msgstr "호스트명: :"
-
-#: ../mdkonline:197
-#, c-format
-msgid "Confirm Password:"
-msgstr "열쇠글 확인:"
-
-#: ../mdkonline:204
-#, c-format
-msgid ""
-"The passwords do not match\n"
-" Please try again\n"
-msgstr ""
-"암호가 일치하지 않습니다.\n"
-"다시 시도하여 주십시오.\n"
-
-#: ../mdkonline:208
-#, fuzzy, c-format
-msgid "Please fill in each field"
-msgstr "아래 양식을 채워 주세요."
-
-#: ../mdkonline:212
-#, fuzzy, c-format
-msgid "Not a valid mail address!\n"
-msgstr "유효한 주소를 입력하세요!"
-
-#: ../mdkonline:217
-#, c-format
-msgid "Creating account failed!"
-msgstr ""
-
-#: ../mdkonline:225
-#, c-format
-msgid ""
-"Mandriva Online Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
-msgstr ""
-
-#: ../mdkonline:229
-#, c-format
-msgid "Your upload was successful!"
-msgstr "성공적으로 전송되었습니다!"
-
-#: ../mdkonline:229
+#: ../mdkapplet:478
 #, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandriva Online."
+msgid "Online WebSite"
 msgstr ""
-"이제부터 보안과 업그레이드에 대한 정보를 \n"
-"맨드리바 온라인을 통해 받아 보실 수 있습니다."
 
-#: ../mdkonline:229
+#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
+#: ../mdkapplet:483
 #, c-format
-msgid ""
-"Mandriva Online offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
+msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
-"맨들레크 온라인은 님께 자동업데이트 기능을 제공합니다.\n"
-"새로운 업데이트를 확인하기 위하여 프로그램이 정기적으로 실행될 것입니다.\n"
-
-#: ../mdkonline:238
-#, c-format
-msgid "Congratulations"
-msgstr "축하합니다."
 
-#: ../mdkonline:238
+#: ../mdkapplet:492
 #, c-format
-msgid "Your Mandriva Online account has been successfully configured\n"
+msgid "Always launch on startup"
 msgstr ""
 
-#: ../mdkonline:253
-#, fuzzy, c-format
-msgid "Configuration uploaded successfully"
-msgstr "성공적으로 전송되었습니다!"
-
-#: ../mdkonline:254
-#, fuzzy, c-format
-msgid "Problem uploading configuration"
-msgstr "설정사항 읽는 중\n"
-
-#: ../mdkonline:256
+#: ../mdkapplet:494
 #, c-format
-msgid ""
-"Cannot connect to Mandriva Online website: wrong login/password or router/"
-"firewall bad settings"
-msgstr ""
+msgid "Quit"
+msgstr "종료"
 
 #: ../mdkonline.pm:207
 #, fuzzy, c-format
@@ -793,6 +342,11 @@ msgstr ""
 "\n"
 "usage:\n"
 
+#: ../mdkupdate:73
+#, c-format
+msgid "  --help\t\t- print this help message.\n"
+msgstr "  --help\t\t- 이 도움말 출력.\n"
+
 #: ../mdkupdate:74
 #, c-format
 msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
@@ -820,11 +374,6 @@ msgid ""
 "file.\n"
 msgstr ""
 
-#: ../mdkupdate:118 ../mdkupdate:164
-#, c-format
-msgid "Warning"
-msgstr "경고"
-
 #. -PO: here Live Install is currently *NOT* translated on the desktop, so it's better to keep as it:
 #: ../mdkupdate:120
 #, c-format
@@ -833,11 +382,21 @@ msgid ""
 "Install' wizard."
 msgstr ""
 
+#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
+#, c-format
+msgid "Please wait"
+msgstr "기다려 주세요"
+
 #: ../mdkupdate:123 ../mdkupdate:174
 #, fuzzy, c-format
 msgid "Preparing..."
 msgstr "부트 로더 준비중"
 
+#: ../mdkupdate:141 ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
+#, c-format
+msgid "Error"
+msgstr "오류"
+
 #: ../mdkupdate:141
 #, c-format
 msgid ""
@@ -846,6 +405,11 @@ msgid ""
 "%s"
 msgstr ""
 
+#: ../mdkupdate:159 ../mdkupdate:188
+#, c-format
+msgid "An error occurred"
+msgstr "오류 발생"
+
 #: ../mdkupdate:164
 #, c-format
 msgid ""
@@ -871,6 +435,222 @@ msgid "Unable to update packages from update_source medium.\n"
 msgstr ""
 
 #, fuzzy
+#~ msgid "New bundles are available for your system"
+#~ msgstr "네트웍 어댑터를 찾을 수 없습니다!"
+
+#, fuzzy
+#~ msgid "Configure the service"
+#~ msgstr "서비스 설정"
+
+#, fuzzy
+#~ msgid "Check updates"
+#~ msgstr "보안 업데이트"
+
+#, fuzzy
+#~ msgid "Configure Now!"
+#~ msgstr "설정사항 읽는 중\n"
+
+#~ msgid "Actions"
+#~ msgstr "동작"
+
+#~ msgid "Configure"
+#~ msgstr "설정"
+
+#~ msgid "See logs"
+#~ msgstr "기록 보기"
+
+#~ msgid "Status"
+#~ msgstr "상태"
+
+#~ msgid "Close"
+#~ msgstr "닫기"
+
+#~ msgid "Network Connection: "
+#~ msgstr "네트워크 연결: "
+
+#~ msgid "Up"
+#~ msgstr "위로"
+
+#~ msgid "Down"
+#~ msgstr "아래로"
+
+#~ msgid "Machine name:"
+#~ msgstr "컴퓨터 이름:"
+
+#~ msgid "Updates: "
+#~ msgstr "업데이트: "
+
+#, fuzzy
+#~ msgid "Unknown state"
+#~ msgstr "알 수 없는 호스트 이름"
+
+#~ msgid "Wrong Password.\n"
+#~ msgstr "잘못된 암호\n"
+
+#, fuzzy
+#~ msgid "Response from Mandriva Online server\n"
+#~ msgstr "맨드리바 온라인에 잘 오셨습니다."
+
+#~ msgid "Logs"
+#~ msgstr "로그"
+
+#~ msgid "Clear"
+#~ msgstr "지우기"
+
+#~ msgid ""
+#~ "mdonline version %s\n"
+#~ "Copyright (C) %s Mandriva.\n"
+#~ "This is free software and may be redistributed under the terms of the GNU "
+#~ "GPL.\n"
+#~ "\n"
+#~ "usage:\n"
+#~ msgstr ""
+#~ "mdonline 버전 %s\n"
+#~ "저작권(C) %s Mandriva.\n"
+#~ "공개 소프트웨어이며, GNU GPL 조건하에서 재배포될 수 있습니다.\n"
+#~ "\n"
+#~ "usage:\n"
+
+#~ msgid "Mandriva Online"
+#~ msgstr "맨드리바 온라인"
+
+#, fuzzy
+#~ msgid "Mrs."
+#~ msgstr "벽"
+
+#~ msgid "Reading configuration\n"
+#~ msgstr "설정사항 읽는 중\n"
+
+#~ msgid ""
+#~ "This assistant will help you to upload your configuration\n"
+#~ "(packages, hardware configuration) to a centralized database in\n"
+#~ "order to keep you informed about security updates and useful upgrades.\n"
+#~ msgstr ""
+#~ "이 마법사는 님의 설정(팩키지들, 하드웨어 설정)을\n"
+#~ "중앙 데이터베이스에 올리는 것을 도울 것입니다.\n"
+#~ "이는 님께 보안 업데이트나 유용한 업그레이드에 대해 지속적으로 알리기 위함"
+#~ "입니다.\n"
+
+#~ msgid "Enter your Mandriva Online login, password and machine name:"
+#~ msgstr "맨드리바온라인 사용자명, 암호, 컴퓨터 이름을 입력하세요:"
+
+#, fuzzy
+#~ msgid "Email address:"
+#~ msgstr "IP 주소 :"
+
+#~ msgid "Country"
+#~ msgstr "컨트리"
+
+#~ msgid "Password:"
+#~ msgstr "암호:"
+
+#, fuzzy
+#~ msgid "Machine description:"
+#~ msgstr "컴퓨터 이름:"
+
+#, fuzzy
+#~ msgid "Connecting to Mandriva Online website..."
+#~ msgstr "맨드리바 온라인에 잘 오셨습니다."
+
+#~ msgid ""
+#~ "In order to benefit from Mandriva Online services,\n"
+#~ "we are about to upload your configuration.\n"
+#~ "\n"
+#~ "The Wizard will now send the following information to Mandriva:\n"
+#~ "\n"
+#~ "1) the list of packages you have installed on your system,\n"
+#~ "\n"
+#~ "2) your hardware configuration.\n"
+#~ "\n"
+#~ "If you feel uncomfortable by that idea, or do not want to benefit from "
+#~ "this service,\n"
+#~ "please press 'Cancel'. By pressing 'Next', you allow us to keep you "
+#~ "informed\n"
+#~ "about security updates and useful upgrades via personalized email "
+#~ "alerts.\n"
+#~ "Furthermore, you benefit from discounted paid support services on\n"
+#~ "www.mandrivaexpert.com."
+#~ msgstr ""
+#~ "맨드리바 온라인으로부터 혜택을 받기위해서는,\n"
+#~ "님의 설정사항을 전송해야 합니다.\n"
+#~ "\n"
+#~ "마법사는 이제 다음의 정보를 맨드리바소프트로 전송할 것입니다:\n"
+#~ "\n"
+#~ "1) 시스템에 설치된 팩키지 정보.\n"
+#~ "\n"
+#~ "2) 하드웨어 설정 정보.\n"
+#~ "\n"
+#~ "만약 정보누출이 우려되거나 원하지 않는다면, 「취소」를 누르세요.\n"
+#~ "「다음」을 누르면, 님은 보안 및 기타 유용한 업그레이드에 대한 정보를\n"
+#~ "개인 이메일을 통해 지속적으로 받아 보실 수 있게 됩니다.\n"
+#~ "그리고 「www.mandrivaexpert.com」에서 할인된 지원 서비스를\n"
+#~ "받으실 수도 있습니다."
+
+#~ msgid "Connection problem"
+#~ msgstr "연결 문제"
+
+#, fuzzy
+#~ msgid "Create a Mandriva Online Account"
+#~ msgstr "맨드리바 온라인에 잘 오셨습니다."
+
+#, fuzzy
+#~ msgid "Greeting:"
+#~ msgstr "초록색"
+
+#~ msgid "First name:"
+#~ msgstr "이름:"
+
+#, fuzzy
+#~ msgid "Last name:"
+#~ msgstr "호스트명: :"
+
+#~ msgid "Confirm Password:"
+#~ msgstr "열쇠글 확인:"
+
+#~ msgid ""
+#~ "The passwords do not match\n"
+#~ " Please try again\n"
+#~ msgstr ""
+#~ "암호가 일치하지 않습니다.\n"
+#~ "다시 시도하여 주십시오.\n"
+
+#, fuzzy
+#~ msgid "Please fill in each field"
+#~ msgstr "아래 양식을 채워 주세요."
+
+#, fuzzy
+#~ msgid "Not a valid mail address!\n"
+#~ msgstr "유효한 주소를 입력하세요!"
+
+#~ msgid "Your upload was successful!"
+#~ msgstr "성공적으로 전송되었습니다!"
+
+#~ msgid ""
+#~ "From now you will receive on security and updates \n"
+#~ "announcements thanks to Mandriva Online."
+#~ msgstr ""
+#~ "이제부터 보안과 업그레이드에 대한 정보를 \n"
+#~ "맨드리바 온라인을 통해 받아 보실 수 있습니다."
+
+#~ msgid ""
+#~ "Mandriva Online offers you the ability to automate the updates.\n"
+#~ "A program will run regulary in your system waiting for new updates\n"
+#~ msgstr ""
+#~ "맨들레크 온라인은 님께 자동업데이트 기능을 제공합니다.\n"
+#~ "새로운 업데이트를 확인하기 위하여 프로그램이 정기적으로 실행될 것입니다.\n"
+
+#~ msgid "Congratulations"
+#~ msgstr "축하합니다."
+
+#, fuzzy
+#~ msgid "Configuration uploaded successfully"
+#~ msgstr "성공적으로 전송되었습니다!"
+
+#, fuzzy
+#~ msgid "Problem uploading configuration"
+#~ msgstr "설정사항 읽는 중\n"
+
+#, fuzzy
 #~ msgid "Sending configuration..."
 #~ msgstr "설정사항 읽는 중\n"
 
diff --git a/po/ku.po b/po/ku.po
index 3bc4aed0..503544c8 100644
--- a/po/ku.po
+++ b/po/ku.po
@@ -3,12 +3,12 @@
 # Ömer Fadıl USTA <omer_fad@hotmail.com>, 2002, 2003, 2004.
 # Tuncay YENİAY <tuncayyeniay@mynet.com>, 2002.
 # S. Alp ŞENYER <ssenyer@linux-sevenler.org>, 2004.
-# 
-# 
+#
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline-ku\n"
-"POT-Creation-Date: 2007-08-09 16:26+0200\n"
+"POT-Creation-Date: 2008-02-21 18:21+0100\n"
 "PO-Revision-Date: 2004-12-14 20:33+0100\n"
 "Last-Translator: Kadir Dilsiz <kadir@linux-ku.com>\n"
 "Language-Team: Kurdî <team@linux-ku.com>\n"
@@ -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:94
+#: ../mdkapplet:88
 #, fuzzy, c-format
 msgid "Will check updates at %s"
 msgstr "Nûjenkirinan Kontrol Bike"
 
-#: ../mdkapplet:103
+#: ../mdkapplet:97
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "Sîstema we rojane bû"
 
-#: ../mdkapplet:109
+#: ../mdkapplet:103
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -39,53 +39,43 @@ msgstr ""
 "Ji bo pirsgirêkan tu dikarî ji navnîşana support@manrakeonline.net re e-"
 "peyamekêbişînî"
 
-#: ../mdkapplet:115
+#: ../mdkapplet:110
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr ""
 
-#: ../mdkapplet:121
+#: ../mdkapplet:116
 #, c-format
 msgid "New updates are available for your system"
 msgstr "Rojaneyên nû heye ji bo sîstema we"
 
-#: ../mdkapplet:127
-#, fuzzy, c-format
-msgid "New bundles are available for your system"
-msgstr "Rojaneyên nû heye ji bo sîstema we"
-
-#: ../mdkapplet:133
-#, c-format
-msgid "Service is not configured. Please click on \"Configure the service\""
-msgstr ""
-
-#: ../mdkapplet:139
+#: ../mdkapplet:122
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "Tor sekiniye. Ji kerema xwe re tora xwe eyar bikin"
 
-#: ../mdkapplet:145
+#: ../mdkapplet:128
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr ""
 
-#: ../mdkapplet:151 ../mdkapplet:182
+#: ../mdkapplet:134 ../mdkapplet:165
 #, c-format
 msgid "urpmi database locked"
 msgstr ""
 
-#: ../mdkapplet:157
+#: ../mdkapplet:140
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
-#: ../mdkapplet:163
+#: ../mdkapplet:146
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
 msgstr ""
 
-#: ../mdkapplet:169
+#: ../mdkapplet:152
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -96,581 +86,131 @@ msgid ""
 "Then, restart \"%s\"."
 msgstr ""
 
-#: ../mdkapplet:174
+#: ../mdkapplet:157
 #, c-format
 msgid "Enabled"
 msgstr "Çalak"
 
-#: ../mdkapplet:187
+#: ../mdkapplet:170
 #, c-format
 msgid "Error updating media"
 msgstr ""
 
-#: ../mdkapplet:202
+#: ../mdkapplet:185
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr "Rojaneyên amade kontrol dike...\n"
 
-#: ../mdkapplet:207
+#: ../mdkapplet:190
 #, c-format
 msgid "Packages are up to date"
 msgstr ""
 
-#: ../mdkapplet:212
+#: ../mdkapplet:195
 #, c-format
 msgid "Failed to open urpmi database"
 msgstr ""
 
-#: ../mdkapplet:217 ../mdkapplet:324
+#: ../mdkapplet:200
 #, c-format
 msgid "Install updates"
 msgstr "Nûjenkirina Ava Bike"
 
-#: ../mdkapplet:218
-#, c-format
-msgid "Configure the service"
-msgstr "Torê Saz Bike"
-
-#: ../mdkapplet:219
+#: ../mdkapplet:201
 #, c-format
 msgid "Check Updates"
 msgstr "Nûjenkirinan Kontrol Bike"
 
-#: ../mdkapplet:220 ../mdkapplet:327 ../mdkonline:114 ../mdkonline:155
-#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
-#, c-format
-msgid "Please wait"
-msgstr "Ji kerema xwe re li hêviyê rawestin"
-
-#: ../mdkapplet:220 ../mdkapplet:326 ../mdkapplet:327
-#, c-format
-msgid "Check updates"
-msgstr "Nûjenkirinan Kontrol Bike"
-
-#: ../mdkapplet:223 ../mdkapplet:648
-#, c-format
-msgid "Online WebSite"
-msgstr "Online WebSite"
-
-#: ../mdkapplet:224
+#: ../mdkapplet:202
 #, c-format
 msgid "Configure Network"
 msgstr "Torê Saz Bike"
 
-#: ../mdkapplet:225
-#, c-format
-msgid "Configure Now!"
-msgstr "Saz Bike"
-
-#: ../mdkapplet:313 ../mdkapplet:392
-#, c-format
-msgid "Mandriva Linux Updates Applet"
-msgstr "Sepandinoka Nûjenkirina Mandriva Linux"
-
-#: ../mdkapplet:322
-#, c-format
-msgid "Actions"
-msgstr "Çalakî"
-
-#: ../mdkapplet:325
-#, c-format
-msgid "Configure"
-msgstr "Saz Bike"
-
-#: ../mdkapplet:329
-#, c-format
-msgid "See logs"
-msgstr "Rojnivîskê nîşan bide"
-
-#: ../mdkapplet:332
-#, c-format
-msgid "Status"
-msgstr "Rewş"
-
-#: ../mdkapplet:336 ../mdkapplet:597
-#, c-format
-msgid "Close"
-msgstr "Bigire"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Network Connection: "
-msgstr "Girêdana Torê:"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Up"
-msgstr "Berjor"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Down"
-msgstr "Berjêr"
-
-#: ../mdkapplet:366
-#, c-format
-msgid "Last check: "
-msgstr "Kontrola Dawî:"
-
-#: ../mdkapplet:367 ../mdkonline:145
-#, c-format
-msgid "Machine name:"
-msgstr "Navê Makîneyê:"
-
-#: ../mdkapplet:368
-#, c-format
-msgid "Updates: "
-msgstr "Nûjenkirinên Nû:"
-
-#: ../mdkapplet:372
+#: ../mdkapplet:283
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Drakconnect destpêdike\n"
 
-#: ../mdkapplet:375
+#: ../mdkapplet:286
 #, c-format
 msgid "Mandriva Online seems to be reinstalled, reloading applet ...."
 msgstr ""
 
-#: ../mdkapplet:383
+#: ../mdkapplet:294
 #, c-format
 msgid "Launching MandrivaUpdate\n"
 msgstr "Destpêkirina MandrivaUpdate\n"
 
-#: ../mdkapplet:398
+#: ../mdkapplet:303
+#, c-format
+msgid "Mandriva Linux Updates Applet"
+msgstr "Sepandinoka Nûjenkirina Mandriva Linux"
+
+#: ../mdkapplet:308
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Rojanekirina Kontrol Bike...\n"
 
-#: ../mdkapplet:399
+#: ../mdkapplet:309
 #, c-format
 msgid "Connecting to"
 msgstr "Pirsgirêka girêdanê"
 
-#: ../mdkapplet:467 ../mdkupdate:159 ../mdkupdate:188
-#, c-format
-msgid "An error occurred"
-msgstr ""
-
-#: ../mdkapplet:475
-#, c-format
-msgid "Development release not supported by service"
-msgstr ""
-
-#: ../mdkapplet:476
-#, c-format
-msgid "Too old release not supported by service"
-msgstr ""
-
-#: ../mdkapplet:477
-#, c-format
-msgid "Unknown state"
-msgstr "Rewş ne hatiye naskirin"
-
-#: ../mdkapplet:478
-#, c-format
-msgid "Online services disabled. Contact Mandriva Online site\n"
-msgstr ""
-
-#: ../mdkapplet:479
-#, c-format
-msgid "Wrong Password.\n"
-msgstr "Şîfreya Çewt.\n"
-
-#: ../mdkapplet:480
-#, c-format
-msgid "Wrong Action or host or login.\n"
-msgstr ""
-
-#: ../mdkapplet:481
-#, c-format
-msgid ""
-"Something is wrong with your network settings (check your route, firewall or "
-"proxy settings)\n"
-msgstr ""
-
-#: ../mdkapplet:483
-#, c-format
-msgid ""
-"Problem occured while connecting to the server, please contact the support "
-"team"
-msgstr ""
-
-#: ../mdkapplet:487
-#, c-format
-msgid "Response from Mandriva Online server\n"
-msgstr "Tu Bi Xêr Hatî Mandriva Online\n"
-
-#: ../mdkapplet:490
+#: ../mdkapplet:386
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Sîstema we rojane bûye\n"
 
-#: ../mdkapplet:527
-#, c-format
-msgid "No check"
-msgstr "Kontrola Dawî:"
-
-#: ../mdkapplet:541
-#, c-format
-msgid "Checking config file: Not present\n"
-msgstr ""
-
-#: ../mdkapplet:544
+#: ../mdkapplet:415
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr ""
 
-#: ../mdkapplet:587
-#, c-format
-msgid "Logs"
-msgstr "Qeydên têketine:"
-
-#: ../mdkapplet:603
+#: ../mdkapplet:457 ../mdkupdate:118 ../mdkupdate:164
 #, c-format
-msgid "Clear"
-msgstr "Paqij Bike"
+msgid "Warning"
+msgstr "Li bala we"
 
-#: ../mdkapplet:629
+#: ../mdkapplet:468
 #, c-format
 msgid "About..."
 msgstr "Der barê de..."
 
-#: ../mdkapplet:631
+#: ../mdkapplet:472
 #, fuzzy, c-format
 msgid "Mandriva Online %s"
 msgstr "Tu Bi Xêr Hatî Mandriva Online"
 
-#: ../mdkapplet:635
+#: ../mdkapplet:473
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr ""
 
-#: ../mdkapplet:647
+#: ../mdkapplet:476
 #, c-format
 msgid "Mandriva Online gives access to Mandriva web services."
 msgstr ""
 
-#: ../mdkapplet:655
-#, c-format
-msgid "Always launch on startup"
-msgstr "Di vekirina sîsteme de bişuxlîne"
-
-#: ../mdkapplet:657
-#, c-format
-msgid "Quit"
-msgstr "Derkeve"
-
-#: ../mdkonline:58
-#, c-format
-msgid ""
-"mdonline version %s\n"
-"Copyright (C) %s Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"mdonline guherto %s\n"
-"Copyright (C) %s Mandriva.\n"
-"Ev nivîsbariyeke serbest e û  di bin lîsansa GNU GPL de dikare dubare were "
-"belavkirin.\n"
-"\n"
-"xebitandina wê:\n"
-
-#: ../mdkonline:63 ../mdkupdate:73
-#, c-format
-msgid "  --help\t\t- print this help message.\n"
-msgstr "  --help\t\t- ev peyama alîkariyê nîşan dide.\n"
-
-#: ../mdkonline:64
-#, c-format
-msgid "  --box=\t\t\t- hostname.\n"
-msgstr ""
-
-#: ../mdkonline:65
-#, c-format
-msgid "  --country\t\t\t- name of country of the user. \n"
-msgstr ""
-
-#: ../mdkonline:66
-#, c-format
-msgid "  --interactive\t\t- use the interactive mode.\n"
-msgstr ""
-
-#: ../mdkonline:67
-#, c-format
-msgid "  --nointeractive\t- use the non-interactive mode.\n"
-msgstr ""
-
-#: ../mdkonline:68
-#, c-format
-msgid "  --login=\t\t     - login name of the user.\n"
-msgstr ""
-
-#: ../mdkonline:69
-#, c-format
-msgid "  --pass=\t\t\t- password  of the user.\n"
-msgstr ""
-
-#: ../mdkonline:87 ../mdkonline:120
-#, c-format
-msgid "Mandriva Online"
-msgstr "Tu Bi Xêr Hatî Mandriva Online"
-
-#: ../mdkonline:90
-#, c-format
-msgid "I already have an account"
-msgstr "Ez berê qeyd bûme"
-
-#: ../mdkonline:91
-#, c-format
-msgid "I want to subscribe"
-msgstr "Ez dixwazim xwe qeyd bikim"
-
-#: ../mdkonline:96
-#, c-format
-msgid "Mr."
-msgstr "M."
-
-#: ../mdkonline:96
-#, c-format
-msgid "Mrs."
-msgstr "Jne"
-
-#: ../mdkonline:96
-#, c-format
-msgid "Ms."
-msgstr "Jne"
-
-#: ../mdkonline:114
-#, c-format
-msgid "Reading configuration\n"
-msgstr "Sazkirina te tê xwendin\n"
-
-#: ../mdkonline:123
-#, c-format
-msgid ""
-"This assistant will help you to upload your configuration\n"
-"(packages, hardware configuration) to a centralized database in\n"
-"order to keep you informed about security updates and useful upgrades.\n"
-msgstr ""
-"Ev asîstan dê di şandina sazkirina te de bibe alîkarê te.\n"
-"(paket, agahiyên hardware) Dê bi van agahiyan di Mandriva de danedankek\n"
-"were çêkirin û der barê pergala te de, te ji pîneyên ewlekariyê û "
-"nûjenkirinan\n"
-" agahdar bike.\n"
-
-#: ../mdkonline:131
-#, c-format
-msgid "Account creation or authentication"
-msgstr "çêkirina hesabekî û têketin"
-
-#: ../mdkonline:136
-#, c-format
-msgid "Enter your Mandriva Online login, password and machine name:"
-msgstr ""
-"Wekî bikarhênerê Mandriva Online navê bikarhêneriyê , şîfre û navê makîneyê "
-"binivîse:"
-
-#: ../mdkonline:142 ../mdkonline:195
-#, fuzzy, c-format
-msgid "Email address:"
-msgstr "Navnîşana posteyên çûyî"
-
-#: ../mdkonline:143
-#, c-format
-msgid "Country"
-msgstr "Welat:"
-
-#: ../mdkonline:144 ../mdkonline:196
-#, c-format
-msgid "Password:"
-msgstr "Şîfre:"
-
-#: ../mdkonline:146
-#, fuzzy, c-format
-msgid "Machine description:"
-msgstr "Navê Makîneyê:"
-
-#: ../mdkonline:147
-#, c-format
-msgid "(Ex: My Home Office's Computer)"
-msgstr ""
-
-#: ../mdkonline:152 ../mdkonline:159 ../mdkonline:180 ../mdkonline:204
-#: ../mdkonline:208 ../mdkonline:212 ../mdkonline:217 ../mdkupdate:141
-#: ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
-#, c-format
-msgid "Error"
-msgstr "çewt"
-
-#: ../mdkonline:152
-#, c-format
-msgid "Machine name must be 1 to 40 alphanumerical characters"
-msgstr ""
-
-#: ../mdkonline:155
-#, c-format
-msgid "Connecting to Mandriva Online website..."
-msgstr "Tu Bi Xêr Hatî Mandriva Online"
-
-#: ../mdkonline:167
-#, c-format
-msgid ""
-"In order to benefit from Mandriva Online services,\n"
-"we are about to upload your configuration.\n"
-"\n"
-"The Wizard will now send the following information to Mandriva:\n"
-"\n"
-"1) the list of packages you have installed on your system,\n"
-"\n"
-"2) your hardware configuration.\n"
-"\n"
-"If you feel uncomfortable by that idea, or do not want to benefit from this "
-"service,\n"
-"please press 'Cancel'. By pressing 'Next', you allow us to keep you "
-"informed\n"
-"about security updates and useful upgrades via personalized email alerts.\n"
-"Furthermore, you benefit from discounted paid support services on\n"
-"www.mandrivaexpert.com."
-msgstr ""
-"Bi hilbijartina ku tê bikî tu dibî xwediyê şansa ku alîkariyê bidî\n"
-"Mandriva Linux'e.\n"
-"\n"
-"Dê ev sêrbaz agahiyên li jêr hatiye lîstekirin ji  Mandriva'ê re bişîne:\n"
-"\n"
-"1) Navê (bernameyên) Paketên di pergalêde barkirî,\n"
-"\n"
-"2) Lîsteya hardwera kompûtera te.\n"
-"\n"
-"Heke ev li xweşa te neçû Derbas Be bitikîne û jê derkeve!\n"
-"Heke tu Pêş de Here bitikînî tê li gor pêwistiyên Mandriva Linux\n"
-"di sazkirinê de alîkariyeke mezin bikî.\n"
-"Tu caran agahiyên te yên pergalê ji kesekî sêyemîn re naçe.\n"
-"Dê hemû agahî di Poliçeya Nepenî ya Mandriva Linux de were veşartin.\n"
-"www.mandrivaexpert.com."
-
-#: ../mdkonline:180
-#, c-format
-msgid "Connection problem"
-msgstr "Pirsgirêka girêdanê"
-
-#: ../mdkonline:180
-#, c-format
-msgid "Problem occurs when uploading files, please try again"
-msgstr ""
-
-#: ../mdkonline:187
-#, c-format
-msgid "Create a Mandriva Online Account"
-msgstr "Hesabê Mandriva Linux Online Çêke"
-
-#. -PO: that is for things like "Mr", "Ms",...
-#: ../mdkonline:192
-#, fuzzy, c-format
-msgid "Greeting:"
-msgstr "Kesk"
-
-#: ../mdkonline:193
-#, fuzzy, c-format
-msgid "First name:"
-msgstr "Nav:"
-
-#: ../mdkonline:194
-#, fuzzy, c-format
-msgid "Last name:"
-msgstr "Navê komputerê:"
-
-#: ../mdkonline:197
-#, c-format
-msgid "Confirm Password:"
-msgstr "Şîfreyê Erê Bike:"
-
-#: ../mdkonline:204
-#, c-format
-msgid ""
-"The passwords do not match\n"
-" Please try again\n"
-msgstr ""
-"Şîfre hevdi nagirin\n"
-"Careke din biceribîne\n"
-
-#: ../mdkonline:208
-#, fuzzy, c-format
-msgid "Please fill in each field"
-msgstr "Ji kerema xwe re hemû zeviyên vala dagire\n"
-
-#: ../mdkonline:212
-#, c-format
-msgid "Not a valid mail address!\n"
-msgstr "Ev ne e-peyameke derbasdar e \n"
-
-#: ../mdkonline:217
-#, c-format
-msgid "Creating account failed!"
-msgstr ""
-
-#: ../mdkonline:225
-#, c-format
-msgid ""
-"Mandriva Online Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
-msgstr ""
-
-#: ../mdkonline:229
-#, c-format
-msgid "Your upload was successful!"
-msgstr "Şandina te temam bû!"
-
-#: ../mdkonline:229
+#: ../mdkapplet:478
 #, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandriva Online."
-msgstr ""
-"Ji niha û pê ve ji Mandriva Online\n"
-"der barê pergala we de hemû pêşketin û qelşên ewlekariyê de tê werî "
-"agahdarkirin.\n"
-"Mandriva spas dike..."
+msgid "Online WebSite"
+msgstr "Online WebSite"
 
-#: ../mdkonline:229
+#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
+#: ../mdkapplet:483
 #, c-format
-msgid ""
-"Mandriva Online offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
+msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
-"Mandriva Online bernameyeke ku dê dê jixweber nûjenkirinên dikarin werin "
-"sepandin teklîf bike.\n"
-"Dê bi navber di pergala te de bixebite û\n"
-"nûjenkirinan bişopîne\n"
 
-#: ../mdkonline:238
+#: ../mdkapplet:492
 #, c-format
-msgid "Congratulations"
-msgstr "Serkeftin"
-
-#: ../mdkonline:238
-#, c-format
-msgid "Your Mandriva Online account has been successfully configured\n"
-msgstr "Hesabê we ji bo Mandriva Online bi serkeftin hate eyar kirin\n"
-
-#: ../mdkonline:253
-#, c-format
-msgid "Configuration uploaded successfully"
-msgstr "Eyarên we bi serkeftin pêk hat"
-
-#: ../mdkonline:254
-#, c-format
-msgid "Problem uploading configuration"
-msgstr "Pirsgrêka eyarên sazkirine"
+msgid "Always launch on startup"
+msgstr "Di vekirina sîsteme de bişuxlîne"
 
-#: ../mdkonline:256
+#: ../mdkapplet:494
 #, c-format
-msgid ""
-"Cannot connect to Mandriva Online website: wrong login/password or router/"
-"firewall bad settings"
-msgstr ""
+msgid "Quit"
+msgstr "Derkeve"
 
 #: ../mdkonline.pm:207
 #, fuzzy, c-format
@@ -810,6 +350,11 @@ msgstr ""
 "\n"
 "xebitandina wê:\n"
 
+#: ../mdkupdate:73
+#, c-format
+msgid "  --help\t\t- print this help message.\n"
+msgstr "  --help\t\t- ev peyama alîkariyê nîşan dide.\n"
+
 #: ../mdkupdate:74
 #, c-format
 msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
@@ -837,11 +382,6 @@ msgid ""
 "file.\n"
 msgstr ""
 
-#: ../mdkupdate:118 ../mdkupdate:164
-#, c-format
-msgid "Warning"
-msgstr "Li bala we"
-
 #. -PO: here Live Install is currently *NOT* translated on the desktop, so it's better to keep as it:
 #: ../mdkupdate:120
 #, c-format
@@ -850,11 +390,21 @@ msgid ""
 "Install' wizard."
 msgstr ""
 
+#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
+#, c-format
+msgid "Please wait"
+msgstr "Ji kerema xwe re li hêviyê rawestin"
+
 #: ../mdkupdate:123 ../mdkupdate:174
 #, c-format
 msgid "Preparing..."
 msgstr ""
 
+#: ../mdkupdate:141 ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
+#, c-format
+msgid "Error"
+msgstr "çewt"
+
 #: ../mdkupdate:141
 #, c-format
 msgid ""
@@ -863,6 +413,11 @@ msgid ""
 "%s"
 msgstr ""
 
+#: ../mdkupdate:159 ../mdkupdate:188
+#, c-format
+msgid "An error occurred"
+msgstr ""
+
 #: ../mdkupdate:164
 #, c-format
 msgid ""
@@ -887,6 +442,245 @@ msgstr "Nûjenkirina Ava Bike\n"
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "di medyaya update_source de paket tên nûjenkirin.\n"
 
+#, fuzzy
+#~ msgid "New bundles are available for your system"
+#~ msgstr "Rojaneyên nû heye ji bo sîstema we"
+
+#~ msgid "Configure the service"
+#~ msgstr "Torê Saz Bike"
+
+#~ msgid "Check updates"
+#~ msgstr "Nûjenkirinan Kontrol Bike"
+
+#~ msgid "Configure Now!"
+#~ msgstr "Saz Bike"
+
+#~ msgid "Actions"
+#~ msgstr "Çalakî"
+
+#~ msgid "Configure"
+#~ msgstr "Saz Bike"
+
+#~ msgid "See logs"
+#~ msgstr "Rojnivîskê nîşan bide"
+
+#~ msgid "Status"
+#~ msgstr "Rewş"
+
+#~ msgid "Close"
+#~ msgstr "Bigire"
+
+#~ msgid "Network Connection: "
+#~ msgstr "Girêdana Torê:"
+
+#~ msgid "Up"
+#~ msgstr "Berjor"
+
+#~ msgid "Down"
+#~ msgstr "Berjêr"
+
+#~ msgid "Last check: "
+#~ msgstr "Kontrola Dawî:"
+
+#~ msgid "Machine name:"
+#~ msgstr "Navê Makîneyê:"
+
+#~ msgid "Updates: "
+#~ msgstr "Nûjenkirinên Nû:"
+
+#~ msgid "Unknown state"
+#~ msgstr "Rewş ne hatiye naskirin"
+
+#~ msgid "Wrong Password.\n"
+#~ msgstr "Şîfreya Çewt.\n"
+
+#~ msgid "Response from Mandriva Online server\n"
+#~ msgstr "Tu Bi Xêr Hatî Mandriva Online\n"
+
+#~ msgid "No check"
+#~ msgstr "Kontrola Dawî:"
+
+#~ msgid "Logs"
+#~ msgstr "Qeydên têketine:"
+
+#~ msgid "Clear"
+#~ msgstr "Paqij Bike"
+
+#~ msgid ""
+#~ "mdonline version %s\n"
+#~ "Copyright (C) %s Mandriva.\n"
+#~ "This is free software and may be redistributed under the terms of the GNU "
+#~ "GPL.\n"
+#~ "\n"
+#~ "usage:\n"
+#~ msgstr ""
+#~ "mdonline guherto %s\n"
+#~ "Copyright (C) %s Mandriva.\n"
+#~ "Ev nivîsbariyeke serbest e û  di bin lîsansa GNU GPL de dikare dubare "
+#~ "were belavkirin.\n"
+#~ "\n"
+#~ "xebitandina wê:\n"
+
+#~ msgid "Mandriva Online"
+#~ msgstr "Tu Bi Xêr Hatî Mandriva Online"
+
+#~ msgid "I already have an account"
+#~ msgstr "Ez berê qeyd bûme"
+
+#~ msgid "I want to subscribe"
+#~ msgstr "Ez dixwazim xwe qeyd bikim"
+
+#~ msgid "Mr."
+#~ msgstr "M."
+
+#~ msgid "Mrs."
+#~ msgstr "Jne"
+
+#~ msgid "Ms."
+#~ msgstr "Jne"
+
+#~ msgid "Reading configuration\n"
+#~ msgstr "Sazkirina te tê xwendin\n"
+
+#~ msgid ""
+#~ "This assistant will help you to upload your configuration\n"
+#~ "(packages, hardware configuration) to a centralized database in\n"
+#~ "order to keep you informed about security updates and useful upgrades.\n"
+#~ msgstr ""
+#~ "Ev asîstan dê di şandina sazkirina te de bibe alîkarê te.\n"
+#~ "(paket, agahiyên hardware) Dê bi van agahiyan di Mandriva de danedankek\n"
+#~ "were çêkirin û der barê pergala te de, te ji pîneyên ewlekariyê û "
+#~ "nûjenkirinan\n"
+#~ " agahdar bike.\n"
+
+#~ msgid "Account creation or authentication"
+#~ msgstr "çêkirina hesabekî û têketin"
+
+#~ msgid "Enter your Mandriva Online login, password and machine name:"
+#~ msgstr ""
+#~ "Wekî bikarhênerê Mandriva Online navê bikarhêneriyê , şîfre û navê "
+#~ "makîneyê binivîse:"
+
+#, fuzzy
+#~ msgid "Email address:"
+#~ msgstr "Navnîşana posteyên çûyî"
+
+#~ msgid "Country"
+#~ msgstr "Welat:"
+
+#~ msgid "Password:"
+#~ msgstr "Şîfre:"
+
+#, fuzzy
+#~ msgid "Machine description:"
+#~ msgstr "Navê Makîneyê:"
+
+#~ msgid "Connecting to Mandriva Online website..."
+#~ msgstr "Tu Bi Xêr Hatî Mandriva Online"
+
+#~ msgid ""
+#~ "In order to benefit from Mandriva Online services,\n"
+#~ "we are about to upload your configuration.\n"
+#~ "\n"
+#~ "The Wizard will now send the following information to Mandriva:\n"
+#~ "\n"
+#~ "1) the list of packages you have installed on your system,\n"
+#~ "\n"
+#~ "2) your hardware configuration.\n"
+#~ "\n"
+#~ "If you feel uncomfortable by that idea, or do not want to benefit from "
+#~ "this service,\n"
+#~ "please press 'Cancel'. By pressing 'Next', you allow us to keep you "
+#~ "informed\n"
+#~ "about security updates and useful upgrades via personalized email "
+#~ "alerts.\n"
+#~ "Furthermore, you benefit from discounted paid support services on\n"
+#~ "www.mandrivaexpert.com."
+#~ msgstr ""
+#~ "Bi hilbijartina ku tê bikî tu dibî xwediyê şansa ku alîkariyê bidî\n"
+#~ "Mandriva Linux'e.\n"
+#~ "\n"
+#~ "Dê ev sêrbaz agahiyên li jêr hatiye lîstekirin ji  Mandriva'ê re bişîne:\n"
+#~ "\n"
+#~ "1) Navê (bernameyên) Paketên di pergalêde barkirî,\n"
+#~ "\n"
+#~ "2) Lîsteya hardwera kompûtera te.\n"
+#~ "\n"
+#~ "Heke ev li xweşa te neçû Derbas Be bitikîne û jê derkeve!\n"
+#~ "Heke tu Pêş de Here bitikînî tê li gor pêwistiyên Mandriva Linux\n"
+#~ "di sazkirinê de alîkariyeke mezin bikî.\n"
+#~ "Tu caran agahiyên te yên pergalê ji kesekî sêyemîn re naçe.\n"
+#~ "Dê hemû agahî di Poliçeya Nepenî ya Mandriva Linux de were veşartin.\n"
+#~ "www.mandrivaexpert.com."
+
+#~ msgid "Connection problem"
+#~ msgstr "Pirsgirêka girêdanê"
+
+#~ msgid "Create a Mandriva Online Account"
+#~ msgstr "Hesabê Mandriva Linux Online Çêke"
+
+#, fuzzy
+#~ msgid "Greeting:"
+#~ msgstr "Kesk"
+
+#, fuzzy
+#~ msgid "First name:"
+#~ msgstr "Nav:"
+
+#, fuzzy
+#~ msgid "Last name:"
+#~ msgstr "Navê komputerê:"
+
+#~ msgid "Confirm Password:"
+#~ msgstr "Şîfreyê Erê Bike:"
+
+#~ msgid ""
+#~ "The passwords do not match\n"
+#~ " Please try again\n"
+#~ msgstr ""
+#~ "Şîfre hevdi nagirin\n"
+#~ "Careke din biceribîne\n"
+
+#, fuzzy
+#~ msgid "Please fill in each field"
+#~ msgstr "Ji kerema xwe re hemû zeviyên vala dagire\n"
+
+#~ msgid "Not a valid mail address!\n"
+#~ msgstr "Ev ne e-peyameke derbasdar e \n"
+
+#~ msgid "Your upload was successful!"
+#~ msgstr "Şandina te temam bû!"
+
+#~ msgid ""
+#~ "From now you will receive on security and updates \n"
+#~ "announcements thanks to Mandriva Online."
+#~ msgstr ""
+#~ "Ji niha û pê ve ji Mandriva Online\n"
+#~ "der barê pergala we de hemû pêşketin û qelşên ewlekariyê de tê werî "
+#~ "agahdarkirin.\n"
+#~ "Mandriva spas dike..."
+
+#~ msgid ""
+#~ "Mandriva Online offers you the ability to automate the updates.\n"
+#~ "A program will run regulary in your system waiting for new updates\n"
+#~ msgstr ""
+#~ "Mandriva Online bernameyeke ku dê dê jixweber nûjenkirinên dikarin werin "
+#~ "sepandin teklîf bike.\n"
+#~ "Dê bi navber di pergala te de bixebite û\n"
+#~ "nûjenkirinan bişopîne\n"
+
+#~ msgid "Congratulations"
+#~ msgstr "Serkeftin"
+
+#~ msgid "Your Mandriva Online account has been successfully configured\n"
+#~ msgstr "Hesabê we ji bo Mandriva Online bi serkeftin hate eyar kirin\n"
+
+#~ msgid "Configuration uploaded successfully"
+#~ msgstr "Eyarên we bi serkeftin pêk hat"
+
+#~ msgid "Problem uploading configuration"
+#~ msgstr "Pirsgrêka eyarên sazkirine"
+
 #~ msgid "System is busy. Please wait ..."
 #~ msgstr "Sîstem disekine. Kerema xwe re li bende bin ..."
 
diff --git a/po/ky.po b/po/ky.po
index 6e776710..34de5f37 100644
--- a/po/ky.po
+++ b/po/ky.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline-ky\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-09 16:26+0200\n"
+"POT-Creation-Date: 2008-02-21 18:21+0100\n"
 "PO-Revision-Date: 2005-07-14 12:10+0000\n"
 "Last-Translator: Timur Jamakeev <ztimur@mail..ru>\n"
 "Language-Team: Kyrgyz\n"
@@ -21,17 +21,17 @@ msgstr ""
 "X-Generator: KBabel 1.3.1\n"
 
 #. -PO: here %s will be replaced by the local time (eg: "Will check updates at 14:03:50"
-#: ../mdkapplet:94
+#: ../mdkapplet:88
 #, fuzzy, c-format
 msgid "Will check updates at %s"
 msgstr "Жаңылоолорду текшерүү"
 
-#: ../mdkapplet:103
+#: ../mdkapplet:97
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "Система жаңылоону талап кылбайт"
 
-#: ../mdkapplet:109
+#: ../mdkapplet:103
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -40,53 +40,43 @@ msgstr ""
 "Кызматты конфигурациялоо проблемасы. Логдорду карап чыгып андан соң "
 "support@mandrivaonline.com дарегин кат жазыңыз"
 
-#: ../mdkapplet:115
+#: ../mdkapplet:110
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "Күтө туруңуз, мүмкүн болгон пакеттер изделүүдө..."
 
-#: ../mdkapplet:121
+#: ../mdkapplet:116
 #, c-format
 msgid "New updates are available for your system"
 msgstr "Сиздин системаңызды жаңылоо мүмкүнчүлүгү бар"
 
-#: ../mdkapplet:127
-#, fuzzy, c-format
-msgid "New bundles are available for your system"
-msgstr "Сиздин системаңызды жаңылоо мүмкүнчүлүгү бар"
-
-#: ../mdkapplet:133
-#, c-format
-msgid "Service is not configured. Please click on \"Configure the service\""
-msgstr "Кызмат конфигурацияланган эмес. \"Кызматты конфигурациялоо\"ну басыңыз"
-
-#: ../mdkapplet:139
+#: ../mdkapplet:122
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "Тармак иштеген эмес. Тармакты конфигурациялаңыз"
 
-#: ../mdkapplet:145
+#: ../mdkapplet:128
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "Кызмат активдештирилген эмес. \"Онлайн веб-сайты\"н басыңыз"
 
-#: ../mdkapplet:151 ../mdkapplet:182
+#: ../mdkapplet:134 ../mdkapplet:165
 #, fuzzy, c-format
 msgid "urpmi database locked"
 msgstr "urpmi берилиштер базасы кулпуланган"
 
-#: ../mdkapplet:157
+#: ../mdkapplet:140
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr "Релиз колдоого ээ эмес (өтө эски же иштелип жаткан релиз)"
 
-#: ../mdkapplet:163
+#: ../mdkapplet:146
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
 msgstr ""
 
-#: ../mdkapplet:169
+#: ../mdkapplet:152
 #, fuzzy, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -103,581 +93,131 @@ msgstr ""
 "мамычасынан текшериңиз)\n"
 "Андан соң, %s кайра иштетиңиз."
 
-#: ../mdkapplet:174
+#: ../mdkapplet:157
 #, c-format
 msgid "Enabled"
 msgstr "Иштетилгенби"
 
-#: ../mdkapplet:187
+#: ../mdkapplet:170
 #, c-format
 msgid "Error updating media"
 msgstr ""
 
-#: ../mdkapplet:202
+#: ../mdkapplet:185
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr "Текшерүү... Жаңылоолор мүмүкүн\n"
 
-#: ../mdkapplet:207
+#: ../mdkapplet:190
 #, c-format
 msgid "Packages are up to date"
 msgstr ""
 
-#: ../mdkapplet:212
+#: ../mdkapplet:195
 #, fuzzy, c-format
 msgid "Failed to open urpmi database"
 msgstr "rpmdb ачууга болбоду"
 
-#: ../mdkapplet:217 ../mdkapplet:324
+#: ../mdkapplet:200
 #, c-format
 msgid "Install updates"
 msgstr "Жаңылоолорду орнотуу"
 
-#: ../mdkapplet:218
-#, c-format
-msgid "Configure the service"
-msgstr "Кызматты конфигурациялоо"
-
-#: ../mdkapplet:219
+#: ../mdkapplet:201
 #, c-format
 msgid "Check Updates"
 msgstr "Жаңылоолорду текшерүү"
 
-#: ../mdkapplet:220 ../mdkapplet:327 ../mdkonline:114 ../mdkonline:155
-#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
-#, c-format
-msgid "Please wait"
-msgstr "Күтө туруңуз"
-
-#: ../mdkapplet:220 ../mdkapplet:326 ../mdkapplet:327
-#, c-format
-msgid "Check updates"
-msgstr "Жаңылоолорду текшерүү"
-
-#: ../mdkapplet:223 ../mdkapplet:648
-#, c-format
-msgid "Online WebSite"
-msgstr "Онлайндагы веб-сайт"
-
-#: ../mdkapplet:224
+#: ../mdkapplet:202
 #, c-format
 msgid "Configure Network"
 msgstr "Тармакты конфигурациялоо"
 
-#: ../mdkapplet:225
-#, c-format
-msgid "Configure Now!"
-msgstr "Азыр конфигурациялоо!"
-
-#: ../mdkapplet:313 ../mdkapplet:392
-#, c-format
-msgid "Mandriva Linux Updates Applet"
-msgstr "Mandriva Linux Updates апплети"
-
-#: ../mdkapplet:322
-#, c-format
-msgid "Actions"
-msgstr "Аракеттер"
-
-#: ../mdkapplet:325
-#, c-format
-msgid "Configure"
-msgstr "Конфигурациялоо"
-
-#: ../mdkapplet:329
-#, c-format
-msgid "See logs"
-msgstr "Логдорду кара"
-
-#: ../mdkapplet:332
-#, c-format
-msgid "Status"
-msgstr "Абалы"
-
-#: ../mdkapplet:336 ../mdkapplet:597
-#, c-format
-msgid "Close"
-msgstr "Жабуу"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Network Connection: "
-msgstr "Тармак байланышы: "
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Up"
-msgstr "Жогору"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Down"
-msgstr "Төмөн"
-
-#: ../mdkapplet:366
-#, c-format
-msgid "Last check: "
-msgstr "Акыркы текшерүү: "
-
-#: ../mdkapplet:367 ../mdkonline:145
-#, c-format
-msgid "Machine name:"
-msgstr "Машинанын аты:"
-
-#: ../mdkapplet:368
-#, c-format
-msgid "Updates: "
-msgstr "Жаңылоолор: "
-
-#: ../mdkapplet:372
+#: ../mdkapplet:283
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "drakconnect иштетүү\n"
 
-#: ../mdkapplet:375
+#: ../mdkapplet:286
 #, c-format
 msgid "Mandriva Online seems to be reinstalled, reloading applet ...."
 msgstr "Mandriva Online кайра орнотулса керек, апплет кайра жүктөлүүдө ...."
 
-#: ../mdkapplet:383
+#: ../mdkapplet:294
 #, c-format
 msgid "Launching MandrivaUpdate\n"
 msgstr "MandrivaUpdate иштетүү\n"
 
-#: ../mdkapplet:398
+#: ../mdkapplet:303
+#, c-format
+msgid "Mandriva Linux Updates Applet"
+msgstr "Mandriva Linux Updates апплети"
+
+#: ../mdkapplet:308
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Жаңы жаңылоолор эсептелүүдө...\n"
 
-#: ../mdkapplet:399
+#: ../mdkapplet:309
 #, c-format
 msgid "Connecting to"
 msgstr "Төмөнкүгө туташуу"
 
-#: ../mdkapplet:467 ../mdkupdate:159 ../mdkupdate:188
-#, c-format
-msgid "An error occurred"
-msgstr "Жаңылыштык орун алды"
-
-#: ../mdkapplet:475
-#, c-format
-msgid "Development release not supported by service"
-msgstr "Иштелип жаткан релиз кызмат тарабынан колдоого ээ эмес"
-
-#: ../mdkapplet:476
-#, c-format
-msgid "Too old release not supported by service"
-msgstr "Өтө эле эски релиз кызмат тарабынан колдоого ээ эмес"
-
-#: ../mdkapplet:477
-#, c-format
-msgid "Unknown state"
-msgstr "Белгисиз абал"
-
-#: ../mdkapplet:478
-#, c-format
-msgid "Online services disabled. Contact Mandriva Online site\n"
-msgstr "Онлайн кызматы өчүрүлгөн. Mandriva Online сайты менен байланышыңыз\n"
-
-#: ../mdkapplet:479
-#, c-format
-msgid "Wrong Password.\n"
-msgstr "Туура эмес пароль.\n"
-
-#: ../mdkapplet:480
-#, c-format
-msgid "Wrong Action or host or login.\n"
-msgstr "Туура эмес аракет, же хост, же логин.\n"
-
-#: ../mdkapplet:481
-#, c-format
-msgid ""
-"Something is wrong with your network settings (check your route, firewall or "
-"proxy settings)\n"
-msgstr ""
-"Сиздин тармактын конфигурациясынын кайсы бири туура эмес (маршрутуңуздун, "
-"файрволуңуздун же проксиңиздин конфигурациясын текшериңиз)\n"
-
-#: ../mdkapplet:483
-#, c-format
-msgid ""
-"Problem occured while connecting to the server, please contact the support "
-"team"
-msgstr "Серверге кайрылууда ката кетти,сураныч жардамчы командасына кайрылыңыз"
-
-#: ../mdkapplet:487
-#, c-format
-msgid "Response from Mandriva Online server\n"
-msgstr "Mandriva Online серверден жооп\n"
-
-#: ../mdkapplet:490
+#: ../mdkapplet:386
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Система жаңылоону талап кылбайт\n"
 
-#: ../mdkapplet:527
-#, c-format
-msgid "No check"
-msgstr "Текшерүүсүз"
-
-#: ../mdkapplet:541
-#, c-format
-msgid "Checking config file: Not present\n"
-msgstr "Конфиг файлы текшерилүүдө: жок\n"
-
-#: ../mdkapplet:544
+#: ../mdkapplet:415
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Тармак текшерилүүдө: өчүрүлгөн көрүнөт\n"
 
-#: ../mdkapplet:587
-#, c-format
-msgid "Logs"
-msgstr "Логдор"
-
-#: ../mdkapplet:603
+#: ../mdkapplet:457 ../mdkupdate:118 ../mdkupdate:164
 #, c-format
-msgid "Clear"
-msgstr "Тазалоо"
+msgid "Warning"
+msgstr "Эскертүү"
 
-#: ../mdkapplet:629
+#: ../mdkapplet:468
 #, c-format
 msgid "About..."
 msgstr "Жөнүндө.."
 
-#: ../mdkapplet:631
+#: ../mdkapplet:472
 #, fuzzy, c-format
 msgid "Mandriva Online %s"
 msgstr "Mandriva Online"
 
-#: ../mdkapplet:635
+#: ../mdkapplet:473
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr ""
 
-#: ../mdkapplet:647
+#: ../mdkapplet:476
 #, c-format
 msgid "Mandriva Online gives access to Mandriva web services."
 msgstr ""
 
-#: ../mdkapplet:655
-#, c-format
-msgid "Always launch on startup"
-msgstr "Дайыма старт учурунда ишке киргизүү"
-
-#: ../mdkapplet:657
-#, c-format
-msgid "Quit"
-msgstr "Чыгуу"
-
-#: ../mdkonline:58
-#, c-format
-msgid ""
-"mdonline version %s\n"
-"Copyright (C) %s Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"mdonline версиясы %s\n"
-"Copyright (C) %s Mandriva.\n"
-"Бул эркин программалык жабдуу жана ал GNU GPL\n"
-"шартынын негизинде таратылат\n"
-"\n"
-"колдонулушу:\n"
-
-#: ../mdkonline:63 ../mdkupdate:73
-#, c-format
-msgid "  --help\t\t- print this help message.\n"
-msgstr "  --help\t\t- бул маалыматты чыгаруу.\n"
-
-#: ../mdkonline:64
-#, c-format
-msgid "  --box=\t\t\t- hostname.\n"
-msgstr ""
-
-#: ../mdkonline:65
-#, c-format
-msgid "  --country\t\t\t- name of country of the user. \n"
-msgstr ""
-
-#: ../mdkonline:66
-#, c-format
-msgid "  --interactive\t\t- use the interactive mode.\n"
-msgstr ""
-
-#: ../mdkonline:67
-#, c-format
-msgid "  --nointeractive\t- use the non-interactive mode.\n"
-msgstr ""
-
-#: ../mdkonline:68
-#, c-format
-msgid "  --login=\t\t     - login name of the user.\n"
-msgstr ""
-
-#: ../mdkonline:69
-#, c-format
-msgid "  --pass=\t\t\t- password  of the user.\n"
-msgstr ""
-
-#: ../mdkonline:87 ../mdkonline:120
-#, c-format
-msgid "Mandriva Online"
-msgstr "Mandriva Online"
-
-#: ../mdkonline:90
-#, c-format
-msgid "I already have an account"
-msgstr "Менде аккаунт бар"
-
-#: ../mdkonline:91
-#, c-format
-msgid "I want to subscribe"
-msgstr "Мен жазылууну каалайм"
-
-#: ../mdkonline:96
-#, c-format
-msgid "Mr."
-msgstr ""
-
-#: ../mdkonline:96
-#, fuzzy, c-format
-msgid "Mrs."
-msgstr "XMrIs"
-
-#: ../mdkonline:96
-#, c-format
-msgid "Ms."
-msgstr ""
-
-#: ../mdkonline:114
-#, c-format
-msgid "Reading configuration\n"
-msgstr "Конфигурация окулууда\n"
-
-#: ../mdkonline:123
-#, c-format
-msgid ""
-"This assistant will help you to upload your configuration\n"
-"(packages, hardware configuration) to a centralized database in\n"
-"order to keep you informed about security updates and useful upgrades.\n"
-msgstr ""
-"Бул ассистент сизди коопсуздукка байланыштуу жаңы жаңылоолор\n"
-"жана пайдалуу апгрейддер жөнүндө кабардар болуп турушуңуз үчүн\n"
-"сиздин конфигурацияңызды (пакеттер, техникалык жабдуулар конфигурациясын)\n"
-" борбордук берилиштер базасына жүктөөгө жардам берет.\n"
-
-#: ../mdkonline:131
-#, c-format
-msgid "Account creation or authentication"
-msgstr "Аккаунт түзүү же аутентификациялоо"
-
-#: ../mdkonline:136
-#, c-format
-msgid "Enter your Mandriva Online login, password and machine name:"
-msgstr "Mandriva Online логинин, паролун жана машина атын киргизиңиз:"
-
-#: ../mdkonline:142 ../mdkonline:195
-#, fuzzy, c-format
-msgid "Email address:"
-msgstr "Шлюздун IP-адреси:"
-
-#: ../mdkonline:143
-#, c-format
-msgid "Country"
-msgstr "Өлкө"
-
-#: ../mdkonline:144 ../mdkonline:196
-#, c-format
-msgid "Password:"
-msgstr "Пароль:"
-
-#: ../mdkonline:146
-#, fuzzy, c-format
-msgid "Machine description:"
-msgstr "Машинанын аты:"
-
-#: ../mdkonline:147
-#, c-format
-msgid "(Ex: My Home Office's Computer)"
-msgstr ""
-
-#: ../mdkonline:152 ../mdkonline:159 ../mdkonline:180 ../mdkonline:204
-#: ../mdkonline:208 ../mdkonline:212 ../mdkonline:217 ../mdkupdate:141
-#: ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
-#, c-format
-msgid "Error"
-msgstr "Жаңылыштык"
-
-#: ../mdkonline:152
-#, fuzzy, c-format
-msgid "Machine name must be 1 to 40 alphanumerical characters"
-msgstr "Биригүү чекиттери алфавиттик-цифралык символдордон гана турушу керек"
-
-#: ../mdkonline:155
-#, c-format
-msgid "Connecting to Mandriva Online website..."
-msgstr "Mandriva Online веб-сайтына туташуу..."
-
-#: ../mdkonline:167
-#, c-format
-msgid ""
-"In order to benefit from Mandriva Online services,\n"
-"we are about to upload your configuration.\n"
-"\n"
-"The Wizard will now send the following information to Mandriva:\n"
-"\n"
-"1) the list of packages you have installed on your system,\n"
-"\n"
-"2) your hardware configuration.\n"
-"\n"
-"If you feel uncomfortable by that idea, or do not want to benefit from this "
-"service,\n"
-"please press 'Cancel'. By pressing 'Next', you allow us to keep you "
-"informed\n"
-"about security updates and useful upgrades via personalized email alerts.\n"
-"Furthermore, you benefit from discounted paid support services on\n"
-"www.mandrivaexpert.com."
-msgstr ""
-"Mandriva Online кызматтарындан пайдалануу үчүн,\n"
-"сиздин конфигурацияларыңыздын жүктөлүшүн сунуш кылабыз.\n"
-"\n"
-"Азыр, Уста төмөнкү маалыматтарды Mandriva'ко жөнөтөт:\n"
-"\n"
-"1) сиздин системада жүктөлгөн пакеттердин тизмези,\n"
-"\n"
-"2) системанын техникалык жабдуулар конфигурациясы.\n"
-"\n"
-"Эгерде сиз бул ойду жактырбасаңыз же бул кызматтардан пайдаланууну "
-"калабасаңыз,\n"
-"Калтыруу'ну басыңыз. Кийинки'ни басуу менен, сиз акыркы пайдалуу "
-"коопсуздуктар, жаңылоор жана апгрейттер жөнүндө электрондук почта аркылуу "
-"кабардар болосуз.\n"
-"Мындан тышкары, сиз www.mandrivaexpert.com колдоо кызматындан\n"
-"төлөө жеңилдиктерин аласыз."
-
-#: ../mdkonline:180
-#, c-format
-msgid "Connection problem"
-msgstr "Туташуу проблемасы"
-
-#: ../mdkonline:180
-#, c-format
-msgid "Problem occurs when uploading files, please try again"
-msgstr "Файлдарды жүктөө учурундагы проблема, кайра аракет кылыңыз"
-
-#: ../mdkonline:187
-#, c-format
-msgid "Create a Mandriva Online Account"
-msgstr "Mandriva Online аккаунтун түзүү"
-
-#. -PO: that is for things like "Mr", "Ms",...
-#: ../mdkonline:192
-#, fuzzy, c-format
-msgid "Greeting:"
-msgstr "Жашыл"
-
-#: ../mdkonline:193
-#, c-format
-msgid "First name:"
-msgstr "Биринчи аты:"
-
-#: ../mdkonline:194
-#, fuzzy, c-format
-msgid "Last name:"
-msgstr "Биринчи аты:"
-
-#: ../mdkonline:197
-#, c-format
-msgid "Confirm Password:"
-msgstr "Паролду кайталоо:"
-
-#: ../mdkonline:204
-#, c-format
-msgid ""
-"The passwords do not match\n"
-" Please try again\n"
-msgstr ""
-"Паролдор дал келишпейт\n"
-" Кайталаңыз\n"
-
-#: ../mdkonline:208
-#, fuzzy, c-format
-msgid "Please fill in each field"
-msgstr "Бардык талааларды толтуруңуз\n"
-
-#: ../mdkonline:212
-#, c-format
-msgid "Not a valid mail address!\n"
-msgstr "Туура эмес почта адреси!\n"
-
-#: ../mdkonline:217
-#, c-format
-msgid "Creating account failed!"
-msgstr ""
-
-#: ../mdkonline:225
-#, c-format
-msgid ""
-"Mandriva Online Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
-msgstr ""
-"Mandriva Online аккаунту ийгиликтүү түзүлдү.\n"
-"Аутентификациялоо жана конфигурацияңызды жөнөтүү үчүн \"Кийинки\" басыңыз\n"
-
-#: ../mdkonline:229
-#, c-format
-msgid "Your upload was successful!"
-msgstr "Сыртка жүктөө ийгиликтүү!"
-
-#: ../mdkonline:229
+#: ../mdkapplet:478
 #, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandriva Online."
-msgstr ""
-"Мындан кийин сиз коопсуздуктар жана жыңылоолор\n"
-"жөнүндө, Mandriva Online тарабынан кабардар болосуздар."
+msgid "Online WebSite"
+msgstr "Онлайндагы веб-сайт"
 
-#: ../mdkonline:229
+#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
+#: ../mdkapplet:483
 #, c-format
-msgid ""
-"Mandriva Online offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
+msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
-"Mandriva Online сизге автоматташтырылган жаңылоо мүмкүнчүлүгүн сунуштайт.\n"
-"Программа сиздин системада жаңы жаңылоолор үчүн регулярдуу иштейт\n"
-
-#: ../mdkonline:238
-#, c-format
-msgid "Congratulations"
-msgstr "Конфигурациялар"
-
-#: ../mdkonline:238
-#, c-format
-msgid "Your Mandriva Online account has been successfully configured\n"
-msgstr "Сиздин Mandriva Online аккаунтуңуз ийгиликтүү конфигурацияланды\n"
-
-#: ../mdkonline:253
-#, c-format
-msgid "Configuration uploaded successfully"
-msgstr "Конфигурация ийгиликтүү сыртка жүктөлдү"
 
-#: ../mdkonline:254
+#: ../mdkapplet:492
 #, c-format
-msgid "Problem uploading configuration"
-msgstr "Сыртка жүктөөлүүдө конфигурацияда ката"
+msgid "Always launch on startup"
+msgstr "Дайыма старт учурунда ишке киргизүү"
 
-#: ../mdkonline:256
+#: ../mdkapplet:494
 #, c-format
-msgid ""
-"Cannot connect to Mandriva Online website: wrong login/password or router/"
-"firewall bad settings"
-msgstr ""
-"Mandriva Online веб сайтына кирүүгө мүмкүн эмес:аты/катылган белги туура "
-"эмес  маршрутизатор/файервол ыңгайлашуусу туура эмес"
+msgid "Quit"
+msgstr "Чыгуу"
 
 #: ../mdkonline.pm:207
 #, fuzzy, c-format
@@ -818,6 +358,11 @@ msgstr ""
 "\n"
 "колдонулушу:\n"
 
+#: ../mdkupdate:73
+#, c-format
+msgid "  --help\t\t- print this help message.\n"
+msgstr "  --help\t\t- бул маалыматты чыгаруу.\n"
+
 #: ../mdkupdate:74
 #, c-format
 msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
@@ -845,11 +390,6 @@ msgid ""
 "file.\n"
 msgstr ""
 
-#: ../mdkupdate:118 ../mdkupdate:164
-#, c-format
-msgid "Warning"
-msgstr "Эскертүү"
-
 #. -PO: here Live Install is currently *NOT* translated on the desktop, so it's better to keep as it:
 #: ../mdkupdate:120
 #, c-format
@@ -858,11 +398,21 @@ msgid ""
 "Install' wizard."
 msgstr ""
 
+#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
+#, c-format
+msgid "Please wait"
+msgstr "Күтө туруңуз"
+
 #: ../mdkupdate:123 ../mdkupdate:174
 #, c-format
 msgid "Preparing..."
 msgstr "Даярдоо ..."
 
+#: ../mdkupdate:141 ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
+#, c-format
+msgid "Error"
+msgstr "Жаңылыштык"
+
 #: ../mdkupdate:141
 #, c-format
 msgid ""
@@ -871,6 +421,11 @@ msgid ""
 "%s"
 msgstr ""
 
+#: ../mdkupdate:159 ../mdkupdate:188
+#, c-format
+msgid "An error occurred"
+msgstr "Жаңылыштык орун алды"
+
 #: ../mdkupdate:164
 #, c-format
 msgid ""
@@ -895,6 +450,291 @@ msgstr "Пакеттер орнотулууда...\n"
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "update_source булагынан пакеттерди жаңылоо мүмкүн эмес.\n"
 
+#, fuzzy
+#~ msgid "New bundles are available for your system"
+#~ msgstr "Сиздин системаңызды жаңылоо мүмкүнчүлүгү бар"
+
+#~ msgid "Service is not configured. Please click on \"Configure the service\""
+#~ msgstr ""
+#~ "Кызмат конфигурацияланган эмес. \"Кызматты конфигурациялоо\"ну басыңыз"
+
+#~ msgid "Configure the service"
+#~ msgstr "Кызматты конфигурациялоо"
+
+#~ msgid "Check updates"
+#~ msgstr "Жаңылоолорду текшерүү"
+
+#~ msgid "Configure Now!"
+#~ msgstr "Азыр конфигурациялоо!"
+
+#~ msgid "Actions"
+#~ msgstr "Аракеттер"
+
+#~ msgid "Configure"
+#~ msgstr "Конфигурациялоо"
+
+#~ msgid "See logs"
+#~ msgstr "Логдорду кара"
+
+#~ msgid "Status"
+#~ msgstr "Абалы"
+
+#~ msgid "Close"
+#~ msgstr "Жабуу"
+
+#~ msgid "Network Connection: "
+#~ msgstr "Тармак байланышы: "
+
+#~ msgid "Up"
+#~ msgstr "Жогору"
+
+#~ msgid "Down"
+#~ msgstr "Төмөн"
+
+#~ msgid "Last check: "
+#~ msgstr "Акыркы текшерүү: "
+
+#~ msgid "Machine name:"
+#~ msgstr "Машинанын аты:"
+
+#~ msgid "Updates: "
+#~ msgstr "Жаңылоолор: "
+
+#~ msgid "Development release not supported by service"
+#~ msgstr "Иштелип жаткан релиз кызмат тарабынан колдоого ээ эмес"
+
+#~ msgid "Too old release not supported by service"
+#~ msgstr "Өтө эле эски релиз кызмат тарабынан колдоого ээ эмес"
+
+#~ msgid "Unknown state"
+#~ msgstr "Белгисиз абал"
+
+#~ msgid "Online services disabled. Contact Mandriva Online site\n"
+#~ msgstr ""
+#~ "Онлайн кызматы өчүрүлгөн. Mandriva Online сайты менен байланышыңыз\n"
+
+#~ msgid "Wrong Password.\n"
+#~ msgstr "Туура эмес пароль.\n"
+
+#~ msgid "Wrong Action or host or login.\n"
+#~ msgstr "Туура эмес аракет, же хост, же логин.\n"
+
+#~ msgid ""
+#~ "Something is wrong with your network settings (check your route, firewall "
+#~ "or proxy settings)\n"
+#~ msgstr ""
+#~ "Сиздин тармактын конфигурациясынын кайсы бири туура эмес (маршрутуңуздун, "
+#~ "файрволуңуздун же проксиңиздин конфигурациясын текшериңиз)\n"
+
+#~ msgid ""
+#~ "Problem occured while connecting to the server, please contact the "
+#~ "support team"
+#~ msgstr ""
+#~ "Серверге кайрылууда ката кетти,сураныч жардамчы командасына кайрылыңыз"
+
+#~ msgid "Response from Mandriva Online server\n"
+#~ msgstr "Mandriva Online серверден жооп\n"
+
+#~ msgid "No check"
+#~ msgstr "Текшерүүсүз"
+
+#~ msgid "Checking config file: Not present\n"
+#~ msgstr "Конфиг файлы текшерилүүдө: жок\n"
+
+#~ msgid "Logs"
+#~ msgstr "Логдор"
+
+#~ msgid "Clear"
+#~ msgstr "Тазалоо"
+
+#~ msgid ""
+#~ "mdonline version %s\n"
+#~ "Copyright (C) %s Mandriva.\n"
+#~ "This is free software and may be redistributed under the terms of the GNU "
+#~ "GPL.\n"
+#~ "\n"
+#~ "usage:\n"
+#~ msgstr ""
+#~ "mdonline версиясы %s\n"
+#~ "Copyright (C) %s Mandriva.\n"
+#~ "Бул эркин программалык жабдуу жана ал GNU GPL\n"
+#~ "шартынын негизинде таратылат\n"
+#~ "\n"
+#~ "колдонулушу:\n"
+
+#~ msgid "Mandriva Online"
+#~ msgstr "Mandriva Online"
+
+#~ msgid "I already have an account"
+#~ msgstr "Менде аккаунт бар"
+
+#~ msgid "I want to subscribe"
+#~ msgstr "Мен жазылууну каалайм"
+
+#, fuzzy
+#~ msgid "Mrs."
+#~ msgstr "XMrIs"
+
+#~ msgid "Reading configuration\n"
+#~ msgstr "Конфигурация окулууда\n"
+
+#~ msgid ""
+#~ "This assistant will help you to upload your configuration\n"
+#~ "(packages, hardware configuration) to a centralized database in\n"
+#~ "order to keep you informed about security updates and useful upgrades.\n"
+#~ msgstr ""
+#~ "Бул ассистент сизди коопсуздукка байланыштуу жаңы жаңылоолор\n"
+#~ "жана пайдалуу апгрейддер жөнүндө кабардар болуп турушуңуз үчүн\n"
+#~ "сиздин конфигурацияңызды (пакеттер, техникалык жабдуулар "
+#~ "конфигурациясын)\n"
+#~ " борбордук берилиштер базасына жүктөөгө жардам берет.\n"
+
+#~ msgid "Account creation or authentication"
+#~ msgstr "Аккаунт түзүү же аутентификациялоо"
+
+#~ msgid "Enter your Mandriva Online login, password and machine name:"
+#~ msgstr "Mandriva Online логинин, паролун жана машина атын киргизиңиз:"
+
+#, fuzzy
+#~ msgid "Email address:"
+#~ msgstr "Шлюздун IP-адреси:"
+
+#~ msgid "Country"
+#~ msgstr "Өлкө"
+
+#~ msgid "Password:"
+#~ msgstr "Пароль:"
+
+#, fuzzy
+#~ msgid "Machine description:"
+#~ msgstr "Машинанын аты:"
+
+#, fuzzy
+#~ msgid "Machine name must be 1 to 40 alphanumerical characters"
+#~ msgstr ""
+#~ "Биригүү чекиттери алфавиттик-цифралык символдордон гана турушу керек"
+
+#~ msgid "Connecting to Mandriva Online website..."
+#~ msgstr "Mandriva Online веб-сайтына туташуу..."
+
+#~ msgid ""
+#~ "In order to benefit from Mandriva Online services,\n"
+#~ "we are about to upload your configuration.\n"
+#~ "\n"
+#~ "The Wizard will now send the following information to Mandriva:\n"
+#~ "\n"
+#~ "1) the list of packages you have installed on your system,\n"
+#~ "\n"
+#~ "2) your hardware configuration.\n"
+#~ "\n"
+#~ "If you feel uncomfortable by that idea, or do not want to benefit from "
+#~ "this service,\n"
+#~ "please press 'Cancel'. By pressing 'Next', you allow us to keep you "
+#~ "informed\n"
+#~ "about security updates and useful upgrades via personalized email "
+#~ "alerts.\n"
+#~ "Furthermore, you benefit from discounted paid support services on\n"
+#~ "www.mandrivaexpert.com."
+#~ msgstr ""
+#~ "Mandriva Online кызматтарындан пайдалануу үчүн,\n"
+#~ "сиздин конфигурацияларыңыздын жүктөлүшүн сунуш кылабыз.\n"
+#~ "\n"
+#~ "Азыр, Уста төмөнкү маалыматтарды Mandriva'ко жөнөтөт:\n"
+#~ "\n"
+#~ "1) сиздин системада жүктөлгөн пакеттердин тизмези,\n"
+#~ "\n"
+#~ "2) системанын техникалык жабдуулар конфигурациясы.\n"
+#~ "\n"
+#~ "Эгерде сиз бул ойду жактырбасаңыз же бул кызматтардан пайдаланууну "
+#~ "калабасаңыз,\n"
+#~ "Калтыруу'ну басыңыз. Кийинки'ни басуу менен, сиз акыркы пайдалуу "
+#~ "коопсуздуктар, жаңылоор жана апгрейттер жөнүндө электрондук почта аркылуу "
+#~ "кабардар болосуз.\n"
+#~ "Мындан тышкары, сиз www.mandrivaexpert.com колдоо кызматындан\n"
+#~ "төлөө жеңилдиктерин аласыз."
+
+#~ msgid "Connection problem"
+#~ msgstr "Туташуу проблемасы"
+
+#~ msgid "Problem occurs when uploading files, please try again"
+#~ msgstr "Файлдарды жүктөө учурундагы проблема, кайра аракет кылыңыз"
+
+#~ msgid "Create a Mandriva Online Account"
+#~ msgstr "Mandriva Online аккаунтун түзүү"
+
+#, fuzzy
+#~ msgid "Greeting:"
+#~ msgstr "Жашыл"
+
+#~ msgid "First name:"
+#~ msgstr "Биринчи аты:"
+
+#, fuzzy
+#~ msgid "Last name:"
+#~ msgstr "Биринчи аты:"
+
+#~ msgid "Confirm Password:"
+#~ msgstr "Паролду кайталоо:"
+
+#~ msgid ""
+#~ "The passwords do not match\n"
+#~ " Please try again\n"
+#~ msgstr ""
+#~ "Паролдор дал келишпейт\n"
+#~ " Кайталаңыз\n"
+
+#, fuzzy
+#~ msgid "Please fill in each field"
+#~ msgstr "Бардык талааларды толтуруңуз\n"
+
+#~ msgid "Not a valid mail address!\n"
+#~ msgstr "Туура эмес почта адреси!\n"
+
+#~ msgid ""
+#~ "Mandriva Online Account successfully created.\n"
+#~ "Please click \"Next\" to authenticate and upload your configuration\n"
+#~ msgstr ""
+#~ "Mandriva Online аккаунту ийгиликтүү түзүлдү.\n"
+#~ "Аутентификациялоо жана конфигурацияңызды жөнөтүү үчүн \"Кийинки\" "
+#~ "басыңыз\n"
+
+#~ msgid "Your upload was successful!"
+#~ msgstr "Сыртка жүктөө ийгиликтүү!"
+
+#~ msgid ""
+#~ "From now you will receive on security and updates \n"
+#~ "announcements thanks to Mandriva Online."
+#~ msgstr ""
+#~ "Мындан кийин сиз коопсуздуктар жана жыңылоолор\n"
+#~ "жөнүндө, Mandriva Online тарабынан кабардар болосуздар."
+
+#~ msgid ""
+#~ "Mandriva Online offers you the ability to automate the updates.\n"
+#~ "A program will run regulary in your system waiting for new updates\n"
+#~ msgstr ""
+#~ "Mandriva Online сизге автоматташтырылган жаңылоо мүмкүнчүлүгүн "
+#~ "сунуштайт.\n"
+#~ "Программа сиздин системада жаңы жаңылоолор үчүн регулярдуу иштейт\n"
+
+#~ msgid "Congratulations"
+#~ msgstr "Конфигурациялар"
+
+#~ msgid "Your Mandriva Online account has been successfully configured\n"
+#~ msgstr "Сиздин Mandriva Online аккаунтуңуз ийгиликтүү конфигурацияланды\n"
+
+#~ msgid "Configuration uploaded successfully"
+#~ msgstr "Конфигурация ийгиликтүү сыртка жүктөлдү"
+
+#~ msgid "Problem uploading configuration"
+#~ msgstr "Сыртка жүктөөлүүдө конфигурацияда ката"
+
+#~ msgid ""
+#~ "Cannot connect to Mandriva Online website: wrong login/password or router/"
+#~ "firewall bad settings"
+#~ msgstr ""
+#~ "Mandriva Online веб сайтына кирүүгө мүмкүн эмес:аты/катылган белги туура "
+#~ "эмес  маршрутизатор/файервол ыңгайлашуусу туура эмес"
+
 #~ msgid "  --applet\t\t- launch Mandriva Update.\n"
 #~ msgstr "  --applet\t\t- Mandriva Update иштетүү.\n"
 
diff --git a/po/lt.po b/po/lt.po
index 3b9234e6..8887d967 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline-lt\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-09 16:26+0200\n"
+"POT-Creation-Date: 2008-02-21 18:21+0100\n"
 "PO-Revision-Date: 2005-09-26 16:38+0200\n"
 "Last-Translator: Arvydas Svirka <arvydas@arvis.lt>\n"
 "Language-Team: \n"
@@ -19,17 +19,17 @@ msgstr ""
 "100<10 || n%100>=20) ? 1 : 2);\n"
 
 #. -PO: here %s will be replaced by the local time (eg: "Will check updates at 14:03:50"
-#: ../mdkapplet:94
+#: ../mdkapplet:88
 #, fuzzy, c-format
 msgid "Will check updates at %s"
 msgstr "Patikrinti atnaujinimus"
 
-#: ../mdkapplet:103
+#: ../mdkapplet:97
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "Jūsų sistema yra naujausia"
 
-#: ../mdkapplet:109
+#: ../mdkapplet:103
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -38,53 +38,43 @@ msgstr ""
 "Paslaugos konfigūravimo problema. Patikrinkite įrašus ir išsiųskite el. "
 "laišką adresu support@mandrivaonline.com"
 
-#: ../mdkapplet:115
+#: ../mdkapplet:110
 #, fuzzy, c-format
 msgid "Please wait, finding available packages..."
 msgstr "Prašom palaukti.Pašalinami paketai"
 
-#: ../mdkapplet:121
+#: ../mdkapplet:116
 #, c-format
 msgid "New updates are available for your system"
 msgstr "Jūsų sistemai yra atnaujinimų"
 
-#: ../mdkapplet:127
-#, fuzzy, c-format
-msgid "New bundles are available for your system"
-msgstr "Jūsų sistemai yra atnaujinimų"
-
-#: ../mdkapplet:133
-#, c-format
-msgid "Service is not configured. Please click on \"Configure the service\""
-msgstr "Paslauga nesukonfigūruota. Paspauskite \"Konfigūruoti paslaugą\""
-
-#: ../mdkapplet:139
+#: ../mdkapplet:122
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "Tinklas neveikia. Sukonfigūruokite tinklą"
 
-#: ../mdkapplet:145
+#: ../mdkapplet:128
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "Paslauga neįjungta. Paspauskite \"Interneto svetainė\""
 
-#: ../mdkapplet:151 ../mdkapplet:182
+#: ../mdkapplet:134 ../mdkapplet:165
 #, fuzzy, c-format
 msgid "urpmi database locked"
 msgstr "urpmi duomenų bazė užrakinta"
 
-#: ../mdkapplet:157
+#: ../mdkapplet:140
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr "Versija nepalaikoma (versija per sena arba dar kuriama)"
 
-#: ../mdkapplet:163
+#: ../mdkapplet:146
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
 msgstr ""
 
-#: ../mdkapplet:169
+#: ../mdkapplet:152
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -95,586 +85,131 @@ msgid ""
 "Then, restart \"%s\"."
 msgstr ""
 
-#: ../mdkapplet:174
+#: ../mdkapplet:157
 #, c-format
 msgid "Enabled"
 msgstr "Įjungtas"
 
-#: ../mdkapplet:187
+#: ../mdkapplet:170
 #, c-format
 msgid "Error updating media"
 msgstr ""
 
-#: ../mdkapplet:202
+#: ../mdkapplet:185
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr "Tikrinama... Yra atnaujinimų\n"
 
-#: ../mdkapplet:207
+#: ../mdkapplet:190
 #, c-format
 msgid "Packages are up to date"
 msgstr ""
 
-#: ../mdkapplet:212
+#: ../mdkapplet:195
 #, fuzzy, c-format
 msgid "Failed to open urpmi database"
 msgstr "negaliu atverti rpmdb"
 
-#: ../mdkapplet:217 ../mdkapplet:324
+#: ../mdkapplet:200
 #, c-format
 msgid "Install updates"
 msgstr "Įdiegti atnaujinimus"
 
-#: ../mdkapplet:218
-#, c-format
-msgid "Configure the service"
-msgstr "Konfigūruoti paslaugą"
-
-#: ../mdkapplet:219
+#: ../mdkapplet:201
 #, c-format
 msgid "Check Updates"
 msgstr "Patikrinti atnaujinimus"
 
-#: ../mdkapplet:220 ../mdkapplet:327 ../mdkonline:114 ../mdkonline:155
-#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
-#, c-format
-msgid "Please wait"
-msgstr "Prašom palaukti"
-
-#: ../mdkapplet:220 ../mdkapplet:326 ../mdkapplet:327
-#, c-format
-msgid "Check updates"
-msgstr "Patikrinti atnaujinimus"
-
-#: ../mdkapplet:223 ../mdkapplet:648
-#, c-format
-msgid "Online WebSite"
-msgstr "Interneto svetainė"
-
-#: ../mdkapplet:224
+#: ../mdkapplet:202
 #, c-format
 msgid "Configure Network"
 msgstr "Konfigūruoti tinklą"
 
-#: ../mdkapplet:225
-#, c-format
-msgid "Configure Now!"
-msgstr "Konfigūruoti dabar!"
-
-#: ../mdkapplet:313 ../mdkapplet:392
-#, c-format
-msgid "Mandriva Linux Updates Applet"
-msgstr "Mandriva Linux atnaujinimų programėlė"
-
-#: ../mdkapplet:322
-#, c-format
-msgid "Actions"
-msgstr "Veiksmai"
-
-#: ../mdkapplet:325
-#, c-format
-msgid "Configure"
-msgstr "Konfigūruoti"
-
-#: ../mdkapplet:329
-#, c-format
-msgid "See logs"
-msgstr "Peržiūrėti įrašus"
-
-#: ../mdkapplet:332
-#, c-format
-msgid "Status"
-msgstr "Būsena"
-
-#: ../mdkapplet:336 ../mdkapplet:597
-#, c-format
-msgid "Close"
-msgstr "Uždaryti"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Network Connection: "
-msgstr "Prisijungimas prie tinklo: "
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Up"
-msgstr "Aukštyn"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Down"
-msgstr "Žemyn"
-
-#: ../mdkapplet:366
-#, c-format
-msgid "Last check: "
-msgstr "Paskutinis patikrinimas: "
-
-#: ../mdkapplet:367 ../mdkonline:145
-#, c-format
-msgid "Machine name:"
-msgstr "Kompiuterio vardas:"
-
-#: ../mdkapplet:368
-#, c-format
-msgid "Updates: "
-msgstr "Atnaujinimai: "
-
-#: ../mdkapplet:372
+#: ../mdkapplet:283
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Paleidžiama drakconnect\n"
 
-#: ../mdkapplet:375
+#: ../mdkapplet:286
 #, c-format
 msgid "Mandriva Online seems to be reinstalled, reloading applet ...."
 msgstr "Mandriva Online buvo įdiegta iš naujo, įkraunu programėlę ...."
 
-#: ../mdkapplet:383
+#: ../mdkapplet:294
 #, c-format
 msgid "Launching MandrivaUpdate\n"
 msgstr "Paleidžiama MandrivaUpdate\n"
 
-#: ../mdkapplet:398
+#: ../mdkapplet:303
+#, c-format
+msgid "Mandriva Linux Updates Applet"
+msgstr "Mandriva Linux atnaujinimų programėlė"
+
+#: ../mdkapplet:308
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Skaičiuojami paskutiniai atnaujinimai...\n"
 
-#: ../mdkapplet:399
+#: ../mdkapplet:309
 #, c-format
 msgid "Connecting to"
 msgstr "Jungiamasi prie"
 
-#: ../mdkapplet:467 ../mdkupdate:159 ../mdkupdate:188
-#, c-format
-msgid "An error occurred"
-msgstr "Įvyko klaida"
-
-#: ../mdkapplet:475
-#, c-format
-msgid "Development release not supported by service"
-msgstr "Tarnyba nepalaiko dar kuriamos versijos"
-
-#: ../mdkapplet:476
-#, c-format
-msgid "Too old release not supported by service"
-msgstr "Tarnyba nepalaiko per senos versijos"
-
-#: ../mdkapplet:477
-#, c-format
-msgid "Unknown state"
-msgstr "Nežinoma būsena"
-
-#: ../mdkapplet:478
-#, c-format
-msgid "Online services disabled. Contact Mandriva Online site\n"
-msgstr ""
-"Internetinės paslaugos išjungtos. Kreipkitės į Mandriva Online svetainę\n"
-
-#: ../mdkapplet:479
-#, c-format
-msgid "Wrong Password.\n"
-msgstr "Neteisingas slaptažodis.\n"
-
-#: ../mdkapplet:480
-#, c-format
-msgid "Wrong Action or host or login.\n"
-msgstr "Neteisingas veiksmas, stotis arba prisijungimo vardas.\n"
-
-#: ../mdkapplet:481
-#, c-format
-msgid ""
-"Something is wrong with your network settings (check your route, firewall or "
-"proxy settings)\n"
-msgstr ""
-"Kažkas yra negerai su jūsų tinklo nustatymais (patikrinkite maršrutą, "
-"ugniasienės ar tarpinio serverio nustatymus)\n"
-
-#: ../mdkapplet:483
-#, c-format
-msgid ""
-"Problem occured while connecting to the server, please contact the support "
-"team"
-msgstr ""
-"Jungiantis prie serverio įvyko klaida, susisiekite su palaikymo komanda"
-
-#: ../mdkapplet:487
-#, c-format
-msgid "Response from Mandriva Online server\n"
-msgstr "Atsakymas iš Mandriva Online serverio\n"
-
-#: ../mdkapplet:490
+#: ../mdkapplet:386
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Siatema yra naujausia\n"
 
-#: ../mdkapplet:527
-#, c-format
-msgid "No check"
-msgstr "Netikrinti"
-
-#: ../mdkapplet:541
-#, c-format
-msgid "Checking config file: Not present\n"
-msgstr "Tikrinama konfigūracijos byla: nėra\n"
-
-#: ../mdkapplet:544
+#: ../mdkapplet:415
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Tikrinamas tinklas: atrodo, neveikia\n"
 
-#: ../mdkapplet:587
+#: ../mdkapplet:457 ../mdkupdate:118 ../mdkupdate:164
 #, c-format
-msgid "Logs"
-msgstr "Įrašai"
-
-#: ../mdkapplet:603
-#, c-format
-msgid "Clear"
-msgstr "Išvalyti"
+msgid "Warning"
+msgstr "Dėmesio"
 
-#: ../mdkapplet:629
+#: ../mdkapplet:468
 #, c-format
 msgid "About..."
 msgstr "Apie..."
 
-#: ../mdkapplet:631
+#: ../mdkapplet:472
 #, fuzzy, c-format
 msgid "Mandriva Online %s"
 msgstr "Mandriva Online"
 
-#: ../mdkapplet:635
+#: ../mdkapplet:473
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr ""
 
-#: ../mdkapplet:647
+#: ../mdkapplet:476
 #, c-format
 msgid "Mandriva Online gives access to Mandriva web services."
 msgstr ""
 
-#: ../mdkapplet:655
-#, c-format
-msgid "Always launch on startup"
-msgstr "Visada paleisti įkrovimo metu"
-
-#: ../mdkapplet:657
-#, c-format
-msgid "Quit"
-msgstr "Išeiti"
-
-#: ../mdkonline:58
-#, c-format
-msgid ""
-"mdonline version %s\n"
-"Copyright (C) %s Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"mdonline versija %s\n"
-"Autorinės teisės (C) %s Mandriva.\n"
-"Tai nemokama programa ir gali būti platinama pagal GNU GPL licenciją.\n"
-" \n"
-"naudojimas:\n"
-
-#: ../mdkonline:63 ../mdkupdate:73
-#, c-format
-msgid "  --help\t\t- print this help message.\n"
-msgstr "  --help\t\t- spausdinti šį pagalbos pranešimą.\n"
-
-#: ../mdkonline:64
-#, c-format
-msgid "  --box=\t\t\t- hostname.\n"
-msgstr ""
-
-#: ../mdkonline:65
-#, c-format
-msgid "  --country\t\t\t- name of country of the user. \n"
-msgstr ""
-
-#: ../mdkonline:66
-#, c-format
-msgid "  --interactive\t\t- use the interactive mode.\n"
-msgstr ""
-
-#: ../mdkonline:67
-#, c-format
-msgid "  --nointeractive\t- use the non-interactive mode.\n"
-msgstr ""
-
-#: ../mdkonline:68
-#, c-format
-msgid "  --login=\t\t     - login name of the user.\n"
-msgstr ""
-
-#: ../mdkonline:69
-#, c-format
-msgid "  --pass=\t\t\t- password  of the user.\n"
-msgstr ""
-
-#: ../mdkonline:87 ../mdkonline:120
-#, c-format
-msgid "Mandriva Online"
-msgstr "Mandriva Online"
-
-#: ../mdkonline:90
-#, c-format
-msgid "I already have an account"
-msgstr "Aš jau turiu abonentą"
-
-#: ../mdkonline:91
-#, c-format
-msgid "I want to subscribe"
-msgstr "Noriu užsiregistruoti"
-
-#: ../mdkonline:96
-#, c-format
-msgid "Mr."
-msgstr "Ponas"
-
-#: ../mdkonline:96
-#, c-format
-msgid "Mrs."
-msgstr "Ponia"
-
-#: ../mdkonline:96
-#, c-format
-msgid "Ms."
-msgstr "Panelė"
-
-#: ../mdkonline:114
-#, c-format
-msgid "Reading configuration\n"
-msgstr "Skaitau konfigūraciją\n"
-
-#: ../mdkonline:123
-#, c-format
-msgid ""
-"This assistant will help you to upload your configuration\n"
-"(packages, hardware configuration) to a centralized database in\n"
-"order to keep you informed about security updates and useful upgrades.\n"
-msgstr ""
-"Pagalbininkas padės jums persiųsti reikiamus konfigūracijos duomenis\n"
-"(paketus, įrangos konfigūraciją) į centralizuotą duomenų bazę,\n"
-"kad vėliau galėtume jus informuoti apie saugumo atnaujinimus ir naudingus "
-"patobulinimus.\n"
-
-#: ../mdkonline:131
-#, c-format
-msgid "Account creation or authentication"
-msgstr "Abonento sukūrimas arba atpažinimas"
-
-#: ../mdkonline:136
-#, c-format
-msgid "Enter your Mandriva Online login, password and machine name:"
-msgstr ""
-"Įveskite savo Mandriva Online abonento vardą, slaptažodį ir kompiuterio "
-"vardą:"
-
-#: ../mdkonline:142 ../mdkonline:195
-#, c-format
-msgid "Email address:"
-msgstr "El. pašto adresas:"
-
-#: ../mdkonline:143
-#, c-format
-msgid "Country"
-msgstr "Valstybė"
-
-#: ../mdkonline:144 ../mdkonline:196
-#, c-format
-msgid "Password:"
-msgstr "Slaptažodis"
-
-#: ../mdkonline:146
-#, fuzzy, c-format
-msgid "Machine description:"
-msgstr "Kompiuterio vardas:"
-
-#: ../mdkonline:147
-#, c-format
-msgid "(Ex: My Home Office's Computer)"
-msgstr ""
-
-#: ../mdkonline:152 ../mdkonline:159 ../mdkonline:180 ../mdkonline:204
-#: ../mdkonline:208 ../mdkonline:212 ../mdkonline:217 ../mdkupdate:141
-#: ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
-#, c-format
-msgid "Error"
-msgstr "Klaida"
-
-#: ../mdkonline:152
-#, c-format
-msgid "Machine name must be 1 to 40 alphanumerical characters"
-msgstr ""
-"Kompiuterio vardą turi sudaryti nuo 1 iki 40 raidinių-skaitinių simbolių"
-
-#: ../mdkonline:155
-#, c-format
-msgid "Connecting to Mandriva Online website..."
-msgstr "Jungiamasi prie Mandriva Online svetainės..."
-
-#: ../mdkonline:167
-#, c-format
-msgid ""
-"In order to benefit from Mandriva Online services,\n"
-"we are about to upload your configuration.\n"
-"\n"
-"The Wizard will now send the following information to Mandriva:\n"
-"\n"
-"1) the list of packages you have installed on your system,\n"
-"\n"
-"2) your hardware configuration.\n"
-"\n"
-"If you feel uncomfortable by that idea, or do not want to benefit from this "
-"service,\n"
-"please press 'Cancel'. By pressing 'Next', you allow us to keep you "
-"informed\n"
-"about security updates and useful upgrades via personalized email alerts.\n"
-"Furthermore, you benefit from discounted paid support services on\n"
-"www.mandrivaexpert.com."
-msgstr ""
-"Kad jūs galėtumėte naudotis Mandriva Online privalumais,\n"
-"mes parsisiųsime jūsų kompiuterio konfigūraciją.\n"
-"\n"
-"Į Mandriva vedlys netrukus išsiųs sekančią informaciją:\n"
-"\n"
-"1) jūsų sistemoje įdiegtų paketų sąrašą,\n"
-"\n"
-"2) jūsų įrangos konfigūraciją.\n"
-"\n"
-"Jei ši mintis jums nepatinka arba jūs nenorite naudotis šios tarnybos "
-"paslaugomis,\n"
-"paspauskite 'Atšaukti'. Paspausdami 'Tęsti', jūs leisite mums jus "
-"informuoti\n"
-"apie saugumo atnaujinimus ir naudingus papildymus per asmeninę pašto "
-"sistemą.\n"
-"Be to, jūs naudositės palaikymo tarnybos paslaugų nuolaidomis svetainėje\n"
-"www.mandrivaexpert.com."
-
-#: ../mdkonline:180
-#, c-format
-msgid "Connection problem"
-msgstr "Sujungimo klaida"
-
-#: ../mdkonline:180
-#, c-format
-msgid "Problem occurs when uploading files, please try again"
-msgstr "Persiunčiant bylas įvyko klaida, pabandykite dar kartą"
-
-#: ../mdkonline:187
-#, c-format
-msgid "Create a Mandriva Online Account"
-msgstr "Sukurti Mandriva Online abonentą"
-
-#. -PO: that is for things like "Mr", "Ms",...
-#: ../mdkonline:192
-#, c-format
-msgid "Greeting:"
-msgstr "Sveikinimas:"
-
-#: ../mdkonline:193
-#, c-format
-msgid "First name:"
-msgstr "Vardas:"
-
-#: ../mdkonline:194
-#, c-format
-msgid "Last name:"
-msgstr "Pavardė:"
-
-#: ../mdkonline:197
-#, c-format
-msgid "Confirm Password:"
-msgstr "Patvirtinkite slaptažodį:"
-
-#: ../mdkonline:204
-#, c-format
-msgid ""
-"The passwords do not match\n"
-" Please try again\n"
-msgstr ""
-"Slaptažodžiai nesutampa\n"
-" Pabandykite dar kartą\n"
-
-#: ../mdkonline:208
-#, c-format
-msgid "Please fill in each field"
-msgstr "Užpildykite visus laukelius"
-
-#: ../mdkonline:212
-#, c-format
-msgid "Not a valid mail address!\n"
-msgstr "Neteisingas el. pašto adresas!\n"
-
-#: ../mdkonline:217
-#, c-format
-msgid "Creating account failed!"
-msgstr ""
-
-#: ../mdkonline:225
-#, c-format
-msgid ""
-"Mandriva Online Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
-msgstr ""
-"Mandriva Online abonentas sėkmingai sukurtas.\n"
-"Atpažinimui ir jūsų konfigūracijos persiuntimui paspauskite \"Tęsti\"\n"
-
-#: ../mdkonline:229
-#, c-format
-msgid "Your upload was successful!"
-msgstr "Jūsų siuntimas buvo sėkmingas!"
-
-#: ../mdkonline:229
+#: ../mdkapplet:478
 #, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandriva Online."
-msgstr ""
-"Dėka Mandriva online nuo šio momento jūs gausite\n"
-"pranešimus apie saugumo pataisas ir atnaujinimus."
+msgid "Online WebSite"
+msgstr "Interneto svetainė"
 
-#: ../mdkonline:229
+#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
+#: ../mdkapplet:483
 #, c-format
-msgid ""
-"Mandriva Online offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
+msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
-"MandrivaOnlina jums siūlo galimybę automatizuoti atnaujinimus.\n"
-"Programa bus reguliariai paleidžiama jūsų sistemoje ir lauks atnaujinimų\n"
 
-#: ../mdkonline:238
+#: ../mdkapplet:492
 #, c-format
-msgid "Congratulations"
-msgstr "Sveikinimai"
-
-#: ../mdkonline:238
-#, c-format
-msgid "Your Mandriva Online account has been successfully configured\n"
-msgstr "Jūsų Mandriva Online abonentas buvo sėkmingai sukonfigūruotas\n"
-
-#: ../mdkonline:253
-#, c-format
-msgid "Configuration uploaded successfully"
-msgstr "Konfigūracija persiųsta sėkmingai"
-
-#: ../mdkonline:254
-#, c-format
-msgid "Problem uploading configuration"
-msgstr "Konfigūracijos persiuntimo problema"
+msgid "Always launch on startup"
+msgstr "Visada paleisti įkrovimo metu"
 
-#: ../mdkonline:256
+#: ../mdkapplet:494
 #, c-format
-msgid ""
-"Cannot connect to Mandriva Online website: wrong login/password or router/"
-"firewall bad settings"
-msgstr ""
-"Negaliu prisijungti prie Mandriva Online svetainės: neteisingas prisijungimo "
-"vardas/slaptažodis arba blogi maršrutizatoriaus/ugniasienės nustatymai"
+msgid "Quit"
+msgstr "Išeiti"
 
 #: ../mdkonline.pm:207
 #, c-format
@@ -822,6 +357,11 @@ msgstr ""
 " \n"
 "naudojimas:\n"
 
+#: ../mdkupdate:73
+#, c-format
+msgid "  --help\t\t- print this help message.\n"
+msgstr "  --help\t\t- spausdinti šį pagalbos pranešimą.\n"
+
 #: ../mdkupdate:74
 #, c-format
 msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
@@ -849,11 +389,6 @@ msgid ""
 "file.\n"
 msgstr ""
 
-#: ../mdkupdate:118 ../mdkupdate:164
-#, c-format
-msgid "Warning"
-msgstr "Dėmesio"
-
 #. -PO: here Live Install is currently *NOT* translated on the desktop, so it's better to keep as it:
 #: ../mdkupdate:120
 #, c-format
@@ -862,11 +397,21 @@ msgid ""
 "Install' wizard."
 msgstr ""
 
+#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
+#, c-format
+msgid "Please wait"
+msgstr "Prašom palaukti"
+
 #: ../mdkupdate:123 ../mdkupdate:174
 #, c-format
 msgid "Preparing..."
 msgstr "Ruošiamasi..."
 
+#: ../mdkupdate:141 ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
+#, c-format
+msgid "Error"
+msgstr "Klaida"
+
 #: ../mdkupdate:141
 #, c-format
 msgid ""
@@ -875,6 +420,11 @@ msgid ""
 "%s"
 msgstr ""
 
+#: ../mdkupdate:159 ../mdkupdate:188
+#, c-format
+msgid "An error occurred"
+msgstr "Įvyko klaida"
+
 #: ../mdkupdate:164
 #, c-format
 msgid ""
@@ -899,6 +449,290 @@ msgstr "Įdiegiami paketai ...\n"
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "Negaliu atnaujinti paketų sarašo iš update_source šaltinio. \n"
 
+#, fuzzy
+#~ msgid "New bundles are available for your system"
+#~ msgstr "Jūsų sistemai yra atnaujinimų"
+
+#~ msgid "Service is not configured. Please click on \"Configure the service\""
+#~ msgstr "Paslauga nesukonfigūruota. Paspauskite \"Konfigūruoti paslaugą\""
+
+#~ msgid "Configure the service"
+#~ msgstr "Konfigūruoti paslaugą"
+
+#~ msgid "Check updates"
+#~ msgstr "Patikrinti atnaujinimus"
+
+#~ msgid "Configure Now!"
+#~ msgstr "Konfigūruoti dabar!"
+
+#~ msgid "Actions"
+#~ msgstr "Veiksmai"
+
+#~ msgid "Configure"
+#~ msgstr "Konfigūruoti"
+
+#~ msgid "See logs"
+#~ msgstr "Peržiūrėti įrašus"
+
+#~ msgid "Status"
+#~ msgstr "Būsena"
+
+#~ msgid "Close"
+#~ msgstr "Uždaryti"
+
+#~ msgid "Network Connection: "
+#~ msgstr "Prisijungimas prie tinklo: "
+
+#~ msgid "Up"
+#~ msgstr "Aukštyn"
+
+#~ msgid "Down"
+#~ msgstr "Žemyn"
+
+#~ msgid "Last check: "
+#~ msgstr "Paskutinis patikrinimas: "
+
+#~ msgid "Machine name:"
+#~ msgstr "Kompiuterio vardas:"
+
+#~ msgid "Updates: "
+#~ msgstr "Atnaujinimai: "
+
+#~ msgid "Development release not supported by service"
+#~ msgstr "Tarnyba nepalaiko dar kuriamos versijos"
+
+#~ msgid "Too old release not supported by service"
+#~ msgstr "Tarnyba nepalaiko per senos versijos"
+
+#~ msgid "Unknown state"
+#~ msgstr "Nežinoma būsena"
+
+#~ msgid "Online services disabled. Contact Mandriva Online site\n"
+#~ msgstr ""
+#~ "Internetinės paslaugos išjungtos. Kreipkitės į Mandriva Online svetainę\n"
+
+#~ msgid "Wrong Password.\n"
+#~ msgstr "Neteisingas slaptažodis.\n"
+
+#~ msgid "Wrong Action or host or login.\n"
+#~ msgstr "Neteisingas veiksmas, stotis arba prisijungimo vardas.\n"
+
+#~ msgid ""
+#~ "Something is wrong with your network settings (check your route, firewall "
+#~ "or proxy settings)\n"
+#~ msgstr ""
+#~ "Kažkas yra negerai su jūsų tinklo nustatymais (patikrinkite maršrutą, "
+#~ "ugniasienės ar tarpinio serverio nustatymus)\n"
+
+#~ msgid ""
+#~ "Problem occured while connecting to the server, please contact the "
+#~ "support team"
+#~ msgstr ""
+#~ "Jungiantis prie serverio įvyko klaida, susisiekite su palaikymo komanda"
+
+#~ msgid "Response from Mandriva Online server\n"
+#~ msgstr "Atsakymas iš Mandriva Online serverio\n"
+
+#~ msgid "No check"
+#~ msgstr "Netikrinti"
+
+#~ msgid "Checking config file: Not present\n"
+#~ msgstr "Tikrinama konfigūracijos byla: nėra\n"
+
+#~ msgid "Logs"
+#~ msgstr "Įrašai"
+
+#~ msgid "Clear"
+#~ msgstr "Išvalyti"
+
+#~ msgid ""
+#~ "mdonline version %s\n"
+#~ "Copyright (C) %s Mandriva.\n"
+#~ "This is free software and may be redistributed under the terms of the GNU "
+#~ "GPL.\n"
+#~ "\n"
+#~ "usage:\n"
+#~ msgstr ""
+#~ "mdonline versija %s\n"
+#~ "Autorinės teisės (C) %s Mandriva.\n"
+#~ "Tai nemokama programa ir gali būti platinama pagal GNU GPL licenciją.\n"
+#~ " \n"
+#~ "naudojimas:\n"
+
+#~ msgid "Mandriva Online"
+#~ msgstr "Mandriva Online"
+
+#~ msgid "I already have an account"
+#~ msgstr "Aš jau turiu abonentą"
+
+#~ msgid "I want to subscribe"
+#~ msgstr "Noriu užsiregistruoti"
+
+#~ msgid "Mr."
+#~ msgstr "Ponas"
+
+#~ msgid "Mrs."
+#~ msgstr "Ponia"
+
+#~ msgid "Ms."
+#~ msgstr "Panelė"
+
+#~ msgid "Reading configuration\n"
+#~ msgstr "Skaitau konfigūraciją\n"
+
+#~ msgid ""
+#~ "This assistant will help you to upload your configuration\n"
+#~ "(packages, hardware configuration) to a centralized database in\n"
+#~ "order to keep you informed about security updates and useful upgrades.\n"
+#~ msgstr ""
+#~ "Pagalbininkas padės jums persiųsti reikiamus konfigūracijos duomenis\n"
+#~ "(paketus, įrangos konfigūraciją) į centralizuotą duomenų bazę,\n"
+#~ "kad vėliau galėtume jus informuoti apie saugumo atnaujinimus ir naudingus "
+#~ "patobulinimus.\n"
+
+#~ msgid "Account creation or authentication"
+#~ msgstr "Abonento sukūrimas arba atpažinimas"
+
+#~ msgid "Enter your Mandriva Online login, password and machine name:"
+#~ msgstr ""
+#~ "Įveskite savo Mandriva Online abonento vardą, slaptažodį ir kompiuterio "
+#~ "vardą:"
+
+#~ msgid "Email address:"
+#~ msgstr "El. pašto adresas:"
+
+#~ msgid "Country"
+#~ msgstr "Valstybė"
+
+#~ msgid "Password:"
+#~ msgstr "Slaptažodis"
+
+#, fuzzy
+#~ msgid "Machine description:"
+#~ msgstr "Kompiuterio vardas:"
+
+#~ msgid "Machine name must be 1 to 40 alphanumerical characters"
+#~ msgstr ""
+#~ "Kompiuterio vardą turi sudaryti nuo 1 iki 40 raidinių-skaitinių simbolių"
+
+#~ msgid "Connecting to Mandriva Online website..."
+#~ msgstr "Jungiamasi prie Mandriva Online svetainės..."
+
+#~ msgid ""
+#~ "In order to benefit from Mandriva Online services,\n"
+#~ "we are about to upload your configuration.\n"
+#~ "\n"
+#~ "The Wizard will now send the following information to Mandriva:\n"
+#~ "\n"
+#~ "1) the list of packages you have installed on your system,\n"
+#~ "\n"
+#~ "2) your hardware configuration.\n"
+#~ "\n"
+#~ "If you feel uncomfortable by that idea, or do not want to benefit from "
+#~ "this service,\n"
+#~ "please press 'Cancel'. By pressing 'Next', you allow us to keep you "
+#~ "informed\n"
+#~ "about security updates and useful upgrades via personalized email "
+#~ "alerts.\n"
+#~ "Furthermore, you benefit from discounted paid support services on\n"
+#~ "www.mandrivaexpert.com."
+#~ msgstr ""
+#~ "Kad jūs galėtumėte naudotis Mandriva Online privalumais,\n"
+#~ "mes parsisiųsime jūsų kompiuterio konfigūraciją.\n"
+#~ "\n"
+#~ "Į Mandriva vedlys netrukus išsiųs sekančią informaciją:\n"
+#~ "\n"
+#~ "1) jūsų sistemoje įdiegtų paketų sąrašą,\n"
+#~ "\n"
+#~ "2) jūsų įrangos konfigūraciją.\n"
+#~ "\n"
+#~ "Jei ši mintis jums nepatinka arba jūs nenorite naudotis šios tarnybos "
+#~ "paslaugomis,\n"
+#~ "paspauskite 'Atšaukti'. Paspausdami 'Tęsti', jūs leisite mums jus "
+#~ "informuoti\n"
+#~ "apie saugumo atnaujinimus ir naudingus papildymus per asmeninę pašto "
+#~ "sistemą.\n"
+#~ "Be to, jūs naudositės palaikymo tarnybos paslaugų nuolaidomis svetainėje\n"
+#~ "www.mandrivaexpert.com."
+
+#~ msgid "Connection problem"
+#~ msgstr "Sujungimo klaida"
+
+#~ msgid "Problem occurs when uploading files, please try again"
+#~ msgstr "Persiunčiant bylas įvyko klaida, pabandykite dar kartą"
+
+#~ msgid "Create a Mandriva Online Account"
+#~ msgstr "Sukurti Mandriva Online abonentą"
+
+#~ msgid "Greeting:"
+#~ msgstr "Sveikinimas:"
+
+#~ msgid "First name:"
+#~ msgstr "Vardas:"
+
+#~ msgid "Last name:"
+#~ msgstr "Pavardė:"
+
+#~ msgid "Confirm Password:"
+#~ msgstr "Patvirtinkite slaptažodį:"
+
+#~ msgid ""
+#~ "The passwords do not match\n"
+#~ " Please try again\n"
+#~ msgstr ""
+#~ "Slaptažodžiai nesutampa\n"
+#~ " Pabandykite dar kartą\n"
+
+#~ msgid "Please fill in each field"
+#~ msgstr "Užpildykite visus laukelius"
+
+#~ msgid "Not a valid mail address!\n"
+#~ msgstr "Neteisingas el. pašto adresas!\n"
+
+#~ msgid ""
+#~ "Mandriva Online Account successfully created.\n"
+#~ "Please click \"Next\" to authenticate and upload your configuration\n"
+#~ msgstr ""
+#~ "Mandriva Online abonentas sėkmingai sukurtas.\n"
+#~ "Atpažinimui ir jūsų konfigūracijos persiuntimui paspauskite \"Tęsti\"\n"
+
+#~ msgid "Your upload was successful!"
+#~ msgstr "Jūsų siuntimas buvo sėkmingas!"
+
+#~ msgid ""
+#~ "From now you will receive on security and updates \n"
+#~ "announcements thanks to Mandriva Online."
+#~ msgstr ""
+#~ "Dėka Mandriva online nuo šio momento jūs gausite\n"
+#~ "pranešimus apie saugumo pataisas ir atnaujinimus."
+
+#~ msgid ""
+#~ "Mandriva Online offers you the ability to automate the updates.\n"
+#~ "A program will run regulary in your system waiting for new updates\n"
+#~ msgstr ""
+#~ "MandrivaOnlina jums siūlo galimybę automatizuoti atnaujinimus.\n"
+#~ "Programa bus reguliariai paleidžiama jūsų sistemoje ir lauks atnaujinimų\n"
+
+#~ msgid "Congratulations"
+#~ msgstr "Sveikinimai"
+
+#~ msgid "Your Mandriva Online account has been successfully configured\n"
+#~ msgstr "Jūsų Mandriva Online abonentas buvo sėkmingai sukonfigūruotas\n"
+
+#~ msgid "Configuration uploaded successfully"
+#~ msgstr "Konfigūracija persiųsta sėkmingai"
+
+#~ msgid "Problem uploading configuration"
+#~ msgstr "Konfigūracijos persiuntimo problema"
+
+#~ msgid ""
+#~ "Cannot connect to Mandriva Online website: wrong login/password or router/"
+#~ "firewall bad settings"
+#~ msgstr ""
+#~ "Negaliu prisijungti prie Mandriva Online svetainės: neteisingas "
+#~ "prisijungimo vardas/slaptažodis arba blogi maršrutizatoriaus/ugniasienės "
+#~ "nustatymai"
+
 #~ msgid "  --applet\t\t- launch Mandriva Update.\n"
 #~ msgstr "  --applet\t\t- paleisti Mandriva Update.\n"
 
diff --git a/po/ltg.po b/po/ltg.po
index df8447d0..6818efb1 100644
--- a/po/ltg.po
+++ b/po/ltg.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline 0.15\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-09 16:26+0200\n"
+"POT-Creation-Date: 2008-02-21 18:21+0100\n"
 "PO-Revision-Date: 2004-02-17 17:39+0200\n"
 "Last-Translator: Unknown\n"
 "Language-Team: ll10nt <ll10nt@listes.murds.lv>\n"
@@ -16,29 +16,29 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. -PO: here %s will be replaced by the local time (eg: "Will check updates at 14:03:50"
-#: ../mdkapplet:94
+#: ../mdkapplet:88
 #, fuzzy, c-format
 msgid "Will check updates at %s"
 msgstr "Atvārtū portu puorbaude"
 
-#: ../mdkapplet:103
+#: ../mdkapplet:97
 #, c-format
 msgid "Your system is up-to-date"
 msgstr ""
 
-#: ../mdkapplet:109
+#: ../mdkapplet:103
 #, fuzzy, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
 "support@mandrivaonline.com"
 msgstr "Problemu gadīnī syutit e-posta viesti iz support@mandrivaonline.com\n"
 
-#: ../mdkapplet:115
+#: ../mdkapplet:110
 #, fuzzy, c-format
 msgid "Please wait, finding available packages..."
 msgstr "Mekleju pīejamuos pakūtnis"
 
-#: ../mdkapplet:121
+#: ../mdkapplet:116
 #, fuzzy, c-format
 msgid "New updates are available for your system"
 msgstr ""
@@ -47,47 +47,33 @@ msgstr ""
 "%s\n"
 "ir pīejami iz jiusu sistemys.\n"
 
-#: ../mdkapplet:127
-#, fuzzy, c-format
-msgid "New bundles are available for your system"
-msgstr ""
-"Sekuojūši skeneri\n"
-"\n"
-"%s\n"
-"ir pīejami iz jiusu sistemys.\n"
-
-#: ../mdkapplet:133
-#, c-format
-msgid "Service is not configured. Please click on \"Configure the service\""
-msgstr ""
-
-#: ../mdkapplet:139
+#: ../mdkapplet:122
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr ""
 
-#: ../mdkapplet:145
+#: ../mdkapplet:128
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr ""
 
-#: ../mdkapplet:151 ../mdkapplet:182
+#: ../mdkapplet:134 ../mdkapplet:165
 #, c-format
 msgid "urpmi database locked"
 msgstr ""
 
-#: ../mdkapplet:157
+#: ../mdkapplet:140
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
-#: ../mdkapplet:163
+#: ../mdkapplet:146
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
 msgstr ""
 
-#: ../mdkapplet:169
+#: ../mdkapplet:152
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -98,573 +84,131 @@ msgid ""
 "Then, restart \"%s\"."
 msgstr ""
 
-#: ../mdkapplet:174
+#: ../mdkapplet:157
 #, fuzzy, c-format
 msgid "Enabled"
 msgstr "īslēgt"
 
-#: ../mdkapplet:187
+#: ../mdkapplet:170
 #, c-format
 msgid "Error updating media"
 msgstr ""
 
-#: ../mdkapplet:202
+#: ../mdkapplet:185
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr ""
 
-#: ../mdkapplet:207
+#: ../mdkapplet:190
 #, c-format
 msgid "Packages are up to date"
 msgstr ""
 
-#: ../mdkapplet:212
+#: ../mdkapplet:195
 #, c-format
 msgid "Failed to open urpmi database"
 msgstr ""
 
-#: ../mdkapplet:217 ../mdkapplet:324
+#: ../mdkapplet:200
 #, c-format
 msgid "Install updates"
 msgstr "Uzstuodeit jaunynuojumus"
 
-#: ../mdkapplet:218
-#, fuzzy, c-format
-msgid "Configure the service"
-msgstr "Konfigurēt"
-
-#: ../mdkapplet:219
+#: ../mdkapplet:201
 #, fuzzy, c-format
 msgid "Check Updates"
 msgstr "Modernizeijumi"
 
-#: ../mdkapplet:220 ../mdkapplet:327 ../mdkonline:114 ../mdkonline:155
-#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
-#, c-format
-msgid "Please wait"
-msgstr "Lyudzu pagaidit"
-
-#: ../mdkapplet:220 ../mdkapplet:326 ../mdkapplet:327
-#, fuzzy, c-format
-msgid "Check updates"
-msgstr "Atvārtū portu puorbaude"
-
-#: ../mdkapplet:223 ../mdkapplet:648
-#, c-format
-msgid "Online WebSite"
-msgstr ""
-
-#: ../mdkapplet:224
+#: ../mdkapplet:202
 #, fuzzy, c-format
 msgid "Configure Network"
 msgstr "Teikla konfigureišona"
 
-#: ../mdkapplet:225
-#, fuzzy, c-format
-msgid "Configure Now!"
-msgstr "Nūlosu konfiguraceju\n"
-
-#: ../mdkapplet:313 ../mdkapplet:392
-#, fuzzy, c-format
-msgid "Mandriva Linux Updates Applet"
-msgstr "Mandriva Linux privātuma politika"
-
-#: ../mdkapplet:322
-#, fuzzy, c-format
-msgid "Actions"
-msgstr "Darbeiba"
-
-#: ../mdkapplet:325
-#, c-format
-msgid "Configure"
-msgstr "Konfigurēt"
-
-#: ../mdkapplet:329
-#, fuzzy, c-format
-msgid "See logs"
-msgstr "Meklēt +5s"
-
-#: ../mdkapplet:332
-#, c-format
-msgid "Status"
-msgstr "Stuovūklis"
-
-#: ../mdkapplet:336 ../mdkapplet:597
-#, c-format
-msgid "Close"
-msgstr "Aizvērt"
-
-#: ../mdkapplet:365
-#, fuzzy, c-format
-msgid "Network Connection: "
-msgstr "Jauns pīslāgums"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Up"
-msgstr "Iz augšu"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Down"
-msgstr "Iz leju"
-
-#: ../mdkapplet:366
-#, c-format
-msgid "Last check: "
-msgstr ""
-
-#: ../mdkapplet:367 ../mdkonline:145
-#, c-format
-msgid "Machine name:"
-msgstr "Datora nūsaukums:"
-
-#: ../mdkapplet:368
-#, fuzzy, c-format
-msgid "Updates: "
-msgstr "Modernizeijumi"
-
-#: ../mdkapplet:372
+#: ../mdkapplet:283
 #, fuzzy, c-format
 msgid "Launching drakconnect\n"
 msgstr "Palaist userdrake"
 
-#: ../mdkapplet:375
+#: ../mdkapplet:286
 #, c-format
 msgid "Mandriva Online seems to be reinstalled, reloading applet ...."
 msgstr ""
 
-#: ../mdkapplet:383
+#: ../mdkapplet:294
 #, c-format
 msgid "Launching MandrivaUpdate\n"
 msgstr ""
 
-#: ../mdkapplet:398
+#: ../mdkapplet:303
+#, fuzzy, c-format
+msgid "Mandriva Linux Updates Applet"
+msgstr "Mandriva Linux privātuma politika"
+
+#: ../mdkapplet:308
 #, fuzzy, c-format
 msgid "Computing new updates...\n"
 msgstr "Dasaslādzu ...\n"
 
-#: ../mdkapplet:399
+#: ../mdkapplet:309
 #, fuzzy, c-format
 msgid "Connecting to"
 msgstr "Pīslāguma problema"
 
-#: ../mdkapplet:467 ../mdkupdate:159 ../mdkupdate:188
-#, c-format
-msgid "An error occurred"
-msgstr "Atkluota kliuda"
-
-#: ../mdkapplet:475
-#, c-format
-msgid "Development release not supported by service"
-msgstr ""
-
-#: ../mdkapplet:476
-#, c-format
-msgid "Too old release not supported by service"
-msgstr ""
-
-#: ../mdkapplet:477
-#, fuzzy, c-format
-msgid "Unknown state"
-msgstr "Nazynuoms hostdatora vuords"
-
-#: ../mdkapplet:478
-#, c-format
-msgid "Online services disabled. Contact Mandriva Online site\n"
-msgstr ""
-
-#: ../mdkapplet:479
-#, c-format
-msgid "Wrong Password.\n"
-msgstr "Napareizs paroļs.\n"
-
-#: ../mdkapplet:480
-#, c-format
-msgid "Wrong Action or host or login.\n"
-msgstr ""
-
-#: ../mdkapplet:481
-#, c-format
-msgid ""
-"Something is wrong with your network settings (check your route, firewall or "
-"proxy settings)\n"
-msgstr ""
-
-#: ../mdkapplet:483
-#, c-format
-msgid ""
-"Problem occured while connecting to the server, please contact the support "
-"team"
-msgstr ""
-
-#: ../mdkapplet:487
-#, fuzzy, c-format
-msgid "Response from Mandriva Online server\n"
-msgstr "Laipni lyudzam Mandriva Online"
-
-#: ../mdkapplet:490
+#: ../mdkapplet:386
 #, fuzzy, c-format
 msgid "System is up-to-date\n"
 msgstr "Sistemys režims"
 
-#: ../mdkapplet:527
-#, c-format
-msgid "No check"
-msgstr ""
-
-#: ../mdkapplet:541
-#, c-format
-msgid "Checking config file: Not present\n"
-msgstr ""
-
-#: ../mdkapplet:544
+#: ../mdkapplet:415
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr ""
 
-#: ../mdkapplet:587
+#: ../mdkapplet:457 ../mdkupdate:118 ../mdkupdate:164
 #, c-format
-msgid "Logs"
-msgstr "Žurnali"
-
-#: ../mdkapplet:603
-#, fuzzy, c-format
-msgid "Clear"
-msgstr "Kalendars"
+msgid "Warning"
+msgstr "Uzmaneibu"
 
-#: ../mdkapplet:629
+#: ../mdkapplet:468
 #, c-format
 msgid "About..."
 msgstr "Par..."
 
-#: ../mdkapplet:631
+#: ../mdkapplet:472
 #, fuzzy, c-format
 msgid "Mandriva Online %s"
 msgstr "Mandriva Online"
 
-#: ../mdkapplet:635
+#: ../mdkapplet:473
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr ""
 
-#: ../mdkapplet:647
+#: ../mdkapplet:476
 #, c-format
 msgid "Mandriva Online gives access to Mandriva web services."
 msgstr ""
 
-#: ../mdkapplet:655
-#, c-format
-msgid "Always launch on startup"
-msgstr ""
-
-#: ../mdkapplet:657
-#, c-format
-msgid "Quit"
-msgstr "Izīt"
-
-#: ../mdkonline:58
-#, c-format
-msgid ""
-"mdonline version %s\n"
-"Copyright (C) %s Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"mdonline verseja %s\n"
-"Autortīseibys © %s Mandriva.\n"
-"Itei ir breiva programmatura, kū var izplateit saskaņā ar GNU GPL "
-"nūteikumim.\n"
-"\n"
-"pīlītuojums:\n"
-
-#: ../mdkonline:63 ../mdkupdate:73
-#, c-format
-msgid "  --help\t\t- print this help message.\n"
-msgstr "  --help\t\t- drukuot itū paliedzeibys tekstu.\n"
-
-#: ../mdkonline:64
-#, c-format
-msgid "  --box=\t\t\t- hostname.\n"
-msgstr ""
-
-#: ../mdkonline:65
-#, c-format
-msgid "  --country\t\t\t- name of country of the user. \n"
-msgstr ""
-
-#: ../mdkonline:66
-#, c-format
-msgid "  --interactive\t\t- use the interactive mode.\n"
-msgstr ""
-
-#: ../mdkonline:67
-#, c-format
-msgid "  --nointeractive\t- use the non-interactive mode.\n"
-msgstr ""
-
-#: ../mdkonline:68
-#, c-format
-msgid "  --login=\t\t     - login name of the user.\n"
-msgstr ""
-
-#: ../mdkonline:69
-#, c-format
-msgid "  --pass=\t\t\t- password  of the user.\n"
-msgstr ""
-
-#: ../mdkonline:87 ../mdkonline:120
-#, c-format
-msgid "Mandriva Online"
-msgstr "Mandriva Online"
-
-#: ../mdkonline:90
-#, c-format
-msgid "I already have an account"
-msgstr ""
-
-#: ../mdkonline:91
-#, c-format
-msgid "I want to subscribe"
-msgstr ""
-
-#: ../mdkonline:96
-#, c-format
-msgid "Mr."
-msgstr ""
-
-#: ../mdkonline:96
-#, c-format
-msgid "Mrs."
-msgstr ""
-
-#: ../mdkonline:96
-#, c-format
-msgid "Ms."
-msgstr ""
-
-#: ../mdkonline:114
-#, c-format
-msgid "Reading configuration\n"
-msgstr "Nūlosu konfiguraceju\n"
-
-#: ../mdkonline:123
-#, c-format
-msgid ""
-"This assistant will help you to upload your configuration\n"
-"(packages, hardware configuration) to a centralized database in\n"
-"order to keep you informed about security updates and useful upgrades.\n"
-msgstr ""
-"paleidzēs jiusim šursyuteit jiusu konfiguraceju (pakūtnis, dzelžu "
-"konfiguraceju)\n"
-"uz centralizeitu datubāzi, itys vyss teik dareits ar mierķi, lai jius tyktu\n"
-"informeits par drūšeibys uzlobuojumim i cytim vierteigim jaunumim.\n"
-
-#: ../mdkonline:131
-#, c-format
-msgid "Account creation or authentication"
-msgstr ""
-
-#: ../mdkonline:136
-#, c-format
-msgid "Enter your Mandriva Online login, password and machine name:"
-msgstr ""
-"Īvodit jiusu Mandriva Online lītuotuojvuordu, paroli i datora nūsaukumu:"
-
-#: ../mdkonline:142 ../mdkonline:195
-#, fuzzy, c-format
-msgid "Email address:"
-msgstr "IP adrese"
-
-#: ../mdkonline:143
-#, c-format
-msgid "Country"
-msgstr "Vaļsts"
-
-#: ../mdkonline:144 ../mdkonline:196
-#, c-format
-msgid "Password:"
-msgstr "Parole:"
-
-#: ../mdkonline:146
-#, fuzzy, c-format
-msgid "Machine description:"
-msgstr "Datora nūsaukums:"
-
-#: ../mdkonline:147
-#, c-format
-msgid "(Ex: My Home Office's Computer)"
-msgstr ""
-
-#: ../mdkonline:152 ../mdkonline:159 ../mdkonline:180 ../mdkonline:204
-#: ../mdkonline:208 ../mdkonline:212 ../mdkonline:217 ../mdkupdate:141
-#: ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
-#, c-format
-msgid "Error"
-msgstr "Klaida"
-
-#: ../mdkonline:152
-#, c-format
-msgid "Machine name must be 1 to 40 alphanumerical characters"
-msgstr ""
-
-#: ../mdkonline:155
-#, fuzzy, c-format
-msgid "Connecting to Mandriva Online website..."
-msgstr "Laipni lyudzam Mandriva Online"
-
-#: ../mdkonline:167
-#, c-format
-msgid ""
-"In order to benefit from Mandriva Online services,\n"
-"we are about to upload your configuration.\n"
-"\n"
-"The Wizard will now send the following information to Mandriva:\n"
-"\n"
-"1) the list of packages you have installed on your system,\n"
-"\n"
-"2) your hardware configuration.\n"
-"\n"
-"If you feel uncomfortable by that idea, or do not want to benefit from this "
-"service,\n"
-"please press 'Cancel'. By pressing 'Next', you allow us to keep you "
-"informed\n"
-"about security updates and useful upgrades via personalized email alerts.\n"
-"Furthermore, you benefit from discounted paid support services on\n"
-"www.mandrivaexpert.com."
-msgstr ""
-"Lai pylnvierteigi izmontuotu Mandriva Online pakolpuojumus,\n"
-"mes gatovojamīs nūsyuteit jiusu konfiguraceju.\n"
-"\n"
-"Vednis uz Mandriva tyuleņ nūsyuteis sekojūšu informaceju:\n"
-"\n"
-"1) jiusu sistemā instaleitū pakūtņu sarokstu,\n"
-"\n"
-"2) jiusu dzelžu konfiguraceju.\n"
-"\n"
-"Ja jiusim tas līkas napījemami, ci ari nagribit izmontuot šū\n"
-"pakolpuojumu, spīdit 'Atceļt'. Nūspīžūt 'Tuoļuok', jius dūdot\n"
-"atļuovi ar personificeitu e-posta viests paleidzeibu informēt jius\n"
-"par drūšeibys jaunynuojumim i cytim nūdereigim uzlobuojumim.\n"
-"Turkluot, jius sajimsit atlaidis www.mandrivaexpert.com moksys\n"
-"atbolsta pakolpuojumim."
-
-#: ../mdkonline:180
-#, c-format
-msgid "Connection problem"
-msgstr "Pīslāguma problema"
-
-#: ../mdkonline:180
-#, c-format
-msgid "Problem occurs when uploading files, please try again"
-msgstr ""
-
-#: ../mdkonline:187
-#, fuzzy, c-format
-msgid "Create a Mandriva Online Account"
-msgstr "Laipni lyudzam Mandriva Online"
-
-#. -PO: that is for things like "Mr", "Ms",...
-#: ../mdkonline:192
-#, fuzzy, c-format
-msgid "Greeting:"
-msgstr "Greku:"
-
-#: ../mdkonline:193
-#, fuzzy, c-format
-msgid "First name:"
-msgstr "Hostdatora vuords: "
-
-#: ../mdkonline:194
-#, fuzzy, c-format
-msgid "Last name:"
-msgstr "Hostdatora vuords: "
-
-#: ../mdkonline:197
-#, c-format
-msgid "Confirm Password:"
-msgstr "Apstyprynuot paroli:"
-
-#: ../mdkonline:204
-#, fuzzy, c-format
-msgid ""
-"The passwords do not match\n"
-" Please try again\n"
-msgstr "Parolis nasakreit"
-
-#: ../mdkonline:208
-#, fuzzy, c-format
-msgid "Please fill in each field"
-msgstr "Lyudzu aizpilļdit voi izavielejit lauku"
-
-#: ../mdkonline:212
-#, fuzzy, c-format
-msgid "Not a valid mail address!\n"
-msgstr "Lyudzu, īvodit dereigu adresi!"
-
-#: ../mdkonline:217
-#, c-format
-msgid "Creating account failed!"
-msgstr ""
-
-#: ../mdkonline:225
-#, c-format
-msgid ""
-"Mandriva Online Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
-msgstr ""
-
-#: ../mdkonline:229
-#, c-format
-msgid "Your upload was successful!"
-msgstr "Nūsyuteišona beja veiksmeiga!"
-
-#: ../mdkonline:229
+#: ../mdkapplet:478
 #, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandriva Online."
+msgid "Online WebSite"
 msgstr ""
-"Niule pasateicūt Mandriva Online jius sajimsit\n"
-"paziņuojumus par drūšeibys i cytim jaunynuojumim."
 
-#: ../mdkonline:229
+#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
+#: ../mdkapplet:483
 #, c-format
-msgid ""
-"Mandriva Online offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
+msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
-"Mandriva Online pīduovoj īspieju automatizēt jaunynuojumus.\n"
-"Jiusu sistema regulari palaiss programmu, kas gaideis jaunynuojumus\n"
 
-#: ../mdkonline:238
+#: ../mdkapplet:492
 #, c-format
-msgid "Congratulations"
-msgstr "Apsveicam"
-
-#: ../mdkonline:238
-#, c-format
-msgid "Your Mandriva Online account has been successfully configured\n"
+msgid "Always launch on startup"
 msgstr ""
 
-#: ../mdkonline:253
-#, fuzzy, c-format
-msgid "Configuration uploaded successfully"
-msgstr "Nūsyuteišona beja veiksmeiga!"
-
-#: ../mdkonline:254
-#, fuzzy, c-format
-msgid "Problem uploading configuration"
-msgstr "Nūlosu konfiguraceju\n"
-
-#: ../mdkonline:256
+#: ../mdkapplet:494
 #, c-format
-msgid ""
-"Cannot connect to Mandriva Online website: wrong login/password or router/"
-"firewall bad settings"
-msgstr ""
+msgid "Quit"
+msgstr "Izīt"
 
 #: ../mdkonline.pm:207
 #, fuzzy, c-format
@@ -803,6 +347,11 @@ msgstr ""
 "\n"
 "pīlītuojums:\n"
 
+#: ../mdkupdate:73
+#, c-format
+msgid "  --help\t\t- print this help message.\n"
+msgstr "  --help\t\t- drukuot itū paliedzeibys tekstu.\n"
+
 #: ../mdkupdate:74
 #, fuzzy, c-format
 msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
@@ -830,11 +379,6 @@ msgid ""
 "file.\n"
 msgstr ""
 
-#: ../mdkupdate:118 ../mdkupdate:164
-#, c-format
-msgid "Warning"
-msgstr "Uzmaneibu"
-
 #. -PO: here Live Install is currently *NOT* translated on the desktop, so it's better to keep as it:
 #: ../mdkupdate:120
 #, c-format
@@ -843,11 +387,21 @@ msgid ""
 "Install' wizard."
 msgstr ""
 
+#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
+#, c-format
+msgid "Please wait"
+msgstr "Lyudzu pagaidit"
+
 #: ../mdkupdate:123 ../mdkupdate:174
 #, c-format
 msgid "Preparing..."
 msgstr ""
 
+#: ../mdkupdate:141 ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
+#, c-format
+msgid "Error"
+msgstr "Klaida"
+
 #: ../mdkupdate:141
 #, c-format
 msgid ""
@@ -856,6 +410,11 @@ msgid ""
 "%s"
 msgstr ""
 
+#: ../mdkupdate:159 ../mdkupdate:188
+#, c-format
+msgid "An error occurred"
+msgstr "Atkluota kliuda"
+
 #: ../mdkupdate:164
 #, c-format
 msgid ""
@@ -881,6 +440,231 @@ msgid "Unable to update packages from update_source medium.\n"
 msgstr "Nav īspiejams atjaunuot pakūtnis nu update_source medium.\n"
 
 #, fuzzy
+#~ msgid "New bundles are available for your system"
+#~ msgstr ""
+#~ "Sekuojūši skeneri\n"
+#~ "\n"
+#~ "%s\n"
+#~ "ir pīejami iz jiusu sistemys.\n"
+
+#, fuzzy
+#~ msgid "Configure the service"
+#~ msgstr "Konfigurēt"
+
+#, fuzzy
+#~ msgid "Check updates"
+#~ msgstr "Atvārtū portu puorbaude"
+
+#, fuzzy
+#~ msgid "Configure Now!"
+#~ msgstr "Nūlosu konfiguraceju\n"
+
+#, fuzzy
+#~ msgid "Actions"
+#~ msgstr "Darbeiba"
+
+#~ msgid "Configure"
+#~ msgstr "Konfigurēt"
+
+#, fuzzy
+#~ msgid "See logs"
+#~ msgstr "Meklēt +5s"
+
+#~ msgid "Status"
+#~ msgstr "Stuovūklis"
+
+#~ msgid "Close"
+#~ msgstr "Aizvērt"
+
+#, fuzzy
+#~ msgid "Network Connection: "
+#~ msgstr "Jauns pīslāgums"
+
+#~ msgid "Up"
+#~ msgstr "Iz augšu"
+
+#~ msgid "Down"
+#~ msgstr "Iz leju"
+
+#~ msgid "Machine name:"
+#~ msgstr "Datora nūsaukums:"
+
+#, fuzzy
+#~ msgid "Updates: "
+#~ msgstr "Modernizeijumi"
+
+#, fuzzy
+#~ msgid "Unknown state"
+#~ msgstr "Nazynuoms hostdatora vuords"
+
+#~ msgid "Wrong Password.\n"
+#~ msgstr "Napareizs paroļs.\n"
+
+#, fuzzy
+#~ msgid "Response from Mandriva Online server\n"
+#~ msgstr "Laipni lyudzam Mandriva Online"
+
+#~ msgid "Logs"
+#~ msgstr "Žurnali"
+
+#, fuzzy
+#~ msgid "Clear"
+#~ msgstr "Kalendars"
+
+#~ msgid ""
+#~ "mdonline version %s\n"
+#~ "Copyright (C) %s Mandriva.\n"
+#~ "This is free software and may be redistributed under the terms of the GNU "
+#~ "GPL.\n"
+#~ "\n"
+#~ "usage:\n"
+#~ msgstr ""
+#~ "mdonline verseja %s\n"
+#~ "Autortīseibys © %s Mandriva.\n"
+#~ "Itei ir breiva programmatura, kū var izplateit saskaņā ar GNU GPL "
+#~ "nūteikumim.\n"
+#~ "\n"
+#~ "pīlītuojums:\n"
+
+#~ msgid "Mandriva Online"
+#~ msgstr "Mandriva Online"
+
+#~ msgid "Reading configuration\n"
+#~ msgstr "Nūlosu konfiguraceju\n"
+
+#~ msgid ""
+#~ "This assistant will help you to upload your configuration\n"
+#~ "(packages, hardware configuration) to a centralized database in\n"
+#~ "order to keep you informed about security updates and useful upgrades.\n"
+#~ msgstr ""
+#~ "paleidzēs jiusim šursyuteit jiusu konfiguraceju (pakūtnis, dzelžu "
+#~ "konfiguraceju)\n"
+#~ "uz centralizeitu datubāzi, itys vyss teik dareits ar mierķi, lai jius "
+#~ "tyktu\n"
+#~ "informeits par drūšeibys uzlobuojumim i cytim vierteigim jaunumim.\n"
+
+#~ msgid "Enter your Mandriva Online login, password and machine name:"
+#~ msgstr ""
+#~ "Īvodit jiusu Mandriva Online lītuotuojvuordu, paroli i datora nūsaukumu:"
+
+#, fuzzy
+#~ msgid "Email address:"
+#~ msgstr "IP adrese"
+
+#~ msgid "Country"
+#~ msgstr "Vaļsts"
+
+#~ msgid "Password:"
+#~ msgstr "Parole:"
+
+#, fuzzy
+#~ msgid "Machine description:"
+#~ msgstr "Datora nūsaukums:"
+
+#, fuzzy
+#~ msgid "Connecting to Mandriva Online website..."
+#~ msgstr "Laipni lyudzam Mandriva Online"
+
+#~ msgid ""
+#~ "In order to benefit from Mandriva Online services,\n"
+#~ "we are about to upload your configuration.\n"
+#~ "\n"
+#~ "The Wizard will now send the following information to Mandriva:\n"
+#~ "\n"
+#~ "1) the list of packages you have installed on your system,\n"
+#~ "\n"
+#~ "2) your hardware configuration.\n"
+#~ "\n"
+#~ "If you feel uncomfortable by that idea, or do not want to benefit from "
+#~ "this service,\n"
+#~ "please press 'Cancel'. By pressing 'Next', you allow us to keep you "
+#~ "informed\n"
+#~ "about security updates and useful upgrades via personalized email "
+#~ "alerts.\n"
+#~ "Furthermore, you benefit from discounted paid support services on\n"
+#~ "www.mandrivaexpert.com."
+#~ msgstr ""
+#~ "Lai pylnvierteigi izmontuotu Mandriva Online pakolpuojumus,\n"
+#~ "mes gatovojamīs nūsyuteit jiusu konfiguraceju.\n"
+#~ "\n"
+#~ "Vednis uz Mandriva tyuleņ nūsyuteis sekojūšu informaceju:\n"
+#~ "\n"
+#~ "1) jiusu sistemā instaleitū pakūtņu sarokstu,\n"
+#~ "\n"
+#~ "2) jiusu dzelžu konfiguraceju.\n"
+#~ "\n"
+#~ "Ja jiusim tas līkas napījemami, ci ari nagribit izmontuot šū\n"
+#~ "pakolpuojumu, spīdit 'Atceļt'. Nūspīžūt 'Tuoļuok', jius dūdot\n"
+#~ "atļuovi ar personificeitu e-posta viests paleidzeibu informēt jius\n"
+#~ "par drūšeibys jaunynuojumim i cytim nūdereigim uzlobuojumim.\n"
+#~ "Turkluot, jius sajimsit atlaidis www.mandrivaexpert.com moksys\n"
+#~ "atbolsta pakolpuojumim."
+
+#~ msgid "Connection problem"
+#~ msgstr "Pīslāguma problema"
+
+#, fuzzy
+#~ msgid "Create a Mandriva Online Account"
+#~ msgstr "Laipni lyudzam Mandriva Online"
+
+#, fuzzy
+#~ msgid "Greeting:"
+#~ msgstr "Greku:"
+
+#, fuzzy
+#~ msgid "First name:"
+#~ msgstr "Hostdatora vuords: "
+
+#, fuzzy
+#~ msgid "Last name:"
+#~ msgstr "Hostdatora vuords: "
+
+#~ msgid "Confirm Password:"
+#~ msgstr "Apstyprynuot paroli:"
+
+#, fuzzy
+#~ msgid ""
+#~ "The passwords do not match\n"
+#~ " Please try again\n"
+#~ msgstr "Parolis nasakreit"
+
+#, fuzzy
+#~ msgid "Please fill in each field"
+#~ msgstr "Lyudzu aizpilļdit voi izavielejit lauku"
+
+#, fuzzy
+#~ msgid "Not a valid mail address!\n"
+#~ msgstr "Lyudzu, īvodit dereigu adresi!"
+
+#~ msgid "Your upload was successful!"
+#~ msgstr "Nūsyuteišona beja veiksmeiga!"
+
+#~ msgid ""
+#~ "From now you will receive on security and updates \n"
+#~ "announcements thanks to Mandriva Online."
+#~ msgstr ""
+#~ "Niule pasateicūt Mandriva Online jius sajimsit\n"
+#~ "paziņuojumus par drūšeibys i cytim jaunynuojumim."
+
+#~ msgid ""
+#~ "Mandriva Online offers you the ability to automate the updates.\n"
+#~ "A program will run regulary in your system waiting for new updates\n"
+#~ msgstr ""
+#~ "Mandriva Online pīduovoj īspieju automatizēt jaunynuojumus.\n"
+#~ "Jiusu sistema regulari palaiss programmu, kas gaideis jaunynuojumus\n"
+
+#~ msgid "Congratulations"
+#~ msgstr "Apsveicam"
+
+#, fuzzy
+#~ msgid "Configuration uploaded successfully"
+#~ msgstr "Nūsyuteišona beja veiksmeiga!"
+
+#, fuzzy
+#~ msgid "Problem uploading configuration"
+#~ msgstr "Nūlosu konfiguraceju\n"
+
+#, fuzzy
 #~ msgid "  --applet\t\t- launch Mandriva Update.\n"
 #~ msgstr "  --applet\t\t- atjaunuot vysu informaceju.\n"
 
diff --git a/po/lv.po b/po/lv.po
index 50e65737..bd1a36bb 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline 0.15\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-09 16:26+0200\n"
+"POT-Creation-Date: 2008-02-21 18:21+0100\n"
 "PO-Revision-Date: 2002-09-25 19:04+0200\n"
 "Last-Translator: Raivo Saars <spaiks@inbox.lv>\n"
 "Language-Team: ll10nt <ll10nt@listes.murds.lv>\n"
@@ -18,70 +18,60 @@ msgstr ""
 "2);\n"
 
 #. -PO: here %s will be replaced by the local time (eg: "Will check updates at 14:03:50"
-#: ../mdkapplet:94
+#: ../mdkapplet:88
 #, fuzzy, c-format
 msgid "Will check updates at %s"
 msgstr "Drošības atjauninājumi"
 
-#: ../mdkapplet:103
+#: ../mdkapplet:97
 #, c-format
 msgid "Your system is up-to-date"
 msgstr ""
 
-#: ../mdkapplet:109
+#: ../mdkapplet:103
 #, fuzzy, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
 "support@mandrivaonline.com"
 msgstr "Problēmu gadījumā sūtiet vēstuli uz support@mandrivaonline.com\n"
 
-#: ../mdkapplet:115
+#: ../mdkapplet:110
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "Lūdzu gaidiet, meklēju pieejamās pakotnes..."
 
-#: ../mdkapplet:121
+#: ../mdkapplet:116
 #, fuzzy, c-format
 msgid "New updates are available for your system"
 msgstr "Jūsu sistēmā nav tīkla adaptera!"
 
-#: ../mdkapplet:127
-#, fuzzy, c-format
-msgid "New bundles are available for your system"
-msgstr "Jūsu sistēmā nav tīkla adaptera!"
-
-#: ../mdkapplet:133
-#, c-format
-msgid "Service is not configured. Please click on \"Configure the service\""
-msgstr ""
-
-#: ../mdkapplet:139
+#: ../mdkapplet:122
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr ""
 
-#: ../mdkapplet:145
+#: ../mdkapplet:128
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr ""
 
-#: ../mdkapplet:151 ../mdkapplet:182
+#: ../mdkapplet:134 ../mdkapplet:165
 #, fuzzy, c-format
 msgid "urpmi database locked"
 msgstr "urpmi datubāze noslēgta"
 
-#: ../mdkapplet:157
+#: ../mdkapplet:140
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
-#: ../mdkapplet:163
+#: ../mdkapplet:146
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
 msgstr ""
 
-#: ../mdkapplet:169
+#: ../mdkapplet:152
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -92,572 +82,131 @@ msgid ""
 "Then, restart \"%s\"."
 msgstr ""
 
-#: ../mdkapplet:174
+#: ../mdkapplet:157
 #, c-format
 msgid "Enabled"
 msgstr "Atļauts"
 
-#: ../mdkapplet:187
+#: ../mdkapplet:170
 #, c-format
 msgid "Error updating media"
 msgstr ""
 
-#: ../mdkapplet:202
+#: ../mdkapplet:185
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr ""
 
-#: ../mdkapplet:207
+#: ../mdkapplet:190
 #, c-format
 msgid "Packages are up to date"
 msgstr ""
 
-#: ../mdkapplet:212
+#: ../mdkapplet:195
 #, fuzzy, c-format
 msgid "Failed to open urpmi database"
 msgstr "Nevar atvērt failu %s\n"
 
-#: ../mdkapplet:217 ../mdkapplet:324
+#: ../mdkapplet:200
 #, fuzzy, c-format
 msgid "Install updates"
 msgstr "Instalēt tēmas"
 
-#: ../mdkapplet:218
-#, fuzzy, c-format
-msgid "Configure the service"
-msgstr "Servisu konfigurēšana"
-
-#: ../mdkapplet:219
+#: ../mdkapplet:201
 #, fuzzy, c-format
 msgid "Check Updates"
 msgstr "Atjaunināt"
 
-#: ../mdkapplet:220 ../mdkapplet:327 ../mdkonline:114 ../mdkonline:155
-#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
-#, c-format
-msgid "Please wait"
-msgstr "Lūdzu uzgaidiet"
-
-#: ../mdkapplet:220 ../mdkapplet:326 ../mdkapplet:327
-#, fuzzy, c-format
-msgid "Check updates"
-msgstr "Drošības atjauninājumi"
-
-#: ../mdkapplet:223 ../mdkapplet:648
-#, c-format
-msgid "Online WebSite"
-msgstr ""
-
-#: ../mdkapplet:224
+#: ../mdkapplet:202
 #, fuzzy, c-format
 msgid "Configure Network"
 msgstr "Tīkla konfigurēšana"
 
-#: ../mdkapplet:225
-#, fuzzy, c-format
-msgid "Configure Now!"
-msgstr "Nolasu konfigurāciju\n"
-
-#: ../mdkapplet:313 ../mdkapplet:392
-#, fuzzy, c-format
-msgid "Mandriva Linux Updates Applet"
-msgstr "Mandriva Linux privātuma politika"
-
-#: ../mdkapplet:322
-#, c-format
-msgid "Actions"
-msgstr "Darbības"
-
-#: ../mdkapplet:325
-#, c-format
-msgid "Configure"
-msgstr "Konfigurēt"
-
-#: ../mdkapplet:329
-#, fuzzy, c-format
-msgid "See logs"
-msgstr "Meklēt +5s"
-
-#: ../mdkapplet:332
-#, c-format
-msgid "Status"
-msgstr "Statuss"
-
-#: ../mdkapplet:336 ../mdkapplet:597
-#, c-format
-msgid "Close"
-msgstr "Aizvērt"
-
-#: ../mdkapplet:365
-#, fuzzy, c-format
-msgid "Network Connection: "
-msgstr "Virtuālā tīkla pieslēgums"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Up"
-msgstr "Uz augšu"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Down"
-msgstr "Uz leju"
-
-#: ../mdkapplet:366
-#, c-format
-msgid "Last check: "
-msgstr ""
-
-#: ../mdkapplet:367 ../mdkonline:145
-#, c-format
-msgid "Machine name:"
-msgstr "Datora nosaukums:"
-
-#: ../mdkapplet:368
-#, fuzzy, c-format
-msgid "Updates: "
-msgstr "Atjaunināt"
-
-#: ../mdkapplet:372
+#: ../mdkapplet:283
 #, fuzzy, c-format
 msgid "Launching drakconnect\n"
 msgstr "Izpildīt userdrake"
 
-#: ../mdkapplet:375
+#: ../mdkapplet:286
 #, c-format
 msgid "Mandriva Online seems to be reinstalled, reloading applet ...."
 msgstr ""
 
-#: ../mdkapplet:383
+#: ../mdkapplet:294
 #, c-format
 msgid "Launching MandrivaUpdate\n"
 msgstr ""
 
-#: ../mdkapplet:398
+#: ../mdkapplet:303
+#, fuzzy, c-format
+msgid "Mandriva Linux Updates Applet"
+msgstr "Mandriva Linux privātuma politika"
+
+#: ../mdkapplet:308
 #, fuzzy, c-format
 msgid "Computing new updates...\n"
 msgstr "Pieslēguma problēma"
 
-#: ../mdkapplet:399
+#: ../mdkapplet:309
 #, fuzzy, c-format
 msgid "Connecting to"
 msgstr "Pieslēguma problēma"
 
-#: ../mdkapplet:467 ../mdkupdate:159 ../mdkupdate:188
-#, c-format
-msgid "An error occurred"
-msgstr "Atklāta kļūda"
-
-#: ../mdkapplet:475
-#, c-format
-msgid "Development release not supported by service"
-msgstr ""
-
-#: ../mdkapplet:476
-#, c-format
-msgid "Too old release not supported by service"
-msgstr ""
-
-#: ../mdkapplet:477
-#, fuzzy, c-format
-msgid "Unknown state"
-msgstr "Nezināms servera vārds"
-
-#: ../mdkapplet:478
-#, c-format
-msgid "Online services disabled. Contact Mandriva Online site\n"
-msgstr ""
-
-#: ../mdkapplet:479
-#, c-format
-msgid "Wrong Password.\n"
-msgstr "Nepareiza parole.\n"
-
-#: ../mdkapplet:480
-#, c-format
-msgid "Wrong Action or host or login.\n"
-msgstr ""
-
-#: ../mdkapplet:481
-#, c-format
-msgid ""
-"Something is wrong with your network settings (check your route, firewall or "
-"proxy settings)\n"
-msgstr ""
-
-#: ../mdkapplet:483
-#, c-format
-msgid ""
-"Problem occured while connecting to the server, please contact the support "
-"team"
-msgstr ""
-
-#: ../mdkapplet:487
-#, fuzzy, c-format
-msgid "Response from Mandriva Online server\n"
-msgstr "Laipni lūdzam Mandriva Online"
-
-#: ../mdkapplet:490
+#: ../mdkapplet:386
 #, fuzzy, c-format
 msgid "System is up-to-date\n"
 msgstr "Sistēmas režīms"
 
-#: ../mdkapplet:527
-#, c-format
-msgid "No check"
-msgstr ""
-
-#: ../mdkapplet:541
-#, c-format
-msgid "Checking config file: Not present\n"
-msgstr ""
-
-#: ../mdkapplet:544
+#: ../mdkapplet:415
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr ""
 
-#: ../mdkapplet:587
+#: ../mdkapplet:457 ../mdkupdate:118 ../mdkupdate:164
 #, c-format
-msgid "Logs"
-msgstr "Žurnāli"
-
-#: ../mdkapplet:603
-#, c-format
-msgid "Clear"
-msgstr "Attīrīt"
+msgid "Warning"
+msgstr "Uzmanību"
 
-#: ../mdkapplet:629
+#: ../mdkapplet:468
 #, c-format
 msgid "About..."
 msgstr "Par..."
 
-#: ../mdkapplet:631
+#: ../mdkapplet:472
 #, fuzzy, c-format
 msgid "Mandriva Online %s"
 msgstr "Mandriva Online"
 
-#: ../mdkapplet:635
+#: ../mdkapplet:473
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr ""
 
-#: ../mdkapplet:647
+#: ../mdkapplet:476
 #, c-format
 msgid "Mandriva Online gives access to Mandriva web services."
 msgstr ""
 
-#: ../mdkapplet:655
-#, c-format
-msgid "Always launch on startup"
-msgstr ""
-
-#: ../mdkapplet:657
-#, c-format
-msgid "Quit"
-msgstr "Iziet"
-
-#: ../mdkonline:58
-#, c-format
-msgid ""
-"mdonline version %s\n"
-"Copyright (C) %s Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"mdonline versija %s\n"
-"Autortiesības (C) %s Mandriva.\n"
-"Šī ir brīva programmatūra, ko var izplatīt saskaņā ar GNU GPL noteikumiem.\n"
-"\n"
-"Pielietojums:\n"
-
-#: ../mdkonline:63 ../mdkupdate:73
-#, c-format
-msgid "  --help\t\t- print this help message.\n"
-msgstr "  --help\t\t- drukāt šo palīdzības tekstu.\n"
-
-#: ../mdkonline:64
-#, c-format
-msgid "  --box=\t\t\t- hostname.\n"
-msgstr ""
-
-#: ../mdkonline:65
-#, c-format
-msgid "  --country\t\t\t- name of country of the user. \n"
-msgstr ""
-
-#: ../mdkonline:66
-#, c-format
-msgid "  --interactive\t\t- use the interactive mode.\n"
-msgstr ""
-
-#: ../mdkonline:67
-#, c-format
-msgid "  --nointeractive\t- use the non-interactive mode.\n"
-msgstr ""
-
-#: ../mdkonline:68
-#, c-format
-msgid "  --login=\t\t     - login name of the user.\n"
-msgstr ""
-
-#: ../mdkonline:69
-#, c-format
-msgid "  --pass=\t\t\t- password  of the user.\n"
-msgstr ""
-
-#: ../mdkonline:87 ../mdkonline:120
-#, c-format
-msgid "Mandriva Online"
-msgstr "Mandriva Online"
-
-#: ../mdkonline:90
-#, c-format
-msgid "I already have an account"
-msgstr ""
-
-#: ../mdkonline:91
-#, c-format
-msgid "I want to subscribe"
-msgstr ""
-
-#: ../mdkonline:96
-#, c-format
-msgid "Mr."
-msgstr ""
-
-#: ../mdkonline:96
-#, fuzzy, c-format
-msgid "Mrs."
-msgstr "Mures"
-
-#: ../mdkonline:96
-#, c-format
-msgid "Ms."
-msgstr ""
-
-#: ../mdkonline:114
-#, c-format
-msgid "Reading configuration\n"
-msgstr "Nolasu konfigurāciju\n"
-
-#: ../mdkonline:123
-#, c-format
-msgid ""
-"This assistant will help you to upload your configuration\n"
-"(packages, hardware configuration) to a centralized database in\n"
-"order to keep you informed about security updates and useful upgrades.\n"
-msgstr ""
-"palīdzēs Jums augšuplādēt jūsu konfigurāciju (pakotnes, dzelžu "
-"konfigurāciju)\n"
-"uz centralizētu datubāzi, šis viss tiek darīts ar mērķi, lai Jūs tiktu\n"
-"informēts par drošības uzlabojumiem un citiem vērtīgiem jaunumiem.\n"
-
-#: ../mdkonline:131
-#, c-format
-msgid "Account creation or authentication"
-msgstr ""
-
-#: ../mdkonline:136
-#, c-format
-msgid "Enter your Mandriva Online login, password and machine name:"
-msgstr ""
-"Ievadiet jūsu Mandriva Online lietotājvārdu, paroli un datora nosaukumu:"
-
-#: ../mdkonline:142 ../mdkonline:195
-#, fuzzy, c-format
-msgid "Email address:"
-msgstr "IP adrese"
-
-#: ../mdkonline:143
-#, c-format
-msgid "Country"
-msgstr "Valsts"
-
-#: ../mdkonline:144 ../mdkonline:196
-#, c-format
-msgid "Password:"
-msgstr "Parole:"
-
-#: ../mdkonline:146
-#, fuzzy, c-format
-msgid "Machine description:"
-msgstr "Datora nosaukums:"
-
-#: ../mdkonline:147
-#, c-format
-msgid "(Ex: My Home Office's Computer)"
-msgstr ""
-
-#: ../mdkonline:152 ../mdkonline:159 ../mdkonline:180 ../mdkonline:204
-#: ../mdkonline:208 ../mdkonline:212 ../mdkonline:217 ../mdkupdate:141
-#: ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
-#, c-format
-msgid "Error"
-msgstr "Kļūda"
-
-#: ../mdkonline:152
-#, c-format
-msgid "Machine name must be 1 to 40 alphanumerical characters"
-msgstr ""
-
-#: ../mdkonline:155
-#, fuzzy, c-format
-msgid "Connecting to Mandriva Online website..."
-msgstr "Laipni lūdzam Mandriva Online"
-
-#: ../mdkonline:167
-#, c-format
-msgid ""
-"In order to benefit from Mandriva Online services,\n"
-"we are about to upload your configuration.\n"
-"\n"
-"The Wizard will now send the following information to Mandriva:\n"
-"\n"
-"1) the list of packages you have installed on your system,\n"
-"\n"
-"2) your hardware configuration.\n"
-"\n"
-"If you feel uncomfortable by that idea, or do not want to benefit from this "
-"service,\n"
-"please press 'Cancel'. By pressing 'Next', you allow us to keep you "
-"informed\n"
-"about security updates and useful upgrades via personalized email alerts.\n"
-"Furthermore, you benefit from discounted paid support services on\n"
-"www.mandrivaexpert.com."
-msgstr ""
-"Lai pilnvērtīgi izmantotu Mandriva Online pakalpojumus,\n"
-"mēs gatavojamies nosūtīt jūsu konfigurāciju.\n"
-"\n"
-"Vednis uz Mandriva tūlīt nosūtīs sekojošu informācijiu:\n"
-"\n"
-"1) jūsu sistēmā instalēto pakotņu sarakstu,\n"
-"\n"
-"2) jūsu dzelžu konfigurāciju.\n"
-"\n"
-"Ja jums tas liekas nepieņemami, vai arī nevēlaties izmantot šo\n"
-"pakalpojumu, spiediet 'Atcelt'. Nospiežot 'Tālāk', jūs dodat\n"
-"atļauju ar personificētu e-pasta vēstuļu palīdzību informēt jūs\n"
-"par drošības jauninājumiem un citiem noderīgiem uzlabojumiem.\n"
-"Bez tam, jūs saņemsit atlaides www.mandrivaexpert.com maksas\n"
-"atbalsta pakalpojumiem."
-
-#: ../mdkonline:180
-#, c-format
-msgid "Connection problem"
-msgstr "Pieslēguma problēma"
-
-#: ../mdkonline:180
-#, c-format
-msgid "Problem occurs when uploading files, please try again"
-msgstr ""
-
-#: ../mdkonline:187
-#, fuzzy, c-format
-msgid "Create a Mandriva Online Account"
-msgstr "Laipni lūdzam Mandriva Online"
-
-#. -PO: that is for things like "Mr", "Ms",...
-#: ../mdkonline:192
-#, fuzzy, c-format
-msgid "Greeting:"
-msgstr "Zaļa"
-
-#: ../mdkonline:193
-#, c-format
-msgid "First name:"
-msgstr "Vārds:"
-
-#: ../mdkonline:194
-#, fuzzy, c-format
-msgid "Last name:"
-msgstr "Vārds:"
-
-#: ../mdkonline:197
-#, c-format
-msgid "Confirm Password:"
-msgstr "Apstiprināt paroli:"
-
-#: ../mdkonline:204
-#, fuzzy, c-format
-msgid ""
-"The passwords do not match\n"
-" Please try again\n"
-msgstr "Paroles nesakrīt"
-
-#: ../mdkonline:208
-#, fuzzy, c-format
-msgid "Please fill in each field"
-msgstr "Lūdzu aizpildiet vai izvēlietis lauku"
-
-#: ../mdkonline:212
-#, fuzzy, c-format
-msgid "Not a valid mail address!\n"
-msgstr "Ievadiet, lūdzu, derīgu adresi!"
-
-#: ../mdkonline:217
-#, c-format
-msgid "Creating account failed!"
-msgstr ""
-
-#: ../mdkonline:225
-#, c-format
-msgid ""
-"Mandriva Online Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
-msgstr ""
-
-#: ../mdkonline:229
-#, c-format
-msgid "Your upload was successful!"
-msgstr "Nosūtīšana bija veiksmīga!"
-
-#: ../mdkonline:229
+#: ../mdkapplet:478
 #, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandriva Online."
+msgid "Online WebSite"
 msgstr ""
-"Tagad pateicoties Mandriva Online jūs saņemsit\n"
-"paziņojumus par drošības un citiem jauninājumiem."
 
-#: ../mdkonline:229
+#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
+#: ../mdkapplet:483
 #, c-format
-msgid ""
-"Mandriva Online offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
+msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
-"Mandriva Online piedāvā iespēju automatizēt jauninājumus.\n"
-"Jūsu sistēma regulāri palaidīs programmu, kas gaidīs jauninājumus\n"
-
-#: ../mdkonline:238
-#, c-format
-msgid "Congratulations"
-msgstr "Apsveicam"
 
-#: ../mdkonline:238
+#: ../mdkapplet:492
 #, c-format
-msgid "Your Mandriva Online account has been successfully configured\n"
+msgid "Always launch on startup"
 msgstr ""
 
-#: ../mdkonline:253
-#, fuzzy, c-format
-msgid "Configuration uploaded successfully"
-msgstr "Nosūtīšana bija veiksmīga!"
-
-#: ../mdkonline:254
-#, fuzzy, c-format
-msgid "Problem uploading configuration"
-msgstr "Nolasu konfigurāciju\n"
-
-#: ../mdkonline:256
+#: ../mdkapplet:494
 #, c-format
-msgid ""
-"Cannot connect to Mandriva Online website: wrong login/password or router/"
-"firewall bad settings"
-msgstr ""
+msgid "Quit"
+msgstr "Iziet"
 
 #: ../mdkonline.pm:207
 #, fuzzy, c-format
@@ -795,6 +344,11 @@ msgstr ""
 "\n"
 "Pielietojums:\n"
 
+#: ../mdkupdate:73
+#, c-format
+msgid "  --help\t\t- print this help message.\n"
+msgstr "  --help\t\t- drukāt šo palīdzības tekstu.\n"
+
 #: ../mdkupdate:74
 #, fuzzy, c-format
 msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
@@ -822,11 +376,6 @@ msgid ""
 "file.\n"
 msgstr ""
 
-#: ../mdkupdate:118 ../mdkupdate:164
-#, c-format
-msgid "Warning"
-msgstr "Uzmanību"
-
 #. -PO: here Live Install is currently *NOT* translated on the desktop, so it's better to keep as it:
 #: ../mdkupdate:120
 #, c-format
@@ -835,11 +384,21 @@ msgid ""
 "Install' wizard."
 msgstr ""
 
+#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
+#, c-format
+msgid "Please wait"
+msgstr "Lūdzu uzgaidiet"
+
 #: ../mdkupdate:123 ../mdkupdate:174
 #, c-format
 msgid "Preparing..."
 msgstr "Sagatavoju..."
 
+#: ../mdkupdate:141 ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
+#, c-format
+msgid "Error"
+msgstr "Kļūda"
+
 #: ../mdkupdate:141
 #, c-format
 msgid ""
@@ -848,6 +407,11 @@ msgid ""
 "%s"
 msgstr ""
 
+#: ../mdkupdate:159 ../mdkupdate:188
+#, c-format
+msgid "An error occurred"
+msgstr "Atklāta kļūda"
+
 #: ../mdkupdate:164
 #, c-format
 msgid ""
@@ -873,6 +437,227 @@ msgid "Unable to update packages from update_source medium.\n"
 msgstr ""
 
 #, fuzzy
+#~ msgid "New bundles are available for your system"
+#~ msgstr "Jūsu sistēmā nav tīkla adaptera!"
+
+#, fuzzy
+#~ msgid "Configure the service"
+#~ msgstr "Servisu konfigurēšana"
+
+#, fuzzy
+#~ msgid "Check updates"
+#~ msgstr "Drošības atjauninājumi"
+
+#, fuzzy
+#~ msgid "Configure Now!"
+#~ msgstr "Nolasu konfigurāciju\n"
+
+#~ msgid "Actions"
+#~ msgstr "Darbības"
+
+#~ msgid "Configure"
+#~ msgstr "Konfigurēt"
+
+#, fuzzy
+#~ msgid "See logs"
+#~ msgstr "Meklēt +5s"
+
+#~ msgid "Status"
+#~ msgstr "Statuss"
+
+#~ msgid "Close"
+#~ msgstr "Aizvērt"
+
+#, fuzzy
+#~ msgid "Network Connection: "
+#~ msgstr "Virtuālā tīkla pieslēgums"
+
+#~ msgid "Up"
+#~ msgstr "Uz augšu"
+
+#~ msgid "Down"
+#~ msgstr "Uz leju"
+
+#~ msgid "Machine name:"
+#~ msgstr "Datora nosaukums:"
+
+#, fuzzy
+#~ msgid "Updates: "
+#~ msgstr "Atjaunināt"
+
+#, fuzzy
+#~ msgid "Unknown state"
+#~ msgstr "Nezināms servera vārds"
+
+#~ msgid "Wrong Password.\n"
+#~ msgstr "Nepareiza parole.\n"
+
+#, fuzzy
+#~ msgid "Response from Mandriva Online server\n"
+#~ msgstr "Laipni lūdzam Mandriva Online"
+
+#~ msgid "Logs"
+#~ msgstr "Žurnāli"
+
+#~ msgid "Clear"
+#~ msgstr "Attīrīt"
+
+#~ msgid ""
+#~ "mdonline version %s\n"
+#~ "Copyright (C) %s Mandriva.\n"
+#~ "This is free software and may be redistributed under the terms of the GNU "
+#~ "GPL.\n"
+#~ "\n"
+#~ "usage:\n"
+#~ msgstr ""
+#~ "mdonline versija %s\n"
+#~ "Autortiesības (C) %s Mandriva.\n"
+#~ "Šī ir brīva programmatūra, ko var izplatīt saskaņā ar GNU GPL "
+#~ "noteikumiem.\n"
+#~ "\n"
+#~ "Pielietojums:\n"
+
+#~ msgid "Mandriva Online"
+#~ msgstr "Mandriva Online"
+
+#, fuzzy
+#~ msgid "Mrs."
+#~ msgstr "Mures"
+
+#~ msgid "Reading configuration\n"
+#~ msgstr "Nolasu konfigurāciju\n"
+
+#~ msgid ""
+#~ "This assistant will help you to upload your configuration\n"
+#~ "(packages, hardware configuration) to a centralized database in\n"
+#~ "order to keep you informed about security updates and useful upgrades.\n"
+#~ msgstr ""
+#~ "palīdzēs Jums augšuplādēt jūsu konfigurāciju (pakotnes, dzelžu "
+#~ "konfigurāciju)\n"
+#~ "uz centralizētu datubāzi, šis viss tiek darīts ar mērķi, lai Jūs tiktu\n"
+#~ "informēts par drošības uzlabojumiem un citiem vērtīgiem jaunumiem.\n"
+
+#~ msgid "Enter your Mandriva Online login, password and machine name:"
+#~ msgstr ""
+#~ "Ievadiet jūsu Mandriva Online lietotājvārdu, paroli un datora nosaukumu:"
+
+#, fuzzy
+#~ msgid "Email address:"
+#~ msgstr "IP adrese"
+
+#~ msgid "Country"
+#~ msgstr "Valsts"
+
+#~ msgid "Password:"
+#~ msgstr "Parole:"
+
+#, fuzzy
+#~ msgid "Machine description:"
+#~ msgstr "Datora nosaukums:"
+
+#, fuzzy
+#~ msgid "Connecting to Mandriva Online website..."
+#~ msgstr "Laipni lūdzam Mandriva Online"
+
+#~ msgid ""
+#~ "In order to benefit from Mandriva Online services,\n"
+#~ "we are about to upload your configuration.\n"
+#~ "\n"
+#~ "The Wizard will now send the following information to Mandriva:\n"
+#~ "\n"
+#~ "1) the list of packages you have installed on your system,\n"
+#~ "\n"
+#~ "2) your hardware configuration.\n"
+#~ "\n"
+#~ "If you feel uncomfortable by that idea, or do not want to benefit from "
+#~ "this service,\n"
+#~ "please press 'Cancel'. By pressing 'Next', you allow us to keep you "
+#~ "informed\n"
+#~ "about security updates and useful upgrades via personalized email "
+#~ "alerts.\n"
+#~ "Furthermore, you benefit from discounted paid support services on\n"
+#~ "www.mandrivaexpert.com."
+#~ msgstr ""
+#~ "Lai pilnvērtīgi izmantotu Mandriva Online pakalpojumus,\n"
+#~ "mēs gatavojamies nosūtīt jūsu konfigurāciju.\n"
+#~ "\n"
+#~ "Vednis uz Mandriva tūlīt nosūtīs sekojošu informācijiu:\n"
+#~ "\n"
+#~ "1) jūsu sistēmā instalēto pakotņu sarakstu,\n"
+#~ "\n"
+#~ "2) jūsu dzelžu konfigurāciju.\n"
+#~ "\n"
+#~ "Ja jums tas liekas nepieņemami, vai arī nevēlaties izmantot šo\n"
+#~ "pakalpojumu, spiediet 'Atcelt'. Nospiežot 'Tālāk', jūs dodat\n"
+#~ "atļauju ar personificētu e-pasta vēstuļu palīdzību informēt jūs\n"
+#~ "par drošības jauninājumiem un citiem noderīgiem uzlabojumiem.\n"
+#~ "Bez tam, jūs saņemsit atlaides www.mandrivaexpert.com maksas\n"
+#~ "atbalsta pakalpojumiem."
+
+#~ msgid "Connection problem"
+#~ msgstr "Pieslēguma problēma"
+
+#, fuzzy
+#~ msgid "Create a Mandriva Online Account"
+#~ msgstr "Laipni lūdzam Mandriva Online"
+
+#, fuzzy
+#~ msgid "Greeting:"
+#~ msgstr "Zaļa"
+
+#~ msgid "First name:"
+#~ msgstr "Vārds:"
+
+#, fuzzy
+#~ msgid "Last name:"
+#~ msgstr "Vārds:"
+
+#~ msgid "Confirm Password:"
+#~ msgstr "Apstiprināt paroli:"
+
+#, fuzzy
+#~ msgid ""
+#~ "The passwords do not match\n"
+#~ " Please try again\n"
+#~ msgstr "Paroles nesakrīt"
+
+#, fuzzy
+#~ msgid "Please fill in each field"
+#~ msgstr "Lūdzu aizpildiet vai izvēlietis lauku"
+
+#, fuzzy
+#~ msgid "Not a valid mail address!\n"
+#~ msgstr "Ievadiet, lūdzu, derīgu adresi!"
+
+#~ msgid "Your upload was successful!"
+#~ msgstr "Nosūtīšana bija veiksmīga!"
+
+#~ msgid ""
+#~ "From now you will receive on security and updates \n"
+#~ "announcements thanks to Mandriva Online."
+#~ msgstr ""
+#~ "Tagad pateicoties Mandriva Online jūs saņemsit\n"
+#~ "paziņojumus par drošības un citiem jauninājumiem."
+
+#~ msgid ""
+#~ "Mandriva Online offers you the ability to automate the updates.\n"
+#~ "A program will run regulary in your system waiting for new updates\n"
+#~ msgstr ""
+#~ "Mandriva Online piedāvā iespēju automatizēt jauninājumus.\n"
+#~ "Jūsu sistēma regulāri palaidīs programmu, kas gaidīs jauninājumus\n"
+
+#~ msgid "Congratulations"
+#~ msgstr "Apsveicam"
+
+#, fuzzy
+#~ msgid "Configuration uploaded successfully"
+#~ msgstr "Nosūtīšana bija veiksmīga!"
+
+#, fuzzy
+#~ msgid "Problem uploading configuration"
+#~ msgstr "Nolasu konfigurāciju\n"
+
+#, fuzzy
 #~ msgid "  --applet\t\t- launch Mandriva Update.\n"
 #~ msgstr "  --update\t\t- izveidot atjaunināšanas datu nesēju.\n"
 
diff --git a/po/mdkonline.pot b/po/mdkonline.pot
index 4425ff70..758342b0 100644
--- a/po/mdkonline.pot
+++ b/po/mdkonline.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2007-08-09 16:26+0200\n"
+"POT-Creation-Date: 2008-02-21 18:21+0100\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,67 +15,57 @@ 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:94
+#: ../mdkapplet:88
 #, c-format
 msgid "Will check updates at %s"
 msgstr ""
 
-#: ../mdkapplet:103
+#: ../mdkapplet:97
 #, c-format
 msgid "Your system is up-to-date"
 msgstr ""
 
-#: ../mdkapplet:109
+#: ../mdkapplet:103
 #, c-format
 msgid "Service configuration problem. Please check logs and send mail to support@mandrivaonline.com"
 msgstr ""
 
-#: ../mdkapplet:115
+#: ../mdkapplet:110
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr ""
 
-#: ../mdkapplet:121
+#: ../mdkapplet:116
 #, c-format
 msgid "New updates are available for your system"
 msgstr ""
 
-#: ../mdkapplet:127
-#, c-format
-msgid "New bundles are available for your system"
-msgstr ""
-
-#: ../mdkapplet:133
-#, c-format
-msgid "Service is not configured. Please click on \"Configure the service\""
-msgstr ""
-
-#: ../mdkapplet:139
+#: ../mdkapplet:122
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr ""
 
-#: ../mdkapplet:145
+#: ../mdkapplet:128
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr ""
 
-#: ../mdkapplet:151 ../mdkapplet:182
+#: ../mdkapplet:134 ../mdkapplet:165
 #, c-format
 msgid "urpmi database locked"
 msgstr ""
 
-#: ../mdkapplet:157
+#: ../mdkapplet:140
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
-#: ../mdkapplet:163
+#: ../mdkapplet:146
 #, c-format
 msgid "No medium found. You must add some media through 'Software Media Manager'."
 msgstr ""
 
-#: ../mdkapplet:169
+#: ../mdkapplet:152
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -86,579 +76,144 @@ msgid ""
 "Then, restart \"%s\"."
 msgstr ""
 
-#: ../mdkapplet:174
+#: ../mdkapplet:157
 #, c-format
 msgid "Enabled"
 msgstr ""
 
-#: ../mdkapplet:187
+#: ../mdkapplet:170
 #, c-format
 msgid "Error updating media"
 msgstr ""
 
-#: ../mdkapplet:202
+#: ../mdkapplet:185
 #, c-format
 msgid ""
 "Checking... Updates are available\n"
 ""
 msgstr ""
 
-#: ../mdkapplet:207
+#: ../mdkapplet:190
 #, c-format
 msgid "Packages are up to date"
 msgstr ""
 
-#: ../mdkapplet:212
+#: ../mdkapplet:195
 #, c-format
 msgid "Failed to open urpmi database"
 msgstr ""
 
-#: ../mdkapplet:217 ../mdkapplet:324
+#: ../mdkapplet:200
 #, c-format
 msgid "Install updates"
 msgstr ""
 
-#: ../mdkapplet:218
-#, c-format
-msgid "Configure the service"
-msgstr ""
-
-#: ../mdkapplet:219
+#: ../mdkapplet:201
 #, c-format
 msgid "Check Updates"
 msgstr ""
 
-#: ../mdkapplet:220 ../mdkapplet:327 ../mdkonline:114 ../mdkonline:155 ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
-#, c-format
-msgid "Please wait"
-msgstr ""
-
-#: ../mdkapplet:220 ../mdkapplet:326 ../mdkapplet:327
-#, c-format
-msgid "Check updates"
-msgstr ""
-
-#: ../mdkapplet:223 ../mdkapplet:648
-#, c-format
-msgid "Online WebSite"
-msgstr ""
-
-#: ../mdkapplet:224
+#: ../mdkapplet:202
 #, c-format
 msgid "Configure Network"
 msgstr ""
 
-#: ../mdkapplet:225
-#, c-format
-msgid "Configure Now!"
-msgstr ""
-
-#: ../mdkapplet:313 ../mdkapplet:392
-#, c-format
-msgid "Mandriva Linux Updates Applet"
-msgstr ""
-
-#: ../mdkapplet:322
-#, c-format
-msgid "Actions"
-msgstr ""
-
-#: ../mdkapplet:325
-#, c-format
-msgid "Configure"
-msgstr ""
-
-#: ../mdkapplet:329
-#, c-format
-msgid "See logs"
-msgstr ""
-
-#: ../mdkapplet:332
-#, c-format
-msgid "Status"
-msgstr ""
-
-#: ../mdkapplet:336 ../mdkapplet:597
-#, c-format
-msgid "Close"
-msgstr ""
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Network Connection: "
-msgstr ""
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Up"
-msgstr ""
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Down"
-msgstr ""
-
-#: ../mdkapplet:366
-#, c-format
-msgid "Last check: "
-msgstr ""
-
-#: ../mdkapplet:367 ../mdkonline:145
-#, c-format
-msgid "Machine name:"
-msgstr ""
-
-#: ../mdkapplet:368
-#, c-format
-msgid "Updates: "
-msgstr ""
-
-#: ../mdkapplet:372
+#: ../mdkapplet:283
 #, c-format
 msgid ""
 "Launching drakconnect\n"
 ""
 msgstr ""
 
-#: ../mdkapplet:375
+#: ../mdkapplet:286
 #, c-format
 msgid "Mandriva Online seems to be reinstalled, reloading applet ...."
 msgstr ""
 
-#: ../mdkapplet:383
+#: ../mdkapplet:294
 #, c-format
 msgid ""
 "Launching MandrivaUpdate\n"
 ""
 msgstr ""
 
-#: ../mdkapplet:398
-#, c-format
-msgid ""
-"Computing new updates...\n"
-""
-msgstr ""
-
-#: ../mdkapplet:399
-#, c-format
-msgid "Connecting to"
-msgstr ""
-
-#: ../mdkapplet:467 ../mdkupdate:159 ../mdkupdate:188
-#, c-format
-msgid "An error occurred"
-msgstr ""
-
-#: ../mdkapplet:475
+#: ../mdkapplet:303
 #, c-format
-msgid "Development release not supported by service"
-msgstr ""
-
-#: ../mdkapplet:476
-#, c-format
-msgid "Too old release not supported by service"
-msgstr ""
-
-#: ../mdkapplet:477
-#, c-format
-msgid "Unknown state"
-msgstr ""
-
-#: ../mdkapplet:478
-#, c-format
-msgid ""
-"Online services disabled. Contact Mandriva Online site\n"
-""
-msgstr ""
-
-#: ../mdkapplet:479
-#, c-format
-msgid ""
-"Wrong Password.\n"
-""
-msgstr ""
-
-#: ../mdkapplet:480
-#, c-format
-msgid ""
-"Wrong Action or host or login.\n"
-""
+msgid "Mandriva Linux Updates Applet"
 msgstr ""
 
-#: ../mdkapplet:481
+#: ../mdkapplet:308
 #, c-format
 msgid ""
-"Something is wrong with your network settings (check your route, firewall or proxy settings)\n"
+"Computing new updates...\n"
 ""
 msgstr ""
 
-#: ../mdkapplet:483
-#, c-format
-msgid "Problem occured while connecting to the server, please contact the support team"
-msgstr ""
-
-#: ../mdkapplet:487
+#: ../mdkapplet:309
 #, c-format
-msgid ""
-"Response from Mandriva Online server\n"
-""
+msgid "Connecting to"
 msgstr ""
 
-#: ../mdkapplet:490
+#: ../mdkapplet:386
 #, c-format
 msgid ""
 "System is up-to-date\n"
 ""
 msgstr ""
 
-#: ../mdkapplet:527
-#, c-format
-msgid "No check"
-msgstr ""
-
-#: ../mdkapplet:541
-#, c-format
-msgid ""
-"Checking config file: Not present\n"
-""
-msgstr ""
-
-#: ../mdkapplet:544
+#: ../mdkapplet:415
 #, c-format
 msgid ""
 "Checking Network: seems disabled\n"
 ""
 msgstr ""
 
-#: ../mdkapplet:587
+#: ../mdkapplet:457 ../mdkupdate:118 ../mdkupdate:164
 #, c-format
-msgid "Logs"
-msgstr ""
-
-#: ../mdkapplet:603
-#, c-format
-msgid "Clear"
+msgid "Warning"
 msgstr ""
 
-#: ../mdkapplet:629
+#: ../mdkapplet:468
 #, c-format
 msgid "About..."
 msgstr ""
 
-#: ../mdkapplet:631
+#: ../mdkapplet:472
 #, c-format
 msgid "Mandriva Online %s"
 msgstr ""
 
-#: ../mdkapplet:635
+#: ../mdkapplet:473
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr ""
 
-#: ../mdkapplet:647
+#: ../mdkapplet:476
 #, c-format
 msgid "Mandriva Online gives access to Mandriva web services."
 msgstr ""
 
-#: ../mdkapplet:655
-#, c-format
-msgid "Always launch on startup"
-msgstr ""
-
-#: ../mdkapplet:657
-#, c-format
-msgid "Quit"
-msgstr ""
-
-#: ../mdkonline:58
-#, c-format
-msgid ""
-"mdonline version %s\n"
-"Copyright (C) %s Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU GPL.\n"
-"\n"
-"usage:\n"
-""
-msgstr ""
-
-#: ../mdkonline:63 ../mdkupdate:73
-#, c-format
-msgid ""
-"  --help\t\t- print this help message.\n"
-""
-msgstr ""
-
-#: ../mdkonline:64
-#, c-format
-msgid ""
-"  --box=\t\t\t- hostname.\n"
-""
-msgstr ""
-
-#: ../mdkonline:65
-#, c-format
-msgid ""
-"  --country\t\t\t- name of country of the user. \n"
-""
-msgstr ""
-
-#: ../mdkonline:66
-#, c-format
-msgid ""
-"  --interactive\t\t- use the interactive mode.\n"
-""
-msgstr ""
-
-#: ../mdkonline:67
-#, c-format
-msgid ""
-"  --nointeractive\t- use the non-interactive mode.\n"
-""
-msgstr ""
-
-#: ../mdkonline:68
-#, c-format
-msgid ""
-"  --login=\t\t     - login name of the user.\n"
-""
-msgstr ""
-
-#: ../mdkonline:69
-#, c-format
-msgid ""
-"  --pass=\t\t\t- password  of the user.\n"
-""
-msgstr ""
-
-#: ../mdkonline:87 ../mdkonline:120
-#, c-format
-msgid "Mandriva Online"
-msgstr ""
-
-#: ../mdkonline:90
-#, c-format
-msgid "I already have an account"
-msgstr ""
-
-#: ../mdkonline:91
-#, c-format
-msgid "I want to subscribe"
-msgstr ""
-
-#: ../mdkonline:96
-#, c-format
-msgid "Mr."
-msgstr ""
-
-#: ../mdkonline:96
-#, c-format
-msgid "Mrs."
-msgstr ""
-
-#: ../mdkonline:96
-#, c-format
-msgid "Ms."
-msgstr ""
-
-#: ../mdkonline:114
-#, c-format
-msgid ""
-"Reading configuration\n"
-""
-msgstr ""
-
-#: ../mdkonline:123
-#, c-format
-msgid ""
-"This assistant will help you to upload your configuration\n"
-"(packages, hardware configuration) to a centralized database in\n"
-"order to keep you informed about security updates and useful upgrades.\n"
-""
-msgstr ""
-
-#: ../mdkonline:131
-#, c-format
-msgid "Account creation or authentication"
-msgstr ""
-
-#: ../mdkonline:136
-#, c-format
-msgid "Enter your Mandriva Online login, password and machine name:"
-msgstr ""
-
-#: ../mdkonline:142 ../mdkonline:195
-#, c-format
-msgid "Email address:"
-msgstr ""
-
-#: ../mdkonline:143
-#, c-format
-msgid "Country"
-msgstr ""
-
-#: ../mdkonline:144 ../mdkonline:196
-#, c-format
-msgid "Password:"
-msgstr ""
-
-#: ../mdkonline:146
-#, c-format
-msgid "Machine description:"
-msgstr ""
-
-#: ../mdkonline:147
-#, c-format
-msgid "(Ex: My Home Office's Computer)"
-msgstr ""
-
-#: ../mdkonline:152 ../mdkonline:159 ../mdkonline:180 ../mdkonline:204 ../mdkonline:208 ../mdkonline:212 ../mdkonline:217 ../mdkupdate:141 ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
-#, c-format
-msgid "Error"
-msgstr ""
-
-#: ../mdkonline:152
-#, c-format
-msgid "Machine name must be 1 to 40 alphanumerical characters"
-msgstr ""
-
-#: ../mdkonline:155
-#, c-format
-msgid "Connecting to Mandriva Online website..."
-msgstr ""
-
-#: ../mdkonline:167
-#, c-format
-msgid ""
-"In order to benefit from Mandriva Online services,\n"
-"we are about to upload your configuration.\n"
-"\n"
-"The Wizard will now send the following information to Mandriva:\n"
-"\n"
-"1) the list of packages you have installed on your system,\n"
-"\n"
-"2) your hardware configuration.\n"
-"\n"
-"If you feel uncomfortable by that idea, or do not want to benefit from this service,\n"
-"please press 'Cancel'. By pressing 'Next', you allow us to keep you informed\n"
-"about security updates and useful upgrades via personalized email alerts.\n"
-"Furthermore, you benefit from discounted paid support services on\n"
-"www.mandrivaexpert.com."
-msgstr ""
-
-#: ../mdkonline:180
-#, c-format
-msgid "Connection problem"
-msgstr ""
-
-#: ../mdkonline:180
-#, c-format
-msgid "Problem occurs when uploading files, please try again"
-msgstr ""
-
-#: ../mdkonline:187
-#, c-format
-msgid "Create a Mandriva Online Account"
-msgstr ""
-
-#. -PO: that is for things like "Mr", "Ms",...
-#: ../mdkonline:192
-#, c-format
-msgid "Greeting:"
-msgstr ""
-
-#: ../mdkonline:193
-#, c-format
-msgid "First name:"
-msgstr ""
-
-#: ../mdkonline:194
-#, c-format
-msgid "Last name:"
-msgstr ""
-
-#: ../mdkonline:197
-#, c-format
-msgid "Confirm Password:"
-msgstr ""
-
-#: ../mdkonline:204
-#, c-format
-msgid ""
-"The passwords do not match\n"
-" Please try again\n"
-""
-msgstr ""
-
-#: ../mdkonline:208
-#, c-format
-msgid "Please fill in each field"
-msgstr ""
-
-#: ../mdkonline:212
-#, c-format
-msgid ""
-"Not a valid mail address!\n"
-""
-msgstr ""
-
-#: ../mdkonline:217
-#, c-format
-msgid "Creating account failed!"
-msgstr ""
-
-#: ../mdkonline:225
-#, c-format
-msgid ""
-"Mandriva Online Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
-""
-msgstr ""
-
-#: ../mdkonline:229
-#, c-format
-msgid "Your upload was successful!"
-msgstr ""
-
-#: ../mdkonline:229
-#, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandriva Online."
-msgstr ""
-
-#: ../mdkonline:229
-#, c-format
-msgid ""
-"Mandriva Online offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
-""
-msgstr ""
-
-#: ../mdkonline:238
+#: ../mdkapplet:478
 #, c-format
-msgid "Congratulations"
+msgid "Online WebSite"
 msgstr ""
 
-#: ../mdkonline:238
+#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
+#: ../mdkapplet:483
 #, c-format
 msgid ""
-"Your Mandriva Online account has been successfully configured\n"
+"_: Translator(s) name(s) & email(s)\n"
 ""
 msgstr ""
 
-#: ../mdkonline:253
-#, c-format
-msgid "Configuration uploaded successfully"
-msgstr ""
-
-#: ../mdkonline:254
+#: ../mdkapplet:492
 #, c-format
-msgid "Problem uploading configuration"
+msgid "Always launch on startup"
 msgstr ""
 
-#: ../mdkonline:256
+#: ../mdkapplet:494
 #, c-format
-msgid "Cannot connect to Mandriva Online website: wrong login/password or router/firewall bad settings"
+msgid "Quit"
 msgstr ""
 
 #: ../mdkonline.pm:207
@@ -793,6 +348,13 @@ msgid ""
 ""
 msgstr ""
 
+#: ../mdkupdate:73
+#, c-format
+msgid ""
+"  --help\t\t- print this help message.\n"
+""
+msgstr ""
+
 #: ../mdkupdate:74
 #, c-format
 msgid ""
@@ -828,22 +390,27 @@ msgid ""
 ""
 msgstr ""
 
-#: ../mdkupdate:118 ../mdkupdate:164
-#, c-format
-msgid "Warning"
-msgstr ""
-
 #. -PO: here Live Install is currently *NOT* translated on the desktop, so it's better to keep as it:
 #: ../mdkupdate:120
 #, c-format
 msgid "You first need to install the system on your harddrive with the 'Live Install' wizard."
 msgstr ""
 
+#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
+#, c-format
+msgid "Please wait"
+msgstr ""
+
 #: ../mdkupdate:123 ../mdkupdate:174
 #, c-format
 msgid "Preparing..."
 msgstr ""
 
+#: ../mdkupdate:141 ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
+#, c-format
+msgid "Error"
+msgstr ""
+
 #: ../mdkupdate:141
 #, c-format
 msgid ""
@@ -852,6 +419,11 @@ msgid ""
 "%s"
 msgstr ""
 
+#: ../mdkupdate:159 ../mdkupdate:188
+#, c-format
+msgid "An error occurred"
+msgstr ""
+
 #: ../mdkupdate:164
 #, c-format
 msgid ""
diff --git a/po/mk.po b/po/mk.po
index 555863e2..959a695d 100644
--- a/po/mk.po
+++ b/po/mk.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline-mk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-09 16:26+0200\n"
+"POT-Creation-Date: 2008-02-21 18:21+0100\n"
 "PO-Revision-Date: 2006-09-17 20:55-0700\n"
 "Last-Translator: Zoran Dimovski <zoki.dimovski@gmail.com>\n"
 "Language-Team: Macedonian\n"
@@ -19,17 +19,17 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural= n==1 || n%10==1 ? 0 : 1\n"
 
 #. -PO: here %s will be replaced by the local time (eg: "Will check updates at 14:03:50"
-#: ../mdkapplet:94
+#: ../mdkapplet:88
 #, fuzzy, c-format
 msgid "Will check updates at %s"
 msgstr "Провери за ажурирање"
 
-#: ../mdkapplet:103
+#: ../mdkapplet:97
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "Вашиот систем е ажуриран"
 
-#: ../mdkapplet:109
+#: ../mdkapplet:103
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -38,56 +38,44 @@ msgstr ""
 "Проблем при конфигурирање на сервисот. Ве молиме проверете ги логовите и "
 "испратете пошта на  support@mandrivaonline.com"
 
-#: ../mdkapplet:115
+#: ../mdkapplet:110
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "Почекајте, пронаоѓање на достапните пакети..."
 
-#: ../mdkapplet:121
+#: ../mdkapplet:116
 #, c-format
 msgid "New updates are available for your system"
 msgstr "Достапни се нови ажурирања за вашиот систем"
 
-#: ../mdkapplet:127
-#, c-format
-msgid "New bundles are available for your system"
-msgstr "Достапен е нов пакет со апликации за вашиот систем"
-
-#: ../mdkapplet:133
-#, c-format
-msgid "Service is not configured. Please click on \"Configure the service\""
-msgstr ""
-"Сервисот не е конфигуриран. Ве молиме притиснете на \"конфигурај го сервисот"
-"\""
-
-#: ../mdkapplet:139
+#: ../mdkapplet:122
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "Мрежата не работи. Ве молиме конфигурирајте ја вашата мрежа"
 
-#: ../mdkapplet:145
+#: ../mdkapplet:128
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "Сервисот не е вклучен. Ве молиме притиснете на \"Онлајн Веб сајт\""
 
-#: ../mdkapplet:151 ../mdkapplet:182
+#: ../mdkapplet:134 ../mdkapplet:165
 #, fuzzy, c-format
 msgid "urpmi database locked"
 msgstr "базата на податоци на urpmi е заклучена"
 
-#: ../mdkapplet:157
+#: ../mdkapplet:140
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 "Верзијата не е подржана (премногу стара верзија или верзија во развоја фаза)"
 
-#: ../mdkapplet:163
+#: ../mdkapplet:146
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
 msgstr ""
 
-#: ../mdkapplet:169
+#: ../mdkapplet:152
 #, fuzzy, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -104,586 +92,133 @@ msgstr ""
 "\n"
 "Потоа, рестатувајте го %s."
 
-#: ../mdkapplet:174
+#: ../mdkapplet:157
 #, c-format
 msgid "Enabled"
 msgstr "Овозможено"
 
-#: ../mdkapplet:187
+#: ../mdkapplet:170
 #, c-format
 msgid "Error updating media"
 msgstr ""
 
-#: ../mdkapplet:202
+#: ../mdkapplet:185
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr "Проверувам... Пакетите за ажурирање се достапни\n"
 
-#: ../mdkapplet:207
+#: ../mdkapplet:190
 #, c-format
 msgid "Packages are up to date"
 msgstr ""
 
-#: ../mdkapplet:212
+#: ../mdkapplet:195
 #, fuzzy, c-format
 msgid "Failed to open urpmi database"
 msgstr "не можам да отворам rpmdb"
 
-#: ../mdkapplet:217 ../mdkapplet:324
+#: ../mdkapplet:200
 #, c-format
 msgid "Install updates"
 msgstr "Инсталирај надоградувања"
 
-#: ../mdkapplet:218
-#, c-format
-msgid "Configure the service"
-msgstr "Конфигурирај го сервисот"
-
-#: ../mdkapplet:219
+#: ../mdkapplet:201
 #, c-format
 msgid "Check Updates"
 msgstr "Провери за ажурирање"
 
-#: ../mdkapplet:220 ../mdkapplet:327 ../mdkonline:114 ../mdkonline:155
-#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
-#, c-format
-msgid "Please wait"
-msgstr "Ве молиме, почекајте"
-
-#: ../mdkapplet:220 ../mdkapplet:326 ../mdkapplet:327
-#, c-format
-msgid "Check updates"
-msgstr "Провери за ажурирање"
-
-#: ../mdkapplet:223 ../mdkapplet:648
-#, c-format
-msgid "Online WebSite"
-msgstr "Онлајн Веб сајт"
-
-#: ../mdkapplet:224
+#: ../mdkapplet:202
 #, c-format
 msgid "Configure Network"
 msgstr "Конфигурирај мрежа"
 
-#: ../mdkapplet:225
-#, c-format
-msgid "Configure Now!"
-msgstr "Конфигурирај Веднаш!"
-
-#: ../mdkapplet:313 ../mdkapplet:392
-#, c-format
-msgid "Mandriva Linux Updates Applet"
-msgstr "Аплет за ажурирање на Mandriva Linux"
-
-#: ../mdkapplet:322
-#, c-format
-msgid "Actions"
-msgstr "Акции"
-
-#: ../mdkapplet:325
-#, c-format
-msgid "Configure"
-msgstr "Конфигурирај"
-
-#: ../mdkapplet:329
-#, c-format
-msgid "See logs"
-msgstr "Види логови"
-
-#: ../mdkapplet:332
-#, c-format
-msgid "Status"
-msgstr "Статус"
-
-#: ../mdkapplet:336 ../mdkapplet:597
-#, c-format
-msgid "Close"
-msgstr "Затвори"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Network Connection: "
-msgstr "Мрежна конекција: "
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Up"
-msgstr "Горе"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Down"
-msgstr "Долу"
-
-#: ../mdkapplet:366
-#, c-format
-msgid "Last check: "
-msgstr "Последна проверка: "
-
-#: ../mdkapplet:367 ../mdkonline:145
-#, c-format
-msgid "Machine name:"
-msgstr "Име на машината:"
-
-#: ../mdkapplet:368
-#, c-format
-msgid "Updates: "
-msgstr "Ажурирања: "
-
-#: ../mdkapplet:372
+#: ../mdkapplet:283
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Вклучувам drakconnect\n"
 
-#: ../mdkapplet:375
+#: ../mdkapplet:286
 #, c-format
 msgid "Mandriva Online seems to be reinstalled, reloading applet ...."
 msgstr ""
 "Изгледа дека Mandriva Online е повторно инсталиран, го превчитувам "
 "аплетот ...."
 
-#: ../mdkapplet:383
+#: ../mdkapplet:294
 #, c-format
 msgid "Launching MandrivaUpdate\n"
 msgstr "Вклучувам MandrivaUpdate\n"
 
-#: ../mdkapplet:398
+#: ../mdkapplet:303
+#, c-format
+msgid "Mandriva Linux Updates Applet"
+msgstr "Аплет за ажурирање на Mandriva Linux"
+
+#: ../mdkapplet:308
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Ги пресметувам новите ажурирања...\n"
 
-#: ../mdkapplet:399
+#: ../mdkapplet:309
 #, c-format
 msgid "Connecting to"
 msgstr "Се поврзувам со"
 
-#: ../mdkapplet:467 ../mdkupdate:159 ../mdkupdate:188
-#, c-format
-msgid "An error occurred"
-msgstr "Се случи грешка"
-
-#: ../mdkapplet:475
-#, c-format
-msgid "Development release not supported by service"
-msgstr "Верзија во развојна фаза, не е подржана од сервисот"
-
-#: ../mdkapplet:476
-#, c-format
-msgid "Too old release not supported by service"
-msgstr "Премногу стара верзија, не е подржана од сервисот"
-
-#: ../mdkapplet:477
-#, c-format
-msgid "Unknown state"
-msgstr "Непозната држава"
-
-#: ../mdkapplet:478
-#, c-format
-msgid "Online services disabled. Contact Mandriva Online site\n"
-msgstr ""
-"Онлајн сервисите се оневозможени. Контактирајте со сајтот Mandriva Online\n"
-
-#: ../mdkapplet:479
-#, c-format
-msgid "Wrong Password.\n"
-msgstr "Погрешна лозинка.\n"
-
-#: ../mdkapplet:480
-#, c-format
-msgid "Wrong Action or host or login.\n"
-msgstr "Погрешна акција или компјутер или логирање.\n"
-
-#: ../mdkapplet:481
-#, c-format
-msgid ""
-"Something is wrong with your network settings (check your route, firewall or "
-"proxy settings)\n"
-msgstr ""
-"Нешто не е во ред со вашите мрежни подесувања (проверете го вашиот route, "
-"firewall или прокси подесувањата)\n"
-
-#: ../mdkapplet:483
-#, c-format
-msgid ""
-"Problem occured while connecting to the server, please contact the support "
-"team"
-msgstr ""
-"Се појави проблем при поврзување со серверот. Ве молиме контактирајте со "
-"тимот за поддршка"
-
-#: ../mdkapplet:487
-#, c-format
-msgid "Response from Mandriva Online server\n"
-msgstr "Одговор од серверот на Mandriva Online\n"
-
-#: ../mdkapplet:490
+#: ../mdkapplet:386
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Системот е ажуриран\n"
 
-#: ../mdkapplet:527
-#, c-format
-msgid "No check"
-msgstr "Без проверка"
-
-#: ../mdkapplet:541
-#, c-format
-msgid "Checking config file: Not present\n"
-msgstr "Проверувам конфигурациона датотека: Не е достапна\n"
-
-#: ../mdkapplet:544
+#: ../mdkapplet:415
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Проверувам мрежа: изгледа е оневозможена\n"
 
-#: ../mdkapplet:587
-#, c-format
-msgid "Logs"
-msgstr "Логови"
-
-#: ../mdkapplet:603
+#: ../mdkapplet:457 ../mdkupdate:118 ../mdkupdate:164
 #, c-format
-msgid "Clear"
-msgstr "Исчисти"
+msgid "Warning"
+msgstr "Внимание"
 
-#: ../mdkapplet:629
+#: ../mdkapplet:468
 #, c-format
 msgid "About..."
 msgstr "За..."
 
-#: ../mdkapplet:631
+#: ../mdkapplet:472
 #, c-format
 msgid "Mandriva Online %s"
 msgstr "Mandriva Online %s"
 
-#: ../mdkapplet:635
+#: ../mdkapplet:473
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Авторски права (C) %s од „Mandriva“"
 
-#: ../mdkapplet:647
+#: ../mdkapplet:476
 #, c-format
 msgid "Mandriva Online gives access to Mandriva web services."
 msgstr "„Mandriva Online“ дава пристап до веб сервисите на „Mandriva“."
 
-#: ../mdkapplet:655
-#, c-format
-msgid "Always launch on startup"
-msgstr "Секогаш вклучувај при подигнување"
-
-#: ../mdkapplet:657
-#, c-format
-msgid "Quit"
-msgstr "Напушти"
-
-#: ../mdkonline:58
-#, c-format
-msgid ""
-"mdonline version %s\n"
-"Copyright (C) %s Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"mdonline верзија %s\n"
-"Авторски права (C) %s Mandriva.\n"
-"Ова е бесплатен софтвер и може да се редистрибуира под условите на GNU GPL.\n"
-"\n"
-"употреба:\n"
-
-#: ../mdkonline:63 ../mdkupdate:73
-#, c-format
-msgid "  --help\t\t- print this help message.\n"
-msgstr "  --help\t\t- ја печати оваа помошна порака.\n"
-
-#: ../mdkonline:64
-#, c-format
-msgid "  --box=\t\t\t- hostname.\n"
-msgstr "  --box=\t\t\t- имеНаХостот.\n"
-
-#: ../mdkonline:65
-#, c-format
-msgid "  --country\t\t\t- name of country of the user. \n"
-msgstr "  --country\t\t\t- име на државата на корисникот. \n"
-
-#: ../mdkonline:66
-#, c-format
-msgid "  --interactive\t\t- use the interactive mode.\n"
-msgstr "  --interactive\t\t- користи интерактивен режим.\n"
-
-#: ../mdkonline:67
-#, c-format
-msgid "  --nointeractive\t- use the non-interactive mode.\n"
-msgstr "  --nointeractive\t- користи не-интерактивен режим.\n"
-
-#: ../mdkonline:68
-#, c-format
-msgid "  --login=\t\t     - login name of the user.\n"
-msgstr "  --login=\t\t     - име за најавување на корисникот.\n"
-
-#: ../mdkonline:69
-#, c-format
-msgid "  --pass=\t\t\t- password  of the user.\n"
-msgstr "  --pass=\t\t\t- лозинка на корисникот.\n"
-
-#: ../mdkonline:87 ../mdkonline:120
-#, c-format
-msgid "Mandriva Online"
-msgstr "„Mandriva Online“"
-
-#: ../mdkonline:90
-#, c-format
-msgid "I already have an account"
-msgstr "Веќе имам сметка"
-
-#: ../mdkonline:91
-#, c-format
-msgid "I want to subscribe"
-msgstr "Сакам да се зачленам"
-
-#: ../mdkonline:96
-#, c-format
-msgid "Mr."
-msgstr "г-дин"
-
-#: ../mdkonline:96
-#, c-format
-msgid "Mrs."
-msgstr "Г-ѓа"
-
-#: ../mdkonline:96
-#, c-format
-msgid "Ms."
-msgstr "Г-ца"
-
-#: ../mdkonline:114
-#, c-format
-msgid "Reading configuration\n"
-msgstr "Читам конфигурација\n"
-
-#: ../mdkonline:123
-#, c-format
-msgid ""
-"This assistant will help you to upload your configuration\n"
-"(packages, hardware configuration) to a centralized database in\n"
-"order to keep you informed about security updates and useful upgrades.\n"
-msgstr ""
-"Овој асистент ќе ви помогне да ја пратите вашата конфигурација\n"
-"(пакети, хардверска конфигурација) во централизирана база на податоци\n"
-"за да ве известува за сигурносни ажурирања и корисни надоградувања.\n"
-
-#: ../mdkonline:131
-#, c-format
-msgid "Account creation or authentication"
-msgstr "Создавање на сметка или автентикација"
-
-#: ../mdkonline:136
-#, c-format
-msgid "Enter your Mandriva Online login, password and machine name:"
-msgstr "Внесете го вашиот Mandriva Online логин, лозинка и име на машината:"
-
-#: ../mdkonline:142 ../mdkonline:195
-#, c-format
-msgid "Email address:"
-msgstr "Адреса на е-пошта:"
-
-#: ../mdkonline:143
-#, c-format
-msgid "Country"
-msgstr "Држава"
-
-#: ../mdkonline:144 ../mdkonline:196
-#, c-format
-msgid "Password:"
-msgstr "Лозинка:"
-
-#: ../mdkonline:146
-#, c-format
-msgid "Machine description:"
-msgstr "Опис на машината:"
-
-#: ../mdkonline:147
-#, c-format
-msgid "(Ex: My Home Office's Computer)"
-msgstr "(Пр: Компјутер за мојата домашна канцеларија)"
-
-#: ../mdkonline:152 ../mdkonline:159 ../mdkonline:180 ../mdkonline:204
-#: ../mdkonline:208 ../mdkonline:212 ../mdkonline:217 ../mdkupdate:141
-#: ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
-#, c-format
-msgid "Error"
-msgstr "Грешка"
-
-#: ../mdkonline:152
-#, c-format
-msgid "Machine name must be 1 to 40 alphanumerical characters"
-msgstr "Името на машината море да има од 1-40 алфанумерички карактери"
-
-#: ../mdkonline:155
-#, c-format
-msgid "Connecting to Mandriva Online website..."
-msgstr "Се поврзувам на веб страницата Mandriva Online..."
-
-#: ../mdkonline:167
-#, c-format
-msgid ""
-"In order to benefit from Mandriva Online services,\n"
-"we are about to upload your configuration.\n"
-"\n"
-"The Wizard will now send the following information to Mandriva:\n"
-"\n"
-"1) the list of packages you have installed on your system,\n"
-"\n"
-"2) your hardware configuration.\n"
-"\n"
-"If you feel uncomfortable by that idea, or do not want to benefit from this "
-"service,\n"
-"please press 'Cancel'. By pressing 'Next', you allow us to keep you "
-"informed\n"
-"about security updates and useful upgrades via personalized email alerts.\n"
-"Furthermore, you benefit from discounted paid support services on\n"
-"www.mandrivaexpert.com."
-msgstr ""
-"За да придобивате од сервисите на Mandriva Online,\n"
-"сега ќе ја пратиме вашата конфигурација.\n"
-"\n"
-"Волшебникот сега ќе ги испрати следниве информации на Mandriva:\n"
-"\n"
-"1) листа на пакетите кои се инсталирани на вашиот систем,\n"
-"\n"
-"2) вашата хардверска конфигурација.\n"
-"\n"
-"Ако се чествувате неудобно од оваа идеја, или не сакате да придобиете од "
-"овој сервис,\n"
-"ве молиме притиснете 'Откажи'. Со притискање на 'Следно', ни дозволувате "
-"постојано да ве известуваме\n"
-"за сигурносни ажурирања и корисни надоградувања преку персонализирани email "
-"пораки.\n"
-"Дури и придобивате од сервисите за подршка со намалена наплата на\n"
-"www.mandrivaexpert.com."
-
-#: ../mdkonline:180
-#, c-format
-msgid "Connection problem"
-msgstr "Проблем со конекцијата"
-
-#: ../mdkonline:180
-#, c-format
-msgid "Problem occurs when uploading files, please try again"
-msgstr "Проблем при испраќање на датотеките, ве молиме обидете се повторно"
-
-#: ../mdkonline:187
-#, c-format
-msgid "Create a Mandriva Online Account"
-msgstr "Создади Mandriva Online сметка"
-
-#. -PO: that is for things like "Mr", "Ms",...
-#: ../mdkonline:192
-#, c-format
-msgid "Greeting:"
-msgstr "Поздрав:"
-
-#: ../mdkonline:193
-#, c-format
-msgid "First name:"
-msgstr "Име:"
-
-#: ../mdkonline:194
-#, c-format
-msgid "Last name:"
-msgstr "Презиме:"
-
-#: ../mdkonline:197
-#, c-format
-msgid "Confirm Password:"
-msgstr "Потврди ја лозинката:"
-
-#: ../mdkonline:204
-#, c-format
-msgid ""
-"The passwords do not match\n"
-" Please try again\n"
-msgstr ""
-"Лозинките не се совпаѓаат\n"
-" Ве молиме обидете се повторно\n"
-
-#: ../mdkonline:208
-#, c-format
-msgid "Please fill in each field"
-msgstr "Ве молиме пополнете ги сите полиња"
-
-#: ../mdkonline:212
-#, c-format
-msgid "Not a valid mail address!\n"
-msgstr "Невалидна email адреса!\n"
-
-#: ../mdkonline:217
-#, c-format
-msgid "Creating account failed!"
-msgstr "Неуспешно создавање на сметка!"
-
-#: ../mdkonline:225
-#, c-format
-msgid ""
-"Mandriva Online Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
-msgstr ""
-"„Mandriva Online“ сметката е успешно креирана.\n"
-"Ве молиме притиснете „Следно“ за автентикација и испраќање на вашата "
-"конфигурација\n"
-
-#: ../mdkonline:229
-#, c-format
-msgid "Your upload was successful!"
-msgstr "Вашето испраќање е успешно!"
-
-#: ../mdkonline:229
+#: ../mdkapplet:478
 #, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandriva Online."
-msgstr ""
-"Од сега па понатаму ќе добивате известувања за \n"
-"сигурност и ажурирања, благодарение на „Mandriva Online“."
+msgid "Online WebSite"
+msgstr "Онлајн Веб сајт"
 
-#: ../mdkonline:229
+#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
+#: ../mdkapplet:483
 #, c-format
-msgid ""
-"Mandriva Online offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
+msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
-"„Mandriva Online“ ви ја нуди способноста за автоматско ажурирање.\n"
-"Програмата ќе работи регуларно на вашиот систем чекајќи за нови ажирирања\n"
-
-#: ../mdkonline:238
-#, c-format
-msgid "Congratulations"
-msgstr "Честитки"
 
-#: ../mdkonline:238
+#: ../mdkapplet:492
 #, c-format
-msgid "Your Mandriva Online account has been successfully configured\n"
-msgstr "Вашата „Mandriva Online“ сметка успешно е конфигуирана\n"
-
-#: ../mdkonline:253
-#, c-format
-msgid "Configuration uploaded successfully"
-msgstr "Конфигурацијата е успешно испратена"
-
-#: ../mdkonline:254
-#, c-format
-msgid "Problem uploading configuration"
-msgstr "Проблем при праќање на конфигурацијата"
+msgid "Always launch on startup"
+msgstr "Секогаш вклучувај при подигнување"
 
-#: ../mdkonline:256
+#: ../mdkapplet:494
 #, c-format
-msgid ""
-"Cannot connect to Mandriva Online website: wrong login/password or router/"
-"firewall bad settings"
-msgstr ""
-"Не можам да се поврзам на веб страницата на „Mandriva Online“: погрешна "
-"најава/лозинка или лоши поставувања на рутерот/огнениот ѕид"
+msgid "Quit"
+msgstr "Напушти"
 
 #: ../mdkonline.pm:207
 #, c-format
@@ -831,6 +366,11 @@ msgstr ""
 "\n"
 "употреба:\n"
 
+#: ../mdkupdate:73
+#, c-format
+msgid "  --help\t\t- print this help message.\n"
+msgstr "  --help\t\t- ја печати оваа помошна порака.\n"
+
 #: ../mdkupdate:74
 #, c-format
 msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
@@ -860,11 +400,6 @@ msgstr ""
 "  --bundle datoteka.bundle\t- анализира и инсталира пакет од мета "
 "информациите на „.bundle“ датотека.\n"
 
-#: ../mdkupdate:118 ../mdkupdate:164
-#, c-format
-msgid "Warning"
-msgstr "Внимание"
-
 #. -PO: here Live Install is currently *NOT* translated on the desktop, so it's better to keep as it:
 #: ../mdkupdate:120
 #, c-format
@@ -875,11 +410,21 @@ msgstr ""
 "Најпрво треба да го инсталирате системот на вашиот хард диск преку "
 "волшебникот „Live Install“."
 
+#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
+#, c-format
+msgid "Please wait"
+msgstr "Ве молиме, почекајте"
+
 #: ../mdkupdate:123 ../mdkupdate:174
 #, c-format
 msgid "Preparing..."
 msgstr "Се подготвувам..."
 
+#: ../mdkupdate:141 ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
+#, c-format
+msgid "Error"
+msgstr "Грешка"
+
 #: ../mdkupdate:141
 #, c-format
 msgid ""
@@ -891,6 +436,11 @@ msgstr ""
 "\n"
 "%s"
 
+#: ../mdkupdate:159 ../mdkupdate:188
+#, c-format
+msgid "An error occurred"
+msgstr "Се случи грешка"
+
 #: ../mdkupdate:164
 #, c-format
 msgid ""
@@ -919,6 +469,314 @@ msgstr "Инсталирање на пакетите...\n"
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "Не можам да ги ажурирам пакетите од медиумот update_source.\n"
 
+#~ msgid "New bundles are available for your system"
+#~ msgstr "Достапен е нов пакет со апликации за вашиот систем"
+
+#~ msgid "Service is not configured. Please click on \"Configure the service\""
+#~ msgstr ""
+#~ "Сервисот не е конфигуриран. Ве молиме притиснете на \"конфигурај го "
+#~ "сервисот\""
+
+#~ msgid "Configure the service"
+#~ msgstr "Конфигурирај го сервисот"
+
+#~ msgid "Check updates"
+#~ msgstr "Провери за ажурирање"
+
+#~ msgid "Configure Now!"
+#~ msgstr "Конфигурирај Веднаш!"
+
+#~ msgid "Actions"
+#~ msgstr "Акции"
+
+#~ msgid "Configure"
+#~ msgstr "Конфигурирај"
+
+#~ msgid "See logs"
+#~ msgstr "Види логови"
+
+#~ msgid "Status"
+#~ msgstr "Статус"
+
+#~ msgid "Close"
+#~ msgstr "Затвори"
+
+#~ msgid "Network Connection: "
+#~ msgstr "Мрежна конекција: "
+
+#~ msgid "Up"
+#~ msgstr "Горе"
+
+#~ msgid "Down"
+#~ msgstr "Долу"
+
+#~ msgid "Last check: "
+#~ msgstr "Последна проверка: "
+
+#~ msgid "Machine name:"
+#~ msgstr "Име на машината:"
+
+#~ msgid "Updates: "
+#~ msgstr "Ажурирања: "
+
+#~ msgid "Development release not supported by service"
+#~ msgstr "Верзија во развојна фаза, не е подржана од сервисот"
+
+#~ msgid "Too old release not supported by service"
+#~ msgstr "Премногу стара верзија, не е подржана од сервисот"
+
+#~ msgid "Unknown state"
+#~ msgstr "Непозната држава"
+
+#~ msgid "Online services disabled. Contact Mandriva Online site\n"
+#~ msgstr ""
+#~ "Онлајн сервисите се оневозможени. Контактирајте со сајтот Mandriva "
+#~ "Online\n"
+
+#~ msgid "Wrong Password.\n"
+#~ msgstr "Погрешна лозинка.\n"
+
+#~ msgid "Wrong Action or host or login.\n"
+#~ msgstr "Погрешна акција или компјутер или логирање.\n"
+
+#~ msgid ""
+#~ "Something is wrong with your network settings (check your route, firewall "
+#~ "or proxy settings)\n"
+#~ msgstr ""
+#~ "Нешто не е во ред со вашите мрежни подесувања (проверете го вашиот route, "
+#~ "firewall или прокси подесувањата)\n"
+
+#~ msgid ""
+#~ "Problem occured while connecting to the server, please contact the "
+#~ "support team"
+#~ msgstr ""
+#~ "Се појави проблем при поврзување со серверот. Ве молиме контактирајте со "
+#~ "тимот за поддршка"
+
+#~ msgid "Response from Mandriva Online server\n"
+#~ msgstr "Одговор од серверот на Mandriva Online\n"
+
+#~ msgid "No check"
+#~ msgstr "Без проверка"
+
+#~ msgid "Checking config file: Not present\n"
+#~ msgstr "Проверувам конфигурациона датотека: Не е достапна\n"
+
+#~ msgid "Logs"
+#~ msgstr "Логови"
+
+#~ msgid "Clear"
+#~ msgstr "Исчисти"
+
+#~ msgid ""
+#~ "mdonline version %s\n"
+#~ "Copyright (C) %s Mandriva.\n"
+#~ "This is free software and may be redistributed under the terms of the GNU "
+#~ "GPL.\n"
+#~ "\n"
+#~ "usage:\n"
+#~ msgstr ""
+#~ "mdonline верзија %s\n"
+#~ "Авторски права (C) %s Mandriva.\n"
+#~ "Ова е бесплатен софтвер и може да се редистрибуира под условите на GNU "
+#~ "GPL.\n"
+#~ "\n"
+#~ "употреба:\n"
+
+#~ msgid "  --box=\t\t\t- hostname.\n"
+#~ msgstr "  --box=\t\t\t- имеНаХостот.\n"
+
+#~ msgid "  --country\t\t\t- name of country of the user. \n"
+#~ msgstr "  --country\t\t\t- име на државата на корисникот. \n"
+
+#~ msgid "  --interactive\t\t- use the interactive mode.\n"
+#~ msgstr "  --interactive\t\t- користи интерактивен режим.\n"
+
+#~ msgid "  --nointeractive\t- use the non-interactive mode.\n"
+#~ msgstr "  --nointeractive\t- користи не-интерактивен режим.\n"
+
+#~ msgid "  --login=\t\t     - login name of the user.\n"
+#~ msgstr "  --login=\t\t     - име за најавување на корисникот.\n"
+
+#~ msgid "  --pass=\t\t\t- password  of the user.\n"
+#~ msgstr "  --pass=\t\t\t- лозинка на корисникот.\n"
+
+#~ msgid "Mandriva Online"
+#~ msgstr "„Mandriva Online“"
+
+#~ msgid "I already have an account"
+#~ msgstr "Веќе имам сметка"
+
+#~ msgid "I want to subscribe"
+#~ msgstr "Сакам да се зачленам"
+
+#~ msgid "Mr."
+#~ msgstr "г-дин"
+
+#~ msgid "Mrs."
+#~ msgstr "Г-ѓа"
+
+#~ msgid "Ms."
+#~ msgstr "Г-ца"
+
+#~ msgid "Reading configuration\n"
+#~ msgstr "Читам конфигурација\n"
+
+#~ msgid ""
+#~ "This assistant will help you to upload your configuration\n"
+#~ "(packages, hardware configuration) to a centralized database in\n"
+#~ "order to keep you informed about security updates and useful upgrades.\n"
+#~ msgstr ""
+#~ "Овој асистент ќе ви помогне да ја пратите вашата конфигурација\n"
+#~ "(пакети, хардверска конфигурација) во централизирана база на податоци\n"
+#~ "за да ве известува за сигурносни ажурирања и корисни надоградувања.\n"
+
+#~ msgid "Account creation or authentication"
+#~ msgstr "Создавање на сметка или автентикација"
+
+#~ msgid "Enter your Mandriva Online login, password and machine name:"
+#~ msgstr "Внесете го вашиот Mandriva Online логин, лозинка и име на машината:"
+
+#~ msgid "Email address:"
+#~ msgstr "Адреса на е-пошта:"
+
+#~ msgid "Country"
+#~ msgstr "Држава"
+
+#~ msgid "Password:"
+#~ msgstr "Лозинка:"
+
+#~ msgid "Machine description:"
+#~ msgstr "Опис на машината:"
+
+#~ msgid "(Ex: My Home Office's Computer)"
+#~ msgstr "(Пр: Компјутер за мојата домашна канцеларија)"
+
+#~ msgid "Machine name must be 1 to 40 alphanumerical characters"
+#~ msgstr "Името на машината море да има од 1-40 алфанумерички карактери"
+
+#~ msgid "Connecting to Mandriva Online website..."
+#~ msgstr "Се поврзувам на веб страницата Mandriva Online..."
+
+#~ msgid ""
+#~ "In order to benefit from Mandriva Online services,\n"
+#~ "we are about to upload your configuration.\n"
+#~ "\n"
+#~ "The Wizard will now send the following information to Mandriva:\n"
+#~ "\n"
+#~ "1) the list of packages you have installed on your system,\n"
+#~ "\n"
+#~ "2) your hardware configuration.\n"
+#~ "\n"
+#~ "If you feel uncomfortable by that idea, or do not want to benefit from "
+#~ "this service,\n"
+#~ "please press 'Cancel'. By pressing 'Next', you allow us to keep you "
+#~ "informed\n"
+#~ "about security updates and useful upgrades via personalized email "
+#~ "alerts.\n"
+#~ "Furthermore, you benefit from discounted paid support services on\n"
+#~ "www.mandrivaexpert.com."
+#~ msgstr ""
+#~ "За да придобивате од сервисите на Mandriva Online,\n"
+#~ "сега ќе ја пратиме вашата конфигурација.\n"
+#~ "\n"
+#~ "Волшебникот сега ќе ги испрати следниве информации на Mandriva:\n"
+#~ "\n"
+#~ "1) листа на пакетите кои се инсталирани на вашиот систем,\n"
+#~ "\n"
+#~ "2) вашата хардверска конфигурација.\n"
+#~ "\n"
+#~ "Ако се чествувате неудобно од оваа идеја, или не сакате да придобиете од "
+#~ "овој сервис,\n"
+#~ "ве молиме притиснете 'Откажи'. Со притискање на 'Следно', ни дозволувате "
+#~ "постојано да ве известуваме\n"
+#~ "за сигурносни ажурирања и корисни надоградувања преку персонализирани "
+#~ "email пораки.\n"
+#~ "Дури и придобивате од сервисите за подршка со намалена наплата на\n"
+#~ "www.mandrivaexpert.com."
+
+#~ msgid "Connection problem"
+#~ msgstr "Проблем со конекцијата"
+
+#~ msgid "Problem occurs when uploading files, please try again"
+#~ msgstr "Проблем при испраќање на датотеките, ве молиме обидете се повторно"
+
+#~ msgid "Create a Mandriva Online Account"
+#~ msgstr "Создади Mandriva Online сметка"
+
+#~ msgid "Greeting:"
+#~ msgstr "Поздрав:"
+
+#~ msgid "First name:"
+#~ msgstr "Име:"
+
+#~ msgid "Last name:"
+#~ msgstr "Презиме:"
+
+#~ msgid "Confirm Password:"
+#~ msgstr "Потврди ја лозинката:"
+
+#~ msgid ""
+#~ "The passwords do not match\n"
+#~ " Please try again\n"
+#~ msgstr ""
+#~ "Лозинките не се совпаѓаат\n"
+#~ " Ве молиме обидете се повторно\n"
+
+#~ msgid "Please fill in each field"
+#~ msgstr "Ве молиме пополнете ги сите полиња"
+
+#~ msgid "Not a valid mail address!\n"
+#~ msgstr "Невалидна email адреса!\n"
+
+#~ msgid "Creating account failed!"
+#~ msgstr "Неуспешно создавање на сметка!"
+
+#~ msgid ""
+#~ "Mandriva Online Account successfully created.\n"
+#~ "Please click \"Next\" to authenticate and upload your configuration\n"
+#~ msgstr ""
+#~ "„Mandriva Online“ сметката е успешно креирана.\n"
+#~ "Ве молиме притиснете „Следно“ за автентикација и испраќање на вашата "
+#~ "конфигурација\n"
+
+#~ msgid "Your upload was successful!"
+#~ msgstr "Вашето испраќање е успешно!"
+
+#~ msgid ""
+#~ "From now you will receive on security and updates \n"
+#~ "announcements thanks to Mandriva Online."
+#~ msgstr ""
+#~ "Од сега па понатаму ќе добивате известувања за \n"
+#~ "сигурност и ажурирања, благодарение на „Mandriva Online“."
+
+#~ msgid ""
+#~ "Mandriva Online offers you the ability to automate the updates.\n"
+#~ "A program will run regulary in your system waiting for new updates\n"
+#~ msgstr ""
+#~ "„Mandriva Online“ ви ја нуди способноста за автоматско ажурирање.\n"
+#~ "Програмата ќе работи регуларно на вашиот систем чекајќи за нови "
+#~ "ажирирања\n"
+
+#~ msgid "Congratulations"
+#~ msgstr "Честитки"
+
+#~ msgid "Your Mandriva Online account has been successfully configured\n"
+#~ msgstr "Вашата „Mandriva Online“ сметка успешно е конфигуирана\n"
+
+#~ msgid "Configuration uploaded successfully"
+#~ msgstr "Конфигурацијата е успешно испратена"
+
+#~ msgid "Problem uploading configuration"
+#~ msgstr "Проблем при праќање на конфигурацијата"
+
+#~ msgid ""
+#~ "Cannot connect to Mandriva Online website: wrong login/password or router/"
+#~ "firewall bad settings"
+#~ msgstr ""
+#~ "Не можам да се поврзам на веб страницата на „Mandriva Online“: погрешна "
+#~ "најава/лозинка или лоши поставувања на рутерот/огнениот ѕид"
+
 #~ msgid "  --applet\t\t- launch Mandriva Update.\n"
 #~ msgstr "  --applet\t\t- Вклучување на Mandriva Update.\n"
 
diff --git a/po/mn.po b/po/mn.po
index 64a44a98..77de236e 100644
--- a/po/mn.po
+++ b/po/mn.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-09 16:26+0200\n"
+"POT-Creation-Date: 2008-02-21 18:21+0100\n"
 "PO-Revision-Date: 2003-02-21 00:17+0100\n"
 "Last-Translator: Sanlig Badral <badral@chinggis.com>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
@@ -17,70 +17,60 @@ 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:94
+#: ../mdkapplet:88
 #, c-format
 msgid "Will check updates at %s"
 msgstr ""
 
-#: ../mdkapplet:103
+#: ../mdkapplet:97
 #, c-format
 msgid "Your system is up-to-date"
 msgstr ""
 
-#: ../mdkapplet:109
+#: ../mdkapplet:103
 #, fuzzy, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
 "support@mandrivaonline.com"
 msgstr "Та гарсан асуудлаа support@mandrivaonline.com рүү илгээнэ үү\n"
 
-#: ../mdkapplet:115
+#: ../mdkapplet:110
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr ""
 
-#: ../mdkapplet:121
+#: ../mdkapplet:116
 #, c-format
 msgid "New updates are available for your system"
 msgstr ""
 
-#: ../mdkapplet:127
-#, c-format
-msgid "New bundles are available for your system"
-msgstr ""
-
-#: ../mdkapplet:133
-#, c-format
-msgid "Service is not configured. Please click on \"Configure the service\""
-msgstr ""
-
-#: ../mdkapplet:139
+#: ../mdkapplet:122
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr ""
 
-#: ../mdkapplet:145
+#: ../mdkapplet:128
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr ""
 
-#: ../mdkapplet:151 ../mdkapplet:182
+#: ../mdkapplet:134 ../mdkapplet:165
 #, c-format
 msgid "urpmi database locked"
 msgstr ""
 
-#: ../mdkapplet:157
+#: ../mdkapplet:140
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
-#: ../mdkapplet:163
+#: ../mdkapplet:146
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
 msgstr ""
 
-#: ../mdkapplet:169
+#: ../mdkapplet:152
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -91,551 +81,131 @@ msgid ""
 "Then, restart \"%s\"."
 msgstr ""
 
-#: ../mdkapplet:174
+#: ../mdkapplet:157
 #, c-format
 msgid "Enabled"
 msgstr "Нээлттэй"
 
-#: ../mdkapplet:187
+#: ../mdkapplet:170
 #, c-format
 msgid "Error updating media"
 msgstr ""
 
-#: ../mdkapplet:202
+#: ../mdkapplet:185
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr ""
 
-#: ../mdkapplet:207
+#: ../mdkapplet:190
 #, c-format
 msgid "Packages are up to date"
 msgstr ""
 
-#: ../mdkapplet:212
+#: ../mdkapplet:195
 #, fuzzy, c-format
 msgid "Failed to open urpmi database"
 msgstr "rpmdb-г нээж болсонгүй"
 
-#: ../mdkapplet:217 ../mdkapplet:324
+#: ../mdkapplet:200
 #, c-format
 msgid "Install updates"
 msgstr ""
 
-#: ../mdkapplet:218
-#, c-format
-msgid "Configure the service"
-msgstr ""
-
-#: ../mdkapplet:219
+#: ../mdkapplet:201
 #, c-format
 msgid "Check Updates"
 msgstr ""
 
-#: ../mdkapplet:220 ../mdkapplet:327 ../mdkonline:114 ../mdkonline:155
-#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
-#, c-format
-msgid "Please wait"
-msgstr ""
-
-#: ../mdkapplet:220 ../mdkapplet:326 ../mdkapplet:327
-#, c-format
-msgid "Check updates"
-msgstr ""
-
-#: ../mdkapplet:223 ../mdkapplet:648
-#, c-format
-msgid "Online WebSite"
-msgstr ""
-
-#: ../mdkapplet:224
+#: ../mdkapplet:202
 #, fuzzy, c-format
 msgid "Configure Network"
 msgstr "Тохируулах"
 
-#: ../mdkapplet:225
-#, c-format
-msgid "Configure Now!"
-msgstr ""
-
-#: ../mdkapplet:313 ../mdkapplet:392
-#, c-format
-msgid "Mandriva Linux Updates Applet"
-msgstr ""
-
-#: ../mdkapplet:322
-#, c-format
-msgid "Actions"
-msgstr "Үйлдлүүл"
-
-#: ../mdkapplet:325
-#, c-format
-msgid "Configure"
-msgstr "Тохируулах"
-
-#: ../mdkapplet:329
-#, c-format
-msgid "See logs"
-msgstr ""
-
-#: ../mdkapplet:332
-#, c-format
-msgid "Status"
-msgstr "Төлөв"
-
-#: ../mdkapplet:336 ../mdkapplet:597
-#, c-format
-msgid "Close"
-msgstr "Хаах"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Network Connection: "
-msgstr ""
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Up"
-msgstr "Дээш"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Down"
-msgstr "Доош"
-
-#: ../mdkapplet:366
-#, c-format
-msgid "Last check: "
-msgstr ""
-
-#: ../mdkapplet:367 ../mdkonline:145
-#, c-format
-msgid "Machine name:"
-msgstr ""
-
-#: ../mdkapplet:368
-#, c-format
-msgid "Updates: "
-msgstr ""
-
-#: ../mdkapplet:372
+#: ../mdkapplet:283
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr ""
 
-#: ../mdkapplet:375
+#: ../mdkapplet:286
 #, c-format
 msgid "Mandriva Online seems to be reinstalled, reloading applet ...."
 msgstr ""
 
-#: ../mdkapplet:383
+#: ../mdkapplet:294
 #, c-format
 msgid "Launching MandrivaUpdate\n"
 msgstr ""
 
-#: ../mdkapplet:398
+#: ../mdkapplet:303
 #, c-format
-msgid "Computing new updates...\n"
-msgstr ""
-
-#: ../mdkapplet:399
-#, fuzzy, c-format
-msgid "Connecting to"
-msgstr "Холболтын асуудлууд"
-
-#: ../mdkapplet:467 ../mdkupdate:159 ../mdkupdate:188
-#, c-format
-msgid "An error occurred"
-msgstr ""
-
-#: ../mdkapplet:475
-#, c-format
-msgid "Development release not supported by service"
-msgstr ""
-
-#: ../mdkapplet:476
-#, c-format
-msgid "Too old release not supported by service"
+msgid "Mandriva Linux Updates Applet"
 msgstr ""
 
-#: ../mdkapplet:477
+#: ../mdkapplet:308
 #, c-format
-msgid "Unknown state"
-msgstr ""
-
-#: ../mdkapplet:478
-#, c-format
-msgid "Online services disabled. Contact Mandriva Online site\n"
+msgid "Computing new updates...\n"
 msgstr ""
 
-#: ../mdkapplet:479
+#: ../mdkapplet:309
 #, fuzzy, c-format
-msgid "Wrong Password.\n"
-msgstr "Нууц үг:"
-
-#: ../mdkapplet:480
-#, c-format
-msgid "Wrong Action or host or login.\n"
-msgstr ""
-
-#: ../mdkapplet:481
-#, c-format
-msgid ""
-"Something is wrong with your network settings (check your route, firewall or "
-"proxy settings)\n"
-msgstr ""
-
-#: ../mdkapplet:483
-#, c-format
-msgid ""
-"Problem occured while connecting to the server, please contact the support "
-"team"
-msgstr ""
-
-#: ../mdkapplet:487
-#, c-format
-msgid "Response from Mandriva Online server\n"
-msgstr ""
+msgid "Connecting to"
+msgstr "Холболтын асуудлууд"
 
-#: ../mdkapplet:490
+#: ../mdkapplet:386
 #, c-format
 msgid "System is up-to-date\n"
 msgstr ""
 
-#: ../mdkapplet:527
-#, c-format
-msgid "No check"
-msgstr ""
-
-#: ../mdkapplet:541
-#, c-format
-msgid "Checking config file: Not present\n"
-msgstr ""
-
-#: ../mdkapplet:544
+#: ../mdkapplet:415
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr ""
 
-#: ../mdkapplet:587
-#, fuzzy, c-format
-msgid "Logs"
-msgstr "Нэвтрэх нэр:"
-
-#: ../mdkapplet:603
+#: ../mdkapplet:457 ../mdkupdate:118 ../mdkupdate:164
 #, c-format
-msgid "Clear"
-msgstr "Цэвэрлэх"
+msgid "Warning"
+msgstr "Анхааруулга"
 
-#: ../mdkapplet:629
+#: ../mdkapplet:468
 #, c-format
 msgid "About..."
 msgstr "Тухай..."
 
-#: ../mdkapplet:631
+#: ../mdkapplet:472
 #, c-format
 msgid "Mandriva Online %s"
 msgstr ""
 
-#: ../mdkapplet:635
+#: ../mdkapplet:473
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr ""
 
-#: ../mdkapplet:647
+#: ../mdkapplet:476
 #, c-format
 msgid "Mandriva Online gives access to Mandriva web services."
 msgstr ""
 
-#: ../mdkapplet:655
-#, c-format
-msgid "Always launch on startup"
-msgstr ""
-
-#: ../mdkapplet:657
-#, c-format
-msgid "Quit"
-msgstr "Гарах"
-
-#: ../mdkonline:58
-#, c-format
-msgid ""
-"mdonline version %s\n"
-"Copyright (C) %s Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"mdonline Version %s\n"
-"Copyright ® %s Mandriva.\n"
-"Энэ бол чөлөөт программ хангамж ба GNU GPL лицензын дагуу цааш \n"
-"тарааж болно.\n"
-"\n"
-"Ашиглалт: \n"
-
-#: ../mdkonline:63 ../mdkupdate:73
-#, c-format
-msgid "  --help\t\t- print this help message.\n"
-msgstr "  --help\t\t- Энэ тусламжийг хэвлэх.\n"
-
-#: ../mdkonline:64
-#, c-format
-msgid "  --box=\t\t\t- hostname.\n"
-msgstr ""
-
-#: ../mdkonline:65
-#, c-format
-msgid "  --country\t\t\t- name of country of the user. \n"
-msgstr ""
-
-#: ../mdkonline:66
-#, c-format
-msgid "  --interactive\t\t- use the interactive mode.\n"
-msgstr ""
-
-#: ../mdkonline:67
-#, c-format
-msgid "  --nointeractive\t- use the non-interactive mode.\n"
-msgstr ""
-
-#: ../mdkonline:68
-#, c-format
-msgid "  --login=\t\t     - login name of the user.\n"
-msgstr ""
-
-#: ../mdkonline:69
-#, c-format
-msgid "  --pass=\t\t\t- password  of the user.\n"
-msgstr ""
-
-#: ../mdkonline:87 ../mdkonline:120
-#, c-format
-msgid "Mandriva Online"
-msgstr ""
-
-#: ../mdkonline:90
-#, c-format
-msgid "I already have an account"
-msgstr ""
-
-#: ../mdkonline:91
-#, c-format
-msgid "I want to subscribe"
-msgstr ""
-
-#: ../mdkonline:96
-#, c-format
-msgid "Mr."
-msgstr "Ноён"
-
-#: ../mdkonline:96
-#, c-format
-msgid "Mrs."
-msgstr "Хатагтай"
-
-#: ../mdkonline:96
-#, c-format
-msgid "Ms."
-msgstr "Хатагтай"
-
-#: ../mdkonline:114
-#, c-format
-msgid "Reading configuration\n"
-msgstr ""
-
-#: ../mdkonline:123
-#, c-format
-msgid ""
-"This assistant will help you to upload your configuration\n"
-"(packages, hardware configuration) to a centralized database in\n"
-"order to keep you informed about security updates and useful upgrades.\n"
-msgstr ""
-
-#: ../mdkonline:131
-#, c-format
-msgid "Account creation or authentication"
-msgstr ""
-
-#: ../mdkonline:136
-#, c-format
-msgid "Enter your Mandriva Online login, password and machine name:"
-msgstr ""
-
-#: ../mdkonline:142 ../mdkonline:195
-#, fuzzy, c-format
-msgid "Email address:"
-msgstr "IP хаяг"
-
-#: ../mdkonline:143
-#, c-format
-msgid "Country"
-msgstr "Хөдөөний"
-
-#: ../mdkonline:144 ../mdkonline:196
-#, c-format
-msgid "Password:"
-msgstr "Нууц үг:"
-
-#: ../mdkonline:146
-#, c-format
-msgid "Machine description:"
-msgstr ""
-
-#: ../mdkonline:147
-#, c-format
-msgid "(Ex: My Home Office's Computer)"
-msgstr ""
-
-#: ../mdkonline:152 ../mdkonline:159 ../mdkonline:180 ../mdkonline:204
-#: ../mdkonline:208 ../mdkonline:212 ../mdkonline:217 ../mdkupdate:141
-#: ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
-#, c-format
-msgid "Error"
-msgstr "Алдаа"
-
-#: ../mdkonline:152
-#, c-format
-msgid "Machine name must be 1 to 40 alphanumerical characters"
-msgstr ""
-
-#: ../mdkonline:155
-#, c-format
-msgid "Connecting to Mandriva Online website..."
-msgstr ""
-
-#: ../mdkonline:167
-#, c-format
-msgid ""
-"In order to benefit from Mandriva Online services,\n"
-"we are about to upload your configuration.\n"
-"\n"
-"The Wizard will now send the following information to Mandriva:\n"
-"\n"
-"1) the list of packages you have installed on your system,\n"
-"\n"
-"2) your hardware configuration.\n"
-"\n"
-"If you feel uncomfortable by that idea, or do not want to benefit from this "
-"service,\n"
-"please press 'Cancel'. By pressing 'Next', you allow us to keep you "
-"informed\n"
-"about security updates and useful upgrades via personalized email alerts.\n"
-"Furthermore, you benefit from discounted paid support services on\n"
-"www.mandrivaexpert.com."
-msgstr ""
-
-#: ../mdkonline:180
-#, c-format
-msgid "Connection problem"
-msgstr "Холболтын асуудлууд"
-
-#: ../mdkonline:180
-#, c-format
-msgid "Problem occurs when uploading files, please try again"
-msgstr ""
-
-#: ../mdkonline:187
-#, c-format
-msgid "Create a Mandriva Online Account"
-msgstr ""
-
-#. -PO: that is for things like "Mr", "Ms",...
-#: ../mdkonline:192
-#, fuzzy, c-format
-msgid "Greeting:"
-msgstr "Ногоон"
-
-#: ../mdkonline:193
-#, fuzzy, c-format
-msgid "First name:"
-msgstr "Хостын нэр:"
-
-#: ../mdkonline:194
-#, fuzzy, c-format
-msgid "Last name:"
-msgstr "Хостын нэр:"
-
-#: ../mdkonline:197
-#, c-format
-msgid "Confirm Password:"
-msgstr "Нууц үгээ бататгах:"
-
-#: ../mdkonline:204
-#, c-format
-msgid ""
-"The passwords do not match\n"
-" Please try again\n"
-msgstr ""
-"Нууц үг таарахгүй байна\n"
-" Дахин оролдож үзнэ үү\n"
-
-#: ../mdkonline:208
-#, c-format
-msgid "Please fill in each field"
-msgstr ""
-
-#: ../mdkonline:212
-#, c-format
-msgid "Not a valid mail address!\n"
-msgstr "Зөв биш э-шуудангийн хаяг! \n"
-
-#: ../mdkonline:217
-#, c-format
-msgid "Creating account failed!"
-msgstr ""
-
-#: ../mdkonline:225
-#, c-format
-msgid ""
-"Mandriva Online Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
-msgstr ""
-
-#: ../mdkonline:229
-#, c-format
-msgid "Your upload was successful!"
-msgstr ""
-
-#: ../mdkonline:229
-#, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandriva Online."
-msgstr ""
-
-#: ../mdkonline:229
-#, c-format
-msgid ""
-"Mandriva Online offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
-msgstr ""
-
-#: ../mdkonline:238
-#, fuzzy, c-format
-msgid "Congratulations"
-msgstr "Баяр хүргэе!"
-
-#: ../mdkonline:238
+#: ../mdkapplet:478
 #, c-format
-msgid "Your Mandriva Online account has been successfully configured\n"
+msgid "Online WebSite"
 msgstr ""
 
-#: ../mdkonline:253
+#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
+#: ../mdkapplet:483
 #, c-format
-msgid "Configuration uploaded successfully"
+msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
 
-#: ../mdkonline:254
+#: ../mdkapplet:492
 #, c-format
-msgid "Problem uploading configuration"
+msgid "Always launch on startup"
 msgstr ""
 
-#: ../mdkonline:256
+#: ../mdkapplet:494
 #, c-format
-msgid ""
-"Cannot connect to Mandriva Online website: wrong login/password or router/"
-"firewall bad settings"
-msgstr ""
+msgid "Quit"
+msgstr "Гарах"
 
 #: ../mdkonline.pm:207
 #, fuzzy, c-format
@@ -776,6 +346,11 @@ msgstr ""
 "\n"
 "Ашиглалт: \n"
 
+#: ../mdkupdate:73
+#, c-format
+msgid "  --help\t\t- print this help message.\n"
+msgstr "  --help\t\t- Энэ тусламжийг хэвлэх.\n"
+
 #: ../mdkupdate:74
 #, fuzzy, c-format
 msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
@@ -803,11 +378,6 @@ msgid ""
 "file.\n"
 msgstr ""
 
-#: ../mdkupdate:118 ../mdkupdate:164
-#, c-format
-msgid "Warning"
-msgstr "Анхааруулга"
-
 #. -PO: here Live Install is currently *NOT* translated on the desktop, so it's better to keep as it:
 #: ../mdkupdate:120
 #, c-format
@@ -816,11 +386,21 @@ msgid ""
 "Install' wizard."
 msgstr ""
 
+#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
+#, c-format
+msgid "Please wait"
+msgstr ""
+
 #: ../mdkupdate:123 ../mdkupdate:174
 #, c-format
 msgid "Preparing..."
 msgstr "Бэлдэж байна..."
 
+#: ../mdkupdate:141 ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
+#, c-format
+msgid "Error"
+msgstr "Алдаа"
+
 #: ../mdkupdate:141
 #, c-format
 msgid ""
@@ -829,6 +409,11 @@ msgid ""
 "%s"
 msgstr ""
 
+#: ../mdkupdate:159 ../mdkupdate:188
+#, c-format
+msgid "An error occurred"
+msgstr ""
+
 #: ../mdkupdate:164
 #, c-format
 msgid ""
@@ -853,6 +438,101 @@ msgstr "%s багцыг суулгаж байна...\n"
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "„update_source“ хэрэгслээс багцуудыг шинэчилэхэд алдаа.\n"
 
+#~ msgid "Actions"
+#~ msgstr "Үйлдлүүл"
+
+#~ msgid "Configure"
+#~ msgstr "Тохируулах"
+
+#~ msgid "Status"
+#~ msgstr "Төлөв"
+
+#~ msgid "Close"
+#~ msgstr "Хаах"
+
+#~ msgid "Up"
+#~ msgstr "Дээш"
+
+#~ msgid "Down"
+#~ msgstr "Доош"
+
+#, fuzzy
+#~ msgid "Wrong Password.\n"
+#~ msgstr "Нууц үг:"
+
+#, fuzzy
+#~ msgid "Logs"
+#~ msgstr "Нэвтрэх нэр:"
+
+#~ msgid "Clear"
+#~ msgstr "Цэвэрлэх"
+
+#~ msgid ""
+#~ "mdonline version %s\n"
+#~ "Copyright (C) %s Mandriva.\n"
+#~ "This is free software and may be redistributed under the terms of the GNU "
+#~ "GPL.\n"
+#~ "\n"
+#~ "usage:\n"
+#~ msgstr ""
+#~ "mdonline Version %s\n"
+#~ "Copyright ® %s Mandriva.\n"
+#~ "Энэ бол чөлөөт программ хангамж ба GNU GPL лицензын дагуу цааш \n"
+#~ "тарааж болно.\n"
+#~ "\n"
+#~ "Ашиглалт: \n"
+
+#~ msgid "Mr."
+#~ msgstr "Ноён"
+
+#~ msgid "Mrs."
+#~ msgstr "Хатагтай"
+
+#~ msgid "Ms."
+#~ msgstr "Хатагтай"
+
+#, fuzzy
+#~ msgid "Email address:"
+#~ msgstr "IP хаяг"
+
+#~ msgid "Country"
+#~ msgstr "Хөдөөний"
+
+#~ msgid "Password:"
+#~ msgstr "Нууц үг:"
+
+#~ msgid "Connection problem"
+#~ msgstr "Холболтын асуудлууд"
+
+#, fuzzy
+#~ msgid "Greeting:"
+#~ msgstr "Ногоон"
+
+#, fuzzy
+#~ msgid "First name:"
+#~ msgstr "Хостын нэр:"
+
+#, fuzzy
+#~ msgid "Last name:"
+#~ msgstr "Хостын нэр:"
+
+#~ msgid "Confirm Password:"
+#~ msgstr "Нууц үгээ бататгах:"
+
+#~ msgid ""
+#~ "The passwords do not match\n"
+#~ " Please try again\n"
+#~ msgstr ""
+#~ "Нууц үг таарахгүй байна\n"
+#~ " Дахин оролдож үзнэ үү\n"
+
+#~ msgid "Not a valid mail address!\n"
+#~ msgstr "Зөв биш э-шуудангийн хаяг! \n"
+
+#, fuzzy
+#~ msgid "Congratulations"
+#~ msgstr "Баяр хүргэе!"
+
 #, fuzzy
 #~ msgid "  --applet\t\t- launch Mandriva Update.\n"
 #~ msgstr "  --applet\t\t- Бүх мэдээллийг шинэчлэх.\n"
diff --git a/po/ms.po b/po/ms.po
index cf2c6eb7..a8d52ca0 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-09 16:26+0200\n"
+"POT-Creation-Date: 2008-02-21 18:21+0100\n"
 "PO-Revision-Date: 2005-11-26 15:20+0800\n"
 "Last-Translator: Sharuzzaman Ahmat Raslan <sharuzzaman@myrealbox.com>\n"
 "Language-Team: Malay <translation-team-ms@lists.sourceforge.net>\n"
@@ -16,17 +16,17 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. -PO: here %s will be replaced by the local time (eg: "Will check updates at 14:03:50"
-#: ../mdkapplet:94
+#: ../mdkapplet:88
 #, fuzzy, c-format
 msgid "Will check updates at %s"
 msgstr "Periksa kemaskini"
 
-#: ../mdkapplet:103
+#: ../mdkapplet:97
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "Sistem anda telah dikemaskini"
 
-#: ../mdkapplet:109
+#: ../mdkapplet:103
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -35,54 +35,44 @@ msgstr ""
 "Masalah tetapan servis. Sila periksa log dan hantar mel ke "
 "support@mandrivaonline.com"
 
-#: ../mdkapplet:115
+#: ../mdkapplet:110
 #, fuzzy, c-format
 msgid "Please wait, finding available packages..."
 msgstr "muat ulang senarai pakej yg tersedia"
 
-#: ../mdkapplet:121
+#: ../mdkapplet:116
 #, c-format
 msgid "New updates are available for your system"
 msgstr "Kemaskini baru terdapat untuk sistem anda"
 
-#: ../mdkapplet:127
-#, fuzzy, c-format
-msgid "New bundles are available for your system"
-msgstr "Kemaskini baru terdapat untuk sistem anda"
-
-#: ../mdkapplet:133
-#, c-format
-msgid "Service is not configured. Please click on \"Configure the service\""
-msgstr "Servis tidak ditetapkan. Sila klik pada \"Tetapkan servis\""
-
-#: ../mdkapplet:139
+#: ../mdkapplet:122
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "Rangkaian tidak berfungsi. Sila tetapkan rangkaian anda"
 
-#: ../mdkapplet:145
+#: ../mdkapplet:128
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "Servis tidak diaktifkan. Sila klik pada \"Laman Web Online\""
 
-#: ../mdkapplet:151 ../mdkapplet:182
+#: ../mdkapplet:134 ../mdkapplet:165
 #, fuzzy, c-format
 msgid "urpmi database locked"
 msgstr "database urpmi terkunci"
 
-#: ../mdkapplet:157
+#: ../mdkapplet:140
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 "Keluaran tidak disokong (keluaran terlalu lama, atau keluaran pembangunan)"
 
-#: ../mdkapplet:163
+#: ../mdkapplet:146
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
 msgstr ""
 
-#: ../mdkapplet:169
+#: ../mdkapplet:152
 #, fuzzy, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -93,572 +83,131 @@ msgid ""
 "Then, restart \"%s\"."
 msgstr "dimatikan dalam ulanghidup."
 
-#: ../mdkapplet:174
+#: ../mdkapplet:157
 #, c-format
 msgid "Enabled"
 msgstr "Hidupkan"
 
-#: ../mdkapplet:187
+#: ../mdkapplet:170
 #, c-format
 msgid "Error updating media"
 msgstr ""
 
-#: ../mdkapplet:202
+#: ../mdkapplet:185
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr "Memeriksa... Terdapat kemaskini\n"
 
-#: ../mdkapplet:207
+#: ../mdkapplet:190
 #, c-format
 msgid "Packages are up to date"
 msgstr ""
 
-#: ../mdkapplet:212
+#: ../mdkapplet:195
 #, fuzzy, c-format
 msgid "Failed to open urpmi database"
 msgstr "tidak dapat membuka rpmdb"
 
-#: ../mdkapplet:217 ../mdkapplet:324
+#: ../mdkapplet:200
 #, c-format
 msgid "Install updates"
 msgstr "Pasang kemaskini"
 
-#: ../mdkapplet:218
-#, c-format
-msgid "Configure the service"
-msgstr "Tetapkan servis"
-
-#: ../mdkapplet:219
+#: ../mdkapplet:201
 #, c-format
 msgid "Check Updates"
 msgstr "Periksa Kemaskini"
 
-#: ../mdkapplet:220 ../mdkapplet:327 ../mdkonline:114 ../mdkonline:155
-#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
-#, c-format
-msgid "Please wait"
-msgstr "Sila tunggu"
-
-#: ../mdkapplet:220 ../mdkapplet:326 ../mdkapplet:327
-#, c-format
-msgid "Check updates"
-msgstr "Periksa kemaskini"
-
-#: ../mdkapplet:223 ../mdkapplet:648
-#, c-format
-msgid "Online WebSite"
-msgstr "Lamanweb Dalam Talian"
-
-#: ../mdkapplet:224
+#: ../mdkapplet:202
 #, c-format
 msgid "Configure Network"
 msgstr "Tetapkan Rangkaian"
 
-#: ../mdkapplet:225
-#, c-format
-msgid "Configure Now!"
-msgstr "Tetapkan Sekarang!"
-
-#: ../mdkapplet:313 ../mdkapplet:392
-#, c-format
-msgid "Mandriva Linux Updates Applet"
-msgstr "Aplet Kemaskini Mandriva Linux"
-
-#: ../mdkapplet:322
-#, c-format
-msgid "Actions"
-msgstr "Aksi"
-
-#: ../mdkapplet:325
-#, c-format
-msgid "Configure"
-msgstr "Tetapkan"
-
-#: ../mdkapplet:329
-#, c-format
-msgid "See logs"
-msgstr "Lihat log"
-
-#: ../mdkapplet:332
-#, c-format
-msgid "Status"
-msgstr "Status"
-
-#: ../mdkapplet:336 ../mdkapplet:597
-#, c-format
-msgid "Close"
-msgstr "Tutup"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Network Connection: "
-msgstr "Sambungan Rangkaian:"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Up"
-msgstr "Naik"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Down"
-msgstr "Turun"
-
-#: ../mdkapplet:366
-#, c-format
-msgid "Last check: "
-msgstr "Pemeriksaan terakhir:"
-
-#: ../mdkapplet:367 ../mdkonline:145
-#, c-format
-msgid "Machine name:"
-msgstr "Nama mesin:"
-
-#: ../mdkapplet:368
-#, c-format
-msgid "Updates: "
-msgstr "Kemaskini:"
-
-#: ../mdkapplet:372
+#: ../mdkapplet:283
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Melaksanakan drakconnect\n"
 
-#: ../mdkapplet:375
+#: ../mdkapplet:286
 #, c-format
 msgid "Mandriva Online seems to be reinstalled, reloading applet ...."
 msgstr ""
 
-#: ../mdkapplet:383
+#: ../mdkapplet:294
 #, c-format
 msgid "Launching MandrivaUpdate\n"
 msgstr "Melaksanakan MandrivaUpdate\n"
 
-#: ../mdkapplet:398
+#: ../mdkapplet:303
+#, c-format
+msgid "Mandriva Linux Updates Applet"
+msgstr "Aplet Kemaskini Mandriva Linux"
+
+#: ../mdkapplet:308
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Memeriksa kemaskini baru...\n"
 
-#: ../mdkapplet:399
+#: ../mdkapplet:309
 #, c-format
 msgid "Connecting to"
 msgstr "Menyambung ke"
 
-#: ../mdkapplet:467 ../mdkupdate:159 ../mdkupdate:188
-#, c-format
-msgid "An error occurred"
-msgstr "Ralat telah berlaku"
-
-#: ../mdkapplet:475
-#, c-format
-msgid "Development release not supported by service"
-msgstr "Keluaran pembangunan tidak disokong oleh servis"
-
-#: ../mdkapplet:476
-#, c-format
-msgid "Too old release not supported by service"
-msgstr "Keluaran terlalu lama tidak disokong oleh servis"
-
-#: ../mdkapplet:477
-#, c-format
-msgid "Unknown state"
-msgstr "Keadaan tidak diketahui"
-
-#: ../mdkapplet:478
-#, c-format
-msgid "Online services disabled. Contact Mandriva Online site\n"
-msgstr "Service dalam talian dimatikan. Hubungi laman Mandriva Online\n"
-
-#: ../mdkapplet:479
-#, c-format
-msgid "Wrong Password.\n"
-msgstr "Salah katalaluan.\n"
-
-#: ../mdkapplet:480
-#, c-format
-msgid "Wrong Action or host or login.\n"
-msgstr "Salah Tindakan atau hos atau logmasuk.\n"
-
-#: ../mdkapplet:481
-#, c-format
-msgid ""
-"Something is wrong with your network settings (check your route, firewall or "
-"proxy settings)\n"
-msgstr ""
-
-#: ../mdkapplet:483
-#, c-format
-msgid ""
-"Problem occured while connecting to the server, please contact the support "
-"team"
-msgstr ""
-
-#: ../mdkapplet:487
-#, c-format
-msgid "Response from Mandriva Online server\n"
-msgstr "Jawapan dari pelayan Mandriva Online\n"
-
-#: ../mdkapplet:490
+#: ../mdkapplet:386
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Sistem adalah terkini\n"
 
-#: ../mdkapplet:527
-#, c-format
-msgid "No check"
-msgstr "Tiada pemeriksaan"
-
-#: ../mdkapplet:541
-#, c-format
-msgid "Checking config file: Not present\n"
-msgstr "Memeriksa fail tetapan: Tidak wujud\n"
-
-#: ../mdkapplet:544
+#: ../mdkapplet:415
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Pemeriksaan Rangkaian: seperti dimatikan\n"
 
-#: ../mdkapplet:587
-#, c-format
-msgid "Logs"
-msgstr "Log"
-
-#: ../mdkapplet:603
+#: ../mdkapplet:457 ../mdkupdate:118 ../mdkupdate:164
 #, c-format
-msgid "Clear"
-msgstr "Kosongkan"
+msgid "Warning"
+msgstr "Amaran"
 
-#: ../mdkapplet:629
+#: ../mdkapplet:468
 #, c-format
 msgid "About..."
 msgstr "Keterangan..."
 
-#: ../mdkapplet:631
+#: ../mdkapplet:472
 #, fuzzy, c-format
 msgid "Mandriva Online %s"
 msgstr "Mandriva Online"
 
-#: ../mdkapplet:635
+#: ../mdkapplet:473
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr ""
 
-#: ../mdkapplet:647
+#: ../mdkapplet:476
 #, c-format
 msgid "Mandriva Online gives access to Mandriva web services."
 msgstr ""
 
-#: ../mdkapplet:655
-#, c-format
-msgid "Always launch on startup"
-msgstr "Sentiasa lancar ketika permulaan"
-
-#: ../mdkapplet:657
-#, c-format
-msgid "Quit"
-msgstr "Keluar"
-
-#: ../mdkonline:58
-#, c-format
-msgid ""
-"mdonline version %s\n"
-"Copyright (C) %s Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"versi mdonline %s\n"
-"Hakmilik (C) %s Mandriva.\n"
-"Ini adalah perisian percuma dan boleh disebarkan dibawah akta GNU GPL.\n"
-"\n"
-"penggunaan:\n"
-
-#: ../mdkonline:63 ../mdkupdate:73
-#, c-format
-msgid "  --help\t\t- print this help message.\n"
-msgstr "  --help\t\t- cetak mesej bantuan ini.\n"
-
-#: ../mdkonline:64
-#, c-format
-msgid "  --box=\t\t\t- hostname.\n"
-msgstr ""
-
-#: ../mdkonline:65
-#, c-format
-msgid "  --country\t\t\t- name of country of the user. \n"
-msgstr ""
-
-#: ../mdkonline:66
-#, c-format
-msgid "  --interactive\t\t- use the interactive mode.\n"
-msgstr ""
-
-#: ../mdkonline:67
-#, c-format
-msgid "  --nointeractive\t- use the non-interactive mode.\n"
-msgstr ""
-
-#: ../mdkonline:68
-#, c-format
-msgid "  --login=\t\t     - login name of the user.\n"
-msgstr ""
-
-#: ../mdkonline:69
-#, c-format
-msgid "  --pass=\t\t\t- password  of the user.\n"
-msgstr ""
-
-#: ../mdkonline:87 ../mdkonline:120
-#, c-format
-msgid "Mandriva Online"
-msgstr "Mandriva Online"
-
-#: ../mdkonline:90
-#, c-format
-msgid "I already have an account"
-msgstr "Saya sudah mempunyai akaun"
-
-#: ../mdkonline:91
-#, c-format
-msgid "I want to subscribe"
-msgstr "Saya mahu melanggan"
-
-#: ../mdkonline:96
-#, c-format
-msgid "Mr."
-msgstr "En."
-
-#: ../mdkonline:96
-#, c-format
-msgid "Mrs."
-msgstr "Puan"
-
-#: ../mdkonline:96
-#, c-format
-msgid "Ms."
-msgstr "Cik/Puan"
-
-#: ../mdkonline:114
-#, c-format
-msgid "Reading configuration\n"
-msgstr "Membaca konfigurasi\n"
-
-#: ../mdkonline:123
-#, c-format
-msgid ""
-"This assistant will help you to upload your configuration\n"
-"(packages, hardware configuration) to a centralized database in\n"
-"order to keep you informed about security updates and useful upgrades.\n"
-msgstr ""
-"Pembantu ini akan menolong anda memuatnaik konfigurasi anda\n"
-"(pakej, konfigurasi perkakasan) ke pangkalan data pusat agar anda selalu\n"
-"diberitahu kemaskini sekuriti dan naiktaraf yang berguna.\n"
-
-#: ../mdkonline:131
-#, c-format
-msgid "Account creation or authentication"
-msgstr "Penciptaan akaun atau pengesahan"
-
-#: ../mdkonline:136
-#, c-format
-msgid "Enter your Mandriva Online login, password and machine name:"
-msgstr "Masukkan login, katalaluan, dan nama mesin  Mandriva Online Anda:"
-
-#: ../mdkonline:142 ../mdkonline:195
-#, c-format
-msgid "Email address:"
-msgstr "Alamat emel:"
-
-#: ../mdkonline:143
-#, c-format
-msgid "Country"
-msgstr "Negara"
-
-#: ../mdkonline:144 ../mdkonline:196
-#, c-format
-msgid "Password:"
-msgstr "Katalaluan:"
-
-#: ../mdkonline:146
-#, fuzzy, c-format
-msgid "Machine description:"
-msgstr "Nama mesin:"
-
-#: ../mdkonline:147
-#, c-format
-msgid "(Ex: My Home Office's Computer)"
-msgstr ""
-
-#: ../mdkonline:152 ../mdkonline:159 ../mdkonline:180 ../mdkonline:204
-#: ../mdkonline:208 ../mdkonline:212 ../mdkonline:217 ../mdkupdate:141
-#: ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
-#, c-format
-msgid "Error"
-msgstr "Ralat"
-
-#: ../mdkonline:152
-#, c-format
-msgid "Machine name must be 1 to 40 alphanumerical characters"
-msgstr "Nama mesin mesti 1 hingga 40 aksara alfanumerik"
-
-#: ../mdkonline:155
-#, c-format
-msgid "Connecting to Mandriva Online website..."
-msgstr "Menyambung ke laman web Mandriva Online..."
-
-#: ../mdkonline:167
-#, c-format
-msgid ""
-"In order to benefit from Mandriva Online services,\n"
-"we are about to upload your configuration.\n"
-"\n"
-"The Wizard will now send the following information to Mandriva:\n"
-"\n"
-"1) the list of packages you have installed on your system,\n"
-"\n"
-"2) your hardware configuration.\n"
-"\n"
-"If you feel uncomfortable by that idea, or do not want to benefit from this "
-"service,\n"
-"please press 'Cancel'. By pressing 'Next', you allow us to keep you "
-"informed\n"
-"about security updates and useful upgrades via personalized email alerts.\n"
-"Furthermore, you benefit from discounted paid support services on\n"
-"www.mandrivaexpert.com."
-msgstr ""
-"Agar mendapat manfaat servis Mandriva Online,\n"
-"kami akan meng-upload konfigurasi Anda.\n"
-"\n"
-"Wizard kini akan mengirim info berikut ke Mandriva:\n"
-"\n"
-"1) daftar pakej yang diinstal di dalam sistem Anda,\n"
-"\n"
-"2) konfigurasi perkakasan Anda.\n"
-"\n"
-"Jika Anda merasa tidak sesuai dengan idea ini, atau tidak ingin "
-"memanfaatkan\n"
-"servis ini, tekan 'Batal'. Dengan menekan 'Lanjut', Anda mengizinkan kami\n"
-"memberitahu Anda mengenai kemaskini sekuriti dan upgrade bermanfaat melalui "
-"email.\n"
-"Tambahan pula, Anda akan mendapat diskaun servis di www.mandrivaexpert.com."
-
-#: ../mdkonline:180
-#, c-format
-msgid "Connection problem"
-msgstr "Masalah perhubungan"
-
-#: ../mdkonline:180
-#, c-format
-msgid "Problem occurs when uploading files, please try again"
-msgstr "Masalah berlaku ketika memuatnaik fail, sila cuba lagi"
-
-#: ../mdkonline:187
-#, c-format
-msgid "Create a Mandriva Online Account"
-msgstr "Cipta Akaun Mandriva Online"
-
-#. -PO: that is for things like "Mr", "Ms",...
-#: ../mdkonline:192
-#, c-format
-msgid "Greeting:"
-msgstr "Ucapan:"
-
-#: ../mdkonline:193
-#, c-format
-msgid "First name:"
-msgstr "Nama pertama:"
-
-#: ../mdkonline:194
-#, c-format
-msgid "Last name:"
-msgstr "Nama akhir:"
-
-#: ../mdkonline:197
-#, c-format
-msgid "Confirm Password:"
-msgstr "Sahkan Katalaluan:"
-
-#: ../mdkonline:204
-#, c-format
-msgid ""
-"The passwords do not match\n"
-" Please try again\n"
-msgstr ""
-"Katalaluan tidak sama\n"
-" Sila cuba lagi\n"
-
-#: ../mdkonline:208
-#, c-format
-msgid "Please fill in each field"
-msgstr "Sila penuhkan setiap medan"
-
-#: ../mdkonline:212
-#, c-format
-msgid "Not a valid mail address!\n"
-msgstr "Alamat mail yang tidak sah!\n"
-
-#: ../mdkonline:217
-#, c-format
-msgid "Creating account failed!"
-msgstr ""
-
-#: ../mdkonline:225
-#, c-format
-msgid ""
-"Mandriva Online Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
-msgstr ""
-
-#: ../mdkonline:229
-#, c-format
-msgid "Your upload was successful!"
-msgstr "Upload Anda berjaya!"
-
-#: ../mdkonline:229
-#, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandriva Online."
-msgstr ""
-"Mulai saat ini Anda akan menerima pengumuman sekuriti dan upgrade\n"
-"dari Mandriva Online."
-
-#: ../mdkonline:229
-#, c-format
-msgid ""
-"Mandriva Online offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
-msgstr ""
-"Mandriva Online memberi Anda kemampuan update automatik.\n"
-"Sebuah program akan berjalan secara periodik menunggu untuk kemaskini baru\n"
-
-#: ../mdkonline:238
+#: ../mdkapplet:478
 #, c-format
-msgid "Congratulations"
-msgstr "Tahniah"
+msgid "Online WebSite"
+msgstr "Lamanweb Dalam Talian"
 
-#: ../mdkonline:238
+#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
+#: ../mdkapplet:483
 #, c-format
-msgid "Your Mandriva Online account has been successfully configured\n"
+msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
 
-#: ../mdkonline:253
+#: ../mdkapplet:492
 #, c-format
-msgid "Configuration uploaded successfully"
-msgstr "Tetapan berjaya dimuatnaik"
-
-#: ../mdkonline:254
-#, c-format
-msgid "Problem uploading configuration"
-msgstr "Masalah memuatnaik tetapan"
+msgid "Always launch on startup"
+msgstr "Sentiasa lancar ketika permulaan"
 
-#: ../mdkonline:256
+#: ../mdkapplet:494
 #, c-format
-msgid ""
-"Cannot connect to Mandriva Online website: wrong login/password or router/"
-"firewall bad settings"
-msgstr ""
+msgid "Quit"
+msgstr "Keluar"
 
 #: ../mdkonline.pm:207
 #, c-format
@@ -802,6 +351,11 @@ msgstr ""
 "\n"
 "penggunaan:\n"
 
+#: ../mdkupdate:73
+#, c-format
+msgid "  --help\t\t- print this help message.\n"
+msgstr "  --help\t\t- cetak mesej bantuan ini.\n"
+
 #: ../mdkupdate:74
 #, fuzzy, c-format
 msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
@@ -829,11 +383,6 @@ msgid ""
 "file.\n"
 msgstr ""
 
-#: ../mdkupdate:118 ../mdkupdate:164
-#, c-format
-msgid "Warning"
-msgstr "Amaran"
-
 #. -PO: here Live Install is currently *NOT* translated on the desktop, so it's better to keep as it:
 #: ../mdkupdate:120
 #, c-format
@@ -842,11 +391,21 @@ msgid ""
 "Install' wizard."
 msgstr ""
 
+#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
+#, c-format
+msgid "Please wait"
+msgstr "Sila tunggu"
+
 #: ../mdkupdate:123 ../mdkupdate:174
 #, c-format
 msgid "Preparing..."
 msgstr "Menyediakan..."
 
+#: ../mdkupdate:141 ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
+#, c-format
+msgid "Error"
+msgstr "Ralat"
+
 #: ../mdkupdate:141
 #, c-format
 msgid ""
@@ -855,6 +414,11 @@ msgid ""
 "%s"
 msgstr ""
 
+#: ../mdkupdate:159 ../mdkupdate:188
+#, c-format
+msgid "An error occurred"
+msgstr "Ralat telah berlaku"
+
 #: ../mdkupdate:164
 #, c-format
 msgid ""
@@ -879,6 +443,255 @@ msgstr "Memasang pakej ...\n"
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "Gagal mengemaskini pakej dari media update_source.\n"
 
+#, fuzzy
+#~ msgid "New bundles are available for your system"
+#~ msgstr "Kemaskini baru terdapat untuk sistem anda"
+
+#~ msgid "Service is not configured. Please click on \"Configure the service\""
+#~ msgstr "Servis tidak ditetapkan. Sila klik pada \"Tetapkan servis\""
+
+#~ msgid "Configure the service"
+#~ msgstr "Tetapkan servis"
+
+#~ msgid "Check updates"
+#~ msgstr "Periksa kemaskini"
+
+#~ msgid "Configure Now!"
+#~ msgstr "Tetapkan Sekarang!"
+
+#~ msgid "Actions"
+#~ msgstr "Aksi"
+
+#~ msgid "Configure"
+#~ msgstr "Tetapkan"
+
+#~ msgid "See logs"
+#~ msgstr "Lihat log"
+
+#~ msgid "Status"
+#~ msgstr "Status"
+
+#~ msgid "Close"
+#~ msgstr "Tutup"
+
+#~ msgid "Network Connection: "
+#~ msgstr "Sambungan Rangkaian:"
+
+#~ msgid "Up"
+#~ msgstr "Naik"
+
+#~ msgid "Down"
+#~ msgstr "Turun"
+
+#~ msgid "Last check: "
+#~ msgstr "Pemeriksaan terakhir:"
+
+#~ msgid "Machine name:"
+#~ msgstr "Nama mesin:"
+
+#~ msgid "Updates: "
+#~ msgstr "Kemaskini:"
+
+#~ msgid "Development release not supported by service"
+#~ msgstr "Keluaran pembangunan tidak disokong oleh servis"
+
+#~ msgid "Too old release not supported by service"
+#~ msgstr "Keluaran terlalu lama tidak disokong oleh servis"
+
+#~ msgid "Unknown state"
+#~ msgstr "Keadaan tidak diketahui"
+
+#~ msgid "Online services disabled. Contact Mandriva Online site\n"
+#~ msgstr "Service dalam talian dimatikan. Hubungi laman Mandriva Online\n"
+
+#~ msgid "Wrong Password.\n"
+#~ msgstr "Salah katalaluan.\n"
+
+#~ msgid "Wrong Action or host or login.\n"
+#~ msgstr "Salah Tindakan atau hos atau logmasuk.\n"
+
+#~ msgid "Response from Mandriva Online server\n"
+#~ msgstr "Jawapan dari pelayan Mandriva Online\n"
+
+#~ msgid "No check"
+#~ msgstr "Tiada pemeriksaan"
+
+#~ msgid "Checking config file: Not present\n"
+#~ msgstr "Memeriksa fail tetapan: Tidak wujud\n"
+
+#~ msgid "Logs"
+#~ msgstr "Log"
+
+#~ msgid "Clear"
+#~ msgstr "Kosongkan"
+
+#~ msgid ""
+#~ "mdonline version %s\n"
+#~ "Copyright (C) %s Mandriva.\n"
+#~ "This is free software and may be redistributed under the terms of the GNU "
+#~ "GPL.\n"
+#~ "\n"
+#~ "usage:\n"
+#~ msgstr ""
+#~ "versi mdonline %s\n"
+#~ "Hakmilik (C) %s Mandriva.\n"
+#~ "Ini adalah perisian percuma dan boleh disebarkan dibawah akta GNU GPL.\n"
+#~ "\n"
+#~ "penggunaan:\n"
+
+#~ msgid "Mandriva Online"
+#~ msgstr "Mandriva Online"
+
+#~ msgid "I already have an account"
+#~ msgstr "Saya sudah mempunyai akaun"
+
+#~ msgid "I want to subscribe"
+#~ msgstr "Saya mahu melanggan"
+
+#~ msgid "Mr."
+#~ msgstr "En."
+
+#~ msgid "Mrs."
+#~ msgstr "Puan"
+
+#~ msgid "Ms."
+#~ msgstr "Cik/Puan"
+
+#~ msgid "Reading configuration\n"
+#~ msgstr "Membaca konfigurasi\n"
+
+#~ msgid ""
+#~ "This assistant will help you to upload your configuration\n"
+#~ "(packages, hardware configuration) to a centralized database in\n"
+#~ "order to keep you informed about security updates and useful upgrades.\n"
+#~ msgstr ""
+#~ "Pembantu ini akan menolong anda memuatnaik konfigurasi anda\n"
+#~ "(pakej, konfigurasi perkakasan) ke pangkalan data pusat agar anda selalu\n"
+#~ "diberitahu kemaskini sekuriti dan naiktaraf yang berguna.\n"
+
+#~ msgid "Account creation or authentication"
+#~ msgstr "Penciptaan akaun atau pengesahan"
+
+#~ msgid "Enter your Mandriva Online login, password and machine name:"
+#~ msgstr "Masukkan login, katalaluan, dan nama mesin  Mandriva Online Anda:"
+
+#~ msgid "Email address:"
+#~ msgstr "Alamat emel:"
+
+#~ msgid "Country"
+#~ msgstr "Negara"
+
+#~ msgid "Password:"
+#~ msgstr "Katalaluan:"
+
+#, fuzzy
+#~ msgid "Machine description:"
+#~ msgstr "Nama mesin:"
+
+#~ msgid "Machine name must be 1 to 40 alphanumerical characters"
+#~ msgstr "Nama mesin mesti 1 hingga 40 aksara alfanumerik"
+
+#~ msgid "Connecting to Mandriva Online website..."
+#~ msgstr "Menyambung ke laman web Mandriva Online..."
+
+#~ msgid ""
+#~ "In order to benefit from Mandriva Online services,\n"
+#~ "we are about to upload your configuration.\n"
+#~ "\n"
+#~ "The Wizard will now send the following information to Mandriva:\n"
+#~ "\n"
+#~ "1) the list of packages you have installed on your system,\n"
+#~ "\n"
+#~ "2) your hardware configuration.\n"
+#~ "\n"
+#~ "If you feel uncomfortable by that idea, or do not want to benefit from "
+#~ "this service,\n"
+#~ "please press 'Cancel'. By pressing 'Next', you allow us to keep you "
+#~ "informed\n"
+#~ "about security updates and useful upgrades via personalized email "
+#~ "alerts.\n"
+#~ "Furthermore, you benefit from discounted paid support services on\n"
+#~ "www.mandrivaexpert.com."
+#~ msgstr ""
+#~ "Agar mendapat manfaat servis Mandriva Online,\n"
+#~ "kami akan meng-upload konfigurasi Anda.\n"
+#~ "\n"
+#~ "Wizard kini akan mengirim info berikut ke Mandriva:\n"
+#~ "\n"
+#~ "1) daftar pakej yang diinstal di dalam sistem Anda,\n"
+#~ "\n"
+#~ "2) konfigurasi perkakasan Anda.\n"
+#~ "\n"
+#~ "Jika Anda merasa tidak sesuai dengan idea ini, atau tidak ingin "
+#~ "memanfaatkan\n"
+#~ "servis ini, tekan 'Batal'. Dengan menekan 'Lanjut', Anda mengizinkan "
+#~ "kami\n"
+#~ "memberitahu Anda mengenai kemaskini sekuriti dan upgrade bermanfaat "
+#~ "melalui email.\n"
+#~ "Tambahan pula, Anda akan mendapat diskaun servis di www.mandrivaexpert."
+#~ "com."
+
+#~ msgid "Connection problem"
+#~ msgstr "Masalah perhubungan"
+
+#~ msgid "Problem occurs when uploading files, please try again"
+#~ msgstr "Masalah berlaku ketika memuatnaik fail, sila cuba lagi"
+
+#~ msgid "Create a Mandriva Online Account"
+#~ msgstr "Cipta Akaun Mandriva Online"
+
+#~ msgid "Greeting:"
+#~ msgstr "Ucapan:"
+
+#~ msgid "First name:"
+#~ msgstr "Nama pertama:"
+
+#~ msgid "Last name:"
+#~ msgstr "Nama akhir:"
+
+#~ msgid "Confirm Password:"
+#~ msgstr "Sahkan Katalaluan:"
+
+#~ msgid ""
+#~ "The passwords do not match\n"
+#~ " Please try again\n"
+#~ msgstr ""
+#~ "Katalaluan tidak sama\n"
+#~ " Sila cuba lagi\n"
+
+#~ msgid "Please fill in each field"
+#~ msgstr "Sila penuhkan setiap medan"
+
+#~ msgid "Not a valid mail address!\n"
+#~ msgstr "Alamat mail yang tidak sah!\n"
+
+#~ msgid "Your upload was successful!"
+#~ msgstr "Upload Anda berjaya!"
+
+#~ msgid ""
+#~ "From now you will receive on security and updates \n"
+#~ "announcements thanks to Mandriva Online."
+#~ msgstr ""
+#~ "Mulai saat ini Anda akan menerima pengumuman sekuriti dan upgrade\n"
+#~ "dari Mandriva Online."
+
+#~ msgid ""
+#~ "Mandriva Online offers you the ability to automate the updates.\n"
+#~ "A program will run regulary in your system waiting for new updates\n"
+#~ msgstr ""
+#~ "Mandriva Online memberi Anda kemampuan update automatik.\n"
+#~ "Sebuah program akan berjalan secara periodik menunggu untuk kemaskini "
+#~ "baru\n"
+
+#~ msgid "Congratulations"
+#~ msgstr "Tahniah"
+
+#~ msgid "Configuration uploaded successfully"
+#~ msgstr "Tetapan berjaya dimuatnaik"
+
+#~ msgid "Problem uploading configuration"
+#~ msgstr "Masalah memuatnaik tetapan"
+
 #~ msgid "  --applet\t\t- launch Mandriva Update.\n"
 #~ msgstr "  --applet\t\t- lancar Mandriva Update.\n"
 
diff --git a/po/mt.po b/po/mt.po
index b7256fca..98a49368 100644
--- a/po/mt.po
+++ b/po/mt.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mt\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-09 16:26+0200\n"
+"POT-Creation-Date: 2008-02-21 18:21+0100\n"
 "PO-Revision-Date: 2004-10-02 06:19+0200\n"
 "Last-Translator: Ramon Casha <ramon.casha@linux.org.mt>\n"
 "Language-Team: Maltese <mt@li.org>\n"
@@ -19,17 +19,17 @@ msgstr ""
 "X-Generator: KBabel 1.3.1\n"
 
 #. -PO: here %s will be replaced by the local time (eg: "Will check updates at 14:03:50"
-#: ../mdkapplet:94
+#: ../mdkapplet:88
 #, fuzzy, c-format
 msgid "Will check updates at %s"
 msgstr "Iċċekkja aġġornamenti"
 
-#: ../mdkapplet:103
+#: ../mdkapplet:97
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "Is-sistema tiegħek hija aġġornata"
 
-#: ../mdkapplet:109
+#: ../mdkapplet:103
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -38,54 +38,43 @@ msgstr ""
 "Hemm problema fil-konfigurazzjoni. Iċċekkja l-logs u ibgħat imejl "
 "lilsupport@mandrivaonline.com"
 
-#: ../mdkapplet:115
+#: ../mdkapplet:110
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "Stenna ftit, qed insib pakketti disponibbli..."
 
-#: ../mdkapplet:121
+#: ../mdkapplet:116
 #, c-format
 msgid "New updates are available for your system"
 msgstr "Hemm aġġornamenti ġodda għas-sistema tiegħek"
 
-#: ../mdkapplet:127
-#, fuzzy, c-format
-msgid "New bundles are available for your system"
-msgstr "Hemm aġġornamenti ġodda għas-sistema tiegħek"
-
-#: ../mdkapplet:133
-#, c-format
-msgid "Service is not configured. Please click on \"Configure the service\""
-msgstr ""
-"Is-servizz għadu mhux konfigurat. Ikklikkja fuq \"Ikkonfigura s-servizz\""
-
-#: ../mdkapplet:139
+#: ../mdkapplet:122
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "In-network mhux imtella'. Jekk jogħġbok issettja n-network."
 
-#: ../mdkapplet:145
+#: ../mdkapplet:128
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "is-servizz mhux attivat. Jekk jogħġbok klikkja fuq \"Sit online\""
 
-#: ../mdkapplet:151 ../mdkapplet:182
+#: ../mdkapplet:134 ../mdkapplet:165
 #, fuzzy, c-format
 msgid "urpmi database locked"
 msgstr "database urpmi imsakkar"
 
-#: ../mdkapplet:157
+#: ../mdkapplet:140
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr "Verżjoni mhux sapportita (antika wisq, jew verżjoni ta' żvilupp)"
 
-#: ../mdkapplet:163
+#: ../mdkapplet:146
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
 msgstr ""
 
-#: ../mdkapplet:169
+#: ../mdkapplet:152
 #, fuzzy, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -101,583 +90,133 @@ msgstr ""
 "\n"
 "Imbgħad, erġa’ startja %s."
 
-#: ../mdkapplet:174
+#: ../mdkapplet:157
 #, c-format
 msgid "Enabled"
 msgstr "Mixgħul"
 
-#: ../mdkapplet:187
+#: ../mdkapplet:170
 #, c-format
 msgid "Error updating media"
 msgstr ""
 
-#: ../mdkapplet:202
+#: ../mdkapplet:185
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr "Qed jiġu ċċekkjati... hemm aġġornamenti disponibbli\n"
 
-#: ../mdkapplet:207
+#: ../mdkapplet:190
 #, c-format
 msgid "Packages are up to date"
 msgstr ""
 
-#: ../mdkapplet:212
+#: ../mdkapplet:195
 #, fuzzy, c-format
 msgid "Failed to open urpmi database"
 msgstr "ma nistax niftaħ rpmdb"
 
-#: ../mdkapplet:217 ../mdkapplet:324
+#: ../mdkapplet:200
 #, c-format
 msgid "Install updates"
 msgstr "Installa aġġornamenti"
 
-#: ../mdkapplet:218
-#, c-format
-msgid "Configure the service"
-msgstr "Ikkonfigura s-servizz"
-
-#: ../mdkapplet:219
+#: ../mdkapplet:201
 #, c-format
 msgid "Check Updates"
 msgstr "Iċċekkja għal aġġornamenti"
 
-#: ../mdkapplet:220 ../mdkapplet:327 ../mdkonline:114 ../mdkonline:155
-#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
-#, c-format
-msgid "Please wait"
-msgstr "Stenna ftit"
-
-#: ../mdkapplet:220 ../mdkapplet:326 ../mdkapplet:327
-#, c-format
-msgid "Check updates"
-msgstr "Iċċekkja aġġornamenti"
-
-#: ../mdkapplet:223 ../mdkapplet:648
-#, c-format
-msgid "Online WebSite"
-msgstr "Sit online"
-
-#: ../mdkapplet:224
+#: ../mdkapplet:202
 #, c-format
 msgid "Configure Network"
 msgstr "Ikkonfigura n-network"
 
-#: ../mdkapplet:225
-#, c-format
-msgid "Configure Now!"
-msgstr "Ikkonfigura issa"
-
-#: ../mdkapplet:313 ../mdkapplet:392
-#, c-format
-msgid "Mandriva Linux Updates Applet"
-msgstr "Applet għall-aġġornamenti Mandriva Linux"
-
-#: ../mdkapplet:322
-#, c-format
-msgid "Actions"
-msgstr "Azzjonijiet"
-
-#: ../mdkapplet:325
-#, c-format
-msgid "Configure"
-msgstr "Ikkonfigura"
-
-#: ../mdkapplet:329
-#, c-format
-msgid "See logs"
-msgstr "Ara logs"
-
-#: ../mdkapplet:332
-#, c-format
-msgid "Status"
-msgstr "Stat"
-
-#: ../mdkapplet:336 ../mdkapplet:597
-#, c-format
-msgid "Close"
-msgstr "Agħlaq"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Network Connection: "
-msgstr "Konnessjoni network:"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Up"
-msgstr "Fuq"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Down"
-msgstr "isfel"
-
-#: ../mdkapplet:366
-#, c-format
-msgid "Last check: "
-msgstr "L-aħħar li ċċekkjajt: "
-
-#: ../mdkapplet:367 ../mdkonline:145
-#, c-format
-msgid "Machine name:"
-msgstr "Isem tal-kompjuter:"
-
-#: ../mdkapplet:368
-#, c-format
-msgid "Updates: "
-msgstr "Aġġornamenti: "
-
-#: ../mdkapplet:372
+#: ../mdkapplet:283
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Qed jitħaddem drakconnect\n"
 
-#: ../mdkapplet:375
+#: ../mdkapplet:286
 #, c-format
 msgid "Mandriva Online seems to be reinstalled, reloading applet ...."
 msgstr ""
 "Mandriva Online jidher li reġa' ġie installat, qed terġa' tittella' l-"
 "applet ..."
 
-#: ../mdkapplet:383
+#: ../mdkapplet:294
 #, c-format
 msgid "Launching MandrivaUpdate\n"
 msgstr "Qed jitħaddem MandrivaUpdate\n"
 
-#: ../mdkapplet:398
+#: ../mdkapplet:303
+#, c-format
+msgid "Mandriva Linux Updates Applet"
+msgstr "Applet għall-aġġornamenti Mandriva Linux"
+
+#: ../mdkapplet:308
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Qed jiġu kalkulati aġġornamenti ġodda...\n"
 
-#: ../mdkapplet:399
+#: ../mdkapplet:309
 #, c-format
 msgid "Connecting to"
 msgstr "Qed issir konnessjoni ma'"
 
-#: ../mdkapplet:467 ../mdkupdate:159 ../mdkupdate:188
-#, c-format
-msgid "An error occurred"
-msgstr "Inqalgħet problema"
-
-#: ../mdkapplet:475
-#, c-format
-msgid "Development release not supported by service"
-msgstr "Verżjoni ta' żvilupp mhux sapportita mis-servizz"
-
-#: ../mdkapplet:476
-#, c-format
-msgid "Too old release not supported by service"
-msgstr "Verżjoni antika wisq mhux sapportita mis-servizz"
-
-#: ../mdkapplet:477
-#, c-format
-msgid "Unknown state"
-msgstr "Stat mhux magħruf"
-
-#: ../mdkapplet:478
-#, c-format
-msgid "Online services disabled. Contact Mandriva Online site\n"
-msgstr "Servizzi online mhux attivi. Ikkuntattja s-sit ta' Mandriva Online\n"
-
-#: ../mdkapplet:479
-#, c-format
-msgid "Wrong Password.\n"
-msgstr "Password ħażina.\n"
-
-#: ../mdkapplet:480
-#, c-format
-msgid "Wrong Action or host or login.\n"
-msgstr "Azzjoni, login jew server ħażin.\n"
-
-#: ../mdkapplet:481
-#, c-format
-msgid ""
-"Something is wrong with your network settings (check your route, firewall or "
-"proxy settings)\n"
-msgstr ""
-"Hemm problema bis-setings tan-network tiegħek (iċċekkja s-setings ta' route, "
-"firewall jew proxy)\n"
-
-#: ../mdkapplet:483
-#, c-format
-msgid ""
-"Problem occured while connecting to the server, please contact the support "
-"team"
-msgstr ""
-
-#: ../mdkapplet:487
-#, fuzzy, c-format
-msgid "Response from Mandriva Online server\n"
-msgstr "Merħba għal Mandriva Online"
-
-#: ../mdkapplet:490
+#: ../mdkapplet:386
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Is-sistema hija aġġornata\n"
 
-#: ../mdkapplet:527
-#, c-format
-msgid "No check"
-msgstr "Ebda ċċekkjar"
-
-#: ../mdkapplet:541
-#, c-format
-msgid "Checking config file: Not present\n"
-msgstr "Qed jiġi ċċekkjat fajl ta' konfigurazzjoni: mhux preżenti\n"
-
-#: ../mdkapplet:544
+#: ../mdkapplet:415
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Qed niċċekkja n-network... jidher li mitfi\n"
 
-#: ../mdkapplet:587
+#: ../mdkapplet:457 ../mdkupdate:118 ../mdkupdate:164
 #, c-format
-msgid "Logs"
-msgstr "Logs"
-
-#: ../mdkapplet:603
-#, c-format
-msgid "Clear"
-msgstr "Ħassar"
+msgid "Warning"
+msgstr "Twissija"
 
-#: ../mdkapplet:629
+#: ../mdkapplet:468
 #, c-format
 msgid "About..."
 msgstr "Dwar.."
 
-#: ../mdkapplet:631
+#: ../mdkapplet:472
 #, fuzzy, c-format
 msgid "Mandriva Online %s"
 msgstr "Mandriva Online"
 
-#: ../mdkapplet:635
+#: ../mdkapplet:473
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr ""
 
-#: ../mdkapplet:647
+#: ../mdkapplet:476
 #, c-format
 msgid "Mandriva Online gives access to Mandriva web services."
 msgstr ""
 
-#: ../mdkapplet:655
-#, c-format
-msgid "Always launch on startup"
-msgstr "Dejjem ħaddem mat-tlugħ"
-
-#: ../mdkapplet:657
-#, c-format
-msgid "Quit"
-msgstr "Oħroġ"
-
-#: ../mdkonline:58
-#, c-format
-msgid ""
-"mdonline version %s\n"
-"Copyright (C) %s Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"mdonline verżjoni %s\n"
-"Copyright (C) %s Mandriva.\n"
-"Dan huwa softwer ħieles u jista' jiġi distribwit taħt it-termini tal-GNU "
-"GPL.\n"
-"\n"
-"użu:\n"
-
-#: ../mdkonline:63 ../mdkupdate:73
-#, c-format
-msgid "  --help\t\t- print this help message.\n"
-msgstr "  --help\t\t- uri dan il-messaġġ ta' għajnuna.\n"
-
-#: ../mdkonline:64
-#, c-format
-msgid "  --box=\t\t\t- hostname.\n"
-msgstr ""
-
-#: ../mdkonline:65
-#, c-format
-msgid "  --country\t\t\t- name of country of the user. \n"
-msgstr ""
-
-#: ../mdkonline:66
-#, c-format
-msgid "  --interactive\t\t- use the interactive mode.\n"
-msgstr ""
-
-#: ../mdkonline:67
-#, c-format
-msgid "  --nointeractive\t- use the non-interactive mode.\n"
-msgstr ""
-
-#: ../mdkonline:68
-#, c-format
-msgid "  --login=\t\t     - login name of the user.\n"
-msgstr ""
-
-#: ../mdkonline:69
-#, c-format
-msgid "  --pass=\t\t\t- password  of the user.\n"
-msgstr ""
-
-#: ../mdkonline:87 ../mdkonline:120
-#, c-format
-msgid "Mandriva Online"
-msgstr "Mandriva Online"
-
-#: ../mdkonline:90
-#, c-format
-msgid "I already have an account"
-msgstr "Diġà għandi kont"
-
-#: ../mdkonline:91
-#, c-format
-msgid "I want to subscribe"
-msgstr "Nixtieq nabbona"
-
-#: ../mdkonline:96
-#, c-format
-msgid "Mr."
-msgstr ""
-
-#: ../mdkonline:96
-#, fuzzy, c-format
-msgid "Mrs."
-msgstr "XMrIs"
-
-#: ../mdkonline:96
-#, c-format
-msgid "Ms."
-msgstr ""
-
-#: ../mdkonline:114
-#, c-format
-msgid "Reading configuration\n"
-msgstr "Qed tinqara' l-konfigurazzjoni\n"
-
-#: ../mdkonline:123
-#, c-format
-msgid ""
-"This assistant will help you to upload your configuration\n"
-"(packages, hardware configuration) to a centralized database in\n"
-"order to keep you informed about security updates and useful upgrades.\n"
-msgstr ""
-"Dan l-assistent jgħinek tibgħat il-konfigurazzjoni tiegħek\n"
-"(pakketti, konfigurazzjoni tal-magna) lill database ċentrali sabiex\n"
-"tinżamm infurmat dwar aġġornamenti ta' sigurtà u oħrajn utli.\n"
-
-#: ../mdkonline:131
-#, c-format
-msgid "Account creation or authentication"
-msgstr "Ħolqien jew awtentikazzjoni ta' kont"
-
-#: ../mdkonline:136
-#, c-format
-msgid "Enter your Mandriva Online login, password and machine name:"
-msgstr "Daħħal il-login, password u isem tal-kompjuter għal Mandriva Online:"
-
-#: ../mdkonline:142 ../mdkonline:195
-#, fuzzy, c-format
-msgid "Email address:"
-msgstr "Indirizz tal-imejl li ħiereġ"
-
-#: ../mdkonline:143
-#, c-format
-msgid "Country"
-msgstr "Pajjiż"
-
-#: ../mdkonline:144 ../mdkonline:196
-#, c-format
-msgid "Password:"
-msgstr "Password:"
-
-#: ../mdkonline:146
-#, fuzzy, c-format
-msgid "Machine description:"
-msgstr "Isem tal-kompjuter:"
-
-#: ../mdkonline:147
-#, c-format
-msgid "(Ex: My Home Office's Computer)"
-msgstr ""
-
-#: ../mdkonline:152 ../mdkonline:159 ../mdkonline:180 ../mdkonline:204
-#: ../mdkonline:208 ../mdkonline:212 ../mdkonline:217 ../mdkupdate:141
-#: ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
-#, c-format
-msgid "Error"
-msgstr "Problema"
-
-#: ../mdkonline:152
-#, fuzzy, c-format
-msgid "Machine name must be 1 to 40 alphanumerical characters"
-msgstr "Punti tal-immunar jista' jkun fihom biss ittri u numri"
-
-#: ../mdkonline:155
-#, c-format
-msgid "Connecting to Mandriva Online website..."
-msgstr "Qed naqbad mas-sit Mandriva Online..."
-
-#: ../mdkonline:167
-#, c-format
-msgid ""
-"In order to benefit from Mandriva Online services,\n"
-"we are about to upload your configuration.\n"
-"\n"
-"The Wizard will now send the following information to Mandriva:\n"
-"\n"
-"1) the list of packages you have installed on your system,\n"
-"\n"
-"2) your hardware configuration.\n"
-"\n"
-"If you feel uncomfortable by that idea, or do not want to benefit from this "
-"service,\n"
-"please press 'Cancel'. By pressing 'Next', you allow us to keep you "
-"informed\n"
-"about security updates and useful upgrades via personalized email alerts.\n"
-"Furthermore, you benefit from discounted paid support services on\n"
-"www.mandrivaexpert.com."
-msgstr ""
-"Biex tibbenefika mis-servizzi ta' Mandriva Online,\n"
-"irridu nibgħatu l-konfigurazzjoni tiegħel.\n"
-"\n"
-"Is-Saħħar se jibgħat din l-informazzjoni lill Mandriva:\n"
-"\n"
-"1) Lista tal-pakketti li huma nstallati fuq is-sistema tiegħek,\n"
-"\n"
-"2) Il-konfigurazzjoni tal-ħardwer tal-kompjuter.\n"
-"\n"
-"Jekk ma tħossokx komdu b'dan, jew jekk ma tixtieqx tibbenefika minn dan is-"
-"servizz,\n"
-"jekk jogħġbok agħfas \"Ikkanċella\". Jekk tagħfas \"Li jmiss\", int "
-"tippermettilna\n"
-"li nżommuk informat dwar aġġornamenti fis-sigurtà u aġġornamenti oħra utli\n"
-"permezz ta' messaġġi bl-imejl personalizzati. Minnbarra dan, int tieħu "
-"vantaġġ\n"
-"minn skonti fuq servizzi oħra bil-ħlas minn www.mandrivaexpert.com."
-
-#: ../mdkonline:180
-#, c-format
-msgid "Connection problem"
-msgstr "Problema fil-konnessjoni"
-
-#: ../mdkonline:180
-#, c-format
-msgid "Problem occurs when uploading files, please try again"
-msgstr "Problema waqt li jintbagħtu l-fajls, erġa' pprova"
-
-#: ../mdkonline:187
-#, c-format
-msgid "Create a Mandriva Online Account"
-msgstr "Oħloq kont Mandriva Online"
-
-#. -PO: that is for things like "Mr", "Ms",...
-#: ../mdkonline:192
-#, fuzzy, c-format
-msgid "Greeting:"
-msgstr "Aħdar"
-
-#: ../mdkonline:193
-#, c-format
-msgid "First name:"
-msgstr "Isem proprju:"
-
-#: ../mdkonline:194
-#, fuzzy, c-format
-msgid "Last name:"
-msgstr "Isem proprju:"
-
-#: ../mdkonline:197
-#, c-format
-msgid "Confirm Password:"
-msgstr "Ikkonferma password:"
-
-#: ../mdkonline:204
-#, c-format
-msgid ""
-"The passwords do not match\n"
-" Please try again\n"
-msgstr ""
-"Il-passwords ma jaqblux.\n"
-"Jekk jogħġbok erġa' pprova\n"
-
-#: ../mdkonline:208
-#, fuzzy, c-format
-msgid "Please fill in each field"
-msgstr "Jekk jogħġbok imla l-kaxex kollha\n"
-
-#: ../mdkonline:212
-#, c-format
-msgid "Not a valid mail address!\n"
-msgstr "Dan mhux indirizz tal-imejl validu!\n"
-
-#: ../mdkonline:217
-#, c-format
-msgid "Creating account failed!"
-msgstr ""
-
-#: ../mdkonline:225
-#, c-format
-msgid ""
-"Mandriva Online Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
-msgstr ""
-"Kont Mandriva Online inħoloq.\n"
-"Jekk jogħġbok agħfas \"Li Jmiss\" biex tawtentika ruħek u tibgħat il-"
-"konfigurazzjoni\n"
-
-#: ../mdkonline:229
-#, c-format
-msgid "Your upload was successful!"
-msgstr "It-trasferiment tal-informazzjoni rnexxa."
-
-#: ../mdkonline:229
+#: ../mdkapplet:478
 #, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandriva Online."
-msgstr ""
-"Minn issa 'l quddiem int tirċievi notifiki dwar \n"
-"sigurtà u aġġornamenti minngħand Mandriva Online."
+msgid "Online WebSite"
+msgstr "Sit online"
 
-#: ../mdkonline:229
+#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
+#: ../mdkapplet:483
 #, c-format
-msgid ""
-"Mandriva Online offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
+msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
-"Mandriva Online joffrilek il-possibbiltà li taġġorna s-sistema "
-"awtomatikament.\n"
-"Regularment jitħaddem programm fuq is-sistema biex jistenna aġġornamenti.\n"
-
-#: ../mdkonline:238
-#, c-format
-msgid "Congratulations"
-msgstr "Prosit"
 
-#: ../mdkonline:238
+#: ../mdkapplet:492
 #, c-format
-msgid "Your Mandriva Online account has been successfully configured\n"
-msgstr "Il-kont Mandriva Online tiegħek ġie konfigurat\n"
-
-#: ../mdkonline:253
-#, fuzzy, c-format
-msgid "Configuration uploaded successfully"
-msgstr "It-trasferiment tal-informazzjoni rnexxa."
-
-#: ../mdkonline:254
-#, fuzzy, c-format
-msgid "Problem uploading configuration"
-msgstr "Qed tinqara' l-konfigurazzjoni\n"
+msgid "Always launch on startup"
+msgstr "Dejjem ħaddem mat-tlugħ"
 
-#: ../mdkonline:256
+#: ../mdkapplet:494
 #, c-format
-msgid ""
-"Cannot connect to Mandriva Online website: wrong login/password or router/"
-"firewall bad settings"
-msgstr ""
+msgid "Quit"
+msgstr "Oħroġ"
 
 #: ../mdkonline.pm:207
 #, fuzzy, c-format
@@ -816,6 +355,11 @@ msgstr ""
 "\n"
 "użu:\n"
 
+#: ../mdkupdate:73
+#, c-format
+msgid "  --help\t\t- print this help message.\n"
+msgstr "  --help\t\t- uri dan il-messaġġ ta' għajnuna.\n"
+
 #: ../mdkupdate:74
 #, c-format
 msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
@@ -843,11 +387,6 @@ msgid ""
 "file.\n"
 msgstr ""
 
-#: ../mdkupdate:118 ../mdkupdate:164
-#, c-format
-msgid "Warning"
-msgstr "Twissija"
-
 #. -PO: here Live Install is currently *NOT* translated on the desktop, so it's better to keep as it:
 #: ../mdkupdate:120
 #, c-format
@@ -856,11 +395,21 @@ msgid ""
 "Install' wizard."
 msgstr ""
 
+#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
+#, c-format
+msgid "Please wait"
+msgstr "Stenna ftit"
+
 #: ../mdkupdate:123 ../mdkupdate:174
 #, c-format
 msgid "Preparing..."
 msgstr "Qed nipprepara..."
 
+#: ../mdkupdate:141 ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
+#, c-format
+msgid "Error"
+msgstr "Problema"
+
 #: ../mdkupdate:141
 #, c-format
 msgid ""
@@ -869,6 +418,11 @@ msgid ""
 "%s"
 msgstr ""
 
+#: ../mdkupdate:159 ../mdkupdate:188
+#, c-format
+msgid "An error occurred"
+msgstr "Inqalgħet problema"
+
 #: ../mdkupdate:164
 #, c-format
 msgid ""
@@ -893,6 +447,282 @@ msgstr "Qed ninstalla pakketti...\n"
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "Ma stajtx naġġorna pakketti mis-sors update_source.\n"
 
+#, fuzzy
+#~ msgid "New bundles are available for your system"
+#~ msgstr "Hemm aġġornamenti ġodda għas-sistema tiegħek"
+
+#~ msgid "Service is not configured. Please click on \"Configure the service\""
+#~ msgstr ""
+#~ "Is-servizz għadu mhux konfigurat. Ikklikkja fuq \"Ikkonfigura s-servizz\""
+
+#~ msgid "Configure the service"
+#~ msgstr "Ikkonfigura s-servizz"
+
+#~ msgid "Check updates"
+#~ msgstr "Iċċekkja aġġornamenti"
+
+#~ msgid "Configure Now!"
+#~ msgstr "Ikkonfigura issa"
+
+#~ msgid "Actions"
+#~ msgstr "Azzjonijiet"
+
+#~ msgid "Configure"
+#~ msgstr "Ikkonfigura"
+
+#~ msgid "See logs"
+#~ msgstr "Ara logs"
+
+#~ msgid "Status"
+#~ msgstr "Stat"
+
+#~ msgid "Close"
+#~ msgstr "Agħlaq"
+
+#~ msgid "Network Connection: "
+#~ msgstr "Konnessjoni network:"
+
+#~ msgid "Up"
+#~ msgstr "Fuq"
+
+#~ msgid "Down"
+#~ msgstr "isfel"
+
+#~ msgid "Last check: "
+#~ msgstr "L-aħħar li ċċekkjajt: "
+
+#~ msgid "Machine name:"
+#~ msgstr "Isem tal-kompjuter:"
+
+#~ msgid "Updates: "
+#~ msgstr "Aġġornamenti: "
+
+#~ msgid "Development release not supported by service"
+#~ msgstr "Verżjoni ta' żvilupp mhux sapportita mis-servizz"
+
+#~ msgid "Too old release not supported by service"
+#~ msgstr "Verżjoni antika wisq mhux sapportita mis-servizz"
+
+#~ msgid "Unknown state"
+#~ msgstr "Stat mhux magħruf"
+
+#~ msgid "Online services disabled. Contact Mandriva Online site\n"
+#~ msgstr ""
+#~ "Servizzi online mhux attivi. Ikkuntattja s-sit ta' Mandriva Online\n"
+
+#~ msgid "Wrong Password.\n"
+#~ msgstr "Password ħażina.\n"
+
+#~ msgid "Wrong Action or host or login.\n"
+#~ msgstr "Azzjoni, login jew server ħażin.\n"
+
+#~ msgid ""
+#~ "Something is wrong with your network settings (check your route, firewall "
+#~ "or proxy settings)\n"
+#~ msgstr ""
+#~ "Hemm problema bis-setings tan-network tiegħek (iċċekkja s-setings ta' "
+#~ "route, firewall jew proxy)\n"
+
+#, fuzzy
+#~ msgid "Response from Mandriva Online server\n"
+#~ msgstr "Merħba għal Mandriva Online"
+
+#~ msgid "No check"
+#~ msgstr "Ebda ċċekkjar"
+
+#~ msgid "Checking config file: Not present\n"
+#~ msgstr "Qed jiġi ċċekkjat fajl ta' konfigurazzjoni: mhux preżenti\n"
+
+#~ msgid "Logs"
+#~ msgstr "Logs"
+
+#~ msgid "Clear"
+#~ msgstr "Ħassar"
+
+#~ msgid ""
+#~ "mdonline version %s\n"
+#~ "Copyright (C) %s Mandriva.\n"
+#~ "This is free software and may be redistributed under the terms of the GNU "
+#~ "GPL.\n"
+#~ "\n"
+#~ "usage:\n"
+#~ msgstr ""
+#~ "mdonline verżjoni %s\n"
+#~ "Copyright (C) %s Mandriva.\n"
+#~ "Dan huwa softwer ħieles u jista' jiġi distribwit taħt it-termini tal-GNU "
+#~ "GPL.\n"
+#~ "\n"
+#~ "użu:\n"
+
+#~ msgid "Mandriva Online"
+#~ msgstr "Mandriva Online"
+
+#~ msgid "I already have an account"
+#~ msgstr "Diġà għandi kont"
+
+#~ msgid "I want to subscribe"
+#~ msgstr "Nixtieq nabbona"
+
+#, fuzzy
+#~ msgid "Mrs."
+#~ msgstr "XMrIs"
+
+#~ msgid "Reading configuration\n"
+#~ msgstr "Qed tinqara' l-konfigurazzjoni\n"
+
+#~ msgid ""
+#~ "This assistant will help you to upload your configuration\n"
+#~ "(packages, hardware configuration) to a centralized database in\n"
+#~ "order to keep you informed about security updates and useful upgrades.\n"
+#~ msgstr ""
+#~ "Dan l-assistent jgħinek tibgħat il-konfigurazzjoni tiegħek\n"
+#~ "(pakketti, konfigurazzjoni tal-magna) lill database ċentrali sabiex\n"
+#~ "tinżamm infurmat dwar aġġornamenti ta' sigurtà u oħrajn utli.\n"
+
+#~ msgid "Account creation or authentication"
+#~ msgstr "Ħolqien jew awtentikazzjoni ta' kont"
+
+#~ msgid "Enter your Mandriva Online login, password and machine name:"
+#~ msgstr ""
+#~ "Daħħal il-login, password u isem tal-kompjuter għal Mandriva Online:"
+
+#, fuzzy
+#~ msgid "Email address:"
+#~ msgstr "Indirizz tal-imejl li ħiereġ"
+
+#~ msgid "Country"
+#~ msgstr "Pajjiż"
+
+#~ msgid "Password:"
+#~ msgstr "Password:"
+
+#, fuzzy
+#~ msgid "Machine description:"
+#~ msgstr "Isem tal-kompjuter:"
+
+#, fuzzy
+#~ msgid "Machine name must be 1 to 40 alphanumerical characters"
+#~ msgstr "Punti tal-immunar jista' jkun fihom biss ittri u numri"
+
+#~ msgid "Connecting to Mandriva Online website..."
+#~ msgstr "Qed naqbad mas-sit Mandriva Online..."
+
+#~ msgid ""
+#~ "In order to benefit from Mandriva Online services,\n"
+#~ "we are about to upload your configuration.\n"
+#~ "\n"
+#~ "The Wizard will now send the following information to Mandriva:\n"
+#~ "\n"
+#~ "1) the list of packages you have installed on your system,\n"
+#~ "\n"
+#~ "2) your hardware configuration.\n"
+#~ "\n"
+#~ "If you feel uncomfortable by that idea, or do not want to benefit from "
+#~ "this service,\n"
+#~ "please press 'Cancel'. By pressing 'Next', you allow us to keep you "
+#~ "informed\n"
+#~ "about security updates and useful upgrades via personalized email "
+#~ "alerts.\n"
+#~ "Furthermore, you benefit from discounted paid support services on\n"
+#~ "www.mandrivaexpert.com."
+#~ msgstr ""
+#~ "Biex tibbenefika mis-servizzi ta' Mandriva Online,\n"
+#~ "irridu nibgħatu l-konfigurazzjoni tiegħel.\n"
+#~ "\n"
+#~ "Is-Saħħar se jibgħat din l-informazzjoni lill Mandriva:\n"
+#~ "\n"
+#~ "1) Lista tal-pakketti li huma nstallati fuq is-sistema tiegħek,\n"
+#~ "\n"
+#~ "2) Il-konfigurazzjoni tal-ħardwer tal-kompjuter.\n"
+#~ "\n"
+#~ "Jekk ma tħossokx komdu b'dan, jew jekk ma tixtieqx tibbenefika minn dan "
+#~ "is-servizz,\n"
+#~ "jekk jogħġbok agħfas \"Ikkanċella\". Jekk tagħfas \"Li jmiss\", int "
+#~ "tippermettilna\n"
+#~ "li nżommuk informat dwar aġġornamenti fis-sigurtà u aġġornamenti oħra "
+#~ "utli\n"
+#~ "permezz ta' messaġġi bl-imejl personalizzati. Minnbarra dan, int tieħu "
+#~ "vantaġġ\n"
+#~ "minn skonti fuq servizzi oħra bil-ħlas minn www.mandrivaexpert.com."
+
+#~ msgid "Connection problem"
+#~ msgstr "Problema fil-konnessjoni"
+
+#~ msgid "Problem occurs when uploading files, please try again"
+#~ msgstr "Problema waqt li jintbagħtu l-fajls, erġa' pprova"
+
+#~ msgid "Create a Mandriva Online Account"
+#~ msgstr "Oħloq kont Mandriva Online"
+
+#, fuzzy
+#~ msgid "Greeting:"
+#~ msgstr "Aħdar"
+
+#~ msgid "First name:"
+#~ msgstr "Isem proprju:"
+
+#, fuzzy
+#~ msgid "Last name:"
+#~ msgstr "Isem proprju:"
+
+#~ msgid "Confirm Password:"
+#~ msgstr "Ikkonferma password:"
+
+#~ msgid ""
+#~ "The passwords do not match\n"
+#~ " Please try again\n"
+#~ msgstr ""
+#~ "Il-passwords ma jaqblux.\n"
+#~ "Jekk jogħġbok erġa' pprova\n"
+
+#, fuzzy
+#~ msgid "Please fill in each field"
+#~ msgstr "Jekk jogħġbok imla l-kaxex kollha\n"
+
+#~ msgid "Not a valid mail address!\n"
+#~ msgstr "Dan mhux indirizz tal-imejl validu!\n"
+
+#~ msgid ""
+#~ "Mandriva Online Account successfully created.\n"
+#~ "Please click \"Next\" to authenticate and upload your configuration\n"
+#~ msgstr ""
+#~ "Kont Mandriva Online inħoloq.\n"
+#~ "Jekk jogħġbok agħfas \"Li Jmiss\" biex tawtentika ruħek u tibgħat il-"
+#~ "konfigurazzjoni\n"
+
+#~ msgid "Your upload was successful!"
+#~ msgstr "It-trasferiment tal-informazzjoni rnexxa."
+
+#~ msgid ""
+#~ "From now you will receive on security and updates \n"
+#~ "announcements thanks to Mandriva Online."
+#~ msgstr ""
+#~ "Minn issa 'l quddiem int tirċievi notifiki dwar \n"
+#~ "sigurtà u aġġornamenti minngħand Mandriva Online."
+
+#~ msgid ""
+#~ "Mandriva Online offers you the ability to automate the updates.\n"
+#~ "A program will run regulary in your system waiting for new updates\n"
+#~ msgstr ""
+#~ "Mandriva Online joffrilek il-possibbiltà li taġġorna s-sistema "
+#~ "awtomatikament.\n"
+#~ "Regularment jitħaddem programm fuq is-sistema biex jistenna "
+#~ "aġġornamenti.\n"
+
+#~ msgid "Congratulations"
+#~ msgstr "Prosit"
+
+#~ msgid "Your Mandriva Online account has been successfully configured\n"
+#~ msgstr "Il-kont Mandriva Online tiegħek ġie konfigurat\n"
+
+#, fuzzy
+#~ msgid "Configuration uploaded successfully"
+#~ msgstr "It-trasferiment tal-informazzjoni rnexxa."
+
+#, fuzzy
+#~ msgid "Problem uploading configuration"
+#~ msgstr "Qed tinqara' l-konfigurazzjoni\n"
+
 #~ msgid "  --applet\t\t- launch Mandriva Update.\n"
 #~ msgstr "  --applet\t\t- ħaddem Mandriva Update.\n"
 
diff --git a/po/nb.po b/po/nb.po
index 7636d64b..fb13764b 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nb\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-09 16:26+0200\n"
+"POT-Creation-Date: 2008-02-21 18:21+0100\n"
 "PO-Revision-Date: 2007-09-14 16:32+0200\n"
 "Last-Translator: Per Øyvind Karlsen <peroyvind@mandriva.org>\n"
 "Language-Team: Norwegian Bokmål <i18n-no@lister.ping.uio.no>\n"
@@ -24,17 +24,17 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. -PO: here %s will be replaced by the local time (eg: "Will check updates at 14:03:50"
-#: ../mdkapplet:94
+#: ../mdkapplet:88
 #, c-format
 msgid "Will check updates at %s"
 msgstr "Vil se etter oppdateringer på %s"
 
-#: ../mdkapplet:103
+#: ../mdkapplet:97
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "Systemet ditt er oppdatert"
 
-#: ../mdkapplet:109
+#: ../mdkapplet:103
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -43,52 +43,44 @@ msgstr ""
 "Tjenestekonfigurasjonsproblem. Vennligst sjekk logger og send e-post til "
 "support@mandrivaonline.com"
 
-#: ../mdkapplet:115
+#: ../mdkapplet:110
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "Finner tilgjengelige pakker …"
 
-#: ../mdkapplet:121
+#: ../mdkapplet:116
 #, c-format
 msgid "New updates are available for your system"
 msgstr "Nye oppdateringer er tilgjengelig for ditt system"
 
-#: ../mdkapplet:127
-#, c-format
-msgid "New bundles are available for your system"
-msgstr "Nye programvaresamlinger er tilgjengelig for ditt system"
-
-#: ../mdkapplet:133
-#, c-format
-msgid "Service is not configured. Please click on \"Configure the service\""
-msgstr "Tjenesten er ikke konfigurert. Velg «Sett opp tjenesten»"
-
-#: ../mdkapplet:139
+#: ../mdkapplet:122
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "Nettverket er nede. Vennligst sett opp nettverket ditt"
 
-#: ../mdkapplet:145
+#: ../mdkapplet:128
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "\tTjenesten er ikke aktivert. Vennligst klikk på «Online-nettsted»"
 
-#: ../mdkapplet:151 ../mdkapplet:182
+#: ../mdkapplet:134 ../mdkapplet:165
 #, c-format
 msgid "urpmi database locked"
 msgstr "urpmi-database låst"
 
-#: ../mdkapplet:157
+#: ../mdkapplet:140
 #, c-format
 msgid "Release not supported (too old release, or development release)"
-msgstr "Versjonen er ikke støttet (for gammel versjon, eller utviklingsversjon)"
+msgstr ""
+"Versjonen er ikke støttet (for gammel versjon, eller utviklingsversjon)"
 
-#: ../mdkapplet:163
+#: ../mdkapplet:146
 #, c-format
-msgid "No medium found. You must add some media through 'Software Media Manager'."
+msgid ""
+"No medium found. You must add some media through 'Software Media Manager'."
 msgstr "Fant inget medium. Du må legge til medium gjennom «Mediehåndtering»."
 
-#: ../mdkapplet:169
+#: ../mdkapplet:152
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -104,573 +96,133 @@ msgstr ""
 "\n"
 "Start så %s på nytt."
 
-#: ../mdkapplet:174
+#: ../mdkapplet:157
 #, c-format
 msgid "Enabled"
 msgstr "Aktivert"
 
-#: ../mdkapplet:187
+#: ../mdkapplet:170
 #, c-format
 msgid "Error updating media"
 msgstr "Feil ved oppdatering av medie"
 
-#: ../mdkapplet:202
+#: ../mdkapplet:185
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr "Sjekker … Nye oppdateringer er tilgjengelig\n"
 
-#: ../mdkapplet:207
+#: ../mdkapplet:190
 #, c-format
 msgid "Packages are up to date"
 msgstr "Alle pakker er oppdaterte"
 
-#: ../mdkapplet:212
+#: ../mdkapplet:195
 #, c-format
 msgid "Failed to open urpmi database"
 msgstr "Klarte ikke åpne urpmi-database"
 
-#: ../mdkapplet:217 ../mdkapplet:324
+#: ../mdkapplet:200
 #, c-format
 msgid "Install updates"
 msgstr "Installer oppdateringer"
 
-#: ../mdkapplet:218
-#, c-format
-msgid "Configure the service"
-msgstr "Sett opp tjenesten"
-
-#: ../mdkapplet:219
+#: ../mdkapplet:201
 #, c-format
 msgid "Check Updates"
 msgstr "Sjekk etter oppdateringer"
 
-#: ../mdkapplet:220 ../mdkapplet:327 ../mdkonline:114 ../mdkonline:155
-#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
-#, c-format
-msgid "Please wait"
-msgstr "Vennligst vent"
-
-#: ../mdkapplet:220 ../mdkapplet:326 ../mdkapplet:327
-#, c-format
-msgid "Check updates"
-msgstr "Sjekk etter oppdateringer"
-
-#: ../mdkapplet:223 ../mdkapplet:648
-#, c-format
-msgid "Online WebSite"
-msgstr "Hjemmeside"
-
-#: ../mdkapplet:224
+#: ../mdkapplet:202
 #, c-format
 msgid "Configure Network"
 msgstr "Sett opp nettverk"
 
-#: ../mdkapplet:225
-#, c-format
-msgid "Configure Now!"
-msgstr "Sett opp nå!"
-
-#: ../mdkapplet:313 ../mdkapplet:392
-#, c-format
-msgid "Mandriva Linux Updates Applet"
-msgstr "Panelprogram Mandriva Linux-oppdateringer"
-
-#: ../mdkapplet:322
-#, c-format
-msgid "Actions"
-msgstr "Handlinger"
-
-#: ../mdkapplet:325
-#, c-format
-msgid "Configure"
-msgstr "Sett opp"
-
-#: ../mdkapplet:329
-#, c-format
-msgid "See logs"
-msgstr "Se logger"
-
-#: ../mdkapplet:332
-#, c-format
-msgid "Status"
-msgstr "Status"
-
-#: ../mdkapplet:336 ../mdkapplet:597
-#, c-format
-msgid "Close"
-msgstr "Lukk"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Network Connection: "
-msgstr "Nettverkstilkobling: "
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Up"
-msgstr "Oppe"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Down"
-msgstr "Nede"
-
-#: ../mdkapplet:366
-#, c-format
-msgid "Last check: "
-msgstr "Sist sjekket: "
-
-#: ../mdkapplet:367 ../mdkonline:145
-#, c-format
-msgid "Machine name:"
-msgstr "Maskinnavn:"
-
-#: ../mdkapplet:368
-#, c-format
-msgid "Updates: "
-msgstr "Oppdateringer: "
-
-#: ../mdkapplet:372
+#: ../mdkapplet:283
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Starter drakconnect\n"
 
-#: ../mdkapplet:375
+#: ../mdkapplet:286
 #, c-format
 msgid "Mandriva Online seems to be reinstalled, reloading applet ...."
-msgstr "Mandriva Online ser ut til å være installert på nytt. Starter panelprogrammet på nytt …"
+msgstr ""
+"Mandriva Online ser ut til å være installert på nytt. Starter "
+"panelprogrammet på nytt …"
 
-#: ../mdkapplet:383
+#: ../mdkapplet:294
 #, c-format
 msgid "Launching MandrivaUpdate\n"
 msgstr "Starter MandrivaUpdate\n"
 
-#: ../mdkapplet:398
+#: ../mdkapplet:303
+#, c-format
+msgid "Mandriva Linux Updates Applet"
+msgstr "Panelprogram Mandriva Linux-oppdateringer"
+
+#: ../mdkapplet:308
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Gransker nye oppdateringer …\n"
 
-#: ../mdkapplet:399
+#: ../mdkapplet:309
 #, c-format
 msgid "Connecting to"
 msgstr "Kobler til"
 
-#: ../mdkapplet:467 ../mdkupdate:159 ../mdkupdate:188
-#, c-format
-msgid "An error occurred"
-msgstr "En feil oppstod"
-
-#: ../mdkapplet:475
-#, c-format
-msgid "Development release not supported by service"
-msgstr "Utviklingsversjon er ikke støttet av tjenesten"
-
-#: ../mdkapplet:476
-#, c-format
-msgid "Too old release not supported by service"
-msgstr "Gamle versjoner er ikke støttet av tjenesten"
-
-#: ../mdkapplet:477
-#, c-format
-msgid "Unknown state"
-msgstr "Ukjent tilstand"
-
-#: ../mdkapplet:478
-#, c-format
-msgid "Online services disabled. Contact Mandriva Online site\n"
-msgstr "Tjenesten er avslått. Kontakt Mandriva Online\n"
-
-#: ../mdkapplet:479
-#, c-format
-msgid "Wrong Password.\n"
-msgstr "Feil passord.\n"
-
-#: ../mdkapplet:480
-#, c-format
-msgid "Wrong Action or host or login.\n"
-msgstr "Ugyldig handling, vert eller brukernavn.\n"
-
-#: ../mdkapplet:481
-#, c-format
-msgid ""
-"Something is wrong with your network settings (check your route, firewall or "
-"proxy settings)\n"
-msgstr "Noe er galt med ditt nettverksoppsett (sjekk oppsett for din ruter, brannmur eller mellomtjener).\n"
-
-#: ../mdkapplet:483
-#, c-format
-msgid ""
-"Problem occured while connecting to the server, please contact the support "
-"team"
-msgstr "Et problem oppstod under tilkobling til tjeneren, kontakt brukerstøtte"
-
-#: ../mdkapplet:487
-#, c-format
-msgid "Response from Mandriva Online server\n"
-msgstr "Svar fra Mandriva Online-tjeneren\n"
-
-#: ../mdkapplet:490
+#: ../mdkapplet:386
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Systemet er oppdatert\n"
 
-#: ../mdkapplet:527
-#, c-format
-msgid "No check"
-msgstr "Ingen sjekk"
-
-#: ../mdkapplet:541
-#, c-format
-msgid "Checking config file: Not present\n"
-msgstr "Sjekker konfigurasjonsfil: Mangler\n"
-
-#: ../mdkapplet:544
+#: ../mdkapplet:415
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Sjekker nettverk: ser ut til å være deaktivert\n"
 
-#: ../mdkapplet:587
+#: ../mdkapplet:457 ../mdkupdate:118 ../mdkupdate:164
 #, c-format
-msgid "Logs"
-msgstr "Logger"
-
-#: ../mdkapplet:603
-#, c-format
-msgid "Clear"
-msgstr "Tøm"
+msgid "Warning"
+msgstr "Advarsel"
 
-#: ../mdkapplet:629
+#: ../mdkapplet:468
 #, c-format
 msgid "About..."
 msgstr "Om …"
 
-#: ../mdkapplet:631
+#: ../mdkapplet:472
 #, c-format
 msgid "Mandriva Online %s"
 msgstr "Mandriva Online %s"
 
-#: ../mdkapplet:635
+#: ../mdkapplet:473
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Copyright © %s Mandriva"
 
-#: ../mdkapplet:647
+#: ../mdkapplet:476
 #, c-format
 msgid "Mandriva Online gives access to Mandriva web services."
 msgstr "Mandriva Online gir deg tilgang til Mandriva's nettjenester."
 
-#: ../mdkapplet:655
-#, c-format
-msgid "Always launch on startup"
-msgstr "Kjør alltid under oppstart"
-
-#: ../mdkapplet:657
-#, c-format
-msgid "Quit"
-msgstr "Avslutt"
-
-#: ../mdkonline:58
-#, c-format
-msgid ""
-"mdonline version %s\n"
-"Copyright (C) %s Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"mdonline versjon %s\n"
-"Copyright (C) %s Mandriva.\n"
-"Dette er fri programvare og kan videredistribueres under vilkårene til "
-"GNU GPL.\n"
-"\n"
-"bruk:\n"
-
-#: ../mdkonline:63 ../mdkupdate:73
-#, c-format
-msgid "  --help\t\t- print this help message.\n"
-msgstr "  --help\t\t– vis denne hjelpebeskjeden\n"
-
-#: ../mdkonline:64
-#, c-format
-msgid "  --box=\t\t\t- hostname.\n"
-msgstr "  --box=\t\t\t– Vertsnavn.\n"
-
-#: ../mdkonline:65
-#, c-format
-msgid "  --country\t\t\t- name of country of the user. \n"
-msgstr "  --country\t\t\t– Navnet på landet til brukeren. \n"
-
-#: ../mdkonline:66
-#, c-format
-msgid "  --interactive\t\t- use the interactive mode.\n"
-msgstr "  --interactive\t\t– Bruk interaktivt modus.\n"
-
-#: ../mdkonline:67
-#, c-format
-msgid "  --nointeractive\t- use the non-interactive mode.\n"
-msgstr "  --nointeractive\t– Bruk ikke-interaktivt modus.\n"
-
-#: ../mdkonline:68
-#, c-format
-msgid "  --login=\t\t     - login name of the user.\n"
-msgstr "  --login=\t\t     – Innloggingsnavnet til brukeren.\n"
-
-#: ../mdkonline:69
-#, c-format
-msgid "  --pass=\t\t\t- password  of the user.\n"
-msgstr "  --pass=\t\t\t– Passordet til brukeren.\n"
-
-#: ../mdkonline:87 ../mdkonline:120
-#, c-format
-msgid "Mandriva Online"
-msgstr "Mandriva Online"
-
-#: ../mdkonline:90
-#, c-format
-msgid "I already have an account"
-msgstr "Jeg har allerede en konto"
-
-#: ../mdkonline:91
-#, c-format
-msgid "I want to subscribe"
-msgstr "Jeg vil abonnere"
-
-#: ../mdkonline:96
-#, c-format
-msgid "Mr."
-msgstr "Herr"
-
-#: ../mdkonline:96
-#, c-format
-msgid "Mrs."
-msgstr "Fru"
-
-#: ../mdkonline:96
-#, c-format
-msgid "Ms."
-msgstr "Frøken"
-
-#: ../mdkonline:114
-#, c-format
-msgid "Reading configuration\n"
-msgstr "Leser oppsett\n"
-
-#: ../mdkonline:123
-#, c-format
-msgid ""
-"This assistant will help you to upload your configuration\n"
-"(packages, hardware configuration) to a centralized database in\n"
-"order to keep you informed about security updates and useful upgrades.\n"
-msgstr ""
-"Denne assistenten vil hjelpe deg med å laste opp ditt oppsett\n"
-"(pakker, maskinvarekonfigurasjon) til en sentralisert database for å holde\n"
-"deg informert om sikkerhetsoppdateringer og andre nyttgige oppdateringer\n"
-
-#: ../mdkonline:131
-#, c-format
-msgid "Account creation or authentication"
-msgstr "Oppretting eller autentisering av konto"
-
-#: ../mdkonline:136
-#, c-format
-msgid "Enter your Mandriva Online login, password and machine name:"
-msgstr "Tast inn ditt Mandriva Online-brukernavn, passord og maskinnavn:"
-
-#: ../mdkonline:142 ../mdkonline:195
-#, c-format
-msgid "Email address:"
-msgstr "E-postadresse:"
-
-#: ../mdkonline:143
-#, c-format
-msgid "Country"
-msgstr "Land"
-
-#: ../mdkonline:144 ../mdkonline:196
-#, c-format
-msgid "Password:"
-msgstr "Passord:"
-
-#: ../mdkonline:146
-#, c-format
-msgid "Machine description:"
-msgstr "Maskinbeskrivelse:"
-
-#: ../mdkonline:147
-#, c-format
-msgid "(Ex: My Home Office's Computer)"
-msgstr "(Feks: Min hjemmekontormaskin)"
-
-#: ../mdkonline:152 ../mdkonline:159 ../mdkonline:180 ../mdkonline:204
-#: ../mdkonline:208 ../mdkonline:212 ../mdkonline:217 ../mdkupdate:141
-#: ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
-#, c-format
-msgid "Error"
-msgstr "Feil"
-
-#: ../mdkonline:152
-#, c-format
-msgid "Machine name must be 1 to 40 alphanumerical characters"
-msgstr "Maskinnavn må være på mellom 1 og 40 bokstaver/tegn"
-
-#: ../mdkonline:155
-#, c-format
-msgid "Connecting to Mandriva Online website..."
-msgstr "Kobler til Mandriva Online-nettsiden …"
-
-#: ../mdkonline:167
-#, c-format
-msgid ""
-"In order to benefit from Mandriva Online services,\n"
-"we are about to upload your configuration.\n"
-"\n"
-"The Wizard will now send the following information to Mandriva:\n"
-"\n"
-"1) the list of packages you have installed on your system,\n"
-"\n"
-"2) your hardware configuration.\n"
-"\n"
-"If you feel uncomfortable by that idea, or do not want to benefit from this "
-"service,\n"
-"please press 'Cancel'. By pressing 'Next', you allow us to keep you "
-"informed\n"
-"about security updates and useful upgrades via personalized email alerts.\n"
-"Furthermore, you benefit from discounted paid support services on\n"
-"www.mandrivaexpert.com."
-msgstr ""
-"For å dra nytte av Mandriva Online-tjenester,\n"
-"så er vi på vei til å laste opp din konfigurasjon.\n"
-"\n"
-"Veiviseren vil nå sende den følgende informasjonen til Mandriva:\n"
-"\n"
-"1) liste over pakker installert på ditt system,\n"
-"\n"
-"2) ditt maskinvareoppsett.\n"
-"\n"
-"Om du ikke ønsker dette, og ikke vil bruk bruke tjenesten, må du velge «Avbryt».\n"
-"Ved å presse «Neste», så tillater du oss å holde deg informert via e-post når det\n"
-"kommer nye sikkerhetsoppdateringer og andre nyttige oppdateringer.\n"
-"Du får òg rabba på kundestøttetjenestene våre på www.mandrivaexpert.com."
-
-#: ../mdkonline:180
-#, c-format
-msgid "Connection problem"
-msgstr "Tilkoblingsproblem"
-
-#: ../mdkonline:180
-#, c-format
-msgid "Problem occurs when uploading files, please try again"
-msgstr "Problem oppstod under opplasting av filer. Prøv på nytt."
-
-#: ../mdkonline:187
-#, c-format
-msgid "Create a Mandriva Online Account"
-msgstr "Opprett en Mandriva Online-konto"
-
-#. -PO: that is for things like "Mr", "Ms",...
-#: ../mdkonline:192
-#, c-format
-msgid "Greeting:"
-msgstr "Hilsen:"
-
-#: ../mdkonline:193
-#, c-format
-msgid "First name:"
-msgstr "Fornavn:"
-
-#: ../mdkonline:194
-#, c-format
-msgid "Last name:"
-msgstr "Etternavn:"
-
-#: ../mdkonline:197
-#, c-format
-msgid "Confirm Password:"
-msgstr "Bekreft passord:"
-
-#: ../mdkonline:204
-#, c-format
-msgid ""
-"The passwords do not match\n"
-" Please try again\n"
-msgstr ""
-"Passordene stemmer ikke overens.\n"
-"Prøv på nytt\n"
-
-#: ../mdkonline:208
-#, c-format
-msgid "Please fill in each field"
-msgstr "Fyll ut alle feltene"
-
-#: ../mdkonline:212
-#, c-format
-msgid "Not a valid mail address!\n"
-msgstr "Ugyldig e-postadresse!\n"
-
-#: ../mdkonline:217
-#, c-format
-msgid "Creating account failed!"
-msgstr "Klarte ikke opprette konto!"
-
-#: ../mdkonline:225
-#, c-format
-msgid ""
-"Mandriva Online Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
-msgstr ""
-"Fullført oppretting av Mandriva Online-konto.\n"
-"Trykk «Neste» for å autentisere og laste opp oppsettet ditt\n"
-
-#: ../mdkonline:229
-#, c-format
-msgid "Your upload was successful!"
-msgstr "Opplasting vellykket!"
-
-#: ../mdkonline:229
+#: ../mdkapplet:478
 #, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandriva Online."
-msgstr "Fra nå av vil du motta varsel om sikkerhets- og andre nyttige\n oppdateringer fra Mandriva Online."
+msgid "Online WebSite"
+msgstr "Hjemmeside"
 
-#: ../mdkonline:229
+#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
+#: ../mdkapplet:483
 #, c-format
-msgid ""
-"Mandriva Online offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
+msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
-"Mandriva Online gjør det mulig å automatisere oppdateringene.\n"
-"Et program vil kjøre regelmessig på ditt system i og sjekker etter nye tilgjengelig oppdateringer.\n"
-
-#: ../mdkonline:238
-#, c-format
-msgid "Congratulations"
-msgstr "Gratulerer"
-
-#: ../mdkonline:238
-#, c-format
-msgid "Your Mandriva Online account has been successfully configured\n"
-msgstr "Mandriva Online-kontoen er nå satt opp\n"
 
-#: ../mdkonline:253
+#: ../mdkapplet:492
 #, c-format
-msgid "Configuration uploaded successfully"
-msgstr "Opplasting av oppsett vellykket"
-
-#: ../mdkonline:254
-#, c-format
-msgid "Problem uploading configuration"
-msgstr "Problem ved opplasting av oppsett"
+msgid "Always launch on startup"
+msgstr "Kjør alltid under oppstart"
 
-#: ../mdkonline:256
+#: ../mdkapplet:494
 #, c-format
-msgid ""
-"Cannot connect to Mandriva Online website: wrong login/password or router/"
-"firewall bad settings"
-msgstr ""
-"Kan ikke koble til Mandriva Online-nettsiden: feil brukernavn/passord eller "
-"feil innstillinger i ruter/brannmur."
+msgid "Quit"
+msgstr "Avslutt"
 
 #: ../mdkonline.pm:207
 #, c-format
@@ -814,11 +366,16 @@ msgid ""
 msgstr ""
 "mdkupdate versjon %s\n"
 "Copyright (C) %s Mandriva.\n"
-"Dette er fri programvare og kan videredistribueres under vilkårene til "
-"GNU GPL.\n"
+"Dette er fri programvare og kan videredistribueres under vilkårene til GNU "
+"GPL.\n"
 "\n"
 "bruk:\n"
 
+#: ../mdkupdate:73
+#, c-format
+msgid "  --help\t\t- print this help message.\n"
+msgstr "  --help\t\t– vis denne hjelpebeskjeden\n"
+
 #: ../mdkupdate:74
 #, c-format
 msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
@@ -846,24 +403,31 @@ msgid ""
 "file.\n"
 msgstr "  --bundle fil.bundle\t– Installer pakke fra en .bundle-metainfofil.\n"
 
-#: ../mdkupdate:118 ../mdkupdate:164
-#, c-format
-msgid "Warning"
-msgstr "Advarsel"
-
 #. -PO: here Live Install is currently *NOT* translated on the desktop, so it's better to keep as it:
 #: ../mdkupdate:120
 #, c-format
 msgid ""
 "You first need to install the system on your harddrive with the 'Live "
 "Install' wizard."
-msgstr "Du trenger først å installere systemet på din harddisk med «Live Install»-veiviseren"
+msgstr ""
+"Du trenger først å installere systemet på din harddisk med «Live Install»-"
+"veiviseren"
+
+#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
+#, c-format
+msgid "Please wait"
+msgstr "Vennligst vent"
 
 #: ../mdkupdate:123 ../mdkupdate:174
 #, c-format
 msgid "Preparing..."
 msgstr "Forbereder …"
 
+#: ../mdkupdate:141 ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
+#, c-format
+msgid "Error"
+msgstr "Feil"
+
 #: ../mdkupdate:141
 #, c-format
 msgid ""
@@ -875,6 +439,11 @@ msgstr ""
 "\n"
 "%s"
 
+#: ../mdkupdate:159 ../mdkupdate:188
+#, c-format
+msgid "An error occurred"
+msgstr "En feil oppstod"
+
 #: ../mdkupdate:164
 #, c-format
 msgid ""
@@ -885,7 +454,8 @@ msgid ""
 msgstr ""
 "Denne versjonen av Mandriva Online-klienten er for gammel. \n"
 "\n"
-"Du trenger å oppdatere til en nyere versjon. Du kan hente en ny fra http://start.mandriva.com."
+"Du trenger å oppdatere til en nyere versjon. Du kan hente en ny fra http://"
+"start.mandriva.com."
 
 #: ../mdkupdate:207
 #, c-format
@@ -902,3 +472,303 @@ msgstr "Installerer pakke …\n"
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "Klarte kke oppdatere pakker fra oppdateringsmedium.\n"
 
+#~ msgid "New bundles are available for your system"
+#~ msgstr "Nye programvaresamlinger er tilgjengelig for ditt system"
+
+#~ msgid "Service is not configured. Please click on \"Configure the service\""
+#~ msgstr "Tjenesten er ikke konfigurert. Velg «Sett opp tjenesten»"
+
+#~ msgid "Configure the service"
+#~ msgstr "Sett opp tjenesten"
+
+#~ msgid "Check updates"
+#~ msgstr "Sjekk etter oppdateringer"
+
+#~ msgid "Configure Now!"
+#~ msgstr "Sett opp nå!"
+
+#~ msgid "Actions"
+#~ msgstr "Handlinger"
+
+#~ msgid "Configure"
+#~ msgstr "Sett opp"
+
+#~ msgid "See logs"
+#~ msgstr "Se logger"
+
+#~ msgid "Status"
+#~ msgstr "Status"
+
+#~ msgid "Close"
+#~ msgstr "Lukk"
+
+#~ msgid "Network Connection: "
+#~ msgstr "Nettverkstilkobling: "
+
+#~ msgid "Up"
+#~ msgstr "Oppe"
+
+#~ msgid "Down"
+#~ msgstr "Nede"
+
+#~ msgid "Last check: "
+#~ msgstr "Sist sjekket: "
+
+#~ msgid "Machine name:"
+#~ msgstr "Maskinnavn:"
+
+#~ msgid "Updates: "
+#~ msgstr "Oppdateringer: "
+
+#~ msgid "Development release not supported by service"
+#~ msgstr "Utviklingsversjon er ikke støttet av tjenesten"
+
+#~ msgid "Too old release not supported by service"
+#~ msgstr "Gamle versjoner er ikke støttet av tjenesten"
+
+#~ msgid "Unknown state"
+#~ msgstr "Ukjent tilstand"
+
+#~ msgid "Online services disabled. Contact Mandriva Online site\n"
+#~ msgstr "Tjenesten er avslått. Kontakt Mandriva Online\n"
+
+#~ msgid "Wrong Password.\n"
+#~ msgstr "Feil passord.\n"
+
+#~ msgid "Wrong Action or host or login.\n"
+#~ msgstr "Ugyldig handling, vert eller brukernavn.\n"
+
+#~ msgid ""
+#~ "Something is wrong with your network settings (check your route, firewall "
+#~ "or proxy settings)\n"
+#~ msgstr ""
+#~ "Noe er galt med ditt nettverksoppsett (sjekk oppsett for din ruter, "
+#~ "brannmur eller mellomtjener).\n"
+
+#~ msgid ""
+#~ "Problem occured while connecting to the server, please contact the "
+#~ "support team"
+#~ msgstr ""
+#~ "Et problem oppstod under tilkobling til tjeneren, kontakt brukerstøtte"
+
+#~ msgid "Response from Mandriva Online server\n"
+#~ msgstr "Svar fra Mandriva Online-tjeneren\n"
+
+#~ msgid "No check"
+#~ msgstr "Ingen sjekk"
+
+#~ msgid "Checking config file: Not present\n"
+#~ msgstr "Sjekker konfigurasjonsfil: Mangler\n"
+
+#~ msgid "Logs"
+#~ msgstr "Logger"
+
+#~ msgid "Clear"
+#~ msgstr "Tøm"
+
+#~ msgid ""
+#~ "mdonline version %s\n"
+#~ "Copyright (C) %s Mandriva.\n"
+#~ "This is free software and may be redistributed under the terms of the GNU "
+#~ "GPL.\n"
+#~ "\n"
+#~ "usage:\n"
+#~ msgstr ""
+#~ "mdonline versjon %s\n"
+#~ "Copyright (C) %s Mandriva.\n"
+#~ "Dette er fri programvare og kan videredistribueres under vilkårene til "
+#~ "GNU GPL.\n"
+#~ "\n"
+#~ "bruk:\n"
+
+#~ msgid "  --box=\t\t\t- hostname.\n"
+#~ msgstr "  --box=\t\t\t– Vertsnavn.\n"
+
+#~ msgid "  --country\t\t\t- name of country of the user. \n"
+#~ msgstr "  --country\t\t\t– Navnet på landet til brukeren. \n"
+
+#~ msgid "  --interactive\t\t- use the interactive mode.\n"
+#~ msgstr "  --interactive\t\t– Bruk interaktivt modus.\n"
+
+#~ msgid "  --nointeractive\t- use the non-interactive mode.\n"
+#~ msgstr "  --nointeractive\t– Bruk ikke-interaktivt modus.\n"
+
+#~ msgid "  --login=\t\t     - login name of the user.\n"
+#~ msgstr "  --login=\t\t     – Innloggingsnavnet til brukeren.\n"
+
+#~ msgid "  --pass=\t\t\t- password  of the user.\n"
+#~ msgstr "  --pass=\t\t\t– Passordet til brukeren.\n"
+
+#~ msgid "Mandriva Online"
+#~ msgstr "Mandriva Online"
+
+#~ msgid "I already have an account"
+#~ msgstr "Jeg har allerede en konto"
+
+#~ msgid "I want to subscribe"
+#~ msgstr "Jeg vil abonnere"
+
+#~ msgid "Mr."
+#~ msgstr "Herr"
+
+#~ msgid "Mrs."
+#~ msgstr "Fru"
+
+#~ msgid "Ms."
+#~ msgstr "Frøken"
+
+#~ msgid "Reading configuration\n"
+#~ msgstr "Leser oppsett\n"
+
+#~ msgid ""
+#~ "This assistant will help you to upload your configuration\n"
+#~ "(packages, hardware configuration) to a centralized database in\n"
+#~ "order to keep you informed about security updates and useful upgrades.\n"
+#~ msgstr ""
+#~ "Denne assistenten vil hjelpe deg med å laste opp ditt oppsett\n"
+#~ "(pakker, maskinvarekonfigurasjon) til en sentralisert database for å "
+#~ "holde\n"
+#~ "deg informert om sikkerhetsoppdateringer og andre nyttgige oppdateringer\n"
+
+#~ msgid "Account creation or authentication"
+#~ msgstr "Oppretting eller autentisering av konto"
+
+#~ msgid "Enter your Mandriva Online login, password and machine name:"
+#~ msgstr "Tast inn ditt Mandriva Online-brukernavn, passord og maskinnavn:"
+
+#~ msgid "Email address:"
+#~ msgstr "E-postadresse:"
+
+#~ msgid "Country"
+#~ msgstr "Land"
+
+#~ msgid "Password:"
+#~ msgstr "Passord:"
+
+#~ msgid "Machine description:"
+#~ msgstr "Maskinbeskrivelse:"
+
+#~ msgid "(Ex: My Home Office's Computer)"
+#~ msgstr "(Feks: Min hjemmekontormaskin)"
+
+#~ msgid "Machine name must be 1 to 40 alphanumerical characters"
+#~ msgstr "Maskinnavn må være på mellom 1 og 40 bokstaver/tegn"
+
+#~ msgid "Connecting to Mandriva Online website..."
+#~ msgstr "Kobler til Mandriva Online-nettsiden …"
+
+#~ msgid ""
+#~ "In order to benefit from Mandriva Online services,\n"
+#~ "we are about to upload your configuration.\n"
+#~ "\n"
+#~ "The Wizard will now send the following information to Mandriva:\n"
+#~ "\n"
+#~ "1) the list of packages you have installed on your system,\n"
+#~ "\n"
+#~ "2) your hardware configuration.\n"
+#~ "\n"
+#~ "If you feel uncomfortable by that idea, or do not want to benefit from "
+#~ "this service,\n"
+#~ "please press 'Cancel'. By pressing 'Next', you allow us to keep you "
+#~ "informed\n"
+#~ "about security updates and useful upgrades via personalized email "
+#~ "alerts.\n"
+#~ "Furthermore, you benefit from discounted paid support services on\n"
+#~ "www.mandrivaexpert.com."
+#~ msgstr ""
+#~ "For å dra nytte av Mandriva Online-tjenester,\n"
+#~ "så er vi på vei til å laste opp din konfigurasjon.\n"
+#~ "\n"
+#~ "Veiviseren vil nå sende den følgende informasjonen til Mandriva:\n"
+#~ "\n"
+#~ "1) liste over pakker installert på ditt system,\n"
+#~ "\n"
+#~ "2) ditt maskinvareoppsett.\n"
+#~ "\n"
+#~ "Om du ikke ønsker dette, og ikke vil bruk bruke tjenesten, må du velge "
+#~ "«Avbryt».\n"
+#~ "Ved å presse «Neste», så tillater du oss å holde deg informert via e-post "
+#~ "når det\n"
+#~ "kommer nye sikkerhetsoppdateringer og andre nyttige oppdateringer.\n"
+#~ "Du får òg rabba på kundestøttetjenestene våre på www.mandrivaexpert.com."
+
+#~ msgid "Connection problem"
+#~ msgstr "Tilkoblingsproblem"
+
+#~ msgid "Problem occurs when uploading files, please try again"
+#~ msgstr "Problem oppstod under opplasting av filer. Prøv på nytt."
+
+#~ msgid "Create a Mandriva Online Account"
+#~ msgstr "Opprett en Mandriva Online-konto"
+
+#~ msgid "Greeting:"
+#~ msgstr "Hilsen:"
+
+#~ msgid "First name:"
+#~ msgstr "Fornavn:"
+
+#~ msgid "Last name:"
+#~ msgstr "Etternavn:"
+
+#~ msgid "Confirm Password:"
+#~ msgstr "Bekreft passord:"
+
+#~ msgid ""
+#~ "The passwords do not match\n"
+#~ " Please try again\n"
+#~ msgstr ""
+#~ "Passordene stemmer ikke overens.\n"
+#~ "Prøv på nytt\n"
+
+#~ msgid "Please fill in each field"
+#~ msgstr "Fyll ut alle feltene"
+
+#~ msgid "Not a valid mail address!\n"
+#~ msgstr "Ugyldig e-postadresse!\n"
+
+#~ msgid "Creating account failed!"
+#~ msgstr "Klarte ikke opprette konto!"
+
+#~ msgid ""
+#~ "Mandriva Online Account successfully created.\n"
+#~ "Please click \"Next\" to authenticate and upload your configuration\n"
+#~ msgstr ""
+#~ "Fullført oppretting av Mandriva Online-konto.\n"
+#~ "Trykk «Neste» for å autentisere og laste opp oppsettet ditt\n"
+
+#~ msgid "Your upload was successful!"
+#~ msgstr "Opplasting vellykket!"
+
+#~ msgid ""
+#~ "From now you will receive on security and updates \n"
+#~ "announcements thanks to Mandriva Online."
+#~ msgstr ""
+#~ "Fra nå av vil du motta varsel om sikkerhets- og andre nyttige\n"
+#~ " oppdateringer fra Mandriva Online."
+
+#~ msgid ""
+#~ "Mandriva Online offers you the ability to automate the updates.\n"
+#~ "A program will run regulary in your system waiting for new updates\n"
+#~ msgstr ""
+#~ "Mandriva Online gjør det mulig å automatisere oppdateringene.\n"
+#~ "Et program vil kjøre regelmessig på ditt system i og sjekker etter nye "
+#~ "tilgjengelig oppdateringer.\n"
+
+#~ msgid "Congratulations"
+#~ msgstr "Gratulerer"
+
+#~ msgid "Your Mandriva Online account has been successfully configured\n"
+#~ msgstr "Mandriva Online-kontoen er nå satt opp\n"
+
+#~ msgid "Configuration uploaded successfully"
+#~ msgstr "Opplasting av oppsett vellykket"
+
+#~ msgid "Problem uploading configuration"
+#~ msgstr "Problem ved opplasting av oppsett"
+
+#~ msgid ""
+#~ "Cannot connect to Mandriva Online website: wrong login/password or router/"
+#~ "firewall bad settings"
+#~ msgstr ""
+#~ "Kan ikke koble til Mandriva Online-nettsiden: feil brukernavn/passord "
+#~ "eller feil innstillinger i ruter/brannmur."
diff --git a/po/nl.po b/po/nl.po
index e8c7c44c..ab36961d 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline-nl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-09 16:26+0200\n"
+"POT-Creation-Date: 2008-02-21 18:21+0100\n"
 "PO-Revision-Date: 2007-08-22 00:03+0200\n"
 "Last-Translator: Reinout van Schouwen <reinout@gmail.com>\n"
 "Language-Team: Nederlands\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:94
+#: ../mdkapplet:88
 #, c-format
 msgid "Will check updates at %s"
 msgstr "Volgende controle op herzieningen om %s"
 
-#: ../mdkapplet:103
+#: ../mdkapplet:97
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "Uw systeem is bijgewerkt"
 
-#: ../mdkapplet:109
+#: ../mdkapplet:103
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -38,47 +38,37 @@ msgstr ""
 "Dienst-instellingsprobleem. Verifieer uw logboeken en stuur een e-mail naar "
 "support@mandrivaonline.com"
 
-#: ../mdkapplet:115
+#: ../mdkapplet:110
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "Even geduld, bezig met opzoeken van beschikbare pakketten…"
 
-#: ../mdkapplet:121
+#: ../mdkapplet:116
 #, c-format
 msgid "New updates are available for your system"
 msgstr "Er zijn nieuwe herzieningen beschikbaar voor uw systeem"
 
-#: ../mdkapplet:127
-#, c-format
-msgid "New bundles are available for your system"
-msgstr "Er zijn nieuwe bundels beschikbaar voor uw systeem"
-
-#: ../mdkapplet:133
-#, c-format
-msgid "Service is not configured. Please click on \"Configure the service\""
-msgstr "Dienst niet ingesteld. Klik op \"Dienst configureren\""
-
-#: ../mdkapplet:139
+#: ../mdkapplet:122
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "Netwerk niet actief. Configureer uw netwerk"
 
-#: ../mdkapplet:145
+#: ../mdkapplet:128
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "Dienst niet geactiveerd. Klik alstublieft op \"Webstek\""
 
-#: ../mdkapplet:151 ../mdkapplet:182
+#: ../mdkapplet:134 ../mdkapplet:165
 #, c-format
 msgid "urpmi database locked"
 msgstr "urpmi-database gesloten"
 
-#: ../mdkapplet:157
+#: ../mdkapplet:140
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr "Uitgave niet ondersteund (te oud, of een ontwikkelingsuitgave)"
 
-#: ../mdkapplet:163
+#: ../mdkapplet:146
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
@@ -86,7 +76,7 @@ msgstr ""
 "Geen medium gevonden. U dient er één of meer toe te voegen via ‘Software "
 "Mediabeheer’."
 
-#: ../mdkapplet:169
+#: ../mdkapplet:152
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -103,585 +93,131 @@ msgstr ""
 "\n"
 "Daarna herstart u ‘%s’."
 
-#: ../mdkapplet:174
+#: ../mdkapplet:157
 #, c-format
 msgid "Enabled"
 msgstr "Ingeschakeld"
 
-#: ../mdkapplet:187
+#: ../mdkapplet:170
 #, c-format
 msgid "Error updating media"
 msgstr "Er is een fout opgetreden bij het bijwerken van de media"
 
-#: ../mdkapplet:202
+#: ../mdkapplet:185
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr "Nagaan… Herzieningen zijn beschikbaar\n"
 
-#: ../mdkapplet:207
+#: ../mdkapplet:190
 #, c-format
 msgid "Packages are up to date"
 msgstr "Pakketten zijn bijgewerkt"
 
-#: ../mdkapplet:212
+#: ../mdkapplet:195
 #, c-format
 msgid "Failed to open urpmi database"
 msgstr "Openen van urpmi-database is mislukt"
 
-#: ../mdkapplet:217 ../mdkapplet:324
+#: ../mdkapplet:200
 #, c-format
 msgid "Install updates"
 msgstr "Herzieningen installeren"
 
-#: ../mdkapplet:218
-#, c-format
-msgid "Configure the service"
-msgstr "Dienst configureren"
-
-#: ../mdkapplet:219
+#: ../mdkapplet:201
 #, c-format
 msgid "Check Updates"
 msgstr "Herzieningen nagaan"
 
-#: ../mdkapplet:220 ../mdkapplet:327 ../mdkonline:114 ../mdkonline:155
-#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
-#, c-format
-msgid "Please wait"
-msgstr "Even geduld"
-
-#: ../mdkapplet:220 ../mdkapplet:326 ../mdkapplet:327
-#, c-format
-msgid "Check updates"
-msgstr "Herzieningen nagaan"
-
-#: ../mdkapplet:223 ../mdkapplet:648
-#, c-format
-msgid "Online WebSite"
-msgstr "Webstek"
-
-#: ../mdkapplet:224
+#: ../mdkapplet:202
 #, c-format
 msgid "Configure Network"
 msgstr "Netwerk configureren"
 
-#: ../mdkapplet:225
-#, c-format
-msgid "Configure Now!"
-msgstr "Nu configureren!"
-
-#: ../mdkapplet:313 ../mdkapplet:392
-#, c-format
-msgid "Mandriva Linux Updates Applet"
-msgstr "Mandriva Linux herzieningen-applet"
-
-#: ../mdkapplet:322
-#, c-format
-msgid "Actions"
-msgstr "Acties"
-
-#: ../mdkapplet:325
-#, c-format
-msgid "Configure"
-msgstr "Configureren"
-
-#: ../mdkapplet:329
-#, c-format
-msgid "See logs"
-msgstr "Logboeken inzien"
-
-#: ../mdkapplet:332
-#, c-format
-msgid "Status"
-msgstr "Status"
-
-#: ../mdkapplet:336 ../mdkapplet:597
-#, c-format
-msgid "Close"
-msgstr "Sluiten"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Network Connection: "
-msgstr "Netwerkverbinding: "
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Up"
-msgstr "Actief"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Down"
-msgstr "Inactief"
-
-#: ../mdkapplet:366
-#, c-format
-msgid "Last check: "
-msgstr "Laatste controle: "
-
-#: ../mdkapplet:367 ../mdkonline:145
-#, c-format
-msgid "Machine name:"
-msgstr "Computernaam:"
-
-#: ../mdkapplet:368
-#, c-format
-msgid "Updates: "
-msgstr "Herzieningen: "
-
-#: ../mdkapplet:372
+#: ../mdkapplet:283
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Drakconnect wordt gestart\n"
 
-#: ../mdkapplet:375
+#: ../mdkapplet:286
 #, c-format
 msgid "Mandriva Online seems to be reinstalled, reloading applet ...."
 msgstr "Mandriva Online lijkt opnieuw geïnstalleerd te zijn, applet herladen…"
 
-#: ../mdkapplet:383
+#: ../mdkapplet:294
 #, c-format
 msgid "Launching MandrivaUpdate\n"
 msgstr "MandrivaUpdate wordt gestart\n"
 
-#: ../mdkapplet:398
+#: ../mdkapplet:303
+#, c-format
+msgid "Mandriva Linux Updates Applet"
+msgstr "Mandriva Linux herzieningen-applet"
+
+#: ../mdkapplet:308
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Nieuwe herzieningen nagaan...\n"
 
-#: ../mdkapplet:399
+#: ../mdkapplet:309
 #, c-format
 msgid "Connecting to"
 msgstr "Verbinding aan het maken met"
 
-#: ../mdkapplet:467 ../mdkupdate:159 ../mdkupdate:188
-#, c-format
-msgid "An error occurred"
-msgstr "Er is een fout opgetreden"
-
-#: ../mdkapplet:475
-#, c-format
-msgid "Development release not supported by service"
-msgstr "Ontwikkelingsuitgaven worden niet ondersteund door deze dienst"
-
-#: ../mdkapplet:476
-#, c-format
-msgid "Too old release not supported by service"
-msgstr "Te oude uitgaven worden niet ondersteund door deze dienst"
-
-#: ../mdkapplet:477
-#, c-format
-msgid "Unknown state"
-msgstr "Onbekende toestand"
-
-#: ../mdkapplet:478
-#, c-format
-msgid "Online services disabled. Contact Mandriva Online site\n"
-msgstr "Online diensten uitgeschakeld. Zie de Mandriva Online webstek\n"
-
-#: ../mdkapplet:479
-#, c-format
-msgid "Wrong Password.\n"
-msgstr "Wachtwoord onjuist.\n"
-
-#: ../mdkapplet:480
-#, c-format
-msgid "Wrong Action or host or login.\n"
-msgstr "Onjuiste actie of host of gebruikersnaam.\n"
-
-#: ../mdkapplet:481
-#, c-format
-msgid ""
-"Something is wrong with your network settings (check your route, firewall or "
-"proxy settings)\n"
-msgstr ""
-"Er is een probleem met uw netwerk instellingen (verifieer uw route-, "
-"firewall- of proxy-instellingen)\n"
-
-#: ../mdkapplet:483
-#, c-format
-msgid ""
-"Problem occured while connecting to the server, please contact the support "
-"team"
-msgstr ""
-"Er heeft zich een probleem voorgedaan bij het maken van de verbinding met de "
-"server, neem alstublieft contact op met het ondersteuningsteam"
-
-#: ../mdkapplet:487
-#, c-format
-msgid "Response from Mandriva Online server\n"
-msgstr "Antwoord van Mandriva Online server\n"
-
-#: ../mdkapplet:490
+#: ../mdkapplet:386
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Systeem is bijgewerkt\n"
 
-#: ../mdkapplet:527
-#, c-format
-msgid "No check"
-msgstr "Geen controle"
-
-#: ../mdkapplet:541
-#, c-format
-msgid "Checking config file: Not present\n"
-msgstr "Controle van het instellingsbestand: niet aanwezig\n"
-
-#: ../mdkapplet:544
+#: ../mdkapplet:415
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Controle van het netwerk: lijkt uitgeschakeld te zijn\n"
 
-#: ../mdkapplet:587
+#: ../mdkapplet:457 ../mdkupdate:118 ../mdkupdate:164
 #, c-format
-msgid "Logs"
-msgstr "Logboek"
-
-#: ../mdkapplet:603
-#, c-format
-msgid "Clear"
-msgstr "Wissen"
+msgid "Warning"
+msgstr "Waarschuwing"
 
-#: ../mdkapplet:629
+#: ../mdkapplet:468
 #, c-format
 msgid "About..."
 msgstr "Info…"
 
-#: ../mdkapplet:631
+#: ../mdkapplet:472
 #, c-format
 msgid "Mandriva Online %s"
 msgstr "Mandriva Online %s"
 
-#: ../mdkapplet:635
+#: ../mdkapplet:473
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Copyright © %s van Mandriva"
 
-#: ../mdkapplet:647
+#: ../mdkapplet:476
 #, c-format
 msgid "Mandriva Online gives access to Mandriva web services."
 msgstr "Mandriva Online geeft toegang tot webdiensten van Mandriva."
 
-#: ../mdkapplet:655
-#, c-format
-msgid "Always launch on startup"
-msgstr "Altijd starten bij systeemstart"
-
-#: ../mdkapplet:657
-#, c-format
-msgid "Quit"
-msgstr "Afsluiten"
-
-#: ../mdkonline:58
-#, c-format
-msgid ""
-"mdonline version %s\n"
-"Copyright (C) %s Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"mdonline versie %s\n"
-"Copyright © %s Mandriva.\n"
-"Dit is vrije software en mag verder gedistribueerd worden onder de "
-"voorwaarden van de GNU GPL.\n"
-"\n"
-"gebruik:\n"
-
-#: ../mdkonline:63 ../mdkupdate:73
-#, c-format
-msgid "  --help\t\t- print this help message.\n"
-msgstr "  --help\t\t- deze gebruiksaanwijzing.tonen\n"
-
-#: ../mdkonline:64
-#, c-format
-msgid "  --box=\t\t\t- hostname.\n"
-msgstr "  --box=\t\t\t- computernaam.\n"
-
-#: ../mdkonline:65
-#, c-format
-msgid "  --country\t\t\t- name of country of the user. \n"
-msgstr "  --country\t\t\t- naam van het land van de gebruiker. \n"
-
-#: ../mdkonline:66
-#, c-format
-msgid "  --interactive\t\t- use the interactive mode.\n"
-msgstr "  --interactive\t\t- interactieve modus gebruiken.\n"
-
-#: ../mdkonline:67
-#, c-format
-msgid "  --nointeractive\t- use the non-interactive mode.\n"
-msgstr "  --nointeractive\t- de non-interactieve modus gebruiken.\n"
-
-#: ../mdkonline:68
-#, c-format
-msgid "  --login=\t\t     - login name of the user.\n"
-msgstr "  --login=\t\t     - aanmeldnaam van de gebruiker.\n"
-
-#: ../mdkonline:69
-#, c-format
-msgid "  --pass=\t\t\t- password  of the user.\n"
-msgstr "  --pass=\t\t\t- wachtwoord van de gebruiker.\n"
-
-#: ../mdkonline:87 ../mdkonline:120
-#, c-format
-msgid "Mandriva Online"
-msgstr "Mandriva Online"
-
-#: ../mdkonline:90
-#, c-format
-msgid "I already have an account"
-msgstr "Ik heb al een account"
-
-#: ../mdkonline:91
-#, c-format
-msgid "I want to subscribe"
-msgstr "Ik wil mijzelf aanmelden"
-
-#: ../mdkonline:96
-#, c-format
-msgid "Mr."
-msgstr "Dhr."
-
-#: ../mdkonline:96
-#, c-format
-msgid "Mrs."
-msgstr "Mw."
-
-#: ../mdkonline:96
-#, c-format
-msgid "Ms."
-msgstr "Mej."
-
-#: ../mdkonline:114
-#, c-format
-msgid "Reading configuration\n"
-msgstr "Lezen instellingen\n"
-
-#: ../mdkonline:123
-#, c-format
-msgid ""
-"This assistant will help you to upload your configuration\n"
-"(packages, hardware configuration) to a centralized database in\n"
-"order to keep you informed about security updates and useful upgrades.\n"
-msgstr ""
-"Deze assistent zal u helpen om uw configuratie door te sturen\n"
-"(pakketten, hardwareconfiguratie) naar een centrale database om\n"
-"u op de hoogte te kunnen houden van beveiligingsherzieningen en nuttige "
-"opwaarderingen.\n"
-
-#: ../mdkonline:131
-#, c-format
-msgid "Account creation or authentication"
-msgstr "Aanmaken van account of aanmeldingscontrole"
-
-#: ../mdkonline:136
-#, c-format
-msgid "Enter your Mandriva Online login, password and machine name:"
-msgstr "Voer uw Mandriva Online gebruikersnaam, wachtwoord en computernaam in:"
-
-#: ../mdkonline:142 ../mdkonline:195
-#, c-format
-msgid "Email address:"
-msgstr "E-mailadres:"
-
-#: ../mdkonline:143
-#, c-format
-msgid "Country"
-msgstr "Land"
-
-#: ../mdkonline:144 ../mdkonline:196
-#, c-format
-msgid "Password:"
-msgstr "Wachtwoord:"
-
-#: ../mdkonline:146
-#, c-format
-msgid "Machine description:"
-msgstr "Computeromschrijving:"
-
-#: ../mdkonline:147
-#, c-format
-msgid "(Ex: My Home Office's Computer)"
-msgstr "(Bijv.: Computer op mijn kantoor)"
-
-#: ../mdkonline:152 ../mdkonline:159 ../mdkonline:180 ../mdkonline:204
-#: ../mdkonline:208 ../mdkonline:212 ../mdkonline:217 ../mdkupdate:141
-#: ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
-#, c-format
-msgid "Error"
-msgstr "Fout"
-
-#: ../mdkonline:152
-#, c-format
-msgid "Machine name must be 1 to 40 alphanumerical characters"
-msgstr "Machinenaam dient uit 1 tot 40 alfanumerieke tekens te bestaan"
-
-#: ../mdkonline:155
-#, c-format
-msgid "Connecting to Mandriva Online website..."
-msgstr "Verbinden met Mandriva Online webstek..."
-
-#: ../mdkonline:167
-#, c-format
-msgid ""
-"In order to benefit from Mandriva Online services,\n"
-"we are about to upload your configuration.\n"
-"\n"
-"The Wizard will now send the following information to Mandriva:\n"
-"\n"
-"1) the list of packages you have installed on your system,\n"
-"\n"
-"2) your hardware configuration.\n"
-"\n"
-"If you feel uncomfortable by that idea, or do not want to benefit from this "
-"service,\n"
-"please press 'Cancel'. By pressing 'Next', you allow us to keep you "
-"informed\n"
-"about security updates and useful upgrades via personalized email alerts.\n"
-"Furthermore, you benefit from discounted paid support services on\n"
-"www.mandrivaexpert.com."
-msgstr ""
-"Om te profiteren van de Mandriva Online diensten,\n"
-"staan we op het punt uw configuratie op te sturen.\n"
-"\n"
-"De assistent zal nu de volgende informatie naar Mandriva sturen:\n"
-"\n"
-"1) een lijst met pakketten die u heeft geïnstalleerd op uw systeem,\n"
-"\n"
-"2) uw hardware configuratie.\n"
-"\n"
-"Als u dit geen prettig idee vindt, of u niet wilt profiteren van deze\n"
-"diensten, druk dan op 'Annuleren'. Als u op 'Volgende' klikt, staat u\n"
-"ons toe dat wij u informeren over beveiligingsherzieningen en nuttige\n"
-"opwaarderingen via persoonlijke e-mail.\n"
-"Verder profiteert u van goedkopere betaalde ondersteuning op\n"
-"www.mandrivaexpert.com."
-
-#: ../mdkonline:180
-#, c-format
-msgid "Connection problem"
-msgstr "Verbindingsprobleem"
-
-#: ../mdkonline:180
-#, c-format
-msgid "Problem occurs when uploading files, please try again"
-msgstr "Probleem met het versturen van de gegevens, probeert u het opnieuw"
-
-#: ../mdkonline:187
-#, c-format
-msgid "Create a Mandriva Online Account"
-msgstr "Mandriva Online account aanmaken"
-
-#. -PO: that is for things like "Mr", "Ms",...
-#: ../mdkonline:192
-#, c-format
-msgid "Greeting:"
-msgstr "Aanhef:"
-
-#: ../mdkonline:193
-#, c-format
-msgid "First name:"
-msgstr "Voornaam:"
-
-#: ../mdkonline:194
-#, c-format
-msgid "Last name:"
-msgstr "Achternaam:"
-
-#: ../mdkonline:197
-#, c-format
-msgid "Confirm Password:"
-msgstr "Wachtwoord bevestigen:"
-
-#: ../mdkonline:204
-#, c-format
-msgid ""
-"The passwords do not match\n"
-" Please try again\n"
-msgstr ""
-"De wachtwoorden komen niet overeen\n"
-"Probeer het opnieuw\n"
-
-#: ../mdkonline:208
-#, c-format
-msgid "Please fill in each field"
-msgstr "Gelieve alle velden in te vullen"
-
-#: ../mdkonline:212
-#, c-format
-msgid "Not a valid mail address!\n"
-msgstr "Geen geldig emailadres\n"
-
-#: ../mdkonline:217
-#, c-format
-msgid "Creating account failed!"
-msgstr "Aanmaken van account is mislukt!"
-
-#: ../mdkonline:225
-#, c-format
-msgid ""
-"Mandriva Online Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
-msgstr ""
-"Aanmaken van een Mandriva Online-account is gelukt.\n"
-"Klik op \"Volgende\" om aan te melden en uw systeemsamenstelling te "
-"verzenden\n"
-
-#: ../mdkonline:229
-#, c-format
-msgid "Your upload was successful!"
-msgstr "Het versturen is gelukt!"
-
-#: ../mdkonline:229
+#: ../mdkapplet:478
 #, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandriva Online."
-msgstr ""
-"Vanaf nu ontvangt u beveiligings- en\n"
-"herzieningsaankondigingen dankzij Mandriva Online"
+msgid "Online WebSite"
+msgstr "Webstek"
 
-#: ../mdkonline:229
+#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
+#: ../mdkapplet:483
 #, c-format
-msgid ""
-"Mandriva Online offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
+msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
-"Mandriva Online biedt u de mogelijkheid om de herzieningen te "
-"automatiseren.\n"
-"Een programma in uw systeem zal regelmatig kijken of er nieuwe herziene\n"
-"versies zijn\n"
-
-#: ../mdkonline:238
-#, c-format
-msgid "Congratulations"
-msgstr "Gefeliciteerd"
-
-#: ../mdkonline:238
-#, c-format
-msgid "Your Mandriva Online account has been successfully configured\n"
-msgstr "Uw Mandriva Online account is met succes geconfigureerd\n"
 
-#: ../mdkonline:253
+#: ../mdkapplet:492
 #, c-format
-msgid "Configuration uploaded successfully"
-msgstr "Het versturen van de configuratie is gelukt!"
-
-#: ../mdkonline:254
-#, c-format
-msgid "Problem uploading configuration"
-msgstr "Probleem met versturen van de configuratie"
+msgid "Always launch on startup"
+msgstr "Altijd starten bij systeemstart"
 
-#: ../mdkonline:256
+#: ../mdkapplet:494
 #, c-format
-msgid ""
-"Cannot connect to Mandriva Online website: wrong login/password or router/"
-"firewall bad settings"
-msgstr ""
-"Niet in staat verbinding te maken met de Mandriva Online website: onjuiste "
-"gebruikersnaam/wachtwoord of router/firewall instelling"
+msgid "Quit"
+msgstr "Afsluiten"
 
 #: ../mdkonline.pm:207
 #, c-format
@@ -830,6 +366,11 @@ msgstr ""
 "\n"
 "gebruik:\n"
 
+#: ../mdkupdate:73
+#, c-format
+msgid "  --help\t\t- print this help message.\n"
+msgstr "  --help\t\t- deze gebruiksaanwijzing.tonen\n"
+
 #: ../mdkupdate:74
 #, c-format
 msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
@@ -859,11 +400,6 @@ msgstr ""
 " --budle bestand.bundle\t- pakket analyseren en installeren vanuit .bundle "
 "metainfo-bestand.\n"
 
-#: ../mdkupdate:118 ../mdkupdate:164
-#, c-format
-msgid "Warning"
-msgstr "Waarschuwing"
-
 #. -PO: here Live Install is currently *NOT* translated on the desktop, so it's better to keep as it:
 #: ../mdkupdate:120
 #, c-format
@@ -874,11 +410,21 @@ msgstr ""
 "U dient het systeem eerst op uw harde schijf te installeren met de 'Live "
 "Installatie'-wizard."
 
+#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
+#, c-format
+msgid "Please wait"
+msgstr "Even geduld"
+
 #: ../mdkupdate:123 ../mdkupdate:174
 #, c-format
 msgid "Preparing..."
 msgstr "Voorbereiden..."
 
+#: ../mdkupdate:141 ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
+#, c-format
+msgid "Error"
+msgstr "Fout"
+
 #: ../mdkupdate:141
 #, c-format
 msgid ""
@@ -890,6 +436,11 @@ msgstr ""
 "\n"
 "%s"
 
+#: ../mdkupdate:159 ../mdkupdate:188
+#, c-format
+msgid "An error occurred"
+msgstr "Er is een fout opgetreden"
+
 #: ../mdkupdate:164
 #, c-format
 msgid ""
@@ -918,6 +469,311 @@ msgstr "Installeren van pakketten...\n"
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "Niet in staat pakketten bij te werken vanaf het update_source-medium\n"
 
+#~ msgid "New bundles are available for your system"
+#~ msgstr "Er zijn nieuwe bundels beschikbaar voor uw systeem"
+
+#~ msgid "Service is not configured. Please click on \"Configure the service\""
+#~ msgstr "Dienst niet ingesteld. Klik op \"Dienst configureren\""
+
+#~ msgid "Configure the service"
+#~ msgstr "Dienst configureren"
+
+#~ msgid "Check updates"
+#~ msgstr "Herzieningen nagaan"
+
+#~ msgid "Configure Now!"
+#~ msgstr "Nu configureren!"
+
+#~ msgid "Actions"
+#~ msgstr "Acties"
+
+#~ msgid "Configure"
+#~ msgstr "Configureren"
+
+#~ msgid "See logs"
+#~ msgstr "Logboeken inzien"
+
+#~ msgid "Status"
+#~ msgstr "Status"
+
+#~ msgid "Close"
+#~ msgstr "Sluiten"
+
+#~ msgid "Network Connection: "
+#~ msgstr "Netwerkverbinding: "
+
+#~ msgid "Up"
+#~ msgstr "Actief"
+
+#~ msgid "Down"
+#~ msgstr "Inactief"
+
+#~ msgid "Last check: "
+#~ msgstr "Laatste controle: "
+
+#~ msgid "Machine name:"
+#~ msgstr "Computernaam:"
+
+#~ msgid "Updates: "
+#~ msgstr "Herzieningen: "
+
+#~ msgid "Development release not supported by service"
+#~ msgstr "Ontwikkelingsuitgaven worden niet ondersteund door deze dienst"
+
+#~ msgid "Too old release not supported by service"
+#~ msgstr "Te oude uitgaven worden niet ondersteund door deze dienst"
+
+#~ msgid "Unknown state"
+#~ msgstr "Onbekende toestand"
+
+#~ msgid "Online services disabled. Contact Mandriva Online site\n"
+#~ msgstr "Online diensten uitgeschakeld. Zie de Mandriva Online webstek\n"
+
+#~ msgid "Wrong Password.\n"
+#~ msgstr "Wachtwoord onjuist.\n"
+
+#~ msgid "Wrong Action or host or login.\n"
+#~ msgstr "Onjuiste actie of host of gebruikersnaam.\n"
+
+#~ msgid ""
+#~ "Something is wrong with your network settings (check your route, firewall "
+#~ "or proxy settings)\n"
+#~ msgstr ""
+#~ "Er is een probleem met uw netwerk instellingen (verifieer uw route-, "
+#~ "firewall- of proxy-instellingen)\n"
+
+#~ msgid ""
+#~ "Problem occured while connecting to the server, please contact the "
+#~ "support team"
+#~ msgstr ""
+#~ "Er heeft zich een probleem voorgedaan bij het maken van de verbinding met "
+#~ "de server, neem alstublieft contact op met het ondersteuningsteam"
+
+#~ msgid "Response from Mandriva Online server\n"
+#~ msgstr "Antwoord van Mandriva Online server\n"
+
+#~ msgid "No check"
+#~ msgstr "Geen controle"
+
+#~ msgid "Checking config file: Not present\n"
+#~ msgstr "Controle van het instellingsbestand: niet aanwezig\n"
+
+#~ msgid "Logs"
+#~ msgstr "Logboek"
+
+#~ msgid "Clear"
+#~ msgstr "Wissen"
+
+#~ msgid ""
+#~ "mdonline version %s\n"
+#~ "Copyright (C) %s Mandriva.\n"
+#~ "This is free software and may be redistributed under the terms of the GNU "
+#~ "GPL.\n"
+#~ "\n"
+#~ "usage:\n"
+#~ msgstr ""
+#~ "mdonline versie %s\n"
+#~ "Copyright © %s Mandriva.\n"
+#~ "Dit is vrije software en mag verder gedistribueerd worden onder de "
+#~ "voorwaarden van de GNU GPL.\n"
+#~ "\n"
+#~ "gebruik:\n"
+
+#~ msgid "  --box=\t\t\t- hostname.\n"
+#~ msgstr "  --box=\t\t\t- computernaam.\n"
+
+#~ msgid "  --country\t\t\t- name of country of the user. \n"
+#~ msgstr "  --country\t\t\t- naam van het land van de gebruiker. \n"
+
+#~ msgid "  --interactive\t\t- use the interactive mode.\n"
+#~ msgstr "  --interactive\t\t- interactieve modus gebruiken.\n"
+
+#~ msgid "  --nointeractive\t- use the non-interactive mode.\n"
+#~ msgstr "  --nointeractive\t- de non-interactieve modus gebruiken.\n"
+
+#~ msgid "  --login=\t\t     - login name of the user.\n"
+#~ msgstr "  --login=\t\t     - aanmeldnaam van de gebruiker.\n"
+
+#~ msgid "  --pass=\t\t\t- password  of the user.\n"
+#~ msgstr "  --pass=\t\t\t- wachtwoord van de gebruiker.\n"
+
+#~ msgid "Mandriva Online"
+#~ msgstr "Mandriva Online"
+
+#~ msgid "I already have an account"
+#~ msgstr "Ik heb al een account"
+
+#~ msgid "I want to subscribe"
+#~ msgstr "Ik wil mijzelf aanmelden"
+
+#~ msgid "Mr."
+#~ msgstr "Dhr."
+
+#~ msgid "Mrs."
+#~ msgstr "Mw."
+
+#~ msgid "Ms."
+#~ msgstr "Mej."
+
+#~ msgid "Reading configuration\n"
+#~ msgstr "Lezen instellingen\n"
+
+#~ msgid ""
+#~ "This assistant will help you to upload your configuration\n"
+#~ "(packages, hardware configuration) to a centralized database in\n"
+#~ "order to keep you informed about security updates and useful upgrades.\n"
+#~ msgstr ""
+#~ "Deze assistent zal u helpen om uw configuratie door te sturen\n"
+#~ "(pakketten, hardwareconfiguratie) naar een centrale database om\n"
+#~ "u op de hoogte te kunnen houden van beveiligingsherzieningen en nuttige "
+#~ "opwaarderingen.\n"
+
+#~ msgid "Account creation or authentication"
+#~ msgstr "Aanmaken van account of aanmeldingscontrole"
+
+#~ msgid "Enter your Mandriva Online login, password and machine name:"
+#~ msgstr ""
+#~ "Voer uw Mandriva Online gebruikersnaam, wachtwoord en computernaam in:"
+
+#~ msgid "Email address:"
+#~ msgstr "E-mailadres:"
+
+#~ msgid "Country"
+#~ msgstr "Land"
+
+#~ msgid "Password:"
+#~ msgstr "Wachtwoord:"
+
+#~ msgid "Machine description:"
+#~ msgstr "Computeromschrijving:"
+
+#~ msgid "(Ex: My Home Office's Computer)"
+#~ msgstr "(Bijv.: Computer op mijn kantoor)"
+
+#~ msgid "Machine name must be 1 to 40 alphanumerical characters"
+#~ msgstr "Machinenaam dient uit 1 tot 40 alfanumerieke tekens te bestaan"
+
+#~ msgid "Connecting to Mandriva Online website..."
+#~ msgstr "Verbinden met Mandriva Online webstek..."
+
+#~ msgid ""
+#~ "In order to benefit from Mandriva Online services,\n"
+#~ "we are about to upload your configuration.\n"
+#~ "\n"
+#~ "The Wizard will now send the following information to Mandriva:\n"
+#~ "\n"
+#~ "1) the list of packages you have installed on your system,\n"
+#~ "\n"
+#~ "2) your hardware configuration.\n"
+#~ "\n"
+#~ "If you feel uncomfortable by that idea, or do not want to benefit from "
+#~ "this service,\n"
+#~ "please press 'Cancel'. By pressing 'Next', you allow us to keep you "
+#~ "informed\n"
+#~ "about security updates and useful upgrades via personalized email "
+#~ "alerts.\n"
+#~ "Furthermore, you benefit from discounted paid support services on\n"
+#~ "www.mandrivaexpert.com."
+#~ msgstr ""
+#~ "Om te profiteren van de Mandriva Online diensten,\n"
+#~ "staan we op het punt uw configuratie op te sturen.\n"
+#~ "\n"
+#~ "De assistent zal nu de volgende informatie naar Mandriva sturen:\n"
+#~ "\n"
+#~ "1) een lijst met pakketten die u heeft geïnstalleerd op uw systeem,\n"
+#~ "\n"
+#~ "2) uw hardware configuratie.\n"
+#~ "\n"
+#~ "Als u dit geen prettig idee vindt, of u niet wilt profiteren van deze\n"
+#~ "diensten, druk dan op 'Annuleren'. Als u op 'Volgende' klikt, staat u\n"
+#~ "ons toe dat wij u informeren over beveiligingsherzieningen en nuttige\n"
+#~ "opwaarderingen via persoonlijke e-mail.\n"
+#~ "Verder profiteert u van goedkopere betaalde ondersteuning op\n"
+#~ "www.mandrivaexpert.com."
+
+#~ msgid "Connection problem"
+#~ msgstr "Verbindingsprobleem"
+
+#~ msgid "Problem occurs when uploading files, please try again"
+#~ msgstr "Probleem met het versturen van de gegevens, probeert u het opnieuw"
+
+#~ msgid "Create a Mandriva Online Account"
+#~ msgstr "Mandriva Online account aanmaken"
+
+#~ msgid "Greeting:"
+#~ msgstr "Aanhef:"
+
+#~ msgid "First name:"
+#~ msgstr "Voornaam:"
+
+#~ msgid "Last name:"
+#~ msgstr "Achternaam:"
+
+#~ msgid "Confirm Password:"
+#~ msgstr "Wachtwoord bevestigen:"
+
+#~ msgid ""
+#~ "The passwords do not match\n"
+#~ " Please try again\n"
+#~ msgstr ""
+#~ "De wachtwoorden komen niet overeen\n"
+#~ "Probeer het opnieuw\n"
+
+#~ msgid "Please fill in each field"
+#~ msgstr "Gelieve alle velden in te vullen"
+
+#~ msgid "Not a valid mail address!\n"
+#~ msgstr "Geen geldig emailadres\n"
+
+#~ msgid "Creating account failed!"
+#~ msgstr "Aanmaken van account is mislukt!"
+
+#~ msgid ""
+#~ "Mandriva Online Account successfully created.\n"
+#~ "Please click \"Next\" to authenticate and upload your configuration\n"
+#~ msgstr ""
+#~ "Aanmaken van een Mandriva Online-account is gelukt.\n"
+#~ "Klik op \"Volgende\" om aan te melden en uw systeemsamenstelling te "
+#~ "verzenden\n"
+
+#~ msgid "Your upload was successful!"
+#~ msgstr "Het versturen is gelukt!"
+
+#~ msgid ""
+#~ "From now you will receive on security and updates \n"
+#~ "announcements thanks to Mandriva Online."
+#~ msgstr ""
+#~ "Vanaf nu ontvangt u beveiligings- en\n"
+#~ "herzieningsaankondigingen dankzij Mandriva Online"
+
+#~ msgid ""
+#~ "Mandriva Online offers you the ability to automate the updates.\n"
+#~ "A program will run regulary in your system waiting for new updates\n"
+#~ msgstr ""
+#~ "Mandriva Online biedt u de mogelijkheid om de herzieningen te "
+#~ "automatiseren.\n"
+#~ "Een programma in uw systeem zal regelmatig kijken of er nieuwe herziene\n"
+#~ "versies zijn\n"
+
+#~ msgid "Congratulations"
+#~ msgstr "Gefeliciteerd"
+
+#~ msgid "Your Mandriva Online account has been successfully configured\n"
+#~ msgstr "Uw Mandriva Online account is met succes geconfigureerd\n"
+
+#~ msgid "Configuration uploaded successfully"
+#~ msgstr "Het versturen van de configuratie is gelukt!"
+
+#~ msgid "Problem uploading configuration"
+#~ msgstr "Probleem met versturen van de configuratie"
+
+#~ msgid ""
+#~ "Cannot connect to Mandriva Online website: wrong login/password or router/"
+#~ "firewall bad settings"
+#~ msgstr ""
+#~ "Niet in staat verbinding te maken met de Mandriva Online website: "
+#~ "onjuiste gebruikersnaam/wachtwoord of router/firewall instelling"
+
 #~ msgid "  --applet\t\t- launch Mandriva Update.\n"
 #~ msgstr "  --applet\t\t- Mandriva Update starten.\n"
 
diff --git a/po/nn.po b/po/nn.po
index 9709dd3e..ee1698e7 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline\n"
-"POT-Creation-Date: 2007-08-09 16:26+0200\n"
+"POT-Creation-Date: 2008-02-21 18:21+0100\n"
 "PO-Revision-Date: 2007-08-12 10:43+0200\n"
 "Last-Translator: Karl Ove Hufthammer <karl@huftis.org>\n"
 "Language-Team: Norwegian Nynorsk <i18n-nn@lister.ping.uio.no>\n"
@@ -17,17 +17,17 @@ msgstr ""
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
 #. -PO: here %s will be replaced by the local time (eg: "Will check updates at 14:03:50"
-#: ../mdkapplet:94
+#: ../mdkapplet:88
 #, c-format
 msgid "Will check updates at %s"
 msgstr "Vil sjå etter oppdateringar %s"
 
-#: ../mdkapplet:103
+#: ../mdkapplet:97
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "Systemet ditt er oppdatert."
 
-#: ../mdkapplet:109
+#: ../mdkapplet:103
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -36,52 +36,44 @@ msgstr ""
 "Feil ved oppsett av tenesta. Kontroller loggane og kontakt "
 "support@mandrivaonline.com."
 
-#: ../mdkapplet:115
+#: ../mdkapplet:110
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "Ser etter tilgjengelege pakkar. Vent litt …"
 
-#: ../mdkapplet:121
+#: ../mdkapplet:116
 #, c-format
 msgid "New updates are available for your system"
 msgstr "Det finst nye oppdateringar for systemet ditt."
 
-#: ../mdkapplet:127
-#, c-format
-msgid "New bundles are available for your system"
-msgstr "Det finst nye programsamlingar for systemet ditt."
-
-#: ../mdkapplet:133
-#, c-format
-msgid "Service is not configured. Please click on \"Configure the service\""
-msgstr "Tenesta er ikkje sett opp enno. Vel «Set opp tenesta»."
-
-#: ../mdkapplet:139
+#: ../mdkapplet:122
 #, c-format
 msgid "Network is down. Please configure your network"
-msgstr "Nettverket er ikkje tilgjengeleg. Kontroller at nettverksoppsettet fungerer."
+msgstr ""
+"Nettverket er ikkje tilgjengeleg. Kontroller at nettverksoppsettet fungerer."
 
-#: ../mdkapplet:145
+#: ../mdkapplet:128
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "Tenesta er ikkje aktivert. Vel «Heimeside»."
 
-#: ../mdkapplet:151 ../mdkapplet:182
+#: ../mdkapplet:134 ../mdkapplet:165
 #, c-format
 msgid "urpmi database locked"
 msgstr "urpmi-databasen er låst."
 
-#: ../mdkapplet:157
+#: ../mdkapplet:140
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr "Utgåva di er ikkje støtta (anten for gammal eller utviklingsutgåve)."
 
-#: ../mdkapplet:163
+#: ../mdkapplet:146
 #, c-format
-msgid "No medium found. You must add some media through 'Software Media Manager'."
+msgid ""
+"No medium found. You must add some media through 'Software Media Manager'."
 msgstr "Fann ingen medium. Du må leggja til medium gjennom «Mediehandtering»."
 
-#: ../mdkapplet:169
+#: ../mdkapplet:152
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -97,583 +89,131 @@ msgstr ""
 "\n"
 "Start så %s på nytt."
 
-#: ../mdkapplet:174
+#: ../mdkapplet:157
 #, c-format
 msgid "Enabled"
 msgstr "I bruk"
 
-#: ../mdkapplet:187
+#: ../mdkapplet:170
 #, c-format
 msgid "Error updating media"
 msgstr "Feil ved oppdatering av medie"
 
-#: ../mdkapplet:202
+#: ../mdkapplet:185
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr "Kontrollererer … Det finst nye oppdateringar.\n"
 
-#: ../mdkapplet:207
+#: ../mdkapplet:190
 #, c-format
 msgid "Packages are up to date"
 msgstr "Alle pakkane er i nyaste versjon."
 
-#: ../mdkapplet:212
+#: ../mdkapplet:195
 #, c-format
 msgid "Failed to open urpmi database"
 msgstr "Klarte ikkje opna pakkedatabase."
 
-#: ../mdkapplet:217 ../mdkapplet:324
+#: ../mdkapplet:200
 #, c-format
 msgid "Install updates"
 msgstr "Installer oppdateringar"
 
-#: ../mdkapplet:218
-#, c-format
-msgid "Configure the service"
-msgstr "Set opp tenesta"
-
-#: ../mdkapplet:219
+#: ../mdkapplet:201
 #, c-format
 msgid "Check Updates"
 msgstr "Sjå etter oppdateringar"
 
-#: ../mdkapplet:220 ../mdkapplet:327 ../mdkonline:114 ../mdkonline:155
-#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
-#, c-format
-msgid "Please wait"
-msgstr "Vent litt"
-
-#: ../mdkapplet:220 ../mdkapplet:326 ../mdkapplet:327
-#, c-format
-msgid "Check updates"
-msgstr "Ser etter oppdateringar "
-
-#: ../mdkapplet:223 ../mdkapplet:648
-#, c-format
-msgid "Online WebSite"
-msgstr "Heimeside"
-
-#: ../mdkapplet:224
+#: ../mdkapplet:202
 #, c-format
 msgid "Configure Network"
 msgstr "Set opp nettverket"
 
-#: ../mdkapplet:225
-#, c-format
-msgid "Configure Now!"
-msgstr "Set opp"
-
-#: ../mdkapplet:313 ../mdkapplet:392
-#, c-format
-msgid "Mandriva Linux Updates Applet"
-msgstr "Panelprogram for Mandriva Linux-oppdateringar"
-
-#: ../mdkapplet:322
-#, c-format
-msgid "Actions"
-msgstr "Handlingar"
-
-#: ../mdkapplet:325
-#, c-format
-msgid "Configure"
-msgstr "Set opp"
-
-#: ../mdkapplet:329
-#, c-format
-msgid "See logs"
-msgstr "Sjå loggar"
-
-#: ../mdkapplet:332
-#, c-format
-msgid "Status"
-msgstr "Status"
-
-#: ../mdkapplet:336 ../mdkapplet:597
-#, c-format
-msgid "Close"
-msgstr "Lukk"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Network Connection: "
-msgstr "Nettverksoppsett: "
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Up"
-msgstr "Op"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Down"
-msgstr "Ned"
-
-#: ../mdkapplet:366
-#, c-format
-msgid "Last check: "
-msgstr "Siste kontroll: "
-
-#: ../mdkapplet:367 ../mdkonline:145
-#, c-format
-msgid "Machine name:"
-msgstr "Maskinnamn:"
-
-#: ../mdkapplet:368
-#, c-format
-msgid "Updates: "
-msgstr "Oppdateringar: "
-
-#: ../mdkapplet:372
+#: ../mdkapplet:283
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Køyrer drakconnect\n"
 
-#: ../mdkapplet:375
+#: ../mdkapplet:286
 #, c-format
 msgid "Mandriva Online seems to be reinstalled, reloading applet ...."
 msgstr "Mandriva Online er installert på nytt. Startar panelprogrammet om att."
 
-#: ../mdkapplet:383
+#: ../mdkapplet:294
 #, c-format
 msgid "Launching MandrivaUpdate\n"
 msgstr "Køyrer MandrivaUpdate\n"
 
-#: ../mdkapplet:398
+#: ../mdkapplet:303
+#, c-format
+msgid "Mandriva Linux Updates Applet"
+msgstr "Panelprogram for Mandriva Linux-oppdateringar"
+
+#: ../mdkapplet:308
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Granskar nye oppdateringar …\n"
 
-#: ../mdkapplet:399
+#: ../mdkapplet:309
 #, c-format
 msgid "Connecting to"
 msgstr "Koplar til"
 
-#: ../mdkapplet:467 ../mdkupdate:159 ../mdkupdate:188
-#, c-format
-msgid "An error occurred"
-msgstr "Det oppstod ein feil"
-
-#: ../mdkapplet:475
-#, c-format
-msgid "Development release not supported by service"
-msgstr "Utviklingsutgåva er ikkje støtta av denne tenesta"
-
-#: ../mdkapplet:476
-#, c-format
-msgid "Too old release not supported by service"
-msgstr "Gamle utgåver er ikkje støtta av tenesta"
-
-#: ../mdkapplet:477
-#, c-format
-msgid "Unknown state"
-msgstr "Ukjend tilstand"
-
-#: ../mdkapplet:478
-#, c-format
-msgid "Online services disabled. Contact Mandriva Online site\n"
-msgstr "Tenesta er avslått. Ta kontakt med Mandriva Online.\n"
-
-#: ../mdkapplet:479
-#, c-format
-msgid "Wrong Password.\n"
-msgstr "Ugyldig passord.\n"
-
-#: ../mdkapplet:480
-#, c-format
-msgid "Wrong Action or host or login.\n"
-msgstr "Ugyldig handling, vert eller bruknamn.\n"
-
-#: ../mdkapplet:481
-#, c-format
-msgid ""
-"Something is wrong with your network settings (check your route, firewall or "
-"proxy settings)\n"
-msgstr ""
-"Noko er galt med nettverksoppsettet (kontroller oppsetta for rutaren, "
-"brannmuren og mellomtenaren).\n"
-
-#: ../mdkapplet:483
-#, c-format
-msgid ""
-"Problem occured while connecting to the server, please contact the support "
-"team"
-msgstr ""
-"Det oppstod ein feil ved tilkopling til tenaren. Ta kontakt med "
-"kundestøttetenesta."
-
-#: ../mdkapplet:487
-#, c-format
-msgid "Response from Mandriva Online server\n"
-msgstr "Svar frå Mandriva Online-tenaren\n"
-
-#: ../mdkapplet:490
+#: ../mdkapplet:386
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Systemet er oppdatert\n"
 
-#: ../mdkapplet:527
-#, c-format
-msgid "No check"
-msgstr "Ingen kontroll"
-
-#: ../mdkapplet:541
-#, c-format
-msgid "Checking config file: Not present\n"
-msgstr "Kontrollerer oppsettfil: Manglar.\n"
-
-#: ../mdkapplet:544
+#: ../mdkapplet:415
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Kontrollerer nettverk: Ser avslått ut.\n"
 
-#: ../mdkapplet:587
-#, c-format
-msgid "Logs"
-msgstr "Loggar"
-
-#: ../mdkapplet:603
+#: ../mdkapplet:457 ../mdkupdate:118 ../mdkupdate:164
 #, c-format
-msgid "Clear"
-msgstr "Tøm"
+msgid "Warning"
+msgstr "Åtvaring"
 
-#: ../mdkapplet:629
+#: ../mdkapplet:468
 #, c-format
 msgid "About..."
 msgstr "Om …"
 
-#: ../mdkapplet:631
+#: ../mdkapplet:472
 #, c-format
 msgid "Mandriva Online %s"
 msgstr "Mandriva Online %s"
 
-#: ../mdkapplet:635
+#: ../mdkapplet:473
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Copyright © %s Mandriva"
 
-#: ../mdkapplet:647
+#: ../mdkapplet:476
 #, c-format
 msgid "Mandriva Online gives access to Mandriva web services."
 msgstr "Mandriva Online gjev deg tilgang til vevtenestene til Mandriva."
 
-#: ../mdkapplet:655
-#, c-format
-msgid "Always launch on startup"
-msgstr "Køyr ved oppstart"
-
-#: ../mdkapplet:657
-#, c-format
-msgid "Quit"
-msgstr "Avslutt"
-
-#: ../mdkonline:58
-#, c-format
-msgid ""
-"mdonline version %s\n"
-"Copyright (C) %s Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"mdonline – versjon %s\n"
-"Copyright © %s Mandriva.\n"
-"Dette er fri programvare, og kan distribuerast under vilkåra i GNU GPL-"
-"lisensen.\n"
-"\n"
-"Bruk:\n"
-
-#: ../mdkonline:63 ../mdkupdate:73
-#, c-format
-msgid "  --help\t\t- print this help message.\n"
-msgstr "  --help         – Vis denne hjelpeteksten.\n"
-
-#: ../mdkonline:64
-#, c-format
-msgid "  --box=\t\t\t- hostname.\n"
-msgstr "  --box=\t\t\t– vertsnamn.\n"
-
-#: ../mdkonline:65
-#, c-format
-msgid "  --country\t\t\t- name of country of the user. \n"
-msgstr "  --country\t\t\t– Namnet på landet til brukaren. \n"
-
-#: ../mdkonline:66
-#, c-format
-msgid "  --interactive\t\t- use the interactive mode.\n"
-msgstr "  --interactive\t\t– Bruk interaktiv modus.\n"
-
-#: ../mdkonline:67
-#, c-format
-msgid "  --nointeractive\t- use the non-interactive mode.\n"
-msgstr "  --nointeractive\t– Bruk ikkje-interaktiv modus.\n"
-
-#: ../mdkonline:68
-#, c-format
-msgid "  --login=\t\t     - login name of the user.\n"
-msgstr "  --login=\t\t     – Innloggingsnamnet til brukaren.\n"
-
-#: ../mdkonline:69
-#, c-format
-msgid "  --pass=\t\t\t- password  of the user.\n"
-msgstr "  --pass=\t\t\t– Passordet til brukaren.\n"
-
-#: ../mdkonline:87 ../mdkonline:120
-#, c-format
-msgid "Mandriva Online"
-msgstr "Mandriva Online"
-
-#: ../mdkonline:90
-#, c-format
-msgid "I already have an account"
-msgstr "Eg har allereie ein konto"
-
-#: ../mdkonline:91
-#, c-format
-msgid "I want to subscribe"
-msgstr "Eg ønskjer å abonnera"
-
-#: ../mdkonline:96
-#, c-format
-msgid "Mr."
-msgstr "Herr"
-
-#: ../mdkonline:96
-#, c-format
-msgid "Mrs."
-msgstr "Fru"
-
-#: ../mdkonline:96
-#, c-format
-msgid "Ms."
-msgstr "Frøken"
-
-#: ../mdkonline:114
-#, c-format
-msgid "Reading configuration\n"
-msgstr "Leser oppsett\n"
-
-#: ../mdkonline:123
-#, c-format
-msgid ""
-"This assistant will help you to upload your configuration\n"
-"(packages, hardware configuration) to a centralized database in\n"
-"order to keep you informed about security updates and useful upgrades.\n"
-msgstr ""
-"Denne vegvisaren vil hjelpa deg å lasta opp oppsettet ditt\n"
-"(pakkar og maskinvareoppsett) til ein sentralisert database,\n"
-"slik at du kan varslast om viktige tryggleiksoppdateringar\n"
-"og andre viktige oppdaterte programpakkar.\n"
-
-#: ../mdkonline:131
-#, c-format
-msgid "Account creation or authentication"
-msgstr "Oppretting eller autentisering av konto"
-
-#: ../mdkonline:136
-#, c-format
-msgid "Enter your Mandriva Online login, password and machine name:"
-msgstr "Skriv inn brukarnamn, passord og maskinnamn frå Mandriva Online-kontoen:"
-
-#: ../mdkonline:142 ../mdkonline:195
-#, c-format
-msgid "Email address:"
-msgstr "E-postadresse:"
-
-#: ../mdkonline:143
-#, c-format
-msgid "Country"
-msgstr "Land"
-
-#: ../mdkonline:144 ../mdkonline:196
-#, c-format
-msgid "Password:"
-msgstr "Passord:"
-
-#: ../mdkonline:146
-#, c-format
-msgid "Machine description:"
-msgstr "Maskinbeskriving:"
-
-#: ../mdkonline:147
-#, c-format
-msgid "(Ex: My Home Office's Computer)"
-msgstr "(Eksempel: Heimekontormaskina mi)"
-
-#: ../mdkonline:152 ../mdkonline:159 ../mdkonline:180 ../mdkonline:204
-#: ../mdkonline:208 ../mdkonline:212 ../mdkonline:217 ../mdkupdate:141
-#: ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
-#, c-format
-msgid "Error"
-msgstr "Feil"
-
-#: ../mdkonline:152
-#, c-format
-msgid "Machine name must be 1 to 40 alphanumerical characters"
-msgstr "Maskinnamnet må vera på mellom 1 og 40 bokstavar/tal"
-
-#: ../mdkonline:155
-#, c-format
-msgid "Connecting to Mandriva Online website..."
-msgstr "Koplar til Mandriva Online-nettstaden …"
-
-#: ../mdkonline:167
-#, c-format
-msgid ""
-"In order to benefit from Mandriva Online services,\n"
-"we are about to upload your configuration.\n"
-"\n"
-"The Wizard will now send the following information to Mandriva:\n"
-"\n"
-"1) the list of packages you have installed on your system,\n"
-"\n"
-"2) your hardware configuration.\n"
-"\n"
-"If you feel uncomfortable by that idea, or do not want to benefit from this "
-"service,\n"
-"please press 'Cancel'. By pressing 'Next', you allow us to keep you "
-"informed\n"
-"about security updates and useful upgrades via personalized email alerts.\n"
-"Furthermore, you benefit from discounted paid support services on\n"
-"www.mandrivaexpert.com."
-msgstr ""
-"For å kunna bruka Mandriva Online-tenestene, må du først lasta opp oppsettet "
-"ditt.\n"
-"\n"
-"Denne vegvisaren vil no senda følgjande informasjon til Mandriva:\n"
-"\n"
-"1  Oversikta over pakkane du har installert på systemet.\n"
-"\n"
-"2  Oversikt over maskinvareoppsettet ditt.\n"
-"\n"
-"Om du ikkje ønskjer dette, og ikkje vil bruka tenesta, må du velja "
-"«Avbryt».\n"
-"Ved å trykkja «Neste» samtykkjer du i å la oss varsla deg via e-post når "
-"det\n"
-"kjem nye tryggleiksoppdateringar og andre nyttige oppdateringar.\n"
-"Du får òg rabattar på kundestøttetenestene våre på www.mandrivaexpert.com."
-
-#: ../mdkonline:180
-#, c-format
-msgid "Connection problem"
-msgstr "Sambandsproblem"
-
-#: ../mdkonline:180
-#, c-format
-msgid "Problem occurs when uploading files, please try again"
-msgstr "Feil ved opplasting av filer. Prøv på nytt."
-
-#: ../mdkonline:187
-#, c-format
-msgid "Create a Mandriva Online Account"
-msgstr "Opprett Mandriva Online-konto"
-
-#. -PO: that is for things like "Mr", "Ms",...
-#: ../mdkonline:192
-#, c-format
-msgid "Greeting:"
-msgstr "Tiltaleform:"
-
-#: ../mdkonline:193
-#, c-format
-msgid "First name:"
-msgstr "Fornamn:"
-
-#: ../mdkonline:194
-#, c-format
-msgid "Last name:"
-msgstr "Etternamn:"
-
-#: ../mdkonline:197
-#, c-format
-msgid "Confirm Password:"
-msgstr "Stadfest passord:"
-
-#: ../mdkonline:204
-#, c-format
-msgid ""
-"The passwords do not match\n"
-" Please try again\n"
-msgstr ""
-"Dei to passord er ikkje like.\n"
-"Prøv på nytt.\n"
-
-#: ../mdkonline:208
-#, c-format
-msgid "Please fill in each field"
-msgstr "Fyll inn alle felta"
-
-#: ../mdkonline:212
-#, c-format
-msgid "Not a valid mail address!\n"
-msgstr "Ugyldig e-postadresse.\n"
-
-#: ../mdkonline:217
-#, c-format
-msgid "Creating account failed!"
-msgstr "Klarte ikkje oppretta konto."
-
-#: ../mdkonline:225
-#, c-format
-msgid ""
-"Mandriva Online Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
-msgstr ""
-"Fullført oppretting av Mandriva Online-konto.\n"
-"Trykk «Neste» for å autentisera og lasta opp oppsettet ditt.\n"
-
-#: ../mdkonline:229
-#, c-format
-msgid "Your upload was successful!"
-msgstr "Opplastinga er ferdig."
-
-#: ../mdkonline:229
+#: ../mdkapplet:478
 #, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandriva Online."
-msgstr ""
-"Frå no av vil du motta varsel om programoppdateringar\n"
-"frå Mandriva Online."
+msgid "Online WebSite"
+msgstr "Heimeside"
 
-#: ../mdkonline:229
+#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
+#: ../mdkapplet:483
 #, c-format
-msgid ""
-"Mandriva Online offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
+msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
-"Mandriva Linux gjer det mogleg å automatisera mottak av oppdateringar.\n"
-"Eit program køyrer regelmessig og ser om nye oppdateringar er "
-"tilgjengelege.\n"
 
-#: ../mdkonline:238
+#: ../mdkapplet:492
 #, c-format
-msgid "Congratulations"
-msgstr "Gratulerer"
-
-#: ../mdkonline:238
-#, c-format
-msgid "Your Mandriva Online account has been successfully configured\n"
-msgstr "Mandriva Online-kontoen er no sett opp.\n"
-
-#: ../mdkonline:253
-#, c-format
-msgid "Configuration uploaded successfully"
-msgstr "Oppsettet er lasta opp"
-
-#: ../mdkonline:254
-#, c-format
-msgid "Problem uploading configuration"
-msgstr "Feil ved opplasting av oppsett"
+msgid "Always launch on startup"
+msgstr "Køyr ved oppstart"
 
-#: ../mdkonline:256
+#: ../mdkapplet:494
 #, c-format
-msgid ""
-"Cannot connect to Mandriva Online website: wrong login/password or router/"
-"firewall bad settings"
-msgstr ""
-"Klarte ikkje kopla til Mandriva Online-nettstaden: Feil brukarnamn/passord "
-"eller feil rutar/brannmur-oppsett."
+msgid "Quit"
+msgstr "Avslutt"
 
 #: ../mdkonline.pm:207
 #, c-format
@@ -820,6 +360,11 @@ msgstr ""
 "\n"
 "Bruk:\n"
 
+#: ../mdkupdate:73
+#, c-format
+msgid "  --help\t\t- print this help message.\n"
+msgstr "  --help         – Vis denne hjelpeteksten.\n"
+
 #: ../mdkupdate:74
 #, c-format
 msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
@@ -845,12 +390,8 @@ msgstr "  --debug\t\t\t– Logg over kva som vert gjort.\n"
 msgid ""
 "  --bundle file.bundle\t- parse and install package from .bundle metainfo "
 "file.\n"
-msgstr "  --bundle file.bundle\t– Installer pakkar frå ei .bundle-metainfofil.\n"
-
-#: ../mdkupdate:118 ../mdkupdate:164
-#, c-format
-msgid "Warning"
-msgstr "Åtvaring"
+msgstr ""
+"  --bundle file.bundle\t– Installer pakkar frå ei .bundle-metainfofil.\n"
 
 #. -PO: here Live Install is currently *NOT* translated on the desktop, so it's better to keep as it:
 #: ../mdkupdate:120
@@ -858,13 +399,24 @@ msgstr "Åtvaring"
 msgid ""
 "You first need to install the system on your harddrive with the 'Live "
 "Install' wizard."
-msgstr "Du må først installera systemet på harddisken med «Live-install»-vegvisaren."
+msgstr ""
+"Du må først installera systemet på harddisken med «Live-install»-vegvisaren."
+
+#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
+#, c-format
+msgid "Please wait"
+msgstr "Vent litt"
 
 #: ../mdkupdate:123 ../mdkupdate:174
 #, c-format
 msgid "Preparing..."
 msgstr "Førebur …"
 
+#: ../mdkupdate:141 ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
+#, c-format
+msgid "Error"
+msgstr "Feil"
+
 #: ../mdkupdate:141
 #, c-format
 msgid ""
@@ -876,6 +428,11 @@ msgstr ""
 "\n"
 "%s"
 
+#: ../mdkupdate:159 ../mdkupdate:188
+#, c-format
+msgid "An error occurred"
+msgstr "Det oppstod ein feil"
+
 #: ../mdkupdate:164
 #, c-format
 msgid ""
@@ -904,6 +461,309 @@ msgstr "Installerer pakkar …\n"
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "Klarte ikkje oppdatera pakkar frå oppdateringsmedium.\n"
 
+#~ msgid "New bundles are available for your system"
+#~ msgstr "Det finst nye programsamlingar for systemet ditt."
+
+#~ msgid "Service is not configured. Please click on \"Configure the service\""
+#~ msgstr "Tenesta er ikkje sett opp enno. Vel «Set opp tenesta»."
+
+#~ msgid "Configure the service"
+#~ msgstr "Set opp tenesta"
+
+#~ msgid "Check updates"
+#~ msgstr "Ser etter oppdateringar "
+
+#~ msgid "Configure Now!"
+#~ msgstr "Set opp"
+
+#~ msgid "Actions"
+#~ msgstr "Handlingar"
+
+#~ msgid "Configure"
+#~ msgstr "Set opp"
+
+#~ msgid "See logs"
+#~ msgstr "Sjå loggar"
+
+#~ msgid "Status"
+#~ msgstr "Status"
+
+#~ msgid "Close"
+#~ msgstr "Lukk"
+
+#~ msgid "Network Connection: "
+#~ msgstr "Nettverksoppsett: "
+
+#~ msgid "Up"
+#~ msgstr "Op"
+
+#~ msgid "Down"
+#~ msgstr "Ned"
+
+#~ msgid "Last check: "
+#~ msgstr "Siste kontroll: "
+
+#~ msgid "Machine name:"
+#~ msgstr "Maskinnamn:"
+
+#~ msgid "Updates: "
+#~ msgstr "Oppdateringar: "
+
+#~ msgid "Development release not supported by service"
+#~ msgstr "Utviklingsutgåva er ikkje støtta av denne tenesta"
+
+#~ msgid "Too old release not supported by service"
+#~ msgstr "Gamle utgåver er ikkje støtta av tenesta"
+
+#~ msgid "Unknown state"
+#~ msgstr "Ukjend tilstand"
+
+#~ msgid "Online services disabled. Contact Mandriva Online site\n"
+#~ msgstr "Tenesta er avslått. Ta kontakt med Mandriva Online.\n"
+
+#~ msgid "Wrong Password.\n"
+#~ msgstr "Ugyldig passord.\n"
+
+#~ msgid "Wrong Action or host or login.\n"
+#~ msgstr "Ugyldig handling, vert eller bruknamn.\n"
+
+#~ msgid ""
+#~ "Something is wrong with your network settings (check your route, firewall "
+#~ "or proxy settings)\n"
+#~ msgstr ""
+#~ "Noko er galt med nettverksoppsettet (kontroller oppsetta for rutaren, "
+#~ "brannmuren og mellomtenaren).\n"
+
+#~ msgid ""
+#~ "Problem occured while connecting to the server, please contact the "
+#~ "support team"
+#~ msgstr ""
+#~ "Det oppstod ein feil ved tilkopling til tenaren. Ta kontakt med "
+#~ "kundestøttetenesta."
+
+#~ msgid "Response from Mandriva Online server\n"
+#~ msgstr "Svar frå Mandriva Online-tenaren\n"
+
+#~ msgid "No check"
+#~ msgstr "Ingen kontroll"
+
+#~ msgid "Checking config file: Not present\n"
+#~ msgstr "Kontrollerer oppsettfil: Manglar.\n"
+
+#~ msgid "Logs"
+#~ msgstr "Loggar"
+
+#~ msgid "Clear"
+#~ msgstr "Tøm"
+
+#~ msgid ""
+#~ "mdonline version %s\n"
+#~ "Copyright (C) %s Mandriva.\n"
+#~ "This is free software and may be redistributed under the terms of the GNU "
+#~ "GPL.\n"
+#~ "\n"
+#~ "usage:\n"
+#~ msgstr ""
+#~ "mdonline – versjon %s\n"
+#~ "Copyright © %s Mandriva.\n"
+#~ "Dette er fri programvare, og kan distribuerast under vilkåra i GNU GPL-"
+#~ "lisensen.\n"
+#~ "\n"
+#~ "Bruk:\n"
+
+#~ msgid "  --box=\t\t\t- hostname.\n"
+#~ msgstr "  --box=\t\t\t– vertsnamn.\n"
+
+#~ msgid "  --country\t\t\t- name of country of the user. \n"
+#~ msgstr "  --country\t\t\t– Namnet på landet til brukaren. \n"
+
+#~ msgid "  --interactive\t\t- use the interactive mode.\n"
+#~ msgstr "  --interactive\t\t– Bruk interaktiv modus.\n"
+
+#~ msgid "  --nointeractive\t- use the non-interactive mode.\n"
+#~ msgstr "  --nointeractive\t– Bruk ikkje-interaktiv modus.\n"
+
+#~ msgid "  --login=\t\t     - login name of the user.\n"
+#~ msgstr "  --login=\t\t     – Innloggingsnamnet til brukaren.\n"
+
+#~ msgid "  --pass=\t\t\t- password  of the user.\n"
+#~ msgstr "  --pass=\t\t\t– Passordet til brukaren.\n"
+
+#~ msgid "Mandriva Online"
+#~ msgstr "Mandriva Online"
+
+#~ msgid "I already have an account"
+#~ msgstr "Eg har allereie ein konto"
+
+#~ msgid "I want to subscribe"
+#~ msgstr "Eg ønskjer å abonnera"
+
+#~ msgid "Mr."
+#~ msgstr "Herr"
+
+#~ msgid "Mrs."
+#~ msgstr "Fru"
+
+#~ msgid "Ms."
+#~ msgstr "Frøken"
+
+#~ msgid "Reading configuration\n"
+#~ msgstr "Leser oppsett\n"
+
+#~ msgid ""
+#~ "This assistant will help you to upload your configuration\n"
+#~ "(packages, hardware configuration) to a centralized database in\n"
+#~ "order to keep you informed about security updates and useful upgrades.\n"
+#~ msgstr ""
+#~ "Denne vegvisaren vil hjelpa deg å lasta opp oppsettet ditt\n"
+#~ "(pakkar og maskinvareoppsett) til ein sentralisert database,\n"
+#~ "slik at du kan varslast om viktige tryggleiksoppdateringar\n"
+#~ "og andre viktige oppdaterte programpakkar.\n"
+
+#~ msgid "Account creation or authentication"
+#~ msgstr "Oppretting eller autentisering av konto"
+
+#~ msgid "Enter your Mandriva Online login, password and machine name:"
+#~ msgstr ""
+#~ "Skriv inn brukarnamn, passord og maskinnamn frå Mandriva Online-kontoen:"
+
+#~ msgid "Email address:"
+#~ msgstr "E-postadresse:"
+
+#~ msgid "Country"
+#~ msgstr "Land"
+
+#~ msgid "Password:"
+#~ msgstr "Passord:"
+
+#~ msgid "Machine description:"
+#~ msgstr "Maskinbeskriving:"
+
+#~ msgid "(Ex: My Home Office's Computer)"
+#~ msgstr "(Eksempel: Heimekontormaskina mi)"
+
+#~ msgid "Machine name must be 1 to 40 alphanumerical characters"
+#~ msgstr "Maskinnamnet må vera på mellom 1 og 40 bokstavar/tal"
+
+#~ msgid "Connecting to Mandriva Online website..."
+#~ msgstr "Koplar til Mandriva Online-nettstaden …"
+
+#~ msgid ""
+#~ "In order to benefit from Mandriva Online services,\n"
+#~ "we are about to upload your configuration.\n"
+#~ "\n"
+#~ "The Wizard will now send the following information to Mandriva:\n"
+#~ "\n"
+#~ "1) the list of packages you have installed on your system,\n"
+#~ "\n"
+#~ "2) your hardware configuration.\n"
+#~ "\n"
+#~ "If you feel uncomfortable by that idea, or do not want to benefit from "
+#~ "this service,\n"
+#~ "please press 'Cancel'. By pressing 'Next', you allow us to keep you "
+#~ "informed\n"
+#~ "about security updates and useful upgrades via personalized email "
+#~ "alerts.\n"
+#~ "Furthermore, you benefit from discounted paid support services on\n"
+#~ "www.mandrivaexpert.com."
+#~ msgstr ""
+#~ "For å kunna bruka Mandriva Online-tenestene, må du først lasta opp "
+#~ "oppsettet ditt.\n"
+#~ "\n"
+#~ "Denne vegvisaren vil no senda følgjande informasjon til Mandriva:\n"
+#~ "\n"
+#~ "1  Oversikta over pakkane du har installert på systemet.\n"
+#~ "\n"
+#~ "2  Oversikt over maskinvareoppsettet ditt.\n"
+#~ "\n"
+#~ "Om du ikkje ønskjer dette, og ikkje vil bruka tenesta, må du velja "
+#~ "«Avbryt».\n"
+#~ "Ved å trykkja «Neste» samtykkjer du i å la oss varsla deg via e-post når "
+#~ "det\n"
+#~ "kjem nye tryggleiksoppdateringar og andre nyttige oppdateringar.\n"
+#~ "Du får òg rabattar på kundestøttetenestene våre på www.mandrivaexpert.com."
+
+#~ msgid "Connection problem"
+#~ msgstr "Sambandsproblem"
+
+#~ msgid "Problem occurs when uploading files, please try again"
+#~ msgstr "Feil ved opplasting av filer. Prøv på nytt."
+
+#~ msgid "Create a Mandriva Online Account"
+#~ msgstr "Opprett Mandriva Online-konto"
+
+#~ msgid "Greeting:"
+#~ msgstr "Tiltaleform:"
+
+#~ msgid "First name:"
+#~ msgstr "Fornamn:"
+
+#~ msgid "Last name:"
+#~ msgstr "Etternamn:"
+
+#~ msgid "Confirm Password:"
+#~ msgstr "Stadfest passord:"
+
+#~ msgid ""
+#~ "The passwords do not match\n"
+#~ " Please try again\n"
+#~ msgstr ""
+#~ "Dei to passord er ikkje like.\n"
+#~ "Prøv på nytt.\n"
+
+#~ msgid "Please fill in each field"
+#~ msgstr "Fyll inn alle felta"
+
+#~ msgid "Not a valid mail address!\n"
+#~ msgstr "Ugyldig e-postadresse.\n"
+
+#~ msgid "Creating account failed!"
+#~ msgstr "Klarte ikkje oppretta konto."
+
+#~ msgid ""
+#~ "Mandriva Online Account successfully created.\n"
+#~ "Please click \"Next\" to authenticate and upload your configuration\n"
+#~ msgstr ""
+#~ "Fullført oppretting av Mandriva Online-konto.\n"
+#~ "Trykk «Neste» for å autentisera og lasta opp oppsettet ditt.\n"
+
+#~ msgid "Your upload was successful!"
+#~ msgstr "Opplastinga er ferdig."
+
+#~ msgid ""
+#~ "From now you will receive on security and updates \n"
+#~ "announcements thanks to Mandriva Online."
+#~ msgstr ""
+#~ "Frå no av vil du motta varsel om programoppdateringar\n"
+#~ "frå Mandriva Online."
+
+#~ msgid ""
+#~ "Mandriva Online offers you the ability to automate the updates.\n"
+#~ "A program will run regulary in your system waiting for new updates\n"
+#~ msgstr ""
+#~ "Mandriva Linux gjer det mogleg å automatisera mottak av oppdateringar.\n"
+#~ "Eit program køyrer regelmessig og ser om nye oppdateringar er "
+#~ "tilgjengelege.\n"
+
+#~ msgid "Congratulations"
+#~ msgstr "Gratulerer"
+
+#~ msgid "Your Mandriva Online account has been successfully configured\n"
+#~ msgstr "Mandriva Online-kontoen er no sett opp.\n"
+
+#~ msgid "Configuration uploaded successfully"
+#~ msgstr "Oppsettet er lasta opp"
+
+#~ msgid "Problem uploading configuration"
+#~ msgstr "Feil ved opplasting av oppsett"
+
+#~ msgid ""
+#~ "Cannot connect to Mandriva Online website: wrong login/password or router/"
+#~ "firewall bad settings"
+#~ msgstr ""
+#~ "Klarte ikkje kopla til Mandriva Online-nettstaden: Feil brukarnamn/"
+#~ "passord eller feil rutar/brannmur-oppsett."
+
 #~ msgid "  --applet\t\t- launch Mandriva Update.\n"
 #~ msgstr "  --applet       – Køyr Mandriva Update.\n"
 
@@ -974,4 +834,3 @@ msgstr "Klarte ikkje oppdatera pakkar frå oppdateringsmedium.\n"
 #~ msgstr ""
 #~ "Det oppstod ein feil ved tilkopling til tenaren. Ta kontakt med "
 #~ "kundestøttetenesta."
-
diff --git a/po/pa_IN.po b/po/pa_IN.po
index 15a0f83e..95d7bb8f 100644
--- a/po/pa_IN.po
+++ b/po/pa_IN.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline\n"
-"POT-Creation-Date: 2007-08-09 16:26+0200\n"
+"POT-Creation-Date: 2008-02-21 18:21+0100\n"
 "PO-Revision-Date: 2005-03-26 22:30+0530\n"
 "Last-Translator: Kanwaljeet Singh Brar <kanwaljeetbrar@yahoo.co.in>\n"
 "Language-Team: punlinux-i18n@lists.sourceforge.net\n"
@@ -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:94
+#: ../mdkapplet:88
 #, fuzzy, c-format
 msgid "Will check updates at %s"
 msgstr "ਨਵੀਨੀਕਰਨ ਪੜਤਾਲ"
 
-#: ../mdkapplet:103
+#: ../mdkapplet:97
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "ਤੁਹਾਡਾ ਸਿਸਟਮ ਨਵੀਨ ਹੈ"
 
-#: ../mdkapplet:109
+#: ../mdkapplet:103
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -35,53 +35,43 @@ msgstr ""
 "ਸੇਵਾ ਸੰਰਚਨਾ ਸਮੱਸਿਆ ਹੈ। ਕਿਰਪਾ ਕਰਕੇ ਲਾਗ ਦੀ ਪੜਤਾਲ ਕਰੋ ਅਤੇ support@mandrivaonline.com ਨੂੰ "
 "ਚਿੱਠੀ ਪਾਓ।"
 
-#: ../mdkapplet:115
+#: ../mdkapplet:110
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "ਕਿਰਪਾ ਕਰਕੇ ਉਡੀਕੋ, ਉਪਲੱਬਧ ਪੈਕੇਜ ਖੋਜੇ ਜਾ ਰਹੇ ਹਨ..."
 
-#: ../mdkapplet:121
+#: ../mdkapplet:116
 #, c-format
 msgid "New updates are available for your system"
 msgstr "ਤੁਹਾਡੇ ਸਿਸਟਮ ਲਈ ਨਵੇਂ ਨਵੀਨੀਕਰਨ ਉਪਲੱਬਧ ਹਨ"
 
-#: ../mdkapplet:127
-#, fuzzy, c-format
-msgid "New bundles are available for your system"
-msgstr "ਤੁਹਾਡੇ ਸਿਸਟਮ ਲਈ ਨਵੇਂ ਨਵੀਨੀਕਰਨ ਉਪਲੱਬਧ ਹਨ"
-
-#: ../mdkapplet:133
-#, c-format
-msgid "Service is not configured. Please click on \"Configure the service\""
-msgstr "ਸੇਵਾ ਸੰਰਚਿਤ ਨਹੀਂ ਹੈ। ਕਿਰਪਾ ਕਰਕੇ \"ਸੇਵਾ ਸੰਰਚਨਾ\" ਨੂੰ ਦਬਾਓ"
-
-#: ../mdkapplet:139
+#: ../mdkapplet:122
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "ਨੈਟਵਰਕ ਬੰਦ ਹੈ। ਕਿਰਪਾ ਕਰਕੇ ਆਪਣੇ ਨੈਟਵਰਕ ਦੀ ਸੰਰਚਨਾ ਕਰੋ"
 
-#: ../mdkapplet:145
+#: ../mdkapplet:128
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "ਸੇਵਾ ਸਰਗਰਮ ਨਹੀਂ ਹੈ। ਕਿਰਪਾ ਕਰਕੇ \"ਆਨਲਾਇਨ ਵੈਬਸਾਇਟ\" ਦਬਾਓ"
 
-#: ../mdkapplet:151 ../mdkapplet:182
+#: ../mdkapplet:134 ../mdkapplet:165
 #, fuzzy, c-format
 msgid "urpmi database locked"
 msgstr "urpmi ਡਾਟਾਬੇਸ ਤਾਲਾਬੰਦ ਹੈ"
 
-#: ../mdkapplet:157
+#: ../mdkapplet:140
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr "ਜਾਰੀ ਸਹਿਯੋਗੀ ਨਹੀਂ ਹੈ (ਬਹੁਤ ਪੁਰਾਣਾ ਵਰਜਨ ਹੈ ਜਾਂ ਵਿਕਾਸ ਜਾਰੀ ਹੈ)"
 
-#: ../mdkapplet:163
+#: ../mdkapplet:146
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
 msgstr ""
 
-#: ../mdkapplet:169
+#: ../mdkapplet:152
 #, fuzzy, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -98,577 +88,131 @@ msgstr ""
 "\n"
 "ਤਦ, %s ਮੁੜ ਚਲਾਓ।"
 
-#: ../mdkapplet:174
+#: ../mdkapplet:157
 #, c-format
 msgid "Enabled"
 msgstr "ਯੋਗ"
 
-#: ../mdkapplet:187
+#: ../mdkapplet:170
 #, c-format
 msgid "Error updating media"
 msgstr ""
 
-#: ../mdkapplet:202
+#: ../mdkapplet:185
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr "ਪੜਤਾਲ ਜਾਰੀ... ਨਵੀਨੀਕਰਨ ਉਪਲੱਬਧ ਹਨ\n"
 
-#: ../mdkapplet:207
+#: ../mdkapplet:190
 #, c-format
 msgid "Packages are up to date"
 msgstr ""
 
-#: ../mdkapplet:212
+#: ../mdkapplet:195
 #, fuzzy, c-format
 msgid "Failed to open urpmi database"
 msgstr "rpmdb ਖੋਲਣ ਲਈ ਅਸਫਲ"
 
-#: ../mdkapplet:217 ../mdkapplet:324
+#: ../mdkapplet:200
 #, c-format
 msgid "Install updates"
 msgstr "ਨਵੀਨੀਕਰਨ ਇੰਸਟਾਲ"
 
-#: ../mdkapplet:218
-#, c-format
-msgid "Configure the service"
-msgstr "ਸੇਵਾ ਸੰਰਚਨਾ"
-
-#: ../mdkapplet:219
+#: ../mdkapplet:201
 #, c-format
 msgid "Check Updates"
 msgstr "ਨਵੀਨੀਕਰਨ ਜਾਂਚ"
 
-#: ../mdkapplet:220 ../mdkapplet:327 ../mdkonline:114 ../mdkonline:155
-#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
-#, c-format
-msgid "Please wait"
-msgstr "ਕਿਰਪਾ ਕਰਕੇ ਉਡੀਕੋ"
-
-#: ../mdkapplet:220 ../mdkapplet:326 ../mdkapplet:327
-#, c-format
-msgid "Check updates"
-msgstr "ਨਵੀਨੀਕਰਨ ਪੜਤਾਲ"
-
-#: ../mdkapplet:223 ../mdkapplet:648
-#, c-format
-msgid "Online WebSite"
-msgstr "ਆਨਲਾਇਨ ਵੈੱਬਸਾਇਟ"
-
-#: ../mdkapplet:224
+#: ../mdkapplet:202
 #, c-format
 msgid "Configure Network"
 msgstr "ਨੈਟਵਰਕ ਸੰਰਚਨਾ"
 
-#: ../mdkapplet:225
-#, c-format
-msgid "Configure Now!"
-msgstr "ਹੁਣ ਸੰਰਚਨਾ!"
-
-#: ../mdkapplet:313 ../mdkapplet:392
-#, c-format
-msgid "Mandriva Linux Updates Applet"
-msgstr "ਮੈਂਡਰਿਵਲੀਨਕਸ ਨਵੀਨੀਕਰਨ ਐਪਲਿਟ"
-
-#: ../mdkapplet:322
-#, c-format
-msgid "Actions"
-msgstr "ਕਾਰਵਾਈ"
-
-#: ../mdkapplet:325
-#, c-format
-msgid "Configure"
-msgstr "ਸੰਰਚਨਾ"
-
-#: ../mdkapplet:329
-#, c-format
-msgid "See logs"
-msgstr "ਲਾਗ ਵੇਖੋ"
-
-#: ../mdkapplet:332
-#, c-format
-msgid "Status"
-msgstr "ਸਥਿਤੀ"
-
-#: ../mdkapplet:336 ../mdkapplet:597
-#, c-format
-msgid "Close"
-msgstr "ਬੰਦ ਕਰੋ"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Network Connection: "
-msgstr "ਨੈਟਵਰਕ ਕੁਨੈਕਸ਼ਨ: "
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Up"
-msgstr "ਚਾਲੂ"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Down"
-msgstr "ਬੰਦ"
-
-#: ../mdkapplet:366
-#, c-format
-msgid "Last check: "
-msgstr "ਆਖਰੀ ਚੈਕ: "
-
-#: ../mdkapplet:367 ../mdkonline:145
-#, c-format
-msgid "Machine name:"
-msgstr "ਮਸ਼ੀਨ ਨਾਂ: "
-
-#: ../mdkapplet:368
-#, c-format
-msgid "Updates: "
-msgstr "ਨਵੀਨੀਕਰਨ: "
-
-#: ../mdkapplet:372
+#: ../mdkapplet:283
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "drakconnect ਚਾਲੂ ਕੀਤਾ ਜਾਦਾ ਹੈ\n"
 
-#: ../mdkapplet:375
+#: ../mdkapplet:286
 #, c-format
 msgid "Mandriva Online seems to be reinstalled, reloading applet ...."
 msgstr "ਮੈਂਡਰਿਵਆਨਲਾਇਨ ਮੁੜ-ਇੰਸਟਾਲ ਜਾਪਦਾ ਹੈ, ਐਪਲਿਟ ਮੁੜ ਲੋਡ..."
 
-#: ../mdkapplet:383
+#: ../mdkapplet:294
 #, c-format
 msgid "Launching MandrivaUpdate\n"
 msgstr "MandrivaUpdate ਚਾਲੂ ਕੀਤਾ ਜਾਦਾ ਹੈ\n"
 
-#: ../mdkapplet:398
+#: ../mdkapplet:303
+#, c-format
+msgid "Mandriva Linux Updates Applet"
+msgstr "ਮੈਂਡਰਿਵਲੀਨਕਸ ਨਵੀਨੀਕਰਨ ਐਪਲਿਟ"
+
+#: ../mdkapplet:308
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "ਨਵੇਂ ਨਵੀਨੀਕਰਨ ਲਈ ਗਣਨਾ ਜਾਰੀ ਹੈ...\n"
 
-#: ../mdkapplet:399
+#: ../mdkapplet:309
 #, c-format
 msgid "Connecting to"
 msgstr "ਜੁੜਿਆ ਜਾਦਾ ਹੈ"
 
-#: ../mdkapplet:467 ../mdkupdate:159 ../mdkupdate:188
-#, c-format
-msgid "An error occurred"
-msgstr "ਇੱਕ ਗਲਤੀ ਆਈ ਹੈ"
-
-#: ../mdkapplet:475
-#, c-format
-msgid "Development release not supported by service"
-msgstr "ਵਿਕਾਸ ਜਾਰੀ ਸੇਵਾ ਲਈ ਸਹਿਯੋਗੀ ਨਹੀਂ ਹੈ"
-
-#: ../mdkapplet:476
-#, c-format
-msgid "Too old release not supported by service"
-msgstr "ਸੇਵਾ ਲਈ ਜਾਰੀ ਬਹੁਤ ਹੀ ਪੁਰਾਣਾ ਵਰਜਨ ਹੈ"
-
-#: ../mdkapplet:477
-#, c-format
-msgid "Unknown state"
-msgstr "ਅਣਜਾਣੀ ਸਥਿਤੀ"
-
-#: ../mdkapplet:478
-#, c-format
-msgid "Online services disabled. Contact Mandriva Online site\n"
-msgstr "ਆਨਲਾਇਨ ਸੇਵਾ ਆਯੋਗ ਹੈ। ਮੈਂਡਰਿਵਆਨਲਾਇਨ ਨਾਲ ਸੰਪਰਕ ਕਰੋ\n"
-
-#: ../mdkapplet:479
-#, c-format
-msgid "Wrong Password.\n"
-msgstr "ਗਲਤ ਗੁਪਤ-ਕੋਡ ਹੈ।\n"
-
-#: ../mdkapplet:480
-#, c-format
-msgid "Wrong Action or host or login.\n"
-msgstr "ਗਲਤ ਕਾਰਵਾਈ ਜਾਂ ਮੇਜ਼ਬਾਨ ਜਾਂ ਲਾਗਿੰਨ ਹੈ।\n"
-
-#: ../mdkapplet:481
-#, c-format
-msgid ""
-"Something is wrong with your network settings (check your route, firewall or "
-"proxy settings)\n"
-msgstr ""
-"ਤੁਹਾਡੀ ਨੈਟਵਰਕ ਵਿਵਸਥਾ ਵਿੱਚ ਕੁਝ ਗਲਤ ਹੈ (ਆਪਣਾ ਰੂਟ, ਫਾਇਰਵਾਲ, ਜਾਂ ਪਰਾਕਸੀ ਵਿਵਸਥਾ ਦੀ ਜਾਂਚ "
-"ਕਰੋ)\n"
-
-#: ../mdkapplet:483
-#, c-format
-msgid ""
-"Problem occured while connecting to the server, please contact the support "
-"team"
-msgstr "ਸਰਵਰ ਨਾਲ ਜੁੜਨ ਸਮੇਂ ਸਮੱਸਿਆ ਆਈ ਹੈ, ਕਿਰਪਾ ਕਰਕੇ ਸਹਾਇਤਾ ਟੀਮ ਨਾਲ ਸੰਪਰਕ ਕਰੋ"
-
-#: ../mdkapplet:487
-#, c-format
-msgid "Response from Mandriva Online server\n"
-msgstr "ਮੈਂਡਰਿਵਆਨਲਾਇਨ ਸਰਵਰ ਤੋਂ ਜਵਾਬ\n"
-
-#: ../mdkapplet:490
+#: ../mdkapplet:386
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "ਸਿਸਟਮ ਨਵੀਨ ਹੈ।\n"
 
-#: ../mdkapplet:527
-#, c-format
-msgid "No check"
-msgstr "ਕੋਈ ਜਾਂਚ ਨਹੀਂ"
-
-#: ../mdkapplet:541
-#, c-format
-msgid "Checking config file: Not present\n"
-msgstr "ਸੰਰਚਨਾ ਫਾਇਲ ਪੜਤਾਲ: ਮੌਜੂਦ ਨਹੀਂ ਹੈ\n"
-
-#: ../mdkapplet:544
+#: ../mdkapplet:415
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "ਨੈਟਵਰਕ ਪੜਤਾਲ: ਆਯੋਗ ਜਾਪਦਾ ਹੈ\n"
 
-#: ../mdkapplet:587
-#, c-format
-msgid "Logs"
-msgstr "ਲਾਗ"
-
-#: ../mdkapplet:603
+#: ../mdkapplet:457 ../mdkupdate:118 ../mdkupdate:164
 #, c-format
-msgid "Clear"
-msgstr "ਸਾਫ਼"
+msgid "Warning"
+msgstr "ਚੇਤਾਵਨੀ"
 
-#: ../mdkapplet:629
+#: ../mdkapplet:468
 #, c-format
 msgid "About..."
 msgstr "ਇਸ ਬਾਰੇ..."
 
-#: ../mdkapplet:631
+#: ../mdkapplet:472
 #, fuzzy, c-format
 msgid "Mandriva Online %s"
 msgstr "ਮੈਂਡਰਿਵਆਨਲਾਇਨ"
 
-#: ../mdkapplet:635
+#: ../mdkapplet:473
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr ""
 
-#: ../mdkapplet:647
+#: ../mdkapplet:476
 #, c-format
 msgid "Mandriva Online gives access to Mandriva web services."
 msgstr ""
 
-#: ../mdkapplet:655
-#, c-format
-msgid "Always launch on startup"
-msgstr "ਸ਼ੁਰੂ ਸਮੇਂ ਹਮੇਸ਼ਾ ਚਾਲੂ ਕਰੋ"
-
-#: ../mdkapplet:657
-#, c-format
-msgid "Quit"
-msgstr "ਬੰਦ ਕਰੋ"
-
-#: ../mdkonline:58
-#, c-format
-msgid ""
-"mdonline version %s\n"
-"Copyright (C) %s Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"mdonline ਵਰਜਨ %s\n"
-"Copyright (C) %s Mandriva.\n"
-"ਇਹ ਸਾਫਟਵੇਅਰ ਮੁਫਤ ਹੈ ਅਤੇ GNU GPL ਦੀਆਂ ਸ਼ਰਤਾਂ ਅਧੀਨ ਮੁੜ ਵੰਡਿਆ ਜਾ ਸਕਦਾ ਹੈ।\n"
-"\n"
-"ਵਰਤੋਂ:\n"
-
-#: ../mdkonline:63 ../mdkupdate:73
-#, fuzzy, c-format
-msgid "  --help\t\t- print this help message.\n"
-msgstr "  --help         - print this help message.\n"
-
-#: ../mdkonline:64
-#, c-format
-msgid "  --box=\t\t\t- hostname.\n"
-msgstr ""
-
-#: ../mdkonline:65
-#, c-format
-msgid "  --country\t\t\t- name of country of the user. \n"
-msgstr ""
-
-#: ../mdkonline:66
-#, c-format
-msgid "  --interactive\t\t- use the interactive mode.\n"
-msgstr ""
-
-#: ../mdkonline:67
-#, c-format
-msgid "  --nointeractive\t- use the non-interactive mode.\n"
-msgstr ""
-
-#: ../mdkonline:68
-#, c-format
-msgid "  --login=\t\t     - login name of the user.\n"
-msgstr ""
-
-#: ../mdkonline:69
-#, c-format
-msgid "  --pass=\t\t\t- password  of the user.\n"
-msgstr ""
-
-#: ../mdkonline:87 ../mdkonline:120
-#, c-format
-msgid "Mandriva Online"
-msgstr "ਮੈਂਡਰਿਵਆਨਲਾਇਨ"
-
-#: ../mdkonline:90
-#, c-format
-msgid "I already have an account"
-msgstr "ਮੇਰੇ ਕੋਲ ਇੱਕ ਖਾਤਾ ਹੈ"
-
-#: ../mdkonline:91
-#, c-format
-msgid "I want to subscribe"
-msgstr "ਮੈਂ ਮੈਂਬਰ ਹਾਂ"
-
-#: ../mdkonline:96
-#, c-format
-msgid "Mr."
-msgstr ""
-
-#: ../mdkonline:96
-#, fuzzy, c-format
-msgid "Mrs."
-msgstr "XMrIs"
-
-#: ../mdkonline:96
-#, c-format
-msgid "Ms."
-msgstr ""
-
-#: ../mdkonline:114
-#, c-format
-msgid "Reading configuration\n"
-msgstr "ਸੰਰਚਨਾ ਪੜੀ ਜਾ ਰਹੀ ਹੈ\n"
-
-#: ../mdkonline:123
-#, c-format
-msgid ""
-"This assistant will help you to upload your configuration\n"
-"(packages, hardware configuration) to a centralized database in\n"
-"order to keep you informed about security updates and useful upgrades.\n"
-msgstr ""
-"ਇਹ ਸਹਾਇਕ ਤੁਹਾਨੂੰ ਤੁਹਾਡੀ ਸੰਰਚਨਾ (ਪੈਕੇਜ, ਜੰਤਰ ਸੰਰਚਨਾ) ਨੂੰ ਕੇਂਦਰੀ ਡਾਟਾਬੇਸ\n"
-"ਵਿੱਚ ਅਪਲੋਡ ਕਰਨ ਲਈ ਸਹਾਇਤਾ ਕਰੇਗਾ, ਤਾਂ ਤੁਹਾਨੂੰ ਸੁਰੱਖਿਆ\n"
-"ਨਵੀਨੀਕਰਨ ਅਤੇ ਹੋਰ ਲਾਭਦਾਇਕ ਨਵੀਨੀਕਰਨਾਂ ਬਾਰੇ ਸੂਚਨਾ ਮਿਲਦੀ ਰਹੇ।\n"
-
-#: ../mdkonline:131
-#, c-format
-msgid "Account creation or authentication"
-msgstr "ਖਾਤਾ ਬਣਾਉਣਾ ਜਾਂ ਦਾਖਲਾ"
-
-#: ../mdkonline:136
-#, c-format
-msgid "Enter your Mandriva Online login, password and machine name:"
-msgstr "ਆਪਣਾ ਮੈਂਡਰਿਵਆਨਲਾਇਨ ਲਾਗਿੰਨ, ਗੁਪਤ-ਕੋਡ ਅਤੇ ਮਸ਼ੀਨ ਨਾਂ ਦਿਓ:"
-
-#: ../mdkonline:142 ../mdkonline:195
-#, fuzzy, c-format
-msgid "Email address:"
-msgstr "IP ਸਿਰਨਾਵਾਂ"
-
-#: ../mdkonline:143
-#, c-format
-msgid "Country"
-msgstr "ਦੇਸ਼"
-
-#: ../mdkonline:144 ../mdkonline:196
-#, c-format
-msgid "Password:"
-msgstr "ਗੁਪਤ-ਕੋਡ:"
-
-#: ../mdkonline:146
-#, fuzzy, c-format
-msgid "Machine description:"
-msgstr "ਮਸ਼ੀਨ ਨਾਂ: "
-
-#: ../mdkonline:147
-#, c-format
-msgid "(Ex: My Home Office's Computer)"
-msgstr ""
-
-#: ../mdkonline:152 ../mdkonline:159 ../mdkonline:180 ../mdkonline:204
-#: ../mdkonline:208 ../mdkonline:212 ../mdkonline:217 ../mdkupdate:141
-#: ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
-#, c-format
-msgid "Error"
-msgstr "ਗਲਤੀ"
-
-#: ../mdkonline:152
-#, fuzzy, c-format
-msgid "Machine name must be 1 to 40 alphanumerical characters"
-msgstr "ਮਾਊਂਟ ਸਥਿਤੀ ਵਿੱਚ ਸਿਰਫ ਅੱਖਰ-ਅੰਕੀ ਅੱਖਰਾਂ ਸ਼ਾਮਿਲ ਹੋਣੇ ਚਾਹੀਦੇ ਹਨ"
-
-#: ../mdkonline:155
-#, c-format
-msgid "Connecting to Mandriva Online website..."
-msgstr "ਮੈਂਡਰਿਵਆਨਲਾਇਨ ਵੈਬਸਾਇਟ ਨਾਲ ਜੁੜਿਆ ਜਾ ਰਿਹਾ ਹੈ..."
-
-#: ../mdkonline:167
-#, c-format
-msgid ""
-"In order to benefit from Mandriva Online services,\n"
-"we are about to upload your configuration.\n"
-"\n"
-"The Wizard will now send the following information to Mandriva:\n"
-"\n"
-"1) the list of packages you have installed on your system,\n"
-"\n"
-"2) your hardware configuration.\n"
-"\n"
-"If you feel uncomfortable by that idea, or do not want to benefit from this "
-"service,\n"
-"please press 'Cancel'. By pressing 'Next', you allow us to keep you "
-"informed\n"
-"about security updates and useful upgrades via personalized email alerts.\n"
-"Furthermore, you benefit from discounted paid support services on\n"
-"www.mandrivaexpert.com."
-msgstr ""
-"ਮੈਂਡਰਿਵਆਨਲਾਇਨ ਸੇਵਾਵਾਂ ਤੋਂ ਵੱਧੋ ਵੱਧ ਲਾਭ ਲੈਣ ਲਈ,\n"
-"ਅਸੀਂ ਤੁਹਾਡੀ ਸੰਰਚਨਾ ਨੂੰ ਅੱਪਲੋਡ ਕਰ ਰਹੇ ਹਾਂ।\n"
-"\n"
-"ਸਹਾਇਕ ਹੇਠ ਦਿੱਤੀ ਜਾਣਕਾਰੀ ਨੂੰ ਮੈਂਡਰਿਵਸਾਫਟ ਨੂੰ ਭੇਜ ਰਿਹਾ ਹੈ:\n"
-"\n"
-"1) ਤੁਹਾਡੇ ਸਿਸਟਮ ਤੇ ਇੰਸਟਾਲ ਪੈਕੇਜਾਂ ਦੀ ਸੂਚੀ,\n"
-"\n"
-"2) ਤੁਹਾਡੇ ਜੰਤਰਾਂ ਦੀ ਸੰਰਚਨਾ ਹੈ।\n"
-"\n"
-"ਜੇਕਰ ਤੁਹਾਨੂੰ ਇਸ ਢੰਗ ਨਾਲ ਕੋਈ ਸਮੱਸਿਆ ਹੈ ਜਾਂ ਤੁਸੀਂ ਇਸ ਸੰਰਚਨਾ ਦਾ ਲਾਭ ਨਹੀਂ ਲੈਣ ਚਾਹੁੰਦੇ ਹੋ,\n"
-"ਤਾਂ ਕਿਰਪਾ ਕਰਕੇ 'ਰੱਦ ਕਰੋ' ਨੂੰ ਦਬਾਓ। 'ਅੱਗੇ' ਨੂੰ ਦਬਾਉਣ ਨਾਲ, ਤੁਸੀਂ ਸਾਨੂੰ ਆਪਣੇ ਜਾਣਕਾਰੀ ਨੂੰ\n"
-"ਸੁਰੱਖਿਆ ਨਵੀਨੀਕਰਨ ਅਤੇ ਲਾਭਦਾਇਕ ਨਵੀਨੀਕਰਨ ਨੂੰ ਨਿੱਜੀ ਈ-ਪੱਤਰਾਂ ਰਾਹੀਂ ਦੇਣ ਲਈ ਸਹਾਇਕ ਹੋ।\n"
-"ਇਸ ਤੋਂ ਇਲਾਵਾ ਲਗਾਤਾਰ ਪੇਸ਼ੇਵਾਰ ਸਹਿਯੋਗੀ ਸੇਵਾਵਾਂ ਲਈ ਵੇਖੋ\n"
-"www.mandrivaexpert.com"
-
-#: ../mdkonline:180
-#, c-format
-msgid "Connection problem"
-msgstr "ਕੁਨੈਕਸ਼ਨ ਸਮੱਸਿਆ"
-
-#: ../mdkonline:180
-#, c-format
-msgid "Problem occurs when uploading files, please try again"
-msgstr "ਫਾਇਲਾਂ ਅੱਪਲੋਡ ਕਰਨ ਦੌਰਾਨ ਗਲਤੀ ਆਈ ਹੈ, ਕਿਰਪਾ ਕਰਕੇ ਮੁੜ ਕੋਸ਼ਿਸ ਕਰੋ"
-
-#: ../mdkonline:187
-#, c-format
-msgid "Create a Mandriva Online Account"
-msgstr "ਮੈਂਡਰਿਵਆਨਲਾਇਨ ਖਾਤਾ ਬਣਾਓ"
-
-#. -PO: that is for things like "Mr", "Ms",...
-#: ../mdkonline:192
-#, fuzzy, c-format
-msgid "Greeting:"
-msgstr "ਹਰਾ"
-
-#: ../mdkonline:193
-#, c-format
-msgid "First name:"
-msgstr "ਪਹਿਲਾ ਨਾਂ:"
-
-#: ../mdkonline:194
-#, fuzzy, c-format
-msgid "Last name:"
-msgstr "ਪਹਿਲਾ ਨਾਂ:"
-
-#: ../mdkonline:197
-#, c-format
-msgid "Confirm Password:"
-msgstr "ਗੁਪਤ-ਕੋਡ ਪ੍ਰਮਾਣਿਕਤਾ:"
-
-#: ../mdkonline:204
-#, c-format
-msgid ""
-"The passwords do not match\n"
-" Please try again\n"
-msgstr ""
-"ਗੁਪਤ-ਕੋਡ ਮੇਲ ਨਹੀਂ ਕਰਦਾ\n"
-" ਕਿਰਪਾ ਕਰਕੇ ਫਿਰ ਕੋਸ਼ਿਸ਼ ਕਰੋ\n"
-
-#: ../mdkonline:208
-#, fuzzy, c-format
-msgid "Please fill in each field"
-msgstr "ਕਿਰਪਾ ਕਰਕੇ ਸਭ ਖੇਤਰ ਭਰੋ\n"
-
-#: ../mdkonline:212
-#, c-format
-msgid "Not a valid mail address!\n"
-msgstr "ਠੀਕ ਪੱਤਰ ਸਿਰਨਾਵਾਂ ਨਹੀਂ ਹੈ!\n"
-
-#: ../mdkonline:217
-#, c-format
-msgid "Creating account failed!"
-msgstr ""
-
-#: ../mdkonline:225
-#, c-format
-msgid ""
-"Mandriva Online Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
-msgstr ""
-"ਮੈਂਡਰਿਵਆਨਲਾਇਨ ਖਾਤਾ ਸਫਲਤਾਪੂਰਕ ਬਣਾਇਆ ਗਿਆ ਹੈ।\n"
-"ਕਿਰਪਾ ਕਰਕੇ ਪ੍ਰਮਾਣਿਕਤਾ ਅਤੇ ਆਪਣੀ ਸੰਰਚਨਾ ਚੜਾਉਣ ਲਈ \"ਅੱਗੇ\" ਦਬਾਓ।\n"
-
-#: ../mdkonline:229
-#, c-format
-msgid "Your upload was successful!"
-msgstr "ਤੁਹਾਡਾ ਅੱਪਲੋਡ ਸਫਲ ਰਿਹਾ!"
-
-#: ../mdkonline:229
+#: ../mdkapplet:478
 #, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandriva Online."
-msgstr ""
-"ਹੁਣ ਤੁਸੀਂ ਸੁਰੱਖਿਆ ਤੇ ਨਵੀਨੀਕਰਨ ਲਈ ਸੂਚਨਾਵਾਂ ਪ੍ਰਾਪਤ\n"
-"ਕਰ ਸਕਦੇ ਹੋ, ਮੈਂਡਰਿਵਆਨਲਾਇਨ ਦਾ ਧੰਨਵਾਦ।"
+msgid "Online WebSite"
+msgstr "ਆਨਲਾਇਨ ਵੈੱਬਸਾਇਟ"
 
-#: ../mdkonline:229
+#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
+#: ../mdkapplet:483
 #, c-format
-msgid ""
-"Mandriva Online offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
+msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
-"ਮੈਂਡਰਿਵਆਨਲਾਇਨ ਤੁਹਾਨੂੰ ਨਵੀਨੀਕਰਨ ਸਵੈ-ਚਾਲਤ ਕਰਨ ਲਈ ਸਹਾਇਕ ਹੈ।\n"
-"ਇੱਕ ਕਾਰਜ ਲਗਾਤਾਰ ਤੁਹਾਡੇ ਕੰਪਿਊਟਰ ਲਈ ਨਵੀਨ ਪੈਕੇਜਾਂ ਦੀ ਪੜਤਾਲ ਕਰਦਾ ਰਹੇਗਾ।\n"
-
-#: ../mdkonline:238
-#, c-format
-msgid "Congratulations"
-msgstr "ਮੁਬਾਰਕ"
 
-#: ../mdkonline:238
+#: ../mdkapplet:492
 #, c-format
-msgid "Your Mandriva Online account has been successfully configured\n"
-msgstr "ਤੁਹਾਡਾ ਮੈਂਡਰਿਵਆਨਲਾਇਨ ਖਾਤਾ ਸਫਲਤਾਪੂਰਕ ਬਣ ਗਿਆ ਹੈ।\n"
-
-#: ../mdkonline:253
-#, c-format
-msgid "Configuration uploaded successfully"
-msgstr "ਸੰਰਚਨਾ ਸਫਲਤਾਪੂਰਕ ਅੱਪਲੋਡ ਹੋਈ"
-
-#: ../mdkonline:254
-#, c-format
-msgid "Problem uploading configuration"
-msgstr "ਸੰਰਚਨਾ ਅੱਪਲੋਡ ਦੌਰਾਨ ਸਮੱਸਿਆ"
+msgid "Always launch on startup"
+msgstr "ਸ਼ੁਰੂ ਸਮੇਂ ਹਮੇਸ਼ਾ ਚਾਲੂ ਕਰੋ"
 
-#: ../mdkonline:256
+#: ../mdkapplet:494
 #, c-format
-msgid ""
-"Cannot connect to Mandriva Online website: wrong login/password or router/"
-"firewall bad settings"
-msgstr ""
-"ਮੈਂਡਰਿਵਆਨਲਾਇਨ ਸਾਇਟ ਨਾਲ ਜੁੜਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ: ਗਲਤ ਲਾਗਿੰਨ/ਗੁਪਤ-ਕੋਡ ਜਾਂ ਰਾਊਟਰ/ਫਾਇਰਵਾਲ ਗਲਤ "
-"ਵਿਵਸਥਾ"
+msgid "Quit"
+msgstr "ਬੰਦ ਕਰੋ"
 
 #: ../mdkonline.pm:207
 #, fuzzy, c-format
@@ -806,6 +350,11 @@ msgstr ""
 "\n"
 "ਵਰਤੋਂ:\n"
 
+#: ../mdkupdate:73
+#, fuzzy, c-format
+msgid "  --help\t\t- print this help message.\n"
+msgstr "  --help         - print this help message.\n"
+
 #: ../mdkupdate:74
 #, fuzzy, c-format
 msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
@@ -833,11 +382,6 @@ msgid ""
 "file.\n"
 msgstr ""
 
-#: ../mdkupdate:118 ../mdkupdate:164
-#, c-format
-msgid "Warning"
-msgstr "ਚੇਤਾਵਨੀ"
-
 #. -PO: here Live Install is currently *NOT* translated on the desktop, so it's better to keep as it:
 #: ../mdkupdate:120
 #, c-format
@@ -846,11 +390,21 @@ msgid ""
 "Install' wizard."
 msgstr ""
 
+#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
+#, c-format
+msgid "Please wait"
+msgstr "ਕਿਰਪਾ ਕਰਕੇ ਉਡੀਕੋ"
+
 #: ../mdkupdate:123 ../mdkupdate:174
 #, c-format
 msgid "Preparing..."
 msgstr "ਤਿਆਰ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ...."
 
+#: ../mdkupdate:141 ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
+#, c-format
+msgid "Error"
+msgstr "ਗਲਤੀ"
+
 #: ../mdkupdate:141
 #, c-format
 msgid ""
@@ -859,6 +413,11 @@ msgid ""
 "%s"
 msgstr ""
 
+#: ../mdkupdate:159 ../mdkupdate:188
+#, c-format
+msgid "An error occurred"
+msgstr "ਇੱਕ ਗਲਤੀ ਆਈ ਹੈ"
+
 #: ../mdkupdate:164
 #, c-format
 msgid ""
@@ -884,6 +443,280 @@ msgid "Unable to update packages from update_source medium.\n"
 msgstr "update_source ਮਾਧਿਅਮ ਤੋਂ ਪੈਕੇਜ ਨਵੀਨੀਕਰਨ ਲਈ ਅਸਫਲ ਹੈ।\n"
 
 #, fuzzy
+#~ msgid "New bundles are available for your system"
+#~ msgstr "ਤੁਹਾਡੇ ਸਿਸਟਮ ਲਈ ਨਵੇਂ ਨਵੀਨੀਕਰਨ ਉਪਲੱਬਧ ਹਨ"
+
+#~ msgid "Service is not configured. Please click on \"Configure the service\""
+#~ msgstr "ਸੇਵਾ ਸੰਰਚਿਤ ਨਹੀਂ ਹੈ। ਕਿਰਪਾ ਕਰਕੇ \"ਸੇਵਾ ਸੰਰਚਨਾ\" ਨੂੰ ਦਬਾਓ"
+
+#~ msgid "Configure the service"
+#~ msgstr "ਸੇਵਾ ਸੰਰਚਨਾ"
+
+#~ msgid "Check updates"
+#~ msgstr "ਨਵੀਨੀਕਰਨ ਪੜਤਾਲ"
+
+#~ msgid "Configure Now!"
+#~ msgstr "ਹੁਣ ਸੰਰਚਨਾ!"
+
+#~ msgid "Actions"
+#~ msgstr "ਕਾਰਵਾਈ"
+
+#~ msgid "Configure"
+#~ msgstr "ਸੰਰਚਨਾ"
+
+#~ msgid "See logs"
+#~ msgstr "ਲਾਗ ਵੇਖੋ"
+
+#~ msgid "Status"
+#~ msgstr "ਸਥਿਤੀ"
+
+#~ msgid "Close"
+#~ msgstr "ਬੰਦ ਕਰੋ"
+
+#~ msgid "Network Connection: "
+#~ msgstr "ਨੈਟਵਰਕ ਕੁਨੈਕਸ਼ਨ: "
+
+#~ msgid "Up"
+#~ msgstr "ਚਾਲੂ"
+
+#~ msgid "Down"
+#~ msgstr "ਬੰਦ"
+
+#~ msgid "Last check: "
+#~ msgstr "ਆਖਰੀ ਚੈਕ: "
+
+#~ msgid "Machine name:"
+#~ msgstr "ਮਸ਼ੀਨ ਨਾਂ: "
+
+#~ msgid "Updates: "
+#~ msgstr "ਨਵੀਨੀਕਰਨ: "
+
+#~ msgid "Development release not supported by service"
+#~ msgstr "ਵਿਕਾਸ ਜਾਰੀ ਸੇਵਾ ਲਈ ਸਹਿਯੋਗੀ ਨਹੀਂ ਹੈ"
+
+#~ msgid "Too old release not supported by service"
+#~ msgstr "ਸੇਵਾ ਲਈ ਜਾਰੀ ਬਹੁਤ ਹੀ ਪੁਰਾਣਾ ਵਰਜਨ ਹੈ"
+
+#~ msgid "Unknown state"
+#~ msgstr "ਅਣਜਾਣੀ ਸਥਿਤੀ"
+
+#~ msgid "Online services disabled. Contact Mandriva Online site\n"
+#~ msgstr "ਆਨਲਾਇਨ ਸੇਵਾ ਆਯੋਗ ਹੈ। ਮੈਂਡਰਿਵਆਨਲਾਇਨ ਨਾਲ ਸੰਪਰਕ ਕਰੋ\n"
+
+#~ msgid "Wrong Password.\n"
+#~ msgstr "ਗਲਤ ਗੁਪਤ-ਕੋਡ ਹੈ।\n"
+
+#~ msgid "Wrong Action or host or login.\n"
+#~ msgstr "ਗਲਤ ਕਾਰਵਾਈ ਜਾਂ ਮੇਜ਼ਬਾਨ ਜਾਂ ਲਾਗਿੰਨ ਹੈ।\n"
+
+#~ msgid ""
+#~ "Something is wrong with your network settings (check your route, firewall "
+#~ "or proxy settings)\n"
+#~ msgstr ""
+#~ "ਤੁਹਾਡੀ ਨੈਟਵਰਕ ਵਿਵਸਥਾ ਵਿੱਚ ਕੁਝ ਗਲਤ ਹੈ (ਆਪਣਾ ਰੂਟ, ਫਾਇਰਵਾਲ, ਜਾਂ ਪਰਾਕਸੀ ਵਿਵਸਥਾ ਦੀ "
+#~ "ਜਾਂਚ ਕਰੋ)\n"
+
+#~ msgid ""
+#~ "Problem occured while connecting to the server, please contact the "
+#~ "support team"
+#~ msgstr "ਸਰਵਰ ਨਾਲ ਜੁੜਨ ਸਮੇਂ ਸਮੱਸਿਆ ਆਈ ਹੈ, ਕਿਰਪਾ ਕਰਕੇ ਸਹਾਇਤਾ ਟੀਮ ਨਾਲ ਸੰਪਰਕ ਕਰੋ"
+
+#~ msgid "Response from Mandriva Online server\n"
+#~ msgstr "ਮੈਂਡਰਿਵਆਨਲਾਇਨ ਸਰਵਰ ਤੋਂ ਜਵਾਬ\n"
+
+#~ msgid "No check"
+#~ msgstr "ਕੋਈ ਜਾਂਚ ਨਹੀਂ"
+
+#~ msgid "Checking config file: Not present\n"
+#~ msgstr "ਸੰਰਚਨਾ ਫਾਇਲ ਪੜਤਾਲ: ਮੌਜੂਦ ਨਹੀਂ ਹੈ\n"
+
+#~ msgid "Logs"
+#~ msgstr "ਲਾਗ"
+
+#~ msgid "Clear"
+#~ msgstr "ਸਾਫ਼"
+
+#~ msgid ""
+#~ "mdonline version %s\n"
+#~ "Copyright (C) %s Mandriva.\n"
+#~ "This is free software and may be redistributed under the terms of the GNU "
+#~ "GPL.\n"
+#~ "\n"
+#~ "usage:\n"
+#~ msgstr ""
+#~ "mdonline ਵਰਜਨ %s\n"
+#~ "Copyright (C) %s Mandriva.\n"
+#~ "ਇਹ ਸਾਫਟਵੇਅਰ ਮੁਫਤ ਹੈ ਅਤੇ GNU GPL ਦੀਆਂ ਸ਼ਰਤਾਂ ਅਧੀਨ ਮੁੜ ਵੰਡਿਆ ਜਾ ਸਕਦਾ ਹੈ।\n"
+#~ "\n"
+#~ "ਵਰਤੋਂ:\n"
+
+#~ msgid "Mandriva Online"
+#~ msgstr "ਮੈਂਡਰਿਵਆਨਲਾਇਨ"
+
+#~ msgid "I already have an account"
+#~ msgstr "ਮੇਰੇ ਕੋਲ ਇੱਕ ਖਾਤਾ ਹੈ"
+
+#~ msgid "I want to subscribe"
+#~ msgstr "ਮੈਂ ਮੈਂਬਰ ਹਾਂ"
+
+#, fuzzy
+#~ msgid "Mrs."
+#~ msgstr "XMrIs"
+
+#~ msgid "Reading configuration\n"
+#~ msgstr "ਸੰਰਚਨਾ ਪੜੀ ਜਾ ਰਹੀ ਹੈ\n"
+
+#~ msgid ""
+#~ "This assistant will help you to upload your configuration\n"
+#~ "(packages, hardware configuration) to a centralized database in\n"
+#~ "order to keep you informed about security updates and useful upgrades.\n"
+#~ msgstr ""
+#~ "ਇਹ ਸਹਾਇਕ ਤੁਹਾਨੂੰ ਤੁਹਾਡੀ ਸੰਰਚਨਾ (ਪੈਕੇਜ, ਜੰਤਰ ਸੰਰਚਨਾ) ਨੂੰ ਕੇਂਦਰੀ ਡਾਟਾਬੇਸ\n"
+#~ "ਵਿੱਚ ਅਪਲੋਡ ਕਰਨ ਲਈ ਸਹਾਇਤਾ ਕਰੇਗਾ, ਤਾਂ ਤੁਹਾਨੂੰ ਸੁਰੱਖਿਆ\n"
+#~ "ਨਵੀਨੀਕਰਨ ਅਤੇ ਹੋਰ ਲਾਭਦਾਇਕ ਨਵੀਨੀਕਰਨਾਂ ਬਾਰੇ ਸੂਚਨਾ ਮਿਲਦੀ ਰਹੇ।\n"
+
+#~ msgid "Account creation or authentication"
+#~ msgstr "ਖਾਤਾ ਬਣਾਉਣਾ ਜਾਂ ਦਾਖਲਾ"
+
+#~ msgid "Enter your Mandriva Online login, password and machine name:"
+#~ msgstr "ਆਪਣਾ ਮੈਂਡਰਿਵਆਨਲਾਇਨ ਲਾਗਿੰਨ, ਗੁਪਤ-ਕੋਡ ਅਤੇ ਮਸ਼ੀਨ ਨਾਂ ਦਿਓ:"
+
+#, fuzzy
+#~ msgid "Email address:"
+#~ msgstr "IP ਸਿਰਨਾਵਾਂ"
+
+#~ msgid "Country"
+#~ msgstr "ਦੇਸ਼"
+
+#~ msgid "Password:"
+#~ msgstr "ਗੁਪਤ-ਕੋਡ:"
+
+#, fuzzy
+#~ msgid "Machine description:"
+#~ msgstr "ਮਸ਼ੀਨ ਨਾਂ: "
+
+#, fuzzy
+#~ msgid "Machine name must be 1 to 40 alphanumerical characters"
+#~ msgstr "ਮਾਊਂਟ ਸਥਿਤੀ ਵਿੱਚ ਸਿਰਫ ਅੱਖਰ-ਅੰਕੀ ਅੱਖਰਾਂ ਸ਼ਾਮਿਲ ਹੋਣੇ ਚਾਹੀਦੇ ਹਨ"
+
+#~ msgid "Connecting to Mandriva Online website..."
+#~ msgstr "ਮੈਂਡਰਿਵਆਨਲਾਇਨ ਵੈਬਸਾਇਟ ਨਾਲ ਜੁੜਿਆ ਜਾ ਰਿਹਾ ਹੈ..."
+
+#~ msgid ""
+#~ "In order to benefit from Mandriva Online services,\n"
+#~ "we are about to upload your configuration.\n"
+#~ "\n"
+#~ "The Wizard will now send the following information to Mandriva:\n"
+#~ "\n"
+#~ "1) the list of packages you have installed on your system,\n"
+#~ "\n"
+#~ "2) your hardware configuration.\n"
+#~ "\n"
+#~ "If you feel uncomfortable by that idea, or do not want to benefit from "
+#~ "this service,\n"
+#~ "please press 'Cancel'. By pressing 'Next', you allow us to keep you "
+#~ "informed\n"
+#~ "about security updates and useful upgrades via personalized email "
+#~ "alerts.\n"
+#~ "Furthermore, you benefit from discounted paid support services on\n"
+#~ "www.mandrivaexpert.com."
+#~ msgstr ""
+#~ "ਮੈਂਡਰਿਵਆਨਲਾਇਨ ਸੇਵਾਵਾਂ ਤੋਂ ਵੱਧੋ ਵੱਧ ਲਾਭ ਲੈਣ ਲਈ,\n"
+#~ "ਅਸੀਂ ਤੁਹਾਡੀ ਸੰਰਚਨਾ ਨੂੰ ਅੱਪਲੋਡ ਕਰ ਰਹੇ ਹਾਂ।\n"
+#~ "\n"
+#~ "ਸਹਾਇਕ ਹੇਠ ਦਿੱਤੀ ਜਾਣਕਾਰੀ ਨੂੰ ਮੈਂਡਰਿਵਸਾਫਟ ਨੂੰ ਭੇਜ ਰਿਹਾ ਹੈ:\n"
+#~ "\n"
+#~ "1) ਤੁਹਾਡੇ ਸਿਸਟਮ ਤੇ ਇੰਸਟਾਲ ਪੈਕੇਜਾਂ ਦੀ ਸੂਚੀ,\n"
+#~ "\n"
+#~ "2) ਤੁਹਾਡੇ ਜੰਤਰਾਂ ਦੀ ਸੰਰਚਨਾ ਹੈ।\n"
+#~ "\n"
+#~ "ਜੇਕਰ ਤੁਹਾਨੂੰ ਇਸ ਢੰਗ ਨਾਲ ਕੋਈ ਸਮੱਸਿਆ ਹੈ ਜਾਂ ਤੁਸੀਂ ਇਸ ਸੰਰਚਨਾ ਦਾ ਲਾਭ ਨਹੀਂ ਲੈਣ ਚਾਹੁੰਦੇ ਹੋ,\n"
+#~ "ਤਾਂ ਕਿਰਪਾ ਕਰਕੇ 'ਰੱਦ ਕਰੋ' ਨੂੰ ਦਬਾਓ। 'ਅੱਗੇ' ਨੂੰ ਦਬਾਉਣ ਨਾਲ, ਤੁਸੀਂ ਸਾਨੂੰ ਆਪਣੇ ਜਾਣਕਾਰੀ ਨੂੰ\n"
+#~ "ਸੁਰੱਖਿਆ ਨਵੀਨੀਕਰਨ ਅਤੇ ਲਾਭਦਾਇਕ ਨਵੀਨੀਕਰਨ ਨੂੰ ਨਿੱਜੀ ਈ-ਪੱਤਰਾਂ ਰਾਹੀਂ ਦੇਣ ਲਈ ਸਹਾਇਕ ਹੋ।\n"
+#~ "ਇਸ ਤੋਂ ਇਲਾਵਾ ਲਗਾਤਾਰ ਪੇਸ਼ੇਵਾਰ ਸਹਿਯੋਗੀ ਸੇਵਾਵਾਂ ਲਈ ਵੇਖੋ\n"
+#~ "www.mandrivaexpert.com"
+
+#~ msgid "Connection problem"
+#~ msgstr "ਕੁਨੈਕਸ਼ਨ ਸਮੱਸਿਆ"
+
+#~ msgid "Problem occurs when uploading files, please try again"
+#~ msgstr "ਫਾਇਲਾਂ ਅੱਪਲੋਡ ਕਰਨ ਦੌਰਾਨ ਗਲਤੀ ਆਈ ਹੈ, ਕਿਰਪਾ ਕਰਕੇ ਮੁੜ ਕੋਸ਼ਿਸ ਕਰੋ"
+
+#~ msgid "Create a Mandriva Online Account"
+#~ msgstr "ਮੈਂਡਰਿਵਆਨਲਾਇਨ ਖਾਤਾ ਬਣਾਓ"
+
+#, fuzzy
+#~ msgid "Greeting:"
+#~ msgstr "ਹਰਾ"
+
+#~ msgid "First name:"
+#~ msgstr "ਪਹਿਲਾ ਨਾਂ:"
+
+#, fuzzy
+#~ msgid "Last name:"
+#~ msgstr "ਪਹਿਲਾ ਨਾਂ:"
+
+#~ msgid "Confirm Password:"
+#~ msgstr "ਗੁਪਤ-ਕੋਡ ਪ੍ਰਮਾਣਿਕਤਾ:"
+
+#~ msgid ""
+#~ "The passwords do not match\n"
+#~ " Please try again\n"
+#~ msgstr ""
+#~ "ਗੁਪਤ-ਕੋਡ ਮੇਲ ਨਹੀਂ ਕਰਦਾ\n"
+#~ " ਕਿਰਪਾ ਕਰਕੇ ਫਿਰ ਕੋਸ਼ਿਸ਼ ਕਰੋ\n"
+
+#, fuzzy
+#~ msgid "Please fill in each field"
+#~ msgstr "ਕਿਰਪਾ ਕਰਕੇ ਸਭ ਖੇਤਰ ਭਰੋ\n"
+
+#~ msgid "Not a valid mail address!\n"
+#~ msgstr "ਠੀਕ ਪੱਤਰ ਸਿਰਨਾਵਾਂ ਨਹੀਂ ਹੈ!\n"
+
+#~ msgid ""
+#~ "Mandriva Online Account successfully created.\n"
+#~ "Please click \"Next\" to authenticate and upload your configuration\n"
+#~ msgstr ""
+#~ "ਮੈਂਡਰਿਵਆਨਲਾਇਨ ਖਾਤਾ ਸਫਲਤਾਪੂਰਕ ਬਣਾਇਆ ਗਿਆ ਹੈ।\n"
+#~ "ਕਿਰਪਾ ਕਰਕੇ ਪ੍ਰਮਾਣਿਕਤਾ ਅਤੇ ਆਪਣੀ ਸੰਰਚਨਾ ਚੜਾਉਣ ਲਈ \"ਅੱਗੇ\" ਦਬਾਓ।\n"
+
+#~ msgid "Your upload was successful!"
+#~ msgstr "ਤੁਹਾਡਾ ਅੱਪਲੋਡ ਸਫਲ ਰਿਹਾ!"
+
+#~ msgid ""
+#~ "From now you will receive on security and updates \n"
+#~ "announcements thanks to Mandriva Online."
+#~ msgstr ""
+#~ "ਹੁਣ ਤੁਸੀਂ ਸੁਰੱਖਿਆ ਤੇ ਨਵੀਨੀਕਰਨ ਲਈ ਸੂਚਨਾਵਾਂ ਪ੍ਰਾਪਤ\n"
+#~ "ਕਰ ਸਕਦੇ ਹੋ, ਮੈਂਡਰਿਵਆਨਲਾਇਨ ਦਾ ਧੰਨਵਾਦ।"
+
+#~ msgid ""
+#~ "Mandriva Online offers you the ability to automate the updates.\n"
+#~ "A program will run regulary in your system waiting for new updates\n"
+#~ msgstr ""
+#~ "ਮੈਂਡਰਿਵਆਨਲਾਇਨ ਤੁਹਾਨੂੰ ਨਵੀਨੀਕਰਨ ਸਵੈ-ਚਾਲਤ ਕਰਨ ਲਈ ਸਹਾਇਕ ਹੈ।\n"
+#~ "ਇੱਕ ਕਾਰਜ ਲਗਾਤਾਰ ਤੁਹਾਡੇ ਕੰਪਿਊਟਰ ਲਈ ਨਵੀਨ ਪੈਕੇਜਾਂ ਦੀ ਪੜਤਾਲ ਕਰਦਾ ਰਹੇਗਾ।\n"
+
+#~ msgid "Congratulations"
+#~ msgstr "ਮੁਬਾਰਕ"
+
+#~ msgid "Your Mandriva Online account has been successfully configured\n"
+#~ msgstr "ਤੁਹਾਡਾ ਮੈਂਡਰਿਵਆਨਲਾਇਨ ਖਾਤਾ ਸਫਲਤਾਪੂਰਕ ਬਣ ਗਿਆ ਹੈ।\n"
+
+#~ msgid "Configuration uploaded successfully"
+#~ msgstr "ਸੰਰਚਨਾ ਸਫਲਤਾਪੂਰਕ ਅੱਪਲੋਡ ਹੋਈ"
+
+#~ msgid "Problem uploading configuration"
+#~ msgstr "ਸੰਰਚਨਾ ਅੱਪਲੋਡ ਦੌਰਾਨ ਸਮੱਸਿਆ"
+
+#~ msgid ""
+#~ "Cannot connect to Mandriva Online website: wrong login/password or router/"
+#~ "firewall bad settings"
+#~ msgstr ""
+#~ "ਮੈਂਡਰਿਵਆਨਲਾਇਨ ਸਾਇਟ ਨਾਲ ਜੁੜਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ: ਗਲਤ ਲਾਗਿੰਨ/ਗੁਪਤ-ਕੋਡ ਜਾਂ ਰਾਊਟਰ/ਫਾਇਰਵਾਲ "
+#~ "ਗਲਤ ਵਿਵਸਥਾ"
+
+#, fuzzy
 #~ msgid "  --applet\t\t- launch Mandriva Update.\n"
 #~ msgstr "  --applet       - launch Mandriva Update.\n"
 
diff --git a/po/pl.po b/po/pl.po
index f9558a5d..4d00748a 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -11,28 +11,30 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-09 16:26+0200\n"
+"POT-Creation-Date: 2008-02-21 18:21+0100\n"
 "PO-Revision-Date: 2007-09-07 15:00+0200\n"
-"Last-Translator: Tomasz Bednarski - Mandriva Poland <tomasz.bednarski@mandriva.pl>\n"
+"Last-Translator: Tomasz Bednarski - Mandriva Poland <tomasz."
+"bednarski@mandriva.pl>\n"
 "Language-Team: pl <pl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
-"Plural-Forms:  nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms:  nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%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:94
+#: ../mdkapplet:88
 #, c-format
 msgid "Will check updates at %s"
 msgstr "Aktualizacje zostaną sprawdzone o %s"
 
-#: ../mdkapplet:103
+#: ../mdkapplet:97
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "Oprogramowanie systemu jest aktualne"
 
-#: ../mdkapplet:109
+#: ../mdkapplet:103
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -41,52 +43,44 @@ msgstr ""
 "Problem z konfiguracją usługi. Sprawdź logi i wyślij e-mail'a pod adres "
 "support@mandrivaonline.com"
 
-#: ../mdkapplet:115
+#: ../mdkapplet:110
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "Proszę czekać, wyszukiwanie dostępnych pakietów..."
 
-#: ../mdkapplet:121
+#: ../mdkapplet:116
 #, c-format
 msgid "New updates are available for your system"
 msgstr "Dostępne są nowe aktualizacje dla Twojego systemu"
 
-#: ../mdkapplet:127
-#, c-format
-msgid "New bundles are available for your system"
-msgstr "Dostępne są nowe pakiety dla twojego systemu"
-
-#: ../mdkapplet:133
-#, c-format
-msgid "Service is not configured. Please click on \"Configure the service\""
-msgstr "Usługa jest nieskonfigurowana. Kliknij na \"Konfiguracja usługi\""
-
-#: ../mdkapplet:139
+#: ../mdkapplet:122
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "Sieć jest wyłączona. Skonfiguruj sieć"
 
-#: ../mdkapplet:145
+#: ../mdkapplet:128
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "Usługa jest nieaktywna. Kliknij na Witryna internetowa\""
 
-#: ../mdkapplet:151 ../mdkapplet:182
+#: ../mdkapplet:134 ../mdkapplet:165
 #, c-format
 msgid "urpmi database locked"
 msgstr "urpmi baza danych zablokowana"
 
-#: ../mdkapplet:157
+#: ../mdkapplet:140
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr "Nieobsługiwane wydanie (za stare, lub wydanie rozwojowe)"
 
-#: ../mdkapplet:163
+#: ../mdkapplet:146
 #, c-format
-msgid "No medium found. You must add some media through 'Software Media Manager'."
-msgstr "Nie odnaleziono nośnika. Dodaj nośnik w 'Menedżere Nośników Oprogramowania'."
+msgid ""
+"No medium found. You must add some media through 'Software Media Manager'."
+msgstr ""
+"Nie odnaleziono nośnika. Dodaj nośnik w 'Menedżere Nośników Oprogramowania'."
 
-#: ../mdkapplet:169
+#: ../mdkapplet:152
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -103,581 +97,132 @@ msgstr ""
 "\n"
 "Następnie uruchom ponownie \"%s\"."
 
-#: ../mdkapplet:174
+#: ../mdkapplet:157
 #, c-format
 msgid "Enabled"
 msgstr "Włączone"
 
-#: ../mdkapplet:187
+#: ../mdkapplet:170
 #, c-format
 msgid "Error updating media"
 msgstr "Błąd w trakcie aktualizowania nośnika"
 
-#: ../mdkapplet:202
+#: ../mdkapplet:185
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr "Sprawdzanie... Uaktualnienia są dostępne\n"
 
-#: ../mdkapplet:207
+#: ../mdkapplet:190
 #, c-format
 msgid "Packages are up to date"
 msgstr "Oprogramowanie jest zaktualizowane"
 
-#: ../mdkapplet:212
+#: ../mdkapplet:195
 #, c-format
 msgid "Failed to open urpmi database"
 msgstr "Nie można otworzyć bazy danych urpmi"
 
-#: ../mdkapplet:217 ../mdkapplet:324
+#: ../mdkapplet:200
 #, c-format
 msgid "Install updates"
 msgstr "Zainstaluj aktualizacje"
 
-#: ../mdkapplet:218
-#, c-format
-msgid "Configure the service"
-msgstr "Konfiguracja usługi"
-
-#: ../mdkapplet:219
+#: ../mdkapplet:201
 #, c-format
 msgid "Check Updates"
 msgstr "Sprawdź aktualizacje"
 
-#: ../mdkapplet:220 ../mdkapplet:327 ../mdkonline:114 ../mdkonline:155
-#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
-#, c-format
-msgid "Please wait"
-msgstr "Proszę czekać"
-
-#: ../mdkapplet:220 ../mdkapplet:326 ../mdkapplet:327
-#, c-format
-msgid "Check updates"
-msgstr "Sprawdź aktualizacje"
-
-#: ../mdkapplet:223 ../mdkapplet:648
-#, c-format
-msgid "Online WebSite"
-msgstr "Witryna internetowa"
-
-#: ../mdkapplet:224
+#: ../mdkapplet:202
 #, c-format
 msgid "Configure Network"
 msgstr "Skonfiguruj sieć"
 
-#: ../mdkapplet:225
-#, c-format
-msgid "Configure Now!"
-msgstr "Skonfiguruj teraz!"
-
-#: ../mdkapplet:313 ../mdkapplet:392
-#, c-format
-msgid "Mandriva Linux Updates Applet"
-msgstr "Aplet aktualizacji Mandriva Linux"
-
-#: ../mdkapplet:322
-#, c-format
-msgid "Actions"
-msgstr "Operacje"
-
-#: ../mdkapplet:325
-#, c-format
-msgid "Configure"
-msgstr "Skonfiguruj"
-
-#: ../mdkapplet:329
-#, c-format
-msgid "See logs"
-msgstr "Zobacz dziennik"
-
-#: ../mdkapplet:332
-#, c-format
-msgid "Status"
-msgstr "Stan"
-
-#: ../mdkapplet:336 ../mdkapplet:597
-#, c-format
-msgid "Close"
-msgstr "Zamknij"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Network Connection: "
-msgstr "Połączenie sieciowe: "
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Up"
-msgstr "W górę"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Down"
-msgstr "W dół"
-
-#: ../mdkapplet:366
-#, c-format
-msgid "Last check: "
-msgstr "Ostatnie sprawdzenie: "
-
-#: ../mdkapplet:367 ../mdkonline:145
-#, c-format
-msgid "Machine name:"
-msgstr "Nazwa komputera:"
-
-#: ../mdkapplet:368
-#, c-format
-msgid "Updates: "
-msgstr "Aktualizacje: "
-
-#: ../mdkapplet:372
+#: ../mdkapplet:283
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Uruchamianie programu drakconnect\n"
 
-#: ../mdkapplet:375
+#: ../mdkapplet:286
 #, c-format
 msgid "Mandriva Online seems to be reinstalled, reloading applet ...."
-msgstr "Mandriva Online prawdopodobnie zostało przeinstalowane. Ładowanie apletu ...."
+msgstr ""
+"Mandriva Online prawdopodobnie zostało przeinstalowane. Ładowanie apletu ...."
 
-#: ../mdkapplet:383
+#: ../mdkapplet:294
 #, c-format
 msgid "Launching MandrivaUpdate\n"
 msgstr "Uruchamianie polecenia MandrivaUpdate\n"
 
-#: ../mdkapplet:398
+#: ../mdkapplet:303
+#, c-format
+msgid "Mandriva Linux Updates Applet"
+msgstr "Aplet aktualizacji Mandriva Linux"
+
+#: ../mdkapplet:308
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Przetwarzanie nowych aktualizacji...\n"
 
-#: ../mdkapplet:399
+#: ../mdkapplet:309
 #, c-format
 msgid "Connecting to"
 msgstr "Łączenie z"
 
-#: ../mdkapplet:467 ../mdkupdate:159 ../mdkupdate:188
-#, c-format
-msgid "An error occurred"
-msgstr "Wystąpił błąd"
-
-#: ../mdkapplet:475
-#, c-format
-msgid "Development release not supported by service"
-msgstr "Wydanie rozwojowe nie jest obsługiwane przez usługę"
-
-#: ../mdkapplet:476
-#, c-format
-msgid "Too old release not supported by service"
-msgstr "Za stare wydanie nie jest obsługiwane przez usługę"
-
-#: ../mdkapplet:477
-#, c-format
-msgid "Unknown state"
-msgstr "Nieznany stan"
-
-#: ../mdkapplet:478
-#, c-format
-msgid "Online services disabled. Contact Mandriva Online site\n"
-msgstr "Usługi internetowe są wyłączone. Skontaktuj się z witryną Mandriva Online\n"
-
-#: ../mdkapplet:479
-#, c-format
-msgid "Wrong Password.\n"
-msgstr "Złe hasło.\n"
-
-#: ../mdkapplet:480
-#, c-format
-msgid "Wrong Action or host or login.\n"
-msgstr "Niepoprawna operacja, komputer lub nazwa użytkownika.\n"
-
-#: ../mdkapplet:481
-#, c-format
-msgid ""
-"Something is wrong with your network settings (check your route, firewall or "
-"proxy settings)\n"
-msgstr ""
-"Coś nieprawidłowego dzieje się z ustawieniami sieci (sprawdź połączenie, "
-"zaporę sieciową lub ustawienia pośrednika)\n"
-
-#: ../mdkapplet:483
-#, c-format
-msgid ""
-"Problem occured while connecting to the server, please contact the support "
-"team"
-msgstr "Podczas łączenia z serwerem wystąpił błąd, skontaktuj się z pomocą techniczną"
-
-#: ../mdkapplet:487
-#, c-format
-msgid "Response from Mandriva Online server\n"
-msgstr "Odpowiedź z serwera Mandriva Online\n"
-
-#: ../mdkapplet:490
+#: ../mdkapplet:386
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "System jest aktualny\n"
 
-#: ../mdkapplet:527
-#, c-format
-msgid "No check"
-msgstr "Bez sprawdzania"
-
-#: ../mdkapplet:541
-#, c-format
-msgid "Checking config file: Not present\n"
-msgstr "Sprawdzanie pliku konfiguracyjnego: brak pliku\n"
-
-#: ../mdkapplet:544
+#: ../mdkapplet:415
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Sprawdzanie sieci: wygląda na wyłączoną\n"
 
-#: ../mdkapplet:587
-#, c-format
-msgid "Logs"
-msgstr "Dziennik"
-
-#: ../mdkapplet:603
+#: ../mdkapplet:457 ../mdkupdate:118 ../mdkupdate:164
 #, c-format
-msgid "Clear"
-msgstr "Wyczyść"
+msgid "Warning"
+msgstr "Ostrzeżenie"
 
-#: ../mdkapplet:629
+#: ../mdkapplet:468
 #, c-format
 msgid "About..."
 msgstr "O programie..."
 
-#: ../mdkapplet:631
+#: ../mdkapplet:472
 #, c-format
 msgid "Mandriva Online %s"
 msgstr "Mandriva Online %s"
 
-#: ../mdkapplet:635
+#: ../mdkapplet:473
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Copyright (C) %s by Mandriva"
 
-#: ../mdkapplet:647
+#: ../mdkapplet:476
 #, c-format
 msgid "Mandriva Online gives access to Mandriva web services."
 msgstr "Mandriva Online umożliwia korzystanie z usług sieciowych Mandrivy."
 
-#: ../mdkapplet:655
-#, c-format
-msgid "Always launch on startup"
-msgstr "Uruchamiaj przy starcie"
-
-#: ../mdkapplet:657
-#, c-format
-msgid "Quit"
-msgstr "Zakończ"
-
-#: ../mdkonline:58
-#, c-format
-msgid ""
-"mdonline version %s\n"
-"Copyright (C) %s Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"wersja mdonline %s\n"
-"Copyright (C) %s Mandriva.\n"
-"To jest Wolne Oprogramowanie i może być rozpowszechniane\n"
-"na zasadach licencji GNU GPL.\n"
-"\n"
-"użycie:\n"
-
-#: ../mdkonline:63 ../mdkupdate:73
-#, c-format
-msgid "  --help\t\t- print this help message.\n"
-msgstr "  --help\t\t- wyświetla ten komunikat pomocy.\n"
-
-#: ../mdkonline:64
-#, c-format
-msgid "  --box=\t\t\t- hostname.\n"
-msgstr "  --box=\t\t\t- nazwa komputera.\n"
-
-#: ../mdkonline:65
-#, c-format
-msgid "  --country\t\t\t- name of country of the user. \n"
-msgstr "  --country\t\t\t- nazwa kraju użytkownika. \n"
-
-#: ../mdkonline:66
-#, c-format
-msgid "  --interactive\t\t- use the interactive mode.\n"
-msgstr "  --interactive\t\t- używaj trybu interaktywnego.\n"
-
-#: ../mdkonline:67
-#, c-format
-msgid "  --nointeractive\t- use the non-interactive mode.\n"
-msgstr "  --nointeractive\t- używaj trybu nie interaktywnego.\n"
-
-#: ../mdkonline:68
-#, c-format
-msgid "  --login=\t\t     - login name of the user.\n"
-msgstr "  --login=\t\t     - login użytkownika.\n"
-
-#: ../mdkonline:69
-#, c-format
-msgid "  --pass=\t\t\t- password  of the user.\n"
-msgstr "  --pass=\t\t\t- hasło użytkownika.\n"
-
-#: ../mdkonline:87 ../mdkonline:120
-#, c-format
-msgid "Mandriva Online"
-msgstr "Mandriva Online"
-
-#: ../mdkonline:90
-#, c-format
-msgid "I already have an account"
-msgstr "Mam już konto"
-
-#: ../mdkonline:91
-#, c-format
-msgid "I want to subscribe"
-msgstr "Chcę się zapisać"
-
-#: ../mdkonline:96
-#, c-format
-msgid "Mr."
-msgstr "Pan"
-
-#: ../mdkonline:96
-#, c-format
-msgid "Mrs."
-msgstr "Pani"
-
-#: ../mdkonline:96
-#, c-format
-msgid "Ms."
-msgstr "Panna"
-
-#: ../mdkonline:114
-#, c-format
-msgid "Reading configuration\n"
-msgstr "Wczytywanie konfiguracji\n"
-
-#: ../mdkonline:123
-#, c-format
-msgid ""
-"This assistant will help you to upload your configuration\n"
-"(packages, hardware configuration) to a centralized database in\n"
-"order to keep you informed about security updates and useful upgrades.\n"
-msgstr ""
-"Ten asystent pomoże ci w przesłaniu konfiguracji\n"
-"(pakiety, konfiguracja sprzętowa) do centralnej bazy danych, \n"
-"aby móc lepiej informować cię o odpowiednich uaktualnieniach.\n"
-
-#: ../mdkonline:131
-#, c-format
-msgid "Account creation or authentication"
-msgstr "Tworzenie konta lub uwierzytelnianie"
-
-#: ../mdkonline:136
-#, c-format
-msgid "Enter your Mandriva Online login, password and machine name:"
-msgstr "Wprowadź swój login Mandriva Online, hasło i nazwę komputera:"
-
-#: ../mdkonline:142 ../mdkonline:195
-#, c-format
-msgid "Email address:"
-msgstr "Adres e-mail:"
-
-#: ../mdkonline:143
-#, c-format
-msgid "Country"
-msgstr "Kraj"
-
-#: ../mdkonline:144 ../mdkonline:196
-#, c-format
-msgid "Password:"
-msgstr "Hasło:"
-
-#: ../mdkonline:146
-#, c-format
-msgid "Machine description:"
-msgstr "Opis komputera:"
-
-#: ../mdkonline:147
-#, c-format
-msgid "(Ex: My Home Office's Computer)"
-msgstr "(np. Mój komputer biurowy)"
-
-#: ../mdkonline:152 ../mdkonline:159 ../mdkonline:180 ../mdkonline:204
-#: ../mdkonline:208 ../mdkonline:212 ../mdkonline:217 ../mdkupdate:141
-#: ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
-#, c-format
-msgid "Error"
-msgstr "Błąd"
-
-#: ../mdkonline:152
-#, c-format
-msgid "Machine name must be 1 to 40 alphanumerical characters"
-msgstr ""
-"Nazwa komputera musi składać się z znaków alfanumerycznych w ilości od 1 do "
-"40"
-
-#: ../mdkonline:155
-#, c-format
-msgid "Connecting to Mandriva Online website..."
-msgstr "Łączenie z witryną Mandriva Online..."
-
-#: ../mdkonline:167
-#, c-format
-msgid ""
-"In order to benefit from Mandriva Online services,\n"
-"we are about to upload your configuration.\n"
-"\n"
-"The Wizard will now send the following information to Mandriva:\n"
-"\n"
-"1) the list of packages you have installed on your system,\n"
-"\n"
-"2) your hardware configuration.\n"
-"\n"
-"If you feel uncomfortable by that idea, or do not want to benefit from this "
-"service,\n"
-"please press 'Cancel'. By pressing 'Next', you allow us to keep you "
-"informed\n"
-"about security updates and useful upgrades via personalized email alerts.\n"
-"Furthermore, you benefit from discounted paid support services on\n"
-"www.mandrivaexpert.com."
-msgstr ""
-"W celu skorzystaniu z usług Mandriva Online, twoja konfiguracja\n"
-"komputera zostanie za chwilę wysłana przez druida.\n"
-"\n"
-"Do Mandriva zostaną przesłane następujące informacje:\n"
-"\n"
-"1) lista pakietów zainstalowanych w systemie,\n"
-"\n"
-"2) konfiguracja sprzętowa.\n"
-"\n"
-"Jeśli nie przepadasz za tego typu pomysłami lub nie chcesz wysyłać tych "
-"informacji,\n"
-"naciśnij \"Anuluj\". Klikając \"Dalej\" pozwolisz na wysyłanie\n"
-"informacji dotyczących uaktualnień za pomocą spersonalizowanych e-maili.\n"
-"Co więcej, skorzystasz z usług bez potrzeby uiszczania dodatkowych opłat\n"
-"na www.mandrivaexpert.com."
-
-#: ../mdkonline:180
-#, c-format
-msgid "Connection problem"
-msgstr "Problem z połączeniem"
-
-#: ../mdkonline:180
-#, c-format
-msgid "Problem occurs when uploading files, please try again"
-msgstr "Podczas wysyłania plików wystąpił błąd. Spróbuj ponownie."
-
-#: ../mdkonline:187
-#, c-format
-msgid "Create a Mandriva Online Account"
-msgstr "Utwórz konto Mandriva Online "
-
-#. -PO: that is for things like "Mr", "Ms",...
-#: ../mdkonline:192
-#, c-format
-msgid "Greeting:"
-msgstr "Powitanie:"
-
-#: ../mdkonline:193
-#, c-format
-msgid "First name:"
-msgstr "Imię:"
-
-#: ../mdkonline:194
-#, c-format
-msgid "Last name:"
-msgstr "Nazwisko:"
-
-#: ../mdkonline:197
-#, c-format
-msgid "Confirm Password:"
-msgstr "Potwierdź hasło:"
-
-#: ../mdkonline:204
-#, c-format
-msgid ""
-"The passwords do not match\n"
-" Please try again\n"
-msgstr ""
-"Hasła różnią się\n"
-"Spróbuj ponownie\n"
-
-#: ../mdkonline:208
-#, c-format
-msgid "Please fill in each field"
-msgstr "Wypełnij wszystkie pola"
-
-#: ../mdkonline:212
-#, c-format
-msgid "Not a valid mail address!\n"
-msgstr "To nie jest poprawny adres e-mail!\n"
-
-#: ../mdkonline:217
-#, c-format
-msgid "Creating account failed!"
-msgstr "Utworzenie konta nie powiodło się!"
-
-#: ../mdkonline:225
-#, c-format
-msgid ""
-"Mandriva Online Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
-msgstr ""
-"Pomyślnie utworzono konto Mandriva Online.\n"
-"Kliknij \"Naprzód\" aby uwierzytlenić się i pobrać swoją konfigurację\n"
-
-#: ../mdkonline:229
-#, c-format
-msgid "Your upload was successful!"
-msgstr "Informacje zostały pomyślnie przesłane!"
-
-#: ../mdkonline:229
+#: ../mdkapplet:478
 #, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandriva Online."
-msgstr ""
-"Od tej chwili dzięki Mandriva Online będziesz otrzymywać \n"
-"informacje o wykrytych błędach i uaktualnieniach."
+msgid "Online WebSite"
+msgstr "Witryna internetowa"
 
-#: ../mdkonline:229
+#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
+#: ../mdkapplet:483
 #, c-format
-msgid ""
-"Mandriva Online offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
+msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
-"Mandriva Online umożliwia Ci zautomatyzowanie uaktualnień.\n"
-"Program będzie uruchamiał się regularnie i oczekiwał na uaktualnienia\n"
-
-#: ../mdkonline:238
-#, c-format
-msgid "Congratulations"
-msgstr "Gratulacje"
-
-#: ../mdkonline:238
-#, c-format
-msgid "Your Mandriva Online account has been successfully configured\n"
-msgstr "Twoje konto Mandriva Online zostało pomyślnie skonfigurowane\n"
-
-#: ../mdkonline:253
-#, c-format
-msgid "Configuration uploaded successfully"
-msgstr "Informacje zostały pomyślnie przesłane"
 
-#: ../mdkonline:254
+#: ../mdkapplet:492
 #, c-format
-msgid "Problem uploading configuration"
-msgstr "Błąd wczytywania konfiguracji"
+msgid "Always launch on startup"
+msgstr "Uruchamiaj przy starcie"
 
-#: ../mdkonline:256
+#: ../mdkapplet:494
 #, c-format
-msgid ""
-"Cannot connect to Mandriva Online website: wrong login/password or router/"
-"firewall bad settings"
-msgstr ""
-"Połączenie z witryną Mandriva Online jest niemożliwe: nieprawidłowe login/"
-"hasło lub niewłaściwe ustawienia rutera/zapory sieciowej"
+msgid "Quit"
+msgstr "Zakończ"
 
 #: ../mdkonline.pm:207
 #, c-format
@@ -826,6 +371,11 @@ msgstr ""
 "\n"
 "użycie:\n"
 
+#: ../mdkupdate:73
+#, c-format
+msgid "  --help\t\t- print this help message.\n"
+msgstr "  --help\t\t- wyświetla ten komunikat pomocy.\n"
+
 #: ../mdkupdate:74
 #, c-format
 msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
@@ -855,11 +405,6 @@ msgstr ""
 "  --bundle file.bundle\t- przetwarzaj i instaluj pakiet z pliku meta ."
 "bundle.\n"
 
-#: ../mdkupdate:118 ../mdkupdate:164
-#, c-format
-msgid "Warning"
-msgstr "Ostrzeżenie"
-
 #. -PO: here Live Install is currently *NOT* translated on the desktop, so it's better to keep as it:
 #: ../mdkupdate:120
 #, c-format
@@ -870,11 +415,21 @@ msgstr ""
 "W pierwszej kolejności należy zainstalować system na dysku twardym. W tym "
 "celu użyj druida Live Install."
 
+#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
+#, c-format
+msgid "Please wait"
+msgstr "Proszę czekać"
+
 #: ../mdkupdate:123 ../mdkupdate:174
 #, c-format
 msgid "Preparing..."
 msgstr "Przygotowywanie..."
 
+#: ../mdkupdate:141 ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
+#, c-format
+msgid "Error"
+msgstr "Błąd"
+
 #: ../mdkupdate:141
 #, c-format
 msgid ""
@@ -886,6 +441,11 @@ msgstr ""
 "\n"
 "%s"
 
+#: ../mdkupdate:159 ../mdkupdate:188
+#, c-format
+msgid "An error occurred"
+msgstr "Wystąpił błąd"
+
 #: ../mdkupdate:164
 #, c-format
 msgid ""
@@ -914,3 +474,306 @@ msgstr "Instalowanie pakietów...\n"
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "Nie można uaktualnić pakietów z nośnika update_source.\n"
 
+#~ msgid "New bundles are available for your system"
+#~ msgstr "Dostępne są nowe pakiety dla twojego systemu"
+
+#~ msgid "Service is not configured. Please click on \"Configure the service\""
+#~ msgstr "Usługa jest nieskonfigurowana. Kliknij na \"Konfiguracja usługi\""
+
+#~ msgid "Configure the service"
+#~ msgstr "Konfiguracja usługi"
+
+#~ msgid "Check updates"
+#~ msgstr "Sprawdź aktualizacje"
+
+#~ msgid "Configure Now!"
+#~ msgstr "Skonfiguruj teraz!"
+
+#~ msgid "Actions"
+#~ msgstr "Operacje"
+
+#~ msgid "Configure"
+#~ msgstr "Skonfiguruj"
+
+#~ msgid "See logs"
+#~ msgstr "Zobacz dziennik"
+
+#~ msgid "Status"
+#~ msgstr "Stan"
+
+#~ msgid "Close"
+#~ msgstr "Zamknij"
+
+#~ msgid "Network Connection: "
+#~ msgstr "Połączenie sieciowe: "
+
+#~ msgid "Up"
+#~ msgstr "W górę"
+
+#~ msgid "Down"
+#~ msgstr "W dół"
+
+#~ msgid "Last check: "
+#~ msgstr "Ostatnie sprawdzenie: "
+
+#~ msgid "Machine name:"
+#~ msgstr "Nazwa komputera:"
+
+#~ msgid "Updates: "
+#~ msgstr "Aktualizacje: "
+
+#~ msgid "Development release not supported by service"
+#~ msgstr "Wydanie rozwojowe nie jest obsługiwane przez usługę"
+
+#~ msgid "Too old release not supported by service"
+#~ msgstr "Za stare wydanie nie jest obsługiwane przez usługę"
+
+#~ msgid "Unknown state"
+#~ msgstr "Nieznany stan"
+
+#~ msgid "Online services disabled. Contact Mandriva Online site\n"
+#~ msgstr ""
+#~ "Usługi internetowe są wyłączone. Skontaktuj się z witryną Mandriva "
+#~ "Online\n"
+
+#~ msgid "Wrong Password.\n"
+#~ msgstr "Złe hasło.\n"
+
+#~ msgid "Wrong Action or host or login.\n"
+#~ msgstr "Niepoprawna operacja, komputer lub nazwa użytkownika.\n"
+
+#~ msgid ""
+#~ "Something is wrong with your network settings (check your route, firewall "
+#~ "or proxy settings)\n"
+#~ msgstr ""
+#~ "Coś nieprawidłowego dzieje się z ustawieniami sieci (sprawdź połączenie, "
+#~ "zaporę sieciową lub ustawienia pośrednika)\n"
+
+#~ msgid ""
+#~ "Problem occured while connecting to the server, please contact the "
+#~ "support team"
+#~ msgstr ""
+#~ "Podczas łączenia z serwerem wystąpił błąd, skontaktuj się z pomocą "
+#~ "techniczną"
+
+#~ msgid "Response from Mandriva Online server\n"
+#~ msgstr "Odpowiedź z serwera Mandriva Online\n"
+
+#~ msgid "No check"
+#~ msgstr "Bez sprawdzania"
+
+#~ msgid "Checking config file: Not present\n"
+#~ msgstr "Sprawdzanie pliku konfiguracyjnego: brak pliku\n"
+
+#~ msgid "Logs"
+#~ msgstr "Dziennik"
+
+#~ msgid "Clear"
+#~ msgstr "Wyczyść"
+
+#~ msgid ""
+#~ "mdonline version %s\n"
+#~ "Copyright (C) %s Mandriva.\n"
+#~ "This is free software and may be redistributed under the terms of the GNU "
+#~ "GPL.\n"
+#~ "\n"
+#~ "usage:\n"
+#~ msgstr ""
+#~ "wersja mdonline %s\n"
+#~ "Copyright (C) %s Mandriva.\n"
+#~ "To jest Wolne Oprogramowanie i może być rozpowszechniane\n"
+#~ "na zasadach licencji GNU GPL.\n"
+#~ "\n"
+#~ "użycie:\n"
+
+#~ msgid "  --box=\t\t\t- hostname.\n"
+#~ msgstr "  --box=\t\t\t- nazwa komputera.\n"
+
+#~ msgid "  --country\t\t\t- name of country of the user. \n"
+#~ msgstr "  --country\t\t\t- nazwa kraju użytkownika. \n"
+
+#~ msgid "  --interactive\t\t- use the interactive mode.\n"
+#~ msgstr "  --interactive\t\t- używaj trybu interaktywnego.\n"
+
+#~ msgid "  --nointeractive\t- use the non-interactive mode.\n"
+#~ msgstr "  --nointeractive\t- używaj trybu nie interaktywnego.\n"
+
+#~ msgid "  --login=\t\t     - login name of the user.\n"
+#~ msgstr "  --login=\t\t     - login użytkownika.\n"
+
+#~ msgid "  --pass=\t\t\t- password  of the user.\n"
+#~ msgstr "  --pass=\t\t\t- hasło użytkownika.\n"
+
+#~ msgid "Mandriva Online"
+#~ msgstr "Mandriva Online"
+
+#~ msgid "I already have an account"
+#~ msgstr "Mam już konto"
+
+#~ msgid "I want to subscribe"
+#~ msgstr "Chcę się zapisać"
+
+#~ msgid "Mr."
+#~ msgstr "Pan"
+
+#~ msgid "Mrs."
+#~ msgstr "Pani"
+
+#~ msgid "Ms."
+#~ msgstr "Panna"
+
+#~ msgid "Reading configuration\n"
+#~ msgstr "Wczytywanie konfiguracji\n"
+
+#~ msgid ""
+#~ "This assistant will help you to upload your configuration\n"
+#~ "(packages, hardware configuration) to a centralized database in\n"
+#~ "order to keep you informed about security updates and useful upgrades.\n"
+#~ msgstr ""
+#~ "Ten asystent pomoże ci w przesłaniu konfiguracji\n"
+#~ "(pakiety, konfiguracja sprzętowa) do centralnej bazy danych, \n"
+#~ "aby móc lepiej informować cię o odpowiednich uaktualnieniach.\n"
+
+#~ msgid "Account creation or authentication"
+#~ msgstr "Tworzenie konta lub uwierzytelnianie"
+
+#~ msgid "Enter your Mandriva Online login, password and machine name:"
+#~ msgstr "Wprowadź swój login Mandriva Online, hasło i nazwę komputera:"
+
+#~ msgid "Email address:"
+#~ msgstr "Adres e-mail:"
+
+#~ msgid "Country"
+#~ msgstr "Kraj"
+
+#~ msgid "Password:"
+#~ msgstr "Hasło:"
+
+#~ msgid "Machine description:"
+#~ msgstr "Opis komputera:"
+
+#~ msgid "(Ex: My Home Office's Computer)"
+#~ msgstr "(np. Mój komputer biurowy)"
+
+#~ msgid "Machine name must be 1 to 40 alphanumerical characters"
+#~ msgstr ""
+#~ "Nazwa komputera musi składać się z znaków alfanumerycznych w ilości od 1 "
+#~ "do 40"
+
+#~ msgid "Connecting to Mandriva Online website..."
+#~ msgstr "Łączenie z witryną Mandriva Online..."
+
+#~ msgid ""
+#~ "In order to benefit from Mandriva Online services,\n"
+#~ "we are about to upload your configuration.\n"
+#~ "\n"
+#~ "The Wizard will now send the following information to Mandriva:\n"
+#~ "\n"
+#~ "1) the list of packages you have installed on your system,\n"
+#~ "\n"
+#~ "2) your hardware configuration.\n"
+#~ "\n"
+#~ "If you feel uncomfortable by that idea, or do not want to benefit from "
+#~ "this service,\n"
+#~ "please press 'Cancel'. By pressing 'Next', you allow us to keep you "
+#~ "informed\n"
+#~ "about security updates and useful upgrades via personalized email "
+#~ "alerts.\n"
+#~ "Furthermore, you benefit from discounted paid support services on\n"
+#~ "www.mandrivaexpert.com."
+#~ msgstr ""
+#~ "W celu skorzystaniu z usług Mandriva Online, twoja konfiguracja\n"
+#~ "komputera zostanie za chwilę wysłana przez druida.\n"
+#~ "\n"
+#~ "Do Mandriva zostaną przesłane następujące informacje:\n"
+#~ "\n"
+#~ "1) lista pakietów zainstalowanych w systemie,\n"
+#~ "\n"
+#~ "2) konfiguracja sprzętowa.\n"
+#~ "\n"
+#~ "Jeśli nie przepadasz za tego typu pomysłami lub nie chcesz wysyłać tych "
+#~ "informacji,\n"
+#~ "naciśnij \"Anuluj\". Klikając \"Dalej\" pozwolisz na wysyłanie\n"
+#~ "informacji dotyczących uaktualnień za pomocą spersonalizowanych e-maili.\n"
+#~ "Co więcej, skorzystasz z usług bez potrzeby uiszczania dodatkowych opłat\n"
+#~ "na www.mandrivaexpert.com."
+
+#~ msgid "Connection problem"
+#~ msgstr "Problem z połączeniem"
+
+#~ msgid "Problem occurs when uploading files, please try again"
+#~ msgstr "Podczas wysyłania plików wystąpił błąd. Spróbuj ponownie."
+
+#~ msgid "Create a Mandriva Online Account"
+#~ msgstr "Utwórz konto Mandriva Online "
+
+#~ msgid "Greeting:"
+#~ msgstr "Powitanie:"
+
+#~ msgid "First name:"
+#~ msgstr "Imię:"
+
+#~ msgid "Last name:"
+#~ msgstr "Nazwisko:"
+
+#~ msgid "Confirm Password:"
+#~ msgstr "Potwierdź hasło:"
+
+#~ msgid ""
+#~ "The passwords do not match\n"
+#~ " Please try again\n"
+#~ msgstr ""
+#~ "Hasła różnią się\n"
+#~ "Spróbuj ponownie\n"
+
+#~ msgid "Please fill in each field"
+#~ msgstr "Wypełnij wszystkie pola"
+
+#~ msgid "Not a valid mail address!\n"
+#~ msgstr "To nie jest poprawny adres e-mail!\n"
+
+#~ msgid "Creating account failed!"
+#~ msgstr "Utworzenie konta nie powiodło się!"
+
+#~ msgid ""
+#~ "Mandriva Online Account successfully created.\n"
+#~ "Please click \"Next\" to authenticate and upload your configuration\n"
+#~ msgstr ""
+#~ "Pomyślnie utworzono konto Mandriva Online.\n"
+#~ "Kliknij \"Naprzód\" aby uwierzytlenić się i pobrać swoją konfigurację\n"
+
+#~ msgid "Your upload was successful!"
+#~ msgstr "Informacje zostały pomyślnie przesłane!"
+
+#~ msgid ""
+#~ "From now you will receive on security and updates \n"
+#~ "announcements thanks to Mandriva Online."
+#~ msgstr ""
+#~ "Od tej chwili dzięki Mandriva Online będziesz otrzymywać \n"
+#~ "informacje o wykrytych błędach i uaktualnieniach."
+
+#~ msgid ""
+#~ "Mandriva Online offers you the ability to automate the updates.\n"
+#~ "A program will run regulary in your system waiting for new updates\n"
+#~ msgstr ""
+#~ "Mandriva Online umożliwia Ci zautomatyzowanie uaktualnień.\n"
+#~ "Program będzie uruchamiał się regularnie i oczekiwał na uaktualnienia\n"
+
+#~ msgid "Congratulations"
+#~ msgstr "Gratulacje"
+
+#~ msgid "Your Mandriva Online account has been successfully configured\n"
+#~ msgstr "Twoje konto Mandriva Online zostało pomyślnie skonfigurowane\n"
+
+#~ msgid "Configuration uploaded successfully"
+#~ msgstr "Informacje zostały pomyślnie przesłane"
+
+#~ msgid "Problem uploading configuration"
+#~ msgstr "Błąd wczytywania konfiguracji"
+
+#~ msgid ""
+#~ "Cannot connect to Mandriva Online website: wrong login/password or router/"
+#~ "firewall bad settings"
+#~ msgstr ""
+#~ "Połączenie z witryną Mandriva Online jest niemożliwe: nieprawidłowe login/"
+#~ "hasło lub niewłaściwe ustawienia rutera/zapory sieciowej"
diff --git a/po/pt.po b/po/pt.po
index 0bf16390..2d9eb7eb 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pt\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-09 16:26+0200\n"
+"POT-Creation-Date: 2008-02-21 18:21+0100\n"
 "PO-Revision-Date: 2008-01-06 02:26+0000\n"
 "Last-Translator: Zé <mmodem00@gmail.com>\n"
 "Language-Team: Português <pt@li.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:94
+#: ../mdkapplet:88
 #, c-format
 msgid "Will check updates at %s"
 msgstr "Irá verificar actualizações em %s"
 
-#: ../mdkapplet:103
+#: ../mdkapplet:97
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "O seu sistema está actualizado"
 
-#: ../mdkapplet:109
+#: ../mdkapplet:103
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -45,54 +45,46 @@ msgstr ""
 "Problema na configuração do serviço. Por favor verifique os registos e envie "
 "uma mensagem electrónica para support@mandrivaonline.com"
 
-#: ../mdkapplet:115
+#: ../mdkapplet:110
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "Por favor aguarde, a procurar pacotes disponíveis..."
 
-#: ../mdkapplet:121
+#: ../mdkapplet:116
 #, c-format
 msgid "New updates are available for your system"
 msgstr "Novas actualizações disponíveis para o seu sistema"
 
-#: ../mdkapplet:127
-#, c-format
-msgid "New bundles are available for your system"
-msgstr "Novos 'bundles' disponíveis para o seu sistema"
-
-#: ../mdkapplet:133
-#, c-format
-msgid "Service is not configured. Please click on \"Configure the service\""
-msgstr "O serviço não está configurado. Por favor clique em \"Configurar Serviço\""
-
-#: ../mdkapplet:139
+#: ../mdkapplet:122
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "A rede não está a funcionar. Por favor configure a sua rede"
 
-#: ../mdkapplet:145
+#: ../mdkapplet:128
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
-msgstr "O serviço não está activado. Por favor clique em \"Sítio Web Em-linha\""
+msgstr ""
+"O serviço não está activado. Por favor clique em \"Sítio Web Em-linha\""
 
-#: ../mdkapplet:151 ../mdkapplet:182
+#: ../mdkapplet:134 ../mdkapplet:165
 #, c-format
 msgid "urpmi database locked"
 msgstr "base de dados urpmi trancada"
 
-#: ../mdkapplet:157
+#: ../mdkapplet:140
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr "Versão não suportada (versão demasiado antiga, ou de desenvolvimento)"
 
-#: ../mdkapplet:163
+#: ../mdkapplet:146
 #, c-format
-msgid "No medium found. You must add some media through 'Software Media Manager'."
+msgid ""
+"No medium found. You must add some media through 'Software Media Manager'."
 msgstr ""
 "Nenhuma média encontrada. Precisa adicionar alguma média através do 'Gestor "
 "de Médias de Programas'."
 
-#: ../mdkapplet:169
+#: ../mdkapplet:152
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -109,584 +101,132 @@ msgstr ""
 "\n"
 "Depois, reinicie \"%s\"."
 
-#: ../mdkapplet:174
+#: ../mdkapplet:157
 #, c-format
 msgid "Enabled"
 msgstr "Activado"
 
-#: ../mdkapplet:187
+#: ../mdkapplet:170
 #, c-format
 msgid "Error updating media"
 msgstr "Erro a actualizar média"
 
-#: ../mdkapplet:202
+#: ../mdkapplet:185
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr "A verificar... Actualizações disponíveis\n"
 
-#: ../mdkapplet:207
+#: ../mdkapplet:190
 #, c-format
 msgid "Packages are up to date"
 msgstr "Os pacotes estão actualizados"
 
-#: ../mdkapplet:212
+#: ../mdkapplet:195
 #, c-format
 msgid "Failed to open urpmi database"
 msgstr "Falha ao abrir a base de dados urpmi"
 
-#: ../mdkapplet:217 ../mdkapplet:324
+#: ../mdkapplet:200
 #, c-format
 msgid "Install updates"
 msgstr "Instalar actualizações"
 
-#: ../mdkapplet:218
-#, c-format
-msgid "Configure the service"
-msgstr "Configurar Serviço"
-
-#: ../mdkapplet:219
+#: ../mdkapplet:201
 #, c-format
 msgid "Check Updates"
 msgstr "Verificar Actualizações"
 
-#: ../mdkapplet:220 ../mdkapplet:327 ../mdkonline:114 ../mdkonline:155
-#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
-#, c-format
-msgid "Please wait"
-msgstr "Por favor aguarde"
-
-#: ../mdkapplet:220 ../mdkapplet:326 ../mdkapplet:327
-#, c-format
-msgid "Check updates"
-msgstr "Verificar actualizações"
-
-#: ../mdkapplet:223 ../mdkapplet:648
-#, c-format
-msgid "Online WebSite"
-msgstr "Sítio Em-linha"
-
-#: ../mdkapplet:224
+#: ../mdkapplet:202
 #, c-format
 msgid "Configure Network"
 msgstr "Configurar Rede"
 
-#: ../mdkapplet:225
-#, c-format
-msgid "Configure Now!"
-msgstr "Configurar Agora!"
-
-#: ../mdkapplet:313 ../mdkapplet:392
-#, c-format
-msgid "Mandriva Linux Updates Applet"
-msgstr "Componente de Actualizações Mandriva Linux"
-
-#: ../mdkapplet:322
-#, c-format
-msgid "Actions"
-msgstr "Acções"
-
-#: ../mdkapplet:325
-#, c-format
-msgid "Configure"
-msgstr "Configurar"
-
-#: ../mdkapplet:329
-#, c-format
-msgid "See logs"
-msgstr "Ver registos"
-
-#: ../mdkapplet:332
-#, c-format
-msgid "Status"
-msgstr "Estado"
-
-#: ../mdkapplet:336 ../mdkapplet:597
-#, c-format
-msgid "Close"
-msgstr "Fechar"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Network Connection: "
-msgstr "Ligação da Rede: "
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Up"
-msgstr "Ligado"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Down"
-msgstr "Desligado"
-
-#: ../mdkapplet:366
-#, c-format
-msgid "Last check: "
-msgstr "Última verificação: "
-
-#: ../mdkapplet:367 ../mdkonline:145
-#, c-format
-msgid "Machine name:"
-msgstr "Nome da máquina: "
-
-#: ../mdkapplet:368
-#, c-format
-msgid "Updates: "
-msgstr "Actualizações: "
-
-#: ../mdkapplet:372
+#: ../mdkapplet:283
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "A iniciar drakconnect\n"
 
-#: ../mdkapplet:375
+#: ../mdkapplet:286
 #, c-format
 msgid "Mandriva Online seems to be reinstalled, reloading applet ...."
-msgstr "O Mandriva Em-linha parece ter sido reinstalado, a recarregar o componente..."
+msgstr ""
+"O Mandriva Em-linha parece ter sido reinstalado, a recarregar o componente..."
 
-#: ../mdkapplet:383
+#: ../mdkapplet:294
 #, c-format
 msgid "Launching MandrivaUpdate\n"
 msgstr "A iniciar MandrivaUpdate\n"
 
-#: ../mdkapplet:398
+#: ../mdkapplet:303
+#, c-format
+msgid "Mandriva Linux Updates Applet"
+msgstr "Componente de Actualizações Mandriva Linux"
+
+#: ../mdkapplet:308
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "A verificar novas actualizações...\n"
 
-#: ../mdkapplet:399
+#: ../mdkapplet:309
 #, c-format
 msgid "Connecting to"
 msgstr "A ligar a"
 
-#: ../mdkapplet:467 ../mdkupdate:159 ../mdkupdate:188
-#, c-format
-msgid "An error occurred"
-msgstr "Ocorreu um erro"
-
-#: ../mdkapplet:475
-#, c-format
-msgid "Development release not supported by service"
-msgstr "Versão de desenvolvimento não suportada pelo serviço"
-
-#: ../mdkapplet:476
-#, c-format
-msgid "Too old release not supported by service"
-msgstr "Versão demasiado antiga não suportada pelo serviço"
-
-#: ../mdkapplet:477
-#, c-format
-msgid "Unknown state"
-msgstr "Estado desconhecido"
-
-#: ../mdkapplet:478
-#, c-format
-msgid "Online services disabled. Contact Mandriva Online site\n"
-msgstr "Serviços em linha desactivados. Contacte o sítio Mandriva Em-linha\n"
-
-#: ../mdkapplet:479
-#, c-format
-msgid "Wrong Password.\n"
-msgstr "Senha Errada.\n"
-
-#: ../mdkapplet:480
-#, c-format
-msgid "Wrong Action or host or login.\n"
-msgstr "Acção, endereço ou autenticação errada.\n"
-
-#: ../mdkapplet:481
-#, c-format
-msgid ""
-"Something is wrong with your network settings (check your route, firewall or "
-"proxy settings)\n"
-msgstr ""
-"Algo não está correcto nas suas definições de rede (verifique as "
-"configurações do seu route, firewall ou proxy)\n"
-
-#: ../mdkapplet:483
-#, c-format
-msgid ""
-"Problem occured while connecting to the server, please contact the support "
-"team"
-msgstr ""
-"O problema ocorreu quando se ligou ao servidor, por favor contacte a equipa "
-"de suporte"
-
-#: ../mdkapplet:487
-#, c-format
-msgid "Response from Mandriva Online server\n"
-msgstr "Resposta do servidor Mandriva Em-linha\n"
-
-#: ../mdkapplet:490
+#: ../mdkapplet:386
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "O sistema está actualizado\n"
 
-#: ../mdkapplet:527
-#, c-format
-msgid "No check"
-msgstr "Nenhuma verificação"
-
-#: ../mdkapplet:541
-#, c-format
-msgid "Checking config file: Not present\n"
-msgstr "A verificar o ficheiro de configuração: Não está disponível\n"
-
-#: ../mdkapplet:544
+#: ../mdkapplet:415
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Verificação da Rede: parece desactivada\n"
 
-#: ../mdkapplet:587
-#, c-format
-msgid "Logs"
-msgstr "Registos"
-
-#: ../mdkapplet:603
+#: ../mdkapplet:457 ../mdkupdate:118 ../mdkupdate:164
 #, c-format
-msgid "Clear"
-msgstr "Limpar"
+msgid "Warning"
+msgstr "Aviso"
 
-#: ../mdkapplet:629
+#: ../mdkapplet:468
 #, c-format
 msgid "About..."
 msgstr "Acerca..."
 
-#: ../mdkapplet:631
+#: ../mdkapplet:472
 #, c-format
 msgid "Mandriva Online %s"
 msgstr "Mandriva Em-linha %s"
 
-#: ../mdkapplet:635
+#: ../mdkapplet:473
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Direitos de Autor (C) %s Mandriva"
 
-#: ../mdkapplet:647
+#: ../mdkapplet:476
 #, c-format
 msgid "Mandriva Online gives access to Mandriva web services."
 msgstr "O Mandriva Em-linha dá acesso aos serviços web Mandriva."
 
-#: ../mdkapplet:655
-#, c-format
-msgid "Always launch on startup"
-msgstr "Executar sempre no arranque"
-
-#: ../mdkapplet:657
-#, c-format
-msgid "Quit"
-msgstr "Sair"
-
-#: ../mdkonline:58
-#, c-format
-msgid ""
-"mdonline version %s\n"
-"Copyright (C) %s Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"mdonline versão %s\n"
-"Direitos de autor (C) %s Mandriva.\n"
-"Isto é um programa livre e pode ser redistribuído sob os termos da licença "
-"GNU GPL.\n"
-"\n"
-"uso:\n"
-
-#: ../mdkonline:63 ../mdkupdate:73
-#, c-format
-msgid "  --help\t\t- print this help message.\n"
-msgstr "  --help\t\t- mostra esta mensagem de ajuda.\n"
-
-#: ../mdkonline:64
-#, c-format
-msgid "  --box=\t\t\t- hostname.\n"
-msgstr "  --box=\t\t\t- nome do endereço.\n"
-
-#: ../mdkonline:65
-#, c-format
-msgid "  --country\t\t\t- name of country of the user. \n"
-msgstr "  --country\t\t\t- nome do país do utilizador.\n"
-
-#: ../mdkonline:66
-#, c-format
-msgid "  --interactive\t\t- use the interactive mode.\n"
-msgstr "  --interactive\t\t- usa o modo interactivo.\n"
-
-#: ../mdkonline:67
-#, c-format
-msgid "  --nointeractive\t- use the non-interactive mode.\n"
-msgstr "  --nointeractive\t- usa o modo não-interactivo.\n"
-
-#: ../mdkonline:68
-#, c-format
-msgid "  --login=\t\t     - login name of the user.\n"
-msgstr "  --login=\t\t     - nome de autenticação do utilizador.\n"
-
-#: ../mdkonline:69
-#, c-format
-msgid "  --pass=\t\t\t- password  of the user.\n"
-msgstr "  --pass=\t\t\t- senha do utilizador.\n"
-
-#: ../mdkonline:87 ../mdkonline:120
-#, c-format
-msgid "Mandriva Online"
-msgstr "Mandriva Em-linha"
-
-#: ../mdkonline:90
-#, c-format
-msgid "I already have an account"
-msgstr "Já tenho uma conta"
-
-#: ../mdkonline:91
-#, c-format
-msgid "I want to subscribe"
-msgstr "Desejo subscrever"
-
-#: ../mdkonline:96
-#, c-format
-msgid "Mr."
-msgstr "Sr."
-
-#: ../mdkonline:96
-#, c-format
-msgid "Mrs."
-msgstr "Sra."
-
-#: ../mdkonline:96
-#, c-format
-msgid "Ms."
-msgstr "Menina."
-
-#: ../mdkonline:114
-#, c-format
-msgid "Reading configuration\n"
-msgstr "A ler a configuração\n"
-
-#: ../mdkonline:123
-#, c-format
-msgid ""
-"This assistant will help you to upload your configuration\n"
-"(packages, hardware configuration) to a centralized database in\n"
-"order to keep you informed about security updates and useful upgrades.\n"
-msgstr ""
-"Este assistente irá ajudá-lo a enviar a sua configuração (pacotes,\n"
-"configuração de material) para uma base de dados central para\n"
-"o manter informado acerca das actualizações de segurança e\n"
-"outros pacotes.\n"
-
-#: ../mdkonline:131
-#, c-format
-msgid "Account creation or authentication"
-msgstr "Criação de conta ou autenticação"
-
-#: ../mdkonline:136
-#, c-format
-msgid "Enter your Mandriva Online login, password and machine name:"
-msgstr "Indique a sua autenticação Mandriva Em-linha, senha e nome da máquina:"
-
-#: ../mdkonline:142 ../mdkonline:195
-#, c-format
-msgid "Email address:"
-msgstr "Endereço electrónico:"
-
-#: ../mdkonline:143
-#, c-format
-msgid "Country"
-msgstr "País"
-
-#: ../mdkonline:144 ../mdkonline:196
-#, c-format
-msgid "Password:"
-msgstr "Senha:"
-
-#: ../mdkonline:146
-#, c-format
-msgid "Machine description:"
-msgstr "Descrição da máquina:"
-
-#: ../mdkonline:147
-#, c-format
-msgid "(Ex: My Home Office's Computer)"
-msgstr "(Ex: O Computador do Meu Escritório)"
-
-#: ../mdkonline:152 ../mdkonline:159 ../mdkonline:180 ../mdkonline:204
-#: ../mdkonline:208 ../mdkonline:212 ../mdkonline:217 ../mdkupdate:141
-#: ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
-#, c-format
-msgid "Error"
-msgstr "Erro"
-
-#: ../mdkonline:152
-#, c-format
-msgid "Machine name must be 1 to 40 alphanumerical characters"
-msgstr "O nome da máquina deve apenas conter entre 1 e 40 caracteres alfanuméricos"
-
-#: ../mdkonline:155
-#, c-format
-msgid "Connecting to Mandriva Online website..."
-msgstr "A ligar ao sítio web Mandriva Em-linha..."
-
-#: ../mdkonline:167
-#, c-format
-msgid ""
-"In order to benefit from Mandriva Online services,\n"
-"we are about to upload your configuration.\n"
-"\n"
-"The Wizard will now send the following information to Mandriva:\n"
-"\n"
-"1) the list of packages you have installed on your system,\n"
-"\n"
-"2) your hardware configuration.\n"
-"\n"
-"If you feel uncomfortable by that idea, or do not want to benefit from this "
-"service,\n"
-"please press 'Cancel'. By pressing 'Next', you allow us to keep you "
-"informed\n"
-"about security updates and useful upgrades via personalized email alerts.\n"
-"Furthermore, you benefit from discounted paid support services on\n"
-"www.mandrivaexpert.com."
-msgstr ""
-"Para que possa beneficiar dos serviços Mandriva Em-linha,\n"
-"estamos prestes a enviar a sua configuração.\n"
-"\n"
-"O Assistente irá agora enviar a seguinte informação para a Mandriva:\n"
-"\n"
-"1) a lista dos pacotes que instalou no seu sistema,\n"
-"\n"
-"2) a configuração do seu material.\n"
-"\n"
-"Se esta ideia não lhe agradar, ou não quiser beneficiar deste serviço,\n"
-"por favor clique em 'Cancelar'. Ao premir em 'Seguinte', irá-nos permitir\n"
-"mantê-lo informado acerca das actualizações de segurança e de novas\n"
-"versões através de alertas personalizados por correio electrónico.\n"
-"Também poderá beneficiar de descontos nos serviços de suporte em\n"
-"www.mandrivaexpert.com."
-
-#: ../mdkonline:180
-#, c-format
-msgid "Connection problem"
-msgstr "Problema na ligação"
-
-#: ../mdkonline:180
-#, c-format
-msgid "Problem occurs when uploading files, please try again"
-msgstr "Ocorrem problemas apenas ao enviar ficheiros, por favor tente novamente"
-
-#: ../mdkonline:187
-#, c-format
-msgid "Create a Mandriva Online Account"
-msgstr "Criar uma Conta Mandriva Em-linha"
-
-#. -PO: that is for things like "Mr", "Ms",...
-#: ../mdkonline:192
-#, c-format
-msgid "Greeting:"
-msgstr "Mensagem de boas-vindas:"
-
-#: ../mdkonline:193
-#, c-format
-msgid "First name:"
-msgstr "Primeiro nome:"
-
-#: ../mdkonline:194
-#, c-format
-msgid "Last name:"
-msgstr "Último nome:"
-
-#: ../mdkonline:197
-#, c-format
-msgid "Confirm Password:"
-msgstr "Confirmar Senha:"
-
-#: ../mdkonline:204
-#, c-format
-msgid ""
-"The passwords do not match\n"
-" Please try again\n"
-msgstr ""
-"As senhas não correspondem\n"
-"Por favor tente novamente\n"
-
-#: ../mdkonline:208
-#, c-format
-msgid "Please fill in each field"
-msgstr "Por favor preencha todos os campos"
-
-#: ../mdkonline:212
-#, c-format
-msgid "Not a valid mail address!\n"
-msgstr "Não é um endereço electrónico válido!\n"
-
-#: ../mdkonline:217
-#, c-format
-msgid "Creating account failed!"
-msgstr "Criação de conta falhada!"
-
-#: ../mdkonline:225
-#, c-format
-msgid ""
-"Mandriva Online Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
-msgstr ""
-"Conta Mandriva Em-linha criada com sucesso.\n"
-"Por favor clique em \"Seguinte\" para autenticar e enviar a sua "
-"configuração\n"
-
-#: ../mdkonline:229
-#, c-format
-msgid "Your upload was successful!"
-msgstr "Envio bem sucedido!"
-
-#: ../mdkonline:229
+#: ../mdkapplet:478
 #, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandriva Online."
-msgstr ""
-"A partir de agora irá receber anúncios acerca de segurança\n"
-"e actualizações graças ao Mandriva Em-linha."
+msgid "Online WebSite"
+msgstr "Sítio Em-linha"
 
-#: ../mdkonline:229
+#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
+#: ../mdkapplet:483
 #, c-format
-msgid ""
-"Mandriva Online offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
+msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
-"O Mandriva Em-linha oferece-lhe a possibilidade de automatizar as\n"
-"actualizações. Um programa irá ser executado regularmente no\n"
-"seu sistema à espera de novas actualizações.\n"
-
-#: ../mdkonline:238
-#, c-format
-msgid "Congratulations"
-msgstr "Parabéns"
-
-#: ../mdkonline:238
-#, c-format
-msgid "Your Mandriva Online account has been successfully configured\n"
-msgstr "A sua conta Mandriva Em-linha foi configurada com sucesso\n"
-
-#: ../mdkonline:253
-#, c-format
-msgid "Configuration uploaded successfully"
-msgstr "Configuração enviada com sucesso!"
 
-#: ../mdkonline:254
+#: ../mdkapplet:492
 #, c-format
-msgid "Problem uploading configuration"
-msgstr "Problema ao enviar a configuração"
+msgid "Always launch on startup"
+msgstr "Executar sempre no arranque"
 
-#: ../mdkonline:256
+#: ../mdkapplet:494
 #, c-format
-msgid ""
-"Cannot connect to Mandriva Online website: wrong login/password or router/"
-"firewall bad settings"
-msgstr ""
-"Não é possível ligar ao sítio web Mandriva Em-linha: nome/senha errados ou "
-"problemas na configuração do router/firewall"
+msgid "Quit"
+msgstr "Sair"
 
 #: ../mdkonline.pm:207
 #, c-format
@@ -835,6 +375,11 @@ msgstr ""
 "\n"
 "uso:\n"
 
+#: ../mdkupdate:73
+#, c-format
+msgid "  --help\t\t- print this help message.\n"
+msgstr "  --help\t\t- mostra esta mensagem de ajuda.\n"
+
 #: ../mdkupdate:74
 #, c-format
 msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
@@ -864,11 +409,6 @@ msgstr ""
 "  --bundle file.bundle\t- analisa e instala o pacote do ficheiro de "
 "metainformação .bundle\n"
 
-#: ../mdkupdate:118 ../mdkupdate:164
-#, c-format
-msgid "Warning"
-msgstr "Aviso"
-
 #. -PO: here Live Install is currently *NOT* translated on the desktop, so it's better to keep as it:
 #: ../mdkupdate:120
 #, c-format
@@ -879,11 +419,21 @@ msgstr ""
 "Primeiro precisa instalar o sistema no seu disco rígido com o assistente "
 "'Live Install'."
 
+#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
+#, c-format
+msgid "Please wait"
+msgstr "Por favor aguarde"
+
 #: ../mdkupdate:123 ../mdkupdate:174
 #, c-format
 msgid "Preparing..."
 msgstr "A preparar..."
 
+#: ../mdkupdate:141 ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
+#, c-format
+msgid "Error"
+msgstr "Erro"
+
 #: ../mdkupdate:141
 #, c-format
 msgid ""
@@ -895,6 +445,11 @@ msgstr ""
 "\n"
 "%s"
 
+#: ../mdkupdate:159 ../mdkupdate:188
+#, c-format
+msgid "An error occurred"
+msgstr "Ocorreu um erro"
+
 #: ../mdkupdate:164
 #, c-format
 msgid ""
@@ -923,3 +478,311 @@ msgstr "A instalar pacotes...\n"
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "Não é possível actualizar os pacotes da média update_source.\n"
 
+#~ msgid "New bundles are available for your system"
+#~ msgstr "Novos 'bundles' disponíveis para o seu sistema"
+
+#~ msgid "Service is not configured. Please click on \"Configure the service\""
+#~ msgstr ""
+#~ "O serviço não está configurado. Por favor clique em \"Configurar Serviço\""
+
+#~ msgid "Configure the service"
+#~ msgstr "Configurar Serviço"
+
+#~ msgid "Check updates"
+#~ msgstr "Verificar actualizações"
+
+#~ msgid "Configure Now!"
+#~ msgstr "Configurar Agora!"
+
+#~ msgid "Actions"
+#~ msgstr "Acções"
+
+#~ msgid "Configure"
+#~ msgstr "Configurar"
+
+#~ msgid "See logs"
+#~ msgstr "Ver registos"
+
+#~ msgid "Status"
+#~ msgstr "Estado"
+
+#~ msgid "Close"
+#~ msgstr "Fechar"
+
+#~ msgid "Network Connection: "
+#~ msgstr "Ligação da Rede: "
+
+#~ msgid "Up"
+#~ msgstr "Ligado"
+
+#~ msgid "Down"
+#~ msgstr "Desligado"
+
+#~ msgid "Last check: "
+#~ msgstr "Última verificação: "
+
+#~ msgid "Machine name:"
+#~ msgstr "Nome da máquina: "
+
+#~ msgid "Updates: "
+#~ msgstr "Actualizações: "
+
+#~ msgid "Development release not supported by service"
+#~ msgstr "Versão de desenvolvimento não suportada pelo serviço"
+
+#~ msgid "Too old release not supported by service"
+#~ msgstr "Versão demasiado antiga não suportada pelo serviço"
+
+#~ msgid "Unknown state"
+#~ msgstr "Estado desconhecido"
+
+#~ msgid "Online services disabled. Contact Mandriva Online site\n"
+#~ msgstr ""
+#~ "Serviços em linha desactivados. Contacte o sítio Mandriva Em-linha\n"
+
+#~ msgid "Wrong Password.\n"
+#~ msgstr "Senha Errada.\n"
+
+#~ msgid "Wrong Action or host or login.\n"
+#~ msgstr "Acção, endereço ou autenticação errada.\n"
+
+#~ msgid ""
+#~ "Something is wrong with your network settings (check your route, firewall "
+#~ "or proxy settings)\n"
+#~ msgstr ""
+#~ "Algo não está correcto nas suas definições de rede (verifique as "
+#~ "configurações do seu route, firewall ou proxy)\n"
+
+#~ msgid ""
+#~ "Problem occured while connecting to the server, please contact the "
+#~ "support team"
+#~ msgstr ""
+#~ "O problema ocorreu quando se ligou ao servidor, por favor contacte a "
+#~ "equipa de suporte"
+
+#~ msgid "Response from Mandriva Online server\n"
+#~ msgstr "Resposta do servidor Mandriva Em-linha\n"
+
+#~ msgid "No check"
+#~ msgstr "Nenhuma verificação"
+
+#~ msgid "Checking config file: Not present\n"
+#~ msgstr "A verificar o ficheiro de configuração: Não está disponível\n"
+
+#~ msgid "Logs"
+#~ msgstr "Registos"
+
+#~ msgid "Clear"
+#~ msgstr "Limpar"
+
+#~ msgid ""
+#~ "mdonline version %s\n"
+#~ "Copyright (C) %s Mandriva.\n"
+#~ "This is free software and may be redistributed under the terms of the GNU "
+#~ "GPL.\n"
+#~ "\n"
+#~ "usage:\n"
+#~ msgstr ""
+#~ "mdonline versão %s\n"
+#~ "Direitos de autor (C) %s Mandriva.\n"
+#~ "Isto é um programa livre e pode ser redistribuído sob os termos da "
+#~ "licença GNU GPL.\n"
+#~ "\n"
+#~ "uso:\n"
+
+#~ msgid "  --box=\t\t\t- hostname.\n"
+#~ msgstr "  --box=\t\t\t- nome do endereço.\n"
+
+#~ msgid "  --country\t\t\t- name of country of the user. \n"
+#~ msgstr "  --country\t\t\t- nome do país do utilizador.\n"
+
+#~ msgid "  --interactive\t\t- use the interactive mode.\n"
+#~ msgstr "  --interactive\t\t- usa o modo interactivo.\n"
+
+#~ msgid "  --nointeractive\t- use the non-interactive mode.\n"
+#~ msgstr "  --nointeractive\t- usa o modo não-interactivo.\n"
+
+#~ msgid "  --login=\t\t     - login name of the user.\n"
+#~ msgstr "  --login=\t\t     - nome de autenticação do utilizador.\n"
+
+#~ msgid "  --pass=\t\t\t- password  of the user.\n"
+#~ msgstr "  --pass=\t\t\t- senha do utilizador.\n"
+
+#~ msgid "Mandriva Online"
+#~ msgstr "Mandriva Em-linha"
+
+#~ msgid "I already have an account"
+#~ msgstr "Já tenho uma conta"
+
+#~ msgid "I want to subscribe"
+#~ msgstr "Desejo subscrever"
+
+#~ msgid "Mr."
+#~ msgstr "Sr."
+
+#~ msgid "Mrs."
+#~ msgstr "Sra."
+
+#~ msgid "Ms."
+#~ msgstr "Menina."
+
+#~ msgid "Reading configuration\n"
+#~ msgstr "A ler a configuração\n"
+
+#~ msgid ""
+#~ "This assistant will help you to upload your configuration\n"
+#~ "(packages, hardware configuration) to a centralized database in\n"
+#~ "order to keep you informed about security updates and useful upgrades.\n"
+#~ msgstr ""
+#~ "Este assistente irá ajudá-lo a enviar a sua configuração (pacotes,\n"
+#~ "configuração de material) para uma base de dados central para\n"
+#~ "o manter informado acerca das actualizações de segurança e\n"
+#~ "outros pacotes.\n"
+
+#~ msgid "Account creation or authentication"
+#~ msgstr "Criação de conta ou autenticação"
+
+#~ msgid "Enter your Mandriva Online login, password and machine name:"
+#~ msgstr ""
+#~ "Indique a sua autenticação Mandriva Em-linha, senha e nome da máquina:"
+
+#~ msgid "Email address:"
+#~ msgstr "Endereço electrónico:"
+
+#~ msgid "Country"
+#~ msgstr "País"
+
+#~ msgid "Password:"
+#~ msgstr "Senha:"
+
+#~ msgid "Machine description:"
+#~ msgstr "Descrição da máquina:"
+
+#~ msgid "(Ex: My Home Office's Computer)"
+#~ msgstr "(Ex: O Computador do Meu Escritório)"
+
+#~ msgid "Machine name must be 1 to 40 alphanumerical characters"
+#~ msgstr ""
+#~ "O nome da máquina deve apenas conter entre 1 e 40 caracteres alfanuméricos"
+
+#~ msgid "Connecting to Mandriva Online website..."
+#~ msgstr "A ligar ao sítio web Mandriva Em-linha..."
+
+#~ msgid ""
+#~ "In order to benefit from Mandriva Online services,\n"
+#~ "we are about to upload your configuration.\n"
+#~ "\n"
+#~ "The Wizard will now send the following information to Mandriva:\n"
+#~ "\n"
+#~ "1) the list of packages you have installed on your system,\n"
+#~ "\n"
+#~ "2) your hardware configuration.\n"
+#~ "\n"
+#~ "If you feel uncomfortable by that idea, or do not want to benefit from "
+#~ "this service,\n"
+#~ "please press 'Cancel'. By pressing 'Next', you allow us to keep you "
+#~ "informed\n"
+#~ "about security updates and useful upgrades via personalized email "
+#~ "alerts.\n"
+#~ "Furthermore, you benefit from discounted paid support services on\n"
+#~ "www.mandrivaexpert.com."
+#~ msgstr ""
+#~ "Para que possa beneficiar dos serviços Mandriva Em-linha,\n"
+#~ "estamos prestes a enviar a sua configuração.\n"
+#~ "\n"
+#~ "O Assistente irá agora enviar a seguinte informação para a Mandriva:\n"
+#~ "\n"
+#~ "1) a lista dos pacotes que instalou no seu sistema,\n"
+#~ "\n"
+#~ "2) a configuração do seu material.\n"
+#~ "\n"
+#~ "Se esta ideia não lhe agradar, ou não quiser beneficiar deste serviço,\n"
+#~ "por favor clique em 'Cancelar'. Ao premir em 'Seguinte', irá-nos "
+#~ "permitir\n"
+#~ "mantê-lo informado acerca das actualizações de segurança e de novas\n"
+#~ "versões através de alertas personalizados por correio electrónico.\n"
+#~ "Também poderá beneficiar de descontos nos serviços de suporte em\n"
+#~ "www.mandrivaexpert.com."
+
+#~ msgid "Connection problem"
+#~ msgstr "Problema na ligação"
+
+#~ msgid "Problem occurs when uploading files, please try again"
+#~ msgstr ""
+#~ "Ocorrem problemas apenas ao enviar ficheiros, por favor tente novamente"
+
+#~ msgid "Create a Mandriva Online Account"
+#~ msgstr "Criar uma Conta Mandriva Em-linha"
+
+#~ msgid "Greeting:"
+#~ msgstr "Mensagem de boas-vindas:"
+
+#~ msgid "First name:"
+#~ msgstr "Primeiro nome:"
+
+#~ msgid "Last name:"
+#~ msgstr "Último nome:"
+
+#~ msgid "Confirm Password:"
+#~ msgstr "Confirmar Senha:"
+
+#~ msgid ""
+#~ "The passwords do not match\n"
+#~ " Please try again\n"
+#~ msgstr ""
+#~ "As senhas não correspondem\n"
+#~ "Por favor tente novamente\n"
+
+#~ msgid "Please fill in each field"
+#~ msgstr "Por favor preencha todos os campos"
+
+#~ msgid "Not a valid mail address!\n"
+#~ msgstr "Não é um endereço electrónico válido!\n"
+
+#~ msgid "Creating account failed!"
+#~ msgstr "Criação de conta falhada!"
+
+#~ msgid ""
+#~ "Mandriva Online Account successfully created.\n"
+#~ "Please click \"Next\" to authenticate and upload your configuration\n"
+#~ msgstr ""
+#~ "Conta Mandriva Em-linha criada com sucesso.\n"
+#~ "Por favor clique em \"Seguinte\" para autenticar e enviar a sua "
+#~ "configuração\n"
+
+#~ msgid "Your upload was successful!"
+#~ msgstr "Envio bem sucedido!"
+
+#~ msgid ""
+#~ "From now you will receive on security and updates \n"
+#~ "announcements thanks to Mandriva Online."
+#~ msgstr ""
+#~ "A partir de agora irá receber anúncios acerca de segurança\n"
+#~ "e actualizações graças ao Mandriva Em-linha."
+
+#~ msgid ""
+#~ "Mandriva Online offers you the ability to automate the updates.\n"
+#~ "A program will run regulary in your system waiting for new updates\n"
+#~ msgstr ""
+#~ "O Mandriva Em-linha oferece-lhe a possibilidade de automatizar as\n"
+#~ "actualizações. Um programa irá ser executado regularmente no\n"
+#~ "seu sistema à espera de novas actualizações.\n"
+
+#~ msgid "Congratulations"
+#~ msgstr "Parabéns"
+
+#~ msgid "Your Mandriva Online account has been successfully configured\n"
+#~ msgstr "A sua conta Mandriva Em-linha foi configurada com sucesso\n"
+
+#~ msgid "Configuration uploaded successfully"
+#~ msgstr "Configuração enviada com sucesso!"
+
+#~ msgid "Problem uploading configuration"
+#~ msgstr "Problema ao enviar a configuração"
+
+#~ msgid ""
+#~ "Cannot connect to Mandriva Online website: wrong login/password or router/"
+#~ "firewall bad settings"
+#~ msgstr ""
+#~ "Não é possível ligar ao sítio web Mandriva Em-linha: nome/senha errados "
+#~ "ou problemas na configuração do router/firewall"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 125fb73d..bb121caf 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pt_BR\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-09 16:26+0200\n"
+"POT-Creation-Date: 2008-02-21 18:21+0100\n"
 "PO-Revision-Date: 2007-08-28 17:38-0300\n"
 "Last-Translator: Felipe Arruda\n"
 "Language-Team: Brazilian Portuguese <pt@li.org>\n"
@@ -24,17 +24,17 @@ msgstr ""
 "Plural-Forms:  nplurals=2; plural=(n > 1);\n"
 
 #. -PO: here %s will be replaced by the local time (eg: "Will check updates at 14:03:50"
-#: ../mdkapplet:94
+#: ../mdkapplet:88
 #, c-format
 msgid "Will check updates at %s"
 msgstr "Verificar atualizações em %s"
 
-#: ../mdkapplet:103
+#: ../mdkapplet:97
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "Seu sistema está atualizado"
 
-#: ../mdkapplet:109
+#: ../mdkapplet:103
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -43,54 +43,45 @@ msgstr ""
 "Problema no serviço de configuração.  Por favor, verifique os logs gerados e "
 "envie para support@mandrivaonline.com"
 
-#: ../mdkapplet:115
+#: ../mdkapplet:110
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "Aguarde, procurando pacotes disponíveis..."
 
-#: ../mdkapplet:121
+#: ../mdkapplet:116
 #, c-format
 msgid "New updates are available for your system"
 msgstr "Novas atualizações estão disponíveis para o seu sistema"
 
-#: ../mdkapplet:127
-#, c-format
-msgid "New bundles are available for your system"
-msgstr "Novos kits (bundles) estão disponíveis para o seu sistema"
-
-#: ../mdkapplet:133
-#, c-format
-msgid "Service is not configured. Please click on \"Configure the service\""
-msgstr "O serviço não está configurado. Clique em \"Configurar o serviço\""
-
-#: ../mdkapplet:139
+#: ../mdkapplet:122
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "Sem conexão de rede. Por favor configure sua rede"
 
-#: ../mdkapplet:145
+#: ../mdkapplet:128
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "O Serviço não está ativado. Por favor clique em \"WebSite Online\""
 
-#: ../mdkapplet:151 ../mdkapplet:182
+#: ../mdkapplet:134 ../mdkapplet:165
 #, c-format
 msgid "urpmi database locked"
 msgstr "base de dados bloqueada urpmi"
 
-#: ../mdkapplet:157
+#: ../mdkapplet:140
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr "Versão não suportada (muito antiga ou de desenvolvimento)"
 
-#: ../mdkapplet:163
+#: ../mdkapplet:146
 #, c-format
-msgid "No medium found. You must add some media through 'Software Media Manager'."
+msgid ""
+"No medium found. You must add some media through 'Software Media Manager'."
 msgstr ""
 "Nenhuma mídia foi encontrada. Você deve adicionar alguma mídia através do "
 "'Gerenciador de Mídia de Software'."
 
-#: ../mdkapplet:169
+#: ../mdkapplet:152
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -102,587 +93,136 @@ msgid ""
 msgstr ""
 "Você já tem pelo menos uma mídia de atualização configurada,\n"
 "mas todas estão desabilitadas atualmente. Você deve executar o\n"
-"'Gerenciador de Mídias' para habilitar ao menos uma (verifique a coluna \"%s\").\n"
+"'Gerenciador de Mídias' para habilitar ao menos uma (verifique a coluna \"%s"
+"\").\n"
 "\n"
 "Depois, reinicie o \"%s\"."
 
-#: ../mdkapplet:174
+#: ../mdkapplet:157
 #, c-format
 msgid "Enabled"
 msgstr "Habilitar"
 
-#: ../mdkapplet:187
+#: ../mdkapplet:170
 #, c-format
 msgid "Error updating media"
 msgstr "Erro ao atualizar a mídia"
 
-#: ../mdkapplet:202
+#: ../mdkapplet:185
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr "Verificando... Atualizações estão disponíveis\n"
 
-#: ../mdkapplet:207
+#: ../mdkapplet:190
 #, c-format
 msgid "Packages are up to date"
 msgstr "Pacotes estão atualizados"
 
-#: ../mdkapplet:212
+#: ../mdkapplet:195
 #, c-format
 msgid "Failed to open urpmi database"
 msgstr "Não foi possível abrir a base de dados urpmi"
 
-#: ../mdkapplet:217 ../mdkapplet:324
+#: ../mdkapplet:200
 #, c-format
 msgid "Install updates"
 msgstr "Instalar atualizações"
 
-#: ../mdkapplet:218
-#, c-format
-msgid "Configure the service"
-msgstr "Configurar o serviço"
-
-#: ../mdkapplet:219
+#: ../mdkapplet:201
 #, c-format
 msgid "Check Updates"
 msgstr "Verificar Atualizações"
 
-#: ../mdkapplet:220 ../mdkapplet:327 ../mdkonline:114 ../mdkonline:155
-#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
-#, c-format
-msgid "Please wait"
-msgstr "Por favor aguarde"
-
-#: ../mdkapplet:220 ../mdkapplet:326 ../mdkapplet:327
-#, c-format
-msgid "Check updates"
-msgstr "Verificar atualizações"
-
-#: ../mdkapplet:223 ../mdkapplet:648
-#, c-format
-msgid "Online WebSite"
-msgstr "WebSite Online"
-
-#: ../mdkapplet:224
+#: ../mdkapplet:202
 #, c-format
 msgid "Configure Network"
 msgstr "Configurar Rede"
 
-#: ../mdkapplet:225
-#, c-format
-msgid "Configure Now!"
-msgstr "Configurar Agora!"
-
-#: ../mdkapplet:313 ../mdkapplet:392
-#, c-format
-msgid "Mandriva Linux Updates Applet"
-msgstr "Aplicativo de Atualizações Mandriva Linux"
-
-#: ../mdkapplet:322
-#, c-format
-msgid "Actions"
-msgstr "Ações"
-
-#: ../mdkapplet:325
-#, c-format
-msgid "Configure"
-msgstr "Configurar"
-
-#: ../mdkapplet:329
-#, c-format
-msgid "See logs"
-msgstr "Ver logs"
-
-#: ../mdkapplet:332
-#, c-format
-msgid "Status"
-msgstr "Status"
-
-#: ../mdkapplet:336 ../mdkapplet:597
-#, c-format
-msgid "Close"
-msgstr "Fechar"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Network Connection: "
-msgstr "Conexão de rede: "
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Up"
-msgstr "Ativa"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Down"
-msgstr "Caída"
-
-#: ../mdkapplet:366
-#, c-format
-msgid "Last check: "
-msgstr "Última verificação: "
-
-#: ../mdkapplet:367 ../mdkonline:145
-#, c-format
-msgid "Machine name:"
-msgstr "Nome da máquina:"
-
-#: ../mdkapplet:368
-#, c-format
-msgid "Updates: "
-msgstr "Atualizações: "
-
-#: ../mdkapplet:372
+#: ../mdkapplet:283
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Lançando o drakconnect\n"
 
-#: ../mdkapplet:375
+#: ../mdkapplet:286
 #, c-format
 msgid "Mandriva Online seems to be reinstalled, reloading applet ...."
 msgstr "O Mandriva Online parece ter sido reinstalado, recarregando ...."
 
-#: ../mdkapplet:383
+#: ../mdkapplet:294
 #, c-format
 msgid "Launching MandrivaUpdate\n"
 msgstr "Lançando o MandrivaUpdate\n"
 
-#: ../mdkapplet:398
+#: ../mdkapplet:303
+#, c-format
+msgid "Mandriva Linux Updates Applet"
+msgstr "Aplicativo de Atualizações Mandriva Linux"
+
+#: ../mdkapplet:308
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Conferindo novas atualizações...\n"
 
-#: ../mdkapplet:399
+#: ../mdkapplet:309
 #, c-format
 msgid "Connecting to"
 msgstr "Conectando em"
 
-#: ../mdkapplet:467 ../mdkupdate:159 ../mdkupdate:188
-#, c-format
-msgid "An error occurred"
-msgstr "Ocorreu um erro"
-
-#: ../mdkapplet:475
-#, c-format
-msgid "Development release not supported by service"
-msgstr "Versão de desenvolvimento não é suportada por este serviço"
-
-#: ../mdkapplet:476
-#, c-format
-msgid "Too old release not supported by service"
-msgstr "Versão muito antiga e não suportada pelo serviço"
-
-#: ../mdkapplet:477
-#, c-format
-msgid "Unknown state"
-msgstr "Estado desconhecido"
-
-#: ../mdkapplet:478
-#, c-format
-msgid "Online services disabled. Contact Mandriva Online site\n"
-msgstr "Serviços on-line desativados. Contacte o site Mandriva Online\n"
-
-#: ../mdkapplet:479
-#, c-format
-msgid "Wrong Password.\n"
-msgstr "Senha incorreta.\n"
-
-#: ../mdkapplet:480
-#, c-format
-msgid "Wrong Action or host or login.\n"
-msgstr "Erro na ação, host ou login.\n"
-
-#: ../mdkapplet:481
-#, c-format
-msgid ""
-"Something is wrong with your network settings (check your route, firewall or "
-"proxy settings)\n"
-msgstr ""
-"Algo está errado com a configuração da rede (verifique a rota, firewall ou "
-"as configurações proxy)\n"
-
-#: ../mdkapplet:483
-#, c-format
-msgid ""
-"Problem occured while connecting to the server, please contact the support "
-"team"
-msgstr ""
-"Um problema ocorreu durante a conexão ao servidor, por favor contacte nosso "
-"time de suporte"
-
-#: ../mdkapplet:487
-#, c-format
-msgid "Response from Mandriva Online server\n"
-msgstr "Resposta do servidor Mandriva Online\n"
-
-#: ../mdkapplet:490
+#: ../mdkapplet:386
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Sistema está atualizado\n"
 
-#: ../mdkapplet:527
-#, c-format
-msgid "No check"
-msgstr "Não verificado"
-
-#: ../mdkapplet:541
-#, c-format
-msgid "Checking config file: Not present\n"
-msgstr "Checando arquivo de configuração: Não presente\n"
-
-#: ../mdkapplet:544
+#: ../mdkapplet:415
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Checando a Rede: parece inativa\n"
 
-#: ../mdkapplet:587
-#, c-format
-msgid "Logs"
-msgstr "Logs:"
-
-#: ../mdkapplet:603
+#: ../mdkapplet:457 ../mdkupdate:118 ../mdkupdate:164
 #, c-format
-msgid "Clear"
-msgstr "Limpar"
+msgid "Warning"
+msgstr "Aviso"
 
-#: ../mdkapplet:629
+#: ../mdkapplet:468
 #, c-format
 msgid "About..."
 msgstr "Sobre.."
 
-#: ../mdkapplet:631
+#: ../mdkapplet:472
 #, c-format
 msgid "Mandriva Online %s"
 msgstr "Mandriva Online %s"
 
-#: ../mdkapplet:635
+#: ../mdkapplet:473
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Copyright (C) %s Mandriva"
 
-#: ../mdkapplet:647
+#: ../mdkapplet:476
 #, c-format
 msgid "Mandriva Online gives access to Mandriva web services."
 msgstr "Mandriva Online fornece acesso para serviços web Mandriva"
 
-#: ../mdkapplet:655
-#, c-format
-msgid "Always launch on startup"
-msgstr "Sempre iniciar no boot"
-
-#: ../mdkapplet:657
-#, c-format
-msgid "Quit"
-msgstr "Sair"
-
-#: ../mdkonline:58
-#, c-format
-msgid ""
-"mdonline version %s\n"
-"Copyright (C) %s Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"mdonline versão %s\n"
-"Copyright (C) %s Mandriva.\n"
-"Este é um software livre e pode ser redistribuído sobre os termos da GNU "
-"GPL.\n"
-"\n"
-"uso:\n"
-
-#: ../mdkonline:63 ../mdkupdate:73
-#, c-format
-msgid "  --help\t\t- print this help message.\n"
-msgstr "  --help\t\t- exibe esta mensagem de ajuda.\n"
-
-#: ../mdkonline:64
-#, c-format
-msgid "  --box=\t\t\t- hostname.\n"
-msgstr " --box=\t\t\t- nome do host.\n"
-
-#: ../mdkonline:65
-#, c-format
-msgid "  --country\t\t\t- name of country of the user. \n"
-msgstr " --país\t\t\t- nome do país do usuário. \n"
-
-#: ../mdkonline:66
-#, c-format
-msgid "  --interactive\t\t- use the interactive mode.\n"
-msgstr "  --interativo\t\t- use o modo interativo.\n"
-
-#: ../mdkonline:67
-#, c-format
-msgid "  --nointeractive\t- use the non-interactive mode.\n"
-msgstr "  --não interativo\t- use o modo não interativo.\n"
-
-#: ../mdkonline:68
-#, c-format
-msgid "  --login=\t\t     - login name of the user.\n"
-msgstr "  --login=\t\t     - nome de login do usuário.\n"
-
-#: ../mdkonline:69
-#, c-format
-msgid "  --pass=\t\t\t- password  of the user.\n"
-msgstr "  --pass=\t\t\t- password  do usuário.\n"
-
-#: ../mdkonline:87 ../mdkonline:120
-#, c-format
-msgid "Mandriva Online"
-msgstr "Mandriva Online."
-
-#: ../mdkonline:90
-#, c-format
-msgid "I already have an account"
-msgstr "Eu já possuo uma conta"
-
-#: ../mdkonline:91
-#, c-format
-msgid "I want to subscribe"
-msgstr "Você precisa se inscrever"
-
-#: ../mdkonline:96
-#, c-format
-msgid "Mr."
-msgstr "Sr."
-
-#: ../mdkonline:96
-#, c-format
-msgid "Mrs."
-msgstr "Sra."
-
-#: ../mdkonline:96
-#, c-format
-msgid "Ms."
-msgstr "Sra."
-
-#: ../mdkonline:114
-#, c-format
-msgid "Reading configuration\n"
-msgstr "Lendo configuração\n"
-
-#: ../mdkonline:123
-#, c-format
-msgid ""
-"This assistant will help you to upload your configuration\n"
-"(packages, hardware configuration) to a centralized database in\n"
-"order to keep you informed about security updates and useful upgrades.\n"
-msgstr ""
-"Este assistente ajudará você a enviar sua configuração\n"
-"(pacotes instalados e configuração de hardware) para uma base\n"
-"de dados centralizada com o intuito de mantê-lo informado sobre\n"
-"atualizações de segurança e melhorias úteis.\n"
-
-#: ../mdkonline:131
-#, c-format
-msgid "Account creation or authentication"
-msgstr "Criação ou autenticação de conta"
-
-#: ../mdkonline:136
-#, c-format
-msgid "Enter your Mandriva Online login, password and machine name:"
-msgstr "Digite seu login do Mandriva Online, senha e o nome da máquina:"
-
-#: ../mdkonline:142 ../mdkonline:195
-#, c-format
-msgid "Email address:"
-msgstr "Endereço email:"
-
-#: ../mdkonline:143
-#, c-format
-msgid "Country"
-msgstr "País:"
-
-#: ../mdkonline:144 ../mdkonline:196
-#, c-format
-msgid "Password:"
-msgstr "Senha:"
-
-#: ../mdkonline:146
-#, c-format
-msgid "Machine description:"
-msgstr "Descrição da máquina:"
-
-#: ../mdkonline:147
-#, c-format
-msgid "(Ex: My Home Office's Computer)"
-msgstr "(Ex: Meu Computador de Casa)"
-
-#: ../mdkonline:152 ../mdkonline:159 ../mdkonline:180 ../mdkonline:204
-#: ../mdkonline:208 ../mdkonline:212 ../mdkonline:217 ../mdkupdate:141
-#: ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
-#, c-format
-msgid "Error"
-msgstr "Erro"
-
-#: ../mdkonline:152
-#, c-format
-msgid "Machine name must be 1 to 40 alphanumerical characters"
-msgstr "Nome da máquina deve ter de 1 a 40 caracteres alfanuméricos"
-
-#: ../mdkonline:155
-#, c-format
-msgid "Connecting to Mandriva Online website..."
-msgstr "Conectando-se ao site Mandriva Online..."
-
-#: ../mdkonline:167
-#, c-format
-msgid ""
-"In order to benefit from Mandriva Online services,\n"
-"we are about to upload your configuration.\n"
-"\n"
-"The Wizard will now send the following information to Mandriva:\n"
-"\n"
-"1) the list of packages you have installed on your system,\n"
-"\n"
-"2) your hardware configuration.\n"
-"\n"
-"If you feel uncomfortable by that idea, or do not want to benefit from this "
-"service,\n"
-"please press 'Cancel'. By pressing 'Next', you allow us to keep you "
-"informed\n"
-"about security updates and useful upgrades via personalized email alerts.\n"
-"Furthermore, you benefit from discounted paid support services on\n"
-"www.mandrivaexpert.com."
-msgstr ""
-"Para que você se beneficie dos serviços Mandriva Online,\n"
-"nós enviaremos agora a sua configuração. \n"
-"\n"
-"O Assistente enviará as seguintes informações para a Mandriva:\n"
-"\n"
-"1) a lista dos pacotes instalados no seu sistema,\n"
-"\n"
-"2) a configuração de hardware. \n"
-"\n"
-"Se você não concorda em enviar estes dados, ou não deseja utilizar este "
-"serviço,\n"
-"clique em 'Cancelar'. Clicando em 'Próximo', você nos permitirá mantê-lo\n"
-"informado sobre atualizações de segurança e melhorias úteis, via emails\n"
-"personalizados. Além disso, você obterá descontos em serviços pagos de\n"
-"suporte em www.mandrivaexpert.com."
-
-#: ../mdkonline:180
-#, c-format
-msgid "Connection problem"
-msgstr "Problema de conexão"
-
-#: ../mdkonline:180
-#, c-format
-msgid "Problem occurs when uploading files, please try again"
-msgstr "Ocorreu um erro ao atualizar os arquivos, por favor tente novamente"
-
-#: ../mdkonline:187
-#, c-format
-msgid "Create a Mandriva Online Account"
-msgstr "Criar uma Conta Mandriva Online"
-
-#. -PO: that is for things like "Mr", "Ms",...
-#: ../mdkonline:192
-#, c-format
-msgid "Greeting:"
-msgstr "Saudação:"
-
-#: ../mdkonline:193
-#, c-format
-msgid "First name:"
-msgstr "Primeiro Nome:"
-
-#: ../mdkonline:194
-#, c-format
-msgid "Last name:"
-msgstr "Último nome:"
-
-#: ../mdkonline:197
-#, c-format
-msgid "Confirm Password:"
-msgstr "Confirmar Senha:"
-
-#: ../mdkonline:204
-#, c-format
-msgid ""
-"The passwords do not match\n"
-" Please try again\n"
-msgstr ""
-"A senha não confere\n"
-" Por favor, tente de novo\n"
-
-#: ../mdkonline:208
-#, c-format
-msgid "Please fill in each field"
-msgstr "Por favor preencha cada campo"
-
-#: ../mdkonline:212
-#, c-format
-msgid "Not a valid mail address!\n"
-msgstr "Endereço de email inválido\n"
-
-#: ../mdkonline:217
-#, c-format
-msgid "Creating account failed!"
-msgstr "Falha na criação de conta!"
-
-#: ../mdkonline:225
-#, c-format
-msgid ""
-"Mandriva Online Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
-msgstr ""
-"Conta na Mandriva Online foi criada com sucesso.\n"
-"Por favor clique em \"Próximo\" para autenticar e enviar sua configuração\n"
-
-#: ../mdkonline:229
-#, c-format
-msgid "Your upload was successful!"
-msgstr "Enviado com sucesso!"
-
-#: ../mdkonline:229
+#: ../mdkapplet:478
 #, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandriva Online."
-msgstr ""
-"A partir de agora você receberá anúncios de segurança \n"
-"e atualizações graças ao Mandriva Online."
+msgid "Online WebSite"
+msgstr "WebSite Online"
 
-#: ../mdkonline:229
+#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
+#: ../mdkapplet:483
 #, c-format
-msgid ""
-"Mandriva Online offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
+msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
-"Mandriva Online oferece a você a facilidade de automatizar suas\n"
-"atualizações. Um programa instalado no seu sistema verificará\n"
-"regularmente as novas atualizações.\n"
-
-#: ../mdkonline:238
-#, c-format
-msgid "Congratulations"
-msgstr "Parabéns"
 
-#: ../mdkonline:238
+#: ../mdkapplet:492
 #, c-format
-msgid "Your Mandriva Online account has been successfully configured\n"
-msgstr "Sua conta na Mandriva Online foi configurada com sucesso\n"
-
-#: ../mdkonline:253
-#, c-format
-msgid "Configuration uploaded successfully"
-msgstr "Configuração enviada com sucesso"
-
-#: ../mdkonline:254
-#, c-format
-msgid "Problem uploading configuration"
-msgstr "Problema ao enviar configuração"
+msgid "Always launch on startup"
+msgstr "Sempre iniciar no boot"
 
-#: ../mdkonline:256
+#: ../mdkapplet:494
 #, c-format
-msgid ""
-"Cannot connect to Mandriva Online website: wrong login/password or router/"
-"firewall bad settings"
-msgstr ""
-"Não foi possível conectar-se ao website Mandriva Online: usuário/senha ou as "
-"definições de firewall estão incorretas"
+msgid "Quit"
+msgstr "Sair"
 
 #: ../mdkonline.pm:207
 #, c-format
@@ -831,6 +371,11 @@ msgstr ""
 "\n"
 "uso:\n"
 
+#: ../mdkupdate:73
+#, c-format
+msgid "  --help\t\t- print this help message.\n"
+msgstr "  --help\t\t- exibe esta mensagem de ajuda.\n"
+
 #: ../mdkupdate:74
 #, c-format
 msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
@@ -860,11 +405,6 @@ msgstr ""
 "  --bundle file.bundle\t- instala pacotes a partir do arquivo de\n"
 "                          meta-informações .bundle.\n"
 
-#: ../mdkupdate:118 ../mdkupdate:164
-#, c-format
-msgid "Warning"
-msgstr "Aviso"
-
 #. -PO: here Live Install is currently *NOT* translated on the desktop, so it's better to keep as it:
 #: ../mdkupdate:120
 #, c-format
@@ -875,11 +415,21 @@ msgstr ""
 "Você deve primeiramente instalar o sistema no disco rígido com o assistente "
 "'Live Install'."
 
+#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
+#, c-format
+msgid "Please wait"
+msgstr "Por favor aguarde"
+
 #: ../mdkupdate:123 ../mdkupdate:174
 #, c-format
 msgid "Preparing..."
 msgstr "Preparando..."
 
+#: ../mdkupdate:141 ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
+#, c-format
+msgid "Error"
+msgstr "Erro"
+
 #: ../mdkupdate:141
 #, c-format
 msgid ""
@@ -891,6 +441,11 @@ msgstr ""
 "\n"
 "%s"
 
+#: ../mdkupdate:159 ../mdkupdate:188
+#, c-format
+msgid "An error occurred"
+msgstr "Ocorreu um erro"
+
 #: ../mdkupdate:164
 #, c-format
 msgid ""
@@ -917,5 +472,308 @@ msgstr "Instalando pacotes ...\n"
 #: ../mdkupdate:231 ../mdkupdate:271
 #, c-format
 msgid "Unable to update packages from update_source medium.\n"
-msgstr "Não foi possível atualizar os pacotes a partir da mídia update_source.\n"
+msgstr ""
+"Não foi possível atualizar os pacotes a partir da mídia update_source.\n"
+
+#~ msgid "New bundles are available for your system"
+#~ msgstr "Novos kits (bundles) estão disponíveis para o seu sistema"
+
+#~ msgid "Service is not configured. Please click on \"Configure the service\""
+#~ msgstr "O serviço não está configurado. Clique em \"Configurar o serviço\""
+
+#~ msgid "Configure the service"
+#~ msgstr "Configurar o serviço"
+
+#~ msgid "Check updates"
+#~ msgstr "Verificar atualizações"
+
+#~ msgid "Configure Now!"
+#~ msgstr "Configurar Agora!"
+
+#~ msgid "Actions"
+#~ msgstr "Ações"
+
+#~ msgid "Configure"
+#~ msgstr "Configurar"
+
+#~ msgid "See logs"
+#~ msgstr "Ver logs"
+
+#~ msgid "Status"
+#~ msgstr "Status"
+
+#~ msgid "Close"
+#~ msgstr "Fechar"
+
+#~ msgid "Network Connection: "
+#~ msgstr "Conexão de rede: "
+
+#~ msgid "Up"
+#~ msgstr "Ativa"
+
+#~ msgid "Down"
+#~ msgstr "Caída"
+
+#~ msgid "Last check: "
+#~ msgstr "Última verificação: "
+
+#~ msgid "Machine name:"
+#~ msgstr "Nome da máquina:"
+
+#~ msgid "Updates: "
+#~ msgstr "Atualizações: "
+
+#~ msgid "Development release not supported by service"
+#~ msgstr "Versão de desenvolvimento não é suportada por este serviço"
+
+#~ msgid "Too old release not supported by service"
+#~ msgstr "Versão muito antiga e não suportada pelo serviço"
+
+#~ msgid "Unknown state"
+#~ msgstr "Estado desconhecido"
+
+#~ msgid "Online services disabled. Contact Mandriva Online site\n"
+#~ msgstr "Serviços on-line desativados. Contacte o site Mandriva Online\n"
+
+#~ msgid "Wrong Password.\n"
+#~ msgstr "Senha incorreta.\n"
+
+#~ msgid "Wrong Action or host or login.\n"
+#~ msgstr "Erro na ação, host ou login.\n"
+
+#~ msgid ""
+#~ "Something is wrong with your network settings (check your route, firewall "
+#~ "or proxy settings)\n"
+#~ msgstr ""
+#~ "Algo está errado com a configuração da rede (verifique a rota, firewall "
+#~ "ou as configurações proxy)\n"
+
+#~ msgid ""
+#~ "Problem occured while connecting to the server, please contact the "
+#~ "support team"
+#~ msgstr ""
+#~ "Um problema ocorreu durante a conexão ao servidor, por favor contacte "
+#~ "nosso time de suporte"
+
+#~ msgid "Response from Mandriva Online server\n"
+#~ msgstr "Resposta do servidor Mandriva Online\n"
+
+#~ msgid "No check"
+#~ msgstr "Não verificado"
+
+#~ msgid "Checking config file: Not present\n"
+#~ msgstr "Checando arquivo de configuração: Não presente\n"
+
+#~ msgid "Logs"
+#~ msgstr "Logs:"
+
+#~ msgid "Clear"
+#~ msgstr "Limpar"
+
+#~ msgid ""
+#~ "mdonline version %s\n"
+#~ "Copyright (C) %s Mandriva.\n"
+#~ "This is free software and may be redistributed under the terms of the GNU "
+#~ "GPL.\n"
+#~ "\n"
+#~ "usage:\n"
+#~ msgstr ""
+#~ "mdonline versão %s\n"
+#~ "Copyright (C) %s Mandriva.\n"
+#~ "Este é um software livre e pode ser redistribuído sobre os termos da GNU "
+#~ "GPL.\n"
+#~ "\n"
+#~ "uso:\n"
 
+#~ msgid "  --box=\t\t\t- hostname.\n"
+#~ msgstr " --box=\t\t\t- nome do host.\n"
+
+#~ msgid "  --country\t\t\t- name of country of the user. \n"
+#~ msgstr " --país\t\t\t- nome do país do usuário. \n"
+
+#~ msgid "  --interactive\t\t- use the interactive mode.\n"
+#~ msgstr "  --interativo\t\t- use o modo interativo.\n"
+
+#~ msgid "  --nointeractive\t- use the non-interactive mode.\n"
+#~ msgstr "  --não interativo\t- use o modo não interativo.\n"
+
+#~ msgid "  --login=\t\t     - login name of the user.\n"
+#~ msgstr "  --login=\t\t     - nome de login do usuário.\n"
+
+#~ msgid "  --pass=\t\t\t- password  of the user.\n"
+#~ msgstr "  --pass=\t\t\t- password  do usuário.\n"
+
+#~ msgid "Mandriva Online"
+#~ msgstr "Mandriva Online."
+
+#~ msgid "I already have an account"
+#~ msgstr "Eu já possuo uma conta"
+
+#~ msgid "I want to subscribe"
+#~ msgstr "Você precisa se inscrever"
+
+#~ msgid "Mr."
+#~ msgstr "Sr."
+
+#~ msgid "Mrs."
+#~ msgstr "Sra."
+
+#~ msgid "Ms."
+#~ msgstr "Sra."
+
+#~ msgid "Reading configuration\n"
+#~ msgstr "Lendo configuração\n"
+
+#~ msgid ""
+#~ "This assistant will help you to upload your configuration\n"
+#~ "(packages, hardware configuration) to a centralized database in\n"
+#~ "order to keep you informed about security updates and useful upgrades.\n"
+#~ msgstr ""
+#~ "Este assistente ajudará você a enviar sua configuração\n"
+#~ "(pacotes instalados e configuração de hardware) para uma base\n"
+#~ "de dados centralizada com o intuito de mantê-lo informado sobre\n"
+#~ "atualizações de segurança e melhorias úteis.\n"
+
+#~ msgid "Account creation or authentication"
+#~ msgstr "Criação ou autenticação de conta"
+
+#~ msgid "Enter your Mandriva Online login, password and machine name:"
+#~ msgstr "Digite seu login do Mandriva Online, senha e o nome da máquina:"
+
+#~ msgid "Email address:"
+#~ msgstr "Endereço email:"
+
+#~ msgid "Country"
+#~ msgstr "País:"
+
+#~ msgid "Password:"
+#~ msgstr "Senha:"
+
+#~ msgid "Machine description:"
+#~ msgstr "Descrição da máquina:"
+
+#~ msgid "(Ex: My Home Office's Computer)"
+#~ msgstr "(Ex: Meu Computador de Casa)"
+
+#~ msgid "Machine name must be 1 to 40 alphanumerical characters"
+#~ msgstr "Nome da máquina deve ter de 1 a 40 caracteres alfanuméricos"
+
+#~ msgid "Connecting to Mandriva Online website..."
+#~ msgstr "Conectando-se ao site Mandriva Online..."
+
+#~ msgid ""
+#~ "In order to benefit from Mandriva Online services,\n"
+#~ "we are about to upload your configuration.\n"
+#~ "\n"
+#~ "The Wizard will now send the following information to Mandriva:\n"
+#~ "\n"
+#~ "1) the list of packages you have installed on your system,\n"
+#~ "\n"
+#~ "2) your hardware configuration.\n"
+#~ "\n"
+#~ "If you feel uncomfortable by that idea, or do not want to benefit from "
+#~ "this service,\n"
+#~ "please press 'Cancel'. By pressing 'Next', you allow us to keep you "
+#~ "informed\n"
+#~ "about security updates and useful upgrades via personalized email "
+#~ "alerts.\n"
+#~ "Furthermore, you benefit from discounted paid support services on\n"
+#~ "www.mandrivaexpert.com."
+#~ msgstr ""
+#~ "Para que você se beneficie dos serviços Mandriva Online,\n"
+#~ "nós enviaremos agora a sua configuração. \n"
+#~ "\n"
+#~ "O Assistente enviará as seguintes informações para a Mandriva:\n"
+#~ "\n"
+#~ "1) a lista dos pacotes instalados no seu sistema,\n"
+#~ "\n"
+#~ "2) a configuração de hardware. \n"
+#~ "\n"
+#~ "Se você não concorda em enviar estes dados, ou não deseja utilizar este "
+#~ "serviço,\n"
+#~ "clique em 'Cancelar'. Clicando em 'Próximo', você nos permitirá mantê-lo\n"
+#~ "informado sobre atualizações de segurança e melhorias úteis, via emails\n"
+#~ "personalizados. Além disso, você obterá descontos em serviços pagos de\n"
+#~ "suporte em www.mandrivaexpert.com."
+
+#~ msgid "Connection problem"
+#~ msgstr "Problema de conexão"
+
+#~ msgid "Problem occurs when uploading files, please try again"
+#~ msgstr "Ocorreu um erro ao atualizar os arquivos, por favor tente novamente"
+
+#~ msgid "Create a Mandriva Online Account"
+#~ msgstr "Criar uma Conta Mandriva Online"
+
+#~ msgid "Greeting:"
+#~ msgstr "Saudação:"
+
+#~ msgid "First name:"
+#~ msgstr "Primeiro Nome:"
+
+#~ msgid "Last name:"
+#~ msgstr "Último nome:"
+
+#~ msgid "Confirm Password:"
+#~ msgstr "Confirmar Senha:"
+
+#~ msgid ""
+#~ "The passwords do not match\n"
+#~ " Please try again\n"
+#~ msgstr ""
+#~ "A senha não confere\n"
+#~ " Por favor, tente de novo\n"
+
+#~ msgid "Please fill in each field"
+#~ msgstr "Por favor preencha cada campo"
+
+#~ msgid "Not a valid mail address!\n"
+#~ msgstr "Endereço de email inválido\n"
+
+#~ msgid "Creating account failed!"
+#~ msgstr "Falha na criação de conta!"
+
+#~ msgid ""
+#~ "Mandriva Online Account successfully created.\n"
+#~ "Please click \"Next\" to authenticate and upload your configuration\n"
+#~ msgstr ""
+#~ "Conta na Mandriva Online foi criada com sucesso.\n"
+#~ "Por favor clique em \"Próximo\" para autenticar e enviar sua "
+#~ "configuração\n"
+
+#~ msgid "Your upload was successful!"
+#~ msgstr "Enviado com sucesso!"
+
+#~ msgid ""
+#~ "From now you will receive on security and updates \n"
+#~ "announcements thanks to Mandriva Online."
+#~ msgstr ""
+#~ "A partir de agora você receberá anúncios de segurança \n"
+#~ "e atualizações graças ao Mandriva Online."
+
+#~ msgid ""
+#~ "Mandriva Online offers you the ability to automate the updates.\n"
+#~ "A program will run regulary in your system waiting for new updates\n"
+#~ msgstr ""
+#~ "Mandriva Online oferece a você a facilidade de automatizar suas\n"
+#~ "atualizações. Um programa instalado no seu sistema verificará\n"
+#~ "regularmente as novas atualizações.\n"
+
+#~ msgid "Congratulations"
+#~ msgstr "Parabéns"
+
+#~ msgid "Your Mandriva Online account has been successfully configured\n"
+#~ msgstr "Sua conta na Mandriva Online foi configurada com sucesso\n"
+
+#~ msgid "Configuration uploaded successfully"
+#~ msgstr "Configuração enviada com sucesso"
+
+#~ msgid "Problem uploading configuration"
+#~ msgstr "Problema ao enviar configuração"
+
+#~ msgid ""
+#~ "Cannot connect to Mandriva Online website: wrong login/password or router/"
+#~ "firewall bad settings"
+#~ msgstr ""
+#~ "Não foi possível conectar-se ao website Mandriva Online: usuário/senha ou "
+#~ "as definições de firewall estão incorretas"
diff --git a/po/ro.po b/po/ro.po
index 913cc927..98a81733 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline-ro\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-09 16:26+0200\n"
+"POT-Creation-Date: 2008-02-21 18:21+0100\n"
 "PO-Revision-Date: 2004-10-06 14:18+0300\n"
 "Last-Translator: Ovidiu Constantin <ovidiusoft@gmail.com>\n"
 "Language-Team: Romanian <rtfs-project@lists.sourceforge.net>\n"
@@ -25,17 +25,17 @@ msgstr ""
 "2:1))\n"
 
 #. -PO: here %s will be replaced by the local time (eg: "Will check updates at 14:03:50"
-#: ../mdkapplet:94
+#: ../mdkapplet:88
 #, fuzzy, c-format
 msgid "Will check updates at %s"
 msgstr "Verifică actualizări"
 
-#: ../mdkapplet:103
+#: ../mdkapplet:97
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "Sistemul dumneavoastră este actualizat"
 
-#: ../mdkapplet:109
+#: ../mdkapplet:103
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -44,55 +44,45 @@ msgstr ""
 "Problemă de configuraţie a serviciului. Vă rog verificaţi jurnalele şi "
 "trimiteţi mail la support@mandrivaonline.com"
 
-#: ../mdkapplet:115
+#: ../mdkapplet:110
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "Vă rog să aşteptaţi, caut pachetele disponibile..."
 
-#: ../mdkapplet:121
+#: ../mdkapplet:116
 #, c-format
 msgid "New updates are available for your system"
 msgstr "Sunt disponibile noi actualizări pentru sistemul dumneavoastră"
 
-#: ../mdkapplet:127
-#, fuzzy, c-format
-msgid "New bundles are available for your system"
-msgstr "Sunt disponibile noi actualizări pentru sistemul dumneavoastră"
-
-#: ../mdkapplet:133
-#, c-format
-msgid "Service is not configured. Please click on \"Configure the service\""
-msgstr "Serviciul nu este configurat. Apăsaţi pe \"Configurează serviciul\""
-
-#: ../mdkapplet:139
+#: ../mdkapplet:122
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "Reţeaua nu merge. Vă rog configuraţi-vă reţeaua"
 
-#: ../mdkapplet:145
+#: ../mdkapplet:128
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "Serviciul nu este activat. Apăsaţi pe \"Sit online\""
 
-#: ../mdkapplet:151 ../mdkapplet:182
+#: ../mdkapplet:134 ../mdkapplet:165
 #, fuzzy, c-format
 msgid "urpmi database locked"
 msgstr "baza de date urpmi este blocată"
 
-#: ../mdkapplet:157
+#: ../mdkapplet:140
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 "Versiunea nu este suportată (versiunea este prea veche sau este versiune de "
 "dezvoltare)"
 
-#: ../mdkapplet:163
+#: ../mdkapplet:146
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
 msgstr ""
 
-#: ../mdkapplet:169
+#: ../mdkapplet:152
 #, fuzzy, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -109,580 +99,131 @@ msgstr ""
 "\n"
 "Apoi reporniţi %s."
 
-#: ../mdkapplet:174
+#: ../mdkapplet:157
 #, c-format
 msgid "Enabled"
 msgstr "Activat"
 
-#: ../mdkapplet:187
+#: ../mdkapplet:170
 #, c-format
 msgid "Error updating media"
 msgstr ""
 
-#: ../mdkapplet:202
+#: ../mdkapplet:185
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr "Verific...Actualizări sunt disponibile\n"
 
-#: ../mdkapplet:207
+#: ../mdkapplet:190
 #, c-format
 msgid "Packages are up to date"
 msgstr ""
 
-#: ../mdkapplet:212
+#: ../mdkapplet:195
 #, fuzzy, c-format
 msgid "Failed to open urpmi database"
 msgstr "nu pot deschide rpmdb"
 
-#: ../mdkapplet:217 ../mdkapplet:324
+#: ../mdkapplet:200
 #, c-format
 msgid "Install updates"
 msgstr "Instalare actualizări pentru sistem"
 
-#: ../mdkapplet:218
-#, c-format
-msgid "Configure the service"
-msgstr "Configurează serviciul"
-
-#: ../mdkapplet:219
+#: ../mdkapplet:201
 #, c-format
 msgid "Check Updates"
 msgstr "Verificare Actualizări"
 
-#: ../mdkapplet:220 ../mdkapplet:327 ../mdkonline:114 ../mdkonline:155
-#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
-#, c-format
-msgid "Please wait"
-msgstr "Vă rog să aşteptaţi"
-
-#: ../mdkapplet:220 ../mdkapplet:326 ../mdkapplet:327
-#, c-format
-msgid "Check updates"
-msgstr "Verifică actualizări"
-
-#: ../mdkapplet:223 ../mdkapplet:648
-#, c-format
-msgid "Online WebSite"
-msgstr "Pagină web"
-
-#: ../mdkapplet:224
+#: ../mdkapplet:202
 #, c-format
 msgid "Configure Network"
 msgstr "Configurare Reţea"
 
-#: ../mdkapplet:225
-#, c-format
-msgid "Configure Now!"
-msgstr "Setări"
-
-#: ../mdkapplet:313 ../mdkapplet:392
-#, c-format
-msgid "Mandriva Linux Updates Applet"
-msgstr "Mandriva Linux Updates Applet"
-
-#: ../mdkapplet:322
-#, c-format
-msgid "Actions"
-msgstr "Acţiuni"
-
-#: ../mdkapplet:325
-#, c-format
-msgid "Configure"
-msgstr "Configurează"
-
-#: ../mdkapplet:329
-#, c-format
-msgid "See logs"
-msgstr "Vezi logurile"
-
-#: ../mdkapplet:332
-#, c-format
-msgid "Status"
-msgstr "Statut"
-
-#: ../mdkapplet:336 ../mdkapplet:597
-#, c-format
-msgid "Close"
-msgstr "Închide"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Network Connection: "
-msgstr "Conexiune Reţea:"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Up"
-msgstr "Pornită"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Down"
-msgstr "Oprită"
-
-#: ../mdkapplet:366
-#, c-format
-msgid "Last check: "
-msgstr "Ultima verificare:"
-
-#: ../mdkapplet:367 ../mdkonline:145
-#, c-format
-msgid "Machine name:"
-msgstr "Nume maşină:"
-
-#: ../mdkapplet:368
-#, c-format
-msgid "Updates: "
-msgstr "Actualizări: "
-
-#: ../mdkapplet:372
+#: ../mdkapplet:283
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Lansez drakconnect\n"
 
-#: ../mdkapplet:375
+#: ../mdkapplet:286
 #, c-format
 msgid "Mandriva Online seems to be reinstalled, reloading applet ...."
 msgstr "Mandriva Online pare să fi fost reinstalat, reîncarc applet-ul ...."
 
-#: ../mdkapplet:383
+#: ../mdkapplet:294
 #, c-format
 msgid "Launching MandrivaUpdate\n"
 msgstr "Lansez MandrivaUpdate\n"
 
-#: ../mdkapplet:398
+#: ../mdkapplet:303
+#, c-format
+msgid "Mandriva Linux Updates Applet"
+msgstr "Mandriva Linux Updates Applet"
+
+#: ../mdkapplet:308
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Calculez actualizările noi...\n"
 
-#: ../mdkapplet:399
+#: ../mdkapplet:309
 #, c-format
 msgid "Connecting to"
 msgstr "Mă conectez la"
 
-#: ../mdkapplet:467 ../mdkupdate:159 ../mdkupdate:188
-#, c-format
-msgid "An error occurred"
-msgstr "A apărut o eroare"
-
-#: ../mdkapplet:475
-#, c-format
-msgid "Development release not supported by service"
-msgstr "Versiunea de dezvoltare nu este suportată de serviciu"
-
-#: ../mdkapplet:476
-#, c-format
-msgid "Too old release not supported by service"
-msgstr "Versiunea este prea veche si nu este suportată de serviciu"
-
-#: ../mdkapplet:477
-#, c-format
-msgid "Unknown state"
-msgstr "Stare necunoscută"
-
-#: ../mdkapplet:478
-#, c-format
-msgid "Online services disabled. Contact Mandriva Online site\n"
-msgstr "Servicii online dezactivate Contactaţi pagina de web Mandriva Online\n"
-
-#: ../mdkapplet:479
-#, c-format
-msgid "Wrong Password.\n"
-msgstr "Parolă greşită.\n"
-
-#: ../mdkapplet:480
-#, c-format
-msgid "Wrong Action or host or login.\n"
-msgstr "Acţiune sau Gazdă sau Login greşit.\n"
-
-#: ../mdkapplet:481
-#, c-format
-msgid ""
-"Something is wrong with your network settings (check your route, firewall or "
-"proxy settings)\n"
-msgstr ""
-"Sunt probleme cu setarile reţelei(verifică ruta, firewall-ul sau setarile "
-"proxy-ului)\n"
-
-#: ../mdkapplet:483
-#, c-format
-msgid ""
-"Problem occured while connecting to the server, please contact the support "
-"team"
-msgstr ""
-
-#: ../mdkapplet:487
-#, fuzzy, c-format
-msgid "Response from Mandriva Online server\n"
-msgstr "Bun venit la Mandriva Online"
-
-#: ../mdkapplet:490
+#: ../mdkapplet:386
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Sistemul este la zi cu actualizările\n"
 
-#: ../mdkapplet:527
-#, c-format
-msgid "No check"
-msgstr "Fără verificare"
-
-#: ../mdkapplet:541
-#, c-format
-msgid "Checking config file: Not present\n"
-msgstr "Verificare fisier de configurare: Nu este prezent\n"
-
-#: ../mdkapplet:544
+#: ../mdkapplet:415
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Verificare Reţea:se pare că este dezactivată\n"
 
-#: ../mdkapplet:587
+#: ../mdkapplet:457 ../mdkupdate:118 ../mdkupdate:164
 #, c-format
-msgid "Logs"
-msgstr "Loguri"
-
-#: ../mdkapplet:603
-#, c-format
-msgid "Clear"
-msgstr "Şterge"
+msgid "Warning"
+msgstr "Avertisment"
 
-#: ../mdkapplet:629
+#: ../mdkapplet:468
 #, c-format
 msgid "About..."
 msgstr "Despre..."
 
-#: ../mdkapplet:631
+#: ../mdkapplet:472
 #, fuzzy, c-format
 msgid "Mandriva Online %s"
 msgstr "Mandriva Online"
 
-#: ../mdkapplet:635
+#: ../mdkapplet:473
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr ""
 
-#: ../mdkapplet:647
+#: ../mdkapplet:476
 #, c-format
 msgid "Mandriva Online gives access to Mandriva web services."
 msgstr ""
 
-#: ../mdkapplet:655
-#, c-format
-msgid "Always launch on startup"
-msgstr "Lansează întotdeauna la pornire"
-
-#: ../mdkapplet:657
-#, c-format
-msgid "Quit"
-msgstr "Ieşire"
-
-#: ../mdkonline:58
-#, c-format
-msgid ""
-"mdonline version %s\n"
-"Copyright (C) %s Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"mdonline versiunea %s\n"
-"Copyright (C) %s Mandriva.\n"
-"Acest program este liber şi poate fi redistribuit sub termenii GNU GPL.\n"
-"\n"
-"Utilizare:\n"
-
-#: ../mdkonline:63 ../mdkupdate:73
-#, c-format
-msgid "  --help\t\t- print this help message.\n"
-msgstr "  --help\t\t- afişează acest mesaj de ajutor.\n"
-
-#: ../mdkonline:64
-#, c-format
-msgid "  --box=\t\t\t- hostname.\n"
-msgstr ""
-
-#: ../mdkonline:65
-#, c-format
-msgid "  --country\t\t\t- name of country of the user. \n"
-msgstr ""
-
-#: ../mdkonline:66
-#, c-format
-msgid "  --interactive\t\t- use the interactive mode.\n"
-msgstr ""
-
-#: ../mdkonline:67
-#, c-format
-msgid "  --nointeractive\t- use the non-interactive mode.\n"
-msgstr ""
-
-#: ../mdkonline:68
-#, c-format
-msgid "  --login=\t\t     - login name of the user.\n"
-msgstr ""
-
-#: ../mdkonline:69
-#, c-format
-msgid "  --pass=\t\t\t- password  of the user.\n"
-msgstr ""
-
-#: ../mdkonline:87 ../mdkonline:120
-#, c-format
-msgid "Mandriva Online"
-msgstr "Mandriva Online"
-
-#: ../mdkonline:90
-#, c-format
-msgid "I already have an account"
-msgstr "Am deja un cont"
-
-#: ../mdkonline:91
-#, c-format
-msgid "I want to subscribe"
-msgstr "Doresc să mă înscriu"
-
-#: ../mdkonline:96
-#, c-format
-msgid "Mr."
-msgstr ""
-
-#: ../mdkonline:96
-#, fuzzy, c-format
-msgid "Mrs."
-msgstr "XMrls"
-
-#: ../mdkonline:96
-#, c-format
-msgid "Ms."
-msgstr ""
-
-#: ../mdkonline:114
-#, c-format
-msgid "Reading configuration\n"
-msgstr "Citire configuraţie\n"
-
-#: ../mdkonline:123
-#, c-format
-msgid ""
-"This assistant will help you to upload your configuration\n"
-"(packages, hardware configuration) to a centralized database in\n"
-"order to keep you informed about security updates and useful upgrades.\n"
-msgstr ""
-"Acest asistent vă va ajuta să vă trimiteţi configuraţia\n"
-"(pachete, configuraţie hardware) la o bază de date centralizată pentru\n"
-"a vă ţine la curent cu actualizările de securitate şi noutăţi utile.\n"
-
-#: ../mdkonline:131
-#, c-format
-msgid "Account creation or authentication"
-msgstr "Creare cont sau autentificare"
-
-#: ../mdkonline:136
-#, c-format
-msgid "Enter your Mandriva Online login, password and machine name:"
-msgstr ""
-"Introduceţi contul utilizator Mandriva Online, parola şi numele maşinii:"
-
-#: ../mdkonline:142 ../mdkonline:195
-#, fuzzy, c-format
-msgid "Email address:"
-msgstr "Adresă IP"
-
-#: ../mdkonline:143
-#, c-format
-msgid "Country"
-msgstr "Ţara"
-
-#: ../mdkonline:144 ../mdkonline:196
-#, c-format
-msgid "Password:"
-msgstr "Parolă:"
-
-#: ../mdkonline:146
-#, fuzzy, c-format
-msgid "Machine description:"
-msgstr "Nume maşină:"
-
-#: ../mdkonline:147
-#, c-format
-msgid "(Ex: My Home Office's Computer)"
-msgstr ""
-
-#: ../mdkonline:152 ../mdkonline:159 ../mdkonline:180 ../mdkonline:204
-#: ../mdkonline:208 ../mdkonline:212 ../mdkonline:217 ../mdkupdate:141
-#: ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
-#, c-format
-msgid "Error"
-msgstr "Eroare"
-
-#: ../mdkonline:152
-#, fuzzy, c-format
-msgid "Machine name must be 1 to 40 alphanumerical characters"
-msgstr "Punctele de montare au trebui să conţină doar caractere alfanumerice"
-
-#: ../mdkonline:155
-#, c-format
-msgid "Connecting to Mandriva Online website..."
-msgstr "Conectare la situl Mandriva Online..."
-
-#: ../mdkonline:167
-#, c-format
-msgid ""
-"In order to benefit from Mandriva Online services,\n"
-"we are about to upload your configuration.\n"
-"\n"
-"The Wizard will now send the following information to Mandriva:\n"
-"\n"
-"1) the list of packages you have installed on your system,\n"
-"\n"
-"2) your hardware configuration.\n"
-"\n"
-"If you feel uncomfortable by that idea, or do not want to benefit from this "
-"service,\n"
-"please press 'Cancel'. By pressing 'Next', you allow us to keep you "
-"informed\n"
-"about security updates and useful upgrades via personalized email alerts.\n"
-"Furthermore, you benefit from discounted paid support services on\n"
-"www.mandrivaexpert.com."
-msgstr ""
-"Pentru a beneficia de serviciile Mandriva Online,\n"
-"suntem pe cale să trimitem configuraţia dumneavoastră.\n"
-"\n"
-"Acest asistent va trimite acum următoarele informaţii la Mandriva:\n"
-"\n"
-"1) lista pachetelor pe care le aveţi instalate în sistem,\n"
-"\n"
-"2) configuraţia hardware.\n"
-"\n"
-"Dacă nu sunteţi de acord cu acest lucru, sau nu doriţi să beneficiaţi de "
-"acest serviciu,\n"
-"vă rog apăsaţi 'Anulare'. Apăsând 'Înainte', ne permiteţi să vă ţinem "
-"informat\n"
-"despre actualizări de securitate sau folositoare prin alerte email "
-"personalizate.\n"
-"Mai mult, beneficiaţi de discount la serviciile de suport plătit la\n"
-"www.mandrivaexpert.com."
-
-#: ../mdkonline:180
-#, c-format
-msgid "Connection problem"
-msgstr "Problemă la conectare"
-
-#: ../mdkonline:180
-#, c-format
-msgid "Problem occurs when uploading files, please try again"
-msgstr "A apărut o problemă la încărcarea fişierelor, vă rog reînceraţi"
-
-#: ../mdkonline:187
-#, c-format
-msgid "Create a Mandriva Online Account"
-msgstr "Creează un cont Mandriva Online"
-
-#. -PO: that is for things like "Mr", "Ms",...
-#: ../mdkonline:192
-#, fuzzy, c-format
-msgid "Greeting:"
-msgstr "Verde"
-
-#: ../mdkonline:193
-#, c-format
-msgid "First name:"
-msgstr "Primul nume:"
-
-#: ../mdkonline:194
-#, fuzzy, c-format
-msgid "Last name:"
-msgstr "Primul nume:"
-
-#: ../mdkonline:197
-#, c-format
-msgid "Confirm Password:"
-msgstr "Confirmare parolă:"
-
-#: ../mdkonline:204
-#, c-format
-msgid ""
-"The passwords do not match\n"
-" Please try again\n"
-msgstr ""
-"Parolele nu se potrivesc.\n"
-"Incercaţi din nou\n"
-
-#: ../mdkonline:208
-#, fuzzy, c-format
-msgid "Please fill in each field"
-msgstr "Vă rog completaţi poate câmpurile\n"
-
-#: ../mdkonline:212
-#, c-format
-msgid "Not a valid mail address!\n"
-msgstr "Nu e o adresă de mail validă!\n"
-
-#: ../mdkonline:217
-#, c-format
-msgid "Creating account failed!"
-msgstr ""
-
-#: ../mdkonline:225
-#, c-format
-msgid ""
-"Mandriva Online Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
-msgstr ""
-"Contul Mandriva Online a fost creat cu succes.\n"
-"Vă rog apăsaţi \"Înainte\" pentru a vă autentifica şi a transmite "
-"configuraţia dumneavoastră\n"
-
-#: ../mdkonline:229
-#, c-format
-msgid "Your upload was successful!"
-msgstr "Trimiterea a fost reuşită!"
-
-#: ../mdkonline:229
+#: ../mdkapplet:478
 #, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandriva Online."
-msgstr ""
-"De acum veţi primi anunţuri despre securitare\n"
-"şi actualizări cu ajutorul Mandriva Online."
+msgid "Online WebSite"
+msgstr "Pagină web"
 
-#: ../mdkonline:229
+#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
+#: ../mdkapplet:483
 #, c-format
-msgid ""
-"Mandriva Online offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
+msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
-"Mandriva Online vă oferă posibilitatea să automatizaţi actualizările.\n"
-"Un program va rula regulat pe sistemul dumneavoastră aşteptând actualizări\n"
-
-#: ../mdkonline:238
-#, c-format
-msgid "Congratulations"
-msgstr "Felicitări"
 
-#: ../mdkonline:238
+#: ../mdkapplet:492
 #, c-format
-msgid "Your Mandriva Online account has been successfully configured\n"
-msgstr "Contul dumneavoastră Mandriva Online a fost configurat cu succes\n"
-
-#: ../mdkonline:253
-#, fuzzy, c-format
-msgid "Configuration uploaded successfully"
-msgstr "Trimiterea a fost reuşită!"
-
-#: ../mdkonline:254
-#, fuzzy, c-format
-msgid "Problem uploading configuration"
-msgstr "Citire configuraţie\n"
+msgid "Always launch on startup"
+msgstr "Lansează întotdeauna la pornire"
 
-#: ../mdkonline:256
+#: ../mdkapplet:494
 #, c-format
-msgid ""
-"Cannot connect to Mandriva Online website: wrong login/password or router/"
-"firewall bad settings"
-msgstr ""
+msgid "Quit"
+msgstr "Ieşire"
 
 #: ../mdkonline.pm:207
 #, fuzzy, c-format
@@ -822,6 +363,11 @@ msgstr ""
 "\n"
 "Utilizare:\n"
 
+#: ../mdkupdate:73
+#, c-format
+msgid "  --help\t\t- print this help message.\n"
+msgstr "  --help\t\t- afişează acest mesaj de ajutor.\n"
+
 #: ../mdkupdate:74
 #, c-format
 msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
@@ -849,11 +395,6 @@ msgid ""
 "file.\n"
 msgstr ""
 
-#: ../mdkupdate:118 ../mdkupdate:164
-#, c-format
-msgid "Warning"
-msgstr "Avertisment"
-
 #. -PO: here Live Install is currently *NOT* translated on the desktop, so it's better to keep as it:
 #: ../mdkupdate:120
 #, c-format
@@ -862,11 +403,21 @@ msgid ""
 "Install' wizard."
 msgstr ""
 
+#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
+#, c-format
+msgid "Please wait"
+msgstr "Vă rog să aşteptaţi"
+
 #: ../mdkupdate:123 ../mdkupdate:174
 #, c-format
 msgid "Preparing..."
 msgstr "Pregătire..."
 
+#: ../mdkupdate:141 ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
+#, c-format
+msgid "Error"
+msgstr "Eroare"
+
 #: ../mdkupdate:141
 #, c-format
 msgid ""
@@ -875,6 +426,11 @@ msgid ""
 "%s"
 msgstr ""
 
+#: ../mdkupdate:159 ../mdkupdate:188
+#, c-format
+msgid "An error occurred"
+msgstr "A apărut o eroare"
+
 #: ../mdkupdate:164
 #, c-format
 msgid ""
@@ -899,6 +455,279 @@ msgstr "Instalare pachete...\n"
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "Nu pot actualiza pachetele de pe mediul update_source.\n"
 
+#, fuzzy
+#~ msgid "New bundles are available for your system"
+#~ msgstr "Sunt disponibile noi actualizări pentru sistemul dumneavoastră"
+
+#~ msgid "Service is not configured. Please click on \"Configure the service\""
+#~ msgstr "Serviciul nu este configurat. Apăsaţi pe \"Configurează serviciul\""
+
+#~ msgid "Configure the service"
+#~ msgstr "Configurează serviciul"
+
+#~ msgid "Check updates"
+#~ msgstr "Verifică actualizări"
+
+#~ msgid "Configure Now!"
+#~ msgstr "Setări"
+
+#~ msgid "Actions"
+#~ msgstr "Acţiuni"
+
+#~ msgid "Configure"
+#~ msgstr "Configurează"
+
+#~ msgid "See logs"
+#~ msgstr "Vezi logurile"
+
+#~ msgid "Status"
+#~ msgstr "Statut"
+
+#~ msgid "Close"
+#~ msgstr "Închide"
+
+#~ msgid "Network Connection: "
+#~ msgstr "Conexiune Reţea:"
+
+#~ msgid "Up"
+#~ msgstr "Pornită"
+
+#~ msgid "Down"
+#~ msgstr "Oprită"
+
+#~ msgid "Last check: "
+#~ msgstr "Ultima verificare:"
+
+#~ msgid "Machine name:"
+#~ msgstr "Nume maşină:"
+
+#~ msgid "Updates: "
+#~ msgstr "Actualizări: "
+
+#~ msgid "Development release not supported by service"
+#~ msgstr "Versiunea de dezvoltare nu este suportată de serviciu"
+
+#~ msgid "Too old release not supported by service"
+#~ msgstr "Versiunea este prea veche si nu este suportată de serviciu"
+
+#~ msgid "Unknown state"
+#~ msgstr "Stare necunoscută"
+
+#~ msgid "Online services disabled. Contact Mandriva Online site\n"
+#~ msgstr ""
+#~ "Servicii online dezactivate Contactaţi pagina de web Mandriva Online\n"
+
+#~ msgid "Wrong Password.\n"
+#~ msgstr "Parolă greşită.\n"
+
+#~ msgid "Wrong Action or host or login.\n"
+#~ msgstr "Acţiune sau Gazdă sau Login greşit.\n"
+
+#~ msgid ""
+#~ "Something is wrong with your network settings (check your route, firewall "
+#~ "or proxy settings)\n"
+#~ msgstr ""
+#~ "Sunt probleme cu setarile reţelei(verifică ruta, firewall-ul sau setarile "
+#~ "proxy-ului)\n"
+
+#, fuzzy
+#~ msgid "Response from Mandriva Online server\n"
+#~ msgstr "Bun venit la Mandriva Online"
+
+#~ msgid "No check"
+#~ msgstr "Fără verificare"
+
+#~ msgid "Checking config file: Not present\n"
+#~ msgstr "Verificare fisier de configurare: Nu este prezent\n"
+
+#~ msgid "Logs"
+#~ msgstr "Loguri"
+
+#~ msgid "Clear"
+#~ msgstr "Şterge"
+
+#~ msgid ""
+#~ "mdonline version %s\n"
+#~ "Copyright (C) %s Mandriva.\n"
+#~ "This is free software and may be redistributed under the terms of the GNU "
+#~ "GPL.\n"
+#~ "\n"
+#~ "usage:\n"
+#~ msgstr ""
+#~ "mdonline versiunea %s\n"
+#~ "Copyright (C) %s Mandriva.\n"
+#~ "Acest program este liber şi poate fi redistribuit sub termenii GNU GPL.\n"
+#~ "\n"
+#~ "Utilizare:\n"
+
+#~ msgid "Mandriva Online"
+#~ msgstr "Mandriva Online"
+
+#~ msgid "I already have an account"
+#~ msgstr "Am deja un cont"
+
+#~ msgid "I want to subscribe"
+#~ msgstr "Doresc să mă înscriu"
+
+#, fuzzy
+#~ msgid "Mrs."
+#~ msgstr "XMrls"
+
+#~ msgid "Reading configuration\n"
+#~ msgstr "Citire configuraţie\n"
+
+#~ msgid ""
+#~ "This assistant will help you to upload your configuration\n"
+#~ "(packages, hardware configuration) to a centralized database in\n"
+#~ "order to keep you informed about security updates and useful upgrades.\n"
+#~ msgstr ""
+#~ "Acest asistent vă va ajuta să vă trimiteţi configuraţia\n"
+#~ "(pachete, configuraţie hardware) la o bază de date centralizată pentru\n"
+#~ "a vă ţine la curent cu actualizările de securitate şi noutăţi utile.\n"
+
+#~ msgid "Account creation or authentication"
+#~ msgstr "Creare cont sau autentificare"
+
+#~ msgid "Enter your Mandriva Online login, password and machine name:"
+#~ msgstr ""
+#~ "Introduceţi contul utilizator Mandriva Online, parola şi numele maşinii:"
+
+#, fuzzy
+#~ msgid "Email address:"
+#~ msgstr "Adresă IP"
+
+#~ msgid "Country"
+#~ msgstr "Ţara"
+
+#~ msgid "Password:"
+#~ msgstr "Parolă:"
+
+#, fuzzy
+#~ msgid "Machine description:"
+#~ msgstr "Nume maşină:"
+
+#, fuzzy
+#~ msgid "Machine name must be 1 to 40 alphanumerical characters"
+#~ msgstr ""
+#~ "Punctele de montare au trebui să conţină doar caractere alfanumerice"
+
+#~ msgid "Connecting to Mandriva Online website..."
+#~ msgstr "Conectare la situl Mandriva Online..."
+
+#~ msgid ""
+#~ "In order to benefit from Mandriva Online services,\n"
+#~ "we are about to upload your configuration.\n"
+#~ "\n"
+#~ "The Wizard will now send the following information to Mandriva:\n"
+#~ "\n"
+#~ "1) the list of packages you have installed on your system,\n"
+#~ "\n"
+#~ "2) your hardware configuration.\n"
+#~ "\n"
+#~ "If you feel uncomfortable by that idea, or do not want to benefit from "
+#~ "this service,\n"
+#~ "please press 'Cancel'. By pressing 'Next', you allow us to keep you "
+#~ "informed\n"
+#~ "about security updates and useful upgrades via personalized email "
+#~ "alerts.\n"
+#~ "Furthermore, you benefit from discounted paid support services on\n"
+#~ "www.mandrivaexpert.com."
+#~ msgstr ""
+#~ "Pentru a beneficia de serviciile Mandriva Online,\n"
+#~ "suntem pe cale să trimitem configuraţia dumneavoastră.\n"
+#~ "\n"
+#~ "Acest asistent va trimite acum următoarele informaţii la Mandriva:\n"
+#~ "\n"
+#~ "1) lista pachetelor pe care le aveţi instalate în sistem,\n"
+#~ "\n"
+#~ "2) configuraţia hardware.\n"
+#~ "\n"
+#~ "Dacă nu sunteţi de acord cu acest lucru, sau nu doriţi să beneficiaţi de "
+#~ "acest serviciu,\n"
+#~ "vă rog apăsaţi 'Anulare'. Apăsând 'Înainte', ne permiteţi să vă ţinem "
+#~ "informat\n"
+#~ "despre actualizări de securitate sau folositoare prin alerte email "
+#~ "personalizate.\n"
+#~ "Mai mult, beneficiaţi de discount la serviciile de suport plătit la\n"
+#~ "www.mandrivaexpert.com."
+
+#~ msgid "Connection problem"
+#~ msgstr "Problemă la conectare"
+
+#~ msgid "Problem occurs when uploading files, please try again"
+#~ msgstr "A apărut o problemă la încărcarea fişierelor, vă rog reînceraţi"
+
+#~ msgid "Create a Mandriva Online Account"
+#~ msgstr "Creează un cont Mandriva Online"
+
+#, fuzzy
+#~ msgid "Greeting:"
+#~ msgstr "Verde"
+
+#~ msgid "First name:"
+#~ msgstr "Primul nume:"
+
+#, fuzzy
+#~ msgid "Last name:"
+#~ msgstr "Primul nume:"
+
+#~ msgid "Confirm Password:"
+#~ msgstr "Confirmare parolă:"
+
+#~ msgid ""
+#~ "The passwords do not match\n"
+#~ " Please try again\n"
+#~ msgstr ""
+#~ "Parolele nu se potrivesc.\n"
+#~ "Incercaţi din nou\n"
+
+#, fuzzy
+#~ msgid "Please fill in each field"
+#~ msgstr "Vă rog completaţi poate câmpurile\n"
+
+#~ msgid "Not a valid mail address!\n"
+#~ msgstr "Nu e o adresă de mail validă!\n"
+
+#~ msgid ""
+#~ "Mandriva Online Account successfully created.\n"
+#~ "Please click \"Next\" to authenticate and upload your configuration\n"
+#~ msgstr ""
+#~ "Contul Mandriva Online a fost creat cu succes.\n"
+#~ "Vă rog apăsaţi \"Înainte\" pentru a vă autentifica şi a transmite "
+#~ "configuraţia dumneavoastră\n"
+
+#~ msgid "Your upload was successful!"
+#~ msgstr "Trimiterea a fost reuşită!"
+
+#~ msgid ""
+#~ "From now you will receive on security and updates \n"
+#~ "announcements thanks to Mandriva Online."
+#~ msgstr ""
+#~ "De acum veţi primi anunţuri despre securitare\n"
+#~ "şi actualizări cu ajutorul Mandriva Online."
+
+#~ msgid ""
+#~ "Mandriva Online offers you the ability to automate the updates.\n"
+#~ "A program will run regulary in your system waiting for new updates\n"
+#~ msgstr ""
+#~ "Mandriva Online vă oferă posibilitatea să automatizaţi actualizările.\n"
+#~ "Un program va rula regulat pe sistemul dumneavoastră aşteptând "
+#~ "actualizări\n"
+
+#~ msgid "Congratulations"
+#~ msgstr "Felicitări"
+
+#~ msgid "Your Mandriva Online account has been successfully configured\n"
+#~ msgstr "Contul dumneavoastră Mandriva Online a fost configurat cu succes\n"
+
+#, fuzzy
+#~ msgid "Configuration uploaded successfully"
+#~ msgstr "Trimiterea a fost reuşită!"
+
+#, fuzzy
+#~ msgid "Problem uploading configuration"
+#~ msgstr "Citire configuraţie\n"
+
 #~ msgid "  --applet\t\t- launch Mandriva Update.\n"
 #~ msgstr "  --applet\t\t- lansează Mandriva Update.\n"
 
diff --git a/po/ru.po b/po/ru.po
index 8beed552..b6427b76 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-09 16:26+0200\n"
+"POT-Creation-Date: 2008-02-21 18:21+0100\n"
 "PO-Revision-Date: 2008-01-19 21:21+0200\n"
 "Last-Translator: Pavel Maryanov <acid_jack@ukr.net>\n"
 "Language-Team: Russian <gnu@mx.ru>\n"
@@ -19,68 +19,64 @@ 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:94
+#: ../mdkapplet:88
 #, c-format
 msgid "Will check updates at %s"
 msgstr "Проверка обновлений будет выполнена в %s"
 
-#: ../mdkapplet:103
+#: ../mdkapplet:97
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "Система не нуждается в обновлении"
 
-#: ../mdkapplet:109
+#: ../mdkapplet:103
 #, c-format
-msgid "Service configuration problem. Please check logs and send mail to support@mandrivaonline.com"
-msgstr "Проблема настройки службы. Проверьте журнал и отправьте письмо на support@mandrivaonline.com"
+msgid ""
+"Service configuration problem. Please check logs and send mail to "
+"support@mandrivaonline.com"
+msgstr ""
+"Проблема настройки службы. Проверьте журнал и отправьте письмо на "
+"support@mandrivaonline.com"
 
-#: ../mdkapplet:115
+#: ../mdkapplet:110
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "Подождите. Выполняется поиск доступных пакетов..."
 
-#: ../mdkapplet:121
+#: ../mdkapplet:116
 #, c-format
 msgid "New updates are available for your system"
 msgstr "Для системы доступны новые обновления"
 
-#: ../mdkapplet:127
-#, c-format
-msgid "New bundles are available for your system"
-msgstr "Для системы доступны новые программные комплексы"
-
-#: ../mdkapplet:133
-#, c-format
-msgid "Service is not configured. Please click on \"Configure the service\""
-msgstr "Служба не настроена. Выберите \"Настроить службу\""
-
-#: ../mdkapplet:139
+#: ../mdkapplet:122
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "Сеть недоступна. Настройте сеть"
 
-#: ../mdkapplet:145
+#: ../mdkapplet:128
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "Служба не включена. Выберите \"Зайти на веб-сайт\""
 
-#: ../mdkapplet:151
-#: ../mdkapplet:182
+#: ../mdkapplet:134 ../mdkapplet:165
 #, c-format
 msgid "urpmi database locked"
 msgstr "База данных urpmi заблокирована"
 
-#: ../mdkapplet:157
+#: ../mdkapplet:140
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr "Релиз не поддерживается (слишком старый или разрабатываемый релиз)"
 
-#: ../mdkapplet:163
+#: ../mdkapplet:146
 #, c-format
-msgid "No medium found. You must add some media through 'Software Media Manager'."
-msgstr "Источник не найден. Нужно добавить хотя бы один источник с помощью Менеджера источников программ."
+msgid ""
+"No medium found. You must add some media through 'Software Media Manager'."
+msgstr ""
+"Источник не найден. Нужно добавить хотя бы один источник с помощью Менеджера "
+"источников программ."
 
-#: ../mdkapplet:169
+#: ../mdkapplet:152
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -97,592 +93,131 @@ msgstr ""
 "\n"
 "А затем перезапустите \"%s\"."
 
-#: ../mdkapplet:174
+#: ../mdkapplet:157
 #, c-format
 msgid "Enabled"
 msgstr "Включён"
 
-#: ../mdkapplet:187
+#: ../mdkapplet:170
 #, c-format
 msgid "Error updating media"
 msgstr "Ошибка обновления источника"
 
-#: ../mdkapplet:202
+#: ../mdkapplet:185
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr "Выполняется проверка... Обновления доступны\n"
 
-#: ../mdkapplet:207
+#: ../mdkapplet:190
 #, c-format
 msgid "Packages are up to date"
 msgstr "Пакеты не нуждаются в обновлении"
 
-#: ../mdkapplet:212
+#: ../mdkapplet:195
 #, c-format
 msgid "Failed to open urpmi database"
 msgstr "Ошибка открытия базы данных urpmi"
 
-#: ../mdkapplet:217
-#: ../mdkapplet:324
+#: ../mdkapplet:200
 #, c-format
 msgid "Install updates"
 msgstr "Установить обновления"
 
-#: ../mdkapplet:218
-#, c-format
-msgid "Configure the service"
-msgstr "Настроить службу"
-
-#: ../mdkapplet:219
+#: ../mdkapplet:201
 #, c-format
 msgid "Check Updates"
 msgstr "Проверить обновления"
 
-#: ../mdkapplet:220
-#: ../mdkapplet:327
-#: ../mdkonline:114
-#: ../mdkonline:155
-#: ../mdkupdate:123
-#: ../mdkupdate:174
-#: ../mdkupdate:219
-#, c-format
-msgid "Please wait"
-msgstr "Подождите..."
-
-#: ../mdkapplet:220
-#: ../mdkapplet:326
-#: ../mdkapplet:327
-#, c-format
-msgid "Check updates"
-msgstr "Проверить обновления"
-
-#: ../mdkapplet:223
-#: ../mdkapplet:648
-#, c-format
-msgid "Online WebSite"
-msgstr "Зайти на веб-сайт"
-
-#: ../mdkapplet:224
+#: ../mdkapplet:202
 #, c-format
 msgid "Configure Network"
 msgstr "Настроить сеть"
 
-#: ../mdkapplet:225
-#, c-format
-msgid "Configure Now!"
-msgstr "Настроить"
-
-#: ../mdkapplet:313
-#: ../mdkapplet:392
-#, c-format
-msgid "Mandriva Linux Updates Applet"
-msgstr "Апплет 'Обновления Mandriva Linux'"
-
-#: ../mdkapplet:322
-#, c-format
-msgid "Actions"
-msgstr "Действия"
-
-#: ../mdkapplet:325
-#, c-format
-msgid "Configure"
-msgstr "Настроить"
-
-#: ../mdkapplet:329
-#, c-format
-msgid "See logs"
-msgstr "Просмотр журнала"
-
-#: ../mdkapplet:332
-#, c-format
-msgid "Status"
-msgstr "Статус"
-
-#: ../mdkapplet:336
-#: ../mdkapplet:597
-#, c-format
-msgid "Close"
-msgstr "Закрыть"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Network Connection: "
-msgstr "Сетевое подключение: "
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Up"
-msgstr "Активно"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Down"
-msgstr "Неактивно"
-
-#: ../mdkapplet:366
-#, c-format
-msgid "Last check: "
-msgstr "Последняя проверка: "
-
-#: ../mdkapplet:367
-#: ../mdkonline:145
-#, c-format
-msgid "Machine name:"
-msgstr "Имя машины:"
-
-#: ../mdkapplet:368
-#, c-format
-msgid "Updates: "
-msgstr "Обновления: "
-
-#: ../mdkapplet:372
+#: ../mdkapplet:283
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Запускается drakconnect\n"
 
-#: ../mdkapplet:375
+#: ../mdkapplet:286
 #, c-format
 msgid "Mandriva Online seems to be reinstalled, reloading applet ...."
 msgstr "Служба Mandriva Online была переустановлена. Апплет перезагружается..."
 
-#: ../mdkapplet:383
+#: ../mdkapplet:294
 #, c-format
 msgid "Launching MandrivaUpdate\n"
 msgstr "Запускается Mandriva Update\n"
 
-#: ../mdkapplet:398
+#: ../mdkapplet:303
+#, c-format
+msgid "Mandriva Linux Updates Applet"
+msgstr "Апплет 'Обновления Mandriva Linux'"
+
+#: ../mdkapplet:308
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Определяются новые обновления...\n"
 
-#: ../mdkapplet:399
+#: ../mdkapplet:309
 #, c-format
 msgid "Connecting to"
 msgstr "Выполняется подключение к"
 
-#: ../mdkapplet:467
-#: ../mdkupdate:159
-#: ../mdkupdate:188
-#, c-format
-msgid "An error occurred"
-msgstr "Произошла ошибка"
-
-#: ../mdkapplet:475
-#, c-format
-msgid "Development release not supported by service"
-msgstr "Разрабатываемый релиз службой не поддерживается"
-
-#: ../mdkapplet:476
-#, c-format
-msgid "Too old release not supported by service"
-msgstr "Слишком старый релиз, не поддерживаемый службой"
-
-#: ../mdkapplet:477
-#, c-format
-msgid "Unknown state"
-msgstr "Неизвестное состояние"
-
-#: ../mdkapplet:478
-#, c-format
-msgid "Online services disabled. Contact Mandriva Online site\n"
-msgstr "Онлайновые службы отключены. Зайдите на сайт Mandriva Online\n"
-
-#: ../mdkapplet:479
-#, c-format
-msgid "Wrong Password.\n"
-msgstr "Неверный пароль.\n"
-
-#: ../mdkapplet:480
-#, c-format
-msgid "Wrong Action or host or login.\n"
-msgstr "Неверное действие, хост или логин.\n"
-
-#: ../mdkapplet:481
-#, c-format
-msgid "Something is wrong with your network settings (check your route, firewall or proxy settings)\n"
-msgstr "Что-то не так с конфигурацией сети (проверьте маршрут, файервол или настройки прокси)\n"
-
-#: ../mdkapplet:483
-#, c-format
-msgid "Problem occured while connecting to the server, please contact the support team"
-msgstr "Возникла проблема при обращении к серверу. Обратитесь в службу технической поддержки"
-
-#: ../mdkapplet:487
-#, c-format
-msgid "Response from Mandriva Online server\n"
-msgstr "Ответ сервера Mandriva Online\n"
-
-#: ../mdkapplet:490
+#: ../mdkapplet:386
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Система находится в актуальном состоянии\n"
 
-#: ../mdkapplet:527
-#, c-format
-msgid "No check"
-msgstr "Без проверок"
-
-#: ../mdkapplet:541
-#, c-format
-msgid "Checking config file: Not present\n"
-msgstr "Проверка файла config: Отсутствует\n"
-
-#: ../mdkapplet:544
+#: ../mdkapplet:415
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Проверка сети: похоже отключена\n"
 
-#: ../mdkapplet:587
+#: ../mdkapplet:457 ../mdkupdate:118 ../mdkupdate:164
 #, c-format
-msgid "Logs"
-msgstr "Журнал"
-
-#: ../mdkapplet:603
-#, c-format
-msgid "Clear"
-msgstr "Очистить"
+msgid "Warning"
+msgstr "Внимание"
 
-#: ../mdkapplet:629
+#: ../mdkapplet:468
 #, c-format
 msgid "About..."
 msgstr "О программе..."
 
-#: ../mdkapplet:631
+#: ../mdkapplet:472
 #, c-format
 msgid "Mandriva Online %s"
 msgstr "Mandriva Online %s"
 
-#: ../mdkapplet:635
+#: ../mdkapplet:473
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Copyright (C) %s Mandriva"
 
-#: ../mdkapplet:647
+#: ../mdkapplet:476
 #, c-format
 msgid "Mandriva Online gives access to Mandriva web services."
 msgstr "Mandriva Online предоставляет доступ к веб-службам Mandriva."
 
-#: ../mdkapplet:655
-#, c-format
-msgid "Always launch on startup"
-msgstr "Всегда запускать при старте"
-
-#: ../mdkapplet:657
-#, c-format
-msgid "Quit"
-msgstr "Выход"
-
-#: ../mdkonline:58
-#, c-format
-msgid ""
-"mdonline version %s\n"
-"Copyright (C) %s Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"mdonline версия %s\n"
-"Copyright (C) %s Mandriva.\n"
-"Это открытое программное обеспечение и может распространяться согласно условиям GNU GPL.\n"
-"\n"
-"использование:\n"
-
-#: ../mdkonline:63
-#: ../mdkupdate:73
-#, c-format
-msgid "  --help\t\t- print this help message.\n"
-msgstr "  --help\t\t- вывод этого справочного сообщения\n"
-
-#: ../mdkonline:64
-#, c-format
-msgid "  --box=\t\t\t- hostname.\n"
-msgstr "  --box=\t\t\t- имя хоста.\n"
-
-#: ../mdkonline:65
-#, c-format
-msgid "  --country\t\t\t- name of country of the user. \n"
-msgstr "  --country\t\t\t- страна пользователя. \n"
-
-#: ../mdkonline:66
-#, c-format
-msgid "  --interactive\t\t- use the interactive mode.\n"
-msgstr "  --interactive\t\t- использовать интерактивный режим.\n"
-
-#: ../mdkonline:67
-#, c-format
-msgid "  --nointeractive\t- use the non-interactive mode.\n"
-msgstr "  --nointeractive\t- использовать не интерактивный режим.\n"
-
-#: ../mdkonline:68
-#, c-format
-msgid "  --login=\t\t     - login name of the user.\n"
-msgstr "  --login=\t\t     - логин пользователя.\n"
-
-#: ../mdkonline:69
-#, c-format
-msgid "  --pass=\t\t\t- password  of the user.\n"
-msgstr "  --pass=\t\t\t- пароль пользователя.\n"
-
-#: ../mdkonline:87
-#: ../mdkonline:120
-#, c-format
-msgid "Mandriva Online"
-msgstr "Mandriva Online"
-
-#: ../mdkonline:90
-#, c-format
-msgid "I already have an account"
-msgstr "У меня уже есть учётная запись"
-
-#: ../mdkonline:91
-#, c-format
-msgid "I want to subscribe"
-msgstr "Я хочу получить учётную запись"
-
-#: ../mdkonline:96
-#, c-format
-msgid "Mr."
-msgstr "Г-н"
-
-#: ../mdkonline:96
-#, c-format
-msgid "Mrs."
-msgstr "Г-жа"
-
-#: ../mdkonline:96
-#, c-format
-msgid "Ms."
-msgstr "Г-жа"
-
-#: ../mdkonline:114
-#, c-format
-msgid "Reading configuration\n"
-msgstr "Считывается конфигурация\n"
-
-#: ../mdkonline:123
-#, c-format
-msgid ""
-"This assistant will help you to upload your configuration\n"
-"(packages, hardware configuration) to a centralized database in\n"
-"order to keep you informed about security updates and useful upgrades.\n"
-msgstr ""
-"Этот ассистент поможет вам выгрузить свою конфигурацию \n"
-"(пакеты, конфигурацию оборудования) в центральную базу данных,\n"
-"чтобы держать вас в курсе при появлении обновлений по безопасности \n"
-"и полезных апгрейдов.\n"
-
-#: ../mdkonline:131
-#, c-format
-msgid "Account creation or authentication"
-msgstr "Создание учётной записи или аутентификация"
-
-#: ../mdkonline:136
-#, c-format
-msgid "Enter your Mandriva Online login, password and machine name:"
-msgstr "Введите свой логин Mandriva Online, пароль и имя машины:"
-
-#: ../mdkonline:142
-#: ../mdkonline:195
-#, c-format
-msgid "Email address:"
-msgstr "Адрес e-mail:"
-
-#: ../mdkonline:143
-#, c-format
-msgid "Country"
-msgstr "Страна"
-
-#: ../mdkonline:144
-#: ../mdkonline:196
-#, c-format
-msgid "Password:"
-msgstr "Пароль:"
-
-#: ../mdkonline:146
-#, c-format
-msgid "Machine description:"
-msgstr "Описание машины:"
-
-#: ../mdkonline:147
-#, c-format
-msgid "(Ex: My Home Office's Computer)"
-msgstr "(напр: мой домашний компьютер)"
-
-#: ../mdkonline:152
-#: ../mdkonline:159
-#: ../mdkonline:180
-#: ../mdkonline:204
-#: ../mdkonline:208
-#: ../mdkonline:212
-#: ../mdkonline:217
-#: ../mdkupdate:141
-#: ../mdkupdate:159
-#: ../mdkupdate:188
-#: ../mdkupdate:207
-#, c-format
-msgid "Error"
-msgstr "Ошибка"
-
-#: ../mdkonline:152
-#, c-format
-msgid "Machine name must be 1 to 40 alphanumerical characters"
-msgstr "Название машины должно содержать от 1 до 40 алфавитно-цифровых символов"
-
-#: ../mdkonline:155
-#, c-format
-msgid "Connecting to Mandriva Online website..."
-msgstr "Выполняется подключение к веб-сайту Mandriva Online..."
-
-#: ../mdkonline:167
-#, c-format
-msgid ""
-"In order to benefit from Mandriva Online services,\n"
-"we are about to upload your configuration.\n"
-"\n"
-"The Wizard will now send the following information to Mandriva:\n"
-"\n"
-"1) the list of packages you have installed on your system,\n"
-"\n"
-"2) your hardware configuration.\n"
-"\n"
-"If you feel uncomfortable by that idea, or do not want to benefit from this service,\n"
-"please press 'Cancel'. By pressing 'Next', you allow us to keep you informed\n"
-"about security updates and useful upgrades via personalized email alerts.\n"
-"Furthermore, you benefit from discounted paid support services on\n"
-"www.mandrivaexpert.com."
-msgstr ""
-"Чтобы воспользоваться преимуществами служб Mandriva Online,\n"
-"рекомендуется выгрузить на сервер свою конфигурацию.\n"
-"\n"
-"Мастер отправит на сервер Mandriva следующую информацию:\n"
-"1) Список пакетов, установленных в системе.\n"
-"2) Конфигурацию оборудования.\n"
-"\n"
-"Если вас это не устраивает или вы не хотите использовать\n"
-"преимущества этой службы, нажмите кнопку 'Отмена'. Нажимая\n"
-"но кнопку 'Далее', вы тем самым разрешаете нам сообщать вам\n"
-"об обновлениях по безопасности и полезных обновлениях, используя\n"
-"электронную почту.\n"
-"Кроме того, вы получаете скидку на оплачиваемую техническую\n"
-"поддержку на сайте www.mandrivaexpert.com."
-
-#: ../mdkonline:180
-#, c-format
-msgid "Connection problem"
-msgstr "Проблема подключения"
-
-#: ../mdkonline:180
-#, c-format
-msgid "Problem occurs when uploading files, please try again"
-msgstr "При загрузке файлов возникла проблема, попробуйте снова"
-
-#: ../mdkonline:187
-#, c-format
-msgid "Create a Mandriva Online Account"
-msgstr "Создать учетную запись Mandriva Online"
-
-#. -PO: that is for things like "Mr", "Ms",...
-#: ../mdkonline:192
-#, c-format
-msgid "Greeting:"
-msgstr "Приветствие:"
-
-#: ../mdkonline:193
-#, c-format
-msgid "First name:"
-msgstr "Имя:"
-
-#: ../mdkonline:194
-#, c-format
-msgid "Last name:"
-msgstr "Фамилия:"
-
-#: ../mdkonline:197
-#, c-format
-msgid "Confirm Password:"
-msgstr "Подтвердить пароль:"
-
-#: ../mdkonline:204
-#, c-format
-msgid ""
-"The passwords do not match\n"
-" Please try again\n"
-msgstr ""
-"Пароли не совпадают\n"
-"Попробуйте еще раз\n"
-
-#: ../mdkonline:208
-#, c-format
-msgid "Please fill in each field"
-msgstr "Пожалуйста, заполните все поля"
-
-#: ../mdkonline:212
-#, c-format
-msgid "Not a valid mail address!\n"
-msgstr "Недействительный почтовый адрес!\n"
-
-#: ../mdkonline:217
-#, c-format
-msgid "Creating account failed!"
-msgstr "Не удалось создать учётную запись!"
-
-#: ../mdkonline:225
-#, c-format
-msgid ""
-"Mandriva Online Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
-msgstr ""
-"Учётная запись Mandriva Online успешно создана.\n"
-"Нажмите \"Далее\", чтобы пройти аутентификацию\n"
-"и выгрузить свою конфигурацию\n"
-
-#: ../mdkonline:229
-#, c-format
-msgid "Your upload was successful!"
-msgstr "Выгрузка произведена успешно!"
-
-#: ../mdkonline:229
+#: ../mdkapplet:478
 #, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandriva Online."
-msgstr ""
-"С этого момента, благодаря Mandriva Online, вы будете\n"
-"получать уведомления о безопасности и обновлениях."
+msgid "Online WebSite"
+msgstr "Зайти на веб-сайт"
 
-#: ../mdkonline:229
+#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
+#: ../mdkapplet:483
 #, c-format
-msgid ""
-"Mandriva Online offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
+msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
-"Mandriva Online предлагает вам возможность автоматизировать обновления.\n"
-"Программа будет регулярно запускаться в вашей системе, ожидая новых обновлений\n"
-
-#: ../mdkonline:238
-#, c-format
-msgid "Congratulations"
-msgstr "Поздравляем"
-
-#: ../mdkonline:238
-#, c-format
-msgid "Your Mandriva Online account has been successfully configured\n"
-msgstr "Учётная запись Mandriva Online была успешно настроена\n"
 
-#: ../mdkonline:253
+#: ../mdkapplet:492
 #, c-format
-msgid "Configuration uploaded successfully"
-msgstr "Конфигурация успешно выгружена"
-
-#: ../mdkonline:254
-#, c-format
-msgid "Problem uploading configuration"
-msgstr "Проблема выгрузки конфигурации"
+msgid "Always launch on startup"
+msgstr "Всегда запускать при старте"
 
-#: ../mdkonline:256
+#: ../mdkapplet:494
 #, c-format
-msgid "Cannot connect to Mandriva Online website: wrong login/password or router/firewall bad settings"
-msgstr "Невозможно подключится к веб-сайту Mandriva Online: неверные логин/пароль или неверная настройка маршрутизатора/файервола"
+msgid "Quit"
+msgstr "Выход"
 
 #: ../mdkonline.pm:207
 #, c-format
@@ -718,8 +253,7 @@ msgstr "Ошибка регистрации"
 msgid "Some parameters are missing"
 msgstr "Отсутствуют некоторые параметры"
 
-#: ../mdkonline.pm:210
-#: ../mdkonline.pm:216
+#: ../mdkonline.pm:210 ../mdkonline.pm:216
 #, c-format
 msgid "Password error"
 msgstr "Ошибка пароля"
@@ -729,9 +263,7 @@ msgstr "Ошибка пароля"
 msgid "Wrong password"
 msgstr "Неверный пароль"
 
-#: ../mdkonline.pm:211
-#: ../mdkonline.pm:212
-#: ../mdkonline.pm:213
+#: ../mdkonline.pm:211 ../mdkonline.pm:212 ../mdkonline.pm:213
 #, c-format
 msgid "Login error"
 msgstr "Ошибка логина"
@@ -769,8 +301,7 @@ msgstr "Ошибка ограничения"
 msgid "Database access forbidden"
 msgstr "Доступ к базе данных запрещён"
 
-#: ../mdkonline.pm:215
-#: ../mdkonline.pm:217
+#: ../mdkonline.pm:215 ../mdkonline.pm:217
 #, c-format
 msgid "Service error"
 msgstr "Ошибка службы"
@@ -823,16 +354,23 @@ msgstr "Веб-службы Mandriva недоступны"
 msgid ""
 "mdkupdate version %s\n"
 "Copyright (C) %s Mandriva.\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 версия %s\n"
 "Copyright (C) %s Mandriva.\n"
-"Это открытое программное обеспечение и может распространяться согласно условиям GNU GPL.\n"
+"Это открытое программное обеспечение и может распространяться согласно "
+"условиям GNU GPL.\n"
 "\n"
 "использование:\n"
 
+#: ../mdkupdate:73
+#, c-format
+msgid "  --help\t\t- print this help message.\n"
+msgstr "  --help\t\t- вывод этого справочного сообщения\n"
+
 #: ../mdkupdate:74
 #, c-format
 msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
@@ -855,27 +393,38 @@ msgstr "  --debug\t\t\t- журналирование выполняемых д�
 
 #: ../mdkupdate:78
 #, c-format
-msgid "  --bundle file.bundle\t- parse and install package from .bundle metainfo file.\n"
-msgstr "  --bundle file.bundle\t- разбор и установка пакета из файла .bundle с метаинформацией.\n"
-
-#: ../mdkupdate:118
-#: ../mdkupdate:164
-#, c-format
-msgid "Warning"
-msgstr "Внимание"
+msgid ""
+"  --bundle file.bundle\t- parse and install package from .bundle metainfo "
+"file.\n"
+msgstr ""
+"  --bundle file.bundle\t- разбор и установка пакета из файла .bundle с "
+"метаинформацией.\n"
 
 #. -PO: here Live Install is currently *NOT* translated on the desktop, so it's better to keep as it:
 #: ../mdkupdate:120
 #, c-format
-msgid "You first need to install the system on your harddrive with the 'Live Install' wizard."
-msgstr "Нужно сначала установить систему на жёсткий диск с помощью мастера 'Live Install'."
+msgid ""
+"You first need to install the system on your harddrive with the 'Live "
+"Install' wizard."
+msgstr ""
+"Нужно сначала установить систему на жёсткий диск с помощью мастера 'Live "
+"Install'."
+
+#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
+#, c-format
+msgid "Please wait"
+msgstr "Подождите..."
 
-#: ../mdkupdate:123
-#: ../mdkupdate:174
+#: ../mdkupdate:123 ../mdkupdate:174
 #, c-format
 msgid "Preparing..."
 msgstr "Подготовка..."
 
+#: ../mdkupdate:141 ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
+#, c-format
+msgid "Error"
+msgstr "Ошибка"
+
 #: ../mdkupdate:141
 #, c-format
 msgid ""
@@ -887,16 +436,23 @@ msgstr ""
 "\n"
 "%s"
 
+#: ../mdkupdate:159 ../mdkupdate:188
+#, c-format
+msgid "An error occurred"
+msgstr "Произошла ошибка"
+
 #: ../mdkupdate:164
 #, c-format
 msgid ""
 "The version of the Mandriva Online client is too old.\n"
 "\n"
-"You need to update to a newer version. You can get a new one from http://start.mandriva.com"
+"You need to update to a newer version. You can get a new one from http://"
+"start.mandriva.com"
 msgstr ""
 "Слишком старая версия клиента Mandriva Online.\n"
 "\n"
-"Обновите клиент до более свежей версии. Загрузить его можно с сайта http://start.mandriva.com"
+"Обновите клиент до более свежей версии. Загрузить его можно с сайта http://"
+"start.mandriva.com"
 
 #: ../mdkupdate:207
 #, c-format
@@ -908,18 +464,322 @@ msgstr "Этот bundle имеет неверный формат. Установ
 msgid "Installing packages ...\n"
 msgstr "Устанавливаются пакеты...\n"
 
-#: ../mdkupdate:231
-#: ../mdkupdate:271
+#: ../mdkupdate:231 ../mdkupdate:271
 #, c-format
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "Невозможно обновить пакеты из источника update_source.\n"
 
+#~ msgid "New bundles are available for your system"
+#~ msgstr "Для системы доступны новые программные комплексы"
+
+#~ msgid "Service is not configured. Please click on \"Configure the service\""
+#~ msgstr "Служба не настроена. Выберите \"Настроить службу\""
+
+#~ msgid "Configure the service"
+#~ msgstr "Настроить службу"
+
+#~ msgid "Check updates"
+#~ msgstr "Проверить обновления"
+
+#~ msgid "Configure Now!"
+#~ msgstr "Настроить"
+
+#~ msgid "Actions"
+#~ msgstr "Действия"
+
+#~ msgid "Configure"
+#~ msgstr "Настроить"
+
+#~ msgid "See logs"
+#~ msgstr "Просмотр журнала"
+
+#~ msgid "Status"
+#~ msgstr "Статус"
+
+#~ msgid "Close"
+#~ msgstr "Закрыть"
+
+#~ msgid "Network Connection: "
+#~ msgstr "Сетевое подключение: "
+
+#~ msgid "Up"
+#~ msgstr "Активно"
+
+#~ msgid "Down"
+#~ msgstr "Неактивно"
+
+#~ msgid "Last check: "
+#~ msgstr "Последняя проверка: "
+
+#~ msgid "Machine name:"
+#~ msgstr "Имя машины:"
+
+#~ msgid "Updates: "
+#~ msgstr "Обновления: "
+
+#~ msgid "Development release not supported by service"
+#~ msgstr "Разрабатываемый релиз службой не поддерживается"
+
+#~ msgid "Too old release not supported by service"
+#~ msgstr "Слишком старый релиз, не поддерживаемый службой"
+
+#~ msgid "Unknown state"
+#~ msgstr "Неизвестное состояние"
+
+#~ msgid "Online services disabled. Contact Mandriva Online site\n"
+#~ msgstr "Онлайновые службы отключены. Зайдите на сайт Mandriva Online\n"
+
+#~ msgid "Wrong Password.\n"
+#~ msgstr "Неверный пароль.\n"
+
+#~ msgid "Wrong Action or host or login.\n"
+#~ msgstr "Неверное действие, хост или логин.\n"
+
+#~ msgid ""
+#~ "Something is wrong with your network settings (check your route, firewall "
+#~ "or proxy settings)\n"
+#~ msgstr ""
+#~ "Что-то не так с конфигурацией сети (проверьте маршрут, файервол или "
+#~ "настройки прокси)\n"
+
+#~ msgid ""
+#~ "Problem occured while connecting to the server, please contact the "
+#~ "support team"
+#~ msgstr ""
+#~ "Возникла проблема при обращении к серверу. Обратитесь в службу "
+#~ "технической поддержки"
+
+#~ msgid "Response from Mandriva Online server\n"
+#~ msgstr "Ответ сервера Mandriva Online\n"
+
+#~ msgid "No check"
+#~ msgstr "Без проверок"
+
+#~ msgid "Checking config file: Not present\n"
+#~ msgstr "Проверка файла config: Отсутствует\n"
+
+#~ msgid "Logs"
+#~ msgstr "Журнал"
+
+#~ msgid "Clear"
+#~ msgstr "Очистить"
+
+#~ msgid ""
+#~ "mdonline version %s\n"
+#~ "Copyright (C) %s Mandriva.\n"
+#~ "This is free software and may be redistributed under the terms of the GNU "
+#~ "GPL.\n"
+#~ "\n"
+#~ "usage:\n"
+#~ msgstr ""
+#~ "mdonline версия %s\n"
+#~ "Copyright (C) %s Mandriva.\n"
+#~ "Это открытое программное обеспечение и может распространяться согласно "
+#~ "условиям GNU GPL.\n"
+#~ "\n"
+#~ "использование:\n"
+
+#~ msgid "  --box=\t\t\t- hostname.\n"
+#~ msgstr "  --box=\t\t\t- имя хоста.\n"
+
+#~ msgid "  --country\t\t\t- name of country of the user. \n"
+#~ msgstr "  --country\t\t\t- страна пользователя. \n"
+
+#~ msgid "  --interactive\t\t- use the interactive mode.\n"
+#~ msgstr "  --interactive\t\t- использовать интерактивный режим.\n"
+
+#~ msgid "  --nointeractive\t- use the non-interactive mode.\n"
+#~ msgstr "  --nointeractive\t- использовать не интерактивный режим.\n"
+
+#~ msgid "  --login=\t\t     - login name of the user.\n"
+#~ msgstr "  --login=\t\t     - логин пользователя.\n"
+
+#~ msgid "  --pass=\t\t\t- password  of the user.\n"
+#~ msgstr "  --pass=\t\t\t- пароль пользователя.\n"
+
+#~ msgid "Mandriva Online"
+#~ msgstr "Mandriva Online"
+
+#~ msgid "I already have an account"
+#~ msgstr "У меня уже есть учётная запись"
+
+#~ msgid "I want to subscribe"
+#~ msgstr "Я хочу получить учётную запись"
+
+#~ msgid "Mr."
+#~ msgstr "Г-н"
+
+#~ msgid "Mrs."
+#~ msgstr "Г-жа"
+
+#~ msgid "Ms."
+#~ msgstr "Г-жа"
+
+#~ msgid "Reading configuration\n"
+#~ msgstr "Считывается конфигурация\n"
+
+#~ msgid ""
+#~ "This assistant will help you to upload your configuration\n"
+#~ "(packages, hardware configuration) to a centralized database in\n"
+#~ "order to keep you informed about security updates and useful upgrades.\n"
+#~ msgstr ""
+#~ "Этот ассистент поможет вам выгрузить свою конфигурацию \n"
+#~ "(пакеты, конфигурацию оборудования) в центральную базу данных,\n"
+#~ "чтобы держать вас в курсе при появлении обновлений по безопасности \n"
+#~ "и полезных апгрейдов.\n"
+
+#~ msgid "Account creation or authentication"
+#~ msgstr "Создание учётной записи или аутентификация"
+
+#~ msgid "Enter your Mandriva Online login, password and machine name:"
+#~ msgstr "Введите свой логин Mandriva Online, пароль и имя машины:"
+
+#~ msgid "Email address:"
+#~ msgstr "Адрес e-mail:"
+
+#~ msgid "Country"
+#~ msgstr "Страна"
+
+#~ msgid "Password:"
+#~ msgstr "Пароль:"
+
+#~ msgid "Machine description:"
+#~ msgstr "Описание машины:"
+
+#~ msgid "(Ex: My Home Office's Computer)"
+#~ msgstr "(напр: мой домашний компьютер)"
+
+#~ msgid "Machine name must be 1 to 40 alphanumerical characters"
+#~ msgstr ""
+#~ "Название машины должно содержать от 1 до 40 алфавитно-цифровых символов"
+
+#~ msgid "Connecting to Mandriva Online website..."
+#~ msgstr "Выполняется подключение к веб-сайту Mandriva Online..."
+
+#~ msgid ""
+#~ "In order to benefit from Mandriva Online services,\n"
+#~ "we are about to upload your configuration.\n"
+#~ "\n"
+#~ "The Wizard will now send the following information to Mandriva:\n"
+#~ "\n"
+#~ "1) the list of packages you have installed on your system,\n"
+#~ "\n"
+#~ "2) your hardware configuration.\n"
+#~ "\n"
+#~ "If you feel uncomfortable by that idea, or do not want to benefit from "
+#~ "this service,\n"
+#~ "please press 'Cancel'. By pressing 'Next', you allow us to keep you "
+#~ "informed\n"
+#~ "about security updates and useful upgrades via personalized email "
+#~ "alerts.\n"
+#~ "Furthermore, you benefit from discounted paid support services on\n"
+#~ "www.mandrivaexpert.com."
+#~ msgstr ""
+#~ "Чтобы воспользоваться преимуществами служб Mandriva Online,\n"
+#~ "рекомендуется выгрузить на сервер свою конфигурацию.\n"
+#~ "\n"
+#~ "Мастер отправит на сервер Mandriva следующую информацию:\n"
+#~ "1) Список пакетов, установленных в системе.\n"
+#~ "2) Конфигурацию оборудования.\n"
+#~ "\n"
+#~ "Если вас это не устраивает или вы не хотите использовать\n"
+#~ "преимущества этой службы, нажмите кнопку 'Отмена'. Нажимая\n"
+#~ "но кнопку 'Далее', вы тем самым разрешаете нам сообщать вам\n"
+#~ "об обновлениях по безопасности и полезных обновлениях, используя\n"
+#~ "электронную почту.\n"
+#~ "Кроме того, вы получаете скидку на оплачиваемую техническую\n"
+#~ "поддержку на сайте www.mandrivaexpert.com."
+
+#~ msgid "Connection problem"
+#~ msgstr "Проблема подключения"
+
+#~ msgid "Problem occurs when uploading files, please try again"
+#~ msgstr "При загрузке файлов возникла проблема, попробуйте снова"
+
+#~ msgid "Create a Mandriva Online Account"
+#~ msgstr "Создать учетную запись Mandriva Online"
+
+#~ msgid "Greeting:"
+#~ msgstr "Приветствие:"
+
+#~ msgid "First name:"
+#~ msgstr "Имя:"
+
+#~ msgid "Last name:"
+#~ msgstr "Фамилия:"
+
+#~ msgid "Confirm Password:"
+#~ msgstr "Подтвердить пароль:"
+
+#~ msgid ""
+#~ "The passwords do not match\n"
+#~ " Please try again\n"
+#~ msgstr ""
+#~ "Пароли не совпадают\n"
+#~ "Попробуйте еще раз\n"
+
+#~ msgid "Please fill in each field"
+#~ msgstr "Пожалуйста, заполните все поля"
+
+#~ msgid "Not a valid mail address!\n"
+#~ msgstr "Недействительный почтовый адрес!\n"
+
+#~ msgid "Creating account failed!"
+#~ msgstr "Не удалось создать учётную запись!"
+
+#~ msgid ""
+#~ "Mandriva Online Account successfully created.\n"
+#~ "Please click \"Next\" to authenticate and upload your configuration\n"
+#~ msgstr ""
+#~ "Учётная запись Mandriva Online успешно создана.\n"
+#~ "Нажмите \"Далее\", чтобы пройти аутентификацию\n"
+#~ "и выгрузить свою конфигурацию\n"
+
+#~ msgid "Your upload was successful!"
+#~ msgstr "Выгрузка произведена успешно!"
+
+#~ msgid ""
+#~ "From now you will receive on security and updates \n"
+#~ "announcements thanks to Mandriva Online."
+#~ msgstr ""
+#~ "С этого момента, благодаря Mandriva Online, вы будете\n"
+#~ "получать уведомления о безопасности и обновлениях."
+
+#~ msgid ""
+#~ "Mandriva Online offers you the ability to automate the updates.\n"
+#~ "A program will run regulary in your system waiting for new updates\n"
+#~ msgstr ""
+#~ "Mandriva Online предлагает вам возможность автоматизировать обновления.\n"
+#~ "Программа будет регулярно запускаться в вашей системе, ожидая новых "
+#~ "обновлений\n"
+
+#~ msgid "Congratulations"
+#~ msgstr "Поздравляем"
+
+#~ msgid "Your Mandriva Online account has been successfully configured\n"
+#~ msgstr "Учётная запись Mandriva Online была успешно настроена\n"
+
+#~ msgid "Configuration uploaded successfully"
+#~ msgstr "Конфигурация успешно выгружена"
+
+#~ msgid "Problem uploading configuration"
+#~ msgstr "Проблема выгрузки конфигурации"
+
+#~ msgid ""
+#~ "Cannot connect to Mandriva Online website: wrong login/password or router/"
+#~ "firewall bad settings"
+#~ msgstr ""
+#~ "Невозможно подключится к веб-сайту Mandriva Online: неверные логин/пароль "
+#~ "или неверная настройка маршрутизатора/файервола"
+
 #~ msgid "  --applet\t\t- launch Mandriva Update.\n"
 #~ msgstr "  --applet\t\t- запуск Mandriva Update\n"
+
 #~ msgid "Cannot get list of updates: %s"
 #~ msgstr "Невозможно получить перечень обновлений: %s"
+
 #~ msgid "Choose which packages should be installed and Press Ok"
 #~ msgstr "Выберите пакеты, которые необходимо установить, и нажмите ОК"
+
 #~ msgid "Launching mdkupdate --applet\n"
 #~ msgstr "Запускается mdkupdate --applet\n"
-
diff --git a/po/sc.po b/po/sc.po
index be32e1bd..8ef15242 100644
--- a/po/sc.po
+++ b/po/sc.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline-sc\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-09 16:26+0200\n"
+"POT-Creation-Date: 2008-02-21 18:21+0100\n"
 "PO-Revision-Date: 2005-09-05 19:00+0100\n"
 "Last-Translator: Antoni Pistis <antonio.pistis@virgilio.it>\n"
 "Language-Team: Sardu\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:94
+#: ../mdkapplet:88
 #, fuzzy, c-format
 msgid "Will check updates at %s"
 msgstr "Controlla is ajorronus"
 
-#: ../mdkapplet:103
+#: ../mdkapplet:97
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "Su sistema est ajorronau"
 
-#: ../mdkapplet:109
+#: ../mdkapplet:103
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -39,53 +39,43 @@ msgstr ""
 "Probrema de assètiu de serbìtziu. Controlla is log e manda una missada a "
 "support@mandrivaonline.com"
 
-#: ../mdkapplet:115
+#: ../mdkapplet:110
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "Abeta, agatu is pakitus a disposta..."
 
-#: ../mdkapplet:121
+#: ../mdkapplet:116
 #, c-format
 msgid "New updates are available for your system"
 msgstr "Ajorronus a disposta po su sistema tuu"
 
-#: ../mdkapplet:127
-#, fuzzy, c-format
-msgid "New bundles are available for your system"
-msgstr "Ajorronus a disposta po su sistema tuu"
-
-#: ../mdkapplet:133
-#, c-format
-msgid "Service is not configured. Please click on \"Configure the service\""
-msgstr "Serbìtziu no assetiau. Craca \"Assètia su Serbìtziu\""
-
-#: ../mdkapplet:139
+#: ../mdkapplet:122
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "S'arretza no andat. Assètia s'arretza tua."
 
-#: ../mdkapplet:145
+#: ../mdkapplet:128
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "Serbìtziu no abivau. Craca \"Jassus Online\""
 
-#: ../mdkapplet:151 ../mdkapplet:182
+#: ../mdkapplet:134 ../mdkapplet:165
 #, fuzzy, c-format
 msgid "urpmi database locked"
 msgstr "su database de urpmi est serrau"
 
-#: ../mdkapplet:157
+#: ../mdkapplet:140
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr "Release no suportada (tropu beça, o de adelantamentu)"
 
-#: ../mdkapplet:163
+#: ../mdkapplet:146
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
 msgstr ""
 
-#: ../mdkapplet:169
+#: ../mdkapplet:152
 #, fuzzy, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -102,577 +92,131 @@ msgstr ""
 "\n"
 "Apustis, torra a allui %s."
 
-#: ../mdkapplet:174
+#: ../mdkapplet:157
 #, c-format
 msgid "Enabled"
 msgstr "Abivau"
 
-#: ../mdkapplet:187
+#: ../mdkapplet:170
 #, c-format
 msgid "Error updating media"
 msgstr ""
 
-#: ../mdkapplet:202
+#: ../mdkapplet:185
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr "Seu controllendi... Ajorronus a disposta\n"
 
-#: ../mdkapplet:207
+#: ../mdkapplet:190
 #, c-format
 msgid "Packages are up to date"
 msgstr ""
 
-#: ../mdkapplet:212
+#: ../mdkapplet:195
 #, fuzzy, c-format
 msgid "Failed to open urpmi database"
 msgstr "no potzu aberri su database rpm"
 
-#: ../mdkapplet:217 ../mdkapplet:324
+#: ../mdkapplet:200
 #, c-format
 msgid "Install updates"
 msgstr "Aposenta is ajorronus"
 
-#: ../mdkapplet:218
-#, c-format
-msgid "Configure the service"
-msgstr "Assètia su serbìtziu"
-
-#: ../mdkapplet:219
+#: ../mdkapplet:201
 #, c-format
 msgid "Check Updates"
 msgstr "Controlla is Ajorronus"
 
-#: ../mdkapplet:220 ../mdkapplet:327 ../mdkonline:114 ../mdkonline:155
-#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
-#, c-format
-msgid "Please wait"
-msgstr "Abeta, po praxeri"
-
-#: ../mdkapplet:220 ../mdkapplet:326 ../mdkapplet:327
-#, c-format
-msgid "Check updates"
-msgstr "Controlla is ajorronus"
-
-#: ../mdkapplet:223 ../mdkapplet:648
-#, c-format
-msgid "Online WebSite"
-msgstr "Jassu online"
-
-#: ../mdkapplet:224
+#: ../mdkapplet:202
 #, c-format
 msgid "Configure Network"
 msgstr "Assètia Arretza"
 
-#: ../mdkapplet:225
-#, c-format
-msgid "Configure Now!"
-msgstr "Assètia Imoi!"
-
-#: ../mdkapplet:313 ../mdkapplet:392
-#, c-format
-msgid "Mandriva Linux Updates Applet"
-msgstr "Applet Mandriva Linux Updates"
-
-#: ../mdkapplet:322
-#, c-format
-msgid "Actions"
-msgstr "Fainas"
-
-#: ../mdkapplet:325
-#, c-format
-msgid "Configure"
-msgstr "Assètia"
-
-#: ../mdkapplet:329
-#, c-format
-msgid "See logs"
-msgstr "Càstia is logs"
-
-#: ../mdkapplet:332
-#, c-format
-msgid "Status"
-msgstr "Stadu"
-
-#: ../mdkapplet:336 ../mdkapplet:597
-#, c-format
-msgid "Close"
-msgstr "Serra"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Network Connection: "
-msgstr "Acàpiu a s'Arretza: "
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Up"
-msgstr "Andat"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Down"
-msgstr "No andat"
-
-#: ../mdkapplet:366
-#, c-format
-msgid "Last check: "
-msgstr "Ùrtimu controllu: "
-
-#: ../mdkapplet:367 ../mdkonline:145
-#, c-format
-msgid "Machine name:"
-msgstr "Nòmini màkina:"
-
-#: ../mdkapplet:368
-#, c-format
-msgid "Updates: "
-msgstr "Ajorronus:"
-
-#: ../mdkapplet:372
+#: ../mdkapplet:283
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Seu alluendi drakconnect\n"
 
-#: ../mdkapplet:375
+#: ../mdkapplet:286
 #, c-format
 msgid "Mandriva Online seems to be reinstalled, reloading applet ...."
 msgstr "Mandriva Online parit torrau a aposentai, càrrigu torra sa applet ...."
 
-#: ../mdkapplet:383
+#: ../mdkapplet:294
 #, c-format
 msgid "Launching MandrivaUpdate\n"
 msgstr "Seu alluendi MandrivaUpdate\n"
 
-#: ../mdkapplet:398
+#: ../mdkapplet:303
+#, c-format
+msgid "Mandriva Linux Updates Applet"
+msgstr "Applet Mandriva Linux Updates"
+
+#: ../mdkapplet:308
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Seu carculendi atrus ajorronus...\n"
 
-#: ../mdkapplet:399
+#: ../mdkapplet:309
 #, c-format
 msgid "Connecting to"
 msgstr "Seu acapiendi"
 
-#: ../mdkapplet:467 ../mdkupdate:159 ../mdkupdate:188
-#, c-format
-msgid "An error occurred"
-msgstr "Faddina"
-
-#: ../mdkapplet:475
-#, c-format
-msgid "Development release not supported by service"
-msgstr "Release de adelantamentu no suportada de su serbìtziu"
-
-#: ../mdkapplet:476
-#, c-format
-msgid "Too old release not supported by service"
-msgstr "Release tropu beça no suportada de su serbìtziu"
-
-#: ../mdkapplet:477
-#, c-format
-msgid "Unknown state"
-msgstr "Stadu disconnotu"
-
-#: ../mdkapplet:478
-#, c-format
-msgid "Online services disabled. Contact Mandriva Online site\n"
-msgstr "Serbìtziu online disabivau. Cuntata su jassu Mandriva Online\n"
-
-#: ../mdkapplet:479
-#, c-format
-msgid "Wrong Password.\n"
-msgstr "Password sballiada.\n"
-
-#: ../mdkapplet:480
-#, c-format
-msgid "Wrong Action or host or login.\n"
-msgstr "Faina o host o login sballiau.\n"
-
-#: ../mdkapplet:481
-#, c-format
-msgid ""
-"Something is wrong with your network settings (check your route, firewall or "
-"proxy settings)\n"
-msgstr ""
-"Calincuna cosa est sballiada is s'assètiu arretza tuu (controlla s'assètiu "
-"de route, de su firewall o de su proxy)\n"
-
-#: ../mdkapplet:483
-#, c-format
-msgid ""
-"Problem occured while connecting to the server, please contact the support "
-"team"
-msgstr "Probrema in s'acàpiu a su server, po praxeri, cuntata su support team"
-
-#: ../mdkapplet:487
-#, c-format
-msgid "Response from Mandriva Online server\n"
-msgstr "Arrespusta de su server Mandriva Online\n"
-
-#: ../mdkapplet:490
+#: ../mdkapplet:386
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Su sistema est ajorronau\n"
 
-#: ../mdkapplet:527
-#, c-format
-msgid "No check"
-msgstr "Nisçunu controllu"
-
-#: ../mdkapplet:541
-#, c-format
-msgid "Checking config file: Not present\n"
-msgstr "Seu controllendi su config file: no dui at\n"
-
-#: ../mdkapplet:544
+#: ../mdkapplet:415
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Seu controllendi s'arretza: parit disabivada\n"
 
-#: ../mdkapplet:587
+#: ../mdkapplet:457 ../mdkupdate:118 ../mdkupdate:164
 #, c-format
-msgid "Logs"
-msgstr "Logs"
-
-#: ../mdkapplet:603
-#, c-format
-msgid "Clear"
-msgstr "Lìmpia"
+msgid "Warning"
+msgstr "Atentu"
 
-#: ../mdkapplet:629
+#: ../mdkapplet:468
 #, c-format
 msgid "About..."
 msgstr "Apitzus de..."
 
-#: ../mdkapplet:631
+#: ../mdkapplet:472
 #, fuzzy, c-format
 msgid "Mandriva Online %s"
 msgstr "Mandriva Online"
 
-#: ../mdkapplet:635
+#: ../mdkapplet:473
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr ""
 
-#: ../mdkapplet:647
+#: ../mdkapplet:476
 #, c-format
 msgid "Mandriva Online gives access to Mandriva web services."
 msgstr ""
 
-#: ../mdkapplet:655
-#, c-format
-msgid "Always launch on startup"
-msgstr "Lança sempri a s'alluidura"
-
-#: ../mdkapplet:657
-#, c-format
-msgid "Quit"
-msgstr "Bessi"
-
-#: ../mdkonline:58
-#, c-format
-msgid ""
-"mdonline version %s\n"
-"Copyright (C) %s Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"mdonline versioni %s\n"
-"Copyright (C) %s Mandriva.\n"
-"Custu est software lìberu e fait a du spainai sighendi sa GNU GPL.\n"
-"\n"
-"impreu:\n"
-
-#: ../mdkonline:63 ../mdkupdate:73
-#, c-format
-msgid "  --help\t\t- print this help message.\n"
-msgstr "  --help\t\t- imprenta custa missada de ajudu.\n"
-
-#: ../mdkonline:64
-#, c-format
-msgid "  --box=\t\t\t- hostname.\n"
-msgstr ""
-
-#: ../mdkonline:65
-#, c-format
-msgid "  --country\t\t\t- name of country of the user. \n"
-msgstr ""
-
-#: ../mdkonline:66
-#, c-format
-msgid "  --interactive\t\t- use the interactive mode.\n"
-msgstr ""
-
-#: ../mdkonline:67
-#, c-format
-msgid "  --nointeractive\t- use the non-interactive mode.\n"
-msgstr ""
-
-#: ../mdkonline:68
-#, c-format
-msgid "  --login=\t\t     - login name of the user.\n"
-msgstr ""
-
-#: ../mdkonline:69
-#, c-format
-msgid "  --pass=\t\t\t- password  of the user.\n"
-msgstr ""
-
-#: ../mdkonline:87 ../mdkonline:120
-#, c-format
-msgid "Mandriva Online"
-msgstr "Mandriva Online"
-
-#: ../mdkonline:90
-#, c-format
-msgid "I already have an account"
-msgstr "Tenju jai unu account"
-
-#: ../mdkonline:91
-#, c-format
-msgid "I want to subscribe"
-msgstr "Bollu sutascriri"
-
-#: ../mdkonline:96
-#, c-format
-msgid "Mr."
-msgstr ""
-
-#: ../mdkonline:96
-#, fuzzy, c-format
-msgid "Mrs."
-msgstr "XMrIs"
-
-#: ../mdkonline:96
-#, c-format
-msgid "Ms."
-msgstr ""
-
-#: ../mdkonline:114
-#, c-format
-msgid "Reading configuration\n"
-msgstr "Seu ligendi s'assètiu\n"
-
-#: ../mdkonline:123
-#, c-format
-msgid ""
-"This assistant will help you to upload your configuration\n"
-"(packages, hardware configuration) to a centralized database in\n"
-"order to keep you informed about security updates and useful upgrades.\n"
-msgstr ""
-"Custu ti at a ajudai a carrigai s'assètiu de sistema tuu (pakitus,\n"
-"assètiu màkina) in d-unu database centralisau po ti podi apoderai\n"
-"informau de is ajorronusus de siguresa e de mellorias utilosas.\n"
-
-#: ../mdkonline:131
-#, c-format
-msgid "Account creation or authentication"
-msgstr "Creadura o autentigadura de account"
-
-#: ../mdkonline:136
-#, c-format
-msgid "Enter your Mandriva Online login, password and machine name:"
-msgstr "Intra su login e password tuus Mandriva Online e su nòmini màkina:"
-
-#: ../mdkonline:142 ../mdkonline:195
-#, fuzzy, c-format
-msgid "Email address:"
-msgstr "Bivimentu IP de su Gateway:"
-
-#: ../mdkonline:143
-#, c-format
-msgid "Country"
-msgstr "Stadu"
-
-#: ../mdkonline:144 ../mdkonline:196
-#, c-format
-msgid "Password:"
-msgstr "Password:"
-
-#: ../mdkonline:146
-#, fuzzy, c-format
-msgid "Machine description:"
-msgstr "Nòmini màkina:"
-
-#: ../mdkonline:147
-#, c-format
-msgid "(Ex: My Home Office's Computer)"
-msgstr ""
-
-#: ../mdkonline:152 ../mdkonline:159 ../mdkonline:180 ../mdkonline:204
-#: ../mdkonline:208 ../mdkonline:212 ../mdkonline:217 ../mdkupdate:141
-#: ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
-#, c-format
-msgid "Error"
-msgstr "Faddina"
-
-#: ../mdkonline:152
-#, c-format
-msgid "Machine name must be 1 to 40 alphanumerical characters"
-msgstr ""
-
-#: ../mdkonline:155
-#, c-format
-msgid "Connecting to Mandriva Online website..."
-msgstr "Acàpiu a su jassu Mandriva Online in cursu..."
-
-#: ../mdkonline:167
-#, c-format
-msgid ""
-"In order to benefit from Mandriva Online services,\n"
-"we are about to upload your configuration.\n"
-"\n"
-"The Wizard will now send the following information to Mandriva:\n"
-"\n"
-"1) the list of packages you have installed on your system,\n"
-"\n"
-"2) your hardware configuration.\n"
-"\n"
-"If you feel uncomfortable by that idea, or do not want to benefit from this "
-"service,\n"
-"please press 'Cancel'. By pressing 'Next', you allow us to keep you "
-"informed\n"
-"about security updates and useful upgrades via personalized email alerts.\n"
-"Furthermore, you benefit from discounted paid support services on\n"
-"www.mandrivaexpert.com."
-msgstr ""
-"Po ti podi abantaxai de is serbìtzius de Mandriva Online,\n"
-"megaus a carrigai s'assetiu de su sistema tuu.\n"
-"\n"
-"Su Wizard imoi at a mandai a Mandriva is scedas ki sighint:\n"
-"\n"
-"1) sa lista de is pakitus ki as aposentau in su sistema,\n"
-"\n"
-"2) s'assètiu hardware cosa tua.\n"
-"\n"
-"Ki s'idea no ti praxit o no ti bolis abantaxai de su serbìtziu,\n"
-"craca 'Annudda'. Crakendi 'Sighi', permitis a nosu de ti informai\n"
-"apitzus de ajorronus de siguresa e utilosus via email.\n"
-"In prus, t'abantaxas de su serbìtziu de ajudu scontau in\n"
-"www.mandrivaexpert.com."
-
-#: ../mdkonline:180
-#, c-format
-msgid "Connection problem"
-msgstr "Probrema de acàpiu"
-
-#: ../mdkonline:180
-#, c-format
-msgid "Problem occurs when uploading files, please try again"
-msgstr "Probrema carrighendi is file, torra a provai"
-
-#: ../mdkonline:187
-#, c-format
-msgid "Create a Mandriva Online Account"
-msgstr "Crea unu Account Mandriva Online"
-
-#. -PO: that is for things like "Mr", "Ms",...
-#: ../mdkonline:192
-#, fuzzy, c-format
-msgid "Greeting:"
-msgstr "Birdi"
-
-#: ../mdkonline:193
-#, fuzzy, c-format
-msgid "First name:"
-msgstr "Nòmini host"
-
-#: ../mdkonline:194
-#, fuzzy, c-format
-msgid "Last name:"
-msgstr "Nòmini host"
-
-#: ../mdkonline:197
-#, c-format
-msgid "Confirm Password:"
-msgstr "Cunfirma sa Password:"
-
-#: ../mdkonline:204
-#, c-format
-msgid ""
-"The passwords do not match\n"
-" Please try again\n"
-msgstr ""
-"Is password no cuncordant\n"
-"Po praxeri, torra a provai\n"
-
-#: ../mdkonline:208
-#, fuzzy, c-format
-msgid "Please fill in each field"
-msgstr "Po praxeri, preni totu is campus\n"
-
-#: ../mdkonline:212
-#, c-format
-msgid "Not a valid mail address!\n"
-msgstr "No est bivimentu email bonu!\n"
-
-#: ../mdkonline:217
-#, c-format
-msgid "Creating account failed!"
-msgstr ""
-
-#: ../mdkonline:225
-#, c-format
-msgid ""
-"Mandriva Online Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
-msgstr ""
-"Account Mandriva Online acabau de creai.\n"
-"Crica \"Sighi\" po intrai e carrigai is assètius tuus\n"
-
-#: ../mdkonline:229
-#, c-format
-msgid "Your upload was successful!"
-msgstr "S'upload est acabau beni!"
-
-#: ../mdkonline:229
+#: ../mdkapplet:478
 #, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandriva Online."
-msgstr ""
-"De imoi as a arriciri noas apitzus de siguresa e\n"
-"ajorronus, gràtzias a Mandriva Online."
+msgid "Online WebSite"
+msgstr "Jassu online"
 
-#: ../mdkonline:229
+#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
+#: ../mdkapplet:483
 #, c-format
-msgid ""
-"Mandriva Online offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
+msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
-"Mandriva Online ti donat de podi ajorronai in automàtigu.\n"
-"Unu programa at a girai in su sistema, abetendi ajorronus\n"
-
-#: ../mdkonline:238
-#, c-format
-msgid "Congratulations"
-msgstr "Cumprimentus"
-
-#: ../mdkonline:238
-#, c-format
-msgid "Your Mandriva Online account has been successfully configured\n"
-msgstr "S'assètiu de s'account Mandriva Online est acabau\n"
-
-#: ../mdkonline:253
-#, c-format
-msgid "Configuration uploaded successfully"
-msgstr "Su carrigamentu de s'assètiu est acabau!"
 
-#: ../mdkonline:254
+#: ../mdkapplet:492
 #, c-format
-msgid "Problem uploading configuration"
-msgstr "Barrancus carrighendi s'assètiu"
+msgid "Always launch on startup"
+msgstr "Lança sempri a s'alluidura"
 
-#: ../mdkonline:256
+#: ../mdkapplet:494
 #, c-format
-msgid ""
-"Cannot connect to Mandriva Online website: wrong login/password or router/"
-"firewall bad settings"
-msgstr ""
-"No potzu acapiai su jassu mandrivaonline: login/password sballiau o assètiu "
-"router/firewall malu "
+msgid "Quit"
+msgstr "Bessi"
 
 #: ../mdkonline.pm:207
 #, fuzzy, c-format
@@ -812,6 +356,11 @@ msgstr ""
 "\n"
 "impreu:\n"
 
+#: ../mdkupdate:73
+#, c-format
+msgid "  --help\t\t- print this help message.\n"
+msgstr "  --help\t\t- imprenta custa missada de ajudu.\n"
+
 #: ../mdkupdate:74
 #, c-format
 msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
@@ -839,11 +388,6 @@ msgid ""
 "file.\n"
 msgstr ""
 
-#: ../mdkupdate:118 ../mdkupdate:164
-#, c-format
-msgid "Warning"
-msgstr "Atentu"
-
 #. -PO: here Live Install is currently *NOT* translated on the desktop, so it's better to keep as it:
 #: ../mdkupdate:120
 #, c-format
@@ -852,11 +396,21 @@ msgid ""
 "Install' wizard."
 msgstr ""
 
+#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
+#, c-format
+msgid "Please wait"
+msgstr "Abeta, po praxeri"
+
 #: ../mdkupdate:123 ../mdkupdate:174
 #, c-format
 msgid "Preparing..."
 msgstr "Apariçu..."
 
+#: ../mdkupdate:141 ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
+#, c-format
+msgid "Error"
+msgstr "Faddina"
+
 #: ../mdkupdate:141
 #, c-format
 msgid ""
@@ -865,6 +419,11 @@ msgid ""
 "%s"
 msgstr ""
 
+#: ../mdkupdate:159 ../mdkupdate:188
+#, c-format
+msgid "An error occurred"
+msgstr "Faddina"
+
 #: ../mdkupdate:164
 #, c-format
 msgid ""
@@ -889,6 +448,278 @@ msgstr "Aposentu is pakitus ... \n"
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "No potzu ajorronai is pakitus de su mèdiu update_source.\n"
 
+#, fuzzy
+#~ msgid "New bundles are available for your system"
+#~ msgstr "Ajorronus a disposta po su sistema tuu"
+
+#~ msgid "Service is not configured. Please click on \"Configure the service\""
+#~ msgstr "Serbìtziu no assetiau. Craca \"Assètia su Serbìtziu\""
+
+#~ msgid "Configure the service"
+#~ msgstr "Assètia su serbìtziu"
+
+#~ msgid "Check updates"
+#~ msgstr "Controlla is ajorronus"
+
+#~ msgid "Configure Now!"
+#~ msgstr "Assètia Imoi!"
+
+#~ msgid "Actions"
+#~ msgstr "Fainas"
+
+#~ msgid "Configure"
+#~ msgstr "Assètia"
+
+#~ msgid "See logs"
+#~ msgstr "Càstia is logs"
+
+#~ msgid "Status"
+#~ msgstr "Stadu"
+
+#~ msgid "Close"
+#~ msgstr "Serra"
+
+#~ msgid "Network Connection: "
+#~ msgstr "Acàpiu a s'Arretza: "
+
+#~ msgid "Up"
+#~ msgstr "Andat"
+
+#~ msgid "Down"
+#~ msgstr "No andat"
+
+#~ msgid "Last check: "
+#~ msgstr "Ùrtimu controllu: "
+
+#~ msgid "Machine name:"
+#~ msgstr "Nòmini màkina:"
+
+#~ msgid "Updates: "
+#~ msgstr "Ajorronus:"
+
+#~ msgid "Development release not supported by service"
+#~ msgstr "Release de adelantamentu no suportada de su serbìtziu"
+
+#~ msgid "Too old release not supported by service"
+#~ msgstr "Release tropu beça no suportada de su serbìtziu"
+
+#~ msgid "Unknown state"
+#~ msgstr "Stadu disconnotu"
+
+#~ msgid "Online services disabled. Contact Mandriva Online site\n"
+#~ msgstr "Serbìtziu online disabivau. Cuntata su jassu Mandriva Online\n"
+
+#~ msgid "Wrong Password.\n"
+#~ msgstr "Password sballiada.\n"
+
+#~ msgid "Wrong Action or host or login.\n"
+#~ msgstr "Faina o host o login sballiau.\n"
+
+#~ msgid ""
+#~ "Something is wrong with your network settings (check your route, firewall "
+#~ "or proxy settings)\n"
+#~ msgstr ""
+#~ "Calincuna cosa est sballiada is s'assètiu arretza tuu (controlla "
+#~ "s'assètiu de route, de su firewall o de su proxy)\n"
+
+#~ msgid ""
+#~ "Problem occured while connecting to the server, please contact the "
+#~ "support team"
+#~ msgstr ""
+#~ "Probrema in s'acàpiu a su server, po praxeri, cuntata su support team"
+
+#~ msgid "Response from Mandriva Online server\n"
+#~ msgstr "Arrespusta de su server Mandriva Online\n"
+
+#~ msgid "No check"
+#~ msgstr "Nisçunu controllu"
+
+#~ msgid "Checking config file: Not present\n"
+#~ msgstr "Seu controllendi su config file: no dui at\n"
+
+#~ msgid "Logs"
+#~ msgstr "Logs"
+
+#~ msgid "Clear"
+#~ msgstr "Lìmpia"
+
+#~ msgid ""
+#~ "mdonline version %s\n"
+#~ "Copyright (C) %s Mandriva.\n"
+#~ "This is free software and may be redistributed under the terms of the GNU "
+#~ "GPL.\n"
+#~ "\n"
+#~ "usage:\n"
+#~ msgstr ""
+#~ "mdonline versioni %s\n"
+#~ "Copyright (C) %s Mandriva.\n"
+#~ "Custu est software lìberu e fait a du spainai sighendi sa GNU GPL.\n"
+#~ "\n"
+#~ "impreu:\n"
+
+#~ msgid "Mandriva Online"
+#~ msgstr "Mandriva Online"
+
+#~ msgid "I already have an account"
+#~ msgstr "Tenju jai unu account"
+
+#~ msgid "I want to subscribe"
+#~ msgstr "Bollu sutascriri"
+
+#, fuzzy
+#~ msgid "Mrs."
+#~ msgstr "XMrIs"
+
+#~ msgid "Reading configuration\n"
+#~ msgstr "Seu ligendi s'assètiu\n"
+
+#~ msgid ""
+#~ "This assistant will help you to upload your configuration\n"
+#~ "(packages, hardware configuration) to a centralized database in\n"
+#~ "order to keep you informed about security updates and useful upgrades.\n"
+#~ msgstr ""
+#~ "Custu ti at a ajudai a carrigai s'assètiu de sistema tuu (pakitus,\n"
+#~ "assètiu màkina) in d-unu database centralisau po ti podi apoderai\n"
+#~ "informau de is ajorronusus de siguresa e de mellorias utilosas.\n"
+
+#~ msgid "Account creation or authentication"
+#~ msgstr "Creadura o autentigadura de account"
+
+#~ msgid "Enter your Mandriva Online login, password and machine name:"
+#~ msgstr "Intra su login e password tuus Mandriva Online e su nòmini màkina:"
+
+#, fuzzy
+#~ msgid "Email address:"
+#~ msgstr "Bivimentu IP de su Gateway:"
+
+#~ msgid "Country"
+#~ msgstr "Stadu"
+
+#~ msgid "Password:"
+#~ msgstr "Password:"
+
+#, fuzzy
+#~ msgid "Machine description:"
+#~ msgstr "Nòmini màkina:"
+
+#~ msgid "Connecting to Mandriva Online website..."
+#~ msgstr "Acàpiu a su jassu Mandriva Online in cursu..."
+
+#~ msgid ""
+#~ "In order to benefit from Mandriva Online services,\n"
+#~ "we are about to upload your configuration.\n"
+#~ "\n"
+#~ "The Wizard will now send the following information to Mandriva:\n"
+#~ "\n"
+#~ "1) the list of packages you have installed on your system,\n"
+#~ "\n"
+#~ "2) your hardware configuration.\n"
+#~ "\n"
+#~ "If you feel uncomfortable by that idea, or do not want to benefit from "
+#~ "this service,\n"
+#~ "please press 'Cancel'. By pressing 'Next', you allow us to keep you "
+#~ "informed\n"
+#~ "about security updates and useful upgrades via personalized email "
+#~ "alerts.\n"
+#~ "Furthermore, you benefit from discounted paid support services on\n"
+#~ "www.mandrivaexpert.com."
+#~ msgstr ""
+#~ "Po ti podi abantaxai de is serbìtzius de Mandriva Online,\n"
+#~ "megaus a carrigai s'assetiu de su sistema tuu.\n"
+#~ "\n"
+#~ "Su Wizard imoi at a mandai a Mandriva is scedas ki sighint:\n"
+#~ "\n"
+#~ "1) sa lista de is pakitus ki as aposentau in su sistema,\n"
+#~ "\n"
+#~ "2) s'assètiu hardware cosa tua.\n"
+#~ "\n"
+#~ "Ki s'idea no ti praxit o no ti bolis abantaxai de su serbìtziu,\n"
+#~ "craca 'Annudda'. Crakendi 'Sighi', permitis a nosu de ti informai\n"
+#~ "apitzus de ajorronus de siguresa e utilosus via email.\n"
+#~ "In prus, t'abantaxas de su serbìtziu de ajudu scontau in\n"
+#~ "www.mandrivaexpert.com."
+
+#~ msgid "Connection problem"
+#~ msgstr "Probrema de acàpiu"
+
+#~ msgid "Problem occurs when uploading files, please try again"
+#~ msgstr "Probrema carrighendi is file, torra a provai"
+
+#~ msgid "Create a Mandriva Online Account"
+#~ msgstr "Crea unu Account Mandriva Online"
+
+#, fuzzy
+#~ msgid "Greeting:"
+#~ msgstr "Birdi"
+
+#, fuzzy
+#~ msgid "First name:"
+#~ msgstr "Nòmini host"
+
+#, fuzzy
+#~ msgid "Last name:"
+#~ msgstr "Nòmini host"
+
+#~ msgid "Confirm Password:"
+#~ msgstr "Cunfirma sa Password:"
+
+#~ msgid ""
+#~ "The passwords do not match\n"
+#~ " Please try again\n"
+#~ msgstr ""
+#~ "Is password no cuncordant\n"
+#~ "Po praxeri, torra a provai\n"
+
+#, fuzzy
+#~ msgid "Please fill in each field"
+#~ msgstr "Po praxeri, preni totu is campus\n"
+
+#~ msgid "Not a valid mail address!\n"
+#~ msgstr "No est bivimentu email bonu!\n"
+
+#~ msgid ""
+#~ "Mandriva Online Account successfully created.\n"
+#~ "Please click \"Next\" to authenticate and upload your configuration\n"
+#~ msgstr ""
+#~ "Account Mandriva Online acabau de creai.\n"
+#~ "Crica \"Sighi\" po intrai e carrigai is assètius tuus\n"
+
+#~ msgid "Your upload was successful!"
+#~ msgstr "S'upload est acabau beni!"
+
+#~ msgid ""
+#~ "From now you will receive on security and updates \n"
+#~ "announcements thanks to Mandriva Online."
+#~ msgstr ""
+#~ "De imoi as a arriciri noas apitzus de siguresa e\n"
+#~ "ajorronus, gràtzias a Mandriva Online."
+
+#~ msgid ""
+#~ "Mandriva Online offers you the ability to automate the updates.\n"
+#~ "A program will run regulary in your system waiting for new updates\n"
+#~ msgstr ""
+#~ "Mandriva Online ti donat de podi ajorronai in automàtigu.\n"
+#~ "Unu programa at a girai in su sistema, abetendi ajorronus\n"
+
+#~ msgid "Congratulations"
+#~ msgstr "Cumprimentus"
+
+#~ msgid "Your Mandriva Online account has been successfully configured\n"
+#~ msgstr "S'assètiu de s'account Mandriva Online est acabau\n"
+
+#~ msgid "Configuration uploaded successfully"
+#~ msgstr "Su carrigamentu de s'assètiu est acabau!"
+
+#~ msgid "Problem uploading configuration"
+#~ msgstr "Barrancus carrighendi s'assètiu"
+
+#~ msgid ""
+#~ "Cannot connect to Mandriva Online website: wrong login/password or router/"
+#~ "firewall bad settings"
+#~ msgstr ""
+#~ "No potzu acapiai su jassu mandrivaonline: login/password sballiau o "
+#~ "assètiu router/firewall malu "
+
 #~ msgid "  --applet\t\t- launch Mandriva Update.\n"
 #~ msgstr "  --applet\t\t- lança Mandriva Update.\n"
 
diff --git a/po/sk.po b/po/sk.po
index a4953d64..54d7460c 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-09 16:26+0200\n"
+"POT-Creation-Date: 2008-02-21 18:21+0100\n"
 "PO-Revision-Date: 2005-09-21 14:06+0100\n"
 "Last-Translator: Tibor Pittich <Tibor.Pittich@mandriva.org>\n"
 "Language-Team: Slovak <i18n@mandrake.sk>\n"
@@ -16,17 +16,17 @@ msgstr ""
 "Plural-Forms:  nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
 #. -PO: here %s will be replaced by the local time (eg: "Will check updates at 14:03:50"
-#: ../mdkapplet:94
+#: ../mdkapplet:88
 #, fuzzy, c-format
 msgid "Will check updates at %s"
 msgstr "Skontrolovať aktualizácie"
 
-#: ../mdkapplet:103
+#: ../mdkapplet:97
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "Váš systém je dostatočne aktualizovaný"
 
-#: ../mdkapplet:109
+#: ../mdkapplet:103
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -35,55 +35,44 @@ msgstr ""
 "Nastal problém v konfigurácii služby. Prosím skontrolujte log súbory a "
 "pošlite e-mail na support@mandrivaonline.com"
 
-#: ../mdkapplet:115
+#: ../mdkapplet:110
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "Prosím čakajte, hľadajú sa dostupné balíky..."
 
-#: ../mdkapplet:121
+#: ../mdkapplet:116
 #, c-format
 msgid "New updates are available for your system"
 msgstr "Sú dostupné nové aktualizácie pre váš systém"
 
-#: ../mdkapplet:127
-#, fuzzy, c-format
-msgid "New bundles are available for your system"
-msgstr "Sú dostupné nové aktualizácie pre váš systém"
-
-#: ../mdkapplet:133
-#, c-format
-msgid "Service is not configured. Please click on \"Configure the service\""
-msgstr ""
-"Služba nie je nakonfigurovaná. Prosím kliknite na \"Konfigurovať službu\""
-
-#: ../mdkapplet:139
+#: ../mdkapplet:122
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "Sieť je nedostupná. Prosím skontrolujte vašu sieť"
 
-#: ../mdkapplet:145
+#: ../mdkapplet:128
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "Služba nie je aktivovaná. Prosím kliknite na \"Online web\""
 
-#: ../mdkapplet:151 ../mdkapplet:182
+#: ../mdkapplet:134 ../mdkapplet:165
 #, fuzzy, c-format
 msgid "urpmi database locked"
 msgstr "urpmi databáza je uzamknutá"
 
-#: ../mdkapplet:157
+#: ../mdkapplet:140
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 "Táto verzia nie je podporovaná (je príliš stará alebo je vo fáze vývoja)"
 
-#: ../mdkapplet:163
+#: ../mdkapplet:146
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
 msgstr ""
 
-#: ../mdkapplet:169
+#: ../mdkapplet:152
 #, fuzzy, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -99,581 +88,131 @@ msgstr ""
 "\n"
 "Potom reštartujte %s."
 
-#: ../mdkapplet:174
+#: ../mdkapplet:157
 #, c-format
 msgid "Enabled"
 msgstr "Povolené"
 
-#: ../mdkapplet:187
+#: ../mdkapplet:170
 #, c-format
 msgid "Error updating media"
 msgstr ""
 
-#: ../mdkapplet:202
+#: ../mdkapplet:185
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr "Hľadanie... K dispozícii sú aktualizácie\n"
 
-#: ../mdkapplet:207
+#: ../mdkapplet:190
 #, c-format
 msgid "Packages are up to date"
 msgstr ""
 
-#: ../mdkapplet:212
+#: ../mdkapplet:195
 #, fuzzy, c-format
 msgid "Failed to open urpmi database"
 msgstr "nemôžem otvoriť rpmdb"
 
-#: ../mdkapplet:217 ../mdkapplet:324
+#: ../mdkapplet:200
 #, c-format
 msgid "Install updates"
 msgstr "Inštalácia aktualizácií"
 
-#: ../mdkapplet:218
-#, c-format
-msgid "Configure the service"
-msgstr "Nastaviť službu"
-
-#: ../mdkapplet:219
+#: ../mdkapplet:201
 #, c-format
 msgid "Check Updates"
 msgstr "Skontrolovať aktualizácie"
 
-#: ../mdkapplet:220 ../mdkapplet:327 ../mdkonline:114 ../mdkonline:155
-#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
-#, c-format
-msgid "Please wait"
-msgstr "Prosím čakajte"
-
-#: ../mdkapplet:220 ../mdkapplet:326 ../mdkapplet:327
-#, c-format
-msgid "Check updates"
-msgstr "Skontrolovať aktualizácie"
-
-#: ../mdkapplet:223 ../mdkapplet:648
-#, c-format
-msgid "Online WebSite"
-msgstr "Online web"
-
-#: ../mdkapplet:224
+#: ../mdkapplet:202
 #, c-format
 msgid "Configure Network"
 msgstr "Nastaviť sieť"
 
-#: ../mdkapplet:225
-#, c-format
-msgid "Configure Now!"
-msgstr "Nastaviť teraz!"
-
-#: ../mdkapplet:313 ../mdkapplet:392
-#, c-format
-msgid "Mandriva Linux Updates Applet"
-msgstr "Mandriva Linux aktualizačný applet"
-
-#: ../mdkapplet:322
-#, c-format
-msgid "Actions"
-msgstr "Akcie"
-
-#: ../mdkapplet:325
-#, c-format
-msgid "Configure"
-msgstr "Nastaviť"
-
-#: ../mdkapplet:329
-#, c-format
-msgid "See logs"
-msgstr "Nahliadnuť do logov"
-
-#: ../mdkapplet:332
-#, c-format
-msgid "Status"
-msgstr "Stav"
-
-#: ../mdkapplet:336 ../mdkapplet:597
-#, c-format
-msgid "Close"
-msgstr "Zatvoriť"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Network Connection: "
-msgstr "Sieťové pripojenia:"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Up"
-msgstr "Hore"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Down"
-msgstr "Dole"
-
-#: ../mdkapplet:366
-#, c-format
-msgid "Last check: "
-msgstr "Posledná kontrola:"
-
-#: ../mdkapplet:367 ../mdkonline:145
-#, c-format
-msgid "Machine name:"
-msgstr "Meno počítača:"
-
-#: ../mdkapplet:368
-#, c-format
-msgid "Updates: "
-msgstr "Aktualizácie:"
-
-#: ../mdkapplet:372
+#: ../mdkapplet:283
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Spúšťanie drakconnect\n"
 
-#: ../mdkapplet:375
+#: ../mdkapplet:286
 #, c-format
 msgid "Mandriva Online seems to be reinstalled, reloading applet ...."
 msgstr "Mandriva Online bude potrebné preinštalovať, znova nahrávam applet...."
 
-#: ../mdkapplet:383
+#: ../mdkapplet:294
 #, c-format
 msgid "Launching MandrivaUpdate\n"
 msgstr "Spúšťanie MandrivaUpdate\n"
 
-#: ../mdkapplet:398
+#: ../mdkapplet:303
+#, c-format
+msgid "Mandriva Linux Updates Applet"
+msgstr "Mandriva Linux aktualizačný applet"
+
+#: ../mdkapplet:308
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Hľadanie nových aktualizácií...\n"
 
-#: ../mdkapplet:399
+#: ../mdkapplet:309
 #, c-format
 msgid "Connecting to"
 msgstr "Spájanie s"
 
-#: ../mdkapplet:467 ../mdkupdate:159 ../mdkupdate:188
-#, c-format
-msgid "An error occurred"
-msgstr "Vyskytla sa chyba"
-
-#: ../mdkapplet:475
-#, c-format
-msgid "Development release not supported by service"
-msgstr "Vývojová verzia nie je podporovaná touto službou"
-
-#: ../mdkapplet:476
-#, c-format
-msgid "Too old release not supported by service"
-msgstr "Príliš stará verzia nie je podporovaná službou"
-
-#: ../mdkapplet:477
-#, c-format
-msgid "Unknown state"
-msgstr "Neznámy status"
-
-#: ../mdkapplet:478
-#, c-format
-msgid "Online services disabled. Contact Mandriva Online site\n"
-msgstr "Online služby vypnuté. Kontaktujte stránku Mandriva Online\n"
-
-#: ../mdkapplet:479
-#, c-format
-msgid "Wrong Password.\n"
-msgstr "Zlé heslo.\n"
-
-#: ../mdkapplet:480
-#, c-format
-msgid "Wrong Action or host or login.\n"
-msgstr "Nesprávna akcia, hostiteľ alebo prihlasovacie údaje\n"
-
-#: ../mdkapplet:481
-#, c-format
-msgid ""
-"Something is wrong with your network settings (check your route, firewall or "
-"proxy settings)\n"
-msgstr ""
-"Niečo s nastavením vašej siete nie je v poriadku (skontrolujte pripojenie "
-"firewall alebo nastavenie proxy)\n"
-
-#: ../mdkapplet:483
-#, c-format
-msgid ""
-"Problem occured while connecting to the server, please contact the support "
-"team"
-msgstr ""
-"Nastal problém pri pripájaní na server, prosím kontaktujte podporný tím"
-
-#: ../mdkapplet:487
-#, c-format
-msgid "Response from Mandriva Online server\n"
-msgstr "Odpoveď zo servera Mandriva Online\n"
-
-#: ../mdkapplet:490
+#: ../mdkapplet:386
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Váš systém je dostatočne aktualizovaný\n"
 
-#: ../mdkapplet:527
-#, c-format
-msgid "No check"
-msgstr "Žiadna kontrola"
-
-#: ../mdkapplet:541
-#, c-format
-msgid "Checking config file: Not present\n"
-msgstr "Kontrolovanie konfiguračného súboru: Nebol nájdený\n"
-
-#: ../mdkapplet:544
+#: ../mdkapplet:415
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Kontrolovanie siete: zrejme je vypnutá\n"
 
-#: ../mdkapplet:587
-#, c-format
-msgid "Logs"
-msgstr "Logy"
-
-#: ../mdkapplet:603
+#: ../mdkapplet:457 ../mdkupdate:118 ../mdkupdate:164
 #, c-format
-msgid "Clear"
-msgstr "Vyprázdniť"
+msgid "Warning"
+msgstr "Varovanie"
 
-#: ../mdkapplet:629
+#: ../mdkapplet:468
 #, c-format
 msgid "About..."
 msgstr "O.."
 
-#: ../mdkapplet:631
+#: ../mdkapplet:472
 #, fuzzy, c-format
 msgid "Mandriva Online %s"
 msgstr "Mandriva Online"
 
-#: ../mdkapplet:635
+#: ../mdkapplet:473
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr ""
 
-#: ../mdkapplet:647
+#: ../mdkapplet:476
 #, c-format
 msgid "Mandriva Online gives access to Mandriva web services."
 msgstr ""
 
-#: ../mdkapplet:655
-#, c-format
-msgid "Always launch on startup"
-msgstr "Spustiť po štarte"
-
-#: ../mdkapplet:657
-#, c-format
-msgid "Quit"
-msgstr "Koniec"
-
-#: ../mdkonline:58
-#, c-format
-msgid ""
-"mdonline version %s\n"
-"Copyright (C) %s Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"mdonline verzia %s\n"
-"Copyright (C) %s Mandriva.\n"
-"Tento softvér môže byť redistribuovaný podľa podmienok GNU GPL.\n"
-"\n"
-"použitie:\n"
-
-#: ../mdkonline:63 ../mdkupdate:73
-#, c-format
-msgid "  --help\t\t- print this help message.\n"
-msgstr "  --help\t\t- vypíše túto pomoc.\n"
-
-#: ../mdkonline:64
-#, c-format
-msgid "  --box=\t\t\t- hostname.\n"
-msgstr ""
-
-#: ../mdkonline:65
-#, c-format
-msgid "  --country\t\t\t- name of country of the user. \n"
-msgstr ""
-
-#: ../mdkonline:66
-#, c-format
-msgid "  --interactive\t\t- use the interactive mode.\n"
-msgstr ""
-
-#: ../mdkonline:67
-#, c-format
-msgid "  --nointeractive\t- use the non-interactive mode.\n"
-msgstr ""
-
-#: ../mdkonline:68
-#, c-format
-msgid "  --login=\t\t     - login name of the user.\n"
-msgstr ""
-
-#: ../mdkonline:69
-#, c-format
-msgid "  --pass=\t\t\t- password  of the user.\n"
-msgstr ""
-
-#: ../mdkonline:87 ../mdkonline:120
-#, c-format
-msgid "Mandriva Online"
-msgstr "Mandriva Online"
-
-#: ../mdkonline:90
-#, c-format
-msgid "I already have an account"
-msgstr "Už mám vytvorený účet"
-
-#: ../mdkonline:91
-#, c-format
-msgid "I want to subscribe"
-msgstr "Chcem sa zaregistrovať"
-
-#: ../mdkonline:96
-#, c-format
-msgid "Mr."
-msgstr "Pán"
-
-#: ../mdkonline:96
-#, c-format
-msgid "Mrs."
-msgstr "Pani"
-
-#: ../mdkonline:96
-#, c-format
-msgid "Ms."
-msgstr "Slečna"
-
-#: ../mdkonline:114
-#, c-format
-msgid "Reading configuration\n"
-msgstr "Načítavanie konfigurácie\n"
-
-#: ../mdkonline:123
-#, c-format
-msgid ""
-"This assistant will help you to upload your configuration\n"
-"(packages, hardware configuration) to a centralized database in\n"
-"order to keep you informed about security updates and useful upgrades.\n"
-msgstr ""
-"Tento sprievodca vám pomôže pri nahrávaní vašej konfigurácie\n"
-"(balíky, hardvérová konfigurácia) do centrálnej databázy aby ste mohli\n"
-"byť informovaní o bezpečnostných aktualizáciách a zaujímavých balíkoch.\n"
-
-#: ../mdkonline:131
-#, c-format
-msgid "Account creation or authentication"
-msgstr "Vytváranie účtu a autorizácia"
-
-#: ../mdkonline:136
-#, c-format
-msgid "Enter your Mandriva Online login, password and machine name:"
-msgstr "Zadajte vaše prihlasovacie meno, heslo a názov počítača:"
-
-#: ../mdkonline:142 ../mdkonline:195
-#, c-format
-msgid "Email address:"
-msgstr "E-mailová adresa:"
-
-#: ../mdkonline:143
-#, c-format
-msgid "Country"
-msgstr "Krajina"
-
-#: ../mdkonline:144 ../mdkonline:196
-#, c-format
-msgid "Password:"
-msgstr "Heslo:"
-
-#: ../mdkonline:146
-#, fuzzy, c-format
-msgid "Machine description:"
-msgstr "Meno počítača:"
-
-#: ../mdkonline:147
-#, c-format
-msgid "(Ex: My Home Office's Computer)"
-msgstr ""
-
-#: ../mdkonline:152 ../mdkonline:159 ../mdkonline:180 ../mdkonline:204
-#: ../mdkonline:208 ../mdkonline:212 ../mdkonline:217 ../mdkupdate:141
-#: ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
-#, c-format
-msgid "Error"
-msgstr "Chyba"
-
-#: ../mdkonline:152
-#, c-format
-msgid "Machine name must be 1 to 40 alphanumerical characters"
-msgstr "Meno tlačiarne môže byť 1 až 40 alfanumerických znakov"
-
-#: ../mdkonline:155
-#, c-format
-msgid "Connecting to Mandriva Online website..."
-msgstr "Pripájanie sa na stránku Mandriva Online..."
-
-#: ../mdkonline:167
-#, c-format
-msgid ""
-"In order to benefit from Mandriva Online services,\n"
-"we are about to upload your configuration.\n"
-"\n"
-"The Wizard will now send the following information to Mandriva:\n"
-"\n"
-"1) the list of packages you have installed on your system,\n"
-"\n"
-"2) your hardware configuration.\n"
-"\n"
-"If you feel uncomfortable by that idea, or do not want to benefit from this "
-"service,\n"
-"please press 'Cancel'. By pressing 'Next', you allow us to keep you "
-"informed\n"
-"about security updates and useful upgrades via personalized email alerts.\n"
-"Furthermore, you benefit from discounted paid support services on\n"
-"www.mandrivaexpert.com."
-msgstr ""
-"Aby ste mohli mať úžitok zo služieb na Mandriva Online,\n"
-"je potrebné získanie vašej konfigurácie.\n"
-"\n"
-"Sprievodca teraz odošle nasledovné informácie do Mandriva-u:\n"
-"\n"
-"1) zoznam balíkov ktoré ste si nainštalovali\n"
-"\n"
-"2) vašu hardvérovú konfiguráciu\n"
-"\n"
-"Ak sa vám nepozdáva tento nápad alebo nevyžadujete používanie takýchto "
-"služieb\n"
-"kliknite na 'Zrušiť'. Kliknutím na 'Pokračovať' nám umožníte, aby sme vás "
-"informovali\n"
-"o bezpečnostných aktualizáciách a užitočných iných vylepšeniach pomocou\n"
-"personalizovaného emailu.\n"
-"Môžete tiež zúžitkovať rôzne zľavy pre platené podporné služby na\n"
-"www.mandrivaexpert.com."
-
-#: ../mdkonline:180
-#, c-format
-msgid "Connection problem"
-msgstr "Problém s pripojením"
-
-#: ../mdkonline:180
-#, c-format
-msgid "Problem occurs when uploading files, please try again"
-msgstr "Pri odosielaní súborov nastal problém, prosím skúste ešte raz"
-
-#: ../mdkonline:187
-#, c-format
-msgid "Create a Mandriva Online Account"
-msgstr "Vytvoriť Mandriva Linux Online účet"
-
-#. -PO: that is for things like "Mr", "Ms",...
-#: ../mdkonline:192
-#, c-format
-msgid "Greeting:"
-msgstr "Uvítanie:"
-
-#: ../mdkonline:193
-#, c-format
-msgid "First name:"
-msgstr "Krstné meno:"
-
-#: ../mdkonline:194
-#, c-format
-msgid "Last name:"
-msgstr "Priezvisko:"
-
-#: ../mdkonline:197
-#, c-format
-msgid "Confirm Password:"
-msgstr "Potvrdiť heslo:"
-
-#: ../mdkonline:204
-#, c-format
-msgid ""
-"The passwords do not match\n"
-" Please try again\n"
-msgstr ""
-"Heslá nie sú zhodné\n"
-" Skúste znova\n"
-
-#: ../mdkonline:208
-#, c-format
-msgid "Please fill in each field"
-msgstr "Vyplňte prosím všetky polia"
-
-#: ../mdkonline:212
-#, c-format
-msgid "Not a valid mail address!\n"
-msgstr "Nekorektná emailová adresa!\n"
-
-#: ../mdkonline:217
-#, c-format
-msgid "Creating account failed!"
-msgstr ""
-
-#: ../mdkonline:225
-#, c-format
-msgid ""
-"Mandriva Online Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
-msgstr ""
-"Účet pre Mandriva Online bol úspešne vytvorený.\n"
-"Kliknite prosím na \"Ďalej\" pre overenie a nahratie vašej konfigurácie\n"
-
-#: ../mdkonline:229
-#, c-format
-msgid "Your upload was successful!"
-msgstr "Zaslanie bolo úspešné!"
-
-#: ../mdkonline:229
+#: ../mdkapplet:478
 #, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandriva Online."
-msgstr ""
-"Odteraz budete môcť vďaka Mandriva Online získavať oznámenia \n"
-"o bezpečnostných a funkčných aktualizáciách."
+msgid "Online WebSite"
+msgstr "Online web"
 
-#: ../mdkonline:229
+#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
+#: ../mdkapplet:483
 #, c-format
-msgid ""
-"Mandriva Online offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
+msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
-"Mandriva Online vám prináša možnosť ako vykonávať aktualizácie.\n"
-"Program môže bežať na vašom systéme a čakať na nové aktualizácie\n"
 
-#: ../mdkonline:238
+#: ../mdkapplet:492
 #, c-format
-msgid "Congratulations"
-msgstr "Gratulujeme"
-
-#: ../mdkonline:238
-#, c-format
-msgid "Your Mandriva Online account has been successfully configured\n"
-msgstr "Váš Mandriva Online účet bol úspešne vytvorený\n"
-
-#: ../mdkonline:253
-#, c-format
-msgid "Configuration uploaded successfully"
-msgstr "Zaslanie nastavení bolo úspešné"
-
-#: ../mdkonline:254
-#, c-format
-msgid "Problem uploading configuration"
-msgstr "Nastal problém so zasielaním nastavenia"
+msgid "Always launch on startup"
+msgstr "Spustiť po štarte"
 
-#: ../mdkonline:256
+#: ../mdkapplet:494
 #, c-format
-msgid ""
-"Cannot connect to Mandriva Online website: wrong login/password or router/"
-"firewall bad settings"
-msgstr ""
-"Nebolo možné pripojiť sa na stránku mandrivaonline: nesprávne meno/heslo "
-"alebo nastavenie firewallu"
+msgid "Quit"
+msgstr "Koniec"
 
 #: ../mdkonline.pm:207
 #, c-format
@@ -821,6 +360,11 @@ msgstr ""
 "\n"
 "použitie:\n"
 
+#: ../mdkupdate:73
+#, c-format
+msgid "  --help\t\t- print this help message.\n"
+msgstr "  --help\t\t- vypíše túto pomoc.\n"
+
 #: ../mdkupdate:74
 #, c-format
 msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
@@ -848,11 +392,6 @@ msgid ""
 "file.\n"
 msgstr ""
 
-#: ../mdkupdate:118 ../mdkupdate:164
-#, c-format
-msgid "Warning"
-msgstr "Varovanie"
-
 #. -PO: here Live Install is currently *NOT* translated on the desktop, so it's better to keep as it:
 #: ../mdkupdate:120
 #, c-format
@@ -861,11 +400,21 @@ msgid ""
 "Install' wizard."
 msgstr ""
 
+#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
+#, c-format
+msgid "Please wait"
+msgstr "Prosím čakajte"
+
 #: ../mdkupdate:123 ../mdkupdate:174
 #, c-format
 msgid "Preparing..."
 msgstr "Príprava..."
 
+#: ../mdkupdate:141 ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
+#, c-format
+msgid "Error"
+msgstr "Chyba"
+
 #: ../mdkupdate:141
 #, c-format
 msgid ""
@@ -874,6 +423,11 @@ msgid ""
 "%s"
 msgstr ""
 
+#: ../mdkupdate:159 ../mdkupdate:188
+#, c-format
+msgid "An error occurred"
+msgstr "Vyskytla sa chyba"
+
 #: ../mdkupdate:164
 #, c-format
 msgid ""
@@ -898,6 +452,285 @@ msgstr "Inštalujú sa balíky...\n"
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "Nie je možné aktualizovať balíky z média update_source.\n"
 
+#, fuzzy
+#~ msgid "New bundles are available for your system"
+#~ msgstr "Sú dostupné nové aktualizácie pre váš systém"
+
+#~ msgid "Service is not configured. Please click on \"Configure the service\""
+#~ msgstr ""
+#~ "Služba nie je nakonfigurovaná. Prosím kliknite na \"Konfigurovať službu\""
+
+#~ msgid "Configure the service"
+#~ msgstr "Nastaviť službu"
+
+#~ msgid "Check updates"
+#~ msgstr "Skontrolovať aktualizácie"
+
+#~ msgid "Configure Now!"
+#~ msgstr "Nastaviť teraz!"
+
+#~ msgid "Actions"
+#~ msgstr "Akcie"
+
+#~ msgid "Configure"
+#~ msgstr "Nastaviť"
+
+#~ msgid "See logs"
+#~ msgstr "Nahliadnuť do logov"
+
+#~ msgid "Status"
+#~ msgstr "Stav"
+
+#~ msgid "Close"
+#~ msgstr "Zatvoriť"
+
+#~ msgid "Network Connection: "
+#~ msgstr "Sieťové pripojenia:"
+
+#~ msgid "Up"
+#~ msgstr "Hore"
+
+#~ msgid "Down"
+#~ msgstr "Dole"
+
+#~ msgid "Last check: "
+#~ msgstr "Posledná kontrola:"
+
+#~ msgid "Machine name:"
+#~ msgstr "Meno počítača:"
+
+#~ msgid "Updates: "
+#~ msgstr "Aktualizácie:"
+
+#~ msgid "Development release not supported by service"
+#~ msgstr "Vývojová verzia nie je podporovaná touto službou"
+
+#~ msgid "Too old release not supported by service"
+#~ msgstr "Príliš stará verzia nie je podporovaná službou"
+
+#~ msgid "Unknown state"
+#~ msgstr "Neznámy status"
+
+#~ msgid "Online services disabled. Contact Mandriva Online site\n"
+#~ msgstr "Online služby vypnuté. Kontaktujte stránku Mandriva Online\n"
+
+#~ msgid "Wrong Password.\n"
+#~ msgstr "Zlé heslo.\n"
+
+#~ msgid "Wrong Action or host or login.\n"
+#~ msgstr "Nesprávna akcia, hostiteľ alebo prihlasovacie údaje\n"
+
+#~ msgid ""
+#~ "Something is wrong with your network settings (check your route, firewall "
+#~ "or proxy settings)\n"
+#~ msgstr ""
+#~ "Niečo s nastavením vašej siete nie je v poriadku (skontrolujte pripojenie "
+#~ "firewall alebo nastavenie proxy)\n"
+
+#~ msgid ""
+#~ "Problem occured while connecting to the server, please contact the "
+#~ "support team"
+#~ msgstr ""
+#~ "Nastal problém pri pripájaní na server, prosím kontaktujte podporný tím"
+
+#~ msgid "Response from Mandriva Online server\n"
+#~ msgstr "Odpoveď zo servera Mandriva Online\n"
+
+#~ msgid "No check"
+#~ msgstr "Žiadna kontrola"
+
+#~ msgid "Checking config file: Not present\n"
+#~ msgstr "Kontrolovanie konfiguračného súboru: Nebol nájdený\n"
+
+#~ msgid "Logs"
+#~ msgstr "Logy"
+
+#~ msgid "Clear"
+#~ msgstr "Vyprázdniť"
+
+#~ msgid ""
+#~ "mdonline version %s\n"
+#~ "Copyright (C) %s Mandriva.\n"
+#~ "This is free software and may be redistributed under the terms of the GNU "
+#~ "GPL.\n"
+#~ "\n"
+#~ "usage:\n"
+#~ msgstr ""
+#~ "mdonline verzia %s\n"
+#~ "Copyright (C) %s Mandriva.\n"
+#~ "Tento softvér môže byť redistribuovaný podľa podmienok GNU GPL.\n"
+#~ "\n"
+#~ "použitie:\n"
+
+#~ msgid "Mandriva Online"
+#~ msgstr "Mandriva Online"
+
+#~ msgid "I already have an account"
+#~ msgstr "Už mám vytvorený účet"
+
+#~ msgid "I want to subscribe"
+#~ msgstr "Chcem sa zaregistrovať"
+
+#~ msgid "Mr."
+#~ msgstr "Pán"
+
+#~ msgid "Mrs."
+#~ msgstr "Pani"
+
+#~ msgid "Ms."
+#~ msgstr "Slečna"
+
+#~ msgid "Reading configuration\n"
+#~ msgstr "Načítavanie konfigurácie\n"
+
+#~ msgid ""
+#~ "This assistant will help you to upload your configuration\n"
+#~ "(packages, hardware configuration) to a centralized database in\n"
+#~ "order to keep you informed about security updates and useful upgrades.\n"
+#~ msgstr ""
+#~ "Tento sprievodca vám pomôže pri nahrávaní vašej konfigurácie\n"
+#~ "(balíky, hardvérová konfigurácia) do centrálnej databázy aby ste mohli\n"
+#~ "byť informovaní o bezpečnostných aktualizáciách a zaujímavých balíkoch.\n"
+
+#~ msgid "Account creation or authentication"
+#~ msgstr "Vytváranie účtu a autorizácia"
+
+#~ msgid "Enter your Mandriva Online login, password and machine name:"
+#~ msgstr "Zadajte vaše prihlasovacie meno, heslo a názov počítača:"
+
+#~ msgid "Email address:"
+#~ msgstr "E-mailová adresa:"
+
+#~ msgid "Country"
+#~ msgstr "Krajina"
+
+#~ msgid "Password:"
+#~ msgstr "Heslo:"
+
+#, fuzzy
+#~ msgid "Machine description:"
+#~ msgstr "Meno počítača:"
+
+#~ msgid "Machine name must be 1 to 40 alphanumerical characters"
+#~ msgstr "Meno tlačiarne môže byť 1 až 40 alfanumerických znakov"
+
+#~ msgid "Connecting to Mandriva Online website..."
+#~ msgstr "Pripájanie sa na stránku Mandriva Online..."
+
+#~ msgid ""
+#~ "In order to benefit from Mandriva Online services,\n"
+#~ "we are about to upload your configuration.\n"
+#~ "\n"
+#~ "The Wizard will now send the following information to Mandriva:\n"
+#~ "\n"
+#~ "1) the list of packages you have installed on your system,\n"
+#~ "\n"
+#~ "2) your hardware configuration.\n"
+#~ "\n"
+#~ "If you feel uncomfortable by that idea, or do not want to benefit from "
+#~ "this service,\n"
+#~ "please press 'Cancel'. By pressing 'Next', you allow us to keep you "
+#~ "informed\n"
+#~ "about security updates and useful upgrades via personalized email "
+#~ "alerts.\n"
+#~ "Furthermore, you benefit from discounted paid support services on\n"
+#~ "www.mandrivaexpert.com."
+#~ msgstr ""
+#~ "Aby ste mohli mať úžitok zo služieb na Mandriva Online,\n"
+#~ "je potrebné získanie vašej konfigurácie.\n"
+#~ "\n"
+#~ "Sprievodca teraz odošle nasledovné informácie do Mandriva-u:\n"
+#~ "\n"
+#~ "1) zoznam balíkov ktoré ste si nainštalovali\n"
+#~ "\n"
+#~ "2) vašu hardvérovú konfiguráciu\n"
+#~ "\n"
+#~ "Ak sa vám nepozdáva tento nápad alebo nevyžadujete používanie takýchto "
+#~ "služieb\n"
+#~ "kliknite na 'Zrušiť'. Kliknutím na 'Pokračovať' nám umožníte, aby sme vás "
+#~ "informovali\n"
+#~ "o bezpečnostných aktualizáciách a užitočných iných vylepšeniach pomocou\n"
+#~ "personalizovaného emailu.\n"
+#~ "Môžete tiež zúžitkovať rôzne zľavy pre platené podporné služby na\n"
+#~ "www.mandrivaexpert.com."
+
+#~ msgid "Connection problem"
+#~ msgstr "Problém s pripojením"
+
+#~ msgid "Problem occurs when uploading files, please try again"
+#~ msgstr "Pri odosielaní súborov nastal problém, prosím skúste ešte raz"
+
+#~ msgid "Create a Mandriva Online Account"
+#~ msgstr "Vytvoriť Mandriva Linux Online účet"
+
+#~ msgid "Greeting:"
+#~ msgstr "Uvítanie:"
+
+#~ msgid "First name:"
+#~ msgstr "Krstné meno:"
+
+#~ msgid "Last name:"
+#~ msgstr "Priezvisko:"
+
+#~ msgid "Confirm Password:"
+#~ msgstr "Potvrdiť heslo:"
+
+#~ msgid ""
+#~ "The passwords do not match\n"
+#~ " Please try again\n"
+#~ msgstr ""
+#~ "Heslá nie sú zhodné\n"
+#~ " Skúste znova\n"
+
+#~ msgid "Please fill in each field"
+#~ msgstr "Vyplňte prosím všetky polia"
+
+#~ msgid "Not a valid mail address!\n"
+#~ msgstr "Nekorektná emailová adresa!\n"
+
+#~ msgid ""
+#~ "Mandriva Online Account successfully created.\n"
+#~ "Please click \"Next\" to authenticate and upload your configuration\n"
+#~ msgstr ""
+#~ "Účet pre Mandriva Online bol úspešne vytvorený.\n"
+#~ "Kliknite prosím na \"Ďalej\" pre overenie a nahratie vašej konfigurácie\n"
+
+#~ msgid "Your upload was successful!"
+#~ msgstr "Zaslanie bolo úspešné!"
+
+#~ msgid ""
+#~ "From now you will receive on security and updates \n"
+#~ "announcements thanks to Mandriva Online."
+#~ msgstr ""
+#~ "Odteraz budete môcť vďaka Mandriva Online získavať oznámenia \n"
+#~ "o bezpečnostných a funkčných aktualizáciách."
+
+#~ msgid ""
+#~ "Mandriva Online offers you the ability to automate the updates.\n"
+#~ "A program will run regulary in your system waiting for new updates\n"
+#~ msgstr ""
+#~ "Mandriva Online vám prináša možnosť ako vykonávať aktualizácie.\n"
+#~ "Program môže bežať na vašom systéme a čakať na nové aktualizácie\n"
+
+#~ msgid "Congratulations"
+#~ msgstr "Gratulujeme"
+
+#~ msgid "Your Mandriva Online account has been successfully configured\n"
+#~ msgstr "Váš Mandriva Online účet bol úspešne vytvorený\n"
+
+#~ msgid "Configuration uploaded successfully"
+#~ msgstr "Zaslanie nastavení bolo úspešné"
+
+#~ msgid "Problem uploading configuration"
+#~ msgstr "Nastal problém so zasielaním nastavenia"
+
+#~ msgid ""
+#~ "Cannot connect to Mandriva Online website: wrong login/password or router/"
+#~ "firewall bad settings"
+#~ msgstr ""
+#~ "Nebolo možné pripojiť sa na stránku mandrivaonline: nesprávne meno/heslo "
+#~ "alebo nastavenie firewallu"
+
 #~ msgid "  --applet\t\t- launch Mandriva Update.\n"
 #~ msgstr "  --applet\t\t- spustiť Mandriva Update.\n"
 
diff --git a/po/sl.po b/po/sl.po
index 1059bb7b..97b18ef9 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-09 16:26+0200\n"
+"POT-Creation-Date: 2008-02-21 18:21+0100\n"
 "PO-Revision-Date: 2007-09-09 13:08+0200\n"
 "Last-Translator: Jure Repinc <jlp@holodeck1.com>\n"
 "Language-Team: Slovenščina <lugos-slo@lugos.si>\n"
@@ -21,20 +21,21 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
-"Plural-Forms:  nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
+"Plural-Forms:  nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || "
+"n%100==4 ? 2 : 3);\n"
 
 #. -PO: here %s will be replaced by the local time (eg: "Will check updates at 14:03:50"
-#: ../mdkapplet:94
+#: ../mdkapplet:88
 #, c-format
 msgid "Will check updates at %s"
 msgstr "Za posodobitve bom preveril ob %s"
 
-#: ../mdkapplet:103
+#: ../mdkapplet:97
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "Vaš sistem je posodobljen"
 
-#: ../mdkapplet:109
+#: ../mdkapplet:103
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -43,54 +44,45 @@ msgstr ""
 "Težava z nastavitvijo storitve. Prosim preverite dnevnike in pošljite pošto "
 "na support@mandrivaonline.com"
 
-#: ../mdkapplet:115
+#: ../mdkapplet:110
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "Prosim počakajte, iščem dostopne pakete..."
 
-#: ../mdkapplet:121
+#: ../mdkapplet:116
 #, c-format
 msgid "New updates are available for your system"
 msgstr "Za vaš sistem so na voljo novi popravki"
 
-#: ../mdkapplet:127
-#, c-format
-msgid "New bundles are available for your system"
-msgstr "Za vaš sistem so na voljo novi sklopi programov"
-
-#: ../mdkapplet:133
-#, c-format
-msgid "Service is not configured. Please click on \"Configure the service\""
-msgstr "Storitev ni nastavljena. Prosim iz menija izberite »Nastavitev storitve«"
-
-#: ../mdkapplet:139
+#: ../mdkapplet:122
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "Ni povezave z omrežjem. Prosim nastavite omrežje"
 
-#: ../mdkapplet:145
+#: ../mdkapplet:128
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "Storitev ni aktivirana. Prosim kliknite na »Spletna stran«"
 
-#: ../mdkapplet:151 ../mdkapplet:182
+#: ../mdkapplet:134 ../mdkapplet:165
 #, c-format
 msgid "urpmi database locked"
 msgstr "podatkovna zbirka urpmi je zaklenjena"
 
-#: ../mdkapplet:157
+#: ../mdkapplet:140
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr "Izdaja ni podprta (prestara ali razvojna različica)"
 
-#: ../mdkapplet:163
+#: ../mdkapplet:146
 #, c-format
-msgid "No medium found. You must add some media through 'Software Media Manager'."
+msgid ""
+"No medium found. You must add some media through 'Software Media Manager'."
 msgstr ""
-"Ni moč najti virov. Vire lahko dodate s pomočjo "
-"upravljalnika virov programske opreme."
+"Ni moč najti virov. Vire lahko dodate s pomočjo upravljalnika virov "
+"programske opreme."
 
-#: ../mdkapplet:169
+#: ../mdkapplet:152
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -107,580 +99,133 @@ msgstr ""
 "\n"
 "Potem ponovno zaženite »%s«."
 
-#: ../mdkapplet:174
+#: ../mdkapplet:157
 #, c-format
 msgid "Enabled"
 msgstr "Omogočen"
 
-#: ../mdkapplet:187
+#: ../mdkapplet:170
 #, c-format
 msgid "Error updating media"
 msgstr "Napaka pri posodabljanju"
 
-#: ../mdkapplet:202
+#: ../mdkapplet:185
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr "Preverjanje ... Posodobitve so na voljo\n"
 
-#: ../mdkapplet:207
+#: ../mdkapplet:190
 #, c-format
 msgid "Packages are up to date"
 msgstr "Paketi so posodobljeni"
 
-#: ../mdkapplet:212
+#: ../mdkapplet:195
 #, c-format
 msgid "Failed to open urpmi database"
 msgstr "Odpiranje zbirke podatkov urpmi je spodletelo"
 
-#: ../mdkapplet:217 ../mdkapplet:324
+#: ../mdkapplet:200
 #, c-format
 msgid "Install updates"
 msgstr "Namesti posodobitve"
 
-#: ../mdkapplet:218
-#, c-format
-msgid "Configure the service"
-msgstr "Nastavitev storitve"
-
-#: ../mdkapplet:219
+#: ../mdkapplet:201
 #, c-format
 msgid "Check Updates"
 msgstr "Pregled posodobitev"
 
-#: ../mdkapplet:220 ../mdkapplet:327 ../mdkonline:114 ../mdkonline:155
-#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
-#, c-format
-msgid "Please wait"
-msgstr "Prosim počakajte"
-
-#: ../mdkapplet:220 ../mdkapplet:326 ../mdkapplet:327
-#, c-format
-msgid "Check updates"
-msgstr "Pregled posodobitev"
-
-#: ../mdkapplet:223 ../mdkapplet:648
-#, c-format
-msgid "Online WebSite"
-msgstr "Spletna stran"
-
-#: ../mdkapplet:224
+#: ../mdkapplet:202
 #, c-format
 msgid "Configure Network"
 msgstr "Nastavitev omrežja"
 
-#: ../mdkapplet:225
-#, c-format
-msgid "Configure Now!"
-msgstr "Nastavitev storitve"
-
-#: ../mdkapplet:313 ../mdkapplet:392
-#, c-format
-msgid "Mandriva Linux Updates Applet"
-msgstr "Vstavek Mandriva Linux za posodobitve"
-
-#: ../mdkapplet:322
-#, c-format
-msgid "Actions"
-msgstr "Dejanja"
-
-#: ../mdkapplet:325
-#, c-format
-msgid "Configure"
-msgstr "Nastavi"
-
-#: ../mdkapplet:329
-#, c-format
-msgid "See logs"
-msgstr "Poglej dnevnike"
-
-#: ../mdkapplet:332
-#, c-format
-msgid "Status"
-msgstr "Stanje"
-
-#: ../mdkapplet:336 ../mdkapplet:597
-#, c-format
-msgid "Close"
-msgstr "Zapri"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Network Connection: "
-msgstr "Omrežna povezava: "
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Up"
-msgstr "Vzpostavljena"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Down"
-msgstr "Prekinjena"
-
-#: ../mdkapplet:366
-#, c-format
-msgid "Last check: "
-msgstr "Zadnji pregled: "
-
-#: ../mdkapplet:367 ../mdkonline:145
-#, c-format
-msgid "Machine name:"
-msgstr "Ime računalnika:"
-
-#: ../mdkapplet:368
-#, c-format
-msgid "Updates: "
-msgstr "Posodobitve: "
-
-#: ../mdkapplet:372
+#: ../mdkapplet:283
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "»drakconnect« se zaganja\n"
 
-#: ../mdkapplet:375
+#: ../mdkapplet:286
 #, c-format
 msgid "Mandriva Online seems to be reinstalled, reloading applet ...."
 msgstr ""
 "Izgleda, da je Mandriva Online na novo nameščen. Ponovno nalaganje "
 "vstavka ..."
 
-#: ../mdkapplet:383
+#: ../mdkapplet:294
 #, c-format
 msgid "Launching MandrivaUpdate\n"
 msgstr "»MandrivaUpdate« se zaganja\n"
 
-#: ../mdkapplet:398
+#: ../mdkapplet:303
+#, c-format
+msgid "Mandriva Linux Updates Applet"
+msgstr "Vstavek Mandriva Linux za posodobitve"
+
+#: ../mdkapplet:308
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Procesiranje novih popravkov ...\n"
 
-#: ../mdkapplet:399
+#: ../mdkapplet:309
 #, c-format
 msgid "Connecting to"
 msgstr "Povezovanje z"
 
-#: ../mdkapplet:467 ../mdkupdate:159 ../mdkupdate:188
-#, c-format
-msgid "An error occurred"
-msgstr "Prišlo je do napake"
-
-#: ../mdkapplet:475
-#, c-format
-msgid "Development release not supported by service"
-msgstr "Storitev ne podpira razvojne različice"
-
-#: ../mdkapplet:476
-#, c-format
-msgid "Too old release not supported by service"
-msgstr "Storitev ne podpira prestarih različic"
-
-#: ../mdkapplet:477
-#, c-format
-msgid "Unknown state"
-msgstr "Neznano stanje"
-
-#: ../mdkapplet:478
-#, c-format
-msgid "Online services disabled. Contact Mandriva Online site\n"
-msgstr "Storitve na zvezi so onemogočene. Preverite stran Mandriva Online\n"
-
-#: ../mdkapplet:479
-#, c-format
-msgid "Wrong Password.\n"
-msgstr "Napačno geslo.\n"
-
-#: ../mdkapplet:480
-#, c-format
-msgid "Wrong Action or host or login.\n"
-msgstr "Napačno dejanje, gostitelj ali prijava.\n"
-
-#: ../mdkapplet:481
-#, c-format
-msgid ""
-"Something is wrong with your network settings (check your route, firewall or "
-"proxy settings)\n"
-msgstr ""
-"Nekaj je narobe z vašimi omrežnimi nastavitvami (preverite usmerjanje, "
-"požarni zid ali nastavitve posrednika)\n"
-
-#: ../mdkapplet:483
-#, c-format
-msgid ""
-"Problem occured while connecting to the server, please contact the support "
-"team"
-msgstr "Težava pri povezovanju s strežnikom. Prosim obrnite se na skupino za podporo"
-
-#: ../mdkapplet:487
-#, c-format
-msgid "Response from Mandriva Online server\n"
-msgstr "Odgovor strežnika Mandriva Online\n"
-
-#: ../mdkapplet:490
+#: ../mdkapplet:386
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Sistem je posodobljen\n"
 
-#: ../mdkapplet:527
-#, c-format
-msgid "No check"
-msgstr "Brez pregleda"
-
-#: ../mdkapplet:541
-#, c-format
-msgid "Checking config file: Not present\n"
-msgstr "Preverjanje nastavitvene datoteke: Ne obstaja\n"
-
-#: ../mdkapplet:544
+#: ../mdkapplet:415
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Preverjanje omrežja: izgleda onemogočeno\n"
 
-#: ../mdkapplet:587
+#: ../mdkapplet:457 ../mdkupdate:118 ../mdkupdate:164
 #, c-format
-msgid "Logs"
-msgstr "Dnevniki"
-
-#: ../mdkapplet:603
-#, c-format
-msgid "Clear"
-msgstr "Počisti"
+msgid "Warning"
+msgstr "Opozorilo"
 
-#: ../mdkapplet:629
+#: ../mdkapplet:468
 #, c-format
 msgid "About..."
 msgstr "O ..."
 
-#: ../mdkapplet:631
+#: ../mdkapplet:472
 #, c-format
 msgid "Mandriva Online %s"
 msgstr "Mandriva Online %s"
 
-#: ../mdkapplet:635
+#: ../mdkapplet:473
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Avtorske pravice © %s, Mandriva"
 
-#: ../mdkapplet:647
+#: ../mdkapplet:476
 #, c-format
 msgid "Mandriva Online gives access to Mandriva web services."
 msgstr "Mandriva Online omogoča dostop do spletnih storitev Mandriva"
 
-#: ../mdkapplet:655
-#, c-format
-msgid "Always launch on startup"
-msgstr "Vedno zaženi ob zagonu"
-
-#: ../mdkapplet:657
-#, c-format
-msgid "Quit"
-msgstr "Končaj"
-
-#: ../mdkonline:58
-#, c-format
-msgid ""
-"mdonline version %s\n"
-"Copyright (C) %s Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"mdonline različica %s\n"
-"Avtorske pravice © %s Mandriva.\n"
-"To je prosto programje in se sme razširjati pod pogoji licence GNU GPL.\n"
-"\n"
-"uporaba:\n"
-
-#: ../mdkonline:63 ../mdkupdate:73
-#, c-format
-msgid "  --help\t\t- print this help message.\n"
-msgstr "  --help\t\t- izpiši to sporočilo s pomočjo.\n"
-
-#: ../mdkonline:64
-#, c-format
-msgid "  --box=\t\t\t- hostname.\n"
-msgstr "  --box=\t\t\t- hostname.\n"
-
-#: ../mdkonline:65
-#, c-format
-msgid "  --country\t\t\t- name of country of the user. \n"
-msgstr "  --country\t\t\t- name of country of the user. \n"
-
-#: ../mdkonline:66
-#, c-format
-msgid "  --interactive\t\t- use the interactive mode.\n"
-msgstr "  --interactive\t\t- use the interactive mode.\n"
-
-#: ../mdkonline:67
-#, c-format
-msgid "  --nointeractive\t- use the non-interactive mode.\n"
-msgstr "  --nointeractive\t- use the non-interactive mode.\n"
-
-#: ../mdkonline:68
-#, c-format
-msgid "  --login=\t\t     - login name of the user.\n"
-msgstr "  --login=\t\t     - login name of the user.\n"
-
-#: ../mdkonline:69
-#, c-format
-msgid "  --pass=\t\t\t- password  of the user.\n"
-msgstr "  --pass=\t\t\t- password  of the user.\n"
-
-#: ../mdkonline:87 ../mdkonline:120
-#, c-format
-msgid "Mandriva Online"
-msgstr "Mandriva Online"
-
-#: ../mdkonline:90
-#, c-format
-msgid "I already have an account"
-msgstr "Račun že imam"
-
-#: ../mdkonline:91
-#, c-format
-msgid "I want to subscribe"
-msgstr "Želim se registrirati"
-
-#: ../mdkonline:96
-#, c-format
-msgid "Mr."
-msgstr "g."
-
-#: ../mdkonline:96
-#, c-format
-msgid "Mrs."
-msgstr "ga."
-
-#: ../mdkonline:96
-#, c-format
-msgid "Ms."
-msgstr "gdč."
-
-#: ../mdkonline:114
-#, c-format
-msgid "Reading configuration\n"
-msgstr "Branje nastavitev\n"
-
-#: ../mdkonline:123
-#, c-format
-msgid ""
-"This assistant will help you to upload your configuration\n"
-"(packages, hardware configuration) to a centralized database in\n"
-"order to keep you informed about security updates and useful upgrades.\n"
-msgstr ""
-"Ta čarovnik vam bo v pomoč pri prenosu vaših nastavitev\n"
-"(paketi, sestava strojne opreme) v osrednjo zbirko, tako da\n"
-"boste obveščeni o varnostnih in drugih uporabnih nadgradnjah.\n"
-
-#: ../mdkonline:131
-#, c-format
-msgid "Account creation or authentication"
-msgstr "Ustvarjanje računa ali overjanje"
-
-#: ../mdkonline:136
-#, c-format
-msgid "Enter your Mandriva Online login, password and machine name:"
-msgstr "Vnesite svoje uporabniško ime, geslo in ime računalnika za Mandriva Online:"
-
-#: ../mdkonline:142 ../mdkonline:195
-#, c-format
-msgid "Email address:"
-msgstr "E-poštni naslov:"
-
-#: ../mdkonline:143
-#, c-format
-msgid "Country"
-msgstr "Država"
-
-#: ../mdkonline:144 ../mdkonline:196
-#, c-format
-msgid "Password:"
-msgstr "Geslo:"
-
-#: ../mdkonline:146
-#, c-format
-msgid "Machine description:"
-msgstr "Opis računalnika:"
-
-#: ../mdkonline:147
-#, c-format
-msgid "(Ex: My Home Office's Computer)"
-msgstr "(npr. Moj domači - pisarniški računalnik)"
-
-#: ../mdkonline:152 ../mdkonline:159 ../mdkonline:180 ../mdkonline:204
-#: ../mdkonline:208 ../mdkonline:212 ../mdkonline:217 ../mdkupdate:141
-#: ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
-#, c-format
-msgid "Error"
-msgstr "Napaka"
-
-#: ../mdkonline:152
-#, c-format
-msgid "Machine name must be 1 to 40 alphanumerical characters"
-msgstr "Ime računalnika mora biti dolgo od 1 do 40 znakov"
-
-#: ../mdkonline:155
-#, c-format
-msgid "Connecting to Mandriva Online website..."
-msgstr "Povezovanje s spletno stranjo Mandriva Online ..."
-
-#: ../mdkonline:167
-#, c-format
-msgid ""
-"In order to benefit from Mandriva Online services,\n"
-"we are about to upload your configuration.\n"
-"\n"
-"The Wizard will now send the following information to Mandriva:\n"
-"\n"
-"1) the list of packages you have installed on your system,\n"
-"\n"
-"2) your hardware configuration.\n"
-"\n"
-"If you feel uncomfortable by that idea, or do not want to benefit from this "
-"service,\n"
-"please press 'Cancel'. By pressing 'Next', you allow us to keep you "
-"informed\n"
-"about security updates and useful upgrades via personalized email alerts.\n"
-"Furthermore, you benefit from discounted paid support services on\n"
-"www.mandrivaexpert.com."
-msgstr ""
-"Da bi lahko uporabljali storitve Mandriva Online,\n"
-"je potrebno poslati vaše nastavitve.\n"
-"\n"
-"Čarovnik bo sedaj Mandrivi poslal sledeče podatke:\n"
-"\n"
-"1) seznam paketov, ki so nameščeni na vašem sistemu,\n"
-"\n"
-"2) podatke o vaši strojni opremi.\n"
-"\n"
-"Če se zaradi tega počutite nelagodno, ali ne potrebujete teh storitev,\n"
-"kliknite »Prekliči«. S pritiskom na »Naprej« nam dovolite, da vas\n"
-"obveščamo o varnostnih in drugih uporabnih nadgradnjah s pomočjo\n"
-" osebnih e-poštnih obvestil.\n"
-"Poleg tega boste imeli popust pri plačniških storitev podpore na\n"
-"www.mandrivaexpert.com."
-
-#: ../mdkonline:180
-#, c-format
-msgid "Connection problem"
-msgstr "Težave pri povezavi"
-
-#: ../mdkonline:180
-#, c-format
-msgid "Problem occurs when uploading files, please try again"
-msgstr "Težava pri pošiljanju datotek. Prosim poskusite znova."
-
-#: ../mdkonline:187
-#, c-format
-msgid "Create a Mandriva Online Account"
-msgstr "Ustvarjanje računa Mandriva Online"
-
-#. -PO: that is for things like "Mr", "Ms",...
-#: ../mdkonline:192
-#, c-format
-msgid "Greeting:"
-msgstr "Pozdrav:"
-
-#: ../mdkonline:193
-#, c-format
-msgid "First name:"
-msgstr "Ime:"
-
-#: ../mdkonline:194
-#, c-format
-msgid "Last name:"
-msgstr "Priimek:"
-
-#: ../mdkonline:197
-#, c-format
-msgid "Confirm Password:"
-msgstr "Potrditev gesla:"
-
-#: ../mdkonline:204
-#, c-format
-msgid ""
-"The passwords do not match\n"
-" Please try again\n"
-msgstr ""
-"Gesli se ne ujemata\n"
-" Prosim poskusite znova\n"
-
-#: ../mdkonline:208
-#, c-format
-msgid "Please fill in each field"
-msgstr "Prosim izpolnite vsa polja"
-
-#: ../mdkonline:212
-#, c-format
-msgid "Not a valid mail address!\n"
-msgstr "Neveljaven poštni naslov!\n"
-
-#: ../mdkonline:217
-#, c-format
-msgid "Creating account failed!"
-msgstr "Ustvarjanje računa ni uspelo! "
-
-#: ../mdkonline:225
-#, c-format
-msgid ""
-"Mandriva Online Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
-msgstr ""
-"Račun Mandriva Online je uspešno ustvarjen.\n"
-"Prosim kliknite »Naprej« za overitev in pošiljanje vaših nastavitev.\n"
-
-#: ../mdkonline:229
-#, c-format
-msgid "Your upload was successful!"
-msgstr "Pošiljanje je bilo uspešno!"
-
-#: ../mdkonline:229
+#: ../mdkapplet:478
 #, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandriva Online."
-msgstr ""
-"Od zdaj naprej boste zahvaljujoč Mandrivi Online prejemali\n"
-"obvestila o varnostnih in drugih posodobitvah."
+msgid "Online WebSite"
+msgstr "Spletna stran"
 
-#: ../mdkonline:229
+#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
+#: ../mdkapplet:483
 #, c-format
-msgid ""
-"Mandriva Online offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
+msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
-"Mandriva Online vam omogoča samodejno posodabljanje.\n"
-"Program bo tekel v ozadju in čakal na nove posodobitve.\n"
-
-#: ../mdkonline:238
-#, c-format
-msgid "Congratulations"
-msgstr "Čestitke"
 
-#: ../mdkonline:238
+#: ../mdkapplet:492
 #, c-format
-msgid "Your Mandriva Online account has been successfully configured\n"
-msgstr "Vaš račun Mandriva Online je bil uspešno nastavljen\n"
-
-#: ../mdkonline:253
-#, c-format
-msgid "Configuration uploaded successfully"
-msgstr "Nastavitve uspešno poslane"
-
-#: ../mdkonline:254
-#, c-format
-msgid "Problem uploading configuration"
-msgstr "Težava pri pošiljanju nastavitev"
+msgid "Always launch on startup"
+msgstr "Vedno zaženi ob zagonu"
 
-#: ../mdkonline:256
+#: ../mdkapplet:494
 #, c-format
-msgid ""
-"Cannot connect to Mandriva Online website: wrong login/password or router/"
-"firewall bad settings"
-msgstr ""
-"Ni se mogoče povezati s spletno stranjo Mandriva Online: napačno uporabniško "
-"ime, geslo, ali napačne nastavitve usmerjevalnika oziroma požarnega zidu"
+msgid "Quit"
+msgstr "Končaj"
 
 #: ../mdkonline.pm:207
 #, c-format
@@ -828,6 +373,11 @@ msgstr ""
 "\n"
 "uporaba:\n"
 
+#: ../mdkupdate:73
+#, c-format
+msgid "  --help\t\t- print this help message.\n"
+msgstr "  --help\t\t- izpiši to sporočilo s pomočjo.\n"
+
 #: ../mdkupdate:74
 #, c-format
 msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
@@ -857,11 +407,6 @@ msgstr ""
 "  --bundle file.bundle\t- parse and install package from .bundle metainfo "
 "file.\n"
 
-#: ../mdkupdate:118 ../mdkupdate:164
-#, c-format
-msgid "Warning"
-msgstr "Opozorilo"
-
 #. -PO: here Live Install is currently *NOT* translated on the desktop, so it's better to keep as it:
 #: ../mdkupdate:120
 #, c-format
@@ -870,11 +415,21 @@ msgid ""
 "Install' wizard."
 msgstr "Najprej morate sistem namestiti na disk s pomočjo čarovnika"
 
+#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
+#, c-format
+msgid "Please wait"
+msgstr "Prosim počakajte"
+
 #: ../mdkupdate:123 ../mdkupdate:174
 #, c-format
 msgid "Preparing..."
 msgstr "Priprava ..."
 
+#: ../mdkupdate:141 ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
+#, c-format
+msgid "Error"
+msgstr "Napaka"
+
 #: ../mdkupdate:141
 #, c-format
 msgid ""
@@ -886,6 +441,11 @@ msgstr ""
 "\n"
 "%s"
 
+#: ../mdkupdate:159 ../mdkupdate:188
+#, c-format
+msgid "An error occurred"
+msgstr "Prišlo je do napake"
+
 #: ../mdkupdate:164
 #, c-format
 msgid ""
@@ -913,3 +473,305 @@ msgstr "Nameščanje paketov ...\n"
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "Paketov iz vira update_source ni mogoče posodobiti.\n"
 
+#~ msgid "New bundles are available for your system"
+#~ msgstr "Za vaš sistem so na voljo novi sklopi programov"
+
+#~ msgid "Service is not configured. Please click on \"Configure the service\""
+#~ msgstr ""
+#~ "Storitev ni nastavljena. Prosim iz menija izberite »Nastavitev storitve«"
+
+#~ msgid "Configure the service"
+#~ msgstr "Nastavitev storitve"
+
+#~ msgid "Check updates"
+#~ msgstr "Pregled posodobitev"
+
+#~ msgid "Configure Now!"
+#~ msgstr "Nastavitev storitve"
+
+#~ msgid "Actions"
+#~ msgstr "Dejanja"
+
+#~ msgid "Configure"
+#~ msgstr "Nastavi"
+
+#~ msgid "See logs"
+#~ msgstr "Poglej dnevnike"
+
+#~ msgid "Status"
+#~ msgstr "Stanje"
+
+#~ msgid "Close"
+#~ msgstr "Zapri"
+
+#~ msgid "Network Connection: "
+#~ msgstr "Omrežna povezava: "
+
+#~ msgid "Up"
+#~ msgstr "Vzpostavljena"
+
+#~ msgid "Down"
+#~ msgstr "Prekinjena"
+
+#~ msgid "Last check: "
+#~ msgstr "Zadnji pregled: "
+
+#~ msgid "Machine name:"
+#~ msgstr "Ime računalnika:"
+
+#~ msgid "Updates: "
+#~ msgstr "Posodobitve: "
+
+#~ msgid "Development release not supported by service"
+#~ msgstr "Storitev ne podpira razvojne različice"
+
+#~ msgid "Too old release not supported by service"
+#~ msgstr "Storitev ne podpira prestarih različic"
+
+#~ msgid "Unknown state"
+#~ msgstr "Neznano stanje"
+
+#~ msgid "Online services disabled. Contact Mandriva Online site\n"
+#~ msgstr "Storitve na zvezi so onemogočene. Preverite stran Mandriva Online\n"
+
+#~ msgid "Wrong Password.\n"
+#~ msgstr "Napačno geslo.\n"
+
+#~ msgid "Wrong Action or host or login.\n"
+#~ msgstr "Napačno dejanje, gostitelj ali prijava.\n"
+
+#~ msgid ""
+#~ "Something is wrong with your network settings (check your route, firewall "
+#~ "or proxy settings)\n"
+#~ msgstr ""
+#~ "Nekaj je narobe z vašimi omrežnimi nastavitvami (preverite usmerjanje, "
+#~ "požarni zid ali nastavitve posrednika)\n"
+
+#~ msgid ""
+#~ "Problem occured while connecting to the server, please contact the "
+#~ "support team"
+#~ msgstr ""
+#~ "Težava pri povezovanju s strežnikom. Prosim obrnite se na skupino za "
+#~ "podporo"
+
+#~ msgid "Response from Mandriva Online server\n"
+#~ msgstr "Odgovor strežnika Mandriva Online\n"
+
+#~ msgid "No check"
+#~ msgstr "Brez pregleda"
+
+#~ msgid "Checking config file: Not present\n"
+#~ msgstr "Preverjanje nastavitvene datoteke: Ne obstaja\n"
+
+#~ msgid "Logs"
+#~ msgstr "Dnevniki"
+
+#~ msgid "Clear"
+#~ msgstr "Počisti"
+
+#~ msgid ""
+#~ "mdonline version %s\n"
+#~ "Copyright (C) %s Mandriva.\n"
+#~ "This is free software and may be redistributed under the terms of the GNU "
+#~ "GPL.\n"
+#~ "\n"
+#~ "usage:\n"
+#~ msgstr ""
+#~ "mdonline različica %s\n"
+#~ "Avtorske pravice © %s Mandriva.\n"
+#~ "To je prosto programje in se sme razširjati pod pogoji licence GNU GPL.\n"
+#~ "\n"
+#~ "uporaba:\n"
+
+#~ msgid "  --box=\t\t\t- hostname.\n"
+#~ msgstr "  --box=\t\t\t- hostname.\n"
+
+#~ msgid "  --country\t\t\t- name of country of the user. \n"
+#~ msgstr "  --country\t\t\t- name of country of the user. \n"
+
+#~ msgid "  --interactive\t\t- use the interactive mode.\n"
+#~ msgstr "  --interactive\t\t- use the interactive mode.\n"
+
+#~ msgid "  --nointeractive\t- use the non-interactive mode.\n"
+#~ msgstr "  --nointeractive\t- use the non-interactive mode.\n"
+
+#~ msgid "  --login=\t\t     - login name of the user.\n"
+#~ msgstr "  --login=\t\t     - login name of the user.\n"
+
+#~ msgid "  --pass=\t\t\t- password  of the user.\n"
+#~ msgstr "  --pass=\t\t\t- password  of the user.\n"
+
+#~ msgid "Mandriva Online"
+#~ msgstr "Mandriva Online"
+
+#~ msgid "I already have an account"
+#~ msgstr "Račun že imam"
+
+#~ msgid "I want to subscribe"
+#~ msgstr "Želim se registrirati"
+
+#~ msgid "Mr."
+#~ msgstr "g."
+
+#~ msgid "Mrs."
+#~ msgstr "ga."
+
+#~ msgid "Ms."
+#~ msgstr "gdč."
+
+#~ msgid "Reading configuration\n"
+#~ msgstr "Branje nastavitev\n"
+
+#~ msgid ""
+#~ "This assistant will help you to upload your configuration\n"
+#~ "(packages, hardware configuration) to a centralized database in\n"
+#~ "order to keep you informed about security updates and useful upgrades.\n"
+#~ msgstr ""
+#~ "Ta čarovnik vam bo v pomoč pri prenosu vaših nastavitev\n"
+#~ "(paketi, sestava strojne opreme) v osrednjo zbirko, tako da\n"
+#~ "boste obveščeni o varnostnih in drugih uporabnih nadgradnjah.\n"
+
+#~ msgid "Account creation or authentication"
+#~ msgstr "Ustvarjanje računa ali overjanje"
+
+#~ msgid "Enter your Mandriva Online login, password and machine name:"
+#~ msgstr ""
+#~ "Vnesite svoje uporabniško ime, geslo in ime računalnika za Mandriva "
+#~ "Online:"
+
+#~ msgid "Email address:"
+#~ msgstr "E-poštni naslov:"
+
+#~ msgid "Country"
+#~ msgstr "Država"
+
+#~ msgid "Password:"
+#~ msgstr "Geslo:"
+
+#~ msgid "Machine description:"
+#~ msgstr "Opis računalnika:"
+
+#~ msgid "(Ex: My Home Office's Computer)"
+#~ msgstr "(npr. Moj domači - pisarniški računalnik)"
+
+#~ msgid "Machine name must be 1 to 40 alphanumerical characters"
+#~ msgstr "Ime računalnika mora biti dolgo od 1 do 40 znakov"
+
+#~ msgid "Connecting to Mandriva Online website..."
+#~ msgstr "Povezovanje s spletno stranjo Mandriva Online ..."
+
+#~ msgid ""
+#~ "In order to benefit from Mandriva Online services,\n"
+#~ "we are about to upload your configuration.\n"
+#~ "\n"
+#~ "The Wizard will now send the following information to Mandriva:\n"
+#~ "\n"
+#~ "1) the list of packages you have installed on your system,\n"
+#~ "\n"
+#~ "2) your hardware configuration.\n"
+#~ "\n"
+#~ "If you feel uncomfortable by that idea, or do not want to benefit from "
+#~ "this service,\n"
+#~ "please press 'Cancel'. By pressing 'Next', you allow us to keep you "
+#~ "informed\n"
+#~ "about security updates and useful upgrades via personalized email "
+#~ "alerts.\n"
+#~ "Furthermore, you benefit from discounted paid support services on\n"
+#~ "www.mandrivaexpert.com."
+#~ msgstr ""
+#~ "Da bi lahko uporabljali storitve Mandriva Online,\n"
+#~ "je potrebno poslati vaše nastavitve.\n"
+#~ "\n"
+#~ "Čarovnik bo sedaj Mandrivi poslal sledeče podatke:\n"
+#~ "\n"
+#~ "1) seznam paketov, ki so nameščeni na vašem sistemu,\n"
+#~ "\n"
+#~ "2) podatke o vaši strojni opremi.\n"
+#~ "\n"
+#~ "Če se zaradi tega počutite nelagodno, ali ne potrebujete teh storitev,\n"
+#~ "kliknite »Prekliči«. S pritiskom na »Naprej« nam dovolite, da vas\n"
+#~ "obveščamo o varnostnih in drugih uporabnih nadgradnjah s pomočjo\n"
+#~ " osebnih e-poštnih obvestil.\n"
+#~ "Poleg tega boste imeli popust pri plačniških storitev podpore na\n"
+#~ "www.mandrivaexpert.com."
+
+#~ msgid "Connection problem"
+#~ msgstr "Težave pri povezavi"
+
+#~ msgid "Problem occurs when uploading files, please try again"
+#~ msgstr "Težava pri pošiljanju datotek. Prosim poskusite znova."
+
+#~ msgid "Create a Mandriva Online Account"
+#~ msgstr "Ustvarjanje računa Mandriva Online"
+
+#~ msgid "Greeting:"
+#~ msgstr "Pozdrav:"
+
+#~ msgid "First name:"
+#~ msgstr "Ime:"
+
+#~ msgid "Last name:"
+#~ msgstr "Priimek:"
+
+#~ msgid "Confirm Password:"
+#~ msgstr "Potrditev gesla:"
+
+#~ msgid ""
+#~ "The passwords do not match\n"
+#~ " Please try again\n"
+#~ msgstr ""
+#~ "Gesli se ne ujemata\n"
+#~ " Prosim poskusite znova\n"
+
+#~ msgid "Please fill in each field"
+#~ msgstr "Prosim izpolnite vsa polja"
+
+#~ msgid "Not a valid mail address!\n"
+#~ msgstr "Neveljaven poštni naslov!\n"
+
+#~ msgid "Creating account failed!"
+#~ msgstr "Ustvarjanje računa ni uspelo! "
+
+#~ msgid ""
+#~ "Mandriva Online Account successfully created.\n"
+#~ "Please click \"Next\" to authenticate and upload your configuration\n"
+#~ msgstr ""
+#~ "Račun Mandriva Online je uspešno ustvarjen.\n"
+#~ "Prosim kliknite »Naprej« za overitev in pošiljanje vaših nastavitev.\n"
+
+#~ msgid "Your upload was successful!"
+#~ msgstr "Pošiljanje je bilo uspešno!"
+
+#~ msgid ""
+#~ "From now you will receive on security and updates \n"
+#~ "announcements thanks to Mandriva Online."
+#~ msgstr ""
+#~ "Od zdaj naprej boste zahvaljujoč Mandrivi Online prejemali\n"
+#~ "obvestila o varnostnih in drugih posodobitvah."
+
+#~ msgid ""
+#~ "Mandriva Online offers you the ability to automate the updates.\n"
+#~ "A program will run regulary in your system waiting for new updates\n"
+#~ msgstr ""
+#~ "Mandriva Online vam omogoča samodejno posodabljanje.\n"
+#~ "Program bo tekel v ozadju in čakal na nove posodobitve.\n"
+
+#~ msgid "Congratulations"
+#~ msgstr "Čestitke"
+
+#~ msgid "Your Mandriva Online account has been successfully configured\n"
+#~ msgstr "Vaš račun Mandriva Online je bil uspešno nastavljen\n"
+
+#~ msgid "Configuration uploaded successfully"
+#~ msgstr "Nastavitve uspešno poslane"
+
+#~ msgid "Problem uploading configuration"
+#~ msgstr "Težava pri pošiljanju nastavitev"
+
+#~ msgid ""
+#~ "Cannot connect to Mandriva Online website: wrong login/password or router/"
+#~ "firewall bad settings"
+#~ msgstr ""
+#~ "Ni se mogoče povezati s spletno stranjo Mandriva Online: napačno "
+#~ "uporabniško ime, geslo, ali napačne nastavitve usmerjevalnika oziroma "
+#~ "požarnega zidu"
diff --git a/po/sq.po b/po/sq.po
index ce15fbae..0a74d47f 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline 0.15 \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-09 16:26+0200\n"
+"POT-Creation-Date: 2008-02-21 18:21+0100\n"
 "PO-Revision-Date: 2002-09-24 15:30+0100\n"
 "Last-Translator: Naim Daka <naim70@freesurf.ch>\n"
 "Language-Team: Albanian <LL@li.org>\n"
@@ -17,29 +17,29 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. -PO: here %s will be replaced by the local time (eg: "Will check updates at 14:03:50"
-#: ../mdkapplet:94
+#: ../mdkapplet:88
 #, fuzzy, c-format
 msgid "Will check updates at %s"
 msgstr "Azhurnimet e sigurisë"
 
-#: ../mdkapplet:103
+#: ../mdkapplet:97
 #, c-format
 msgid "Your system is up-to-date"
 msgstr ""
 
-#: ../mdkapplet:109
+#: ../mdkapplet:103
 #, fuzzy, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
 "support@mandrivaonline.com"
 msgstr "Për çdo problem na dërgoni një e-mail në suppport@mandrivaonline.com\n"
 
-#: ../mdkapplet:115
+#: ../mdkapplet:110
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "Një moment ju lutemi, gjetja e pakove të lira..."
 
-#: ../mdkapplet:121
+#: ../mdkapplet:116
 #, fuzzy, c-format
 msgid "New updates are available for your system"
 msgstr ""
@@ -48,47 +48,33 @@ msgstr ""
 "%s\n"
 "janë lidhur direkt në sistemin tuaj.\n"
 
-#: ../mdkapplet:127
-#, fuzzy, c-format
-msgid "New bundles are available for your system"
-msgstr ""
-"Skanerët e radhitur\n"
-"\n"
-"%s\n"
-"janë lidhur direkt në sistemin tuaj.\n"
-
-#: ../mdkapplet:133
-#, c-format
-msgid "Service is not configured. Please click on \"Configure the service\""
-msgstr ""
-
-#: ../mdkapplet:139
+#: ../mdkapplet:122
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr ""
 
-#: ../mdkapplet:145
+#: ../mdkapplet:128
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr ""
 
-#: ../mdkapplet:151 ../mdkapplet:182
+#: ../mdkapplet:134 ../mdkapplet:165
 #, fuzzy, c-format
 msgid "urpmi database locked"
 msgstr "baza e të dhënave urpmi është e mbyllur"
 
-#: ../mdkapplet:157
+#: ../mdkapplet:140
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
-#: ../mdkapplet:163
+#: ../mdkapplet:146
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
 msgstr ""
 
-#: ../mdkapplet:169
+#: ../mdkapplet:152
 #, fuzzy, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -105,575 +91,131 @@ msgstr ""
 "\n"
 "Dhe, riniseni %s."
 
-#: ../mdkapplet:174
+#: ../mdkapplet:157
 #, c-format
 msgid "Enabled"
 msgstr "Aktivizuar"
 
-#: ../mdkapplet:187
+#: ../mdkapplet:170
 #, c-format
 msgid "Error updating media"
 msgstr ""
 
-#: ../mdkapplet:202
+#: ../mdkapplet:185
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr ""
 
-#: ../mdkapplet:207
+#: ../mdkapplet:190
 #, c-format
 msgid "Packages are up to date"
 msgstr ""
 
-#: ../mdkapplet:212
+#: ../mdkapplet:195
 #, fuzzy, c-format
 msgid "Failed to open urpmi database"
 msgstr "e pa mundur hapja e rpmdb"
 
-#: ../mdkapplet:217 ../mdkapplet:324
+#: ../mdkapplet:200
 #, c-format
 msgid "Install updates"
 msgstr "Instaloi azhurnimet"
 
-#: ../mdkapplet:218
-#, fuzzy, c-format
-msgid "Configure the service"
-msgstr "Konfiguro"
-
-#: ../mdkapplet:219
+#: ../mdkapplet:201
 #, fuzzy, c-format
 msgid "Check Updates"
 msgstr "Azhurnimi"
 
-#: ../mdkapplet:220 ../mdkapplet:327 ../mdkonline:114 ../mdkonline:155
-#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
-#, c-format
-msgid "Please wait"
-msgstr "Një moment ju lutemi"
-
-#: ../mdkapplet:220 ../mdkapplet:326 ../mdkapplet:327
-#, fuzzy, c-format
-msgid "Check updates"
-msgstr "Azhurnimet e sigurisë"
-
-#: ../mdkapplet:223 ../mdkapplet:648
-#, c-format
-msgid "Online WebSite"
-msgstr ""
-
-#: ../mdkapplet:224
+#: ../mdkapplet:202
 #, fuzzy, c-format
 msgid "Configure Network"
 msgstr "Konfigurim i rrjetin"
 
-#: ../mdkapplet:225
-#, fuzzy, c-format
-msgid "Configure Now!"
-msgstr "Lexim i konfiguracionit\n"
-
-#: ../mdkapplet:313 ../mdkapplet:392
-#, fuzzy, c-format
-msgid "Mandriva Linux Updates Applet"
-msgstr "Mandriva Linux dhe jeta e juaj private"
-
-#: ../mdkapplet:322
-#, c-format
-msgid "Actions"
-msgstr "Akcionet"
-
-#: ../mdkapplet:325
-#, c-format
-msgid "Configure"
-msgstr "Konfiguro"
-
-#: ../mdkapplet:329
-#, fuzzy, c-format
-msgid "See logs"
-msgstr "Kërkim +5s"
-
-#: ../mdkapplet:332
-#, c-format
-msgid "Status"
-msgstr "Statusi"
-
-#: ../mdkapplet:336 ../mdkapplet:597
-#, c-format
-msgid "Close"
-msgstr "Mbylle"
-
-#: ../mdkapplet:365
-#, fuzzy, c-format
-msgid "Network Connection: "
-msgstr "Lidhje Virtuale në Rrjet"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Up"
-msgstr "Lartë"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Down"
-msgstr "Poshtë"
-
-#: ../mdkapplet:366
-#, c-format
-msgid "Last check: "
-msgstr ""
-
-#: ../mdkapplet:367 ../mdkonline:145
-#, c-format
-msgid "Machine name:"
-msgstr "Emri i Makinës:"
-
-#: ../mdkapplet:368
-#, fuzzy, c-format
-msgid "Updates: "
-msgstr "Azhurnimi"
-
-#: ../mdkapplet:372
+#: ../mdkapplet:283
 #, fuzzy, c-format
 msgid "Launching drakconnect\n"
 msgstr "Nise userdrake"
 
-#: ../mdkapplet:375
+#: ../mdkapplet:286
 #, c-format
 msgid "Mandriva Online seems to be reinstalled, reloading applet ...."
 msgstr ""
 
-#: ../mdkapplet:383
+#: ../mdkapplet:294
 #, c-format
 msgid "Launching MandrivaUpdate\n"
 msgstr ""
 
-#: ../mdkapplet:398
+#: ../mdkapplet:303
+#, fuzzy, c-format
+msgid "Mandriva Linux Updates Applet"
+msgstr "Mandriva Linux dhe jeta e juaj private"
+
+#: ../mdkapplet:308
 #, fuzzy, c-format
 msgid "Computing new updates...\n"
 msgstr "Lidhje e ballafaquar"
 
-#: ../mdkapplet:399
+#: ../mdkapplet:309
 #, fuzzy, c-format
 msgid "Connecting to"
 msgstr "Lidhje e ballafaquar"
 
-#: ../mdkapplet:467 ../mdkupdate:159 ../mdkupdate:188
-#, c-format
-msgid "An error occurred"
-msgstr "Një gabim është paraqitur"
-
-#: ../mdkapplet:475
-#, c-format
-msgid "Development release not supported by service"
-msgstr ""
-
-#: ../mdkapplet:476
-#, c-format
-msgid "Too old release not supported by service"
-msgstr ""
-
-#: ../mdkapplet:477
-#, fuzzy, c-format
-msgid "Unknown state"
-msgstr "Ftues i pa njoftur"
-
-#: ../mdkapplet:478
-#, c-format
-msgid "Online services disabled. Contact Mandriva Online site\n"
-msgstr ""
-
-#: ../mdkapplet:479
-#, c-format
-msgid "Wrong Password.\n"
-msgstr "Parulla e gabuar.\n"
-
-#: ../mdkapplet:480
-#, c-format
-msgid "Wrong Action or host or login.\n"
-msgstr ""
-
-#: ../mdkapplet:481
-#, c-format
-msgid ""
-"Something is wrong with your network settings (check your route, firewall or "
-"proxy settings)\n"
-msgstr ""
-
-#: ../mdkapplet:483
-#, c-format
-msgid ""
-"Problem occured while connecting to the server, please contact the support "
-"team"
-msgstr ""
-
-#: ../mdkapplet:487
-#, fuzzy, c-format
-msgid "Response from Mandriva Online server\n"
-msgstr "Mirë se Vini në Mandriva Online"
-
-#: ../mdkapplet:490
+#: ../mdkapplet:386
 #, fuzzy, c-format
 msgid "System is up-to-date\n"
 msgstr "Modë i sistemit"
 
-#: ../mdkapplet:527
-#, c-format
-msgid "No check"
-msgstr ""
-
-#: ../mdkapplet:541
-#, c-format
-msgid "Checking config file: Not present\n"
-msgstr ""
-
-#: ../mdkapplet:544
+#: ../mdkapplet:415
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr ""
 
-#: ../mdkapplet:587
+#: ../mdkapplet:457 ../mdkupdate:118 ../mdkupdate:164
 #, c-format
-msgid "Logs"
-msgstr "Të përditëshmet"
-
-#: ../mdkapplet:603
-#, c-format
-msgid "Clear"
-msgstr "Pastro"
+msgid "Warning"
+msgstr "Kujdes"
 
-#: ../mdkapplet:629
+#: ../mdkapplet:468
 #, c-format
 msgid "About..."
 msgstr "Në lidhje me..."
 
-#: ../mdkapplet:631
+#: ../mdkapplet:472
 #, fuzzy, c-format
 msgid "Mandriva Online %s"
 msgstr "Mandriva Online"
 
-#: ../mdkapplet:635
+#: ../mdkapplet:473
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr ""
 
-#: ../mdkapplet:647
+#: ../mdkapplet:476
 #, c-format
 msgid "Mandriva Online gives access to Mandriva web services."
 msgstr ""
 
-#: ../mdkapplet:655
-#, c-format
-msgid "Always launch on startup"
-msgstr ""
-
-#: ../mdkapplet:657
-#, c-format
-msgid "Quit"
-msgstr "Dalje"
-
-#: ../mdkonline:58
-#, c-format
-msgid ""
-"mdonline version %s\n"
-"Copyright (C) %s Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"mdonline versioni %s\n"
-"E drejtë autori (C) %s Mandriva.\n"
-"Ky është software gratis dhe mund të shpërndahet ndër termet e GNU GPL.\n"
-"\n"
-"përdorim:\n"
-
-#: ../mdkonline:63 ../mdkupdate:73
-#, c-format
-msgid "  --help\t\t- print this help message.\n"
-msgstr "  --help\t\t- çfaqe këtë lajm ndihmues.\n"
-
-#: ../mdkonline:64
-#, c-format
-msgid "  --box=\t\t\t- hostname.\n"
-msgstr ""
-
-#: ../mdkonline:65
-#, c-format
-msgid "  --country\t\t\t- name of country of the user. \n"
-msgstr ""
-
-#: ../mdkonline:66
-#, c-format
-msgid "  --interactive\t\t- use the interactive mode.\n"
-msgstr ""
-
-#: ../mdkonline:67
-#, c-format
-msgid "  --nointeractive\t- use the non-interactive mode.\n"
-msgstr ""
-
-#: ../mdkonline:68
-#, c-format
-msgid "  --login=\t\t     - login name of the user.\n"
-msgstr ""
-
-#: ../mdkonline:69
-#, c-format
-msgid "  --pass=\t\t\t- password  of the user.\n"
-msgstr ""
-
-#: ../mdkonline:87 ../mdkonline:120
-#, c-format
-msgid "Mandriva Online"
-msgstr "Mandriva Online"
-
-#: ../mdkonline:90
-#, c-format
-msgid "I already have an account"
-msgstr ""
-
-#: ../mdkonline:91
-#, c-format
-msgid "I want to subscribe"
-msgstr ""
-
-#: ../mdkonline:96
-#, c-format
-msgid "Mr."
-msgstr ""
-
-#: ../mdkonline:96
-#, fuzzy, c-format
-msgid "Mrs."
-msgstr "XMrIs"
-
-#: ../mdkonline:96
-#, c-format
-msgid "Ms."
-msgstr ""
-
-#: ../mdkonline:114
-#, c-format
-msgid "Reading configuration\n"
-msgstr "Lexim i konfiguracionit\n"
-
-#: ../mdkonline:123
-#, c-format
-msgid ""
-"This assistant will help you to upload your configuration\n"
-"(packages, hardware configuration) to a centralized database in\n"
-"order to keep you informed about security updates and useful upgrades.\n"
-msgstr ""
-"Ky asitent do të ju ndihmojë që ta dërgoni konfigurimin tuaj (listën e \n"
-"pakove, konfigurimin e materialit) në drejtim të një baze të të dhënave "
-"qendrore\n"
-"që në fund të ju informon për azhurnimin e sigurisë.\n"
-
-#: ../mdkonline:131
-#, c-format
-msgid "Account creation or authentication"
-msgstr ""
-
-#: ../mdkonline:136
-#, c-format
-msgid "Enter your Mandriva Online login, password and machine name:"
-msgstr "Hyni loginin, parullën dhe emrin e makinës suaj në Mandriva Online:"
-
-#: ../mdkonline:142 ../mdkonline:195
-#, fuzzy, c-format
-msgid "Email address:"
-msgstr "Adresa IP"
-
-#: ../mdkonline:143
-#, c-format
-msgid "Country"
-msgstr "Shteti"
-
-#: ../mdkonline:144 ../mdkonline:196
-#, c-format
-msgid "Password:"
-msgstr "Parulla:"
-
-#: ../mdkonline:146
-#, fuzzy, c-format
-msgid "Machine description:"
-msgstr "Emri i Makinës:"
-
-#: ../mdkonline:147
-#, c-format
-msgid "(Ex: My Home Office's Computer)"
-msgstr ""
-
-#: ../mdkonline:152 ../mdkonline:159 ../mdkonline:180 ../mdkonline:204
-#: ../mdkonline:208 ../mdkonline:212 ../mdkonline:217 ../mdkupdate:141
-#: ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
-#, c-format
-msgid "Error"
-msgstr "Gabim"
-
-#: ../mdkonline:152
-#, fuzzy, c-format
-msgid "Machine name must be 1 to 40 alphanumerical characters"
-msgstr "Pikat montuese duhet të posedojnë vetëm shkronja dhe numëra"
-
-#: ../mdkonline:155
-#, fuzzy, c-format
-msgid "Connecting to Mandriva Online website..."
-msgstr "Mirë se Vini në Mandriva Online"
-
-#: ../mdkonline:167
-#, c-format
-msgid ""
-"In order to benefit from Mandriva Online services,\n"
-"we are about to upload your configuration.\n"
-"\n"
-"The Wizard will now send the following information to Mandriva:\n"
-"\n"
-"1) the list of packages you have installed on your system,\n"
-"\n"
-"2) your hardware configuration.\n"
-"\n"
-"If you feel uncomfortable by that idea, or do not want to benefit from this "
-"service,\n"
-"please press 'Cancel'. By pressing 'Next', you allow us to keep you "
-"informed\n"
-"about security updates and useful upgrades via personalized email alerts.\n"
-"Furthermore, you benefit from discounted paid support services on\n"
-"www.mandrivaexpert.com."
-msgstr ""
-"Më në fund që të përfitoni nga servicet Mandriva Online,\n"
-"ne jeni përsipër në marrjes e të dhënave mbi konfigurimin tuaj.\n"
-"Asistenti do të ju komunikoj të dhënat e poshtë të shënuara në Mandriva:\n"
-"\n"
-"1) listën e pakove të cilat i keni instaluar në sistemin tuaj,\n"
-"\n"
-"2) konfigurimin e hardwarit tuaj.\n"
-"\n"
-"Nëse ju nuk e ndieni veten të qetë me këtë ide, e ne nuk keni dëshirë që të "
-"përfitoni nga këto service,\n"
-"ju lutemi shtypni 'Anulo'. Me shtypje mbi 'Tjetri', ju do të na mundësoni që "
-"të ju informojmë për azhurnimin e sigurisë\n"
-"përmirësime të përdorshme me lidhje të azhurnimit të sigurisë drejt e-mail "
-"elektronike.\n"
-"Njashtu, ju përfitoni në vënie të serviseve ndihmuese të paguara në\n"
-"www.mandrivaexpert.com"
-
-#: ../mdkonline:180
-#, c-format
-msgid "Connection problem"
-msgstr "Lidhje e ballafaquar"
-
-#: ../mdkonline:180
-#, c-format
-msgid "Problem occurs when uploading files, please try again"
-msgstr ""
-
-#: ../mdkonline:187
-#, fuzzy, c-format
-msgid "Create a Mandriva Online Account"
-msgstr "Kontoja e Klubit Mandriva"
-
-#. -PO: that is for things like "Mr", "Ms",...
-#: ../mdkonline:192
-#, fuzzy, c-format
-msgid "Greeting:"
-msgstr "Gjelbërt"
-
-#: ../mdkonline:193
-#, fuzzy, c-format
-msgid "First name:"
-msgstr "Emri:"
-
-#: ../mdkonline:194
-#, fuzzy, c-format
-msgid "Last name:"
-msgstr "Emri ftues:"
-
-#: ../mdkonline:197
-#, c-format
-msgid "Confirm Password:"
-msgstr "Konfirmoje Parullën:"
-
-#: ../mdkonline:204
-#, c-format
-msgid ""
-"The passwords do not match\n"
-" Please try again\n"
-msgstr ""
-"Parulla e juaj nuk pëputhet\n"
-" Ju lutemi provoni edhe një herë\n"
-
-#: ../mdkonline:208
-#, fuzzy, c-format
-msgid "Please fill in each field"
-msgstr "Ju lutemi mbushni dhe verifikoni zonat plotësuese"
-
-#: ../mdkonline:212
-#, c-format
-msgid "Not a valid mail address!\n"
-msgstr "Nuk është një adresë e-mail valide!\n"
-
-#: ../mdkonline:217
-#, c-format
-msgid "Creating account failed!"
-msgstr ""
-
-#: ../mdkonline:225
-#, c-format
-msgid ""
-"Mandriva Online Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
-msgstr ""
-
-#: ../mdkonline:229
-#, c-format
-msgid "Your upload was successful!"
-msgstr "Dërgesa e juaj ishte me sukses!"
-
-#: ../mdkonline:229
+#: ../mdkapplet:478
 #, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandriva Online."
+msgid "Online WebSite"
 msgstr ""
-"Prej ketij momenti Mandriva Online do të ju dërgon azhurnimet\n"
-"e reja të sigurisë."
 
-#: ../mdkonline:229
+#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
+#: ../mdkapplet:483
 #, c-format
-msgid ""
-"Mandriva Online offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
+msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
-"Mandriva Online ju mundëson që ti automatozoni azhurnimet e reja.\n"
-"Një program do të starton rregulisht në makinën tuaj për pritjen e "
-"azhurnimeve të reja.\n"
-
-#: ../mdkonline:238
-#, c-format
-msgid "Congratulations"
-msgstr "Urime"
 
-#: ../mdkonline:238
+#: ../mdkapplet:492
 #, c-format
-msgid "Your Mandriva Online account has been successfully configured\n"
+msgid "Always launch on startup"
 msgstr ""
 
-#: ../mdkonline:253
-#, fuzzy, c-format
-msgid "Configuration uploaded successfully"
-msgstr "Dërgesa e juaj ishte me sukses!"
-
-#: ../mdkonline:254
-#, fuzzy, c-format
-msgid "Problem uploading configuration"
-msgstr "Lexim i konfiguracionit\n"
-
-#: ../mdkonline:256
+#: ../mdkapplet:494
 #, c-format
-msgid ""
-"Cannot connect to Mandriva Online website: wrong login/password or router/"
-"firewall bad settings"
-msgstr ""
+msgid "Quit"
+msgstr "Dalje"
 
 #: ../mdkonline.pm:207
 #, fuzzy, c-format
@@ -813,6 +355,11 @@ msgstr ""
 "\n"
 "përdorim:\n"
 
+#: ../mdkupdate:73
+#, c-format
+msgid "  --help\t\t- print this help message.\n"
+msgstr "  --help\t\t- çfaqe këtë lajm ndihmues.\n"
+
 #: ../mdkupdate:74
 #, fuzzy, c-format
 msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
@@ -840,11 +387,6 @@ msgid ""
 "file.\n"
 msgstr ""
 
-#: ../mdkupdate:118 ../mdkupdate:164
-#, c-format
-msgid "Warning"
-msgstr "Kujdes"
-
 #. -PO: here Live Install is currently *NOT* translated on the desktop, so it's better to keep as it:
 #: ../mdkupdate:120
 #, c-format
@@ -853,11 +395,21 @@ msgid ""
 "Install' wizard."
 msgstr ""
 
+#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
+#, c-format
+msgid "Please wait"
+msgstr "Një moment ju lutemi"
+
 #: ../mdkupdate:123 ../mdkupdate:174
 #, c-format
 msgid "Preparing..."
 msgstr "Përgatitje..."
 
+#: ../mdkupdate:141 ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
+#, c-format
+msgid "Error"
+msgstr "Gabim"
+
 #: ../mdkupdate:141
 #, c-format
 msgid ""
@@ -866,6 +418,11 @@ msgid ""
 "%s"
 msgstr ""
 
+#: ../mdkupdate:159 ../mdkupdate:188
+#, c-format
+msgid "An error occurred"
+msgstr "Një gabim është paraqitur"
+
 #: ../mdkupdate:164
 #, c-format
 msgid ""
@@ -891,6 +448,236 @@ msgid "Unable to update packages from update_source medium.\n"
 msgstr "I pa mundur azhurnimi i pakove nga update_source mesatar.\n"
 
 #, fuzzy
+#~ msgid "New bundles are available for your system"
+#~ msgstr ""
+#~ "Skanerët e radhitur\n"
+#~ "\n"
+#~ "%s\n"
+#~ "janë lidhur direkt në sistemin tuaj.\n"
+
+#, fuzzy
+#~ msgid "Configure the service"
+#~ msgstr "Konfiguro"
+
+#, fuzzy
+#~ msgid "Check updates"
+#~ msgstr "Azhurnimet e sigurisë"
+
+#, fuzzy
+#~ msgid "Configure Now!"
+#~ msgstr "Lexim i konfiguracionit\n"
+
+#~ msgid "Actions"
+#~ msgstr "Akcionet"
+
+#~ msgid "Configure"
+#~ msgstr "Konfiguro"
+
+#, fuzzy
+#~ msgid "See logs"
+#~ msgstr "Kërkim +5s"
+
+#~ msgid "Status"
+#~ msgstr "Statusi"
+
+#~ msgid "Close"
+#~ msgstr "Mbylle"
+
+#, fuzzy
+#~ msgid "Network Connection: "
+#~ msgstr "Lidhje Virtuale në Rrjet"
+
+#~ msgid "Up"
+#~ msgstr "Lartë"
+
+#~ msgid "Down"
+#~ msgstr "Poshtë"
+
+#~ msgid "Machine name:"
+#~ msgstr "Emri i Makinës:"
+
+#, fuzzy
+#~ msgid "Updates: "
+#~ msgstr "Azhurnimi"
+
+#, fuzzy
+#~ msgid "Unknown state"
+#~ msgstr "Ftues i pa njoftur"
+
+#~ msgid "Wrong Password.\n"
+#~ msgstr "Parulla e gabuar.\n"
+
+#, fuzzy
+#~ msgid "Response from Mandriva Online server\n"
+#~ msgstr "Mirë se Vini në Mandriva Online"
+
+#~ msgid "Logs"
+#~ msgstr "Të përditëshmet"
+
+#~ msgid "Clear"
+#~ msgstr "Pastro"
+
+#~ msgid ""
+#~ "mdonline version %s\n"
+#~ "Copyright (C) %s Mandriva.\n"
+#~ "This is free software and may be redistributed under the terms of the GNU "
+#~ "GPL.\n"
+#~ "\n"
+#~ "usage:\n"
+#~ msgstr ""
+#~ "mdonline versioni %s\n"
+#~ "E drejtë autori (C) %s Mandriva.\n"
+#~ "Ky është software gratis dhe mund të shpërndahet ndër termet e GNU GPL.\n"
+#~ "\n"
+#~ "përdorim:\n"
+
+#~ msgid "Mandriva Online"
+#~ msgstr "Mandriva Online"
+
+#, fuzzy
+#~ msgid "Mrs."
+#~ msgstr "XMrIs"
+
+#~ msgid "Reading configuration\n"
+#~ msgstr "Lexim i konfiguracionit\n"
+
+#~ msgid ""
+#~ "This assistant will help you to upload your configuration\n"
+#~ "(packages, hardware configuration) to a centralized database in\n"
+#~ "order to keep you informed about security updates and useful upgrades.\n"
+#~ msgstr ""
+#~ "Ky asitent do të ju ndihmojë që ta dërgoni konfigurimin tuaj (listën e \n"
+#~ "pakove, konfigurimin e materialit) në drejtim të një baze të të dhënave "
+#~ "qendrore\n"
+#~ "që në fund të ju informon për azhurnimin e sigurisë.\n"
+
+#~ msgid "Enter your Mandriva Online login, password and machine name:"
+#~ msgstr "Hyni loginin, parullën dhe emrin e makinës suaj në Mandriva Online:"
+
+#, fuzzy
+#~ msgid "Email address:"
+#~ msgstr "Adresa IP"
+
+#~ msgid "Country"
+#~ msgstr "Shteti"
+
+#~ msgid "Password:"
+#~ msgstr "Parulla:"
+
+#, fuzzy
+#~ msgid "Machine description:"
+#~ msgstr "Emri i Makinës:"
+
+#, fuzzy
+#~ msgid "Machine name must be 1 to 40 alphanumerical characters"
+#~ msgstr "Pikat montuese duhet të posedojnë vetëm shkronja dhe numëra"
+
+#, fuzzy
+#~ msgid "Connecting to Mandriva Online website..."
+#~ msgstr "Mirë se Vini në Mandriva Online"
+
+#~ msgid ""
+#~ "In order to benefit from Mandriva Online services,\n"
+#~ "we are about to upload your configuration.\n"
+#~ "\n"
+#~ "The Wizard will now send the following information to Mandriva:\n"
+#~ "\n"
+#~ "1) the list of packages you have installed on your system,\n"
+#~ "\n"
+#~ "2) your hardware configuration.\n"
+#~ "\n"
+#~ "If you feel uncomfortable by that idea, or do not want to benefit from "
+#~ "this service,\n"
+#~ "please press 'Cancel'. By pressing 'Next', you allow us to keep you "
+#~ "informed\n"
+#~ "about security updates and useful upgrades via personalized email "
+#~ "alerts.\n"
+#~ "Furthermore, you benefit from discounted paid support services on\n"
+#~ "www.mandrivaexpert.com."
+#~ msgstr ""
+#~ "Më në fund që të përfitoni nga servicet Mandriva Online,\n"
+#~ "ne jeni përsipër në marrjes e të dhënave mbi konfigurimin tuaj.\n"
+#~ "Asistenti do të ju komunikoj të dhënat e poshtë të shënuara në Mandriva:\n"
+#~ "\n"
+#~ "1) listën e pakove të cilat i keni instaluar në sistemin tuaj,\n"
+#~ "\n"
+#~ "2) konfigurimin e hardwarit tuaj.\n"
+#~ "\n"
+#~ "Nëse ju nuk e ndieni veten të qetë me këtë ide, e ne nuk keni dëshirë që "
+#~ "të përfitoni nga këto service,\n"
+#~ "ju lutemi shtypni 'Anulo'. Me shtypje mbi 'Tjetri', ju do të na mundësoni "
+#~ "që të ju informojmë për azhurnimin e sigurisë\n"
+#~ "përmirësime të përdorshme me lidhje të azhurnimit të sigurisë drejt e-"
+#~ "mail elektronike.\n"
+#~ "Njashtu, ju përfitoni në vënie të serviseve ndihmuese të paguara në\n"
+#~ "www.mandrivaexpert.com"
+
+#~ msgid "Connection problem"
+#~ msgstr "Lidhje e ballafaquar"
+
+#, fuzzy
+#~ msgid "Create a Mandriva Online Account"
+#~ msgstr "Kontoja e Klubit Mandriva"
+
+#, fuzzy
+#~ msgid "Greeting:"
+#~ msgstr "Gjelbërt"
+
+#, fuzzy
+#~ msgid "First name:"
+#~ msgstr "Emri:"
+
+#, fuzzy
+#~ msgid "Last name:"
+#~ msgstr "Emri ftues:"
+
+#~ msgid "Confirm Password:"
+#~ msgstr "Konfirmoje Parullën:"
+
+#~ msgid ""
+#~ "The passwords do not match\n"
+#~ " Please try again\n"
+#~ msgstr ""
+#~ "Parulla e juaj nuk pëputhet\n"
+#~ " Ju lutemi provoni edhe një herë\n"
+
+#, fuzzy
+#~ msgid "Please fill in each field"
+#~ msgstr "Ju lutemi mbushni dhe verifikoni zonat plotësuese"
+
+#~ msgid "Not a valid mail address!\n"
+#~ msgstr "Nuk është një adresë e-mail valide!\n"
+
+#~ msgid "Your upload was successful!"
+#~ msgstr "Dërgesa e juaj ishte me sukses!"
+
+#~ msgid ""
+#~ "From now you will receive on security and updates \n"
+#~ "announcements thanks to Mandriva Online."
+#~ msgstr ""
+#~ "Prej ketij momenti Mandriva Online do të ju dërgon azhurnimet\n"
+#~ "e reja të sigurisë."
+
+#~ msgid ""
+#~ "Mandriva Online offers you the ability to automate the updates.\n"
+#~ "A program will run regulary in your system waiting for new updates\n"
+#~ msgstr ""
+#~ "Mandriva Online ju mundëson që ti automatozoni azhurnimet e reja.\n"
+#~ "Një program do të starton rregulisht në makinën tuaj për pritjen e "
+#~ "azhurnimeve të reja.\n"
+
+#~ msgid "Congratulations"
+#~ msgstr "Urime"
+
+#, fuzzy
+#~ msgid "Configuration uploaded successfully"
+#~ msgstr "Dërgesa e juaj ishte me sukses!"
+
+#, fuzzy
+#~ msgid "Problem uploading configuration"
+#~ msgstr "Lexim i konfiguracionit\n"
+
+#, fuzzy
 #~ msgid "  --applet\t\t- launch Mandriva Update.\n"
 #~ msgstr "  --applet\t\t- azhurnoi të gjitha informacionet.\n"
 
diff --git a/po/sr.po b/po/sr.po
index b545df3b..bc016ac5 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-09 16:26+0200\n"
+"POT-Creation-Date: 2008-02-21 18:21+0100\n"
 "PO-Revision-Date: 2003-02-15 09:31+0100\n"
 "Last-Translator: Toma Jankovic <tomaja@net.yu>\n"
 "Language-Team: Serbian <i18n@mandrake.co.yu>\n"
@@ -19,17 +19,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:94
+#: ../mdkapplet:88
 #, fuzzy, c-format
 msgid "Will check updates at %s"
 msgstr "Сигурносне надоградње"
 
-#: ../mdkapplet:103
+#: ../mdkapplet:97
 #, c-format
 msgid "Your system is up-to-date"
 msgstr ""
 
-#: ../mdkapplet:109
+#: ../mdkapplet:103
 #, fuzzy, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -38,12 +38,12 @@ msgstr ""
 "Уколико имате било какав проблем пошаљите e-mail на support@mandrivaonline."
 "net\n"
 
-#: ../mdkapplet:115
+#: ../mdkapplet:110
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "Молим Вас сачекајте, проналазим доступне пакете..."
 
-#: ../mdkapplet:121
+#: ../mdkapplet:116
 #, fuzzy, c-format
 msgid "New updates are available for your system"
 msgstr ""
@@ -52,47 +52,33 @@ msgstr ""
 "%s\n"
 "су директно повезани на ваш систем.\n"
 
-#: ../mdkapplet:127
-#, fuzzy, c-format
-msgid "New bundles are available for your system"
-msgstr ""
-"Следећи скенери\n"
-"\n"
-"%s\n"
-"су директно повезани на ваш систем.\n"
-
-#: ../mdkapplet:133
-#, c-format
-msgid "Service is not configured. Please click on \"Configure the service\""
-msgstr ""
-
-#: ../mdkapplet:139
+#: ../mdkapplet:122
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr ""
 
-#: ../mdkapplet:145
+#: ../mdkapplet:128
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr ""
 
-#: ../mdkapplet:151 ../mdkapplet:182
+#: ../mdkapplet:134 ../mdkapplet:165
 #, fuzzy, c-format
 msgid "urpmi database locked"
 msgstr "urpmi база података закључана"
 
-#: ../mdkapplet:157
+#: ../mdkapplet:140
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
-#: ../mdkapplet:163
+#: ../mdkapplet:146
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
 msgstr ""
 
-#: ../mdkapplet:169
+#: ../mdkapplet:152
 #, fuzzy, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -110,551 +96,131 @@ msgstr ""
 "\n"
 "Затим  рестартујте  %s."
 
-#: ../mdkapplet:174
+#: ../mdkapplet:157
 #, c-format
 msgid "Enabled"
 msgstr "Укључи"
 
-#: ../mdkapplet:187
+#: ../mdkapplet:170
 #, c-format
 msgid "Error updating media"
 msgstr ""
 
-#: ../mdkapplet:202
+#: ../mdkapplet:185
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr ""
 
-#: ../mdkapplet:207
+#: ../mdkapplet:190
 #, c-format
 msgid "Packages are up to date"
 msgstr ""
 
-#: ../mdkapplet:212
+#: ../mdkapplet:195
 #, fuzzy, c-format
 msgid "Failed to open urpmi database"
 msgstr "не могу да отворим rpmdb"
 
-#: ../mdkapplet:217 ../mdkapplet:324
+#: ../mdkapplet:200
 #, c-format
 msgid "Install updates"
 msgstr "Инсталирај update-ове"
 
-#: ../mdkapplet:218
-#, fuzzy, c-format
-msgid "Configure the service"
-msgstr "Подеси"
-
-#: ../mdkapplet:219
+#: ../mdkapplet:201
 #, fuzzy, c-format
 msgid "Check Updates"
 msgstr "Ажурирање"
 
-#: ../mdkapplet:220 ../mdkapplet:327 ../mdkonline:114 ../mdkonline:155
-#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
-#, c-format
-msgid "Please wait"
-msgstr "Само моменат..."
-
-#: ../mdkapplet:220 ../mdkapplet:326 ../mdkapplet:327
-#, fuzzy, c-format
-msgid "Check updates"
-msgstr "Сигурносне надоградње"
-
-#: ../mdkapplet:223 ../mdkapplet:648
-#, c-format
-msgid "Online WebSite"
-msgstr ""
-
-#: ../mdkapplet:224
+#: ../mdkapplet:202
 #, fuzzy, c-format
 msgid "Configure Network"
 msgstr "Подеси мрежу"
 
-#: ../mdkapplet:225
-#, fuzzy, c-format
-msgid "Configure Now!"
-msgstr "Подеси веб"
-
-#: ../mdkapplet:313 ../mdkapplet:392
-#, fuzzy, c-format
-msgid "Mandriva Linux Updates Applet"
-msgstr "Mandriva Update"
-
-#: ../mdkapplet:322
-#, c-format
-msgid "Actions"
-msgstr "Акције"
-
-#: ../mdkapplet:325
-#, c-format
-msgid "Configure"
-msgstr "Подеси"
-
-#: ../mdkapplet:329
-#, fuzzy, c-format
-msgid "See logs"
-msgstr "Тражи +5s"
-
-#: ../mdkapplet:332
-#, c-format
-msgid "Status"
-msgstr "Статус"
-
-#: ../mdkapplet:336 ../mdkapplet:597
-#, c-format
-msgid "Close"
-msgstr "Затвори"
-
-#: ../mdkapplet:365
-#, fuzzy, c-format
-msgid "Network Connection: "
-msgstr "Конекција за Виртуелни Мрежу"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Up"
-msgstr "горе"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Down"
-msgstr "Доле"
-
-#: ../mdkapplet:366
-#, c-format
-msgid "Last check: "
-msgstr ""
-
-#: ../mdkapplet:367 ../mdkonline:145
-#, fuzzy, c-format
-msgid "Machine name:"
-msgstr "Минице"
-
-#: ../mdkapplet:368
-#, fuzzy, c-format
-msgid "Updates: "
-msgstr "Ажурирање"
-
-#: ../mdkapplet:372
+#: ../mdkapplet:283
 #, fuzzy, c-format
 msgid "Launching drakconnect\n"
 msgstr "Покрени userdrake"
 
-#: ../mdkapplet:375
+#: ../mdkapplet:286
 #, c-format
 msgid "Mandriva Online seems to be reinstalled, reloading applet ...."
 msgstr ""
 
-#: ../mdkapplet:383
+#: ../mdkapplet:294
 #, c-format
 msgid "Launching MandrivaUpdate\n"
 msgstr ""
 
-#: ../mdkapplet:398
+#: ../mdkapplet:303
+#, fuzzy, c-format
+msgid "Mandriva Linux Updates Applet"
+msgstr "Mandriva Update"
+
+#: ../mdkapplet:308
 #, c-format
 msgid "Computing new updates...\n"
 msgstr ""
 
-#: ../mdkapplet:399
+#: ../mdkapplet:309
 #, fuzzy, c-format
 msgid "Connecting to"
 msgstr "Проблем са повезивањем"
 
-#: ../mdkapplet:467 ../mdkupdate:159 ../mdkupdate:188
-#, c-format
-msgid "An error occurred"
-msgstr "Хм,појавила се грешка"
-
-#: ../mdkapplet:475
-#, c-format
-msgid "Development release not supported by service"
-msgstr ""
-
-#: ../mdkapplet:476
-#, c-format
-msgid "Too old release not supported by service"
-msgstr ""
-
-#: ../mdkapplet:477
-#, fuzzy, c-format
-msgid "Unknown state"
-msgstr "Непознато име хоста"
-
-#: ../mdkapplet:478
-#, c-format
-msgid "Online services disabled. Contact Mandriva Online site\n"
-msgstr ""
-
-#: ../mdkapplet:479
-#, fuzzy, c-format
-msgid "Wrong Password.\n"
-msgstr "Потврди лозинку:"
-
-#: ../mdkapplet:480
-#, c-format
-msgid "Wrong Action or host or login.\n"
-msgstr ""
-
-#: ../mdkapplet:481
-#, c-format
-msgid ""
-"Something is wrong with your network settings (check your route, firewall or "
-"proxy settings)\n"
-msgstr ""
-
-#: ../mdkapplet:483
-#, c-format
-msgid ""
-"Problem occured while connecting to the server, please contact the support "
-"team"
-msgstr ""
-
-#: ../mdkapplet:487
-#, fuzzy, c-format
-msgid "Response from Mandriva Online server\n"
-msgstr "Добродошли у Mandriva Linux"
-
-#: ../mdkapplet:490
+#: ../mdkapplet:386
 #, fuzzy, c-format
 msgid "System is up-to-date\n"
 msgstr "Системски мод"
 
-#: ../mdkapplet:527
-#, c-format
-msgid "No check"
-msgstr ""
-
-#: ../mdkapplet:541
-#, fuzzy, c-format
-msgid "Checking config file: Not present\n"
-msgstr "Недостаје конфигурациони фајл %s.\n"
-
-#: ../mdkapplet:544
+#: ../mdkapplet:415
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr ""
 
-#: ../mdkapplet:587
+#: ../mdkapplet:457 ../mdkupdate:118 ../mdkupdate:164
 #, c-format
-msgid "Logs"
-msgstr "Лог записи"
-
-#: ../mdkapplet:603
-#, c-format
-msgid "Clear"
-msgstr "Очисти"
+msgid "Warning"
+msgstr "Упозорење"
 
-#: ../mdkapplet:629
+#: ../mdkapplet:468
 #, c-format
 msgid "About..."
 msgstr "О..."
 
-#: ../mdkapplet:631
+#: ../mdkapplet:472
 #, fuzzy, c-format
 msgid "Mandriva Online %s"
 msgstr "Mandriva Online"
 
-#: ../mdkapplet:635
+#: ../mdkapplet:473
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Сва права (C) %s задржава Мандрива"
 
-#: ../mdkapplet:647
+#: ../mdkapplet:476
 #, c-format
 msgid "Mandriva Online gives access to Mandriva web services."
 msgstr ""
 
-#: ../mdkapplet:655
-#, c-format
-msgid "Always launch on startup"
-msgstr ""
-
-#: ../mdkapplet:657
-#, c-format
-msgid "Quit"
-msgstr "Заврши"
-
-#: ../mdkonline:58
-#, c-format
-msgid ""
-"mdonline version %s\n"
-"Copyright (C) %s Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"mdonline верзија %s\n"
-"Сва права задржава (C) %s Mandriva.\n"
-"Ово је бесплатни софтвер и може се слободно дистрибуирати под условима GNU "
-"GPL лиценце.\n"
-"\n"
-"употреба:\n"
-
-#: ../mdkonline:63 ../mdkupdate:73
-#, c-format
-msgid "  --help\t\t- print this help message.\n"
-msgstr "  --help\t\t- приказује ову поруку.\n"
-
-#: ../mdkonline:64
-#, c-format
-msgid "  --box=\t\t\t- hostname.\n"
-msgstr ""
-
-#: ../mdkonline:65
-#, c-format
-msgid "  --country\t\t\t- name of country of the user. \n"
-msgstr ""
-
-#: ../mdkonline:66
-#, c-format
-msgid "  --interactive\t\t- use the interactive mode.\n"
-msgstr ""
-
-#: ../mdkonline:67
-#, c-format
-msgid "  --nointeractive\t- use the non-interactive mode.\n"
-msgstr ""
-
-#: ../mdkonline:68
-#, c-format
-msgid "  --login=\t\t     - login name of the user.\n"
-msgstr ""
-
-#: ../mdkonline:69
-#, c-format
-msgid "  --pass=\t\t\t- password  of the user.\n"
-msgstr ""
-
-#: ../mdkonline:87 ../mdkonline:120
-#, c-format
-msgid "Mandriva Online"
-msgstr "Mandriva Online"
-
-#: ../mdkonline:90
-#, c-format
-msgid "I already have an account"
-msgstr ""
-
-#: ../mdkonline:91
-#, c-format
-msgid "I want to subscribe"
-msgstr ""
-
-#: ../mdkonline:96
-#, c-format
-msgid "Mr."
-msgstr "г-дин"
-
-#: ../mdkonline:96
-#, c-format
-msgid "Mrs."
-msgstr "г-ђа"
-
-#: ../mdkonline:96
-#, c-format
-msgid "Ms."
-msgstr "г-ђа"
-
-#: ../mdkonline:114
-#, fuzzy, c-format
-msgid "Reading configuration\n"
-msgstr "Поново уносим конфигурацију: "
-
-#: ../mdkonline:123
-#, c-format
-msgid ""
-"This assistant will help you to upload your configuration\n"
-"(packages, hardware configuration) to a centralized database in\n"
-"order to keep you informed about security updates and useful upgrades.\n"
-msgstr ""
-
-#: ../mdkonline:131
-#, c-format
-msgid "Account creation or authentication"
-msgstr ""
-
-#: ../mdkonline:136
-#, c-format
-msgid "Enter your Mandriva Online login, password and machine name:"
-msgstr ""
-
-#: ../mdkonline:142 ../mdkonline:195
-#, fuzzy, c-format
-msgid "Email address:"
-msgstr "IP адреса"
-
-#: ../mdkonline:143
-#, c-format
-msgid "Country"
-msgstr "Држава"
-
-#: ../mdkonline:144 ../mdkonline:196
-#, c-format
-msgid "Password:"
-msgstr "Лозинка:"
-
-#: ../mdkonline:146
-#, fuzzy, c-format
-msgid "Machine description:"
-msgstr "Минице"
-
-#: ../mdkonline:147
-#, c-format
-msgid "(Ex: My Home Office's Computer)"
-msgstr ""
-
-#: ../mdkonline:152 ../mdkonline:159 ../mdkonline:180 ../mdkonline:204
-#: ../mdkonline:208 ../mdkonline:212 ../mdkonline:217 ../mdkupdate:141
-#: ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
-#, c-format
-msgid "Error"
-msgstr "Грешка"
-
-#: ../mdkonline:152
-#, fuzzy, c-format
-msgid "Machine name must be 1 to 40 alphanumerical characters"
-msgstr "Тачке монтирања треба да садрже само алфанумеричке карактере"
-
-#: ../mdkonline:155
-#, fuzzy, c-format
-msgid "Connecting to Mandriva Online website..."
-msgstr "Добродошли у Mandriva Linux"
-
-#: ../mdkonline:167
-#, c-format
-msgid ""
-"In order to benefit from Mandriva Online services,\n"
-"we are about to upload your configuration.\n"
-"\n"
-"The Wizard will now send the following information to Mandriva:\n"
-"\n"
-"1) the list of packages you have installed on your system,\n"
-"\n"
-"2) your hardware configuration.\n"
-"\n"
-"If you feel uncomfortable by that idea, or do not want to benefit from this "
-"service,\n"
-"please press 'Cancel'. By pressing 'Next', you allow us to keep you "
-"informed\n"
-"about security updates and useful upgrades via personalized email alerts.\n"
-"Furthermore, you benefit from discounted paid support services on\n"
-"www.mandrivaexpert.com."
-msgstr ""
-
-#: ../mdkonline:180
-#, c-format
-msgid "Connection problem"
-msgstr "Проблем са повезивањем"
-
-#: ../mdkonline:180
-#, c-format
-msgid "Problem occurs when uploading files, please try again"
-msgstr ""
-
-#: ../mdkonline:187
-#, fuzzy, c-format
-msgid "Create a Mandriva Online Account"
-msgstr "Mandriva Club Рачун"
-
-#. -PO: that is for things like "Mr", "Ms",...
-#: ../mdkonline:192
-#, fuzzy, c-format
-msgid "Greeting:"
-msgstr "Зелена"
-
-#: ../mdkonline:193
-#, c-format
-msgid "First name:"
-msgstr "Име:"
-
-#: ../mdkonline:194
-#, fuzzy, c-format
-msgid "Last name:"
-msgstr "Име:"
-
-#: ../mdkonline:197
-#, c-format
-msgid "Confirm Password:"
-msgstr "Потврди лозинку:"
-
-#: ../mdkonline:204
-#, c-format
-msgid ""
-"The passwords do not match\n"
-" Please try again\n"
-msgstr ""
-"Лозинке се не слажу\n"
-" Покушајте поново\n"
-
-#: ../mdkonline:208
-#, fuzzy, c-format
-msgid "Please fill in each field"
-msgstr "Молим ВАС да попуните или означите поља испод"
-
-#: ../mdkonline:212
-#, c-format
-msgid "Not a valid mail address!\n"
-msgstr "Е-mail адреса није исправна!\n"
-
-#: ../mdkonline:217
-#, c-format
-msgid "Creating account failed!"
-msgstr ""
-
-#: ../mdkonline:225
-#, c-format
-msgid ""
-"Mandriva Online Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
-msgstr ""
-
-#: ../mdkonline:229
-#, c-format
-msgid "Your upload was successful!"
-msgstr ""
-
-#: ../mdkonline:229
-#, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandriva Online."
-msgstr ""
-
-#: ../mdkonline:229
+#: ../mdkapplet:478
 #, c-format
-msgid ""
-"Mandriva Online offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
+msgid "Online WebSite"
 msgstr ""
 
-#: ../mdkonline:238
-#, c-format
-msgid "Congratulations"
-msgstr "Честитке"
-
-#: ../mdkonline:238
+#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
+#: ../mdkapplet:483
 #, c-format
-msgid "Your Mandriva Online account has been successfully configured\n"
+msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
 
-#: ../mdkonline:253
+#: ../mdkapplet:492
 #, c-format
-msgid "Configuration uploaded successfully"
+msgid "Always launch on startup"
 msgstr ""
 
-#: ../mdkonline:254
-#, fuzzy, c-format
-msgid "Problem uploading configuration"
-msgstr "Поново уносим конфигурацију: "
-
-#: ../mdkonline:256
+#: ../mdkapplet:494
 #, c-format
-msgid ""
-"Cannot connect to Mandriva Online website: wrong login/password or router/"
-"firewall bad settings"
-msgstr ""
+msgid "Quit"
+msgstr "Заврши"
 
 #: ../mdkonline.pm:207
 #, fuzzy, c-format
@@ -795,6 +361,11 @@ msgstr ""
 "\n"
 "употреба:\n"
 
+#: ../mdkupdate:73
+#, c-format
+msgid "  --help\t\t- print this help message.\n"
+msgstr "  --help\t\t- приказује ову поруку.\n"
+
 #: ../mdkupdate:74
 #, fuzzy, c-format
 msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
@@ -822,11 +393,6 @@ msgid ""
 "file.\n"
 msgstr ""
 
-#: ../mdkupdate:118 ../mdkupdate:164
-#, c-format
-msgid "Warning"
-msgstr "Упозорење"
-
 #. -PO: here Live Install is currently *NOT* translated on the desktop, so it's better to keep as it:
 #: ../mdkupdate:120
 #, c-format
@@ -835,11 +401,21 @@ msgid ""
 "Install' wizard."
 msgstr ""
 
+#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
+#, c-format
+msgid "Please wait"
+msgstr "Само моменат..."
+
 #: ../mdkupdate:123 ../mdkupdate:174
 #, c-format
 msgid "Preparing..."
 msgstr "Припремам..."
 
+#: ../mdkupdate:141 ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
+#, c-format
+msgid "Error"
+msgstr "Грешка"
+
 #: ../mdkupdate:141
 #, c-format
 msgid ""
@@ -848,6 +424,11 @@ msgid ""
 "%s"
 msgstr ""
 
+#: ../mdkupdate:159 ../mdkupdate:188
+#, c-format
+msgid "An error occurred"
+msgstr "Хм,појавила се грешка"
+
 #: ../mdkupdate:164
 #, c-format
 msgid ""
@@ -873,6 +454,177 @@ msgid "Unable to update packages from update_source medium.\n"
 msgstr "Не могу да ажурирам пакете са update_source медија.\n"
 
 #, fuzzy
+#~ msgid "New bundles are available for your system"
+#~ msgstr ""
+#~ "Следећи скенери\n"
+#~ "\n"
+#~ "%s\n"
+#~ "су директно повезани на ваш систем.\n"
+
+#, fuzzy
+#~ msgid "Configure the service"
+#~ msgstr "Подеси"
+
+#, fuzzy
+#~ msgid "Check updates"
+#~ msgstr "Сигурносне надоградње"
+
+#, fuzzy
+#~ msgid "Configure Now!"
+#~ msgstr "Подеси веб"
+
+#~ msgid "Actions"
+#~ msgstr "Акције"
+
+#~ msgid "Configure"
+#~ msgstr "Подеси"
+
+#, fuzzy
+#~ msgid "See logs"
+#~ msgstr "Тражи +5s"
+
+#~ msgid "Status"
+#~ msgstr "Статус"
+
+#~ msgid "Close"
+#~ msgstr "Затвори"
+
+#, fuzzy
+#~ msgid "Network Connection: "
+#~ msgstr "Конекција за Виртуелни Мрежу"
+
+#~ msgid "Up"
+#~ msgstr "горе"
+
+#~ msgid "Down"
+#~ msgstr "Доле"
+
+#, fuzzy
+#~ msgid "Machine name:"
+#~ msgstr "Минице"
+
+#, fuzzy
+#~ msgid "Updates: "
+#~ msgstr "Ажурирање"
+
+#, fuzzy
+#~ msgid "Unknown state"
+#~ msgstr "Непознато име хоста"
+
+#, fuzzy
+#~ msgid "Wrong Password.\n"
+#~ msgstr "Потврди лозинку:"
+
+#, fuzzy
+#~ msgid "Response from Mandriva Online server\n"
+#~ msgstr "Добродошли у Mandriva Linux"
+
+#, fuzzy
+#~ msgid "Checking config file: Not present\n"
+#~ msgstr "Недостаје конфигурациони фајл %s.\n"
+
+#~ msgid "Logs"
+#~ msgstr "Лог записи"
+
+#~ msgid "Clear"
+#~ msgstr "Очисти"
+
+#~ msgid ""
+#~ "mdonline version %s\n"
+#~ "Copyright (C) %s Mandriva.\n"
+#~ "This is free software and may be redistributed under the terms of the GNU "
+#~ "GPL.\n"
+#~ "\n"
+#~ "usage:\n"
+#~ msgstr ""
+#~ "mdonline верзија %s\n"
+#~ "Сва права задржава (C) %s Mandriva.\n"
+#~ "Ово је бесплатни софтвер и може се слободно дистрибуирати под условима "
+#~ "GNU GPL лиценце.\n"
+#~ "\n"
+#~ "употреба:\n"
+
+#~ msgid "Mandriva Online"
+#~ msgstr "Mandriva Online"
+
+#~ msgid "Mr."
+#~ msgstr "г-дин"
+
+#~ msgid "Mrs."
+#~ msgstr "г-ђа"
+
+#~ msgid "Ms."
+#~ msgstr "г-ђа"
+
+#, fuzzy
+#~ msgid "Reading configuration\n"
+#~ msgstr "Поново уносим конфигурацију: "
+
+#, fuzzy
+#~ msgid "Email address:"
+#~ msgstr "IP адреса"
+
+#~ msgid "Country"
+#~ msgstr "Држава"
+
+#~ msgid "Password:"
+#~ msgstr "Лозинка:"
+
+#, fuzzy
+#~ msgid "Machine description:"
+#~ msgstr "Минице"
+
+#, fuzzy
+#~ msgid "Machine name must be 1 to 40 alphanumerical characters"
+#~ msgstr "Тачке монтирања треба да садрже само алфанумеричке карактере"
+
+#, fuzzy
+#~ msgid "Connecting to Mandriva Online website..."
+#~ msgstr "Добродошли у Mandriva Linux"
+
+#~ msgid "Connection problem"
+#~ msgstr "Проблем са повезивањем"
+
+#, fuzzy
+#~ msgid "Create a Mandriva Online Account"
+#~ msgstr "Mandriva Club Рачун"
+
+#, fuzzy
+#~ msgid "Greeting:"
+#~ msgstr "Зелена"
+
+#~ msgid "First name:"
+#~ msgstr "Име:"
+
+#, fuzzy
+#~ msgid "Last name:"
+#~ msgstr "Име:"
+
+#~ msgid "Confirm Password:"
+#~ msgstr "Потврди лозинку:"
+
+#~ msgid ""
+#~ "The passwords do not match\n"
+#~ " Please try again\n"
+#~ msgstr ""
+#~ "Лозинке се не слажу\n"
+#~ " Покушајте поново\n"
+
+#, fuzzy
+#~ msgid "Please fill in each field"
+#~ msgstr "Молим ВАС да попуните или означите поља испод"
+
+#~ msgid "Not a valid mail address!\n"
+#~ msgstr "Е-mail адреса није исправна!\n"
+
+#~ msgid "Congratulations"
+#~ msgstr "Честитке"
+
+#, fuzzy
+#~ msgid "Problem uploading configuration"
+#~ msgstr "Поново уносим конфигурацију: "
+
+#, fuzzy
 #~ msgid "  --applet\t\t- launch Mandriva Update.\n"
 #~ msgstr "  --applet\t\t- ажурира све информације.\n"
 
diff --git a/po/sr@Latn.po b/po/sr@Latn.po
index 5e445897..44698d8b 100644
--- a/po/sr@Latn.po
+++ b/po/sr@Latn.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-09 16:26+0200\n"
+"POT-Creation-Date: 2008-02-21 18:21+0100\n"
 "PO-Revision-Date: 2003-02-15 09:31+0100\n"
 "Last-Translator: Toma Jankovic_<tomaja@net.yu>\n"
 "Language-Team: Serbian <i18n@mandrake.co.yu>\n"
@@ -19,17 +19,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:94
+#: ../mdkapplet:88
 #, fuzzy, c-format
 msgid "Will check updates at %s"
 msgstr "Sigurnosne nadogradnje"
 
-#: ../mdkapplet:103
+#: ../mdkapplet:97
 #, c-format
 msgid "Your system is up-to-date"
 msgstr ""
 
-#: ../mdkapplet:109
+#: ../mdkapplet:103
 #, fuzzy, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -38,12 +38,12 @@ msgstr ""
 "Ukoliko imate bilo kakav problem pošaljite e-mail na support@mandrivaonline."
 "net\n"
 
-#: ../mdkapplet:115
+#: ../mdkapplet:110
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "Molim Vas sačekajte, pronalazim dostupne pakete..."
 
-#: ../mdkapplet:121
+#: ../mdkapplet:116
 #, fuzzy, c-format
 msgid "New updates are available for your system"
 msgstr ""
@@ -52,47 +52,33 @@ msgstr ""
 "%s\n"
 "su direktno povezani na vaš sistem.\n"
 
-#: ../mdkapplet:127
-#, fuzzy, c-format
-msgid "New bundles are available for your system"
-msgstr ""
-"Sledeći skeneri\n"
-"\n"
-"%s\n"
-"su direktno povezani na vaš sistem.\n"
-
-#: ../mdkapplet:133
-#, c-format
-msgid "Service is not configured. Please click on \"Configure the service\""
-msgstr ""
-
-#: ../mdkapplet:139
+#: ../mdkapplet:122
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr ""
 
-#: ../mdkapplet:145
+#: ../mdkapplet:128
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr ""
 
-#: ../mdkapplet:151 ../mdkapplet:182
+#: ../mdkapplet:134 ../mdkapplet:165
 #, fuzzy, c-format
 msgid "urpmi database locked"
 msgstr "urpmi baza podataka zaključana"
 
-#: ../mdkapplet:157
+#: ../mdkapplet:140
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
-#: ../mdkapplet:163
+#: ../mdkapplet:146
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
 msgstr ""
 
-#: ../mdkapplet:169
+#: ../mdkapplet:152
 #, fuzzy, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -110,551 +96,131 @@ msgstr ""
 "\n"
 "Zatim  restartujte  %s."
 
-#: ../mdkapplet:174
+#: ../mdkapplet:157
 #, c-format
 msgid "Enabled"
 msgstr "Uključi"
 
-#: ../mdkapplet:187
+#: ../mdkapplet:170
 #, c-format
 msgid "Error updating media"
 msgstr ""
 
-#: ../mdkapplet:202
+#: ../mdkapplet:185
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr ""
 
-#: ../mdkapplet:207
+#: ../mdkapplet:190
 #, c-format
 msgid "Packages are up to date"
 msgstr ""
 
-#: ../mdkapplet:212
+#: ../mdkapplet:195
 #, fuzzy, c-format
 msgid "Failed to open urpmi database"
 msgstr "ne mogu da otvorim rpmdb"
 
-#: ../mdkapplet:217 ../mdkapplet:324
+#: ../mdkapplet:200
 #, c-format
 msgid "Install updates"
 msgstr "Instaliraj update-ove"
 
-#: ../mdkapplet:218
-#, fuzzy, c-format
-msgid "Configure the service"
-msgstr "Podesi"
-
-#: ../mdkapplet:219
+#: ../mdkapplet:201
 #, fuzzy, c-format
 msgid "Check Updates"
 msgstr "Ažuriranje"
 
-#: ../mdkapplet:220 ../mdkapplet:327 ../mdkonline:114 ../mdkonline:155
-#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
-#, c-format
-msgid "Please wait"
-msgstr "Samo momenat..."
-
-#: ../mdkapplet:220 ../mdkapplet:326 ../mdkapplet:327
-#, fuzzy, c-format
-msgid "Check updates"
-msgstr "Sigurnosne nadogradnje"
-
-#: ../mdkapplet:223 ../mdkapplet:648
-#, c-format
-msgid "Online WebSite"
-msgstr ""
-
-#: ../mdkapplet:224
+#: ../mdkapplet:202
 #, fuzzy, c-format
 msgid "Configure Network"
 msgstr "Podesi mrežu"
 
-#: ../mdkapplet:225
-#, fuzzy, c-format
-msgid "Configure Now!"
-msgstr "Podesi veb"
-
-#: ../mdkapplet:313 ../mdkapplet:392
-#, fuzzy, c-format
-msgid "Mandriva Linux Updates Applet"
-msgstr "Mandriva Update"
-
-#: ../mdkapplet:322
-#, c-format
-msgid "Actions"
-msgstr "Akcije"
-
-#: ../mdkapplet:325
-#, c-format
-msgid "Configure"
-msgstr "Podesi"
-
-#: ../mdkapplet:329
-#, fuzzy, c-format
-msgid "See logs"
-msgstr "Traži +5s"
-
-#: ../mdkapplet:332
-#, c-format
-msgid "Status"
-msgstr "Status"
-
-#: ../mdkapplet:336 ../mdkapplet:597
-#, c-format
-msgid "Close"
-msgstr "Zatvori"
-
-#: ../mdkapplet:365
-#, fuzzy, c-format
-msgid "Network Connection: "
-msgstr "Konekcija za Virtuelni Mrežu"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Up"
-msgstr "gore"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Down"
-msgstr "Dole"
-
-#: ../mdkapplet:366
-#, c-format
-msgid "Last check: "
-msgstr ""
-
-#: ../mdkapplet:367 ../mdkonline:145
-#, fuzzy, c-format
-msgid "Machine name:"
-msgstr "Minice"
-
-#: ../mdkapplet:368
-#, fuzzy, c-format
-msgid "Updates: "
-msgstr "Ažuriranje"
-
-#: ../mdkapplet:372
+#: ../mdkapplet:283
 #, fuzzy, c-format
 msgid "Launching drakconnect\n"
 msgstr "Pokreni userdrake"
 
-#: ../mdkapplet:375
+#: ../mdkapplet:286
 #, c-format
 msgid "Mandriva Online seems to be reinstalled, reloading applet ...."
 msgstr ""
 
-#: ../mdkapplet:383
+#: ../mdkapplet:294
 #, c-format
 msgid "Launching MandrivaUpdate\n"
 msgstr ""
 
-#: ../mdkapplet:398
+#: ../mdkapplet:303
+#, fuzzy, c-format
+msgid "Mandriva Linux Updates Applet"
+msgstr "Mandriva Update"
+
+#: ../mdkapplet:308
 #, c-format
 msgid "Computing new updates...\n"
 msgstr ""
 
-#: ../mdkapplet:399
+#: ../mdkapplet:309
 #, fuzzy, c-format
 msgid "Connecting to"
 msgstr "Problem sa povezivanjem"
 
-#: ../mdkapplet:467 ../mdkupdate:159 ../mdkupdate:188
-#, c-format
-msgid "An error occurred"
-msgstr "Hm,pojavila se greška"
-
-#: ../mdkapplet:475
-#, c-format
-msgid "Development release not supported by service"
-msgstr ""
-
-#: ../mdkapplet:476
-#, c-format
-msgid "Too old release not supported by service"
-msgstr ""
-
-#: ../mdkapplet:477
-#, fuzzy, c-format
-msgid "Unknown state"
-msgstr "Nepoznato ime hosta"
-
-#: ../mdkapplet:478
-#, c-format
-msgid "Online services disabled. Contact Mandriva Online site\n"
-msgstr ""
-
-#: ../mdkapplet:479
-#, fuzzy, c-format
-msgid "Wrong Password.\n"
-msgstr "Potvrdi lozinku:"
-
-#: ../mdkapplet:480
-#, c-format
-msgid "Wrong Action or host or login.\n"
-msgstr ""
-
-#: ../mdkapplet:481
-#, c-format
-msgid ""
-"Something is wrong with your network settings (check your route, firewall or "
-"proxy settings)\n"
-msgstr ""
-
-#: ../mdkapplet:483
-#, c-format
-msgid ""
-"Problem occured while connecting to the server, please contact the support "
-"team"
-msgstr ""
-
-#: ../mdkapplet:487
-#, fuzzy, c-format
-msgid "Response from Mandriva Online server\n"
-msgstr "Dobrodošli u Mandriva Linux"
-
-#: ../mdkapplet:490
+#: ../mdkapplet:386
 #, fuzzy, c-format
 msgid "System is up-to-date\n"
 msgstr "Sistemski mod"
 
-#: ../mdkapplet:527
-#, c-format
-msgid "No check"
-msgstr ""
-
-#: ../mdkapplet:541
-#, fuzzy, c-format
-msgid "Checking config file: Not present\n"
-msgstr "Nedostaje konfiguracioni fajl %s.\n"
-
-#: ../mdkapplet:544
+#: ../mdkapplet:415
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr ""
 
-#: ../mdkapplet:587
+#: ../mdkapplet:457 ../mdkupdate:118 ../mdkupdate:164
 #, c-format
-msgid "Logs"
-msgstr "Log zapisi"
-
-#: ../mdkapplet:603
-#, c-format
-msgid "Clear"
-msgstr "Očisti"
+msgid "Warning"
+msgstr "Upozorenje"
 
-#: ../mdkapplet:629
+#: ../mdkapplet:468
 #, c-format
 msgid "About..."
 msgstr "O..."
 
-#: ../mdkapplet:631
+#: ../mdkapplet:472
 #, fuzzy, c-format
 msgid "Mandriva Online %s"
 msgstr "Mandriva Online"
 
-#: ../mdkapplet:635
+#: ../mdkapplet:473
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Sva prava (C) %s zadržava Mandriva"
 
-#: ../mdkapplet:647
+#: ../mdkapplet:476
 #, c-format
 msgid "Mandriva Online gives access to Mandriva web services."
 msgstr ""
 
-#: ../mdkapplet:655
-#, c-format
-msgid "Always launch on startup"
-msgstr ""
-
-#: ../mdkapplet:657
-#, c-format
-msgid "Quit"
-msgstr "Završi"
-
-#: ../mdkonline:58
-#, c-format
-msgid ""
-"mdonline version %s\n"
-"Copyright (C) %s Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"mdonline verzija %s\n"
-"Sva prava zadržava (C) %s Mandriva.\n"
-"Ovo je besplatni softver i može se slobodno distribuirati pod uslovima GNU "
-"GPL licence.\n"
-"\n"
-"upotreba:\n"
-
-#: ../mdkonline:63 ../mdkupdate:73
-#, c-format
-msgid "  --help\t\t- print this help message.\n"
-msgstr "  --help\t\t- prikazuje ovu poruku.\n"
-
-#: ../mdkonline:64
-#, c-format
-msgid "  --box=\t\t\t- hostname.\n"
-msgstr ""
-
-#: ../mdkonline:65
-#, c-format
-msgid "  --country\t\t\t- name of country of the user. \n"
-msgstr ""
-
-#: ../mdkonline:66
-#, c-format
-msgid "  --interactive\t\t- use the interactive mode.\n"
-msgstr ""
-
-#: ../mdkonline:67
-#, c-format
-msgid "  --nointeractive\t- use the non-interactive mode.\n"
-msgstr ""
-
-#: ../mdkonline:68
-#, c-format
-msgid "  --login=\t\t     - login name of the user.\n"
-msgstr ""
-
-#: ../mdkonline:69
-#, c-format
-msgid "  --pass=\t\t\t- password  of the user.\n"
-msgstr ""
-
-#: ../mdkonline:87 ../mdkonline:120
-#, c-format
-msgid "Mandriva Online"
-msgstr "Mandriva Online"
-
-#: ../mdkonline:90
-#, c-format
-msgid "I already have an account"
-msgstr ""
-
-#: ../mdkonline:91
-#, c-format
-msgid "I want to subscribe"
-msgstr ""
-
-#: ../mdkonline:96
-#, c-format
-msgid "Mr."
-msgstr "g-din"
-
-#: ../mdkonline:96
-#, c-format
-msgid "Mrs."
-msgstr "g-đa"
-
-#: ../mdkonline:96
-#, c-format
-msgid "Ms."
-msgstr "g-đa"
-
-#: ../mdkonline:114
-#, fuzzy, c-format
-msgid "Reading configuration\n"
-msgstr "Ponovo unosim konfiguraciju: "
-
-#: ../mdkonline:123
-#, c-format
-msgid ""
-"This assistant will help you to upload your configuration\n"
-"(packages, hardware configuration) to a centralized database in\n"
-"order to keep you informed about security updates and useful upgrades.\n"
-msgstr ""
-
-#: ../mdkonline:131
-#, c-format
-msgid "Account creation or authentication"
-msgstr ""
-
-#: ../mdkonline:136
-#, c-format
-msgid "Enter your Mandriva Online login, password and machine name:"
-msgstr ""
-
-#: ../mdkonline:142 ../mdkonline:195
-#, fuzzy, c-format
-msgid "Email address:"
-msgstr "IP adresa"
-
-#: ../mdkonline:143
-#, c-format
-msgid "Country"
-msgstr "Država"
-
-#: ../mdkonline:144 ../mdkonline:196
-#, c-format
-msgid "Password:"
-msgstr "Lozinka:"
-
-#: ../mdkonline:146
-#, fuzzy, c-format
-msgid "Machine description:"
-msgstr "Minice"
-
-#: ../mdkonline:147
-#, c-format
-msgid "(Ex: My Home Office's Computer)"
-msgstr ""
-
-#: ../mdkonline:152 ../mdkonline:159 ../mdkonline:180 ../mdkonline:204
-#: ../mdkonline:208 ../mdkonline:212 ../mdkonline:217 ../mdkupdate:141
-#: ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
-#, c-format
-msgid "Error"
-msgstr "Greška"
-
-#: ../mdkonline:152
-#, fuzzy, c-format
-msgid "Machine name must be 1 to 40 alphanumerical characters"
-msgstr "Tačke montiranja treba da sadrže samo alfanumeričke karaktere"
-
-#: ../mdkonline:155
-#, fuzzy, c-format
-msgid "Connecting to Mandriva Online website..."
-msgstr "Dobrodošli u Mandriva Linux"
-
-#: ../mdkonline:167
-#, c-format
-msgid ""
-"In order to benefit from Mandriva Online services,\n"
-"we are about to upload your configuration.\n"
-"\n"
-"The Wizard will now send the following information to Mandriva:\n"
-"\n"
-"1) the list of packages you have installed on your system,\n"
-"\n"
-"2) your hardware configuration.\n"
-"\n"
-"If you feel uncomfortable by that idea, or do not want to benefit from this "
-"service,\n"
-"please press 'Cancel'. By pressing 'Next', you allow us to keep you "
-"informed\n"
-"about security updates and useful upgrades via personalized email alerts.\n"
-"Furthermore, you benefit from discounted paid support services on\n"
-"www.mandrivaexpert.com."
-msgstr ""
-
-#: ../mdkonline:180
-#, c-format
-msgid "Connection problem"
-msgstr "Problem sa povezivanjem"
-
-#: ../mdkonline:180
-#, c-format
-msgid "Problem occurs when uploading files, please try again"
-msgstr ""
-
-#: ../mdkonline:187
-#, fuzzy, c-format
-msgid "Create a Mandriva Online Account"
-msgstr "Mandriva Club Račun"
-
-#. -PO: that is for things like "Mr", "Ms",...
-#: ../mdkonline:192
-#, fuzzy, c-format
-msgid "Greeting:"
-msgstr "Zelena"
-
-#: ../mdkonline:193
-#, c-format
-msgid "First name:"
-msgstr "Ime:"
-
-#: ../mdkonline:194
-#, fuzzy, c-format
-msgid "Last name:"
-msgstr "Ime:"
-
-#: ../mdkonline:197
-#, c-format
-msgid "Confirm Password:"
-msgstr "Potvrdi lozinku:"
-
-#: ../mdkonline:204
-#, c-format
-msgid ""
-"The passwords do not match\n"
-" Please try again\n"
-msgstr ""
-"Lozinke se ne slažu\n"
-" Pokušajte ponovo\n"
-
-#: ../mdkonline:208
-#, fuzzy, c-format
-msgid "Please fill in each field"
-msgstr "Molim VAS da popunite ili označite polja ispod"
-
-#: ../mdkonline:212
-#, c-format
-msgid "Not a valid mail address!\n"
-msgstr "E-mail adresa nije ispravna!\n"
-
-#: ../mdkonline:217
-#, c-format
-msgid "Creating account failed!"
-msgstr ""
-
-#: ../mdkonline:225
-#, c-format
-msgid ""
-"Mandriva Online Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
-msgstr ""
-
-#: ../mdkonline:229
-#, c-format
-msgid "Your upload was successful!"
-msgstr ""
-
-#: ../mdkonline:229
-#, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandriva Online."
-msgstr ""
-
-#: ../mdkonline:229
+#: ../mdkapplet:478
 #, c-format
-msgid ""
-"Mandriva Online offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
+msgid "Online WebSite"
 msgstr ""
 
-#: ../mdkonline:238
-#, c-format
-msgid "Congratulations"
-msgstr "Čestitke"
-
-#: ../mdkonline:238
+#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
+#: ../mdkapplet:483
 #, c-format
-msgid "Your Mandriva Online account has been successfully configured\n"
+msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
 
-#: ../mdkonline:253
+#: ../mdkapplet:492
 #, c-format
-msgid "Configuration uploaded successfully"
+msgid "Always launch on startup"
 msgstr ""
 
-#: ../mdkonline:254
-#, fuzzy, c-format
-msgid "Problem uploading configuration"
-msgstr "Ponovo unosim konfiguraciju: "
-
-#: ../mdkonline:256
+#: ../mdkapplet:494
 #, c-format
-msgid ""
-"Cannot connect to Mandriva Online website: wrong login/password or router/"
-"firewall bad settings"
-msgstr ""
+msgid "Quit"
+msgstr "Završi"
 
 #: ../mdkonline.pm:207
 #, fuzzy, c-format
@@ -795,6 +361,11 @@ msgstr ""
 "\n"
 "upotreba:\n"
 
+#: ../mdkupdate:73
+#, c-format
+msgid "  --help\t\t- print this help message.\n"
+msgstr "  --help\t\t- prikazuje ovu poruku.\n"
+
 #: ../mdkupdate:74
 #, fuzzy, c-format
 msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
@@ -822,11 +393,6 @@ msgid ""
 "file.\n"
 msgstr ""
 
-#: ../mdkupdate:118 ../mdkupdate:164
-#, c-format
-msgid "Warning"
-msgstr "Upozorenje"
-
 #. -PO: here Live Install is currently *NOT* translated on the desktop, so it's better to keep as it:
 #: ../mdkupdate:120
 #, c-format
@@ -835,11 +401,21 @@ msgid ""
 "Install' wizard."
 msgstr ""
 
+#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
+#, c-format
+msgid "Please wait"
+msgstr "Samo momenat..."
+
 #: ../mdkupdate:123 ../mdkupdate:174
 #, c-format
 msgid "Preparing..."
 msgstr "Pripremam..."
 
+#: ../mdkupdate:141 ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
+#, c-format
+msgid "Error"
+msgstr "Greška"
+
 #: ../mdkupdate:141
 #, c-format
 msgid ""
@@ -848,6 +424,11 @@ msgid ""
 "%s"
 msgstr ""
 
+#: ../mdkupdate:159 ../mdkupdate:188
+#, c-format
+msgid "An error occurred"
+msgstr "Hm,pojavila se greška"
+
 #: ../mdkupdate:164
 #, c-format
 msgid ""
@@ -873,6 +454,177 @@ msgid "Unable to update packages from update_source medium.\n"
 msgstr "Ne mogu da ažuriram pakete sa update_source medija.\n"
 
 #, fuzzy
+#~ msgid "New bundles are available for your system"
+#~ msgstr ""
+#~ "Sledeći skeneri\n"
+#~ "\n"
+#~ "%s\n"
+#~ "su direktno povezani na vaš sistem.\n"
+
+#, fuzzy
+#~ msgid "Configure the service"
+#~ msgstr "Podesi"
+
+#, fuzzy
+#~ msgid "Check updates"
+#~ msgstr "Sigurnosne nadogradnje"
+
+#, fuzzy
+#~ msgid "Configure Now!"
+#~ msgstr "Podesi veb"
+
+#~ msgid "Actions"
+#~ msgstr "Akcije"
+
+#~ msgid "Configure"
+#~ msgstr "Podesi"
+
+#, fuzzy
+#~ msgid "See logs"
+#~ msgstr "Traži +5s"
+
+#~ msgid "Status"
+#~ msgstr "Status"
+
+#~ msgid "Close"
+#~ msgstr "Zatvori"
+
+#, fuzzy
+#~ msgid "Network Connection: "
+#~ msgstr "Konekcija za Virtuelni Mrežu"
+
+#~ msgid "Up"
+#~ msgstr "gore"
+
+#~ msgid "Down"
+#~ msgstr "Dole"
+
+#, fuzzy
+#~ msgid "Machine name:"
+#~ msgstr "Minice"
+
+#, fuzzy
+#~ msgid "Updates: "
+#~ msgstr "Ažuriranje"
+
+#, fuzzy
+#~ msgid "Unknown state"
+#~ msgstr "Nepoznato ime hosta"
+
+#, fuzzy
+#~ msgid "Wrong Password.\n"
+#~ msgstr "Potvrdi lozinku:"
+
+#, fuzzy
+#~ msgid "Response from Mandriva Online server\n"
+#~ msgstr "Dobrodošli u Mandriva Linux"
+
+#, fuzzy
+#~ msgid "Checking config file: Not present\n"
+#~ msgstr "Nedostaje konfiguracioni fajl %s.\n"
+
+#~ msgid "Logs"
+#~ msgstr "Log zapisi"
+
+#~ msgid "Clear"
+#~ msgstr "Očisti"
+
+#~ msgid ""
+#~ "mdonline version %s\n"
+#~ "Copyright (C) %s Mandriva.\n"
+#~ "This is free software and may be redistributed under the terms of the GNU "
+#~ "GPL.\n"
+#~ "\n"
+#~ "usage:\n"
+#~ msgstr ""
+#~ "mdonline verzija %s\n"
+#~ "Sva prava zadržava (C) %s Mandriva.\n"
+#~ "Ovo je besplatni softver i može se slobodno distribuirati pod uslovima "
+#~ "GNU GPL licence.\n"
+#~ "\n"
+#~ "upotreba:\n"
+
+#~ msgid "Mandriva Online"
+#~ msgstr "Mandriva Online"
+
+#~ msgid "Mr."
+#~ msgstr "g-din"
+
+#~ msgid "Mrs."
+#~ msgstr "g-đa"
+
+#~ msgid "Ms."
+#~ msgstr "g-đa"
+
+#, fuzzy
+#~ msgid "Reading configuration\n"
+#~ msgstr "Ponovo unosim konfiguraciju: "
+
+#, fuzzy
+#~ msgid "Email address:"
+#~ msgstr "IP adresa"
+
+#~ msgid "Country"
+#~ msgstr "Država"
+
+#~ msgid "Password:"
+#~ msgstr "Lozinka:"
+
+#, fuzzy
+#~ msgid "Machine description:"
+#~ msgstr "Minice"
+
+#, fuzzy
+#~ msgid "Machine name must be 1 to 40 alphanumerical characters"
+#~ msgstr "Tačke montiranja treba da sadrže samo alfanumeričke karaktere"
+
+#, fuzzy
+#~ msgid "Connecting to Mandriva Online website..."
+#~ msgstr "Dobrodošli u Mandriva Linux"
+
+#~ msgid "Connection problem"
+#~ msgstr "Problem sa povezivanjem"
+
+#, fuzzy
+#~ msgid "Create a Mandriva Online Account"
+#~ msgstr "Mandriva Club Račun"
+
+#, fuzzy
+#~ msgid "Greeting:"
+#~ msgstr "Zelena"
+
+#~ msgid "First name:"
+#~ msgstr "Ime:"
+
+#, fuzzy
+#~ msgid "Last name:"
+#~ msgstr "Ime:"
+
+#~ msgid "Confirm Password:"
+#~ msgstr "Potvrdi lozinku:"
+
+#~ msgid ""
+#~ "The passwords do not match\n"
+#~ " Please try again\n"
+#~ msgstr ""
+#~ "Lozinke se ne slažu\n"
+#~ " Pokušajte ponovo\n"
+
+#, fuzzy
+#~ msgid "Please fill in each field"
+#~ msgstr "Molim VAS da popunite ili označite polja ispod"
+
+#~ msgid "Not a valid mail address!\n"
+#~ msgstr "E-mail adresa nije ispravna!\n"
+
+#~ msgid "Congratulations"
+#~ msgstr "Čestitke"
+
+#, fuzzy
+#~ msgid "Problem uploading configuration"
+#~ msgstr "Ponovo unosim konfiguraciju: "
+
+#, fuzzy
 #~ msgid "  --applet\t\t- launch Mandriva Update.\n"
 #~ msgstr "  --applet\t\t- ažurira sve informacije.\n"
 
diff --git a/po/sv.po b/po/sv.po
index 225fbd00..b0b81225 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline-sv\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-09 16:26+0200\n"
+"POT-Creation-Date: 2008-02-21 18:21+0100\n"
 "PO-Revision-Date: 2007-03-20 19:52+0100\n"
 "Last-Translator: Kenneth Krekula <kenneth.krekula@kiruna.se>\n"
 "Language-Team:  <sv@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:94
+#: ../mdkapplet:88
 #, fuzzy, c-format
 msgid "Will check updates at %s"
 msgstr "Kontrollera om det finns uppdateringar"
 
-#: ../mdkapplet:103
+#: ../mdkapplet:97
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "Ditt system är uppdaterat"
 
-#: ../mdkapplet:109
+#: ../mdkapplet:103
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -44,54 +44,44 @@ msgstr ""
 "Problem med tjänstens konfiguration. Var vänlig kontrollera loggar och "
 "skicka e-post till support@mandrivaonline.com"
 
-#: ../mdkapplet:115
+#: ../mdkapplet:110
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "Vänta, hittar tillgängliga paket..."
 
-#: ../mdkapplet:121
+#: ../mdkapplet:116
 #, c-format
 msgid "New updates are available for your system"
 msgstr "Nya uppdateringar finns tillgängliga för ditt system"
 
-#: ../mdkapplet:127
-#, c-format
-msgid "New bundles are available for your system"
-msgstr "Nya samlingar finns tillgängliga för ditt system"
-
-#: ../mdkapplet:133
-#, c-format
-msgid "Service is not configured. Please click on \"Configure the service\""
-msgstr "Tjänsten är ej konfigurerad. Klicka på \"Konfigurera tjänsten\""
-
-#: ../mdkapplet:139
+#: ../mdkapplet:122
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "Nätverket är nere. Var vänlig konfigurera ditt nätverk."
 
-#: ../mdkapplet:145
+#: ../mdkapplet:128
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "Tjänsten är ej aktiverad. Klicka på \"Online webbsajt\""
 
-#: ../mdkapplet:151 ../mdkapplet:182
+#: ../mdkapplet:134 ../mdkapplet:165
 #, c-format
 msgid "urpmi database locked"
 msgstr "urpmi-databas låst"
 
-#: ../mdkapplet:157
+#: ../mdkapplet:140
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 "Denna version stöds inte (för gammal version, eller utvecklingsversion)"
 
-#: ../mdkapplet:163
+#: ../mdkapplet:146
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
 msgstr ""
 
-#: ../mdkapplet:169
+#: ../mdkapplet:152
 #, fuzzy, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -107,582 +97,131 @@ msgstr ""
 "\n"
 "Starta sedan om '%s'."
 
-#: ../mdkapplet:174
+#: ../mdkapplet:157
 #, c-format
 msgid "Enabled"
 msgstr "Aktiverad"
 
-#: ../mdkapplet:187
+#: ../mdkapplet:170
 #, c-format
 msgid "Error updating media"
 msgstr "Fel vid uppdatering av media"
 
-#: ../mdkapplet:202
+#: ../mdkapplet:185
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr "Kontrollerar... Uppdateringar finns tillgängliga\n"
 
-#: ../mdkapplet:207
+#: ../mdkapplet:190
 #, c-format
 msgid "Packages are up to date"
 msgstr "Inga uppdateringar finns"
 
-#: ../mdkapplet:212
+#: ../mdkapplet:195
 #, c-format
 msgid "Failed to open urpmi database"
 msgstr "Kunde inte öppna urpmi databas"
 
-#: ../mdkapplet:217 ../mdkapplet:324
+#: ../mdkapplet:200
 #, c-format
 msgid "Install updates"
 msgstr "Installera uppdateringar"
 
-#: ../mdkapplet:218
-#, c-format
-msgid "Configure the service"
-msgstr "Konfigurera tjänsten"
-
-#: ../mdkapplet:219
+#: ../mdkapplet:201
 #, c-format
 msgid "Check Updates"
 msgstr "Kontrollera om det finns uppdateringar"
 
-#: ../mdkapplet:220 ../mdkapplet:327 ../mdkonline:114 ../mdkonline:155
-#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
-#, c-format
-msgid "Please wait"
-msgstr "Vänta"
-
-#: ../mdkapplet:220 ../mdkapplet:326 ../mdkapplet:327
-#, c-format
-msgid "Check updates"
-msgstr "Kontrollera om det finns uppdateringar"
-
-#: ../mdkapplet:223 ../mdkapplet:648
-#, c-format
-msgid "Online WebSite"
-msgstr "Online webbsajt"
-
-#: ../mdkapplet:224
+#: ../mdkapplet:202
 #, c-format
 msgid "Configure Network"
 msgstr "Konfigurera nätverket"
 
-#: ../mdkapplet:225
-#, c-format
-msgid "Configure Now!"
-msgstr "Konfigurera nu!"
-
-#: ../mdkapplet:313 ../mdkapplet:392
-#, c-format
-msgid "Mandriva Linux Updates Applet"
-msgstr "Mandriva Linux uppdateringsapplet"
-
-#: ../mdkapplet:322
-#, c-format
-msgid "Actions"
-msgstr "Åtgärder"
-
-#: ../mdkapplet:325
-#, c-format
-msgid "Configure"
-msgstr "Konfigurera"
-
-#: ../mdkapplet:329
-#, c-format
-msgid "See logs"
-msgstr "Kontrollera loggar"
-
-#: ../mdkapplet:332
-#, c-format
-msgid "Status"
-msgstr "Status"
-
-#: ../mdkapplet:336 ../mdkapplet:597
-#, c-format
-msgid "Close"
-msgstr "Stäng"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Network Connection: "
-msgstr "Nätverksanslutning: "
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Up"
-msgstr "Upp"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Down"
-msgstr "Ner"
-
-#: ../mdkapplet:366
-#, c-format
-msgid "Last check: "
-msgstr "Sist kontrollerat: "
-
-#: ../mdkapplet:367 ../mdkonline:145
-#, c-format
-msgid "Machine name:"
-msgstr "Datornamn:"
-
-#: ../mdkapplet:368
-#, c-format
-msgid "Updates: "
-msgstr "Uppdateringar: "
-
-#: ../mdkapplet:372
+#: ../mdkapplet:283
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Startar drakconnect\n"
 
-#: ../mdkapplet:375
+#: ../mdkapplet:286
 #, c-format
 msgid "Mandriva Online seems to be reinstalled, reloading applet ...."
 msgstr "Mandriva Online verkar ha ominstallerats,startar om applet ...."
 
-#: ../mdkapplet:383
+#: ../mdkapplet:294
 #, c-format
 msgid "Launching MandrivaUpdate\n"
 msgstr "Startar MandrivaUpdate\n"
 
-#: ../mdkapplet:398
+#: ../mdkapplet:303
+#, c-format
+msgid "Mandriva Linux Updates Applet"
+msgstr "Mandriva Linux uppdateringsapplet"
+
+#: ../mdkapplet:308
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Beräknar nya uppdateringar...\n"
 
-#: ../mdkapplet:399
+#: ../mdkapplet:309
 #, c-format
 msgid "Connecting to"
 msgstr "Ansluter till"
 
-#: ../mdkapplet:467 ../mdkupdate:159 ../mdkupdate:188
-#, c-format
-msgid "An error occurred"
-msgstr "Ett fel inträffade"
-
-#: ../mdkapplet:475
-#, c-format
-msgid "Development release not supported by service"
-msgstr "Utvecklingsversion stöds inte av tjänsten"
-
-#: ../mdkapplet:476
-#, c-format
-msgid "Too old release not supported by service"
-msgstr "För gammal version för att stödjas av tjänsten"
-
-#: ../mdkapplet:477
-#, c-format
-msgid "Unknown state"
-msgstr "Okänd status"
-
-#: ../mdkapplet:478
-#, c-format
-msgid "Online services disabled. Contact Mandriva Online site\n"
-msgstr "Online tjänster avaktiverade. Kontakta Mandriva Online\n"
-
-#: ../mdkapplet:479
-#, c-format
-msgid "Wrong Password.\n"
-msgstr "Felaktigt lösenord.\n"
-
-#: ../mdkapplet:480
-#, c-format
-msgid "Wrong Action or host or login.\n"
-msgstr "Fel åtgärd, värd eller login.\n"
-
-#: ../mdkapplet:481
-#, c-format
-msgid ""
-"Something is wrong with your network settings (check your route, firewall or "
-"proxy settings)\n"
-msgstr ""
-"Något verkar fel med dina nätverksinställningar (kontrollera dina routing-, "
-"brandväggs- och proxyinställningar)\n"
-
-#: ../mdkapplet:483
-#, c-format
-msgid ""
-"Problem occured while connecting to the server, please contact the support "
-"team"
-msgstr "Ett problem uppstod när servern skulle kontaktas, kontakta supporten."
-
-#: ../mdkapplet:487
-#, c-format
-msgid "Response from Mandriva Online server\n"
-msgstr "Svar från Mandriva Online server\n"
-
-#: ../mdkapplet:490
+#: ../mdkapplet:386
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Systemet är uppdaterat\n"
 
-#: ../mdkapplet:527
-#, c-format
-msgid "No check"
-msgstr "Ingen kontroll"
-
-#: ../mdkapplet:541
-#, c-format
-msgid "Checking config file: Not present\n"
-msgstr "Kontrollerar konfigurationsfil: Ej tillgänglig\n"
-
-#: ../mdkapplet:544
+#: ../mdkapplet:415
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Kontrollerar nätverk: verkar avaktiverat\n"
 
-#: ../mdkapplet:587
-#, c-format
-msgid "Logs"
-msgstr "Loggar"
-
-#: ../mdkapplet:603
+#: ../mdkapplet:457 ../mdkupdate:118 ../mdkupdate:164
 #, c-format
-msgid "Clear"
-msgstr "Töm"
+msgid "Warning"
+msgstr "Varning"
 
-#: ../mdkapplet:629
+#: ../mdkapplet:468
 #, c-format
 msgid "About..."
 msgstr "Om.."
 
-#: ../mdkapplet:631
+#: ../mdkapplet:472
 #, c-format
 msgid "Mandriva Online %s"
 msgstr "Mandriva Online %s"
 
-#: ../mdkapplet:635
+#: ../mdkapplet:473
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Copyright (C) %s, Mandriva"
 
-#: ../mdkapplet:647
+#: ../mdkapplet:476
 #, c-format
 msgid "Mandriva Online gives access to Mandriva web services."
 msgstr "Mandriva Online ger tillgång till Mandriva webtjänster."
 
-#: ../mdkapplet:655
-#, c-format
-msgid "Always launch on startup"
-msgstr "Kör alltid vid uppstart"
-
-#: ../mdkapplet:657
-#, c-format
-msgid "Quit"
-msgstr "Avsluta"
-
-#: ../mdkonline:58
-#, c-format
-msgid ""
-"mdonline version %s\n"
-"Copyright (C) %s Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"mdonline version %s\n"
-"Copyright © %s Mandriva.\n"
-"Det här är fri programvara och får distribueras enligt villkoren i GNU GPL.\n"
-"\n"
-"användning:\n"
-
-#: ../mdkonline:63 ../mdkupdate:73
-#, c-format
-msgid "  --help\t\t- print this help message.\n"
-msgstr "  --help\t\t- visa det här hjälpmeddelandet.\n"
-
-#: ../mdkonline:64
-#, c-format
-msgid "  --box=\t\t\t- hostname.\n"
-msgstr "  --box=\t\t\t- maskinnamn.\n"
-
-#: ../mdkonline:65
-#, c-format
-msgid "  --country\t\t\t- name of country of the user. \n"
-msgstr "  --country\t\t\t- namnet på användarens land. \n"
-
-#: ../mdkonline:66
-#, c-format
-msgid "  --interactive\t\t- use the interactive mode.\n"
-msgstr "  --interactive\t\t- amvänd interaktivt läge.\n"
-
-#: ../mdkonline:67
-#, c-format
-msgid "  --nointeractive\t- use the non-interactive mode.\n"
-msgstr "  --nointeractive\t- använd icke-interaktivt läge.\n"
-
-#: ../mdkonline:68
-#, c-format
-msgid "  --login=\t\t     - login name of the user.\n"
-msgstr "  --login=\t\t     - användarens inloggningsnamn.\n"
-
-#: ../mdkonline:69
-#, c-format
-msgid "  --pass=\t\t\t- password  of the user.\n"
-msgstr "  --pass=\t\t\t- användarens lösenord.\n"
-
-#: ../mdkonline:87 ../mdkonline:120
-#, c-format
-msgid "Mandriva Online"
-msgstr "Mandriva Online"
-
-#: ../mdkonline:90
-#, c-format
-msgid "I already have an account"
-msgstr "Jag har redan ett konto"
-
-#: ../mdkonline:91
-#, c-format
-msgid "I want to subscribe"
-msgstr "Jag vill prenumerera"
-
-#: ../mdkonline:96
-#, c-format
-msgid "Mr."
-msgstr "Herr"
-
-#: ../mdkonline:96
-#, c-format
-msgid "Mrs."
-msgstr "Fru"
-
-#: ../mdkonline:96
-#, c-format
-msgid "Ms."
-msgstr "Fru"
-
-#: ../mdkonline:114
-#, c-format
-msgid "Reading configuration\n"
-msgstr "Läser konfiguration\n"
-
-#: ../mdkonline:123
-#, c-format
-msgid ""
-"This assistant will help you to upload your configuration\n"
-"(packages, hardware configuration) to a centralized database in\n"
-"order to keep you informed about security updates and useful upgrades.\n"
-msgstr ""
-"Den här assistenten kommer hjälpa dig att ladda upp din\n"
-"konfiguration (paket, hårdvarukonfiguration) till en centraliserad\n"
-"databas för att kunna hålla dig informerad om säkerhetsuppdateringar\n"
-"och andra användbara uppdateringar.\n"
-
-#: ../mdkonline:131
-#, c-format
-msgid "Account creation or authentication"
-msgstr "Skapar eller autentiserar konto"
-
-#: ../mdkonline:136
-#, c-format
-msgid "Enter your Mandriva Online login, password and machine name:"
-msgstr "Ange ditt Mandriva Online-användarnamn, lösenord och datornamn:"
-
-#: ../mdkonline:142 ../mdkonline:195
-#, c-format
-msgid "Email address:"
-msgstr "E-postadress"
-
-#: ../mdkonline:143
-#, c-format
-msgid "Country"
-msgstr "Land"
-
-#: ../mdkonline:144 ../mdkonline:196
-#, c-format
-msgid "Password:"
-msgstr "Lösenord:"
-
-#: ../mdkonline:146
-#, c-format
-msgid "Machine description:"
-msgstr "Datorbeskrivning:"
-
-#: ../mdkonline:147
-#, c-format
-msgid "(Ex: My Home Office's Computer)"
-msgstr "(Ex: Min Hemkontor-dator)"
-
-#: ../mdkonline:152 ../mdkonline:159 ../mdkonline:180 ../mdkonline:204
-#: ../mdkonline:208 ../mdkonline:212 ../mdkonline:217 ../mdkupdate:141
-#: ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
-#, c-format
-msgid "Error"
-msgstr "Fel"
-
-#: ../mdkonline:152
-#, c-format
-msgid "Machine name must be 1 to 40 alphanumerical characters"
-msgstr "Maskinens namn måste vara mellan 1 och 40 alfanumeriska tecken"
-
-#: ../mdkonline:155
-#, c-format
-msgid "Connecting to Mandriva Online website..."
-msgstr "Kontaktar Mandriva Onlines websajt"
-
-#: ../mdkonline:167
-#, c-format
-msgid ""
-"In order to benefit from Mandriva Online services,\n"
-"we are about to upload your configuration.\n"
-"\n"
-"The Wizard will now send the following information to Mandriva:\n"
-"\n"
-"1) the list of packages you have installed on your system,\n"
-"\n"
-"2) your hardware configuration.\n"
-"\n"
-"If you feel uncomfortable by that idea, or do not want to benefit from this "
-"service,\n"
-"please press 'Cancel'. By pressing 'Next', you allow us to keep you "
-"informed\n"
-"about security updates and useful upgrades via personalized email alerts.\n"
-"Furthermore, you benefit from discounted paid support services on\n"
-"www.mandrivaexpert.com."
-msgstr ""
-"För att dra nytta av fördelarna hos Mandriva Online\n"
-"kommer vi att sända över din konfiguration.\n"
-"\n"
-"Guiden kommer nu att sända följande information till Mandriva:\n"
-"\n"
-"1) listan på de paket du har installerat på systemet,\n"
-"\n"
-"2) din hårdvarukonfiguration.\n"
-"\n"
-"Om du inte känner dig komfortabel med denna idé, eller inte vill dra nytta "
-"av fördelarna med denna tjänst,\n"
-"klicka på \"Avbryt\". Genom att klicka på \"Nästa\", tillåter du oss att "
-"hålla dig informerad\n"
-"om säkerhetsuppdateringar och användbara uppgraderingar via personligt "
-"utformad e-post.\n"
-"Du kan även dra nytta av de rabbatterade supporttjänsterna på \n"
-"www.mandrivaexpert.com."
-
-#: ../mdkonline:180
-#, c-format
-msgid "Connection problem"
-msgstr "Anslutningsproblem"
-
-#: ../mdkonline:180
-#, c-format
-msgid "Problem occurs when uploading files, please try again"
-msgstr "Ett fel inträffade när filerna laddades upp, var vänlig försök igen"
-
-#: ../mdkonline:187
-#, c-format
-msgid "Create a Mandriva Online Account"
-msgstr "Skapa ett Mandriva Online konto"
-
-#. -PO: that is for things like "Mr", "Ms",...
-#: ../mdkonline:192
-#, c-format
-msgid "Greeting:"
-msgstr "Hälsning:"
-
-#: ../mdkonline:193
-#, c-format
-msgid "First name:"
-msgstr "Förnamn:"
-
-#: ../mdkonline:194
-#, c-format
-msgid "Last name:"
-msgstr "Efternamn:"
-
-#: ../mdkonline:197
-#, c-format
-msgid "Confirm Password:"
-msgstr "Bekräfta lösenord:"
-
-#: ../mdkonline:204
-#, c-format
-msgid ""
-"The passwords do not match\n"
-" Please try again\n"
-msgstr ""
-"Lösenorden är inte lika.\n"
-" Försök igen.\n"
-
-#: ../mdkonline:208
-#, c-format
-msgid "Please fill in each field"
-msgstr "Var vänlig  och fyll i alla fält"
-
-#: ../mdkonline:212
-#, c-format
-msgid "Not a valid mail address!\n"
-msgstr "Inte en giltig e-postadress.\n"
-
-#: ../mdkonline:217
-#, c-format
-msgid "Creating account failed!"
-msgstr "Skapande av konto misslyckades!"
-
-#: ../mdkonline:225
-#, c-format
-msgid ""
-"Mandriva Online Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
-msgstr ""
-"Mandriva Online konto skapades.\n"
-"Klicka \"Nästa\" för att autentisera och ladda upp din konfiguration\n"
-
-#: ../mdkonline:229
-#, c-format
-msgid "Your upload was successful!"
-msgstr "Uppladdningen lyckades!"
-
-#: ../mdkonline:229
+#: ../mdkapplet:478
 #, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandriva Online."
-msgstr ""
-"Från och med nu kommer du att få säkerhets-\n"
-"och uppdateringsannonseringar tack vare Mandriva Online."
+msgid "Online WebSite"
+msgstr "Online webbsajt"
 
-#: ../mdkonline:229
+#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
+#: ../mdkapplet:483
 #, c-format
-msgid ""
-"Mandriva Online offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
+msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
-"Mandriva Online erbjuder dig möjligheten att automatisera uppdateringarna.\n"
-"Ett program kommer regelbundet att köras på systemet och vänta på nya "
-"uppdateringar.\n"
-
-#: ../mdkonline:238
-#, c-format
-msgid "Congratulations"
-msgstr "Gratulerar"
-
-#: ../mdkonline:238
-#, c-format
-msgid "Your Mandriva Online account has been successfully configured\n"
-msgstr "Konfigureringen av ditt Mandriva Online-konto lyckades\n"
-
-#: ../mdkonline:253
-#, c-format
-msgid "Configuration uploaded successfully"
-msgstr "Uppladdning av konfigurationen klar"
 
-#: ../mdkonline:254
+#: ../mdkapplet:492
 #, c-format
-msgid "Problem uploading configuration"
-msgstr "Problem uppstod vid konfigurationens uppladdning"
+msgid "Always launch on startup"
+msgstr "Kör alltid vid uppstart"
 
-#: ../mdkonline:256
+#: ../mdkapplet:494
 #, c-format
-msgid ""
-"Cannot connect to Mandriva Online website: wrong login/password or router/"
-"firewall bad settings"
-msgstr ""
-"Kan ej ansluta till Mandriva Onlines webbsajt: Fel användarnamn/lösenord, "
-"eller felaktiga inställningar för router/brandvägg."
+msgid "Quit"
+msgstr "Avsluta"
 
 #: ../mdkonline.pm:207
 #, c-format
@@ -830,6 +369,11 @@ msgstr ""
 "\n"
 "användning:\n"
 
+#: ../mdkupdate:73
+#, c-format
+msgid "  --help\t\t- print this help message.\n"
+msgstr "  --help\t\t- visa det här hjälpmeddelandet.\n"
+
 #: ../mdkupdate:74
 #, c-format
 msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
@@ -859,11 +403,6 @@ msgstr ""
 "  --bundles file.bundle\t- verifiera och installera paket från .bundle "
 "metainfo fil\n"
 
-#: ../mdkupdate:118 ../mdkupdate:164
-#, c-format
-msgid "Warning"
-msgstr "Varning"
-
 #. -PO: here Live Install is currently *NOT* translated on the desktop, so it's better to keep as it:
 #: ../mdkupdate:120
 #, c-format
@@ -874,11 +413,21 @@ msgstr ""
 "Du måste först installera systemet på din hårddisk med Live Installations "
 "Guiden."
 
+#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
+#, c-format
+msgid "Please wait"
+msgstr "Vänta"
+
 #: ../mdkupdate:123 ../mdkupdate:174
 #, c-format
 msgid "Preparing..."
 msgstr "Förbereder..."
 
+#: ../mdkupdate:141 ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
+#, c-format
+msgid "Error"
+msgstr "Fel"
+
 #: ../mdkupdate:141
 #, c-format
 msgid ""
@@ -890,6 +439,11 @@ msgstr ""
 "\n"
 "%s"
 
+#: ../mdkupdate:159 ../mdkupdate:188
+#, c-format
+msgid "An error occurred"
+msgstr "Ett fel inträffade"
+
 #: ../mdkupdate:164
 #, c-format
 msgid ""
@@ -918,6 +472,310 @@ msgstr "Installerar paket...\n"
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "Kunde ej uppdatera paket från update_source källan.\n"
 
+#~ msgid "New bundles are available for your system"
+#~ msgstr "Nya samlingar finns tillgängliga för ditt system"
+
+#~ msgid "Service is not configured. Please click on \"Configure the service\""
+#~ msgstr "Tjänsten är ej konfigurerad. Klicka på \"Konfigurera tjänsten\""
+
+#~ msgid "Configure the service"
+#~ msgstr "Konfigurera tjänsten"
+
+#~ msgid "Check updates"
+#~ msgstr "Kontrollera om det finns uppdateringar"
+
+#~ msgid "Configure Now!"
+#~ msgstr "Konfigurera nu!"
+
+#~ msgid "Actions"
+#~ msgstr "Åtgärder"
+
+#~ msgid "Configure"
+#~ msgstr "Konfigurera"
+
+#~ msgid "See logs"
+#~ msgstr "Kontrollera loggar"
+
+#~ msgid "Status"
+#~ msgstr "Status"
+
+#~ msgid "Close"
+#~ msgstr "Stäng"
+
+#~ msgid "Network Connection: "
+#~ msgstr "Nätverksanslutning: "
+
+#~ msgid "Up"
+#~ msgstr "Upp"
+
+#~ msgid "Down"
+#~ msgstr "Ner"
+
+#~ msgid "Last check: "
+#~ msgstr "Sist kontrollerat: "
+
+#~ msgid "Machine name:"
+#~ msgstr "Datornamn:"
+
+#~ msgid "Updates: "
+#~ msgstr "Uppdateringar: "
+
+#~ msgid "Development release not supported by service"
+#~ msgstr "Utvecklingsversion stöds inte av tjänsten"
+
+#~ msgid "Too old release not supported by service"
+#~ msgstr "För gammal version för att stödjas av tjänsten"
+
+#~ msgid "Unknown state"
+#~ msgstr "Okänd status"
+
+#~ msgid "Online services disabled. Contact Mandriva Online site\n"
+#~ msgstr "Online tjänster avaktiverade. Kontakta Mandriva Online\n"
+
+#~ msgid "Wrong Password.\n"
+#~ msgstr "Felaktigt lösenord.\n"
+
+#~ msgid "Wrong Action or host or login.\n"
+#~ msgstr "Fel åtgärd, värd eller login.\n"
+
+#~ msgid ""
+#~ "Something is wrong with your network settings (check your route, firewall "
+#~ "or proxy settings)\n"
+#~ msgstr ""
+#~ "Något verkar fel med dina nätverksinställningar (kontrollera dina "
+#~ "routing-, brandväggs- och proxyinställningar)\n"
+
+#~ msgid ""
+#~ "Problem occured while connecting to the server, please contact the "
+#~ "support team"
+#~ msgstr ""
+#~ "Ett problem uppstod när servern skulle kontaktas, kontakta supporten."
+
+#~ msgid "Response from Mandriva Online server\n"
+#~ msgstr "Svar från Mandriva Online server\n"
+
+#~ msgid "No check"
+#~ msgstr "Ingen kontroll"
+
+#~ msgid "Checking config file: Not present\n"
+#~ msgstr "Kontrollerar konfigurationsfil: Ej tillgänglig\n"
+
+#~ msgid "Logs"
+#~ msgstr "Loggar"
+
+#~ msgid "Clear"
+#~ msgstr "Töm"
+
+#~ msgid ""
+#~ "mdonline version %s\n"
+#~ "Copyright (C) %s Mandriva.\n"
+#~ "This is free software and may be redistributed under the terms of the GNU "
+#~ "GPL.\n"
+#~ "\n"
+#~ "usage:\n"
+#~ msgstr ""
+#~ "mdonline version %s\n"
+#~ "Copyright © %s Mandriva.\n"
+#~ "Det här är fri programvara och får distribueras enligt villkoren i GNU "
+#~ "GPL.\n"
+#~ "\n"
+#~ "användning:\n"
+
+#~ msgid "  --box=\t\t\t- hostname.\n"
+#~ msgstr "  --box=\t\t\t- maskinnamn.\n"
+
+#~ msgid "  --country\t\t\t- name of country of the user. \n"
+#~ msgstr "  --country\t\t\t- namnet på användarens land. \n"
+
+#~ msgid "  --interactive\t\t- use the interactive mode.\n"
+#~ msgstr "  --interactive\t\t- amvänd interaktivt läge.\n"
+
+#~ msgid "  --nointeractive\t- use the non-interactive mode.\n"
+#~ msgstr "  --nointeractive\t- använd icke-interaktivt läge.\n"
+
+#~ msgid "  --login=\t\t     - login name of the user.\n"
+#~ msgstr "  --login=\t\t     - användarens inloggningsnamn.\n"
+
+#~ msgid "  --pass=\t\t\t- password  of the user.\n"
+#~ msgstr "  --pass=\t\t\t- användarens lösenord.\n"
+
+#~ msgid "Mandriva Online"
+#~ msgstr "Mandriva Online"
+
+#~ msgid "I already have an account"
+#~ msgstr "Jag har redan ett konto"
+
+#~ msgid "I want to subscribe"
+#~ msgstr "Jag vill prenumerera"
+
+#~ msgid "Mr."
+#~ msgstr "Herr"
+
+#~ msgid "Mrs."
+#~ msgstr "Fru"
+
+#~ msgid "Ms."
+#~ msgstr "Fru"
+
+#~ msgid "Reading configuration\n"
+#~ msgstr "Läser konfiguration\n"
+
+#~ msgid ""
+#~ "This assistant will help you to upload your configuration\n"
+#~ "(packages, hardware configuration) to a centralized database in\n"
+#~ "order to keep you informed about security updates and useful upgrades.\n"
+#~ msgstr ""
+#~ "Den här assistenten kommer hjälpa dig att ladda upp din\n"
+#~ "konfiguration (paket, hårdvarukonfiguration) till en centraliserad\n"
+#~ "databas för att kunna hålla dig informerad om säkerhetsuppdateringar\n"
+#~ "och andra användbara uppdateringar.\n"
+
+#~ msgid "Account creation or authentication"
+#~ msgstr "Skapar eller autentiserar konto"
+
+#~ msgid "Enter your Mandriva Online login, password and machine name:"
+#~ msgstr "Ange ditt Mandriva Online-användarnamn, lösenord och datornamn:"
+
+#~ msgid "Email address:"
+#~ msgstr "E-postadress"
+
+#~ msgid "Country"
+#~ msgstr "Land"
+
+#~ msgid "Password:"
+#~ msgstr "Lösenord:"
+
+#~ msgid "Machine description:"
+#~ msgstr "Datorbeskrivning:"
+
+#~ msgid "(Ex: My Home Office's Computer)"
+#~ msgstr "(Ex: Min Hemkontor-dator)"
+
+#~ msgid "Machine name must be 1 to 40 alphanumerical characters"
+#~ msgstr "Maskinens namn måste vara mellan 1 och 40 alfanumeriska tecken"
+
+#~ msgid "Connecting to Mandriva Online website..."
+#~ msgstr "Kontaktar Mandriva Onlines websajt"
+
+#~ msgid ""
+#~ "In order to benefit from Mandriva Online services,\n"
+#~ "we are about to upload your configuration.\n"
+#~ "\n"
+#~ "The Wizard will now send the following information to Mandriva:\n"
+#~ "\n"
+#~ "1) the list of packages you have installed on your system,\n"
+#~ "\n"
+#~ "2) your hardware configuration.\n"
+#~ "\n"
+#~ "If you feel uncomfortable by that idea, or do not want to benefit from "
+#~ "this service,\n"
+#~ "please press 'Cancel'. By pressing 'Next', you allow us to keep you "
+#~ "informed\n"
+#~ "about security updates and useful upgrades via personalized email "
+#~ "alerts.\n"
+#~ "Furthermore, you benefit from discounted paid support services on\n"
+#~ "www.mandrivaexpert.com."
+#~ msgstr ""
+#~ "För att dra nytta av fördelarna hos Mandriva Online\n"
+#~ "kommer vi att sända över din konfiguration.\n"
+#~ "\n"
+#~ "Guiden kommer nu att sända följande information till Mandriva:\n"
+#~ "\n"
+#~ "1) listan på de paket du har installerat på systemet,\n"
+#~ "\n"
+#~ "2) din hårdvarukonfiguration.\n"
+#~ "\n"
+#~ "Om du inte känner dig komfortabel med denna idé, eller inte vill dra "
+#~ "nytta av fördelarna med denna tjänst,\n"
+#~ "klicka på \"Avbryt\". Genom att klicka på \"Nästa\", tillåter du oss att "
+#~ "hålla dig informerad\n"
+#~ "om säkerhetsuppdateringar och användbara uppgraderingar via personligt "
+#~ "utformad e-post.\n"
+#~ "Du kan även dra nytta av de rabbatterade supporttjänsterna på \n"
+#~ "www.mandrivaexpert.com."
+
+#~ msgid "Connection problem"
+#~ msgstr "Anslutningsproblem"
+
+#~ msgid "Problem occurs when uploading files, please try again"
+#~ msgstr "Ett fel inträffade när filerna laddades upp, var vänlig försök igen"
+
+#~ msgid "Create a Mandriva Online Account"
+#~ msgstr "Skapa ett Mandriva Online konto"
+
+#~ msgid "Greeting:"
+#~ msgstr "Hälsning:"
+
+#~ msgid "First name:"
+#~ msgstr "Förnamn:"
+
+#~ msgid "Last name:"
+#~ msgstr "Efternamn:"
+
+#~ msgid "Confirm Password:"
+#~ msgstr "Bekräfta lösenord:"
+
+#~ msgid ""
+#~ "The passwords do not match\n"
+#~ " Please try again\n"
+#~ msgstr ""
+#~ "Lösenorden är inte lika.\n"
+#~ " Försök igen.\n"
+
+#~ msgid "Please fill in each field"
+#~ msgstr "Var vänlig  och fyll i alla fält"
+
+#~ msgid "Not a valid mail address!\n"
+#~ msgstr "Inte en giltig e-postadress.\n"
+
+#~ msgid "Creating account failed!"
+#~ msgstr "Skapande av konto misslyckades!"
+
+#~ msgid ""
+#~ "Mandriva Online Account successfully created.\n"
+#~ "Please click \"Next\" to authenticate and upload your configuration\n"
+#~ msgstr ""
+#~ "Mandriva Online konto skapades.\n"
+#~ "Klicka \"Nästa\" för att autentisera och ladda upp din konfiguration\n"
+
+#~ msgid "Your upload was successful!"
+#~ msgstr "Uppladdningen lyckades!"
+
+#~ msgid ""
+#~ "From now you will receive on security and updates \n"
+#~ "announcements thanks to Mandriva Online."
+#~ msgstr ""
+#~ "Från och med nu kommer du att få säkerhets-\n"
+#~ "och uppdateringsannonseringar tack vare Mandriva Online."
+
+#~ msgid ""
+#~ "Mandriva Online offers you the ability to automate the updates.\n"
+#~ "A program will run regulary in your system waiting for new updates\n"
+#~ msgstr ""
+#~ "Mandriva Online erbjuder dig möjligheten att automatisera "
+#~ "uppdateringarna.\n"
+#~ "Ett program kommer regelbundet att köras på systemet och vänta på nya "
+#~ "uppdateringar.\n"
+
+#~ msgid "Congratulations"
+#~ msgstr "Gratulerar"
+
+#~ msgid "Your Mandriva Online account has been successfully configured\n"
+#~ msgstr "Konfigureringen av ditt Mandriva Online-konto lyckades\n"
+
+#~ msgid "Configuration uploaded successfully"
+#~ msgstr "Uppladdning av konfigurationen klar"
+
+#~ msgid "Problem uploading configuration"
+#~ msgstr "Problem uppstod vid konfigurationens uppladdning"
+
+#~ msgid ""
+#~ "Cannot connect to Mandriva Online website: wrong login/password or router/"
+#~ "firewall bad settings"
+#~ msgstr ""
+#~ "Kan ej ansluta till Mandriva Onlines webbsajt: Fel användarnamn/lösenord, "
+#~ "eller felaktiga inställningar för router/brandvägg."
+
 #~ msgid "  --applet\t\t- launch Mandriva Update.\n"
 #~ msgstr "  --applet\t\t- starta Mandriva Update.\n"
 
diff --git a/po/ta.po b/po/ta.po
index 3a76486d..e7418d3f 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline 1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-09 16:26+0200\n"
+"POT-Creation-Date: 2008-02-21 18:21+0100\n"
 "PO-Revision-Date: 2002-08-23 20:02-0400\n"
 "Last-Translator: prabu <prabu_anand2000@yahoo.com>\n"
 "Language-Team: Tamil\n"
@@ -17,70 +17,60 @@ 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:94
+#: ../mdkapplet:88
 #, fuzzy, c-format
 msgid "Will check updates at %s"
 msgstr "பாதுகாப்பு புதுப்பித்தல்"
 
-#: ../mdkapplet:103
+#: ../mdkapplet:97
 #, c-format
 msgid "Your system is up-to-date"
 msgstr ""
 
-#: ../mdkapplet:109
+#: ../mdkapplet:103
 #, fuzzy, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
 "support@mandrivaonline.com"
 msgstr "பிழைகளை ஆங்கிலத்தில் ெதரிவிக்க support@mandrivaonline.com\n"
 
-#: ../mdkapplet:115
+#: ../mdkapplet:110
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "தயவுசெய்து காத்திருக்கவும்..இருக்கும் பொதிகளை கண்டுபிடிக்கப் படுகிறது"
 
-#: ../mdkapplet:121
+#: ../mdkapplet:116
 #, fuzzy, c-format
 msgid "New updates are available for your system"
 msgstr "வலையமைப்பு அட்ைட எதுவும் காணப்படவில்ைல"
 
-#: ../mdkapplet:127
-#, fuzzy, c-format
-msgid "New bundles are available for your system"
-msgstr "வலையமைப்பு அட்ைட எதுவும் காணப்படவில்ைல"
-
-#: ../mdkapplet:133
-#, c-format
-msgid "Service is not configured. Please click on \"Configure the service\""
-msgstr ""
-
-#: ../mdkapplet:139
+#: ../mdkapplet:122
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr ""
 
-#: ../mdkapplet:145
+#: ../mdkapplet:128
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr ""
 
-#: ../mdkapplet:151 ../mdkapplet:182
+#: ../mdkapplet:134 ../mdkapplet:165
 #, c-format
 msgid "urpmi database locked"
 msgstr ""
 
-#: ../mdkapplet:157
+#: ../mdkapplet:140
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
-#: ../mdkapplet:163
+#: ../mdkapplet:146
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
 msgstr ""
 
-#: ../mdkapplet:169
+#: ../mdkapplet:152
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -91,572 +81,131 @@ msgid ""
 "Then, restart \"%s\"."
 msgstr ""
 
-#: ../mdkapplet:174
+#: ../mdkapplet:157
 #, c-format
 msgid "Enabled"
 msgstr "ெசயல்படுத்தப்பட்டுள்ளதா"
 
-#: ../mdkapplet:187
+#: ../mdkapplet:170
 #, c-format
 msgid "Error updating media"
 msgstr ""
 
-#: ../mdkapplet:202
+#: ../mdkapplet:185
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr ""
 
-#: ../mdkapplet:207
+#: ../mdkapplet:190
 #, c-format
 msgid "Packages are up to date"
 msgstr ""
 
-#: ../mdkapplet:212
+#: ../mdkapplet:195
 #, c-format
 msgid "Failed to open urpmi database"
 msgstr ""
 
-#: ../mdkapplet:217 ../mdkapplet:324
+#: ../mdkapplet:200
 #, fuzzy, c-format
 msgid "Install updates"
 msgstr "உருகருக்களை நிறுவுங்கள்"
 
-#: ../mdkapplet:218
-#, fuzzy, c-format
-msgid "Configure the service"
-msgstr "வடிவமை"
-
-#: ../mdkapplet:219
+#: ../mdkapplet:201
 #, fuzzy, c-format
 msgid "Check Updates"
 msgstr "புதுப்பித்தல்கள்"
 
-#: ../mdkapplet:220 ../mdkapplet:327 ../mdkonline:114 ../mdkonline:155
-#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
-#, c-format
-msgid "Please wait"
-msgstr "தயவுசெய்து காத்திருக்கவும்.."
-
-#: ../mdkapplet:220 ../mdkapplet:326 ../mdkapplet:327
-#, fuzzy, c-format
-msgid "Check updates"
-msgstr "பாதுகாப்பு புதுப்பித்தல்"
-
-#: ../mdkapplet:223 ../mdkapplet:648
-#, c-format
-msgid "Online WebSite"
-msgstr ""
-
-#: ../mdkapplet:224
+#: ../mdkapplet:202
 #, fuzzy, c-format
 msgid "Configure Network"
 msgstr "வலையமைப்பாக்கங்களை வடிவமையுங்கள்"
 
-#: ../mdkapplet:225
-#, fuzzy, c-format
-msgid "Configure Now!"
-msgstr "வடிவமைப்பு படித்துக்கொன்டிருக்கிறது\n"
-
-#: ../mdkapplet:313 ../mdkapplet:392
-#, fuzzy, c-format
-msgid "Mandriva Linux Updates Applet"
-msgstr "மாண்டிரேக் கொள்கை"
-
-#: ../mdkapplet:322
-#, c-format
-msgid "Actions"
-msgstr "செயல்கள்"
-
-#: ../mdkapplet:325
-#, c-format
-msgid "Configure"
-msgstr "வடிவமை"
-
-#: ../mdkapplet:329
-#, c-format
-msgid "See logs"
-msgstr ""
-
-#: ../mdkapplet:332
-#, c-format
-msgid "Status"
-msgstr "நிலவரம்"
-
-#: ../mdkapplet:336 ../mdkapplet:597
-#, c-format
-msgid "Close"
-msgstr "மூடு"
-
-#: ../mdkapplet:365
-#, fuzzy, c-format
-msgid "Network Connection: "
-msgstr "தொலைப்புழங்கி"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Up"
-msgstr "மேல்"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Down"
-msgstr "கீழ்"
-
-#: ../mdkapplet:366
-#, c-format
-msgid "Last check: "
-msgstr ""
-
-#: ../mdkapplet:367 ../mdkonline:145
-#, c-format
-msgid "Machine name:"
-msgstr "கணிணியின் பெயர்"
-
-#: ../mdkapplet:368
-#, fuzzy, c-format
-msgid "Updates: "
-msgstr "புதுப்பித்தல்கள்"
-
-#: ../mdkapplet:372
+#: ../mdkapplet:283
 #, fuzzy, c-format
 msgid "Launching drakconnect\n"
 msgstr "டிரேக்பயனரை துவக்கு"
 
-#: ../mdkapplet:375
+#: ../mdkapplet:286
 #, c-format
 msgid "Mandriva Online seems to be reinstalled, reloading applet ...."
 msgstr ""
 
-#: ../mdkapplet:383
+#: ../mdkapplet:294
 #, c-format
 msgid "Launching MandrivaUpdate\n"
 msgstr ""
 
-#: ../mdkapplet:398
+#: ../mdkapplet:303
+#, fuzzy, c-format
+msgid "Mandriva Linux Updates Applet"
+msgstr "மாண்டிரேக் கொள்கை"
+
+#: ../mdkapplet:308
 #, fuzzy, c-format
 msgid "Computing new updates...\n"
 msgstr "தொடர்பில் பிழை நேர்ந்துள்ளது"
 
-#: ../mdkapplet:399
+#: ../mdkapplet:309
 #, fuzzy, c-format
 msgid "Connecting to"
 msgstr "தொடர்பில் பிழை நேர்ந்துள்ளது"
 
-#: ../mdkapplet:467 ../mdkupdate:159 ../mdkupdate:188
-#, c-format
-msgid "An error occurred"
-msgstr "பிழை நேர்ந்துள்ளது மன்னிக்கவும்"
-
-#: ../mdkapplet:475
-#, c-format
-msgid "Development release not supported by service"
-msgstr ""
-
-#: ../mdkapplet:476
-#, c-format
-msgid "Too old release not supported by service"
-msgstr ""
-
-#: ../mdkapplet:477
-#, fuzzy, c-format
-msgid "Unknown state"
-msgstr "தெரியாத பயனர்"
-
-#: ../mdkapplet:478
-#, c-format
-msgid "Online services disabled. Contact Mandriva Online site\n"
-msgstr ""
-
-#: ../mdkapplet:479
-#, c-format
-msgid "Wrong Password.\n"
-msgstr "தவறான கடவுச்சொல்\n"
-
-#: ../mdkapplet:480
-#, c-format
-msgid "Wrong Action or host or login.\n"
-msgstr ""
-
-#: ../mdkapplet:481
-#, c-format
-msgid ""
-"Something is wrong with your network settings (check your route, firewall or "
-"proxy settings)\n"
-msgstr ""
-
-#: ../mdkapplet:483
-#, c-format
-msgid ""
-"Problem occured while connecting to the server, please contact the support "
-"team"
-msgstr ""
-
-#: ../mdkapplet:487
-#, fuzzy, c-format
-msgid "Response from Mandriva Online server\n"
-msgstr "மாண்டிரேக் இணையத்தளத்திற்கு வருக"
-
-#: ../mdkapplet:490
+#: ../mdkapplet:386
 #, fuzzy, c-format
 msgid "System is up-to-date\n"
 msgstr "இயக்க முறைமை"
 
-#: ../mdkapplet:527
-#, c-format
-msgid "No check"
-msgstr ""
-
-#: ../mdkapplet:541
-#, c-format
-msgid "Checking config file: Not present\n"
-msgstr ""
-
-#: ../mdkapplet:544
+#: ../mdkapplet:415
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr ""
 
-#: ../mdkapplet:587
+#: ../mdkapplet:457 ../mdkupdate:118 ../mdkupdate:164
 #, c-format
-msgid "Logs"
-msgstr "பதிவுகள்"
-
-#: ../mdkapplet:603
-#, c-format
-msgid "Clear"
-msgstr "துடை"
+msgid "Warning"
+msgstr "எச்சரிக்ைக"
 
-#: ../mdkapplet:629
+#: ../mdkapplet:468
 #, c-format
 msgid "About..."
 msgstr "பற்றி..."
 
-#: ../mdkapplet:631
+#: ../mdkapplet:472
 #, fuzzy, c-format
 msgid "Mandriva Online %s"
 msgstr "மாண்ட்ேரக்இணைய"
 
-#: ../mdkapplet:635
+#: ../mdkapplet:473
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr ""
 
-#: ../mdkapplet:647
+#: ../mdkapplet:476
 #, c-format
 msgid "Mandriva Online gives access to Mandriva web services."
 msgstr ""
 
-#: ../mdkapplet:655
-#, c-format
-msgid "Always launch on startup"
-msgstr ""
-
-#: ../mdkapplet:657
-#, c-format
-msgid "Quit"
-msgstr "வெளிச்செல்"
-
-#: ../mdkonline:58
-#, c-format
-msgid ""
-"mdonline version %s\n"
-"Copyright (C) %s Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"mdonline வெளியீடு %s\n"
-"உரிமம்; %s Mandriva.\n"
-"இது சுதந்திரமாக பயன்படுத்தக் கூடிய மென்பொருள், குனு GPL கீழ் வெளியிடப்பட்டுள்ளது\n"
-"\n"
-"பயன்பாடு\n"
-
-#: ../mdkonline:63 ../mdkupdate:73
-#, c-format
-msgid "  --help\t\t- print this help message.\n"
-msgstr "  --help\t\t- இந்த உதவியை காட்டு.\n"
-
-#: ../mdkonline:64
-#, c-format
-msgid "  --box=\t\t\t- hostname.\n"
-msgstr ""
-
-#: ../mdkonline:65
-#, c-format
-msgid "  --country\t\t\t- name of country of the user. \n"
-msgstr ""
-
-#: ../mdkonline:66
-#, c-format
-msgid "  --interactive\t\t- use the interactive mode.\n"
-msgstr ""
-
-#: ../mdkonline:67
-#, c-format
-msgid "  --nointeractive\t- use the non-interactive mode.\n"
-msgstr ""
-
-#: ../mdkonline:68
-#, c-format
-msgid "  --login=\t\t     - login name of the user.\n"
-msgstr ""
-
-#: ../mdkonline:69
-#, c-format
-msgid "  --pass=\t\t\t- password  of the user.\n"
-msgstr ""
-
-#: ../mdkonline:87 ../mdkonline:120
-#, c-format
-msgid "Mandriva Online"
-msgstr "மாண்ட்ேரக்இணைய"
-
-#: ../mdkonline:90
-#, c-format
-msgid "I already have an account"
-msgstr ""
-
-#: ../mdkonline:91
-#, c-format
-msgid "I want to subscribe"
-msgstr ""
-
-#: ../mdkonline:96
-#, c-format
-msgid "Mr."
-msgstr "திரு"
-
-#: ../mdkonline:96
-#, c-format
-msgid "Mrs."
-msgstr "திருமதி"
-
-#: ../mdkonline:96
-#, c-format
-msgid "Ms."
-msgstr "திருமதி"
-
-#: ../mdkonline:114
-#, c-format
-msgid "Reading configuration\n"
-msgstr "வடிவமைப்பு படித்துக்கொன்டிருக்கிறது\n"
-
-#: ../mdkonline:123
-#, c-format
-msgid ""
-"This assistant will help you to upload your configuration\n"
-"(packages, hardware configuration) to a centralized database in\n"
-"order to keep you informed about security updates and useful upgrades.\n"
-msgstr ""
-" வேலைச் செய்ய வேண்டும்.இது உங்கள் கணிணிக்குத் தேவையான \n"
-"புதிய நிரல்களை அனுப்ப வடிவமைப்பு விவரங்களை ஓர் தரவுத்தளத்திற்கு\n"
-"அனுப்பி வைக்கும்.\n"
-
-#: ../mdkonline:131
-#, c-format
-msgid "Account creation or authentication"
-msgstr ""
-
-#: ../mdkonline:136
-#, c-format
-msgid "Enter your Mandriva Online login, password and machine name:"
-msgstr ""
-"உங்கள் மாண்டிரேக் இணையத்தள பயனர்கணக்கின்\n"
-"பெயர்,கடவுச்சொல்லை அடிக்கவும்"
-
-#: ../mdkonline:142 ../mdkonline:195
-#, fuzzy, c-format
-msgid "Email address:"
-msgstr "அதிகபட்ச IP முகவரி:"
-
-#: ../mdkonline:143
-#, c-format
-msgid "Country"
-msgstr "நாடு"
-
-#: ../mdkonline:144 ../mdkonline:196
-#, c-format
-msgid "Password:"
-msgstr "கடவுச்சொல்"
-
-#: ../mdkonline:146
-#, fuzzy, c-format
-msgid "Machine description:"
-msgstr "கணிணியின் பெயர்"
-
-#: ../mdkonline:147
-#, c-format
-msgid "(Ex: My Home Office's Computer)"
-msgstr ""
-
-#: ../mdkonline:152 ../mdkonline:159 ../mdkonline:180 ../mdkonline:204
-#: ../mdkonline:208 ../mdkonline:212 ../mdkonline:217 ../mdkupdate:141
-#: ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
-#, c-format
-msgid "Error"
-msgstr "பிழை"
-
-#: ../mdkonline:152
-#, c-format
-msgid "Machine name must be 1 to 40 alphanumerical characters"
-msgstr ""
-
-#: ../mdkonline:155
-#, fuzzy, c-format
-msgid "Connecting to Mandriva Online website..."
-msgstr "மாண்டிரேக் இணையத்தளத்திற்கு வருக"
-
-#: ../mdkonline:167
-#, c-format
-msgid ""
-"In order to benefit from Mandriva Online services,\n"
-"we are about to upload your configuration.\n"
-"\n"
-"The Wizard will now send the following information to Mandriva:\n"
-"\n"
-"1) the list of packages you have installed on your system,\n"
-"\n"
-"2) your hardware configuration.\n"
-"\n"
-"If you feel uncomfortable by that idea, or do not want to benefit from this "
-"service,\n"
-"please press 'Cancel'. By pressing 'Next', you allow us to keep you "
-"informed\n"
-"about security updates and useful upgrades via personalized email alerts.\n"
-"Furthermore, you benefit from discounted paid support services on\n"
-"www.mandrivaexpert.com."
-msgstr ""
-"மேன்மையான சேவைகளை அளிக்க மாண்டிரேக் இணையத்தளத்திற்கு\n"
-"உங்கள் விவரங்கள் அனுப்பப்படுகின்றன\n"
-"\n"
-"மாயாவி பின்வரும் விவரங்களை  அனுப்பப்விருக்கிறது\n"
-"\n"
-"1)நிறுவப்பட்டுள்ள நிரல்கள்,\n"
-"\n"
-"2)கணிணியின் வன்பொருள் வடிவமைப்பு\n"
-"\n"
-"உங்களுக்கு இது பிடிக்கவில்லையென்றால்,  நீக்கு பொத்தானை அழுத்து\n"
-"அடுத்து என்ற பொத்தானை அழுத்தினால் நீங்கள் மாண்டிரேக் இணையத்தளத்திலிருந்து\n"
-"பாதுகாப்பு, புதிய நிரல் பற்றி அறியலாம்.\n"
-"மேலும் நீங்கள் www.mandrivaexpert.com என்ற இணையத்தளத்திற்கு."
-
-#: ../mdkonline:180
-#, c-format
-msgid "Connection problem"
-msgstr "தொடர்பில் பிழை நேர்ந்துள்ளது"
-
-#: ../mdkonline:180
-#, c-format
-msgid "Problem occurs when uploading files, please try again"
-msgstr ""
-
-#: ../mdkonline:187
-#, fuzzy, c-format
-msgid "Create a Mandriva Online Account"
-msgstr "மாண்ட்ரிவ க்ளப் கணக்கு"
-
-#. -PO: that is for things like "Mr", "Ms",...
-#: ../mdkonline:192
-#, fuzzy, c-format
-msgid "Greeting:"
-msgstr "பச்சை"
-
-#: ../mdkonline:193
-#, c-format
-msgid "First name:"
-msgstr "முதல் பெயர்"
-
-#: ../mdkonline:194
-#, fuzzy, c-format
-msgid "Last name:"
-msgstr "முதல் பெயர்"
-
-#: ../mdkonline:197
-#, c-format
-msgid "Confirm Password:"
-msgstr "கடவுச்சொல்லை உறுதிச் செய்:"
-
-#: ../mdkonline:204
-#, c-format
-msgid ""
-"The passwords do not match\n"
-" Please try again\n"
-msgstr ""
-"கடவுச்சொற்கள் பொருத்தமாக இல்லை.\n"
-"தயவுசெய்து மீண்டும் முயன்று பார்க்கவும்\n"
-
-#: ../mdkonline:208
-#, c-format
-msgid "Please fill in each field"
-msgstr ""
-
-#: ../mdkonline:212
-#, c-format
-msgid "Not a valid mail address!\n"
-msgstr "சரியான மின்னஞ்சல் முகவரி அல்ல!\n"
-
-#: ../mdkonline:217
-#, c-format
-msgid "Creating account failed!"
-msgstr ""
-
-#: ../mdkonline:225
+#: ../mdkapplet:478
 #, c-format
-msgid ""
-"Mandriva Online Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
+msgid "Online WebSite"
 msgstr ""
 
-#: ../mdkonline:229
-#, c-format
-msgid "Your upload was successful!"
-msgstr "உங்கள் மேலேற்றுதல் வெற்றியடைந்தது"
-
-#: ../mdkonline:229
+#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
+#: ../mdkapplet:483
 #, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandriva Online."
+msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
-"இப்போது முதல் நீங்கள் மாண்டிரேக் இணையத்தளத்திலிருந்து\n"
-"பாதுகாப்பு, புதிய நிரல் பற்றி அறியலாம்"
 
-#: ../mdkonline:229
+#: ../mdkapplet:492
 #, c-format
-msgid ""
-"Mandriva Online offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
+msgid "Always launch on startup"
 msgstr ""
-"மாண்டிரேக் இணையம் உங்கள் கணிணியில் புதிய நிரல்களை நிறுவும்\n"
-"புதிய நிரல் பற்றி அறிய உங்கள் கணிணியில் நிரல் ஓடிக்கொண்டிருக்கும்\n"
-
-#: ../mdkonline:238
-#, c-format
-msgid "Congratulations"
-msgstr "பாராட்டுக்கள்"
 
-#: ../mdkonline:238
+#: ../mdkapplet:494
 #, c-format
-msgid "Your Mandriva Online account has been successfully configured\n"
-msgstr ""
-
-#: ../mdkonline:253
-#, fuzzy, c-format
-msgid "Configuration uploaded successfully"
-msgstr "உங்கள் மேலேற்றுதல் வெற்றியடைந்தது"
-
-#: ../mdkonline:254
-#, fuzzy, c-format
-msgid "Problem uploading configuration"
-msgstr "வடிவமைப்பு படித்துக்கொன்டிருக்கிறது\n"
-
-#: ../mdkonline:256
-#, c-format
-msgid ""
-"Cannot connect to Mandriva Online website: wrong login/password or router/"
-"firewall bad settings"
-msgstr ""
+msgid "Quit"
+msgstr "வெளிச்செல்"
 
 #: ../mdkonline.pm:207
 #, fuzzy, c-format
@@ -796,6 +345,11 @@ msgstr ""
 "\n"
 "பயன்பாடு\n"
 
+#: ../mdkupdate:73
+#, c-format
+msgid "  --help\t\t- print this help message.\n"
+msgstr "  --help\t\t- இந்த உதவியை காட்டு.\n"
+
 #: ../mdkupdate:74
 #, fuzzy, c-format
 msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
@@ -823,11 +377,6 @@ msgid ""
 "file.\n"
 msgstr ""
 
-#: ../mdkupdate:118 ../mdkupdate:164
-#, c-format
-msgid "Warning"
-msgstr "எச்சரிக்ைக"
-
 #. -PO: here Live Install is currently *NOT* translated on the desktop, so it's better to keep as it:
 #: ../mdkupdate:120
 #, c-format
@@ -836,11 +385,21 @@ msgid ""
 "Install' wizard."
 msgstr ""
 
+#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
+#, c-format
+msgid "Please wait"
+msgstr "தயவுசெய்து காத்திருக்கவும்.."
+
 #: ../mdkupdate:123 ../mdkupdate:174
 #, c-format
 msgid "Preparing..."
 msgstr ""
 
+#: ../mdkupdate:141 ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
+#, c-format
+msgid "Error"
+msgstr "பிழை"
+
 #: ../mdkupdate:141
 #, c-format
 msgid ""
@@ -849,6 +408,11 @@ msgid ""
 "%s"
 msgstr ""
 
+#: ../mdkupdate:159 ../mdkupdate:188
+#, c-format
+msgid "An error occurred"
+msgstr "பிழை நேர்ந்துள்ளது மன்னிக்கவும்"
+
 #: ../mdkupdate:164
 #, c-format
 msgid ""
@@ -874,6 +438,221 @@ msgid "Unable to update packages from update_source medium.\n"
 msgstr "மாண்ட்ேரக்புதுப்பி ஊடகத்திலிருந்து ெமன்ெபாருைள புதுப்பிக்க முடியவில்ைல\n"
 
 #, fuzzy
+#~ msgid "New bundles are available for your system"
+#~ msgstr "வலையமைப்பு அட்ைட எதுவும் காணப்படவில்ைல"
+
+#, fuzzy
+#~ msgid "Configure the service"
+#~ msgstr "வடிவமை"
+
+#, fuzzy
+#~ msgid "Check updates"
+#~ msgstr "பாதுகாப்பு புதுப்பித்தல்"
+
+#, fuzzy
+#~ msgid "Configure Now!"
+#~ msgstr "வடிவமைப்பு படித்துக்கொன்டிருக்கிறது\n"
+
+#~ msgid "Actions"
+#~ msgstr "செயல்கள்"
+
+#~ msgid "Configure"
+#~ msgstr "வடிவமை"
+
+#~ msgid "Status"
+#~ msgstr "நிலவரம்"
+
+#~ msgid "Close"
+#~ msgstr "மூடு"
+
+#, fuzzy
+#~ msgid "Network Connection: "
+#~ msgstr "தொலைப்புழங்கி"
+
+#~ msgid "Up"
+#~ msgstr "மேல்"
+
+#~ msgid "Down"
+#~ msgstr "கீழ்"
+
+#~ msgid "Machine name:"
+#~ msgstr "கணிணியின் பெயர்"
+
+#, fuzzy
+#~ msgid "Updates: "
+#~ msgstr "புதுப்பித்தல்கள்"
+
+#, fuzzy
+#~ msgid "Unknown state"
+#~ msgstr "தெரியாத பயனர்"
+
+#~ msgid "Wrong Password.\n"
+#~ msgstr "தவறான கடவுச்சொல்\n"
+
+#, fuzzy
+#~ msgid "Response from Mandriva Online server\n"
+#~ msgstr "மாண்டிரேக் இணையத்தளத்திற்கு வருக"
+
+#~ msgid "Logs"
+#~ msgstr "பதிவுகள்"
+
+#~ msgid "Clear"
+#~ msgstr "துடை"
+
+#~ msgid ""
+#~ "mdonline version %s\n"
+#~ "Copyright (C) %s Mandriva.\n"
+#~ "This is free software and may be redistributed under the terms of the GNU "
+#~ "GPL.\n"
+#~ "\n"
+#~ "usage:\n"
+#~ msgstr ""
+#~ "mdonline வெளியீடு %s\n"
+#~ "உரிமம்; %s Mandriva.\n"
+#~ "இது சுதந்திரமாக பயன்படுத்தக் கூடிய மென்பொருள், குனு GPL கீழ் வெளியிடப்பட்டுள்ளது\n"
+#~ "\n"
+#~ "பயன்பாடு\n"
+
+#~ msgid "Mandriva Online"
+#~ msgstr "மாண்ட்ேரக்இணைய"
+
+#~ msgid "Mr."
+#~ msgstr "திரு"
+
+#~ msgid "Mrs."
+#~ msgstr "திருமதி"
+
+#~ msgid "Ms."
+#~ msgstr "திருமதி"
+
+#~ msgid "Reading configuration\n"
+#~ msgstr "வடிவமைப்பு படித்துக்கொன்டிருக்கிறது\n"
+
+#~ msgid ""
+#~ "This assistant will help you to upload your configuration\n"
+#~ "(packages, hardware configuration) to a centralized database in\n"
+#~ "order to keep you informed about security updates and useful upgrades.\n"
+#~ msgstr ""
+#~ " வேலைச் செய்ய வேண்டும்.இது உங்கள் கணிணிக்குத் தேவையான \n"
+#~ "புதிய நிரல்களை அனுப்ப வடிவமைப்பு விவரங்களை ஓர் தரவுத்தளத்திற்கு\n"
+#~ "அனுப்பி வைக்கும்.\n"
+
+#~ msgid "Enter your Mandriva Online login, password and machine name:"
+#~ msgstr ""
+#~ "உங்கள் மாண்டிரேக் இணையத்தள பயனர்கணக்கின்\n"
+#~ "பெயர்,கடவுச்சொல்லை அடிக்கவும்"
+
+#, fuzzy
+#~ msgid "Email address:"
+#~ msgstr "அதிகபட்ச IP முகவரி:"
+
+#~ msgid "Country"
+#~ msgstr "நாடு"
+
+#~ msgid "Password:"
+#~ msgstr "கடவுச்சொல்"
+
+#, fuzzy
+#~ msgid "Machine description:"
+#~ msgstr "கணிணியின் பெயர்"
+
+#, fuzzy
+#~ msgid "Connecting to Mandriva Online website..."
+#~ msgstr "மாண்டிரேக் இணையத்தளத்திற்கு வருக"
+
+#~ msgid ""
+#~ "In order to benefit from Mandriva Online services,\n"
+#~ "we are about to upload your configuration.\n"
+#~ "\n"
+#~ "The Wizard will now send the following information to Mandriva:\n"
+#~ "\n"
+#~ "1) the list of packages you have installed on your system,\n"
+#~ "\n"
+#~ "2) your hardware configuration.\n"
+#~ "\n"
+#~ "If you feel uncomfortable by that idea, or do not want to benefit from "
+#~ "this service,\n"
+#~ "please press 'Cancel'. By pressing 'Next', you allow us to keep you "
+#~ "informed\n"
+#~ "about security updates and useful upgrades via personalized email "
+#~ "alerts.\n"
+#~ "Furthermore, you benefit from discounted paid support services on\n"
+#~ "www.mandrivaexpert.com."
+#~ msgstr ""
+#~ "மேன்மையான சேவைகளை அளிக்க மாண்டிரேக் இணையத்தளத்திற்கு\n"
+#~ "உங்கள் விவரங்கள் அனுப்பப்படுகின்றன\n"
+#~ "\n"
+#~ "மாயாவி பின்வரும் விவரங்களை  அனுப்பப்விருக்கிறது\n"
+#~ "\n"
+#~ "1)நிறுவப்பட்டுள்ள நிரல்கள்,\n"
+#~ "\n"
+#~ "2)கணிணியின் வன்பொருள் வடிவமைப்பு\n"
+#~ "\n"
+#~ "உங்களுக்கு இது பிடிக்கவில்லையென்றால்,  நீக்கு பொத்தானை அழுத்து\n"
+#~ "அடுத்து என்ற பொத்தானை அழுத்தினால் நீங்கள் மாண்டிரேக் இணையத்தளத்திலிருந்து\n"
+#~ "பாதுகாப்பு, புதிய நிரல் பற்றி அறியலாம்.\n"
+#~ "மேலும் நீங்கள் www.mandrivaexpert.com என்ற இணையத்தளத்திற்கு."
+
+#~ msgid "Connection problem"
+#~ msgstr "தொடர்பில் பிழை நேர்ந்துள்ளது"
+
+#, fuzzy
+#~ msgid "Create a Mandriva Online Account"
+#~ msgstr "மாண்ட்ரிவ க்ளப் கணக்கு"
+
+#, fuzzy
+#~ msgid "Greeting:"
+#~ msgstr "பச்சை"
+
+#~ msgid "First name:"
+#~ msgstr "முதல் பெயர்"
+
+#, fuzzy
+#~ msgid "Last name:"
+#~ msgstr "முதல் பெயர்"
+
+#~ msgid "Confirm Password:"
+#~ msgstr "கடவுச்சொல்லை உறுதிச் செய்:"
+
+#~ msgid ""
+#~ "The passwords do not match\n"
+#~ " Please try again\n"
+#~ msgstr ""
+#~ "கடவுச்சொற்கள் பொருத்தமாக இல்லை.\n"
+#~ "தயவுசெய்து மீண்டும் முயன்று பார்க்கவும்\n"
+
+#~ msgid "Not a valid mail address!\n"
+#~ msgstr "சரியான மின்னஞ்சல் முகவரி அல்ல!\n"
+
+#~ msgid "Your upload was successful!"
+#~ msgstr "உங்கள் மேலேற்றுதல் வெற்றியடைந்தது"
+
+#~ msgid ""
+#~ "From now you will receive on security and updates \n"
+#~ "announcements thanks to Mandriva Online."
+#~ msgstr ""
+#~ "இப்போது முதல் நீங்கள் மாண்டிரேக் இணையத்தளத்திலிருந்து\n"
+#~ "பாதுகாப்பு, புதிய நிரல் பற்றி அறியலாம்"
+
+#~ msgid ""
+#~ "Mandriva Online offers you the ability to automate the updates.\n"
+#~ "A program will run regulary in your system waiting for new updates\n"
+#~ msgstr ""
+#~ "மாண்டிரேக் இணையம் உங்கள் கணிணியில் புதிய நிரல்களை நிறுவும்\n"
+#~ "புதிய நிரல் பற்றி அறிய உங்கள் கணிணியில் நிரல் ஓடிக்கொண்டிருக்கும்\n"
+
+#~ msgid "Congratulations"
+#~ msgstr "பாராட்டுக்கள்"
+
+#, fuzzy
+#~ msgid "Configuration uploaded successfully"
+#~ msgstr "உங்கள் மேலேற்றுதல் வெற்றியடைந்தது"
+
+#, fuzzy
+#~ msgid "Problem uploading configuration"
+#~ msgstr "வடிவமைப்பு படித்துக்கொன்டிருக்கிறது\n"
+
+#, fuzzy
 #~ msgid "  --applet\t\t- launch Mandriva Update.\n"
 #~ msgstr "  --applet\t\t-அைனத்து  விவரங்களையும் புதுப்பிக்கவும்\n"
 
diff --git a/po/tg.po b/po/tg.po
index 6d955d69..14e9eaaa 100644
--- a/po/tg.po
+++ b/po/tg.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline-tg\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-09 16:26+0200\n"
+"POT-Creation-Date: 2008-02-21 18:21+0100\n"
 "PO-Revision-Date: 2005-09-17 16:22+0500\n"
 "Last-Translator: Victor Ibragimov <youth_opportunities@tajikngo.org>\n"
 "Language-Team: Tajik\n"
@@ -25,17 +25,17 @@ msgstr ""
 "X-Generator: KBabel 1.10\n"
 
 #. -PO: here %s will be replaced by the local time (eg: "Will check updates at 14:03:50"
-#: ../mdkapplet:94
+#: ../mdkapplet:88
 #, fuzzy, c-format
 msgid "Will check updates at %s"
 msgstr "Навкуниҳоро тафтиш кунед"
 
-#: ../mdkapplet:103
+#: ../mdkapplet:97
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "Системаи навкуниро талаб намекунад"
 
-#: ../mdkapplet:109
+#: ../mdkapplet:103
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -44,53 +44,43 @@ msgstr ""
 "Мушкилии танзими хидмат.Марҳамат карда номнависҳоро санҷед ва ба "
 "support@mandrivaonline.com пайём фиристед"
 
-#: ../mdkapplet:115
+#: ../mdkapplet:110
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "Интизор шавед, ёфтани қуттиҳои дастрас..."
 
-#: ../mdkapplet:121
+#: ../mdkapplet:116
 #, c-format
 msgid "New updates are available for your system"
 msgstr "Барои системаи шумо навсозиҳои дастрасанд"
 
-#: ../mdkapplet:127
-#, fuzzy, c-format
-msgid "New bundles are available for your system"
-msgstr "Барои системаи шумо навсозиҳои дастрасанд"
-
-#: ../mdkapplet:133
-#, c-format
-msgid "Service is not configured. Please click on \"Configure the service\""
-msgstr "Хидматрасон танзим нашудааст. Ба \"Танзимкунии хидмат\" ангушт занед"
-
-#: ../mdkapplet:139
+#: ../mdkapplet:122
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "Шабака дастрас нест. Марҳамат кардашабакаи худро танзим кунед"
 
-#: ../mdkapplet:145
+#: ../mdkapplet:128
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "Хидмат фаъол нагаштааст. Ба \"Пойгоҳи шабакавӣ\" ангушт занед"
 
-#: ../mdkapplet:151 ../mdkapplet:182
+#: ../mdkapplet:134 ../mdkapplet:165
 #, fuzzy, c-format
 msgid "urpmi database locked"
 msgstr "urpmi манбаи маълумот дастнорас аст"
 
-#: ../mdkapplet:157
+#: ../mdkapplet:140
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr "Барориш пуштибонӣ намегардад (барориши хеле кӯҳна, ё коркарди барориш)"
 
-#: ../mdkapplet:163
+#: ../mdkapplet:146
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
 msgstr ""
 
-#: ../mdkapplet:169
+#: ../mdkapplet:152
 #, fuzzy, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -108,589 +98,133 @@ msgstr ""
 "\n"
 "Сониян, %s-ро дуюм маротиба ба кор дароред."
 
-#: ../mdkapplet:174
+#: ../mdkapplet:157
 #, c-format
 msgid "Enabled"
 msgstr "Даргирифта"
 
-#: ../mdkapplet:187
+#: ../mdkapplet:170
 #, c-format
 msgid "Error updating media"
 msgstr ""
 
-#: ../mdkapplet:202
+#: ../mdkapplet:185
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr "Тафтишкунӣ... Навкуниҳо имконпазиранд\n"
 
-#: ../mdkapplet:207
+#: ../mdkapplet:190
 #, c-format
 msgid "Packages are up to date"
 msgstr ""
 
-#: ../mdkapplet:212
+#: ../mdkapplet:195
 #, fuzzy, c-format
 msgid "Failed to open urpmi database"
 msgstr "кушодани rpmdb номумкин"
 
-#: ../mdkapplet:217 ../mdkapplet:324
+#: ../mdkapplet:200
 #, c-format
 msgid "Install updates"
 msgstr "Кор гузоштани навигариҳо"
 
-#: ../mdkapplet:218
-#, c-format
-msgid "Configure the service"
-msgstr "Танзимкунии хидмат"
-
-#: ../mdkapplet:219
+#: ../mdkapplet:201
 #, c-format
 msgid "Check Updates"
 msgstr "Тафтиши Навкуниҳо"
 
-#: ../mdkapplet:220 ../mdkapplet:327 ../mdkonline:114 ../mdkonline:155
-#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
-#, c-format
-msgid "Please wait"
-msgstr "Лутфан интизор шавед"
-
-#: ../mdkapplet:220 ../mdkapplet:326 ../mdkapplet:327
-#, c-format
-msgid "Check updates"
-msgstr "Навкуниҳоро тафтиш кунед"
-
-#: ../mdkapplet:223 ../mdkapplet:648
-#, c-format
-msgid "Online WebSite"
-msgstr "WebПойгоҳи Ғайрихудмухтор"
-
-#: ../mdkapplet:224
+#: ../mdkapplet:202
 #, c-format
 msgid "Configure Network"
 msgstr "Танзимкунии Шабака"
 
-#: ../mdkapplet:225
-#, c-format
-msgid "Configure Now!"
-msgstr "Ҳозир Танзим кунед!"
-
-#: ../mdkapplet:313 ../mdkapplet:392
-#, c-format
-msgid "Mandriva Linux Updates Applet"
-msgstr "Апплети Mandriva Linux Навкунӣ"
-
-#: ../mdkapplet:322
-#, c-format
-msgid "Actions"
-msgstr "Амалиёт"
-
-#: ../mdkapplet:325
-#, c-format
-msgid "Configure"
-msgstr "Ба танзим даровардан"
-
-#: ../mdkapplet:329
-#, c-format
-msgid "See logs"
-msgstr "Ба номнависҳо нигаред"
-
-#: ../mdkapplet:332
-#, c-format
-msgid "Status"
-msgstr "Вазъият"
-
-#: ../mdkapplet:336 ../mdkapplet:597
-#, c-format
-msgid "Close"
-msgstr "Пӯшидан"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Network Connection: "
-msgstr "Пайвастшавии Шабакавӣ:  "
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Up"
-msgstr "Ба боло"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Down"
-msgstr "Ба поён"
-
-#: ../mdkapplet:366
-#, c-format
-msgid "Last check: "
-msgstr "Тафтиши охирон: "
-
-#: ../mdkapplet:367 ../mdkonline:145
-#, c-format
-msgid "Machine name:"
-msgstr "Номи мошина:"
-
-#: ../mdkapplet:368
-#, c-format
-msgid "Updates: "
-msgstr "Навсозӣ: "
-
-#: ../mdkapplet:372
+#: ../mdkapplet:283
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Сардиҳии drakconnect\n"
 
-#: ../mdkapplet:375
+#: ../mdkapplet:286
 #, c-format
 msgid "Mandriva Online seems to be reinstalled, reloading applet ...."
 msgstr ""
 "Дар назар чунин аст, ки Mandriva Online боз коргузорӣ шудааст, бозборкунии "
 "апплет ...."
 
-#: ../mdkapplet:383
+#: ../mdkapplet:294
 #, c-format
 msgid "Launching MandrivaUpdate\n"
 msgstr "Сардиҳии MandrivaUpdate\n"
 
-#: ../mdkapplet:398
+#: ../mdkapplet:303
+#, c-format
+msgid "Mandriva Linux Updates Applet"
+msgstr "Апплети Mandriva Linux Навкунӣ"
+
+#: ../mdkapplet:308
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Ҳисобкунии навозиҳои тоза...\n"
 
-#: ../mdkapplet:399
+#: ../mdkapplet:309
 #, c-format
 msgid "Connecting to"
 msgstr "Пайвастшавӣ ба"
 
-#: ../mdkapplet:467 ../mdkupdate:159 ../mdkupdate:188
-#, c-format
-msgid "An error occurred"
-msgstr "Хатогӣ рух дод"
-
-#: ../mdkapplet:475
-#, c-format
-msgid "Development release not supported by service"
-msgstr "Коркарди барориш аз тарафи хидматрасон пуштибонӣ намегардад"
-
-#: ../mdkapplet:476
-#, c-format
-msgid "Too old release not supported by service"
-msgstr "Бароришҳои аз ҳад кӯҳна пуштибонӣ намегарданд"
-
-#: ../mdkapplet:477
-#, c-format
-msgid "Unknown state"
-msgstr "Ҳолати номаълум"
-
-#: ../mdkapplet:478
-#, c-format
-msgid "Online services disabled. Contact Mandriva Online site\n"
-msgstr ""
-"Хидматрасониҳои ғайрихудмухтор хомӯш карда мешаванд. Ба пойгоҳи Mandriva "
-"Online пайваст шавед\n"
-
-#: ../mdkapplet:479
-#, c-format
-msgid "Wrong Password.\n"
-msgstr "Гузарвожаи нодуруст.\n"
-
-#: ../mdkapplet:480
-#, c-format
-msgid "Wrong Action or host or login.\n"
-msgstr "Амалиёти нодурусти ё соҳиб ё ворид.\n"
-
-#: ../mdkapplet:481
-#, c-format
-msgid ""
-"Something is wrong with your network settings (check your route, firewall or "
-"proxy settings)\n"
-msgstr ""
-"Чизе дар гузоришҳои шабакаи шумо нодуруст аст (гардиш, фейрвол ва гузоришҳои "
-"проксии худро санҷед)\n"
-
-#: ../mdkapplet:483
-#, c-format
-msgid ""
-"Problem occured while connecting to the server, please contact the support "
-"team"
-msgstr ""
-
-#: ../mdkapplet:487
-#, c-format
-msgid "Response from Mandriva Online server\n"
-msgstr "Ёри аз тарафи хидматрасони Mandriva Online\n"
-
-#: ../mdkapplet:490
+#: ../mdkapplet:386
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Системаи навкуниро талаб намекунад\n"
 
-#: ../mdkapplet:527
-#, c-format
-msgid "No check"
-msgstr "Бе тафтишот"
-
-#: ../mdkapplet:541
-#, c-format
-msgid "Checking config file: Not present\n"
-msgstr "Тафтиши файли config: ҳозир нест\n"
-
-#: ../mdkapplet:544
+#: ../mdkapplet:415
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Тафтиши Шабака: эҳтимолан хомӯш карда шудааст\n"
 
-#: ../mdkapplet:587
+#: ../mdkapplet:457 ../mdkupdate:118 ../mdkupdate:164
 #, c-format
-msgid "Logs"
-msgstr "Воридҳо"
-
-#: ../mdkapplet:603
-#, c-format
-msgid "Clear"
-msgstr "Пок кардан"
+msgid "Warning"
+msgstr "Огоҳӣ"
 
-#: ../mdkapplet:629
+#: ../mdkapplet:468
 #, c-format
 msgid "About..."
 msgstr "Дар бораи..."
 
-#: ../mdkapplet:631
+#: ../mdkapplet:472
 #, fuzzy, c-format
 msgid "Mandriva Online %s"
 msgstr "Mandriva Online"
 
-#: ../mdkapplet:635
+#: ../mdkapplet:473
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr ""
 
-#: ../mdkapplet:647
+#: ../mdkapplet:476
 #, c-format
 msgid "Mandriva Online gives access to Mandriva web services."
 msgstr ""
 
-#: ../mdkapplet:655
-#, c-format
-msgid "Always launch on startup"
-msgstr "Ҳамеша дар оғозёбӣ сар додан"
-
-#: ../mdkapplet:657
-#, c-format
-msgid "Quit"
-msgstr "Баромадан"
-
-#: ../mdkonline:58
-#, c-format
-msgid ""
-"mdonline version %s\n"
-"Copyright (C) %s Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"mdonline нусхаи %s\n"
-"Copyright (C) %s Mandriva.\n"
-"Ин нармафзори озод мебошад ва дар зери шартҳои GNU GPL аз нав паҳн карда "
-"мешавад.\n"
-"\n"
-"истифода:\n"
-
-#: ../mdkonline:63 ../mdkupdate:73
-#, c-format
-msgid "  --help\t\t- print this help message.\n"
-msgstr "  --help\t\t- чопи ин пайғоми ёрӣ.\n"
-
-#: ../mdkonline:64
-#, c-format
-msgid "  --box=\t\t\t- hostname.\n"
-msgstr ""
-
-#: ../mdkonline:65
-#, c-format
-msgid "  --country\t\t\t- name of country of the user. \n"
-msgstr ""
-
-#: ../mdkonline:66
-#, c-format
-msgid "  --interactive\t\t- use the interactive mode.\n"
-msgstr ""
-
-#: ../mdkonline:67
-#, c-format
-msgid "  --nointeractive\t- use the non-interactive mode.\n"
-msgstr ""
-
-#: ../mdkonline:68
-#, c-format
-msgid "  --login=\t\t     - login name of the user.\n"
-msgstr ""
-
-#: ../mdkonline:69
-#, c-format
-msgid "  --pass=\t\t\t- password  of the user.\n"
-msgstr ""
-
-#: ../mdkonline:87 ../mdkonline:120
-#, c-format
-msgid "Mandriva Online"
-msgstr "Mandriva Online"
-
-#: ../mdkonline:90
-#, c-format
-msgid "I already have an account"
-msgstr "Ман аллакай ҳисоб дорам"
-
-#: ../mdkonline:91
-#, c-format
-msgid "I want to subscribe"
-msgstr "Ман муштарӣ шудан мехоҳам"
-
-#: ../mdkonline:96
-#, c-format
-msgid "Mr."
-msgstr ""
-
-#: ../mdkonline:96
-#, fuzzy, c-format
-msgid "Mrs."
-msgstr "XMrIs"
-
-#: ../mdkonline:96
-#, c-format
-msgid "Ms."
-msgstr ""
-
-#: ../mdkonline:114
-#, c-format
-msgid "Reading configuration\n"
-msgstr "Танзимдарорӣ хонда шуда истодааст\n"
-
-#: ../mdkonline:123
-#, c-format
-msgid ""
-"This assistant will help you to upload your configuration\n"
-"(packages, hardware configuration) to a centralized database in\n"
-"order to keep you informed about security updates and useful upgrades.\n"
-msgstr ""
-"Ин ёрдамчӣ ба шумо барои бор кардани танзимдарории худ\n"
-"(қуттиҳо, танзимдарории сахтафзор) ба манбаи маълумоти\n"
-"марказонидашуда\n"
-"барои шуморо хабардор доштан оид ба навигариҳои бехатарӣ\n"
-"ва афзоишҳои фоиданок ёрӣ хоҳад расонд.\n"
-
-#: ../mdkonline:131
-#, c-format
-msgid "Account creation or authentication"
-msgstr "Офаридани ҳисоб ё аслшиносӣ"
-
-#: ../mdkonline:136
-#, c-format
-msgid "Enter your Mandriva Online login, password and machine name:"
-msgstr ""
-"Ворикунанадаи Mandriva Online-и худро, гузарвожа ва номи мошинаро ворид "
-"кунед:"
-
-#: ../mdkonline:142 ../mdkonline:195
-#, c-format
-msgid "Email address:"
-msgstr "Почтаи электронӣ:"
-
-#: ../mdkonline:143
-#, c-format
-msgid "Country"
-msgstr "Давлат"
-
-#: ../mdkonline:144 ../mdkonline:196
-#, c-format
-msgid "Password:"
-msgstr "Гузарвожа:"
-
-#: ../mdkonline:146
-#, fuzzy, c-format
-msgid "Machine description:"
-msgstr "Номи мошина:"
-
-#: ../mdkonline:147
-#, c-format
-msgid "(Ex: My Home Office's Computer)"
-msgstr ""
-
-#: ../mdkonline:152 ../mdkonline:159 ../mdkonline:180 ../mdkonline:204
-#: ../mdkonline:208 ../mdkonline:212 ../mdkonline:217 ../mdkupdate:141
-#: ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
-#, c-format
-msgid "Error"
-msgstr "Хатогӣ"
-
-#: ../mdkonline:152
-#, fuzzy, c-format
-msgid "Machine name must be 1 to 40 alphanumerical characters"
-msgstr "Нуқтаҳои васлшавӣ бояд танҳо рамзҳои ҳарфу рақамро дошта бошад"
-
-#: ../mdkonline:155
-#, c-format
-msgid "Connecting to Mandriva Online website..."
-msgstr "Пайвастшавӣ бо пойгоҳи шабакавии Mandriva Online..."
-
-#: ../mdkonline:167
-#, c-format
-msgid ""
-"In order to benefit from Mandriva Online services,\n"
-"we are about to upload your configuration.\n"
-"\n"
-"The Wizard will now send the following information to Mandriva:\n"
-"\n"
-"1) the list of packages you have installed on your system,\n"
-"\n"
-"2) your hardware configuration.\n"
-"\n"
-"If you feel uncomfortable by that idea, or do not want to benefit from this "
-"service,\n"
-"please press 'Cancel'. By pressing 'Next', you allow us to keep you "
-"informed\n"
-"about security updates and useful upgrades via personalized email alerts.\n"
-"Furthermore, you benefit from discounted paid support services on\n"
-"www.mandrivaexpert.com."
-msgstr ""
-"Барои аз хадамоти Mandriva Online фоида гирифтан,\n"
-"мо ба бор кардани танзимдарории шумо наздик ҳастем.\n"
-"\n"
-"Устод маълумоти зеринро ҳозир ба Mandriva мефиристад:\n"
-"\n"
-"1) рӯйхати қуттиҳои ба системи шумо коргузошташуда,\n"
-"\n"
-"2) танзимдарории сахтафзори шумо.\n"
-"\n"
-"Агар шумо аз ин фикр худро ноқулай ҳис кунед, ё аз ин хадамот фоида гирифтан "
-"нахоҳед,\n"
-"‘Бекор кардан’-ро пахш кунед.Бо пахш кардани ‘Навбатӣ’ шумо ба мо\n"
-"иҷозат медиҳед, ки шуморо бо навигариҳои бехатарӣ ва афзоишҳои\n"
-"фоиданок ба воситаи пости электронии хусусии эҳтиётӣ хабардор созем.\n"
-"Ғайр аз ин шумо аз хадамоти дастгиркунандаи арзон дар\n"
-" www.mandrivaexpert.com фоида мекунед. "
-
-#: ../mdkonline:180
-#, c-format
-msgid "Connection problem"
-msgstr "Муаммои пайвастагӣ"
-
-#: ../mdkonline:180
-#, c-format
-msgid "Problem occurs when uploading files, please try again"
-msgstr "Ҳангоми боркунии файлҳо мушкилие рух дод, бори дигар кӯшиш кунед"
-
-#: ../mdkonline:187
-#, c-format
-msgid "Create a Mandriva Online Account"
-msgstr "Офаридани Ҳисоби Mandriva Online"
-
-#. -PO: that is for things like "Mr", "Ms",...
-#: ../mdkonline:192
-#, fuzzy, c-format
-msgid "Greeting:"
-msgstr "Сабз"
-
-#: ../mdkonline:193
-#, c-format
-msgid "First name:"
-msgstr "Ном аввала:"
-
-#: ../mdkonline:194
-#, c-format
-msgid "Last name:"
-msgstr "Насаб:"
-
-#: ../mdkonline:197
-#, c-format
-msgid "Confirm Password:"
-msgstr "Тасдиқи Гузарвожа:"
-
-#: ../mdkonline:204
-#, c-format
-msgid ""
-"The passwords do not match\n"
-" Please try again\n"
-msgstr ""
-"Гузарвожаҳо мувофиқ нестанд\n"
-" Лутфан такрор кунед\n"
-
-#: ../mdkonline:208
-#, fuzzy, c-format
-msgid "Please fill in each field"
-msgstr "Марҳамат карда ҳамаи майдонҳоро пур кунед\n"
-
-#: ../mdkonline:212
-#, c-format
-msgid "Not a valid mail address!\n"
-msgstr "Суроғаи пост ҳақиқӣ нест!\n"
-
-#: ../mdkonline:217
-#, c-format
-msgid "Creating account failed!"
-msgstr ""
-
-#: ../mdkonline:225
-#, c-format
-msgid ""
-"Mandriva Online Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
-msgstr ""
-"Ҳисоби Mandriva Online бо муваффақият офарида шуд.\n"
-"Барои аслшиносӣ ва боркунии танзимоти худ ба \"Оянда\" ангушт занед\n"
-
-#: ../mdkonline:229
-#, c-format
-msgid "Your upload was successful!"
-msgstr "Боркунии шумо бо муваффақият ноил гардид!"
-
-#: ../mdkonline:229
+#: ../mdkapplet:478
 #, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandriva Online."
-msgstr ""
-"Ба туфайли Mandriva Online аз ин лаҳза эътибран шумо ахбороти \n"
-"оиди бехатарӣ ва навкуниҳоро қабул хоҳед кард."
+msgid "Online WebSite"
+msgstr "WebПойгоҳи Ғайрихудмухтор"
 
-#: ../mdkonline:229
+#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
+#: ../mdkapplet:483
 #, c-format
-msgid ""
-"Mandriva Online offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
+msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
-"Mandriva Online ба шумо имконияти худкоркунии навсозиҳоро пешкаш мекунад.\n"
-"Барнома доимо ар системаи шумо иҷро мегардад ва то навкуниҳои оянда интизор "
-"мешавад.\n"
-
-#: ../mdkonline:238
-#, c-format
-msgid "Congratulations"
-msgstr "Табрик"
-
-#: ../mdkonline:238
-#, c-format
-msgid "Your Mandriva Online account has been successfully configured\n"
-msgstr "Ҳисоби Mandriva Online-и шумо бо муваффақият танзим карда шуд\n"
-
-#: ../mdkonline:253
-#, c-format
-msgid "Configuration uploaded successfully"
-msgstr "Боркунии шумо бо муваффақият ноил гардид"
 
-#: ../mdkonline:254
+#: ../mdkapplet:492
 #, c-format
-msgid "Problem uploading configuration"
-msgstr "Танзимдарории хатогии боркуни"
+msgid "Always launch on startup"
+msgstr "Ҳамеша дар оғозёбӣ сар додан"
 
-#: ../mdkonline:256
+#: ../mdkapplet:494
 #, c-format
-msgid ""
-"Cannot connect to Mandriva Online website: wrong login/password or router/"
-"firewall bad settings"
-msgstr ""
-"Ба пойгоҳи шабакавии mandrivaonline пайваст гашта наметавонам: хатогии ном/"
-"гузарвожа ё таҳриргур/фейрвол гузоришҳои нодуруст"
+msgid "Quit"
+msgstr "Баромадан"
 
 #: ../mdkonline.pm:207
 #, c-format
@@ -831,6 +365,11 @@ msgstr ""
 "\n"
 "истифода:\n"
 
+#: ../mdkupdate:73
+#, c-format
+msgid "  --help\t\t- print this help message.\n"
+msgstr "  --help\t\t- чопи ин пайғоми ёрӣ.\n"
+
 #: ../mdkupdate:74
 #, c-format
 msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
@@ -858,11 +397,6 @@ msgid ""
 "file.\n"
 msgstr ""
 
-#: ../mdkupdate:118 ../mdkupdate:164
-#, c-format
-msgid "Warning"
-msgstr "Огоҳӣ"
-
 #. -PO: here Live Install is currently *NOT* translated on the desktop, so it's better to keep as it:
 #: ../mdkupdate:120
 #, c-format
@@ -871,11 +405,21 @@ msgid ""
 "Install' wizard."
 msgstr ""
 
+#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
+#, c-format
+msgid "Please wait"
+msgstr "Лутфан интизор шавед"
+
 #: ../mdkupdate:123 ../mdkupdate:174
 #, c-format
 msgid "Preparing..."
 msgstr "Тайёрӣ..."
 
+#: ../mdkupdate:141 ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
+#, c-format
+msgid "Error"
+msgstr "Хатогӣ"
+
 #: ../mdkupdate:141
 #, c-format
 msgid ""
@@ -884,6 +428,11 @@ msgid ""
 "%s"
 msgstr ""
 
+#: ../mdkupdate:159 ../mdkupdate:188
+#, c-format
+msgid "An error occurred"
+msgstr "Хатогӣ рух дод"
+
 #: ../mdkupdate:164
 #, c-format
 msgid ""
@@ -908,6 +457,285 @@ msgstr "Қуттиҳо коргузорӣ мешавад...\n"
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "Навсозии бастаҳо аз муҳити update_source ғайри имкон аст.\n"
 
+#, fuzzy
+#~ msgid "New bundles are available for your system"
+#~ msgstr "Барои системаи шумо навсозиҳои дастрасанд"
+
+#~ msgid "Service is not configured. Please click on \"Configure the service\""
+#~ msgstr ""
+#~ "Хидматрасон танзим нашудааст. Ба \"Танзимкунии хидмат\" ангушт занед"
+
+#~ msgid "Configure the service"
+#~ msgstr "Танзимкунии хидмат"
+
+#~ msgid "Check updates"
+#~ msgstr "Навкуниҳоро тафтиш кунед"
+
+#~ msgid "Configure Now!"
+#~ msgstr "Ҳозир Танзим кунед!"
+
+#~ msgid "Actions"
+#~ msgstr "Амалиёт"
+
+#~ msgid "Configure"
+#~ msgstr "Ба танзим даровардан"
+
+#~ msgid "See logs"
+#~ msgstr "Ба номнависҳо нигаред"
+
+#~ msgid "Status"
+#~ msgstr "Вазъият"
+
+#~ msgid "Close"
+#~ msgstr "Пӯшидан"
+
+#~ msgid "Network Connection: "
+#~ msgstr "Пайвастшавии Шабакавӣ:  "
+
+#~ msgid "Up"
+#~ msgstr "Ба боло"
+
+#~ msgid "Down"
+#~ msgstr "Ба поён"
+
+#~ msgid "Last check: "
+#~ msgstr "Тафтиши охирон: "
+
+#~ msgid "Machine name:"
+#~ msgstr "Номи мошина:"
+
+#~ msgid "Updates: "
+#~ msgstr "Навсозӣ: "
+
+#~ msgid "Development release not supported by service"
+#~ msgstr "Коркарди барориш аз тарафи хидматрасон пуштибонӣ намегардад"
+
+#~ msgid "Too old release not supported by service"
+#~ msgstr "Бароришҳои аз ҳад кӯҳна пуштибонӣ намегарданд"
+
+#~ msgid "Unknown state"
+#~ msgstr "Ҳолати номаълум"
+
+#~ msgid "Online services disabled. Contact Mandriva Online site\n"
+#~ msgstr ""
+#~ "Хидматрасониҳои ғайрихудмухтор хомӯш карда мешаванд. Ба пойгоҳи Mandriva "
+#~ "Online пайваст шавед\n"
+
+#~ msgid "Wrong Password.\n"
+#~ msgstr "Гузарвожаи нодуруст.\n"
+
+#~ msgid "Wrong Action or host or login.\n"
+#~ msgstr "Амалиёти нодурусти ё соҳиб ё ворид.\n"
+
+#~ msgid ""
+#~ "Something is wrong with your network settings (check your route, firewall "
+#~ "or proxy settings)\n"
+#~ msgstr ""
+#~ "Чизе дар гузоришҳои шабакаи шумо нодуруст аст (гардиш, фейрвол ва "
+#~ "гузоришҳои проксии худро санҷед)\n"
+
+#~ msgid "Response from Mandriva Online server\n"
+#~ msgstr "Ёри аз тарафи хидматрасони Mandriva Online\n"
+
+#~ msgid "No check"
+#~ msgstr "Бе тафтишот"
+
+#~ msgid "Checking config file: Not present\n"
+#~ msgstr "Тафтиши файли config: ҳозир нест\n"
+
+#~ msgid "Logs"
+#~ msgstr "Воридҳо"
+
+#~ msgid "Clear"
+#~ msgstr "Пок кардан"
+
+#~ msgid ""
+#~ "mdonline version %s\n"
+#~ "Copyright (C) %s Mandriva.\n"
+#~ "This is free software and may be redistributed under the terms of the GNU "
+#~ "GPL.\n"
+#~ "\n"
+#~ "usage:\n"
+#~ msgstr ""
+#~ "mdonline нусхаи %s\n"
+#~ "Copyright (C) %s Mandriva.\n"
+#~ "Ин нармафзори озод мебошад ва дар зери шартҳои GNU GPL аз нав паҳн карда "
+#~ "мешавад.\n"
+#~ "\n"
+#~ "истифода:\n"
+
+#~ msgid "Mandriva Online"
+#~ msgstr "Mandriva Online"
+
+#~ msgid "I already have an account"
+#~ msgstr "Ман аллакай ҳисоб дорам"
+
+#~ msgid "I want to subscribe"
+#~ msgstr "Ман муштарӣ шудан мехоҳам"
+
+#, fuzzy
+#~ msgid "Mrs."
+#~ msgstr "XMrIs"
+
+#~ msgid "Reading configuration\n"
+#~ msgstr "Танзимдарорӣ хонда шуда истодааст\n"
+
+#~ msgid ""
+#~ "This assistant will help you to upload your configuration\n"
+#~ "(packages, hardware configuration) to a centralized database in\n"
+#~ "order to keep you informed about security updates and useful upgrades.\n"
+#~ msgstr ""
+#~ "Ин ёрдамчӣ ба шумо барои бор кардани танзимдарории худ\n"
+#~ "(қуттиҳо, танзимдарории сахтафзор) ба манбаи маълумоти\n"
+#~ "марказонидашуда\n"
+#~ "барои шуморо хабардор доштан оид ба навигариҳои бехатарӣ\n"
+#~ "ва афзоишҳои фоиданок ёрӣ хоҳад расонд.\n"
+
+#~ msgid "Account creation or authentication"
+#~ msgstr "Офаридани ҳисоб ё аслшиносӣ"
+
+#~ msgid "Enter your Mandriva Online login, password and machine name:"
+#~ msgstr ""
+#~ "Ворикунанадаи Mandriva Online-и худро, гузарвожа ва номи мошинаро ворид "
+#~ "кунед:"
+
+#~ msgid "Email address:"
+#~ msgstr "Почтаи электронӣ:"
+
+#~ msgid "Country"
+#~ msgstr "Давлат"
+
+#~ msgid "Password:"
+#~ msgstr "Гузарвожа:"
+
+#, fuzzy
+#~ msgid "Machine description:"
+#~ msgstr "Номи мошина:"
+
+#, fuzzy
+#~ msgid "Machine name must be 1 to 40 alphanumerical characters"
+#~ msgstr "Нуқтаҳои васлшавӣ бояд танҳо рамзҳои ҳарфу рақамро дошта бошад"
+
+#~ msgid "Connecting to Mandriva Online website..."
+#~ msgstr "Пайвастшавӣ бо пойгоҳи шабакавии Mandriva Online..."
+
+#~ msgid ""
+#~ "In order to benefit from Mandriva Online services,\n"
+#~ "we are about to upload your configuration.\n"
+#~ "\n"
+#~ "The Wizard will now send the following information to Mandriva:\n"
+#~ "\n"
+#~ "1) the list of packages you have installed on your system,\n"
+#~ "\n"
+#~ "2) your hardware configuration.\n"
+#~ "\n"
+#~ "If you feel uncomfortable by that idea, or do not want to benefit from "
+#~ "this service,\n"
+#~ "please press 'Cancel'. By pressing 'Next', you allow us to keep you "
+#~ "informed\n"
+#~ "about security updates and useful upgrades via personalized email "
+#~ "alerts.\n"
+#~ "Furthermore, you benefit from discounted paid support services on\n"
+#~ "www.mandrivaexpert.com."
+#~ msgstr ""
+#~ "Барои аз хадамоти Mandriva Online фоида гирифтан,\n"
+#~ "мо ба бор кардани танзимдарории шумо наздик ҳастем.\n"
+#~ "\n"
+#~ "Устод маълумоти зеринро ҳозир ба Mandriva мефиристад:\n"
+#~ "\n"
+#~ "1) рӯйхати қуттиҳои ба системи шумо коргузошташуда,\n"
+#~ "\n"
+#~ "2) танзимдарории сахтафзори шумо.\n"
+#~ "\n"
+#~ "Агар шумо аз ин фикр худро ноқулай ҳис кунед, ё аз ин хадамот фоида "
+#~ "гирифтан нахоҳед,\n"
+#~ "‘Бекор кардан’-ро пахш кунед.Бо пахш кардани ‘Навбатӣ’ шумо ба мо\n"
+#~ "иҷозат медиҳед, ки шуморо бо навигариҳои бехатарӣ ва афзоишҳои\n"
+#~ "фоиданок ба воситаи пости электронии хусусии эҳтиётӣ хабардор созем.\n"
+#~ "Ғайр аз ин шумо аз хадамоти дастгиркунандаи арзон дар\n"
+#~ " www.mandrivaexpert.com фоида мекунед. "
+
+#~ msgid "Connection problem"
+#~ msgstr "Муаммои пайвастагӣ"
+
+#~ msgid "Problem occurs when uploading files, please try again"
+#~ msgstr "Ҳангоми боркунии файлҳо мушкилие рух дод, бори дигар кӯшиш кунед"
+
+#~ msgid "Create a Mandriva Online Account"
+#~ msgstr "Офаридани Ҳисоби Mandriva Online"
+
+#, fuzzy
+#~ msgid "Greeting:"
+#~ msgstr "Сабз"
+
+#~ msgid "First name:"
+#~ msgstr "Ном аввала:"
+
+#~ msgid "Last name:"
+#~ msgstr "Насаб:"
+
+#~ msgid "Confirm Password:"
+#~ msgstr "Тасдиқи Гузарвожа:"
+
+#~ msgid ""
+#~ "The passwords do not match\n"
+#~ " Please try again\n"
+#~ msgstr ""
+#~ "Гузарвожаҳо мувофиқ нестанд\n"
+#~ " Лутфан такрор кунед\n"
+
+#, fuzzy
+#~ msgid "Please fill in each field"
+#~ msgstr "Марҳамат карда ҳамаи майдонҳоро пур кунед\n"
+
+#~ msgid "Not a valid mail address!\n"
+#~ msgstr "Суроғаи пост ҳақиқӣ нест!\n"
+
+#~ msgid ""
+#~ "Mandriva Online Account successfully created.\n"
+#~ "Please click \"Next\" to authenticate and upload your configuration\n"
+#~ msgstr ""
+#~ "Ҳисоби Mandriva Online бо муваффақият офарида шуд.\n"
+#~ "Барои аслшиносӣ ва боркунии танзимоти худ ба \"Оянда\" ангушт занед\n"
+
+#~ msgid "Your upload was successful!"
+#~ msgstr "Боркунии шумо бо муваффақият ноил гардид!"
+
+#~ msgid ""
+#~ "From now you will receive on security and updates \n"
+#~ "announcements thanks to Mandriva Online."
+#~ msgstr ""
+#~ "Ба туфайли Mandriva Online аз ин лаҳза эътибран шумо ахбороти \n"
+#~ "оиди бехатарӣ ва навкуниҳоро қабул хоҳед кард."
+
+#~ msgid ""
+#~ "Mandriva Online offers you the ability to automate the updates.\n"
+#~ "A program will run regulary in your system waiting for new updates\n"
+#~ msgstr ""
+#~ "Mandriva Online ба шумо имконияти худкоркунии навсозиҳоро пешкаш "
+#~ "мекунад.\n"
+#~ "Барнома доимо ар системаи шумо иҷро мегардад ва то навкуниҳои оянда "
+#~ "интизор мешавад.\n"
+
+#~ msgid "Congratulations"
+#~ msgstr "Табрик"
+
+#~ msgid "Your Mandriva Online account has been successfully configured\n"
+#~ msgstr "Ҳисоби Mandriva Online-и шумо бо муваффақият танзим карда шуд\n"
+
+#~ msgid "Configuration uploaded successfully"
+#~ msgstr "Боркунии шумо бо муваффақият ноил гардид"
+
+#~ msgid "Problem uploading configuration"
+#~ msgstr "Танзимдарории хатогии боркуни"
+
+#~ msgid ""
+#~ "Cannot connect to Mandriva Online website: wrong login/password or router/"
+#~ "firewall bad settings"
+#~ msgstr ""
+#~ "Ба пойгоҳи шабакавии mandrivaonline пайваст гашта наметавонам: хатогии "
+#~ "ном/гузарвожа ё таҳриргур/фейрвол гузоришҳои нодуруст"
+
 #~ msgid "  --applet\t\t- launch Mandriva Update.\n"
 #~ msgstr "  --applet\t\t- сардиҳии MandrivaНавкунӣ.\n"
 
diff --git a/po/th.po b/po/th.po
index 2818838e..6662ff04 100644
--- a/po/th.po
+++ b/po/th.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-09 16:26+0200\n"
+"POT-Creation-Date: 2008-02-21 18:21+0100\n"
 "PO-Revision-Date: 2003-02-28 05:55+0900\n"
 "Last-Translator: Pramote Khuwijitjaru <kmote@hotmail.com>\n"
 "Language-Team: Thai <en@li.org>\n"
@@ -18,70 +18,60 @@ 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:94
+#: ../mdkapplet:88
 #, c-format
 msgid "Will check updates at %s"
 msgstr ""
 
-#: ../mdkapplet:103
+#: ../mdkapplet:97
 #, c-format
 msgid "Your system is up-to-date"
 msgstr ""
 
-#: ../mdkapplet:109
+#: ../mdkapplet:103
 #, fuzzy, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
 "support@mandrivaonline.com"
 msgstr "หากมีปัญหาใดๆ ให้ส่งอีเมล์ไปยัง support@mandrivaonline.com\n"
 
-#: ../mdkapplet:115
+#: ../mdkapplet:110
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "กำลังหาเพกเกจที่มีอยู่, กรุณารอสักครู่..."
 
-#: ../mdkapplet:121
+#: ../mdkapplet:116
 #, c-format
 msgid "New updates are available for your system"
 msgstr ""
 
-#: ../mdkapplet:127
-#, c-format
-msgid "New bundles are available for your system"
-msgstr ""
-
-#: ../mdkapplet:133
-#, c-format
-msgid "Service is not configured. Please click on \"Configure the service\""
-msgstr ""
-
-#: ../mdkapplet:139
+#: ../mdkapplet:122
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr ""
 
-#: ../mdkapplet:145
+#: ../mdkapplet:128
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr ""
 
-#: ../mdkapplet:151 ../mdkapplet:182
+#: ../mdkapplet:134 ../mdkapplet:165
 #, fuzzy, c-format
 msgid "urpmi database locked"
 msgstr "ฐานข้อมูล urpmi ถูกล็อก"
 
-#: ../mdkapplet:157
+#: ../mdkapplet:140
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
-#: ../mdkapplet:163
+#: ../mdkapplet:146
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
 msgstr ""
 
-#: ../mdkapplet:169
+#: ../mdkapplet:152
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -92,548 +82,131 @@ msgid ""
 "Then, restart \"%s\"."
 msgstr ""
 
-#: ../mdkapplet:174
+#: ../mdkapplet:157
 #, c-format
 msgid "Enabled"
 msgstr "เปิดใช้"
 
-#: ../mdkapplet:187
+#: ../mdkapplet:170
 #, c-format
 msgid "Error updating media"
 msgstr ""
 
-#: ../mdkapplet:202
+#: ../mdkapplet:185
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr ""
 
-#: ../mdkapplet:207
+#: ../mdkapplet:190
 #, c-format
 msgid "Packages are up to date"
 msgstr ""
 
-#: ../mdkapplet:212
+#: ../mdkapplet:195
 #, fuzzy, c-format
 msgid "Failed to open urpmi database"
 msgstr "ไม่สามารถเปิดแฟ้ม %s\n"
 
-#: ../mdkapplet:217 ../mdkapplet:324
+#: ../mdkapplet:200
 #, fuzzy, c-format
 msgid "Install updates"
 msgstr "ติดตั้งระบบ"
 
-#: ../mdkapplet:218
-#, c-format
-msgid "Configure the service"
-msgstr ""
-
-#: ../mdkapplet:219
+#: ../mdkapplet:201
 #, c-format
 msgid "Check Updates"
 msgstr ""
 
-#: ../mdkapplet:220 ../mdkapplet:327 ../mdkonline:114 ../mdkonline:155
-#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
-#, c-format
-msgid "Please wait"
-msgstr "โปรดรอสักครู่"
-
-#: ../mdkapplet:220 ../mdkapplet:326 ../mdkapplet:327
-#, c-format
-msgid "Check updates"
-msgstr ""
-
-#: ../mdkapplet:223 ../mdkapplet:648
-#, c-format
-msgid "Online WebSite"
-msgstr ""
-
-#: ../mdkapplet:224
+#: ../mdkapplet:202
 #, fuzzy, c-format
 msgid "Configure Network"
 msgstr "คอนฟิกระบบเน็ตเวิร์ก"
 
-#: ../mdkapplet:225
-#, c-format
-msgid "Configure Now!"
-msgstr ""
-
-#: ../mdkapplet:313 ../mdkapplet:392
-#, c-format
-msgid "Mandriva Linux Updates Applet"
-msgstr ""
-
-#: ../mdkapplet:322
-#, c-format
-msgid "Actions"
-msgstr "การกระทำ"
-
-#: ../mdkapplet:325
-#, c-format
-msgid "Configure"
-msgstr "ตั้งค่า"
-
-#: ../mdkapplet:329
-#, c-format
-msgid "See logs"
-msgstr ""
-
-#: ../mdkapplet:332
-#, c-format
-msgid "Status"
-msgstr "สถานภาพ"
-
-#: ../mdkapplet:336 ../mdkapplet:597
-#, c-format
-msgid "Close"
-msgstr "ปิด"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Network Connection: "
-msgstr ""
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Up"
-msgstr "ขึ้น"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Down"
-msgstr "เลื่อนลง"
-
-#: ../mdkapplet:366
-#, c-format
-msgid "Last check: "
-msgstr ""
-
-#: ../mdkapplet:367 ../mdkonline:145
-#, c-format
-msgid "Machine name:"
-msgstr ""
-
-#: ../mdkapplet:368
-#, c-format
-msgid "Updates: "
-msgstr ""
-
-#: ../mdkapplet:372
+#: ../mdkapplet:283
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr ""
 
-#: ../mdkapplet:375
+#: ../mdkapplet:286
 #, c-format
 msgid "Mandriva Online seems to be reinstalled, reloading applet ...."
 msgstr ""
 
-#: ../mdkapplet:383
+#: ../mdkapplet:294
 #, c-format
 msgid "Launching MandrivaUpdate\n"
 msgstr ""
 
-#: ../mdkapplet:398
+#: ../mdkapplet:303
+#, c-format
+msgid "Mandriva Linux Updates Applet"
+msgstr ""
+
+#: ../mdkapplet:308
 #, fuzzy, c-format
 msgid "Computing new updates...\n"
 msgstr "ปัญหาการคอนเน็ค"
 
-#: ../mdkapplet:399
+#: ../mdkapplet:309
 #, fuzzy, c-format
 msgid "Connecting to"
 msgstr "ปัญหาการคอนเน็ค"
 
-#: ../mdkapplet:467 ../mdkupdate:159 ../mdkupdate:188
-#, c-format
-msgid "An error occurred"
-msgstr "มีปัญหาเกิดขึ้น"
-
-#: ../mdkapplet:475
-#, c-format
-msgid "Development release not supported by service"
-msgstr ""
-
-#: ../mdkapplet:476
-#, c-format
-msgid "Too old release not supported by service"
-msgstr ""
-
-#: ../mdkapplet:477
-#, c-format
-msgid "Unknown state"
-msgstr ""
-
-#: ../mdkapplet:478
-#, c-format
-msgid "Online services disabled. Contact Mandriva Online site\n"
-msgstr ""
-
-#: ../mdkapplet:479
-#, c-format
-msgid "Wrong Password.\n"
-msgstr ""
-
-#: ../mdkapplet:480
-#, c-format
-msgid "Wrong Action or host or login.\n"
-msgstr ""
-
-#: ../mdkapplet:481
-#, c-format
-msgid ""
-"Something is wrong with your network settings (check your route, firewall or "
-"proxy settings)\n"
-msgstr ""
-
-#: ../mdkapplet:483
-#, c-format
-msgid ""
-"Problem occured while connecting to the server, please contact the support "
-"team"
-msgstr ""
-
-#: ../mdkapplet:487
-#, c-format
-msgid "Response from Mandriva Online server\n"
-msgstr ""
-
-#: ../mdkapplet:490
+#: ../mdkapplet:386
 #, c-format
 msgid "System is up-to-date\n"
 msgstr ""
 
-#: ../mdkapplet:527
-#, c-format
-msgid "No check"
-msgstr ""
-
-#: ../mdkapplet:541
-#, c-format
-msgid "Checking config file: Not present\n"
-msgstr ""
-
-#: ../mdkapplet:544
+#: ../mdkapplet:415
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr ""
 
-#: ../mdkapplet:587
+#: ../mdkapplet:457 ../mdkupdate:118 ../mdkupdate:164
 #, c-format
-msgid "Logs"
-msgstr "ล็อก"
-
-#: ../mdkapplet:603
-#, c-format
-msgid "Clear"
-msgstr "ลบทั้งหมด"
+msgid "Warning"
+msgstr "คำเตือน"
 
-#: ../mdkapplet:629
+#: ../mdkapplet:468
 #, c-format
 msgid "About..."
 msgstr "เกี่ยวกับ..."
 
-#: ../mdkapplet:631
+#: ../mdkapplet:472
 #, fuzzy, c-format
 msgid "Mandriva Online %s"
 msgstr "Mandriva Online"
 
-#: ../mdkapplet:635
+#: ../mdkapplet:473
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr ""
 
-#: ../mdkapplet:647
+#: ../mdkapplet:476
 #, c-format
 msgid "Mandriva Online gives access to Mandriva web services."
 msgstr ""
 
-#: ../mdkapplet:655
-#, c-format
-msgid "Always launch on startup"
-msgstr ""
-
-#: ../mdkapplet:657
-#, c-format
-msgid "Quit"
-msgstr "ออก"
-
-#: ../mdkonline:58
-#, c-format
-msgid ""
-"mdonline version %s\n"
-"Copyright (C) %s Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"mdonline เวอร์ชั่นที่ %s\n"
-"Copyright (C) %s Mandriva.\n"
-"ซอฟท์แวร์นี่เป็นฟรีซอฟท์แวร์และแจกจ่ายภายใต้ระเบียบของ GNU GPL.\n"
-"\n"
-"วิธีใช้:\n"
-
-#: ../mdkonline:63 ../mdkupdate:73
-#, c-format
-msgid "  --help\t\t- print this help message.\n"
-msgstr "  --help\t\t- แสดงข้อความช่วยเหลือ\n"
-
-#: ../mdkonline:64
-#, c-format
-msgid "  --box=\t\t\t- hostname.\n"
-msgstr ""
-
-#: ../mdkonline:65
-#, c-format
-msgid "  --country\t\t\t- name of country of the user. \n"
-msgstr ""
-
-#: ../mdkonline:66
-#, c-format
-msgid "  --interactive\t\t- use the interactive mode.\n"
-msgstr ""
-
-#: ../mdkonline:67
-#, c-format
-msgid "  --nointeractive\t- use the non-interactive mode.\n"
-msgstr ""
-
-#: ../mdkonline:68
-#, c-format
-msgid "  --login=\t\t     - login name of the user.\n"
-msgstr ""
-
-#: ../mdkonline:69
-#, c-format
-msgid "  --pass=\t\t\t- password  of the user.\n"
-msgstr ""
-
-#: ../mdkonline:87 ../mdkonline:120
-#, c-format
-msgid "Mandriva Online"
-msgstr "Mandriva Online"
-
-#: ../mdkonline:90
-#, c-format
-msgid "I already have an account"
-msgstr ""
-
-#: ../mdkonline:91
-#, c-format
-msgid "I want to subscribe"
-msgstr ""
-
-#: ../mdkonline:96
-#, c-format
-msgid "Mr."
-msgstr "นาย"
-
-#: ../mdkonline:96
-#, c-format
-msgid "Mrs."
-msgstr "นาง"
-
-#: ../mdkonline:96
-#, c-format
-msgid "Ms."
-msgstr "นาง"
-
-#: ../mdkonline:114
-#, c-format
-msgid "Reading configuration\n"
-msgstr ""
-
-#: ../mdkonline:123
-#, c-format
-msgid ""
-"This assistant will help you to upload your configuration\n"
-"(packages, hardware configuration) to a centralized database in\n"
-"order to keep you informed about security updates and useful upgrades.\n"
-msgstr ""
-
-#: ../mdkonline:131
-#, c-format
-msgid "Account creation or authentication"
-msgstr ""
-
-#: ../mdkonline:136
-#, c-format
-msgid "Enter your Mandriva Online login, password and machine name:"
-msgstr ""
-
-#: ../mdkonline:142 ../mdkonline:195
-#, fuzzy, c-format
-msgid "Email address:"
-msgstr "ค่า IP"
-
-#: ../mdkonline:143
-#, c-format
-msgid "Country"
-msgstr "คันทรี"
-
-#: ../mdkonline:144 ../mdkonline:196
-#, c-format
-msgid "Password:"
-msgstr "รหัสผ่าน:"
-
-#: ../mdkonline:146
-#, c-format
-msgid "Machine description:"
-msgstr ""
-
-#: ../mdkonline:147
-#, c-format
-msgid "(Ex: My Home Office's Computer)"
-msgstr ""
-
-#: ../mdkonline:152 ../mdkonline:159 ../mdkonline:180 ../mdkonline:204
-#: ../mdkonline:208 ../mdkonline:212 ../mdkonline:217 ../mdkupdate:141
-#: ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
-#, c-format
-msgid "Error"
-msgstr "ข้อผิดพลาด"
-
-#: ../mdkonline:152
-#, c-format
-msgid "Machine name must be 1 to 40 alphanumerical characters"
-msgstr ""
-
-#: ../mdkonline:155
-#, c-format
-msgid "Connecting to Mandriva Online website..."
-msgstr ""
-
-#: ../mdkonline:167
-#, c-format
-msgid ""
-"In order to benefit from Mandriva Online services,\n"
-"we are about to upload your configuration.\n"
-"\n"
-"The Wizard will now send the following information to Mandriva:\n"
-"\n"
-"1) the list of packages you have installed on your system,\n"
-"\n"
-"2) your hardware configuration.\n"
-"\n"
-"If you feel uncomfortable by that idea, or do not want to benefit from this "
-"service,\n"
-"please press 'Cancel'. By pressing 'Next', you allow us to keep you "
-"informed\n"
-"about security updates and useful upgrades via personalized email alerts.\n"
-"Furthermore, you benefit from discounted paid support services on\n"
-"www.mandrivaexpert.com."
-msgstr ""
-
-#: ../mdkonline:180
-#, c-format
-msgid "Connection problem"
-msgstr "ปัญหาการคอนเน็ค"
-
-#: ../mdkonline:180
-#, c-format
-msgid "Problem occurs when uploading files, please try again"
-msgstr ""
-
-#: ../mdkonline:187
-#, c-format
-msgid "Create a Mandriva Online Account"
-msgstr ""
-
-#. -PO: that is for things like "Mr", "Ms",...
-#: ../mdkonline:192
-#, fuzzy, c-format
-msgid "Greeting:"
-msgstr "เขียว"
-
-#: ../mdkonline:193
-#, fuzzy, c-format
-msgid "First name:"
-msgstr "ชื่อโฮสต์:"
-
-#: ../mdkonline:194
-#, fuzzy, c-format
-msgid "Last name:"
-msgstr "ชื่อโฮสต์:"
-
-#: ../mdkonline:197
-#, c-format
-msgid "Confirm Password:"
-msgstr "ยืนยันรหัสลับ:"
-
-#: ../mdkonline:204
-#, c-format
-msgid ""
-"The passwords do not match\n"
-" Please try again\n"
-msgstr ""
-
-#: ../mdkonline:208
-#, fuzzy, c-format
-msgid "Please fill in each field"
-msgstr "กรุณาเลือกช่องข้างล่างนี้"
-
-#: ../mdkonline:212
-#, c-format
-msgid "Not a valid mail address!\n"
-msgstr ""
-
-#: ../mdkonline:217
-#, c-format
-msgid "Creating account failed!"
-msgstr ""
-
-#: ../mdkonline:225
-#, c-format
-msgid ""
-"Mandriva Online Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
-msgstr ""
-
-#: ../mdkonline:229
-#, c-format
-msgid "Your upload was successful!"
-msgstr ""
-
-#: ../mdkonline:229
-#, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandriva Online."
-msgstr ""
-
-#: ../mdkonline:229
-#, c-format
-msgid ""
-"Mandriva Online offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
-msgstr ""
-
-#: ../mdkonline:238
-#, fuzzy, c-format
-msgid "Congratulations"
-msgstr "ขอแสดงความยินดี"
-
-#: ../mdkonline:238
+#: ../mdkapplet:478
 #, c-format
-msgid "Your Mandriva Online account has been successfully configured\n"
+msgid "Online WebSite"
 msgstr ""
 
-#: ../mdkonline:253
+#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
+#: ../mdkapplet:483
 #, c-format
-msgid "Configuration uploaded successfully"
+msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
 
-#: ../mdkonline:254
+#: ../mdkapplet:492
 #, c-format
-msgid "Problem uploading configuration"
+msgid "Always launch on startup"
 msgstr ""
 
-#: ../mdkonline:256
+#: ../mdkapplet:494
 #, c-format
-msgid ""
-"Cannot connect to Mandriva Online website: wrong login/password or router/"
-"firewall bad settings"
-msgstr ""
+msgid "Quit"
+msgstr "ออก"
 
 #: ../mdkonline.pm:207
 #, fuzzy, c-format
@@ -771,6 +344,11 @@ msgstr ""
 "\n"
 "วิธีใช้:\n"
 
+#: ../mdkupdate:73
+#, c-format
+msgid "  --help\t\t- print this help message.\n"
+msgstr "  --help\t\t- แสดงข้อความช่วยเหลือ\n"
+
 #: ../mdkupdate:74
 #, fuzzy, c-format
 msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
@@ -798,11 +376,6 @@ msgid ""
 "file.\n"
 msgstr ""
 
-#: ../mdkupdate:118 ../mdkupdate:164
-#, c-format
-msgid "Warning"
-msgstr "คำเตือน"
-
 #. -PO: here Live Install is currently *NOT* translated on the desktop, so it's better to keep as it:
 #: ../mdkupdate:120
 #, c-format
@@ -811,11 +384,21 @@ msgid ""
 "Install' wizard."
 msgstr ""
 
+#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
+#, c-format
+msgid "Please wait"
+msgstr "โปรดรอสักครู่"
+
 #: ../mdkupdate:123 ../mdkupdate:174
 #, c-format
 msgid "Preparing..."
 msgstr "กำลังเตรียม..."
 
+#: ../mdkupdate:141 ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
+#, c-format
+msgid "Error"
+msgstr "ข้อผิดพลาด"
+
 #: ../mdkupdate:141
 #, c-format
 msgid ""
@@ -824,6 +407,11 @@ msgid ""
 "%s"
 msgstr ""
 
+#: ../mdkupdate:159 ../mdkupdate:188
+#, c-format
+msgid "An error occurred"
+msgstr "มีปัญหาเกิดขึ้น"
+
 #: ../mdkupdate:164
 #, c-format
 msgid ""
@@ -848,6 +436,92 @@ msgstr "กำลังติดตั้งแพ็คเก็จ %s\n"
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "ไม่สามารถอัพเดทแพ็จเกจจากมีเดียของ update_source \n"
 
+#~ msgid "Actions"
+#~ msgstr "การกระทำ"
+
+#~ msgid "Configure"
+#~ msgstr "ตั้งค่า"
+
+#~ msgid "Status"
+#~ msgstr "สถานภาพ"
+
+#~ msgid "Close"
+#~ msgstr "ปิด"
+
+#~ msgid "Up"
+#~ msgstr "ขึ้น"
+
+#~ msgid "Down"
+#~ msgstr "เลื่อนลง"
+
+#~ msgid "Logs"
+#~ msgstr "ล็อก"
+
+#~ msgid "Clear"
+#~ msgstr "ลบทั้งหมด"
+
+#~ msgid ""
+#~ "mdonline version %s\n"
+#~ "Copyright (C) %s Mandriva.\n"
+#~ "This is free software and may be redistributed under the terms of the GNU "
+#~ "GPL.\n"
+#~ "\n"
+#~ "usage:\n"
+#~ msgstr ""
+#~ "mdonline เวอร์ชั่นที่ %s\n"
+#~ "Copyright (C) %s Mandriva.\n"
+#~ "ซอฟท์แวร์นี่เป็นฟรีซอฟท์แวร์และแจกจ่ายภายใต้ระเบียบของ GNU GPL.\n"
+#~ "\n"
+#~ "วิธีใช้:\n"
+
+#~ msgid "Mandriva Online"
+#~ msgstr "Mandriva Online"
+
+#~ msgid "Mr."
+#~ msgstr "นาย"
+
+#~ msgid "Mrs."
+#~ msgstr "นาง"
+
+#~ msgid "Ms."
+#~ msgstr "นาง"
+
+#, fuzzy
+#~ msgid "Email address:"
+#~ msgstr "ค่า IP"
+
+#~ msgid "Country"
+#~ msgstr "คันทรี"
+
+#~ msgid "Password:"
+#~ msgstr "รหัสผ่าน:"
+
+#~ msgid "Connection problem"
+#~ msgstr "ปัญหาการคอนเน็ค"
+
+#, fuzzy
+#~ msgid "Greeting:"
+#~ msgstr "เขียว"
+
+#, fuzzy
+#~ msgid "First name:"
+#~ msgstr "ชื่อโฮสต์:"
+
+#, fuzzy
+#~ msgid "Last name:"
+#~ msgstr "ชื่อโฮสต์:"
+
+#~ msgid "Confirm Password:"
+#~ msgstr "ยืนยันรหัสลับ:"
+
+#, fuzzy
+#~ msgid "Please fill in each field"
+#~ msgstr "กรุณาเลือกช่องข้างล่างนี้"
+
+#, fuzzy
+#~ msgid "Congratulations"
+#~ msgstr "ขอแสดงความยินดี"
+
 #, fuzzy
 #~ msgid "  --applet\t\t- launch Mandriva Update.\n"
 #~ msgstr "  --applet\t\t- อัพเดทข้อมูลทั้งหมด\n"
diff --git a/po/tl.po b/po/tl.po
index 204ee176..4071412f 100644
--- a/po/tl.po
+++ b/po/tl.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline-tl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-09 16:26+0200\n"
+"POT-Creation-Date: 2008-02-21 18:21+0100\n"
 "PO-Revision-Date: 2005-02-05 00:43+0000\n"
 "Last-Translator: Arys P. Deloso <arys@deloso.org>\n"
 "Language-Team: Filipino <salin@pandaypinoy.org>\n"
@@ -19,17 +19,17 @@ msgstr ""
 "X-Generator: KBabel 1.3.1\n"
 
 #. -PO: here %s will be replaced by the local time (eg: "Will check updates at 14:03:50"
-#: ../mdkapplet:94
+#: ../mdkapplet:88
 #, fuzzy, c-format
 msgid "Will check updates at %s"
 msgstr "Suriin ang mga update"
 
-#: ../mdkapplet:103
+#: ../mdkapplet:97
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "Ang iyong sistema ay ayon sa bago"
 
-#: ../mdkapplet:109
+#: ../mdkapplet:103
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -38,55 +38,44 @@ msgstr ""
 "Problema sa pag-configure ng serbisyo. Pakisuri ang mga log at ipadala sa "
 "sulat na support@mandrivaonline.com"
 
-#: ../mdkapplet:115
+#: ../mdkapplet:110
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "Pakihintay, naghahanap ng mga available na package..."
 
-#: ../mdkapplet:121
+#: ../mdkapplet:116
 #, c-format
 msgid "New updates are available for your system"
 msgstr "May mga bagong update para sa iyong sistema"
 
-#: ../mdkapplet:127
-#, fuzzy, c-format
-msgid "New bundles are available for your system"
-msgstr "May mga bagong update para sa iyong sistema"
-
-#: ../mdkapplet:133
-#, c-format
-msgid "Service is not configured. Please click on \"Configure the service\""
-msgstr ""
-"Ang serbisyo ay hindi available. I-click ang \"I-configure ang serbisyo\""
-
-#: ../mdkapplet:139
+#: ../mdkapplet:122
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "Bagsak ang network. Paki-configure ang iyong network"
 
-#: ../mdkapplet:145
+#: ../mdkapplet:128
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "Ang serbisyo ay hindi nakaandar. Paki-click ang \"Online Website\""
 
-#: ../mdkapplet:151 ../mdkapplet:182
+#: ../mdkapplet:134 ../mdkapplet:165
 #, fuzzy, c-format
 msgid "urpmi database locked"
 msgstr "urpmi database ay naka-lock"
 
-#: ../mdkapplet:157
+#: ../mdkapplet:140
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 "Hindi suportado ang pagpapalabas (luma na, o panglinang na pagpapalabas)"
 
-#: ../mdkapplet:163
+#: ../mdkapplet:146
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
 msgstr ""
 
-#: ../mdkapplet:169
+#: ../mdkapplet:152
 #, fuzzy, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -103,591 +92,131 @@ msgstr ""
 "\n"
 "Pagkatapos, simulan muli ang %s."
 
-#: ../mdkapplet:174
+#: ../mdkapplet:157
 #, c-format
 msgid "Enabled"
 msgstr "Gumagana"
 
-#: ../mdkapplet:187
+#: ../mdkapplet:170
 #, c-format
 msgid "Error updating media"
 msgstr ""
 
-#: ../mdkapplet:202
+#: ../mdkapplet:185
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr "Nagsusuri... mayroong mga Update\n"
 
-#: ../mdkapplet:207
+#: ../mdkapplet:190
 #, c-format
 msgid "Packages are up to date"
 msgstr ""
 
-#: ../mdkapplet:212
+#: ../mdkapplet:195
 #, fuzzy, c-format
 msgid "Failed to open urpmi database"
 msgstr "hindi mabuksan ang rpmdb"
 
-#: ../mdkapplet:217 ../mdkapplet:324
+#: ../mdkapplet:200
 #, c-format
 msgid "Install updates"
 msgstr "I-install ang mga update"
 
-#: ../mdkapplet:218
-#, c-format
-msgid "Configure the service"
-msgstr "I-configure ang serbisyo"
-
-#: ../mdkapplet:219
+#: ../mdkapplet:201
 #, c-format
 msgid "Check Updates"
 msgstr "Suriin ang mga Update"
 
-#: ../mdkapplet:220 ../mdkapplet:327 ../mdkonline:114 ../mdkonline:155
-#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
-#, c-format
-msgid "Please wait"
-msgstr "Maghintay lamang"
-
-#: ../mdkapplet:220 ../mdkapplet:326 ../mdkapplet:327
-#, c-format
-msgid "Check updates"
-msgstr "Suriin ang mga update"
-
-#: ../mdkapplet:223 ../mdkapplet:648
-#, c-format
-msgid "Online WebSite"
-msgstr "Online WebSite"
-
-#: ../mdkapplet:224
+#: ../mdkapplet:202
 #, c-format
 msgid "Configure Network"
 msgstr "I-configure ang Network"
 
-#: ../mdkapplet:225
-#, c-format
-msgid "Configure Now!"
-msgstr "I-configure Ngayon!"
-
-#: ../mdkapplet:313 ../mdkapplet:392
-#, c-format
-msgid "Mandriva Linux Updates Applet"
-msgstr "Mandriva Linux Updates Applet"
-
-#: ../mdkapplet:322
-#, c-format
-msgid "Actions"
-msgstr "Mga Aksiyon"
-
-#: ../mdkapplet:325
-#, c-format
-msgid "Configure"
-msgstr "I-configure"
-
-#: ../mdkapplet:329
-#, c-format
-msgid "See logs"
-msgstr "Tingnan ang mga log"
-
-#: ../mdkapplet:332
-#, c-format
-msgid "Status"
-msgstr "Kalagayan"
-
-#: ../mdkapplet:336 ../mdkapplet:597
-#, c-format
-msgid "Close"
-msgstr "Isara"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Network Connection: "
-msgstr "Koneksyon sa Network: "
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Up"
-msgstr "Up"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Down"
-msgstr "Down"
-
-#: ../mdkapplet:366
-#, c-format
-msgid "Last check: "
-msgstr "Huling pagsuri: "
-
-#: ../mdkapplet:367 ../mdkonline:145
-#, c-format
-msgid "Machine name:"
-msgstr "Pangalan ng makina:"
-
-#: ../mdkapplet:368
-#, c-format
-msgid "Updates: "
-msgstr "Mga Update: "
-
-#: ../mdkapplet:372
+#: ../mdkapplet:283
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Inilulunsad ang drakconnect\n"
 
-#: ../mdkapplet:375
+#: ../mdkapplet:286
 #, c-format
 msgid "Mandriva Online seems to be reinstalled, reloading applet ...."
 msgstr "Tila in-install muli ang Mandriva Online, nilo-load muli ang applet..."
 
-#: ../mdkapplet:383
+#: ../mdkapplet:294
 #, c-format
 msgid "Launching MandrivaUpdate\n"
 msgstr "Inilulunsad ang MandrivaUpdate\n"
 
-#: ../mdkapplet:398
+#: ../mdkapplet:303
+#, c-format
+msgid "Mandriva Linux Updates Applet"
+msgstr "Mandriva Linux Updates Applet"
+
+#: ../mdkapplet:308
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Naghahanap ng mga bagong update...\n"
 
-#: ../mdkapplet:399
+#: ../mdkapplet:309
 #, c-format
 msgid "Connecting to"
 msgstr "Kumukonekta sa"
 
-#: ../mdkapplet:467 ../mdkupdate:159 ../mdkupdate:188
-#, c-format
-msgid "An error occurred"
-msgstr "May \"error\" na nangyari"
-
-#: ../mdkapplet:475
-#, c-format
-msgid "Development release not supported by service"
-msgstr "Ang Panglinang na pagpapalabas ay hindi suportado ng serbisyo"
-
-#: ../mdkapplet:476
-#, c-format
-msgid "Too old release not supported by service"
-msgstr "Makalumang pagpapalabas ay hindi suportado ng serbisyo"
-
-#: ../mdkapplet:477
-#, c-format
-msgid "Unknown state"
-msgstr "Di-kilalang state"
-
-#: ../mdkapplet:478
-#, c-format
-msgid "Online services disabled. Contact Mandriva Online site\n"
-msgstr ""
-"Naka-disable ang mga online service. Makipag-alam sa Mandriva Online site\n"
-
-#: ../mdkapplet:479
-#, c-format
-msgid "Wrong Password.\n"
-msgstr "Maling password.\n"
-
-#: ../mdkapplet:480
-#, c-format
-msgid "Wrong Action or host or login.\n"
-msgstr "Maling aksyon o host o login.\n"
-
-#: ../mdkapplet:481
-#, c-format
-msgid ""
-"Something is wrong with your network settings (check your route, firewall or "
-"proxy settings)\n"
-msgstr ""
-"May mali sa mga setting ng iyong network (pakisuri ang mga setting ng iyong "
-"route, firewall o proxy)\n"
-
-#: ../mdkapplet:483
-#, c-format
-msgid ""
-"Problem occured while connecting to the server, please contact the support "
-"team"
-msgstr ""
-"May nangyaring problema habang kumokonekta sa server, makipag-alam sa "
-"koponang pangsuporta"
-
-#: ../mdkapplet:487
-#, c-format
-msgid "Response from Mandriva Online server\n"
-msgstr "Sagot mula sa Mandriva Online server\n"
-
-#: ../mdkapplet:490
+#: ../mdkapplet:386
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Ang Sistema ay naka-update\n"
 
-#: ../mdkapplet:527
-#, c-format
-msgid "No check"
-msgstr "Walang pagsuri"
-
-#: ../mdkapplet:541
-#, c-format
-msgid "Checking config file: Not present\n"
-msgstr "Sinusuri ang config file: Wala\n"
-
-#: ../mdkapplet:544
+#: ../mdkapplet:415
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Sinusuri ang Network: tila naka-disable\n"
 
-#: ../mdkapplet:587
+#: ../mdkapplet:457 ../mdkupdate:118 ../mdkupdate:164
 #, c-format
-msgid "Logs"
-msgstr "Mga Log"
-
-#: ../mdkapplet:603
-#, c-format
-msgid "Clear"
-msgstr "I-clear"
+msgid "Warning"
+msgstr "Babala"
 
-#: ../mdkapplet:629
+#: ../mdkapplet:468
 #, c-format
 msgid "About..."
 msgstr "Tungkol sa.."
 
-#: ../mdkapplet:631
+#: ../mdkapplet:472
 #, fuzzy, c-format
 msgid "Mandriva Online %s"
 msgstr "Mandriva Online"
 
-#: ../mdkapplet:635
+#: ../mdkapplet:473
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr ""
 
-#: ../mdkapplet:647
+#: ../mdkapplet:476
 #, c-format
 msgid "Mandriva Online gives access to Mandriva web services."
 msgstr ""
 
-#: ../mdkapplet:655
-#, c-format
-msgid "Always launch on startup"
-msgstr "Parating ilunsad sa pagsimula"
-
-#: ../mdkapplet:657
-#, c-format
-msgid "Quit"
-msgstr "Quit"
-
-#: ../mdkonline:58
-#, c-format
-msgid ""
-"mdonline version %s\n"
-"Copyright (C) %s Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"mdonline version %s\n"
-"Copyright (C) %s Mandriva.\n"
-"Ito ay libreng software at maaaring ipamahagi muli sa ilalim ng mga nasasaad "
-"sa GNU GPL.\n"
-"\n"
-"paggamit:\n"
-
-#: ../mdkonline:63 ../mdkupdate:73
-#, c-format
-msgid "  --help\t\t- print this help message.\n"
-msgstr "  --help\t\t- i-print ang mensaheng tulong na ito.\n"
-
-#: ../mdkonline:64
-#, c-format
-msgid "  --box=\t\t\t- hostname.\n"
-msgstr ""
-
-#: ../mdkonline:65
-#, c-format
-msgid "  --country\t\t\t- name of country of the user. \n"
-msgstr ""
-
-#: ../mdkonline:66
-#, c-format
-msgid "  --interactive\t\t- use the interactive mode.\n"
-msgstr ""
-
-#: ../mdkonline:67
-#, c-format
-msgid "  --nointeractive\t- use the non-interactive mode.\n"
-msgstr ""
-
-#: ../mdkonline:68
-#, c-format
-msgid "  --login=\t\t     - login name of the user.\n"
-msgstr ""
-
-#: ../mdkonline:69
-#, c-format
-msgid "  --pass=\t\t\t- password  of the user.\n"
-msgstr ""
-
-#: ../mdkonline:87 ../mdkonline:120
-#, c-format
-msgid "Mandriva Online"
-msgstr "Mandriva Online"
-
-#: ../mdkonline:90
-#, c-format
-msgid "I already have an account"
-msgstr "Mayroon na akong account"
-
-#: ../mdkonline:91
-#, c-format
-msgid "I want to subscribe"
-msgstr "Gusto kong mag-subscribe"
-
-#: ../mdkonline:96
-#, c-format
-msgid "Mr."
-msgstr ""
-
-#: ../mdkonline:96
-#, fuzzy, c-format
-msgid "Mrs."
-msgstr "XMrIs"
-
-#: ../mdkonline:96
-#, c-format
-msgid "Ms."
-msgstr ""
-
-#: ../mdkonline:114
-#, c-format
-msgid "Reading configuration\n"
-msgstr "Binabasa ang configuration\n"
-
-#: ../mdkonline:123
-#, c-format
-msgid ""
-"This assistant will help you to upload your configuration\n"
-"(packages, hardware configuration) to a centralized database in\n"
-"order to keep you informed about security updates and useful upgrades.\n"
-msgstr ""
-"Ang alalay na ito ay tutulong sa iyong i-upload ang iyong configuration\n"
-"(mga package, hardware configuration) sa isang centralized database\n"
-"para mapaalam sa iyo ang tungkol sa mga update sa seguridad at mga\n"
-"kapakipakinabang na mga upgrade.\n"
-
-#: ../mdkonline:131
-#, c-format
-msgid "Account creation or authentication"
-msgstr "Paggawa o pagpapatotoo ng account"
-
-#: ../mdkonline:136
-#, c-format
-msgid "Enter your Mandriva Online login, password and machine name:"
-msgstr ""
-"Ipasok ang iyong Mandriva Online login, password at pangalan ng makina:"
-
-#: ../mdkonline:142 ../mdkonline:195
-#, fuzzy, c-format
-msgid "Email address:"
-msgstr "Pa-labas na mail address"
-
-#: ../mdkonline:143
-#, c-format
-msgid "Country"
-msgstr "Bansa"
-
-#: ../mdkonline:144 ../mdkonline:196
-#, c-format
-msgid "Password:"
-msgstr "Password:"
-
-#: ../mdkonline:146
-#, fuzzy, c-format
-msgid "Machine description:"
-msgstr "Pangalan ng makina:"
-
-#: ../mdkonline:147
-#, c-format
-msgid "(Ex: My Home Office's Computer)"
-msgstr ""
-
-#: ../mdkonline:152 ../mdkonline:159 ../mdkonline:180 ../mdkonline:204
-#: ../mdkonline:208 ../mdkonline:212 ../mdkonline:217 ../mdkupdate:141
-#: ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
-#, c-format
-msgid "Error"
-msgstr "Error"
-
-#: ../mdkonline:152
-#, fuzzy, c-format
-msgid "Machine name must be 1 to 40 alphanumerical characters"
-msgstr ""
-"Ang mga \"mount point\" ay dapat maglaman lamang ng mga character na "
-"\"alphanumeric\""
-
-#: ../mdkonline:155
-#, c-format
-msgid "Connecting to Mandriva Online website..."
-msgstr "Kumukonekta sa Mandriva Online website..."
-
-#: ../mdkonline:167
-#, c-format
-msgid ""
-"In order to benefit from Mandriva Online services,\n"
-"we are about to upload your configuration.\n"
-"\n"
-"The Wizard will now send the following information to Mandriva:\n"
-"\n"
-"1) the list of packages you have installed on your system,\n"
-"\n"
-"2) your hardware configuration.\n"
-"\n"
-"If you feel uncomfortable by that idea, or do not want to benefit from this "
-"service,\n"
-"please press 'Cancel'. By pressing 'Next', you allow us to keep you "
-"informed\n"
-"about security updates and useful upgrades via personalized email alerts.\n"
-"Furthermore, you benefit from discounted paid support services on\n"
-"www.mandrivaexpert.com."
-msgstr ""
-"Para makinabang sa mga serbisyo ng Mandriva Online,\n"
-"i-a-upload namin ang iyong configuration.\n"
-"\n"
-"Ipapadala ngayon ng Wizard ang mga sumusunod na inpormasyon sa Mandriva:\n"
-"\n"
-"1) ang talaan ng mga package na naka-install sa iyong sistema,\n"
-"\n"
-"2) iyong hardware configuration.\n"
-"\n"
-"Kung hindi ka komportable sa idea na iyon, o ayaw pakinabangan ang "
-"serbisyong ito,\n"
-"paki-pindut ang 'I-cancel'. Sa pagpipindut ng 'Kasunod', pinapayagan mo "
-"kaming\n"
-"ipaalam sa iyo ang tungkol sa mga update sa seguridad at mga "
-"kapakipakinabang na\n"
-"mga upgrade via mga personalized email alert. At saka, ikaw ay makakatawad "
-"sa\n"
-"sa mga bayad na support service sa www.mandrivaexpert.com."
-
-#: ../mdkonline:180
-#, c-format
-msgid "Connection problem"
-msgstr "Problema sa koneksyon"
-
-#: ../mdkonline:180
-#, c-format
-msgid "Problem occurs when uploading files, please try again"
-msgstr "Nagkakaproblema sa pag-a-upload ng file, pakisubukan muli"
-
-#: ../mdkonline:187
-#, c-format
-msgid "Create a Mandriva Online Account"
-msgstr "Gumawa ng Mandriva Online Account"
-
-#. -PO: that is for things like "Mr", "Ms",...
-#: ../mdkonline:192
-#, fuzzy, c-format
-msgid "Greeting:"
-msgstr "Luntian"
-
-#: ../mdkonline:193
-#, c-format
-msgid "First name:"
-msgstr "Unang pangalan:"
-
-#: ../mdkonline:194
-#, fuzzy, c-format
-msgid "Last name:"
-msgstr "Unang pangalan:"
-
-#: ../mdkonline:197
-#, c-format
-msgid "Confirm Password:"
-msgstr "Ulitin ang Password:"
-
-#: ../mdkonline:204
-#, c-format
-msgid ""
-"The passwords do not match\n"
-" Please try again\n"
-msgstr ""
-"Hindi magkatumbas ang mga password\n"
-" Pakisubukan muli\n"
-
-#: ../mdkonline:208
-#, fuzzy, c-format
-msgid "Please fill in each field"
-msgstr "Pakipuno lahat ng field\n"
-
-#: ../mdkonline:212
-#, c-format
-msgid "Not a valid mail address!\n"
-msgstr "Hindi balidong mail address!\n"
-
-#: ../mdkonline:217
-#, c-format
-msgid "Creating account failed!"
-msgstr ""
-
-#: ../mdkonline:225
-#, c-format
-msgid ""
-"Mandriva Online Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
-msgstr ""
-"Matagumpay na nalikha ang Mandriva Online Account.\n"
-"Paki-click ang \"Kasunod\" para patotohonan at i-upload ang iyong "
-"configuration\n"
-
-#: ../mdkonline:229
-#, c-format
-msgid "Your upload was successful!"
-msgstr "Nagtagumpay ang iyong upload!"
-
-#: ../mdkonline:229
+#: ../mdkapplet:478
 #, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandriva Online."
-msgstr ""
-"Mula ngayon ikaw ay makakatanggap ng mga announcement\n"
-"tungkol sa seguridad at update salamat sa Mandriva Online."
+msgid "Online WebSite"
+msgstr "Online WebSite"
 
-#: ../mdkonline:229
+#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
+#: ../mdkapplet:483
 #, c-format
-msgid ""
-"Mandriva Online offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
+msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
-"Ang Mandriva Online ay naghahandog sa iyo ng kakayahang i-automate\n"
-"ang mga update. May program na tatakbo tuwina sa iyong sistema na\n"
-"maghihintay para sa mga bagong update.\n"
-
-#: ../mdkonline:238
-#, c-format
-msgid "Congratulations"
-msgstr "Maligayang Bati"
 
-#: ../mdkonline:238
+#: ../mdkapplet:492
 #, c-format
-msgid "Your Mandriva Online account has been successfully configured\n"
-msgstr "Matagumpay na na-configure ang iyong Mandriva Online account\n"
-
-#: ../mdkonline:253
-#, c-format
-msgid "Configuration uploaded successfully"
-msgstr "Matagumpay na nai-upload ang configuration!"
-
-#: ../mdkonline:254
-#, c-format
-msgid "Problem uploading configuration"
-msgstr "Problema sa pag-a-upload ng configuration"
+msgid "Always launch on startup"
+msgstr "Parating ilunsad sa pagsimula"
 
-#: ../mdkonline:256
+#: ../mdkapplet:494
 #, c-format
-msgid ""
-"Cannot connect to Mandriva Online website: wrong login/password or router/"
-"firewall bad settings"
-msgstr ""
-"Hindi makakonekta sa website ng mandrivaonline: maling login/password o "
-"maling setting ng router/firewall"
+msgid "Quit"
+msgstr "Quit"
 
 #: ../mdkonline.pm:207
 #, fuzzy, c-format
@@ -826,6 +355,11 @@ msgstr ""
 "\n"
 "paggamit:\n"
 
+#: ../mdkupdate:73
+#, c-format
+msgid "  --help\t\t- print this help message.\n"
+msgstr "  --help\t\t- i-print ang mensaheng tulong na ito.\n"
+
 #: ../mdkupdate:74
 #, c-format
 msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
@@ -853,11 +387,6 @@ msgid ""
 "file.\n"
 msgstr ""
 
-#: ../mdkupdate:118 ../mdkupdate:164
-#, c-format
-msgid "Warning"
-msgstr "Babala"
-
 #. -PO: here Live Install is currently *NOT* translated on the desktop, so it's better to keep as it:
 #: ../mdkupdate:120
 #, c-format
@@ -866,11 +395,21 @@ msgid ""
 "Install' wizard."
 msgstr ""
 
+#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
+#, c-format
+msgid "Please wait"
+msgstr "Maghintay lamang"
+
 #: ../mdkupdate:123 ../mdkupdate:174
 #, c-format
 msgid "Preparing..."
 msgstr "Naghahanda..."
 
+#: ../mdkupdate:141 ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
+#, c-format
+msgid "Error"
+msgstr "Error"
+
 #: ../mdkupdate:141
 #, c-format
 msgid ""
@@ -879,6 +418,11 @@ msgid ""
 "%s"
 msgstr ""
 
+#: ../mdkupdate:159 ../mdkupdate:188
+#, c-format
+msgid "An error occurred"
+msgstr "May \"error\" na nangyari"
+
 #: ../mdkupdate:164
 #, c-format
 msgid ""
@@ -903,6 +447,296 @@ msgstr "Ini-install ang mga package...\n"
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "Hindi ma-update ang mga package mula sa medium ng update_source.\n"
 
+#, fuzzy
+#~ msgid "New bundles are available for your system"
+#~ msgstr "May mga bagong update para sa iyong sistema"
+
+#~ msgid "Service is not configured. Please click on \"Configure the service\""
+#~ msgstr ""
+#~ "Ang serbisyo ay hindi available. I-click ang \"I-configure ang serbisyo\""
+
+#~ msgid "Configure the service"
+#~ msgstr "I-configure ang serbisyo"
+
+#~ msgid "Check updates"
+#~ msgstr "Suriin ang mga update"
+
+#~ msgid "Configure Now!"
+#~ msgstr "I-configure Ngayon!"
+
+#~ msgid "Actions"
+#~ msgstr "Mga Aksiyon"
+
+#~ msgid "Configure"
+#~ msgstr "I-configure"
+
+#~ msgid "See logs"
+#~ msgstr "Tingnan ang mga log"
+
+#~ msgid "Status"
+#~ msgstr "Kalagayan"
+
+#~ msgid "Close"
+#~ msgstr "Isara"
+
+#~ msgid "Network Connection: "
+#~ msgstr "Koneksyon sa Network: "
+
+#~ msgid "Up"
+#~ msgstr "Up"
+
+#~ msgid "Down"
+#~ msgstr "Down"
+
+#~ msgid "Last check: "
+#~ msgstr "Huling pagsuri: "
+
+#~ msgid "Machine name:"
+#~ msgstr "Pangalan ng makina:"
+
+#~ msgid "Updates: "
+#~ msgstr "Mga Update: "
+
+#~ msgid "Development release not supported by service"
+#~ msgstr "Ang Panglinang na pagpapalabas ay hindi suportado ng serbisyo"
+
+#~ msgid "Too old release not supported by service"
+#~ msgstr "Makalumang pagpapalabas ay hindi suportado ng serbisyo"
+
+#~ msgid "Unknown state"
+#~ msgstr "Di-kilalang state"
+
+#~ msgid "Online services disabled. Contact Mandriva Online site\n"
+#~ msgstr ""
+#~ "Naka-disable ang mga online service. Makipag-alam sa Mandriva Online "
+#~ "site\n"
+
+#~ msgid "Wrong Password.\n"
+#~ msgstr "Maling password.\n"
+
+#~ msgid "Wrong Action or host or login.\n"
+#~ msgstr "Maling aksyon o host o login.\n"
+
+#~ msgid ""
+#~ "Something is wrong with your network settings (check your route, firewall "
+#~ "or proxy settings)\n"
+#~ msgstr ""
+#~ "May mali sa mga setting ng iyong network (pakisuri ang mga setting ng "
+#~ "iyong route, firewall o proxy)\n"
+
+#~ msgid ""
+#~ "Problem occured while connecting to the server, please contact the "
+#~ "support team"
+#~ msgstr ""
+#~ "May nangyaring problema habang kumokonekta sa server, makipag-alam sa "
+#~ "koponang pangsuporta"
+
+#~ msgid "Response from Mandriva Online server\n"
+#~ msgstr "Sagot mula sa Mandriva Online server\n"
+
+#~ msgid "No check"
+#~ msgstr "Walang pagsuri"
+
+#~ msgid "Checking config file: Not present\n"
+#~ msgstr "Sinusuri ang config file: Wala\n"
+
+#~ msgid "Logs"
+#~ msgstr "Mga Log"
+
+#~ msgid "Clear"
+#~ msgstr "I-clear"
+
+#~ msgid ""
+#~ "mdonline version %s\n"
+#~ "Copyright (C) %s Mandriva.\n"
+#~ "This is free software and may be redistributed under the terms of the GNU "
+#~ "GPL.\n"
+#~ "\n"
+#~ "usage:\n"
+#~ msgstr ""
+#~ "mdonline version %s\n"
+#~ "Copyright (C) %s Mandriva.\n"
+#~ "Ito ay libreng software at maaaring ipamahagi muli sa ilalim ng mga "
+#~ "nasasaad sa GNU GPL.\n"
+#~ "\n"
+#~ "paggamit:\n"
+
+#~ msgid "Mandriva Online"
+#~ msgstr "Mandriva Online"
+
+#~ msgid "I already have an account"
+#~ msgstr "Mayroon na akong account"
+
+#~ msgid "I want to subscribe"
+#~ msgstr "Gusto kong mag-subscribe"
+
+#, fuzzy
+#~ msgid "Mrs."
+#~ msgstr "XMrIs"
+
+#~ msgid "Reading configuration\n"
+#~ msgstr "Binabasa ang configuration\n"
+
+#~ msgid ""
+#~ "This assistant will help you to upload your configuration\n"
+#~ "(packages, hardware configuration) to a centralized database in\n"
+#~ "order to keep you informed about security updates and useful upgrades.\n"
+#~ msgstr ""
+#~ "Ang alalay na ito ay tutulong sa iyong i-upload ang iyong configuration\n"
+#~ "(mga package, hardware configuration) sa isang centralized database\n"
+#~ "para mapaalam sa iyo ang tungkol sa mga update sa seguridad at mga\n"
+#~ "kapakipakinabang na mga upgrade.\n"
+
+#~ msgid "Account creation or authentication"
+#~ msgstr "Paggawa o pagpapatotoo ng account"
+
+#~ msgid "Enter your Mandriva Online login, password and machine name:"
+#~ msgstr ""
+#~ "Ipasok ang iyong Mandriva Online login, password at pangalan ng makina:"
+
+#, fuzzy
+#~ msgid "Email address:"
+#~ msgstr "Pa-labas na mail address"
+
+#~ msgid "Country"
+#~ msgstr "Bansa"
+
+#~ msgid "Password:"
+#~ msgstr "Password:"
+
+#, fuzzy
+#~ msgid "Machine description:"
+#~ msgstr "Pangalan ng makina:"
+
+#, fuzzy
+#~ msgid "Machine name must be 1 to 40 alphanumerical characters"
+#~ msgstr ""
+#~ "Ang mga \"mount point\" ay dapat maglaman lamang ng mga character na "
+#~ "\"alphanumeric\""
+
+#~ msgid "Connecting to Mandriva Online website..."
+#~ msgstr "Kumukonekta sa Mandriva Online website..."
+
+#~ msgid ""
+#~ "In order to benefit from Mandriva Online services,\n"
+#~ "we are about to upload your configuration.\n"
+#~ "\n"
+#~ "The Wizard will now send the following information to Mandriva:\n"
+#~ "\n"
+#~ "1) the list of packages you have installed on your system,\n"
+#~ "\n"
+#~ "2) your hardware configuration.\n"
+#~ "\n"
+#~ "If you feel uncomfortable by that idea, or do not want to benefit from "
+#~ "this service,\n"
+#~ "please press 'Cancel'. By pressing 'Next', you allow us to keep you "
+#~ "informed\n"
+#~ "about security updates and useful upgrades via personalized email "
+#~ "alerts.\n"
+#~ "Furthermore, you benefit from discounted paid support services on\n"
+#~ "www.mandrivaexpert.com."
+#~ msgstr ""
+#~ "Para makinabang sa mga serbisyo ng Mandriva Online,\n"
+#~ "i-a-upload namin ang iyong configuration.\n"
+#~ "\n"
+#~ "Ipapadala ngayon ng Wizard ang mga sumusunod na inpormasyon sa Mandriva:\n"
+#~ "\n"
+#~ "1) ang talaan ng mga package na naka-install sa iyong sistema,\n"
+#~ "\n"
+#~ "2) iyong hardware configuration.\n"
+#~ "\n"
+#~ "Kung hindi ka komportable sa idea na iyon, o ayaw pakinabangan ang "
+#~ "serbisyong ito,\n"
+#~ "paki-pindut ang 'I-cancel'. Sa pagpipindut ng 'Kasunod', pinapayagan mo "
+#~ "kaming\n"
+#~ "ipaalam sa iyo ang tungkol sa mga update sa seguridad at mga "
+#~ "kapakipakinabang na\n"
+#~ "mga upgrade via mga personalized email alert. At saka, ikaw ay "
+#~ "makakatawad sa\n"
+#~ "sa mga bayad na support service sa www.mandrivaexpert.com."
+
+#~ msgid "Connection problem"
+#~ msgstr "Problema sa koneksyon"
+
+#~ msgid "Problem occurs when uploading files, please try again"
+#~ msgstr "Nagkakaproblema sa pag-a-upload ng file, pakisubukan muli"
+
+#~ msgid "Create a Mandriva Online Account"
+#~ msgstr "Gumawa ng Mandriva Online Account"
+
+#, fuzzy
+#~ msgid "Greeting:"
+#~ msgstr "Luntian"
+
+#~ msgid "First name:"
+#~ msgstr "Unang pangalan:"
+
+#, fuzzy
+#~ msgid "Last name:"
+#~ msgstr "Unang pangalan:"
+
+#~ msgid "Confirm Password:"
+#~ msgstr "Ulitin ang Password:"
+
+#~ msgid ""
+#~ "The passwords do not match\n"
+#~ " Please try again\n"
+#~ msgstr ""
+#~ "Hindi magkatumbas ang mga password\n"
+#~ " Pakisubukan muli\n"
+
+#, fuzzy
+#~ msgid "Please fill in each field"
+#~ msgstr "Pakipuno lahat ng field\n"
+
+#~ msgid "Not a valid mail address!\n"
+#~ msgstr "Hindi balidong mail address!\n"
+
+#~ msgid ""
+#~ "Mandriva Online Account successfully created.\n"
+#~ "Please click \"Next\" to authenticate and upload your configuration\n"
+#~ msgstr ""
+#~ "Matagumpay na nalikha ang Mandriva Online Account.\n"
+#~ "Paki-click ang \"Kasunod\" para patotohonan at i-upload ang iyong "
+#~ "configuration\n"
+
+#~ msgid "Your upload was successful!"
+#~ msgstr "Nagtagumpay ang iyong upload!"
+
+#~ msgid ""
+#~ "From now you will receive on security and updates \n"
+#~ "announcements thanks to Mandriva Online."
+#~ msgstr ""
+#~ "Mula ngayon ikaw ay makakatanggap ng mga announcement\n"
+#~ "tungkol sa seguridad at update salamat sa Mandriva Online."
+
+#~ msgid ""
+#~ "Mandriva Online offers you the ability to automate the updates.\n"
+#~ "A program will run regulary in your system waiting for new updates\n"
+#~ msgstr ""
+#~ "Ang Mandriva Online ay naghahandog sa iyo ng kakayahang i-automate\n"
+#~ "ang mga update. May program na tatakbo tuwina sa iyong sistema na\n"
+#~ "maghihintay para sa mga bagong update.\n"
+
+#~ msgid "Congratulations"
+#~ msgstr "Maligayang Bati"
+
+#~ msgid "Your Mandriva Online account has been successfully configured\n"
+#~ msgstr "Matagumpay na na-configure ang iyong Mandriva Online account\n"
+
+#~ msgid "Configuration uploaded successfully"
+#~ msgstr "Matagumpay na nai-upload ang configuration!"
+
+#~ msgid "Problem uploading configuration"
+#~ msgstr "Problema sa pag-a-upload ng configuration"
+
+#~ msgid ""
+#~ "Cannot connect to Mandriva Online website: wrong login/password or router/"
+#~ "firewall bad settings"
+#~ msgstr ""
+#~ "Hindi makakonekta sa website ng mandrivaonline: maling login/password o "
+#~ "maling setting ng router/firewall"
+
 #~ msgid "  --applet\t\t- launch Mandriva Update.\n"
 #~ msgstr "  --applet\t\t- ilunsad ang Mandriva Update.\n"
 
diff --git a/po/tr.po b/po/tr.po
index 1c7cfce3..92e29eb4 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -10,28 +10,27 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-09 16:26+0200\n"
+"POT-Creation-Date: 2008-02-21 18:21+0100\n"
 "PO-Revision-Date: 2007-09-27 16:44+0300\n"
 "Last-Translator: Taha Özket <taha.ozket@obss.net>\n"
 "Language-Team: Turkce <tr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;"
-"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms: nplurals=1; plural=0;X-Generator: KBabel 1.11.4\n"
 
 #. -PO: here %s will be replaced by the local time (eg: "Will check updates at 14:03:50"
-#: ../mdkapplet:94
+#: ../mdkapplet:88
 #, c-format
 msgid "Will check updates at %s"
 msgstr "Güncellemeler %s itibari ile kontrol edilecek."
 
-#: ../mdkapplet:103
+#: ../mdkapplet:97
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "Sisteminiz güncel"
 
-#: ../mdkapplet:109
+#: ../mdkapplet:103
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -40,52 +39,45 @@ msgstr ""
 "Herhangi bir sorun için support@manrakeonline.net adresine posta "
 "gönderebilirsiniz"
 
-#: ../mdkapplet:115
+#: ../mdkapplet:110
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "Lütfen bekleyin, erişilebilir paketler aranıyor..."
 
-#: ../mdkapplet:121
+#: ../mdkapplet:116
 #, c-format
 msgid "New updates are available for your system"
 msgstr "Sisteminiz için yeni güncellemeler mevcut"
 
-#: ../mdkapplet:127
-#, c-format
-msgid "New bundles are available for your system"
-msgstr "Sisteminiz için yeni güncellemeler mevcut "
-
-#: ../mdkapplet:133
-#, c-format
-msgid "Service is not configured. Please click on \"Configure the service\""
-msgstr "Servis yapılandırılmadı. Lütfen yapılandırın."
-
-#: ../mdkapplet:139
+#: ../mdkapplet:122
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "Ağ'ınız çalışmıyor. Lütfen ağ yapılandırmanızı kontrol edin"
 
-#: ../mdkapplet:145
+#: ../mdkapplet:128
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "Servis etkin değil. Lütfen çevrimiçi Websitesi Linkine tıklayın."
 
-#: ../mdkapplet:151 ../mdkapplet:182
+#: ../mdkapplet:134 ../mdkapplet:165
 #, c-format
 msgid "urpmi database locked"
 msgstr "urpmi veri tabanı kilitlendi "
 
-#: ../mdkapplet:157
+#: ../mdkapplet:140
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr "Sürüm Desteklenmiyor (Çok eski ta da deneme sürümü)"
 
-#: ../mdkapplet:163
+#: ../mdkapplet:146
 #, c-format
-msgid "No medium found. You must add some media through 'Software Media Manager'."
-msgstr "Yazılım ortamı bulunamadı. Yazılım ortam yöneticisinden geçerli bir yazılım ortamı ekleyin."
+msgid ""
+"No medium found. You must add some media through 'Software Media Manager'."
+msgstr ""
+"Yazılım ortamı bulunamadı. Yazılım ortam yöneticisinden geçerli bir yazılım "
+"ortamı ekleyin."
 
-#: ../mdkapplet:169
+#: ../mdkapplet:152
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -96,575 +88,131 @@ msgid ""
 "Then, restart \"%s\"."
 msgstr ""
 
-#: ../mdkapplet:174
+#: ../mdkapplet:157
 #, c-format
 msgid "Enabled"
 msgstr "Etkin"
 
-#: ../mdkapplet:187
+#: ../mdkapplet:170
 #, c-format
 msgid "Error updating media"
 msgstr "Ortam yenileme hatası"
 
-#: ../mdkapplet:202
+#: ../mdkapplet:185
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr "Kontrol ediliyor.... Güncelleştirmeler mevcut.\n"
 
-#: ../mdkapplet:207
+#: ../mdkapplet:190
 #, c-format
 msgid "Packages are up to date"
 msgstr "Paketler güncel"
 
-#: ../mdkapplet:212
+#: ../mdkapplet:195
 #, c-format
 msgid "Failed to open urpmi database"
 msgstr "urpmi veri tabanı açılamıyor"
 
-#: ../mdkapplet:217 ../mdkapplet:324
+#: ../mdkapplet:200
 #, c-format
 msgid "Install updates"
 msgstr "Güncellemeleri kur"
 
-#: ../mdkapplet:218
-#, c-format
-msgid "Configure the service"
-msgstr "Servisi Yapılandır"
-
-#: ../mdkapplet:219
+#: ../mdkapplet:201
 #, c-format
 msgid "Check Updates"
 msgstr "Güncellemeleri Kontrol Et"
 
-#: ../mdkapplet:220 ../mdkapplet:327 ../mdkonline:114 ../mdkonline:155
-#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
-#, c-format
-msgid "Please wait"
-msgstr "Lütfen bekleyin"
-
-#: ../mdkapplet:220 ../mdkapplet:326 ../mdkapplet:327
-#, c-format
-msgid "Check updates"
-msgstr "Güncellemeleri Kontrol Et"
-
-#: ../mdkapplet:223 ../mdkapplet:648
-#, c-format
-msgid "Online WebSite"
-msgstr "Online WebSite"
-
-#: ../mdkapplet:224
+#: ../mdkapplet:202
 #, c-format
 msgid "Configure Network"
 msgstr "Ağı Yapılandır"
 
-#: ../mdkapplet:225
-#, c-format
-msgid "Configure Now!"
-msgstr "Yapılandır"
-
-#: ../mdkapplet:313 ../mdkapplet:392
-#, c-format
-msgid "Mandriva Linux Updates Applet"
-msgstr "Mandriva Linux Güncelleme Uygulamacığı"
-
-#: ../mdkapplet:322
-#, c-format
-msgid "Actions"
-msgstr "Eylemler"
-
-#: ../mdkapplet:325
-#, c-format
-msgid "Configure"
-msgstr "Yapılandır"
-
-#: ../mdkapplet:329
-#, c-format
-msgid "See logs"
-msgstr "Günlüğü göster"
-
-#: ../mdkapplet:332
-#, c-format
-msgid "Status"
-msgstr "Durum"
-
-#: ../mdkapplet:336 ../mdkapplet:597
-#, c-format
-msgid "Close"
-msgstr "Kapat"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Network Connection: "
-msgstr "Ağ Bağlantısı:"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Up"
-msgstr "Yukarı"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Down"
-msgstr "Aşağı"
-
-#: ../mdkapplet:366
-#, c-format
-msgid "Last check: "
-msgstr "Son Kontrol:"
-
-#: ../mdkapplet:367 ../mdkonline:145
-#, c-format
-msgid "Machine name:"
-msgstr "Makine adı:"
-
-#: ../mdkapplet:368
-#, c-format
-msgid "Updates: "
-msgstr "Yeni Güncellemeler:"
-
-#: ../mdkapplet:372
+#: ../mdkapplet:283
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Drakconnect başlatılıyor\n"
 
-#: ../mdkapplet:375
+#: ../mdkapplet:286
 #, c-format
 msgid "Mandriva Online seems to be reinstalled, reloading applet ...."
 msgstr "Mandriva online yenilenmiş gözüküyor. Applet yeniden yükleniyor."
 
-#: ../mdkapplet:383
+#: ../mdkapplet:294
 #, c-format
 msgid "Launching MandrivaUpdate\n"
 msgstr "Mandriva Update Başlatılıyor.\n"
 
-#: ../mdkapplet:398
+#: ../mdkapplet:303
+#, c-format
+msgid "Mandriva Linux Updates Applet"
+msgstr "Mandriva Linux Güncelleme Uygulamacığı"
+
+#: ../mdkapplet:308
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Güncellemeleri Kontrol Et \n"
 
-#: ../mdkapplet:399
+#: ../mdkapplet:309
 #, c-format
 msgid "Connecting to"
 msgstr "Bağlanıyor"
 
-#: ../mdkapplet:467 ../mdkupdate:159 ../mdkupdate:188
-#, c-format
-msgid "An error occurred"
-msgstr "Bir hata oluştu"
-
-#: ../mdkapplet:475
-#, c-format
-msgid "Development release not supported by service"
-msgstr "Geliştirme sürümü: Desteklenmemektedir."
-
-#: ../mdkapplet:476
-#, c-format
-msgid "Too old release not supported by service"
-msgstr "Aşırı eski sürüm : Desteklenmemektedir"
-
-#: ../mdkapplet:477
-#, c-format
-msgid "Unknown state"
-msgstr "Bilinmeyen durum"
-
-#: ../mdkapplet:478
-#, c-format
-msgid "Online services disabled. Contact Mandriva Online site\n"
-msgstr "Çevrimiçi servisler etkisiz. Mandriva Online ile ilişki kurun.\n"
-
-#: ../mdkapplet:479
-#, c-format
-msgid "Wrong Password.\n"
-msgstr "Yanlış parola.\n"
-
-#: ../mdkapplet:480
-#, c-format
-msgid "Wrong Action or host or login.\n"
-msgstr "Yanlış Eylem, sunucu, giriş.\n"
-
-#: ../mdkapplet:481
-#, c-format
-msgid ""
-"Something is wrong with your network settings (check your route, firewall or "
-"proxy settings)\n"
-msgstr "Ağ ayarlarınızda sorun var. Lütfen ağ ayarlarınızın doğruluğunu bir daha denetleyin.\n"
-
-#: ../mdkapplet:483
-#, c-format
-msgid ""
-"Problem occured while connecting to the server, please contact the support "
-"team"
-msgstr "Sunucu bağlantı hatası. Lütfen sunucu destek ekibine başvurun."
-
-#: ../mdkapplet:487
-#, c-format
-msgid "Response from Mandriva Online server\n"
-msgstr "Mandriva Online Cevabı: \n"
-
-#: ../mdkapplet:490
+#: ../mdkapplet:386
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Sisteminiz güncel \n"
 
-#: ../mdkapplet:527
-#, c-format
-msgid "No check"
-msgstr "Kontrolsüz:"
-
-#: ../mdkapplet:541
-#, c-format
-msgid "Checking config file: Not present\n"
-msgstr "yapılandırma dosyası mevcut değil.\n"
-
-#: ../mdkapplet:544
+#: ../mdkapplet:415
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Ağ etkinleştirilmemiş\n"
 
-#: ../mdkapplet:587
-#, c-format
-msgid "Logs"
-msgstr "Kayıtlar"
-
-#: ../mdkapplet:603
+#: ../mdkapplet:457 ../mdkupdate:118 ../mdkupdate:164
 #, c-format
-msgid "Clear"
-msgstr "Temizle"
+msgid "Warning"
+msgstr "Uyarı"
 
-#: ../mdkapplet:629
+#: ../mdkapplet:468
 #, c-format
 msgid "About..."
 msgstr "Hakkında..."
 
-#: ../mdkapplet:631
+#: ../mdkapplet:472
 #, c-format
 msgid "Mandriva Online %s"
 msgstr "Mandriva Online %s"
 
-#: ../mdkapplet:635
+#: ../mdkapplet:473
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Copyright (C) %s by Mandriva"
 
-#: ../mdkapplet:647
+#: ../mdkapplet:476
 #, c-format
 msgid "Mandriva Online gives access to Mandriva web services."
 msgstr "Mandriva online Mandriva web servislerine erişim sağlar."
 
-#: ../mdkapplet:655
-#, c-format
-msgid "Always launch on startup"
-msgstr "Her zaman başlangıçta çalıştır."
-
-#: ../mdkapplet:657
-#, c-format
-msgid "Quit"
-msgstr "Çıkış"
-
-#: ../mdkonline:58
-#, c-format
-msgid ""
-"mdonline version %s\n"
-"Copyright (C) %s Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"mdonline sürüm %s\n"
-"Copyright (C) %s Mandriva.\n"
-"Bu bir serbest yazılımdır ve GNU GPL lisansı altında tekrar "
-"dağıtılabilinir.\n"
-"\n"
-"kullanımı:\n"
-
-#: ../mdkonline:63 ../mdkupdate:73
-#, c-format
-msgid "  --help\t\t- print this help message.\n"
-msgstr "  --help\t\t- bu yardım mesajını görüntüler.\n"
-
-#: ../mdkonline:64
-#, c-format
-msgid "  --box=\t\t\t- hostname.\n"
-msgstr "  --box=\t\t\t- hostname.\n"
-
-#: ../mdkonline:65
-#, c-format
-msgid "  --country\t\t\t- name of country of the user. \n"
-msgstr "  --country\t\t\t- Kullanıcının ülke adı. \n"
-
-#: ../mdkonline:66
-#, c-format
-msgid "  --interactive\t\t- use the interactive mode.\n"
-msgstr "  --interactive\t\t- interaktif modu kullanın.\n"
-
-#: ../mdkonline:67
-#, c-format
-msgid "  --nointeractive\t- use the non-interactive mode.\n"
-msgstr ""
-
-#: ../mdkonline:68
-#, c-format
-msgid "  --login=\t\t     - login name of the user.\n"
-msgstr ""
-
-#: ../mdkonline:69
-#, c-format
-msgid "  --pass=\t\t\t- password  of the user.\n"
-msgstr ""
-
-#: ../mdkonline:87 ../mdkonline:120
-#, c-format
-msgid "Mandriva Online"
-msgstr "Mandriva Online"
-
-#: ../mdkonline:90
-#, c-format
-msgid "I already have an account"
-msgstr ""
-
-#: ../mdkonline:91
-#, c-format
-msgid "I want to subscribe"
-msgstr ""
-
-#: ../mdkonline:96
-#, c-format
-msgid "Mr."
-msgstr "Bay"
-
-#: ../mdkonline:96
-#, c-format
-msgid "Mrs."
-msgstr "Bayan"
-
-#: ../mdkonline:96
-#, c-format
-msgid "Ms."
-msgstr "Bayan"
-
-#: ../mdkonline:114
-#, c-format
-msgid "Reading configuration\n"
-msgstr "Yapılandırmanız okunuyor\n"
-
-#: ../mdkonline:123
-#, c-format
-msgid ""
-"This assistant will help you to upload your configuration\n"
-"(packages, hardware configuration) to a centralized database in\n"
-"order to keep you informed about security updates and useful upgrades.\n"
-msgstr ""
-"Bu asistan size yapılandırmanızı yollarken yardımcı olacaktır.\n"
-"(paketler, donanım bilgisi) Bu bilgilerle Mandrivata bir veri tabanı\n"
-"oluşturulacak ve sisteminiz hakkında güvenlik yamaları ve güncellemelerden\n"
-"her an haberdar olacaksınız.\n"
-
-#: ../mdkonline:131
-#, c-format
-msgid "Account creation or authentication"
-msgstr ""
-
-#: ../mdkonline:136
-#, c-format
-msgid "Enter your Mandriva Online login, password and machine name:"
-msgstr "Mandriva Online kullanıcıadınızı , parolanızı ve makine adını giriniz:"
-
-#: ../mdkonline:142 ../mdkonline:195
-#, c-format
-msgid "Email address:"
-msgstr "E-Posta adresi:"
-
-#: ../mdkonline:143
-#, c-format
-msgid "Country"
-msgstr "Ülke"
-
-#: ../mdkonline:144 ../mdkonline:196
-#, c-format
-msgid "Password:"
-msgstr "Parola:"
-
-#: ../mdkonline:146
-#, c-format
-msgid "Machine description:"
-msgstr "Makine açıklaması:"
-
-#: ../mdkonline:147
-#, c-format
-msgid "(Ex: My Home Office's Computer)"
-msgstr " "
-
-#: ../mdkonline:152 ../mdkonline:159 ../mdkonline:180 ../mdkonline:204
-#: ../mdkonline:208 ../mdkonline:212 ../mdkonline:217 ../mdkupdate:141
-#: ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
-#, c-format
-msgid "Error"
-msgstr "Hata"
-
-#: ../mdkonline:152
-#, c-format
-msgid "Machine name must be 1 to 40 alphanumerical characters"
-msgstr "Makine adı 40 karektere kadar ve alfanumerik olmalıdır."
-
-#: ../mdkonline:155
-#, c-format
-msgid "Connecting to Mandriva Online website..."
-msgstr "Mandriva Online'na Bağlanıyor"
-
-#: ../mdkonline:167
-#, c-format
-msgid ""
-"In order to benefit from Mandriva Online services,\n"
-"we are about to upload your configuration.\n"
-"\n"
-"The Wizard will now send the following information to Mandriva:\n"
-"\n"
-"1) the list of packages you have installed on your system,\n"
-"\n"
-"2) your hardware configuration.\n"
-"\n"
-"If you feel uncomfortable by that idea, or do not want to benefit from this "
-"service,\n"
-"please press 'Cancel'. By pressing 'Next', you allow us to keep you "
-"informed\n"
-"about security updates and useful upgrades via personalized email alerts.\n"
-"Furthermore, you benefit from discounted paid support services on\n"
-"www.mandrivaexpert.com."
-msgstr ""
-"Yapacağınız seçim ile Mandriva Linux'a yardım etme şansına sahipsiniz .\n"
-"\n"
-"Bu sihirbaz aşağıda listelenen bilgileri Mandriva a yollayacaktır:\n"
-"\n"
-"1) Sistemde yüklü olan paketlerin(programların) isimleri,\n"
-"\n"
-"2) Bilgisayarınızın donanım listesi.\n"
-"\n"
-"Bu sizde hoşnutsuzluk oluşturdu ise Vazgeç e tıklayıp çıkabilirsiniz!\n"
-"İleri ye tıklamanız halinde Mandriva Linux un ihtiyaçlara göre \n"
-"yapılandırılmasında büyük bir yardımda bulunmuş olacaksınız.\n"
-"Sistem bilginiz kesinlikle bir 3. şahısa iletilmeyecektir.\n"
-"Tüm bu bilgiler Mandriva Linux Gizlilik Poliçesi ile korunacaktır."
-
-#: ../mdkonline:180
-#, c-format
-msgid "Connection problem"
-msgstr "Bağlantı problemi"
-
-#: ../mdkonline:180
-#, c-format
-msgid "Problem occurs when uploading files, please try again"
-msgstr ""
-
-#: ../mdkonline:187
-#, c-format
-msgid "Create a Mandriva Online Account"
-msgstr "Mandriva Linux Online Hesabı Oluştur"
-
-#. -PO: that is for things like "Mr", "Ms",...
-#: ../mdkonline:192
-#, c-format
-msgid "Greeting:"
-msgstr "KArşılama"
-
-#: ../mdkonline:193
-#, c-format
-msgid "First name:"
-msgstr "İlk isim:"
-
-#: ../mdkonline:194
-#, c-format
-msgid "Last name:"
-msgstr "Soyad:"
-
-#: ../mdkonline:197
-#, c-format
-msgid "Confirm Password:"
-msgstr "Parolayı Onayla:"
-
-#: ../mdkonline:204
-#, c-format
-msgid ""
-"The passwords do not match\n"
-" Please try again\n"
-msgstr ""
-"Şifreler uyuşmuyor\n"
-"Lütfen tekrar deneyin\n"
-
-#: ../mdkonline:208
-#, c-format
-msgid "Please fill in each field"
-msgstr "Lütfen tüm alanları doldurun"
-
-#: ../mdkonline:212
-#, c-format
-msgid "Not a valid mail address!\n"
-msgstr "Geçerli bir EPosta adresi değil\n"
-
-#: ../mdkonline:217
-#, c-format
-msgid "Creating account failed!"
-msgstr ""
-
-#: ../mdkonline:225
-#, c-format
-msgid ""
-"Mandriva Online Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
-msgstr ""
-
-#: ../mdkonline:229
-#, c-format
-msgid "Your upload was successful!"
-msgstr "Göndermeniz tamamlanmıştır!"
-
-#: ../mdkonline:229
-#, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandriva Online."
-msgstr ""
-"Bundan böyle Mandriva Online'dan sisteminiz\n"
-"hakkında ki tüm gelişmeler ve güvenlik açıkları size bildirilecektir.\n"
-"Mandriva teşekkürlerini sunar..."
-
-#: ../mdkonline:229
-#, c-format
-msgid ""
-"Mandriva Online offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
-msgstr ""
-"Mandriva Online otamatikman uygulanabilecek güncellemeleri "
-"teklif edecektir.\n"
-"Sistemizde belirli aralıklarla çalışacak ve\n"
-"güncellemeleri takip edecek olan bir programdır\n"
-
-#: ../mdkonline:238
+#: ../mdkapplet:478
 #, c-format
-msgid "Congratulations"
-msgstr "Tebrikler"
+msgid "Online WebSite"
+msgstr "Online WebSite"
 
-#: ../mdkonline:238
+#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
+#: ../mdkapplet:483
 #, c-format
-msgid "Your Mandriva Online account has been successfully configured\n"
+msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
 
-#: ../mdkonline:253
+#: ../mdkapplet:492
 #, c-format
-msgid "Configuration uploaded successfully"
-msgstr "Göndermeniz tamamlanmıştır!"
-
-#: ../mdkonline:254
-#, c-format
-msgid "Problem uploading configuration"
-msgstr "Yapılandırmanız okuma hatası"
+msgid "Always launch on startup"
+msgstr "Her zaman başlangıçta çalıştır."
 
-#: ../mdkonline:256
+#: ../mdkapplet:494
 #, c-format
-msgid ""
-"Cannot connect to Mandriva Online website: wrong login/password or router/"
-"firewall bad settings"
-msgstr ""
+msgid "Quit"
+msgstr "Çıkış"
 
 #: ../mdkonline.pm:207
 #, c-format
@@ -767,8 +315,8 @@ msgid ""
 "Mandriva web services are under maintenance\n"
 "Please Try again Later"
 msgstr ""
-"Mandriva web servisleri şu an için bakımda. "
-"Daha sonra lütfen tekrar deneyiniz."
+"Mandriva web servisleri şu an için bakımda. Daha sonra lütfen tekrar "
+"deneyiniz."
 
 #: ../mdkonline.pm:218
 #, c-format
@@ -807,6 +355,11 @@ msgstr ""
 "\n"
 "kullanımı:\n"
 
+#: ../mdkupdate:73
+#, c-format
+msgid "  --help\t\t- print this help message.\n"
+msgstr "  --help\t\t- bu yardım mesajını görüntüler.\n"
+
 #: ../mdkupdate:74
 #, c-format
 msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
@@ -834,11 +387,6 @@ msgid ""
 "file.\n"
 msgstr ""
 
-#: ../mdkupdate:118 ../mdkupdate:164
-#, c-format
-msgid "Warning"
-msgstr "Uyarı"
-
 #. -PO: here Live Install is currently *NOT* translated on the desktop, so it's better to keep as it:
 #: ../mdkupdate:120
 #, c-format
@@ -847,11 +395,21 @@ msgid ""
 "Install' wizard."
 msgstr ""
 
+#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
+#, c-format
+msgid "Please wait"
+msgstr "Lütfen bekleyin"
+
 #: ../mdkupdate:123 ../mdkupdate:174
 #, c-format
 msgid "Preparing..."
 msgstr "Hazırlanıyor..."
 
+#: ../mdkupdate:141 ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
+#, c-format
+msgid "Error"
+msgstr "Hata"
+
 #: ../mdkupdate:141
 #, c-format
 msgid ""
@@ -860,6 +418,11 @@ msgid ""
 "%s"
 msgstr ""
 
+#: ../mdkupdate:159 ../mdkupdate:188
+#, c-format
+msgid "An error occurred"
+msgstr "Bir hata oluştu"
+
 #: ../mdkupdate:164
 #, c-format
 msgid ""
@@ -884,3 +447,263 @@ msgstr "Paketler kuruluyor...\n"
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "update_source medyasından paketler güncellenemiyor.\n"
 
+#~ msgid "New bundles are available for your system"
+#~ msgstr "Sisteminiz için yeni güncellemeler mevcut "
+
+#~ msgid "Service is not configured. Please click on \"Configure the service\""
+#~ msgstr "Servis yapılandırılmadı. Lütfen yapılandırın."
+
+#~ msgid "Configure the service"
+#~ msgstr "Servisi Yapılandır"
+
+#~ msgid "Check updates"
+#~ msgstr "Güncellemeleri Kontrol Et"
+
+#~ msgid "Configure Now!"
+#~ msgstr "Yapılandır"
+
+#~ msgid "Actions"
+#~ msgstr "Eylemler"
+
+#~ msgid "Configure"
+#~ msgstr "Yapılandır"
+
+#~ msgid "See logs"
+#~ msgstr "Günlüğü göster"
+
+#~ msgid "Status"
+#~ msgstr "Durum"
+
+#~ msgid "Close"
+#~ msgstr "Kapat"
+
+#~ msgid "Network Connection: "
+#~ msgstr "Ağ Bağlantısı:"
+
+#~ msgid "Up"
+#~ msgstr "Yukarı"
+
+#~ msgid "Down"
+#~ msgstr "Aşağı"
+
+#~ msgid "Last check: "
+#~ msgstr "Son Kontrol:"
+
+#~ msgid "Machine name:"
+#~ msgstr "Makine adı:"
+
+#~ msgid "Updates: "
+#~ msgstr "Yeni Güncellemeler:"
+
+#~ msgid "Development release not supported by service"
+#~ msgstr "Geliştirme sürümü: Desteklenmemektedir."
+
+#~ msgid "Too old release not supported by service"
+#~ msgstr "Aşırı eski sürüm : Desteklenmemektedir"
+
+#~ msgid "Unknown state"
+#~ msgstr "Bilinmeyen durum"
+
+#~ msgid "Online services disabled. Contact Mandriva Online site\n"
+#~ msgstr "Çevrimiçi servisler etkisiz. Mandriva Online ile ilişki kurun.\n"
+
+#~ msgid "Wrong Password.\n"
+#~ msgstr "Yanlış parola.\n"
+
+#~ msgid "Wrong Action or host or login.\n"
+#~ msgstr "Yanlış Eylem, sunucu, giriş.\n"
+
+#~ msgid ""
+#~ "Something is wrong with your network settings (check your route, firewall "
+#~ "or proxy settings)\n"
+#~ msgstr ""
+#~ "Ağ ayarlarınızda sorun var. Lütfen ağ ayarlarınızın doğruluğunu bir daha "
+#~ "denetleyin.\n"
+
+#~ msgid ""
+#~ "Problem occured while connecting to the server, please contact the "
+#~ "support team"
+#~ msgstr "Sunucu bağlantı hatası. Lütfen sunucu destek ekibine başvurun."
+
+#~ msgid "Response from Mandriva Online server\n"
+#~ msgstr "Mandriva Online Cevabı: \n"
+
+#~ msgid "No check"
+#~ msgstr "Kontrolsüz:"
+
+#~ msgid "Checking config file: Not present\n"
+#~ msgstr "yapılandırma dosyası mevcut değil.\n"
+
+#~ msgid "Logs"
+#~ msgstr "Kayıtlar"
+
+#~ msgid "Clear"
+#~ msgstr "Temizle"
+
+#~ msgid ""
+#~ "mdonline version %s\n"
+#~ "Copyright (C) %s Mandriva.\n"
+#~ "This is free software and may be redistributed under the terms of the GNU "
+#~ "GPL.\n"
+#~ "\n"
+#~ "usage:\n"
+#~ msgstr ""
+#~ "mdonline sürüm %s\n"
+#~ "Copyright (C) %s Mandriva.\n"
+#~ "Bu bir serbest yazılımdır ve GNU GPL lisansı altında tekrar "
+#~ "dağıtılabilinir.\n"
+#~ "\n"
+#~ "kullanımı:\n"
+
+#~ msgid "  --box=\t\t\t- hostname.\n"
+#~ msgstr "  --box=\t\t\t- hostname.\n"
+
+#~ msgid "  --country\t\t\t- name of country of the user. \n"
+#~ msgstr "  --country\t\t\t- Kullanıcının ülke adı. \n"
+
+#~ msgid "  --interactive\t\t- use the interactive mode.\n"
+#~ msgstr "  --interactive\t\t- interaktif modu kullanın.\n"
+
+#~ msgid "Mandriva Online"
+#~ msgstr "Mandriva Online"
+
+#~ msgid "Mr."
+#~ msgstr "Bay"
+
+#~ msgid "Mrs."
+#~ msgstr "Bayan"
+
+#~ msgid "Ms."
+#~ msgstr "Bayan"
+
+#~ msgid "Reading configuration\n"
+#~ msgstr "Yapılandırmanız okunuyor\n"
+
+#~ msgid ""
+#~ "This assistant will help you to upload your configuration\n"
+#~ "(packages, hardware configuration) to a centralized database in\n"
+#~ "order to keep you informed about security updates and useful upgrades.\n"
+#~ msgstr ""
+#~ "Bu asistan size yapılandırmanızı yollarken yardımcı olacaktır.\n"
+#~ "(paketler, donanım bilgisi) Bu bilgilerle Mandrivata bir veri tabanı\n"
+#~ "oluşturulacak ve sisteminiz hakkında güvenlik yamaları ve "
+#~ "güncellemelerden\n"
+#~ "her an haberdar olacaksınız.\n"
+
+#~ msgid "Enter your Mandriva Online login, password and machine name:"
+#~ msgstr ""
+#~ "Mandriva Online kullanıcıadınızı , parolanızı ve makine adını giriniz:"
+
+#~ msgid "Email address:"
+#~ msgstr "E-Posta adresi:"
+
+#~ msgid "Country"
+#~ msgstr "Ülke"
+
+#~ msgid "Password:"
+#~ msgstr "Parola:"
+
+#~ msgid "Machine description:"
+#~ msgstr "Makine açıklaması:"
+
+#~ msgid "(Ex: My Home Office's Computer)"
+#~ msgstr " "
+
+#~ msgid "Machine name must be 1 to 40 alphanumerical characters"
+#~ msgstr "Makine adı 40 karektere kadar ve alfanumerik olmalıdır."
+
+#~ msgid "Connecting to Mandriva Online website..."
+#~ msgstr "Mandriva Online'na Bağlanıyor"
+
+#~ msgid ""
+#~ "In order to benefit from Mandriva Online services,\n"
+#~ "we are about to upload your configuration.\n"
+#~ "\n"
+#~ "The Wizard will now send the following information to Mandriva:\n"
+#~ "\n"
+#~ "1) the list of packages you have installed on your system,\n"
+#~ "\n"
+#~ "2) your hardware configuration.\n"
+#~ "\n"
+#~ "If you feel uncomfortable by that idea, or do not want to benefit from "
+#~ "this service,\n"
+#~ "please press 'Cancel'. By pressing 'Next', you allow us to keep you "
+#~ "informed\n"
+#~ "about security updates and useful upgrades via personalized email "
+#~ "alerts.\n"
+#~ "Furthermore, you benefit from discounted paid support services on\n"
+#~ "www.mandrivaexpert.com."
+#~ msgstr ""
+#~ "Yapacağınız seçim ile Mandriva Linux'a yardım etme şansına sahipsiniz .\n"
+#~ "\n"
+#~ "Bu sihirbaz aşağıda listelenen bilgileri Mandriva a yollayacaktır:\n"
+#~ "\n"
+#~ "1) Sistemde yüklü olan paketlerin(programların) isimleri,\n"
+#~ "\n"
+#~ "2) Bilgisayarınızın donanım listesi.\n"
+#~ "\n"
+#~ "Bu sizde hoşnutsuzluk oluşturdu ise Vazgeç e tıklayıp çıkabilirsiniz!\n"
+#~ "İleri ye tıklamanız halinde Mandriva Linux un ihtiyaçlara göre \n"
+#~ "yapılandırılmasında büyük bir yardımda bulunmuş olacaksınız.\n"
+#~ "Sistem bilginiz kesinlikle bir 3. şahısa iletilmeyecektir.\n"
+#~ "Tüm bu bilgiler Mandriva Linux Gizlilik Poliçesi ile korunacaktır."
+
+#~ msgid "Connection problem"
+#~ msgstr "Bağlantı problemi"
+
+#~ msgid "Create a Mandriva Online Account"
+#~ msgstr "Mandriva Linux Online Hesabı Oluştur"
+
+#~ msgid "Greeting:"
+#~ msgstr "KArşılama"
+
+#~ msgid "First name:"
+#~ msgstr "İlk isim:"
+
+#~ msgid "Last name:"
+#~ msgstr "Soyad:"
+
+#~ msgid "Confirm Password:"
+#~ msgstr "Parolayı Onayla:"
+
+#~ msgid ""
+#~ "The passwords do not match\n"
+#~ " Please try again\n"
+#~ msgstr ""
+#~ "Şifreler uyuşmuyor\n"
+#~ "Lütfen tekrar deneyin\n"
+
+#~ msgid "Please fill in each field"
+#~ msgstr "Lütfen tüm alanları doldurun"
+
+#~ msgid "Not a valid mail address!\n"
+#~ msgstr "Geçerli bir EPosta adresi değil\n"
+
+#~ msgid "Your upload was successful!"
+#~ msgstr "Göndermeniz tamamlanmıştır!"
+
+#~ msgid ""
+#~ "From now you will receive on security and updates \n"
+#~ "announcements thanks to Mandriva Online."
+#~ msgstr ""
+#~ "Bundan böyle Mandriva Online'dan sisteminiz\n"
+#~ "hakkında ki tüm gelişmeler ve güvenlik açıkları size bildirilecektir.\n"
+#~ "Mandriva teşekkürlerini sunar..."
+
+#~ msgid ""
+#~ "Mandriva Online offers you the ability to automate the updates.\n"
+#~ "A program will run regulary in your system waiting for new updates\n"
+#~ msgstr ""
+#~ "Mandriva Online otamatikman uygulanabilecek güncellemeleri "
+#~ "teklif edecektir.\n"
+#~ "Sistemizde belirli aralıklarla çalışacak ve\n"
+#~ "güncellemeleri takip edecek olan bir programdır\n"
+
+#~ msgid "Congratulations"
+#~ msgstr "Tebrikler"
+
+#~ msgid "Configuration uploaded successfully"
+#~ msgstr "Göndermeniz tamamlanmıştır!"
+
+#~ msgid "Problem uploading configuration"
+#~ msgstr "Yapılandırmanız okuma hatası"
diff --git a/po/uk.po b/po/uk.po
index 00815ed8..5c3706f8 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline-uk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-09 16:26+0200\n"
+"POT-Creation-Date: 2008-02-21 18:21+0100\n"
 "PO-Revision-Date: 2005-06-27 13:37+0300\n"
 "Last-Translator: Taras Boychuk <btr1@mail.ru>\n"
 "Language-Team: ukrainian <translation@linux.org.ua>\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:94
+#: ../mdkapplet:88
 #, fuzzy, c-format
 msgid "Will check updates at %s"
 msgstr "Перевірити поновлення"
 
-#: ../mdkapplet:103
+#: ../mdkapplet:97
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "Система поновлена"
 
-#: ../mdkapplet:109
+#: ../mdkapplet:103
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -42,53 +42,43 @@ msgstr ""
 "Проблема з налаштуванням служб. Будь ласка, перевірте журнал і відправте "
 "листа на support@mandrivaonline.com"
 
-#: ../mdkapplet:115
+#: ../mdkapplet:110
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "Будь ласка, зачекайте, шукаю доступні пакунки..."
 
-#: ../mdkapplet:121
+#: ../mdkapplet:116
 #, c-format
 msgid "New updates are available for your system"
 msgstr "Є нові поновлення для Вашої системи"
 
-#: ../mdkapplet:127
-#, fuzzy, c-format
-msgid "New bundles are available for your system"
-msgstr "Є нові поновлення для Вашої системи"
-
-#: ../mdkapplet:133
-#, c-format
-msgid "Service is not configured. Please click on \"Configure the service\""
-msgstr "Служба не налаштована. Натисніть на \"Налаштувати службу\""
-
-#: ../mdkapplet:139
+#: ../mdkapplet:122
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "Мережа вимкнена. Будь ласка, налаштуйте мережу"
 
-#: ../mdkapplet:145
+#: ../mdkapplet:128
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "Служба не ввімкнена. Натисніть на \"Online Website\""
 
-#: ../mdkapplet:151 ../mdkapplet:182
+#: ../mdkapplet:134 ../mdkapplet:165
 #, fuzzy, c-format
 msgid "urpmi database locked"
 msgstr "базу даних urpmi блоковано "
 
-#: ../mdkapplet:157
+#: ../mdkapplet:140
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr "Версія не підтримується (занадто стара або в розробці)"
 
-#: ../mdkapplet:163
+#: ../mdkapplet:146
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
 msgstr ""
 
-#: ../mdkapplet:169
+#: ../mdkapplet:152
 #, fuzzy, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -104,582 +94,132 @@ msgstr ""
 "\n"
 "Після цього перезапустіть %s."
 
-#: ../mdkapplet:174
+#: ../mdkapplet:157
 #, c-format
 msgid "Enabled"
 msgstr "Доступний"
 
-#: ../mdkapplet:187
+#: ../mdkapplet:170
 #, c-format
 msgid "Error updating media"
 msgstr ""
 
-#: ../mdkapplet:202
+#: ../mdkapplet:185
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr "Перевірка... Поновлення готові \n"
 
-#: ../mdkapplet:207
+#: ../mdkapplet:190
 #, c-format
 msgid "Packages are up to date"
 msgstr ""
 
-#: ../mdkapplet:212
+#: ../mdkapplet:195
 #, fuzzy, c-format
 msgid "Failed to open urpmi database"
 msgstr "неможливо відкрити rpmdb"
 
-#: ../mdkapplet:217 ../mdkapplet:324
+#: ../mdkapplet:200
 #, c-format
 msgid "Install updates"
 msgstr "Встановити поновлення"
 
-#: ../mdkapplet:218
-#, c-format
-msgid "Configure the service"
-msgstr "Налаштувати службу"
-
-#: ../mdkapplet:219
+#: ../mdkapplet:201
 #, c-format
 msgid "Check Updates"
 msgstr "Перевірити поновлення"
 
-#: ../mdkapplet:220 ../mdkapplet:327 ../mdkonline:114 ../mdkonline:155
-#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
-#, c-format
-msgid "Please wait"
-msgstr "Зачекайте, будь ласка"
-
-#: ../mdkapplet:220 ../mdkapplet:326 ../mdkapplet:327
-#, c-format
-msgid "Check updates"
-msgstr "Перевірити поновлення"
-
-#: ../mdkapplet:223 ../mdkapplet:648
-#, c-format
-msgid "Online WebSite"
-msgstr "Online WebSite"
-
-#: ../mdkapplet:224
+#: ../mdkapplet:202
 #, c-format
 msgid "Configure Network"
 msgstr "Налаштувати мережу"
 
-#: ../mdkapplet:225
-#, c-format
-msgid "Configure Now!"
-msgstr "Налаштувати вже!"
-
-#: ../mdkapplet:313 ../mdkapplet:392
-#, c-format
-msgid "Mandriva Linux Updates Applet"
-msgstr "Аплет Поновлення Мандріва Лінакса"
-
-#: ../mdkapplet:322
-#, c-format
-msgid "Actions"
-msgstr "Дії"
-
-#: ../mdkapplet:325
-#, c-format
-msgid "Configure"
-msgstr "Налаштувати"
-
-#: ../mdkapplet:329
-#, c-format
-msgid "See logs"
-msgstr "Переглянути журнал"
-
-#: ../mdkapplet:332
-#, c-format
-msgid "Status"
-msgstr "Стан"
-
-#: ../mdkapplet:336 ../mdkapplet:597
-#, c-format
-msgid "Close"
-msgstr "Закрити"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Network Connection: "
-msgstr "Під'єднання до мережі:"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Up"
-msgstr "Увімкнути"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Down"
-msgstr "Вимкнути"
-
-#: ../mdkapplet:366
-#, c-format
-msgid "Last check: "
-msgstr "Остання перевірка:"
-
-#: ../mdkapplet:367 ../mdkonline:145
-#, c-format
-msgid "Machine name:"
-msgstr "Назва машини:"
-
-#: ../mdkapplet:368
-#, c-format
-msgid "Updates: "
-msgstr "Поновлення: "
-
-#: ../mdkapplet:372
+#: ../mdkapplet:283
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Запускається drakconnect\n"
 
-#: ../mdkapplet:375
+#: ../mdkapplet:286
 #, c-format
 msgid "Mandriva Online seems to be reinstalled, reloading applet ...."
 msgstr ""
 "Здається, Mandriva Online було перевстановлено, перезавантажую аплет..."
 
-#: ../mdkapplet:383
+#: ../mdkapplet:294
 #, c-format
 msgid "Launching MandrivaUpdate\n"
 msgstr "Запускається MandrivaUpdate\n"
 
-#: ../mdkapplet:398
+#: ../mdkapplet:303
+#, c-format
+msgid "Mandriva Linux Updates Applet"
+msgstr "Аплет Поновлення Мандріва Лінакса"
+
+#: ../mdkapplet:308
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Перевіряються нові поновлення...\n"
 
-#: ../mdkapplet:399
+#: ../mdkapplet:309
 #, c-format
 msgid "Connecting to"
 msgstr "Під'єднуюсь до"
 
-#: ../mdkapplet:467 ../mdkupdate:159 ../mdkupdate:188
-#, c-format
-msgid "An error occurred"
-msgstr "Сталася помилка"
-
-#: ../mdkapplet:475
-#, c-format
-msgid "Development release not supported by service"
-msgstr "Версії в розробці не підтримуюються послугою"
-
-#: ../mdkapplet:476
-#, c-format
-msgid "Too old release not supported by service"
-msgstr "Занадто стара версія, не підтримується послугою"
-
-#: ../mdkapplet:477
-#, c-format
-msgid "Unknown state"
-msgstr "Невідомий стан"
-
-#: ../mdkapplet:478
-#, c-format
-msgid "Online services disabled. Contact Mandriva Online site\n"
-msgstr "Онлайнові послуги вимкнено. Зверніться на сайт Mandriva Online\n"
-
-#: ../mdkapplet:479
-#, c-format
-msgid "Wrong Password.\n"
-msgstr "Неправильний пароль.\n"
-
-#: ../mdkapplet:480
-#, c-format
-msgid "Wrong Action or host or login.\n"
-msgstr "Неправильна дія, машина або пароль.\n"
-
-#: ../mdkapplet:481
-#, c-format
-msgid ""
-"Something is wrong with your network settings (check your route, firewall or "
-"proxy settings)\n"
-msgstr ""
-"Щось сталося з налаштуваннями мережі (перевірте маршрутизатор, захисний шлюз "
-"або налаштування проксі)\n"
-
-#: ../mdkapplet:483
-#, c-format
-msgid ""
-"Problem occured while connecting to the server, please contact the support "
-"team"
-msgstr ""
-"Під час під'єднання до сервера виникла проблема, будь ласка, зв'яжіться з "
-"командою розробників"
-
-#: ../mdkapplet:487
-#, c-format
-msgid "Response from Mandriva Online server\n"
-msgstr "Відповідь з сервера Mandriva Online\n"
-
-#: ../mdkapplet:490
+#: ../mdkapplet:386
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Система поновлена\n"
 
-#: ../mdkapplet:527
-#, c-format
-msgid "No check"
-msgstr "Без перевірок"
-
-#: ../mdkapplet:541
-#, c-format
-msgid "Checking config file: Not present\n"
-msgstr "Перевірка конфігураційного файла: немає\n"
-
-#: ../mdkapplet:544
+#: ../mdkapplet:415
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Перевірка мережі: здається, вимкнена\n"
 
-#: ../mdkapplet:587
-#, c-format
-msgid "Logs"
-msgstr "Журнал"
-
-#: ../mdkapplet:603
+#: ../mdkapplet:457 ../mdkupdate:118 ../mdkupdate:164
 #, c-format
-msgid "Clear"
-msgstr "Очистити"
+msgid "Warning"
+msgstr "Попередження"
 
-#: ../mdkapplet:629
+#: ../mdkapplet:468
 #, c-format
 msgid "About..."
 msgstr "Про..."
 
-#: ../mdkapplet:631
+#: ../mdkapplet:472
 #, fuzzy, c-format
 msgid "Mandriva Online %s"
 msgstr "Mandriva Online"
 
-#: ../mdkapplet:635
+#: ../mdkapplet:473
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr ""
 
-#: ../mdkapplet:647
+#: ../mdkapplet:476
 #, c-format
 msgid "Mandriva Online gives access to Mandriva web services."
 msgstr ""
 
-#: ../mdkapplet:655
-#, c-format
-msgid "Always launch on startup"
-msgstr "Завжди виконувати при завантаженні"
-
-#: ../mdkapplet:657
-#, c-format
-msgid "Quit"
-msgstr "Вийти"
-
-#: ../mdkonline:58
-#, c-format
-msgid ""
-"mdonline version %s\n"
-"Copyright (C) %s Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"mdonline версія %s\n"
-"Copyright (C) %s Mandriva.\n"
-"Це відкрите програмне забезпечення і може розповсюджуватися за умов GNU "
-"GPL.\n"
-"\n"
-"використання:\n"
-
-#: ../mdkonline:63 ../mdkupdate:73
-#, c-format
-msgid "  --help\t\t- print this help message.\n"
-msgstr "  --help\t\t- вивести цю довідку.\n"
-
-#: ../mdkonline:64
-#, c-format
-msgid "  --box=\t\t\t- hostname.\n"
-msgstr ""
-
-#: ../mdkonline:65
-#, c-format
-msgid "  --country\t\t\t- name of country of the user. \n"
-msgstr ""
-
-#: ../mdkonline:66
-#, c-format
-msgid "  --interactive\t\t- use the interactive mode.\n"
-msgstr ""
-
-#: ../mdkonline:67
-#, c-format
-msgid "  --nointeractive\t- use the non-interactive mode.\n"
-msgstr ""
-
-#: ../mdkonline:68
-#, c-format
-msgid "  --login=\t\t     - login name of the user.\n"
-msgstr ""
-
-#: ../mdkonline:69
-#, c-format
-msgid "  --pass=\t\t\t- password  of the user.\n"
-msgstr ""
-
-#: ../mdkonline:87 ../mdkonline:120
-#, c-format
-msgid "Mandriva Online"
-msgstr "Mandriva Online"
-
-#: ../mdkonline:90
-#, c-format
-msgid "I already have an account"
-msgstr "Я вже маю рахунок"
-
-#: ../mdkonline:91
-#, c-format
-msgid "I want to subscribe"
-msgstr "Я хочу підписатися"
-
-#: ../mdkonline:96
-#, c-format
-msgid "Mr."
-msgstr "п."
-
-#: ../mdkonline:96
-#, c-format
-msgid "Mrs."
-msgstr "пані"
-
-#: ../mdkonline:96
-#, c-format
-msgid "Ms."
-msgstr "п."
-
-#: ../mdkonline:114
-#, c-format
-msgid "Reading configuration\n"
-msgstr "Читається конфігурація\n"
-
-#: ../mdkonline:123
-#, c-format
-msgid ""
-"This assistant will help you to upload your configuration\n"
-"(packages, hardware configuration) to a centralized database in\n"
-"order to keep you informed about security updates and useful upgrades.\n"
-msgstr ""
-"Цей Помічник допоможе переслати Вашу конфігурацію\n"
-"(пакунки, конфігурацію системи) до централізованої бази,\n"
-"щоб інформувати Вас про поновлення безпеки та інші корисні оновлення.\n"
-
-#: ../mdkonline:131
-#, c-format
-msgid "Account creation or authentication"
-msgstr "Створення рахунка або розпізнавання"
-
-#: ../mdkonline:136
-#, c-format
-msgid "Enter your Mandriva Online login, password and machine name:"
-msgstr "Введіть своє ім'я на Mandriva Online, пароль та назву машини: "
-
-#: ../mdkonline:142 ../mdkonline:195
-#, c-format
-msgid "Email address:"
-msgstr "Адреса електронної пошти:"
-
-#: ../mdkonline:143
-#, c-format
-msgid "Country"
-msgstr "Країна"
-
-#: ../mdkonline:144 ../mdkonline:196
-#, c-format
-msgid "Password:"
-msgstr "Пароль:"
-
-#: ../mdkonline:146
-#, fuzzy, c-format
-msgid "Machine description:"
-msgstr "Назва машини:"
-
-#: ../mdkonline:147
-#, c-format
-msgid "(Ex: My Home Office's Computer)"
-msgstr ""
-
-#: ../mdkonline:152 ../mdkonline:159 ../mdkonline:180 ../mdkonline:204
-#: ../mdkonline:208 ../mdkonline:212 ../mdkonline:217 ../mdkupdate:141
-#: ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
-#, c-format
-msgid "Error"
-msgstr "Помилка"
-
-#: ../mdkonline:152
-#, c-format
-msgid "Machine name must be 1 to 40 alphanumerical characters"
-msgstr "Назва машини має складатися з букв і цифр від 1 до 40 символів"
-
-#: ../mdkonline:155
-#, c-format
-msgid "Connecting to Mandriva Online website..."
-msgstr "Під'єднання до сайта Mandriva Online..."
-
-#: ../mdkonline:167
-#, c-format
-msgid ""
-"In order to benefit from Mandriva Online services,\n"
-"we are about to upload your configuration.\n"
-"\n"
-"The Wizard will now send the following information to Mandriva:\n"
-"\n"
-"1) the list of packages you have installed on your system,\n"
-"\n"
-"2) your hardware configuration.\n"
-"\n"
-"If you feel uncomfortable by that idea, or do not want to benefit from this "
-"service,\n"
-"please press 'Cancel'. By pressing 'Next', you allow us to keep you "
-"informed\n"
-"about security updates and useful upgrades via personalized email alerts.\n"
-"Furthermore, you benefit from discounted paid support services on\n"
-"www.mandrivaexpert.com."
-msgstr ""
-"Для того, щоб можна було використовувати послуги Mandriva Online,\n"
-"ми відішлемо Вашу конфігурацію.\n"
-"\n"
-"Помічник зараз відправить наступну інформацію до Mandriva:\n"
-"\n"
-"1) список пакунків, встановлених на Вашу систему,\n"
-"\n"
-"2) конфігурацію обладнання.\n"
-"\n"
-"Якщо Вам не подобається ця ідея, або не хочете користуватися цією\n"
-"послугою,\n"
-" натисніть 'Скасувати'. Натиснувши на 'Далі', Ви дозволите нам інформувати "
-"Вас\n"
-" про поновлення безпеки і корисні оновлення через персональні попередження "
-"електронною поштою."
-
-#: ../mdkonline:180
-#, c-format
-msgid "Connection problem"
-msgstr "Проблеми зі з'єднанням"
-
-#: ../mdkonline:180
-#, c-format
-msgid "Problem occurs when uploading files, please try again"
-msgstr "При звантаженні файлів виникла проблема, спробуйте ще раз"
-
-#: ../mdkonline:187
-#, c-format
-msgid "Create a Mandriva Online Account"
-msgstr "Створити рахунок на Mandriva Online"
-
-#. -PO: that is for things like "Mr", "Ms",...
-#: ../mdkonline:192
-#, c-format
-msgid "Greeting:"
-msgstr "Привітання:"
-
-#: ../mdkonline:193
-#, c-format
-msgid "First name:"
-msgstr "Ім'я:"
-
-#: ../mdkonline:194
-#, c-format
-msgid "Last name:"
-msgstr "Прізвище:"
-
-#: ../mdkonline:197
-#, c-format
-msgid "Confirm Password:"
-msgstr "Підтвердіть пароль:"
-
-#: ../mdkonline:204
-#, c-format
-msgid ""
-"The passwords do not match\n"
-" Please try again\n"
-msgstr ""
-"Паролі не співпадають\n"
-"Спробуйте ще раз\n"
-
-#: ../mdkonline:208
-#, c-format
-msgid "Please fill in each field"
-msgstr "Будь ласка, заповніть усі поля"
-
-#: ../mdkonline:212
-#, c-format
-msgid "Not a valid mail address!\n"
-msgstr "Неправильна електронна адреса!\n"
-
-#: ../mdkonline:217
-#, c-format
-msgid "Creating account failed!"
-msgstr ""
-
-#: ../mdkonline:225
-#, c-format
-msgid ""
-"Mandriva Online Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
-msgstr ""
-"Рахунок Mandriva Online успішно створено.\n"
-"Будь ласка, натисніть \"Далі\", щоб виявити і встановити Ваші налаштування\n"
-
-#: ../mdkonline:229
-#, c-format
-msgid "Your upload was successful!"
-msgstr "Звантаження конфігурації пройшло успішно!"
-
-#: ../mdkonline:229
+#: ../mdkapplet:478
 #, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandriva Online."
-msgstr ""
-"Відтепер завдяки Mandriva Online Ви отримуватимете оновлення безпеки та\n"
-"оголошення про поновлення."
+msgid "Online WebSite"
+msgstr "Online WebSite"
 
-#: ../mdkonline:229
+#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
+#: ../mdkapplet:483
 #, c-format
-msgid ""
-"Mandriva Online offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
+msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
-"Mandriva Online пропонує Вам можливість автоматизувати поновлення.\n"
-"Програма регулярно виконуватиметься і очікуватиме нових поновлень\n"
-
-#: ../mdkonline:238
-#, c-format
-msgid "Congratulations"
-msgstr "Поздоровляємо"
 
-#: ../mdkonline:238
+#: ../mdkapplet:492
 #, c-format
-msgid "Your Mandriva Online account has been successfully configured\n"
-msgstr "Ваш рахунок на Mandriva Online було успішно налаштовано\n"
-
-#: ../mdkonline:253
-#, c-format
-msgid "Configuration uploaded successfully"
-msgstr "Налаштування успішно звантажено"
-
-#: ../mdkonline:254
-#, c-format
-msgid "Problem uploading configuration"
-msgstr "Проблеми із звантаженням конфігурації"
+msgid "Always launch on startup"
+msgstr "Завжди виконувати при завантаженні"
 
-#: ../mdkonline:256
+#: ../mdkapplet:494
 #, c-format
-msgid ""
-"Cannot connect to Mandriva Online website: wrong login/password or router/"
-"firewall bad settings"
-msgstr ""
-"Неможливо під'єднатися до сайту mandrivaonline: неправильне ім'я/пароль або "
-"неправильні налаштування маршрутизатора/захисного шлюза"
+msgid "Quit"
+msgstr "Вийти"
 
 #: ../mdkonline.pm:207
 #, c-format
@@ -827,6 +367,11 @@ msgstr ""
 "\n"
 "використання:\n"
 
+#: ../mdkupdate:73
+#, c-format
+msgid "  --help\t\t- print this help message.\n"
+msgstr "  --help\t\t- вивести цю довідку.\n"
+
 #: ../mdkupdate:74
 #, c-format
 msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
@@ -854,11 +399,6 @@ msgid ""
 "file.\n"
 msgstr ""
 
-#: ../mdkupdate:118 ../mdkupdate:164
-#, c-format
-msgid "Warning"
-msgstr "Попередження"
-
 #. -PO: here Live Install is currently *NOT* translated on the desktop, so it's better to keep as it:
 #: ../mdkupdate:120
 #, c-format
@@ -867,11 +407,21 @@ msgid ""
 "Install' wizard."
 msgstr ""
 
+#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
+#, c-format
+msgid "Please wait"
+msgstr "Зачекайте, будь ласка"
+
 #: ../mdkupdate:123 ../mdkupdate:174
 #, c-format
 msgid "Preparing..."
 msgstr "Підготовка..."
 
+#: ../mdkupdate:141 ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
+#, c-format
+msgid "Error"
+msgstr "Помилка"
+
 #: ../mdkupdate:141
 #, c-format
 msgid ""
@@ -880,6 +430,11 @@ msgid ""
 "%s"
 msgstr ""
 
+#: ../mdkupdate:159 ../mdkupdate:188
+#, c-format
+msgid "An error occurred"
+msgstr "Сталася помилка"
+
 #: ../mdkupdate:164
 #, c-format
 msgid ""
@@ -904,6 +459,285 @@ msgstr "Встановлюються пакунки...\n"
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "Неможливо поновити пакунки з джерела update_source.\n"
 
+#, fuzzy
+#~ msgid "New bundles are available for your system"
+#~ msgstr "Є нові поновлення для Вашої системи"
+
+#~ msgid "Service is not configured. Please click on \"Configure the service\""
+#~ msgstr "Служба не налаштована. Натисніть на \"Налаштувати службу\""
+
+#~ msgid "Configure the service"
+#~ msgstr "Налаштувати службу"
+
+#~ msgid "Check updates"
+#~ msgstr "Перевірити поновлення"
+
+#~ msgid "Configure Now!"
+#~ msgstr "Налаштувати вже!"
+
+#~ msgid "Actions"
+#~ msgstr "Дії"
+
+#~ msgid "Configure"
+#~ msgstr "Налаштувати"
+
+#~ msgid "See logs"
+#~ msgstr "Переглянути журнал"
+
+#~ msgid "Status"
+#~ msgstr "Стан"
+
+#~ msgid "Close"
+#~ msgstr "Закрити"
+
+#~ msgid "Network Connection: "
+#~ msgstr "Під'єднання до мережі:"
+
+#~ msgid "Up"
+#~ msgstr "Увімкнути"
+
+#~ msgid "Down"
+#~ msgstr "Вимкнути"
+
+#~ msgid "Last check: "
+#~ msgstr "Остання перевірка:"
+
+#~ msgid "Machine name:"
+#~ msgstr "Назва машини:"
+
+#~ msgid "Updates: "
+#~ msgstr "Поновлення: "
+
+#~ msgid "Development release not supported by service"
+#~ msgstr "Версії в розробці не підтримуюються послугою"
+
+#~ msgid "Too old release not supported by service"
+#~ msgstr "Занадто стара версія, не підтримується послугою"
+
+#~ msgid "Unknown state"
+#~ msgstr "Невідомий стан"
+
+#~ msgid "Online services disabled. Contact Mandriva Online site\n"
+#~ msgstr "Онлайнові послуги вимкнено. Зверніться на сайт Mandriva Online\n"
+
+#~ msgid "Wrong Password.\n"
+#~ msgstr "Неправильний пароль.\n"
+
+#~ msgid "Wrong Action or host or login.\n"
+#~ msgstr "Неправильна дія, машина або пароль.\n"
+
+#~ msgid ""
+#~ "Something is wrong with your network settings (check your route, firewall "
+#~ "or proxy settings)\n"
+#~ msgstr ""
+#~ "Щось сталося з налаштуваннями мережі (перевірте маршрутизатор, захисний "
+#~ "шлюз або налаштування проксі)\n"
+
+#~ msgid ""
+#~ "Problem occured while connecting to the server, please contact the "
+#~ "support team"
+#~ msgstr ""
+#~ "Під час під'єднання до сервера виникла проблема, будь ласка, зв'яжіться з "
+#~ "командою розробників"
+
+#~ msgid "Response from Mandriva Online server\n"
+#~ msgstr "Відповідь з сервера Mandriva Online\n"
+
+#~ msgid "No check"
+#~ msgstr "Без перевірок"
+
+#~ msgid "Checking config file: Not present\n"
+#~ msgstr "Перевірка конфігураційного файла: немає\n"
+
+#~ msgid "Logs"
+#~ msgstr "Журнал"
+
+#~ msgid "Clear"
+#~ msgstr "Очистити"
+
+#~ msgid ""
+#~ "mdonline version %s\n"
+#~ "Copyright (C) %s Mandriva.\n"
+#~ "This is free software and may be redistributed under the terms of the GNU "
+#~ "GPL.\n"
+#~ "\n"
+#~ "usage:\n"
+#~ msgstr ""
+#~ "mdonline версія %s\n"
+#~ "Copyright (C) %s Mandriva.\n"
+#~ "Це відкрите програмне забезпечення і може розповсюджуватися за умов GNU "
+#~ "GPL.\n"
+#~ "\n"
+#~ "використання:\n"
+
+#~ msgid "Mandriva Online"
+#~ msgstr "Mandriva Online"
+
+#~ msgid "I already have an account"
+#~ msgstr "Я вже маю рахунок"
+
+#~ msgid "I want to subscribe"
+#~ msgstr "Я хочу підписатися"
+
+#~ msgid "Mr."
+#~ msgstr "п."
+
+#~ msgid "Mrs."
+#~ msgstr "пані"
+
+#~ msgid "Ms."
+#~ msgstr "п."
+
+#~ msgid "Reading configuration\n"
+#~ msgstr "Читається конфігурація\n"
+
+#~ msgid ""
+#~ "This assistant will help you to upload your configuration\n"
+#~ "(packages, hardware configuration) to a centralized database in\n"
+#~ "order to keep you informed about security updates and useful upgrades.\n"
+#~ msgstr ""
+#~ "Цей Помічник допоможе переслати Вашу конфігурацію\n"
+#~ "(пакунки, конфігурацію системи) до централізованої бази,\n"
+#~ "щоб інформувати Вас про поновлення безпеки та інші корисні оновлення.\n"
+
+#~ msgid "Account creation or authentication"
+#~ msgstr "Створення рахунка або розпізнавання"
+
+#~ msgid "Enter your Mandriva Online login, password and machine name:"
+#~ msgstr "Введіть своє ім'я на Mandriva Online, пароль та назву машини: "
+
+#~ msgid "Email address:"
+#~ msgstr "Адреса електронної пошти:"
+
+#~ msgid "Country"
+#~ msgstr "Країна"
+
+#~ msgid "Password:"
+#~ msgstr "Пароль:"
+
+#, fuzzy
+#~ msgid "Machine description:"
+#~ msgstr "Назва машини:"
+
+#~ msgid "Machine name must be 1 to 40 alphanumerical characters"
+#~ msgstr "Назва машини має складатися з букв і цифр від 1 до 40 символів"
+
+#~ msgid "Connecting to Mandriva Online website..."
+#~ msgstr "Під'єднання до сайта Mandriva Online..."
+
+#~ msgid ""
+#~ "In order to benefit from Mandriva Online services,\n"
+#~ "we are about to upload your configuration.\n"
+#~ "\n"
+#~ "The Wizard will now send the following information to Mandriva:\n"
+#~ "\n"
+#~ "1) the list of packages you have installed on your system,\n"
+#~ "\n"
+#~ "2) your hardware configuration.\n"
+#~ "\n"
+#~ "If you feel uncomfortable by that idea, or do not want to benefit from "
+#~ "this service,\n"
+#~ "please press 'Cancel'. By pressing 'Next', you allow us to keep you "
+#~ "informed\n"
+#~ "about security updates and useful upgrades via personalized email "
+#~ "alerts.\n"
+#~ "Furthermore, you benefit from discounted paid support services on\n"
+#~ "www.mandrivaexpert.com."
+#~ msgstr ""
+#~ "Для того, щоб можна було використовувати послуги Mandriva Online,\n"
+#~ "ми відішлемо Вашу конфігурацію.\n"
+#~ "\n"
+#~ "Помічник зараз відправить наступну інформацію до Mandriva:\n"
+#~ "\n"
+#~ "1) список пакунків, встановлених на Вашу систему,\n"
+#~ "\n"
+#~ "2) конфігурацію обладнання.\n"
+#~ "\n"
+#~ "Якщо Вам не подобається ця ідея, або не хочете користуватися цією\n"
+#~ "послугою,\n"
+#~ " натисніть 'Скасувати'. Натиснувши на 'Далі', Ви дозволите нам "
+#~ "інформувати Вас\n"
+#~ " про поновлення безпеки і корисні оновлення через персональні "
+#~ "попередження електронною поштою."
+
+#~ msgid "Connection problem"
+#~ msgstr "Проблеми зі з'єднанням"
+
+#~ msgid "Problem occurs when uploading files, please try again"
+#~ msgstr "При звантаженні файлів виникла проблема, спробуйте ще раз"
+
+#~ msgid "Create a Mandriva Online Account"
+#~ msgstr "Створити рахунок на Mandriva Online"
+
+#~ msgid "Greeting:"
+#~ msgstr "Привітання:"
+
+#~ msgid "First name:"
+#~ msgstr "Ім'я:"
+
+#~ msgid "Last name:"
+#~ msgstr "Прізвище:"
+
+#~ msgid "Confirm Password:"
+#~ msgstr "Підтвердіть пароль:"
+
+#~ msgid ""
+#~ "The passwords do not match\n"
+#~ " Please try again\n"
+#~ msgstr ""
+#~ "Паролі не співпадають\n"
+#~ "Спробуйте ще раз\n"
+
+#~ msgid "Please fill in each field"
+#~ msgstr "Будь ласка, заповніть усі поля"
+
+#~ msgid "Not a valid mail address!\n"
+#~ msgstr "Неправильна електронна адреса!\n"
+
+#~ msgid ""
+#~ "Mandriva Online Account successfully created.\n"
+#~ "Please click \"Next\" to authenticate and upload your configuration\n"
+#~ msgstr ""
+#~ "Рахунок Mandriva Online успішно створено.\n"
+#~ "Будь ласка, натисніть \"Далі\", щоб виявити і встановити Ваші "
+#~ "налаштування\n"
+
+#~ msgid "Your upload was successful!"
+#~ msgstr "Звантаження конфігурації пройшло успішно!"
+
+#~ msgid ""
+#~ "From now you will receive on security and updates \n"
+#~ "announcements thanks to Mandriva Online."
+#~ msgstr ""
+#~ "Відтепер завдяки Mandriva Online Ви отримуватимете оновлення безпеки та\n"
+#~ "оголошення про поновлення."
+
+#~ msgid ""
+#~ "Mandriva Online offers you the ability to automate the updates.\n"
+#~ "A program will run regulary in your system waiting for new updates\n"
+#~ msgstr ""
+#~ "Mandriva Online пропонує Вам можливість автоматизувати поновлення.\n"
+#~ "Програма регулярно виконуватиметься і очікуватиме нових поновлень\n"
+
+#~ msgid "Congratulations"
+#~ msgstr "Поздоровляємо"
+
+#~ msgid "Your Mandriva Online account has been successfully configured\n"
+#~ msgstr "Ваш рахунок на Mandriva Online було успішно налаштовано\n"
+
+#~ msgid "Configuration uploaded successfully"
+#~ msgstr "Налаштування успішно звантажено"
+
+#~ msgid "Problem uploading configuration"
+#~ msgstr "Проблеми із звантаженням конфігурації"
+
+#~ msgid ""
+#~ "Cannot connect to Mandriva Online website: wrong login/password or router/"
+#~ "firewall bad settings"
+#~ msgstr ""
+#~ "Неможливо під'єднатися до сайту mandrivaonline: неправильне ім'я/пароль "
+#~ "або неправильні налаштування маршрутизатора/захисного шлюза"
+
 #~ msgid "  --applet\t\t- launch Mandriva Update.\n"
 #~ msgstr "  --applet\t\t- виконати Mandriva Update.\n"
 
diff --git a/po/ur.po b/po/ur.po
index d4c26cb8..f5665da2 100644
--- a/po/ur.po
+++ b/po/ur.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline\n"
-"POT-Creation-Date: 2007-08-09 16:26+0200\n"
+"POT-Creation-Date: 2008-02-21 18:21+0100\n"
 "PO-Revision-Date: 2005-02-22 06:57-0500\n"
 "Last-Translator: khushbakht  <khushbakht@gmail.com>\n"
 "Language-Team: URDU <C@li.org>\n"
@@ -15,17 +15,17 @@ msgstr ""
 "X-Generator: KBabel 1.0.1\n"
 
 #. -PO: here %s will be replaced by the local time (eg: "Will check updates at 14:03:50"
-#: ../mdkapplet:94
+#: ../mdkapplet:88
 #, fuzzy, c-format
 msgid "Will check updates at %s"
 msgstr "تازه تریں معلومات كو دیكھیں"
 
-#: ../mdkapplet:103
+#: ../mdkapplet:97
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "آپ كا سسٹم جدید هے"
 
-#: ../mdkapplet:109
+#: ../mdkapplet:103
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -34,54 +34,43 @@ msgstr ""
 "خدمات كی ترتیب میں مسله۔ مهربانی فرما كر یاداشتوں میں دیكھیں اور "
 "support@mandrivaonline.com كو میل بھیجیں"
 
-#: ../mdkapplet:115
+#: ../mdkapplet:110
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr ""
 
-#: ../mdkapplet:121
+#: ../mdkapplet:116
 #, c-format
 msgid "New updates are available for your system"
 msgstr "آپ كے سسٹم كیلیے تازه تریں معلومات موجود هیں"
 
-#: ../mdkapplet:127
-#, fuzzy, c-format
-msgid "New bundles are available for your system"
-msgstr "آپ كے سسٹم كیلیے تازه تریں معلومات موجود هیں"
-
-#: ../mdkapplet:133
-#, c-format
-msgid "Service is not configured. Please click on \"Configure the service\""
-msgstr ""
-"خدمت ترتیب میں نهیں هے۔ مهربانی فرما كر \"Configure the service\" پر كلك كریں"
-
-#: ../mdkapplet:139
+#: ../mdkapplet:122
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "نیٹورك بند ھے۔ مهربانی فرما كر اپنا نیٹورك ترتیب دیں"
 
-#: ../mdkapplet:145
+#: ../mdkapplet:128
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "خدمت چالو نهیں هے۔ مهربانی فرما كر \"Online Website\" پر كلك كریں"
 
-#: ../mdkapplet:151 ../mdkapplet:182
+#: ../mdkapplet:134 ../mdkapplet:165
 #, c-format
 msgid "urpmi database locked"
 msgstr ""
 
-#: ../mdkapplet:157
+#: ../mdkapplet:140
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr "نشریه مواقف نهیں هے (بهت پرانا نشریه هے یا ترقی كا نشریه)"
 
-#: ../mdkapplet:163
+#: ../mdkapplet:146
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
 msgstr ""
 
-#: ../mdkapplet:169
+#: ../mdkapplet:152
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -92,579 +81,131 @@ msgid ""
 "Then, restart \"%s\"."
 msgstr ""
 
-#: ../mdkapplet:174
+#: ../mdkapplet:157
 #, c-format
 msgid "Enabled"
 msgstr ""
 
-#: ../mdkapplet:187
+#: ../mdkapplet:170
 #, c-format
 msgid "Error updating media"
 msgstr ""
 
-#: ../mdkapplet:202
+#: ../mdkapplet:185
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr "تصدیق كرها هے ۔۔۔جدید معلومات دستیاب هیں\n"
 
-#: ../mdkapplet:207
+#: ../mdkapplet:190
 #, c-format
 msgid "Packages are up to date"
 msgstr ""
 
-#: ../mdkapplet:212
+#: ../mdkapplet:195
 #, c-format
 msgid "Failed to open urpmi database"
 msgstr ""
 
-#: ../mdkapplet:217 ../mdkapplet:324
+#: ../mdkapplet:200
 #, c-format
 msgid "Install updates"
 msgstr "جدید معلومات نصب كریں "
 
-#: ../mdkapplet:218
-#, c-format
-msgid "Configure the service"
-msgstr "خدمت ترتیب دیں"
-
-#: ../mdkapplet:219
+#: ../mdkapplet:201
 #, c-format
 msgid "Check Updates"
 msgstr "جدید معلومات كو دیكھیں"
 
-#: ../mdkapplet:220 ../mdkapplet:327 ../mdkonline:114 ../mdkonline:155
-#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
-#, c-format
-msgid "Please wait"
-msgstr "انتظار فرماءیے"
-
-#: ../mdkapplet:220 ../mdkapplet:326 ../mdkapplet:327
-#, c-format
-msgid "Check updates"
-msgstr "تازه تریں معلومات كو دیكھیں"
-
-#: ../mdkapplet:223 ../mdkapplet:648
-#, c-format
-msgid "Online WebSite"
-msgstr "آنلاءین ویبساءیٹ"
-
-#: ../mdkapplet:224
+#: ../mdkapplet:202
 #, c-format
 msgid "Configure Network"
 msgstr "نیٹورك ترتیب دیں"
 
-#: ../mdkapplet:225
-#, c-format
-msgid "Configure Now!"
-msgstr "ابھی ترتیب دیں!"
-
-#: ../mdkapplet:313 ../mdkapplet:392
-#, c-format
-msgid "Mandriva Linux Updates Applet"
-msgstr "جدید تریں مینڈریك لاءینك ایپلٹ"
-
-#: ../mdkapplet:322
-#, c-format
-msgid "Actions"
-msgstr "عمل"
-
-#: ../mdkapplet:325
-#, c-format
-msgid "Configure"
-msgstr "اجزا یا عناصر كو كسی خاص صورت میں ترتیب دیں"
-
-#: ../mdkapplet:329
-#, c-format
-msgid "See logs"
-msgstr "یاداشتیں دیكھیں"
-
-#: ../mdkapplet:332
-#, c-format
-msgid "Status"
-msgstr "درجه"
-
-#: ../mdkapplet:336 ../mdkapplet:597
-#, c-format
-msgid "Close"
-msgstr "بند كریں"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Network Connection: "
-msgstr "نیٹورك كا رابطه: "
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Up"
-msgstr "اوپر"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Down"
-msgstr "نیچے"
-
-#: ../mdkapplet:366
-#, c-format
-msgid "Last check: "
-msgstr "آخری چیك: "
-
-#: ../mdkapplet:367 ../mdkonline:145
-#, c-format
-msgid "Machine name:"
-msgstr "مشین كا نام:"
-
-#: ../mdkapplet:368
-#, c-format
-msgid "Updates: "
-msgstr "جدید معلومات: "
-
-#: ../mdkapplet:372
+#: ../mdkapplet:283
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "ڈارك كے رابطے كا آغاز\n"
 
-#: ../mdkapplet:375
+#: ../mdkapplet:286
 #, c-format
 msgid "Mandriva Online seems to be reinstalled, reloading applet ...."
 msgstr "مینڈریك اونلاءین كو دوباره نصب كرنا پڑے گا، دوباره بھرنا ایپلٹ ۔۔۔۔"
 
-#: ../mdkapplet:383
+#: ../mdkapplet:294
 #, fuzzy, c-format
 msgid "Launching MandrivaUpdate\n"
 msgstr "جدید تریں ایمڈی كے كا آغاز MandrivaUpdate\n"
 
-#: ../mdkapplet:398
+#: ../mdkapplet:303
+#, c-format
+msgid "Mandriva Linux Updates Applet"
+msgstr "جدید تریں مینڈریك لاءینك ایپلٹ"
+
+#: ../mdkapplet:308
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "جدید معلومات كا شمار كرنا\n"
 
-#: ../mdkapplet:399
+#: ../mdkapplet:309
 #, c-format
 msgid "Connecting to"
 msgstr "سے رابطه كر رها هے"
 
-#: ../mdkapplet:467 ../mdkupdate:159 ../mdkupdate:188
-#, c-format
-msgid "An error occurred"
-msgstr ""
-
-#: ../mdkapplet:475
-#, c-format
-msgid "Development release not supported by service"
-msgstr "مكمل نشریه كو خدمت كی همایت حاصل نهی هے"
-
-#: ../mdkapplet:476
-#, c-format
-msgid "Too old release not supported by service"
-msgstr "بهت پرانا نشریه هے خدمت كی همایت حاصل نهی هے"
-
-#: ../mdkapplet:477
-#, c-format
-msgid "Unknown state"
-msgstr "نامعلام درجه"
-
-#: ../mdkapplet:478
-#, c-format
-msgid "Online services disabled. Contact Mandriva Online site\n"
-msgstr "اونلاءین خدمات معزور هیں۔مینڈریك اونلاءین ساءیٹ سے رابطه كریں\n"
-
-#: ../mdkapplet:479
-#, c-format
-msgid "Wrong Password.\n"
-msgstr "غلط خوفیه لفظ\n"
-
-#: ../mdkapplet:480
-#, c-format
-msgid "Wrong Action or host or login.\n"
-msgstr "غلط حركت یا میزبان یا لوگ ان1\n"
-
-#: ../mdkapplet:481
-#, c-format
-msgid ""
-"Something is wrong with your network settings (check your route, firewall or "
-"proxy settings)\n"
-msgstr ""
-"آپ كی نیٹورك سیٹینگ كے ساتھ كچھ مسله هے (اپنے راوءٹ،فاءروال یا پراكسی سیٹینگ "
-"كی تصدیق كریں)\n"
-
-#: ../mdkapplet:483
-#, c-format
-msgid ""
-"Problem occured while connecting to the server, please contact the support "
-"team"
-msgstr ""
-
-#: ../mdkapplet:487
-#, c-format
-msgid "Response from Mandriva Online server\n"
-msgstr "مینڈریك اونلاءین سرور سے جواب\n"
-
-#: ../mdkapplet:490
+#: ../mdkapplet:386
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "سسٹم جدید هے\n"
 
-#: ../mdkapplet:527
-#, c-format
-msgid "No check"
-msgstr "كوءی تصدیق نهی"
-
-#: ../mdkapplet:541
-#, c-format
-msgid "Checking config file: Not present\n"
-msgstr "كونفیگ فاءل كی تلاش:موجود نهی\n"
-
-#: ../mdkapplet:544
+#: ../mdkapplet:415
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "نیٹورك كی تصدیق كرها هے: معزور دیكھاءی دیتا هے\n"
 
-#: ../mdkapplet:587
-#, c-format
-msgid "Logs"
-msgstr "یاداشتیں"
-
-#: ../mdkapplet:603
+#: ../mdkapplet:457 ../mdkupdate:118 ../mdkupdate:164
 #, c-format
-msgid "Clear"
-msgstr "صاف كریں"
+msgid "Warning"
+msgstr "انتباه"
 
-#: ../mdkapplet:629
+#: ../mdkapplet:468
 #, c-format
 msgid "About..."
 msgstr "بارے میں۔۔۔"
 
-#: ../mdkapplet:631
+#: ../mdkapplet:472
 #, fuzzy, c-format
 msgid "Mandriva Online %s"
 msgstr "مینڈریكآنلاءین"
 
-#: ../mdkapplet:635
+#: ../mdkapplet:473
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr ""
 
-#: ../mdkapplet:647
+#: ../mdkapplet:476
 #, c-format
 msgid "Mandriva Online gives access to Mandriva web services."
 msgstr ""
 
-#: ../mdkapplet:655
-#, c-format
-msgid "Always launch on startup"
-msgstr "همیشه سٹاٹ اپ پر آغازكار كریں"
-
-#: ../mdkapplet:657
-#, c-format
-msgid "Quit"
-msgstr "ختم كریں یا چھوڑ دیں"
-
-#: ../mdkonline:58
-#, c-format
-msgid ""
-"mdonline version %s\n"
-"Copyright (C) %s Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"mdonline %s\n"
-"Copyright (C) %s Mandriva.\n"
-"یه ایك مفت سافٹ ویعر هے اور شاید دوباره سے GNU GPL كی شراءت پر تقسیم كیا "
-"جاےء۔ \n"
-" \n"
-"استعمال كار:\n"
-
-#: ../mdkonline:63 ../mdkupdate:73
-#, fuzzy, c-format
-msgid "  --help\t\t- print this help message.\n"
-msgstr "  --help         - print this help message.\n"
-
-#: ../mdkonline:64
-#, c-format
-msgid "  --box=\t\t\t- hostname.\n"
-msgstr ""
-
-#: ../mdkonline:65
-#, c-format
-msgid "  --country\t\t\t- name of country of the user. \n"
-msgstr ""
-
-#: ../mdkonline:66
-#, c-format
-msgid "  --interactive\t\t- use the interactive mode.\n"
-msgstr ""
-
-#: ../mdkonline:67
-#, c-format
-msgid "  --nointeractive\t- use the non-interactive mode.\n"
-msgstr ""
-
-#: ../mdkonline:68
-#, c-format
-msgid "  --login=\t\t     - login name of the user.\n"
-msgstr ""
-
-#: ../mdkonline:69
-#, c-format
-msgid "  --pass=\t\t\t- password  of the user.\n"
-msgstr ""
-
-#: ../mdkonline:87 ../mdkonline:120
-#, c-format
-msgid "Mandriva Online"
-msgstr "مینڈریكآنلاءین"
-
-#: ../mdkonline:90
-#, c-format
-msgid "I already have an account"
-msgstr "میرا پهلے سے ایك كھاتا موجود هے"
-
-#: ../mdkonline:91
-#, c-format
-msgid "I want to subscribe"
-msgstr "میں دستخط كركے هم خیال بننا چاهتا هوں"
-
-#: ../mdkonline:96
-#, c-format
-msgid "Mr."
-msgstr ""
-
-#: ../mdkonline:96
-#, c-format
-msgid "Mrs."
-msgstr ""
-
-#: ../mdkonline:96
-#, c-format
-msgid "Ms."
-msgstr ""
-
-#: ../mdkonline:114
-#, c-format
-msgid "Reading configuration\n"
-msgstr "اجزا یا اناصر كی ترتیب كو پڑھنا\n"
-
-#: ../mdkonline:123
-#, c-format
-msgid ""
-"This assistant will help you to upload your configuration\n"
-"(packages, hardware configuration) to a centralized database in\n"
-"order to keep you informed about security updates and useful upgrades.\n"
-msgstr ""
-"یه ماتحت عناصر كی ترتیب كو نقل بالا كرنے میں آپ كی مدد كرے گا\n"
-"(باندھی هویء اشیاء یا كمپیوٹر كے برقی اجزا)كو مركزی معلومات میں\n"
-"آپ كو تاذه ترین حفاظتی اقدامات اور مددگار عهدےمیں ترقی سے آگاه ركھنے كے لےء\n"
-
-#: ../mdkonline:131
-#, c-format
-msgid "Account creation or authentication"
-msgstr "كھاتا بنانا یا توثیق دینا"
-
-#: ../mdkonline:136
-#, c-format
-msgid "Enter your Mandriva Online login, password and machine name:"
-msgstr "اپنا مینڈریك آنلاءین كا لوگ ان، خفیه لفظ اور مشین كا نام داخل كریں:"
-
-#: ../mdkonline:142 ../mdkonline:195
-#, fuzzy, c-format
-msgid "Email address:"
-msgstr "میل كا پته معقول نهی!\n"
-
-#: ../mdkonline:143
-#, c-format
-msgid "Country"
-msgstr "ملك"
-
-#: ../mdkonline:144 ../mdkonline:196
-#, c-format
-msgid "Password:"
-msgstr "خفیه لفظ:"
-
-#: ../mdkonline:146
-#, fuzzy, c-format
-msgid "Machine description:"
-msgstr "مشین كا نام:"
-
-#: ../mdkonline:147
-#, c-format
-msgid "(Ex: My Home Office's Computer)"
-msgstr ""
-
-#: ../mdkonline:152 ../mdkonline:159 ../mdkonline:180 ../mdkonline:204
-#: ../mdkonline:208 ../mdkonline:212 ../mdkonline:217 ../mdkupdate:141
-#: ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
-#, c-format
-msgid "Error"
-msgstr "غلطی"
-
-#: ../mdkonline:152
-#, c-format
-msgid "Machine name must be 1 to 40 alphanumerical characters"
-msgstr ""
-
-#: ../mdkonline:155
-#, c-format
-msgid "Connecting to Mandriva Online website..."
-msgstr "مینڈریكآنلاءین ویبساءیٹ سے رابطه هو رها هے۔۔۔"
-
-#: ../mdkonline:167
-#, c-format
-msgid ""
-"In order to benefit from Mandriva Online services,\n"
-"we are about to upload your configuration.\n"
-"\n"
-"The Wizard will now send the following information to Mandriva:\n"
-"\n"
-"1) the list of packages you have installed on your system,\n"
-"\n"
-"2) your hardware configuration.\n"
-"\n"
-"If you feel uncomfortable by that idea, or do not want to benefit from this "
-"service,\n"
-"please press 'Cancel'. By pressing 'Next', you allow us to keep you "
-"informed\n"
-"about security updates and useful upgrades via personalized email alerts.\n"
-"Furthermore, you benefit from discounted paid support services on\n"
-"www.mandrivaexpert.com."
-msgstr ""
-"مینڈریك آنلاءین كی خدمات سے فاءںده اٹھانے كے لےء،\n"
-"هم آپ كے اجزا كی ترتیب كو نقل بالا كرنے والے هیں۔\n"
-"\n"
-"ویزرڈ اب مندرجه ذیل معلومات كو مینڈریكسوفٹ كو بیھجے گا:\n"
-"\n"
-"1) باندھی هویء سشیاء كی فهرست جو آپ نے اپنے سسٹم پرنصب كی هیں،\n"
-"\n"
-"2) آپ كے كمپیوٹر كے مشینی اور برقی اجزا۔\n"
-"\n"
-"اگر آپ كو یه تجویز غیرآرامده هے،یا اس خدمت سے مستفیدنهی هونا چاهتے،"
-
-#: ../mdkonline:180
-#, c-format
-msgid "Connection problem"
-msgstr "رابطه میں مسله"
-
-#: ../mdkonline:180
-#, c-format
-msgid "Problem occurs when uploading files, please try again"
-msgstr ""
-"فاءل كو بڑے ذخیزه نظام میں منتقل كرنے میں مسله آرها هے،مهربانی فرماكر دوباره "
-"كوشش كریں"
-
-#: ../mdkonline:187
-#, c-format
-msgid "Create a Mandriva Online Account"
-msgstr "ایك مینڈریك آنلاءین كھاتا بناءیں"
-
-#. -PO: that is for things like "Mr", "Ms",...
-#: ../mdkonline:192
-#, c-format
-msgid "Greeting:"
-msgstr ""
-
-#: ../mdkonline:193
-#, c-format
-msgid "First name:"
-msgstr ""
-
-#: ../mdkonline:194
-#, fuzzy, c-format
-msgid "Last name:"
-msgstr "آخری چیك: "
-
-#: ../mdkonline:197
-#, c-format
-msgid "Confirm Password:"
-msgstr "خفیه لفظ كی تصدیق كرواءیں:"
-
-#: ../mdkonline:204
-#, c-format
-msgid ""
-"The passwords do not match\n"
-" Please try again\n"
-msgstr ""
-"خوفیه لفظ نهی ملتا\n"
-"مهربانی فرماكر دوباره كوشش كریں\n"
-
-#: ../mdkonline:208
-#, fuzzy, c-format
-msgid "Please fill in each field"
-msgstr "مهربانی فرما كر تمام قطعهءكو پر كریڪ\n"
-
-#: ../mdkonline:212
-#, c-format
-msgid "Not a valid mail address!\n"
-msgstr "میل كا پته معقول نهی!\n"
-
-#: ../mdkonline:217
-#, c-format
-msgid "Creating account failed!"
-msgstr ""
-
-#: ../mdkonline:225
-#, c-format
-msgid ""
-"Mandriva Online Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
-msgstr ""
-"آپ كے مینڈرك آنلاءین كھاتےكوبنانے میں كامیابی حاصل هوءی۔\n"
-"مهربانی فرماكر\"Next\" پر كلك كریں تاكه آپ قابلے اعتبار هوں اور اپنے اجزا كی "
-"ترتیب كو نقل بالا كر سكیں\n"
-
-#: ../mdkonline:229
-#, c-format
-msgid "Your upload was successful!"
-msgstr "آپ كا نقل بالا كامیاب رها!"
-
-#: ../mdkonline:229
-#, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandriva Online."
-msgstr ""
-"اب كے بعد آپ كو  حفاظت اور تازه ترین معلومات سےآگاه كیا جاےء گا\n"
-"اعلانیه مینڈرك آنلاءین كا شكریه ادا كرتی هے۔"
-
-#: ../mdkonline:229
-#, c-format
-msgid ""
-"Mandriva Online offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
-msgstr ""
-"مینڈرك آنلاءین آپ كو جدیدترین كو خودكاربنانے كی صلاحیت پیش كرتا هے\n"
-"ایك پروگرام تازه تریں معلومات كے انتظار میں مسلسل آپ كے سسٹم پر چلتا رهے گا\n"
-
-#: ../mdkonline:238
+#: ../mdkapplet:478
 #, c-format
-msgid "Congratulations"
-msgstr "مبارك هو"
+msgid "Online WebSite"
+msgstr "آنلاءین ویبساءیٹ"
 
-#: ../mdkonline:238
+#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
+#: ../mdkapplet:483
 #, c-format
-msgid "Your Mandriva Online account has been successfully configured\n"
+msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
-"آپ كے مینڈرك آنلاءین كھاتےكے اجزا یا اناصركوكی ایك خاص صورت میں ترتیب دینے "
-"میں كامیابی\n"
-
-#: ../mdkonline:253
-#, c-format
-msgid "Configuration uploaded successfully"
-msgstr "اجزا یا اناصر كو بڑے ذخیزه نظام میں منتقل كرنے میں كامیابی"
 
-#: ../mdkonline:254
+#: ../mdkapplet:492
 #, c-format
-msgid "Problem uploading configuration"
-msgstr "اجزا یا اناصر كو كی ایك خاص صورت میں ترتیب دینا"
+msgid "Always launch on startup"
+msgstr "همیشه سٹاٹ اپ پر آغازكار كریں"
 
-#: ../mdkonline:256
+#: ../mdkapplet:494
 #, c-format
-msgid ""
-"Cannot connect to Mandriva Online website: wrong login/password or router/"
-"firewall bad settings"
-msgstr ""
-"مینڈرك آنلاءین ویبساءیٹ سے الحاق نهی هو رها:غلط لوگ ان/خفیه لفظ یا رآاوٹر/"
-"فاءروال كی بری ترتیب هے"
+msgid "Quit"
+msgstr "ختم كریں یا چھوڑ دیں"
 
 #: ../mdkonline.pm:207
 #, fuzzy, c-format
@@ -803,6 +344,11 @@ msgstr ""
 " \n"
 "استعمال كار:\n"
 
+#: ../mdkupdate:73
+#, fuzzy, c-format
+msgid "  --help\t\t- print this help message.\n"
+msgstr "  --help         - print this help message.\n"
+
 #: ../mdkupdate:74
 #, fuzzy, c-format
 msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
@@ -830,11 +376,6 @@ msgid ""
 "file.\n"
 msgstr ""
 
-#: ../mdkupdate:118 ../mdkupdate:164
-#, c-format
-msgid "Warning"
-msgstr "انتباه"
-
 #. -PO: here Live Install is currently *NOT* translated on the desktop, so it's better to keep as it:
 #: ../mdkupdate:120
 #, c-format
@@ -843,11 +384,21 @@ msgid ""
 "Install' wizard."
 msgstr ""
 
+#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
+#, c-format
+msgid "Please wait"
+msgstr "انتظار فرماءیے"
+
 #: ../mdkupdate:123 ../mdkupdate:174
 #, c-format
 msgid "Preparing..."
 msgstr ""
 
+#: ../mdkupdate:141 ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
+#, c-format
+msgid "Error"
+msgstr "غلطی"
+
 #: ../mdkupdate:141
 #, c-format
 msgid ""
@@ -856,6 +407,11 @@ msgid ""
 "%s"
 msgstr ""
 
+#: ../mdkupdate:159 ../mdkupdate:188
+#, c-format
+msgid "An error occurred"
+msgstr ""
+
 #: ../mdkupdate:164
 #, c-format
 msgid ""
@@ -881,6 +437,266 @@ msgid "Unable to update packages from update_source medium.\n"
 msgstr "عمومی پروگرام جس كا اطلاق كیء جگه هو سكے نه كے ایك جگه\n"
 
 #, fuzzy
+#~ msgid "New bundles are available for your system"
+#~ msgstr "آپ كے سسٹم كیلیے تازه تریں معلومات موجود هیں"
+
+#~ msgid "Service is not configured. Please click on \"Configure the service\""
+#~ msgstr ""
+#~ "خدمت ترتیب میں نهیں هے۔ مهربانی فرما كر \"Configure the service\" پر كلك "
+#~ "كریں"
+
+#~ msgid "Configure the service"
+#~ msgstr "خدمت ترتیب دیں"
+
+#~ msgid "Check updates"
+#~ msgstr "تازه تریں معلومات كو دیكھیں"
+
+#~ msgid "Configure Now!"
+#~ msgstr "ابھی ترتیب دیں!"
+
+#~ msgid "Actions"
+#~ msgstr "عمل"
+
+#~ msgid "Configure"
+#~ msgstr "اجزا یا عناصر كو كسی خاص صورت میں ترتیب دیں"
+
+#~ msgid "See logs"
+#~ msgstr "یاداشتیں دیكھیں"
+
+#~ msgid "Status"
+#~ msgstr "درجه"
+
+#~ msgid "Close"
+#~ msgstr "بند كریں"
+
+#~ msgid "Network Connection: "
+#~ msgstr "نیٹورك كا رابطه: "
+
+#~ msgid "Up"
+#~ msgstr "اوپر"
+
+#~ msgid "Down"
+#~ msgstr "نیچے"
+
+#~ msgid "Last check: "
+#~ msgstr "آخری چیك: "
+
+#~ msgid "Machine name:"
+#~ msgstr "مشین كا نام:"
+
+#~ msgid "Updates: "
+#~ msgstr "جدید معلومات: "
+
+#~ msgid "Development release not supported by service"
+#~ msgstr "مكمل نشریه كو خدمت كی همایت حاصل نهی هے"
+
+#~ msgid "Too old release not supported by service"
+#~ msgstr "بهت پرانا نشریه هے خدمت كی همایت حاصل نهی هے"
+
+#~ msgid "Unknown state"
+#~ msgstr "نامعلام درجه"
+
+#~ msgid "Online services disabled. Contact Mandriva Online site\n"
+#~ msgstr "اونلاءین خدمات معزور هیں۔مینڈریك اونلاءین ساءیٹ سے رابطه كریں\n"
+
+#~ msgid "Wrong Password.\n"
+#~ msgstr "غلط خوفیه لفظ\n"
+
+#~ msgid "Wrong Action or host or login.\n"
+#~ msgstr "غلط حركت یا میزبان یا لوگ ان1\n"
+
+#~ msgid ""
+#~ "Something is wrong with your network settings (check your route, firewall "
+#~ "or proxy settings)\n"
+#~ msgstr ""
+#~ "آپ كی نیٹورك سیٹینگ كے ساتھ كچھ مسله هے (اپنے راوءٹ،فاءروال یا پراكسی "
+#~ "سیٹینگ كی تصدیق كریں)\n"
+
+#~ msgid "Response from Mandriva Online server\n"
+#~ msgstr "مینڈریك اونلاءین سرور سے جواب\n"
+
+#~ msgid "No check"
+#~ msgstr "كوءی تصدیق نهی"
+
+#~ msgid "Checking config file: Not present\n"
+#~ msgstr "كونفیگ فاءل كی تلاش:موجود نهی\n"
+
+#~ msgid "Logs"
+#~ msgstr "یاداشتیں"
+
+#~ msgid "Clear"
+#~ msgstr "صاف كریں"
+
+#~ msgid ""
+#~ "mdonline version %s\n"
+#~ "Copyright (C) %s Mandriva.\n"
+#~ "This is free software and may be redistributed under the terms of the GNU "
+#~ "GPL.\n"
+#~ "\n"
+#~ "usage:\n"
+#~ msgstr ""
+#~ "mdonline %s\n"
+#~ "Copyright (C) %s Mandriva.\n"
+#~ "یه ایك مفت سافٹ ویعر هے اور شاید دوباره سے GNU GPL كی شراءت پر تقسیم كیا "
+#~ "جاےء۔ \n"
+#~ " \n"
+#~ "استعمال كار:\n"
+
+#~ msgid "Mandriva Online"
+#~ msgstr "مینڈریكآنلاءین"
+
+#~ msgid "I already have an account"
+#~ msgstr "میرا پهلے سے ایك كھاتا موجود هے"
+
+#~ msgid "I want to subscribe"
+#~ msgstr "میں دستخط كركے هم خیال بننا چاهتا هوں"
+
+#~ msgid "Reading configuration\n"
+#~ msgstr "اجزا یا اناصر كی ترتیب كو پڑھنا\n"
+
+#~ msgid ""
+#~ "This assistant will help you to upload your configuration\n"
+#~ "(packages, hardware configuration) to a centralized database in\n"
+#~ "order to keep you informed about security updates and useful upgrades.\n"
+#~ msgstr ""
+#~ "یه ماتحت عناصر كی ترتیب كو نقل بالا كرنے میں آپ كی مدد كرے گا\n"
+#~ "(باندھی هویء اشیاء یا كمپیوٹر كے برقی اجزا)كو مركزی معلومات میں\n"
+#~ "آپ كو تاذه ترین حفاظتی اقدامات اور مددگار عهدےمیں ترقی سے آگاه ركھنے كے "
+#~ "لےء\n"
+
+#~ msgid "Account creation or authentication"
+#~ msgstr "كھاتا بنانا یا توثیق دینا"
+
+#~ msgid "Enter your Mandriva Online login, password and machine name:"
+#~ msgstr "اپنا مینڈریك آنلاءین كا لوگ ان، خفیه لفظ اور مشین كا نام داخل كریں:"
+
+#, fuzzy
+#~ msgid "Email address:"
+#~ msgstr "میل كا پته معقول نهی!\n"
+
+#~ msgid "Country"
+#~ msgstr "ملك"
+
+#~ msgid "Password:"
+#~ msgstr "خفیه لفظ:"
+
+#, fuzzy
+#~ msgid "Machine description:"
+#~ msgstr "مشین كا نام:"
+
+#~ msgid "Connecting to Mandriva Online website..."
+#~ msgstr "مینڈریكآنلاءین ویبساءیٹ سے رابطه هو رها هے۔۔۔"
+
+#~ msgid ""
+#~ "In order to benefit from Mandriva Online services,\n"
+#~ "we are about to upload your configuration.\n"
+#~ "\n"
+#~ "The Wizard will now send the following information to Mandriva:\n"
+#~ "\n"
+#~ "1) the list of packages you have installed on your system,\n"
+#~ "\n"
+#~ "2) your hardware configuration.\n"
+#~ "\n"
+#~ "If you feel uncomfortable by that idea, or do not want to benefit from "
+#~ "this service,\n"
+#~ "please press 'Cancel'. By pressing 'Next', you allow us to keep you "
+#~ "informed\n"
+#~ "about security updates and useful upgrades via personalized email "
+#~ "alerts.\n"
+#~ "Furthermore, you benefit from discounted paid support services on\n"
+#~ "www.mandrivaexpert.com."
+#~ msgstr ""
+#~ "مینڈریك آنلاءین كی خدمات سے فاءںده اٹھانے كے لےء،\n"
+#~ "هم آپ كے اجزا كی ترتیب كو نقل بالا كرنے والے هیں۔\n"
+#~ "\n"
+#~ "ویزرڈ اب مندرجه ذیل معلومات كو مینڈریكسوفٹ كو بیھجے گا:\n"
+#~ "\n"
+#~ "1) باندھی هویء سشیاء كی فهرست جو آپ نے اپنے سسٹم پرنصب كی هیں،\n"
+#~ "\n"
+#~ "2) آپ كے كمپیوٹر كے مشینی اور برقی اجزا۔\n"
+#~ "\n"
+#~ "اگر آپ كو یه تجویز غیرآرامده هے،یا اس خدمت سے مستفیدنهی هونا چاهتے،"
+
+#~ msgid "Connection problem"
+#~ msgstr "رابطه میں مسله"
+
+#~ msgid "Problem occurs when uploading files, please try again"
+#~ msgstr ""
+#~ "فاءل كو بڑے ذخیزه نظام میں منتقل كرنے میں مسله آرها هے،مهربانی فرماكر "
+#~ "دوباره كوشش كریں"
+
+#~ msgid "Create a Mandriva Online Account"
+#~ msgstr "ایك مینڈریك آنلاءین كھاتا بناءیں"
+
+#, fuzzy
+#~ msgid "Last name:"
+#~ msgstr "آخری چیك: "
+
+#~ msgid "Confirm Password:"
+#~ msgstr "خفیه لفظ كی تصدیق كرواءیں:"
+
+#~ msgid ""
+#~ "The passwords do not match\n"
+#~ " Please try again\n"
+#~ msgstr ""
+#~ "خوفیه لفظ نهی ملتا\n"
+#~ "مهربانی فرماكر دوباره كوشش كریں\n"
+
+#, fuzzy
+#~ msgid "Please fill in each field"
+#~ msgstr "مهربانی فرما كر تمام قطعهءكو پر كریڪ\n"
+
+#~ msgid "Not a valid mail address!\n"
+#~ msgstr "میل كا پته معقول نهی!\n"
+
+#~ msgid ""
+#~ "Mandriva Online Account successfully created.\n"
+#~ "Please click \"Next\" to authenticate and upload your configuration\n"
+#~ msgstr ""
+#~ "آپ كے مینڈرك آنلاءین كھاتےكوبنانے میں كامیابی حاصل هوءی۔\n"
+#~ "مهربانی فرماكر\"Next\" پر كلك كریں تاكه آپ قابلے اعتبار هوں اور اپنے اجزا "
+#~ "كی ترتیب كو نقل بالا كر سكیں\n"
+
+#~ msgid "Your upload was successful!"
+#~ msgstr "آپ كا نقل بالا كامیاب رها!"
+
+#~ msgid ""
+#~ "From now you will receive on security and updates \n"
+#~ "announcements thanks to Mandriva Online."
+#~ msgstr ""
+#~ "اب كے بعد آپ كو  حفاظت اور تازه ترین معلومات سےآگاه كیا جاےء گا\n"
+#~ "اعلانیه مینڈرك آنلاءین كا شكریه ادا كرتی هے۔"
+
+#~ msgid ""
+#~ "Mandriva Online offers you the ability to automate the updates.\n"
+#~ "A program will run regulary in your system waiting for new updates\n"
+#~ msgstr ""
+#~ "مینڈرك آنلاءین آپ كو جدیدترین كو خودكاربنانے كی صلاحیت پیش كرتا هے\n"
+#~ "ایك پروگرام تازه تریں معلومات كے انتظار میں مسلسل آپ كے سسٹم پر چلتا رهے "
+#~ "گا\n"
+
+#~ msgid "Congratulations"
+#~ msgstr "مبارك هو"
+
+#~ msgid "Your Mandriva Online account has been successfully configured\n"
+#~ msgstr ""
+#~ "آپ كے مینڈرك آنلاءین كھاتےكے اجزا یا اناصركوكی ایك خاص صورت میں ترتیب "
+#~ "دینے میں كامیابی\n"
+
+#~ msgid "Configuration uploaded successfully"
+#~ msgstr "اجزا یا اناصر كو بڑے ذخیزه نظام میں منتقل كرنے میں كامیابی"
+
+#~ msgid "Problem uploading configuration"
+#~ msgstr "اجزا یا اناصر كو كی ایك خاص صورت میں ترتیب دینا"
+
+#~ msgid ""
+#~ "Cannot connect to Mandriva Online website: wrong login/password or router/"
+#~ "firewall bad settings"
+#~ msgstr ""
+#~ "مینڈرك آنلاءین ویبساءیٹ سے الحاق نهی هو رها:غلط لوگ ان/خفیه لفظ یا رآاوٹر/"
+#~ "فاءروال كی بری ترتیب هے"
+
+#, fuzzy
 #~ msgid "  --applet\t\t- launch Mandriva Update.\n"
 #~ msgstr "  --applet       - launch Mandriva Update.\n"
 
diff --git a/po/uz.po b/po/uz.po
index 1228caeb..832bd062 100644
--- a/po/uz.po
+++ b/po/uz.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline-uz\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-09 16:26+0200\n"
+"POT-Creation-Date: 2008-02-21 18:21+0100\n"
 "PO-Revision-Date: 2004-06-27 23:53+0200\n"
 "Last-Translator: Mashrab Kuvatov <kmashrab@uni-bremen.de>\n"
 "Language-Team: Uzbek <kmashrab@uni-bremen.de>\n"
@@ -18,70 +18,60 @@ msgstr ""
 "X-Generator: KBabel 1.3\n"
 
 #. -PO: here %s will be replaced by the local time (eg: "Will check updates at 14:03:50"
-#: ../mdkapplet:94
+#: ../mdkapplet:88
 #, fuzzy, c-format
 msgid "Will check updates at %s"
 msgstr "Yangilanishlarni tekshirish"
 
-#: ../mdkapplet:103
+#: ../mdkapplet:97
 #, c-format
 msgid "Your system is up-to-date"
 msgstr ""
 
-#: ../mdkapplet:109
+#: ../mdkapplet:103
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
 "support@mandrivaonline.com"
 msgstr ""
 
-#: ../mdkapplet:115
+#: ../mdkapplet:110
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "Mavjud bo'lgan paketlar qidirilmoqda, iltimos kutib turing..."
 
-#: ../mdkapplet:121
+#: ../mdkapplet:116
 #, c-format
 msgid "New updates are available for your system"
 msgstr ""
 
-#: ../mdkapplet:127
-#, c-format
-msgid "New bundles are available for your system"
-msgstr ""
-
-#: ../mdkapplet:133
-#, c-format
-msgid "Service is not configured. Please click on \"Configure the service\""
-msgstr ""
-
-#: ../mdkapplet:139
+#: ../mdkapplet:122
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr ""
 
-#: ../mdkapplet:145
+#: ../mdkapplet:128
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr ""
 
-#: ../mdkapplet:151 ../mdkapplet:182
+#: ../mdkapplet:134 ../mdkapplet:165
 #, c-format
 msgid "urpmi database locked"
 msgstr "urpmi ma'lumot bazasi qulflangan"
 
-#: ../mdkapplet:157
+#: ../mdkapplet:140
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
-#: ../mdkapplet:163
+#: ../mdkapplet:146
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
 msgstr ""
 
-#: ../mdkapplet:169
+#: ../mdkapplet:152
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -92,550 +82,131 @@ msgid ""
 "Then, restart \"%s\"."
 msgstr ""
 
-#: ../mdkapplet:174
+#: ../mdkapplet:157
 #, c-format
 msgid "Enabled"
 msgstr "Yoqilgan"
 
-#: ../mdkapplet:187
+#: ../mdkapplet:170
 #, fuzzy, c-format
 msgid "Error updating media"
 msgstr "To'plam yangilanmoqda...\n"
 
-#: ../mdkapplet:202
+#: ../mdkapplet:185
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr ""
 
-#: ../mdkapplet:207
+#: ../mdkapplet:190
 #, c-format
 msgid "Packages are up to date"
 msgstr "Paketlarni yangilash muhtoji yo'q"
 
-#: ../mdkapplet:212
+#: ../mdkapplet:195
 #, fuzzy, c-format
 msgid "Failed to open urpmi database"
 msgstr "rpmdb'ni ochib bo'lmadi"
 
-#: ../mdkapplet:217 ../mdkapplet:324
+#: ../mdkapplet:200
 #, c-format
 msgid "Install updates"
 msgstr "Yangilanishlarni o'rnatish"
 
-#: ../mdkapplet:218
-#, fuzzy, c-format
-msgid "Configure the service"
-msgstr "Tarmoqni moslash"
-
-#: ../mdkapplet:219
+#: ../mdkapplet:201
 #, c-format
 msgid "Check Updates"
 msgstr "Yangilanishlarni tekshirish"
 
-#: ../mdkapplet:220 ../mdkapplet:327 ../mdkonline:114 ../mdkonline:155
-#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
-#, c-format
-msgid "Please wait"
-msgstr "Iltimos kutib turing"
-
-#: ../mdkapplet:220 ../mdkapplet:326 ../mdkapplet:327
-#, c-format
-msgid "Check updates"
-msgstr "Yangilanishlarni tekshirish"
-
-#: ../mdkapplet:223 ../mdkapplet:648
-#, c-format
-msgid "Online WebSite"
-msgstr ""
-
-#: ../mdkapplet:224
+#: ../mdkapplet:202
 #, c-format
 msgid "Configure Network"
 msgstr "Tarmoqni moslash"
 
-#: ../mdkapplet:225
-#, c-format
-msgid "Configure Now!"
-msgstr ""
-
-#: ../mdkapplet:313 ../mdkapplet:392
-#, c-format
-msgid "Mandriva Linux Updates Applet"
-msgstr ""
-
-#: ../mdkapplet:322
-#, c-format
-msgid "Actions"
-msgstr "Amallar"
-
-#: ../mdkapplet:325
-#, c-format
-msgid "Configure"
-msgstr "Moslash"
-
-#: ../mdkapplet:329
-#, c-format
-msgid "See logs"
-msgstr "Loglarni ko'rish"
-
-#: ../mdkapplet:332
-#, c-format
-msgid "Status"
-msgstr "Holati"
-
-#: ../mdkapplet:336 ../mdkapplet:597
-#, c-format
-msgid "Close"
-msgstr "Yopish"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Network Connection: "
-msgstr "Tarmoq: "
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Up"
-msgstr "Ishlayapti"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Down"
-msgstr "Ishlamayapti"
-
-#: ../mdkapplet:366
-#, c-format
-msgid "Last check: "
-msgstr "Oxirgi tekshiruv:"
-
-#: ../mdkapplet:367 ../mdkonline:145
-#, c-format
-msgid "Machine name:"
-msgstr "Kompyuterning nomi:"
-
-#: ../mdkapplet:368
-#, fuzzy, c-format
-msgid "Updates: "
-msgstr "Yangi yangilanishlar: "
-
-#: ../mdkapplet:372
+#: ../mdkapplet:283
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr ""
 
-#: ../mdkapplet:375
+#: ../mdkapplet:286
 #, c-format
 msgid "Mandriva Online seems to be reinstalled, reloading applet ...."
 msgstr ""
 
-#: ../mdkapplet:383
+#: ../mdkapplet:294
 #, c-format
 msgid "Launching MandrivaUpdate\n"
 msgstr ""
 
-#: ../mdkapplet:398
-#, c-format
-msgid "Computing new updates...\n"
-msgstr ""
-
-#: ../mdkapplet:399
-#, c-format
-msgid "Connecting to"
-msgstr "Aloqa o'rnatilmoqda"
-
-#: ../mdkapplet:467 ../mdkupdate:159 ../mdkupdate:188
-#, c-format
-msgid "An error occurred"
-msgstr "Xato ro'y berdi"
-
-#: ../mdkapplet:475
-#, c-format
-msgid "Development release not supported by service"
-msgstr ""
-
-#: ../mdkapplet:476
-#, c-format
-msgid "Too old release not supported by service"
-msgstr ""
-
-#: ../mdkapplet:477
-#, c-format
-msgid "Unknown state"
-msgstr ""
-
-#: ../mdkapplet:478
-#, c-format
-msgid "Online services disabled. Contact Mandriva Online site\n"
-msgstr ""
-
-#: ../mdkapplet:479
+#: ../mdkapplet:303
 #, c-format
-msgid "Wrong Password.\n"
-msgstr "Maxfiy so'z noto'g'ri.\n"
-
-#: ../mdkapplet:480
-#, c-format
-msgid "Wrong Action or host or login.\n"
+msgid "Mandriva Linux Updates Applet"
 msgstr ""
 
-#: ../mdkapplet:481
+#: ../mdkapplet:308
 #, c-format
-msgid ""
-"Something is wrong with your network settings (check your route, firewall or "
-"proxy settings)\n"
+msgid "Computing new updates...\n"
 msgstr ""
 
-#: ../mdkapplet:483
+#: ../mdkapplet:309
 #, c-format
-msgid ""
-"Problem occured while connecting to the server, please contact the support "
-"team"
-msgstr ""
-
-#: ../mdkapplet:487
-#, fuzzy, c-format
-msgid "Response from Mandriva Online server\n"
-msgstr "Mandriva Online'ga marhamat"
+msgid "Connecting to"
+msgstr "Aloqa o'rnatilmoqda"
 
-#: ../mdkapplet:490
+#: ../mdkapplet:386
 #, c-format
 msgid "System is up-to-date\n"
 msgstr ""
 
-#: ../mdkapplet:527
-#, c-format
-msgid "No check"
-msgstr ""
-
-#: ../mdkapplet:541
-#, c-format
-msgid "Checking config file: Not present\n"
-msgstr ""
-
-#: ../mdkapplet:544
+#: ../mdkapplet:415
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr ""
 
-#: ../mdkapplet:587
+#: ../mdkapplet:457 ../mdkupdate:118 ../mdkupdate:164
 #, c-format
-msgid "Logs"
-msgstr "Loglar"
-
-#: ../mdkapplet:603
-#, c-format
-msgid "Clear"
-msgstr "Tozalash"
+msgid "Warning"
+msgstr "Diqqat"
 
-#: ../mdkapplet:629
+#: ../mdkapplet:468
 #, c-format
 msgid "About..."
 msgstr "Haqida"
 
-#: ../mdkapplet:631
+#: ../mdkapplet:472
 #, fuzzy, c-format
 msgid "Mandriva Online %s"
 msgstr "Mandriva Online"
 
-#: ../mdkapplet:635
+#: ../mdkapplet:473
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Copyright (C) %s by Mandriva"
 
-#: ../mdkapplet:647
+#: ../mdkapplet:476
 #, c-format
 msgid "Mandriva Online gives access to Mandriva web services."
 msgstr ""
 
-#: ../mdkapplet:655
-#, c-format
-msgid "Always launch on startup"
-msgstr "Tizimga kirganda ishga tushirish"
-
-#: ../mdkapplet:657
-#, c-format
-msgid "Quit"
-msgstr "Chiqish"
-
-#: ../mdkonline:58
-#, c-format
-msgid ""
-"mdonline version %s\n"
-"Copyright (C) %s Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"mdonline, versiya %s\n"
-"Copyright (C) %s Mandriva.\n"
-"Bu erkin dastur va GNU GPL shartlari asosida tarqatilishi mumkin.\n"
-"\n"
-"Foydalanish:\n"
-
-#: ../mdkonline:63 ../mdkupdate:73
-#, c-format
-msgid "  --help\t\t- print this help message.\n"
-msgstr "  --help\t\t- shu yordam xabarini ko'rsatish.\n"
-
-#: ../mdkonline:64
-#, c-format
-msgid "  --box=\t\t\t- hostname.\n"
-msgstr ""
-
-#: ../mdkonline:65
-#, c-format
-msgid "  --country\t\t\t- name of country of the user. \n"
-msgstr ""
-
-#: ../mdkonline:66
-#, c-format
-msgid "  --interactive\t\t- use the interactive mode.\n"
-msgstr ""
-
-#: ../mdkonline:67
-#, c-format
-msgid "  --nointeractive\t- use the non-interactive mode.\n"
-msgstr ""
-
-#: ../mdkonline:68
-#, c-format
-msgid "  --login=\t\t     - login name of the user.\n"
-msgstr ""
-
-#: ../mdkonline:69
-#, c-format
-msgid "  --pass=\t\t\t- password  of the user.\n"
-msgstr ""
-
-#: ../mdkonline:87 ../mdkonline:120
-#, c-format
-msgid "Mandriva Online"
-msgstr "Mandriva Online"
-
-#: ../mdkonline:90
-#, c-format
-msgid "I already have an account"
-msgstr ""
-
-#: ../mdkonline:91
-#, c-format
-msgid "I want to subscribe"
-msgstr ""
-
-#: ../mdkonline:96
-#, c-format
-msgid "Mr."
-msgstr "Janob"
-
-#: ../mdkonline:96
-#, c-format
-msgid "Mrs."
-msgstr "Xonim"
-
-#: ../mdkonline:96
-#, c-format
-msgid "Ms."
-msgstr "Xonim"
-
-#: ../mdkonline:114
-#, c-format
-msgid "Reading configuration\n"
-msgstr ""
-
-#: ../mdkonline:123
-#, c-format
-msgid ""
-"This assistant will help you to upload your configuration\n"
-"(packages, hardware configuration) to a centralized database in\n"
-"order to keep you informed about security updates and useful upgrades.\n"
-msgstr ""
-
-#: ../mdkonline:131
-#, c-format
-msgid "Account creation or authentication"
-msgstr ""
-
-#: ../mdkonline:136
-#, c-format
-msgid "Enter your Mandriva Online login, password and machine name:"
-msgstr ""
-
-#: ../mdkonline:142 ../mdkonline:195
-#, fuzzy, c-format
-msgid "Email address:"
-msgstr "IP raqami"
-
-#: ../mdkonline:143
-#, c-format
-msgid "Country"
-msgstr "Kantri"
-
-#: ../mdkonline:144 ../mdkonline:196
-#, c-format
-msgid "Password:"
-msgstr "Maxfiy so'z:"
-
-#: ../mdkonline:146
-#, fuzzy, c-format
-msgid "Machine description:"
-msgstr "Kompyuterning nomi:"
-
-#: ../mdkonline:147
-#, c-format
-msgid "(Ex: My Home Office's Computer)"
-msgstr ""
-
-#: ../mdkonline:152 ../mdkonline:159 ../mdkonline:180 ../mdkonline:204
-#: ../mdkonline:208 ../mdkonline:212 ../mdkonline:217 ../mdkupdate:141
-#: ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
-#, c-format
-msgid "Error"
-msgstr "Xato"
-
-#: ../mdkonline:152
-#, fuzzy, c-format
-msgid "Machine name must be 1 to 40 alphanumerical characters"
-msgstr "Ulash nuqtalari faqat son yoki harflardan iborat bo'lishi mumkin"
-
-#: ../mdkonline:155
-#, fuzzy, c-format
-msgid "Connecting to Mandriva Online website..."
-msgstr "Mandriva Online'ga marhamat"
-
-#: ../mdkonline:167
-#, c-format
-msgid ""
-"In order to benefit from Mandriva Online services,\n"
-"we are about to upload your configuration.\n"
-"\n"
-"The Wizard will now send the following information to Mandriva:\n"
-"\n"
-"1) the list of packages you have installed on your system,\n"
-"\n"
-"2) your hardware configuration.\n"
-"\n"
-"If you feel uncomfortable by that idea, or do not want to benefit from this "
-"service,\n"
-"please press 'Cancel'. By pressing 'Next', you allow us to keep you "
-"informed\n"
-"about security updates and useful upgrades via personalized email alerts.\n"
-"Furthermore, you benefit from discounted paid support services on\n"
-"www.mandrivaexpert.com."
-msgstr ""
-
-#: ../mdkonline:180
-#, c-format
-msgid "Connection problem"
-msgstr "Aloqa o'rnatishda muammo"
-
-#: ../mdkonline:180
-#, c-format
-msgid "Problem occurs when uploading files, please try again"
-msgstr ""
-
-#: ../mdkonline:187
-#, c-format
-msgid "Create a Mandriva Online Account"
-msgstr "Mandriva Online hisobini yaratish"
-
-#. -PO: that is for things like "Mr", "Ms",...
-#: ../mdkonline:192
-#, fuzzy, c-format
-msgid "Greeting:"
-msgstr "Yashil"
-
-#: ../mdkonline:193
-#, c-format
-msgid "First name:"
-msgstr "Ismi:"
-
-#: ../mdkonline:194
-#, fuzzy, c-format
-msgid "Last name:"
-msgstr "Ismi:"
-
-#: ../mdkonline:197
-#, c-format
-msgid "Confirm Password:"
-msgstr "Maxfiy so'zni tasdiqlang:"
-
-#: ../mdkonline:204
-#, c-format
-msgid ""
-"The passwords do not match\n"
-" Please try again\n"
-msgstr ""
-"Maxfiy so'zlar mos kelmaydi\n"
-" Iltimos yana urinib ko'ring\n"
-
-#: ../mdkonline:208
-#, fuzzy, c-format
-msgid "Please fill in each field"
-msgstr "Iltimos hamma maydonlarni to'ldiring\n"
-
-#: ../mdkonline:212
-#, c-format
-msgid "Not a valid mail address!\n"
-msgstr "Elektron pochta haqiqiy emas!\n"
-
-#: ../mdkonline:217
-#, fuzzy, c-format
-msgid "Creating account failed!"
-msgstr "Hisobni o'zgartirish"
-
-#: ../mdkonline:225
-#, c-format
-msgid ""
-"Mandriva Online Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
-msgstr ""
-
-#: ../mdkonline:229
-#, c-format
-msgid "Your upload was successful!"
-msgstr ""
-
-#: ../mdkonline:229
-#, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandriva Online."
-msgstr ""
-
-#: ../mdkonline:229
+#: ../mdkapplet:478
 #, c-format
-msgid ""
-"Mandriva Online offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
+msgid "Online WebSite"
 msgstr ""
 
-#: ../mdkonline:238
-#, c-format
-msgid "Congratulations"
-msgstr "Tabriklaymiz!"
-
-#: ../mdkonline:238
+#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
+#: ../mdkapplet:483
 #, c-format
-msgid "Your Mandriva Online account has been successfully configured\n"
+msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
 
-#: ../mdkonline:253
+#: ../mdkapplet:492
 #, c-format
-msgid "Configuration uploaded successfully"
-msgstr ""
-
-#: ../mdkonline:254
-#, fuzzy, c-format
-msgid "Problem uploading configuration"
-msgstr "Moslamalar jo'natilmoqda..."
+msgid "Always launch on startup"
+msgstr "Tizimga kirganda ishga tushirish"
 
-#: ../mdkonline:256
+#: ../mdkapplet:494
 #, c-format
-msgid ""
-"Cannot connect to Mandriva Online website: wrong login/password or router/"
-"firewall bad settings"
-msgstr ""
+msgid "Quit"
+msgstr "Chiqish"
 
 #: ../mdkonline.pm:207
 #, fuzzy, c-format
@@ -775,6 +346,11 @@ msgstr ""
 "\n"
 "Foydalanish:\n"
 
+#: ../mdkupdate:73
+#, c-format
+msgid "  --help\t\t- print this help message.\n"
+msgstr "  --help\t\t- shu yordam xabarini ko'rsatish.\n"
+
 #: ../mdkupdate:74
 #, fuzzy, c-format
 msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
@@ -802,11 +378,6 @@ msgid ""
 "file.\n"
 msgstr ""
 
-#: ../mdkupdate:118 ../mdkupdate:164
-#, c-format
-msgid "Warning"
-msgstr "Diqqat"
-
 #. -PO: here Live Install is currently *NOT* translated on the desktop, so it's better to keep as it:
 #: ../mdkupdate:120
 #, c-format
@@ -815,11 +386,21 @@ msgid ""
 "Install' wizard."
 msgstr ""
 
+#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
+#, c-format
+msgid "Please wait"
+msgstr "Iltimos kutib turing"
+
 #: ../mdkupdate:123 ../mdkupdate:174
 #, c-format
 msgid "Preparing..."
 msgstr "Tayyorlanmoqda..."
 
+#: ../mdkupdate:141 ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
+#, c-format
+msgid "Error"
+msgstr "Xato"
+
 #: ../mdkupdate:141
 #, c-format
 msgid ""
@@ -828,6 +409,11 @@ msgid ""
 "%s"
 msgstr ""
 
+#: ../mdkupdate:159 ../mdkupdate:188
+#, c-format
+msgid "An error occurred"
+msgstr "Xato ro'y berdi"
+
 #: ../mdkupdate:164
 #, c-format
 msgid ""
@@ -852,6 +438,153 @@ msgstr "Paketlar o'rnatilmoqda...\n"
 msgid "Unable to update packages from update_source medium.\n"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Configure the service"
+#~ msgstr "Tarmoqni moslash"
+
+#~ msgid "Check updates"
+#~ msgstr "Yangilanishlarni tekshirish"
+
+#~ msgid "Actions"
+#~ msgstr "Amallar"
+
+#~ msgid "Configure"
+#~ msgstr "Moslash"
+
+#~ msgid "See logs"
+#~ msgstr "Loglarni ko'rish"
+
+#~ msgid "Status"
+#~ msgstr "Holati"
+
+#~ msgid "Close"
+#~ msgstr "Yopish"
+
+#~ msgid "Network Connection: "
+#~ msgstr "Tarmoq: "
+
+#~ msgid "Up"
+#~ msgstr "Ishlayapti"
+
+#~ msgid "Down"
+#~ msgstr "Ishlamayapti"
+
+#~ msgid "Last check: "
+#~ msgstr "Oxirgi tekshiruv:"
+
+#~ msgid "Machine name:"
+#~ msgstr "Kompyuterning nomi:"
+
+#, fuzzy
+#~ msgid "Updates: "
+#~ msgstr "Yangi yangilanishlar: "
+
+#~ msgid "Wrong Password.\n"
+#~ msgstr "Maxfiy so'z noto'g'ri.\n"
+
+#, fuzzy
+#~ msgid "Response from Mandriva Online server\n"
+#~ msgstr "Mandriva Online'ga marhamat"
+
+#~ msgid "Logs"
+#~ msgstr "Loglar"
+
+#~ msgid "Clear"
+#~ msgstr "Tozalash"
+
+#~ msgid ""
+#~ "mdonline version %s\n"
+#~ "Copyright (C) %s Mandriva.\n"
+#~ "This is free software and may be redistributed under the terms of the GNU "
+#~ "GPL.\n"
+#~ "\n"
+#~ "usage:\n"
+#~ msgstr ""
+#~ "mdonline, versiya %s\n"
+#~ "Copyright (C) %s Mandriva.\n"
+#~ "Bu erkin dastur va GNU GPL shartlari asosida tarqatilishi mumkin.\n"
+#~ "\n"
+#~ "Foydalanish:\n"
+
+#~ msgid "Mandriva Online"
+#~ msgstr "Mandriva Online"
+
+#~ msgid "Mr."
+#~ msgstr "Janob"
+
+#~ msgid "Mrs."
+#~ msgstr "Xonim"
+
+#~ msgid "Ms."
+#~ msgstr "Xonim"
+
+#, fuzzy
+#~ msgid "Email address:"
+#~ msgstr "IP raqami"
+
+#~ msgid "Country"
+#~ msgstr "Kantri"
+
+#~ msgid "Password:"
+#~ msgstr "Maxfiy so'z:"
+
+#, fuzzy
+#~ msgid "Machine description:"
+#~ msgstr "Kompyuterning nomi:"
+
+#, fuzzy
+#~ msgid "Machine name must be 1 to 40 alphanumerical characters"
+#~ msgstr "Ulash nuqtalari faqat son yoki harflardan iborat bo'lishi mumkin"
+
+#, fuzzy
+#~ msgid "Connecting to Mandriva Online website..."
+#~ msgstr "Mandriva Online'ga marhamat"
+
+#~ msgid "Connection problem"
+#~ msgstr "Aloqa o'rnatishda muammo"
+
+#~ msgid "Create a Mandriva Online Account"
+#~ msgstr "Mandriva Online hisobini yaratish"
+
+#, fuzzy
+#~ msgid "Greeting:"
+#~ msgstr "Yashil"
+
+#~ msgid "First name:"
+#~ msgstr "Ismi:"
+
+#, fuzzy
+#~ msgid "Last name:"
+#~ msgstr "Ismi:"
+
+#~ msgid "Confirm Password:"
+#~ msgstr "Maxfiy so'zni tasdiqlang:"
+
+#~ msgid ""
+#~ "The passwords do not match\n"
+#~ " Please try again\n"
+#~ msgstr ""
+#~ "Maxfiy so'zlar mos kelmaydi\n"
+#~ " Iltimos yana urinib ko'ring\n"
+
+#, fuzzy
+#~ msgid "Please fill in each field"
+#~ msgstr "Iltimos hamma maydonlarni to'ldiring\n"
+
+#~ msgid "Not a valid mail address!\n"
+#~ msgstr "Elektron pochta haqiqiy emas!\n"
+
+#, fuzzy
+#~ msgid "Creating account failed!"
+#~ msgstr "Hisobni o'zgartirish"
+
+#~ msgid "Congratulations"
+#~ msgstr "Tabriklaymiz!"
+
+#, fuzzy
+#~ msgid "Problem uploading configuration"
+#~ msgstr "Moslamalar jo'natilmoqda..."
+
 #~ msgid "  --applet\t\t- launch Mandriva Update.\n"
 #~ msgstr "  --applet\t\t- Mandriva Update xizmatini ishga tushirish.\n"
 
diff --git a/po/uz@cyrillic.po b/po/uz@cyrillic.po
index 36aae6ca..1920dfb3 100644
--- a/po/uz@cyrillic.po
+++ b/po/uz@cyrillic.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline-uz\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-09 16:26+0200\n"
+"POT-Creation-Date: 2008-02-21 18:21+0100\n"
 "PO-Revision-Date: 2004-06-27 23:53+0200\n"
 "Last-Translator: Mashrab Kuvatov <kmashrab@uni-bremen.de>\n"
 "Language-Team: Uzbek <kmashrab@uni-bremen.de>\n"
@@ -18,70 +18,60 @@ msgstr ""
 "X-Generator: KBabel 1.3\n"
 
 #. -PO: here %s will be replaced by the local time (eg: "Will check updates at 14:03:50"
-#: ../mdkapplet:94
+#: ../mdkapplet:88
 #, fuzzy, c-format
 msgid "Will check updates at %s"
 msgstr "Янгиланишларни текшириш"
 
-#: ../mdkapplet:103
+#: ../mdkapplet:97
 #, c-format
 msgid "Your system is up-to-date"
 msgstr ""
 
-#: ../mdkapplet:109
+#: ../mdkapplet:103
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
 "support@mandrivaonline.com"
 msgstr ""
 
-#: ../mdkapplet:115
+#: ../mdkapplet:110
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "Мавжуд бўлган пакетлар қидирилмоқда, илтимос кутиб туринг..."
 
-#: ../mdkapplet:121
+#: ../mdkapplet:116
 #, c-format
 msgid "New updates are available for your system"
 msgstr ""
 
-#: ../mdkapplet:127
-#, c-format
-msgid "New bundles are available for your system"
-msgstr ""
-
-#: ../mdkapplet:133
-#, c-format
-msgid "Service is not configured. Please click on \"Configure the service\""
-msgstr ""
-
-#: ../mdkapplet:139
+#: ../mdkapplet:122
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr ""
 
-#: ../mdkapplet:145
+#: ../mdkapplet:128
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr ""
 
-#: ../mdkapplet:151 ../mdkapplet:182
+#: ../mdkapplet:134 ../mdkapplet:165
 #, c-format
 msgid "urpmi database locked"
 msgstr "urpmi маълумот базаси қулфланган"
 
-#: ../mdkapplet:157
+#: ../mdkapplet:140
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
-#: ../mdkapplet:163
+#: ../mdkapplet:146
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
 msgstr ""
 
-#: ../mdkapplet:169
+#: ../mdkapplet:152
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -92,550 +82,131 @@ msgid ""
 "Then, restart \"%s\"."
 msgstr ""
 
-#: ../mdkapplet:174
+#: ../mdkapplet:157
 #, c-format
 msgid "Enabled"
 msgstr "Ёқилган"
 
-#: ../mdkapplet:187
+#: ../mdkapplet:170
 #, fuzzy, c-format
 msgid "Error updating media"
 msgstr "Тўплам янгиланмоқда...\n"
 
-#: ../mdkapplet:202
+#: ../mdkapplet:185
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr ""
 
-#: ../mdkapplet:207
+#: ../mdkapplet:190
 #, c-format
 msgid "Packages are up to date"
 msgstr "Пакетларни янгилаш муҳтожи йўқ"
 
-#: ../mdkapplet:212
+#: ../mdkapplet:195
 #, fuzzy, c-format
 msgid "Failed to open urpmi database"
 msgstr "rpmdb'ни очиб бўлмади"
 
-#: ../mdkapplet:217 ../mdkapplet:324
+#: ../mdkapplet:200
 #, c-format
 msgid "Install updates"
 msgstr "Янгиланишларни ўрнатиш"
 
-#: ../mdkapplet:218
-#, fuzzy, c-format
-msgid "Configure the service"
-msgstr "Тармоқни мослаш"
-
-#: ../mdkapplet:219
+#: ../mdkapplet:201
 #, c-format
 msgid "Check Updates"
 msgstr "Янгиланишларни текшириш"
 
-#: ../mdkapplet:220 ../mdkapplet:327 ../mdkonline:114 ../mdkonline:155
-#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
-#, c-format
-msgid "Please wait"
-msgstr "Илтимос кутиб туринг"
-
-#: ../mdkapplet:220 ../mdkapplet:326 ../mdkapplet:327
-#, c-format
-msgid "Check updates"
-msgstr "Янгиланишларни текшириш"
-
-#: ../mdkapplet:223 ../mdkapplet:648
-#, c-format
-msgid "Online WebSite"
-msgstr ""
-
-#: ../mdkapplet:224
+#: ../mdkapplet:202
 #, c-format
 msgid "Configure Network"
 msgstr "Тармоқни мослаш"
 
-#: ../mdkapplet:225
-#, c-format
-msgid "Configure Now!"
-msgstr ""
-
-#: ../mdkapplet:313 ../mdkapplet:392
-#, c-format
-msgid "Mandriva Linux Updates Applet"
-msgstr ""
-
-#: ../mdkapplet:322
-#, c-format
-msgid "Actions"
-msgstr "Амаллар"
-
-#: ../mdkapplet:325
-#, c-format
-msgid "Configure"
-msgstr "Мослаш"
-
-#: ../mdkapplet:329
-#, c-format
-msgid "See logs"
-msgstr "Логларни кўриш"
-
-#: ../mdkapplet:332
-#, c-format
-msgid "Status"
-msgstr "Ҳолати"
-
-#: ../mdkapplet:336 ../mdkapplet:597
-#, c-format
-msgid "Close"
-msgstr "Ёпиш"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Network Connection: "
-msgstr "Тармоқ: "
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Up"
-msgstr "Ишлаяпти"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Down"
-msgstr "Ишламаяпти"
-
-#: ../mdkapplet:366
-#, c-format
-msgid "Last check: "
-msgstr "Охирги текширув:"
-
-#: ../mdkapplet:367 ../mdkonline:145
-#, c-format
-msgid "Machine name:"
-msgstr "Компьютернинг номи:"
-
-#: ../mdkapplet:368
-#, fuzzy, c-format
-msgid "Updates: "
-msgstr "Янги янгиланишлар: "
-
-#: ../mdkapplet:372
+#: ../mdkapplet:283
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr ""
 
-#: ../mdkapplet:375
+#: ../mdkapplet:286
 #, c-format
 msgid "Mandriva Online seems to be reinstalled, reloading applet ...."
 msgstr ""
 
-#: ../mdkapplet:383
+#: ../mdkapplet:294
 #, c-format
 msgid "Launching MandrivaUpdate\n"
 msgstr ""
 
-#: ../mdkapplet:398
-#, c-format
-msgid "Computing new updates...\n"
-msgstr ""
-
-#: ../mdkapplet:399
-#, c-format
-msgid "Connecting to"
-msgstr "Алоқа ўрнатилмоқда"
-
-#: ../mdkapplet:467 ../mdkupdate:159 ../mdkupdate:188
-#, c-format
-msgid "An error occurred"
-msgstr "Хато рўй берди"
-
-#: ../mdkapplet:475
-#, c-format
-msgid "Development release not supported by service"
-msgstr ""
-
-#: ../mdkapplet:476
-#, c-format
-msgid "Too old release not supported by service"
-msgstr ""
-
-#: ../mdkapplet:477
-#, c-format
-msgid "Unknown state"
-msgstr ""
-
-#: ../mdkapplet:478
-#, c-format
-msgid "Online services disabled. Contact Mandriva Online site\n"
-msgstr ""
-
-#: ../mdkapplet:479
+#: ../mdkapplet:303
 #, c-format
-msgid "Wrong Password.\n"
-msgstr "Махфий сўз нотўғри.\n"
-
-#: ../mdkapplet:480
-#, c-format
-msgid "Wrong Action or host or login.\n"
+msgid "Mandriva Linux Updates Applet"
 msgstr ""
 
-#: ../mdkapplet:481
+#: ../mdkapplet:308
 #, c-format
-msgid ""
-"Something is wrong with your network settings (check your route, firewall or "
-"proxy settings)\n"
+msgid "Computing new updates...\n"
 msgstr ""
 
-#: ../mdkapplet:483
+#: ../mdkapplet:309
 #, c-format
-msgid ""
-"Problem occured while connecting to the server, please contact the support "
-"team"
-msgstr ""
-
-#: ../mdkapplet:487
-#, fuzzy, c-format
-msgid "Response from Mandriva Online server\n"
-msgstr "Mandriva Online'га марҳамат"
+msgid "Connecting to"
+msgstr "Алоқа ўрнатилмоқда"
 
-#: ../mdkapplet:490
+#: ../mdkapplet:386
 #, c-format
 msgid "System is up-to-date\n"
 msgstr ""
 
-#: ../mdkapplet:527
-#, c-format
-msgid "No check"
-msgstr ""
-
-#: ../mdkapplet:541
-#, c-format
-msgid "Checking config file: Not present\n"
-msgstr ""
-
-#: ../mdkapplet:544
+#: ../mdkapplet:415
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr ""
 
-#: ../mdkapplet:587
+#: ../mdkapplet:457 ../mdkupdate:118 ../mdkupdate:164
 #, c-format
-msgid "Logs"
-msgstr "Логлар"
-
-#: ../mdkapplet:603
-#, c-format
-msgid "Clear"
-msgstr "Тозалаш"
+msgid "Warning"
+msgstr "Диққат"
 
-#: ../mdkapplet:629
+#: ../mdkapplet:468
 #, c-format
 msgid "About..."
 msgstr "Ҳақида"
 
-#: ../mdkapplet:631
+#: ../mdkapplet:472
 #, fuzzy, c-format
 msgid "Mandriva Online %s"
 msgstr "Mandriva Online"
 
-#: ../mdkapplet:635
+#: ../mdkapplet:473
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Copyright (C) %s by Mandriva"
 
-#: ../mdkapplet:647
+#: ../mdkapplet:476
 #, c-format
 msgid "Mandriva Online gives access to Mandriva web services."
 msgstr ""
 
-#: ../mdkapplet:655
-#, c-format
-msgid "Always launch on startup"
-msgstr "Тизимга кирганда ишга тушириш"
-
-#: ../mdkapplet:657
-#, c-format
-msgid "Quit"
-msgstr "Чиқиш"
-
-#: ../mdkonline:58
-#, c-format
-msgid ""
-"mdonline version %s\n"
-"Copyright (C) %s Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"mdonline, версия %s\n"
-"Copyright (C) %s Mandriva.\n"
-"Бу эркин дастур ва GNU GPL шартлари асосида тарқатилиши мумкин.\n"
-"\n"
-"Фойдаланиш:\n"
-
-#: ../mdkonline:63 ../mdkupdate:73
-#, c-format
-msgid "  --help\t\t- print this help message.\n"
-msgstr "  --help\t\t- шу ёрдам хабарини кўрсатиш.\n"
-
-#: ../mdkonline:64
-#, c-format
-msgid "  --box=\t\t\t- hostname.\n"
-msgstr ""
-
-#: ../mdkonline:65
-#, c-format
-msgid "  --country\t\t\t- name of country of the user. \n"
-msgstr ""
-
-#: ../mdkonline:66
-#, c-format
-msgid "  --interactive\t\t- use the interactive mode.\n"
-msgstr ""
-
-#: ../mdkonline:67
-#, c-format
-msgid "  --nointeractive\t- use the non-interactive mode.\n"
-msgstr ""
-
-#: ../mdkonline:68
-#, c-format
-msgid "  --login=\t\t     - login name of the user.\n"
-msgstr ""
-
-#: ../mdkonline:69
-#, c-format
-msgid "  --pass=\t\t\t- password  of the user.\n"
-msgstr ""
-
-#: ../mdkonline:87 ../mdkonline:120
-#, c-format
-msgid "Mandriva Online"
-msgstr "Mandriva Online"
-
-#: ../mdkonline:90
-#, c-format
-msgid "I already have an account"
-msgstr ""
-
-#: ../mdkonline:91
-#, c-format
-msgid "I want to subscribe"
-msgstr ""
-
-#: ../mdkonline:96
-#, c-format
-msgid "Mr."
-msgstr "Жаноб"
-
-#: ../mdkonline:96
-#, c-format
-msgid "Mrs."
-msgstr "Хоним"
-
-#: ../mdkonline:96
-#, c-format
-msgid "Ms."
-msgstr "Хоним"
-
-#: ../mdkonline:114
-#, c-format
-msgid "Reading configuration\n"
-msgstr ""
-
-#: ../mdkonline:123
-#, c-format
-msgid ""
-"This assistant will help you to upload your configuration\n"
-"(packages, hardware configuration) to a centralized database in\n"
-"order to keep you informed about security updates and useful upgrades.\n"
-msgstr ""
-
-#: ../mdkonline:131
-#, c-format
-msgid "Account creation or authentication"
-msgstr ""
-
-#: ../mdkonline:136
-#, c-format
-msgid "Enter your Mandriva Online login, password and machine name:"
-msgstr ""
-
-#: ../mdkonline:142 ../mdkonline:195
-#, fuzzy, c-format
-msgid "Email address:"
-msgstr "IP рақами"
-
-#: ../mdkonline:143
-#, c-format
-msgid "Country"
-msgstr "Кантри"
-
-#: ../mdkonline:144 ../mdkonline:196
-#, c-format
-msgid "Password:"
-msgstr "Махфий сўз:"
-
-#: ../mdkonline:146
-#, fuzzy, c-format
-msgid "Machine description:"
-msgstr "Компьютернинг номи:"
-
-#: ../mdkonline:147
-#, c-format
-msgid "(Ex: My Home Office's Computer)"
-msgstr ""
-
-#: ../mdkonline:152 ../mdkonline:159 ../mdkonline:180 ../mdkonline:204
-#: ../mdkonline:208 ../mdkonline:212 ../mdkonline:217 ../mdkupdate:141
-#: ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
-#, c-format
-msgid "Error"
-msgstr "Хато"
-
-#: ../mdkonline:152
-#, fuzzy, c-format
-msgid "Machine name must be 1 to 40 alphanumerical characters"
-msgstr "Улаш нуқталари фақат сон ёки ҳарфлардан иборат бўлиши мумкин"
-
-#: ../mdkonline:155
-#, fuzzy, c-format
-msgid "Connecting to Mandriva Online website..."
-msgstr "Mandriva Online'га марҳамат"
-
-#: ../mdkonline:167
-#, c-format
-msgid ""
-"In order to benefit from Mandriva Online services,\n"
-"we are about to upload your configuration.\n"
-"\n"
-"The Wizard will now send the following information to Mandriva:\n"
-"\n"
-"1) the list of packages you have installed on your system,\n"
-"\n"
-"2) your hardware configuration.\n"
-"\n"
-"If you feel uncomfortable by that idea, or do not want to benefit from this "
-"service,\n"
-"please press 'Cancel'. By pressing 'Next', you allow us to keep you "
-"informed\n"
-"about security updates and useful upgrades via personalized email alerts.\n"
-"Furthermore, you benefit from discounted paid support services on\n"
-"www.mandrivaexpert.com."
-msgstr ""
-
-#: ../mdkonline:180
-#, c-format
-msgid "Connection problem"
-msgstr "Алоқа ўрнатишда муаммо"
-
-#: ../mdkonline:180
-#, c-format
-msgid "Problem occurs when uploading files, please try again"
-msgstr ""
-
-#: ../mdkonline:187
-#, c-format
-msgid "Create a Mandriva Online Account"
-msgstr "Mandriva Online ҳисобини яратиш"
-
-#. -PO: that is for things like "Mr", "Ms",...
-#: ../mdkonline:192
-#, fuzzy, c-format
-msgid "Greeting:"
-msgstr "Яшил"
-
-#: ../mdkonline:193
-#, c-format
-msgid "First name:"
-msgstr "Исми:"
-
-#: ../mdkonline:194
-#, fuzzy, c-format
-msgid "Last name:"
-msgstr "Исми:"
-
-#: ../mdkonline:197
-#, c-format
-msgid "Confirm Password:"
-msgstr "Махфий сўзни тасдиқланг:"
-
-#: ../mdkonline:204
-#, c-format
-msgid ""
-"The passwords do not match\n"
-" Please try again\n"
-msgstr ""
-"Махфий сўзлар мос келмайди\n"
-" Илтимос яна уриниб кўринг\n"
-
-#: ../mdkonline:208
-#, fuzzy, c-format
-msgid "Please fill in each field"
-msgstr "Илтимос ҳамма майдонларни тўлдиринг\n"
-
-#: ../mdkonline:212
-#, c-format
-msgid "Not a valid mail address!\n"
-msgstr "Электрон почта ҳақиқий эмас!\n"
-
-#: ../mdkonline:217
-#, fuzzy, c-format
-msgid "Creating account failed!"
-msgstr "Ҳисобни ўзгартириш"
-
-#: ../mdkonline:225
-#, c-format
-msgid ""
-"Mandriva Online Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
-msgstr ""
-
-#: ../mdkonline:229
-#, c-format
-msgid "Your upload was successful!"
-msgstr ""
-
-#: ../mdkonline:229
-#, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandriva Online."
-msgstr ""
-
-#: ../mdkonline:229
+#: ../mdkapplet:478
 #, c-format
-msgid ""
-"Mandriva Online offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
+msgid "Online WebSite"
 msgstr ""
 
-#: ../mdkonline:238
-#, c-format
-msgid "Congratulations"
-msgstr "Табриклаймиз!"
-
-#: ../mdkonline:238
+#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
+#: ../mdkapplet:483
 #, c-format
-msgid "Your Mandriva Online account has been successfully configured\n"
+msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
 
-#: ../mdkonline:253
+#: ../mdkapplet:492
 #, c-format
-msgid "Configuration uploaded successfully"
-msgstr ""
-
-#: ../mdkonline:254
-#, fuzzy, c-format
-msgid "Problem uploading configuration"
-msgstr "Мосламалар жўнатилмоқда..."
+msgid "Always launch on startup"
+msgstr "Тизимга кирганда ишга тушириш"
 
-#: ../mdkonline:256
+#: ../mdkapplet:494
 #, c-format
-msgid ""
-"Cannot connect to Mandriva Online website: wrong login/password or router/"
-"firewall bad settings"
-msgstr ""
+msgid "Quit"
+msgstr "Чиқиш"
 
 #: ../mdkonline.pm:207
 #, fuzzy, c-format
@@ -775,6 +346,11 @@ msgstr ""
 "\n"
 "Фойдаланиш:\n"
 
+#: ../mdkupdate:73
+#, c-format
+msgid "  --help\t\t- print this help message.\n"
+msgstr "  --help\t\t- шу ёрдам хабарини кўрсатиш.\n"
+
 #: ../mdkupdate:74
 #, fuzzy, c-format
 msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
@@ -802,11 +378,6 @@ msgid ""
 "file.\n"
 msgstr ""
 
-#: ../mdkupdate:118 ../mdkupdate:164
-#, c-format
-msgid "Warning"
-msgstr "Диққат"
-
 #. -PO: here Live Install is currently *NOT* translated on the desktop, so it's better to keep as it:
 #: ../mdkupdate:120
 #, c-format
@@ -815,11 +386,21 @@ msgid ""
 "Install' wizard."
 msgstr ""
 
+#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
+#, c-format
+msgid "Please wait"
+msgstr "Илтимос кутиб туринг"
+
 #: ../mdkupdate:123 ../mdkupdate:174
 #, c-format
 msgid "Preparing..."
 msgstr "Тайёрланмоқда..."
 
+#: ../mdkupdate:141 ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
+#, c-format
+msgid "Error"
+msgstr "Хато"
+
 #: ../mdkupdate:141
 #, c-format
 msgid ""
@@ -828,6 +409,11 @@ msgid ""
 "%s"
 msgstr ""
 
+#: ../mdkupdate:159 ../mdkupdate:188
+#, c-format
+msgid "An error occurred"
+msgstr "Хато рўй берди"
+
 #: ../mdkupdate:164
 #, c-format
 msgid ""
@@ -852,6 +438,153 @@ msgstr "Пакетлар ўрнатилмоқда...\n"
 msgid "Unable to update packages from update_source medium.\n"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Configure the service"
+#~ msgstr "Тармоқни мослаш"
+
+#~ msgid "Check updates"
+#~ msgstr "Янгиланишларни текшириш"
+
+#~ msgid "Actions"
+#~ msgstr "Амаллар"
+
+#~ msgid "Configure"
+#~ msgstr "Мослаш"
+
+#~ msgid "See logs"
+#~ msgstr "Логларни кўриш"
+
+#~ msgid "Status"
+#~ msgstr "Ҳолати"
+
+#~ msgid "Close"
+#~ msgstr "Ёпиш"
+
+#~ msgid "Network Connection: "
+#~ msgstr "Тармоқ: "
+
+#~ msgid "Up"
+#~ msgstr "Ишлаяпти"
+
+#~ msgid "Down"
+#~ msgstr "Ишламаяпти"
+
+#~ msgid "Last check: "
+#~ msgstr "Охирги текширув:"
+
+#~ msgid "Machine name:"
+#~ msgstr "Компьютернинг номи:"
+
+#, fuzzy
+#~ msgid "Updates: "
+#~ msgstr "Янги янгиланишлар: "
+
+#~ msgid "Wrong Password.\n"
+#~ msgstr "Махфий сўз нотўғри.\n"
+
+#, fuzzy
+#~ msgid "Response from Mandriva Online server\n"
+#~ msgstr "Mandriva Online'га марҳамат"
+
+#~ msgid "Logs"
+#~ msgstr "Логлар"
+
+#~ msgid "Clear"
+#~ msgstr "Тозалаш"
+
+#~ msgid ""
+#~ "mdonline version %s\n"
+#~ "Copyright (C) %s Mandriva.\n"
+#~ "This is free software and may be redistributed under the terms of the GNU "
+#~ "GPL.\n"
+#~ "\n"
+#~ "usage:\n"
+#~ msgstr ""
+#~ "mdonline, версия %s\n"
+#~ "Copyright (C) %s Mandriva.\n"
+#~ "Бу эркин дастур ва GNU GPL шартлари асосида тарқатилиши мумкин.\n"
+#~ "\n"
+#~ "Фойдаланиш:\n"
+
+#~ msgid "Mandriva Online"
+#~ msgstr "Mandriva Online"
+
+#~ msgid "Mr."
+#~ msgstr "Жаноб"
+
+#~ msgid "Mrs."
+#~ msgstr "Хоним"
+
+#~ msgid "Ms."
+#~ msgstr "Хоним"
+
+#, fuzzy
+#~ msgid "Email address:"
+#~ msgstr "IP рақами"
+
+#~ msgid "Country"
+#~ msgstr "Кантри"
+
+#~ msgid "Password:"
+#~ msgstr "Махфий сўз:"
+
+#, fuzzy
+#~ msgid "Machine description:"
+#~ msgstr "Компьютернинг номи:"
+
+#, fuzzy
+#~ msgid "Machine name must be 1 to 40 alphanumerical characters"
+#~ msgstr "Улаш нуқталари фақат сон ёки ҳарфлардан иборат бўлиши мумкин"
+
+#, fuzzy
+#~ msgid "Connecting to Mandriva Online website..."
+#~ msgstr "Mandriva Online'га марҳамат"
+
+#~ msgid "Connection problem"
+#~ msgstr "Алоқа ўрнатишда муаммо"
+
+#~ msgid "Create a Mandriva Online Account"
+#~ msgstr "Mandriva Online ҳисобини яратиш"
+
+#, fuzzy
+#~ msgid "Greeting:"
+#~ msgstr "Яшил"
+
+#~ msgid "First name:"
+#~ msgstr "Исми:"
+
+#, fuzzy
+#~ msgid "Last name:"
+#~ msgstr "Исми:"
+
+#~ msgid "Confirm Password:"
+#~ msgstr "Махфий сўзни тасдиқланг:"
+
+#~ msgid ""
+#~ "The passwords do not match\n"
+#~ " Please try again\n"
+#~ msgstr ""
+#~ "Махфий сўзлар мос келмайди\n"
+#~ " Илтимос яна уриниб кўринг\n"
+
+#, fuzzy
+#~ msgid "Please fill in each field"
+#~ msgstr "Илтимос ҳамма майдонларни тўлдиринг\n"
+
+#~ msgid "Not a valid mail address!\n"
+#~ msgstr "Электрон почта ҳақиқий эмас!\n"
+
+#, fuzzy
+#~ msgid "Creating account failed!"
+#~ msgstr "Ҳисобни ўзгартириш"
+
+#~ msgid "Congratulations"
+#~ msgstr "Табриклаймиз!"
+
+#, fuzzy
+#~ msgid "Problem uploading configuration"
+#~ msgstr "Мосламалар жўнатилмоқда..."
+
 #~ msgid "  --applet\t\t- launch Mandriva Update.\n"
 #~ msgstr "  --applet\t\t- Mandriva Update хизматини ишга тушириш.\n"
 
diff --git a/po/vi.po b/po/vi.po
index 8c677de3..704e351d 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline 0.15\n"
-"POT-Creation-Date: 2007-08-09 16:26+0200\n"
+"POT-Creation-Date: 2008-02-21 18:21+0100\n"
 "PO-Revision-Date: 2005-02-12 19:53+0700\n"
 "Last-Translator: Trinh Minh Thanh <tmthanh@yahoo.com>\n"
 "Language-Team: Gnome-Vi <Gnomevi-list@lists.sourceforge.net>\n"
@@ -15,17 +15,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:94
+#: ../mdkapplet:88
 #, fuzzy, c-format
 msgid "Will check updates at %s"
 msgstr "Kiểm tra cập nhật"
 
-#: ../mdkapplet:103
+#: ../mdkapplet:97
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "Hệ thống của bạn đã cập nhật"
 
-#: ../mdkapplet:109
+#: ../mdkapplet:103
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -34,53 +34,43 @@ msgstr ""
 "Trục trặc về cấu hình dịch vụ. Hãy xem log và gửi email tới "
 "support@mandrivaonline.com"
 
-#: ../mdkapplet:115
+#: ../mdkapplet:110
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "Hãy đợi, đang tìm các gói sẵn có..."
 
-#: ../mdkapplet:121
+#: ../mdkapplet:116
 #, c-format
 msgid "New updates are available for your system"
 msgstr "Có cập nhật mới cho hệ thống của bạn"
 
-#: ../mdkapplet:127
-#, fuzzy, c-format
-msgid "New bundles are available for your system"
-msgstr "Có cập nhật mới cho hệ thống của bạn"
-
-#: ../mdkapplet:133
-#, c-format
-msgid "Service is not configured. Please click on \"Configure the service\""
-msgstr "Chưa cấu hình dịch vụ. Hãy nhấn \"Cấu hình dịch vụ\""
-
-#: ../mdkapplet:139
+#: ../mdkapplet:122
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "Network chưa có. Hãy cấu hình network !"
 
-#: ../mdkapplet:145
+#: ../mdkapplet:128
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "Dịch vụ chưa được kích hoạt. Hãy nhấn chuột lên \"Website Trực Tuyến\""
 
-#: ../mdkapplet:151 ../mdkapplet:182
+#: ../mdkapplet:134 ../mdkapplet:165
 #, fuzzy, c-format
 msgid "urpmi database locked"
 msgstr "cơ sở dữ liệu urpmi bị khóa"
 
-#: ../mdkapplet:157
+#: ../mdkapplet:140
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr "Không hỗ trợ phát hành này (phát hành quá cũ hay là bản phát triển)"
 
-#: ../mdkapplet:163
+#: ../mdkapplet:146
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
 msgstr ""
 
-#: ../mdkapplet:169
+#: ../mdkapplet:152
 #, fuzzy, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -97,579 +87,131 @@ msgstr ""
 "\n"
 "Sau đó chạy lại %s."
 
-#: ../mdkapplet:174
+#: ../mdkapplet:157
 #, c-format
 msgid "Enabled"
 msgstr "Bật chạy"
 
-#: ../mdkapplet:187
+#: ../mdkapplet:170
 #, c-format
 msgid "Error updating media"
 msgstr ""
 
-#: ../mdkapplet:202
+#: ../mdkapplet:185
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr "Kiểm tra... Đang có bản cập nhật mới\n"
 
-#: ../mdkapplet:207
+#: ../mdkapplet:190
 #, c-format
 msgid "Packages are up to date"
 msgstr ""
 
-#: ../mdkapplet:212
+#: ../mdkapplet:195
 #, fuzzy, c-format
 msgid "Failed to open urpmi database"
 msgstr "không thể mở rpmdb"
 
-#: ../mdkapplet:217 ../mdkapplet:324
+#: ../mdkapplet:200
 #, c-format
 msgid "Install updates"
 msgstr "Cài đặt các cập nhật"
 
-#: ../mdkapplet:218
-#, c-format
-msgid "Configure the service"
-msgstr "Cấu hình dịch vụ"
-
-#: ../mdkapplet:219
+#: ../mdkapplet:201
 #, c-format
 msgid "Check Updates"
 msgstr "Kiểm tra cập nhật"
 
-#: ../mdkapplet:220 ../mdkapplet:327 ../mdkonline:114 ../mdkonline:155
-#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
-#, c-format
-msgid "Please wait"
-msgstr "Hãy đợi"
-
-#: ../mdkapplet:220 ../mdkapplet:326 ../mdkapplet:327
-#, c-format
-msgid "Check updates"
-msgstr "Kiểm tra cập nhật"
-
-#: ../mdkapplet:223 ../mdkapplet:648
-#, c-format
-msgid "Online WebSite"
-msgstr "WebSite Trực Tuyến"
-
-#: ../mdkapplet:224
+#: ../mdkapplet:202
 #, c-format
 msgid "Configure Network"
 msgstr "Cấu hình network"
 
-#: ../mdkapplet:225
-#, c-format
-msgid "Configure Now!"
-msgstr "Cấu hình bây giờ!"
-
-#: ../mdkapplet:313 ../mdkapplet:392
-#, c-format
-msgid "Mandriva Linux Updates Applet"
-msgstr "Applet Cập Nhật Mandriva Linux"
-
-#: ../mdkapplet:322
-#, c-format
-msgid "Actions"
-msgstr "Hành động"
-
-#: ../mdkapplet:325
-#, c-format
-msgid "Configure"
-msgstr "Cấu hình"
-
-#: ../mdkapplet:329
-#, c-format
-msgid "See logs"
-msgstr "Xem log"
-
-#: ../mdkapplet:332
-#, c-format
-msgid "Status"
-msgstr "Trạng thái"
-
-#: ../mdkapplet:336 ../mdkapplet:597
-#, c-format
-msgid "Close"
-msgstr "Đóng"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Network Connection: "
-msgstr "Kết nối mạng:"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Up"
-msgstr "Lên"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Down"
-msgstr "Xuống"
-
-#: ../mdkapplet:366
-#, c-format
-msgid "Last check: "
-msgstr "Lần kiểm tra cuối:"
-
-#: ../mdkapplet:367 ../mdkonline:145
-#, c-format
-msgid "Machine name:"
-msgstr "Tên máy tính:"
-
-#: ../mdkapplet:368
-#, c-format
-msgid "Updates: "
-msgstr "Cập nhật:"
-
-#: ../mdkapplet:372
+#: ../mdkapplet:283
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Chạy drakconnect\n"
 
-#: ../mdkapplet:375
+#: ../mdkapplet:286
 #, c-format
 msgid "Mandriva Online seems to be reinstalled, reloading applet ...."
 msgstr "Mandriva Online có vẻ được cài đặt lại, đang nạp lại applet ...."
 
-#: ../mdkapplet:383
+#: ../mdkapplet:294
 #, c-format
 msgid "Launching MandrivaUpdate\n"
 msgstr "Chạy MandrivaUpdate\n"
 
-#: ../mdkapplet:398
+#: ../mdkapplet:303
+#, c-format
+msgid "Mandriva Linux Updates Applet"
+msgstr "Applet Cập Nhật Mandriva Linux"
+
+#: ../mdkapplet:308
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Tính toán các cập nhật mới...\n"
 
-#: ../mdkapplet:399
+#: ../mdkapplet:309
 #, c-format
 msgid "Connecting to"
 msgstr "Kết nối tới"
 
-#: ../mdkapplet:467 ../mdkupdate:159 ../mdkupdate:188
-#, c-format
-msgid "An error occurred"
-msgstr "Lỗi xảy ra"
-
-#: ../mdkapplet:475
-#, c-format
-msgid "Development release not supported by service"
-msgstr "Dịch vụ không hỗ trợ phiên bản phát triển"
-
-#: ../mdkapplet:476
-#, c-format
-msgid "Too old release not supported by service"
-msgstr "Dịch vụ không hỗ trợ phiên bản quá cũ"
-
-#: ../mdkapplet:477
-#, c-format
-msgid "Unknown state"
-msgstr "Trạng thái không xác định"
-
-#: ../mdkapplet:478
-#, c-format
-msgid "Online services disabled. Contact Mandriva Online site\n"
-msgstr "Dịch vụ trực tuyến bị tắt. Hãy liên lạc với Mandriva Online site\n"
-
-#: ../mdkapplet:479
-#, c-format
-msgid "Wrong Password.\n"
-msgstr "Sai mật khẩu.\n"
-
-#: ../mdkapplet:480
-#, c-format
-msgid "Wrong Action or host or login.\n"
-msgstr "Sai hành động, host, đăng nhập.\n"
-
-#: ../mdkapplet:481
-#, c-format
-msgid ""
-"Something is wrong with your network settings (check your route, firewall or "
-"proxy settings)\n"
-msgstr ""
-"Có gi đó chưa đúng trong thiết lập mạng (hãy kiểm tra thiết lập route, tường "
-"lửa, proxy)\n"
-
-#: ../mdkapplet:483
-#, c-format
-msgid ""
-"Problem occured while connecting to the server, please contact the support "
-"team"
-msgstr "Có trục trặc khi kết nỗi tới máy chủ, hãy liên lạc với nhóm hỗ trợ"
-
-#: ../mdkapplet:487
-#, c-format
-msgid "Response from Mandriva Online server\n"
-msgstr "Trả lời từ máy chủ Mandriva Online\n"
-
-#: ../mdkapplet:490
+#: ../mdkapplet:386
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Hệ thống đã cập nhật mới\n"
 
-#: ../mdkapplet:527
-#, c-format
-msgid "No check"
-msgstr "Không kiểm tra"
-
-#: ../mdkapplet:541
-#, c-format
-msgid "Checking config file: Not present\n"
-msgstr "Kiểm tra tập tin cấu hình: không tồn tại\n"
-
-#: ../mdkapplet:544
+#: ../mdkapplet:415
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Kiểm tra mạng: có lẽ chưa bật chạy\n"
 
-#: ../mdkapplet:587
+#: ../mdkapplet:457 ../mdkupdate:118 ../mdkupdate:164
 #, c-format
-msgid "Logs"
-msgstr "Logs"
-
-#: ../mdkapplet:603
-#, c-format
-msgid "Clear"
-msgstr "Xóa sạch"
+msgid "Warning"
+msgstr "Cảnh báo"
 
-#: ../mdkapplet:629
+#: ../mdkapplet:468
 #, c-format
 msgid "About..."
 msgstr "Giới thiệu"
 
-#: ../mdkapplet:631
+#: ../mdkapplet:472
 #, fuzzy, c-format
 msgid "Mandriva Online %s"
 msgstr "Mandriva Online"
 
-#: ../mdkapplet:635
+#: ../mdkapplet:473
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr ""
 
-#: ../mdkapplet:647
+#: ../mdkapplet:476
 #, c-format
 msgid "Mandriva Online gives access to Mandriva web services."
 msgstr ""
 
-#: ../mdkapplet:655
-#, c-format
-msgid "Always launch on startup"
-msgstr "Luôn chạy khi khởi động"
-
-#: ../mdkapplet:657
-#, c-format
-msgid "Quit"
-msgstr "Thoát"
-
-#: ../mdkonline:58
-#, c-format
-msgid ""
-"mdonline version %s\n"
-"Copyright (C) %s Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"phiên bản mdonline %s\n"
-"Bản quyền (C) %s Mandriva.\n"
-"Đây là phần mềm tự do và có thể phân phối lại dưới các điều khoản của GNU/"
-"GPL.\n"
-"\n"
-"cách dùng:\n"
-
-#: ../mdkonline:63 ../mdkupdate:73
-#, c-format
-msgid "  --help\t\t- print this help message.\n"
-msgstr "  --help\t\t- in ra thông điệp trợ giúp này.\n"
-
-#: ../mdkonline:64
-#, c-format
-msgid "  --box=\t\t\t- hostname.\n"
-msgstr ""
-
-#: ../mdkonline:65
-#, c-format
-msgid "  --country\t\t\t- name of country of the user. \n"
-msgstr ""
-
-#: ../mdkonline:66
-#, c-format
-msgid "  --interactive\t\t- use the interactive mode.\n"
-msgstr ""
-
-#: ../mdkonline:67
-#, c-format
-msgid "  --nointeractive\t- use the non-interactive mode.\n"
-msgstr ""
-
-#: ../mdkonline:68
-#, c-format
-msgid "  --login=\t\t     - login name of the user.\n"
-msgstr ""
-
-#: ../mdkonline:69
-#, c-format
-msgid "  --pass=\t\t\t- password  of the user.\n"
-msgstr ""
-
-#: ../mdkonline:87 ../mdkonline:120
-#, c-format
-msgid "Mandriva Online"
-msgstr "Mandriva Online"
-
-#: ../mdkonline:90
-#, c-format
-msgid "I already have an account"
-msgstr "Tôi đã có một tài khoản"
-
-#: ../mdkonline:91
-#, c-format
-msgid "I want to subscribe"
-msgstr "Tôi muốn đăng ký"
-
-#: ../mdkonline:96
-#, c-format
-msgid "Mr."
-msgstr "Ô."
-
-#: ../mdkonline:96
-#, c-format
-msgid "Mrs."
-msgstr "B."
-
-#: ../mdkonline:96
-#, c-format
-msgid "Ms."
-msgstr "B."
-
-#: ../mdkonline:114
-#, c-format
-msgid "Reading configuration\n"
-msgstr "Đang đọc cấu hình\n"
-
-#: ../mdkonline:123
-#, c-format
-msgid ""
-"This assistant will help you to upload your configuration\n"
-"(packages, hardware configuration) to a centralized database in\n"
-"order to keep you informed about security updates and useful upgrades.\n"
-msgstr ""
-"Trợ giúp này sẽ giúp bạn tải lên cấu hình bạn có\n"
-"(các gói, cấu hình phần cứng) đến cơ sở dữ liệu tập chung nhằm\n"
-"duy trì thông báo cho bạn về các cập nhật bảo mật và nâng cấp hữu ích.\n"
-
-#: ../mdkonline:131
-#, c-format
-msgid "Account creation or authentication"
-msgstr "Việc tạo tài khoản hay chứng thực"
-
-#: ../mdkonline:136
-#, c-format
-msgid "Enter your Mandriva Online login, password and machine name:"
-msgstr "Hãy điền tên đăng nhập MandraleOnline, mật khẩu và tên máy:"
-
-#: ../mdkonline:142 ../mdkonline:195
-#, fuzzy, c-format
-msgid "Email address:"
-msgstr "Địa chỉ thư gửi đi"
-
-#: ../mdkonline:143
-#, c-format
-msgid "Country"
-msgstr "Quốc gia"
-
-#: ../mdkonline:144 ../mdkonline:196
-#, c-format
-msgid "Password:"
-msgstr "Mật khẩu:"
-
-#: ../mdkonline:146
-#, fuzzy, c-format
-msgid "Machine description:"
-msgstr "Tên máy tính:"
-
-#: ../mdkonline:147
-#, c-format
-msgid "(Ex: My Home Office's Computer)"
-msgstr ""
-
-#: ../mdkonline:152 ../mdkonline:159 ../mdkonline:180 ../mdkonline:204
-#: ../mdkonline:208 ../mdkonline:212 ../mdkonline:217 ../mdkupdate:141
-#: ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
-#, c-format
-msgid "Error"
-msgstr "Lỗi"
-
-#: ../mdkonline:152
-#, fuzzy, c-format
-msgid "Machine name must be 1 to 40 alphanumerical characters"
-msgstr "Các điểm gắn kết chỉ nên dùng các ký tự chữ và số"
-
-#: ../mdkonline:155
-#, c-format
-msgid "Connecting to Mandriva Online website..."
-msgstr "Đang kết nối đến Mandriva Online website..."
-
-#: ../mdkonline:167
-#, c-format
-msgid ""
-"In order to benefit from Mandriva Online services,\n"
-"we are about to upload your configuration.\n"
-"\n"
-"The Wizard will now send the following information to Mandriva:\n"
-"\n"
-"1) the list of packages you have installed on your system,\n"
-"\n"
-"2) your hardware configuration.\n"
-"\n"
-"If you feel uncomfortable by that idea, or do not want to benefit from this "
-"service,\n"
-"please press 'Cancel'. By pressing 'Next', you allow us to keep you "
-"informed\n"
-"about security updates and useful upgrades via personalized email alerts.\n"
-"Furthermore, you benefit from discounted paid support services on\n"
-"www.mandrivaexpert.com."
-msgstr ""
-"Để nhận lợi ích từ các dịch vụ Mandriva Online,\n"
-"chúng tôi sẽ tải lên cấu hình bạn có.\n"
-"\n"
-"Bây giờ, đồ thuật sẽ gửi những thông tin sau tới Mandriva:\n"
-"\n"
-"1) danh sách các gói đã được cài đặt lên hệ thống,\n"
-"\n"
-"2) cấu hình phần cứng.\n"
-"\n"
-"Nếu cảm thấy không thoải mái, hoặc không muốn hưởng lợi từ dịch vụ này,\n"
-"hãy nhấn 'Bỏ qua'. Nếu nhấn 'Tiếp theo', chúng tôi sẽ được phép gửi bạn "
-"thông báo\n"
-"về các cập nhật bảo mật và các nâng cấp hữu ích thông qua e-mail cá nhân.\n"
-"Thêm nữa, bạn được hưởng lợi do giảm giá chi trả cho các dịch vụ hỗ trợ tại\n"
-"www.mandrivaexpert.com."
-
-#: ../mdkonline:180
-#, c-format
-msgid "Connection problem"
-msgstr "Trục trặc kết nối"
-
-#: ../mdkonline:180
-#, c-format
-msgid "Problem occurs when uploading files, please try again"
-msgstr "Trục trặc khi tải lên các tập tin, hãy thực hiện lại"
-
-#: ../mdkonline:187
-#, c-format
-msgid "Create a Mandriva Online Account"
-msgstr "Tạo tài khoản Mandriva Online"
-
-#. -PO: that is for things like "Mr", "Ms",...
-#: ../mdkonline:192
-#, fuzzy, c-format
-msgid "Greeting:"
-msgstr "Xanh lá cây"
-
-#: ../mdkonline:193
-#, c-format
-msgid "First name:"
-msgstr "Tên đầu:"
-
-#: ../mdkonline:194
-#, fuzzy, c-format
-msgid "Last name:"
-msgstr "Tên đầu:"
-
-#: ../mdkonline:197
-#, c-format
-msgid "Confirm Password:"
-msgstr "Xác Nhận Mật Khẩu:"
-
-#: ../mdkonline:204
-#, c-format
-msgid ""
-"The passwords do not match\n"
-" Please try again\n"
-msgstr ""
-"Mật khẩu không khớp\n"
-" Hãy thử lại\n"
-
-#: ../mdkonline:208
-#, fuzzy, c-format
-msgid "Please fill in each field"
-msgstr "Hãy điền đủ các trường\n"
-
-#: ../mdkonline:212
-#, c-format
-msgid "Not a valid mail address!\n"
-msgstr "Địa chỉ thư không hợp lệ!\n"
-
-#: ../mdkonline:217
-#, c-format
-msgid "Creating account failed!"
-msgstr ""
-
-#: ../mdkonline:225
-#, c-format
-msgid ""
-"Mandriva Online Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
-msgstr ""
-"Đã tạo được tài khoản Mandriva Online.\n"
-"Hãy nhấn \"Tiếp theo\" để chứng thực và tải lên cấu hình của bạn\n"
-
-#: ../mdkonline:229
-#, c-format
-msgid "Your upload was successful!"
-msgstr "Đã hoàn thành việc tải lên!"
-
-#: ../mdkonline:229
+#: ../mdkapplet:478
 #, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandriva Online."
-msgstr ""
-"Từ bây giờ, bạn sẽ nhận được các thông\n"
-"báo về cập nhật bảo mật thông qua Mandriva Online."
+msgid "Online WebSite"
+msgstr "WebSite Trực Tuyến"
 
-#: ../mdkonline:229
+#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
+#: ../mdkapplet:483
 #, c-format
-msgid ""
-"Mandriva Online offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
+msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
-"Mandriva Online cung cấp khả năng tự động cập nhật.\n"
-"Một chương trình sẽ chạy thường quy trong hệ thống để đợi các cập nhật mới\n"
-
-#: ../mdkonline:238
-#, c-format
-msgid "Congratulations"
-msgstr "Chúc mừng"
 
-#: ../mdkonline:238
+#: ../mdkapplet:492
 #, c-format
-msgid "Your Mandriva Online account has been successfully configured\n"
-msgstr "Cấu hình thành công tài khoản Mandriva Online của bạn\n"
-
-#: ../mdkonline:253
-#, c-format
-msgid "Configuration uploaded successfully"
-msgstr "Hoàn thành việc tải lên cấu hình"
-
-#: ../mdkonline:254
-#, c-format
-msgid "Problem uploading configuration"
-msgstr "Lỗi tải lên cấu hình"
+msgid "Always launch on startup"
+msgstr "Luôn chạy khi khởi động"
 
-#: ../mdkonline:256
+#: ../mdkapplet:494
 #, c-format
-msgid ""
-"Cannot connect to Mandriva Online website: wrong login/password or router/"
-"firewall bad settings"
-msgstr ""
-"Không thể kết nối đến mandrivaonline website: sai đăng nhập/mật khẩu hoặc "
-"thiết lập sai router/firewall"
+msgid "Quit"
+msgstr "Thoát"
 
 #: ../mdkonline.pm:207
 #, fuzzy, c-format
@@ -808,6 +350,11 @@ msgstr ""
 "\n"
 "cách dùng:\n"
 
+#: ../mdkupdate:73
+#, c-format
+msgid "  --help\t\t- print this help message.\n"
+msgstr "  --help\t\t- in ra thông điệp trợ giúp này.\n"
+
 #: ../mdkupdate:74
 #, c-format
 msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
@@ -835,11 +382,6 @@ msgid ""
 "file.\n"
 msgstr ""
 
-#: ../mdkupdate:118 ../mdkupdate:164
-#, c-format
-msgid "Warning"
-msgstr "Cảnh báo"
-
 #. -PO: here Live Install is currently *NOT* translated on the desktop, so it's better to keep as it:
 #: ../mdkupdate:120
 #, c-format
@@ -848,11 +390,21 @@ msgid ""
 "Install' wizard."
 msgstr ""
 
+#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
+#, c-format
+msgid "Please wait"
+msgstr "Hãy đợi"
+
 #: ../mdkupdate:123 ../mdkupdate:174
 #, c-format
 msgid "Preparing..."
 msgstr "Đang chuẩn bị..."
 
+#: ../mdkupdate:141 ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
+#, c-format
+msgid "Error"
+msgstr "Lỗi"
+
 #: ../mdkupdate:141
 #, c-format
 msgid ""
@@ -861,6 +413,11 @@ msgid ""
 "%s"
 msgstr ""
 
+#: ../mdkupdate:159 ../mdkupdate:188
+#, c-format
+msgid "An error occurred"
+msgstr "Lỗi xảy ra"
+
 #: ../mdkupdate:164
 #, c-format
 msgid ""
@@ -885,6 +442,290 @@ msgstr "Đang cài đặt các gói tin ...\n"
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "Không thể cập nhật các gói từ phương tiện update_source.\n"
 
+#, fuzzy
+#~ msgid "New bundles are available for your system"
+#~ msgstr "Có cập nhật mới cho hệ thống của bạn"
+
+#~ msgid "Service is not configured. Please click on \"Configure the service\""
+#~ msgstr "Chưa cấu hình dịch vụ. Hãy nhấn \"Cấu hình dịch vụ\""
+
+#~ msgid "Configure the service"
+#~ msgstr "Cấu hình dịch vụ"
+
+#~ msgid "Check updates"
+#~ msgstr "Kiểm tra cập nhật"
+
+#~ msgid "Configure Now!"
+#~ msgstr "Cấu hình bây giờ!"
+
+#~ msgid "Actions"
+#~ msgstr "Hành động"
+
+#~ msgid "Configure"
+#~ msgstr "Cấu hình"
+
+#~ msgid "See logs"
+#~ msgstr "Xem log"
+
+#~ msgid "Status"
+#~ msgstr "Trạng thái"
+
+#~ msgid "Close"
+#~ msgstr "Đóng"
+
+#~ msgid "Network Connection: "
+#~ msgstr "Kết nối mạng:"
+
+#~ msgid "Up"
+#~ msgstr "Lên"
+
+#~ msgid "Down"
+#~ msgstr "Xuống"
+
+#~ msgid "Last check: "
+#~ msgstr "Lần kiểm tra cuối:"
+
+#~ msgid "Machine name:"
+#~ msgstr "Tên máy tính:"
+
+#~ msgid "Updates: "
+#~ msgstr "Cập nhật:"
+
+#~ msgid "Development release not supported by service"
+#~ msgstr "Dịch vụ không hỗ trợ phiên bản phát triển"
+
+#~ msgid "Too old release not supported by service"
+#~ msgstr "Dịch vụ không hỗ trợ phiên bản quá cũ"
+
+#~ msgid "Unknown state"
+#~ msgstr "Trạng thái không xác định"
+
+#~ msgid "Online services disabled. Contact Mandriva Online site\n"
+#~ msgstr "Dịch vụ trực tuyến bị tắt. Hãy liên lạc với Mandriva Online site\n"
+
+#~ msgid "Wrong Password.\n"
+#~ msgstr "Sai mật khẩu.\n"
+
+#~ msgid "Wrong Action or host or login.\n"
+#~ msgstr "Sai hành động, host, đăng nhập.\n"
+
+#~ msgid ""
+#~ "Something is wrong with your network settings (check your route, firewall "
+#~ "or proxy settings)\n"
+#~ msgstr ""
+#~ "Có gi đó chưa đúng trong thiết lập mạng (hãy kiểm tra thiết lập route, "
+#~ "tường lửa, proxy)\n"
+
+#~ msgid ""
+#~ "Problem occured while connecting to the server, please contact the "
+#~ "support team"
+#~ msgstr "Có trục trặc khi kết nỗi tới máy chủ, hãy liên lạc với nhóm hỗ trợ"
+
+#~ msgid "Response from Mandriva Online server\n"
+#~ msgstr "Trả lời từ máy chủ Mandriva Online\n"
+
+#~ msgid "No check"
+#~ msgstr "Không kiểm tra"
+
+#~ msgid "Checking config file: Not present\n"
+#~ msgstr "Kiểm tra tập tin cấu hình: không tồn tại\n"
+
+#~ msgid "Logs"
+#~ msgstr "Logs"
+
+#~ msgid "Clear"
+#~ msgstr "Xóa sạch"
+
+#~ msgid ""
+#~ "mdonline version %s\n"
+#~ "Copyright (C) %s Mandriva.\n"
+#~ "This is free software and may be redistributed under the terms of the GNU "
+#~ "GPL.\n"
+#~ "\n"
+#~ "usage:\n"
+#~ msgstr ""
+#~ "phiên bản mdonline %s\n"
+#~ "Bản quyền (C) %s Mandriva.\n"
+#~ "Đây là phần mềm tự do và có thể phân phối lại dưới các điều khoản của GNU/"
+#~ "GPL.\n"
+#~ "\n"
+#~ "cách dùng:\n"
+
+#~ msgid "Mandriva Online"
+#~ msgstr "Mandriva Online"
+
+#~ msgid "I already have an account"
+#~ msgstr "Tôi đã có một tài khoản"
+
+#~ msgid "I want to subscribe"
+#~ msgstr "Tôi muốn đăng ký"
+
+#~ msgid "Mr."
+#~ msgstr "Ô."
+
+#~ msgid "Mrs."
+#~ msgstr "B."
+
+#~ msgid "Ms."
+#~ msgstr "B."
+
+#~ msgid "Reading configuration\n"
+#~ msgstr "Đang đọc cấu hình\n"
+
+#~ msgid ""
+#~ "This assistant will help you to upload your configuration\n"
+#~ "(packages, hardware configuration) to a centralized database in\n"
+#~ "order to keep you informed about security updates and useful upgrades.\n"
+#~ msgstr ""
+#~ "Trợ giúp này sẽ giúp bạn tải lên cấu hình bạn có\n"
+#~ "(các gói, cấu hình phần cứng) đến cơ sở dữ liệu tập chung nhằm\n"
+#~ "duy trì thông báo cho bạn về các cập nhật bảo mật và nâng cấp hữu ích.\n"
+
+#~ msgid "Account creation or authentication"
+#~ msgstr "Việc tạo tài khoản hay chứng thực"
+
+#~ msgid "Enter your Mandriva Online login, password and machine name:"
+#~ msgstr "Hãy điền tên đăng nhập MandraleOnline, mật khẩu và tên máy:"
+
+#, fuzzy
+#~ msgid "Email address:"
+#~ msgstr "Địa chỉ thư gửi đi"
+
+#~ msgid "Country"
+#~ msgstr "Quốc gia"
+
+#~ msgid "Password:"
+#~ msgstr "Mật khẩu:"
+
+#, fuzzy
+#~ msgid "Machine description:"
+#~ msgstr "Tên máy tính:"
+
+#, fuzzy
+#~ msgid "Machine name must be 1 to 40 alphanumerical characters"
+#~ msgstr "Các điểm gắn kết chỉ nên dùng các ký tự chữ và số"
+
+#~ msgid "Connecting to Mandriva Online website..."
+#~ msgstr "Đang kết nối đến Mandriva Online website..."
+
+#~ msgid ""
+#~ "In order to benefit from Mandriva Online services,\n"
+#~ "we are about to upload your configuration.\n"
+#~ "\n"
+#~ "The Wizard will now send the following information to Mandriva:\n"
+#~ "\n"
+#~ "1) the list of packages you have installed on your system,\n"
+#~ "\n"
+#~ "2) your hardware configuration.\n"
+#~ "\n"
+#~ "If you feel uncomfortable by that idea, or do not want to benefit from "
+#~ "this service,\n"
+#~ "please press 'Cancel'. By pressing 'Next', you allow us to keep you "
+#~ "informed\n"
+#~ "about security updates and useful upgrades via personalized email "
+#~ "alerts.\n"
+#~ "Furthermore, you benefit from discounted paid support services on\n"
+#~ "www.mandrivaexpert.com."
+#~ msgstr ""
+#~ "Để nhận lợi ích từ các dịch vụ Mandriva Online,\n"
+#~ "chúng tôi sẽ tải lên cấu hình bạn có.\n"
+#~ "\n"
+#~ "Bây giờ, đồ thuật sẽ gửi những thông tin sau tới Mandriva:\n"
+#~ "\n"
+#~ "1) danh sách các gói đã được cài đặt lên hệ thống,\n"
+#~ "\n"
+#~ "2) cấu hình phần cứng.\n"
+#~ "\n"
+#~ "Nếu cảm thấy không thoải mái, hoặc không muốn hưởng lợi từ dịch vụ này,\n"
+#~ "hãy nhấn 'Bỏ qua'. Nếu nhấn 'Tiếp theo', chúng tôi sẽ được phép gửi bạn "
+#~ "thông báo\n"
+#~ "về các cập nhật bảo mật và các nâng cấp hữu ích thông qua e-mail cá "
+#~ "nhân.\n"
+#~ "Thêm nữa, bạn được hưởng lợi do giảm giá chi trả cho các dịch vụ hỗ trợ "
+#~ "tại\n"
+#~ "www.mandrivaexpert.com."
+
+#~ msgid "Connection problem"
+#~ msgstr "Trục trặc kết nối"
+
+#~ msgid "Problem occurs when uploading files, please try again"
+#~ msgstr "Trục trặc khi tải lên các tập tin, hãy thực hiện lại"
+
+#~ msgid "Create a Mandriva Online Account"
+#~ msgstr "Tạo tài khoản Mandriva Online"
+
+#, fuzzy
+#~ msgid "Greeting:"
+#~ msgstr "Xanh lá cây"
+
+#~ msgid "First name:"
+#~ msgstr "Tên đầu:"
+
+#, fuzzy
+#~ msgid "Last name:"
+#~ msgstr "Tên đầu:"
+
+#~ msgid "Confirm Password:"
+#~ msgstr "Xác Nhận Mật Khẩu:"
+
+#~ msgid ""
+#~ "The passwords do not match\n"
+#~ " Please try again\n"
+#~ msgstr ""
+#~ "Mật khẩu không khớp\n"
+#~ " Hãy thử lại\n"
+
+#, fuzzy
+#~ msgid "Please fill in each field"
+#~ msgstr "Hãy điền đủ các trường\n"
+
+#~ msgid "Not a valid mail address!\n"
+#~ msgstr "Địa chỉ thư không hợp lệ!\n"
+
+#~ msgid ""
+#~ "Mandriva Online Account successfully created.\n"
+#~ "Please click \"Next\" to authenticate and upload your configuration\n"
+#~ msgstr ""
+#~ "Đã tạo được tài khoản Mandriva Online.\n"
+#~ "Hãy nhấn \"Tiếp theo\" để chứng thực và tải lên cấu hình của bạn\n"
+
+#~ msgid "Your upload was successful!"
+#~ msgstr "Đã hoàn thành việc tải lên!"
+
+#~ msgid ""
+#~ "From now you will receive on security and updates \n"
+#~ "announcements thanks to Mandriva Online."
+#~ msgstr ""
+#~ "Từ bây giờ, bạn sẽ nhận được các thông\n"
+#~ "báo về cập nhật bảo mật thông qua Mandriva Online."
+
+#~ msgid ""
+#~ "Mandriva Online offers you the ability to automate the updates.\n"
+#~ "A program will run regulary in your system waiting for new updates\n"
+#~ msgstr ""
+#~ "Mandriva Online cung cấp khả năng tự động cập nhật.\n"
+#~ "Một chương trình sẽ chạy thường quy trong hệ thống để đợi các cập nhật "
+#~ "mới\n"
+
+#~ msgid "Congratulations"
+#~ msgstr "Chúc mừng"
+
+#~ msgid "Your Mandriva Online account has been successfully configured\n"
+#~ msgstr "Cấu hình thành công tài khoản Mandriva Online của bạn\n"
+
+#~ msgid "Configuration uploaded successfully"
+#~ msgstr "Hoàn thành việc tải lên cấu hình"
+
+#~ msgid "Problem uploading configuration"
+#~ msgstr "Lỗi tải lên cấu hình"
+
+#~ msgid ""
+#~ "Cannot connect to Mandriva Online website: wrong login/password or router/"
+#~ "firewall bad settings"
+#~ msgstr ""
+#~ "Không thể kết nối đến mandrivaonline website: sai đăng nhập/mật khẩu hoặc "
+#~ "thiết lập sai router/firewall"
+
 #~ msgid "  --applet\t\t- launch Mandriva Update.\n"
 #~ msgstr "  --applet\t\t- chạy Mandriva Update.\n"
 
diff --git a/po/wa.po b/po/wa.po
index 53451230..ea86c99a 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-09 16:26+0200\n"
+"POT-Creation-Date: 2008-02-21 18:21+0100\n"
 "PO-Revision-Date: 2004-08-11 20:48+0200\n"
 "Last-Translator: Pablo Saratxaga <pablo@walon.org>\n"
 "Language-Team: Walloon <linux-wa@walon.org>\n"
@@ -18,17 +18,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:94
+#: ../mdkapplet:88
 #, fuzzy, c-format
 msgid "Will check updates at %s"
 msgstr "Verifyî les metaedjes a djoû"
 
-#: ../mdkapplet:103
+#: ../mdkapplet:97
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "Li sistinme da vosse est a djoû"
 
-#: ../mdkapplet:109
+#: ../mdkapplet:103
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -37,48 +37,38 @@ msgstr ""
 "Åk n' a nén stî tot-z apontiant l' siervice. Loukîz les djournås eyet emilez "
 "po dire li problinme a support@mandrivaonline.com"
 
-#: ../mdkapplet:115
+#: ../mdkapplet:110
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "Tårdjîz on pô s' i vs plait, dji cwir après les pacaedjes k' i gn a..."
 
-#: ../mdkapplet:121
+#: ../mdkapplet:116
 #, c-format
 msgid "New updates are available for your system"
 msgstr "I gn des noveas metaedjes a djoû po vosse sistinme"
 
-#: ../mdkapplet:127
-#, c-format
-msgid "New bundles are available for your system"
-msgstr "I gn des noveas «bundles» po vosse sistinme"
-
-#: ../mdkapplet:133
-#, c-format
-msgid "Service is not configured. Please click on \"Configure the service\""
-msgstr "Siervice nén apontyî. Clitchîz so «Apontyî l' siervice»"
-
-#: ../mdkapplet:139
+#: ../mdkapplet:122
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "Li rantoele est djus. Apontyîz l' rantoele s' i vs plait."
 
-#: ../mdkapplet:145
+#: ../mdkapplet:128
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "Siervice nén èn alaedje. Clitchîz so «Waibe»"
 
-#: ../mdkapplet:151 ../mdkapplet:182
+#: ../mdkapplet:134 ../mdkapplet:165
 #, c-format
 msgid "urpmi database locked"
 msgstr "båze di dnêyes urpmi serêye"
 
-#: ../mdkapplet:157
+#: ../mdkapplet:140
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 "Modêye nén sopoirtêye (modêye pår trop viye, ou modêye di diswalpaedje)"
 
-#: ../mdkapplet:163
+#: ../mdkapplet:146
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
@@ -86,7 +76,7 @@ msgstr ""
 "Nou sopoirt di trové. Vos ndè dvoz radjouter onk avou l' «Manaedjeu des "
 "sopoirts d' astalaedje»."
 
-#: ../mdkapplet:169
+#: ../mdkapplet:152
 #, fuzzy, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -103,589 +93,134 @@ msgstr ""
 "\n"
 "Poy, renondez %s."
 
-#: ../mdkapplet:174
+#: ../mdkapplet:157
 #, c-format
 msgid "Enabled"
 msgstr "En alaedje"
 
-#: ../mdkapplet:187
+#: ../mdkapplet:170
 #, c-format
 msgid "Error updating media"
 msgstr "Åk n' a nén stî tot metant a djoû les sopoirts"
 
-#: ../mdkapplet:202
+#: ../mdkapplet:185
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr "Verifiant... Des metaedjes a djoû sont disponibes\n"
 
-#: ../mdkapplet:207
+#: ../mdkapplet:190
 #, c-format
 msgid "Packages are up to date"
 msgstr "Les pacaedjes sont-st a djoû"
 
-#: ../mdkapplet:212
+#: ../mdkapplet:195
 #, c-format
 msgid "Failed to open urpmi database"
 msgstr "Dji n' sai drovi l' båze di dnêyes urpmi"
 
-#: ../mdkapplet:217 ../mdkapplet:324
+#: ../mdkapplet:200
 #, c-format
 msgid "Install updates"
 msgstr "Astaler les metaedjes a djoû"
 
-#: ../mdkapplet:218
-#, c-format
-msgid "Configure the service"
-msgstr "Apontyî l' siervice"
-
-#: ../mdkapplet:219
+#: ../mdkapplet:201
 #, c-format
 msgid "Check Updates"
 msgstr "Verifyî les metaedjes a djoû"
 
-#: ../mdkapplet:220 ../mdkapplet:327 ../mdkonline:114 ../mdkonline:155
-#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
-#, c-format
-msgid "Please wait"
-msgstr "Tårdjîz on pô, s' i vs plait"
-
-#: ../mdkapplet:220 ../mdkapplet:326 ../mdkapplet:327
-#, c-format
-msgid "Check updates"
-msgstr "Verifyî les metaedjes a djoû"
-
-#: ../mdkapplet:223 ../mdkapplet:648
-#, c-format
-msgid "Online WebSite"
-msgstr "Waibe"
-
-#: ../mdkapplet:224
+#: ../mdkapplet:202
 #, c-format
 msgid "Configure Network"
 msgstr "Apontyî l' rantoele"
 
-#: ../mdkapplet:225
-#, c-format
-msgid "Configure Now!"
-msgstr "Apontyî do côp!"
-
-#: ../mdkapplet:313 ../mdkapplet:392
-#, c-format
-msgid "Mandriva Linux Updates Applet"
-msgstr "Aplikete di metaedjes a djoû"
-
-#: ../mdkapplet:322
-#, c-format
-msgid "Actions"
-msgstr "Accions"
-
-#: ../mdkapplet:325
-#, c-format
-msgid "Configure"
-msgstr "Apontyî"
-
-#: ../mdkapplet:329
-#, c-format
-msgid "See logs"
-msgstr "Vey les djournås"
-
-#: ../mdkapplet:332
-#, c-format
-msgid "Status"
-msgstr "Estat"
-
-#: ../mdkapplet:336 ../mdkapplet:597
-#, c-format
-msgid "Close"
-msgstr "Clôre"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Network Connection: "
-msgstr "Raloyaedje al rantoele: "
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Up"
-msgstr "En alaedje"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Down"
-msgstr "Essocté"
-
-#: ../mdkapplet:366
-#, c-format
-msgid "Last check: "
-msgstr "Dierin verifiaedje: "
-
-#: ../mdkapplet:367 ../mdkonline:145
-#, c-format
-msgid "Machine name:"
-msgstr "No d' l' éndjole:"
-
-#: ../mdkapplet:368
-#, c-format
-msgid "Updates: "
-msgstr "Metaedjes a djoû: "
-
-#: ../mdkapplet:372
+#: ../mdkapplet:283
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Enondant drakconnect\n"
 
-#: ../mdkapplet:375
+#: ../mdkapplet:286
 #, c-format
 msgid "Mandriva Online seems to be reinstalled, reloading applet ...."
 msgstr ""
 "I shonnreut k' Mandriva Online åye sitî rastalé, dji rtchedje l' aplikete..."
 
-#: ../mdkapplet:383
+#: ../mdkapplet:294
 #, c-format
 msgid "Launching MandrivaUpdate\n"
 msgstr "Enondant «MandrivaUpdate»\n"
 
-#: ../mdkapplet:398
+#: ../mdkapplet:303
+#, c-format
+msgid "Mandriva Linux Updates Applet"
+msgstr "Aplikete di metaedjes a djoû"
+
+#: ../mdkapplet:308
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Carculaedje des metaedjes a djoû...\n"
 
-#: ../mdkapplet:399
+#: ../mdkapplet:309
 #, c-format
 msgid "Connecting to"
 msgstr "Dji m' raloyaedje a"
 
-#: ../mdkapplet:467 ../mdkupdate:159 ../mdkupdate:188
-#, c-format
-msgid "An error occurred"
-msgstr "Dj' aroke so ene sacwè"
-
-#: ../mdkapplet:475
-#, c-format
-msgid "Development release not supported by service"
-msgstr "Modêye di diswalpaedje nén sopoirtêye på siervice"
-
-#: ../mdkapplet:476
-#, c-format
-msgid "Too old release not supported by service"
-msgstr "Modêye pår trop viye nén sopoirtêye på siervice"
-
-#: ../mdkapplet:477
-#, c-format
-msgid "Unknown state"
-msgstr "Estat nén cnoxhou"
-
-#: ../mdkapplet:478
-#, c-format
-msgid "Online services disabled. Contact Mandriva Online site\n"
-msgstr ""
-"Les siervices so les fyis sont essoctés. Contactez li site Mandriva Online\n"
-
-#: ../mdkapplet:479
-#, c-format
-msgid "Wrong Password.\n"
-msgstr "Måva scret.\n"
-
-#: ../mdkapplet:480
-#, c-format
-msgid "Wrong Action or host or login.\n"
-msgstr "Accion, no d' lodjoe ou no d' elodjaedje nén corek.\n"
-
-#: ../mdkapplet:481
-#, c-format
-msgid ""
-"Something is wrong with your network settings (check your route, firewall or "
-"proxy settings)\n"
-msgstr ""
-"I gn a åk ki n' va nén avou vost apontiaedje rantoele (verifyîz vosse "
-"routaedje, li côpe-feu eyet l' apontiaedje do procsi)\n"
-
-#: ../mdkapplet:483
-#, c-format
-msgid ""
-"Problem occured while connecting to the server, please contact the support "
-"team"
-msgstr ""
-"Åk n' a nén stî tot s' raloyant å sierveu, atôtchîz l' ekipe di sopoirt s' i "
-"vs plait"
-
-#: ../mdkapplet:487
-#, c-format
-msgid "Response from Mandriva Online server\n"
-msgstr "Response do sierveu Mandriva Online\n"
-
-#: ../mdkapplet:490
+#: ../mdkapplet:386
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Li sistinme est a djoû\n"
 
-#: ../mdkapplet:527
-#, c-format
-msgid "No check"
-msgstr "Pont d' verifiaedje"
-
-#: ../mdkapplet:541
-#, c-format
-msgid "Checking config file: Not present\n"
-msgstr "Verifiaedje do fitchî d' apontiaedje: nén la\n"
-
-#: ../mdkapplet:544
+#: ../mdkapplet:415
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Verifiaedje del rantoele: i shonnreut k' ele ni soeye nén en alaedje\n"
 
-#: ../mdkapplet:587
-#, c-format
-msgid "Logs"
-msgstr "Djournås"
-
-#: ../mdkapplet:603
+#: ../mdkapplet:457 ../mdkupdate:118 ../mdkupdate:164
 #, c-format
-msgid "Clear"
-msgstr "Netyî"
+msgid "Warning"
+msgstr "Adviertixhmint"
 
-#: ../mdkapplet:629
+#: ../mdkapplet:468
 #, c-format
 msgid "About..."
 msgstr "Åd fwait..."
 
-#: ../mdkapplet:631
+#: ../mdkapplet:472
 #, c-format
 msgid "Mandriva Online %s"
 msgstr "Mandriva Online %s"
 
-#: ../mdkapplet:635
+#: ../mdkapplet:473
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Copyright © %s pa Mandriva"
 
-#: ../mdkapplet:647
+#: ../mdkapplet:476
 #, c-format
 msgid "Mandriva Online gives access to Mandriva web services."
 msgstr ""
 "Mandriva Online (Mandriva so les fyis) vos dene accès åzès siervices waibe "
 "da Mandriva."
 
-#: ../mdkapplet:655
-#, c-format
-msgid "Always launch on startup"
-msgstr "El drovi tofer a l' enondaedje"
-
-#: ../mdkapplet:657
-#, c-format
-msgid "Quit"
-msgstr "Cwiter"
-
-#: ../mdkonline:58
-#, c-format
-msgid ""
-"mdonline version %s\n"
-"Copyright (C) %s Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"mdonline modêye %s\n"
-"Copyright © %s Mandriva.\n"
-"Çouchal est on libe programe et pout esse cossemé dzo les termes del licince "
-"GPL.\n"
-"\n"
-"Po s' è siervi:\n"
-
-#: ../mdkonline:63 ../mdkupdate:73
-#, c-format
-msgid "  --help\t\t- print this help message.\n"
-msgstr " --help           - mostere ci messaedje d' aidance chal.\n"
-
-#: ../mdkonline:64
-#, c-format
-msgid "  --box=\t\t\t- hostname.\n"
-msgstr "  --box=          - no do lodjoe.\n"
-
-#: ../mdkonline:65
-#, c-format
-msgid "  --country\t\t\t- name of country of the user. \n"
-msgstr "  --country       - no do payis d' l' uzeu.\n"
-
-#: ../mdkonline:66
-#, c-format
-msgid "  --interactive\t\t- use the interactive mode.\n"
-msgstr "  --interactif    - eployî l' môde interactif.\n"
-
-#: ../mdkonline:67
-#, c-format
-msgid "  --nointeractive\t- use the non-interactive mode.\n"
-msgstr "  --nointeractive - eployî l' môde nén interactif.\n"
-
-#: ../mdkonline:68
-#, c-format
-msgid "  --login=\t\t     - login name of the user.\n"
-msgstr "  --login=        - no d' elodjaedje di l' uzeu.\n"
-
-#: ../mdkonline:69
-#, c-format
-msgid "  --pass=\t\t\t- password  of the user.\n"
-msgstr "  --pass=         - sicret d' l' uzeu.\n"
-
-#: ../mdkonline:87 ../mdkonline:120
-#, c-format
-msgid "Mandriva Online"
-msgstr "Mandriva Online"
-
-#: ../mdkonline:90
-#, c-format
-msgid "I already have an account"
-msgstr "Dji so ddja mimbe"
-
-#: ../mdkonline:91
-#, c-format
-msgid "I want to subscribe"
-msgstr "Dji vôreu divni mimbe"
-
-#: ../mdkonline:96
-#, c-format
-msgid "Mr."
-msgstr "M."
-
-#: ../mdkonline:96
-#, c-format
-msgid "Mrs."
-msgstr "Mme"
-
-#: ../mdkonline:96
-#, c-format
-msgid "Ms."
-msgstr "Mme"
-
-#: ../mdkonline:114
-#, c-format
-msgid "Reading configuration\n"
-msgstr "Dji lé vost apontiaedje\n"
-
-#: ../mdkonline:123
-#, c-format
-msgid ""
-"This assistant will help you to upload your configuration\n"
-"(packages, hardware configuration) to a centralized database in\n"
-"order to keep you informed about security updates and useful upgrades.\n"
-msgstr ""
-"Ci macrea chal vos aidrè po-z evoyî vost apontiaedje\n"
-"(pacaedjes, apontiaedje del éndjolreye) a ene båze di dnêyes cintrålijheye\n"
-"por nos pleur vos informer tchaeke côp k' i gn årè on metaedje a djoû\n"
-"di såvrité, oudonbén ahessåve pol apontiaedje da vosse.\n"
-
-#: ../mdkonline:131
-#, c-format
-msgid "Account creation or authentication"
-msgstr "Ahivaedje d' on conte, ou otintifiaedje"
-
-#: ../mdkonline:136
-#, c-format
-msgid "Enter your Mandriva Online login, password and machine name:"
-msgstr ""
-"Dinez vosse no d' elodjaedje, no d' éndjole eyet scret po Mandriva Online:"
-
-#: ../mdkonline:142 ../mdkonline:195
-#, c-format
-msgid "Email address:"
-msgstr "Emile:"
-
-#: ../mdkonline:143
-#, c-format
-msgid "Country"
-msgstr "Payis"
-
-#: ../mdkonline:144 ../mdkonline:196
-#, c-format
-msgid "Password:"
-msgstr "Sicret:"
-
-#: ../mdkonline:146
-#, c-format
-msgid "Machine description:"
-msgstr "Discrijhaedje di l' éndjole:"
-
-#: ../mdkonline:147
-#, c-format
-msgid "(Ex: My Home Office's Computer)"
-msgstr "(Eg: Copiutrece å buro)"
-
-#: ../mdkonline:152 ../mdkonline:159 ../mdkonline:180 ../mdkonline:204
-#: ../mdkonline:208 ../mdkonline:212 ../mdkonline:217 ../mdkupdate:141
-#: ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
-#, c-format
-msgid "Error"
-msgstr "Aroke"
-
-#: ../mdkonline:152
-#, c-format
-msgid "Machine name must be 1 to 40 alphanumerical characters"
-msgstr "Li no d' l' éndjole doet esse d' inte 1 a 40 caracteres alfanumerikes"
-
-#: ../mdkonline:155
-#, c-format
-msgid "Connecting to Mandriva Online website..."
-msgstr "Raloyaedje sol waibe Mandriva Online..."
-
-#: ../mdkonline:167
-#, c-format
-msgid ""
-"In order to benefit from Mandriva Online services,\n"
-"we are about to upload your configuration.\n"
-"\n"
-"The Wizard will now send the following information to Mandriva:\n"
-"\n"
-"1) the list of packages you have installed on your system,\n"
-"\n"
-"2) your hardware configuration.\n"
-"\n"
-"If you feel uncomfortable by that idea, or do not want to benefit from this "
-"service,\n"
-"please press 'Cancel'. By pressing 'Next', you allow us to keep you "
-"informed\n"
-"about security updates and useful upgrades via personalized email alerts.\n"
-"Furthermore, you benefit from discounted paid support services on\n"
-"www.mandrivaexpert.com."
-msgstr ""
-"Po profiter des siervices di Mandriva Linux so fyis (Mandriva Online),\n"
-"i fåt evoyî les informåcions åd fwait di l' apontiaedje di voste éndjole.\n"
-"\n"
-"Li macrea evoyrè asteure les informåcions shuvantes a Mandriva:\n"
-"\n"
-"1) li djivêye des pacaedjes k' ont stî astalés sol sistinme,\n"
-"\n"
-"2) l' apontiaedje di voste éndjolreye.\n"
-"\n"
-"Si vos n' inmez nén di dner ces racsegnes, ou si vos n' voloz nén profiter\n"
-"di ç' siervice ci, clitchîz sol boton «Rinoncî».\n"
-"Si vos clitchîz sol boton «Shuvant» vos nos otorijhîz a vs informer pa\n"
-"emile des metaedjes a djoû di såvrité. Di pus, vos beneficyîz di rmetaedjes\n"
-"so les siervices payants di www.mandrivaexpert.com."
-
-#: ../mdkonline:180
-#, c-format
-msgid "Connection problem"
-msgstr "Aroke avou l' raloyaedje"
-
-#: ../mdkonline:180
-#, c-format
-msgid "Problem occurs when uploading files, please try again"
-msgstr "Åk n' a nén stî tot-z eberwetant les fitchîs, rissayîz s' i vs plait"
-
-#: ../mdkonline:187
-#, c-format
-msgid "Create a Mandriva Online Account"
-msgstr "Ahiver on conte Mandriva Online"
-
-#. -PO: that is for things like "Mr", "Ms",...
-#: ../mdkonline:192
-#, c-format
-msgid "Greeting:"
-msgstr "Salutaedje:"
-
-#: ../mdkonline:193
-#, c-format
-msgid "First name:"
-msgstr "Pitit No:"
-
-#: ../mdkonline:194
-#, c-format
-msgid "Last name:"
-msgstr "No d' famile:"
-
-#: ../mdkonline:197
-#, c-format
-msgid "Confirm Password:"
-msgstr "Acertinez l' sicret:"
-
-#: ../mdkonline:204
-#, c-format
-msgid ""
-"The passwords do not match\n"
-" Please try again\n"
-msgstr ""
-"Les screts n' sont nén les minmes\n"
-" Sayîz cor on côp s' i vs plait\n"
-
-#: ../mdkonline:208
-#, c-format
-msgid "Please fill in each field"
-msgstr "Rimplixhoz tchaeke tchamp s' i vs plait"
-
-#: ../mdkonline:212
-#, c-format
-msgid "Not a valid mail address!\n"
-msgstr "C' est nén ene adresse emile valide!\n"
-
-#: ../mdkonline:217
-#, c-format
-msgid "Creating account failed!"
-msgstr "L' ahivaedje do conte a fwait berwete!"
-
-#: ../mdkonline:225
-#, c-format
-msgid ""
-"Mandriva Online Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
-msgstr ""
-"Li conte mandrivaonline a stî ahivé comifåt.\n"
-"Clitchîz so «Shuvant» po vs elodjî eyet eberweter vost apontiaedje\n"
-
-#: ../mdkonline:229
+#: ../mdkapplet:478
 #, c-format
-msgid "Your upload was successful!"
-msgstr "Vosse metaedje a djoû a stî comifåt!"
+msgid "Online WebSite"
+msgstr "Waibe"
 
-#: ../mdkonline:229
+#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
+#: ../mdkapplet:483
 #, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandriva Online."
+msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
-"A pårti d' asteure vos rçuroz les anonces di såvrité\n"
-"et di metaedjes a djoû viè Mandriva Online."
 
-#: ../mdkonline:229
+#: ../mdkapplet:492
 #, c-format
-msgid ""
-"Mandriva Online offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
-msgstr ""
-"Mandriva Online vos ofere li possibilité di fé des metaedjes a djoû "
-"otomatikes.\n"
-"On programe srè enondé regulirmint so vosse sistinme po cweri après des "
-"noveas metaedjes a djoû\n"
-
-#: ../mdkonline:238
-#, c-format
-msgid "Congratulations"
-msgstr "Proficiate"
-
-#: ../mdkonline:238
-#, c-format
-msgid "Your Mandriva Online account has been successfully configured\n"
-msgstr "Vosse conte Mandriva Online a stî apontyî comifåt\n"
-
-#: ../mdkonline:253
-#, c-format
-msgid "Configuration uploaded successfully"
-msgstr "L' apontiaedje a stî metou a djoû comifåt"
-
-#: ../mdkonline:254
-#, c-format
-msgid "Problem uploading configuration"
-msgstr "Åk n' a nén stî tot-z eberwetant vost apontiaedje"
+msgid "Always launch on startup"
+msgstr "El drovi tofer a l' enondaedje"
 
-#: ../mdkonline:256
+#: ../mdkapplet:494
 #, c-format
-msgid ""
-"Cannot connect to Mandriva Online website: wrong login/password or router/"
-"firewall bad settings"
-msgstr ""
-"Dji n' mi sai raloyî al waibe mandrivaonline: li no d' elodjaedje ou "
-"l' sicret sont måvas, oudonbén i gn a des mwais apontiaedjes pol routeu/côpe-"
-"feu"
+msgid "Quit"
+msgstr "Cwiter"
 
 #: ../mdkonline.pm:207
 #, c-format
@@ -834,6 +369,11 @@ msgstr ""
 "\n"
 "Po s' è siervi:\n"
 
+#: ../mdkupdate:73
+#, c-format
+msgid "  --help\t\t- print this help message.\n"
+msgstr " --help           - mostere ci messaedje d' aidance chal.\n"
+
 #: ../mdkupdate:74
 #, c-format
 msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
@@ -863,11 +403,6 @@ msgstr ""
 "  --bundle file.bundle    - lére eyet astaker des pacaedjes a pårti d' on "
 "fitchî di meta-dnêyes «.bundle».\n"
 
-#: ../mdkupdate:118 ../mdkupdate:164
-#, c-format
-msgid "Warning"
-msgstr "Adviertixhmint"
-
 #. -PO: here Live Install is currently *NOT* translated on the desktop, so it's better to keep as it:
 #: ../mdkupdate:120
 #, c-format
@@ -878,11 +413,21 @@ msgstr ""
 "Vos dvoz d' aprume astaler l' sistinme so vosse deure plake avou l' macrea "
 "«Live Install»."
 
+#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
+#, c-format
+msgid "Please wait"
+msgstr "Tårdjîz on pô, s' i vs plait"
+
 #: ../mdkupdate:123 ../mdkupdate:174
 #, c-format
 msgid "Preparing..."
 msgstr "Dj' aprestêye..."
 
+#: ../mdkupdate:141 ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
+#, c-format
+msgid "Error"
+msgstr "Aroke"
+
 #: ../mdkupdate:141
 #, c-format
 msgid ""
@@ -894,6 +439,11 @@ msgstr ""
 "\n"
 "%s"
 
+#: ../mdkupdate:159 ../mdkupdate:188
+#, c-format
+msgid "An error occurred"
+msgstr "Dj' aroke so ene sacwè"
+
 #: ../mdkupdate:164
 #, c-format
 msgid ""
@@ -923,6 +473,318 @@ msgid "Unable to update packages from update_source medium.\n"
 msgstr ""
 "Dji n' a nén savou mete a djoû les pacaedjes foû do sopoirt update_source.\n"
 
+#~ msgid "New bundles are available for your system"
+#~ msgstr "I gn des noveas «bundles» po vosse sistinme"
+
+#~ msgid "Service is not configured. Please click on \"Configure the service\""
+#~ msgstr "Siervice nén apontyî. Clitchîz so «Apontyî l' siervice»"
+
+#~ msgid "Configure the service"
+#~ msgstr "Apontyî l' siervice"
+
+#~ msgid "Check updates"
+#~ msgstr "Verifyî les metaedjes a djoû"
+
+#~ msgid "Configure Now!"
+#~ msgstr "Apontyî do côp!"
+
+#~ msgid "Actions"
+#~ msgstr "Accions"
+
+#~ msgid "Configure"
+#~ msgstr "Apontyî"
+
+#~ msgid "See logs"
+#~ msgstr "Vey les djournås"
+
+#~ msgid "Status"
+#~ msgstr "Estat"
+
+#~ msgid "Close"
+#~ msgstr "Clôre"
+
+#~ msgid "Network Connection: "
+#~ msgstr "Raloyaedje al rantoele: "
+
+#~ msgid "Up"
+#~ msgstr "En alaedje"
+
+#~ msgid "Down"
+#~ msgstr "Essocté"
+
+#~ msgid "Last check: "
+#~ msgstr "Dierin verifiaedje: "
+
+#~ msgid "Machine name:"
+#~ msgstr "No d' l' éndjole:"
+
+#~ msgid "Updates: "
+#~ msgstr "Metaedjes a djoû: "
+
+#~ msgid "Development release not supported by service"
+#~ msgstr "Modêye di diswalpaedje nén sopoirtêye på siervice"
+
+#~ msgid "Too old release not supported by service"
+#~ msgstr "Modêye pår trop viye nén sopoirtêye på siervice"
+
+#~ msgid "Unknown state"
+#~ msgstr "Estat nén cnoxhou"
+
+#~ msgid "Online services disabled. Contact Mandriva Online site\n"
+#~ msgstr ""
+#~ "Les siervices so les fyis sont essoctés. Contactez li site Mandriva "
+#~ "Online\n"
+
+#~ msgid "Wrong Password.\n"
+#~ msgstr "Måva scret.\n"
+
+#~ msgid "Wrong Action or host or login.\n"
+#~ msgstr "Accion, no d' lodjoe ou no d' elodjaedje nén corek.\n"
+
+#~ msgid ""
+#~ "Something is wrong with your network settings (check your route, firewall "
+#~ "or proxy settings)\n"
+#~ msgstr ""
+#~ "I gn a åk ki n' va nén avou vost apontiaedje rantoele (verifyîz vosse "
+#~ "routaedje, li côpe-feu eyet l' apontiaedje do procsi)\n"
+
+#~ msgid ""
+#~ "Problem occured while connecting to the server, please contact the "
+#~ "support team"
+#~ msgstr ""
+#~ "Åk n' a nén stî tot s' raloyant å sierveu, atôtchîz l' ekipe di sopoirt "
+#~ "s' i vs plait"
+
+#~ msgid "Response from Mandriva Online server\n"
+#~ msgstr "Response do sierveu Mandriva Online\n"
+
+#~ msgid "No check"
+#~ msgstr "Pont d' verifiaedje"
+
+#~ msgid "Checking config file: Not present\n"
+#~ msgstr "Verifiaedje do fitchî d' apontiaedje: nén la\n"
+
+#~ msgid "Logs"
+#~ msgstr "Djournås"
+
+#~ msgid "Clear"
+#~ msgstr "Netyî"
+
+#~ msgid ""
+#~ "mdonline version %s\n"
+#~ "Copyright (C) %s Mandriva.\n"
+#~ "This is free software and may be redistributed under the terms of the GNU "
+#~ "GPL.\n"
+#~ "\n"
+#~ "usage:\n"
+#~ msgstr ""
+#~ "mdonline modêye %s\n"
+#~ "Copyright © %s Mandriva.\n"
+#~ "Çouchal est on libe programe et pout esse cossemé dzo les termes del "
+#~ "licince GPL.\n"
+#~ "\n"
+#~ "Po s' è siervi:\n"
+
+#~ msgid "  --box=\t\t\t- hostname.\n"
+#~ msgstr "  --box=          - no do lodjoe.\n"
+
+#~ msgid "  --country\t\t\t- name of country of the user. \n"
+#~ msgstr "  --country       - no do payis d' l' uzeu.\n"
+
+#~ msgid "  --interactive\t\t- use the interactive mode.\n"
+#~ msgstr "  --interactif    - eployî l' môde interactif.\n"
+
+#~ msgid "  --nointeractive\t- use the non-interactive mode.\n"
+#~ msgstr "  --nointeractive - eployî l' môde nén interactif.\n"
+
+#~ msgid "  --login=\t\t     - login name of the user.\n"
+#~ msgstr "  --login=        - no d' elodjaedje di l' uzeu.\n"
+
+#~ msgid "  --pass=\t\t\t- password  of the user.\n"
+#~ msgstr "  --pass=         - sicret d' l' uzeu.\n"
+
+#~ msgid "Mandriva Online"
+#~ msgstr "Mandriva Online"
+
+#~ msgid "I already have an account"
+#~ msgstr "Dji so ddja mimbe"
+
+#~ msgid "I want to subscribe"
+#~ msgstr "Dji vôreu divni mimbe"
+
+#~ msgid "Mr."
+#~ msgstr "M."
+
+#~ msgid "Mrs."
+#~ msgstr "Mme"
+
+#~ msgid "Ms."
+#~ msgstr "Mme"
+
+#~ msgid "Reading configuration\n"
+#~ msgstr "Dji lé vost apontiaedje\n"
+
+#~ msgid ""
+#~ "This assistant will help you to upload your configuration\n"
+#~ "(packages, hardware configuration) to a centralized database in\n"
+#~ "order to keep you informed about security updates and useful upgrades.\n"
+#~ msgstr ""
+#~ "Ci macrea chal vos aidrè po-z evoyî vost apontiaedje\n"
+#~ "(pacaedjes, apontiaedje del éndjolreye) a ene båze di dnêyes "
+#~ "cintrålijheye\n"
+#~ "por nos pleur vos informer tchaeke côp k' i gn årè on metaedje a djoû\n"
+#~ "di såvrité, oudonbén ahessåve pol apontiaedje da vosse.\n"
+
+#~ msgid "Account creation or authentication"
+#~ msgstr "Ahivaedje d' on conte, ou otintifiaedje"
+
+#~ msgid "Enter your Mandriva Online login, password and machine name:"
+#~ msgstr ""
+#~ "Dinez vosse no d' elodjaedje, no d' éndjole eyet scret po Mandriva Online:"
+
+#~ msgid "Email address:"
+#~ msgstr "Emile:"
+
+#~ msgid "Country"
+#~ msgstr "Payis"
+
+#~ msgid "Password:"
+#~ msgstr "Sicret:"
+
+#~ msgid "Machine description:"
+#~ msgstr "Discrijhaedje di l' éndjole:"
+
+#~ msgid "(Ex: My Home Office's Computer)"
+#~ msgstr "(Eg: Copiutrece å buro)"
+
+#~ msgid "Machine name must be 1 to 40 alphanumerical characters"
+#~ msgstr ""
+#~ "Li no d' l' éndjole doet esse d' inte 1 a 40 caracteres alfanumerikes"
+
+#~ msgid "Connecting to Mandriva Online website..."
+#~ msgstr "Raloyaedje sol waibe Mandriva Online..."
+
+#~ msgid ""
+#~ "In order to benefit from Mandriva Online services,\n"
+#~ "we are about to upload your configuration.\n"
+#~ "\n"
+#~ "The Wizard will now send the following information to Mandriva:\n"
+#~ "\n"
+#~ "1) the list of packages you have installed on your system,\n"
+#~ "\n"
+#~ "2) your hardware configuration.\n"
+#~ "\n"
+#~ "If you feel uncomfortable by that idea, or do not want to benefit from "
+#~ "this service,\n"
+#~ "please press 'Cancel'. By pressing 'Next', you allow us to keep you "
+#~ "informed\n"
+#~ "about security updates and useful upgrades via personalized email "
+#~ "alerts.\n"
+#~ "Furthermore, you benefit from discounted paid support services on\n"
+#~ "www.mandrivaexpert.com."
+#~ msgstr ""
+#~ "Po profiter des siervices di Mandriva Linux so fyis (Mandriva Online),\n"
+#~ "i fåt evoyî les informåcions åd fwait di l' apontiaedje di voste "
+#~ "éndjole.\n"
+#~ "\n"
+#~ "Li macrea evoyrè asteure les informåcions shuvantes a Mandriva:\n"
+#~ "\n"
+#~ "1) li djivêye des pacaedjes k' ont stî astalés sol sistinme,\n"
+#~ "\n"
+#~ "2) l' apontiaedje di voste éndjolreye.\n"
+#~ "\n"
+#~ "Si vos n' inmez nén di dner ces racsegnes, ou si vos n' voloz nén "
+#~ "profiter\n"
+#~ "di ç' siervice ci, clitchîz sol boton «Rinoncî».\n"
+#~ "Si vos clitchîz sol boton «Shuvant» vos nos otorijhîz a vs informer pa\n"
+#~ "emile des metaedjes a djoû di såvrité. Di pus, vos beneficyîz di "
+#~ "rmetaedjes\n"
+#~ "so les siervices payants di www.mandrivaexpert.com."
+
+#~ msgid "Connection problem"
+#~ msgstr "Aroke avou l' raloyaedje"
+
+#~ msgid "Problem occurs when uploading files, please try again"
+#~ msgstr ""
+#~ "Åk n' a nén stî tot-z eberwetant les fitchîs, rissayîz s' i vs plait"
+
+#~ msgid "Create a Mandriva Online Account"
+#~ msgstr "Ahiver on conte Mandriva Online"
+
+#~ msgid "Greeting:"
+#~ msgstr "Salutaedje:"
+
+#~ msgid "First name:"
+#~ msgstr "Pitit No:"
+
+#~ msgid "Last name:"
+#~ msgstr "No d' famile:"
+
+#~ msgid "Confirm Password:"
+#~ msgstr "Acertinez l' sicret:"
+
+#~ msgid ""
+#~ "The passwords do not match\n"
+#~ " Please try again\n"
+#~ msgstr ""
+#~ "Les screts n' sont nén les minmes\n"
+#~ " Sayîz cor on côp s' i vs plait\n"
+
+#~ msgid "Please fill in each field"
+#~ msgstr "Rimplixhoz tchaeke tchamp s' i vs plait"
+
+#~ msgid "Not a valid mail address!\n"
+#~ msgstr "C' est nén ene adresse emile valide!\n"
+
+#~ msgid "Creating account failed!"
+#~ msgstr "L' ahivaedje do conte a fwait berwete!"
+
+#~ msgid ""
+#~ "Mandriva Online Account successfully created.\n"
+#~ "Please click \"Next\" to authenticate and upload your configuration\n"
+#~ msgstr ""
+#~ "Li conte mandrivaonline a stî ahivé comifåt.\n"
+#~ "Clitchîz so «Shuvant» po vs elodjî eyet eberweter vost apontiaedje\n"
+
+#~ msgid "Your upload was successful!"
+#~ msgstr "Vosse metaedje a djoû a stî comifåt!"
+
+#~ msgid ""
+#~ "From now you will receive on security and updates \n"
+#~ "announcements thanks to Mandriva Online."
+#~ msgstr ""
+#~ "A pårti d' asteure vos rçuroz les anonces di såvrité\n"
+#~ "et di metaedjes a djoû viè Mandriva Online."
+
+#~ msgid ""
+#~ "Mandriva Online offers you the ability to automate the updates.\n"
+#~ "A program will run regulary in your system waiting for new updates\n"
+#~ msgstr ""
+#~ "Mandriva Online vos ofere li possibilité di fé des metaedjes a djoû "
+#~ "otomatikes.\n"
+#~ "On programe srè enondé regulirmint so vosse sistinme po cweri après des "
+#~ "noveas metaedjes a djoû\n"
+
+#~ msgid "Congratulations"
+#~ msgstr "Proficiate"
+
+#~ msgid "Your Mandriva Online account has been successfully configured\n"
+#~ msgstr "Vosse conte Mandriva Online a stî apontyî comifåt\n"
+
+#~ msgid "Configuration uploaded successfully"
+#~ msgstr "L' apontiaedje a stî metou a djoû comifåt"
+
+#~ msgid "Problem uploading configuration"
+#~ msgstr "Åk n' a nén stî tot-z eberwetant vost apontiaedje"
+
+#~ msgid ""
+#~ "Cannot connect to Mandriva Online website: wrong login/password or router/"
+#~ "firewall bad settings"
+#~ msgstr ""
+#~ "Dji n' mi sai raloyî al waibe mandrivaonline: li no d' elodjaedje ou "
+#~ "l' sicret sont måvas, oudonbén i gn a des mwais apontiaedjes pol routeu/"
+#~ "côpe-feu"
+
 #~ msgid "  --applet\t\t- launch Mandriva Update.\n"
 #~ msgstr ""
 #~ " --applet         - enonder les metaedjes a djoû di Mandriva Linux.\n"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index f0ef7fb6..a0516a3f 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline 2006\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-09 16:26+0200\n"
+"POT-Creation-Date: 2008-02-21 18:21+0100\n"
 "PO-Revision-Date: 2006-08-10 22:31+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: Simplified Chinese <cooker-i18n@linux-mandrake.com>\n"
@@ -17,70 +17,60 @@ 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:94
+#: ../mdkapplet:88
 #, c-format
 msgid "Will check updates at %s"
 msgstr "将在 %s 检查更新"
 
-#: ../mdkapplet:103
+#: ../mdkapplet:97
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "您的系统已为最新"
 
-#: ../mdkapplet:109
+#: ../mdkapplet:103
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
 "support@mandrivaonline.com"
 msgstr "服务配置问题。请检查日志并发送邮件到 support@mandrivaonline.com"
 
-#: ../mdkapplet:115
+#: ../mdkapplet:110
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "正在寻找可用的软件包，请稍候..."
 
-#: ../mdkapplet:121
+#: ../mdkapplet:116
 #, c-format
 msgid "New updates are available for your system"
 msgstr "您的系统没有可用的更新"
 
-#: ../mdkapplet:127
-#, c-format
-msgid "New bundles are available for your system"
-msgstr "您的系统没有可用的捆绑包"
-
-#: ../mdkapplet:133
-#, c-format
-msgid "Service is not configured. Please click on \"Configure the service\""
-msgstr "服务未配置。请点击“配置服务”"
-
-#: ../mdkapplet:139
+#: ../mdkapplet:122
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "网络已掉线。请配置您的网络"
 
-#: ../mdkapplet:145
+#: ../mdkapplet:128
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "服务未激活。请点击“在线网站”"
 
-#: ../mdkapplet:151 ../mdkapplet:182
+#: ../mdkapplet:134 ../mdkapplet:165
 #, c-format
 msgid "urpmi database locked"
 msgstr "urpmi 数据库已锁定"
 
-#: ../mdkapplet:157
+#: ../mdkapplet:140
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr "版本不支持(太旧，或者为开发版本)"
 
-#: ../mdkapplet:163
+#: ../mdkapplet:146
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
 msgstr "未找到介质。您必须通过“软件介质管理器”添加介质。"
 
-#: ../mdkapplet:169
+#: ../mdkapplet:152
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -96,569 +86,131 @@ msgstr ""
 "\n"
 "然后，重新启动 %s。"
 
-#: ../mdkapplet:174
+#: ../mdkapplet:157
 #, c-format
 msgid "Enabled"
 msgstr "启用"
 
-#: ../mdkapplet:187
+#: ../mdkapplet:170
 #, c-format
 msgid "Error updating media"
 msgstr "更新介质出错"
 
-#: ../mdkapplet:202
+#: ../mdkapplet:185
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr "正在检查... 有可用的更新\n"
 
-#: ../mdkapplet:207
+#: ../mdkapplet:190
 #, c-format
 msgid "Packages are up to date"
 msgstr "软件包已为最新"
 
-#: ../mdkapplet:212
+#: ../mdkapplet:195
 #, c-format
 msgid "Failed to open urpmi database"
 msgstr "打开 urpmi 数据库出错"
 
-#: ../mdkapplet:217 ../mdkapplet:324
+#: ../mdkapplet:200
 #, c-format
 msgid "Install updates"
 msgstr "安装更新"
 
-#: ../mdkapplet:218
-#, c-format
-msgid "Configure the service"
-msgstr "配置服务"
-
-#: ../mdkapplet:219
+#: ../mdkapplet:201
 #, c-format
 msgid "Check Updates"
 msgstr "检查更新"
 
-#: ../mdkapplet:220 ../mdkapplet:327 ../mdkonline:114 ../mdkonline:155
-#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
-#, c-format
-msgid "Please wait"
-msgstr "请稍候"
-
-#: ../mdkapplet:220 ../mdkapplet:326 ../mdkapplet:327
-#, c-format
-msgid "Check updates"
-msgstr "检查更新"
-
-#: ../mdkapplet:223 ../mdkapplet:648
-#, c-format
-msgid "Online WebSite"
-msgstr "在线网站"
-
-#: ../mdkapplet:224
+#: ../mdkapplet:202
 #, c-format
 msgid "Configure Network"
 msgstr "配置网络"
 
-#: ../mdkapplet:225
-#, c-format
-msgid "Configure Now!"
-msgstr "立即配置!"
-
-#: ../mdkapplet:313 ../mdkapplet:392
-#, c-format
-msgid "Mandriva Linux Updates Applet"
-msgstr "Mandriva Linux 更新小程序"
-
-#: ../mdkapplet:322
-#, c-format
-msgid "Actions"
-msgstr "动作"
-
-#: ../mdkapplet:325
-#, c-format
-msgid "Configure"
-msgstr "配置"
-
-#: ../mdkapplet:329
-#, c-format
-msgid "See logs"
-msgstr "查看日志"
-
-#: ../mdkapplet:332
-#, c-format
-msgid "Status"
-msgstr "状态"
-
-#: ../mdkapplet:336 ../mdkapplet:597
-#, c-format
-msgid "Close"
-msgstr "关闭"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Network Connection: "
-msgstr "网络连接: "
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Up"
-msgstr "通"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Down"
-msgstr "断"
-
-#: ../mdkapplet:366
-#, c-format
-msgid "Last check: "
-msgstr "上次检查: "
-
-#: ../mdkapplet:367 ../mdkonline:145
-#, c-format
-msgid "Machine name:"
-msgstr "机器名: "
-
-#: ../mdkapplet:368
-#, c-format
-msgid "Updates: "
-msgstr "更新: "
-
-#: ../mdkapplet:372
+#: ../mdkapplet:283
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "调用 Drak 连接\n"
 
-#: ../mdkapplet:375
+#: ../mdkapplet:286
 #, c-format
 msgid "Mandriva Online seems to be reinstalled, reloading applet ...."
 msgstr "Mandriva Online 似乎重新安装了，正在重新装入小程序..."
 
-#: ../mdkapplet:383
+#: ../mdkapplet:294
 #, c-format
 msgid "Launching MandrivaUpdate\n"
 msgstr "调用 MandrivaUpdate\n"
 
-#: ../mdkapplet:398
+#: ../mdkapplet:303
+#, c-format
+msgid "Mandriva Linux Updates Applet"
+msgstr "Mandriva Linux 更新小程序"
+
+#: ../mdkapplet:308
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "正在检查更新...\n"
 
-#: ../mdkapplet:399
+#: ../mdkapplet:309
 #, c-format
 msgid "Connecting to"
 msgstr "正在连接到"
 
-#: ../mdkapplet:467 ../mdkupdate:159 ../mdkupdate:188
-#, c-format
-msgid "An error occurred"
-msgstr "发生了一个错误"
-
-#: ../mdkapplet:475
-#, c-format
-msgid "Development release not supported by service"
-msgstr "此服务不支持开发版本"
-
-#: ../mdkapplet:476
-#, c-format
-msgid "Too old release not supported by service"
-msgstr "此服务器不支持太旧的版本"
-
-#: ../mdkapplet:477
-#, c-format
-msgid "Unknown state"
-msgstr "未知状态"
-
-#: ../mdkapplet:478
-#, c-format
-msgid "Online services disabled. Contact Mandriva Online site\n"
-msgstr "在线服务已禁用。请浏览 Mandriva Online 网站\n"
-
-#: ../mdkapplet:479
-#, c-format
-msgid "Wrong Password.\n"
-msgstr "密码错误。\n"
-
-#: ../mdkapplet:480
-#, c-format
-msgid "Wrong Action or host or login.\n"
-msgstr "动作、主机或用户名错误。\n"
-
-#: ../mdkapplet:481
-#, c-format
-msgid ""
-"Something is wrong with your network settings (check your route, firewall or "
-"proxy settings)\n"
-msgstr "您的网络设置可能有错(请检查您的路由器、防火墙或代理服务器设置)\n"
-
-#: ../mdkapplet:483
-#, c-format
-msgid ""
-"Problem occured while connecting to the server, please contact the support "
-"team"
-msgstr "连接到服务器时发生问题，请联系支持团队"
-
-#: ../mdkapplet:487
-#, c-format
-msgid "Response from Mandriva Online server\n"
-msgstr "Mandriva Online 服务器的响应\n"
-
-#: ../mdkapplet:490
+#: ../mdkapplet:386
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "系统已为最新\n"
 
-#: ../mdkapplet:527
-#, c-format
-msgid "No check"
-msgstr "不检查"
-
-#: ../mdkapplet:541
-#, c-format
-msgid "Checking config file: Not present\n"
-msgstr "检查配置文件：不存在\n"
-
-#: ../mdkapplet:544
+#: ../mdkapplet:415
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "检查网络：似乎已禁用\n"
 
-#: ../mdkapplet:587
+#: ../mdkapplet:457 ../mdkupdate:118 ../mdkupdate:164
 #, c-format
-msgid "Logs"
-msgstr "日志"
-
-#: ../mdkapplet:603
-#, c-format
-msgid "Clear"
-msgstr "清除"
+msgid "Warning"
+msgstr "警告"
 
-#: ../mdkapplet:629
+#: ../mdkapplet:468
 #, c-format
 msgid "About..."
 msgstr "关于..."
 
-#: ../mdkapplet:631
+#: ../mdkapplet:472
 #, c-format
 msgid "Mandriva Online %s"
 msgstr "Mandriva Online %s"
 
-#: ../mdkapplet:635
+#: ../mdkapplet:473
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "版权 (C) %s Mandriva"
 
-#: ../mdkapplet:647
+#: ../mdkapplet:476
 #, c-format
 msgid "Mandriva Online gives access to Mandriva web services."
 msgstr "Mandriva Online 可让您访问 Mandriva 的 Web 服务。"
 
-#: ../mdkapplet:655
-#, c-format
-msgid "Always launch on startup"
-msgstr "在启动时自动调用"
-
-#: ../mdkapplet:657
-#, c-format
-msgid "Quit"
-msgstr "退出"
-
-#: ../mdkonline:58
-#, c-format
-msgid ""
-"mdonline version %s\n"
-"Copyright (C) %s Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"mdonline 版本 %s\n"
-"版权所有 (C) %s Mandriva。\n"
-"这是自由软件, 它能在 GNU GPL 条款下再次发行。\n"
-"\n"
-"用法:\n"
-
-#: ../mdkonline:63 ../mdkupdate:73
-#, c-format
-msgid "  --help\t\t- print this help message.\n"
-msgstr "  --help\t\t- 打印本帮助信息。\n"
-
-#: ../mdkonline:64
-#, c-format
-msgid "  --box=\t\t\t- hostname.\n"
-msgstr "  --box=\t\t\t- 主机名。\n"
-
-#: ../mdkonline:65
-#, c-format
-msgid "  --country\t\t\t- name of country of the user. \n"
-msgstr "  --country\t\t\t- 用户的国家名。\n"
-
-#: ../mdkonline:66
-#, c-format
-msgid "  --interactive\t\t- use the interactive mode.\n"
-msgstr "  --interactive\t\t- 使用交互模式。\n"
-
-#: ../mdkonline:67
-#, c-format
-msgid "  --nointeractive\t- use the non-interactive mode.\n"
-msgstr "  --nointeractive\t- 使用非交互模式。\n"
-
-#: ../mdkonline:68
-#, c-format
-msgid "  --login=\t\t     - login name of the user.\n"
-msgstr "  --login=\t\t     - 用户名。\n"
-
-#: ../mdkonline:69
-#, c-format
-msgid "  --pass=\t\t\t- password  of the user.\n"
-msgstr "  --pass=\t\t\t- 用户的密码。\n"
-
-#: ../mdkonline:87 ../mdkonline:120
-#, c-format
-msgid "Mandriva Online"
-msgstr "Mandriva Online"
-
-#: ../mdkonline:90
-#, c-format
-msgid "I already have an account"
-msgstr "我已经有账户了"
-
-#: ../mdkonline:91
-#, c-format
-msgid "I want to subscribe"
-msgstr "我想要订阅"
-
-#: ../mdkonline:96
-#, c-format
-msgid "Mr."
-msgstr "先生"
-
-#: ../mdkonline:96
-#, c-format
-msgid "Mrs."
-msgstr "夫人"
-
-#: ../mdkonline:96
-#, c-format
-msgid "Ms."
-msgstr "女士"
-
-#: ../mdkonline:114
-#, c-format
-msgid "Reading configuration\n"
-msgstr "正在读取配置\n"
-
-#: ../mdkonline:123
-#, c-format
-msgid ""
-"This assistant will help you to upload your configuration\n"
-"(packages, hardware configuration) to a centralized database in\n"
-"order to keep you informed about security updates and useful upgrades.\n"
-msgstr ""
-"您需要在本步骤中提供您在 Mandriva Online 的账户。而本助手将会帮助您将您的配置"
-"(软件包、硬件配置)上传到中央数据库中，这样可以保证您能够时刻收到安全更新和有"
-"用的升级。\n"
-
-#: ../mdkonline:131
-#, c-format
-msgid "Account creation or authentication"
-msgstr "账户创建或身份验证"
-
-#: ../mdkonline:136
-#, c-format
-msgid "Enter your Mandriva Online login, password and machine name:"
-msgstr "请输入您的 Mandriva Online 登录名，密码和机器名:"
-
-#: ../mdkonline:142 ../mdkonline:195
-#, c-format
-msgid "Email address:"
-msgstr "电子邮件地址："
-
-#: ../mdkonline:143
-#, c-format
-msgid "Country"
-msgstr "国家/地区"
-
-#: ../mdkonline:144 ../mdkonline:196
-#, c-format
-msgid "Password:"
-msgstr "密码:"
-
-#: ../mdkonline:146
-#, c-format
-msgid "Machine description:"
-msgstr "机器描述: "
-
-#: ../mdkonline:147
-#, c-format
-msgid "(Ex: My Home Office's Computer)"
-msgstr "(如: 我家里的电脑)"
-
-#: ../mdkonline:152 ../mdkonline:159 ../mdkonline:180 ../mdkonline:204
-#: ../mdkonline:208 ../mdkonline:212 ../mdkonline:217 ../mdkupdate:141
-#: ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
-#, c-format
-msgid "Error"
-msgstr "错误"
-
-#: ../mdkonline:152
-#, c-format
-msgid "Machine name must be 1 to 40 alphanumerical characters"
-msgstr "计算机名称必须是 1 到 40 个字符"
-
-#: ../mdkonline:155
-#, c-format
-msgid "Connecting to Mandriva Online website..."
-msgstr "正在连接到 Mandriva Online 网站..."
-
-#: ../mdkonline:167
-#, c-format
-msgid ""
-"In order to benefit from Mandriva Online services,\n"
-"we are about to upload your configuration.\n"
-"\n"
-"The Wizard will now send the following information to Mandriva:\n"
-"\n"
-"1) the list of packages you have installed on your system,\n"
-"\n"
-"2) your hardware configuration.\n"
-"\n"
-"If you feel uncomfortable by that idea, or do not want to benefit from this "
-"service,\n"
-"please press 'Cancel'. By pressing 'Next', you allow us to keep you "
-"informed\n"
-"about security updates and useful upgrades via personalized email alerts.\n"
-"Furthermore, you benefit from discounted paid support services on\n"
-"www.mandrivaexpert.com."
-msgstr ""
-"为了更好的享受 Mandriva Online 的服务，我们即将上传您的配置。\n"
-"\n"
-"向导现在将向 Mandriva 发送下列信息:\n"
-"\n"
-"1) 您在系统中所安装的软件包列表；\n"
-"\n"
-"2) 您的硬件配置。\n"
-"\n"
-"如果您担心此操作会暴露您的个人隐私，或者不想享受此服务，请按“取消”。只要您按"
-"下“下一步”，就表明您允许我们通过个性化的电子邮件提醒您最新的安全更新和有用的"
-"升级。除此以外，您还能够从 www.mandrivaexpert.com 上得到支持服务的付费折扣。"
-
-#: ../mdkonline:180
-#, c-format
-msgid "Connection problem"
-msgstr "连接问题"
-
-#: ../mdkonline:180
-#, c-format
-msgid "Problem occurs when uploading files, please try again"
-msgstr "上传文件时发生了错误，请重试"
-
-#: ../mdkonline:187
-#, c-format
-msgid "Create a Mandriva Online Account"
-msgstr "创建一个 Mandriva Online 账户"
-
-#. -PO: that is for things like "Mr", "Ms",...
-#: ../mdkonline:192
-#, c-format
-msgid "Greeting:"
-msgstr "欢迎："
-
-#: ../mdkonline:193
-#, c-format
-msgid "First name:"
-msgstr "名:"
-
-#: ../mdkonline:194
-#, c-format
-msgid "Last name:"
-msgstr "姓："
-
-#: ../mdkonline:197
-#, c-format
-msgid "Confirm Password:"
-msgstr "确认密码:"
-
-#: ../mdkonline:204
-#, c-format
-msgid ""
-"The passwords do not match\n"
-" Please try again\n"
-msgstr ""
-"密码不匹配\n"
-" 请再试一次\n"
-
-#: ../mdkonline:208
-#, c-format
-msgid "Please fill in each field"
-msgstr "所有内容都是必填的"
-
-#: ../mdkonline:212
-#, c-format
-msgid "Not a valid mail address!\n"
-msgstr "不是有效的电子邮件地址!\n"
-
-#: ../mdkonline:217
-#, c-format
-msgid "Creating account failed!"
-msgstr "创建账户失败！"
-
-#: ../mdkonline:225
-#, c-format
-msgid ""
-"Mandriva Online Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
-msgstr ""
-"Mandriva Online 账户创建成功。\n"
-"请单击“下一步”进行身份验证并上传您的配置\n"
-
-#: ../mdkonline:229
-#, c-format
-msgid "Your upload was successful!"
-msgstr "您的上传已经成功!"
-
-#: ../mdkonline:229
+#: ../mdkapplet:478
 #, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandriva Online."
-msgstr "从现在开始，您将能够收到 Mandriva Online 发出的安全和更新通知了。"
+msgid "Online WebSite"
+msgstr "在线网站"
 
-#: ../mdkonline:229
+#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
+#: ../mdkapplet:483
 #, c-format
-msgid ""
-"Mandriva Online offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
+msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
-"Mandriva Online 还能让您自动保持更新。您的系统中会定期运行一个特定的程序，该"
-"程序会自动下载并安装更新\n"
-
-#: ../mdkonline:238
-#, c-format
-msgid "Congratulations"
-msgstr "配置"
 
-#: ../mdkonline:238
+#: ../mdkapplet:492
 #, c-format
-msgid "Your Mandriva Online account has been successfully configured\n"
-msgstr "您的 Mandriva Online 账户已经配置成功\n"
-
-#: ../mdkonline:253
-#, c-format
-msgid "Configuration uploaded successfully"
-msgstr "配置上传成功"
-
-#: ../mdkonline:254
-#, c-format
-msgid "Problem uploading configuration"
-msgstr "读取配置出错"
+msgid "Always launch on startup"
+msgstr "在启动时自动调用"
 
-#: ../mdkonline:256
+#: ../mdkapplet:494
 #, c-format
-msgid ""
-"Cannot connect to Mandriva Online website: wrong login/password or router/"
-"firewall bad settings"
-msgstr ""
-"无法连接到 Mandriva Online 网站: 登录名/密码不对，或路由器/防火墙设置错误"
+msgid "Quit"
+msgstr "退出"
 
 #: ../mdkonline.pm:207
 #, c-format
@@ -806,6 +358,11 @@ msgstr ""
 "\n"
 "用法:\n"
 
+#: ../mdkupdate:73
+#, c-format
+msgid "  --help\t\t- print this help message.\n"
+msgstr "  --help\t\t- 打印本帮助信息。\n"
+
 #: ../mdkupdate:74
 #, c-format
 msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
@@ -834,11 +391,6 @@ msgid ""
 msgstr ""
 "  --bundle file.bundle\t- 分析并安装 .bundle 元信息文件中附带的软件包。\n"
 
-#: ../mdkupdate:118 ../mdkupdate:164
-#, c-format
-msgid "Warning"
-msgstr "警告"
-
 #. -PO: here Live Install is currently *NOT* translated on the desktop, so it's better to keep as it:
 #: ../mdkupdate:120
 #, c-format
@@ -847,11 +399,21 @@ msgid ""
 "Install' wizard."
 msgstr "您需要先使用“Live Install”将系统安装到硬盘上。"
 
+#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
+#, c-format
+msgid "Please wait"
+msgstr "请稍候"
+
 #: ../mdkupdate:123 ../mdkupdate:174
 #, c-format
 msgid "Preparing..."
 msgstr "正在准备..."
 
+#: ../mdkupdate:141 ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
+#, c-format
+msgid "Error"
+msgstr "错误"
+
 #: ../mdkupdate:141
 #, c-format
 msgid ""
@@ -863,6 +425,11 @@ msgstr ""
 "\n"
 "%s"
 
+#: ../mdkupdate:159 ../mdkupdate:188
+#, c-format
+msgid "An error occurred"
+msgstr "发生了一个错误"
+
 #: ../mdkupdate:164
 #, c-format
 msgid ""
@@ -890,6 +457,295 @@ msgstr "正在安装软件包...\n"
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "无法从 update_source 介质更新软件包。\n"
 
+#~ msgid "New bundles are available for your system"
+#~ msgstr "您的系统没有可用的捆绑包"
+
+#~ msgid "Service is not configured. Please click on \"Configure the service\""
+#~ msgstr "服务未配置。请点击“配置服务”"
+
+#~ msgid "Configure the service"
+#~ msgstr "配置服务"
+
+#~ msgid "Check updates"
+#~ msgstr "检查更新"
+
+#~ msgid "Configure Now!"
+#~ msgstr "立即配置!"
+
+#~ msgid "Actions"
+#~ msgstr "动作"
+
+#~ msgid "Configure"
+#~ msgstr "配置"
+
+#~ msgid "See logs"
+#~ msgstr "查看日志"
+
+#~ msgid "Status"
+#~ msgstr "状态"
+
+#~ msgid "Close"
+#~ msgstr "关闭"
+
+#~ msgid "Network Connection: "
+#~ msgstr "网络连接: "
+
+#~ msgid "Up"
+#~ msgstr "通"
+
+#~ msgid "Down"
+#~ msgstr "断"
+
+#~ msgid "Last check: "
+#~ msgstr "上次检查: "
+
+#~ msgid "Machine name:"
+#~ msgstr "机器名: "
+
+#~ msgid "Updates: "
+#~ msgstr "更新: "
+
+#~ msgid "Development release not supported by service"
+#~ msgstr "此服务不支持开发版本"
+
+#~ msgid "Too old release not supported by service"
+#~ msgstr "此服务器不支持太旧的版本"
+
+#~ msgid "Unknown state"
+#~ msgstr "未知状态"
+
+#~ msgid "Online services disabled. Contact Mandriva Online site\n"
+#~ msgstr "在线服务已禁用。请浏览 Mandriva Online 网站\n"
+
+#~ msgid "Wrong Password.\n"
+#~ msgstr "密码错误。\n"
+
+#~ msgid "Wrong Action or host or login.\n"
+#~ msgstr "动作、主机或用户名错误。\n"
+
+#~ msgid ""
+#~ "Something is wrong with your network settings (check your route, firewall "
+#~ "or proxy settings)\n"
+#~ msgstr "您的网络设置可能有错(请检查您的路由器、防火墙或代理服务器设置)\n"
+
+#~ msgid ""
+#~ "Problem occured while connecting to the server, please contact the "
+#~ "support team"
+#~ msgstr "连接到服务器时发生问题，请联系支持团队"
+
+#~ msgid "Response from Mandriva Online server\n"
+#~ msgstr "Mandriva Online 服务器的响应\n"
+
+#~ msgid "No check"
+#~ msgstr "不检查"
+
+#~ msgid "Checking config file: Not present\n"
+#~ msgstr "检查配置文件：不存在\n"
+
+#~ msgid "Logs"
+#~ msgstr "日志"
+
+#~ msgid "Clear"
+#~ msgstr "清除"
+
+#~ msgid ""
+#~ "mdonline version %s\n"
+#~ "Copyright (C) %s Mandriva.\n"
+#~ "This is free software and may be redistributed under the terms of the GNU "
+#~ "GPL.\n"
+#~ "\n"
+#~ "usage:\n"
+#~ msgstr ""
+#~ "mdonline 版本 %s\n"
+#~ "版权所有 (C) %s Mandriva。\n"
+#~ "这是自由软件, 它能在 GNU GPL 条款下再次发行。\n"
+#~ "\n"
+#~ "用法:\n"
+
+#~ msgid "  --box=\t\t\t- hostname.\n"
+#~ msgstr "  --box=\t\t\t- 主机名。\n"
+
+#~ msgid "  --country\t\t\t- name of country of the user. \n"
+#~ msgstr "  --country\t\t\t- 用户的国家名。\n"
+
+#~ msgid "  --interactive\t\t- use the interactive mode.\n"
+#~ msgstr "  --interactive\t\t- 使用交互模式。\n"
+
+#~ msgid "  --nointeractive\t- use the non-interactive mode.\n"
+#~ msgstr "  --nointeractive\t- 使用非交互模式。\n"
+
+#~ msgid "  --login=\t\t     - login name of the user.\n"
+#~ msgstr "  --login=\t\t     - 用户名。\n"
+
+#~ msgid "  --pass=\t\t\t- password  of the user.\n"
+#~ msgstr "  --pass=\t\t\t- 用户的密码。\n"
+
+#~ msgid "Mandriva Online"
+#~ msgstr "Mandriva Online"
+
+#~ msgid "I already have an account"
+#~ msgstr "我已经有账户了"
+
+#~ msgid "I want to subscribe"
+#~ msgstr "我想要订阅"
+
+#~ msgid "Mr."
+#~ msgstr "先生"
+
+#~ msgid "Mrs."
+#~ msgstr "夫人"
+
+#~ msgid "Ms."
+#~ msgstr "女士"
+
+#~ msgid "Reading configuration\n"
+#~ msgstr "正在读取配置\n"
+
+#~ msgid ""
+#~ "This assistant will help you to upload your configuration\n"
+#~ "(packages, hardware configuration) to a centralized database in\n"
+#~ "order to keep you informed about security updates and useful upgrades.\n"
+#~ msgstr ""
+#~ "您需要在本步骤中提供您在 Mandriva Online 的账户。而本助手将会帮助您将您的"
+#~ "配置(软件包、硬件配置)上传到中央数据库中，这样可以保证您能够时刻收到安全更"
+#~ "新和有用的升级。\n"
+
+#~ msgid "Account creation or authentication"
+#~ msgstr "账户创建或身份验证"
+
+#~ msgid "Enter your Mandriva Online login, password and machine name:"
+#~ msgstr "请输入您的 Mandriva Online 登录名，密码和机器名:"
+
+#~ msgid "Email address:"
+#~ msgstr "电子邮件地址："
+
+#~ msgid "Country"
+#~ msgstr "国家/地区"
+
+#~ msgid "Password:"
+#~ msgstr "密码:"
+
+#~ msgid "Machine description:"
+#~ msgstr "机器描述: "
+
+#~ msgid "(Ex: My Home Office's Computer)"
+#~ msgstr "(如: 我家里的电脑)"
+
+#~ msgid "Machine name must be 1 to 40 alphanumerical characters"
+#~ msgstr "计算机名称必须是 1 到 40 个字符"
+
+#~ msgid "Connecting to Mandriva Online website..."
+#~ msgstr "正在连接到 Mandriva Online 网站..."
+
+#~ msgid ""
+#~ "In order to benefit from Mandriva Online services,\n"
+#~ "we are about to upload your configuration.\n"
+#~ "\n"
+#~ "The Wizard will now send the following information to Mandriva:\n"
+#~ "\n"
+#~ "1) the list of packages you have installed on your system,\n"
+#~ "\n"
+#~ "2) your hardware configuration.\n"
+#~ "\n"
+#~ "If you feel uncomfortable by that idea, or do not want to benefit from "
+#~ "this service,\n"
+#~ "please press 'Cancel'. By pressing 'Next', you allow us to keep you "
+#~ "informed\n"
+#~ "about security updates and useful upgrades via personalized email "
+#~ "alerts.\n"
+#~ "Furthermore, you benefit from discounted paid support services on\n"
+#~ "www.mandrivaexpert.com."
+#~ msgstr ""
+#~ "为了更好的享受 Mandriva Online 的服务，我们即将上传您的配置。\n"
+#~ "\n"
+#~ "向导现在将向 Mandriva 发送下列信息:\n"
+#~ "\n"
+#~ "1) 您在系统中所安装的软件包列表；\n"
+#~ "\n"
+#~ "2) 您的硬件配置。\n"
+#~ "\n"
+#~ "如果您担心此操作会暴露您的个人隐私，或者不想享受此服务，请按“取消”。只要您"
+#~ "按下“下一步”，就表明您允许我们通过个性化的电子邮件提醒您最新的安全更新和有"
+#~ "用的升级。除此以外，您还能够从 www.mandrivaexpert.com 上得到支持服务的付费"
+#~ "折扣。"
+
+#~ msgid "Connection problem"
+#~ msgstr "连接问题"
+
+#~ msgid "Problem occurs when uploading files, please try again"
+#~ msgstr "上传文件时发生了错误，请重试"
+
+#~ msgid "Create a Mandriva Online Account"
+#~ msgstr "创建一个 Mandriva Online 账户"
+
+#~ msgid "Greeting:"
+#~ msgstr "欢迎："
+
+#~ msgid "First name:"
+#~ msgstr "名:"
+
+#~ msgid "Last name:"
+#~ msgstr "姓："
+
+#~ msgid "Confirm Password:"
+#~ msgstr "确认密码:"
+
+#~ msgid ""
+#~ "The passwords do not match\n"
+#~ " Please try again\n"
+#~ msgstr ""
+#~ "密码不匹配\n"
+#~ " 请再试一次\n"
+
+#~ msgid "Please fill in each field"
+#~ msgstr "所有内容都是必填的"
+
+#~ msgid "Not a valid mail address!\n"
+#~ msgstr "不是有效的电子邮件地址!\n"
+
+#~ msgid "Creating account failed!"
+#~ msgstr "创建账户失败！"
+
+#~ msgid ""
+#~ "Mandriva Online Account successfully created.\n"
+#~ "Please click \"Next\" to authenticate and upload your configuration\n"
+#~ msgstr ""
+#~ "Mandriva Online 账户创建成功。\n"
+#~ "请单击“下一步”进行身份验证并上传您的配置\n"
+
+#~ msgid "Your upload was successful!"
+#~ msgstr "您的上传已经成功!"
+
+#~ msgid ""
+#~ "From now you will receive on security and updates \n"
+#~ "announcements thanks to Mandriva Online."
+#~ msgstr "从现在开始，您将能够收到 Mandriva Online 发出的安全和更新通知了。"
+
+#~ msgid ""
+#~ "Mandriva Online offers you the ability to automate the updates.\n"
+#~ "A program will run regulary in your system waiting for new updates\n"
+#~ msgstr ""
+#~ "Mandriva Online 还能让您自动保持更新。您的系统中会定期运行一个特定的程序，"
+#~ "该程序会自动下载并安装更新\n"
+
+#~ msgid "Congratulations"
+#~ msgstr "配置"
+
+#~ msgid "Your Mandriva Online account has been successfully configured\n"
+#~ msgstr "您的 Mandriva Online 账户已经配置成功\n"
+
+#~ msgid "Configuration uploaded successfully"
+#~ msgstr "配置上传成功"
+
+#~ msgid "Problem uploading configuration"
+#~ msgstr "读取配置出错"
+
+#~ msgid ""
+#~ "Cannot connect to Mandriva Online website: wrong login/password or router/"
+#~ "firewall bad settings"
+#~ msgstr ""
+#~ "无法连接到 Mandriva Online 网站: 登录名/密码不对，或路由器/防火墙设置错误"
+
 #~ msgid "  --applet\t\t- launch Mandriva Update.\n"
 #~ msgstr "  --applet\t\t- 调用 Mandriva Update。\n"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index f1fad1b9..6d54e6c7 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline-zh_TW\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-09 16:26+0200\n"
+"POT-Creation-Date: 2008-02-21 18:21+0100\n"
 "PO-Revision-Date: 2007-09-06 20:01+0800\n"
 "Last-Translator: You-Cheng Hsieh <yochenhsieh@gmail.com>\n"
 "Language-Team: Chinese Traditional <zh@li.org>\n"
@@ -23,68 +23,61 @@ 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:94
+#: ../mdkapplet:88
 #, c-format
 msgid "Will check updates at %s"
 msgstr "將於 %s 檢查更新"
 
-#: ../mdkapplet:103
+#: ../mdkapplet:97
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "您的系統處於最新的狀態"
 
-#: ../mdkapplet:109
+#: ../mdkapplet:103
 #, c-format
-msgid "Service configuration problem. Please check logs and send mail to support@mandrivaonline.com"
-msgstr "服務設定發生問題，請檢查錯誤紀錄並寄封電子郵件至 support@mandrivaonline.com"
+msgid ""
+"Service configuration problem. Please check logs and send mail to "
+"support@mandrivaonline.com"
+msgstr ""
+"服務設定發生問題，請檢查錯誤紀錄並寄封電子郵件至 support@mandrivaonline.com"
 
-#: ../mdkapplet:115
+#: ../mdkapplet:110
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "請稍候，正在尋找可用的套件..."
 
-#: ../mdkapplet:121
+#: ../mdkapplet:116
 #, c-format
 msgid "New updates are available for your system"
 msgstr "有適用於您系統的更新"
 
-#: ../mdkapplet:127
-#, c-format
-msgid "New bundles are available for your system"
-msgstr "有適用於您系統的加值軟體"
-
-#: ../mdkapplet:133
-#, c-format
-msgid "Service is not configured. Please click on \"Configure the service\""
-msgstr "沒有設定服務，請點選「設定本服務」"
-
-#: ../mdkapplet:139
+#: ../mdkapplet:122
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "網路沒有啟動，請設定您的網路連線"
 
-#: ../mdkapplet:145
+#: ../mdkapplet:128
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "服務沒有啟動。請點選「線上網站」"
 
-#: ../mdkapplet:151
-#: ../mdkapplet:182
+#: ../mdkapplet:134 ../mdkapplet:165
 #, c-format
 msgid "urpmi database locked"
 msgstr "urpmi 資料庫被鎖住了"
 
-#: ../mdkapplet:157
+#: ../mdkapplet:140
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr "版本不支援 (您使用的版本過舊或是開發中版本)"
 
-#: ../mdkapplet:163
+#: ../mdkapplet:146
 #, c-format
-msgid "No medium found. You must add some media through 'Software Media Manager'."
+msgid ""
+"No medium found. You must add some media through 'Software Media Manager'."
 msgstr "找不到媒體。您必須經由「套件媒體管理員」新增一些媒體。"
 
-#: ../mdkapplet:169
+#: ../mdkapplet:152
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -99,591 +92,131 @@ msgstr ""
 "\n"
 "完成後，請重新啟動 %s。"
 
-#: ../mdkapplet:174
+#: ../mdkapplet:157
 #, c-format
 msgid "Enabled"
 msgstr "是否啟用？"
 
-#: ../mdkapplet:187
+#: ../mdkapplet:170
 #, c-format
 msgid "Error updating media"
 msgstr "更新媒體時發生錯誤"
 
-#: ../mdkapplet:202
+#: ../mdkapplet:185
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr "檢查中...有可用的更新\n"
 
-#: ../mdkapplet:207
+#: ../mdkapplet:190
 #, c-format
 msgid "Packages are up to date"
 msgstr "套件都已經更新了"
 
-#: ../mdkapplet:212
+#: ../mdkapplet:195
 #, c-format
 msgid "Failed to open urpmi database"
 msgstr "無法開啟 urpmi 資料庫"
 
-#: ../mdkapplet:217
-#: ../mdkapplet:324
+#: ../mdkapplet:200
 #, c-format
 msgid "Install updates"
 msgstr "安裝更新"
 
-#: ../mdkapplet:218
-#, c-format
-msgid "Configure the service"
-msgstr "設定本服務"
-
-#: ../mdkapplet:219
+#: ../mdkapplet:201
 #, c-format
 msgid "Check Updates"
 msgstr "檢查更新"
 
-#: ../mdkapplet:220
-#: ../mdkapplet:327
-#: ../mdkonline:114
-#: ../mdkonline:155
-#: ../mdkupdate:123
-#: ../mdkupdate:174
-#: ../mdkupdate:219
-#, c-format
-msgid "Please wait"
-msgstr "請稍候"
-
-#: ../mdkapplet:220
-#: ../mdkapplet:326
-#: ../mdkapplet:327
-#, c-format
-msgid "Check updates"
-msgstr "檢查更新"
-
-#: ../mdkapplet:223
-#: ../mdkapplet:648
-#, c-format
-msgid "Online WebSite"
-msgstr "線上網站"
-
-#: ../mdkapplet:224
+#: ../mdkapplet:202
 #, c-format
 msgid "Configure Network"
 msgstr "設定網路連線"
 
-#: ../mdkapplet:225
-#, c-format
-msgid "Configure Now!"
-msgstr "立即設定！"
-
-#: ../mdkapplet:313
-#: ../mdkapplet:392
-#, c-format
-msgid "Mandriva Linux Updates Applet"
-msgstr "Mandriva Linux 自動更新面板程式"
-
-#: ../mdkapplet:322
-#, c-format
-msgid "Actions"
-msgstr "動作"
-
-#: ../mdkapplet:325
-#, c-format
-msgid "Configure"
-msgstr "設定"
-
-#: ../mdkapplet:329
-#, c-format
-msgid "See logs"
-msgstr "檢視紀錄"
-
-#: ../mdkapplet:332
-#, c-format
-msgid "Status"
-msgstr "狀態"
-
-#: ../mdkapplet:336
-#: ../mdkapplet:597
-#, c-format
-msgid "Close"
-msgstr "關閉"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Network Connection: "
-msgstr "網路連線："
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Up"
-msgstr "啟動"
-
-#: ../mdkapplet:365
-#, c-format
-msgid "Down"
-msgstr "未啟動"
-
-#: ../mdkapplet:366
-#, c-format
-msgid "Last check: "
-msgstr "最近一次檢查："
-
-#: ../mdkapplet:367
-#: ../mdkonline:145
-#, c-format
-msgid "Machine name:"
-msgstr "電腦名稱："
-
-#: ../mdkapplet:368
-#, c-format
-msgid "Updates: "
-msgstr "更新："
-
-#: ../mdkapplet:372
+#: ../mdkapplet:283
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "啟動 drakconnect 連線程式\n"
 
-#: ../mdkapplet:375
+#: ../mdkapplet:286
 #, c-format
 msgid "Mandriva Online seems to be reinstalled, reloading applet ...."
 msgstr "Mandriva Online 似乎重新安裝過，重新載入面板程式..."
 
-#: ../mdkapplet:383
+#: ../mdkapplet:294
 #, c-format
 msgid "Launching MandrivaUpdate\n"
 msgstr "啟動 MandrivaUpdate\n"
 
-#: ../mdkapplet:398
+#: ../mdkapplet:303
+#, c-format
+msgid "Mandriva Linux Updates Applet"
+msgstr "Mandriva Linux 自動更新面板程式"
+
+#: ../mdkapplet:308
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "計算新的更新...\n"
 
-#: ../mdkapplet:399
+#: ../mdkapplet:309
 #, c-format
 msgid "Connecting to"
 msgstr "連線到"
 
-#: ../mdkapplet:467
-#: ../mdkupdate:159
-#: ../mdkupdate:188
-#, c-format
-msgid "An error occurred"
-msgstr "發生一個錯誤"
-
-#: ../mdkapplet:475
-#, c-format
-msgid "Development release not supported by service"
-msgstr "本服務不支援開發中的版本"
-
-#: ../mdkapplet:476
-#, c-format
-msgid "Too old release not supported by service"
-msgstr "本服務不支援過舊的版本"
-
-#: ../mdkapplet:477
-#, c-format
-msgid "Unknown state"
-msgstr "未知的狀態"
-
-#: ../mdkapplet:478
-#, c-format
-msgid "Online services disabled. Contact Mandriva Online site\n"
-msgstr "線上服務關閉。請聯繫 Mandriva Online 網站\n"
-
-#: ../mdkapplet:479
-#, c-format
-msgid "Wrong Password.\n"
-msgstr "密碼錯誤。\n"
-
-#: ../mdkapplet:480
-#, c-format
-msgid "Wrong Action or host or login.\n"
-msgstr "錯誤的動作或主機或帳號。\n"
-
-#: ../mdkapplet:481
-#, c-format
-msgid "Something is wrong with your network settings (check your route, firewall or proxy settings)\n"
-msgstr "您的網路設定發生錯誤 (請檢查您的路由器、防火牆或代理伺服器設定)\n"
-
-#: ../mdkapplet:483
-#, c-format
-msgid "Problem occured while connecting to the server, please contact the support team"
-msgstr "連結到伺服器發生錯誤，請聯繫支援團隊"
-
-#: ../mdkapplet:487
-#, c-format
-msgid "Response from Mandriva Online server\n"
-msgstr "來自 Mandriva Online 伺服器的回應\n"
-
-#: ../mdkapplet:490
+#: ../mdkapplet:386
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "系統已經在最新狀態了\n"
 
-#: ../mdkapplet:527
-#, c-format
-msgid "No check"
-msgstr "不檢查"
-
-#: ../mdkapplet:541
-#, c-format
-msgid "Checking config file: Not present\n"
-msgstr "檢查設定檔：不存在\n"
-
-#: ../mdkapplet:544
+#: ../mdkapplet:415
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "檢查網路狀態中：似乎已停用\n"
 
-#: ../mdkapplet:587
-#, c-format
-msgid "Logs"
-msgstr "記錄檔"
-
-#: ../mdkapplet:603
+#: ../mdkapplet:457 ../mdkupdate:118 ../mdkupdate:164
 #, c-format
-msgid "Clear"
-msgstr "清除"
+msgid "Warning"
+msgstr "警告"
 
-#: ../mdkapplet:629
+#: ../mdkapplet:468
 #, c-format
 msgid "About..."
 msgstr "關於..."
 
-#: ../mdkapplet:631
+#: ../mdkapplet:472
 #, c-format
 msgid "Mandriva Online %s"
 msgstr "Mandriva Online %s"
 
-#: ../mdkapplet:635
+#: ../mdkapplet:473
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Copyright (C) %s by Mandriva"
 
-#: ../mdkapplet:647
+#: ../mdkapplet:476
 #, c-format
 msgid "Mandriva Online gives access to Mandriva web services."
 msgstr "Mandriva Online 將引導您連結到 Mandriva 網頁服務。"
 
-#: ../mdkapplet:655
-#, c-format
-msgid "Always launch on startup"
-msgstr "總是在啟動時執行"
-
-#: ../mdkapplet:657
-#, c-format
-msgid "Quit"
-msgstr "結束"
-
-#: ../mdkonline:58
-#, c-format
-msgid ""
-"mdonline version %s\n"
-"Copyright (C) %s Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"mdonline 版本號 %s\n"
-"Copyright (C) %s Mandriva.\n"
-"這是自由軟體且可於 GNU GPL 條款下被重新散佈。\n"
-"\n"
-"用法：\n"
-
-#: ../mdkonline:63
-#: ../mdkupdate:73
-#, c-format
-msgid "  --help\t\t- print this help message.\n"
-msgstr "  --help\t\t- 顯示本輔助說明。\n"
-
-#: ../mdkonline:64
-#, c-format
-msgid "  --box=\t\t\t- hostname.\n"
-msgstr "  --box=\t\t\t- 主機名稱。\n"
-
-#: ../mdkonline:65
-#, c-format
-msgid "  --country\t\t\t- name of country of the user. \n"
-msgstr "  --country\t\t\t- 使用者國家名稱。\n"
-
-#: ../mdkonline:66
-#, c-format
-msgid "  --interactive\t\t- use the interactive mode.\n"
-msgstr "  --interactive\t\t- 使用互動模式。\n"
-
-#: ../mdkonline:67
-#, c-format
-msgid "  --nointeractive\t- use the non-interactive mode.\n"
-msgstr "  --nointeractive\t- 使用非互動模式。\n"
-
-#: ../mdkonline:68
-#, c-format
-msgid "  --login=\t\t     - login name of the user.\n"
-msgstr "  --login=\t\t     - 使用者的登入名稱。\n"
-
-#: ../mdkonline:69
-#, c-format
-msgid "  --pass=\t\t\t- password  of the user.\n"
-msgstr "  --pass=\t\t\t- 使用者密碼。\n"
-
-#: ../mdkonline:87
-#: ../mdkonline:120
-#, c-format
-msgid "Mandriva Online"
-msgstr "Mandriva Online"
-
-#: ../mdkonline:90
-#, c-format
-msgid "I already have an account"
-msgstr "我已經有一個帳號"
-
-#: ../mdkonline:91
-#, c-format
-msgid "I want to subscribe"
-msgstr "我要訂購"
-
-#: ../mdkonline:96
-#, c-format
-msgid "Mr."
-msgstr "Mr."
-
-#: ../mdkonline:96
-#, c-format
-msgid "Mrs."
-msgstr "Mrs."
-
-#: ../mdkonline:96
-#, c-format
-msgid "Ms."
-msgstr "Ms."
-
-#: ../mdkonline:114
-#, c-format
-msgid "Reading configuration\n"
-msgstr "正在讀取組態設定\n"
-
-#: ../mdkonline:123
-#, c-format
-msgid ""
-"This assistant will help you to upload your configuration\n"
-"(packages, hardware configuration) to a centralized database in\n"
-"order to keep you informed about security updates and useful upgrades.\n"
-msgstr ""
-"這個精靈將協助您上傳您的組態設定 (包含套件與硬體設定) 到一個集\n"
-"中管理的資料庫中，以提供您關於安全性更新及其餘有用的更新的訊息。\n"
-
-#: ../mdkonline:131
-#, c-format
-msgid "Account creation or authentication"
-msgstr "帳號建立或認證"
-
-#: ../mdkonline:136
-#, c-format
-msgid "Enter your Mandriva Online login, password and machine name:"
-msgstr "請輸入您在 Mandriva Online 上的帳號、密碼與電腦名稱："
-
-#: ../mdkonline:142
-#: ../mdkonline:195
-#, c-format
-msgid "Email address:"
-msgstr "郵件地址："
-
-#: ../mdkonline:143
-#, c-format
-msgid "Country"
-msgstr "國家"
-
-#: ../mdkonline:144
-#: ../mdkonline:196
-#, c-format
-msgid "Password:"
-msgstr "密碼："
-
-#: ../mdkonline:146
-#, c-format
-msgid "Machine description:"
-msgstr "電腦描述："
-
-#: ../mdkonline:147
-#, c-format
-msgid "(Ex: My Home Office's Computer)"
-msgstr "(例如：我家的電腦)"
-
-#: ../mdkonline:152
-#: ../mdkonline:159
-#: ../mdkonline:180
-#: ../mdkonline:204
-#: ../mdkonline:208
-#: ../mdkonline:212
-#: ../mdkonline:217
-#: ../mdkupdate:141
-#: ../mdkupdate:159
-#: ../mdkupdate:188
-#: ../mdkupdate:207
-#, c-format
-msgid "Error"
-msgstr "錯誤"
-
-#: ../mdkonline:152
-#, c-format
-msgid "Machine name must be 1 to 40 alphanumerical characters"
-msgstr "主機名稱必須由 1 到 40 個英文字母或數字的字元所組成"
-
-#: ../mdkonline:155
-#, c-format
-msgid "Connecting to Mandriva Online website..."
-msgstr "正在連線到 Mandriva Online 網站..."
-
-#: ../mdkonline:167
-#, c-format
-msgid ""
-"In order to benefit from Mandriva Online services,\n"
-"we are about to upload your configuration.\n"
-"\n"
-"The Wizard will now send the following information to Mandriva:\n"
-"\n"
-"1) the list of packages you have installed on your system,\n"
-"\n"
-"2) your hardware configuration.\n"
-"\n"
-"If you feel uncomfortable by that idea, or do not want to benefit from this service,\n"
-"please press 'Cancel'. By pressing 'Next', you allow us to keep you informed\n"
-"about security updates and useful upgrades via personalized email alerts.\n"
-"Furthermore, you benefit from discounted paid support services on\n"
-"www.mandrivaexpert.com."
-msgstr ""
-"為了能夠使用 Mandriva Online 服務項目，首先需要將您目前的組態資訊\n"
-"送回 Mandriva Linux 總部，以便於能夠進行後續服務功能。\n"
-"\n"
-"設定精靈將會送出下面的資訊到 Mandriva 總部，這包含了：\n"
-"\n"
-"1) 您目前系統已經安裝的套件清單內容，\n"
-"\n"
-"2) 您系統的硬體環境組態。\n"
-"\n"
-"如果您不認同將相關資訊送回至 Mandriva 的行為，或者是您不打算\n"
-"使用後續 Mandriva Online 服務的話，請點選「取消」 按鈕放棄。\n"
-"若是您點選「下一步」的話，設定精靈將會把相關資訊送回 Mandriva \n"
-"總部，您以後就能夠獲得關於相關套件的安全問題通知，並包含相關套件\n"
-"更新資訊。\n"
-"此外，您可以在 http://www.mandrivaexpert.com 使用付費的機制獲得\n"
-"更多服務與支援。"
-
-#: ../mdkonline:180
-#, c-format
-msgid "Connection problem"
-msgstr "連線問題"
-
-#: ../mdkonline:180
-#, c-format
-msgid "Problem occurs when uploading files, please try again"
-msgstr "上傳檔案時發生問題，請再試一次"
-
-#: ../mdkonline:187
-#, c-format
-msgid "Create a Mandriva Online Account"
-msgstr "建立 Mandriva Online 帳號"
-
-#. -PO: that is for things like "Mr", "Ms",...
-#: ../mdkonline:192
-#, c-format
-msgid "Greeting:"
-msgstr "歡迎："
-
-#: ../mdkonline:193
-#, c-format
-msgid "First name:"
-msgstr "名字："
-
-#: ../mdkonline:194
-#, c-format
-msgid "Last name:"
-msgstr "姓氏："
-
-#: ../mdkonline:197
-#, c-format
-msgid "Confirm Password:"
-msgstr "確認密碼："
-
-#: ../mdkonline:204
-#, c-format
-msgid ""
-"The passwords do not match\n"
-" Please try again\n"
-msgstr ""
-"密碼不符\n"
-" 請再試一次\n"
-
-#: ../mdkonline:208
-#, c-format
-msgid "Please fill in each field"
-msgstr "請填寫全部的欄位"
-
-#: ../mdkonline:212
-#, c-format
-msgid "Not a valid mail address!\n"
-msgstr "不是一個有效的郵件地址！\n"
-
-#: ../mdkonline:217
-#, c-format
-msgid "Creating account failed!"
-msgstr "帳號建立失敗！"
-
-#: ../mdkonline:225
-#, c-format
-msgid ""
-"Mandriva Online Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
-msgstr ""
-"Mandriva Online 帳號註冊成功。\n"
-"請按「下一步」來認證並上傳您的組態設定\n"
-
-#: ../mdkonline:229
+#: ../mdkapplet:478
 #, c-format
-msgid "Your upload was successful!"
-msgstr "上傳成功！"
+msgid "Online WebSite"
+msgstr "線上網站"
 
-#: ../mdkonline:229
+#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
+#: ../mdkapplet:483
 #, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandriva Online."
+msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
-"由現在起，您將會不定期的收到來自於 Mandriva Online\n"
-"發送的安全與更新修正套件公告資訊。"
 
-#: ../mdkonline:229
+#: ../mdkapplet:492
 #, c-format
-msgid ""
-"Mandriva Online offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
-msgstr ""
-"Mandriva Online 提供讓您能夠自動進行更新動作。\n"
-"系統將會定期的執行更新程式檢查最新的更新資訊\n"
-
-#: ../mdkonline:238
-#, c-format
-msgid "Congratulations"
-msgstr "恭喜"
-
-#: ../mdkonline:238
-#, c-format
-msgid "Your Mandriva Online account has been successfully configured\n"
-msgstr "您的 Mandriva Online 帳號已經成功設定\n"
-
-#: ../mdkonline:253
-#, c-format
-msgid "Configuration uploaded successfully"
-msgstr "組態設定上傳成功"
-
-#: ../mdkonline:254
-#, c-format
-msgid "Problem uploading configuration"
-msgstr "上傳組態設定時發生問題"
+msgid "Always launch on startup"
+msgstr "總是在啟動時執行"
 
-#: ../mdkonline:256
+#: ../mdkapplet:494
 #, c-format
-msgid "Cannot connect to Mandriva Online website: wrong login/password or router/firewall bad settings"
-msgstr "無法連線到 Mandriva Online 網站：錯誤的帳號/密碼或路由器/防火牆設定"
+msgid "Quit"
+msgstr "結束"
 
 #: ../mdkonline.pm:207
 #, c-format
@@ -719,8 +252,7 @@ msgstr "註冊錯誤"
 msgid "Some parameters are missing"
 msgstr "某些參數遺失"
 
-#: ../mdkonline.pm:210
-#: ../mdkonline.pm:216
+#: ../mdkonline.pm:210 ../mdkonline.pm:216
 #, c-format
 msgid "Password error"
 msgstr "密碼錯誤"
@@ -730,9 +262,7 @@ msgstr "密碼錯誤"
 msgid "Wrong password"
 msgstr "錯誤密碼"
 
-#: ../mdkonline.pm:211
-#: ../mdkonline.pm:212
-#: ../mdkonline.pm:213
+#: ../mdkonline.pm:211 ../mdkonline.pm:212 ../mdkonline.pm:213
 #, c-format
 msgid "Login error"
 msgstr "登入錯誤"
@@ -770,8 +300,7 @@ msgstr "限制錯誤"
 msgid "Database access forbidden"
 msgstr "連結資料庫遭拒"
 
-#: ../mdkonline.pm:215
-#: ../mdkonline.pm:217
+#: ../mdkonline.pm:215 ../mdkonline.pm:217
 #, c-format
 msgid "Service error"
 msgstr "服務錯誤"
@@ -824,7 +353,8 @@ msgstr "無法連線到 Mandriva 網頁服務"
 msgid ""
 "mdkupdate version %s\n"
 "Copyright (C) %s Mandriva.\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 ""
@@ -834,6 +364,11 @@ msgstr ""
 "\n"
 "用法：\n"
 
+#: ../mdkupdate:73
+#, c-format
+msgid "  --help\t\t- print this help message.\n"
+msgstr "  --help\t\t- 顯示本輔助說明。\n"
+
 #: ../mdkupdate:74
 #, c-format
 msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
@@ -856,27 +391,34 @@ msgstr "  --debug\t\t\t- 紀錄做了那些事情\n"
 
 #: ../mdkupdate:78
 #, c-format
-msgid "  --bundle file.bundle\t- parse and install package from .bundle metainfo file.\n"
+msgid ""
+"  --bundle file.bundle\t- parse and install package from .bundle metainfo "
+"file.\n"
 msgstr "  --bundle file.bundle\t- 分析並安裝 .bundle 資訊檔中的套件。\n"
 
-#: ../mdkupdate:118
-#: ../mdkupdate:164
-#, c-format
-msgid "Warning"
-msgstr "警告"
-
 #. -PO: here Live Install is currently *NOT* translated on the desktop, so it's better to keep as it:
 #: ../mdkupdate:120
 #, c-format
-msgid "You first need to install the system on your harddrive with the 'Live Install' wizard."
+msgid ""
+"You first need to install the system on your harddrive with the 'Live "
+"Install' wizard."
 msgstr "首先您必須用「Live Install」精靈將系統安裝到您的硬碟。"
 
-#: ../mdkupdate:123
-#: ../mdkupdate:174
+#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
+#, c-format
+msgid "Please wait"
+msgstr "請稍候"
+
+#: ../mdkupdate:123 ../mdkupdate:174
 #, c-format
 msgid "Preparing..."
 msgstr "準備中..."
 
+#: ../mdkupdate:141 ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
+#, c-format
+msgid "Error"
+msgstr "錯誤"
+
 #: ../mdkupdate:141
 #, c-format
 msgid ""
@@ -888,12 +430,18 @@ msgstr ""
 "\n"
 "%s"
 
+#: ../mdkupdate:159 ../mdkupdate:188
+#, c-format
+msgid "An error occurred"
+msgstr "發生一個錯誤"
+
 #: ../mdkupdate:164
 #, c-format
 msgid ""
 "The version of the Mandriva Online client is too old.\n"
 "\n"
-"You need to update to a newer version. You can get a new one from http://start.mandriva.com"
+"You need to update to a newer version. You can get a new one from http://"
+"start.mandriva.com"
 msgstr ""
 "這個 Mandriva Online 客戶端的版本太舊了。\n"
 "\n"
@@ -909,34 +457,337 @@ msgstr "這個加值軟體沒有經過良好的格式化，略過。"
 msgid "Installing packages ...\n"
 msgstr "正在安裝套件...\n"
 
-#: ../mdkupdate:231
-#: ../mdkupdate:271
+#: ../mdkupdate:231 ../mdkupdate:271
 #, c-format
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "無法由 update_source 媒體更新套件。\n"
 
+#~ msgid "New bundles are available for your system"
+#~ msgstr "有適用於您系統的加值軟體"
+
+#~ msgid "Service is not configured. Please click on \"Configure the service\""
+#~ msgstr "沒有設定服務，請點選「設定本服務」"
+
+#~ msgid "Configure the service"
+#~ msgstr "設定本服務"
+
+#~ msgid "Check updates"
+#~ msgstr "檢查更新"
+
+#~ msgid "Configure Now!"
+#~ msgstr "立即設定！"
+
+#~ msgid "Actions"
+#~ msgstr "動作"
+
+#~ msgid "Configure"
+#~ msgstr "設定"
+
+#~ msgid "See logs"
+#~ msgstr "檢視紀錄"
+
+#~ msgid "Status"
+#~ msgstr "狀態"
+
+#~ msgid "Close"
+#~ msgstr "關閉"
+
+#~ msgid "Network Connection: "
+#~ msgstr "網路連線："
+
+#~ msgid "Up"
+#~ msgstr "啟動"
+
+#~ msgid "Down"
+#~ msgstr "未啟動"
+
+#~ msgid "Last check: "
+#~ msgstr "最近一次檢查："
+
+#~ msgid "Machine name:"
+#~ msgstr "電腦名稱："
+
+#~ msgid "Updates: "
+#~ msgstr "更新："
+
+#~ msgid "Development release not supported by service"
+#~ msgstr "本服務不支援開發中的版本"
+
+#~ msgid "Too old release not supported by service"
+#~ msgstr "本服務不支援過舊的版本"
+
+#~ msgid "Unknown state"
+#~ msgstr "未知的狀態"
+
+#~ msgid "Online services disabled. Contact Mandriva Online site\n"
+#~ msgstr "線上服務關閉。請聯繫 Mandriva Online 網站\n"
+
+#~ msgid "Wrong Password.\n"
+#~ msgstr "密碼錯誤。\n"
+
+#~ msgid "Wrong Action or host or login.\n"
+#~ msgstr "錯誤的動作或主機或帳號。\n"
+
+#~ msgid ""
+#~ "Something is wrong with your network settings (check your route, firewall "
+#~ "or proxy settings)\n"
+#~ msgstr "您的網路設定發生錯誤 (請檢查您的路由器、防火牆或代理伺服器設定)\n"
+
+#~ msgid ""
+#~ "Problem occured while connecting to the server, please contact the "
+#~ "support team"
+#~ msgstr "連結到伺服器發生錯誤，請聯繫支援團隊"
+
+#~ msgid "Response from Mandriva Online server\n"
+#~ msgstr "來自 Mandriva Online 伺服器的回應\n"
+
+#~ msgid "No check"
+#~ msgstr "不檢查"
+
+#~ msgid "Checking config file: Not present\n"
+#~ msgstr "檢查設定檔：不存在\n"
+
+#~ msgid "Logs"
+#~ msgstr "記錄檔"
+
+#~ msgid "Clear"
+#~ msgstr "清除"
+
+#~ msgid ""
+#~ "mdonline version %s\n"
+#~ "Copyright (C) %s Mandriva.\n"
+#~ "This is free software and may be redistributed under the terms of the GNU "
+#~ "GPL.\n"
+#~ "\n"
+#~ "usage:\n"
+#~ msgstr ""
+#~ "mdonline 版本號 %s\n"
+#~ "Copyright (C) %s Mandriva.\n"
+#~ "這是自由軟體且可於 GNU GPL 條款下被重新散佈。\n"
+#~ "\n"
+#~ "用法：\n"
+
+#~ msgid "  --box=\t\t\t- hostname.\n"
+#~ msgstr "  --box=\t\t\t- 主機名稱。\n"
+
+#~ msgid "  --country\t\t\t- name of country of the user. \n"
+#~ msgstr "  --country\t\t\t- 使用者國家名稱。\n"
+
+#~ msgid "  --interactive\t\t- use the interactive mode.\n"
+#~ msgstr "  --interactive\t\t- 使用互動模式。\n"
+
+#~ msgid "  --nointeractive\t- use the non-interactive mode.\n"
+#~ msgstr "  --nointeractive\t- 使用非互動模式。\n"
+
+#~ msgid "  --login=\t\t     - login name of the user.\n"
+#~ msgstr "  --login=\t\t     - 使用者的登入名稱。\n"
+
+#~ msgid "  --pass=\t\t\t- password  of the user.\n"
+#~ msgstr "  --pass=\t\t\t- 使用者密碼。\n"
+
+#~ msgid "Mandriva Online"
+#~ msgstr "Mandriva Online"
+
+#~ msgid "I already have an account"
+#~ msgstr "我已經有一個帳號"
+
+#~ msgid "I want to subscribe"
+#~ msgstr "我要訂購"
+
+#~ msgid "Mr."
+#~ msgstr "Mr."
+
+#~ msgid "Mrs."
+#~ msgstr "Mrs."
+
+#~ msgid "Ms."
+#~ msgstr "Ms."
+
+#~ msgid "Reading configuration\n"
+#~ msgstr "正在讀取組態設定\n"
+
+#~ msgid ""
+#~ "This assistant will help you to upload your configuration\n"
+#~ "(packages, hardware configuration) to a centralized database in\n"
+#~ "order to keep you informed about security updates and useful upgrades.\n"
+#~ msgstr ""
+#~ "這個精靈將協助您上傳您的組態設定 (包含套件與硬體設定) 到一個集\n"
+#~ "中管理的資料庫中，以提供您關於安全性更新及其餘有用的更新的訊息。\n"
+
+#~ msgid "Account creation or authentication"
+#~ msgstr "帳號建立或認證"
+
+#~ msgid "Enter your Mandriva Online login, password and machine name:"
+#~ msgstr "請輸入您在 Mandriva Online 上的帳號、密碼與電腦名稱："
+
+#~ msgid "Email address:"
+#~ msgstr "郵件地址："
+
+#~ msgid "Country"
+#~ msgstr "國家"
+
+#~ msgid "Password:"
+#~ msgstr "密碼："
+
+#~ msgid "Machine description:"
+#~ msgstr "電腦描述："
+
+#~ msgid "(Ex: My Home Office's Computer)"
+#~ msgstr "(例如：我家的電腦)"
+
+#~ msgid "Machine name must be 1 to 40 alphanumerical characters"
+#~ msgstr "主機名稱必須由 1 到 40 個英文字母或數字的字元所組成"
+
+#~ msgid "Connecting to Mandriva Online website..."
+#~ msgstr "正在連線到 Mandriva Online 網站..."
+
+#~ msgid ""
+#~ "In order to benefit from Mandriva Online services,\n"
+#~ "we are about to upload your configuration.\n"
+#~ "\n"
+#~ "The Wizard will now send the following information to Mandriva:\n"
+#~ "\n"
+#~ "1) the list of packages you have installed on your system,\n"
+#~ "\n"
+#~ "2) your hardware configuration.\n"
+#~ "\n"
+#~ "If you feel uncomfortable by that idea, or do not want to benefit from "
+#~ "this service,\n"
+#~ "please press 'Cancel'. By pressing 'Next', you allow us to keep you "
+#~ "informed\n"
+#~ "about security updates and useful upgrades via personalized email "
+#~ "alerts.\n"
+#~ "Furthermore, you benefit from discounted paid support services on\n"
+#~ "www.mandrivaexpert.com."
+#~ msgstr ""
+#~ "為了能夠使用 Mandriva Online 服務項目，首先需要將您目前的組態資訊\n"
+#~ "送回 Mandriva Linux 總部，以便於能夠進行後續服務功能。\n"
+#~ "\n"
+#~ "設定精靈將會送出下面的資訊到 Mandriva 總部，這包含了：\n"
+#~ "\n"
+#~ "1) 您目前系統已經安裝的套件清單內容，\n"
+#~ "\n"
+#~ "2) 您系統的硬體環境組態。\n"
+#~ "\n"
+#~ "如果您不認同將相關資訊送回至 Mandriva 的行為，或者是您不打算\n"
+#~ "使用後續 Mandriva Online 服務的話，請點選「取消」 按鈕放棄。\n"
+#~ "若是您點選「下一步」的話，設定精靈將會把相關資訊送回 Mandriva \n"
+#~ "總部，您以後就能夠獲得關於相關套件的安全問題通知，並包含相關套件\n"
+#~ "更新資訊。\n"
+#~ "此外，您可以在 http://www.mandrivaexpert.com 使用付費的機制獲得\n"
+#~ "更多服務與支援。"
+
+#~ msgid "Connection problem"
+#~ msgstr "連線問題"
+
+#~ msgid "Problem occurs when uploading files, please try again"
+#~ msgstr "上傳檔案時發生問題，請再試一次"
+
+#~ msgid "Create a Mandriva Online Account"
+#~ msgstr "建立 Mandriva Online 帳號"
+
+#~ msgid "Greeting:"
+#~ msgstr "歡迎："
+
+#~ msgid "First name:"
+#~ msgstr "名字："
+
+#~ msgid "Last name:"
+#~ msgstr "姓氏："
+
+#~ msgid "Confirm Password:"
+#~ msgstr "確認密碼："
+
+#~ msgid ""
+#~ "The passwords do not match\n"
+#~ " Please try again\n"
+#~ msgstr ""
+#~ "密碼不符\n"
+#~ " 請再試一次\n"
+
+#~ msgid "Please fill in each field"
+#~ msgstr "請填寫全部的欄位"
+
+#~ msgid "Not a valid mail address!\n"
+#~ msgstr "不是一個有效的郵件地址！\n"
+
+#~ msgid "Creating account failed!"
+#~ msgstr "帳號建立失敗！"
+
+#~ msgid ""
+#~ "Mandriva Online Account successfully created.\n"
+#~ "Please click \"Next\" to authenticate and upload your configuration\n"
+#~ msgstr ""
+#~ "Mandriva Online 帳號註冊成功。\n"
+#~ "請按「下一步」來認證並上傳您的組態設定\n"
+
+#~ msgid "Your upload was successful!"
+#~ msgstr "上傳成功！"
+
+#~ msgid ""
+#~ "From now you will receive on security and updates \n"
+#~ "announcements thanks to Mandriva Online."
+#~ msgstr ""
+#~ "由現在起，您將會不定期的收到來自於 Mandriva Online\n"
+#~ "發送的安全與更新修正套件公告資訊。"
+
+#~ msgid ""
+#~ "Mandriva Online offers you the ability to automate the updates.\n"
+#~ "A program will run regulary in your system waiting for new updates\n"
+#~ msgstr ""
+#~ "Mandriva Online 提供讓您能夠自動進行更新動作。\n"
+#~ "系統將會定期的執行更新程式檢查最新的更新資訊\n"
+
+#~ msgid "Congratulations"
+#~ msgstr "恭喜"
+
+#~ msgid "Your Mandriva Online account has been successfully configured\n"
+#~ msgstr "您的 Mandriva Online 帳號已經成功設定\n"
+
+#~ msgid "Configuration uploaded successfully"
+#~ msgstr "組態設定上傳成功"
+
+#~ msgid "Problem uploading configuration"
+#~ msgstr "上傳組態設定時發生問題"
+
+#~ msgid ""
+#~ "Cannot connect to Mandriva Online website: wrong login/password or router/"
+#~ "firewall bad settings"
+#~ msgstr "無法連線到 Mandriva Online 網站：錯誤的帳號/密碼或路由器/防火牆設定"
+
 #~ msgid "  --applet\t\t- launch Mandriva Update.\n"
 #~ msgstr "  --applet\t\t- 啟動 Mandriva Update 面板程式。\n"
+
 #~ msgid "Cannot get list of updates: %s"
 #~ msgstr "無法取得更新列表：%s"
+
 #~ msgid "Choose which packages should be installed and Press Ok"
 #~ msgstr "請選取要安裝的套件並按下確定"
+
 #~ msgid "System is busy. Please wait ..."
 #~ msgstr "系統忙碌中，請稍候..."
+
 #~ msgid "Sending configuration..."
 #~ msgstr "正在送出組態設定..."
+
 #~ msgid "Unsecure invocation: Method available through httpS only"
 #~ msgstr "不安全的請求：僅能使用 httpS"
+
 #~ msgid "No %s file found. Run mdkonline wizard first"
 #~ msgstr "沒有找到檔案 %s，請先執行 mdkonline 設定精靈"
+
 #~ msgid "Mandriva Update could not contact the site, we will try again."
 #~ msgstr "Mandriva Update 無法連線到網站，我們將再試一次。"
+
 #~ msgid "Login:"
 #~ msgstr "帳號："
+
 #~ msgid "or"
 #~ msgstr "或"
+
 #~ msgid "wrong password:"
 #~ msgstr "密碼錯誤："
+
 #~ msgid ""
 #~ "Your login or password was wrong.\n"
 #~ " Either you'll have to type it again, or you'll need to create an account "
@@ -950,22 +801,29 @@ msgstr "無法由 update_source 媒體更新套件。\n"
 #~ "請重新輸入一次，或者您需要在 Mandriva Online 上註冊一個帳號。\n"
 #~ "若是後者，請回到第一步以連線到 Mandriva Online。\n"
 #~ "請注意您必須同時提供一個電腦名稱 (僅包含英文字母)"
+
 #~ msgid "Mail contact:"
 #~ msgstr "聯絡信箱："
+
 #~ msgid "Please provide a login"
 #~ msgstr "請輸入帳號"
+
 #~ msgid "Login and password should be less than 12 characters\n"
 #~ msgstr "登入帳號與密碼應該少於 12 個字元\n"
+
 #~ msgid "Special characters are not allowed\n"
 #~ msgstr "不允許使用特殊字元\n"
+
 #~ msgid "Email not valid\n"
 #~ msgstr "無效的電子郵件位址\n"
+
 #~ msgid "Account already exists\n"
 #~ msgstr "帳號已經存在\n"
+
 #~ msgid "Problem connecting to server \n"
 #~ msgstr "連線到伺服器出問題\n"
+
 #~ msgid ""
 #~ "Problem occurred while connecting to the server, please contact the "
 #~ "support team"
 #~ msgstr "連結到伺服器發生錯誤，請聯繫支援團隊"
-