diff options
Diffstat (limited to 'addons/mail')
35 files changed, 246 insertions, 170 deletions
diff --git a/addons/mail/i18n/ar.po b/addons/mail/i18n/ar.po index 82b7c93a426..484e83e503a 100644 --- a/addons/mail/i18n/ar.po +++ b/addons/mail/i18n/ar.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-05-11 05:14+0000\n" -"X-Generator: Launchpad (build 15225)\n" +"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n" +"X-Generator: Launchpad (build 15505)\n" #. module: mail #: field:mail.compose.message,subtype:0 field:mail.message,subtype:0 @@ -193,7 +193,7 @@ msgstr "" #. module: mail #: model:ir.model,name:mail.model_mail_compose_message -msgid "E-mail composition wizard" +msgid "Email composition wizard" msgstr "" #. module: mail diff --git a/addons/mail/i18n/bg.po b/addons/mail/i18n/bg.po index 23bddbb9115..52fb512fa19 100644 --- a/addons/mail/i18n/bg.po +++ b/addons/mail/i18n/bg.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-05-11 05:14+0000\n" -"X-Generator: Launchpad (build 15225)\n" +"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n" +"X-Generator: Launchpad (build 15505)\n" #. module: mail #: field:mail.compose.message,subtype:0 field:mail.message,subtype:0 @@ -193,7 +193,7 @@ msgstr "" #. module: mail #: model:ir.model,name:mail.model_mail_compose_message -msgid "E-mail composition wizard" +msgid "Email composition wizard" msgstr "" #. module: mail diff --git a/addons/mail/i18n/ca.po b/addons/mail/i18n/ca.po index cd92c07776f..482051e0fa5 100644 --- a/addons/mail/i18n/ca.po +++ b/addons/mail/i18n/ca.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-05-11 05:14+0000\n" -"X-Generator: Launchpad (build 15225)\n" +"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n" +"X-Generator: Launchpad (build 15505)\n" #. module: mail #: field:mail.compose.message,subtype:0 field:mail.message,subtype:0 @@ -193,7 +193,7 @@ msgstr "" #. module: mail #: model:ir.model,name:mail.model_mail_compose_message -msgid "E-mail composition wizard" +msgid "Email composition wizard" msgstr "" #. module: mail diff --git a/addons/mail/i18n/da.po b/addons/mail/i18n/da.po index 95822b49591..73ac9cbaa61 100644 --- a/addons/mail/i18n/da.po +++ b/addons/mail/i18n/da.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-05-11 05:14+0000\n" -"X-Generator: Launchpad (build 15225)\n" +"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n" +"X-Generator: Launchpad (build 15505)\n" #. module: mail #: field:mail.compose.message,subtype:0 field:mail.message,subtype:0 @@ -193,7 +193,7 @@ msgstr "" #. module: mail #: model:ir.model,name:mail.model_mail_compose_message -msgid "E-mail composition wizard" +msgid "Email composition wizard" msgstr "" #. module: mail diff --git a/addons/mail/i18n/de.po b/addons/mail/i18n/de.po index 305018c660f..ba2116c982a 100644 --- a/addons/mail/i18n/de.po +++ b/addons/mail/i18n/de.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-05-11 05:14+0000\n" -"X-Generator: Launchpad (build 15225)\n" +"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n" +"X-Generator: Launchpad (build 15505)\n" #. module: mail #: field:mail.compose.message,subtype:0 field:mail.message,subtype:0 @@ -193,8 +193,8 @@ msgstr "Empfänger" #. module: mail #: model:ir.model,name:mail.model_mail_compose_message -msgid "E-mail composition wizard" -msgstr "Email-Zusammensetzung Assistent" +msgid "Email composition wizard" +msgstr "" #. module: mail #: field:mail.compose.message,res_id:0 field:mail.message,res_id:0 @@ -521,6 +521,9 @@ msgstr "Bevorzugte Antwortadresse für diese Nachricht" #~ msgid "Text contents" #~ msgstr "Text Inhalt" +#~ msgid "E-mail composition wizard" +#~ msgstr "Email-Zusammensetzung Assistent" + #~ msgid "Related Document model" #~ msgstr "zugehöriges Dokumenten-Modell" diff --git a/addons/mail/i18n/es.po b/addons/mail/i18n/es.po index ccd7d594a3b..35d8b2de735 100644 --- a/addons/mail/i18n/es.po +++ b/addons/mail/i18n/es.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-05-11 05:14+0000\n" -"X-Generator: Launchpad (build 15225)\n" +"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n" +"X-Generator: Launchpad (build 15505)\n" #. module: mail #: field:mail.compose.message,subtype:0 field:mail.message,subtype:0 @@ -195,8 +195,8 @@ msgstr "Destinatarios" #. module: mail #: model:ir.model,name:mail.model_mail_compose_message -msgid "E-mail composition wizard" -msgstr "Asistente de composición de e-mail" +msgid "Email composition wizard" +msgstr "" #. module: mail #: field:mail.compose.message,res_id:0 field:mail.message,res_id:0 @@ -521,6 +521,9 @@ msgstr "" #~ msgid "Related Document model" #~ msgstr "Model de documento relacionado" +#~ msgid "E-mail composition wizard" +#~ msgstr "Asistente de composición de e-mail" + #~ msgid "Related user" #~ msgstr "Usuario relacionado" diff --git a/addons/mail/i18n/es_CR.po b/addons/mail/i18n/es_CR.po index ad9653a47a2..68c60c7f3b4 100644 --- a/addons/mail/i18n/es_CR.po +++ b/addons/mail/i18n/es_CR.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-05-11 05:14+0000\n" -"X-Generator: Launchpad (build 15225)\n" +"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n" +"X-Generator: Launchpad (build 15505)\n" "Language: es\n" #. module: mail @@ -196,8 +196,8 @@ msgstr "Destinatarios" #. module: mail #: model:ir.model,name:mail.model_mail_compose_message -msgid "E-mail composition wizard" -msgstr "Asistente de composición de e-mail" +msgid "Email composition wizard" +msgstr "" #. module: mail #: field:mail.compose.message,res_id:0 field:mail.message,res_id:0 @@ -526,6 +526,9 @@ msgstr "Dirección de respuesta preferida para el mensaje" #~ msgid "Text contents" #~ msgstr "Contenido del Texto" +#~ msgid "E-mail composition wizard" +#~ msgstr "Asistente de composición de e-mail" + #~ msgid "Related Document model" #~ msgstr "Modelo de documento relacionado" diff --git a/addons/mail/i18n/es_PY.po b/addons/mail/i18n/es_PY.po index a27788c0236..c64b3e79ee5 100644 --- a/addons/mail/i18n/es_PY.po +++ b/addons/mail/i18n/es_PY.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-05-11 05:14+0000\n" -"X-Generator: Launchpad (build 15225)\n" +"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n" +"X-Generator: Launchpad (build 15505)\n" #. module: mail #: field:mail.compose.message,subtype:0 field:mail.message,subtype:0 @@ -193,7 +193,7 @@ msgstr "" #. module: mail #: model:ir.model,name:mail.model_mail_compose_message -msgid "E-mail composition wizard" +msgid "Email composition wizard" msgstr "" #. module: mail diff --git a/addons/mail/i18n/fi.po b/addons/mail/i18n/fi.po index f2f5a65d1f7..5a983c5c7c8 100644 --- a/addons/mail/i18n/fi.po +++ b/addons/mail/i18n/fi.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-05-11 05:14+0000\n" -"X-Generator: Launchpad (build 15225)\n" +"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n" +"X-Generator: Launchpad (build 15505)\n" #. module: mail #: field:mail.compose.message,subtype:0 field:mail.message,subtype:0 @@ -195,8 +195,8 @@ msgstr "Vastaanottajat" #. module: mail #: model:ir.model,name:mail.model_mail_compose_message -msgid "E-mail composition wizard" -msgstr "Ohjattu sähköpostin luomistoiminto" +msgid "Email composition wizard" +msgstr "" #. module: mail #: field:mail.compose.message,res_id:0 field:mail.message,res_id:0 @@ -534,3 +534,6 @@ msgstr "Ehdotettu vastausosoite viestille" #~ msgid "Text contents" #~ msgstr "Tekstisisältö" + +#~ msgid "E-mail composition wizard" +#~ msgstr "Ohjattu sähköpostin luomistoiminto" diff --git a/addons/mail/i18n/fr.po b/addons/mail/i18n/fr.po index 0912a3e8762..96dd222a369 100644 --- a/addons/mail/i18n/fr.po +++ b/addons/mail/i18n/fr.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-06-23 05:02+0000\n" -"X-Generator: Launchpad (build 15461)\n" +"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n" +"X-Generator: Launchpad (build 15505)\n" #. module: mail #: field:mail.compose.message,subtype:0 field:mail.message,subtype:0 @@ -196,8 +196,8 @@ msgstr "Destinataires" #. module: mail #: model:ir.model,name:mail.model_mail_compose_message -msgid "E-mail composition wizard" -msgstr "Assistant de composition de courriels" +msgid "Email composition wizard" +msgstr "" #. module: mail #: field:mail.compose.message,res_id:0 field:mail.message,res_id:0 @@ -531,6 +531,9 @@ msgstr "Adresse de réponse préférée pour le message" #~ msgid "Message type" #~ msgstr "Type de message" +#~ msgid "E-mail composition wizard" +#~ msgstr "Assistant de composition de courriels" + #~ msgid "Related user" #~ msgstr "Utilisateur associé" diff --git a/addons/mail/i18n/gl.po b/addons/mail/i18n/gl.po index 7c4d8f75506..69c7f8ea660 100644 --- a/addons/mail/i18n/gl.po +++ b/addons/mail/i18n/gl.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-05-11 05:14+0000\n" -"X-Generator: Launchpad (build 15225)\n" +"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n" +"X-Generator: Launchpad (build 15505)\n" #. module: mail #: field:mail.compose.message,subtype:0 field:mail.message,subtype:0 @@ -193,7 +193,7 @@ msgstr "" #. module: mail #: model:ir.model,name:mail.model_mail_compose_message -msgid "E-mail composition wizard" +msgid "Email composition wizard" msgstr "" #. module: mail diff --git a/addons/mail/i18n/hr.po b/addons/mail/i18n/hr.po index 21c5ecbc73e..2a5bee0ebe2 100644 --- a/addons/mail/i18n/hr.po +++ b/addons/mail/i18n/hr.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-05-11 05:14+0000\n" -"X-Generator: Launchpad (build 15225)\n" +"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n" +"X-Generator: Launchpad (build 15505)\n" #. module: mail #: field:mail.compose.message,subtype:0 field:mail.message,subtype:0 @@ -193,7 +193,7 @@ msgstr "" #. module: mail #: model:ir.model,name:mail.model_mail_compose_message -msgid "E-mail composition wizard" +msgid "Email composition wizard" msgstr "" #. module: mail diff --git a/addons/mail/i18n/hu.po b/addons/mail/i18n/hu.po index 377fb4c457d..e07bfae3ef0 100644 --- a/addons/mail/i18n/hu.po +++ b/addons/mail/i18n/hu.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-05-11 05:14+0000\n" -"X-Generator: Launchpad (build 15225)\n" +"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n" +"X-Generator: Launchpad (build 15505)\n" #. module: mail #: field:mail.compose.message,subtype:0 field:mail.message,subtype:0 @@ -193,7 +193,7 @@ msgstr "" #. module: mail #: model:ir.model,name:mail.model_mail_compose_message -msgid "E-mail composition wizard" +msgid "Email composition wizard" msgstr "" #. module: mail diff --git a/addons/mail/i18n/it.po b/addons/mail/i18n/it.po index 8eb74992412..039faf5f96a 100644 --- a/addons/mail/i18n/it.po +++ b/addons/mail/i18n/it.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-05-11 05:14+0000\n" -"X-Generator: Launchpad (build 15225)\n" +"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n" +"X-Generator: Launchpad (build 15505)\n" #. module: mail #: field:mail.compose.message,subtype:0 field:mail.message,subtype:0 @@ -193,7 +193,7 @@ msgstr "" #. module: mail #: model:ir.model,name:mail.model_mail_compose_message -msgid "E-mail composition wizard" +msgid "Email composition wizard" msgstr "" #. module: mail diff --git a/addons/mail/i18n/ja.po b/addons/mail/i18n/ja.po index 479c783ca64..59a9fc26af1 100644 --- a/addons/mail/i18n/ja.po +++ b/addons/mail/i18n/ja.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-05-26 05:07+0000\n" -"X-Generator: Launchpad (build 15288)\n" +"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n" +"X-Generator: Launchpad (build 15505)\n" #. module: mail #: field:mail.compose.message,subtype:0 field:mail.message,subtype:0 @@ -193,8 +193,8 @@ msgstr "宛先" #. module: mail #: model:ir.model,name:mail.model_mail_compose_message -msgid "E-mail composition wizard" -msgstr "Eメール作成ウィザード" +msgid "Email composition wizard" +msgstr "" #. module: mail #: field:mail.compose.message,res_id:0 field:mail.message,res_id:0 @@ -509,3 +509,6 @@ msgstr "メール添付" #: help:mail.message.common,reply_to:0 msgid "Preferred response address for the message" msgstr "メッセージの優先返信アドレス" + +#~ msgid "E-mail composition wizard" +#~ msgstr "Eメール作成ウィザード" diff --git a/addons/mail/i18n/lt.po b/addons/mail/i18n/lt.po index 27e2947ad94..1a2cbe75aee 100644 --- a/addons/mail/i18n/lt.po +++ b/addons/mail/i18n/lt.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-05-11 05:14+0000\n" -"X-Generator: Launchpad (build 15225)\n" +"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n" +"X-Generator: Launchpad (build 15505)\n" #. module: mail #: field:mail.compose.message,subtype:0 field:mail.message,subtype:0 @@ -193,7 +193,7 @@ msgstr "" #. module: mail #: model:ir.model,name:mail.model_mail_compose_message -msgid "E-mail composition wizard" +msgid "Email composition wizard" msgstr "" #. module: mail diff --git a/addons/mail/i18n/lv.po b/addons/mail/i18n/lv.po index c1d3ca7c86e..b35f42dda85 100644 --- a/addons/mail/i18n/lv.po +++ b/addons/mail/i18n/lv.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-05-11 05:14+0000\n" -"X-Generator: Launchpad (build 15225)\n" +"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n" +"X-Generator: Launchpad (build 15505)\n" #. module: mail #: field:mail.compose.message,subtype:0 field:mail.message,subtype:0 @@ -193,7 +193,7 @@ msgstr "" #. module: mail #: model:ir.model,name:mail.model_mail_compose_message -msgid "E-mail composition wizard" +msgid "Email composition wizard" msgstr "" #. module: mail diff --git a/addons/mail/i18n/mail.pot b/addons/mail/i18n/mail.pot index d7095324a88..946da6dd6b6 100644 --- a/addons/mail/i18n/mail.pot +++ b/addons/mail/i18n/mail.pot @@ -194,7 +194,7 @@ msgstr "" #. module: mail #: model:ir.model,name:mail.model_mail_compose_message -msgid "E-mail composition wizard" +msgid "Email composition wizard" msgstr "" #. module: mail diff --git a/addons/mail/i18n/mn.po b/addons/mail/i18n/mn.po index eafd5835b9f..1ca91c71fbf 100644 --- a/addons/mail/i18n/mn.po +++ b/addons/mail/i18n/mn.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-06-21 05:25+0000\n" -"X-Generator: Launchpad (build 15435)\n" +"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n" +"X-Generator: Launchpad (build 15505)\n" #. module: mail #: field:mail.compose.message,subtype:0 field:mail.message,subtype:0 @@ -193,7 +193,7 @@ msgstr "" #. module: mail #: model:ir.model,name:mail.model_mail_compose_message -msgid "E-mail composition wizard" +msgid "Email composition wizard" msgstr "" #. module: mail diff --git a/addons/mail/i18n/nl.po b/addons/mail/i18n/nl.po index 21b4603e769..29cf349d0a8 100644 --- a/addons/mail/i18n/nl.po +++ b/addons/mail/i18n/nl.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-05-11 05:14+0000\n" -"X-Generator: Launchpad (build 15225)\n" +"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n" +"X-Generator: Launchpad (build 15505)\n" #. module: mail #: field:mail.compose.message,subtype:0 field:mail.message,subtype:0 @@ -195,8 +195,8 @@ msgstr "Ontvangers" #. module: mail #: model:ir.model,name:mail.model_mail_compose_message -msgid "E-mail composition wizard" -msgstr "E-mail opmaak wizard" +msgid "Email composition wizard" +msgstr "" #. module: mail #: field:mail.compose.message,res_id:0 field:mail.message,res_id:0 @@ -528,6 +528,9 @@ msgstr "Voorkeur antwoordadres voor het bericht" #~ msgid "Related Document model" #~ msgstr "Gerelateerde Document model" +#~ msgid "E-mail composition wizard" +#~ msgstr "E-mail opmaak wizard" + #~ msgid "Rich-text contents" #~ msgstr "Rich-tekst inhoud" diff --git a/addons/mail/i18n/pl.po b/addons/mail/i18n/pl.po index 581728c2bca..6fdfeee06f1 100644 --- a/addons/mail/i18n/pl.po +++ b/addons/mail/i18n/pl.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-05-11 05:14+0000\n" -"X-Generator: Launchpad (build 15225)\n" +"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n" +"X-Generator: Launchpad (build 15505)\n" #. module: mail #: field:mail.compose.message,subtype:0 field:mail.message,subtype:0 @@ -193,7 +193,7 @@ msgstr "Odbiorcy" #. module: mail #: model:ir.model,name:mail.model_mail_compose_message -msgid "E-mail composition wizard" +msgid "Email composition wizard" msgstr "" #. module: mail diff --git a/addons/mail/i18n/pt.po b/addons/mail/i18n/pt.po index 5b0761309e2..29e652ae11f 100644 --- a/addons/mail/i18n/pt.po +++ b/addons/mail/i18n/pt.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-05-11 05:14+0000\n" -"X-Generator: Launchpad (build 15225)\n" +"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n" +"X-Generator: Launchpad (build 15505)\n" #. module: mail #: field:mail.compose.message,subtype:0 field:mail.message,subtype:0 @@ -195,8 +195,8 @@ msgstr "Destinatários" #. module: mail #: model:ir.model,name:mail.model_mail_compose_message -msgid "E-mail composition wizard" -msgstr "Assistente de composição de e-mail" +msgid "Email composition wizard" +msgstr "" #. module: mail #: field:mail.compose.message,res_id:0 field:mail.message,res_id:0 @@ -524,6 +524,9 @@ msgstr "Endereço de resposta preferido para a mensagem" #~ msgid "Text contents" #~ msgstr "Conteúdos do texto" +#~ msgid "E-mail composition wizard" +#~ msgstr "Assistente de composição de e-mail" + #~ msgid "Related Document model" #~ msgstr "Modelo de documento relacionado" diff --git a/addons/mail/i18n/pt_BR.po b/addons/mail/i18n/pt_BR.po index 30e99849841..b53bc7eb6d0 100644 --- a/addons/mail/i18n/pt_BR.po +++ b/addons/mail/i18n/pt_BR.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-05-11 05:14+0000\n" -"X-Generator: Launchpad (build 15225)\n" +"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n" +"X-Generator: Launchpad (build 15505)\n" #. module: mail #: field:mail.compose.message,subtype:0 field:mail.message,subtype:0 @@ -193,7 +193,7 @@ msgstr "" #. module: mail #: model:ir.model,name:mail.model_mail_compose_message -msgid "E-mail composition wizard" +msgid "Email composition wizard" msgstr "" #. module: mail diff --git a/addons/mail/i18n/ro.po b/addons/mail/i18n/ro.po index 30d672f9cbf..311e58a449e 100644 --- a/addons/mail/i18n/ro.po +++ b/addons/mail/i18n/ro.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-05-11 05:14+0000\n" -"X-Generator: Launchpad (build 15225)\n" +"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n" +"X-Generator: Launchpad (build 15505)\n" #. module: mail #: field:mail.compose.message,subtype:0 field:mail.message,subtype:0 @@ -195,8 +195,8 @@ msgstr "Destinatari" #. module: mail #: model:ir.model,name:mail.model_mail_compose_message -msgid "E-mail composition wizard" -msgstr "Asistent compunere e-mail" +msgid "Email composition wizard" +msgstr "" #. module: mail #: field:mail.compose.message,res_id:0 field:mail.message,res_id:0 @@ -328,7 +328,7 @@ msgstr " in data de " #: help:mail.message,auto_delete:0 msgid "Permanently delete this email after sending it, to save space" msgstr "" -"Sterge definitiv acest mesaj dupa de il trimite, pentru a economisi spatiu" +"Sterge definitiv acest mesaj dupa ce il trimite, pentru a economisi spatiu" #. module: mail #: field:mail.compose.message,references:0 field:mail.message,references:0 @@ -526,6 +526,9 @@ msgstr "Adresa de raspuns preferata pentru mesaj" #~ msgid "Related Document model" #~ msgstr "Model Document asociat" +#~ msgid "E-mail composition wizard" +#~ msgstr "Asistent compunere e-mail" + #~ msgid "Rich-text contents" #~ msgstr "Continuturi rich-text (text imbogatit)" diff --git a/addons/mail/i18n/ru.po b/addons/mail/i18n/ru.po index 09df03bad68..49d9fd4fb86 100644 --- a/addons/mail/i18n/ru.po +++ b/addons/mail/i18n/ru.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-05-11 05:14+0000\n" -"X-Generator: Launchpad (build 15225)\n" +"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n" +"X-Generator: Launchpad (build 15505)\n" #. module: mail #: field:mail.compose.message,subtype:0 field:mail.message,subtype:0 @@ -193,7 +193,7 @@ msgstr "" #. module: mail #: model:ir.model,name:mail.model_mail_compose_message -msgid "E-mail composition wizard" +msgid "Email composition wizard" msgstr "" #. module: mail diff --git a/addons/mail/i18n/sl.po b/addons/mail/i18n/sl.po index e0cb4f4a43f..5457aa3537f 100644 --- a/addons/mail/i18n/sl.po +++ b/addons/mail/i18n/sl.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-05-11 05:14+0000\n" -"X-Generator: Launchpad (build 15225)\n" +"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n" +"X-Generator: Launchpad (build 15505)\n" #. module: mail #: field:mail.compose.message,subtype:0 field:mail.message,subtype:0 @@ -193,7 +193,7 @@ msgstr "" #. module: mail #: model:ir.model,name:mail.model_mail_compose_message -msgid "E-mail composition wizard" +msgid "Email composition wizard" msgstr "" #. module: mail diff --git a/addons/mail/i18n/sr@latin.po b/addons/mail/i18n/sr@latin.po index d47daaa5940..81b828239b8 100644 --- a/addons/mail/i18n/sr@latin.po +++ b/addons/mail/i18n/sr@latin.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-05-11 05:14+0000\n" -"X-Generator: Launchpad (build 15225)\n" +"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n" +"X-Generator: Launchpad (build 15505)\n" #. module: mail #: field:mail.compose.message,subtype:0 field:mail.message,subtype:0 @@ -193,7 +193,7 @@ msgstr "" #. module: mail #: model:ir.model,name:mail.model_mail_compose_message -msgid "E-mail composition wizard" +msgid "Email composition wizard" msgstr "" #. module: mail diff --git a/addons/mail/i18n/sv.po b/addons/mail/i18n/sv.po index ded9b21fd93..aa8781d7966 100644 --- a/addons/mail/i18n/sv.po +++ b/addons/mail/i18n/sv.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-05-11 05:14+0000\n" -"X-Generator: Launchpad (build 15225)\n" +"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n" +"X-Generator: Launchpad (build 15505)\n" #. module: mail #: field:mail.compose.message,subtype:0 field:mail.message,subtype:0 @@ -26,12 +26,12 @@ msgstr "" #. module: mail #: help:mail.compose.message,auto_delete:0 msgid "Permanently delete emails after sending" -msgstr "" +msgstr "Permanent radera e-post efter att de skickats" #. module: mail #: view:mail.message:0 msgid "Open Related Document" -msgstr "" +msgstr "Öppna relaterade dokument" #. module: mail #: view:mail.message:0 @@ -41,12 +41,12 @@ msgstr "Öppna bifogade filer" #. module: mail #: view:mail.message:0 msgid "Message Details" -msgstr "" +msgstr "Meddelandedetaljer" #. module: mail #: view:mail.thread:0 msgid "Communication History" -msgstr "" +msgstr "Kommunikationshitoria" #. module: mail #: view:mail.message:0 @@ -57,24 +57,24 @@ msgstr "Gruppera på..." #: model:ir.actions.act_window,name:mail.action_email_compose_message_wizard #: view:mail.compose.message:0 msgid "Compose Email" -msgstr "" +msgstr "Skriv e-post" #. module: mail #: help:mail.compose.message,body_text:0 help:mail.message,body_text:0 #: help:mail.message.common,body_text:0 msgid "Plain-text version of the message" -msgstr "" +msgstr "Textversion av meddelandet" #. module: mail #: view:mail.compose.message:0 msgid "Body" -msgstr "" +msgstr "Brödtext" #. module: mail #: help:mail.compose.message,email_to:0 help:mail.message,email_to:0 #: help:mail.message.common,email_to:0 msgid "Message recipients" -msgstr "" +msgstr "Mottagare" #. module: mail #: field:mail.compose.message,body_text:0 field:mail.message,body_text:0 @@ -85,45 +85,45 @@ msgstr "" #. module: mail #: view:mail.message:0 selection:mail.message,state:0 msgid "Received" -msgstr "" +msgstr "Mottaget" #. module: mail #: view:mail.message:0 msgid "Thread" -msgstr "" +msgstr "Tråd" #. module: mail #: field:mail.message,mail_server_id:0 msgid "Outgoing mail server" -msgstr "" +msgstr "Utgående mailserver" #. module: mail #: selection:mail.message,state:0 msgid "Cancelled" -msgstr "" +msgstr "Avbruten" #. module: mail #: field:mail.compose.message,reply_to:0 field:mail.message,reply_to:0 #: field:mail.message.common,reply_to:0 msgid "Reply-To" -msgstr "" +msgstr "Svar till" #. module: mail #: help:mail.compose.message,body_html:0 help:mail.message,body_html:0 #: help:mail.message.common,body_html:0 msgid "Rich-text/HTML version of the message" -msgstr "" +msgstr "Utsmyckad text/HTML-version av meddelandet" #. module: mail #: field:mail.compose.message,auto_delete:0 field:mail.message,auto_delete:0 msgid "Auto Delete" -msgstr "" +msgstr "Autoradera" #. module: mail #: help:mail.compose.message,email_bcc:0 help:mail.message,email_bcc:0 #: help:mail.message.common,email_bcc:0 msgid "Blind carbon copy message recipients" -msgstr "" +msgstr "Blindkopiemottagare" #. module: mail #: model:ir.model,name:mail.model_res_partner view:mail.message:0 @@ -140,7 +140,7 @@ msgstr "Ämne" #: code:addons/mail/wizard/mail_compose_message.py:152 #, python-format msgid "On %(date)s, " -msgstr "" +msgstr "Vid %(date)s, " #. module: mail #: field:mail.compose.message,email_from:0 field:mail.message,email_from:0 @@ -151,32 +151,32 @@ msgstr "Från" #. module: mail #: view:mail.message:0 msgid "Email message" -msgstr "" +msgstr "E-postmeddelande" #. module: mail #: view:mail.compose.message:0 msgid "Send" -msgstr "" +msgstr "Skicka" #. module: mail #: view:mail.message:0 msgid "Failed" -msgstr "" +msgstr "Misslyckades" #. module: mail #: view:mail.message:0 field:mail.message,state:0 msgid "State" -msgstr "" +msgstr "Tillstånd" #. module: mail #: view:mail.message:0 msgid "Reply" -msgstr "" +msgstr "Besvara" #. module: mail #: view:mail.message:0 selection:mail.message,state:0 msgid "Sent" -msgstr "" +msgstr "Skickat" #. module: mail #: help:mail.compose.message,subtype:0 help:mail.message,subtype:0 @@ -185,33 +185,35 @@ msgid "" "Type of message, usually 'html' or 'plain', used to select plaintext or rich " "text contents accordingly" msgstr "" +"Typ av meddelande, vanligtvis \"html\" eller \"vanligt\", används för att " +"välja klartext eller utsmyckad text i överensstämmelse härmed" #. module: mail #: view:mail.message:0 msgid "Recipients" -msgstr "" +msgstr "Mottagare" #. module: mail #: model:ir.model,name:mail.model_mail_compose_message -msgid "E-mail composition wizard" +msgid "Email composition wizard" msgstr "" #. module: mail #: field:mail.compose.message,res_id:0 field:mail.message,res_id:0 #: field:mail.message.common,res_id:0 msgid "Related Document ID" -msgstr "" +msgstr "ID relaterat dokument" #. module: mail #: view:mail.message:0 msgid "Advanced" -msgstr "" +msgstr "Avancerat" #. module: mail #: code:addons/mail/wizard/mail_compose_message.py:157 #, python-format msgid "Re:" -msgstr "" +msgstr "Re:" #. module: mail #: field:mail.compose.message,model:0 field:mail.message,model:0 @@ -227,12 +229,12 @@ msgstr "Månad" #. module: mail #: view:mail.message:0 msgid "Email Search" -msgstr "" +msgstr "Sök e-post" #. module: mail #: help:mail.message,original:0 msgid "Original version of the message, as it was sent on the network" -msgstr "" +msgstr "Originalversion av meddelandet, som det var sänt på nätverket" #. module: mail #: view:mail.message:0 @@ -242,27 +244,27 @@ msgstr "Partner namn" #. module: mail #: view:mail.message:0 msgid "Retry" -msgstr "" +msgstr "Försök igen" #. module: mail #: view:mail.message:0 selection:mail.message,state:0 msgid "Outgoing" -msgstr "" +msgstr "Utgående" #. module: mail #: view:mail.message:0 msgid "Send Now" -msgstr "" +msgstr "Skicka nu" #. module: mail #: field:mail.message,partner_id:0 msgid "Related partner" -msgstr "" +msgstr "Relaterat företag" #. module: mail #: view:mail.message:0 msgid "User" -msgstr "" +msgstr "Användare" #. module: mail #: field:mail.compose.message,date:0 field:mail.message,date:0 @@ -273,13 +275,13 @@ msgstr "Datum" #. module: mail #: view:mail.message:0 msgid "Extended Filters..." -msgstr "" +msgstr "Utökade filter..." #. module: mail #: code:addons/mail/wizard/mail_compose_message.py:153 #, python-format msgid "%(sender_name)s wrote:" -msgstr "" +msgstr "%(sender_name)s skrev:" #. module: mail #: field:mail.compose.message,body_html:0 field:mail.message,body_html:0 @@ -290,7 +292,7 @@ msgstr "" #. module: mail #: field:mail.message,original:0 msgid "Original" -msgstr "" +msgstr "Ursprunglig" #. module: mail #: code:addons/mail/mail_thread.py:247 view:res.partner:0 @@ -302,19 +304,19 @@ msgstr "Historik" #: field:mail.compose.message,message_id:0 field:mail.message,message_id:0 #: field:mail.message.common,message_id:0 msgid "Message-Id" -msgstr "" +msgstr "Meddelande-id" #. module: mail #: view:mail.compose.message:0 field:mail.compose.message,attachment_ids:0 #: view:mail.message:0 field:mail.message,attachment_ids:0 msgid "Attachments" -msgstr "" +msgstr "Bilagor" #. module: mail #: field:mail.compose.message,email_cc:0 field:mail.message,email_cc:0 #: field:mail.message.common,email_cc:0 msgid "Cc" -msgstr "" +msgstr "Kopia" #. module: mail #: code:addons/mail/mail_message.py:159 @@ -326,12 +328,13 @@ msgstr " på " #: help:mail.message,auto_delete:0 msgid "Permanently delete this email after sending it, to save space" msgstr "" +"Radera detta meddelande permanent efter avsändandet för att spara plats" #. module: mail #: field:mail.compose.message,references:0 field:mail.message,references:0 #: field:mail.message.common,references:0 msgid "References" -msgstr "" +msgstr "Referenser" #. module: mail #: field:mail.message,display_text:0 @@ -341,18 +344,18 @@ msgstr "Visa text" #. module: mail #: view:mail.compose.message:0 view:mail.message:0 msgid "Cancel" -msgstr "" +msgstr "Avbryt" #. module: mail #: view:mail.message:0 msgid "Open" -msgstr "" +msgstr "Öppna" #. module: mail #: code:addons/mail/mail_thread.py:434 #, python-format msgid "[OpenERP-Forward-Failed] %s" -msgstr "" +msgstr "[OpenERP-Forward-Failed] %s" #. module: mail #: field:mail.message,user_id:0 @@ -366,11 +369,13 @@ msgid "" "Full message headers, e.g. SMTP session headers (usually available on " "inbound messages only)" msgstr "" +"Fullständiga meddelanderubriker, t ex SMTP-sessionsrubriker (vanligtvis " +"endast förekommande på inkommande meddelanden)" #. module: mail #: view:mail.message:0 msgid "Creation Month" -msgstr "" +msgstr "Månad skapad" #. module: mail #: field:mail.compose.message,email_to:0 field:mail.message,email_to:0 @@ -387,7 +392,7 @@ msgstr "Detaljer" #: model:ir.actions.act_window,name:mail.action_view_mailgate_thread #: view:mail.thread:0 msgid "Email Threads" -msgstr "" +msgstr "E-posttrådar" #. module: mail #: help:mail.compose.message,email_from:0 help:mail.message,email_from:0 @@ -396,28 +401,30 @@ msgid "" "Message sender, taken from user preferences. If empty, this is not a mail " "but a message." msgstr "" +"Avsändaren, tagen från användarens preferenser. Om den är tom är detta inte " +"en e-post men ett meddelande." #. module: mail #: view:mail.message:0 msgid "Body (Plain)" -msgstr "" +msgstr "Brödtext (textversion)" #. module: mail #: code:addons/mail/wizard/mail_compose_message.py:153 #, python-format msgid "You" -msgstr "" +msgstr "Du" #. module: mail #: help:mail.compose.message,message_id:0 help:mail.message,message_id:0 #: help:mail.message.common,message_id:0 msgid "Message unique identifier" -msgstr "" +msgstr "Meddelandets unika identifierare" #. module: mail #: view:mail.message:0 msgid "Body (Rich)" -msgstr "" +msgstr "Brödtext (utsmyckad)" #. module: mail #: code:addons/mail/mail_message.py:155 @@ -427,6 +434,9 @@ msgid "" " Subject: %s \n" "\t" msgstr "" +"%s skrev på %s: \n" +" Ämne: %s \n" +"\t" #. module: mail #: model:ir.actions.act_window,name:mail.act_res_partner_emails @@ -451,58 +461,79 @@ msgstr "" #: field:mail.compose.message,email_bcc:0 field:mail.message,email_bcc:0 #: field:mail.message.common,email_bcc:0 msgid "Bcc" -msgstr "" +msgstr "Blindkopia" #. module: mail #: model:ir.model,name:mail.model_mail_message_common msgid "mail.message.common" -msgstr "" +msgstr "mail.message.common" #. module: mail #: help:mail.compose.message,references:0 help:mail.message,references:0 #: help:mail.message.common,references:0 msgid "Message references, such as identifiers of previous messages" -msgstr "" +msgstr "Meddelandereferens, som identifierar tidigare meddelanden" #. module: mail #: constraint:res.partner:0 msgid "Error ! You cannot create recursive associated members." -msgstr "" +msgstr "Fel ! Du kan inte ansluta medlemmar rekursivt" #. module: mail #: help:mail.compose.message,email_cc:0 help:mail.message,email_cc:0 #: help:mail.message.common,email_cc:0 msgid "Carbon copy message recipients" -msgstr "" +msgstr "Blindkopiemottagare" #. module: mail #: selection:mail.message,state:0 msgid "Delivery Failed" -msgstr "" +msgstr "Leverans misslyckades" #. module: mail #: model:ir.model,name:mail.model_mail_message msgid "Email Message" -msgstr "" +msgstr "E-postmeddelande" #. module: mail #: model:ir.model,name:mail.model_mail_thread view:mail.thread:0 msgid "Email Thread" -msgstr "" +msgstr "E-posttråd" #. module: mail #: field:mail.compose.message,filter_id:0 msgid "Filters" -msgstr "" +msgstr "Filter" #. module: mail #: code:addons/mail/mail_thread.py:220 #, python-format msgid "Mail attachment" -msgstr "" +msgstr "E-postbilaga" #. module: mail #: help:mail.compose.message,reply_to:0 help:mail.message,reply_to:0 #: help:mail.message.common,reply_to:0 msgid "Preferred response address for the message" -msgstr "" +msgstr "Föredragen svarsadress för meddelandet" + +#~ msgid "Message type" +#~ msgstr "Meddelandetyp" + +#~ msgid "Text contents" +#~ msgstr "Textinnehåll" + +#~ msgid "E-mail composition wizard" +#~ msgstr "E-post editor" + +#~ msgid "Related Document model" +#~ msgstr "Modell för relaterade dokument" + +#~ msgid "Rich-text contents" +#~ msgstr "Innehåll med utsmyckad text" + +#~ msgid "Related user" +#~ msgstr "Relaterad användare" + +#~ msgid "Message headers" +#~ msgstr "Meddelanderubriker" diff --git a/addons/mail/i18n/tr.po b/addons/mail/i18n/tr.po index 23017beedcc..7a4bb1e9787 100644 --- a/addons/mail/i18n/tr.po +++ b/addons/mail/i18n/tr.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-05-11 05:14+0000\n" -"X-Generator: Launchpad (build 15225)\n" +"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n" +"X-Generator: Launchpad (build 15505)\n" #. module: mail #: field:mail.compose.message,subtype:0 field:mail.message,subtype:0 @@ -195,8 +195,8 @@ msgstr "Alıcılar" #. module: mail #: model:ir.model,name:mail.model_mail_compose_message -msgid "E-mail composition wizard" -msgstr "E-posta oluşturma sihirbazı" +msgid "Email composition wizard" +msgstr "" #. module: mail #: field:mail.compose.message,res_id:0 field:mail.message,res_id:0 @@ -516,6 +516,9 @@ msgstr "Posta Eki" msgid "Preferred response address for the message" msgstr "Mesaj için tercih edilen cevap adresi" +#~ msgid "E-mail composition wizard" +#~ msgstr "E-posta oluşturma sihirbazı" + #~ msgid "Rich-text contents" #~ msgstr "Zengin-metin İçerik" diff --git a/addons/mail/i18n/zh_CN.po b/addons/mail/i18n/zh_CN.po index 488b0a3672a..f5ce2add8e3 100644 --- a/addons/mail/i18n/zh_CN.po +++ b/addons/mail/i18n/zh_CN.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-05-11 05:14+0000\n" -"X-Generator: Launchpad (build 15225)\n" +"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n" +"X-Generator: Launchpad (build 15505)\n" #. module: mail #: field:mail.compose.message,subtype:0 field:mail.message,subtype:0 @@ -193,8 +193,8 @@ msgstr "收件人" #. module: mail #: model:ir.model,name:mail.model_mail_compose_message -msgid "E-mail composition wizard" -msgstr "邮件合并向导" +msgid "Email composition wizard" +msgstr "" #. module: mail #: field:mail.compose.message,res_id:0 field:mail.message,res_id:0 @@ -519,6 +519,9 @@ msgstr "本邮件推荐的回复地址" #~ msgid "Related Document model" #~ msgstr "相关单据模型" +#~ msgid "E-mail composition wizard" +#~ msgstr "邮件合并向导" + #~ msgid "Rich-text contents" #~ msgstr "富文本内容" diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py index e45d4f07807..1c1e980e3ed 100644 --- a/addons/mail/mail_message.py +++ b/addons/mail/mail_message.py @@ -202,10 +202,10 @@ class mail_message(osv.osv): _columns = { 'type': fields.selection([ - ('email', 'e-mail'), + ('email', 'email'), ('comment', 'Comment'), ('notification', 'System notification'), - ], 'Type', help="Message type: e-mail for e-mail message, notification for system message, comment for other messages such as user replies"), + ], 'Type', help="Message type: email for email message, notification for system message, comment for other messages such as user replies"), 'partner_id': fields.many2one('res.partner', 'Related partner'), 'user_id': fields.many2one('res.users', 'Related User', readonly=1), 'attachment_ids': fields.many2many('ir.attachment', 'message_attachment_rel', 'message_id', 'attachment_id', 'Attachments'), @@ -228,7 +228,7 @@ class mail_message(osv.osv): } #------------------------------------------------------ - # E-Mail api + # Email api #------------------------------------------------------ def init(self, cr): diff --git a/addons/mail/mail_thread_view.xml b/addons/mail/mail_thread_view.xml index 6bac1a49f2e..a32045efafc 100644 --- a/addons/mail/mail_thread_view.xml +++ b/addons/mail/mail_thread_view.xml @@ -5,7 +5,8 @@ <!-- toplevel menu --> <menuitem id="mail_feeds_main" name="Feeds" sequence="0" web_icon="static/src/img/feeds.png" - web_icon_hover="static/src/img/feeds-hover.png" /> + web_icon_hover="static/src/img/feeds-hover.png" + groups="base.group_user"/> <!-- left-side menu: Feeds !--> <menuitem id="mail_feeds" name="Feeds" parent="mail_feeds_main"/> diff --git a/addons/mail/res_users.py b/addons/mail/res_users.py index 2223d9e162a..f62e29fb44d 100644 --- a/addons/mail/res_users.py +++ b/addons/mail/res_users.py @@ -36,7 +36,7 @@ class res_users(osv.osv): ('comments', 'Only comments'), ('to_me', 'Only when sent directly to me'), ('none', 'Never') - ], 'Receive Feeds by E-mail', required=True, + ], 'Receive Feeds by Email', required=True, help="Choose in which case you want to receive an email when you receive new feeds."), } diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml index 5ff8a996116..34445c48f8d 100644 --- a/addons/mail/static/src/xml/mail.xml +++ b/addons/mail/static/src/xml/mail.xml @@ -1,12 +1,23 @@ <?xml version="1.0" encoding="UTF-8"?> <template> - <div t-name="mail.Wall" class="oe_mail_wall"> + <div t-name="mail.Wall" class="oe_view_manager oe_mail_wall oe_view_manager_global"> <table class="oe_view_manager_header"> + <colgroup> + <col width="33%"/> + <col width="33%"/> + <col width="34%"/> + </colgroup> + <tbody> <tr class="oe_header_row"> - <td><h2 class="oe_view_title">All Feeds</h2></td> + <td colspan="2"> + <h2 class="oe_view_title"> + <span class="oe_view_title_text">All Feeds</span> + </h2> + </td> <td><div class="oe_view_manager_view_search" t-opentag="true"/></td> </tr> + </tbody> </table> <div class="oe_mail_wall_main"> <div class="oe_mail_wall_action"> diff --git a/addons/mail/wizard/mail_compose_message.py b/addons/mail/wizard/mail_compose_message.py index dd07cbce9b2..cb2ed1eec19 100644 --- a/addons/mail/wizard/mail_compose_message.py +++ b/addons/mail/wizard/mail_compose_message.py @@ -34,7 +34,7 @@ from ..mail_message import to_email EXPRESSION_PATTERN = re.compile('(\$\{.+?\})') class mail_compose_message(osv.osv_memory): - """Generic E-mail composition wizard. This wizard is meant to be inherited + """Generic Email composition wizard. This wizard is meant to be inherited at model and view level to provide specific wizard features. The behavior of the wizard can be modified through the use of context @@ -58,7 +58,7 @@ class mail_compose_message(osv.osv_memory): """ _name = 'mail.compose.message' _inherit = 'mail.message.common' - _description = 'E-mail composition wizard' + _description = 'Email composition wizard' def default_get(self, cr, uid, fields, context=None): """Overridden to provide specific defaults depending on the context |