From 3f035eaf420b74df1d766b9c85a6cdf458f519ac Mon Sep 17 00:00:00 2001 From: Klaus Leithoff Date: Thu, 23 Jan 2014 15:19:25 +0000 Subject: [PATCH] keyword search definition on keyword1/label1 is now important instead of urgent; --- mail/inc/class.mail_ui.inc.php | 6 +++--- mail/lang/egw_de.lang | 2 +- mail/lang/egw_en.lang | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/mail/inc/class.mail_ui.inc.php b/mail/inc/class.mail_ui.inc.php index e76af41b3c..def2c69348 100644 --- a/mail/inc/class.mail_ui.inc.php +++ b/mail/inc/class.mail_ui.inc.php @@ -288,7 +288,7 @@ class mail_ui if ( $this->mail_bo->icServer->hasCapability('SUPPORTS_KEYWORDS')) { $this->statusTypes = array_merge($this->statusTypes,array( - 'keyword1' => 'urgent',//lang('urgent'), + 'keyword1' => 'important',//lang('important'), 'keyword2' => 'job', //lang('job'), 'keyword3' => 'personal',//lang('personal'), 'keyword4' => 'to do', //lang('to do'), @@ -1032,7 +1032,7 @@ class mail_ui ), 'label1' => array( 'group' => ++$group, - 'caption' => "".lang('urgent')."", + 'caption' => "".lang('important')."", 'icon' => 'mail_label1', 'onExecute' => 'javaScript:app.mail.mail_flag', 'shortcut' => egw_keymanager::shortcut(egw_keymanager::_1, true, true), @@ -1075,7 +1075,7 @@ class mail_ui 'group' => ++$group, 'children' => array( 'unlabel1' => array( - 'caption' => "".lang('urgent')."", + 'caption' => "".lang('important')."", 'icon' => 'mail_unlabel1', 'onExecute' => 'javaScript:app.mail.mail_flag', ), diff --git a/mail/lang/egw_de.lang b/mail/lang/egw_de.lang index e6ba5c2f20..9c8b5afae5 100644 --- a/mail/lang/egw_de.lang +++ b/mail/lang/egw_de.lang @@ -185,6 +185,7 @@ import of message %1 failed. could not save message to folder %2 due to: %3 mail import of message %1 failed. destination folder %2 does not exist. mail de Der Import der Nachricht %1 ist fehlgeschlagen. Zielordner %2 existiert nicht. import of message %1 failed. destination folder not set. mail de Der Import der Nachricht %1 ist fehlgeschlagen. Zielordner nicht gesetzt. import of message %1 failed. no contacts to merge and send to specified. mail de Der Import der Nachricht %1 ist fehlgeschlagen. Es wurde keine Kontaktinformation für das Versenden und Zusammenführen von E-Mail und Kontaktdaten angegeben. +important mail de wichtig importance mail de Wichtigkeit in mailbox: %1, with id: %2, and partid: %3 mail de Im Mailordner: %1, mit der ID: %2 und der PartID: %3 inbox mail de Posteingang @@ -366,7 +367,6 @@ undelete mail de Als gelöscht markiert entfernen unflagged mail de Markierung entfernen unread mail de ungelesen unsubscribe folder mail de Abbestellen -urgent mail de dringend use default timeout (20 seconds) mail de verwende Standard Timeout (20 Sekunden) use regular expressions (see wikipedia for information on posix regular expressions) mail de reguläre Ausdrücke verwenden (siehe Wikipedia Artikel bzgl. POSIX Regular Expressions) use source as displayed, if applicable mail de Format wie E-Mailanzeige diff --git a/mail/lang/egw_en.lang b/mail/lang/egw_en.lang index 5210f437b2..4351f8d4ce 100644 --- a/mail/lang/egw_en.lang +++ b/mail/lang/egw_en.lang @@ -184,6 +184,7 @@ import of message %1 failed. could not save message to folder %2 due to: %3 mail import of message %1 failed. destination folder %2 does not exist. mail en Import of message %1 failed. Destination Folder %2 does not exist. import of message %1 failed. destination folder not set. mail en Import of message %1 failed. Destination Folder not set. import of message %1 failed. no contacts to merge and send to specified. mail en Import of message %1 failed. No Contacts to merge and send to specified. +important mail en important importance mail en importance in mailbox: %1, with id: %2, and partid: %3 mail en In Mailbox: %1, with ID: %2, and PartID: %3 inbox mail en INBOX @@ -365,7 +366,6 @@ undelete mail en Undelete unflagged mail en Unflagged unread mail en unread unsubscribe folder mail en Unsubscribe folder -urgent mail en urgent use default timeout (20 seconds) mail en use default timeout (20 seconds) use regular expressions (see wikipedia for information on posix regular expressions) mail en Use regular expressions (see wikipedia for information on POSIX regular expressions) use source as displayed, if applicable mail en use source as displayed, if applicable