merge new tool mdkonline_tui

1 files changed, 248 insertions, 79 deletions

diff --git a/po/ca.po b/po/ca.po
index b404c2db..73a1ee70 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: 2004-09-21 14:29+0200\n"
+"POT-Creation-Date: 2004-09-26 07:20+0200\n"
 "PO-Revision-Date: 2004-09-25 13:55+0200\n"
 "Last-Translator: Albert Astals Cid <astals11@terra.es>\n"
 "Language-Team: Catalan <kde-i18n-ca@kde.org>\n"
@@ -19,218 +19,274 @@ msgstr ""
 "X-Generator: KBabel 1.3.1\n"
 
 #: ../mdkapplet:61
+#, c-format
 msgid "Your system is up-to-date"
 msgstr "El vostre sistema està actualitzat"
 
 #: ../mdkapplet:67
+#, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
 "support@mandrakeonline.net"
-msgstr "Problema de configuració del servei. Comproveu els logs i envieu un correu a support@mandrakeonline.net"
+msgstr ""
+"Problema de configuració del servei. Comproveu els logs i envieu un correu a "
+"support@mandrakeonline.net"
 
 #: ../mdkapplet:73
+#, c-format
 msgid "System is busy. Please wait ..."
 msgstr "El sistema està ocupat. Espereu ..."
 
 #: ../mdkapplet:79
+#, c-format
 msgid "New updates are available for your system"
 msgstr "Hi ha actualitzacions disponibles pel vostre sistema"
 
 #: ../mdkapplet:85
+#, 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:91
+#, c-format
 msgid "Network is down. Please configure your network"
 msgstr "La xarxa està inactiva. Si us plau configureu-la"
 
 #: ../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 "Instal·la actualitzacions"
 
 #: ../mdkapplet:109
+#, c-format
 msgid "Configure the service"
 msgstr "Configura el servei"
 
 #: ../mdkapplet:110
+#, c-format
 msgid "Check Updates"
 msgstr "Comprova actualitzacions"
 
 #: ../mdkapplet:111
+#, c-format
 msgid "Online WebSite"
 msgstr ""
 
 #: ../mdkapplet:112
+#, c-format
 msgid "Configure Network"
 msgstr "Configura la xarxa"
 
 #: ../mdkapplet:113
+#, c-format
 msgid "Configure Now!"
 msgstr "Configura ara!"
 
 #: ../mdkapplet:145
+#, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr "Applet Mandrakelinux Update"
 
 #: ../mdkapplet:155
+#, c-format
 msgid "Actions"
 msgstr "Accions"
 
 #: ../mdkapplet:158
+#, c-format
 msgid "Configure"
 msgstr "Configura"
 
 #: ../mdkapplet:159
+#, c-format
 msgid "Check updates"
 msgstr "Comprova actualitzacions"
 
 #: ../mdkapplet:160
+#, c-format
 msgid "See logs"
 msgstr "Veure els logs"
 
 #: ../mdkapplet:163
+#, c-format
 msgid "Status"
 msgstr "Estat"
 
 #: ../mdkapplet:167 ../mdkapplet:422
+#, c-format
 msgid "Close"
 msgstr "Tanca"
 
 #: ../mdkapplet:202
-msgid "Down"
-msgstr "Caiguda"
-
-#: ../mdkapplet:202
+#, c-format
 msgid "Network Connection: "
 msgstr "Connexió de xarxa: "
 
 #: ../mdkapplet:202
+#, c-format
 msgid "Up"
 msgstr "Funcionant"
 
+#: ../mdkapplet:202
+#, c-format
+msgid "Down"
+msgstr "Caiguda"
+
 #: ../mdkapplet:203
+#, c-format
 msgid "Last check: "
 msgstr "Última comprovació: "
 
 #: ../mdkapplet:204
+#, c-format
 msgid "Updates: "
 msgstr "Actualitzacions: "
 
 #: ../mdkapplet:208
