From afea9f23bd47b71e45bc0b1ee689be5c6230ff87 Mon Sep 17 00:00:00 2001
From: Guillaume Cottenceau <gc@mandriva.com>
Date: Wed, 18 Jun 2003 17:08:29 +0000
Subject: merge

---
 po/ca.po | 58 ++++++++++++++++++++++++++--------------------------------
 1 file changed, 26 insertions(+), 32 deletions(-)

(limited to 'po/ca.po')

diff --git a/po/ca.po b/po/ca.po
index a66abd3d..6b84a9c6 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake\n"
-"POT-Creation-Date: 2003-06-13 21:08+0200\n"
+"POT-Creation-Date: 2003-06-18 19:02+0200\n"
 "PO-Revision-Date: 2003-03-03 21:35+0200\n"
 "Last-Translator: Softcatalà <traddrake@softcatala.org>\n"
 "Language-Team: Catalan <info@softcatala.org>\n"
@@ -598,6 +598,21 @@ msgstr "Import
 msgid "Unable to create medium."
 msgstr "No es pot crear el support."
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"\n"
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"S'han d'eliminar els següents paquets perquè altres siguin actualitzats:\n"
+"\n"
+"%s\n"
+"\n"
+"Esteu d'acord en continuar?"
+
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid ""
@@ -831,6 +846,16 @@ msgstr "S'estan preparant els paquets per a la instal
 msgid "Some packages can't be removed"
 msgstr "No es pot instal·lar el paquet"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid ""
+"Sorry, the following package(s) can't be selected:\n"
+"\n"
+"%s"
+msgstr ""
+"Ho sento, no he pogut seleccionar els següent(s) paquet(s):\n"
+"\n"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Finland"
@@ -1017,23 +1042,6 @@ msgstr "Informaci
 msgid "Removable device"
 msgstr "Dispositius extraïbles"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"\n"
-"%s\n"
-"\n"
-"(waiting for urpmi subroutine for explanation)\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
-"S'han d'eliminar els següents paquets perquè altres siguin actualitzats:\n"
-"\n"
-"%s\n"
-"\n"
-"Esteu d'acord en continuar?"
-
 #: ../rpmdrake:1
 #, c-format
 msgid "Graphical desktop/Icewm"
@@ -1246,20 +1254,6 @@ msgstr "Descripcions"
 msgid "%s KB"
 msgstr "%.1f KB"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid ""
-"Sorry, the following package(s) can't be selected:\n"
-"\n"
-"%s\n"
-"\n"
-"Reasons follow:\n"
-"\n"
-"%s"
-msgstr ""
-"Ho sento, no he pogut seleccionar els següent(s) paquet(s):\n"
-"\n"
-
 #: ../rpmdrake:1
 #, c-format
 msgid "Sciences/Chemistry"
-- 
cgit v1.2.1