merge changes from MNF, MDK-10-update

1 files changed, 169 insertions, 226 deletions

diff --git a/po/mdkonline.pot b/po/mdkonline.pot
index be7647c5..76bd3250 100644
--- a/po/mdkonline.pot
+++ b/po/mdkonline.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2004-10-01 22:41+0200\n"
+"POT-Creation-Date: 2004-11-03 12:10+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,353 +14,352 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: ../mdkapplet:61
+#: ../mdkapplet:63
 #, c-format
 msgid "Your system is up-to-date"
 msgstr ""
 
-#: ../mdkapplet:67
+#: ../mdkapplet:69
 #, c-format
 msgid "Service configuration problem. Please check logs and send mail to support@mandrakeonline.net"
 msgstr ""
 
-#: ../mdkapplet:73
+#: ../mdkapplet:75
 #, c-format
 msgid "System is busy. Please wait ..."
 msgstr ""
 
-#: ../mdkapplet:79
+#: ../mdkapplet:81
 #, c-format
 msgid "New updates are available for your system"
 msgstr ""
 
-#: ../mdkapplet:85
+#: ../mdkapplet:87
 #, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
 msgstr ""
 
-#: ../mdkapplet:91
+#: ../mdkapplet:93
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr ""
 
-#: ../mdkapplet:97
+#: ../mdkapplet:99
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr ""
 
-#: ../mdkapplet:103
+#: ../mdkapplet:105
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
-#: ../mdkapplet:108 ../mdkapplet:158
+#: ../mdkapplet:110 ../mdkapplet:164
 #, c-format
 msgid "Install updates"
 msgstr ""
 
-#: ../mdkapplet:109
+#: ../mdkapplet:111
 #, c-format
 msgid "Configure the service"
 msgstr ""
 
-#: ../mdkapplet:110
+#: ../mdkapplet:112
 #, c-format
 msgid "Check Updates"
 msgstr ""
 
-#: ../mdkapplet:111
+#: ../mdkapplet:113 ../mdkapplet:167 ../mdkapplet:225
+#, c-format
+msgid "Please Wait"
+msgstr ""
+
+#: ../mdkapplet:113 ../mdkapplet:166 ../mdkapplet:167 ../mdkapplet:225
+#, c-format
+msgid "Check updates"
+msgstr ""
+
+#: ../mdkapplet:115
 #, c-format
 msgid "Online WebSite"
 msgstr ""
 
-#: ../mdkapplet:112
+#: ../mdkapplet:116
 #, c-format
 msgid "Configure Network"
 msgstr ""
 
-#: ../mdkapplet:113
+#: ../mdkapplet:117
 #, c-format
 msgid "Configure Now!"
 msgstr ""
 
-#: ../mdkapplet:146
+#: ../mdkapplet:152 ../mdkapplet:229
 #, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr ""
 
-#: ../mdkapplet:156
+#: ../mdkapplet:162
 #, c-format
 msgid "Actions"
 msgstr ""
 
-#: ../mdkapplet:159
+#: ../mdkapplet:165
 #, c-format
 msgid "Configure"
 msgstr ""
 
-#: ../mdkapplet:160
-#, c-format
-msgid "Check updates"
-msgstr ""
-
-#: ../mdkapplet:161
+#: ../mdkapplet:169
 #, c-format
 msgid "See logs"
 msgstr ""
 
-#: ../mdkapplet:164
+#: ../mdkapplet:172
 #, c-format
 msgid "Status"
 msgstr ""
 
-#: ../mdkapplet:168 ../mdkapplet:363
+#: ../mdkapplet:176 ../mdkapplet:375
 #, c-format
 msgid "Close"
 msgstr ""
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Network Connection: "
 msgstr ""
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Up"
 msgstr ""
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Down"
 msgstr ""
 
-#: ../mdkapplet:204
+#: ../mdkapplet:212
 #, c-format
 msgid "Last check: "
 msgstr ""
 
-#: ../mdkapplet:205
+#: ../mdkapplet:213
 #, c-format
 msgid "Updates: "
 msgstr ""
 