+#, c-format
 msgid "Launching drakconnect\n"
 msgstr "S'està executant drakconnect\n"
 
 #: ../mdkapplet:212
+#, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr ""
 
 #: ../mdkapplet:216
+#, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr ""
 
 #: ../mdkapplet:224
+#, c-format
 msgid "Computing new updates...\n"
 msgstr "S'estan computant les noves actualitzacions...\n"
 
 #: ../mdkapplet:226
+#, c-format
 msgid "Connecting to"
 msgstr "S'està connectant a"
 
 #: ../mdkapplet:249
+#, c-format
 msgid "Checking... Updates are available\n"
 msgstr "S'està comprovant ...Hi ha actualitzacions disponibles\n"
 
 #: ../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 "Estat desconegut"
 
 #: ../mdkapplet:256
+#, c-format
 msgid "Online services disabled. Contact Mandrakeonline site\n"
 msgstr ""
 
 #: ../mdkapplet:257
+#, c-format
 msgid "Wrong Password.\n"
 msgstr "Contrasenya incorrecta.\n"
 
 #: ../mdkapplet:258
+#, 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"
 msgstr ""
 
 #: ../mdkapplet:263
+#, c-format
 msgid "System is up-to-date\n"
 msgstr "El sistema està actualitzat\n"
 
 #: ../mdkapplet:348
+#, c-format
 msgid "No check"
 msgstr "No comprovis"
 
 #: ../mdkapplet:361
+#, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "S'està comprovant la xarxa: sembla estar desactivada\n"
 
 #: ../mdkapplet:364
+#, c-format
 msgid "Checking config file: Not present\n"
-msgstr "S'està comprovant l'existència del fitxer de configuració: No està present\n"
+msgstr ""
+"S'està comprovant l'existència del fitxer de configuració: No està present\n"
 
 #: ../mdkapplet:412
+#, c-format
 msgid "Logs"
 msgstr "Registres"
 
 #: ../mdkapplet:428
+#, c-format
 msgid "Clear"
 msgstr "Neteja"
 
 #: ../mdkapplet:455
+#, c-format
 msgid "About..."
 msgstr "Quant a..."
 
 #: ../mdkapplet:456
+#, c-format
 msgid "Always launch on startup"
 msgstr "Executa sempre al inici"
 
 #: ../mdkapplet:458
+#, c-format
 msgid "Quit"
 msgstr "Surt"
 
-#: ../mdkonline:88
+#: ../mdkonline:90
+#, c-format
 msgid "Next"
 msgstr "Següent"
 
-#: ../mdkonline:88
-msgid "Previous"
-msgstr "Anterior"
-
-#: ../mdkonline:88
+#: ../mdkonline:90
+#, c-format
 msgid "Skip Wizard"
 msgstr "Salta l'auxiliar"
 
-#: ../mdkonline:102
+#: ../mdkonline:90
+#, c-format
+msgid "Previous"
+msgstr "Anterior"
+
+#: ../mdkonline:104
+#, c-format
 msgid "Welcome to Mandrakeonline"
 msgstr "Benvingut a Mandrakeonline"
 
-#: ../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"
@@ -241,57 +297,70 @@ msgstr ""
 "per tal de mantenir-vos informat sobre les actualitzacions de seguretat i "
 "altres millores.\n"
 
-#: ../mdkonline:104
+#: ../mdkonline:106 ../mdkonline_tui:133
+#, c-format
 msgid "Create a Mandrakeonline Account"
 msgstr "Crea un compte a Mandrakeonline"
 
-#: ../mdkonline:106
+#: ../mdkonline:108
+#, c-format
 msgid "I don't have a Mandrakeonline account and I want to "
 msgstr "No tinc cap compte de Mandrakeonline i en vull un "
 
-#: ../mdkonline:106
+#: ../mdkonline:108
+#, c-format
 msgid "Subscribe"
 msgstr "Subscriu-te"
 
