diff options
| author | Amit Vora <avo@tinyerp.com> | 2014-04-14 12:48:01 +0530 |
|---|---|---|
| committer | Amit Vora <avo@tinyerp.com> | 2014-04-14 12:48:01 +0530 |
| commit | bf3d4a7d943de6f0765533dae04de5046e0822fa (patch) | |
| tree | 062f17846f931a3a19e8d02128eeb7c946dafe69 /addons/mail | |
| parent | cfbd8ae9f80b32088171afe45844dcadb0c0f5a6 (diff) | |
| parent | e82fbf7d911355c3a9acef38f83040761258dd5d (diff) | |
[MRG] merge with main branch
bzr revid: avo@tinyerp.com-20140414071801-3eaa6iqryfrolxbt
Diffstat (limited to 'addons/mail')
47 files changed, 325 insertions, 200 deletions
diff --git a/addons/mail/data/mail_data.xml b/addons/mail/data/mail_data.xml index f3248821b25..8e52f7e1f7d 100644 --- a/addons/mail/data/mail_data.xml +++ b/addons/mail/data/mail_data.xml @@ -40,6 +40,17 @@ <field name="args">()</field> </record> + <!-- After installation of the module, open the related menu --> + <record id="action_client_messaging_menu" model="ir.actions.client"> + <field name="name">Open Messaging Menu</field> + <field name="tag">reload</field> + <field name="params" eval="{'menu_id': ref('mail.mail_feeds_main')}"/> + </record> + <record id="base.open_menu" model="ir.actions.todo"> + <field name="action_id" ref="action_client_messaging_menu"/> + <field name="state">open</field> + </record> + <!-- Admin should not receivve emails at creation --> <record id="base.partner_root" model="res.partner"> <field name="notify_email">none</field> diff --git a/addons/mail/i18n/ar.po b/addons/mail/i18n/ar.po index 87287897a75..660c6d30aa2 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: 2014-03-27 07:25+0000\n" -"X-Generator: Launchpad (build 16967)\n" +"X-Launchpad-Export-Date: 2014-04-12 08:20+0000\n" +"X-Generator: Launchpad (build 16976)\n" #. module: mail #: view:mail.followers:0 diff --git a/addons/mail/i18n/bg.po b/addons/mail/i18n/bg.po index f828df35f78..a907bb44a3c 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: 2014-03-27 07:25+0000\n" -"X-Generator: Launchpad (build 16967)\n" +"X-Launchpad-Export-Date: 2014-04-12 08:20+0000\n" +"X-Generator: Launchpad (build 16976)\n" #. module: mail #: view:mail.followers:0 diff --git a/addons/mail/i18n/bs.po b/addons/mail/i18n/bs.po index 11fd6fc0ddb..499d2bb03ad 100644 --- a/addons/mail/i18n/bs.po +++ b/addons/mail/i18n/bs.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: 2014-03-27 07:25+0000\n" -"X-Generator: Launchpad (build 16967)\n" +"X-Launchpad-Export-Date: 2014-04-12 08:20+0000\n" +"X-Generator: Launchpad (build 16976)\n" #. module: mail #: view:mail.followers:0 diff --git a/addons/mail/i18n/ca.po b/addons/mail/i18n/ca.po index 11b696aee18..1e774770274 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: 2014-03-27 07:25+0000\n" -"X-Generator: Launchpad (build 16967)\n" +"X-Launchpad-Export-Date: 2014-04-12 08:20+0000\n" +"X-Generator: Launchpad (build 16976)\n" #. module: mail #: view:mail.followers:0 diff --git a/addons/mail/i18n/cs.po b/addons/mail/i18n/cs.po index c52d084b9f7..c2850c42237 100644 --- a/addons/mail/i18n/cs.po +++ b/addons/mail/i18n/cs.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: 2014-03-27 07:25+0000\n" -"X-Generator: Launchpad (build 16967)\n" +"X-Launchpad-Export-Date: 2014-04-12 08:20+0000\n" +"X-Generator: Launchpad (build 16976)\n" #. module: mail #: view:mail.followers:0 diff --git a/addons/mail/i18n/da.po b/addons/mail/i18n/da.po index 38c8166742e..122800b5aa6 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: 2014-03-27 07:25+0000\n" -"X-Generator: Launchpad (build 16967)\n" +"X-Launchpad-Export-Date: 2014-04-12 08:20+0000\n" +"X-Generator: Launchpad (build 16976)\n" #. module: mail #: view:mail.followers:0 diff --git a/addons/mail/i18n/de.po b/addons/mail/i18n/de.po index 1f366fccdcd..c9d7ec0ec06 100644 --- a/addons/mail/i18n/de.po +++ b/addons/mail/i18n/de.po @@ -15,8 +15,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-03-27 07:26+0000\n" -"X-Generator: Launchpad (build 16967)\n" +"X-Launchpad-Export-Date: 2014-04-12 08:21+0000\n" +"X-Generator: Launchpad (build 16976)\n" #. module: mail #: view:mail.followers:0 diff --git a/addons/mail/i18n/es.po b/addons/mail/i18n/es.po index 7675a303721..221c62a59cd 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: 2014-03-27 07:26+0000\n" -"X-Generator: Launchpad (build 16967)\n" +"X-Launchpad-Export-Date: 2014-04-12 08:21+0000\n" +"X-Generator: Launchpad (build 16976)\n" #. module: mail #: view:mail.followers:0 diff --git a/addons/mail/i18n/es_CR.po b/addons/mail/i18n/es_CR.po index 0a09180747a..2234b60436e 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: 2014-03-27 07:26+0000\n" -"X-Generator: Launchpad (build 16967)\n" +"X-Launchpad-Export-Date: 2014-04-12 08:22+0000\n" +"X-Generator: Launchpad (build 16976)\n" "Language: es\n" #. module: mail diff --git a/addons/mail/i18n/es_MX.po b/addons/mail/i18n/es_MX.po index cc2e12dce2e..332f1a0751c 100644 --- a/addons/mail/i18n/es_MX.po +++ b/addons/mail/i18n/es_MX.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: 2014-03-27 07:26+0000\n" -"X-Generator: Launchpad (build 16967)\n" +"X-Launchpad-Export-Date: 2014-04-12 08:22+0000\n" +"X-Generator: Launchpad (build 16976)\n" #. module: mail #: view:mail.followers:0 diff --git a/addons/mail/i18n/es_PY.po b/addons/mail/i18n/es_PY.po index 146eaf884ec..fae6311e235 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: 2014-03-27 07:26+0000\n" -"X-Generator: Launchpad (build 16967)\n" +"X-Launchpad-Export-Date: 2014-04-12 08:22+0000\n" +"X-Generator: Launchpad (build 16976)\n" #. module: mail #: view:mail.followers:0 diff --git a/addons/mail/i18n/es_VE.po b/addons/mail/i18n/es_VE.po index 9314ebf59b2..70f0995cce4 100644 --- a/addons/mail/i18n/es_VE.po +++ b/addons/mail/i18n/es_VE.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: 2014-03-27 07:26+0000\n" -"X-Generator: Launchpad (build 16967)\n" +"X-Launchpad-Export-Date: 2014-04-12 08:22+0000\n" +"X-Generator: Launchpad (build 16976)\n" #. module: mail #: view:mail.followers:0 diff --git a/addons/mail/i18n/et.po b/addons/mail/i18n/et.po index fdfd35e58d5..cfc6ddc4ad3 100644 --- a/addons/mail/i18n/et.po +++ b/addons/mail/i18n/et.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: 2014-03-27 07:25+0000\n" -"X-Generator: Launchpad (build 16967)\n" +"X-Launchpad-Export-Date: 2014-04-12 08:21+0000\n" +"X-Generator: Launchpad (build 16976)\n" #. module: mail #: view:mail.followers:0 diff --git a/addons/mail/i18n/fi.po b/addons/mail/i18n/fi.po index 167e35eaba8..6ea227fe890 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: 2014-03-27 07:26+0000\n" -"X-Generator: Launchpad (build 16967)\n" +"X-Launchpad-Export-Date: 2014-04-12 08:21+0000\n" +"X-Generator: Launchpad (build 16976)\n" #. module: mail #: view:mail.followers:0 diff --git a/addons/mail/i18n/fr.po b/addons/mail/i18n/fr.po index 180f40e6608..4bc7a7cf5bf 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: 2014-03-27 07:26+0000\n" -"X-Generator: Launchpad (build 16967)\n" +"X-Launchpad-Export-Date: 2014-04-12 08:21+0000\n" +"X-Generator: Launchpad (build 16976)\n" #. module: mail #: view:mail.followers:0 diff --git a/addons/mail/i18n/gl.po b/addons/mail/i18n/gl.po index aaed1799177..1ac16163418 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: 2014-03-27 07:26+0000\n" -"X-Generator: Launchpad (build 16967)\n" +"X-Launchpad-Export-Date: 2014-04-12 08:21+0000\n" +"X-Generator: Launchpad (build 16976)\n" #. module: mail #: view:mail.followers:0 diff --git a/addons/mail/i18n/he.po b/addons/mail/i18n/he.po index b3f56baafc2..07ac78a819b 100644 --- a/addons/mail/i18n/he.po +++ b/addons/mail/i18n/he.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: 2014-03-27 07:26+0000\n" -"X-Generator: Launchpad (build 16967)\n" +"X-Launchpad-Export-Date: 2014-04-12 08:21+0000\n" +"X-Generator: Launchpad (build 16976)\n" #. module: mail #: view:mail.followers:0 diff --git a/addons/mail/i18n/hr.po b/addons/mail/i18n/hr.po index 922b3f8e608..7c5aa4d0c11 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: 2014-03-27 07:26+0000\n" -"X-Generator: Launchpad (build 16967)\n" +"X-Launchpad-Export-Date: 2014-04-12 08:21+0000\n" +"X-Generator: Launchpad (build 16976)\n" #. module: mail #: view:mail.followers:0 diff --git a/addons/mail/i18n/hu.po b/addons/mail/i18n/hu.po index ce501f5d2b2..0b0e10cf810 100644 --- a/addons/mail/i18n/hu.po +++ b/addons/mail/i18n/hu.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-03-27 07:26+0000\n" -"X-Generator: Launchpad (build 16967)\n" +"X-Launchpad-Export-Date: 2014-04-12 08:21+0000\n" +"X-Generator: Launchpad (build 16976)\n" #. module: mail #: view:mail.followers:0 diff --git a/addons/mail/i18n/it.po b/addons/mail/i18n/it.po index 3bed3c3d668..228fd135aac 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: 2014-03-27 07:26+0000\n" -"X-Generator: Launchpad (build 16967)\n" +"X-Launchpad-Export-Date: 2014-04-12 08:21+0000\n" +"X-Generator: Launchpad (build 16976)\n" #. module: mail #: view:mail.followers:0 diff --git a/addons/mail/i18n/ja.po b/addons/mail/i18n/ja.po index f2689a7b9f7..be6ef9c4426 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: 2014-03-27 07:26+0000\n" -"X-Generator: Launchpad (build 16967)\n" +"X-Launchpad-Export-Date: 2014-04-12 08:21+0000\n" +"X-Generator: Launchpad (build 16976)\n" #. module: mail #: view:mail.followers:0 diff --git a/addons/mail/i18n/ko.po b/addons/mail/i18n/ko.po index 631d1e6e8d7..e1cc4bc0608 100644 --- a/addons/mail/i18n/ko.po +++ b/addons/mail/i18n/ko.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: 2014-03-27 07:26+0000\n" -"X-Generator: Launchpad (build 16967)\n" +"X-Launchpad-Export-Date: 2014-04-12 08:21+0000\n" +"X-Generator: Launchpad (build 16976)\n" #. module: mail #: view:mail.followers:0 diff --git a/addons/mail/i18n/lt.po b/addons/mail/i18n/lt.po index ead33b5ca02..59acc32f0c3 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: 2014-03-27 07:26+0000\n" -"X-Generator: Launchpad (build 16967)\n" +"X-Launchpad-Export-Date: 2014-04-12 08:21+0000\n" +"X-Generator: Launchpad (build 16976)\n" #. module: mail #: view:mail.followers:0 diff --git a/addons/mail/i18n/lv.po b/addons/mail/i18n/lv.po index 22a92939282..2c0b9ef39a8 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: 2014-03-27 07:26+0000\n" -"X-Generator: Launchpad (build 16967)\n" +"X-Launchpad-Export-Date: 2014-04-12 08:21+0000\n" +"X-Generator: Launchpad (build 16976)\n" #. module: mail #: view:mail.followers:0 diff --git a/addons/mail/i18n/mk.po b/addons/mail/i18n/mk.po index 0a860b1ccb3..96c3a55d192 100644 --- a/addons/mail/i18n/mk.po +++ b/addons/mail/i18n/mk.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: 2014-03-27 07:26+0000\n" -"X-Generator: Launchpad (build 16967)\n" +"X-Launchpad-Export-Date: 2014-04-12 08:21+0000\n" +"X-Generator: Launchpad (build 16976)\n" #. module: mail #: view:mail.followers:0 diff --git a/addons/mail/i18n/mn.po b/addons/mail/i18n/mn.po index 799b294165c..9fff5ef7d81 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: 2014-03-27 07:26+0000\n" -"X-Generator: Launchpad (build 16967)\n" +"X-Launchpad-Export-Date: 2014-04-12 08:21+0000\n" +"X-Generator: Launchpad (build 16976)\n" #. module: mail #: view:mail.followers:0 diff --git a/addons/mail/i18n/nl.po b/addons/mail/i18n/nl.po index 0c864564ff0..cf8024bdd26 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: 2014-03-27 07:25+0000\n" -"X-Generator: Launchpad (build 16967)\n" +"X-Launchpad-Export-Date: 2014-04-12 08:20+0000\n" +"X-Generator: Launchpad (build 16976)\n" #. module: mail #: view:mail.followers:0 diff --git a/addons/mail/i18n/pl.po b/addons/mail/i18n/pl.po index e44e0a315b4..ef4568d5a33 100644 --- a/addons/mail/i18n/pl.po +++ b/addons/mail/i18n/pl.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" "POT-Creation-Date: 2012-12-21 17:04+0000\n" -"PO-Revision-Date: 2012-12-17 19:55+0000\n" -"Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@openglobe.pl>\n" +"PO-Revision-Date: 2014-04-04 19:25+0000\n" +"Last-Translator: Dariusz Żbikowski (Krokus) <darek@krokus.com.pl>\n" "Language-Team: Polish <pl@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-03-27 07:26+0000\n" -"X-Generator: Launchpad (build 16967)\n" +"X-Launchpad-Export-Date: 2014-04-12 08:21+0000\n" +"X-Generator: Launchpad (build 16976)\n" #. module: mail #: view:mail.followers:0 @@ -1363,7 +1363,7 @@ msgstr "Wiadomość Rich-text/HTML" #. module: mail #: view:mail.mail:0 msgid "Creation Month" -msgstr "Miesiąc tworzenia" +msgstr "Miesiąc utworzenia" #. module: mail #. openerp-web @@ -1509,7 +1509,7 @@ msgstr "" #: code:addons/mail/static/src/xml/mail.xml:213 #, python-format msgid "Please, wait while the file is uploading." -msgstr "" +msgstr "Poczekaj, aż plik zostanie załadowany." #. module: mail #: view:mail.group:0 diff --git a/addons/mail/i18n/pt.po b/addons/mail/i18n/pt.po index 8ca456787c0..f4e407562a0 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: 2014-03-27 07:26+0000\n" -"X-Generator: Launchpad (build 16967)\n" +"X-Launchpad-Export-Date: 2014-04-12 08:21+0000\n" +"X-Generator: Launchpad (build 16976)\n" #. module: mail #: view:mail.followers:0 diff --git a/addons/mail/i18n/pt_BR.po b/addons/mail/i18n/pt_BR.po index a0380ee39ea..1bd0a00f4a6 100644 --- a/addons/mail/i18n/pt_BR.po +++ b/addons/mail/i18n/pt_BR.po @@ -15,8 +15,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-03-27 07:26+0000\n" -"X-Generator: Launchpad (build 16967)\n" +"X-Launchpad-Export-Date: 2014-04-12 08:21+0000\n" +"X-Generator: Launchpad (build 16976)\n" #. module: mail #: view:mail.followers:0 diff --git a/addons/mail/i18n/ro.po b/addons/mail/i18n/ro.po index 20b1d2f9308..9bfb9331b80 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: 2014-03-27 07:26+0000\n" -"X-Generator: Launchpad (build 16967)\n" +"X-Launchpad-Export-Date: 2014-04-12 08:21+0000\n" +"X-Generator: Launchpad (build 16976)\n" #. module: mail #: view:mail.followers:0 diff --git a/addons/mail/i18n/ru.po b/addons/mail/i18n/ru.po index c176f898c00..70267a398db 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: 2014-03-27 07:26+0000\n" -"X-Generator: Launchpad (build 16967)\n" +"X-Launchpad-Export-Date: 2014-04-12 08:21+0000\n" +"X-Generator: Launchpad (build 16976)\n" #. module: mail #: view:mail.followers:0 diff --git a/addons/mail/i18n/sl.po b/addons/mail/i18n/sl.po index 927fff7f450..91145244cda 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: 2014-03-27 07:26+0000\n" -"X-Generator: Launchpad (build 16967)\n" +"X-Launchpad-Export-Date: 2014-04-12 08:21+0000\n" +"X-Generator: Launchpad (build 16976)\n" #. module: mail #: view:mail.followers:0 diff --git a/addons/mail/i18n/sr@latin.po b/addons/mail/i18n/sr@latin.po index 9b12fe8d12a..1bff0193658 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: 2014-03-27 07:26+0000\n" -"X-Generator: Launchpad (build 16967)\n" +"X-Launchpad-Export-Date: 2014-04-12 08:22+0000\n" +"X-Generator: Launchpad (build 16976)\n" #. module: mail #: view:mail.followers:0 diff --git a/addons/mail/i18n/sv.po b/addons/mail/i18n/sv.po index 22a083dac94..5ed6764f98f 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: 2014-03-27 07:26+0000\n" -"X-Generator: Launchpad (build 16967)\n" +"X-Launchpad-Export-Date: 2014-04-12 08:21+0000\n" +"X-Generator: Launchpad (build 16976)\n" #. module: mail #: view:mail.followers:0 @@ -25,7 +25,7 @@ msgstr "Följarformulär" #. module: mail #: model:ir.model,name:mail.model_publisher_warranty_contract msgid "publisher_warranty.contract" -msgstr "" +msgstr "publisher_warranty.contract" #. module: mail #: field:mail.compose.message,author_id:0 @@ -115,6 +115,8 @@ msgid "" "Email address of the sender. This field is set when no matching partner is " "found for incoming emails." msgstr "" +"E-postadress till avsändaren. Det här fältet är satt när inget matchande " +"företag hittas för inkommande e-post." #. module: mail #: model:ir.model,name:mail.model_mail_compose_message @@ -153,6 +155,9 @@ msgid "" "Members of those groups will automatically added as followers. Note that " "they will be able to manage their subscription manually if necessary." msgstr "" +"Medlemmarna i dessa grupper kommer automatiskt att läggas till som följare. " +"Observera att de kommer att kunna hantera sin prenumeration för hand om det " +"behövs." #. module: mail #. openerp-web @@ -192,6 +197,9 @@ msgid "" "image, with aspect ratio preserved. Use this field in form views or some " "kanban views." msgstr "" +"Medelstora foto av gruppen. Det är automatiskt storleksändras som en " +"128x128px bild, med bildförhållande bevaras. Använd det här fältet i " +"formulär vyer eller några Kanbanvyer." #. module: mail #. openerp-web @@ -214,6 +222,10 @@ msgid "" "\n" "(Document type: %s, Operation: %s)" msgstr "" +"The requested operation cannot be completed due to security restrictions. " +"Please contact your system administrator.\n" +"\n" +"(Document type: %s, Operation: %s)" #. module: mail #: view:mail.mail:0 @@ -231,14 +243,14 @@ msgstr "Tråd" #: code:addons/mail/static/src/xml/mail.xml:29 #, python-format msgid "Open the full mail composer" -msgstr "" +msgstr "Öppna den avancerade e-posteditorn" #. module: mail #. openerp-web #: code:addons/mail/static/src/xml/mail.xml:29 #, python-format msgid "ò" -msgstr "" +msgstr "ò" #. module: mail #: field:base.config.settings,alias_domain:0 @@ -265,7 +277,7 @@ msgstr "Inga meddelanen" #. module: mail #: model:ir.model,name:mail.model_mail_group msgid "Discussion group" -msgstr "" +msgstr "Diskussionsgrupp" #. module: mail #. openerp-web @@ -289,6 +301,8 @@ msgid "" "Message type: email for email message, notification for system message, " "comment for other messages such as user replies" msgstr "" +"Meddelandetyp: e-post för e-postmeddelande, avisering för systemmeddelande, " +"kommentar är andra meddelanden som till exempel användarsvar" #. module: mail #: help:mail.message.subtype,relation_field:0 @@ -312,7 +326,7 @@ msgstr "Svar till" #: code:addons/mail/wizard/invite.py:37 #, python-format msgid "<div>You have been invited to follow %s.</div>" -msgstr "" +msgstr "<div>Du har blivit inbjuden att följa %s. </div>" #. module: mail #: help:mail.group,message_unread:0 @@ -324,7 +338,7 @@ msgstr "Om ikryssad nya meddelanden som kräver din uppmärksamhet" #. module: mail #: field:mail.group,image_medium:0 msgid "Medium-sized photo" -msgstr "" +msgstr "Medelstort foto" #. module: mail #: model:ir.actions.client,name:mail.action_mail_to_me_feeds @@ -362,7 +376,7 @@ msgstr "visa ytterligare meddelande" #: code:addons/mail/res_users.py:69 #, python-format msgid "Invalid Action!" -msgstr "Ogiltig åtgärd" +msgstr "Ogiltig åtgärd!" #. module: mail #. openerp-web @@ -392,6 +406,8 @@ msgid "" "Holds the Chatter summary (number of messages, ...). This summary is " "directly in html format in order to be inserted in kanban views." msgstr "" +"Lagrar pladder-sammanfattning (antal meddelanden, ...). Denna sammanfattning " +"presenteras i html-format för att kunna sättas in i kanban vyer." #. module: mail #: help:mail.alias,alias_model_id:0 @@ -454,7 +470,7 @@ msgstr "E-postmeddelande" #. module: mail #: model:ir.model,name:mail.model_base_config_settings msgid "base.config.settings" -msgstr "" +msgstr "base.config.settings" #. module: mail #. openerp-web @@ -493,7 +509,7 @@ msgstr "Följare" #: model:ir.actions.client,name:mail.action_mail_archives_feeds #: model:ir.ui.menu,name:mail.mail_archivesfeeds msgid "Archives" -msgstr "Arkiv" +msgstr "Archives" #. module: mail #. openerp-web @@ -516,7 +532,7 @@ msgstr "Besvara" #: code:addons/mail/static/src/js/mail_followers.js:155 #, python-format msgid "One follower" -msgstr "En följate" +msgstr "En följare" #. module: mail #: field:mail.compose.message,type:0 @@ -559,6 +575,9 @@ msgid "" "image, with aspect ratio preserved. Use this field anywhere a small image is " "required." msgstr "" +"Liten bild som representerar gruppen. Det är storleksändras automatiskt till " +"64x64px, men med bevarat bildförhållande. Använd det här fältet när helst en " +"liten bild krävs." #. module: mail #: view:mail.compose.message:0 @@ -599,7 +618,7 @@ msgstr "Avsändare, från dina inställningar" #: code:addons/mail/wizard/invite.py:40 #, python-format msgid "<div>You have been invited to follow a new document.</div>" -msgstr "" +msgstr "<div>Du har blivit inbjuden att följa ett nytt dokument. </div>" #. module: mail #: field:mail.compose.message,parent_id:0 @@ -680,12 +699,14 @@ msgid "" "You may not create a user. To create new users, you should use the " "\"Settings > Users\" menu." msgstr "" +"Du kan inte skapa en användare. För att skapa nya användare används " +"\"Inställningar > Användare\"-menyn" #. module: mail #: help:mail.followers,res_model:0 #: help:mail.wizard.invite,res_model:0 msgid "Model of the followed resource" -msgstr "" +msgstr "Modell för den prenumererade resursen" #. module: mail #. openerp-web @@ -717,17 +738,17 @@ msgstr "Kontakt" msgid "" "Only the invited followers can read the\n" " discussions on this group." -msgstr "" +msgstr "Endast inbjudna följare kan läsa denna grupps diskussioner" #. module: mail #: model:ir.model,name:mail.model_ir_ui_menu msgid "ir.ui.menu" -msgstr "" +msgstr "ir.ui.menu" #. module: mail #: view:mail.message:0 msgid "Has attachments" -msgstr "" +msgstr "Har bilagor" #. module: mail #: view:mail.mail:0 @@ -741,6 +762,7 @@ msgid "" "The following partners chosen as recipients for the email have no email " "address linked :" msgstr "" +"Följande företag är valda mottagare för e-post som saknar länkad adress:" #. module: mail #: help:mail.alias,alias_defaults:0 @@ -748,11 +770,13 @@ msgid "" "A Python dictionary that will be evaluated to provide default values when " "creating new records for this alias." msgstr "" +"Ett Python-dictionary som används för standardvärden när nya poster skapas " +"för detta alias." #. module: mail #: model:ir.model,name:mail.model_mail_message_subtype msgid "Message subtypes" -msgstr "" +msgstr "Undertyper till meddelande" #. module: mail #: help:mail.compose.message,notified_partner_ids:0 @@ -760,6 +784,7 @@ msgstr "" msgid "" "Partners that have a notification pushing this message in their mailboxes" msgstr "" +"Företag som har en aviseringsknuff av detta meddelande till sina e-postlådor" #. module: mail #: selection:mail.compose.message,type:0 @@ -796,7 +821,7 @@ msgstr "" #. module: mail #: field:mail.mail,notification:0 msgid "Is Notification" -msgstr "" +msgstr "Är en avisering" #. module: mail #. openerp-web @@ -816,6 +841,8 @@ msgstr "Skicka nu" msgid "" "Unable to send email, please configure the sender's email address or alias." msgstr "" +"Kunde inte skicka e-post, vänligen konfigurera avsändarens e-postadress " +"eller alias." #. module: mail #: help:res.users,alias_id:0 @@ -843,7 +870,7 @@ msgstr "eller" #: help:mail.compose.message,vote_user_ids:0 #: help:mail.message,vote_user_ids:0 msgid "Users that voted for this message" -msgstr "" +msgstr "Användare som röstat på detta meddelande" #. module: mail #: help:mail.group,alias_id:0 @@ -851,6 +878,8 @@ msgid "" "The email address associated with this group. New emails received will " "automatically create new topics." msgstr "" +"The email address associated with this group. New emails received will " +"automatically create new topics." #. module: mail #: view:mail.mail:0 @@ -876,7 +905,7 @@ msgstr "Ägare" #. module: mail #: model:ir.model,name:mail.model_res_users msgid "Users" -msgstr "" +msgstr "Användare" #. module: mail #: model:ir.model,name:mail.model_mail_message @@ -891,7 +920,7 @@ msgstr "Meddelanden" #: help:mail.followers,res_id:0 #: help:mail.wizard.invite,res_id:0 msgid "Id of the followed resource" -msgstr "" +msgstr "Id of the followed resource" #. module: mail #: field:mail.compose.message,body:0 @@ -911,6 +940,8 @@ msgid "" "Description that will be added in the message posted for this subtype. If " "void, the name will be added instead." msgstr "" +"Description that will be added in the message posted for this subtype. If " +"void, the name will be added instead." #. module: mail #: field:mail.compose.message,vote_user_ids:0 @@ -928,23 +959,24 @@ msgstr "Gruppera" #: help:mail.message,starred:0 msgid "Current user has a starred notification linked to this message" msgstr "" +"Aktuell användare har en blockerad avisering länkad till detta meddelande" #. module: mail #: field:mail.group,public:0 msgid "Privacy" -msgstr "" +msgstr "Integritet" #. module: mail #: view:mail.mail:0 msgid "Notification" -msgstr "" +msgstr "Avisering" #. module: mail #. openerp-web #: code:addons/mail/static/src/js/mail.js:654 #, python-format msgid "Please complete partner's informations" -msgstr "" +msgstr "Please complete partner's informations" #. module: mail #: view:mail.wizard.invite:0 @@ -954,17 +986,17 @@ msgstr "Lägg till följare" #. module: mail #: view:mail.compose.message:0 msgid "Followers of selected items and" -msgstr "" +msgstr "Followers of selected items and" #. module: mail #: field:mail.alias,alias_force_thread_id:0 msgid "Record Thread ID" -msgstr "" +msgstr "Record Thread ID" #. module: mail #: model:ir.ui.menu,name:mail.mail_group_root msgid "My Groups" -msgstr "" +msgstr "Mina grupper" #. module: mail #: model:ir.actions.client,help:mail.action_mail_archives_feeds @@ -1009,7 +1041,7 @@ msgstr "" #: help:mail.compose.message,record_name:0 #: help:mail.message,record_name:0 msgid "Name get of the related document." -msgstr "" +msgstr "Name get of the related document." #. module: mail #: model:ir.actions.act_window,name:mail.action_view_notifications @@ -1020,7 +1052,7 @@ msgstr "" #: field:mail.message,notification_ids:0 #: view:mail.notification:0 msgid "Notifications" -msgstr "Notifikationer" +msgstr "Aviseringar" #. module: mail #: view:mail.alias:0 @@ -1034,6 +1066,9 @@ msgid "" "attached, even if they did not reply to it. If set, this will disable the " "creation of new records completely." msgstr "" +"Optional ID of a thread (record) to which all incoming messages will be " +"attached, even if they did not reply to it. If set, this will disable the " +"creation of new records completely." #. module: mail #: help:mail.message.subtype,name:0 @@ -1053,12 +1088,12 @@ msgstr "av" #. module: mail #: model:mail.group,name:mail.group_best_sales_practices msgid "Best Sales Practices" -msgstr "" +msgstr "Marknadsföringspraxis" #. module: mail #: selection:mail.group,public:0 msgid "Selected Group Only" -msgstr "" +msgstr "Endast valda grupper" #. module: mail #: field:mail.group,message_is_follower:0 @@ -1118,31 +1153,31 @@ msgstr "Skriv till mina följare" #. module: mail #: model:ir.model,name:mail.model_res_groups msgid "Access Groups" -msgstr "" +msgstr "Access Groups" #. module: mail #: field:mail.message.subtype,default:0 msgid "Default" -msgstr "" +msgstr "Default" #. module: mail #. openerp-web #: code:addons/mail/static/src/xml/mail.xml:311 #, python-format msgid "show more message" -msgstr "" +msgstr "visa fler meddelanden" #. module: mail #. openerp-web #: code:addons/mail/static/src/xml/mail.xml:246 #, python-format msgid "Mark as Todo" -msgstr "" +msgstr "Mark as Todo" #. module: mail #: help:mail.message.subtype,parent_id:0 msgid "Parent subtype, used for automatic subscription." -msgstr "" +msgstr "Parent subtype, used for automatic subscription." #. module: mail #: model:ir.model,name:mail.model_mail_wizard_invite @@ -1154,7 +1189,7 @@ msgstr "Inbjudningsguide" #: field:mail.thread,message_summary:0 #: field:res.partner,message_summary:0 msgid "Summary" -msgstr "" +msgstr "Summering" #. module: mail #: help:mail.message.subtype,res_model:0 @@ -1168,7 +1203,7 @@ msgstr "" #: field:mail.message,subtype_id:0 #: view:mail.message.subtype:0 msgid "Subtype" -msgstr "" +msgstr "Undertyp" #. module: mail #: view:mail.group:0 @@ -1207,6 +1242,7 @@ msgstr "Följer" msgid "" "Unfortunately this email alias is already used, please choose a unique one" msgstr "" +"Unfortunately this email alias is already used, please choose a unique one" #. module: mail #: help:mail.alias,alias_user_id:0 @@ -1216,13 +1252,17 @@ msgid "" "the sender (From) address, or will use the Administrator account if no " "system user is found for that address." msgstr "" +"The owner of records created upon receiving emails on this alias. If this " +"field is not set the system will attempt to find the right owner based on " +"the sender (From) address, or will use the Administrator account if no " +"system user is found for that address." #. module: mail #. openerp-web #: code:addons/mail/static/src/xml/mail_followers.xml:52 #, python-format msgid "And" -msgstr "" +msgstr "And" #. module: mail #: field:mail.compose.message,message_id:0 @@ -1236,6 +1276,8 @@ msgid "" "This field holds the image used as photo for the group, limited to " "1024x1024px." msgstr "" +"This field holds the image used as photo for the group, limited to " +"1024x1024px." #. module: mail #: field:mail.compose.message,attachment_ids:0 @@ -1248,7 +1290,7 @@ msgstr "Bilagor" #: field:mail.compose.message,record_name:0 #: field:mail.message,record_name:0 msgid "Message Record Name" -msgstr "" +msgstr "Message Record Name" #. module: mail #: field:mail.mail,email_cc:0 @@ -1258,7 +1300,7 @@ msgstr "Kopia" #. module: mail #: help:mail.notification,starred:0 msgid "Starred message that goes into the todo mailbox" -msgstr "" +msgstr "Blockerade meddelanden som sorteras in i att-göra-boxen" #. module: mail #. openerp-web @@ -1266,7 +1308,7 @@ msgstr "" #: view:mail.compose.message:0 #, python-format msgid "Followers of" -msgstr "" +msgstr "Followers of" #. module: mail #: help:mail.mail,auto_delete:0 @@ -1277,14 +1319,14 @@ msgstr "" #. module: mail #: model:ir.actions.client,name:mail.action_mail_group_feeds msgid "Discussion Group" -msgstr "" +msgstr "Discussion Group" #. module: mail #. openerp-web #: code:addons/mail/static/src/xml/mail.xml:242 #, python-format msgid "Done" -msgstr "" +msgstr "Done" #. module: mail #: model:mail.message.subtype,name:mail.mt_comment @@ -1301,7 +1343,7 @@ msgstr "Följ" #. module: mail #: field:mail.group,name:0 msgid "Name" -msgstr "" +msgstr "Namn" #. module: mail #: model:mail.group,name:mail.group_all_employees @@ -1315,17 +1357,17 @@ msgstr "Hela företaget" #: view:mail.compose.message:0 #, python-format msgid "and" -msgstr "" +msgstr "and" #. module: mail #: help:mail.mail,body_html:0 msgid "Rich-text/HTML message" -msgstr "" +msgstr "Rich-text/HTML message" #. module: mail #: view:mail.mail:0 msgid "Creation Month" -msgstr "Månad skapad" +msgstr "Registreringsmånad" #. module: mail #. openerp-web @@ -1337,12 +1379,12 @@ msgstr "Skriv nytt meddelande" #. module: mail #: field:mail.group,menu_id:0 msgid "Related Menu" -msgstr "" +msgstr "Relaterad meny" #. module: mail #: view:mail.message:0 msgid "Content" -msgstr "" +msgstr "Innehåll" #. module: mail #: field:mail.mail,email_to:0 @@ -1353,7 +1395,7 @@ msgstr "Till" #: field:mail.compose.message,notified_partner_ids:0 #: field:mail.message,notified_partner_ids:0 msgid "Notified partners" -msgstr "Meddelade företag" +msgstr "Aviserade företag" #. module: mail #: help:mail.group,public:0 @@ -1361,6 +1403,8 @@ msgid "" "This group is visible by non members. Invisible groups can add " "members through the invite button." msgstr "" +"Denna grupp är synlig för icke medlemmar. Osynliga grupper kan lägga till " +"medlemmar via den \"osynliga\" knappen." #. module: mail #: model:mail.group,name:mail.group_board @@ -1379,7 +1423,7 @@ msgstr "" #. module: mail #: field:mail.alias,alias_model_id:0 msgid "Aliased Model" -msgstr "" +msgstr "Aliasobjekt" #. module: mail #: help:mail.compose.message,message_id:0 @@ -1391,19 +1435,19 @@ msgstr "Meddelandets unika identifierare" #: field:mail.group,description:0 #: field:mail.message.subtype,description:0 msgid "Description" -msgstr "" +msgstr "Beskrivning" #. module: mail #: model:ir.model,name:mail.model_mail_followers msgid "Document Followers" -msgstr "" +msgstr "Dokumentföljare" #. module: mail #. openerp-web #: code:addons/mail/static/src/xml/mail_followers.xml:35 #, python-format msgid "Remove this follower" -msgstr "" +msgstr "Ta bort denna följare" #. module: mail #: selection:res.partner,notification_email_send:0 @@ -1413,13 +1457,13 @@ msgstr "Aldrig" #. module: mail #: field:mail.mail,mail_server_id:0 msgid "Outgoing mail server" -msgstr "Utgående mailserver" +msgstr "Utgående e-postserver" #. module: mail #: code:addons/mail/mail_message.py:930 #, python-format msgid "Partners email addresses not found" -msgstr "" +msgstr "Företagets e-postadress saknas" #. module: mail #: view:mail.mail:0 @@ -1430,7 +1474,7 @@ msgstr "Skickat" #. module: mail #: field:mail.mail,body_html:0 msgid "Rich-text Contents" -msgstr "" +msgstr "Utsmyckat innehåll" #. module: mail #: help:mail.compose.message,to_read:0 @@ -1458,13 +1502,17 @@ msgid "" " </p>\n" " " msgstr "" +"<p>\n" +" Meddelanden saknas i gruppen.\n" +" </p>\n" +" " #. module: mail #. openerp-web #: code:addons/mail/static/src/xml/mail.xml:213 #, python-format msgid "Please, wait while the file is uploading." -msgstr "" +msgstr "Vänligen vänta tills filen är uppladdad." #. module: mail #: view:mail.group:0 @@ -1474,13 +1522,16 @@ msgid "" "installed\n" " the portal module." msgstr "" +"Denna grupp är synlig för alla,\n" +" även dina kunder i de fall du " +"installerat portalmodulen." #. module: mail #. openerp-web #: code:addons/mail/static/src/xml/mail.xml:243 #, python-format msgid "Set back to Todo" -msgstr "" +msgstr "Backa till Att göra" #. module: mail #. openerp-web @@ -1505,6 +1556,8 @@ msgid "" "If you have setup a catch-all email domain redirected to the OpenERP server, " "enter the domain name here." msgstr "" +"Om du har en 'fånga alla e-postmeddelanden'-domän vidarebefordra den till " +"OpenERP-servern och ange domännamnet här." #. module: mail #: model:ir.actions.act_window,name:mail.action_view_mail_message @@ -1521,7 +1574,7 @@ msgstr "Meddelanden" #: code:addons/mail/static/src/xml/mail.xml:139 #, python-format msgid "others..." -msgstr "" +msgstr "övrigt..." #. module: mail #: model:ir.actions.client,name:mail.action_mail_star_feeds @@ -1535,12 +1588,12 @@ msgstr "Att göra" #: field:mail.group,alias_id:0 #: field:res.users,alias_id:0 msgid "Alias" -msgstr "" +msgstr "Alias" #. module: mail #: model:ir.model,name:mail.model_mail_mail msgid "Outgoing Mails" -msgstr "" +msgstr "Utgående e-post" #. module: mail #: help:mail.compose.message,notification_ids:0 @@ -1554,7 +1607,7 @@ msgstr "" #: model:ir.ui.menu,name:mail.mail_feeds #: model:ir.ui.menu,name:mail.mail_feeds_main msgid "Messaging" -msgstr "Meddelanden" +msgstr "Meddelandehantering" #. module: mail #: view:mail.alias:0 @@ -1579,7 +1632,7 @@ msgstr "" #: help:mail.thread,message_ids:0 #: help:res.partner,message_ids:0 msgid "Messages and communication history" -msgstr "" +msgstr "Meddelande och kommunikationshistorik" #. module: mail #: help:mail.mail,references:0 @@ -1589,7 +1642,7 @@ msgstr "Meddelandereferens, som identifierar tidigare meddelanden" #. module: mail #: field:mail.compose.message,composition_mode:0 msgid "Composition mode" -msgstr "" +msgstr "Författarmod" #. module: mail #: field:mail.compose.message,model:0 @@ -1613,6 +1666,8 @@ msgid "" "Author of the message. If not set, email_from may hold an email address that " "did not match any partner." msgstr "" +"Author of the message. If not set, email_from may hold an email address that " +"did not match any partner." #. module: mail #: help:mail.mail,email_cc:0 @@ -1622,13 +1677,13 @@ msgstr "Blindkopiemottagare" #. module: mail #: field:mail.alias,alias_domain:0 msgid "Alias domain" -msgstr "" +msgstr "Alias domän" #. module: mail #: code:addons/mail/update.py:93 #, python-format msgid "Error during communication with the publisher warranty server." -msgstr "" +msgstr "Fel vid kommunikation med servern för 'utgivarens underhållsavtal'." #. module: mail #: selection:mail.group,public:0 @@ -1666,7 +1721,7 @@ msgstr "Leverans misslyckades" #. module: mail #: field:mail.compose.message,partner_ids:0 msgid "Additional contacts" -msgstr "" +msgstr "Ytterligare kontakter" #. module: mail #: help:mail.compose.message,parent_id:0 @@ -1677,7 +1732,7 @@ msgstr "Inledande meddelande i tråd." #. module: mail #: model:mail.group,name:mail.group_hr_policies msgid "HR Policies" -msgstr "" +msgstr "Personalpolicies" #. module: mail #: selection:res.partner,notification_email_send:0 @@ -1702,7 +1757,7 @@ msgstr "" #: code:addons/mail/static/src/js/many2many_tags_email.js:63 #, python-format msgid "Please complete partner's informations and Email" -msgstr "" +msgstr "Vänligen komplettera företagets information och e-postadresser" #. module: mail #: model:ir.actions.act_window,name:mail.action_view_message_subtype diff --git a/addons/mail/i18n/th.po b/addons/mail/i18n/th.po index 853deebbddd..54483c96055 100644 --- a/addons/mail/i18n/th.po +++ b/addons/mail/i18n/th.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: 2014-03-27 07:26+0000\n" -"X-Generator: Launchpad (build 16967)\n" +"X-Launchpad-Export-Date: 2014-04-12 08:21+0000\n" +"X-Generator: Launchpad (build 16976)\n" #. module: mail #: view:mail.followers:0 diff --git a/addons/mail/i18n/tr.po b/addons/mail/i18n/tr.po index a0855384bc6..02a88e33789 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: 2014-03-27 07:26+0000\n" -"X-Generator: Launchpad (build 16967)\n" +"X-Launchpad-Export-Date: 2014-04-12 08:21+0000\n" +"X-Generator: Launchpad (build 16976)\n" #. module: mail #: view:mail.followers:0 diff --git a/addons/mail/i18n/vi.po b/addons/mail/i18n/vi.po index 8e4f9b2aa9d..d234db7afc6 100644 --- a/addons/mail/i18n/vi.po +++ b/addons/mail/i18n/vi.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: 2014-03-27 07:26+0000\n" -"X-Generator: Launchpad (build 16967)\n" +"X-Launchpad-Export-Date: 2014-04-12 08:21+0000\n" +"X-Generator: Launchpad (build 16976)\n" #. module: mail #: view:mail.followers:0 diff --git a/addons/mail/i18n/zh_CN.po b/addons/mail/i18n/zh_CN.po index 5f046145d92..b1ae0e6ea58 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: 2014-03-27 07:26+0000\n" -"X-Generator: Launchpad (build 16967)\n" +"X-Launchpad-Export-Date: 2014-04-12 08:22+0000\n" +"X-Generator: Launchpad (build 16976)\n" #. module: mail #: view:mail.followers:0 diff --git a/addons/mail/i18n/zh_TW.po b/addons/mail/i18n/zh_TW.po index 2a3c459b55f..e66d773e10c 100644 --- a/addons/mail/i18n/zh_TW.po +++ b/addons/mail/i18n/zh_TW.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: 2014-03-27 07:26+0000\n" -"X-Generator: Launchpad (build 16967)\n" +"X-Launchpad-Export-Date: 2014-04-12 08:22+0000\n" +"X-Generator: Launchpad (build 16976)\n" #. module: mail #: view:mail.followers:0 diff --git a/addons/mail/mail_message_view.xml b/addons/mail/mail_message_view.xml index e2d1deb028b..1c4a7f55c10 100644 --- a/addons/mail/mail_message_view.xml +++ b/addons/mail/mail_message_view.xml @@ -89,5 +89,36 @@ <!-- Add menu entry in Settings/Email --> <menuitem name="Messages" id="menu_mail_message" parent="base.menu_email" action="action_view_mail_message"/> + <record model="ir.ui.view" id="view_document_file_kanban"> + <field name="name">ir.attachment kanban</field> + <field name="model">ir.attachment</field> + <field name="arch" type="xml"> + <kanban> + <field name="file_type_icon"/> + <field name="url"/> + <field name="name"/> + <templates> + <t t-name="kanban-box"> + <div class="oe_kanban_global_click"> + <div t-attf-class="oe_attachment" t-if="record.file_type_icon.value != 'webimage'"> + <img t-att-src="'/mail/static/src/img/mimetypes/' + record.file_type_icon.value + '.png'"></img> + <div class='oe_name'><t t-raw='record.name.value' />bb</div> + </div> + <div t-attf-class="oe_attachment oe_preview" t-if="record.file_type_icon.value == 'webimage'"> + <img t-att-src="kanban_image('ir.attachment', 'datas', record.id.value)" class="oe_kanban_image"/> + <div class='oe_name'><t t-raw='record.name.value' />aa</div> + </div> + </div> + </t> + </templates> + </kanban> + </field> + </record> + <record id="base.action_attachment" model="ir.actions.act_window"> + <field name="view_mode">kanban,form</field> + </record> + + + </data> -</openerp>
\ No newline at end of file +</openerp> diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py index f2d33be7787..73588207d6a 100644 --- a/addons/mail/mail_thread.py +++ b/addons/mail/mail_thread.py @@ -1511,8 +1511,7 @@ class mail_thread(osv.AbstractModel): if subtype: if '.' not in subtype: subtype = 'mail.%s' % subtype - ref = self.pool.get('ir.model.data').get_object_reference(cr, uid, *subtype.split('.')) - subtype_id = ref and ref[1] or False + subtype_id = self.pool.get('ir.model.data').xmlid_to_res_id(cr, uid, subtype) # automatically subscribe recipients if asked to if context.get('mail_post_autofollow') and thread_id and partner_ids: diff --git a/addons/mail/res_users.py b/addons/mail/res_users.py index 1859263b2b3..8fe1482b427 100644 --- a/addons/mail/res_users.py +++ b/addons/mail/res_users.py @@ -118,10 +118,18 @@ class res_users(osv.Model): various mailboxes, we do not have access to the current partner_id. """ if isinstance(thread_id, (list, tuple)): thread_id = thread_id[0] + current_pids = [] partner_ids = kwargs.get('partner_ids', []) - partner_id = self._message_post_get_pid(cr, uid, thread_id, context=context) - if partner_id not in [command[1] for command in partner_ids]: - partner_ids.append(partner_id) + user_pid = self._message_post_get_pid(cr, uid, thread_id, context=context) + for partner_id in partner_ids: + if isinstance(partner_id, (list, tuple)) and partner_id[0] == 4 and len(partner_id) == 2: + current_pids.append(partner_id[1]) + elif isinstance(partner_id, (list, tuple)) and partner_id[0] == 6 and len(partner_id) == 3: + current_pids.append(partner_id[2]) + elif isinstance(partner_id, (int, long)): + current_pids.append(partner_id) + if user_pid not in current_pids: + partner_ids.append(user_pid) kwargs['partner_ids'] = partner_ids return self.pool.get('mail.thread').message_post(cr, uid, False, **kwargs) diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css index 614077b65a2..0abd8ab1b4e 100644 --- a/addons/mail/static/src/css/mail.css +++ b/addons/mail/static/src/css/mail.css @@ -318,7 +318,7 @@ .openerp .oe_mail .oe_msg_composer .oe_recipients input{ vertical-align: middle; } -.openerp .oe_mail .oe_attachment{ +.oe_attachment{ display: inline-block; width: 100px; margin: 4px 2px; @@ -328,7 +328,7 @@ text-align: center; vertical-align: top; } -.openerp .oe_mail .oe_attachment .oe_name{ +.oe_attachment .oe_name{ display: inline-block; max-width: 100%; padding: 1px 3px; @@ -341,10 +341,10 @@ border-radius: 3px; } -.openerp .oe_mail .oe_attachment.oe_preview{ +.oe_attachment.oe_preview{ background: url( data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAAJ0lEQVQYV2MsLS39z4AGLCws0IUYGIeCwrVr12J45sSJE5ieGQIKAbuZKf/EMCs7AAAAAElFTkSuQmCC ); } -.openerp .oe_mail .oe_attachment .oe_progress_bar{ +.oe_attachment .oe_progress_bar{ display: none; position: absolute; top: 18px; @@ -364,7 +364,7 @@ -o-animation: oe_mail_attach_loading_anim 0.75s infinite linear; animation: oe_mail_attach_loading_anim 0.75s infinite linear; } -.openerp .oe_mail .oe_attachment.oe_uploading .oe_progress_bar{ +.oe_attachment.oe_uploading .oe_progress_bar{ display: block; } @-webkit-keyframes oe_mail_attach_loading_anim{ @@ -387,7 +387,7 @@ 50% { background: #009123 } 100% { background: #4BBD00 } } -.openerp .oe_mail .oe_attachment.oe_preview .oe_name{ +.oe_attachment.oe_preview .oe_name{ position: absolute; bottom: 0px; margin: 3px; @@ -405,14 +405,14 @@ -o-transition: opacity 0.2s linear; transition: opacity 0.2s linear; } -.openerp .oe_mail .oe_attachment.oe_preview:hover .oe_name{ +.oe_attachment.oe_preview:hover .oe_name{ opacity: 1; -webkit-transition: opacity 0.2s linear; -moz-transition: opacity 0.2s linear; -o-transition: opacity 0.2s linear; transition: opacity 0.2s linear; } -.openerp .oe_mail .oe_attachment img{ +.oe_attachment img{ position: absolute; width: 48px; height: 48px; @@ -420,7 +420,7 @@ left: 50%; margin-left: -24px; } -.openerp .oe_mail .oe_attachment.oe_preview img{ +.oe_attachment.oe_preview img{ display: block; position: relative; margin:0px; @@ -579,7 +579,7 @@ .openerp .oe_followers button.oe_follower{ display: block; text-align: center; - width:100%; + width:135px; } .openerp .oe_followers button.oe_follower.oe_following{ color: white; @@ -664,13 +664,9 @@ .openerp .oe_followers .oe_partner .oe_hidden{ display: none; } -.openerp.ui-dialog .ui-dialog-titlebar .ui-dialog-title{ - padding-right: 20px; -} .openerp .oe_followers .oe_show_more{ cursor: pointer; } - /* ---------------- MESSAGES BODY ------------------ */ .openerp .oe_mail .oe_msg_content .oe_blockquote, .openerp .oe_mail .oe_msg_content blockquote { diff --git a/addons/mail/static/src/js/mail_followers.js b/addons/mail/static/src/js/mail_followers.js index e7c8ede6867..bf83fe6d7c6 100644 --- a/addons/mail/static/src/js/mail_followers.js +++ b/addons/mail/static/src/js/mail_followers.js @@ -70,7 +70,17 @@ openerp_mail_followers = function(session, mail) { self.do_unfollow(); }); // event: click on a subtype, that (un)subscribe for this subtype - this.$el.on('click', '.oe_subtype_list input', self.do_update_subscription); + this.$el.on('click', '.oe_subtype_list input', function(event) { + self.do_update_subscription(event); + var $list = self.$('.oe_subtype_list'); + if(!$list.hasClass('open')) { + $list.addClass('open'); + } + if(self.$('.oe_subtype_list ul')[0].children.length < 1) { + $list.removeClass('open'); + } + event.stopPropagation(); + }); // event: click on 'invite' button, that opens the invite wizard this.$('.oe_invite').on('click', self.on_invite_follower); // event: click on 'edit_subtype(pencil)' button to edit subscription @@ -84,19 +94,17 @@ openerp_mail_followers = function(session, mail) { var $currentTarget = $(event.currentTarget); var user_pid = $currentTarget.data('id'); $('div.oe_edit_actions').remove(); - self.$dialog = new session.web.dialog($('<div class="oe_edit_actions">'), { - modal: true, - width: 'auto', - height: 'auto', + self.$dialog = new session.web.Dialog(this, { + size: 'small', title: _t('Edit Subscription of ') + $currentTarget.siblings('a').text(), buttons: [ { text: _t("Apply"), click: function() { self.do_update_subscription(event, user_pid); - $(this).dialog("close"); + this.parents('.modal').modal('hide'); }}, - { text: _t("Cancel"), click: function() { $(this).dialog("close"); }} + { text: _t("Cancel"), click: function() { this.parents('.modal').modal('hide'); }} ], - }); + }, "<div class='oe_edit_actions'>").open(); return self.fetch_subtypes(user_pid); }, @@ -244,8 +252,14 @@ openerp_mail_followers = function(session, mail) { if (user_pid) { dialog = true; } else { - var subtype_list_ul = this.$('.oe_subtype_list').empty(); - if (! this.message_is_follower) return; + var subtype_list_ul = this.$('.oe_subtype_list ul').empty(); + if (! this.message_is_follower) { + this.$('.oe_subtype_list > .dropdown-toggle').attr('disabled', true); + return; + } + else { + this.$('.oe_subtype_list > .dropdown-toggle').attr('disabled', false); + } } var id = this.view.datarecord.id; this.ds_model.call('message_get_subscription_data', [[id], user_pid, new session.web.CompoundContext(this.build_context(), {})]) @@ -256,12 +270,11 @@ openerp_mail_followers = function(session, mail) { display_subtypes:function (data, id, dialog) { var self = this; if (dialog) { - var $list = self.$dialog; + var $list = self.$dialog.$el; } else { - var $list = this.$('.oe_subtype_list'); + var $list = this.$('.oe_subtype_list ul'); } - $list.empty().hide(); var records = data[id].message_subtype_data; this.records_length = $.map(records, function(value, index) { return index; }).length; if (this.records_length > 1) { self.display_followers(); } @@ -276,15 +289,13 @@ openerp_mail_followers = function(session, mail) { } record.name = record_name; record.followed = record.followed || undefined; - $(session.web.qweb.render('mail.followers.subtype', {'record': record})).appendTo($list); + $(session.web.qweb.render('mail.followers.subtype', {'record': record, 'dialog': dialog})).appendTo($list); }); - if (_.size(records) > 1) { - $list.show(); - } }, do_follow: function () { var context = new session.web.CompoundContext(this.build_context(), {}); + this.$('.oe_subtype_list > .dropdown-toggle').attr('disabled', false); this.ds_model.call('message_subscribe_users', [[this.view.datarecord.id], [this.session.uid], undefined, context]) .then(this.proxy('read_value')); @@ -294,11 +305,13 @@ openerp_mail_followers = function(session, mail) { }, do_unfollow: function (user_pid) { + var self = this; if (confirm(_t("Warning! \nYou won't be notified of any email or discussion on this document. Do you really want to unfollow this document ?"))) { _(this.$('.oe_msg_subtype_check')).each(function (record) { $(record).attr('checked',false); }); var action_unsubscribe = 'message_unsubscribe_users'; + this.$('.oe_subtype_list > .dropdown-toggle').attr('disabled', true); var follower_ids = [this.session.uid]; if (user_pid) { action_unsubscribe = 'message_unsubscribe'; @@ -332,6 +345,8 @@ openerp_mail_followers = function(session, mail) { if (!checklist.length) { if (!this.do_unfollow(user_pid)) { $(event.target).attr("checked", "checked"); + } else { + self.$('.oe_subtype_list ul').empty(); } } else { var context = new session.web.CompoundContext(this.build_context(), {}); diff --git a/addons/mail/static/src/xml/mail_followers.xml b/addons/mail/static/src/xml/mail_followers.xml index 6e8682cb533..35a5ad320bb 100644 --- a/addons/mail/static/src/xml/mail_followers.xml +++ b/addons/mail/static/src/xml/mail_followers.xml @@ -5,17 +5,23 @@ followers main template Template used to display the followers, the actions and the subtypes in a record. --> - <div t-name="mail.followers" class="oe_followers"> + <div t-name="mail.followers" class="oe_followers"> <div class="oe_actions"> - <button type="button" class="oe_follower oe_notfollow"> - <span class="oe_follow">Follow</span> - <span class="oe_unfollow">Unfollow</span> - <span class="oe_following">Following</span> - </button> + <div t-attf-class="btn-group oe_subtype_list"> + <button class="btn oe_follower oe_notfollow"> + <span class="oe_follow">Follow</span> + <span class="oe_unfollow">Unfollow</span> + <span class="oe_following">Following</span> + </button> + <button type="button" t-attf-class="btn btn-default dropdown-toggle" data-toggle="dropdown"> + <span class="caret"></span> + </button> + <ul class="dropdown-menu" role="menu"></ul> + </div> + <t t-if="widget.comment"> <h5 class="oe_comment"><t t-raw="widget.comment"/></h5> </t> - <div class="oe_subtype_list"></div> </div> <div class='oe_follower_title_box'> <h4 class='oe_follower_title'>Followers</h4> @@ -42,8 +48,12 @@ <t t-name="mail.followers.subtype"> <table class='oe_subtype'> <tr> - <td width="10%"><input type="checkbox" t-att-checked="record.followed" t-att-id="'input_mail_followers_subtype_'+record.id" t-att-data-id="record.id" t-att-name="record.name" class="oe_msg_subtype_check"/></td> - <td><label t-att-for="'input_mail_followers_subtype_'+record.id"><t t-esc="record.name"/></label></td> + <td width="10%"> + <input type="checkbox" t-att-checked="record.followed" t-att-id="'input_mail_followers_subtype_'+record.id+(dialog ? '_in_dialog': '')" t-att-data-id="record.id" t-att-name="record.name" class="oe_msg_subtype_check"/> + </td> + <td> + <label t-att-for="'input_mail_followers_subtype_'+record.id+(dialog ? '_in_dialog': '')"><t t-raw="record.name"/></label> + </td> </tr> </table> </t> |
