From 82953bf156720f8da9691b813bb7c6f17f4ba1b1 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Tue, 15 Jul 2014 09:37:08 +0000 Subject: [PATCH] change phrase "all messages in current folder" to "all messages in current view", as we take search and filters into account, also change German translation accordingly --- mail/js/app.js | 10 +++++----- mail/lang/egw_de.lang | 5 ++--- mail/lang/egw_en.lang | 3 ++- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/mail/js/app.js b/mail/js/app.js index f75a4e49ae..0a78c36722 100644 --- a/mail/js/app.js +++ b/mail/js/app.js @@ -964,7 +964,7 @@ app.classes.mail = AppJS.extend( }); var data = _elems[0].data || {}; - + var text = $j(document.createElement('div')).css({left: '30px', position: 'absolute'}); // add filename or number of files for multiple files text.text(_elems.length > 1 ? _elems.length+' '+this.egw.lang('files') : data.name || ''); @@ -1496,7 +1496,7 @@ app.classes.mail = AppJS.extend( var self = this; this.egw.message(this.egw.lang('empty trash')); egw.json('mail.mail_ui.ajax_emptyTrash',[server[0]],function(){self.lock_tree();}) - .sendRequest(true); + .sendRequest(true); }, /** @@ -1628,7 +1628,7 @@ app.classes.mail = AppJS.extend( {text: this.egw.lang("Yes"), id: "all", class: "ui-priority-primary", "default": true}, {text: this.egw.lang("Cancel"), id:"cancel"} ]; - var messageToDisplay = this.egw.lang("Do you really want to apply %1 to ALL messages in the current folder?",this.egw.lang(_action.id))+" "; + var messageToDisplay = this.egw.lang("Do you really want to apply %1 to ALL messages in current view?",this.egw.lang(_action.id))+" "; switch (_action.id) { case "unlabel": @@ -1640,7 +1640,7 @@ app.classes.mail = AppJS.extend( case "flagged": case "read": case "undelete": - messageToDisplay = this.egw.lang("Do you really want to toggle flag %1 for ALL messages in the current folder?",this.egw.lang(_action.id))+" "; + messageToDisplay = this.egw.lang("Do you really want to toggle flag %1 for ALL messages in current view?",this.egw.lang(_action.id))+" "; break; } return et2_dialog.show_dialog(function(_button_id, _value) { @@ -2720,7 +2720,7 @@ app.classes.mail = AppJS.extend( if (messages['all']) messages['activeFilters'] = this.mail_getActiveFilters(_action); var self = this; egw.json('mail.mail_ui.ajax_copyMessages',[target, messages],function (){self.unlock_tree();}) - .sendRequest(); + .sendRequest(); // Server response contains refresh }, diff --git a/mail/lang/egw_de.lang b/mail/lang/egw_de.lang index a9cdcc7d3d..f72016aeda 100644 --- a/mail/lang/egw_de.lang +++ b/mail/lang/egw_de.lang @@ -1,8 +1,6 @@ %1 attachments mail de %1 Anhänge %1 is not writable by you! mail de %1 ist nicht beschreibbar für Sie %1 mails selected mail de %1 E-Mail(s) ausgewählt -(*) wildcards (*,?) may be used. if you are trying to match * or ? itself, you must escape them with a backslash (). if you check "use regular expressions" you must use valid regular expressions. mail de (*) Platzhalter (*,?) können verwendet werden. Wenn Sie * oder ? selbst finden wollen, dann müssen Sie diesen Zeichen je einen Backslash (\) voranstellen. Wenn Sie "reguläre Ausdrücke verwenden" aktivieren, dann müssen Sie jedoch gültige reguläre Ausdrücke angeben. -(*) wildcards (*,?) may be used. if you are trying to match * or ? itself, you must escape them with a backslash (). if you check "use regular expressions" you must use valid regular expressions. in order to escape of exclamation mark (!) at the begining not being used as "not", use regex and backslash () (e.g. !) mail de (*) wildcards (*,?) may be used. If you are trying to match * or ? itself, you must escape them with a backslash (\). If you check "Use regular expressions" you must use valid regular expressions. In order to escape of exclamation mark (!) at the begining not being used as "NOT", use regex and backslash (\) (e.g. \!) (*) wildcards (*,?) may be used. if you are trying to match * or ? itself, you must escape them with a backslash (\). if you check "use regular expressions" you must use valid regular expressions. mail de (*) Platzhalter (*,?) können verwendet werden. Wenn Sie * oder ? selbst finden wollen, dann müssen Sie diesen Zeichen je einen Backslash (\) voranstellen. Wenn Sie "reguläre Ausdrücke verwenden" aktivieren, dann müssen Sie jedoch gültige reguläre Ausdrücke angeben. (*) wildcards (*,?) may be used. if you are trying to match * or ? itself, you must escape them with a backslash (\). if you check "use regular expressions" you must use valid regular expressions. in order to escape of exclamation mark (!) at the begining not being used as "not", use regex and backslash (\) (e.g. \!) mail de (*) wildcards (*,?) may be used. If you are trying to match * or ? itself, you must escape them with a backslash (\). If you check "Use regular expressions" you must use valid regular expressions. In order to escape of exclamation mark (!) at the begining not being used as "NOT", use regex and backslash (\) (e.g. \!) (leave empty for no quota) mail de (Leer lassen, um einen die Begrenzung zu deaktivieren) @@ -93,8 +91,9 @@ display only when no plain text is available mail de nur anzeigen wenn kein Plai displaying html messages is disabled mail de Die Anzeige von HTML-E-Mails ist deaktiviert. displaying plain messages is disabled mail de Die Anzeige von reinen Text E-Mails ist deaktiviert. do not auto create folders mail de Automatische Ordnererstellung verhindern für -do you really want to apply %1 to all messages in the current folder? mail de Möchten Sie die ausgewählte Aktion: %1, auf alle Nachrichten in diesem Ordner anwenden? +do you really want to apply %1 to all messages in current view? mail de Wollen Sie wirklich %1 auf alle Nachrichten in der aktuellen Ansicht anwenden? do you really want to delete folder %1 ? mail de Wollen Sie den Ordner %1 wirklich löschen? +do you really want to toggle flag %1 for all messages in current view? mail de Wollen Sie wirklich den Wert für %1 für alle Nachrichten in der aktuellen Ansicht umschalten? do you want to be asked for confirmation before attaching selected messages to new mail? mail de Möchten Sie vor dem Anhängen von einer oder mehreren (ausgewählten) E-Mails an eine neue E-Mail gefragt werden? do you want to be asked for confirmation before moving selected messages to another folder? mail de Möchten Sie vor dem Verschieben von E-Mails in andere Ordner gefragt werden? do you want to prevent the editing/setup of filter rules (, even if sieve is enabled)? mail de Möchten Sie das Editieren/Einstellen von Filterregeln (via SIEVE) unterbinden? diff --git a/mail/lang/egw_en.lang b/mail/lang/egw_en.lang index 063926b4fb..4ae627f144 100644 --- a/mail/lang/egw_en.lang +++ b/mail/lang/egw_en.lang @@ -91,8 +91,9 @@ display only when no plain text is available mail en display only when no plain displaying html messages is disabled mail en displaying html messages is disabled displaying plain messages is disabled mail en displaying plain messages is disabled do not auto create folders mail en do not auto create folders -do you really want to apply %1 to all messages in the current folder? mail en Do you really want to apply %1 to ALL messages in the current folder? +do you really want to apply %1 to all messages in current view? mail en Do you really want to apply %1 to ALL messages in current view? do you really want to delete folder %1 ? mail en Do you really want to DELETE Folder %1 ? +do you really want to toggle flag %1 for all messages in current view? mail en Do you really want to toggle flag %1 for ALL messages in current view? do you want to be asked for confirmation before attaching selected messages to new mail? mail en Do you want to be asked for confirmation before attaching selected messages to new mail? do you want to be asked for confirmation before moving selected messages to another folder? mail en Do you want to be asked for confirmation before moving selected messages to another folder? do you want to prevent the editing/setup of filter rules (, even if sieve is enabled)? mail en Do you want to prevent the editing/setup of filter rules (, even if SIEVE is enabled)?