[commits] Horde branch develop updated. cb53279750af1fd1c983fe23f457fb1bf7d557e0
Michael M Slusarz
slusarz at horde.org
Thu Apr 19 06:09:52 UTC 2012
The branch "develop" has been updated.
The following is a summary of the commits.
from: d758185bf3b170488357034fc1d3d0738aa60f69
783a4e6 Update es translation.
0a3d57b Revert "[mms] Fix regression in sending PGP encrypted messages (Bug #11085)."
9b7439e Fix method names.
17f9120 [jan] Fix regression in sending PGP encrypted messages (Bug #11150).
f42cae5 Fix folder names in Procmail rules if using Maildir (Bug 10113).
896c9e1 Better hotfix for displaying HTML data in minimal view
cb53279 Merge branch 'master' into develop
-----------------------------------------------------------------------
commit 783a4e66aca2266be97f498e1110275fc8f06f72
Author: Jan Schneider <jan at horde.org>
Date: Tue Apr 17 13:37:48 2012 +0200
Update es translation.
agora/locale/es/LC_MESSAGES/agora.mo | Bin 82911 -> 83364 bytes
agora/locale/es/LC_MESSAGES/agora.po | 8 ++++++--
ansel/locale/es/LC_MESSAGES/ansel.mo | Bin 115506 -> 115509 bytes
ansel/locale/es/LC_MESSAGES/ansel.po | 8 ++++----
chora/locale/es/LC_MESSAGES/chora.mo | Bin 73541 -> 73548 bytes
framework/Core/locale/es/LC_MESSAGES/Horde_Core.mo | Bin 16704 -> 16711 bytes
framework/Core/locale/es/LC_MESSAGES/Horde_Core.po | 4 ++--
framework/Crypt/locale/es/LC_MESSAGES/Horde_Crypt.mo | Bin 8607 -> 8605 bytes
framework/Crypt/locale/es/LC_MESSAGES/Horde_Crypt.po | 4 ++--
framework/Image/locale/es/LC_MESSAGES/Horde_Image.mo | Bin 15616 -> 15615 bytes
framework/Image/locale/es/LC_MESSAGES/Horde_Image.po | 4 ++--
gollem/locale/es/LC_MESSAGES/gollem.mo | Bin 75529 -> 75516 bytes
gollem/locale/es/LC_MESSAGES/gollem.po | 15 ++++++---------
hermes/locale/es/LC_MESSAGES/hermes.mo | Bin 81921 -> 81917 bytes
hermes/locale/es/LC_MESSAGES/hermes.po | 4 ++--
horde/locale/es/LC_MESSAGES/horde.mo | Bin 67285 -> 67292 bytes
horde/locale/es/LC_MESSAGES/horde.po | 6 +++---
imp/locale/es/LC_MESSAGES/imp.mo | Bin 186122 -> 186127 bytes
imp/locale/es/LC_MESSAGES/imp.po | 8 ++++----
ingo/locale/es/LC_MESSAGES/ingo.mo | Bin 85013 -> 85015 bytes
ingo/locale/es/LC_MESSAGES/ingo.po | 9 ++++-----
jonah/locale/es/LC_MESSAGES/jonah.mo | Bin 77423 -> 77430 bytes
klutz/docs/CREDITS | 1 +
klutz/locale/es/LC_MESSAGES/klutz.mo | Bin 72685 -> 72728 bytes
klutz/locale/es/LC_MESSAGES/klutz.po | 17 +++++++++--------
kronolith/locale/es/LC_MESSAGES/kronolith.mo | Bin 127987 -> 127990 bytes
kronolith/locale/es/LC_MESSAGES/kronolith.po | 6 +++---
luxor/locale/es/LC_MESSAGES/luxor.mo | Bin 69218 -> 69225 bytes
mnemo/locale/es/LC_MESSAGES/mnemo.mo | Bin 77328 -> 77335 bytes
nag/locale/es/LC_MESSAGES/nag.mo | Bin 92095 -> 92142 bytes
nag/locale/es/LC_MESSAGES/nag.po | 15 +++++++--------
passwd/docs/CREDITS | 1 +
passwd/locale/es/LC_MESSAGES/passwd.mo | Bin 76611 -> 76770 bytes
passwd/locale/es/LC_MESSAGES/passwd.po | 4 ++--
sam/locale/es/LC_MESSAGES/sam.mo | Bin 71465 -> 71472 bytes
sesha/docs/CREDITS | 1 +
sesha/locale/es/LC_MESSAGES/sesha.mo | Bin 74996 -> 75022 bytes
sesha/locale/es/LC_MESSAGES/sesha.po | 13 +++++++------
trean/locale/es/LC_MESSAGES/trean.mo | Bin 79875 -> 79922 bytes
trean/locale/es/LC_MESSAGES/trean.po | 11 ++++++-----
turba/locale/es/LC_MESSAGES/turba.mo | Bin 99087 -> 99092 bytes
turba/locale/es/LC_MESSAGES/turba.po | 4 ++--
ulaform/locale/es/LC_MESSAGES/ulaform.mo | Bin 73243 -> 73250 bytes
vilma/locale/es/LC_MESSAGES/vilma.mo | Bin 78620 -> 78627 bytes
whups/locale/es/LC_MESSAGES/whups.mo | Bin 107568 -> 107568 bytes
wicked/locale/es/LC_MESSAGES/wicked.mo | Bin 83708 -> 83752 bytes
wicked/locale/es/LC_MESSAGES/wicked.po | 7 ++++---
47 files changed, 78 insertions(+), 72 deletions(-)
http://git.horde.org/horde-git/-/commit/783a4e66aca2266be97f498e1110275fc8f06f72
-----------------------------------------------------------------------
commit 0a3d57b3ff73564b79bf35640c3c34bbf9a1732a
Author: Jan Schneider <jan at horde.org>
Date: Tue Apr 17 15:21:30 2012 +0200
Revert "[mms] Fix regression in sending PGP encrypted messages (Bug #11085)."
This reverts commit c5540771fc376b2e770d49f8a7a4e0cdfacf65ba.
Conflicts:
imp/docs/CHANGES
imp/lib/Compose.php
imp/package.xml
imp/lib/Compose.php | 29 +++++++++++------------------
1 files changed, 11 insertions(+), 18 deletions(-)
http://git.horde.org/horde-git/-/commit/0a3d57b3ff73564b79bf35640c3c34bbf9a1732a
-----------------------------------------------------------------------
commit 9b7439e53109cc76be12be775a5495bc9f598990
Author: Jan Schneider <jan at horde.org>
Date: Tue Apr 17 15:25:14 2012 +0200
Fix method names.
imp/lib/Compose.php | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
http://git.horde.org/horde-git/-/commit/9b7439e53109cc76be12be775a5495bc9f598990
-----------------------------------------------------------------------
commit 17f91201be2a2feae183af7f4041eccac6239062
Author: Jan Schneider <jan at horde.org>
Date: Tue Apr 17 15:26:09 2012 +0200
[jan] Fix regression in sending PGP encrypted messages (Bug #11150).
imp/docs/CHANGES | 1 +
imp/package.xml | 2 ++
2 files changed, 3 insertions(+), 0 deletions(-)
http://git.horde.org/horde-git/-/commit/17f91201be2a2feae183af7f4041eccac6239062
-----------------------------------------------------------------------
commit f42cae5d096f0307e27aaf3b9065dba176cd5694
Author: Jan Schneider <jan at horde.org>
Date: Wed Apr 18 16:28:03 2012 +0200
Fix folder names in Procmail rules if using Maildir (Bug 10113).
In procmail rules, $DEFAULT should only be used for INBOX delivering. It's not
necessary (and actually seems to cause problems) to use it to build folder path
names.
ingo/config/backends.php | 2 ++
ingo/docs/CHANGES | 1 +
ingo/lib/Script/Procmail/Recipe.php | 15 +++++----------
ingo/package.xml | 2 ++
4 files changed, 10 insertions(+), 10 deletions(-)
http://git.horde.org/horde-git/-/commit/f42cae5d096f0307e27aaf3b9065dba176cd5694
-----------------------------------------------------------------------
commit 896c9e12336b169ccbccecca3d18059585f11e39
Author: Michael M Slusarz <slusarz at horde.org>
Date: Thu Apr 19 00:06:38 2012 -0600
Better hotfix for displaying HTML data in minimal view
imp/lib/Mime/Viewer/Html.php | 32 ++++++++------------------------
1 files changed, 8 insertions(+), 24 deletions(-)
http://git.horde.org/horde-git/-/commit/896c9e12336b169ccbccecca3d18059585f11e39
-----------------------------------------------------------------------
commit cb53279750af1fd1c983fe23f457fb1bf7d557e0
Merge: d758185 896c9e1
Author: Michael M Slusarz <slusarz at horde.org>
Date: Thu Apr 19 00:09:44 2012 -0600
Merge branch 'master' into develop
Conflicts:
imp/lib/Compose.php
imp/lib/Mime/Viewer/Html.php
imp/package.xml
ingo/package.xml
agora/locale/es/LC_MESSAGES/agora.mo | Bin 82911 -> 83364 bytes
agora/locale/es/LC_MESSAGES/agora.po | 8 ++++++--
ansel/locale/es/LC_MESSAGES/ansel.mo | Bin 115506 -> 115509 bytes
ansel/locale/es/LC_MESSAGES/ansel.po | 8 ++++----
chora/locale/es/LC_MESSAGES/chora.mo | Bin 73541 -> 73548 bytes
framework/Core/locale/es/LC_MESSAGES/Horde_Core.mo | Bin 16704 -> 16711 bytes
framework/Core/locale/es/LC_MESSAGES/Horde_Core.po | 4 ++--
framework/Crypt/locale/es/LC_MESSAGES/Horde_Crypt.mo | Bin 8607 -> 8605 bytes
framework/Crypt/locale/es/LC_MESSAGES/Horde_Crypt.po | 4 ++--
framework/Image/locale/es/LC_MESSAGES/Horde_Image.mo | Bin 15616 -> 15615 bytes
framework/Image/locale/es/LC_MESSAGES/Horde_Image.po | 4 ++--
gollem/locale/es/LC_MESSAGES/gollem.mo | Bin 75529 -> 75516 bytes
gollem/locale/es/LC_MESSAGES/gollem.po | 15 ++++++---------
hermes/locale/es/LC_MESSAGES/hermes.mo | Bin 81921 -> 81917 bytes
hermes/locale/es/LC_MESSAGES/hermes.po | 4 ++--
horde/locale/es/LC_MESSAGES/horde.mo | Bin 67285 -> 67292 bytes
horde/locale/es/LC_MESSAGES/horde.po | 6 +++---
imp/docs/CHANGES | 1 +
imp/locale/es/LC_MESSAGES/imp.mo | Bin 186122 -> 186127 bytes
imp/locale/es/LC_MESSAGES/imp.po | 8 ++++----
imp/package.xml | 1 +
ingo/config/backends.php | 2 ++
ingo/docs/CHANGES | 1 +
ingo/lib/Script/Procmail/Recipe.php | 15 +++++----------
ingo/locale/es/LC_MESSAGES/ingo.mo | Bin 85013 -> 85015 bytes
ingo/locale/es/LC_MESSAGES/ingo.po | 9 ++++-----
ingo/package.xml | 1 +
jonah/locale/es/LC_MESSAGES/jonah.mo | Bin 77423 -> 77430 bytes
klutz/docs/CREDITS | 1 +
klutz/locale/es/LC_MESSAGES/klutz.mo | Bin 72685 -> 72728 bytes
klutz/locale/es/LC_MESSAGES/klutz.po | 17 +++++++++--------
kronolith/locale/es/LC_MESSAGES/kronolith.mo | Bin 127987 -> 127990 bytes
kronolith/locale/es/LC_MESSAGES/kronolith.po | 6 +++---
luxor/locale/es/LC_MESSAGES/luxor.mo | Bin 69218 -> 69225 bytes
mnemo/locale/es/LC_MESSAGES/mnemo.mo | Bin 77328 -> 77335 bytes
nag/locale/es/LC_MESSAGES/nag.mo | Bin 92095 -> 92142 bytes
nag/locale/es/LC_MESSAGES/nag.po | 15 +++++++--------
passwd/docs/CREDITS | 1 +
passwd/locale/es/LC_MESSAGES/passwd.mo | Bin 76611 -> 76770 bytes
passwd/locale/es/LC_MESSAGES/passwd.po | 4 ++--
sam/locale/es/LC_MESSAGES/sam.mo | Bin 71465 -> 71472 bytes
sesha/docs/CREDITS | 1 +
sesha/locale/es/LC_MESSAGES/sesha.mo | Bin 74996 -> 75022 bytes
sesha/locale/es/LC_MESSAGES/sesha.po | 13 +++++++------
trean/locale/es/LC_MESSAGES/trean.mo | Bin 79875 -> 79922 bytes
trean/locale/es/LC_MESSAGES/trean.po | 11 ++++++-----
turba/locale/es/LC_MESSAGES/turba.mo | Bin 99087 -> 99092 bytes
turba/locale/es/LC_MESSAGES/turba.po | 4 ++--
ulaform/locale/es/LC_MESSAGES/ulaform.mo | Bin 73243 -> 73250 bytes
vilma/locale/es/LC_MESSAGES/vilma.mo | Bin 78620 -> 78627 bytes
whups/locale/es/LC_MESSAGES/whups.mo | Bin 107568 -> 107568 bytes
wicked/locale/es/LC_MESSAGES/wicked.mo | Bin 83708 -> 83752 bytes
wicked/locale/es/LC_MESSAGES/wicked.po | 7 ++++---
53 files changed, 89 insertions(+), 82 deletions(-)
http://git.horde.org/horde-git/-/commit/cb53279750af1fd1c983fe23f457fb1bf7d557e0
More information about the commits
mailing list