From 6d2970cdbeb354d20d74f403021a5c726cd2545a Mon Sep 17 00:00:00 2001
From: Robert Readman <robert_readman@hotmail.com>
Date: Tue, 24 Aug 2010 14:11:12 +0200
Subject: [PATCH] Translation update done using Pootle.

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

diff --git a/po/en_GB.po b/po/en_GB.po
index 267870b03..3b89cac2d 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -6969,10 +6969,9 @@ msgid "This feature is not supported by your web browser"
 msgstr "This feature is not supported by your web browser"
 
 #: prefs_manage.php:263
-#, fuzzy
 #| msgid "Server configuration"
 msgid "Merge with current configuration"
-msgstr "Server configuration"
+msgstr "Merge with current configuration"
 
 #: prefs_manage.php:277
 #, php-format