-#: ../mdkapplet:209
+#: ../mdkapplet:217
 #, c-format
 msgid ""
 "Launching drakconnect\n"
 ""
 msgstr ""
 
-#: ../mdkapplet:213
+#: ../mdkapplet:221
 #, c-format
 msgid ""
 "Launching mdkupdate --applet\n"
 ""
 msgstr ""
 
-#: ../mdkapplet:217
+#: ../mdkapplet:224
 #, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr ""
 
-#: ../mdkapplet:225
+#: ../mdkapplet:235
 #, c-format
 msgid ""
 "Computing new updates...\n"
 ""
 msgstr ""
 
-#: ../mdkapplet:227
+#: ../mdkapplet:237
 #, c-format
 msgid "Connecting to"
 msgstr ""
 
-#: ../mdkapplet:250
+#: ../mdkapplet:244
+#, c-format
+msgid ""
+"Response from Mandrakeonline server\n"
+""
+msgstr ""
+
+#: ../mdkapplet:262
 #, c-format
 msgid ""
 "Checking... Updates are available\n"
 ""
 msgstr ""
 
-#: ../mdkapplet:254
+#: ../mdkapplet:267
 #, c-format
 msgid "Development release not supported by service"
 msgstr ""
 
-#: ../mdkapplet:255
+#: ../mdkapplet:268
 #, c-format
 msgid "Too old release not supported by service"
 msgstr ""
 
-#: ../mdkapplet:256
+#: ../mdkapplet:269
 #, c-format
 msgid "Unknown state"
 msgstr ""
 
-#: ../mdkapplet:257
+#: ../mdkapplet:270
 #, c-format
 msgid ""
 "Online services disabled. Contact Mandrakeonline site\n"
 ""
 msgstr ""
 
-#: ../mdkapplet:258
+#: ../mdkapplet:271
 #, c-format
 msgid ""
 "Wrong Password.\n"
 ""
 msgstr ""
 
-#: ../mdkapplet:259
+#: ../mdkapplet:272
 #, c-format
 msgid ""
 "Wrong Action or host or login.\n"
 ""
 msgstr ""
 
-#: ../mdkapplet:260
+#: ../mdkapplet:273
 #, c-format
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or proxy settings)\n"
 ""
 msgstr ""
 
-#: ../mdkapplet:264
+#: ../mdkapplet:277
 #, c-format
 msgid ""
 "System is up-to-date\n"
 ""
 msgstr ""
 
-#: ../mdkapplet:303
+#: ../mdkapplet:317
 #, c-format
 msgid "No check"
 msgstr ""
 
-#: ../mdkapplet:316
+#: ../mdkapplet:330
 #, c-format
 msgid ""
 "Checking Network: seems disabled\n"
 ""
 msgstr ""
 
-#: ../mdkapplet:319
+#: ../mdkapplet:333
 #, c-format
 msgid ""
 "Checking config file: Not present\n"
 ""
 msgstr ""
 
-#: ../mdkapplet:353
+#: ../mdkapplet:365
 #, c-format
 msgid "Logs"
 msgstr ""
 
-#: ../mdkapplet:369
+#: ../mdkapplet:381
 #, c-format
 msgid "Clear"
 msgstr ""
 
-#: ../mdkapplet:396
+#: ../mdkapplet:408
 #, c-format
 msgid "About..."
 msgstr ""
 
-#: ../mdkapplet:397
+#: ../mdkapplet:409
 #, c-format
 msgid "Always launch on startup"
 msgstr ""
 
-#: ../mdkapplet:399
+#: ../mdkapplet:411
 #, c-format
 msgid "Quit"
 msgstr ""
 
-#: ../mdkonline:89
+#: ../mdkonline:52 ../mdkonline:106
 #, c-format
-msgid "Next"
+msgid "Mandrakeonline"
 msgstr ""
 
-#: ../mdkonline:89
+#: ../mdkonline:55
 #, c-format
-msgid "Cancel"
+msgid "I already have an account"
 msgstr ""
 
-#: ../mdkonline:89
+#: ../mdkonline:56
 #, c-format
-msgid "Previous"
+msgid "I want to subscribe"
 msgstr ""
 
