From 80aa10a905f6a52fde0431e8bbfa92dc2029727d Mon Sep 17 00:00:00 2001
From: Panagiotis Papazoglou <papaz_p@yahoo.com>
Date: Fri, 26 Nov 2010 15:36:29 +0200
Subject: [PATCH] Translation update done using Pootle.

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

diff --git a/po/el.po b/po/el.po
index 62b66feba..cad0ab74e 100644
--- a/po/el.po
+++ b/po/el.po
@@ -7568,10 +7568,9 @@ msgid "This feature is not supported by your web browser"
 msgstr ""
 
 #: prefs_manage.php:263
-#, fuzzy
 #| msgid "Server configuration"
 msgid "Merge with current configuration"
-msgstr "Προσαρμογή διακομιστή"
+msgstr "Ένωση με την τρέχουσα ρύθμιση"
 
 #: prefs_manage.php:277
 #, php-format