merge new tool mdkonline_tui

1 files changed, 312 insertions, 81 deletions

diff --git a/po/mdkonline.pot b/po/mdkonline.pot
index aa201433..4c8375bb 100644
--- a/po/mdkonline.pot
+++ b/po/mdkonline.pot
@@ -1,289 +1,372 @@
 # SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
+# Copyright (C) YEAR Free Software Foundation, Inc.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-09-21 14:29+0200\n"
+"POT-Creation-Date: 2004-09-26 07:20+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
+"Content-Transfer-Encoding: 8-bit\n"
 
 #: ../mdkapplet:61
+#, c-format
 msgid "Your system is up-to-date"
 msgstr ""
 
 #: ../mdkapplet:67
-msgid ""
-"Service configuration problem. Please check logs and send mail to "
-"support@mandrakeonline.net"
+#, c-format
+msgid "Service configuration problem. Please check logs and send mail to support@mandrakeonline.net"
 msgstr ""
 
 #: ../mdkapplet:73
+#, c-format
 msgid "System is busy. Please wait ..."
 msgstr ""
 
 #: ../mdkapplet:79
+#, c-format
 msgid "New updates are available for your system"
 msgstr ""
 
 #: ../mdkapplet:85
+#, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
 msgstr ""
 
 #: ../mdkapplet:91
+#, c-format
 msgid "Network is down. Please configure your network"
 msgstr ""
 
 #: ../mdkapplet:97
+#, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr ""
 
 #: ../mdkapplet:103
+#, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
 #: ../mdkapplet:108 ../mdkapplet:157
+#, c-format
 msgid "Install updates"
 msgstr ""
 
 #: ../mdkapplet:109
+#, c-format
 msgid "Configure the service"
 msgstr ""
 
 #: ../mdkapplet:110
+#, c-format
 msgid "Check Updates"
 msgstr ""
 
 #: ../mdkapplet:111
+#, c-format
 msgid "Online WebSite"
 msgstr ""
 
 #: ../mdkapplet:112
+#, c-format
 msgid "Configure Network"
 msgstr ""
 
 #: ../mdkapplet:113
+#, c-format
 msgid "Configure Now!"
 msgstr ""
 
 #: ../mdkapplet:145
+#, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr ""
 
 #: ../mdkapplet:155
+#, c-format
 msgid "Actions"
 msgstr ""
 
 #: ../mdkapplet:158
+#, c-format
 msgid "Configure"
 msgstr ""
 
 #: ../mdkapplet:159
+#, c-format
 msgid "Check updates"
 msgstr ""
 
 #: ../mdkapplet:160
+#, c-format
 msgid "See logs"
 msgstr ""
 
 #: ../mdkapplet:163
+#, c-format
 msgid "Status"
 msgstr ""
 
 #: ../mdkapplet:167 ../mdkapplet:422
+#, c-format
 msgid "Close"
 msgstr ""
 
 #: ../mdkapplet:202
-msgid "Down"
+#, c-format
+msgid "Network Connection: "
 msgstr ""
 
 #: ../mdkapplet:202
-msgid "Network Connection: "
+#, c-format
+msgid "Up"
 msgstr ""
 
 #: ../mdkapplet:202
-msgid "Up"
+#, c-format
+msgid "Down"
 msgstr ""
 
 #: ../mdkapplet:203
+#, c-format
 msgid "Last check: "
 msgstr ""
 
 #: ../mdkapplet:204
+#, c-format
 msgid "Updates: "
 msgstr ""
 
 #: ../mdkapplet:208
-msgid "Launching drakconnect\n"
+#, c-format
+msgid ""
+"Launching drakconnect\n"
+""
 msgstr ""
 
 #: ../mdkapplet:212
-msgid "Launching mdkupdate --applet\n"
+#, c-format
+msgid ""
+"Launching mdkupdate --applet\n"
+""
 msgstr ""
 
 #: ../mdkapplet:216
+#, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr ""
 
 #: ../mdkapplet:224
-msgid "Computing new updates...\n"
+#, c-format
+msgid ""
+"Computing new updates...\n"
+""
 msgstr ""
 
 #: ../mdkapplet:226
