From e68942c65bc9fe9f182a46b43e169987879957dd Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Thu, 16 May 2013 20:03:25 +0200
Subject: Better German labels for from/to headers to avoid conflicts with
 'sender' (#1489084)

---
 CHANGELOG                             | 3 +++
 program/localization/de_CH/labels.inc | 6 +++---
 program/localization/de_DE/labels.inc | 6 +++---
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index b14baa2a9..acd41b259 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,9 @@
 CHANGELOG Roundcube Webmail
 ===========================
 
+RELEASE 0.9.1
+-------------
+- Better German labels for from/to to avoid conflicts with 'sender' (#1489084)
 - Fix problem where security warning was displayed for valid images with image/jpg type (#1489097)
 - Fix handling of invalid email addresses in headers (#1489092)
 - Fix IMAP connection issue with default_socket_timeout < 0 and imap_timeout < 0 (#1489090)
diff --git a/program/localization/de_CH/labels.inc b/program/localization/de_CH/labels.inc
index bea939d3d..e64859d2c 100644
--- a/program/localization/de_CH/labels.inc
+++ b/program/localization/de_CH/labels.inc
@@ -40,9 +40,9 @@ $labels['junk']   = 'Spam';
 
 // 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['threaded'] = 'Gruppiert';
 $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';
diff --git a/program/localization/de_DE/labels.inc b/program/localization/de_DE/labels.inc
index 376376dad..d497a6bc6 100644
--- a/program/localization/de_DE/labels.inc
+++ b/program/localization/de_DE/labels.inc
@@ -40,9 +40,9 @@ $labels['junk']   = 'Spam';
 
 // message listing
 $labels['subject'] = 'Betreff';
-$labels['from']    = 'Absender';
+$labels['from']    = 'Von';
 $labels['sender']  = 'Absender';
-$labels['to']      = 'Empfänger';
+$labels['to']      = 'An';
 $labels['cc']      = 'Kopie';
 $labels['bcc']     = 'Blindkopie';
 $labels['replyto'] = 'Antwort an';
@@ -177,7 +177,7 @@ $labels['threaded'] = 'Gruppiert';
 $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';
-- 
cgit v1.2.3