-#: ../mdkonline:110 ../mdkonline:130
+#: ../mdkonline:112 ../mdkonline:132 ../mdkonline_tui:109 ../mdkonline_tui:136
+#, c-format
 msgid "Login:"
 msgstr "Nom d'usuari:"
 
-#: ../mdkonline:111 ../mdkonline:131
+#: ../mdkonline:113 ../mdkonline:133 ../mdkonline_tui:110 ../mdkonline_tui:137
+#, c-format
 msgid "Password:"
 msgstr "Contrasenya:"
 
-#: ../mdkonline:112
+#: ../mdkonline:114 ../mdkonline_tui:138
+#, c-format
 msgid "Confirm Password:"
 msgstr "Confirmació de la contrasenya:"
 
-#: ../mdkonline:113
+#: ../mdkonline:115 ../mdkonline_tui:139
+#, c-format
 msgid "Mail contact:"
 msgstr "Contacte de correu:"
 
-#: ../mdkonline:120
+#: ../mdkonline:122
+#, c-format
 msgid "Mandrakelinux Privacy Policy"
 msgstr "Normes de privacitat de Mandrakelinux"
 
-#: ../mdkonline:126
+#: ../mdkonline:128
+#, c-format
 msgid "Authentification"
 msgstr "Autenticació"
 
-#: ../mdkonline:127
+#: ../mdkonline:129 ../mdkonline_tui:103
+#, c-format
 msgid "Enter your Mandrakeonline login, password and machine name:"
 msgstr ""
 "Introduïu el vostre nom d'usuari, contrasenya i nom de màquina de "
 "Mandrakeonline:"
 
-#: ../mdkonline:132
+#: ../mdkonline:134 ../mdkonline_tui:111
+#, c-format
 msgid "Machine name:"
 msgstr "Nom de màquina:"
 
-#: ../mdkonline:137
+#: ../mdkonline:139
+#, c-format
 msgid "Send Configuration"
 msgstr "Envia la configuració"
 
-#: ../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"
@@ -327,11 +396,18 @@ msgstr ""
 "Per últim, us facilitarem un àlies de correu electrònic amb el vostre nom "
 "d'usuari@mandrakeonline.net."
 
-#: ../mdkonline:143 ../mdkonline:212 ../mdkonline:238
+#: ../mdkonline:145 ../mdkonline:212 ../mdkonline:235
+#, c-format
 msgid "Finish"
 msgstr "Finalitza"
 
-#: ../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."
@@ -339,7 +415,8 @@ msgstr ""
 "A partir d'ara, gràcies a Mandrakeonline, rebreu\n"
 "avisos d'actualitzacions i millores de seguretat."
 
-#: ../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"
@@ -349,27 +426,28 @@ msgstr ""
 "S'executarà regularment un programa per comprovar si hi ha noves "
 "actualitzacions\n"
 
-#: ../mdkonline:144
-msgid "Your upload was successful!"
-msgstr ""
-
-#: ../mdkonline:145
+#: ../mdkonline:147
+#, c-format
 msgid "automated Upgrades"
 msgstr "actualitzacions automàtiques"
 
-#: ../mdkonline:150
+#: ../mdkonline:151
+#, c-format
 msgid "Country:"
 msgstr "País:"
 
 #: ../mdkonline:179 ../mdkonline:184 ../mdkonline:186 ../mdkonline:188
+#, c-format
 msgid "Error"
 msgstr "Error"
 
 #: ../mdkonline:184
+#, c-format
 msgid "Please provide a login"
 msgstr "Si us plau doneu un login"
 
 #: ../mdkonline:186
+#, c-format
 msgid ""
 "The passwords do not match\n"
 " Please try again\n"
@@ -378,38 +456,49 @@ msgstr ""
 " Si us plau intenteu-ho de nou\n"
 
 #: ../mdkonline:188