-#: ../mdkonline:103
+#: ../mdkonline:89 ../mdkonline:93 ../mdkonline:131
 #, c-format
-msgid "Welcome to Mandrakeonline"
+msgid "Please wait"
 msgstr ""
 
-#: ../mdkonline:104 ../mdkonline_tui:98
+#: ../mdkonline:89
 #, 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"
+"Reading configuration\n"
 ""
 msgstr ""
 
-#: ../mdkonline:105 ../mdkonline_tui:142
-#, c-format
-msgid "Create a Mandrakeonline Account"
-msgstr ""
-
-#: ../mdkonline:107
+#: ../mdkonline:93
 #, c-format
-msgid "I don't have a Mandrakeonline account and I want to subscribe"
+msgid "Sending configuration..."
 msgstr ""
 
-#: ../mdkonline:111 ../mdkonline:131 ../mdkonline_tui:114 ../mdkonline_tui:145
+#: ../mdkonline:109
 #, c-format
-msgid "Login:"
+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:112 ../mdkonline:132 ../mdkonline_tui:115 ../mdkonline_tui:146
+#: ../mdkonline:114
 #, c-format
-msgid "Password:"
+msgid "Account creation or authentication"
 msgstr ""
 
-#: ../mdkonline:113 ../mdkonline_tui:147
+#: ../mdkonline:119
 #, c-format
-msgid "Confirm Password:"
+msgid "Enter your Mandrakeonline login, password and machine name:"
 msgstr ""
 
-#: ../mdkonline:114 ../mdkonline_tui:148
+#: ../mdkonline:125 ../mdkonline:156
 #, c-format
-msgid "Mail contact:"
+msgid "Login:"
 msgstr ""
 
-#: ../mdkonline:121
+#: ../mdkonline:126 ../mdkonline:157
 #, c-format
-msgid "Mandrakelinux Privacy Policy"
+msgid "Password:"
 msgstr ""
 
 #: ../mdkonline:127
 #, c-format
-msgid "Authentification"
-msgstr ""
-
-#: ../mdkonline:128 ../mdkonline_tui:108
-#, c-format
-msgid "Enter your Mandrakeonline login, password and machine name:"
-msgstr ""
-
-#: ../mdkonline:133 ../mdkonline_tui:116
-#, c-format
 msgid "Machine name:"
 msgstr ""
 
-#: ../mdkonline:138
+#: ../mdkonline:131
 #, c-format
-msgid "Send Configuration"
+msgid "Connecting to Mandrakeonline website..."
 msgstr ""
 
-#: ../mdkonline:139 ../mdkonline_tui:128
+#: ../mdkonline:139
 #, c-format
 msgid ""
 "In order to benefit from Mandrakeonline services,\n"
@@ -377,52 +376,47 @@ msgid ""
 "www.mandrakeexpert.com."
 msgstr ""
 
-#: ../mdkonline:144 ../mdkonline:211 ../mdkonline:234
+#: ../mdkonline:141 ../mdkonline:180 ../mdkupdate:126 ../mdkupdate:198
 #, c-format
-msgid "Finish"
+msgid "Connection problem"
 msgstr ""
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
 #, c-format
-msgid "Your upload was successful!"
+msgid "or"
 msgstr ""
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
 #, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandrakeonline."
+msgid "wrong password:"
 msgstr ""
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
 #, c-format
 msgid ""
-"Mandrakeonline offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
-""
-msgstr ""
-
-#: ../mdkonline:146
-#, c-format
-msgid "automated Upgrades"
+"Your login or password was wrong.\n"
+" Either you'll have to type it again, or you'll need to create an account on Mandrakeonline.\n"
+" In the latter case, go back to the first step to connect to Mandrakeonline.\n"
+" Be aware that you must also provide a Machine name \n"
+" (only alphabetical characters are admitted)"
 msgstr ""
 
-#: ../mdkonline:150
+#: ../mdkonline:153
 #, c-format
-msgid "Country:"
+msgid "Create a Mandrakeonline Account"
 msgstr ""
 
-#: ../mdkonline:178 ../mdkonline:183 ../mdkonline:185 ../mdkonline:187
+#: ../mdkonline:158
 #, c-format
