sync with code

1 files changed, 68 insertions, 496 deletions

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 ""