[commits] Horde branch develop updated. 87ba45070dc6e91df55161069766b8218cccabfb

Michael M Slusarz slusarz at horde.org
Wed Dec 21 19:04:48 UTC 2011


The branch "develop" has been updated.
The following is a summary of the commits.

from: 17c7cf8dbb4fcdbdee9f550d95703fe3bfd8b764

5cf019a Revert "Trim attribute, chunk_split() adds a trailing delimiter."
41f3a95 Released Horde_Icalendar-1.1.0
39039e4 Development mode for Horde_Icalendar-1.1.1
9d0470f Released Horde_Imap_Client-1.3.1
e12f1bb Development mode for Horde_Imap_Client-1.3.2
b8cd581 Released Horde_Service_Weather-1.0.0RC2
46aba47 Development mode for Horde_Service_Weather-1.0.0
72cbee8 Released Horde_SyncMl-1.0.7
3904f20 Development mode for Horde_SyncMl-1.0.8
d41ad9e No need for gettext.
857549d Update de translation.
7ef3490 Updated
8d295c2 Prepare release.
866903f Released imp-5.0.17
87c1291 Development mode for imp-5.0.18
81a221e Released Horde_Autoloader_Cache-1.0.0
8b3ac18 Development mode for Horde_Autoloader_Cache-1.0.1
87ba450 Merge branch 'master' into develop

-----------------------------------------------------------------------

commit 5cf019a6e07342a42e2e3a696e883e68582c7ecf
Author: Jan Schneider <jan at horde.org>
Date:   Wed Dec 21 18:01:57 2011 +0100

    Revert "Trim attribute, chunk_split() adds a trailing delimiter."
    
    The behavior was perfectly fine.
    
    This reverts commit 916a5093a0c1c67dc2c20ea8776125fbed0b7b97.
    
    Conflicts:
    
    	framework/Icalendar/package.xml

 framework/Icalendar/lib/Horde/Icalendar.php |    2 +-
 framework/Icalendar/package.xml             |    2 --
 2 files changed, 1 insertions(+), 3 deletions(-)

http://git.horde.org/horde-git/-/commit/5cf019a6e07342a42e2e3a696e883e68582c7ecf

-----------------------------------------------------------------------

commit 41f3a95e7499a8e88ee3fc18ccfd2426cc9f95de
Author: Jan Schneider <jan at horde.org>
Date:   Wed Dec 21 18:06:58 2011 +0100

    Released Horde_Icalendar-1.1.0

 framework/Icalendar/package.xml |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

http://git.horde.org/horde-git/-/commit/41f3a95e7499a8e88ee3fc18ccfd2426cc9f95de

-----------------------------------------------------------------------

commit 39039e49a148f6876702970e3a21b3bd79a20432
Author: Jan Schneider <jan at horde.org>
Date:   Wed Dec 21 18:06:58 2011 +0100

    Development mode for Horde_Icalendar-1.1.1

 framework/Icalendar/package.xml |   19 ++++++++++++++++---
 1 files changed, 16 insertions(+), 3 deletions(-)

http://git.horde.org/horde-git/-/commit/39039e49a148f6876702970e3a21b3bd79a20432

-----------------------------------------------------------------------

commit 9d0470ff935c38483b84d27a490aadf377e40046
Author: Jan Schneider <jan at horde.org>
Date:   Wed Dec 21 18:13:27 2011 +0100

    Released Horde_Imap_Client-1.3.1

 framework/Imap_Client/package.xml |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

http://git.horde.org/horde-git/-/commit/9d0470ff935c38483b84d27a490aadf377e40046

-----------------------------------------------------------------------

commit e12f1bbf8c7452b41d7445362f18a81e5130a1db
Author: Jan Schneider <jan at horde.org>
Date:   Wed Dec 21 18:13:27 2011 +0100

    Development mode for Horde_Imap_Client-1.3.2

 framework/Imap_Client/package.xml |   20 ++++++++++++++++----
 1 files changed, 16 insertions(+), 4 deletions(-)

http://git.horde.org/horde-git/-/commit/e12f1bbf8c7452b41d7445362f18a81e5130a1db

-----------------------------------------------------------------------

commit b8cd58112dd724b24da3fb0106eb358a126bd480
Author: Jan Schneider <jan at horde.org>
Date:   Wed Dec 21 18:16:02 2011 +0100

    Released Horde_Service_Weather-1.0.0RC2

 framework/Service_Weather/package.xml |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

http://git.horde.org/horde-git/-/commit/b8cd58112dd724b24da3fb0106eb358a126bd480

