Branch 'roundcube-0.7' - plugins/calendar

[Thomas Brüderli]

 plugins/calendar/drivers/kolab/kolab_driver.php |    3 +++
 plugins/calendar/localization/de_CH.inc         |    2 +-
 plugins/calendar/localization/de_DE.inc         |    2 +-
 plugins/calendar/localization/en_US.inc         |    3 ++-
 4 files changed, 7 insertions(+), 3 deletions(-)

New commits:
commit 154aebfc3c5dd06bc5ca88a54c44e42a9223cfc7
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date:   Fri Jan 27 17:46:25 2012 +0100

    Fixed minor bugs from #510

diff --git a/plugins/calendar/drivers/kolab/kolab_driver.php b/plugins/calendar/drivers/kolab/kolab_driver.php
index 2d61f02..1978079 100644
--- a/plugins/calendar/drivers/kolab/kolab_driver.php
+++ b/plugins/calendar/drivers/kolab/kolab_driver.php
@@ -1211,6 +1211,9 @@ class kolab_driver extends calendar_driver
         array('form' => $form, 'options' => $options, 'name' => $folder));
     }
 
+    if (!$plugin['form']['sharing']['content'])
+        $plugin['form']['sharing']['content'] = html::div('hint', $this->cal->gettext('aclnorights'));
+
     return $plugin['form']['sharing']['content'];
   }
 
diff --git a/plugins/calendar/localization/de_CH.inc b/plugins/calendar/localization/de_CH.inc
index 34f8909..7171230 100644
--- a/plugins/calendar/localization/de_CH.inc
+++ b/plugins/calendar/localization/de_CH.inc
@@ -61,7 +61,7 @@ $labels['confidential'] = 'vertraulich';
 $labels['alarms'] = 'Erinnerung';
 $labels['generated'] = 'erstellt am';
 $labels['printdescriptions'] = 'Beschrieb drucken';
-$labels['parentcalendar'] = 'Ãœbergeordneter Kalender';
+$labels['parentcalendar'] = 'Erstellen in';
 $labels['searchearlierdates'] = '« Frühere Termine suchen';
 $labels['searchlaterdates'] = 'Spätere Termine suchen »';
 $labels['andnmore'] = '$nr weitere...';
diff --git a/plugins/calendar/localization/de_DE.inc b/plugins/calendar/localization/de_DE.inc
index 9a16e87..cb9b0f4 100644
--- a/plugins/calendar/localization/de_DE.inc
+++ b/plugins/calendar/localization/de_DE.inc
@@ -61,7 +61,7 @@ $labels['confidential'] = 'vertraulich';
 $labels['alarms'] = 'Erinnerung';
 $labels['generated'] = 'erstellt am';
 $labels['printdescriptions'] = 'Beschrieb drucken';
-$labels['parentcalendar'] = 'Ãœbergeordneter Kalender';
+$labels['parentcalendar'] = 'Erstellen in';
 $labels['searchearlierdates'] = '« Frühere Termine suchen';
 $labels['searchlaterdates'] = 'Spätere Termine suchen »';
 $labels['andnmore'] = '$nr weitere...';
diff --git a/plugins/calendar/localization/en_US.inc b/plugins/calendar/localization/en_US.inc
index 8050bb8..ef6fe75 100644
--- a/plugins/calendar/localization/en_US.inc
+++ b/plugins/calendar/localization/en_US.inc
@@ -61,7 +61,7 @@ $labels['confidential'] = 'confidential';
 $labels['alarms'] = 'Reminder';
 $labels['generated'] = 'generated at';
 $labels['printdescriptions'] = 'Print descriptions';
-$labels['parentcalendar'] = 'Superior calendar';
+$labels['parentcalendar'] = 'Insert inside';
 $labels['searchearlierdates'] = '« Search for earlier events';
 $labels['searchlaterdates'] = 'Search for later events »';
 $labels['andnmore'] = '$nr more...';
@@ -205,6 +205,7 @@ $labels['localchangeswarning'] = 'You are about to make changes that will only b
 $labels['importsuccess'] = 'Successfully imported $nr events';
 $labels['importnone'] = 'No events found to be imported';
 $labels['importerror'] = 'An error occured while importing';
+$labels['aclnorights'] = 'You do not have administrator rights on this calendar.';
 
 // recurrence form
 $labels['repeat'] = 'Repeat';