+#, c-format
 msgid "Connecting to"
 msgstr ""
 
 #: ../mdkapplet:249
-msgid "Checking... Updates are available\n"
+#, c-format
+msgid ""
+"Checking... Updates are available\n"
+""
 msgstr ""
 
 #: ../mdkapplet:253
+#, c-format
 msgid "Development release not supported by service"
 msgstr ""
 
 #: ../mdkapplet:254
+#, c-format
 msgid "Too old release not supported by service"
 msgstr ""
 
 #: ../mdkapplet:255
+#, c-format
 msgid "Unknown state"
 msgstr ""
 
 #: ../mdkapplet:256
-msgid "Online services disabled. Contact Mandrakeonline site\n"
+#, c-format
+msgid ""
+"Online services disabled. Contact Mandrakeonline site\n"
+""
 msgstr ""
 
 #: ../mdkapplet:257
-msgid "Wrong Password.\n"
+#, c-format
+msgid ""
+"Wrong Password.\n"
+""
 msgstr ""
 
 #: ../mdkapplet:258
-msgid "Wrong Action or host or login.\n"
+#, c-format
+msgid ""
+"Wrong Action or host or login.\n"
+""
 msgstr ""
 
 #: ../mdkapplet:259
+#, c-format
 msgid ""
-"Something is wrong with your network settings (check your route, firewall or "
-"proxy settings)\n"
+"Something is wrong with your network settings (check your route, firewall or proxy settings)\n"
+""
 msgstr ""
 
 #: ../mdkapplet:263
-msgid "System is up-to-date\n"
+#, c-format
+msgid ""
+"System is up-to-date\n"
+""
 msgstr ""
 
 #: ../mdkapplet:348
+#, c-format
 msgid "No check"
 msgstr ""
 
 #: ../mdkapplet:361
-msgid "Checking Network: seems disabled\n"
+#, c-format
+msgid ""
+"Checking Network: seems disabled\n"
+""
 msgstr ""
 
 #: ../mdkapplet:364
-msgid "Checking config file: Not present\n"
+#, c-format
+msgid ""
+"Checking config file: Not present\n"
+""
 msgstr ""
 
 #: ../mdkapplet:412
+#, c-format
 msgid "Logs"
 msgstr ""
 
 #: ../mdkapplet:428
+#, c-format
 msgid "Clear"
 msgstr ""
 
 #: ../mdkapplet:455
+#, c-format
 msgid "About..."
 msgstr ""
 
 #: ../mdkapplet:456
+#, c-format
 msgid "Always launch on startup"
 msgstr ""
 
 #: ../mdkapplet:458
+#, c-format
 msgid "Quit"
 msgstr ""
 
-#: ../mdkonline:88
+#: ../mdkonline:90
+#, c-format
 msgid "Next"
 msgstr ""
 
-#: ../mdkonline:88
-msgid "Previous"
+#: ../mdkonline:90
+#, c-format
+msgid "Skip Wizard"
 msgstr ""
 
-#: ../mdkonline:88
-msgid "Skip Wizard"
+#: ../mdkonline:90
+#, c-format
+msgid "Previous"
 msgstr ""
 
-#: ../mdkonline:102
+#: ../mdkonline:104
+#, c-format
 msgid "Welcome to Mandrakeonline"
 msgstr ""
 
-#: ../mdkonline:103
+#: ../mdkonline:105 ../mdkonline_tui:93
+#, 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:104
+#: ../mdkonline:106 ../mdkonline_tui:133
+#, c-format
 msgid "Create a Mandrakeonline Account"
 msgstr ""
 
-#: ../mdkonline:106
+#: ../mdkonline:108
+#, c-format
 msgid "I don't have a Mandrakeonline account and I want to "
 msgstr ""
 
-#: ../mdkonline:106
+#: ../mdkonline:108
+#, c-format
 msgid "Subscribe"
 msgstr ""
 
-#: ../mdkonline:110 ../mdkonline:130
+#: ../mdkonline:112 ../mdkonline:132 ../mdkonline_tui:109 ../mdkonline_tui:136
+#, c-format
 msgid "Login:"
 msgstr ""
 
