summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--patches/horde-webmail/1.2.0/horde-webmail-1.2.0_kolab_openpkg.patch76
-rw-r--r--patches/horde-webmail/1.2.0/merges/t_dimp_H_GW_AclView.diff36
-rw-r--r--patches/horde-webmail/1.2.0/merges/t_dimp_H_GW_FoldersView.diff40
3 files changed, 122 insertions, 30 deletions
diff --git a/patches/horde-webmail/1.2.0/horde-webmail-1.2.0_kolab_openpkg.patch b/patches/horde-webmail/1.2.0/horde-webmail-1.2.0_kolab_openpkg.patch
index 1ceb591..115639b 100644
--- a/patches/horde-webmail/1.2.0/horde-webmail-1.2.0_kolab_openpkg.patch
+++ b/patches/horde-webmail/1.2.0/horde-webmail-1.2.0_kolab_openpkg.patch
@@ -27165,12 +27165,14 @@ http://bugs.horde.org/ticket/8060
Signed-off-by: Gunnar Wrobel <p@rdus.de>
---
- horde-webmail/dimp/js/DimpBase.js | 1 +
- horde-webmail/dimp/lib/DIMP.php | 1 +
- horde-webmail/dimp/templates/index/index.inc | 1 +
- horde-webmail/imp/acl.php | 12 ++++++++++--
- horde-webmail/imp/templates/acl/acl.html | 6 ++++++
- 5 files changed, 19 insertions(+), 2 deletions(-)
+ horde-webmail/dimp/js/DimpBase.js | 1 +
+ horde-webmail/dimp/lib/DIMP.php | 1 +
+ .../dimp/locale/de_DE/LC_MESSAGES/dimp.mo | Bin 168731 -> 168778 bytes
+ horde-webmail/dimp/po/de_DE.po | 3 +++
+ horde-webmail/dimp/templates/index/index.inc | 1 +
+ horde-webmail/imp/acl.php | 12 ++++++++++--
+ horde-webmail/imp/templates/acl/acl.html | 6 ++++++
+ 7 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/horde-webmail/dimp/js/DimpBase.js b/horde-webmail/dimp/js/DimpBase.js
index 39a728b..c4eb9f4 100644
@@ -27196,6 +27198,20 @@ index 0aa3b78..92a1e55 100644
'sortthread' => SORTTHREAD,
'sortdate' => SORTDATE,
+diff --git a/horde-webmail/dimp/locale/de_DE/LC_MESSAGES/dimp.mo b/horde-webmail/dimp/locale/de_DE/LC_MESSAGES/dimp.mo
+index 2f1c11c..973776f 100644
+Binary files a/horde-webmail/dimp/locale/de_DE/LC_MESSAGES/dimp.mo and b/horde-webmail/dimp/locale/de_DE/LC_MESSAGES/dimp.mo differ
+diff --git a/horde-webmail/dimp/po/de_DE.po b/horde-webmail/dimp/po/de_DE.po
+index c1a6f52..6de9591 100644
+--- a/horde-webmail/dimp/po/de_DE.po
++++ b/horde-webmail/dimp/po/de_DE.po
+@@ -791,3 +791,6 @@ msgstr "entfernen"
+ #: lib/DIMP.php:191
+ msgid "results found"
+ msgstr "Ergebnisse gefunden"
++
++msgid "Share Folder"
++msgstr "Gemeinsame Ordner"
diff --git a/horde-webmail/dimp/templates/index/index.inc b/horde-webmail/dimp/templates/index/index.inc
index 21939e0..7c02fe7 100644
--- a/horde-webmail/dimp/templates/index/index.inc
@@ -27272,11 +27288,17 @@ index 79580aa..72cf1c5 100644
<td class="header">&nbsp;</td>
</tr>
--
-tg: (3c3721f..) t/dimp/H/GW/AclView (depends on: t/dimp/H/GW/FoldersView)
+tg: (ad147a4..) t/dimp/H/GW/AclView (depends on: t/dimp/H/GW/FoldersView)
--
TOPGIT patch commit log
=======================
+commit 57041c04c322dd7dc57da5b171923b7ab000ec0a
+Author: Gunnar Wrobel <p@rdus.de>
+Date: Sun Jun 21 23:58:30 2009 +0200
+
+ German translation.
+
commit cac1482cec6c96a8a1d7fb7c0e8c2433877728f5
Author: Gunnar Wrobel <p@rdus.de>
Date: Fri Mar 13 12:04:03 2009 +0000
@@ -27308,28 +27330,46 @@ http://bugs.horde.org/ticket/8059
Signed-off-by: Gunnar Wrobel <p@rdus.de>
---
- horde-webmail/dimp/config/menu.php | 6 ++++++
+ horde-webmail/dimp/config/menu.php | 9 ++++++++-
+ horde-webmail/dimp/po/de_DE.po | 3 +++
horde-webmail/imp/folders.php | 17 ++++++++++++-----
horde-webmail/imp/templates/folders/actions.html | 2 ++
- 3 files changed, 20 insertions(+), 5 deletions(-)
+ 4 files changed, 25 insertions(+), 6 deletions(-)
diff --git a/horde-webmail/dimp/config/menu.php b/horde-webmail/dimp/config/menu.php
-index 5dcf354..99a4b8c 100644
+index 0c6ebe9..b5e0a5c 100644
--- a/horde-webmail/dimp/config/menu.php
+++ b/horde-webmail/dimp/config/menu.php
-@@ -28,6 +28,12 @@
+@@ -28,7 +28,14 @@
// 'text' => 'Say Hi!',
// 'icon' => $GLOBALS['registry']->getImageDir('horde') . '/horde.png'),
// );
++
+$site_menu = array(
+ 'folders' => array(
+ 'action' => 'DimpBase.go("app:horde", "' . Horde::url($GLOBALS['registry']->get('webroot', 'imp') . '/folders.php', true) . '")',
-+ 'text' => _('Folders'),
-+ 'icon' => $GLOBALS['registry']->getImageDir('imp') . '/folders/folder.png'),
++ 'text' => _('Folder Subscription'),
++ 'icon' => $GLOBALS['registry']->getImageDir('horde') . '/prefs.png'),
+);
++
if (file_exists(dirname(__FILE__) . '/menu.local.php')) {
- require_once(dirname(__FILE__) . '/menu.local.php');
+ require(dirname(__FILE__) . '/menu.local.php');
}
+-
+diff --git a/horde-webmail/dimp/po/de_DE.po b/horde-webmail/dimp/po/de_DE.po
+index 65e8824..c1a6f52 100644
+--- a/horde-webmail/dimp/po/de_DE.po
++++ b/horde-webmail/dimp/po/de_DE.po
+@@ -16,6 +16,9 @@ msgstr ""
+ "Content-Transfer-Encoding: 8bit\n"
+ "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
++msgid "Folder Subscription"
++mststr "Ordner verwalten"
++
+ #: lib/Views/ShowMessage.php:295
+ #, php-format
+ msgid "%d Attachment"
diff --git a/horde-webmail/imp/folders.php b/horde-webmail/imp/folders.php
index a0425aa..c46b0e5 100644
--- a/horde-webmail/imp/folders.php
@@ -27399,11 +27439,17 @@ index f882a82..8e39b8a 100644
<option value="expunge_folder"><gettext>Purge</gettext></option>
</if:notrash>
--
-tg: (eff636a..) t/dimp/H/GW/FoldersView (depends on: t/kronolith/H/GW/UseDayHourStartEndAlsoInFBView)
+tg: (3678979..) t/dimp/H/GW/FoldersView (depends on: t/kronolith/H/GW/UseDayHourStartEndAlsoInFBView)
--
TOPGIT patch commit log
=======================
+commit ad147a4b42d61800400a2a779e884ee050358811
+Author: Gunnar Wrobel <p@rdus.de>
+Date: Mon Jun 22 00:06:14 2009 +0200
+
+ Fixed menu entry name, added translation, fixed image.
+
commit a1966161022108d9bf4831a8613b1db9a4e68c4d
Author: Gunnar Wrobel <p@rdus.de>
Date: Fri Mar 13 11:06:45 2009 +0000
diff --git a/patches/horde-webmail/1.2.0/merges/t_dimp_H_GW_AclView.diff b/patches/horde-webmail/1.2.0/merges/t_dimp_H_GW_AclView.diff
index 8870b17..780b0fb 100644
--- a/patches/horde-webmail/1.2.0/merges/t_dimp_H_GW_AclView.diff
+++ b/patches/horde-webmail/1.2.0/merges/t_dimp_H_GW_AclView.diff
@@ -12,12 +12,14 @@ http://bugs.horde.org/ticket/8060
Signed-off-by: Gunnar Wrobel <p@rdus.de>
---
- horde-webmail/dimp/js/DimpBase.js | 1 +
- horde-webmail/dimp/lib/DIMP.php | 1 +
- horde-webmail/dimp/templates/index/index.inc | 1 +
- horde-webmail/imp/acl.php | 12 ++++++++++--
- horde-webmail/imp/templates/acl/acl.html | 6 ++++++
- 5 files changed, 19 insertions(+), 2 deletions(-)
+ horde-webmail/dimp/js/DimpBase.js | 1 +
+ horde-webmail/dimp/lib/DIMP.php | 1 +
+ .../dimp/locale/de_DE/LC_MESSAGES/dimp.mo | Bin 168731 -> 168778 bytes
+ horde-webmail/dimp/po/de_DE.po | 3 +++
+ horde-webmail/dimp/templates/index/index.inc | 1 +
+ horde-webmail/imp/acl.php | 12 ++++++++++--
+ horde-webmail/imp/templates/acl/acl.html | 6 ++++++
+ 7 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/horde-webmail/dimp/js/DimpBase.js b/horde-webmail/dimp/js/DimpBase.js
index 39a728b..c4eb9f4 100644
@@ -43,6 +45,20 @@ index 0aa3b78..92a1e55 100644
'sortthread' => SORTTHREAD,
'sortdate' => SORTDATE,
+diff --git a/horde-webmail/dimp/locale/de_DE/LC_MESSAGES/dimp.mo b/horde-webmail/dimp/locale/de_DE/LC_MESSAGES/dimp.mo
+index 2f1c11c..973776f 100644
+Binary files a/horde-webmail/dimp/locale/de_DE/LC_MESSAGES/dimp.mo and b/horde-webmail/dimp/locale/de_DE/LC_MESSAGES/dimp.mo differ
+diff --git a/horde-webmail/dimp/po/de_DE.po b/horde-webmail/dimp/po/de_DE.po
+index c1a6f52..6de9591 100644
+--- a/horde-webmail/dimp/po/de_DE.po
++++ b/horde-webmail/dimp/po/de_DE.po
+@@ -791,3 +791,6 @@ msgstr "entfernen"
+ #: lib/DIMP.php:191
+ msgid "results found"
+ msgstr "Ergebnisse gefunden"
++
++msgid "Share Folder"
++msgstr "Gemeinsame Ordner"
diff --git a/horde-webmail/dimp/templates/index/index.inc b/horde-webmail/dimp/templates/index/index.inc
index 21939e0..7c02fe7 100644
--- a/horde-webmail/dimp/templates/index/index.inc
@@ -119,11 +135,17 @@ index 79580aa..72cf1c5 100644
<td class="header">&nbsp;</td>
</tr>
--
-tg: (3c3721f..) t/dimp/H/GW/AclView (depends on: t/dimp/H/GW/FoldersView)
+tg: (ad147a4..) t/dimp/H/GW/AclView (depends on: t/dimp/H/GW/FoldersView)
--
TOPGIT patch commit log
=======================
+commit 57041c04c322dd7dc57da5b171923b7ab000ec0a
+Author: Gunnar Wrobel <p@rdus.de>
+Date: Sun Jun 21 23:58:30 2009 +0200
+
+ German translation.
+
commit cac1482cec6c96a8a1d7fb7c0e8c2433877728f5
Author: Gunnar Wrobel <p@rdus.de>
Date: Fri Mar 13 12:04:03 2009 +0000
diff --git a/patches/horde-webmail/1.2.0/merges/t_dimp_H_GW_FoldersView.diff b/patches/horde-webmail/1.2.0/merges/t_dimp_H_GW_FoldersView.diff
index 5f64660..9a468ad 100644
--- a/patches/horde-webmail/1.2.0/merges/t_dimp_H_GW_FoldersView.diff
+++ b/patches/horde-webmail/1.2.0/merges/t_dimp_H_GW_FoldersView.diff
@@ -12,28 +12,46 @@ http://bugs.horde.org/ticket/8059
Signed-off-by: Gunnar Wrobel <p@rdus.de>
---
- horde-webmail/dimp/config/menu.php | 6 ++++++
+ horde-webmail/dimp/config/menu.php | 9 ++++++++-
+ horde-webmail/dimp/po/de_DE.po | 3 +++
horde-webmail/imp/folders.php | 17 ++++++++++++-----
horde-webmail/imp/templates/folders/actions.html | 2 ++
- 3 files changed, 20 insertions(+), 5 deletions(-)
+ 4 files changed, 25 insertions(+), 6 deletions(-)
diff --git a/horde-webmail/dimp/config/menu.php b/horde-webmail/dimp/config/menu.php
-index 5dcf354..99a4b8c 100644
+index 0c6ebe9..b5e0a5c 100644
--- a/horde-webmail/dimp/config/menu.php
+++ b/horde-webmail/dimp/config/menu.php
-@@ -28,6 +28,12 @@
+@@ -28,7 +28,14 @@
// 'text' => 'Say Hi!',
// 'icon' => $GLOBALS['registry']->getImageDir('horde') . '/horde.png'),
// );
++
+$site_menu = array(
+ 'folders' => array(
+ 'action' => 'DimpBase.go("app:horde", "' . Horde::url($GLOBALS['registry']->get('webroot', 'imp') . '/folders.php', true) . '")',
-+ 'text' => _('Folders'),
-+ 'icon' => $GLOBALS['registry']->getImageDir('imp') . '/folders/folder.png'),
++ 'text' => _('Folder Subscription'),
++ 'icon' => $GLOBALS['registry']->getImageDir('horde') . '/prefs.png'),
+);
++
if (file_exists(dirname(__FILE__) . '/menu.local.php')) {
- require_once(dirname(__FILE__) . '/menu.local.php');
+ require(dirname(__FILE__) . '/menu.local.php');
}
+-
+diff --git a/horde-webmail/dimp/po/de_DE.po b/horde-webmail/dimp/po/de_DE.po
+index 65e8824..c1a6f52 100644
+--- a/horde-webmail/dimp/po/de_DE.po
++++ b/horde-webmail/dimp/po/de_DE.po
+@@ -16,6 +16,9 @@ msgstr ""
+ "Content-Transfer-Encoding: 8bit\n"
+ "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
++msgid "Folder Subscription"
++mststr "Ordner verwalten"
++
+ #: lib/Views/ShowMessage.php:295
+ #, php-format
+ msgid "%d Attachment"
diff --git a/horde-webmail/imp/folders.php b/horde-webmail/imp/folders.php
index a0425aa..c46b0e5 100644
--- a/horde-webmail/imp/folders.php
@@ -103,11 +121,17 @@ index f882a82..8e39b8a 100644
<option value="expunge_folder"><gettext>Purge</gettext></option>
</if:notrash>
--
-tg: (eff636a..) t/dimp/H/GW/FoldersView (depends on: t/kronolith/H/GW/UseDayHourStartEndAlsoInFBView)
+tg: (3678979..) t/dimp/H/GW/FoldersView (depends on: t/kronolith/H/GW/UseDayHourStartEndAlsoInFBView)
--
TOPGIT patch commit log
=======================
+commit ad147a4b42d61800400a2a779e884ee050358811
+Author: Gunnar Wrobel <p@rdus.de>
+Date: Mon Jun 22 00:06:14 2009 +0200
+
+ Fixed menu entry name, added translation, fixed image.
+
commit a1966161022108d9bf4831a8613b1db9a4e68c4d
Author: Gunnar Wrobel <p@rdus.de>
Date: Fri Mar 13 11:06:45 2009 +0000