-msgid "Error"
+msgid "Confirm Password:"
 msgstr ""
 
-#: ../mdkonline:183 ../mdkonline_tui:152
+#: ../mdkonline:159
 #, c-format
-msgid "Please provide a login"
+msgid "Mail contact:"
 msgstr ""
 
-#: ../mdkonline:185 ../mdkonline_tui:152
+#: ../mdkonline:163
 #, c-format
 msgid ""
 "The passwords do not match\n"
@@ -430,170 +424,126 @@ msgid ""
 ""
 msgstr ""
 
-#: ../mdkonline:187 ../mdkonline_tui:152
+#: ../mdkonline:163
 #, c-format
-msgid ""
-"Not a valid mail address!\n"
-""
+msgid "Please provide a login"
 msgstr ""
 
-#: ../mdkonline:199 ../mdkonline_tui:78
+#: ../mdkonline:163
 #, c-format
 msgid ""
-"Reading configuration\n"
+"Not a valid mail address!\n"
 ""
 msgstr ""
 
-#: ../mdkonline:204 ../mdkonline_tui:82
+#: ../mdkonline:169
 #, c-format
-msgid "Sending configuration..."
+msgid ""
+"Mandrakeonline Account successfully created.\n"
+"Please click \"Next\" to authenticate and upload your configuration\n"
+""
 msgstr ""
 
-#: ../mdkonline:213 ../mdkonline:273 ../mdkonline_tui:130 ../mdkonline_tui:169 ../mdkupdate:124 ../mdkupdate:195
+#: ../mdkonline:178
 #, c-format
-msgid "Connection problem"
+msgid "Your upload was successful!"
 msgstr ""
 
-#: ../mdkonline:213 ../mdkonline_tui:169
+#: ../mdkonline:178
 #, c-format
-msgid "Problem occurs when uploading files, please try again"
+msgid ""
+"From now you will receive on security and updates \n"
+"announcements thanks to Mandrakeonline."
 msgstr ""
 
-#: ../mdkonline:251
+#: ../mdkonline:178
 #, c-format
 msgid ""
-"Quitting Wizard\n"
+"Mandrakeonline offers you the ability to automate the updates.\n"
+"A program will run regulary in your system waiting for new updates\n"
 ""
 msgstr ""
 
-#: ../mdkonline:273
+#: ../mdkonline:180
 #, c-format
-msgid "Mandrakeonline could not be contacted, please try again at a later time"
+msgid "Problem occurs when uploading files, please try again"
 msgstr ""
 
-#: ../mdkonline:285
+#: ../mdkonline:186
 #, c-format
-msgid "Wrong password"
+msgid "Country"
 msgstr ""
 
-#: ../mdkonline:285 ../mdkonline_tui:130
+#: ../mdkonline:198
 #, c-format
-msgid ""
-"Your login or password was wrong.\n"
-" Either you'll have to type it again, or you'll need to create an account on Mandrakeonline.\n"
-" In the latter case, go back to the first step to connect to Mandrakeonline.\n"
-" Be aware that you must also provide a Machine name \n"
-" (only alphabetical characters are admitted)"
+msgid "Congratulations"
 msgstr ""
 
-#: ../mdkonline.pm:58
+#: ../mdkonline:198
 #, c-format
 msgid ""
-"Login and password should be less than 12 characters\n"
+"Your Mandrakeonline account has been successfully configured\n"
 ""
 msgstr ""
 
-#: ../mdkonline.pm:59
+#: ../mdkonline:214
 #, c-format
-msgid ""
-"Special characters are not allowed\n"
-""
+msgid "Configuration uploaded successfully"
 msgstr ""
 
-#: ../mdkonline.pm:60
+#: ../mdkonline:215
 #, c-format
-msgid ""
-"Please fill in all fields\n"
-""
+msgid "Problem uploading configuration"
 msgstr ""
 
-#: ../mdkonline.pm:61
+#: ../mdkonline:216
 #, c-format
-msgid ""
-"Email not valid\n"
-""
+msgid "Cannot connect to mandrakeonline website: wrong login/password or router/firewall bad settings"
 msgstr ""
 