-#: ../mdkonline:111 ../mdkonline:131
+#: ../mdkonline:113 ../mdkonline:133 ../mdkonline_tui:110 ../mdkonline_tui:137
+#, c-format
 msgid "Password:"
 msgstr ""
 
-#: ../mdkonline:112
+#: ../mdkonline:114 ../mdkonline_tui:138
+#, c-format
 msgid "Confirm Password:"
 msgstr ""
 
-#: ../mdkonline:113
+#: ../mdkonline:115 ../mdkonline_tui:139
+#, c-format
 msgid "Mail contact:"
 msgstr ""
 
-#: ../mdkonline:120
+#: ../mdkonline:122
+#, c-format
 msgid "Mandrakelinux Privacy Policy"
 msgstr ""
 
-#: ../mdkonline:126
+#: ../mdkonline:128
+#, c-format
 msgid "Authentification"
 msgstr ""
 
-#: ../mdkonline:127
+#: ../mdkonline:129 ../mdkonline_tui:103
+#, c-format
 msgid "Enter your Mandrakeonline login, password and machine name:"
 msgstr ""
 
-#: ../mdkonline:132
+#: ../mdkonline:134 ../mdkonline_tui:111
+#, c-format
 msgid "Machine name:"
 msgstr ""
 
-#: ../mdkonline:137
+#: ../mdkonline:139
+#, c-format
 msgid "Send Configuration"
 msgstr ""
 
-#: ../mdkonline:138
+#: ../mdkonline:140 ../mdkonline_tui:124
+#, c-format
 msgid ""
 "In order to benefit from Mandrakeonline services,\n"
 "we are about to upload your configuration.\n"
@@ -292,125 +375,273 @@ msgid ""
 "1) the list of packages you have installed on your system,\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"
+"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.mandrakeexpert.com.\n"
-"Finally, an email alias with your username@mandrakeonline.net will be "
-"provided to you."
+"Finally, an email alias with your username@mandrakeonline.net will be provided to you."
 msgstr ""
 
-#: ../mdkonline:143 ../mdkonline:212 ../mdkonline:238
+#: ../mdkonline:145 ../mdkonline:212 ../mdkonline:235
+#, c-format
 msgid "Finish"
 msgstr ""
 
-#: ../mdkonline:144
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
+msgid "Your upload was successful!"
+msgstr ""
+
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
 msgid ""
 "From now you will receive on security and updates \n"
 "announcements thanks to Mandrakeonline."
 msgstr ""
 
-#: ../mdkonline:144
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, 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:144
-msgid "Your upload was successful!"
-msgstr ""
-
-#: ../mdkonline:145
+#: ../mdkonline:147
+#, c-format
 msgid "automated Upgrades"
 msgstr ""
 
-#: ../mdkonline:150
+#: ../mdkonline:151
+#, c-format
 msgid "Country:"
 msgstr ""
 
 #: ../mdkonline:179 ../mdkonline:184 ../mdkonline:186 ../mdkonline:188
+#, c-format
 msgid "Error"
 msgstr ""
 
 #: ../mdkonline:184
+#, c-format
 msgid "Please provide a login"
 msgstr ""
 
 #: ../mdkonline:186
+#, c-format
 msgid ""
 "The passwords do not match\n"
 " Please try again\n"
+""
 msgstr ""
 
 #: ../mdkonline:188
-msgid "Not a valid mail address!\n"
+#, c-format
+msgid ""
+"Not a valid mail address!\n"
+""
 msgstr ""
 
-#: ../mdkonline:200
-msgid "Reading configuration\n"
+#: ../mdkonline:200 ../mdkonline_tui:78 ../mdkonline_tui:82
+#, c-format
+msgid ""
+"Reading configuration\n"
+""
 msgstr ""
 
 #: ../mdkonline:205
+#, c-format
 msgid "Sending configuration..."
 msgstr ""
 
-#: ../mdkonline:214 ../mdkonline:279
+#: ../mdkonline:214 ../mdkonline:274 ../mdkonline_tui:126 ../mdkonline_tui:154 ../mdkupdate:124 ../mdkupdate:195
+#, c-format
 msgid "Connection problem"
 msgstr ""
 
-#: ../mdkonline:214
+#: ../mdkonline:214 ../mdkonline_tui:154
+#, c-format
 msgid "Problem occurs when uploading files, please try again"
 msgstr ""
 
