From ce9fbe16fc11c3438e73a1fe30f29678400f2f51 Mon Sep 17 00:00:00 2001
From: Xavier Navarro <xvnavarro@gmail.com>
Date: Mon, 13 Dec 2010 18:28:48 +0200
Subject: [PATCH] Translation update done using Pootle.

---
 po/ca.po | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/po/ca.po b/po/ca.po
index 50d9ded37..b2dd39304 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -7419,10 +7419,9 @@ msgid "This feature is not supported by your web browser"
 msgstr "Aquesta característica no està suportada pel teu navegador"
 
 #: prefs_manage.php:263
-#, fuzzy
 #| msgid "Server configuration"
 msgid "Merge with current configuration"
-msgstr "Configuració del servidor"
+msgstr "Fusiona amb la configuració actual"
 
 #: prefs_manage.php:277
 #, php-format