merge

1 files changed, 41 insertions, 36 deletions

diff --git a/po/ca.po b/po/ca.po
index 0fcad29e..06387453 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-03-04 14:49+0100\n"
+"POT-Creation-Date: 2004-03-04 16:55+0100\n"
 "PO-Revision-Date: 2004-03-03 19:55+0100\n"
 "Last-Translator: Albert Astals Cid <astals11@terra.es>\n"
 "Language-Team: Catalan <kde-i18n-ca@kde.org>\n"
@@ -18,128 +18,128 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.2\n"
 
-#: ../mdkapplet:48
+#: ../mdkapplet:49
 msgid "No updates available for your system"
 msgstr "No hi ha actualitzacions disponibles pel vostre sistema"
 
-#: ../mdkapplet:54
+#: ../mdkapplet:55
 msgid "Config problems. Launch \"configure\" again"
 msgstr "Problemes de configuració. Executeu \"configura\" un altre cop"
 
-#: ../mdkapplet:60
+#: ../mdkapplet:61
 msgid "System is busy. Wait ..."
 msgstr "El sistema està ocupat. Espereu ..."
 
-#: ../mdkapplet:66
+#: ../mdkapplet:67
 #, perl-format
 msgid "%s packages available for update"
 msgstr "Hi ha %s paquets disponibles per actualitzar"
 
-#: ../mdkapplet:72
+#: ../mdkapplet:73
 msgid "Service not available. Click on \"configuration\""
 msgstr "El servei no està disponible. Premeu a \"configuració\""
 
-#: ../mdkapplet:78
+#: ../mdkapplet:79
 msgid "Network is down. Click on \"configure Network\""
 msgstr "La xarxa està inactiva. Premeu a \"configura la xarxa\""
 
-#: ../mdkapplet:84
+#: ../mdkapplet:85
 msgid "Service deactivated. Waiting for payment..."
 msgstr "Servei desactivat. S'està esperant el pagament..."
 
-#: ../mdkapplet:88
+#: ../mdkapplet:89
 msgid "Launch Mandrake Update"
 msgstr "Executa Mandrake Update"
 
-#: ../mdkapplet:89
+#: ../mdkapplet:90
 msgid "Configuration"
 msgstr "Configuració"
 
-#: ../mdkapplet:90
+#: ../mdkapplet:91
 msgid "Check Updates"
 msgstr "Comprova actualitzacions"
 
-#: ../mdkapplet:91
+#: ../mdkapplet:92
 msgid "Online WebSite"
 msgstr ""
 
-#: ../mdkapplet:92
+#: ../mdkapplet:93
 msgid "Configure Network"
 msgstr "Configura la xarxa"
 
-#: ../mdkapplet:93
+#: ../mdkapplet:94
 msgid "Configure Now!"
 msgstr "Configura ara!"
 
-#: ../mdkapplet:122
+#: ../mdkapplet:123
 msgid "Mandrake Updates Applet"
 msgstr "Applet Mandrake Update"
 
-#: ../mdkapplet:129
+#: ../mdkapplet:130
 msgid "Actions"
 msgstr "Accions"
 
-#: ../mdkapplet:131
+#: ../mdkapplet:132
 msgid "Install updates"
 msgstr "Instal·la actualitzacions"
 
-#: ../mdkapplet:132
+#: ../mdkapplet:133
 msgid "Configure"
 msgstr "Configura"
 
-#: ../mdkapplet:133
+#: ../mdkapplet:134
 msgid "Check updates"
 msgstr "Comprova actualitzacions"
 
-#: ../mdkapplet:134
+#: ../mdkapplet:135
 msgid "See logs"
 msgstr ""
 
-#: ../mdkapplet:137
+#: ../mdkapplet:138
 msgid "Status"
 msgstr "Estat"
 
-#: ../mdkapplet:140
+#: ../mdkapplet:141
 msgid "Network Connection: "
 msgstr "Connexió de xarxa: "
 
-#: ../mdkapplet:141
+#: ../mdkapplet:142
 msgid "Down"
 msgstr "Caiguda"
 
-#: ../mdkapplet:141
+#: ../mdkapplet:142
 msgid "Up"
 msgstr "Funcionant"
 
-#: ../mdkapplet:144
+#: ../mdkapplet:145
 msgid "New Updates: "
 msgstr "Noves actualitzacions: "
 
-#: ../mdkapplet:145
+#: ../mdkapplet:146
 msgid "Available"
 msgstr "Disponible"
 
-#: ../mdkapplet:145
+#: ../mdkapplet:146
 msgid "Not Available"
 msgstr "No disponible"
 
-#: ../mdkapplet:147
+#: ../mdkapplet:149
 msgid "Last check: "
 msgstr "Última comprovació: "
 
-#: ../mdkapplet:153
+#: ../mdkapplet:155
 msgid "Close"
 msgstr "Tanca"
 
-#: ../mdkapplet:220
+#: ../mdkapplet:222
 msgid "No check"
 msgstr "No comprovis"
 
-#: ../mdkapplet:285
+#: ../mdkapplet:287
 msgid "About.."
 msgstr "Quant a"
 
-#: ../mdkapplet:286
+#: ../mdkapplet:288
 msgid "Quit"
 msgstr "Surt"
 
@@ -210,6 +210,11 @@ msgstr ""
 msgid "Machine name:"
 msgstr "Nom de màquina:"
 
+#: ../mdkonline:138
+#, fuzzy
+msgid "Send Configuration"
+msgstr "Configuració"
+
 #: ../mdkonline:139
 msgid ""
 "In order to benefit from MandrakeOnline services,\n"
@@ -246,6 +251,10 @@ msgstr ""
 "Per últim, us facilitarem un àlies de correu electrònic amb el vostre nom "
 "d'usuari@mandrakeonline.net."
 
+#: ../mdkonline:144 ../mdkonline:247 ../mdkonline:275
+msgid "Finish"
+msgstr "Finalitza"
+
 #: ../mdkonline:145
 msgid ""
 "From now you will receive on security and updates \n"
@@ -353,10 +362,6 @@ msgstr "No és una adreça de correu vàlida!\n"
 msgid "Sending configuration..."
 msgstr "S'està enviant la configuració..."
 
-#: ../mdkonline:247 ../mdkonline:275
-msgid "Finish"
-msgstr "Finalitza"
-
 #: ../mdkonline:251 ../mdkonline:326 ../mdkupdate:77
 msgid "Connection problem"
 msgstr "Problema de connexió"