-#: ../mdkonline:255
-msgid "Quitting Wizard\n"
+#: ../mdkonline:252
+#, c-format
+msgid ""
+"Quitting Wizard\n"
+""
 msgstr ""
 
-#: ../mdkonline:279
+#: ../mdkonline:274
+#, c-format
 msgid "Mandrakeonline could not be contacted, please try again at a later time"
 msgstr ""
 
-#: ../mdkonline:291
+#: ../mdkonline:286
+#, c-format
 msgid "Wrong password"
 msgstr ""
 
-#: ../mdkonline:291
+#: ../mdkonline:286 ../mdkonline_tui:126
+#, 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"
+" 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 ""
 
-#: ../mdkupdate:51
-#, perl-format
+#: ../mdkonline.pm:36
+#, c-format
+msgid ""
+"Login and password should be less than 12 characters\n"
+""
+msgstr ""
+
+#: ../mdkonline.pm:37
+#, c-format
+msgid ""
+"Special characters are not allowed\n"
+""
+msgstr ""
+
+#: ../mdkonline.pm:38
+#, c-format
+msgid ""
+"Please fill in all fields\n"
+""
+msgstr ""
+
+#: ../mdkonline.pm:39
+#, c-format
+msgid ""
+"Email not valid\n"
+""
+msgstr ""
+
+#: ../mdkonline.pm:40
+#, c-format
+msgid ""
+"Account already exist\n"
+""
+msgstr ""
+
+#: ../mdkonline.pm:46
+#, c-format
+msgid ""
+"Problem connecting to server \n"
+""
+msgstr ""
+
+#: ../mdkonline_tui:45 ../mdkonline_tui:90
+#, 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:119
+#, c-format
+msgid "Please wait"
+msgstr ""
+
+#: ../mdkonline_tui:98
+#, c-format
+msgid "Account creation or authentication"
+msgstr ""
+
+#: ../mdkonline_tui:119
+#, c-format
+msgid "Connecting to Mandrakeonline website..."
+msgstr ""
+
+#: ../mdkonline_tui:126
+#, c-format
+msgid "or"
+msgstr ""
+
+#: ../mdkonline_tui:126
+#, c-format
+msgid "wrong password:"
+msgstr ""
+
+#: ../mdkonline_tui:160
+#, c-format
+msgid "Country"
+msgstr ""
+
+#: ../mdkupdate:50
+#, c-format
 msgid ""
 "mdkupdate version %s\n"
 "Copyright (C) %s Mandrakesoft.\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:55
+#, c-format
+msgid ""
+"  --help         - print this help message.\n"
+""
 msgstr ""
 
 #: ../mdkupdate:56
-msgid "  --help         - print this help message.\n"
+#, c-format
+msgid ""
+"  --auto         - Mandrakeupdate launched automatically.\n"
+""
 msgstr ""
 
 #: ../mdkupdate:57
-msgid "  --auto         - Mandrakeupdate launched automatically.\n"
+#, c-format
+msgid ""
+"  --applet       - launch Mandrakeupdate.\n"
+""
 msgstr ""
 
 #: ../mdkupdate:58
-msgid "  --applet       - launch Mandrakeupdate.\n"
+#, c-format
+msgid ""
+"  --update       - Update keys\n"
+""
 msgstr ""
 
-#: ../mdkupdate:59
-msgid "  --update       - Update keys\n"
+#: ../mdkupdate:66
+#, c-format
+msgid "No %s file found. Run mdkonline wizard first"
 msgstr ""
+
+#: ../mdkupdate:124
+#, c-format
+msgid "Mandrakeupdate could not contact the site, we will try again."
+msgstr ""
+
+#: ../mdkupdate:173
+#, c-format
+msgid ""
+"Unable to update packages from mdkupdate medium.\n"
+""
+msgstr ""
+
+#: ../mdkupdate:187
+#, c-format
+msgid "No diff found"
+msgstr ""
+
+#: ../mdkupdate:195
+#, c-format
+msgid "Mandrakeupdate could not upload the diff files. Send a mail to support [at] mandrakeonline [dot] net"
+msgstr ""
+