-----------------------------------------------------------------------

commit 46aba4736b667dd9e037d4b2a17b81cffc6eb8ed
Author: Jan Schneider <jan at horde.org>
Date:   Wed Dec 21 18:16:03 2011 +0100

    Development mode for Horde_Service_Weather-1.0.0

 framework/Service_Weather/package.xml |   19 ++++++++++++++++---
 1 files changed, 16 insertions(+), 3 deletions(-)

http://git.horde.org/horde-git/-/commit/46aba4736b667dd9e037d4b2a17b81cffc6eb8ed

-----------------------------------------------------------------------

commit 72cbee86fede312d79156b8b63dbe314a07169e6
Author: Jan Schneider <jan at horde.org>
Date:   Wed Dec 21 18:18:04 2011 +0100

    Released Horde_SyncMl-1.0.7

 framework/SyncMl/package.xml |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

http://git.horde.org/horde-git/-/commit/72cbee86fede312d79156b8b63dbe314a07169e6

-----------------------------------------------------------------------

commit 3904f202301f206a48536a32f5c8ac3a7542fff8
Author: Jan Schneider <jan at horde.org>
Date:   Wed Dec 21 18:18:04 2011 +0100

    Development mode for Horde_SyncMl-1.0.8

 framework/SyncMl/package.xml |   19 ++++++++++++++++---
 1 files changed, 16 insertions(+), 3 deletions(-)

http://git.horde.org/horde-git/-/commit/3904f202301f206a48536a32f5c8ac3a7542fff8

-----------------------------------------------------------------------

commit d41ad9ecf25c598a5aa59baf6e8dad09eab3c606
Author: Jan Schneider <jan at horde.org>
Date:   Wed Dec 21 18:27:20 2011 +0100

    No need for gettext.

 horde/lib/Block/Weather.php |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

http://git.horde.org/horde-git/-/commit/d41ad9ecf25c598a5aa59baf6e8dad09eab3c606

-----------------------------------------------------------------------

commit 857549d76def6e594a4acc169001b2570f62d3e1
Author: Jan Schneider <jan at horde.org>
Date:   Wed Dec 21 18:50:24 2011 +0100

    Update de translation.

 agora/locale/de/LC_MESSAGES/agora.po                              |   56 +-
 ansel/locale/de/LC_MESSAGES/ansel.po                              |   15 +-
 chora/locale/de/LC_MESSAGES/chora.po                              |   20 +-
 framework/Alarm/locale/de/LC_MESSAGES/Horde_Alarm.po              |    6 +-
 framework/Core/locale/de/LC_MESSAGES/Horde_Core.po                |   22 +-
 framework/Crypt/locale/de/LC_MESSAGES/Horde_Crypt.po              |  194 +-
 framework/Mime/locale/de/LC_MESSAGES/Horde_Mime.po                |   16 +-
 .../locale/de/LC_MESSAGES/Horde_Service_Weather.mo                |  Bin 8577 -> 12109 bytes
 .../locale/de/LC_MESSAGES/Horde_Service_Weather.po                |  287 +-
 framework/Token/locale/de/LC_MESSAGES/Horde_Token.po              |   12 +-
 gollem/locale/de/LC_MESSAGES/gollem.po                            |   12 +-
 hermes/locale/de/LC_MESSAGES/hermes.po                            |   28 +-
 horde/locale/de/LC_MESSAGES/horde.mo                              |  Bin 66324 -> 66834 bytes
 horde/locale/de/LC_MESSAGES/horde.po                              |  213 +-
 imp/locale/de/LC_MESSAGES/imp.mo                                  |  Bin 187265 -> 187508 bytes
 imp/locale/de/LC_MESSAGES/imp.po                                  | 1394 +++--
 kronolith/locale/de/LC_MESSAGES/kronolith.po                      |  431 +-
 mnemo/locale/de/LC_MESSAGES/mnemo.po                              |   26 +-
 nag/locale/de/LC_MESSAGES/nag.po                                  |   45 +-
 timeobjects/locale/de/LC_MESSAGES/timeobjects.po                  |   16 +-
 turba/locale/de/LC_MESSAGES/turba.po                              |   18 +-
 whups/locale/de/LC_MESSAGES/whups.po                              |   50 +-
 22 files changed, 1581 insertions(+), 1280 deletions(-)

http://git.horde.org/horde-git/-/commit/857549d76def6e594a4acc169001b2570f62d3e1

-----------------------------------------------------------------------