+#, c-format
 msgid "Not a valid mail address!\n"
 msgstr "No és una adreça de correu vàlida!\n"
 
-#: ../mdkonline:200
+#: ../mdkonline:200 ../mdkonline_tui:78 ../mdkonline_tui:82
+#, c-format
 msgid "Reading configuration\n"
 msgstr "S'està llegint la configuració\n"
 
 #: ../mdkonline:205
+#, c-format
 msgid "Sending configuration..."
 msgstr "S'està enviant la configuració..."
 
-#: ../mdkonline:214 ../mdkonline:279
+#: ../mdkonline:214 ../mdkonline:274 ../mdkonline_tui:126 ../mdkonline_tui:154
+#: ../mdkupdate:124 ../mdkupdate:195
+#, c-format
 msgid "Connection problem"
 msgstr "Problema de connexió"
 
-#: ../mdkonline:214
+#: ../mdkonline:214 ../mdkonline_tui:154
+#, c-format
 msgid "Problem occurs when uploading files, please try again"
 msgstr ""
 
-#: ../mdkonline:255
+#: ../mdkonline:252
+#, c-format
 msgid "Quitting Wizard\n"
 msgstr "S'està sortint de l'auxiliar\n"
 
-#: ../mdkonline:279
+#: ../mdkonline:274
+#, c-format
 msgid "Mandrakeonline could not be contacted, please try again at a later time"
-msgstr "No s'ha pogut contactar amb Mandrakeonline, si us plau, provi-ho més tard"
+msgstr ""
+"No s'ha pogut contactar amb Mandrakeonline, si us plau, provi-ho més tard"
 
-#: ../mdkonline:291
+#: ../mdkonline:286
+#, c-format
 msgid "Wrong password"
 msgstr "Contrasenya incorrecta"
 
-#: ../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 "
@@ -426,8 +515,84 @@ msgstr ""
 " Estigueu avisat de que també cal proporcionar un nom de màquina \n"
 " (només s'admeten caràcters de l'alfabet)"
 
-#: ../mdkupdate:51
-#, perl-format
+#: ../mdkonline.pm:36
+#, c-format
+msgid "Login and password should be less than 12 characters\n"
+msgstr ""
+"Tant el nom d'usuari com la contrasenya han de tenir menys de 12 caràcters\n"
+
+#: ../mdkonline.pm:37
+#, c-format
+msgid "Special characters are not allowed\n"
+msgstr "No es permeten caràcters especials\n"
+
+#: ../mdkonline.pm:38
+#, c-format
+msgid "Please fill in all fields\n"
+msgstr "Si us plau ompliu tots els camps\n"
+
+#: ../mdkonline.pm:39
+#, c-format
+msgid "Email not valid\n"
+msgstr "Correu no vàlid\n"
+
+#: ../mdkonline.pm:40
+#, c-format
+msgid "Account already exist\n"
+msgstr "El compte ja existeix\n"
+
+#: ../mdkonline.pm:46
+#, c-format
+msgid "Problem connecting to server \n"
+msgstr "Problemes connectant al servidor \n"
+
+#: ../mdkonline_tui:45 ../mdkonline_tui:90
+#, fuzzy, c-format
+msgid "Mandrakeonline"
+msgstr "Benvingut a Mandrakeonline"
+
+#: ../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
+#, fuzzy, c-format
+msgid "Connecting to Mandrakeonline website..."
+msgstr "Benvingut a Mandrakeonline"
+
+#: ../mdkonline_tui:126
+#, c-format
+msgid "or"
+msgstr ""
+
+#: ../mdkonline_tui:126
+#, fuzzy, c-format
+msgid "wrong password:"
+msgstr "Contrasenya incorrecta"
+
+#: ../mdkonline_tui:160
+#, fuzzy, c-format
+msgid "Country"
+msgstr "País:"
+
+#: ../mdkupdate:50
+#, c-format
 msgid ""
 "mdkupdate version %s\n"
 "Copyright (C) %s Mandrakesoft.\n"
