summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Arendsen Hein <thomas@intevation.de>2007-10-17 18:27:14 (GMT)
committerThomas Arendsen Hein <thomas@intevation.de>2007-10-17 18:27:14 (GMT)
commitac5846489dae9114c3310d12802207e9686e4875 (patch)
tree2aba3dfa311f2080a40d69d8d3a3e540241ca7dd
parent6525ec62d254c113c88ff4a166bbae711472a248 (diff)
downloadkolab-webadmin-ac5846489dae9114c3310d12802207e9686e4875.tar.gz
Clarify web admin description for HTTP FreeBusy switch (with updated German translation)2.2-beta2
-rw-r--r--ChangeLog4
-rw-r--r--php/admin/locale/de/LC_MESSAGES/messages.po6
-rw-r--r--www/admin/service/index.php.in2
3 files changed, 8 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 1edac05..a899471 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,10 @@
* php/admin/templates/kolab.tpl, www/admin/service/index.php.in:
kolab/issue934 (Remove FTP FreeBusy Service (proftpd))
+ * php/admin/locale/de/LC_MESSAGES/messages.po,
+ www/admin/service/index.php.in: Clarify web admin description for
+ HTTP FreeBusy switch (with updated German translation)
+
2007-08-07 Gunnar Wrobel <p@rdus.de>
* php/admin/templates/page.tpl.in:
diff --git a/php/admin/locale/de/LC_MESSAGES/messages.po b/php/admin/locale/de/LC_MESSAGES/messages.po
index 35bf900..2756bed 100644
--- a/php/admin/locale/de/LC_MESSAGES/messages.po
+++ b/php/admin/locale/de/LC_MESSAGES/messages.po
@@ -11,7 +11,7 @@ msgstr ""
"Project-Id-Version: messages-2.1-new_de\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2007-02-02 18:19+0100\n"
-"PO-Revision-Date: 2005-10-17 09:23+0200\n"
+"PO-Revision-Date: 2007-10-17 20:22+0200\n"
"Last-Translator: Thomas Arendsen Hein <thomas@intevation.de>\n"
"Language-Team: deutsch <kde-i18n-de@kde.org>\n"
"MIME-Version: 1.0\n"
@@ -1728,8 +1728,8 @@ msgstr ""
"Belegt zusammen)"
#: ../../../www/admin/service/index.php.in:284
-msgid "HTTP FreeBusy Service (Legacy)"
-msgstr "HTTP-Frei/Belegt-Dienst (für Altsysteme)"
+msgid "FreeBusy Service via HTTP (in addition to HTTPS)"
+msgstr "Frei/Belegt-Dienst über HTTP (zusätzlich zu HTTPS)"
#: ../../../www/admin/service/index.php.in:285
msgid "Amavis Email Scanning (Virus/Spam)"
diff --git a/www/admin/service/index.php.in b/www/admin/service/index.php.in
index 0f0268f..74d4aaa 100644
--- a/www/admin/service/index.php.in
+++ b/www/admin/service/index.php.in
@@ -275,7 +275,7 @@ $entries = array( array( 'service' => 'pop3', 'name' => _('POP3 Service'), 'ena
array( 'service' => 'imap', 'name' => _('IMAP Service'), 'enabled' => toboolstr( $imap ) ),
array( 'service' => 'imaps', 'name' => _('IMAP/SSL Service (TCP port 993)'), 'enabled' => toboolstr( $imaps ) ),
array( 'service' => 'sieve', 'name' => _('Sieve service (TCP port 2000)'), 'enabled' => toboolstr( $sieve ) ),
- array( 'service' => 'http', 'name' => _('HTTP FreeBusy Service (Legacy)'), 'enabled' => toboolstr( $http ) ),
+ array( 'service' => 'http', 'name' => _('FreeBusy Service via HTTP (in addition to HTTPS)'), 'enabled' => toboolstr( $http ) ),
array( 'service' => 'amavis', 'name' => _('Amavis Email Scanning (Virus/Spam)'),
'enabled' => toboolstr( $amavis ) ) );