From fc52af24f1418d6590a2d37a0d8cc31b123e38f6 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Tue, 19 Aug 2014 12:08:35 -0400
Subject: [PATCH] Fix merge error that disabled contact drag'n'drop

---
 program/localization/de_CH/labels.inc |   15 ++++++++++++---
 1 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/program/localization/de_CH/labels.inc b/program/localization/de_CH/labels.inc
index bea939d..d610b19 100644
--- a/program/localization/de_CH/labels.inc
+++ b/program/localization/de_CH/labels.inc
@@ -40,9 +40,9 @@
 
 // message listing
 $labels['subject'] = 'Betreff';
-$labels['from']    = 'Absender';
+$labels['from']    = 'Von';
 $labels['sender']  = 'Absender';
-$labels['to']      = 'Empfänger';
+$labels['to']      = 'An';
 $labels['cc']      = 'Kopie (CC)';
 $labels['bcc']     = 'Blind-Kopie';
 $labels['replyto'] = 'Antwort an';
@@ -177,7 +177,7 @@
 $labels['autoexpand_threads'] = 'Konversationen aufklappen';
 $labels['do_expand'] = 'alle';
 $labels['expand_only_unread'] = 'nur ungelesene';
-$labels['fromto'] = 'Sender/Empfänger';
+$labels['fromto'] = 'Von/An';
 $labels['flag'] = 'Markierung';
 $labels['attachment'] = 'Anhang';
 $labels['nonesort'] = 'Keine';
@@ -228,6 +228,15 @@
 $labels['resumeediting'] = 'Bearbeitung fortsetzen';
 $labels['revertto']      = 'Zurück zu';
 
+$labels['responses'] = 'Vorlagen';
+$labels['insertresponse'] = 'Vorlage einfügen';
+$labels['manageresponses'] = 'Vorlagen verwalten';
+$labels['savenewresponse'] = 'Neue Vorlage speichern';
+$labels['editresponses'] = 'Vorlagen bearbeiten';
+$labels['editresponse'] = 'Vorlage bearbeiten';
+$labels['responsename'] = 'Name';
+$labels['responsetext'] = 'Vorlagentext';
+
 $labels['attach'] = 'Anhängen';
 $labels['attachments'] = 'Anhänge';
 $labels['upload'] = 'Hochladen';

--
Gitblit v1.9.1