commit 7ef34903b372f09d9e1a3565f1768f28e1e80843
Author: Jan Schneider <jan at horde.org>
Date:   Wed Dec 21 18:50:41 2011 +0100

    Updated

 agora/locale/agora.pot                                     |   56 +-
 ansel/locale/ansel.pot                                     |   12 +-
 chora/locale/chora.pot                                     |   20 +-
 framework/Alarm/locale/Horde_Alarm.pot                     |    6 +-
 framework/Core/locale/Horde_Core.pot                       |   22 +-
 framework/Crypt/locale/Horde_Crypt.pot                     |  194 +-
 framework/Kolab_Cli/locale/Horde_Kolab_Cli.pot             |   26 +-
 framework/Mime/locale/Horde_Mime.pot                       |   16 +-
 framework/Service_Weather/locale/Horde_Service_Weather.pot |    3 +-
 framework/Token/locale/Horde_Token.pot                     |    9 +-
 gollem/locale/gollem.pot                                   |   14 +-
 hermes/locale/hermes.pot                                   |   28 +-
 horde/locale/horde.pot                                     |  188 +-
 imp/locale/imp.pot                                         | 1392 ++++++------
 kolab/locale/kolab.pot                                     |   20 +-
 kronolith/locale/kronolith.pot                             |  425 ++--
 mnemo/locale/mnemo.pot                                     |   28 +-
 nag/locale/nag.pot                                         |   44 +-
 timeobjects/locale/timeobjects.pot                         |   25 +-
 turba/locale/turba.pot                                     |   18 +-
 whups/locale/whups.pot                                     |   52 +-
 21 files changed, 1305 insertions(+), 1293 deletions(-)

http://git.horde.org/horde-git/-/commit/7ef34903b372f09d9e1a3565f1768f28e1e80843

-----------------------------------------------------------------------

commit 8d295c21df88a83fb0c066be02a32bb09b575dc0
Author: Jan Schneider <jan at horde.org>
Date:   Wed Dec 21 18:51:00 2011 +0100

    Prepare release.

 imp/docs/RELEASE_NOTES |   18 +++++++-----------
 1 files changed, 7 insertions(+), 11 deletions(-)

http://git.horde.org/horde-git/-/commit/8d295c21df88a83fb0c066be02a32bb09b575dc0

-----------------------------------------------------------------------

commit 866903f4251b249cb8284695f43095acae6f480b
Author: Jan Schneider <jan at horde.org>
Date:   Wed Dec 21 18:57:00 2011 +0100

    Released imp-5.0.17

 imp/docs/CHANGES        |    6 +++---
 imp/lib/Application.php |    2 +-
 imp/package.xml         |    6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

http://git.horde.org/horde-git/-/commit/866903f4251b249cb8284695f43095acae6f480b

-----------------------------------------------------------------------

commit 87c129111d9e600f3fd94fedb9e2b6199a27346e
Author: Jan Schneider <jan at horde.org>
Date:   Wed Dec 21 18:57:07 2011 +0100

    Development mode for imp-5.0.18

 imp/docs/CHANGES        |    6 ++++++
 imp/lib/Application.php |    2 +-
 imp/package.xml         |   29 ++++++++++++++++-------------
 3 files changed, 23 insertions(+), 14 deletions(-)

http://git.horde.org/horde-git/-/commit/87c129111d9e600f3fd94fedb9e2b6199a27346e

-----------------------------------------------------------------------

commit 81a221e8112e652ec27da3edd43b9d31dbcc82ed
Author: Jan Schneider <jan at horde.org>
Date:   Wed Dec 21 18:59:25 2011 +0100

    Released Horde_Autoloader_Cache-1.0.0

 framework/Autoloader_Cache/package.xml |   22 +++++++++++-----------
 1 files changed, 11 insertions(+), 11 deletions(-)

http://git.horde.org/horde-git/-/commit/81a221e8112e652ec27da3edd43b9d31dbcc82ed

-----------------------------------------------------------------------

commit 8b3ac18d4405a6f1f566fb22dd04348538ce2c14
Author: Jan Schneider <jan at horde.org>
Date:   Wed Dec 21 18:59:25 2011 +0100

    Development mode for Horde_Autoloader_Cache-1.0.1

 framework/Autoloader_Cache/package.xml |   19 ++++++++++++++++---
 1 files changed, 16 insertions(+), 3 deletions(-)

http://git.horde.org/horde-git/-/commit/8b3ac18d4405a6f1f566fb22dd04348538ce2c14

-----------------------------------------------------------------------

