summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG1
-rw-r--r--program/localization/de_CH/labels.inc6
-rw-r--r--program/localization/de_DE/labels.inc6
3 files changed, 7 insertions, 6 deletions
diff --git a/CHANGELOG b/CHANGELOG
index c9d60a07d..4f82ce888 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
CHANGELOG Roundcube Webmail
===========================
+- Better German labels for from/to to avoid conflicts with 'sender' (#1489084)
- Fix SMTP connection using IPv6 address in smtp_server option (#1489024)
- Fix problem where security warning was displayed for valid images with image/jpg type (#1489097)
- Fix handling of invalid email addresses in headers (#1489092)
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';