-#: ../mdkonline.pm:62
+#: ../mdkonline.pm:66
 #, c-format
 msgid ""
-"Account already exist\n"
+"Login and password should be less than 12 characters\n"
 ""
 msgstr ""
 
-#: ../mdkonline.pm:68
+#: ../mdkonline.pm:67
 #, c-format
 msgid ""
-"Problem connecting to server \n"
+"Special characters are not allowed\n"
 ""
 msgstr ""
 
-#: ../mdkonline_tui:45 ../mdkonline_tui:95
-#, c-format
-msgid "Mandrakeonline"
-msgstr ""
-
-#: ../mdkonline_tui:48
-#, c-format
-msgid "I already have an account"
-msgstr ""
-
-#: ../mdkonline_tui:49
-#, c-format
-msgid "I want to subscribe"
-msgstr ""
-
-#: ../mdkonline_tui:78 ../mdkonline_tui:82 ../mdkonline_tui:120
-#, c-format
-msgid "Please wait"
-msgstr ""
-
-#: ../mdkonline_tui:103
-#, c-format
-msgid "Account creation or authentication"
-msgstr ""
-
-#: ../mdkonline_tui:120
-#, c-format
-msgid "Connecting to Mandrakeonline website..."
-msgstr ""
-
-#: ../mdkonline_tui:130
-#, c-format
-msgid "or"
-msgstr ""
-
-#: ../mdkonline_tui:130
-#, c-format
-msgid "wrong password:"
-msgstr ""
-
-#: ../mdkonline_tui:158
+#: ../mdkonline.pm:68
 #, c-format
 msgid ""
-"Mandrakeonline Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
+"Please fill in all fields\n"
 ""
 msgstr ""
 
-#: ../mdkonline_tui:175
+#: ../mdkonline.pm:69
 #, c-format
-msgid "Country"
+msgid ""
+"Email not valid\n"
+""
 msgstr ""
 
-#: ../mdkonline_tui:187
+#: ../mdkonline.pm:70
 #, c-format
-msgid "Congratulations"
+msgid ""
+"Account already exist\n"
+""
 msgstr ""
 
-#: ../mdkonline_tui:187
+#: ../mdkonline.pm:76
 #, c-format
 msgid ""
-"Your Mandrakeonline account has been successfully configured\n"
+"Problem connecting to server \n"
 ""
 msgstr ""
 
-#: ../mdkupdate:50
+#: ../mdkupdate:52
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
@@ -604,52 +554,45 @@ msgid ""
 ""
 msgstr ""
 
-#: ../mdkupdate:55
+#: ../mdkupdate:57
 #, c-format
 msgid ""
 "  --help         - print this help message.\n"
 ""
 msgstr ""
 
-#: ../mdkupdate:56
+#: ../mdkupdate:58
 #, c-format
 msgid ""
 "  --auto         - Mandrakeupdate launched automatically.\n"
 ""
 msgstr ""
 
-#: ../mdkupdate:57
+#: ../mdkupdate:59
 #, c-format
 msgid ""
 "  --applet       - launch Mandrakeupdate.\n"
 ""
 msgstr ""
 
-#: ../mdkupdate:58
-#, c-format
-msgid ""
-"  --update       - Update keys\n"
-""
-msgstr ""
-
-#: ../mdkupdate:66
+#: ../mdkupdate:67
 #, c-format
 msgid "No %s file found. Run mdkonline wizard first"
 msgstr ""
 
-#: ../mdkupdate:124
+#: ../mdkupdate:126
 #, c-format
 msgid "Mandrakeupdate could not contact the site, we will try again."
 msgstr ""
 
-#: ../mdkupdate:173
+#: ../mdkupdate:176
 #, c-format
 msgid ""
 "Unable to update packages from mdkupdate medium.\n"
 ""
 msgstr ""
 
-#: ../mdkupdate:195
+#: ../mdkupdate:198
 #, c-format
 msgid "Mandrakeupdate could not upload the diff files. Send a mail to support [at] mandrakeonline [dot] net"
 msgstr ""