commit 87ba45070dc6e91df55161069766b8218cccabfb
Merge: 17c7cf8 8b3ac18
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Wed Dec 21 11:31:34 2011 -0700

    Merge branch 'master' into develop
    
    Conflicts:
    	imp/lib/Application.php
    	imp/package.xml

 agora/locale/agora.pot                                            |   56 +-
 agora/locale/de/LC_MESSAGES/agora.po                              |   56 +-
 ansel/locale/ansel.pot                                            |   12 +-
 ansel/locale/de/LC_MESSAGES/ansel.po                              |   15 +-
 chora/locale/chora.pot                                            |   20 +-
 chora/locale/de/LC_MESSAGES/chora.po                              |   20 +-
 framework/Alarm/locale/Horde_Alarm.pot                            |    6 +-
 framework/Alarm/locale/de/LC_MESSAGES/Horde_Alarm.po              |    6 +-
 framework/Autoloader_Cache/package.xml                            |   33 +-
 framework/Core/locale/Horde_Core.pot                              |   22 +-
 framework/Core/locale/de/LC_MESSAGES/Horde_Core.po                |   22 +-
 framework/Crypt/locale/Horde_Crypt.pot                            |  194 +-
 framework/Crypt/locale/de/LC_MESSAGES/Horde_Crypt.po              |  194 +-
 framework/Icalendar/lib/Horde/Icalendar.php                       |    2 +-
 framework/Icalendar/package.xml                                   |   25 +-
 framework/Imap_Client/package.xml                                 |   24 +-
 framework/Kolab_Cli/locale/Horde_Kolab_Cli.pot                    |   26 +-
 framework/Mime/locale/Horde_Mime.pot                              |   16 +-
 framework/Mime/locale/de/LC_MESSAGES/Horde_Mime.po                |   16 +-
 framework/Service_Weather/locale/Horde_Service_Weather.pot        |    3 +-
 .../locale/de/LC_MESSAGES/Horde_Service_Weather.mo                |  Bin 8577 -> 12109 bytes
 .../locale/de/LC_MESSAGES/Horde_Service_Weather.po                |  287 +-
 framework/Service_Weather/package.xml                             |   27 +-
 framework/SyncMl/package.xml                                      |   23 +-
 framework/Token/locale/Horde_Token.pot                            |    9 +-
 framework/Token/locale/de/LC_MESSAGES/Horde_Token.po              |   12 +-
 gollem/locale/de/LC_MESSAGES/gollem.po                            |   12 +-
 gollem/locale/gollem.pot                                          |   14 +-
 hermes/locale/de/LC_MESSAGES/hermes.po                            |   28 +-
 hermes/locale/hermes.pot                                          |   28 +-
 horde/lib/Block/Weather.php                                       |    8 +-
 horde/locale/de/LC_MESSAGES/horde.mo                              |  Bin 66324 -> 66834 bytes
 horde/locale/de/LC_MESSAGES/horde.po                              |  213 +-
 horde/locale/horde.pot                                            |  188 +-
 imp/docs/CHANGES                                                  |    8 +-
 imp/docs/RELEASE_NOTES                                            |   18 +-
 imp/locale/de/LC_MESSAGES/imp.mo                                  |  Bin 187265 -> 187508 bytes
 imp/locale/de/LC_MESSAGES/imp.po                                  | 1394 +++--
 imp/locale/imp.pot                                                | 1392 +++--
 imp/package.xml                                                   |   15 +-
 kolab/locale/kolab.pot                                            |   20 +-
 kronolith/locale/de/LC_MESSAGES/kronolith.po                      |  431 +-
 kronolith/locale/kronolith.pot                                    |  425 +-
 mnemo/locale/de/LC_MESSAGES/mnemo.po                              |   26 +-
 mnemo/locale/mnemo.pot                                            |   28 +-
 nag/locale/de/LC_MESSAGES/nag.po                                  |   45 +-
 nag/locale/nag.pot                                                |   44 +-
 timeobjects/locale/de/LC_MESSAGES/timeobjects.po                  |   16 +-
 timeobjects/locale/timeobjects.pot                                |   25 +-
 turba/locale/de/LC_MESSAGES/turba.po                              |   18 +-
 turba/locale/turba.pot                                            |   18 +-
 whups/locale/de/LC_MESSAGES/whups.po                              |   50 +-
 whups/locale/whups.pot                                            |   52 +-
 53 files changed, 3016 insertions(+), 2626 deletions(-)

http://git.horde.org/horde-git/-/commit/87ba45070dc6e91df55161069766b8218cccabfb




More information about the commits mailing list