From 4cbdcec5d9d194513d3c2b153995319e86618ba0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= <matiasbellone@gmail.com>
Date: Thu, 10 Feb 2011 10:30:31 +0200
Subject: [PATCH] Translation update done using Pootle.

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

diff --git a/po/es.po b/po/es.po
index 4cd8cff16..69939c238 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7596,10 +7596,9 @@ msgid "This feature is not supported by your web browser"
 msgstr "Esta funcionalidad no está soportada por tu navegador"
 
 #: prefs_manage.php:263
-#, fuzzy
 #| msgid "Server configuration"
 msgid "Merge with current configuration"
-msgstr "Configuración del servidor"
+msgstr "Combinar con la configuración actual"
 
 #: prefs_manage.php:277
 #, php-format