diff options
-rw-r--r-- | ChangeLog | 21 | ||||
-rw-r--r-- | php/admin/locale/de/LC_MESSAGES/messages.po | 6 | ||||
-rw-r--r-- | php/admin/locale/es/LC_MESSAGES/messages.po | 7 | ||||
-rw-r--r-- | php/admin/locale/fr/LC_MESSAGES/messages.po | 7 | ||||
-rw-r--r-- | php/admin/locale/it/LC_MESSAGES/messages.po | 6 | ||||
-rw-r--r-- | php/admin/locale/nl/LC_MESSAGES/messages.po | 7 | ||||
-rw-r--r-- | www/admin/user/deliver.php.in | 4 | ||||
-rw-r--r-- | www/admin/user/forward.php.in | 2 | ||||
-rw-r--r-- | www/admin/user/vacation.php.in | 2 |
9 files changed, 34 insertions, 28 deletions
@@ -2,6 +2,9 @@ * www/admin/user/user.php.in: Renamed "Free/Busy future" to "Free/Busy interval" to be consistent with the user inteface. + * www/admin/user/deliver.php.in, www/admin/user/forward.php.in, + www/admin/user/vacation.php.in: Don't use @bindir@ in strings + marked for translation. 2007-11-16 Thomas Arendsen Hein <thomas@intevation.de> @@ -66,7 +69,7 @@ fixed kolab/issue1845 (incorrect check mailForDn for ldap results) https://intevation.de/roundup/kolab/issue1845 -2007-07-04 Marcus Hüwe <suse-tux@gmx.de> +2007-07-04 Marcus Hüwe <suse-tux@gmx.de> * Makefile.am: @@ -80,7 +83,7 @@ is not yet capable of generating .mo files for the binary RPM. See kolab/issue1797 (kolab-webadmin source package missing PO files) -2007-06-21 Marcus Hüwe <suse-tux@gmx.de> +2007-06-21 Marcus Hüwe <suse-tux@gmx.de> * Makefile.am: @@ -251,7 +254,7 @@ Fix for issue1479 (https://intevation.de/roundup/kolab/issue1479). -2007-01-10 Marcus Hüwe <suse-tux@gmx.de> +2007-01-10 Marcus Hüwe <suse-tux@gmx.de> * php/admin/include/form.class.php: added a __toString() method otherwise it will not work with php 5.2.0 (see issue1558) @@ -264,7 +267,7 @@ * php/admin/include/mysmarty.php.in: make the Smarty prefix configurable, using variable: kolab_php_smarty_prefix -2006-03-22 Marcus Hüwe <suse-tux@gmx.de> +2006-03-22 Marcus Hüwe <suse-tux@gmx.de> Patch committed by Richard Bos * www/admin/user/user.php.in: replaced $kolab_prefix/etc by @sysconfidir@ @@ -312,7 +315,7 @@ 2006-01-17 Richard Bos <richard@radoeka.nl> * Makefile.am: corrected make rule for php/admin/templates/versions.tpl -2006-01-16 Marcus Hüwe <suse-tux@gmx.de> +2006-01-16 Marcus Hüwe <suse-tux@gmx.de> Patch committed by Richard Bos * www/admin/kolab/versions.php.in: use rpm package name variables for the software package version query's @@ -323,13 +326,13 @@ * Makefile.am: process php/admin/templates/versions.tpl.in * configure.ac: add --with-openpkg cmdline argument -2006-01-15 Marcus Hüwe <suse-tux@gmx.de> +2006-01-15 Marcus Hüwe <suse-tux@gmx.de> Patch committed by Richard Bos * www/admin/kolab/versions.php: moved to /www/admin/kolab/versions.php.in, replaced "$kolab_prefix/bin/openpkg" with @RPM@ * Makefile.am: make www/admin/kolab/versions.php.in -2006-01-14 Marcus Hüwe <suse-tux@gmx.de> +2006-01-14 Marcus Hüwe <suse-tux@gmx.de> Patch commited by Richard Bos * configure.ac: replaced --enable-dist with --with-dist Added dist_conf file check. If dist_conf file specified with @@ -345,7 +348,7 @@ * Makefile.am: add webserver_web_prefix so the involved files are installed in the right directory. -2005-12-30 Marcus Hüwe <suse-tux@gmx.de> +2005-12-30 Marcus Hüwe <suse-tux@gmx.de> Patch committed by Richard Bos, see issue1049 * php/admin/include/auth.class.php: moved to php/admin/include/auth.class.php.in @@ -371,7 +374,7 @@ * ../Makefile: reflected change in configure.ac, to create only bzipped tarbals. Changed 'make dist' into 'make distcheck' -2005-12-16 Marcus Hüwe <suse-tux@gmx.de> +2005-12-16 Marcus Hüwe <suse-tux@gmx.de> * Makefile.am: added dist_ prefix 2005-12-14 Richard Bos <richard@radoeka.nl> diff --git a/php/admin/locale/de/LC_MESSAGES/messages.po b/php/admin/locale/de/LC_MESSAGES/messages.po index 958ccb9..bb88465 100644 --- a/php/admin/locale/de/LC_MESSAGES/messages.po +++ b/php/admin/locale/de/LC_MESSAGES/messages.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: messages-2.1-new_de\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-11-21 12:57+0100\n" +"POT-Creation-Date: 2007-11-21 14:29+0100\n" "PO-Revision-Date: 2007-11-16 12:49+0100\n" "Last-Translator: Thomas Arendsen Hein <thomas@intevation.de>\n" "Language-Team: deutsch <kde-i18n-de@kde.org>\n" @@ -1843,8 +1843,8 @@ msgstr "" #: ../../../www/admin/user/forward.php.in:39 #: ../../../www/admin/user/vacation.php.in:18 msgid "" -"Suggest your system administrator to run \"@bindir@/pear install http://pear." -"php.net/get/Net_Sieve\" on the server" +"Suggest your system administrator to run \"pear install http://pear.php.net/" +"get/Net_Sieve\" on the server" msgstr "" #: ../../../www/admin/user/deliver.php.in:66 diff --git a/php/admin/locale/es/LC_MESSAGES/messages.po b/php/admin/locale/es/LC_MESSAGES/messages.po index dd50379..6d85b3c 100644 --- a/php/admin/locale/es/LC_MESSAGES/messages.po +++ b/php/admin/locale/es/LC_MESSAGES/messages.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: messages\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-11-21 12:57+0100\n" +"POT-Creation-Date: 2007-11-21 14:25+0100\n" "PO-Revision-Date: 2007-07-03 16:52+0200\n" "Last-Translator: Aron Galdon <aron20012004@ya.com>\n" "Language-Team: Español <kde-es@kybs.de>\n" @@ -1836,9 +1836,10 @@ msgstr "" #: ../../../www/admin/user/deliver.php.in:38 #: ../../../www/admin/user/forward.php.in:39 #: ../../../www/admin/user/vacation.php.in:18 +#, fuzzy msgid "" -"Suggest your system administrator to run \"@bindir@/pear install http://pear." -"php.net/get/Net_Sieve\" on the server" +"Suggest your system administrator to run \"pear install http://pear.php.net/" +"get/Net_Sieve\" on the server" msgstr "" "Sugiera a su administrador del sistema que ejecute \"@bindir@/pear install " "http://pear.php.net/get/Net_Sieve/\" en el servidor" diff --git a/php/admin/locale/fr/LC_MESSAGES/messages.po b/php/admin/locale/fr/LC_MESSAGES/messages.po index 81f881c..4dab67a 100644 --- a/php/admin/locale/fr/LC_MESSAGES/messages.po +++ b/php/admin/locale/fr/LC_MESSAGES/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: messages\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-11-21 12:57+0100\n" +"POT-Creation-Date: 2007-11-21 14:25+0100\n" "PO-Revision-Date: 2007-02-13 14:35+0100\n" "Last-Translator: Jean-Michel LACROIX <jm-lacroix@savigny.org>\n" "Language-Team: <fr@li.org>\n" @@ -1852,9 +1852,10 @@ msgstr "" #: ../../../www/admin/user/deliver.php.in:38 #: ../../../www/admin/user/forward.php.in:39 #: ../../../www/admin/user/vacation.php.in:18 +#, fuzzy msgid "" -"Suggest your system administrator to run \"@bindir@/pear install http://pear." -"php.net/get/Net_Sieve\" on the server" +"Suggest your system administrator to run \"pear install http://pear.php.net/" +"get/Net_Sieve\" on the server" msgstr "" "Suggérez à votre administrateur système de lancer \"@bindir@/pear install " "http://pear.php.net/get/Net_Sieve\" sur le serveur" diff --git a/php/admin/locale/it/LC_MESSAGES/messages.po b/php/admin/locale/it/LC_MESSAGES/messages.po index 6509ccc..6d57aee 100644 --- a/php/admin/locale/it/LC_MESSAGES/messages.po +++ b/php/admin/locale/it/LC_MESSAGES/messages.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: messages\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-11-21 12:57+0100\n" +"POT-Creation-Date: 2007-11-21 14:25+0100\n" "PO-Revision-Date: 2005-10-14 23:43+0100\n" "Last-Translator: Yvette Agostini <yvette@yvetteagostini.it>\n" "Language-Team: <fr@li.org>\n" @@ -1837,8 +1837,8 @@ msgstr "" #: ../../../www/admin/user/forward.php.in:39 #: ../../../www/admin/user/vacation.php.in:18 msgid "" -"Suggest your system administrator to run \"@bindir@/pear install http://pear." -"php.net/get/Net_Sieve\" on the server" +"Suggest your system administrator to run \"pear install http://pear.php.net/" +"get/Net_Sieve\" on the server" msgstr "" #: ../../../www/admin/user/deliver.php.in:66 diff --git a/php/admin/locale/nl/LC_MESSAGES/messages.po b/php/admin/locale/nl/LC_MESSAGES/messages.po index 60fbe47..ac38f48 100644 --- a/php/admin/locale/nl/LC_MESSAGES/messages.po +++ b/php/admin/locale/nl/LC_MESSAGES/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: messages\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-11-21 12:57+0100\n" +"POT-Creation-Date: 2007-11-21 14:25+0100\n" "PO-Revision-Date: 2007-02-20 20:45+0100\n" "Last-Translator: Richard Bos <richard@radoeka.nl>\n" "Language-Team: <nl@li.org>\n" @@ -1816,9 +1816,10 @@ msgstr "" #: ../../../www/admin/user/deliver.php.in:38 #: ../../../www/admin/user/forward.php.in:39 #: ../../../www/admin/user/vacation.php.in:18 +#, fuzzy msgid "" -"Suggest your system administrator to run \"@bindir@/pear install http://pear." -"php.net/get/Net_Sieve\" on the server" +"Suggest your system administrator to run \"pear install http://pear.php.net/" +"get/Net_Sieve\" on the server" msgstr "" "Stel Uw systeem administrator voor om \"@bindir@/pear install http://pear." "php.net/get/Net_Sieve\" uit te voeren op de server" diff --git a/www/admin/user/deliver.php.in b/www/admin/user/deliver.php.in index 9350d3c..1bd84be 100644 --- a/www/admin/user/deliver.php.in +++ b/www/admin/user/deliver.php.in @@ -1,6 +1,6 @@ <?php /* - * Copyright (c) 2004 Klarälvdalens Datakonsult AB + * Copyright (c) 2004 Klarälvdalens Datakonsult AB * * Written by Steffen Hansen <steffen@klaralvdalens-datakonsult.se> * @@ -35,7 +35,7 @@ function undotstuff( $str ) { $errors = array(); if( (@include_once '@kolab_php_module_prefix@admin/include/Sieve.php' ) === false ) { $errors[] = _('Net/Sieve.php is missing. Without that, filter settings are not available'); - $errors[] = _("Suggest your system administrator to run \"@bindir@/pear install http://pear.php.net/get/Net_Sieve\" on the server"); + $errors[] = _("Suggest your system administrator to run \"pear install http://pear.php.net/get/Net_Sieve\" on the server"); } /**** Authentication etc. ***/ diff --git a/www/admin/user/forward.php.in b/www/admin/user/forward.php.in index 1ec9618..ba0db88 100644 --- a/www/admin/user/forward.php.in +++ b/www/admin/user/forward.php.in @@ -36,7 +36,7 @@ function undotstuff( $str ) { $errors = array(); if( (@include_once '@kolab_php_module_prefix@admin/include/Sieve.php' ) === false ) { $errors[] = _('Net/Sieve.php is missing. Without that, vacation settings are not available'); - $errors[] = _("Suggest your system administrator to run \"@bindir@/pear install http://pear.php.net/get/Net_Sieve\" on the server"); + $errors[] = _("Suggest your system administrator to run \"pear install http://pear.php.net/get/Net_Sieve\" on the server"); } /**** Authentication etc. ***/ diff --git a/www/admin/user/vacation.php.in b/www/admin/user/vacation.php.in index 7010ffe..6636726 100644 --- a/www/admin/user/vacation.php.in +++ b/www/admin/user/vacation.php.in @@ -15,7 +15,7 @@ require_once '@kolab_php_module_prefix@admin/include/sieveutils.class.php'; $errors = array(); if( (@include_once '@kolab_php_module_prefix@admin/include/Sieve.php' ) === false ) { $errors[] = _('Net/Sieve.php is missing. Without that, vacation settings are not available'); - $errors[] = _("Suggest your system administrator to run \"@bindir@/pear install http://pear.php.net/get/Net_Sieve\" on the server"); + $errors[] = _("Suggest your system administrator to run \"pear install http://pear.php.net/get/Net_Sieve\" on the server"); } /**** Authentication etc. ***/ |