@@ -443,22 +608,54 @@ msgstr ""
 "\n"
 "sintaxi:\n"
 
-#: ../mdkupdate:56
+#: ../mdkupdate:55
+#, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - mostra aquest missatge d'ajuda.\n"
 
-#: ../mdkupdate:57
+#: ../mdkupdate:56
+#, c-format
 msgid "  --auto         - Mandrakeupdate launched automatically.\n"
 msgstr "  --auto         - Mandrakeupdate es llança automàticament.\n"
 
-#: ../mdkupdate:58
+#: ../mdkupdate:57
+#, c-format
 msgid "  --applet       - launch Mandrakeupdate.\n"
 msgstr "  --applet       - actualitza Mandrakeupdate.\n"
 
-#: ../mdkupdate:59
+#: ../mdkupdate:58
+#, c-format
 msgid "  --update       - Update keys\n"
 msgstr "  --update       - Actualitza les claus\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 ""
+"Mandrakeupdate no ha pogut contactar amb el lloc, ho provarem més tard."
+
+#: ../mdkupdate:173
+#, c-format
+msgid "Unable to update packages from mdkupdate medium.\n"
+msgstr "No es poden actualitzar els paquets des del suport mdkupdate.\n"
+
+#: ../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 ""
+
 #~ msgid "Config problems. Launch \"configure\" again"
 #~ msgstr "Problemes de configuració. Executeu \"configura\" un altre cop"
 
@@ -489,44 +686,21 @@ msgstr "  --update       - Actualitza les claus\n"
 #~ msgid "Creation"
 #~ msgstr "Creació"
 
-#~ msgid "Login and password should be less than 12 characters\n"
-#~ msgstr ""
-#~ "Tant el nom d'usuari com la contrasenya han de tenir menys de 12 "
-#~ "caràcters\n"
-
 #~ msgid "Special characters"
 #~ msgstr "Caràcters especials"
 
-#~ msgid "Special characters are not allowed\n"
-#~ msgstr "No es permeten caràcters especials\n"
-
 #~ msgid "Empty fields"
 #~ msgstr "Camps buits"
 
-#~ msgid "Please fill in all fields\n"
-#~ msgstr "Si us plau ompliu tots els camps\n"
-
 #~ msgid "Email"
 #~ msgstr "Correu"
 
-#~ msgid "Email not valid\n"
-#~ msgstr "Correu no vàlid\n"
-
-#~ msgid "Account already exist\n"
-#~ msgstr "El compte ja existeix\n"
-
 #~ msgid "Change account"
 #~ msgstr "Canvia compte"
 
-#~ msgid "Problem connecting to server \n"
-#~ msgstr "Problemes connectant al servidor \n"
-
 #~ msgid "Server Problem"
 #~ msgstr "Problema del servidor"
 
-#~ msgid "Unable to update packages from mdkupdate medium.\n"
-#~ msgstr "No es poden actualitzar els paquets des del suport mdkupdate.\n"
-
 #~ msgid "Response from Mandrakeonline server\n"
 #~ msgstr "Resposta del servidor de Mandrakeonline\n"
 
@@ -536,10 +710,6 @@ msgstr "  --update       - Actualitza les claus\n"
 #~ msgid "Yes I want automated updates"
 #~ msgstr "Sí, vull actualitzacions automàtiques"
 
-#~ msgid "Mandrakeupdate could not contact the site, we will try again."
-#~ msgstr ""
-#~ "Mandrakeupdate no ha pogut contactar amb el lloc, ho provarem més tard."
-
 #~ msgid "Register Now!"
 #~ msgstr "Registreu-vos ara!"
 
@@ -678,4 +848,3 @@ msgstr "  --update       - Actualitza les claus\n"
 
 #~ msgid "Sans Italic 17"
 #~ msgstr "Sans Italic 17"
-