From 7ef15d9c7af68b3e290e42f103010cb57c6df2f3 Mon Sep 17 00:00:00 2001
From: Thomas <thomas@brotherli.ch>
Date: Tue, 13 Sep 2011 17:07:54 +0200
Subject: [PATCH] Fix conflicting label names

---
 plugins/calendar/lib/calendar_ui.php    | 2 +-
 plugins/calendar/localization/de_CH.inc | 2 +-
 plugins/calendar/localization/de_DE.inc | 2 +-
 plugins/calendar/localization/en_US.inc | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/plugins/calendar/lib/calendar_ui.php b/plugins/calendar/lib/calendar_ui.php
index 573031fd..5fd4a622 100644
--- a/plugins/calendar/lib/calendar_ui.php
+++ b/plugins/calendar/lib/calendar_ui.php
@@ -464,7 +464,7 @@ class calendar_ui
 
         $table->add('label', '');
         $table->add(null, $radio->show('', array('value' => 'until', 'id' => 'edit-recurrence-repeat-until')) . ' ' .
-          $this->cal->gettext('until') . ' ' . $input->show(''));
+          $this->cal->gettext('untildate') . ' ' . $input->show(''));
         $html = $table->show();
         break;
     }
diff --git a/plugins/calendar/localization/de_CH.inc b/plugins/calendar/localization/de_CH.inc
index cac0bab4..c8769a96 100644
--- a/plugins/calendar/localization/de_CH.inc
+++ b/plugins/calendar/localization/de_CH.inc
@@ -208,7 +208,7 @@ $labels['weeks'] = 'Woche(n)';
 $labels['months'] = 'Monat(e)';
 $labels['years'] = 'Jahre(e) im:';
 $labels['bydays'] = 'Am';
-$labels['until'] = 'am';
+$labels['untildate'] = 'am';
 $labels['each'] = 'Jeden';
 $labels['onevery'] = 'An jedem';
 $labels['onsamedate'] = 'Am gleichen Tag';
diff --git a/plugins/calendar/localization/de_DE.inc b/plugins/calendar/localization/de_DE.inc
index b2483cb6..7e503ee8 100644
--- a/plugins/calendar/localization/de_DE.inc
+++ b/plugins/calendar/localization/de_DE.inc
@@ -208,7 +208,7 @@ $labels['weeks'] = 'Woche(n)';
 $labels['months'] = 'Monat(e)';
 $labels['years'] = 'Jahre(e) im:';
 $labels['bydays'] = 'Am';
-$labels['until'] = 'am';
+$labels['untildate'] = 'am';
 $labels['each'] = 'Jeden';
 $labels['onevery'] = 'An jedem';
 $labels['onsamedate'] = 'Am gleichen Tag';
diff --git a/plugins/calendar/localization/en_US.inc b/plugins/calendar/localization/en_US.inc
index 084f00d1..3038b606 100644
--- a/plugins/calendar/localization/en_US.inc
+++ b/plugins/calendar/localization/en_US.inc
@@ -209,7 +209,7 @@ $labels['weeks'] = 'week(s)';
 $labels['months'] = 'month(s)';
 $labels['years'] = 'year(s) in:';
 $labels['bydays'] = 'On';
-$labels['until'] = 'the';
+$labels['untildate'] = 'the';
 $labels['each'] = 'Each';
 $labels['onevery'] = 'On every';
 $labels['onsamedate'] = 'On the same date';