[commits] Horde branch ingo_3_1 updated. 3bf2a45e1c03eefb90cb26f4f580ab1df918ae16
Jan Schneider
jan at horde.org
Fri Feb 1 13:55:37 UTC 2013
The branch "ingo_3_1" has been updated.
The following is a summary of the commits.
from: d2c9d8f0aed14b761137593c06ff32c199537d34
e5f09c4 No need to wrap exceptions.
4ed38a9 Silence strict notices from Console_Getopt.
44e9739 Update sk translation.
db5de29 Update de translation.
dc9c170 [jan] Use more portable procmail recipe for rejects (Bug #7520).
742ace3 Fix comment.
13db04f [jan] Fix multiple user-defined headers in a single rule (Zephaniah E. Loss-Cutler-Hull, Bug #11893).
3bf2a45 Merge remote-tracking branch 'origin/master' into ingo_3_1
-----------------------------------------------------------------------
commit e5f09c4c03c8c1ea25f10ab672278ae3b717471f
Author: Jan Schneider <jan at horde.org>
Date: Thu Jan 31 12:50:23 2013 +0100
No need to wrap exceptions.
All the exceptions catched here are already Horde_Exceptions.
horde/lib/Api.php | 133 +++++++++++++++++------------------------------------
1 files changed, 42 insertions(+), 91 deletions(-)
http://git.horde.org/horde-git/-/commit/e5f09c4c03c8c1ea25f10ab672278ae3b717471f
-----------------------------------------------------------------------
commit 4ed38a9f3d9894e3d35f26251867a154f8fa66d6
Author: Jan Schneider <jan at horde.org>
Date: Fri Feb 1 12:20:02 2013 +0100
Silence strict notices from Console_Getopt.
framework/bin/pear_batch_install | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
http://git.horde.org/horde-git/-/commit/4ed38a9f3d9894e3d35f26251867a154f8fa66d6
-----------------------------------------------------------------------
commit 44e973983a49ad0d8dffaf916c3700f314199b96
Author: Jan Schneider <jan at horde.org>
Date: Fri Feb 1 13:35:22 2013 +0100
Update sk translation.
ansel/docs/CREDITS | 1 +
ansel/locale/sk/LC_MESSAGES/ansel.po | 663 +-
framework/Core/locale/sk/LC_MESSAGES/Horde_Core.mo | Bin 16427 -> 19588 bytes
framework/Core/locale/sk/LC_MESSAGES/Horde_Core.po | 722 +-
framework/Core/package.xml | 2 +
.../Kolab_FreeBusy/locale/sk/LC_MESSAGES/Horde_Kolab_FreeBusy.mo | Bin 661 -> 1820 bytes
.../Kolab_FreeBusy/locale/sk/LC_MESSAGES/Horde_Kolab_FreeBusy.po | 101 +-
framework/Mime/locale/sk/LC_MESSAGES/Horde_Mime.mo | Bin 1395 -> 1307 bytes
framework/Mime/locale/sk/LC_MESSAGES/Horde_Mime.po | 38 +-
gollem/locale/sk/LC_MESSAGES/gollem.mo | Bin 72844 -> 72384 bytes
gollem/locale/sk/LC_MESSAGES/gollem.po | 188 +-
imp/docs/CHANGES | 1 +
imp/locale/sk/LC_MESSAGES/imp.mo | Bin 178326 -> 178051 bytes
imp/locale/sk/LC_MESSAGES/imp.po | 2000 ++---
imp/package.xml | 2 +
mnemo/docs/CHANGES | 1 +
mnemo/locale/sk/LC_MESSAGES/mnemo.mo | Bin 72837 -> 74156 bytes
mnemo/locale/sk/LC_MESSAGES/mnemo.po | 81 +-
mnemo/package.xml | 2 +
19 files changed, 1944 insertions(+), 1858 deletions(-)
create mode 100644 ansel/locale/sk/LC_MESSAGES/ansel.po.tmp
http://git.horde.org/horde-git/-/commit/44e973983a49ad0d8dffaf916c3700f314199b96
-----------------------------------------------------------------------
commit db5de296417393d50cee1e36a2469dab2107bb15
Author: Jan Schneider <jan at horde.org>
Date: Fri Feb 1 13:37:01 2013 +0100
Update de translation.
imp/locale/de/LC_MESSAGES/imp.mo | Bin 181519 -> 181520 bytes
imp/locale/de/LC_MESSAGES/imp.po | 10 +++++-----
2 files changed, 5 insertions(+), 5 deletions(-)
http://git.horde.org/horde-git/-/commit/db5de296417393d50cee1e36a2469dab2107bb15
-----------------------------------------------------------------------
commit dc9c17041bae1cce78576b3dfaa9c3b3456ce09f
Author: Jan Schneider <jan at horde.org>
Date: Fri Feb 1 13:53:57 2013 +0100
[jan] Use more portable procmail recipe for rejects (Bug #7520).
ingo/docs/CHANGES | 1 +
ingo/lib/Script/Procmail/Recipe.php | 27 ++++++++++++++++++++++++---
ingo/package.xml | 4 +++-
3 files changed, 28 insertions(+), 4 deletions(-)
http://git.horde.org/horde-git/-/commit/dc9c17041bae1cce78576b3dfaa9c3b3456ce09f
-----------------------------------------------------------------------
commit 742ace3d155d77b337ab9ed905ee477b6eff9ea8
Author: Jan Schneider <jan at horde.org>
Date: Fri Feb 1 14:22:43 2013 +0100
Fix comment.
ingo/lib/Script/Maildrop/Recipe.php | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
http://git.horde.org/horde-git/-/commit/742ace3d155d77b337ab9ed905ee477b6eff9ea8
-----------------------------------------------------------------------
commit 13db04f101d1aa08503f26619dcdf99481135c95
Author: Jan Schneider <jan at horde.org>
Date: Fri Feb 1 14:28:12 2013 +0100
[jan] Fix multiple user-defined headers in a single rule (Zephaniah E. Loss-Cutler-Hull, Bug #11893).
ingo/docs/CHANGES | 2 ++
ingo/package.xml | 2 ++
ingo/rule.php | 6 +-----
3 files changed, 5 insertions(+), 5 deletions(-)
http://git.horde.org/horde-git/-/commit/13db04f101d1aa08503f26619dcdf99481135c95
-----------------------------------------------------------------------
commit 3bf2a45e1c03eefb90cb26f4f580ab1df918ae16
Merge: d2c9d8f 13db04f
Author: Jan Schneider <jan at horde.org>
Date: Fri Feb 1 14:55:18 2013 +0100
Merge remote-tracking branch 'origin/master' into ingo_3_1
Conflicts:
ingo/package.xml
ingo/rule.php
ansel/docs/CREDITS | 1 +
ansel/locale/sk/LC_MESSAGES/ansel.po | 663 +-
framework/Core/locale/sk/LC_MESSAGES/Horde_Core.mo | Bin 16427 -> 19588 bytes
framework/Core/locale/sk/LC_MESSAGES/Horde_Core.po | 722 +-
framework/Core/package.xml | 2 +
.../Kolab_FreeBusy/locale/sk/LC_MESSAGES/Horde_Kolab_FreeBusy.mo | Bin 661 -> 1820 bytes
.../Kolab_FreeBusy/locale/sk/LC_MESSAGES/Horde_Kolab_FreeBusy.po | 101 +-
framework/Mime/locale/sk/LC_MESSAGES/Horde_Mime.mo | Bin 1395 -> 1307 bytes
framework/Mime/locale/sk/LC_MESSAGES/Horde_Mime.po | 38 +-
framework/bin/pear_batch_install | 3 +
gollem/locale/sk/LC_MESSAGES/gollem.mo | Bin 72844 -> 72384 bytes
gollem/locale/sk/LC_MESSAGES/gollem.po | 188 +-
horde/lib/Api.php | 133 +-
imp/docs/CHANGES | 1 +
imp/locale/de/LC_MESSAGES/imp.mo | Bin 181519 -> 181520 bytes
imp/locale/de/LC_MESSAGES/imp.po | 10 +-
imp/locale/sk/LC_MESSAGES/imp.mo | Bin 178326 -> 178051 bytes
imp/locale/sk/LC_MESSAGES/imp.po | 2000 ++---
imp/package.xml | 2 +
ingo/docs/CHANGES | 3 +
ingo/lib/Script/Maildrop/Recipe.php | 3 +-
ingo/lib/Script/Procmail/Recipe.php | 27 +-
ingo/package.xml | 4 +-
ingo/rule.php | 4 +-
mnemo/docs/CHANGES | 1 +
mnemo/locale/sk/LC_MESSAGES/mnemo.mo | Bin 72837 -> 74156 bytes
mnemo/locale/sk/LC_MESSAGES/mnemo.po | 81 +-
mnemo/package.xml | 2 +
28 files changed, 2027 insertions(+), 1962 deletions(-)
http://git.horde.org/horde-git/-/commit/3bf2a45e1c03eefb90cb26f4f580ab1df918ae16
More information about the commits
mailing list