[MERGE]: Merged with addons

bzr revid: atp@tinyerp.com-20140218055618-r36w29vat7zig9ar
author: Atul Patel (OpenERP) <atp@tinyerp.com> 2014-02-18 11:26:18 +0530
committer: Atul Patel (OpenERP) <atp@tinyerp.com> 2014-02-18 11:26:18 +0530
commit: 33b99c8a0737e08e6a243e41bb455d3ab7e6c851 (patch)
tree: a1db52bfbeecf0c6fd9096604b7ec4540bb04197 /addons/mail
parent: caa3510ea434e10c32dcbc134f9c74b2b9f18b2a (diff)
parent: aa0eac1257b97c1be693e8a804fec6ecbf2bb22f (diff)
61 files changed, 3081 insertions, 928 deletions
diff --git a/addons/mail/__init__.py b/addons/mail/__init__.py
index 26578e19af1..08a7a926cee 100644
--- a/addons/mail/__init__.py
+++ b/addons/mail/__init__.py
@@ -19,6 +19,7 @@
 #
 ##############################################################################
 
+import ir_attachment
 import mail_message_subtype
 import mail_alias
 import mail_followers
diff --git a/addons/mail/__openerp__.py b/addons/mail/__openerp__.py
index 1b9111d3040..59d2e5f81ee 100644
--- a/addons/mail/__openerp__.py
+++ b/addons/mail/__openerp__.py
@@ -81,16 +81,19 @@ Main Features
     'css': [
         'static/src/css/mail.css',
         'static/src/css/mail_group.css',
+        'static/src/css/announcement.css',
     ],
     'js': [
         'static/src/js/mail.js',
         'static/src/js/mail_followers.js',
         'static/src/js/many2many_tags_email.js',
+        'static/src/js/announcement.js',
         'static/src/js/suggestions.js',
     ],
     'qweb': [
         'static/src/xml/mail.xml',
         'static/src/xml/mail_followers.xml',
+        'static/src/xml/announcement.xml',
         'static/src/xml/suggestions.xml',
     ],
 }
diff --git a/addons/mail/controllers/main.py b/addons/mail/controllers/main.py
index c2e15c4a12f..a913d3c067d 100644
--- a/addons/mail/controllers/main.py
+++ b/addons/mail/controllers/main.py
@@ -4,6 +4,7 @@ import psycopg2
 import openerp
 from openerp import SUPERUSER_ID
 from openerp import http
+from openerp.http import request
 from openerp.addons.web.controllers.main import content_disposition
 
 
@@ -11,18 +12,19 @@ class MailController(http.Controller):
     _cp_path = '/mail'
 
     @http.route('/mail/download_attachment', type='http', auth='user')
-    def download_attachment(self, req, model, id, method, attachment_id, **kw):
+    def download_attachment(self, model, id, method, attachment_id, **kw):
         # FIXME use /web/binary/saveas directly
-        Model = req.session.model(model)
-        res = getattr(Model, method)(int(id), int(attachment_id))
+        Model = request.registry.get(model)
+        res = getattr(Model, method)(request.cr, request.uid, int(id), int(attachment_id))
         if res:
             filecontent = base64.b64decode(res.get('base64'))
             filename = res.get('filename')
             if filecontent and filename:
-                return req.make_response(filecontent,
+                return request.make_response(
+                    filecontent,
                     headers=[('Content-Type', 'application/octet-stream'),
-                            ('Content-Disposition', content_disposition(filename))])
-        return req.not_found()
+                             ('Content-Disposition', content_disposition(filename))])
+        return request.not_found()
 
     @http.route('/mail/receive', type='json', auth='none')
     def receive(self, req):
diff --git a/addons/mail/data/mail_demo.xml b/addons/mail/data/mail_demo.xml
index 5739f5cd470..5a756e803d3 100644
--- a/addons/mail/data/mail_demo.xml
+++ b/addons/mail/data/mail_demo.xml
@@ -153,71 +153,7 @@
         <record id="msg_discus4_attach2" model="ir.attachment">
             <field name="datas_fname">activity_graph_2012.jpg</field>
             <field name="name">activity_graph_2012</field>
-            <field name="datas">
-                /9j/4AAQSkZJRgABAQEASABIAAD/2wBDAAUDBAQEAwUEBAQFBQUGBwwIBwcHBw8LCwkMEQ8SEhEP
-                ERETFhwXExQaFRERGCEYGh0dHx8fExciJCIeJBweHx7/2wBDAQUFBQcGBw4ICA4eFBEUHh4eHh4e
-                Hh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh7/wAARCABQAGQDAREA
-                AhEBAxEB/8QAHAABAAIDAQEBAAAAAAAAAAAABgUHAAMEAgEI/8QATBAAAQIEAQYHCA8GBwAAAAAA
-                AgMEAAEFBhIHERMis7QUMjQ2QnN0IzE3UnJ1ssIVFhchNVRiY3GCkpOxw9IkJiczQVFDVWGDosHi
-                /8QAGwEAAgMBAQEAAAAAAAAAAAAABQYABAcCAwH/xABAEQABAgMDCAgDBQcFAAAAAAAAAgMEBQYB
-                EjUHFDIzNEJy8BMiMVJxssLSESE2QXORksEVIySBgqKzobHD0eL/2gAMAwEAAhEDEQA/AP1mLpMl
-                VgTTWM0VNGeAOlgx/gcLyIVa9A9jdwhT4q7+7jvMXjjpLDOET+Kr/dxMxePvSWHFUlHq1McpU8VE
-                HhoqC3WJHGAKYNQ/ojtEE8fL4YUbZRUJKptXtCSQkOFGRiusefSZwmZ4NfUwDHvmJL5uFvfKmAVn
-                9NMBXxzworAZBp0D8TxAXl9cImauEv2HK3bZTBNA3VUoa2jRQkp+zLBjXkYabocTR6bB8vBEzQl8
-                8IoZTQQMlajQl19CpLOLVbMS+OeDocQA/wCYS8f3pmJL50PE8oarkJN6hRUGoKOcaajZYzMNJ3Do
-                eJx/LiZoS+eE0MoxOFDXqNGkhN2iphSbLYxRDBpA4nTzH9uJmhL424RP4qv93FXMXj70lhnCJ/FV
-                /u4mYvE6SwxiuDpElUJywyUNOf0gUxn6MeDram1XbToMySBzcFfTV0EiDQ8G0xamkNH/AMB9iLyF
-                rQwi4ch26nziiSeBNtSFDBuayEhTWPH4nT8uJna2+us83+o2taCxLYWNa2qY4U45tUzP7EE0aBCU
-                xR6EMxRCGYohDMUQhmKIQzFEIZiiEMxRCA6/brcW1JnJCmpPFHMjmUzc6GQCGHP0Dz8eAU4niJYt
-                pC0X74Slsrz2+qxegTFu8iX7a625xIvW2lBHYRk6DTay9q0n6BGPDUZywnh4iAYPTOLkKhDjHXJa
-                bDsm31GugNqsYaPQz7uesH+se+aMrJY4tBPsGyTFkiyaBIEUAAA8mLRwdUQh814hDNeIQ+xCEa+q
-                1OYOWzR48RQWclgQAz1jnHaELVYea30IVcUSOvHB6AyqXgjp6tT2TdQH7FssumawZkVME5B3/LOK
-                81WuXwK4s5l7jMbG5qebdrtUqOT064vwOVQGTmUpAmWhxJrGAauLP0P7x4yCJXMYZl1fas950hEv
-                UtKNwF3dUnlVt2jvn+h4SZVBM9EMxDua4B6kKtet9DHQqEd/2ByjXlvQL6186ZaFu8iX7a625wcj
-                dbaAUdh6ofLqz24NghF6B1ZFkxF44IR3X6a2rTajrrkLxzLuI6IsJTzHPjZs3eAo7QytaL5XXFNp
-                c6HfJuOCwBLEq9WqFx1xnUHvCkEQQWQDQCGgxmvqZ+n7wBF+Oh0MJRcBEtilvrXfJq+iVC2nJorK
-                InIk8xongOWuEeECi+/ZYsszJa0Qq7UH2xjWVtGmKLrKLmSGczWPEZxzFWWWPLssO4K2+wi0OZRO
-                dFM6+n76EXYXZVg2O25s92pXKs6ygVmmPH2lZoAoaCOgEcGZXBx5d+EKSzSIjY+IZXoIHiYwbDEE
-                y4jTWQDrnTcPm57t04ZqswJfAK1O42TNleCRTy328rQNonD4YN1brnvD0BGs8yqN19U3qAeUPEoX
-                j9heobDn+e+W1bvIl+2utucFo3W2gdHYGbrJYGFV0DpdqZ1YO6IngPkqcHJGhC7euC5y4tDHUEln
-                qLOLSo66ypGsqwQMz8YppynOcdv6ay0xqUBq7/CZb/Xh6C8EWNhWCn8RQP8AB8soFhwrfJnLFd9x
-                dkZbR1BeZaLYvSfWPc98UX4H7sONc/5iG2CKMFr7AhNdkWV0b1+2O00WzxdFGfBcQAeopI3UgPP9
-                TPCVUcwimKgZh23OosapBCsLkq1qR8/h6BJlC51Uvr2W+pw/wuyrEiO25s5bK8KVe6lXbxl9NYtG
-                8a/MaLOcMY53COec8bh81vdsEPNXYEvgEmnMcs53yYs7wRq+W+3laBlE4dDBurdc94egI1nmVRuv
-                qm9QEyh4lC8fsL9DYc/z3y2rd5Ev211tzgtG620Do7A3dnIal53DdU4PU/2gie7OILIEfabQsX+X
-                IegMR/TWXIXUoDl3+Ey3+vD0F4JMbCsFv4igfYAgWHCuMnUxTuy4jVLCINWWv/uOoKTLRQAJPrnO
-                e+Jr30J2quYHiAlENfH88EVJdr0F6a7Ksrd1yq0Pop+/SjPao+q4fn7VjhTuBK8LfIKcoQ/vVS5/
-                Pst9TjTIXZViFHbc2ctleFKvdSrt4y+msWjeNfmNFnOGMc7hHPOdtxebHu2CHmrsCXwCTTmOWc75
-                LWWP8I1ZfLfbytA2isPhg5Vuue8PQE6zzKo3X1TeoB5Q8SheP2F6hsOf575bVu8iX7a625wWjdba
-                B0dgbu/kNS87huqcH6f7QRPdQc+R6tu6lSVWDtBqAU5FFFEwH3z1MGt9iF2Rzdc4vvLQBKSnr03Y
-                X0iNA1325bsb6ojp0uCLcFkiMz94A1F4a1RbENL1reXcLkyfZhI1Djy7iBhR6zRqvpfY162c6HDj
-                0c5TwQIhI5iKs/crvjQ5DuIQha0aZVwgCyN3gYAYGhT9Q+1Lx8ygW9HJF89wpUPii+e+JmogOSGn
-                ag/ykNsESltmY4P0LFV6x/jDDrlVofRT9+lClVH1XD8/asP07gSvC3yCbKDh9tVKwcXTst9TjTIX
-                ZViFHbc2aLKw+6jXM2DDoD20ZdTOLRvGvzmjTnDWOdwjXmf213F4nsW926cPVW4GvgEinsbJa0cP
-                uRnxcWke7yrAyidghg5Vuuf8PQFKzzKo3X1TeoCZQ8SheP2F6hsOf575bVu8iX7a625wWjdbaB0d
-                gbuvkVS87huqcH6f7QRPdQFsitXY0528YOlCTWfqIg2zjx8wnGbUbGsotXDL01i1k4l0SqWPRNiO
-                pfOjLXrPx8hL8yGassET956FgvKFqPyf8hIZHfhSudS1/FaFnJ9oP/0G71T2sA2rvXLetuWyRSBF
-                8CILBg42AzMPTgplHmr7dyAs0Ll78V/+DK6WmrzNWMwSdWu/5Fj9v4Iaf1SG1GGildmh+D9BqqvW
-                P8YLk+bO3FuJomZm0WZILTwf4nDU4Rp/GsxNTsKZV8k/L8L4To+OYipG90O5fR/YM8oXOql9ey31
-                ONWhdlWJ0dtzZzWT4Uq51J7eMvpnFo3jX5zSJzhrHO4RjznXcXmx7t04eauwJfAI1PY2S9ol/CM5
-                /OPd5VgZROwQwcqzXP8Ah6AnWeZVG6+qb1ATKHiULx+wvUNhz/PfLbt/ka/bXW3OC8ZrbQOjsDV2
-                chqXncN1Tg7T/aCJ7s5XOT7nXQ/OP5KkYrTOLtnWS/6Qf41/7NibLX8Ip+QHrxpNZYIn7z0LEPKH
-                qPyes7sjvwtXOqa/itCzk+1b/ij9TeKp7WP5gi4ecqH0fmHHGUzEEcHrWY3Tf1xBcC/8bhY7XwPs
-                eqQ2wQ/UlqoXg/Qeqn03+P1lb0L4ca+eWW9BGRMfUTfGUMl2Axn3i/8AGgZ5XpqA5FwkaiSwJIqJ
-                GHRMFsca9OYl2DkrrzOnZ70CzVby4ZpbzNvXSizz2HNkfNVS7HSqpmqopTsahl0j00Z/Q7jj8U+t
-                Zp6nlvSCCWvuI8hw3FUAp111XSAZ8LQdNk8HjmsH6Icq3mjENLLIZemtAhyeaswNQssL31iayvBI
-                p5b7eVo+0Th8MN9W657w9ARrPMqjdfVN6gHlDxKF4/YXqGw5/nvlt2/yNftrrbnBWL1toIsD1zUy
-                puAepMmILiu9ByB6cA7yIB6kE5VHIhdMoTKFXFN3EA+2bPuOm1ynPV6egYtnM1jwOg72Aw9eEKTS
-                B2BjERC1/I4o+DVJZI5AP6a13/J/0S9+0S4Lhcpm1paaWEA47oP6aT9cNM9SmZS3NW+/fAVVSB6b
-                JsQyvnrnbYVKrtvun7h1SgPhKaIJiDoOhj/XAemZZ+yEL6demaLOZi3G2otQG6paFzOquLkacgCY
-                5s4E6Cf949KrlypzEodh17l3n8RDlUnegqiZmji+oi//AKoX7xSDGtJ2M3oPsR3YQAJnwoOgeP8A
-                6hgkkS3L22W3NwYpz/GrXc3wpS7Oudu+RXUpyE003qLif7SHQXA/UhLRIHUTRuMv9S/f/H4njR6H
-                JNK4mGf01rWv8yPgTl90ivV6eFrSQDuIJ67kP6HjhymzqI2WOwbemv3oAdRSZ+YQ622973/E1WDQ
-                6/blTXeuaYBaRsCAADoO/jzwu05KrZWta316Y3JdsslUNB76EIR+RBw3LatyVSrk9QpaAJzWUPWd
-                B0zi1VkNbObGbGF6HyE6yRv2TuGj7/UQu+IaBTq7TrIOhHSBNY9PPGLoOmsZ+vBKQOIl8My05uDb
-                O1WR63FN74OlZFz8JXMmTfQLGZAPDeJjOFmZyeKi5hnC3upfvguj2XpIuNcinL/TXLn9/vLUpDNw
-                kxzLdwM111ZhJXPm0ixn3/rQxvK6Vd4vn//Z
-            </field>
+            <field name="datas" type="base64" file="mail/static/img/msg_discus4_attach2-datas.jpg"/>
         </record>
         <record id="msg_discus4" model="mail.message">
             <field name="body"><![CDATA[<p>Hi Demo,</p>
diff --git a/addons/mail/i18n/ar.po b/addons/mail/i18n/ar.po
index 3d52dfdabde..20186bdb663 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: 2013-09-12 06:29+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
+"X-Launchpad-Export-Date: 2014-01-28 06:35+0000\n"
+"X-Generator: Launchpad (build 16914)\n"
 
 #. module: mail
 #: view:mail.followers:0
diff --git a/addons/mail/i18n/bg.po b/addons/mail/i18n/bg.po
index 3b1bbbe0a8d..b8f96baff93 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: 2013-09-12 06:29+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
+"X-Launchpad-Export-Date: 2014-01-28 06:35+0000\n"
+"X-Generator: Launchpad (build 16914)\n"
 
 #. module: mail
 #: view:mail.followers:0
diff --git a/addons/mail/i18n/bs.po b/addons/mail/i18n/bs.po
index 0887e9a2eaa..6899c9b94dc 100644
--- a/addons/mail/i18n/bs.po
+++ b/addons/mail/i18n/bs.po
@@ -14,13 +14,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-09-12 06:29+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
+"X-Launchpad-Export-Date: 2014-01-28 06:35+0000\n"
+"X-Generator: Launchpad (build 16914)\n"
 
 #. module: mail
 #: view:mail.followers:0
 msgid "Followers Form"
-msgstr ""
+msgstr "Obrazac pratitelja"
 
 #. module: mail
 #: model:ir.model,name:mail.model_publisher_warranty_contract
@@ -32,39 +32,39 @@ msgstr ""
 #: view:mail.mail:0
 #: field:mail.message,author_id:0
 msgid "Author"
-msgstr ""
+msgstr "Autor"
 
 #. module: mail
 #: view:mail.mail:0
 msgid "Message Details"
-msgstr ""
+msgstr "Detalji poruke"
 
 #. module: mail
 #: help:mail.mail,email_to:0
 msgid "Message recipients"
-msgstr ""
+msgstr "Primatelji poruke"
 
 #. module: mail
 #: help:mail.message.subtype,default:0
 msgid "Activated by default when subscribing."
-msgstr ""
+msgstr "Standardno aktivirano kod pretplate"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Comments"
-msgstr ""
+msgstr "Komentari"
 
 #. module: mail
 #: view:mail.alias:0
 #: view:mail.mail:0
 msgid "Group By..."
-msgstr ""
+msgstr "Grupiši po..."
 
 #. module: mail
 #: help:mail.compose.message,body:0
 #: help:mail.message,body:0
 msgid "Automatically sanitized HTML contents"
-msgstr ""
+msgstr "Automatski počišćen HTML sadržaj"
 
 #. module: mail
 #: help:mail.alias,alias_name:0
@@ -72,12 +72,14 @@ msgid ""
 "The name of the email alias, e.g. 'jobs' if you want to catch emails for "
 "<jobs@example.my.openerp.com>"
 msgstr ""
+"Ime e-mail aliasa, npr. 'poslovi' ako žele uhvatiti e-poštu za "
+"<pslovi@primjer.my.openerp.com>"
 
 #. module: mail
 #: model:ir.actions.act_window,name:mail.action_email_compose_message_wizard
 #: view:mail.compose.message:0
 msgid "Compose Email"
-msgstr ""
+msgstr "Sastavi e-poštu"
 
 #. module: mail
 #. openerp-web
@@ -89,22 +91,22 @@ msgstr ""
 #. module: mail
 #: view:mail.group:0
 msgid "Group Name"
-msgstr ""
+msgstr "Naziv grupe"
 
 #. module: mail
 #: selection:mail.group,public:0
 msgid "Public"
-msgstr ""
+msgstr "Javna"
 
 #. module: mail
 #: view:mail.mail:0
 msgid "Body"
-msgstr ""
+msgstr "Tijelo poruke"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Show messages to read"
-msgstr ""
+msgstr "Prikaži poruke za čitanje"
 
 #. module: mail
 #: help:mail.compose.message,email_from:0
@@ -113,37 +115,39 @@ msgid ""
 "Email address of the sender. This field is set when no matching partner is "
 "found for incoming emails."
 msgstr ""
+"Email adresa pošiljatelja. Ovo se polje postavlja kada nije pronađen partner "
+"za dolazni email."
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_compose_message
 msgid "Email composition wizard"
-msgstr ""
+msgstr "Čarobnjak sastavljanja email-a"
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail_followers.xml:23
 #, python-format
 msgid "Add others"
-msgstr ""
+msgstr "Dodaj ostale"
 
 #. module: mail
 #: field:mail.message.subtype,parent_id:0
 msgid "Parent"
-msgstr ""
+msgstr "Roditelj"
 
 #. module: mail
 #: field:mail.group,message_unread:0
 #: field:mail.thread,message_unread:0
 #: field:res.partner,message_unread:0
 msgid "Unread Messages"
-msgstr ""
+msgstr "Nepročitane poruke"
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:313
 #, python-format
 msgid "show"
-msgstr ""
+msgstr "prikaži"
 
 #. module: mail
 #: help:mail.group,group_ids:0
@@ -151,37 +155,39 @@ msgid ""
 "Members of those groups will automatically added as followers. Note that "
 "they will be able to manage their subscription manually if necessary."
 msgstr ""
+"Članovi tih grupa će biti automatski dodani kao pratioci. Imajte na umu da "
+"će oni prema potrebi moći ručno upravljati svojom pretplatom."
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/js/mail.js:1029
 #, python-format
 msgid "Do you really want to delete this message?"
-msgstr ""
+msgstr "Da li zaista želite obrisati ovu poruku?"
 
 #. module: mail
 #: view:mail.message:0
 #: field:mail.notification,read:0
 msgid "Read"
-msgstr ""
+msgstr "Pročitano"
 
 #. module: mail
 #: view:mail.group:0
 msgid "Search Groups"
-msgstr ""
+msgstr "Traži grupe"
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/js/mail_followers.js:157
 #, python-format
 msgid "followers"
-msgstr ""
+msgstr "pratioci"
 
 #. module: mail
 #: code:addons/mail/mail_message.py:737
 #, python-format
 msgid "Access Denied"
-msgstr ""
+msgstr "Pristup Odbijen"
 
 #. module: mail
 #: help:mail.group,image_medium:0
@@ -190,18 +196,21 @@ msgid ""
 "image, with aspect ratio preserved. Use this field in form views or some "
 "kanban views."
 msgstr ""
+"Slika od grupe srednje veličine. Automatski će se promijeniti veličina na "
+"128x128 s očuvanim omjerom.  Koristiti ove polje u pregledima obrasca i "
+"nekim kanban pogledima."
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:212
 #, python-format
 msgid "Uploading error"
-msgstr ""
+msgstr "Greška pri slanju"
 
 #. module: mail
 #: model:mail.group,name:mail.group_support
 msgid "Support"
-msgstr ""
+msgstr "Podrška"
 
 #. module: mail
 #: code:addons/mail/mail_message.py:738
@@ -212,24 +221,28 @@ msgid ""
 "\n"
 "(Document type: %s, Operation: %s)"
 msgstr ""
+"Zahtjevana operacija nije mogla biti izvršena zbog sigurnosnih ograničenja. "
+"Molimo Vas da kontaktirate vašeg sistemskog administratora.\n"
+"\n"
+"(Tip dokumenta: %s, Operacija: %s)"
 
 #. module: mail
 #: view:mail.mail:0
 #: selection:mail.mail,state:0
 msgid "Received"
-msgstr ""
+msgstr "Primljeno"
 
 #. module: mail
 #: view:mail.mail:0
 msgid "Thread"
-msgstr ""
+msgstr "Nit"
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:29
 #, python-format
 msgid "Open the full mail composer"
-msgstr ""
+msgstr "Otvori puni editor pošte"
 
 #. module: mail
 #. openerp-web
@@ -241,29 +254,29 @@ msgstr ""
 #. module: mail
 #: field:base.config.settings,alias_domain:0
 msgid "Alias Domain"
-msgstr ""
+msgstr "Alias domena"
 
 #. module: mail
 #: field:mail.group,group_ids:0
 msgid "Auto Subscription"
-msgstr ""
+msgstr "Auto pretplata"
 
 #. module: mail
 #: field:mail.mail,references:0
 msgid "References"
-msgstr ""
+msgstr "Reference"
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:206
 #, python-format
 msgid "No messages."
-msgstr ""
+msgstr "Nema poruka."
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_group
 msgid "Discussion group"
-msgstr ""
+msgstr "Grupe za raspravu"
 
 #. module: mail
 #. openerp-web
@@ -271,14 +284,14 @@ msgstr ""
 #: code:addons/mail/static/src/xml/mail.xml:108
 #, python-format
 msgid "uploading"
-msgstr ""
+msgstr "učitavanje"
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail_followers.xml:52
 #, python-format
 msgid "more."
-msgstr ""
+msgstr "više."
 
 #. module: mail
 #: help:mail.compose.message,type:0
@@ -287,6 +300,8 @@ msgid ""
 "Message type: email for email message, notification for system message, "
 "comment for other messages such as user replies"
 msgstr ""
+"Vrsta poruke: e-mail za e-mail poruke, obavjest za sistemske poruke, "
+"komentari za druge poruke poput korisničkih odgovora"
 
 #. module: mail
 #: help:mail.message.subtype,relation_field:0
@@ -299,46 +314,46 @@ msgstr ""
 #. module: mail
 #: selection:mail.mail,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Otkazani"
 
 #. module: mail
 #: field:mail.mail,reply_to:0
 msgid "Reply-To"
-msgstr ""
+msgstr "Odgovori na"
 
 #. module: mail
 #: code:addons/mail/wizard/invite.py:37
 #, python-format
 msgid "<div>You have been invited to follow %s.</div>"
-msgstr ""
+msgstr "<div>Pozvani ste da pratite %s.</div>"
 
 #. module: mail
 #: help:mail.group,message_unread:0
 #: help:mail.thread,message_unread:0
 #: help:res.partner,message_unread:0
 msgid "If checked new messages require your attention."
-msgstr ""
+msgstr "Ako je označeno nove poruke će zahtjevati vašu pažnju."
 
 #. module: mail
 #: field:mail.group,image_medium:0
 msgid "Medium-sized photo"
-msgstr ""
+msgstr "Slika srednje veličine"
 
 #. module: mail
 #: model:ir.actions.client,name:mail.action_mail_to_me_feeds
 #: model:ir.ui.menu,name:mail.mail_tomefeeds
 msgid "To: me"
-msgstr ""
+msgstr "Za: mene"
 
 #. module: mail
 #: field:mail.message.subtype,name:0
 msgid "Message Type"
-msgstr ""
+msgstr "Tip poruke"
 
 #. module: mail
 #: field:mail.mail,auto_delete:0
 msgid "Auto Delete"
-msgstr ""
+msgstr "Automatsko brisanje"
 
 #. module: mail
 #. openerp-web
@@ -346,28 +361,28 @@ msgstr ""
 #: view:mail.group:0
 #, python-format
 msgid "Unfollow"
-msgstr ""
+msgstr "Ne slijedi više"
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:312
 #, python-format
 msgid "show one more message"
-msgstr ""
+msgstr "prikaži još jednu poruku"
 
 #. module: mail
 #: code:addons/mail/mail_mail.py:75
 #: code:addons/mail/res_users.py:69
 #, python-format
 msgid "Invalid Action!"
-msgstr ""
+msgstr "Ne pravilna akcija"
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:25
 #, python-format
 msgid "User img"
-msgstr ""
+msgstr "Slika korisnika"
 
 #. module: mail
 #: model:ir.actions.act_window,name:mail.action_view_mail_mail
@@ -375,12 +390,12 @@ msgstr ""
 #: view:mail.mail:0
 #: view:mail.message:0
 msgid "Emails"
-msgstr ""
+msgstr "E-mail"
 
 #. module: mail
 #: field:mail.followers,partner_id:0
 msgid "Related Partner"
-msgstr ""
+msgstr "Povezani partner"
 
 #. module: mail
 #: help:mail.group,message_summary:0
@@ -390,6 +405,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 ""
+"Sadrži sažetak konverzacije (broj poruka,..). Ovaj sažetak je u html formatu "
+"da bi mogao biti ubačen u kanban pogled."
 
 #. module: mail
 #: help:mail.alias,alias_model_id:0
@@ -398,56 +415,59 @@ msgid ""
 "incoming email that does not reply to an existing record will cause the "
 "creation of a new record of this model (e.g. a Project Task)"
 msgstr ""
+"Model (OpenERP vrsta dokumenta) na koje ovaj alias odgovara. Svaki dolazni e-"
+"mail koji ne odgovara na postojeći zapis uzrokovati će stvaranje novog "
+"zapisa ovog modela (npr. projektni zadatak)"
 
 #. module: mail
 #: field:mail.message.subtype,relation_field:0
 msgid "Relation field"
-msgstr ""
+msgstr "Relacijsko polje"
 
 #. module: mail
 #: selection:mail.compose.message,type:0
 #: selection:mail.message,type:0
 msgid "System notification"
-msgstr ""
+msgstr "Sistemska obavijest"
 
 #. module: mail
 #: model:ir.model,name:mail.model_res_partner
 msgid "Partner"
-msgstr ""
+msgstr "Partner"
 
 #. module: mail
 #: model:ir.ui.menu,name:mail.mail_my_stuff
 msgid "Organizer"
-msgstr ""
+msgstr "Organizator"
 
 #. module: mail
 #: field:mail.compose.message,subject:0
 #: field:mail.message,subject:0
 msgid "Subject"
-msgstr ""
+msgstr "Tema"
 
 #. module: mail
 #: field:mail.wizard.invite,partner_ids:0
 msgid "Partners"
-msgstr ""
+msgstr "Partneri"
 
 #. module: mail
 #: view:mail.mail:0
 msgid "Retry"
-msgstr ""
+msgstr "Pokušaj opet"
 
 #. module: mail
 #: field:mail.compose.message,email_from:0
 #: field:mail.mail,email_from:0
 #: field:mail.message,email_from:0
 msgid "From"
-msgstr ""
+msgstr "Od"
 
 #. module: mail
 #: view:mail.mail:0
 #: view:mail.message.subtype:0
 msgid "Email message"
-msgstr ""
+msgstr "E-mail poruka"
 
 #. module: mail
 #: model:ir.model,name:mail.model_base_config_settings
@@ -460,19 +480,19 @@ msgstr ""
 #: view:mail.compose.message:0
 #, python-format
 msgid "Send"
-msgstr ""
+msgstr "Pošalji"
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/js/mail_followers.js:153
 #, python-format
 msgid "No followers"
-msgstr ""
+msgstr "Nema pratoca"
 
 #. module: mail
 #: view:mail.mail:0
 msgid "Failed"
-msgstr ""
+msgstr "Neuspješan"
 
 #. module: mail
 #. openerp-web
@@ -485,13 +505,13 @@ msgstr ""
 #: field:res.partner,message_follower_ids:0
 #, python-format
 msgid "Followers"
-msgstr ""
+msgstr "Pratioci"
 
 #. module: mail
 #: model:ir.actions.client,name:mail.action_mail_archives_feeds
 #: model:ir.ui.menu,name:mail.mail_archivesfeeds
 msgid "Archives"
-msgstr ""
+msgstr "Arhive"
 
 #. module: mail
 #. openerp-web
@@ -499,7 +519,7 @@ msgstr ""
 #: code:addons/mail/static/src/xml/mail.xml:107
 #, python-format
 msgid "Delete this attachment"
-msgstr ""
+msgstr "Obriši ovu zakačku"
 
 #. module: mail
 #. openerp-web
@@ -507,32 +527,32 @@ msgstr ""
 #: view:mail.mail:0
 #, python-format
 msgid "Reply"
-msgstr ""
+msgstr "Odgovori"
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/js/mail_followers.js:155
 #, python-format
 msgid "One follower"
-msgstr ""
+msgstr "Jedan pratitelj"
 
 #. module: mail
 #: field:mail.compose.message,type:0
 #: field:mail.message,type:0
 msgid "Type"
-msgstr ""
+msgstr "Tip"
 
 #. module: mail
 #: selection:mail.compose.message,type:0
 #: view:mail.mail:0
 #: selection:mail.message,type:0
 msgid "Email"
-msgstr ""
+msgstr "E-Mail"
 
 #. module: mail
 #: field:ir.ui.menu,mail_group_id:0
 msgid "Mail Group"
-msgstr ""
+msgstr "Mail grupa"
 
 #. module: mail
 #: selection:res.partner,notification_email_send:0
@@ -542,13 +562,13 @@ msgstr ""
 #. module: mail
 #: field:mail.alias,alias_defaults:0
 msgid "Default Values"
-msgstr ""
+msgstr "Zadane vrijednosti"
 
 #. module: mail
 #: code:addons/mail/res_users.py:89
 #, python-format
 msgid "%s has joined the %s network."
-msgstr ""
+msgstr "%s se priključio %s mreži."
 
 #. module: mail
 #: help:mail.group,image_small:0
@@ -557,19 +577,21 @@ msgid ""
 "image, with aspect ratio preserved. Use this field anywhere a small image is "
 "required."
 msgstr ""
+"Slika grupe malog formata. Automatski će se promijeniti veličina na 64x64, s "
+"očuvanim omjerom. Koristite ovo polje gdje je potrebna mala slika."
 
 #. module: mail
 #: view:mail.compose.message:0
 #: field:mail.message,partner_ids:0
 msgid "Recipients"
-msgstr ""
+msgstr "Primaoci"
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:140
 #, python-format
 msgid "<<<"
-msgstr ""
+msgstr "<<<"
 
 #. module: mail
 #. openerp-web
@@ -581,29 +603,29 @@ msgstr ""
 #. module: mail
 #: field:mail.group,group_public_id:0
 msgid "Authorized Group"
-msgstr ""
+msgstr "Ovlaštena grupa"
 
 #. module: mail
 #: view:mail.group:0
 msgid "Join Group"
-msgstr ""
+msgstr "Priključi se grupi"
 
 #. module: mail
 #: help:mail.mail,email_from:0
 msgid "Message sender, taken from user preferences."
-msgstr ""
+msgstr "Pošiljatelj poruke, preuzet iz postavki korisnika"
 
 #. module: mail
 #: code:addons/mail/wizard/invite.py:40
 #, python-format
 msgid "<div>You have been invited to follow a new document.</div>"
-msgstr ""
+msgstr "<div>Pozvani ste da pratite novi dokument.</div>"
 
 #. module: mail
 #: field:mail.compose.message,parent_id:0
 #: field:mail.message,parent_id:0
 msgid "Parent Message"
-msgstr ""
+msgstr "Nadređena poruka"
 
 #. module: mail
 #: field:mail.compose.message,res_id:0
@@ -611,7 +633,7 @@ msgstr ""
 #: field:mail.message,res_id:0
 #: field:mail.wizard.invite,res_id:0
 msgid "Related Document ID"
-msgstr ""
+msgstr "Povezani ID dokumenta"
 
 #. module: mail
 #: model:ir.actions.client,help:mail.action_mail_to_me_feeds
@@ -623,11 +645,17 @@ msgid ""
 "                </p>\n"
 "            "
 msgstr ""
+"<p>\n"
+"                    <b>Nemate privatnih poruka.</b>\n"
+"                </p><p>\n"
+"                    Ova lista sadrži poruke poslane Vama.\n"
+"                </p>\n"
+"            "
 
 #. module: mail
 #: model:mail.group,name:mail.group_rd
 msgid "R&D"
-msgstr ""
+msgstr "Istraživanje i razvoj"
 
 #. module: mail
 #. openerp-web
@@ -639,31 +667,31 @@ msgstr ""
 #. module: mail
 #: model:ir.model,name:mail.model_mail_thread
 msgid "Email Thread"
-msgstr ""
+msgstr "Nit e-pošte"
 
 #. module: mail
 #: view:mail.mail:0
 msgid "Advanced"
-msgstr ""
+msgstr "Napredno"
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:244
 #, python-format
 msgid "Move to Inbox"
-msgstr ""
+msgstr "Premjesti u ulaznu poštu"
 
 #. module: mail
 #: code:addons/mail/wizard/mail_compose_message.py:193
 #, python-format
 msgid "Re:"
-msgstr ""
+msgstr "Re:"
 
 #. module: mail
 #: field:mail.compose.message,to_read:0
 #: field:mail.message,to_read:0
 msgid "To read"
-msgstr ""
+msgstr "Za čitanje"
 
 #. module: mail
 #: code:addons/mail/res_users.py:69
@@ -672,37 +700,39 @@ msgid ""
 "You may not create a user. To create new users, you should use the "
 "\"Settings > Users\" menu."
 msgstr ""
+"Ne možete kreirati korisnika. Za kreiranje novih korisnika, trebali biste "
+"koristiti meni \"Postavke > Korisnici\"."
 
 #. module: mail
 #: help:mail.followers,res_model:0
 #: help:mail.wizard.invite,res_model:0
 msgid "Model of the followed resource"
-msgstr ""
+msgstr "Model pratećeg resursa"
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:337
 #, python-format
 msgid "like"
-msgstr ""
+msgstr "sviđa mi se"
 
 #. module: mail
 #: view:mail.compose.message:0
 #: view:mail.wizard.invite:0
 msgid "Cancel"
-msgstr ""
+msgstr "Otkaži"
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:47
 #, python-format
 msgid "Share with my followers..."
-msgstr ""
+msgstr "Podijeli sa mojim pratiocima..."
 
 #. module: mail
 #: field:mail.notification,partner_id:0
 msgid "Contact"
-msgstr ""
+msgstr "Kontakt"
 
 #. module: mail
 #: view:mail.group:0
@@ -710,6 +740,8 @@ msgid ""
 "Only the invited followers can read the\n"
 "                                    discussions on this group."
 msgstr ""
+"Samo pozvani sljedbenici mogu čitati \n"
+"                                    raspravu na ovoj grupi."
 
 #. module: mail
 #: model:ir.model,name:mail.model_ir_ui_menu
@@ -719,12 +751,12 @@ msgstr ""
 #. module: mail
 #: view:mail.message:0
 msgid "Has attachments"
-msgstr ""
+msgstr "Ima prilog"
 
 #. module: mail
 #: view:mail.mail:0
 msgid "on"
-msgstr ""
+msgstr "na"
 
 #. module: mail
 #: code:addons/mail/mail_message.py:926
@@ -733,6 +765,8 @@ msgid ""
 "The following partners chosen as recipients for the email have no email "
 "address linked :"
 msgstr ""
+"Sljedeći partneri odabrani kao primatelji e-maila nemaju povezanu e-mail "
+"adresu:"
 
 #. module: mail
 #: help:mail.alias,alias_defaults:0
@@ -740,25 +774,27 @@ msgid ""
 "A Python dictionary that will be evaluated to provide default values when "
 "creating new records for this alias."
 msgstr ""
+"Python dictionary koji će se provjeravati za zadane postave kada se kreira "
+"novi zapis za ovaj alias."
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_message_subtype
 msgid "Message subtypes"
-msgstr ""
+msgstr "Podtipovi poruka"
 
 #. module: mail
 #: help:mail.compose.message,notified_partner_ids:0
 #: help:mail.message,notified_partner_ids:0
 msgid ""
 "Partners that have a notification pushing this message in their mailboxes"
-msgstr ""
+msgstr "Poruka za partnere koji imaju obavjesti."
 
 #. module: mail
 #: selection:mail.compose.message,type:0
 #: view:mail.mail:0
 #: selection:mail.message,type:0
 msgid "Comment"
-msgstr ""
+msgstr "Komentar"
 
 #. module: mail
 #: model:ir.actions.client,help:mail.action_mail_inbox_feeds
@@ -774,23 +810,33 @@ msgid ""
 "                </p>\n"
 "            "
 msgstr ""
+"<p>\n"
+"                    <b>Odlično !</b> Vaš inbox je prazan.\n"
+"                </p><p>\n"
+"                    Vaš inbox sadrži privatne poruke ili e-mailove poslane "
+"Vama\n"
+"                    kao i informacije povezane sa dokumentima ili ljudima "
+"koje\n"
+"                    slijedite.\n"
+"                </p>\n"
+"            "
 
 #. module: mail
 #: field:mail.mail,notification:0
 msgid "Is Notification"
-msgstr ""
+msgstr "Je obavijest"
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:188
 #, python-format
 msgid "Compose a new message"
-msgstr ""
+msgstr "Sastavi novu poruku"
 
 #. module: mail
 #: view:mail.mail:0
 msgid "Send Now"
-msgstr ""
+msgstr "Pošalji odmah"
 
 #. module: mail
 #: code:addons/mail/mail_mail.py:75
@@ -798,6 +844,8 @@ msgstr ""
 msgid ""
 "Unable to send email, please configure the sender's email address or alias."
 msgstr ""
+"Nije moguće postali e-mail, molimo podesite pošiljateljevu e-mail adresu ili "
+"alias."
 
 #. module: mail
 #: help:res.users,alias_id:0
@@ -805,11 +853,13 @@ msgid ""
 "Email address internally associated with this user. Incoming emails will "
 "appear in the user's notifications."
 msgstr ""
+"E-mail adresa interno povezana s ovim korisnikom. Dolazni e-mail će se "
+"pojaviti u korisnikovim obavijestima."
 
 #. module: mail
 #: field:mail.group,image:0
 msgid "Photo"
-msgstr ""
+msgstr "Slika"
 
 #. module: mail
 #. openerp-web
@@ -819,13 +869,13 @@ msgstr ""
 #: view:mail.wizard.invite:0
 #, python-format
 msgid "or"
-msgstr ""
+msgstr "ili"
 
 #. module: mail
 #: help:mail.compose.message,vote_user_ids:0
 #: help:mail.message,vote_user_ids:0
 msgid "Users that voted for this message"
-msgstr ""
+msgstr "Korisnici koji su glasali za ovu poruku"
 
 #. module: mail
 #: help:mail.group,alias_id:0
@@ -833,32 +883,34 @@ msgid ""
 "The email address associated with this group. New emails received will "
 "automatically create new topics."
 msgstr ""
+"Adresa e-pošte povezana s ovom grupom. Novoprimljene poruke automatski će "
+"stvoriti nove teme."
 
 #. module: mail
 #: view:mail.mail:0
 msgid "Month"
-msgstr ""
+msgstr "Mjesec"
 
 #. module: mail
 #: view:mail.mail:0
 msgid "Email Search"
-msgstr ""
+msgstr "Pretraživanje e-mailova"
 
 #. module: mail
 #: field:mail.compose.message,child_ids:0
 #: field:mail.message,child_ids:0
 msgid "Child Messages"
-msgstr ""
+msgstr "Podređene poruke"
 
 #. module: mail
 #: field:mail.alias,alias_user_id:0
 msgid "Owner"
-msgstr ""
+msgstr "Vlasnik"
 
 #. module: mail
 #: model:ir.model,name:mail.model_res_users
 msgid "Users"
-msgstr ""
+msgstr "Korisnici"
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_message
@@ -867,25 +919,25 @@ msgstr ""
 #: field:mail.notification,message_id:0
 #: field:mail.wizard.invite,message:0
 msgid "Message"
-msgstr ""
+msgstr "Poruka"
 
 #. module: mail
 #: help:mail.followers,res_id:0
 #: help:mail.wizard.invite,res_id:0
 msgid "Id of the followed resource"
-msgstr ""
+msgstr "Id resursa koji se prati"
 
 #. module: mail
 #: field:mail.compose.message,body:0
 #: field:mail.message,body:0
 msgid "Contents"
-msgstr ""
+msgstr "Sadržaji"
 
 #. module: mail
 #: model:ir.actions.act_window,name:mail.action_view_mail_alias
 #: model:ir.ui.menu,name:mail.mail_alias_menu
 msgid "Aliases"
-msgstr ""
+msgstr "Aliasi"
 
 #. module: mail
 #: help:mail.message.subtype,description:0
@@ -893,60 +945,62 @@ msgid ""
 "Description that will be added in the message posted for this subtype. If "
 "void, the name will be added instead."
 msgstr ""
+"Opis koji će biti dodan u objavljenoj poruci za ovaj podtip. Ako nedostaje, "
+"biti će dodan naziv."
 
 #. module: mail
 #: field:mail.compose.message,vote_user_ids:0
 #: field:mail.message,vote_user_ids:0
 msgid "Votes"
-msgstr ""
+msgstr "Glasovi"
 
 #. module: mail
 #: view:mail.group:0
 msgid "Group"
-msgstr ""
+msgstr "Grupa"
 
 #. module: mail
 #: help:mail.compose.message,starred:0
 #: help:mail.message,starred:0
 msgid "Current user has a starred notification linked to this message"
-msgstr ""
+msgstr "Trenutni korisnik ima označenu obavijest povezanu sa ovom porukom."
 
 #. module: mail
 #: field:mail.group,public:0
 msgid "Privacy"
-msgstr ""
+msgstr "Privatnost"
 
 #. module: mail
 #: view:mail.mail:0
 msgid "Notification"
-msgstr ""
+msgstr "Obavještenje"
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/js/mail.js:654
 #, python-format
 msgid "Please complete partner's informations"
-msgstr ""
+msgstr "Molimo popunite informacije o partneru"
 
 #. module: mail
 #: view:mail.wizard.invite:0
 msgid "Add Followers"
-msgstr ""
+msgstr "Dodaj pratioce"
 
 #. module: mail
 #: view:mail.compose.message:0
 msgid "Followers of selected items and"
-msgstr ""
+msgstr "Pratioci odabranih predmeta i"
 
 #. module: mail
 #: field:mail.alias,alias_force_thread_id:0
 msgid "Record Thread ID"
-msgstr ""
+msgstr "ID niti zapisa"
 
 #. module: mail
 #: model:ir.ui.menu,name:mail.mail_group_root
 msgid "My Groups"
-msgstr ""
+msgstr "Moje grupe"
 
 #. module: mail
 #: model:ir.actions.client,help:mail.action_mail_archives_feeds
@@ -960,18 +1014,27 @@ msgid ""
 "                </p>\n"
 "            "
 msgstr ""
+"<p>\n"
+"                    Poruka nije pronađena niti poslana.\n"
+"                </p><p>\n"
+"                    Pritisnite ikonu u gornjem desnom uglu kako biste "
+"kreirali novu poruku. Ova\n"
+"                    poruka će biti poslana putem e-maila ako se radi o "
+"internom kontaktu.\n"
+"                </p>\n"
+"            "
 
 #. module: mail
 #: view:mail.mail:0
 #: field:mail.mail,state:0
 msgid "Status"
-msgstr ""
+msgstr "Status"
 
 #. module: mail
 #: view:mail.mail:0
 #: selection:mail.mail,state:0
 msgid "Outgoing"
-msgstr ""
+msgstr "Odlazeći"
 
 #. module: mail
 #: selection:res.partner,notification_email_send:0
@@ -982,7 +1045,7 @@ msgstr ""
 #: help:mail.compose.message,record_name:0
 #: help:mail.message,record_name:0
 msgid "Name get of the related document."
-msgstr ""
+msgstr "Naziv preuzet iz povezanog dokumenta"
 
 #. module: mail
 #: model:ir.actions.act_window,name:mail.action_view_notifications
@@ -993,12 +1056,12 @@ msgstr ""
 #: field:mail.message,notification_ids:0
 #: view:mail.notification:0
 msgid "Notifications"
-msgstr ""
+msgstr "Obavještenja"
 
 #. module: mail
 #: view:mail.alias:0
 msgid "Search Alias"
-msgstr ""
+msgstr "Traži alias"
 
 #. module: mail
 #: help:mail.alias,alias_force_thread_id:0
@@ -1007,6 +1070,9 @@ msgid ""
 "attached, even if they did not reply to it. If set, this will disable the "
 "creation of new records completely."
 msgstr ""
+"Opcionalni ID zapisa na kojeg će biti povezane sve dolazne poruke, čak i ako "
+"oni nisu odgovorili na njega. Ako je postavljeno, to će onemogućiti "
+"stvaranje novih zapisa u potpunosti."
 
 #. module: mail
 #: help:mail.message.subtype,name:0
@@ -1017,50 +1083,54 @@ msgid ""
 "subtypes allow to precisely tune the notifications the user want to receive "
 "on its wall."
 msgstr ""
+"Podvrste poruka preciznije definiraju poruku, posebno za sistemske "
+"obavijesti. Na primjer, to može biti obavijesti vezane uz novi zapis (nova), "
+"ili na promjene faze u procesu (promjena faze). Podvrste poruka omogućuju "
+"precizno podešavanje obavijesti koje korisnici žele primati na svoj zid."
 
 #. module: mail
 #: view:mail.mail:0
 msgid "by"
-msgstr ""
+msgstr "od"
 
 #. module: mail
 #: model:mail.group,name:mail.group_best_sales_practices
 msgid "Best Sales Practices"
-msgstr ""
+msgstr "Najbolja praksa u prodaji"
 
 #. module: mail
 #: selection:mail.group,public:0
 msgid "Selected Group Only"
-msgstr ""
+msgstr "Samo odabrane grupe"
 
 #. module: mail
 #: field:mail.group,message_is_follower:0
 #: field:mail.thread,message_is_follower:0
 #: field:res.partner,message_is_follower:0
 msgid "Is a Follower"
-msgstr ""
+msgstr "Je pratilac"
 
 #. module: mail
 #: view:mail.alias:0
 #: view:mail.mail:0
 msgid "User"
-msgstr ""
+msgstr "Korisnik"
 
 #. module: mail
 #: view:mail.group:0
 msgid "Groups"
-msgstr ""
+msgstr "Grupe"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Messages Search"
-msgstr ""
+msgstr "Pretraga poruka"
 
 #. module: mail
 #: field:mail.compose.message,date:0
 #: field:mail.message,date:0
 msgid "Date"
-msgstr ""
+msgstr "Datum"
 
 #. module: mail
 #. openerp-web
@@ -1072,68 +1142,70 @@ msgstr ""
 #. module: mail
 #: view:mail.mail:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Napredni filteri..."
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:120
 #, python-format
 msgid "To:"
-msgstr ""
+msgstr "Za:"
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:193
 #, python-format
 msgid "Write to my followers"
-msgstr ""
+msgstr "Piši mojim pratiocima"
 
 #. module: mail
 #: model:ir.model,name:mail.model_res_groups
 msgid "Access Groups"
-msgstr ""
+msgstr "Pristupne grupe"
 
 #. module: mail
 #: field:mail.message.subtype,default:0
 msgid "Default"
-msgstr ""
+msgstr "Zadano"
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:311
 #, python-format
 msgid "show more message"
-msgstr ""
+msgstr "pokaži još poruka"
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:246
 #, python-format
 msgid "Mark as Todo"
-msgstr ""
+msgstr "Označi sa 'Za uraditi'"
 
 #. module: mail
 #: help:mail.message.subtype,parent_id:0
 msgid "Parent subtype, used for automatic subscription."
-msgstr ""
+msgstr "Nadređeni podtip, koristi se za automatsku pretplatu."
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_wizard_invite
 msgid "Invite wizard"
-msgstr ""
+msgstr "Čarobnjak za pozivanje"
 
 #. module: mail
 #: field:mail.group,message_summary:0
 #: field:mail.thread,message_summary:0
 #: field:res.partner,message_summary:0
 msgid "Summary"
-msgstr ""
+msgstr "Rezime"
 
 #. module: mail
 #: help:mail.message.subtype,res_model:0
 msgid ""
 "Model the subtype applies to. If False, this subtype applies to all models."
 msgstr ""
+"Model na koji se podtip odnosi. Ako nema, ovaj podtip odnosi se na sve "
+"modele."
 
 #. module: mail
 #: field:mail.compose.message,subtype_id:0
@@ -1141,45 +1213,46 @@ msgstr ""
 #: field:mail.message,subtype_id:0
 #: view:mail.message.subtype:0
 msgid "Subtype"
-msgstr ""
+msgstr "Podtip"
 
 #. module: mail
 #: view:mail.group:0
 msgid "Group Form"
-msgstr ""
+msgstr "Grupni obrazac"
 
 #. module: mail
 #: field:mail.compose.message,starred:0
 #: field:mail.message,starred:0
 #: field:mail.notification,starred:0
 msgid "Starred"
-msgstr ""
+msgstr "Sa zvjezdicom"
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:313
 #, python-format
 msgid "more messages"
-msgstr ""
+msgstr "više poruka"
 
 #. module: mail
 #: code:addons/mail/update.py:93
 #, python-format
 msgid "Error"
-msgstr ""
+msgstr "Greška"
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail_followers.xml:13
 #, python-format
 msgid "Following"
-msgstr ""
+msgstr "Pratim"
 
 #. module: mail
 #: sql_constraint:mail.alias:0
 msgid ""
 "Unfortunately this email alias is already used, please choose a unique one"
 msgstr ""
+"Nažalost ovaj e-mail alias se već koristi, molimo odaberite jedinstveni"
 
 #. module: mail
 #: help:mail.alias,alias_user_id:0
@@ -1189,19 +1262,23 @@ msgid ""
 "the sender (From) address, or will use the Administrator account if no "
 "system user is found for that address."
 msgstr ""
+"Vlasnik zapisa kreiranih nakon primitka e-mailova na taj alias. Ako ovo "
+"polje nije postavljeno sustav će pokušati pronaći pravog vlasnika na temelju "
+"adrese pošiljatelja (od), ili će koristiti administratorski račun ako ne "
+"pronađe sistemskog korisnika za tu adresu."
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail_followers.xml:52
 #, python-format
 msgid "And"
-msgstr ""
+msgstr "i"
 
 #. module: mail
 #: field:mail.compose.message,message_id:0
 #: field:mail.message,message_id:0
 msgid "Message-Id"
-msgstr ""
+msgstr "Id-poruke"
 
 #. module: mail
 #: help:mail.group,image:0
@@ -1209,29 +1286,30 @@ msgid ""
 "This field holds the image used as photo for the group, limited to "
 "1024x1024px."
 msgstr ""
+"Ovo polje sadrži sliku koja se koristi za grupu, ograničeno na 1014x1024 px."
 
 #. module: mail
 #: field:mail.compose.message,attachment_ids:0
 #: view:mail.mail:0
 #: field:mail.message,attachment_ids:0
 msgid "Attachments"
-msgstr ""
+msgstr "Prilozi"
 
 #. module: mail
 #: field:mail.compose.message,record_name:0
 #: field:mail.message,record_name:0
 msgid "Message Record Name"
-msgstr ""
+msgstr "Naziv zapisa poruke"
 
 #. module: mail
 #: field:mail.mail,email_cc:0
 msgid "Cc"
-msgstr ""
+msgstr "Cc"
 
 #. module: mail
 #: help:mail.notification,starred:0
 msgid "Starred message that goes into the todo mailbox"
-msgstr ""
+msgstr "Označena poruka koja ide u 'Za uraditi' sandučić"
 
 #. module: mail
 #. openerp-web
@@ -1239,46 +1317,46 @@ msgstr ""
 #: view:mail.compose.message:0
 #, python-format
 msgid "Followers of"
-msgstr ""
+msgstr "Sljedbenici od"
 
 #. module: mail
 #: help:mail.mail,auto_delete:0
 msgid "Permanently delete this email after sending it, to save space"
-msgstr ""
+msgstr "Trajno obriši ovaj e-mail nakon slanja, radi uštede prostora"
 
 #. module: mail
 #: model:ir.actions.client,name:mail.action_mail_group_feeds
 msgid "Discussion Group"
-msgstr ""
+msgstr "Grupa za raspravu"
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:242
 #, python-format
 msgid "Done"
-msgstr ""
+msgstr "Gotovo"
 
 #. module: mail
 #: model:mail.message.subtype,name:mail.mt_comment
 msgid "Discussions"
-msgstr ""
+msgstr "Rasprave"
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail_followers.xml:11
 #, python-format
 msgid "Follow"
-msgstr ""
+msgstr "Prati"
 
 #. module: mail
 #: field:mail.group,name:0
 msgid "Name"
-msgstr ""
+msgstr "Naziv"
 
 #. module: mail
 #: model:mail.group,name:mail.group_all_employees
 msgid "Whole Company"
-msgstr ""
+msgstr "Cijela kompanija"
 
 #. module: mail
 #. openerp-web
@@ -1287,45 +1365,45 @@ msgstr ""
 #: view:mail.compose.message:0
 #, python-format
 msgid "and"
-msgstr ""
+msgstr "i"
 
 #. module: mail
 #: help:mail.mail,body_html:0
 msgid "Rich-text/HTML message"
-msgstr ""
+msgstr "Bogati text/HTML poruka"
 
 #. module: mail
 #: view:mail.mail:0
 msgid "Creation Month"
-msgstr ""
+msgstr "Mjesec kreiranja"
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:323
 #, python-format
 msgid "Compose new Message"
-msgstr ""
+msgstr "Sastavi novu poruku"
 
 #. module: mail
 #: field:mail.group,menu_id:0
 msgid "Related Menu"
-msgstr ""
+msgstr "Povezani meni"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Content"
-msgstr ""
+msgstr "Sadržaj"
 
 #. module: mail
 #: field:mail.mail,email_to:0
 msgid "To"
-msgstr ""
+msgstr "Za"
 
 #. module: mail
 #: field:mail.compose.message,notified_partner_ids:0
 #: field:mail.message,notified_partner_ids:0
 msgid "Notified partners"
-msgstr ""
+msgstr "Obaviješteni partneri"
 
 #. module: mail
 #: help:mail.group,public:0
@@ -1333,11 +1411,13 @@ msgid ""
 "This group is visible by non members.             Invisible groups can add "
 "members through the invite button."
 msgstr ""
+"Ova grupa je vidljiva svima. Za nevidljive grupe članovi se dodaju kroz "
+"dugme pozivanja."
 
 #. module: mail
 #: model:mail.group,name:mail.group_board
 msgid "Board meetings"
-msgstr ""
+msgstr "Sastanci članova uprave"
 
 #. module: mail
 #: constraint:mail.alias:0
@@ -1345,68 +1425,71 @@ msgid ""
 "Invalid expression, it must be a literal python dictionary definition e.g. "
 "\"{'field': 'value'}\""
 msgstr ""
+"Nevažeći izraz, to mora biti doslovna python definicija npr. \"{'field': "
+"'value'}\""
 
 #. module: mail
 #: field:mail.alias,alias_model_id:0
 msgid "Aliased Model"
-msgstr ""
+msgstr "Zamjenski model"
 
 #. module: mail
 #: help:mail.compose.message,message_id:0
 #: help:mail.message,message_id:0
 msgid "Message unique identifier"
-msgstr ""
+msgstr "Jedinstveni identifikator poruke"
 
 #. module: mail
 #: field:mail.group,description:0
 #: field:mail.message.subtype,description:0
 msgid "Description"
-msgstr ""
+msgstr "Opis"
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_followers
 msgid "Document Followers"
-msgstr ""
+msgstr "Pratioci dokumenta"
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail_followers.xml:35
 #, python-format
 msgid "Remove this follower"
-msgstr ""
+msgstr "Ukloni ovog pratioca"
 
 #. module: mail
 #: selection:res.partner,notification_email_send:0
 msgid "Never"
-msgstr ""
+msgstr "Nikada"
 
 #. module: mail
 #: field:mail.mail,mail_server_id:0
 msgid "Outgoing mail server"
-msgstr ""
+msgstr "Izlazni server e-pošte"
 
 #. module: mail
 #: code:addons/mail/mail_message.py:930
 #, python-format
 msgid "Partners email addresses not found"
-msgstr ""
+msgstr "Partnerove e-mail adrese nisu pronađene"
 
 #. module: mail
 #: view:mail.mail:0
 #: selection:mail.mail,state:0
 msgid "Sent"
-msgstr ""
+msgstr "Poslato"
 
 #. module: mail
 #: field:mail.mail,body_html:0
 msgid "Rich-text Contents"
-msgstr ""
+msgstr "Formatirani tekst"
 
 #. module: mail
 #: help:mail.compose.message,to_read:0
 #: help:mail.message,to_read:0
 msgid "Current user has an unread notification linked to this message"
 msgstr ""
+"Trenutni korisnik ima nepročitane obavijesti povezane sa ovom porukom"
 
 #. module: mail
 #: help:res.partner,notification_email_send:0
@@ -1418,7 +1501,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:mail.action_view_groups
 #: model:ir.ui.menu,name:mail.mail_allgroups
 msgid "Join a group"
-msgstr ""
+msgstr "Priključi se grupi"
 
 #. module: mail
 #: model:ir.actions.client,help:mail.action_mail_group_feeds
@@ -1428,13 +1511,17 @@ msgid ""
 "                </p>\n"
 "            "
 msgstr ""
+"<p>\n"
+"                    U ovoj grupi nema poruka.\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 "Molimo, pričekajte dok se datoteka ne učita"
 
 #. module: mail
 #: view:mail.group:0
@@ -1444,25 +1531,29 @@ msgid ""
 "installed\n"
 "                                    the portal module."
 msgstr ""
+"Ova je grupa vidljiva svima,\n"
+"                                    uključujući i Vaše partnere ukoliko ste "
+"instalirali\n"
+"                                    portal modul."
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:243
 #, python-format
 msgid "Set back to Todo"
-msgstr ""
+msgstr "Vrati natrag na 'Za uraditi'"
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:126
 #, python-format
 msgid "this document"
-msgstr ""
+msgstr "ovaj dokument"
 
 #. module: mail
 #: field:mail.compose.message,filter_id:0
 msgid "Filters"
-msgstr ""
+msgstr "Filteri"
 
 #. module: mail
 #: field:res.partner,notification_email_send:0
@@ -1484,20 +1575,20 @@ msgstr ""
 #: field:mail.thread,message_ids:0
 #: field:res.partner,message_ids:0
 msgid "Messages"
-msgstr ""
+msgstr "Poruke"
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:139
 #, python-format
 msgid "others..."
-msgstr ""
+msgstr "ostali..."
 
 #. module: mail
 #: model:ir.actions.client,name:mail.action_mail_star_feeds
 #: model:ir.ui.menu,name:mail.mail_starfeeds
 msgid "To-do"
-msgstr ""
+msgstr "Za uraditi"
 
 #. module: mail
 #: view:mail.alias:0
@@ -1505,12 +1596,12 @@ msgstr ""
 #: 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 "Odlazni mailovi"
 
 #. module: mail
 #: help:mail.compose.message,notification_ids:0
@@ -1519,18 +1610,20 @@ msgid ""
 "Technical field holding the message notifications. Use notified_partner_ids "
 "to access notified partners."
 msgstr ""
+"Tehničko polje koje sadrži obavijesti poruke. Koristite notified_partner_ids "
+"za pristupanje obaviještenim partnerima."
 
 #. module: mail
 #: model:ir.ui.menu,name:mail.mail_feeds
 #: model:ir.ui.menu,name:mail.mail_feeds_main
 msgid "Messaging"
-msgstr ""
+msgstr "Slanje poruka"
 
 #. module: mail
 #: view:mail.alias:0
 #: field:mail.message.subtype,res_model:0
 msgid "Model"
-msgstr ""
+msgstr "Model"
 
 #. module: mail
 #: view:mail.message:0
@@ -1543,23 +1636,25 @@ msgid ""
 "Message subtypes followed, meaning subtypes that will be pushed onto the "
 "user's Wall."
 msgstr ""
+"Podtipovi poduka koji se prate, znači podtipovi koji će biti objavljeni na "
+"zidu korisnika."
 
 #. module: mail
 #: help:mail.group,message_ids:0
 #: help:mail.thread,message_ids:0
 #: help:res.partner,message_ids:0
 msgid "Messages and communication history"
-msgstr ""
+msgstr "Poruke i istorija komunikacije"
 
 #. module: mail
 #: help:mail.mail,references:0
 msgid "Message references, such as identifiers of previous messages"
-msgstr ""
+msgstr "Reference poruke, poput identifikatora prethodnih poruka"
 
 #. module: mail
 #: field:mail.compose.message,composition_mode:0
 msgid "Composition mode"
-msgstr ""
+msgstr "Mod sastavljanja"
 
 #. module: mail
 #: field:mail.compose.message,model:0
@@ -1567,14 +1662,14 @@ msgstr ""
 #: field:mail.message,model:0
 #: field:mail.wizard.invite,res_model:0
 msgid "Related Document Model"
-msgstr ""
+msgstr "Povezani model dokumenta"
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:338
 #, python-format
 msgid "unlike"
-msgstr ""
+msgstr "ukloni sviđa mi se"
 
 #. module: mail
 #: help:mail.compose.message,author_id:0
@@ -1583,27 +1678,29 @@ msgid ""
 "Author of the message. If not set, email_from may hold an email address that "
 "did not match any partner."
 msgstr ""
+"Autor poruke. Ako nije postavljen, email_from može sadržavati adresu e-pošte "
+"koja nije odgovarala niti jednom partneru."
 
 #. module: mail
 #: help:mail.mail,email_cc:0
 msgid "Carbon copy message recipients"
-msgstr ""
+msgstr "Primatelji skrivene kopije"
 
 #. module: mail
 #: field:mail.alias,alias_domain:0
 msgid "Alias domain"
-msgstr ""
+msgstr "Alias domena"
 
 #. module: mail
 #: code:addons/mail/update.py:93
 #, python-format
 msgid "Error during communication with the publisher warranty server."
-msgstr ""
+msgstr "Greška tijekom komunikacije sa serverom nosioca održavanja."
 
 #. module: mail
 #: selection:mail.group,public:0
 msgid "Private"
-msgstr ""
+msgstr "Privatni"
 
 #. module: mail
 #: model:ir.actions.client,help:mail.action_mail_star_feeds
@@ -1618,27 +1715,36 @@ msgid ""
 "                </p>\n"
 "            "
 msgstr ""
+"<p>\n"
+"                    <b>Nema zadataka za uraditii.</b>\n"
+"                </p><p>\n"
+"                    Kada obradite poruke u Vašem inbox-u, neke od njih "
+"možete označiti\n"
+"                    <i>Za uraditi</i>. Iz ovog izbornika možete obraditi sve "
+"Vaše poruke <i>Za uraditi</i>.\n"
+"                </p>\n"
+"            "
 
 #. module: mail
 #: selection:mail.mail,state:0
 msgid "Delivery Failed"
-msgstr ""
+msgstr "Isporuka nije uspjela"
 
 #. module: mail
 #: field:mail.compose.message,partner_ids:0
 msgid "Additional contacts"
-msgstr ""
+msgstr "Dodatni kontakti"
 
 #. module: mail
 #: help:mail.compose.message,parent_id:0
 #: help:mail.message,parent_id:0
 msgid "Initial thread message."
-msgstr ""
+msgstr "Inicijalna nit poruke"
 
 #. module: mail
 #: model:mail.group,name:mail.group_hr_policies
 msgid "HR Policies"
-msgstr ""
+msgstr "Politike ljudskih resursa"
 
 #. module: mail
 #: selection:res.partner,notification_email_send:0
@@ -1649,7 +1755,7 @@ msgstr ""
 #: model:ir.actions.client,name:mail.action_mail_inbox_feeds
 #: model:ir.ui.menu,name:mail.mail_inboxfeeds
 msgid "Inbox"
-msgstr ""
+msgstr "Prijemno sanduče"
 
 #. module: mail
 #. openerp-web
@@ -1663,25 +1769,25 @@ msgstr ""
 #: code:addons/mail/static/src/js/many2many_tags_email.js:63
 #, python-format
 msgid "Please complete partner's informations and Email"
-msgstr ""
+msgstr "Molimo završite unos informacija o partnerima i e-mail"
 
 #. module: mail
 #: model:ir.actions.act_window,name:mail.action_view_message_subtype
 #: model:ir.ui.menu,name:mail.menu_message_subtype
 msgid "Subtypes"
-msgstr ""
+msgstr "Podtipovi"
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_alias
 msgid "Email Aliases"
-msgstr ""
+msgstr "Alias e-maila"
 
 #. module: mail
 #: field:mail.group,image_small:0
 msgid "Small-sized photo"
-msgstr ""
+msgstr "Fotografija malog formata"
 
 #. module: mail
 #: help:mail.mail,reply_to:0
 msgid "Preferred response address for the message"
-msgstr ""
+msgstr "Željena povratna adresa za poruku"
diff --git a/addons/mail/i18n/ca.po b/addons/mail/i18n/ca.po
index 659d9cba8e9..3d512617982 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: 2013-09-12 06:29+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
+"X-Launchpad-Export-Date: 2014-01-28 06:35+0000\n"
+"X-Generator: Launchpad (build 16914)\n"
 
 #. module: mail
 #: view:mail.followers:0
diff --git a/addons/mail/i18n/cs.po b/addons/mail/i18n/cs.po
index cd9ddb85a64..651ece85542 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: 2013-09-12 06:29+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
+"X-Launchpad-Export-Date: 2014-01-28 06:35+0000\n"
+"X-Generator: Launchpad (build 16914)\n"
 
 #. module: mail
 #: view:mail.followers:0
diff --git a/addons/mail/i18n/da.po b/addons/mail/i18n/da.po
index 880060a5958..12f2a389143 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: 2013-09-12 06:29+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
+"X-Launchpad-Export-Date: 2014-01-28 06:35+0000\n"
+"X-Generator: Launchpad (build 16914)\n"
 
 #. module: mail
 #: view:mail.followers:0
diff --git a/addons/mail/i18n/de.po b/addons/mail/i18n/de.po
index 9b1f370d860..2e6f8bb1fb5 100644
--- a/addons/mail/i18n/de.po
+++ b/addons/mail/i18n/de.po
@@ -15,13 +15,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-09-12 06:29+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
+"X-Launchpad-Export-Date: 2014-01-28 06:36+0000\n"
+"X-Generator: Launchpad (build 16914)\n"
 
 #. module: mail
 #: view:mail.followers:0
 msgid "Followers Form"
-msgstr "Follower Formular"
+msgstr "Follower-Formular"
 
 #. module: mail
 #: model:ir.model,name:mail.model_publisher_warranty_contract
@@ -65,7 +65,7 @@ msgstr "Gruppierung ..."
 #: help:mail.compose.message,body:0
 #: help:mail.message,body:0
 msgid "Automatically sanitized HTML contents"
-msgstr "Automatisch bereinigter HTML Inhalt"
+msgstr "Automatisch bereinigter HTML-Inhalt"
 
 #. module: mail
 #: help:mail.alias,alias_name:0
@@ -80,7 +80,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:mail.action_email_compose_message_wizard
 #: view:mail.compose.message:0
 msgid "Compose Email"
-msgstr "Email schreiben"
+msgstr "E-Mail schreiben"
 
 #. module: mail
 #. openerp-web
@@ -92,7 +92,7 @@ msgstr "Hinzufügen zu Empfängern und Followern"
 #. module: mail
 #: view:mail.group:0
 msgid "Group Name"
-msgstr "Gruppe Bezeichnung"
+msgstr "Gruppenname"
 
 #. module: mail
 #: selection:mail.group,public:0
@@ -148,7 +148,7 @@ msgstr "Ungelesene Nachrichten"
 #: code:addons/mail/static/src/xml/mail.xml:313
 #, python-format
 msgid "show"
-msgstr "Anzeigen"
+msgstr "anzeigen"
 
 #. module: mail
 #: help:mail.group,group_ids:0
@@ -157,7 +157,7 @@ msgid ""
 "they will be able to manage their subscription manually if necessary."
 msgstr ""
 "Mitglieder dieser Gruppe werden automatisch als Follower hinzugefügt. "
-"Beachten Sie das diese Ihre Nachrichteneinstellungen auch selbständig "
+"Beachten Sie, dass diese Ihre Nachrichteneinstellungen auch selbständig "
 "bearbeiten können."
 
 #. module: mail
@@ -207,7 +207,7 @@ msgstr ""
 #: code:addons/mail/static/src/xml/mail.xml:212
 #, python-format
 msgid "Uploading error"
-msgstr "Upload Fehler"
+msgstr "Uploadfehler"
 
 #. module: mail
 #: model:mail.group,name:mail.group_support
@@ -223,8 +223,8 @@ msgid ""
 "\n"
 "(Document type: %s, Operation: %s)"
 msgstr ""
-"Der gewünschte Vorgang kann aufgrund Sicherheitsbeschränkungen nicht "
-"ausgeführt werden. Bitte kontaktieren Sie den System Administrator.\n"
+"Der gewünschte Vorgang kann aufgrund von Sicherheitsbeschränkungen nicht "
+"ausgeführt werden. Bitte kontaktieren Sie den Systemadministrator.\n"
 "\n"
 "(Dokumenten Typ: %s, Vorgang: %s)"
 
@@ -302,8 +302,8 @@ msgid ""
 "Message type: email for email message, notification for system message, "
 "comment for other messages such as user replies"
 msgstr ""
-"Nachrichtentyp: E-Mail für E-mailnachricht, Mitteilung für Systemnachricht, "
-"Kommentar für andere Mitteilungen wie Diskussionsbeiträgen von Benutzern."
+"Nachrichtentyp: E-Mail für E-Mail-Nachricht, Mitteilung für Systemnachricht, "
+"Kommentar für andere Mitteilungen wie Diskussionsbeiträge von Benutzern."
 
 #. module: mail
 #: help:mail.message.subtype,relation_field:0
@@ -348,12 +348,12 @@ msgstr "Bild mittlerer Größe"
 #: model:ir.actions.client,name:mail.action_mail_to_me_feeds
 #: model:ir.ui.menu,name:mail.mail_tomefeeds
 msgid "To: me"
-msgstr "Private Nachrichten"
+msgstr "An: mich"
 
 #. module: mail
 #: field:mail.message.subtype,name:0
 msgid "Message Type"
-msgstr "Mitteilung Typ"
+msgstr "Mitteilungstyp"
 
 #. module: mail
 #: field:mail.mail,auto_delete:0
@@ -400,7 +400,7 @@ msgstr "E-Mails"
 #. module: mail
 #: field:mail.followers,partner_id:0
 msgid "Related Partner"
-msgstr "zugehöriger Partner"
+msgstr "Zugehöriger Partner"
 
 #. module: mail
 #: help:mail.group,message_summary:0
@@ -411,7 +411,7 @@ msgid ""
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
 "Hier finden Sie die Nachrichtenübersicht (Anzahl Nachrichten etc., ...) im "
-"html Format, um Sie später in einer Kanban Ansicht einfügen zu können."
+"html Format, um Sie später in einer Kanban-Ansicht einfügen zu können."
 
 #. module: mail
 #: help:mail.alias,alias_model_id:0
@@ -422,7 +422,7 @@ msgid ""
 msgstr ""
 "Das OpenERP Objekt des Datenmodells, auf das sich die Alias Einstellung "
 "bezieht. Sämtliche eingehenden E-Mails, die keine Antwort auf einen bereits "
-"bestehenden Vorgang ist, erzeugen einen neuen Datensatz (z.B. Projekt "
+"bestehenden Vorgang sind, erzeugen einen neuen Datensatz (z.B. Projekt "
 "Aufgabe)."
 
 #. module: mail
@@ -434,7 +434,7 @@ msgstr "Verknüpftes Feld"
 #: selection:mail.compose.message,type:0
 #: selection:mail.message,type:0
 msgid "System notification"
-msgstr "System Benachrichtigung"
+msgstr "Systembenachrichtigung"
 
 #. module: mail
 #: model:ir.model,name:mail.model_res_partner
@@ -473,7 +473,7 @@ msgstr "Von"
 #: view:mail.mail:0
 #: view:mail.message.subtype:0
 msgid "Email message"
-msgstr "E-Mail Nachricht"
+msgstr "E-Mail-Nachricht"
 
 #. module: mail
 #: model:ir.model,name:mail.model_base_config_settings
@@ -493,7 +493,7 @@ msgstr "Senden"
 #: code:addons/mail/static/src/js/mail_followers.js:153
 #, python-format
 msgid "No followers"
-msgstr "Keine Followers"
+msgstr "Keine Follower"
 
 #. module: mail
 #: view:mail.mail:0
@@ -511,13 +511,13 @@ msgstr "Fehlgeschlagen"
 #: field:res.partner,message_follower_ids:0
 #, python-format
 msgid "Followers"
-msgstr "Followers"
+msgstr "Follower"
 
 #. module: mail
 #: model:ir.actions.client,name:mail.action_mail_archives_feeds
 #: model:ir.ui.menu,name:mail.mail_archivesfeeds
 msgid "Archives"
-msgstr "Archive"
+msgstr "Archiv"
 
 #. module: mail
 #. openerp-web
@@ -546,19 +546,19 @@ msgstr "Ein Follower"
 #: field:mail.compose.message,type:0
 #: field:mail.message,type:0
 msgid "Type"
-msgstr "Art"
+msgstr "Typ"
 
 #. module: mail
 #: selection:mail.compose.message,type:0
 #: view:mail.mail:0
 #: selection:mail.message,type:0
 msgid "Email"
-msgstr "E-Mail Adresse"
+msgstr "E-Mail-Adresse"
 
 #. module: mail
 #: field:ir.ui.menu,mail_group_id:0
 msgid "Mail Group"
-msgstr "Nachrichten Gruppe"
+msgstr "Nachrichtengruppe"
 
 #. module: mail
 #: selection:res.partner,notification_email_send:0
@@ -584,8 +584,8 @@ msgid ""
 "required."
 msgstr ""
 "Kleines Bild für diese Gruppe. Es wird automatisch auf eine Größe von "
-"64x64px reduziert, unter Beibehaltung des Formats. Benutzen Sie dieses Feld "
-"überall dort, wo sie es als Grafik benötigen können."
+"64x64px reduziert, unter Beibehaltung des Seitenverhältnisses. Benutzen Sie "
+"dieses Feld überall dort, wo sie es als Grafik benötigen können."
 
 #. module: mail
 #: view:mail.compose.message:0
@@ -627,7 +627,7 @@ msgstr "Absender, aus den Benutzereinstellungen"
 #, python-format
 msgid "<div>You have been invited to follow a new document.</div>"
 msgstr ""
-"<div>Sie wurden eingeladen Follower eines neuen Dokuments zu werden.</div>"
+"<div>Sie wurden eingeladen, Follower eines neuen Dokuments zu werden.</div>"
 
 #. module: mail
 #: field:mail.compose.message,parent_id:0
@@ -641,7 +641,7 @@ msgstr "Übergeordnete Nachricht"
 #: field:mail.message,res_id:0
 #: field:mail.wizard.invite,res_id:0
 msgid "Related Document ID"
-msgstr "zugehörige Dokumenten-ID"
+msgstr "Zugehörige Dokumenten-ID"
 
 #. module: mail
 #: model:ir.actions.client,help:mail.action_mail_to_me_feeds
@@ -700,7 +700,7 @@ msgstr "Re:"
 #: field:mail.compose.message,to_read:0
 #: field:mail.message,to_read:0
 msgid "To read"
-msgstr "ungelesen"
+msgstr "Ungelesen"
 
 #. module: mail
 #: code:addons/mail/res_users.py:69
@@ -709,7 +709,7 @@ msgid ""
 "You may not create a user. To create new users, you should use the "
 "\"Settings > Users\" menu."
 msgstr ""
-"Sie können keinen neuen Benutzer anlegen. Um einen neuen Benutzer anzulegen "
+"Sie können keinen neuen Benutzer anlegen. Um einen neuen Benutzer anzulegen, "
 "benutzen Sie bitte das Menu \"Einstellungen > Benutzer\"."
 
 #. module: mail
@@ -760,7 +760,7 @@ msgstr "ir.ui.menu"
 #. module: mail
 #: view:mail.message:0
 msgid "Has attachments"
-msgstr "enthält Anhänge"
+msgstr "Enthält Anhänge"
 
 #. module: mail
 #: view:mail.mail:0
@@ -789,7 +789,7 @@ msgstr ""
 #. module: mail
 #: model:ir.model,name:mail.model_mail_message_subtype
 msgid "Message subtypes"
-msgstr "Nachrichten Subtyp"
+msgstr "Nachrichten-Subtyp"
 
 #. module: mail
 #: help:mail.compose.message,notified_partner_ids:0
@@ -833,7 +833,7 @@ msgstr ""
 #. module: mail
 #: field:mail.mail,notification:0
 msgid "Is Notification"
-msgstr "ist Ankündigung"
+msgstr "Ist Benachrichtigung"
 
 #. module: mail
 #. openerp-web
@@ -884,7 +884,7 @@ msgstr "oder"
 #: help:mail.compose.message,vote_user_ids:0
 #: help:mail.message,vote_user_ids:0
 msgid "Users that voted for this message"
-msgstr "Benutzer die diese Nachricht positiv finden"
+msgstr "Benutzer, die diese Nachricht positiv finden"
 
 #. module: mail
 #: help:mail.group,alias_id:0
@@ -892,7 +892,7 @@ msgid ""
 "The email address associated with this group. New emails received will "
 "automatically create new topics."
 msgstr ""
-"Die E-Mail Adresse die mit dieser Gruppe verbunden ist. Durch neue E-Mails "
+"Die E-Mail Adresse, die mit dieser Gruppe verbunden ist. Durch neue E-Mails "
 "werden automatisch neue Themenbeiträge erstellt."
 
 #. module: mail
@@ -903,7 +903,7 @@ msgstr "Monat"
 #. module: mail
 #: view:mail.mail:0
 msgid "Email Search"
-msgstr "Suche E-Mail"
+msgstr "E-Mail Suche"
 
 #. module: mail
 #: field:mail.compose.message,child_ids:0
@@ -989,7 +989,7 @@ msgstr "Benachrichtigung"
 #: code:addons/mail/static/src/js/mail.js:654
 #, python-format
 msgid "Please complete partner's informations"
-msgstr "Bitte vervollständingen Sie den Partner Datensatz"
+msgstr "Bitte vervollständingen Sie den Partnerdatensatz"
 
 #. module: mail
 #: view:mail.wizard.invite:0
@@ -999,7 +999,7 @@ msgstr "Follower hinzufügen"
 #. module: mail
 #: view:mail.compose.message:0
 msgid "Followers of selected items and"
-msgstr "Follower des ausgewählten Eintrags sowie"
+msgstr "Beobachter des ausgewählten Eintrags sowie"
 
 #. module: mail
 #: field:mail.alias,alias_force_thread_id:0
@@ -1055,7 +1055,7 @@ msgstr "Alle Feeds"
 #: help:mail.compose.message,record_name:0
 #: help:mail.message,record_name:0
 msgid "Name get of the related document."
-msgstr "Bezeichnung kommt vom verbundenen Vorgang."
+msgstr "Bezeichnung kommt vom verbundenen Dokument"
 
 #. module: mail
 #: model:ir.actions.act_window,name:mail.action_view_notifications
@@ -1135,7 +1135,7 @@ msgstr "Gruppen"
 #. module: mail
 #: view:mail.message:0
 msgid "Messages Search"
-msgstr "Nachrichten Suche"
+msgstr "Nachrichtensuche"
 
 #. module: mail
 #: field:mail.compose.message,date:0
@@ -1184,7 +1184,7 @@ msgstr "Standard"
 #: code:addons/mail/static/src/xml/mail.xml:311
 #, python-format
 msgid "show more message"
-msgstr "Mehr Nachrichten anzeigen"
+msgstr "mehr Nachrichten anzeigen"
 
 #. module: mail
 #. openerp-web
@@ -1215,7 +1215,7 @@ msgstr "Zusammenfassung"
 msgid ""
 "Model the subtype applies to. If False, this subtype applies to all models."
 msgstr ""
-"Modell auf das der Subtyp angewendet wird. Im Falle If False, wird dieser "
+"Modell auf das der Subtyp angewendet wird. Wenn 'falsch'(false), wird dieser "
 "Subtyp auf alle Modelle angewendet."
 
 #. module: mail
@@ -1229,7 +1229,7 @@ msgstr "Subtyp"
 #. module: mail
 #: view:mail.group:0
 msgid "Group Form"
-msgstr "Gruppen Formular"
+msgstr "Gruppenformular"
 
 #. module: mail
 #: field:mail.compose.message,starred:0
@@ -1285,7 +1285,7 @@ msgstr ""
 #: code:addons/mail/static/src/xml/mail_followers.xml:52
 #, python-format
 msgid "And"
-msgstr "und"
+msgstr "Und"
 
 #. module: mail
 #: field:mail.compose.message,message_id:0
@@ -1311,7 +1311,7 @@ msgstr "Anhänge"
 #: field:mail.compose.message,record_name:0
 #: field:mail.message,record_name:0
 msgid "Message Record Name"
-msgstr "Nachrichten Name"
+msgstr "Nachrichtenname"
 
 #. module: mail
 #: field:mail.mail,email_cc:0
@@ -1383,7 +1383,7 @@ msgstr "und"
 #. module: mail
 #: help:mail.mail,body_html:0
 msgid "Rich-text/HTML message"
-msgstr "RTF/HTML Nachricht"
+msgstr "Rich-text/HTML-Nachricht"
 
 #. module: mail
 #: view:mail.mail:0
@@ -1461,7 +1461,7 @@ msgstr "Beschreibung"
 #. module: mail
 #: model:ir.model,name:mail.model_mail_followers
 msgid "Document Followers"
-msgstr "Beleg Follower"
+msgstr "Dokumentenbeobachter"
 
 #. module: mail
 #. openerp-web
@@ -1495,7 +1495,7 @@ msgstr "Gesendet"
 #. module: mail
 #: field:mail.mail,body_html:0
 msgid "Rich-text Contents"
-msgstr "Rich-Text Inhalt"
+msgstr "Rich-Text Inhalte"
 
 #. module: mail
 #: help:mail.compose.message,to_read:0
@@ -1546,15 +1546,15 @@ msgid ""
 "                                    the portal module."
 msgstr ""
 "Diese Gruppe ist für alle sichtbar.\n"
-"                                   auch für Ihre Kunden, wenn sie das\n"
-"                                   das Portal Modul installiert haben."
+"                                   auch für Ihre Kunden, wenn das\n"
+"                                   das Portal Modul installiert wurde."
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:243
 #, python-format
 msgid "Set back to Todo"
-msgstr "Auf zu Erledigen setzen"
+msgstr "Auf 'To Do' setzen"
 
 #. module: mail
 #. openerp-web
@@ -1580,7 +1580,7 @@ msgid ""
 "enter the domain name here."
 msgstr ""
 "Wenn Sie eine \"Catch-All\" E-Mail Domain eingerichtet haben, die mit Ihrem "
-"OpenERP Server verknüpft ist, tragen Sie hier den Domain Namen ein."
+"OpenERP Server verknüpft ist, tragen Sie hier den Domainnamen ein."
 
 #. module: mail
 #: model:ir.actions.act_window,name:mail.action_view_mail_message
@@ -1603,7 +1603,7 @@ msgstr "andere ..."
 #: model:ir.actions.client,name:mail.action_mail_star_feeds
 #: model:ir.ui.menu,name:mail.mail_starfeeds
 msgid "To-do"
-msgstr "Zu Erledigen"
+msgstr "To-Do"
 
 #. module: mail
 #: view:mail.alias:0
@@ -1638,7 +1638,7 @@ msgstr "Nachrichten"
 #: view:mail.alias:0
 #: field:mail.message.subtype,res_model:0
 msgid "Model"
-msgstr "Model"
+msgstr "Modell"
 
 #. module: mail
 #: view:mail.message:0
@@ -1651,7 +1651,7 @@ msgid ""
 "Message subtypes followed, meaning subtypes that will be pushed onto the "
 "user's Wall."
 msgstr ""
-"Verfolgter Nachrichten Subtyp, der auf der Benutzer Nachrichten Startseite "
+"Verfolgter Nachrichten Subtyp, der auf der Benutzer Nachrichten-Startseite "
 "angezeigt wird."
 
 #. module: mail
@@ -1677,7 +1677,7 @@ msgstr "Schreibmodus"
 #: field:mail.message,model:0
 #: field:mail.wizard.invite,res_model:0
 msgid "Related Document Model"
-msgstr "zugehöriges Dokumenten-Modell"
+msgstr "Zugehöriges Dokumenten-Modell"
 
 #. module: mail
 #. openerp-web
@@ -1710,7 +1710,8 @@ msgstr "Alias Domain"
 #: code:addons/mail/update.py:93
 #, python-format
 msgid "Error during communication with the publisher warranty server."
-msgstr "Fehler bei der Kommunikation mit dem Supportserver aufgetreten."
+msgstr ""
+"Es ist ein Fehler bei der Kommunikation mit dem Wartungsserver aufgetreten."
 
 #. module: mail
 #: selection:mail.group,public:0
@@ -1736,7 +1737,7 @@ msgstr ""
 "                    Wenn Sie die Nachrichten in Ihrem Posteingang "
 "bearbeiten, können Sie diese als\n"
 "                    <i>zu erledigen</i> markieren. Mit diesem Menu können "
-"sie alle zu erledigenden Nachrichten bearbeiten.\n"
+"Sie alle zu erledigenden Nachrichten bearbeiten.\n"
 "                </p>\n"
 "            "
 
diff --git a/addons/mail/i18n/es.po b/addons/mail/i18n/es.po
index 089230c1a2c..5c30315432a 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: 2013-09-12 06:30+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
+"X-Launchpad-Export-Date: 2014-01-28 06:36+0000\n"
+"X-Generator: Launchpad (build 16914)\n"
 
 #. module: mail
 #: view:mail.followers:0
diff --git a/addons/mail/i18n/es_CR.po b/addons/mail/i18n/es_CR.po
index 9a7245541cd..e767cf0a0df 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: 2013-09-12 06:30+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
+"X-Launchpad-Export-Date: 2014-01-28 06:36+0000\n"
+"X-Generator: Launchpad (build 16914)\n"
 "Language: es\n"
 
 #. module: mail
diff --git a/addons/mail/i18n/es_MX.po b/addons/mail/i18n/es_MX.po
index fcedc9e6129..71f293b0969 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: 2013-09-12 06:30+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
+"X-Launchpad-Export-Date: 2014-01-28 06:36+0000\n"
+"X-Generator: Launchpad (build 16914)\n"
 
 #. module: mail
 #: view:mail.followers:0
diff --git a/addons/mail/i18n/es_PY.po b/addons/mail/i18n/es_PY.po
index 342c5d220f0..f749df4950e 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: 2013-09-12 06:30+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
+"X-Launchpad-Export-Date: 2014-01-28 06:36+0000\n"
+"X-Generator: Launchpad (build 16914)\n"
 
 #. module: mail
 #: view:mail.followers:0
diff --git a/addons/mail/i18n/es_VE.po b/addons/mail/i18n/es_VE.po
index ce266d29fdb..a54f7efdf79 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: 2013-10-29 04:49+0000\n"
-"X-Generator: Launchpad (build 16818)\n"
+"X-Launchpad-Export-Date: 2014-01-28 06:36+0000\n"
+"X-Generator: Launchpad (build 16914)\n"
 
 #. module: mail
 #: view:mail.followers:0
diff --git a/addons/mail/i18n/et.po b/addons/mail/i18n/et.po
index 8b37d06c10e..9eb39cb9cdb 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: 2013-09-12 06:29+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
+"X-Launchpad-Export-Date: 2014-01-28 06:35+0000\n"
+"X-Generator: Launchpad (build 16914)\n"
 
 #. module: mail
 #: view:mail.followers:0
diff --git a/addons/mail/i18n/fi.po b/addons/mail/i18n/fi.po
index f86c37b6634..40a9c38735d 100644
--- a/addons/mail/i18n/fi.po
+++ b/addons/mail/i18n/fi.po
@@ -14,25 +14,25 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-09-12 06:29+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
+"X-Launchpad-Export-Date: 2014-01-28 06:36+0000\n"
+"X-Generator: Launchpad (build 16914)\n"
 
 #. module: mail
 #: view:mail.followers:0
 msgid "Followers Form"
-msgstr ""
+msgstr "Seuraajien lomake"
 
 #. 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
 #: view:mail.mail:0
 #: field:mail.message,author_id:0
 msgid "Author"
-msgstr ""
+msgstr "Tekijä"
 
 #. module: mail
 #: view:mail.mail:0
@@ -47,12 +47,12 @@ msgstr "Viestin vastaanottajat"
 #. module: mail
 #: help:mail.message.subtype,default:0
 msgid "Activated by default when subscribing."
-msgstr ""
+msgstr "Aktivoidaan oletuksena kun tilataan."
 
 #. module: mail
 #: view:mail.message:0
 msgid "Comments"
-msgstr ""
+msgstr "Kommentit"
 
 #. module: mail
 #: view:mail.alias:0
@@ -64,7 +64,7 @@ msgstr "Ryhmittely..."
 #: help:mail.compose.message,body:0
 #: help:mail.message,body:0
 msgid "Automatically sanitized HTML contents"
-msgstr ""
+msgstr "Automaattisesti puhdistetut HTML-sisällöt"
 
 #. module: mail
 #: help:mail.alias,alias_name:0
@@ -89,12 +89,12 @@ msgstr ""
 #. module: mail
 #: view:mail.group:0
 msgid "Group Name"
-msgstr ""
+msgstr "Ryhmän nimi"
 
 #. module: mail
 #: selection:mail.group,public:0
 msgid "Public"
-msgstr ""
+msgstr "Julkinen"
 
 #. module: mail
 #: view:mail.mail:0
@@ -104,7 +104,7 @@ msgstr "Sisältö"
 #. module: mail
 #: view:mail.message:0
 msgid "Show messages to read"
-msgstr ""
+msgstr "Näytä luettevat viestit"
 
 #. module: mail
 #: help:mail.compose.message,email_from:0
@@ -117,33 +117,33 @@ msgstr ""
 #. module: mail
 #: model:ir.model,name:mail.model_mail_compose_message
 msgid "Email composition wizard"
-msgstr ""
+msgstr "Sähköpostin ohjattu koostaminen"
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail_followers.xml:23
 #, python-format
 msgid "Add others"
-msgstr ""
+msgstr "Lisää muut"
 
 #. module: mail
 #: field:mail.message.subtype,parent_id:0
 msgid "Parent"
-msgstr ""
+msgstr "Edeltävä"
 
 #. module: mail
 #: field:mail.group,message_unread:0
 #: field:mail.thread,message_unread:0
 #: field:res.partner,message_unread:0
 msgid "Unread Messages"
-msgstr ""
+msgstr "Lukemattomia viestejä"
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:313
 #, python-format
 msgid "show"
-msgstr ""
+msgstr "näytä"
 
 #. module: mail
 #: help:mail.group,group_ids:0
@@ -157,31 +157,31 @@ msgstr ""
 #: code:addons/mail/static/src/js/mail.js:1029
 #, python-format
 msgid "Do you really want to delete this message?"
-msgstr ""
+msgstr "Haluatko varmasti poistaa tämän viestin?"
 
 #. module: mail
 #: view:mail.message:0
 #: field:mail.notification,read:0
 msgid "Read"
-msgstr ""
+msgstr "Lue"
 
 #. module: mail
 #: view:mail.group:0
 msgid "Search Groups"
-msgstr ""
+msgstr "Hakuryhmät"
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/js/mail_followers.js:157
 #, python-format
 msgid "followers"
-msgstr ""
+msgstr "seuraajat"
 
 #. module: mail
 #: code:addons/mail/mail_message.py:737
 #, python-format
 msgid "Access Denied"
-msgstr ""
+msgstr "Pääsy evätty"
 
 #. module: mail
 #: help:mail.group,image_medium:0
@@ -196,12 +196,12 @@ msgstr ""
 #: code:addons/mail/static/src/xml/mail.xml:212
 #, python-format
 msgid "Uploading error"
-msgstr ""
+msgstr "Tuontilatauksessa virhe"
 
 #. module: mail
 #: model:mail.group,name:mail.group_support
 msgid "Support"
-msgstr ""
+msgstr "Tuki"
 
 #. module: mail
 #: code:addons/mail/mail_message.py:738
@@ -222,7 +222,7 @@ msgstr "Vastaanotettu"
 #. module: mail
 #: view:mail.mail:0
 msgid "Thread"
-msgstr "Keskustelu"
+msgstr "Viestit"
 
 #. module: mail
 #. openerp-web
@@ -236,17 +236,17 @@ msgstr ""
 #: code:addons/mail/static/src/xml/mail.xml:29
 #, python-format
 msgid "&ograve"
-msgstr ""
+msgstr "&ograve"
 
 #. module: mail
 #: field:base.config.settings,alias_domain:0
 msgid "Alias Domain"
-msgstr ""
+msgstr "Alias Domain"
 
 #. module: mail
 #: field:mail.group,group_ids:0
 msgid "Auto Subscription"
-msgstr ""
+msgstr "Automaattinen tilaus"
 
 #. module: mail
 #: field:mail.mail,references:0
@@ -258,12 +258,12 @@ msgstr "Viitteet"
 #: code:addons/mail/static/src/xml/mail.xml:206
 #, python-format
 msgid "No messages."
-msgstr ""
+msgstr "Ei viestejä."
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_group
 msgid "Discussion group"
-msgstr ""
+msgstr "Keskusteluryhmä"
 
 #. module: mail
 #. openerp-web
@@ -271,14 +271,14 @@ msgstr ""
 #: code:addons/mail/static/src/xml/mail.xml:108
 #, python-format
 msgid "uploading"
-msgstr ""
+msgstr "siirretään"
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail_followers.xml:52
 #, python-format
 msgid "more."
-msgstr ""
+msgstr "lisää."
 
 #. module: mail
 #: help:mail.compose.message,type:0
@@ -287,6 +287,8 @@ msgid ""
 "Message type: email for email message, notification for system message, "
 "comment for other messages such as user replies"
 msgstr ""
+"Viestityyppi: Sähköposti  sähköposteille, Ilmoitus järjestelmän viesteille, "
+"ja Kommentti muille viesteille, kuten käyttäjien vastauksille."
 
 #. module: mail
 #: help:mail.message.subtype,relation_field:0
@@ -299,7 +301,7 @@ msgstr ""
 #. module: mail
 #: selection:mail.mail,state:0
 msgid "Cancelled"
-msgstr "Peruutettu"
+msgstr "Peruttu"
 
 #. module: mail
 #: field:mail.mail,reply_to:0
@@ -310,30 +312,30 @@ msgstr "Vastausosoite"
 #: code:addons/mail/wizard/invite.py:37
 #, python-format
 msgid "<div>You have been invited to follow %s.</div>"
-msgstr ""
+msgstr "<div>Sinut on kutsuttu seuramaan  %s.</div>"
 
 #. module: mail
 #: help:mail.group,message_unread:0
 #: help:mail.thread,message_unread:0
 #: help:res.partner,message_unread:0
 msgid "If checked new messages require your attention."
-msgstr ""
+msgstr "Jos valittu, uudet viestit vaativat huomiosi."
 
 #. module: mail
 #: field:mail.group,image_medium:0
 msgid "Medium-sized photo"
-msgstr ""
+msgstr "Keskikokoinen kuva"
 
 #. module: mail
 #: model:ir.actions.client,name:mail.action_mail_to_me_feeds
 #: model:ir.ui.menu,name:mail.mail_tomefeeds
 msgid "To: me"
-msgstr ""
+msgstr "Vastaanottaja: minä"
 
 #. module: mail
 #: field:mail.message.subtype,name:0
 msgid "Message Type"
-msgstr ""
+msgstr "Viestityyppi"
 
 #. module: mail
 #: field:mail.mail,auto_delete:0
@@ -346,28 +348,28 @@ msgstr "Automaatinen poisto"
 #: view:mail.group:0
 #, python-format
 msgid "Unfollow"
-msgstr ""
+msgstr "Lopeta seuraaminen"
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:312
 #, python-format
 msgid "show one more message"
-msgstr ""
+msgstr "näytä seuraava viesti"
 
 #. module: mail
 #: code:addons/mail/mail_mail.py:75
 #: code:addons/mail/res_users.py:69
 #, python-format
 msgid "Invalid Action!"
-msgstr ""
+msgstr "Virheellinen toiminto!"
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:25
 #, python-format
 msgid "User img"
-msgstr ""
+msgstr "Käyttäjän kuva"
 
 #. module: mail
 #: model:ir.actions.act_window,name:mail.action_view_mail_mail
@@ -380,7 +382,7 @@ msgstr "Sähköpostit"
 #. module: mail
 #: field:mail.followers,partner_id:0
 msgid "Related Partner"
-msgstr ""
+msgstr "Liittyvä kumppani"
 
 #. module: mail
 #: help:mail.group,message_summary:0
@@ -390,6 +392,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 ""
+"Sisältää viestien yhteenvedon (viestien määrän,...). Tämä yhteenveto on "
+"valmiiksi  html-muodossa, jotta se voidaan viedä kanban näkymään."
 
 #. module: mail
 #: help:mail.alias,alias_model_id:0
@@ -402,23 +406,23 @@ msgstr ""
 #. module: mail
 #: field:mail.message.subtype,relation_field:0
 msgid "Relation field"
-msgstr ""
+msgstr "Yhdistämiskenttä"
 
 #. module: mail
 #: selection:mail.compose.message,type:0
 #: selection:mail.message,type:0
 msgid "System notification"
-msgstr ""
+msgstr "Järjestelmän ilmoitus"
 
 #. module: mail
 #: model:ir.model,name:mail.model_res_partner
 msgid "Partner"
-msgstr "Yhteistyökumppani"
+msgstr "Kumppani"
 
 #. module: mail
 #: model:ir.ui.menu,name:mail.mail_my_stuff
 msgid "Organizer"
-msgstr ""
+msgstr "Järjestäjä"
 
 #. module: mail
 #: field:mail.compose.message,subject:0
@@ -429,7 +433,7 @@ msgstr "Aihe"
 #. module: mail
 #: field:mail.wizard.invite,partner_ids:0
 msgid "Partners"
-msgstr ""
+msgstr "Kumppanit"
 
 #. module: mail
 #: view:mail.mail:0
@@ -452,7 +456,7 @@ msgstr "Sähköpostiviesti"
 #. module: mail
 #: model:ir.model,name:mail.model_base_config_settings
 msgid "base.config.settings"
-msgstr ""
+msgstr "base.config.settings"
 
 #. module: mail
 #. openerp-web
@@ -467,7 +471,7 @@ msgstr "Lähetä"
 #: code:addons/mail/static/src/js/mail_followers.js:153
 #, python-format
 msgid "No followers"
-msgstr ""
+msgstr "Ei seuraajia"
 
 #. module: mail
 #: view:mail.mail:0
@@ -485,13 +489,13 @@ msgstr "Epäonnistui"
 #: field:res.partner,message_follower_ids:0
 #, python-format
 msgid "Followers"
-msgstr ""
+msgstr "Seuraajat"
 
 #. module: mail
 #: model:ir.actions.client,name:mail.action_mail_archives_feeds
 #: model:ir.ui.menu,name:mail.mail_archivesfeeds
 msgid "Archives"
-msgstr ""
+msgstr "Arkistot"
 
 #. module: mail
 #. openerp-web
@@ -499,7 +503,7 @@ msgstr ""
 #: code:addons/mail/static/src/xml/mail.xml:107
 #, python-format
 msgid "Delete this attachment"
-msgstr ""
+msgstr "Poista tämä liite"
 
 #. module: mail
 #. openerp-web
@@ -514,25 +518,25 @@ msgstr "Vastaa"
 #: code:addons/mail/static/src/js/mail_followers.js:155
 #, python-format
 msgid "One follower"
-msgstr ""
+msgstr "Yksi seuraaja"
 
 #. module: mail
 #: field:mail.compose.message,type:0
 #: field:mail.message,type:0
 msgid "Type"
-msgstr ""
+msgstr "Tyyppi"
 
 #. module: mail
 #: selection:mail.compose.message,type:0
 #: view:mail.mail:0
 #: selection:mail.message,type:0
 msgid "Email"
-msgstr ""
+msgstr "Sähköposti"
 
 #. module: mail
 #: field:ir.ui.menu,mail_group_id:0
 msgid "Mail Group"
-msgstr ""
+msgstr "Sähköpostiryhmä"
 
 #. module: mail
 #: selection:res.partner,notification_email_send:0
@@ -542,13 +546,13 @@ msgstr ""
 #. module: mail
 #: field:mail.alias,alias_defaults:0
 msgid "Default Values"
-msgstr ""
+msgstr "Oletusarvot"
 
 #. module: mail
 #: code:addons/mail/res_users.py:89
 #, python-format
 msgid "%s has joined the %s network."
-msgstr ""
+msgstr "%s on liittynyt %s verkkoon."
 
 #. module: mail
 #: help:mail.group,image_small:0
@@ -557,6 +561,8 @@ msgid ""
 "image, with aspect ratio preserved. Use this field anywhere a small image is "
 "required."
 msgstr ""
+"Pienikokoinen ryhmän kuva. Muutetaan automaattisesti kokoon 64x64 kuvasuhde "
+"säilyttäen. Käytä tätä kenttää paikoissa, joissa pientä kuvaa tarvitaan."
 
 #. module: mail
 #: view:mail.compose.message:0
@@ -569,7 +575,7 @@ msgstr "Vastaanottajat"
 #: code:addons/mail/static/src/xml/mail.xml:140
 #, python-format
 msgid "<<<"
-msgstr ""
+msgstr "<<<"
 
 #. module: mail
 #. openerp-web
@@ -581,29 +587,29 @@ msgstr ""
 #. module: mail
 #: field:mail.group,group_public_id:0
 msgid "Authorized Group"
-msgstr ""
+msgstr "Valtuutettu ryhmä"
 
 #. module: mail
 #: view:mail.group:0
 msgid "Join Group"
-msgstr ""
+msgstr "Liity ryhmään"
 
 #. module: mail
 #: help:mail.mail,email_from:0
 msgid "Message sender, taken from user preferences."
-msgstr ""
+msgstr "Viestin lähettäjä, tuotu käyttäjän valinnoista."
 
 #. module: mail
 #: code:addons/mail/wizard/invite.py:40
 #, python-format
 msgid "<div>You have been invited to follow a new document.</div>"
-msgstr ""
+msgstr "<div>Sinut on kutsuttu seuraamaan uutta dokumenttia..</div>"
 
 #. module: mail
 #: field:mail.compose.message,parent_id:0
 #: field:mail.message,parent_id:0
 msgid "Parent Message"
-msgstr ""
+msgstr "Edeltävä viesti"
 
 #. module: mail
 #: field:mail.compose.message,res_id:0
@@ -623,6 +629,12 @@ msgid ""
 "                </p>\n"
 "            "
 msgstr ""
+"<p>\n"
+"                    <b>Ei yksityistä viestiä.</b>\n"
+"                </p><p>\n"
+"                    Tämä luettelo sisältää sinulle lähetetyt viestit.\n"
+"                </p>\n"
+"            "
 
 #. module: mail
 #: model:mail.group,name:mail.group_rd
@@ -639,7 +651,7 @@ msgstr ""
 #. module: mail
 #: model:ir.model,name:mail.model_mail_thread
 msgid "Email Thread"
-msgstr "Sähköpostikeskustelu"
+msgstr "Sähköpostiviestit"
 
 #. module: mail
 #: view:mail.mail:0
@@ -651,7 +663,7 @@ msgstr "Lisäasetukset"
 #: code:addons/mail/static/src/xml/mail.xml:244
 #, python-format
 msgid "Move to Inbox"
-msgstr ""
+msgstr "Siirrä saapuneisiin"
 
 #. module: mail
 #: code:addons/mail/wizard/mail_compose_message.py:193
@@ -663,7 +675,7 @@ msgstr "Viite:"
 #: field:mail.compose.message,to_read:0
 #: field:mail.message,to_read:0
 msgid "To read"
-msgstr ""
+msgstr "Lue"
 
 #. module: mail
 #: code:addons/mail/res_users.py:69
@@ -684,7 +696,7 @@ msgstr ""
 #: code:addons/mail/static/src/xml/mail.xml:337
 #, python-format
 msgid "like"
-msgstr ""
+msgstr "kuten"
 
 #. module: mail
 #: view:mail.compose.message:0
@@ -697,12 +709,12 @@ msgstr "Peruuta"
 #: code:addons/mail/static/src/xml/mail.xml:47
 #, python-format
 msgid "Share with my followers..."
-msgstr ""
+msgstr "Jaa seuraajilleni..."
 
 #. module: mail
 #: field:mail.notification,partner_id:0
 msgid "Contact"
-msgstr ""
+msgstr "Kontakti"
 
 #. module: mail
 #: view:mail.group:0
@@ -714,17 +726,17 @@ msgstr ""
 #. 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 "On liitteitä"
 
 #. module: mail
 #: view:mail.mail:0
 msgid "on"
-msgstr ""
+msgstr "käytössä"
 
 #. module: mail
 #: code:addons/mail/mail_message.py:926
@@ -744,7 +756,7 @@ msgstr ""
 #. module: mail
 #: model:ir.model,name:mail.model_mail_message_subtype
 msgid "Message subtypes"
-msgstr ""
+msgstr "Viestin alityypit"
 
 #. module: mail
 #: help:mail.compose.message,notified_partner_ids:0
@@ -758,7 +770,7 @@ msgstr ""
 #: view:mail.mail:0
 #: selection:mail.message,type:0
 msgid "Comment"
-msgstr ""
+msgstr "Kommentti"
 
 #. module: mail
 #: model:ir.actions.client,help:mail.action_mail_inbox_feeds
@@ -774,23 +786,33 @@ msgid ""
 "                </p>\n"
 "            "
 msgstr ""
+"<p>\n"
+"                    <b>Hyvää työtä!</b> Saapuvien postilaatikkosi on tyhjä.\n"
+"                </p><p>\n"
+"                    Sinun saapuvien postilaatikkosi sisältää sinulle "
+"lähetettyjä\n"
+"                    yksityisiä viestejä, sähköposteja tai informaatiota "
+"dokumenteista\n"
+"                    tai henkilöistä, joita seuraat.\n"
+"                </p>\n"
+"            "
 
 #. module: mail
 #: field:mail.mail,notification:0
 msgid "Is Notification"
-msgstr ""
+msgstr "On ilmoitus"
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:188
 #, python-format
 msgid "Compose a new message"
-msgstr ""
+msgstr "Kirjoita uusi viesti"
 
 #. module: mail
 #: view:mail.mail:0
 msgid "Send Now"
-msgstr "Lähetä nyt"
+msgstr "Lähetä heti"
 
 #. module: mail
 #: code:addons/mail/mail_mail.py:75
@@ -809,7 +831,7 @@ msgstr ""
 #. module: mail
 #: field:mail.group,image:0
 msgid "Photo"
-msgstr ""
+msgstr "Kuva"
 
 #. module: mail
 #. openerp-web
@@ -819,7 +841,7 @@ msgstr ""
 #: view:mail.wizard.invite:0
 #, python-format
 msgid "or"
-msgstr ""
+msgstr "tai"
 
 #. module: mail
 #: help:mail.compose.message,vote_user_ids:0
@@ -853,12 +875,12 @@ msgstr ""
 #. module: mail
 #: field:mail.alias,alias_user_id:0
 msgid "Owner"
-msgstr ""
+msgstr "Omistaja"
 
 #. module: mail
 #: model:ir.model,name:mail.model_res_users
 msgid "Users"
-msgstr ""
+msgstr "Käyttäjät"
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_message
@@ -867,7 +889,7 @@ msgstr ""
 #: field:mail.notification,message_id:0
 #: field:mail.wizard.invite,message:0
 msgid "Message"
-msgstr ""
+msgstr "Viesti"
 
 #. module: mail
 #: help:mail.followers,res_id:0
@@ -879,13 +901,13 @@ msgstr ""
 #: field:mail.compose.message,body:0
 #: field:mail.message,body:0
 msgid "Contents"
-msgstr ""
+msgstr "Sisällöt"
 
 #. module: mail
 #: model:ir.actions.act_window,name:mail.action_view_mail_alias
 #: model:ir.ui.menu,name:mail.mail_alias_menu
 msgid "Aliases"
-msgstr ""
+msgstr "Aliakset"
 
 #. module: mail
 #: help:mail.message.subtype,description:0
@@ -903,7 +925,7 @@ msgstr ""
 #. module: mail
 #: view:mail.group:0
 msgid "Group"
-msgstr ""
+msgstr "Ryhmä"
 
 #. module: mail
 #: help:mail.compose.message,starred:0
@@ -914,12 +936,12 @@ msgstr ""
 #. module: mail
 #: field:mail.group,public:0
 msgid "Privacy"
-msgstr ""
+msgstr "Yksityisyys"
 
 #. module: mail
 #: view:mail.mail:0
 msgid "Notification"
-msgstr ""
+msgstr "Ilmoitus"
 
 #. module: mail
 #. openerp-web
@@ -931,7 +953,7 @@ msgstr ""
 #. module: mail
 #: view:mail.wizard.invite:0
 msgid "Add Followers"
-msgstr ""
+msgstr "Lisää seuraajat"
 
 #. module: mail
 #: view:mail.compose.message:0
@@ -946,7 +968,7 @@ msgstr ""
 #. module: mail
 #: model:ir.ui.menu,name:mail.mail_group_root
 msgid "My Groups"
-msgstr ""
+msgstr "Omat ryhmäni"
 
 #. module: mail
 #: model:ir.actions.client,help:mail.action_mail_archives_feeds
@@ -960,12 +982,22 @@ msgid ""
 "                </p>\n"
 "            "
 msgstr ""
+"<p>\n"
+"                    Viestejä ei löydy, eikä yhtään viestiä ole lähetetty "
+"vielä.\n"
+"                </p><p>\n"
+"                    Klikkaa ylä-oikealla olevaa ikonia muodostaaksesi "
+"viestin.\n"
+"                    Tämä viesti lähetetään sähköpostilla, jos kontakti on "
+"sisäinen.\n"
+"                </p>\n"
+"            "
 
 #. module: mail
 #: view:mail.mail:0
 #: field:mail.mail,state:0
 msgid "Status"
-msgstr ""
+msgstr "Tila"
 
 #. module: mail
 #: view:mail.mail:0
@@ -993,12 +1025,12 @@ msgstr ""
 #: field:mail.message,notification_ids:0
 #: view:mail.notification:0
 msgid "Notifications"
-msgstr ""
+msgstr "Ilmoitukset"
 
 #. module: mail
 #: view:mail.alias:0
 msgid "Search Alias"
-msgstr ""
+msgstr "Hae alias"
 
 #. module: mail
 #: help:mail.alias,alias_force_thread_id:0
@@ -1026,19 +1058,19 @@ msgstr ""
 #. module: mail
 #: model:mail.group,name:mail.group_best_sales_practices
 msgid "Best Sales Practices"
-msgstr ""
+msgstr "Parhaat myyntikäytännöt"
 
 #. module: mail
 #: selection:mail.group,public:0
 msgid "Selected Group Only"
-msgstr ""
+msgstr "Vain valitut ryhmät"
 
 #. module: mail
 #: field:mail.group,message_is_follower:0
 #: field:mail.thread,message_is_follower:0
 #: field:res.partner,message_is_follower:0
 msgid "Is a Follower"
-msgstr ""
+msgstr "on seuraaja"
 
 #. module: mail
 #: view:mail.alias:0
@@ -1049,12 +1081,12 @@ msgstr "Käyttäjä"
 #. module: mail
 #: view:mail.group:0
 msgid "Groups"
-msgstr ""
+msgstr "Ryhmät"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Messages Search"
-msgstr ""
+msgstr "Viestien haku"
 
 #. module: mail
 #: field:mail.compose.message,date:0
@@ -1079,38 +1111,38 @@ msgstr "Laajennetut suodattimet..."
 #: code:addons/mail/static/src/xml/mail.xml:120
 #, python-format
 msgid "To:"
-msgstr ""
+msgstr "Vastaanottaja:"
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:193
 #, python-format
 msgid "Write to my followers"
-msgstr ""
+msgstr "Kirjoita seuraajilleni"
 
 #. module: mail
 #: model:ir.model,name:mail.model_res_groups
 msgid "Access Groups"
-msgstr ""
+msgstr "Pääsyryhmät"
 
 #. module: mail
 #: field:mail.message.subtype,default:0
 msgid "Default"
-msgstr ""
+msgstr "Oletus"
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:311
 #, python-format
 msgid "show more message"
-msgstr ""
+msgstr "näytä lisää viestejä"
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:246
 #, python-format
 msgid "Mark as Todo"
-msgstr ""
+msgstr "Merkitse tehtäväksi"
 
 #. module: mail
 #: help:mail.message.subtype,parent_id:0
@@ -1120,14 +1152,14 @@ msgstr ""
 #. module: mail
 #: model:ir.model,name:mail.model_mail_wizard_invite
 msgid "Invite wizard"
-msgstr ""
+msgstr "Kutsuavustaja"
 
 #. module: mail
 #: field:mail.group,message_summary:0
 #: field:mail.thread,message_summary:0
 #: field:res.partner,message_summary:0
 msgid "Summary"
-msgstr ""
+msgstr "Yhteenveto"
 
 #. module: mail
 #: help:mail.message.subtype,res_model:0
@@ -1141,39 +1173,39 @@ msgstr ""
 #: field:mail.message,subtype_id:0
 #: view:mail.message.subtype:0
 msgid "Subtype"
-msgstr ""
+msgstr "Alityyppi"
 
 #. module: mail
 #: view:mail.group:0
 msgid "Group Form"
-msgstr ""
+msgstr "Ryhmälomake"
 
 #. module: mail
 #: field:mail.compose.message,starred:0
 #: field:mail.message,starred:0
 #: field:mail.notification,starred:0
 msgid "Starred"
-msgstr ""
+msgstr "Tähdellä varustetut"
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:313
 #, python-format
 msgid "more messages"
-msgstr ""
+msgstr "lisää viestejö"
 
 #. module: mail
 #: code:addons/mail/update.py:93
 #, python-format
 msgid "Error"
-msgstr ""
+msgstr "Virhe"
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail_followers.xml:13
 #, python-format
 msgid "Following"
-msgstr ""
+msgstr "Seurataan"
 
 #. module: mail
 #: sql_constraint:mail.alias:0
@@ -1195,7 +1227,7 @@ msgstr ""
 #: code:addons/mail/static/src/xml/mail_followers.xml:52
 #, python-format
 msgid "And"
-msgstr ""
+msgstr "Ja"
 
 #. module: mail
 #: field:mail.compose.message,message_id:0
@@ -1221,7 +1253,7 @@ msgstr "Liitteet"
 #: field:mail.compose.message,record_name:0
 #: field:mail.message,record_name:0
 msgid "Message Record Name"
-msgstr ""
+msgstr "Viestin tietuenimi"
 
 #. module: mail
 #: field:mail.mail,email_cc:0
@@ -1231,7 +1263,7 @@ msgstr "Kopio"
 #. module: mail
 #: help:mail.notification,starred:0
 msgid "Starred message that goes into the todo mailbox"
-msgstr ""
+msgstr "Tähdellinen viesti, joka siirtyy tehtävät -postilaatikkoon"
 
 #. module: mail
 #. openerp-web
@@ -1250,36 +1282,36 @@ msgstr ""
 #. module: mail
 #: model:ir.actions.client,name:mail.action_mail_group_feeds
 msgid "Discussion Group"
-msgstr ""
+msgstr "Keskusteluryhmä"
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:242
 #, python-format
 msgid "Done"
-msgstr ""
+msgstr "Valmis"
 
 #. module: mail
 #: model:mail.message.subtype,name:mail.mt_comment
 msgid "Discussions"
-msgstr ""
+msgstr "Keskustelut"
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail_followers.xml:11
 #, python-format
 msgid "Follow"
-msgstr ""
+msgstr "Seuraa"
 
 #. module: mail
 #: field:mail.group,name:0
 msgid "Name"
-msgstr ""
+msgstr "Nimi"
 
 #. module: mail
 #: model:mail.group,name:mail.group_all_employees
 msgid "Whole Company"
-msgstr ""
+msgstr "Koko yhtiö"
 
 #. module: mail
 #. openerp-web
@@ -1288,12 +1320,12 @@ msgstr ""
 #: view:mail.compose.message:0
 #, python-format
 msgid "and"
-msgstr ""
+msgstr "ja"
 
 #. module: mail
 #: help:mail.mail,body_html:0
 msgid "Rich-text/HTML message"
-msgstr ""
+msgstr "Rich-text/HTML -muotoiltu viesti"
 
 #. module: mail
 #: view:mail.mail:0
@@ -1310,12 +1342,12 @@ msgstr ""
 #. module: mail
 #: field:mail.group,menu_id:0
 msgid "Related Menu"
-msgstr ""
+msgstr "Liittyvä valikko"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Content"
-msgstr ""
+msgstr "Sisältö"
 
 #. module: mail
 #: field:mail.mail,email_to:0
@@ -1326,7 +1358,7 @@ msgstr "Vastaanottaja"
 #: field:mail.compose.message,notified_partner_ids:0
 #: field:mail.message,notified_partner_ids:0
 msgid "Notified partners"
-msgstr ""
+msgstr "Kumppanit joille ilmoitettu"
 
 #. module: mail
 #: help:mail.group,public:0
@@ -1338,7 +1370,7 @@ msgstr ""
 #. module: mail
 #: model:mail.group,name:mail.group_board
 msgid "Board meetings"
-msgstr ""
+msgstr "Johtoryhmän tapaamiset"
 
 #. module: mail
 #: constraint:mail.alias:0
@@ -1350,36 +1382,36 @@ msgstr ""
 #. module: mail
 #: field:mail.alias,alias_model_id:0
 msgid "Aliased Model"
-msgstr ""
+msgstr "Aliasmalli"
 
 #. module: mail
 #: help:mail.compose.message,message_id:0
 #: help:mail.message,message_id:0
 msgid "Message unique identifier"
-msgstr "Viestin uniikki tunniste"
+msgstr "Viestin yksilöivä tunniste"
 
 #. module: mail
 #: field:mail.group,description:0
 #: field:mail.message.subtype,description:0
 msgid "Description"
-msgstr ""
+msgstr "Kuvaus"
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_followers
 msgid "Document Followers"
-msgstr ""
+msgstr "Dokumentin seuraajat"
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail_followers.xml:35
 #, python-format
 msgid "Remove this follower"
-msgstr ""
+msgstr "Irroita tämä seuraaja"
 
 #. module: mail
 #: selection:res.partner,notification_email_send:0
 msgid "Never"
-msgstr ""
+msgstr "Ei koskaan"
 
 #. module: mail
 #: field:mail.mail,mail_server_id:0
@@ -1390,7 +1422,7 @@ msgstr "Lähtevän postin palvelin"
 #: code:addons/mail/mail_message.py:930
 #, python-format
 msgid "Partners email addresses not found"
-msgstr ""
+msgstr "Parnerin sähköpostiosoitetta ei löydy"
 
 #. module: mail
 #: view:mail.mail:0
@@ -1401,13 +1433,14 @@ msgstr "Lähetetty"
 #. module: mail
 #: field:mail.mail,body_html:0
 msgid "Rich-text Contents"
-msgstr ""
+msgstr "Rich-text -muotoiset sisällöt"
 
 #. module: mail
 #: help:mail.compose.message,to_read:0
 #: help:mail.message,to_read:0
 msgid "Current user has an unread notification linked to this message"
 msgstr ""
+"Nykyisellä käyttäjällä on lukematon ilmoitus kytkettynä tähän viestiin"
 
 #. module: mail
 #: help:res.partner,notification_email_send:0
@@ -1419,7 +1452,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:mail.action_view_groups
 #: model:ir.ui.menu,name:mail.mail_allgroups
 msgid "Join a group"
-msgstr ""
+msgstr "Liity ryhmään"
 
 #. module: mail
 #: model:ir.actions.client,help:mail.action_mail_group_feeds
@@ -1435,7 +1468,7 @@ msgstr ""
 #: code:addons/mail/static/src/xml/mail.xml:213
 #, python-format
 msgid "Please, wait while the file is uploading."
-msgstr ""
+msgstr "Odota kunnes tiedosto on ladattu sisään."
 
 #. module: mail
 #: view:mail.group:0
@@ -1451,19 +1484,19 @@ msgstr ""
 #: code:addons/mail/static/src/xml/mail.xml:243
 #, python-format
 msgid "Set back to Todo"
-msgstr ""
+msgstr "Plautettu takaisin tehtäviin"
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:126
 #, python-format
 msgid "this document"
-msgstr ""
+msgstr "tämä dokumentti"
 
 #. module: mail
 #: field:mail.compose.message,filter_id:0
 msgid "Filters"
-msgstr "Suotimet"
+msgstr "Suodattimet"
 
 #. module: mail
 #: field:res.partner,notification_email_send:0
@@ -1492,13 +1525,13 @@ msgstr "Viestit"
 #: code:addons/mail/static/src/xml/mail.xml:139
 #, python-format
 msgid "others..."
-msgstr ""
+msgstr "muut..."
 
 #. module: mail
 #: model:ir.actions.client,name:mail.action_mail_star_feeds
 #: model:ir.ui.menu,name:mail.mail_starfeeds
 msgid "To-do"
-msgstr ""
+msgstr "Tehtävät"
 
 #. module: mail
 #: view:mail.alias:0
@@ -1506,12 +1539,12 @@ msgstr ""
 #: 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 "Lähtevät sähköpostit"
 
 #. module: mail
 #: help:mail.compose.message,notification_ids:0
@@ -1525,13 +1558,13 @@ msgstr ""
 #: model:ir.ui.menu,name:mail.mail_feeds
 #: model:ir.ui.menu,name:mail.mail_feeds_main
 msgid "Messaging"
-msgstr ""
+msgstr "Viestit"
 
 #. module: mail
 #: view:mail.alias:0
 #: field:mail.message.subtype,res_model:0
 msgid "Model"
-msgstr ""
+msgstr "Malli"
 
 #. module: mail
 #: view:mail.message:0
@@ -1550,7 +1583,7 @@ msgstr ""
 #: help:mail.thread,message_ids:0
 #: help:res.partner,message_ids:0
 msgid "Messages and communication history"
-msgstr ""
+msgstr "Viesti- ja kommunikointihistoria"
 
 #. module: mail
 #: help:mail.mail,references:0
@@ -1568,7 +1601,7 @@ msgstr ""
 #: field:mail.message,model:0
 #: field:mail.wizard.invite,res_model:0
 msgid "Related Document Model"
-msgstr ""
+msgstr "Liittyvä dokumenttimalli"
 
 #. module: mail
 #. openerp-web
@@ -1593,18 +1626,18 @@ msgstr "Piilokopion vastaanottajat"
 #. module: mail
 #: field:mail.alias,alias_domain:0
 msgid "Alias domain"
-msgstr ""
+msgstr "Alias domain"
 
 #. module: mail
 #: code:addons/mail/update.py:93
 #, python-format
 msgid "Error during communication with the publisher warranty server."
-msgstr ""
+msgstr "Virhe kommunikoidessa julkaisijan takuupalvelimen kanssa."
 
 #. module: mail
 #: selection:mail.group,public:0
 msgid "Private"
-msgstr ""
+msgstr "Yksityinen"
 
 #. module: mail
 #: model:ir.actions.client,help:mail.action_mail_star_feeds
@@ -1619,6 +1652,16 @@ msgid ""
 "                </p>\n"
 "            "
 msgstr ""
+"<p>\n"
+"                    <b>Ei tehtäviä.</b>\n"
+"                </p><p>\n"
+"                    Kun käsittelet saapuvat viestit. voit merkitä haluamasi "
+"viestit\n"
+"                    merkinnällä <i>tehtävä</i>. Tästä valinnasta voit "
+"käsitellä\n"
+"                    kaikki tehtäväsi.\n"
+"                </p>\n"
+"            "
 
 #. module: mail
 #: selection:mail.mail,state:0
@@ -1628,7 +1671,7 @@ msgstr "Lähetys epäonnistui"
 #. module: mail
 #: field:mail.compose.message,partner_ids:0
 msgid "Additional contacts"
-msgstr ""
+msgstr "Lisäkontaktit"
 
 #. module: mail
 #: help:mail.compose.message,parent_id:0
@@ -1639,7 +1682,7 @@ msgstr ""
 #. module: mail
 #: model:mail.group,name:mail.group_hr_policies
 msgid "HR Policies"
-msgstr ""
+msgstr "HR-periaatteet"
 
 #. module: mail
 #: selection:res.partner,notification_email_send:0
@@ -1650,7 +1693,7 @@ msgstr ""
 #: model:ir.actions.client,name:mail.action_mail_inbox_feeds
 #: model:ir.ui.menu,name:mail.mail_inboxfeeds
 msgid "Inbox"
-msgstr ""
+msgstr "Saapuneet"
 
 #. module: mail
 #. openerp-web
@@ -1670,22 +1713,22 @@ msgstr ""
 #: model:ir.actions.act_window,name:mail.action_view_message_subtype
 #: model:ir.ui.menu,name:mail.menu_message_subtype
 msgid "Subtypes"
-msgstr ""
+msgstr "Alityypit"
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_alias
 msgid "Email Aliases"
-msgstr ""
+msgstr "Sähköpostialiakset"
 
 #. module: mail
 #: field:mail.group,image_small:0
 msgid "Small-sized photo"
-msgstr ""
+msgstr "Pienikokoinen kuva"
 
 #. module: mail
 #: help:mail.mail,reply_to:0
 msgid "Preferred response address for the message"
-msgstr "Ehdotettu vastausosoite viestille"
+msgstr "Suositeltu vastausosoite viestille"
 
 #~ msgid "Open Attachments"
 #~ msgstr "Avaa liitteet"
diff --git a/addons/mail/i18n/fr.po b/addons/mail/i18n/fr.po
index 34fb9d6d92e..d53300d4fcb 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: 2013-09-12 06:29+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
+"X-Launchpad-Export-Date: 2014-01-28 06:36+0000\n"
+"X-Generator: Launchpad (build 16914)\n"
 
 #. module: mail
 #: view:mail.followers:0
@@ -311,6 +311,9 @@ msgid ""
 "automatic subscription on a related document. The field is used to compute "
 "getattr(related_document.relation_field)."
 msgstr ""
+"Champ utilisé pour associer le modèle relié au sous-modèle lors de "
+"l'abonnement automatique à un document relié. Le champ est utilisé pour "
+"calculer getattr(related_document.relation_field)."
 
 #. module: mail
 #: selection:mail.mail,state:0
@@ -416,6 +419,9 @@ msgid ""
 "incoming email that does not reply to an existing record will cause the "
 "creation of a new record of this model (e.g. a Project Task)"
 msgstr ""
+"Le modèle (OpenERP Document Kind) auquel correspond cet alias. Tout courriel "
+"entrant qui ne répond pas à un enregistrement existant entraînera la "
+"création d'un nouvel enregistrement de ce modèle (ex.: une tâche de projet)."
 
 #. module: mail
 #: field:mail.message.subtype,relation_field:0
@@ -966,6 +972,7 @@ msgstr "Groupe"
 #: help:mail.message,starred:0
 msgid "Current user has a starred notification linked to this message"
 msgstr ""
+"L'utilisateur actuel a une notification \"favori\" associée à ce message"
 
 #. module: mail
 #: field:mail.group,public:0
@@ -997,7 +1004,7 @@ msgstr "Abonnés des éléments sélectionnés et"
 #. module: mail
 #: field:mail.alias,alias_force_thread_id:0
 msgid "Record Thread ID"
-msgstr ""
+msgstr "ID de l'enregistrement du fil"
 
 #. module: mail
 #: model:ir.ui.menu,name:mail.mail_group_root
@@ -1031,7 +1038,7 @@ msgstr ""
 #: view:mail.mail:0
 #: field:mail.mail,state:0
 msgid "Status"
-msgstr ""
+msgstr "État"
 
 #. module: mail
 #: view:mail.mail:0
@@ -1048,7 +1055,7 @@ msgstr "Tous les flux"
 #: help:mail.compose.message,record_name:0
 #: help:mail.message,record_name:0
 msgid "Name get of the related document."
-msgstr ""
+msgstr "Nom obtenu pour le document relié."
 
 #. module: mail
 #: model:ir.actions.act_window,name:mail.action_view_notifications
@@ -1073,6 +1080,9 @@ msgid ""
 "attached, even if they did not reply to it. If set, this will disable the "
 "creation of new records completely."
 msgstr ""
+"ID optionnel d'un fil (enregistrement) auquel tout message entrant sera "
+"rattaché, même si il ne s'agissait pas d'une réponse à ce fil. Si renseigné, "
+"la création de nouveaux enregistrements sera complètement désactivée."
 
 #. module: mail
 #: help:mail.message.subtype,name:0
@@ -1221,7 +1231,7 @@ msgstr "Formulaire de groupe"
 #: field:mail.message,starred:0
 #: field:mail.notification,starred:0
 msgid "Starred"
-msgstr ""
+msgstr "Favori"
 
 #. module: mail
 #. openerp-web
@@ -1259,6 +1269,11 @@ msgid ""
 "the sender (From) address, or will use the Administrator account if no "
 "system user is found for that address."
 msgstr ""
+"Le propriétaire d'enregistrements créés lors de la réception de courriel sur "
+"cet alias. Si ce champ n'est pas renseigné, le système essaiera de trouver "
+"le propriétaire approprié à partir de l'adresse de l'expéditeur (De) ou "
+"utilisera le compte Administrateur si aucun utilisateur du système n'est "
+"trouvé pour cette adresse."
 
 #. module: mail
 #. openerp-web
@@ -1279,6 +1294,8 @@ msgid ""
 "This field holds the image used as photo for the group, limited to "
 "1024x1024px."
 msgstr ""
+"Ce champ contient une image utilisée pour représenter le groupe, de taille "
+"limitée à 1024x1024px."
 
 #. module: mail
 #: field:mail.compose.message,attachment_ids:0
@@ -1559,6 +1576,8 @@ msgid ""
 "If you have setup a catch-all email domain redirected to the OpenERP server, "
 "enter the domain name here."
 msgstr ""
+"Si vous avez configuré un domaine de courriel attrape-tout (catch-all) qui "
+"redirige vers le serveur OpenERP, saisir le nom de domaine ici."
 
 #. module: mail
 #: model:ir.actions.act_window,name:mail.action_view_mail_message
@@ -1603,6 +1622,8 @@ msgid ""
 "Technical field holding the message notifications. Use notified_partner_ids "
 "to access notified partners."
 msgstr ""
+"Champ technique contenant les notifications du message. Utiliser "
+"notified_partner_ids pour accéder aux partenaires notifiés."
 
 #. module: mail
 #: model:ir.ui.menu,name:mail.mail_feeds
@@ -1652,7 +1673,7 @@ msgstr "Mode de composition"
 #: field:mail.message,model:0
 #: field:mail.wizard.invite,res_model:0
 msgid "Related Document Model"
-msgstr ""
+msgstr "Modèle de document relié"
 
 #. module: mail
 #. openerp-web
@@ -1730,12 +1751,12 @@ msgstr "Contacts additionnels"
 #: help:mail.compose.message,parent_id:0
 #: help:mail.message,parent_id:0
 msgid "Initial thread message."
-msgstr ""
+msgstr "Message initial du fil."
 
 #. module: mail
 #: model:mail.group,name:mail.group_hr_policies
 msgid "HR Policies"
-msgstr ""
+msgstr "Politiques RH"
 
 #. module: mail
 #: selection:res.partner,notification_email_send:0
@@ -1760,7 +1781,7 @@ msgstr "Fichier"
 #: code:addons/mail/static/src/js/many2many_tags_email.js:63
 #, python-format
 msgid "Please complete partner's informations and Email"
-msgstr ""
+msgstr "Complétez les informations du partenaire et son adresse électronique"
 
 #. module: mail
 #: model:ir.actions.act_window,name:mail.action_view_message_subtype
diff --git a/addons/mail/i18n/gl.po b/addons/mail/i18n/gl.po
index b26b4921e89..9032682af7a 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: 2013-09-12 06:29+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
+"X-Launchpad-Export-Date: 2014-01-28 06:36+0000\n"
+"X-Generator: Launchpad (build 16914)\n"
 
 #. module: mail
 #: view:mail.followers:0
diff --git a/addons/mail/i18n/he.po b/addons/mail/i18n/he.po
new file mode 100644
index 00000000000..ea9cfbd533e
--- /dev/null
+++ b/addons/mail/i18n/he.po
@@ -0,0 +1,1706 @@
+# Hebrew translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+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: 2013-12-30 19:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Hebrew <he@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-01-28 06:36+0000\n"
+"X-Generator: Launchpad (build 16914)\n"
+
+#. module: mail
+#: view:mail.followers:0
+msgid "Followers Form"
+msgstr "טופס עוקבים"
+
+#. module: mail
+#: model:ir.model,name:mail.model_publisher_warranty_contract
+msgid "publisher_warranty.contract"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,author_id:0
+#: view:mail.mail:0
+#: field:mail.message,author_id:0
+msgid "Author"
+msgstr "מחבר"
+
+#. module: mail
+#: view:mail.mail:0
+msgid "Message Details"
+msgstr "פרטי ההודעה"
+
+#. module: mail
+#: help:mail.mail,email_to:0
+msgid "Message recipients"
+msgstr "נמעני ההודעה"
+
+#. module: mail
+#: help:mail.message.subtype,default:0
+msgid "Activated by default when subscribing."
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Comments"
+msgstr "הערות"
+
+#. module: mail
+#: view:mail.alias:0
+#: view:mail.mail:0
+msgid "Group By..."
+msgstr "קבץ לפי..."
+
+#. module: mail
+#: help:mail.compose.message,body:0
+#: help:mail.message,body:0
+msgid "Automatically sanitized HTML contents"
+msgstr ""
+
+#. module: mail
+#: help:mail.alias,alias_name:0
+msgid ""
+"The name of the email alias, e.g. 'jobs' if you want to catch emails for "
+"<jobs@example.my.openerp.com>"
+msgstr ""
+
+#. module: mail
+#: model:ir.actions.act_window,name:mail.action_email_compose_message_wizard
+#: view:mail.compose.message:0
+msgid "Compose Email"
+msgstr "כתוב דוא\"ל"
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:132
+#, python-format
+msgid "Add them into recipients and followers"
+msgstr ""
+
+#. module: mail
+#: view:mail.group:0
+msgid "Group Name"
+msgstr "שם הקבוצה"
+
+#. module: mail
+#: selection:mail.group,public:0
+msgid "Public"
+msgstr "ציבורי"
+
+#. module: mail
+#: view:mail.mail:0
+msgid "Body"
+msgstr "גוף ההודעה"
+
+#. module: mail
+#: view:mail.message:0
+msgid "Show messages to read"
+msgstr "הצג הודעות לקריאה"
+
+#. module: mail
+#: help:mail.compose.message,email_from:0
+#: help:mail.message,email_from:0
+msgid ""
+"Email address of the sender. This field is set when no matching partner is "
+"found for incoming emails."
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail_followers.xml:23
+#, python-format
+msgid "Add others"
+msgstr "הוסף אחרים"
+
+#. module: mail
+#: field:mail.message.subtype,parent_id:0
+msgid "Parent"
+msgstr "פריט אב"
+
+#. module: mail
+#: field:mail.group,message_unread:0
+#: field:mail.thread,message_unread:0
+#: field:res.partner,message_unread:0
+msgid "Unread Messages"
+msgstr "הודעות שלא נקראו"
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:313
+#, python-format
+msgid "show"
+msgstr "הצג"
+
+#. module: mail
+#: help:mail.group,group_ids:0
+msgid ""
+"Members of those groups will automatically added as followers. Note that "
+"they will be able to manage their subscription manually if necessary."
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/mail.js:1029
+#, python-format
+msgid "Do you really want to delete this message?"
+msgstr "האם אתם בטוחים שברצונכם למחוק הודעה זו?"
+
+#. module: mail
+#: view:mail.message:0
+#: field:mail.notification,read:0
+msgid "Read"
+msgstr "נקרא"
+
+#. module: mail
+#: view:mail.group:0
+msgid "Search Groups"
+msgstr "חפש בקבוצות"
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/mail_followers.js:157
+#, python-format
+msgid "followers"
+msgstr "עוקבים"
+
+#. module: mail
+#: code:addons/mail/mail_message.py:737
+#, python-format
+msgid "Access Denied"
+msgstr "הגישה נדחתה"
+
+#. module: mail
+#: help:mail.group,image_medium:0
+msgid ""
+"Medium-sized photo of the group. It is automatically resized as a 128x128px "
+"image, with aspect ratio preserved. Use this field in form views or some "
+"kanban views."
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:212
+#, python-format
+msgid "Uploading error"
+msgstr "שגיאת העלאה"
+
+#. module: mail
+#: model:mail.group,name:mail.group_support
+msgid "Support"
+msgstr "תמיכה"
+
+#. module: mail
+#: code:addons/mail/mail_message.py:738
+#, python-format
+msgid ""
+"The requested operation cannot be completed due to security restrictions. "
+"Please contact your system administrator.\n"
+"\n"
+"(Document type: %s, Operation: %s)"
+msgstr ""
+
+#. module: mail
+#: view:mail.mail:0
+#: selection:mail.mail,state:0
+msgid "Received"
+msgstr "התקבל"
+
+#. module: mail
+#: view:mail.mail:0
+msgid "Thread"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:29
+#, python-format
+msgid "Open the full mail composer"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:29
+#, python-format
+msgid "&ograve"
+msgstr ""
+
+#. module: mail
+#: field:base.config.settings,alias_domain:0
+msgid "Alias Domain"
+msgstr ""
+
+#. module: mail
+#: field:mail.group,group_ids:0
+msgid "Auto Subscription"
+msgstr "מנוי אוטומטי"
+
+#. module: mail
+#: field:mail.mail,references:0
+msgid "References"
+msgstr "הפניות"
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:206
+#, python-format
+msgid "No messages."
+msgstr "אין הודעות."
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_group
+msgid "Discussion group"
+msgstr "קבוצת דיון"
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:96
+#: code:addons/mail/static/src/xml/mail.xml:108
+#, python-format
+msgid "uploading"
+msgstr "מעלה"
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail_followers.xml:52
+#, python-format
+msgid "more."
+msgstr "עוד."
+
+#. module: mail
+#: help:mail.compose.message,type:0
+#: help:mail.message,type:0
+msgid ""
+"Message type: email for email message, notification for system message, "
+"comment for other messages such as user replies"
+msgstr ""
+
+#. module: mail
+#: help:mail.message.subtype,relation_field:0
+msgid ""
+"Field used to link the related model to the subtype model when using "
+"automatic subscription on a related document. The field is used to compute "
+"getattr(related_document.relation_field)."
+msgstr ""
+
+#. module: mail
+#: selection:mail.mail,state:0
+msgid "Cancelled"
+msgstr "בוטלה"
+
+#. module: mail
+#: field:mail.mail,reply_to:0
+msgid "Reply-To"
+msgstr "השב ל-"
+
+#. module: mail
+#: code:addons/mail/wizard/invite.py:37
+#, python-format
+msgid "<div>You have been invited to follow %s.</div>"
+msgstr "<div>הזמינו אותך לעקוב אחר %s.</div>"
+
+#. module: mail
+#: help:mail.group,message_unread:0
+#: help:mail.thread,message_unread:0
+#: help:res.partner,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: mail
+#: field:mail.group,image_medium:0
+msgid "Medium-sized photo"
+msgstr "תצלום בינוני"
+
+#. module: mail
+#: model:ir.actions.client,name:mail.action_mail_to_me_feeds
+#: model:ir.ui.menu,name:mail.mail_tomefeeds
+msgid "To: me"
+msgstr "אלי"
+
+#. module: mail
+#: field:mail.message.subtype,name:0
+msgid "Message Type"
+msgstr "סוג ההודעה"
+
+#. module: mail
+#: field:mail.mail,auto_delete:0
+msgid "Auto Delete"
+msgstr "מחיקה אוטומטית"
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail_followers.xml:12
+#: view:mail.group:0
+#, python-format
+msgid "Unfollow"
+msgstr "בטל מעקב"
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:312
+#, python-format
+msgid "show one more message"
+msgstr "הצג הודעה אחת נוספת"
+
+#. module: mail
+#: code:addons/mail/mail_mail.py:75
+#: code:addons/mail/res_users.py:69
+#, python-format
+msgid "Invalid Action!"
+msgstr "פעולה לא חוקית!"
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:25
+#, python-format
+msgid "User img"
+msgstr ""
+
+#. module: mail
+#: model:ir.actions.act_window,name:mail.action_view_mail_mail
+#: model:ir.ui.menu,name:mail.menu_mail_mail
+#: view:mail.mail:0
+#: view:mail.message:0
+msgid "Emails"
+msgstr "הודעות דוא\"ל"
+
+#. module: mail
+#: field:mail.followers,partner_id:0
+msgid "Related Partner"
+msgstr "שותף מקושר"
+
+#. module: mail
+#: help:mail.group,message_summary:0
+#: help:mail.thread,message_summary:0
+#: help:res.partner,message_summary:0
+msgid ""
+"Holds the Chatter summary (number of messages, ...). This summary is "
+"directly in html format in order to be inserted in kanban views."
+msgstr ""
+
+#. module: mail
+#: help:mail.alias,alias_model_id:0
+msgid ""
+"The model (OpenERP Document Kind) to which this alias corresponds. Any "
+"incoming email that does not reply to an existing record will cause the "
+"creation of a new record of this model (e.g. a Project Task)"
+msgstr ""
+
+#. module: mail
+#: field:mail.message.subtype,relation_field:0
+msgid "Relation field"
+msgstr ""
+
+#. module: mail
+#: selection:mail.compose.message,type:0
+#: selection:mail.message,type:0
+msgid "System notification"
+msgstr "הודעת מערכת"
+
+#. module: mail
+#: model:ir.model,name:mail.model_res_partner
+msgid "Partner"
+msgstr "שותף"
+
+#. module: mail
+#: model:ir.ui.menu,name:mail.mail_my_stuff
+msgid "Organizer"
+msgstr "מארגן"
+
+#. module: mail
+#: field:mail.compose.message,subject:0
+#: field:mail.message,subject:0
+msgid "Subject"
+msgstr "נושא"
+
+#. module: mail
+#: field:mail.wizard.invite,partner_ids:0
+msgid "Partners"
+msgstr "שותפים"
+
+#. module: mail
+#: view:mail.mail:0
+msgid "Retry"
+msgstr "נסה שוב"
+
+#. module: mail
+#: field:mail.compose.message,email_from:0
+#: field:mail.mail,email_from:0
+#: field:mail.message,email_from:0
+msgid "From"
+msgstr "מאת"
+
+#. module: mail
+#: view:mail.mail:0
+#: view:mail.message.subtype:0
+msgid "Email message"
+msgstr "הודעת דוא\"ל"
+
+#. module: mail
+#: model:ir.model,name:mail.model_base_config_settings
+msgid "base.config.settings"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:36
+#: view:mail.compose.message:0
+#, python-format
+msgid "Send"
+msgstr "שלח"
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/mail_followers.js:153
+#, python-format
+msgid "No followers"
+msgstr "ללא עוקבים"
+
+#. module: mail
+#: view:mail.mail:0
+msgid "Failed"
+msgstr "נכשלה"
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail_followers.xml:22
+#: model:ir.actions.act_window,name:mail.action_view_followers
+#: model:ir.ui.menu,name:mail.menu_email_followers
+#: view:mail.followers:0
+#: field:mail.group,message_follower_ids:0
+#: field:mail.thread,message_follower_ids:0
+#: field:res.partner,message_follower_ids:0
+#, python-format
+msgid "Followers"
+msgstr "עוקבים"
+
+#. module: mail
+#: model:ir.actions.client,name:mail.action_mail_archives_feeds
+#: model:ir.ui.menu,name:mail.mail_archivesfeeds
+msgid "Archives"
+msgstr "ארכיונים"
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:95
+#: code:addons/mail/static/src/xml/mail.xml:107
+#, python-format
+msgid "Delete this attachment"
+msgstr "מחק קובץ מצורף זה"
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:245
+#: view:mail.mail:0
+#, python-format
+msgid "Reply"
+msgstr "השב"
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/mail_followers.js:155
+#, python-format
+msgid "One follower"
+msgstr "עוקב אחד"
+
+#. module: mail
+#: field:mail.compose.message,type:0
+#: field:mail.message,type:0
+msgid "Type"
+msgstr "סוג"
+
+#. module: mail
+#: selection:mail.compose.message,type:0
+#: view:mail.mail:0
+#: selection:mail.message,type:0
+msgid "Email"
+msgstr "דוא\"ל"
+
+#. module: mail
+#: field:ir.ui.menu,mail_group_id:0
+msgid "Mail Group"
+msgstr "שלח דוא\"ל לקבוצה"
+
+#. module: mail
+#: selection:res.partner,notification_email_send:0
+msgid "Comments and Emails"
+msgstr ""
+
+#. module: mail
+#: field:mail.alias,alias_defaults:0
+msgid "Default Values"
+msgstr "ערכי ברירת מחדל"
+
+#. module: mail
+#: code:addons/mail/res_users.py:89
+#, python-format
+msgid "%s has joined the %s network."
+msgstr "%s הצטרף לרשת %s."
+
+#. module: mail
+#: help:mail.group,image_small:0
+msgid ""
+"Small-sized photo of the group. It is automatically resized as a 64x64px "
+"image, with aspect ratio preserved. Use this field anywhere a small image is "
+"required."
+msgstr ""
+
+#. module: mail
+#: view:mail.compose.message:0
+#: field:mail.message,partner_ids:0
+msgid "Recipients"
+msgstr "נמענים"
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:140
+#, python-format
+msgid "<<<"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:43
+#, python-format
+msgid "Write to the followers of this document..."
+msgstr ""
+
+#. module: mail
+#: field:mail.group,group_public_id:0
+msgid "Authorized Group"
+msgstr "קבוצה מורשית"
+
+#. module: mail
+#: view:mail.group:0
+msgid "Join Group"
+msgstr "הצטרף לקבוצה"
+
+#. module: mail
+#: help:mail.mail,email_from:0
+msgid "Message sender, taken from user preferences."
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/wizard/invite.py:40
+#, python-format
+msgid "<div>You have been invited to follow a new document.</div>"
+msgstr "<div>הזמינו אותך לעקוב אחר מסמך חדש.</div>"
+
+#. module: mail
+#: field:mail.compose.message,parent_id:0
+#: field:mail.message,parent_id:0
+msgid "Parent Message"
+msgstr "הודעת אב"
+
+#. module: mail
+#: field:mail.compose.message,res_id:0
+#: field:mail.followers,res_id:0
+#: field:mail.message,res_id:0
+#: field:mail.wizard.invite,res_id:0
+msgid "Related Document ID"
+msgstr ""
+
+#. module: mail
+#: model:ir.actions.client,help:mail.action_mail_to_me_feeds
+msgid ""
+"<p>\n"
+"                    <b>No private message.</b>\n"
+"                </p><p>\n"
+"                    This list contains messages sent to you.\n"
+"                </p>\n"
+"            "
+msgstr ""
+"<p>\n"
+"                    <b>אין הודעות פרטיות.</b>\n"
+"                </p><p>\n"
+"                    רשימה זו מכילה הודעות שנשלחו אליך.\n"
+"                </p>\n"
+"            "
+
+#. module: mail
+#: model:mail.group,name:mail.group_rd
+msgid "R&D"
+msgstr "מו\"פ"
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:61
+#, python-format
+msgid "/web/binary/upload_attachment"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_thread
+msgid "Email Thread"
+msgstr ""
+
+#. module: mail
+#: view:mail.mail:0
+msgid "Advanced"
+msgstr "מתקדם"
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:244
+#, python-format
+msgid "Move to Inbox"
+msgstr "העבר לדואר נכנס"
+
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:193
+#, python-format
+msgid "Re:"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,to_read:0
+#: field:mail.message,to_read:0
+msgid "To read"
+msgstr "לקריאה"
+
+#. module: mail
+#: code:addons/mail/res_users.py:69
+#, python-format
+msgid ""
+"You may not create a user. To create new users, you should use the "
+"\"Settings > Users\" menu."
+msgstr ""
+
+#. module: mail
+#: help:mail.followers,res_model:0
+#: help:mail.wizard.invite,res_model:0
+msgid "Model of the followed resource"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:337
+#, python-format
+msgid "like"
+msgstr ""
+
+#. module: mail
+#: view:mail.compose.message:0
+#: view:mail.wizard.invite:0
+msgid "Cancel"
+msgstr "ביטול"
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:47
+#, python-format
+msgid "Share with my followers..."
+msgstr "שתף עם העוקבים שלי..."
+
+#. module: mail
+#: field:mail.notification,partner_id:0
+msgid "Contact"
+msgstr "איש קשר"
+
+#. module: mail
+#: view:mail.group:0
+msgid ""
+"Only the invited followers can read the\n"
+"                                    discussions on this group."
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_ir_ui_menu
+msgid "ir.ui.menu"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Has attachments"
+msgstr "כולל קבצים מצורפים"
+
+#. module: mail
+#: view:mail.mail:0
+msgid "on"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/mail_message.py:926
+#, python-format
+msgid ""
+"The following partners chosen as recipients for the email have no email "
+"address linked :"
+msgstr ""
+
+#. module: mail
+#: help:mail.alias,alias_defaults:0
+msgid ""
+"A Python dictionary that will be evaluated to provide default values when "
+"creating new records for this alias."
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_message_subtype
+msgid "Message subtypes"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,notified_partner_ids:0
+#: help:mail.message,notified_partner_ids:0
+msgid ""
+"Partners that have a notification pushing this message in their mailboxes"
+msgstr ""
+
+#. module: mail
+#: selection:mail.compose.message,type:0
+#: view:mail.mail:0
+#: selection:mail.message,type:0
+msgid "Comment"
+msgstr "הערה"
+
+#. module: mail
+#: model:ir.actions.client,help:mail.action_mail_inbox_feeds
+msgid ""
+"<p>\n"
+"                    <b>Good Job!</b> Your inbox is empty.\n"
+"                </p><p>\n"
+"                    Your inbox contains private messages or emails sent to "
+"you\n"
+"                    as well as information related to documents or people "
+"you\n"
+"                    follow.\n"
+"                </p>\n"
+"            "
+msgstr ""
+"<p>\n"
+"                    <b>כל הכבוד!</b> תיבת הדוא הנכנס שלך ריקה.\n"
+"                </p><p>\n"
+"                    תיבת הדואר הנכנס שלך מכילה הודעות פרטיות או מיילים "
+"שנשלחו אליך\n"
+"                    וגם מידע שקשור למסמכים או אנשים שאתה\n"
+"                    עוקב אחריהם.\n"
+"                </p>\n"
+"            "
+
+#. module: mail
+#: field:mail.mail,notification:0
+msgid "Is Notification"
+msgstr "היא התראה"
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:188
+#, python-format
+msgid "Compose a new message"
+msgstr "חבר הודעה חדשה"
+
+#. module: mail
+#: view:mail.mail:0
+msgid "Send Now"
+msgstr "שלח כעת"
+
+#. module: mail
+#: code:addons/mail/mail_mail.py:75
+#, python-format
+msgid ""
+"Unable to send email, please configure the sender's email address or alias."
+msgstr ""
+
+#. module: mail
+#: help:res.users,alias_id:0
+msgid ""
+"Email address internally associated with this user. Incoming emails will "
+"appear in the user's notifications."
+msgstr ""
+
+#. module: mail
+#: field:mail.group,image:0
+msgid "Photo"
+msgstr "תצלום"
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:54
+#: code:addons/mail/static/src/xml/mail.xml:191
+#: view:mail.compose.message:0
+#: view:mail.wizard.invite:0
+#, python-format
+msgid "or"
+msgstr "או"
+
+#. module: mail
+#: help:mail.compose.message,vote_user_ids:0
+#: help:mail.message,vote_user_ids:0
+msgid "Users that voted for this message"
+msgstr "משתמשים שהצביעו עבור הודעה זו"
+
+#. module: mail
+#: help:mail.group,alias_id:0
+msgid ""
+"The email address associated with this group. New emails received will "
+"automatically create new topics."
+msgstr ""
+
+#. module: mail
+#: view:mail.mail:0
+msgid "Month"
+msgstr "חודש"
+
+#. module: mail
+#: view:mail.mail:0
+msgid "Email Search"
+msgstr "חיפוש דוא\"ל"
+
+#. module: mail
+#: field:mail.compose.message,child_ids:0
+#: field:mail.message,child_ids:0
+msgid "Child Messages"
+msgstr "הודעות בנות"
+
+#. module: mail
+#: field:mail.alias,alias_user_id:0
+msgid "Owner"
+msgstr "בעלים"
+
+#. module: mail
+#: model:ir.model,name:mail.model_res_users
+msgid "Users"
+msgstr "משתמשים"
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_message
+#: field:mail.mail,mail_message_id:0
+#: view:mail.message:0
+#: field:mail.notification,message_id:0
+#: field:mail.wizard.invite,message:0
+msgid "Message"
+msgstr "הודעה"
+
+#. module: mail
+#: help:mail.followers,res_id:0
+#: help:mail.wizard.invite,res_id:0
+msgid "Id of the followed resource"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,body:0
+#: field:mail.message,body:0
+msgid "Contents"
+msgstr "תוכן"
+
+#. module: mail
+#: model:ir.actions.act_window,name:mail.action_view_mail_alias
+#: model:ir.ui.menu,name:mail.mail_alias_menu
+msgid "Aliases"
+msgstr ""
+
+#. module: mail
+#: help:mail.message.subtype,description:0
+msgid ""
+"Description that will be added in the message posted for this subtype. If "
+"void, the name will be added instead."
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,vote_user_ids:0
+#: field:mail.message,vote_user_ids:0
+msgid "Votes"
+msgstr "הצבעות"
+
+#. module: mail
+#: view:mail.group:0
+msgid "Group"
+msgstr "קבץ"
+
+#. module: mail
+#: help:mail.compose.message,starred:0
+#: help:mail.message,starred:0
+msgid "Current user has a starred notification linked to this message"
+msgstr ""
+
+#. module: mail
+#: field:mail.group,public:0
+msgid "Privacy"
+msgstr "פרטיות"
+
+#. module: mail
+#: view:mail.mail:0
+msgid "Notification"
+msgstr "התראה"
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/mail.js:654
+#, python-format
+msgid "Please complete partner's informations"
+msgstr "אנא השלם את פרטי השותף"
+
+#. module: mail
+#: view:mail.wizard.invite:0
+msgid "Add Followers"
+msgstr "הוסף עוקבים"
+
+#. module: mail
+#: view:mail.compose.message:0
+msgid "Followers of selected items and"
+msgstr ""
+
+#. module: mail
+#: field:mail.alias,alias_force_thread_id:0
+msgid "Record Thread ID"
+msgstr ""
+
+#. module: mail
+#: model:ir.ui.menu,name:mail.mail_group_root
+msgid "My Groups"
+msgstr "הקבוצות שלי"
+
+#. module: mail
+#: model:ir.actions.client,help:mail.action_mail_archives_feeds
+msgid ""
+"<p>\n"
+"                    No message found and no message sent yet.\n"
+"                </p><p>\n"
+"                    Click on the top-right icon to compose a message. This\n"
+"                    message will be sent by email if it's an internal "
+"contact.\n"
+"                </p>\n"
+"            "
+msgstr ""
+
+#. module: mail
+#: view:mail.mail:0
+#: field:mail.mail,state:0
+msgid "Status"
+msgstr "סטטוס"
+
+#. module: mail
+#: view:mail.mail:0
+#: selection:mail.mail,state:0
+msgid "Outgoing"
+msgstr "דואר יוצא"
+
+#. module: mail
+#: selection:res.partner,notification_email_send:0
+msgid "All feeds"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,record_name:0
+#: help:mail.message,record_name:0
+msgid "Name get of the related document."
+msgstr ""
+
+#. module: mail
+#: model:ir.actions.act_window,name:mail.action_view_notifications
+#: model:ir.model,name:mail.model_mail_notification
+#: model:ir.ui.menu,name:mail.menu_email_notifications
+#: field:mail.compose.message,notification_ids:0
+#: view:mail.message:0
+#: field:mail.message,notification_ids:0
+#: view:mail.notification:0
+msgid "Notifications"
+msgstr "התראות"
+
+#. module: mail
+#: view:mail.alias:0
+msgid "Search Alias"
+msgstr ""
+
+#. module: mail
+#: help:mail.alias,alias_force_thread_id:0
+msgid ""
+"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."
+msgstr ""
+
+#. module: mail
+#: help:mail.message.subtype,name:0
+msgid ""
+"Message subtype gives a more precise type on the message, especially for "
+"system notifications. For example, it can be a notification related to a new "
+"record (New), or to a stage change in a process (Stage change). Message "
+"subtypes allow to precisely tune the notifications the user want to receive "
+"on its wall."
+msgstr ""
+
+#. module: mail
+#: view:mail.mail:0
+msgid "by"
+msgstr "על ידי"
+
+#. module: mail
+#: model:mail.group,name:mail.group_best_sales_practices
+msgid "Best Sales Practices"
+msgstr ""
+
+#. module: mail
+#: selection:mail.group,public:0
+msgid "Selected Group Only"
+msgstr "רק הקבוצות שנבחרו"
+
+#. module: mail
+#: field:mail.group,message_is_follower:0
+#: field:mail.thread,message_is_follower:0
+#: field:res.partner,message_is_follower:0
+msgid "Is a Follower"
+msgstr "הוא עוקב"
+
+#. module: mail
+#: view:mail.alias:0
+#: view:mail.mail:0
+msgid "User"
+msgstr "משתמש"
+
+#. module: mail
+#: view:mail.group:0
+msgid "Groups"
+msgstr "קבוצות"
+
+#. module: mail
+#: view:mail.message:0
+msgid "Messages Search"
+msgstr "חיפוש הודעות"
+
+#. module: mail
+#: field:mail.compose.message,date:0
+#: field:mail.message,date:0
+msgid "Date"
+msgstr "תאריך"
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:34
+#, python-format
+msgid "Post"
+msgstr ""
+
+#. module: mail
+#: view:mail.mail:0
+msgid "Extended Filters..."
+msgstr "מסננים מתקדמים..."
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:120
+#, python-format
+msgid "To:"
+msgstr "אל:"
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:193
+#, python-format
+msgid "Write to my followers"
+msgstr "כתוב לעוקבים שלי"
+
+#. module: mail
+#: model:ir.model,name:mail.model_res_groups
+msgid "Access Groups"
+msgstr "קבוצות גישה"
+
+#. module: mail
+#: field:mail.message.subtype,default:0
+msgid "Default"
+msgstr "ברירת מחדל"
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:311
+#, python-format
+msgid "show more message"
+msgstr "הצג עוד הודעות"
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:246
+#, python-format
+msgid "Mark as Todo"
+msgstr ""
+
+#. module: mail
+#: help:mail.message.subtype,parent_id:0
+msgid "Parent subtype, used for automatic subscription."
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_wizard_invite
+msgid "Invite wizard"
+msgstr ""
+
+#. module: mail
+#: field:mail.group,message_summary:0
+#: field:mail.thread,message_summary:0
+#: field:res.partner,message_summary:0
+msgid "Summary"
+msgstr "תקציר"
+
+#. module: mail
+#: help:mail.message.subtype,res_model:0
+msgid ""
+"Model the subtype applies to. If False, this subtype applies to all models."
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,subtype_id:0
+#: field:mail.followers,subtype_ids:0
+#: field:mail.message,subtype_id:0
+#: view:mail.message.subtype:0
+msgid "Subtype"
+msgstr "תת סוג"
+
+#. module: mail
+#: view:mail.group:0
+msgid "Group Form"
+msgstr "טופס קבוצה"
+
+#. module: mail
+#: field:mail.compose.message,starred:0
+#: field:mail.message,starred:0
+#: field:mail.notification,starred:0
+msgid "Starred"
+msgstr "מסומן בכוכב"
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:313
+#, python-format
+msgid "more messages"
+msgstr "עוד הודעות"
+
+#. module: mail
+#: code:addons/mail/update.py:93
+#, python-format
+msgid "Error"
+msgstr "שגיאה"
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail_followers.xml:13
+#, python-format
+msgid "Following"
+msgstr "עוקבים"
+
+#. module: mail
+#: sql_constraint:mail.alias:0
+msgid ""
+"Unfortunately this email alias is already used, please choose a unique one"
+msgstr ""
+
+#. module: mail
+#: help:mail.alias,alias_user_id:0
+msgid ""
+"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."
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail_followers.xml:52
+#, python-format
+msgid "And"
+msgstr "וגם"
+
+#. module: mail
+#: field:mail.compose.message,message_id:0
+#: field:mail.message,message_id:0
+msgid "Message-Id"
+msgstr ""
+
+#. module: mail
+#: help:mail.group,image:0
+msgid ""
+"This field holds the image used as photo for the group, limited to "
+"1024x1024px."
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,attachment_ids:0
+#: view:mail.mail:0
+#: field:mail.message,attachment_ids:0
+msgid "Attachments"
+msgstr "קבצים מצורפים"
+
+#. module: mail
+#: field:mail.compose.message,record_name:0
+#: field:mail.message,record_name:0
+msgid "Message Record Name"
+msgstr ""
+
+#. module: mail
+#: field:mail.mail,email_cc:0
+msgid "Cc"
+msgstr ""
+
+#. module: mail
+#: help:mail.notification,starred:0
+msgid "Starred message that goes into the todo mailbox"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:123
+#: view:mail.compose.message:0
+#, python-format
+msgid "Followers of"
+msgstr "עוקבים אחר"
+
+#. module: mail
+#: help:mail.mail,auto_delete:0
+msgid "Permanently delete this email after sending it, to save space"
+msgstr ""
+
+#. module: mail
+#: model:ir.actions.client,name:mail.action_mail_group_feeds
+msgid "Discussion Group"
+msgstr "קבוצת דיון"
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:242
+#, python-format
+msgid "Done"
+msgstr "בוצע"
+
+#. module: mail
+#: model:mail.message.subtype,name:mail.mt_comment
+msgid "Discussions"
+msgstr "דיונים"
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail_followers.xml:11
+#, python-format
+msgid "Follow"
+msgstr "עקוב"
+
+#. module: mail
+#: field:mail.group,name:0
+msgid "Name"
+msgstr "שם"
+
+#. module: mail
+#: model:mail.group,name:mail.group_all_employees
+msgid "Whole Company"
+msgstr "כלל החברה"
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:129
+#: code:addons/mail/static/src/xml/mail.xml:292
+#: view:mail.compose.message:0
+#, python-format
+msgid "and"
+msgstr "וגם"
+
+#. module: mail
+#: help:mail.mail,body_html:0
+msgid "Rich-text/HTML message"
+msgstr ""
+
+#. module: mail
+#: view:mail.mail:0
+msgid "Creation Month"
+msgstr "חודש היצירה"
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:323
+#, python-format
+msgid "Compose new Message"
+msgstr "כתוב הודעה חדשה"
+
+#. module: mail
+#: field:mail.group,menu_id:0
+msgid "Related Menu"
+msgstr "תפריט מקושר"
+
+#. module: mail
+#: view:mail.message:0
+msgid "Content"
+msgstr "תוכן"
+
+#. module: mail
+#: field:mail.mail,email_to:0
+msgid "To"
+msgstr "אל"
+
+#. module: mail
+#: field:mail.compose.message,notified_partner_ids:0
+#: field:mail.message,notified_partner_ids:0
+msgid "Notified partners"
+msgstr ""
+
+#. module: mail
+#: help:mail.group,public:0
+msgid ""
+"This group is visible by non members.             Invisible groups can add "
+"members through the invite button."
+msgstr ""
+
+#. module: mail
+#: model:mail.group,name:mail.group_board
+msgid "Board meetings"
+msgstr "פגישות הנהלה"
+
+#. module: mail
+#: constraint:mail.alias:0
+msgid ""
+"Invalid expression, it must be a literal python dictionary definition e.g. "
+"\"{'field': 'value'}\""
+msgstr ""
+
+#. module: mail
+#: field:mail.alias,alias_model_id:0
+msgid "Aliased Model"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,message_id:0
+#: help:mail.message,message_id:0
+msgid "Message unique identifier"
+msgstr ""
+
+#. module: mail
+#: field:mail.group,description:0
+#: field:mail.message.subtype,description:0
+msgid "Description"
+msgstr "תיאור"
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_followers
+msgid "Document Followers"
+msgstr "עוקבים אחר המסמך"
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail_followers.xml:35
+#, python-format
+msgid "Remove this follower"
+msgstr "הסר עוקב זה"
+
+#. module: mail
+#: selection:res.partner,notification_email_send:0
+msgid "Never"
+msgstr "לעולם לא"
+
+#. module: mail
+#: field:mail.mail,mail_server_id:0
+msgid "Outgoing mail server"
+msgstr "שרת דואר יוצא"
+
+#. module: mail
+#: code:addons/mail/mail_message.py:930
+#, python-format
+msgid "Partners email addresses not found"
+msgstr ""
+
+#. module: mail
+#: view:mail.mail:0
+#: selection:mail.mail,state:0
+msgid "Sent"
+msgstr "נשלח"
+
+#. module: mail
+#: field:mail.mail,body_html:0
+msgid "Rich-text Contents"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,to_read:0
+#: help:mail.message,to_read:0
+msgid "Current user has an unread notification linked to this message"
+msgstr ""
+
+#. module: mail
+#: help:res.partner,notification_email_send:0
+msgid ""
+"Choose in which case you want to receive an email when you receive new feeds."
+msgstr ""
+
+#. module: mail
+#: model:ir.actions.act_window,name:mail.action_view_groups
+#: model:ir.ui.menu,name:mail.mail_allgroups
+msgid "Join a group"
+msgstr "הצטרף לקבוצה"
+
+#. module: mail
+#: model:ir.actions.client,help:mail.action_mail_group_feeds
+msgid ""
+"<p>\n"
+"                    No message in this group.\n"
+"                </p>\n"
+"            "
+msgstr ""
+"<p>\n"
+"                    אין הודעה בקבוצה זו.\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 "אנא המתן בזמן שהקובץ עולה."
+
+#. module: mail
+#: view:mail.group:0
+msgid ""
+"This group is visible by everyone,\n"
+"                                    including your customers if you "
+"installed\n"
+"                                    the portal module."
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:243
+#, python-format
+msgid "Set back to Todo"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:126
+#, python-format
+msgid "this document"
+msgstr "מסמך זה"
+
+#. module: mail
+#: field:mail.compose.message,filter_id:0
+msgid "Filters"
+msgstr "מסננים"
+
+#. module: mail
+#: field:res.partner,notification_email_send:0
+msgid "Receive Feeds by Email"
+msgstr ""
+
+#. module: mail
+#: help:base.config.settings,alias_domain:0
+msgid ""
+"If you have setup a catch-all email domain redirected to the OpenERP server, "
+"enter the domain name here."
+msgstr ""
+
+#. module: mail
+#: model:ir.actions.act_window,name:mail.action_view_mail_message
+#: model:ir.ui.menu,name:mail.menu_mail_message
+#: field:mail.group,message_ids:0
+#: view:mail.message:0
+#: field:mail.thread,message_ids:0
+#: field:res.partner,message_ids:0
+msgid "Messages"
+msgstr "הודעות"
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:139
+#, python-format
+msgid "others..."
+msgstr "אחרים..."
+
+#. module: mail
+#: model:ir.actions.client,name:mail.action_mail_star_feeds
+#: model:ir.ui.menu,name:mail.mail_starfeeds
+msgid "To-do"
+msgstr "לביצוע"
+
+#. module: mail
+#: view:mail.alias:0
+#: field:mail.alias,alias_name:0
+#: field:mail.group,alias_id:0
+#: field:res.users,alias_id:0
+msgid "Alias"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_mail
+msgid "Outgoing Mails"
+msgstr "הודעות יוצאות"
+
+#. module: mail
+#: help:mail.compose.message,notification_ids:0
+#: help:mail.message,notification_ids:0
+msgid ""
+"Technical field holding the message notifications. Use notified_partner_ids "
+"to access notified partners."
+msgstr ""
+
+#. module: mail
+#: model:ir.ui.menu,name:mail.mail_feeds
+#: model:ir.ui.menu,name:mail.mail_feeds_main
+msgid "Messaging"
+msgstr "שליחת הודעות"
+
+#. module: mail
+#: view:mail.alias:0
+#: field:mail.message.subtype,res_model:0
+msgid "Model"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Unread"
+msgstr ""
+
+#. module: mail
+#: help:mail.followers,subtype_ids:0
+msgid ""
+"Message subtypes followed, meaning subtypes that will be pushed onto the "
+"user's Wall."
+msgstr ""
+
+#. module: mail
+#: help:mail.group,message_ids:0
+#: help:mail.thread,message_ids:0
+#: help:res.partner,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: mail
+#: help:mail.mail,references:0
+msgid "Message references, such as identifiers of previous messages"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,composition_mode:0
+msgid "Composition mode"
+msgstr "מצב הכתיבה"
+
+#. module: mail
+#: field:mail.compose.message,model:0
+#: field:mail.followers,res_model:0
+#: field:mail.message,model:0
+#: field:mail.wizard.invite,res_model:0
+msgid "Related Document Model"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:338
+#, python-format
+msgid "unlike"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,author_id:0
+#: help:mail.message,author_id:0
+msgid ""
+"Author of the message. If not set, email_from may hold an email address that "
+"did not match any partner."
+msgstr ""
+
+#. module: mail
+#: help:mail.mail,email_cc:0
+msgid "Carbon copy message recipients"
+msgstr ""
+
+#. module: mail
+#: field:mail.alias,alias_domain:0
+msgid "Alias domain"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/update.py:93
+#, python-format
+msgid "Error during communication with the publisher warranty server."
+msgstr ""
+
+#. module: mail
+#: selection:mail.group,public:0
+msgid "Private"
+msgstr "פרטי"
+
+#. module: mail
+#: model:ir.actions.client,help:mail.action_mail_star_feeds
+msgid ""
+"<p>\n"
+"                    <b>No todo.</b>\n"
+"                </p><p>\n"
+"                    When you process messages in your inbox, you can mark "
+"some\n"
+"                    as <i>todo</i>. From this menu, you can process all your "
+"todo.\n"
+"                </p>\n"
+"            "
+msgstr ""
+
+#. module: mail
+#: selection:mail.mail,state:0
+msgid "Delivery Failed"
+msgstr "השליחה נכשלה"
+
+#. module: mail
+#: field:mail.compose.message,partner_ids:0
+msgid "Additional contacts"
+msgstr "אנשי קשר נוספים"
+
+#. module: mail
+#: help:mail.compose.message,parent_id:0
+#: help:mail.message,parent_id:0
+msgid "Initial thread message."
+msgstr ""
+
+#. module: mail
+#: model:mail.group,name:mail.group_hr_policies
+msgid "HR Policies"
+msgstr "מדיניות מש\"א"
+
+#. module: mail
+#: selection:res.partner,notification_email_send:0
+msgid "Emails only"
+msgstr ""
+
+#. module: mail
+#: model:ir.actions.client,name:mail.action_mail_inbox_feeds
+#: model:ir.ui.menu,name:mail.mail_inboxfeeds
+msgid "Inbox"
+msgstr "דואר נכנס"
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:58
+#, python-format
+msgid "File"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/many2many_tags_email.js:63
+#, python-format
+msgid "Please complete partner's informations and Email"
+msgstr "אנא השלם את פרטי ודוא\"ל השותף"
+
+#. module: mail
+#: model:ir.actions.act_window,name:mail.action_view_message_subtype
+#: model:ir.ui.menu,name:mail.menu_message_subtype
+msgid "Subtypes"
+msgstr "תתי סוגים"
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_alias
+msgid "Email Aliases"
+msgstr ""
+
+#. module: mail
+#: field:mail.group,image_small:0
+msgid "Small-sized photo"
+msgstr "תצלום קטן"
+
+#. module: mail
+#: help:mail.mail,reply_to:0
+msgid "Preferred response address for the message"
+msgstr ""
diff --git a/addons/mail/i18n/hr.po b/addons/mail/i18n/hr.po
index 0953909cdfb..f2be73b4d78 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: 2013-09-12 06:30+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
+"X-Launchpad-Export-Date: 2014-01-28 06:36+0000\n"
+"X-Generator: Launchpad (build 16914)\n"
 
 #. module: mail
 #: view:mail.followers:0
@@ -467,7 +467,7 @@ msgstr "Od"
 #: view:mail.mail:0
 #: view:mail.message.subtype:0
 msgid "Email message"
-msgstr "Poruka e-pošte"
+msgstr "E-mail poruka"
 
 #. module: mail
 #: model:ir.model,name:mail.model_base_config_settings
@@ -645,6 +645,12 @@ msgid ""
 "                </p>\n"
 "            "
 msgstr ""
+"<p>\n"
+"                    <b>Nemate privatnih poruka.</b>\n"
+"                </p><p>\n"
+"                    Ova lista sadrži poruke poslane Vama.\n"
+"                </p>\n"
+"            "
 
 #. module: mail
 #: model:mail.group,name:mail.group_rd
@@ -695,7 +701,7 @@ msgid ""
 "\"Settings > Users\" menu."
 msgstr ""
 "Ne možete izraditi korisnika. Za stvaranje novih korisnika, trebali biste "
-"koristiti \"Postavke> Korisnici\" izbornika."
+"koristiti izbornik \"Postavke > Korisnici\"."
 
 #. module: mail
 #: help:mail.followers,res_model:0
@@ -781,7 +787,7 @@ msgstr "Podtipovi poruka"
 #: help:mail.message,notified_partner_ids:0
 msgid ""
 "Partners that have a notification pushing this message in their mailboxes"
-msgstr ""
+msgstr "Poruka za partnere koji imaju obavjesti."
 
 #. module: mail
 #: selection:mail.compose.message,type:0
@@ -804,6 +810,16 @@ msgid ""
 "                </p>\n"
 "            "
 msgstr ""
+"<p>\n"
+"                    <b>Odlično !</b> Vaš inbox je prazan.\n"
+"                </p><p>\n"
+"                    Vaš inbox sadrži privatne poruke ili e-mailove poslane "
+"Vama\n"
+"                    kao i informacije povezane sa dokumentima ili ljudima "
+"koje\n"
+"                    slijedite.\n"
+"                </p>\n"
+"            "
 
 #. module: mail
 #: field:mail.mail,notification:0
@@ -867,7 +883,7 @@ msgid ""
 "The email address associated with this group. New emails received will "
 "automatically create new topics."
 msgstr ""
-"Adresa e-pošte povezana s ovom skupinom. Novoprimljene poruke automatski će "
+"Adresa e-pošte povezana s ovom grupom. Novoprimljene poruke automatski će "
 "stvoriti nove teme."
 
 #. module: mail
@@ -998,6 +1014,15 @@ msgid ""
 "                </p>\n"
 "            "
 msgstr ""
+"<p>\n"
+"                    Poruka nije pronađena niti poslana.\n"
+"                </p><p>\n"
+"                    Pritisnite ikonu u gornjem desnom uglu kako biste "
+"kreirali novu poruku. Ova\n"
+"                    poruka će biti poslana putem e-maila ako se radi o "
+"internom kontaktu.\n"
+"                </p>\n"
+"            "
 
 #. module: mail
 #: view:mail.mail:0
@@ -1446,7 +1471,7 @@ msgstr "Izlazni poslužitelj e-pošte"
 #: code:addons/mail/mail_message.py:930
 #, python-format
 msgid "Partners email addresses not found"
-msgstr "Pertnerove e-mail adrese nisu pronađene"
+msgstr "Partnerove e-mail adrese nisu pronađene"
 
 #. module: mail
 #: view:mail.mail:0
@@ -1486,6 +1511,10 @@ msgid ""
 "                </p>\n"
 "            "
 msgstr ""
+"<p>\n"
+"                    U ovoj grupi nema poruka.\n"
+"                </p>\n"
+"            "
 
 #. module: mail
 #. openerp-web
@@ -1502,6 +1531,10 @@ msgid ""
 "installed\n"
 "                                    the portal module."
 msgstr ""
+"Ova je grupa vidljiva svima,\n"
+"                                    uključujući i Vaše partnere ukoliko ste "
+"instalirali\n"
+"                                    portal modul."
 
 #. module: mail
 #. openerp-web
@@ -1682,6 +1715,15 @@ msgid ""
 "                </p>\n"
 "            "
 msgstr ""
+"<p>\n"
+"                    <b>Nema zadataka za učiniti.</b>\n"
+"                </p><p>\n"
+"                    Kada obradite poruke u Vašem inbox-u, neke od njih "
+"možete označiti\n"
+"                    <i>Za učiniti</i>. Iz ovog izbornika možete obraditi sve "
+"Vaše poruke <i>Za učiniti</i>.\n"
+"                </p>\n"
+"            "
 
 #. module: mail
 #: selection:mail.mail,state:0
diff --git a/addons/mail/i18n/hu.po b/addons/mail/i18n/hu.po
index 9b376093a29..4c2bcf53737 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: 2013-12-03 05:41+0000\n"
-"X-Generator: Launchpad (build 16856)\n"
+"X-Launchpad-Export-Date: 2014-01-28 06:36+0000\n"
+"X-Generator: Launchpad (build 16914)\n"
 
 #. module: mail
 #: view:mail.followers:0
diff --git a/addons/mail/i18n/it.po b/addons/mail/i18n/it.po
index d742589ac41..8da8493caff 100644
--- a/addons/mail/i18n/it.po
+++ b/addons/mail/i18n/it.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-15 13:57+0000\n"
-"Last-Translator: Davide Corio <enlightx@gmail.com>\n"
+"Last-Translator: Davide Corio @ LS <enlightx@gmail.com>\n"
 "Language-Team: Italian <it@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: 2013-09-12 06:29+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
+"X-Launchpad-Export-Date: 2014-01-28 06:36+0000\n"
+"X-Generator: Launchpad (build 16914)\n"
 
 #. module: mail
 #: view:mail.followers:0
diff --git a/addons/mail/i18n/ja.po b/addons/mail/i18n/ja.po
index 9dde3980a0c..acbac2da6e4 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: 2013-09-12 06:30+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
+"X-Launchpad-Export-Date: 2014-01-28 06:36+0000\n"
+"X-Generator: Launchpad (build 16914)\n"
 
 #. module: mail
 #: view:mail.followers:0
@@ -32,7 +32,7 @@ msgstr ""
 #: view:mail.mail:0
 #: field:mail.message,author_id:0
 msgid "Author"
-msgstr ""
+msgstr "作者"
 
 #. module: mail
 #: view:mail.mail:0
@@ -47,12 +47,12 @@ msgstr "メッセージの受取人"
 #. module: mail
 #: help:mail.message.subtype,default:0
 msgid "Activated by default when subscribing."
-msgstr ""
+msgstr "購読するときはデフォルトで活性化されます。"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Comments"
-msgstr ""
+msgstr "コメント"
 
 #. module: mail
 #: view:mail.alias:0
@@ -71,7 +71,7 @@ msgstr ""
 msgid ""
 "The name of the email alias, e.g. 'jobs' if you want to catch emails for "
 "<jobs@example.my.openerp.com>"
-msgstr ""
+msgstr "Eメールエイリアスの名前、たとえば<jobs@example.my.openerp.com>を捉えたい場合は'jobs'"
 
 #. module: mail
 #: model:ir.actions.act_window,name:mail.action_email_compose_message_wizard
@@ -89,12 +89,12 @@ msgstr ""
 #. module: mail
 #: view:mail.group:0
 msgid "Group Name"
-msgstr ""
+msgstr "グループ名"
 
 #. module: mail
 #: selection:mail.group,public:0
 msgid "Public"
-msgstr ""
+msgstr "公開"
 
 #. module: mail
 #: view:mail.mail:0
@@ -112,7 +112,7 @@ msgstr ""
 msgid ""
 "Email address of the sender. This field is set when no matching partner is "
 "found for incoming emails."
-msgstr ""
+msgstr "送信者のメールアドレス。このフィールドは受信メールに一致する取引先が見つからない場合に設定されます。"
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_compose_message
@@ -124,19 +124,19 @@ msgstr ""
 #: code:addons/mail/static/src/xml/mail_followers.xml:23
 #, python-format
 msgid "Add others"
-msgstr ""
+msgstr "フォロワー追加"
 
 #. module: mail
 #: field:mail.message.subtype,parent_id:0
 msgid "Parent"
-msgstr ""
+msgstr "親"
 
 #. module: mail
 #: field:mail.group,message_unread:0
 #: field:mail.thread,message_unread:0
 #: field:res.partner,message_unread:0
 msgid "Unread Messages"
-msgstr ""
+msgstr "未読メッセージ"
 
 #. module: mail
 #. openerp-web
@@ -163,7 +163,7 @@ msgstr ""
 #: view:mail.message:0
 #: field:mail.notification,read:0
 msgid "Read"
-msgstr ""
+msgstr "読む"
 
 #. module: mail
 #: view:mail.group:0
@@ -175,7 +175,7 @@ msgstr ""
 #: code:addons/mail/static/src/js/mail_followers.js:157
 #, python-format
 msgid "followers"
-msgstr ""
+msgstr "フォロワー"
 
 #. module: mail
 #: code:addons/mail/mail_message.py:737
@@ -201,7 +201,7 @@ msgstr ""
 #. module: mail
 #: model:mail.group,name:mail.group_support
 msgid "Support"
-msgstr ""
+msgstr "サポート"
 
 #. module: mail
 #: code:addons/mail/mail_message.py:738
@@ -241,12 +241,12 @@ msgstr ""
 #. module: mail
 #: field:base.config.settings,alias_domain:0
 msgid "Alias Domain"
-msgstr ""
+msgstr "エイリアスドメイン"
 
 #. module: mail
 #: field:mail.group,group_ids:0
 msgid "Auto Subscription"
-msgstr ""
+msgstr "自動サブスクリプション"
 
 #. module: mail
 #: field:mail.mail,references:0
@@ -258,12 +258,12 @@ msgstr "参照"
 #: code:addons/mail/static/src/xml/mail.xml:206
 #, python-format
 msgid "No messages."
-msgstr ""
+msgstr "メッセージがありません。"
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_group
 msgid "Discussion group"
-msgstr ""
+msgstr "ディスカッショングループ"
 
 #. module: mail
 #. openerp-web
@@ -286,7 +286,7 @@ msgstr ""
 msgid ""
 "Message type: email for email message, notification for system message, "
 "comment for other messages such as user replies"
-msgstr ""
+msgstr "メッセージの種類：電子メールメッセージのメール、システムメッセージの通知、ユーザ返信など他のメッセージのコメント"
 
 #. module: mail
 #: help:mail.message.subtype,relation_field:0
@@ -295,6 +295,8 @@ msgid ""
 "automatic subscription on a related document. The field is used to compute "
 "getattr(related_document.relation_field)."
 msgstr ""
+"関連文書を自動購読する場合、関連モデルをサブタイプのモデルにリンクするためのフィールド。このフィールドはgetattr(related_document."
+"relation_field)の計算に使われます。"
 
 #. module: mail
 #: selection:mail.mail,state:0
@@ -346,7 +348,7 @@ msgstr "自動削除"
 #: view:mail.group:0
 #, python-format
 msgid "Unfollow"
-msgstr ""
+msgstr "フォロー解除"
 
 #. module: mail
 #. openerp-web
@@ -380,7 +382,7 @@ msgstr "Eメール"
 #. module: mail
 #: field:mail.followers,partner_id:0
 msgid "Related Partner"
-msgstr ""
+msgstr "関連取引先"
 
 #. module: mail
 #: help:mail.group,message_summary:0
@@ -398,17 +400,20 @@ msgid ""
 "incoming email that does not reply to an existing record will cause the "
 "creation of a new record of this model (e.g. a Project Task)"
 msgstr ""
+"このエイリアスが対応するモデル "
+"(OpenERPのドキュメント類)。既存のレコードに返信しないすべての受信メールは、このモデル(たとえばプロジェクトタスク)の新しいレコード作成を引き起こ"
+"します。"
 
 #. module: mail
 #: field:mail.message.subtype,relation_field:0
 msgid "Relation field"
-msgstr ""
+msgstr "関連フィールド"
 
 #. module: mail
 #: selection:mail.compose.message,type:0
 #: selection:mail.message,type:0
 msgid "System notification"
-msgstr ""
+msgstr "システム通知"
 
 #. module: mail
 #: model:ir.model,name:mail.model_res_partner
@@ -418,7 +423,7 @@ msgstr "パートナ"
 #. module: mail
 #: model:ir.ui.menu,name:mail.mail_my_stuff
 msgid "Organizer"
-msgstr ""
+msgstr "オーガナイザ"
 
 #. module: mail
 #: field:mail.compose.message,subject:0
@@ -429,7 +434,7 @@ msgstr "件名"
 #. module: mail
 #: field:mail.wizard.invite,partner_ids:0
 msgid "Partners"
-msgstr ""
+msgstr "取引先"
 
 #. module: mail
 #: view:mail.mail:0
@@ -467,7 +472,7 @@ msgstr "送信"
 #: code:addons/mail/static/src/js/mail_followers.js:153
 #, python-format
 msgid "No followers"
-msgstr ""
+msgstr "フォロワー不在"
 
 #. module: mail
 #: view:mail.mail:0
@@ -485,7 +490,7 @@ msgstr "失敗"
 #: field:res.partner,message_follower_ids:0
 #, python-format
 msgid "Followers"
-msgstr ""
+msgstr "フォロワー"
 
 #. module: mail
 #: model:ir.actions.client,name:mail.action_mail_archives_feeds
@@ -514,20 +519,20 @@ msgstr "返信"
 #: code:addons/mail/static/src/js/mail_followers.js:155
 #, python-format
 msgid "One follower"
-msgstr ""
+msgstr "1 フォロワー"
 
 #. module: mail
 #: field:mail.compose.message,type:0
 #: field:mail.message,type:0
 msgid "Type"
-msgstr ""
+msgstr "タイプ"
 
 #. module: mail
 #: selection:mail.compose.message,type:0
 #: view:mail.mail:0
 #: selection:mail.message,type:0
 msgid "Email"
-msgstr ""
+msgstr "Eメール"
 
 #. module: mail
 #: field:ir.ui.menu,mail_group_id:0
@@ -542,7 +547,7 @@ msgstr ""
 #. module: mail
 #: field:mail.alias,alias_defaults:0
 msgid "Default Values"
-msgstr ""
+msgstr "デフォルト値"
 
 #. module: mail
 #: code:addons/mail/res_users.py:89
@@ -581,17 +586,17 @@ msgstr ""
 #. module: mail
 #: field:mail.group,group_public_id:0
 msgid "Authorized Group"
-msgstr ""
+msgstr "許可グループ"
 
 #. module: mail
 #: view:mail.group:0
 msgid "Join Group"
-msgstr ""
+msgstr "グループに参加"
 
 #. module: mail
 #: help:mail.mail,email_from:0
 msgid "Message sender, taken from user preferences."
-msgstr ""
+msgstr "ユーザーの設定ファイルから取得したメッセージ送信者"
 
 #. module: mail
 #: code:addons/mail/wizard/invite.py:40
@@ -603,7 +608,7 @@ msgstr ""
 #: field:mail.compose.message,parent_id:0
 #: field:mail.message,parent_id:0
 msgid "Parent Message"
-msgstr ""
+msgstr "親メッセージ"
 
 #. module: mail
 #: field:mail.compose.message,res_id:0
@@ -651,7 +656,7 @@ msgstr "高度"
 #: code:addons/mail/static/src/xml/mail.xml:244
 #, python-format
 msgid "Move to Inbox"
-msgstr ""
+msgstr "受信箱に移動"
 
 #. module: mail
 #: code:addons/mail/wizard/mail_compose_message.py:193
@@ -677,32 +682,32 @@ msgstr ""
 #: help:mail.followers,res_model:0
 #: help:mail.wizard.invite,res_model:0
 msgid "Model of the followed resource"
-msgstr ""
+msgstr "追従するリソースのモデル"
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:337
 #, python-format
 msgid "like"
-msgstr ""
+msgstr "いいね"
 
 #. module: mail
 #: view:mail.compose.message:0
 #: view:mail.wizard.invite:0
 msgid "Cancel"
-msgstr "キャンセル"
+msgstr "取消"
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:47
 #, python-format
 msgid "Share with my followers..."
-msgstr ""
+msgstr "自分のフォロワーとシェア..."
 
 #. module: mail
 #: field:mail.notification,partner_id:0
 msgid "Contact"
-msgstr ""
+msgstr "連絡先"
 
 #. module: mail
 #: view:mail.group:0
@@ -739,26 +744,26 @@ msgstr ""
 msgid ""
 "A Python dictionary that will be evaluated to provide default values when "
 "creating new records for this alias."
-msgstr ""
+msgstr "このエイリアスの新しいレコードを作成する時にデフォルト値を与えるためのPython辞書です。"
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_message_subtype
 msgid "Message subtypes"
-msgstr ""
+msgstr "メッセージのサブタイプ"
 
 #. module: mail
 #: help:mail.compose.message,notified_partner_ids:0
 #: help:mail.message,notified_partner_ids:0
 msgid ""
 "Partners that have a notification pushing this message in their mailboxes"
-msgstr ""
+msgstr "メールボックスのメッセージをプッシュ通知した取引先"
 
 #. module: mail
 #: selection:mail.compose.message,type:0
 #: view:mail.mail:0
 #: selection:mail.message,type:0
 msgid "Comment"
-msgstr ""
+msgstr "コメント"
 
 #. module: mail
 #: model:ir.actions.client,help:mail.action_mail_inbox_feeds
@@ -785,7 +790,7 @@ msgstr ""
 #: code:addons/mail/static/src/xml/mail.xml:188
 #, python-format
 msgid "Compose a new message"
-msgstr ""
+msgstr "新規メッセージ作成"
 
 #. module: mail
 #: view:mail.mail:0
@@ -819,7 +824,7 @@ msgstr ""
 #: view:mail.wizard.invite:0
 #, python-format
 msgid "or"
-msgstr ""
+msgstr "または"
 
 #. module: mail
 #: help:mail.compose.message,vote_user_ids:0
@@ -848,12 +853,12 @@ msgstr "Eメール検索"
 #: field:mail.compose.message,child_ids:0
 #: field:mail.message,child_ids:0
 msgid "Child Messages"
-msgstr ""
+msgstr "子メッセージ"
 
 #. module: mail
 #: field:mail.alias,alias_user_id:0
 msgid "Owner"
-msgstr ""
+msgstr "所有者"
 
 #. module: mail
 #: model:ir.model,name:mail.model_res_users
@@ -867,13 +872,13 @@ msgstr ""
 #: field:mail.notification,message_id:0
 #: field:mail.wizard.invite,message:0
 msgid "Message"
-msgstr ""
+msgstr "メッセージ"
 
 #. module: mail
 #: help:mail.followers,res_id:0
 #: help:mail.wizard.invite,res_id:0
 msgid "Id of the followed resource"
-msgstr ""
+msgstr "追従するリソースのID"
 
 #. module: mail
 #: field:mail.compose.message,body:0
@@ -885,14 +890,14 @@ msgstr ""
 #: model:ir.actions.act_window,name:mail.action_view_mail_alias
 #: model:ir.ui.menu,name:mail.mail_alias_menu
 msgid "Aliases"
-msgstr ""
+msgstr "エイリアス"
 
 #. module: mail
 #: help:mail.message.subtype,description:0
 msgid ""
 "Description that will be added in the message posted for this subtype. If "
 "void, the name will be added instead."
-msgstr ""
+msgstr "このサブタイプのために投稿したメッセージに追加される説明です。"
 
 #. module: mail
 #: field:mail.compose.message,vote_user_ids:0
@@ -914,7 +919,7 @@ msgstr ""
 #. module: mail
 #: field:mail.group,public:0
 msgid "Privacy"
-msgstr ""
+msgstr "プライバシー"
 
 #. module: mail
 #: view:mail.mail:0
@@ -926,12 +931,12 @@ msgstr ""
 #: code:addons/mail/static/src/js/mail.js:654
 #, python-format
 msgid "Please complete partner's informations"
-msgstr ""
+msgstr "取引先の情報を完成させてください。"
 
 #. module: mail
 #: view:mail.wizard.invite:0
 msgid "Add Followers"
-msgstr ""
+msgstr "フォロワーを追加"
 
 #. module: mail
 #: view:mail.compose.message:0
@@ -941,7 +946,7 @@ msgstr ""
 #. module: mail
 #: field:mail.alias,alias_force_thread_id:0
 msgid "Record Thread ID"
-msgstr ""
+msgstr "レコードのスレッドID"
 
 #. module: mail
 #: model:ir.ui.menu,name:mail.mail_group_root
@@ -993,7 +998,7 @@ msgstr ""
 #: field:mail.message,notification_ids:0
 #: view:mail.notification:0
 msgid "Notifications"
-msgstr ""
+msgstr "通知"
 
 #. module: mail
 #: view:mail.alias:0
@@ -1006,7 +1011,7 @@ msgid ""
 "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."
-msgstr ""
+msgstr "すべての受信メッセージに添付されるスレッド(レコード)のオプションIDです。設定した場合は新しいレコードの作成を無効にします。"
 
 #. module: mail
 #: help:mail.message.subtype,name:0
@@ -1017,6 +1022,8 @@ msgid ""
 "subtypes allow to precisely tune the notifications the user want to receive "
 "on its wall."
 msgstr ""
+"メッセージのサブタイプはメッセージ、特にシステム通知に対してより正確なタイプを与えます。たとえば、新規レコード(新規)またはプロセスのステージ変更(ステー"
+"ジ変更)に関連する通知ができます。メッセージのサブタイプはユーザがウォールで受信したい通知を正確にチューンできます。"
 
 #. module: mail
 #: view:mail.mail:0
@@ -1026,12 +1033,12 @@ msgstr ""
 #. module: mail
 #: model:mail.group,name:mail.group_best_sales_practices
 msgid "Best Sales Practices"
-msgstr ""
+msgstr "最適な販売プラクティス"
 
 #. module: mail
 #: selection:mail.group,public:0
 msgid "Selected Group Only"
-msgstr ""
+msgstr "選択グループのみ"
 
 #. module: mail
 #: field:mail.group,message_is_follower:0
@@ -1086,7 +1093,7 @@ msgstr ""
 #: code:addons/mail/static/src/xml/mail.xml:193
 #, python-format
 msgid "Write to my followers"
-msgstr ""
+msgstr "フォロワーに発信"
 
 #. module: mail
 #: model:ir.model,name:mail.model_res_groups
@@ -1096,7 +1103,7 @@ msgstr ""
 #. module: mail
 #: field:mail.message.subtype,default:0
 msgid "Default"
-msgstr ""
+msgstr "デフォルト"
 
 #. module: mail
 #. openerp-web
@@ -1115,7 +1122,7 @@ msgstr ""
 #. module: mail
 #: help:mail.message.subtype,parent_id:0
 msgid "Parent subtype, used for automatic subscription."
-msgstr ""
+msgstr "自動購読で使用する親サブタイプ"
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_wizard_invite
@@ -1133,7 +1140,7 @@ msgstr ""
 #: help:mail.message.subtype,res_model:0
 msgid ""
 "Model the subtype applies to. If False, this subtype applies to all models."
-msgstr ""
+msgstr "サブタイプが適用されるモデルです。そうでない場合、このサブタイプはすべてのモデルに適用されます。"
 
 #. module: mail
 #: field:mail.compose.message,subtype_id:0
@@ -1141,7 +1148,7 @@ msgstr ""
 #: field:mail.message,subtype_id:0
 #: view:mail.message.subtype:0
 msgid "Subtype"
-msgstr ""
+msgstr "サブタイプ"
 
 #. module: mail
 #: view:mail.group:0
@@ -1153,14 +1160,14 @@ msgstr ""
 #: field:mail.message,starred:0
 #: field:mail.notification,starred:0
 msgid "Starred"
-msgstr ""
+msgstr "スター付き"
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:313
 #, python-format
 msgid "more messages"
-msgstr ""
+msgstr "他のメッセージ"
 
 #. module: mail
 #: code:addons/mail/update.py:93
@@ -1173,7 +1180,7 @@ msgstr ""
 #: code:addons/mail/static/src/xml/mail_followers.xml:13
 #, python-format
 msgid "Following"
-msgstr ""
+msgstr "フォロー中"
 
 #. module: mail
 #: sql_constraint:mail.alias:0
@@ -1189,6 +1196,8 @@ msgid ""
 "the sender (From) address, or will use the Administrator account if no "
 "system user is found for that address."
 msgstr ""
+"このエイリアスに電子メールを受信した時に作成されるレコードの所有者。このフィールドが設定されない場合、システムは送信者(From)アドレスに基づいた適切な"
+"所有者を見つけるか、見つからなければ管理者アカウントを使用します。"
 
 #. module: mail
 #. openerp-web
@@ -1231,7 +1240,7 @@ msgstr "写し(CC)"
 #. module: mail
 #: help:mail.notification,starred:0
 msgid "Starred message that goes into the todo mailbox"
-msgstr ""
+msgstr "ToDoメールボックスに入るスター付きメッセージ"
 
 #. module: mail
 #. openerp-web
@@ -1249,7 +1258,7 @@ msgstr "送信後、このEメールを削除（スペース節約のため）"
 #. module: mail
 #: model:ir.actions.client,name:mail.action_mail_group_feeds
 msgid "Discussion Group"
-msgstr ""
+msgstr "ディスカッショングループ"
 
 #. module: mail
 #. openerp-web
@@ -1261,14 +1270,14 @@ msgstr ""
 #. module: mail
 #: model:mail.message.subtype,name:mail.mt_comment
 msgid "Discussions"
-msgstr ""
+msgstr "ディスカッション"
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail_followers.xml:11
 #, python-format
 msgid "Follow"
-msgstr ""
+msgstr "フォロー"
 
 #. module: mail
 #: field:mail.group,name:0
@@ -1304,7 +1313,7 @@ msgstr "作成月"
 #: code:addons/mail/static/src/xml/mail.xml:323
 #, python-format
 msgid "Compose new Message"
-msgstr ""
+msgstr "新規メッセージ作成"
 
 #. module: mail
 #: field:mail.group,menu_id:0
@@ -1325,19 +1334,19 @@ msgstr "宛先"
 #: field:mail.compose.message,notified_partner_ids:0
 #: field:mail.message,notified_partner_ids:0
 msgid "Notified partners"
-msgstr ""
+msgstr "通知された取引先"
 
 #. module: mail
 #: help:mail.group,public:0
 msgid ""
 "This group is visible by non members.             Invisible groups can add "
 "members through the invite button."
-msgstr ""
+msgstr "このグループは非メンバーから見ることができます。見ることができないグループは招待ボタンでメンバーを追加できます。"
 
 #. module: mail
 #: model:mail.group,name:mail.group_board
 msgid "Board meetings"
-msgstr ""
+msgstr "役員会"
 
 #. module: mail
 #: constraint:mail.alias:0
@@ -1349,7 +1358,7 @@ msgstr ""
 #. module: mail
 #: field:mail.alias,alias_model_id:0
 msgid "Aliased Model"
-msgstr ""
+msgstr "エイリアスするモデル"
 
 #. module: mail
 #: help:mail.compose.message,message_id:0
@@ -1361,7 +1370,7 @@ msgstr "メッセージ識別番号"
 #: field:mail.group,description:0
 #: field:mail.message.subtype,description:0
 msgid "Description"
-msgstr ""
+msgstr "説明"
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_followers
@@ -1373,12 +1382,12 @@ msgstr ""
 #: code:addons/mail/static/src/xml/mail_followers.xml:35
 #, python-format
 msgid "Remove this follower"
-msgstr ""
+msgstr "このフォロワーを削除"
 
 #. module: mail
 #: selection:res.partner,notification_email_send:0
 msgid "Never"
-msgstr ""
+msgstr "通知なし"
 
 #. module: mail
 #: field:mail.mail,mail_server_id:0
@@ -1443,7 +1452,7 @@ msgid ""
 "                                    including your customers if you "
 "installed\n"
 "                                    the portal module."
-msgstr ""
+msgstr "このグループは誰でも見ることができます。"
 
 #. module: mail
 #. openerp-web
@@ -1474,7 +1483,7 @@ msgstr ""
 msgid ""
 "If you have setup a catch-all email domain redirected to the OpenERP server, "
 "enter the domain name here."
-msgstr ""
+msgstr "OpenERPサーバにリダイレクトされたEメールのドメインを設定する場合、ここにドメイン名を入力します。"
 
 #. module: mail
 #: model:ir.actions.act_window,name:mail.action_view_mail_message
@@ -1497,7 +1506,7 @@ msgstr ""
 #: model:ir.actions.client,name:mail.action_mail_star_feeds
 #: model:ir.ui.menu,name:mail.mail_starfeeds
 msgid "To-do"
-msgstr ""
+msgstr "TO-DO"
 
 #. module: mail
 #: view:mail.alias:0
@@ -1505,7 +1514,7 @@ msgstr ""
 #: field:mail.group,alias_id:0
 #: field:res.users,alias_id:0
 msgid "Alias"
-msgstr ""
+msgstr "エイリアス"
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_mail
@@ -1524,13 +1533,13 @@ msgstr ""
 #: model:ir.ui.menu,name:mail.mail_feeds
 #: model:ir.ui.menu,name:mail.mail_feeds_main
 msgid "Messaging"
-msgstr ""
+msgstr "メッセージング"
 
 #. module: mail
 #: view:mail.alias:0
 #: field:mail.message.subtype,res_model:0
 msgid "Model"
-msgstr ""
+msgstr "モデル"
 
 #. module: mail
 #: view:mail.message:0
@@ -1542,7 +1551,7 @@ msgstr ""
 msgid ""
 "Message subtypes followed, meaning subtypes that will be pushed onto the "
 "user's Wall."
-msgstr ""
+msgstr "追従するメッセージのサブタイプはユーザのウォールにプッシュされるサブタイプを意味します。"
 
 #. module: mail
 #: help:mail.group,message_ids:0
@@ -1574,7 +1583,7 @@ msgstr "関連する文書モデル"
 #: code:addons/mail/static/src/xml/mail.xml:338
 #, python-format
 msgid "unlike"
-msgstr ""
+msgstr "いいね取消"
 
 #. module: mail
 #: help:mail.compose.message,author_id:0
@@ -1582,7 +1591,7 @@ msgstr ""
 msgid ""
 "Author of the message. If not set, email_from may hold an email address that "
 "did not match any partner."
-msgstr ""
+msgstr "メッセージの作成者。設定されない場合、email_fromはどの取引先とも一致しないメールアドレスを保持します。"
 
 #. module: mail
 #: help:mail.mail,email_cc:0
@@ -1592,7 +1601,7 @@ msgstr "CCメッセージの宛先"
 #. module: mail
 #: field:mail.alias,alias_domain:0
 msgid "Alias domain"
-msgstr ""
+msgstr "エイリアスドメイン"
 
 #. module: mail
 #: code:addons/mail/update.py:93
@@ -1603,7 +1612,7 @@ msgstr ""
 #. module: mail
 #: selection:mail.group,public:0
 msgid "Private"
-msgstr ""
+msgstr "非公開"
 
 #. module: mail
 #: model:ir.actions.client,help:mail.action_mail_star_feeds
@@ -1618,6 +1627,14 @@ msgid ""
 "                </p>\n"
 "            "
 msgstr ""
+"<p>\n"
+"                    <b>todoはありません。</b>\n"
+"                </p><p>\n"
+"                    "
+"受信トレイのメッセージを処理する場合は、<i>todo</i>としていくつかをマークすることができます。このメニューからすべてのtodoを処理することがで"
+"きます。\n"
+"                </p>\n"
+"            "
 
 #. module: mail
 #: selection:mail.mail,state:0
@@ -1633,12 +1650,12 @@ msgstr ""
 #: help:mail.compose.message,parent_id:0
 #: help:mail.message,parent_id:0
 msgid "Initial thread message."
-msgstr ""
+msgstr "初期スレッドメッセージ"
 
 #. module: mail
 #: model:mail.group,name:mail.group_hr_policies
 msgid "HR Policies"
-msgstr ""
+msgstr "人事ポリシー"
 
 #. module: mail
 #: selection:res.partner,notification_email_send:0
@@ -1663,18 +1680,18 @@ msgstr ""
 #: code:addons/mail/static/src/js/many2many_tags_email.js:63
 #, python-format
 msgid "Please complete partner's informations and Email"
-msgstr ""
+msgstr "取引先の情報とEメールを完成させてください。"
 
 #. module: mail
 #: model:ir.actions.act_window,name:mail.action_view_message_subtype
 #: model:ir.ui.menu,name:mail.menu_message_subtype
 msgid "Subtypes"
-msgstr ""
+msgstr "サブタイプ"
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_alias
 msgid "Email Aliases"
-msgstr ""
+msgstr "Eメールエイリアス"
 
 #. module: mail
 #: field:mail.group,image_small:0
diff --git a/addons/mail/i18n/ko.po b/addons/mail/i18n/ko.po
index d6bed4d0d18..063c5c57228 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: 2013-09-12 06:30+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
+"X-Launchpad-Export-Date: 2014-01-28 06:36+0000\n"
+"X-Generator: Launchpad (build 16914)\n"
 
 #. module: mail
 #: view:mail.followers:0
diff --git a/addons/mail/i18n/lt.po b/addons/mail/i18n/lt.po
index aa4aa948407..b9cbce5bfa7 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: 2013-09-12 06:30+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
+"X-Launchpad-Export-Date: 2014-01-28 06:36+0000\n"
+"X-Generator: Launchpad (build 16914)\n"
 
 #. module: mail
 #: view:mail.followers:0
diff --git a/addons/mail/i18n/lv.po b/addons/mail/i18n/lv.po
index d20beadc69a..51e8259ad32 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: 2013-09-12 06:30+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
+"X-Launchpad-Export-Date: 2014-01-28 06:36+0000\n"
+"X-Generator: Launchpad (build 16914)\n"
 
 #. module: mail
 #: view:mail.followers:0
diff --git a/addons/mail/i18n/mk.po b/addons/mail/i18n/mk.po
index 4541986e02c..a943e0fe8d2 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: 2013-09-12 06:30+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
+"X-Launchpad-Export-Date: 2014-01-28 06:36+0000\n"
+"X-Generator: Launchpad (build 16914)\n"
 
 #. module: mail
 #: view:mail.followers:0
diff --git a/addons/mail/i18n/mn.po b/addons/mail/i18n/mn.po
index 4e304489cfa..719272515e2 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: 2013-09-12 06:30+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
+"X-Launchpad-Export-Date: 2014-01-28 06:36+0000\n"
+"X-Generator: Launchpad (build 16914)\n"
 
 #. module: mail
 #: view:mail.followers:0
diff --git a/addons/mail/i18n/nl.po b/addons/mail/i18n/nl.po
index 0232206303d..14315245696 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: 2013-09-12 06:29+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
+"X-Launchpad-Export-Date: 2014-01-28 06:35+0000\n"
+"X-Generator: Launchpad (build 16914)\n"
 
 #. module: mail
 #: view:mail.followers:0
diff --git a/addons/mail/i18n/pl.po b/addons/mail/i18n/pl.po
index 3d0d54d89b1..74e6d89f0f8 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: 2013-09-12 06:30+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
+"X-Launchpad-Export-Date: 2014-01-28 06:36+0000\n"
+"X-Generator: Launchpad (build 16914)\n"
 
 #. module: mail
 #: view:mail.followers:0
diff --git a/addons/mail/i18n/pt.po b/addons/mail/i18n/pt.po
index 27ecdc7f87b..4b179dc1b50 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: 2013-09-12 06:30+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
+"X-Launchpad-Export-Date: 2014-01-28 06:36+0000\n"
+"X-Generator: Launchpad (build 16914)\n"
 
 #. module: mail
 #: view:mail.followers:0
diff --git a/addons/mail/i18n/pt_BR.po b/addons/mail/i18n/pt_BR.po
index 37db64b84b6..244d52cbf2c 100644
--- a/addons/mail/i18n/pt_BR.po
+++ b/addons/mail/i18n/pt_BR.po
@@ -10,13 +10,13 @@ msgstr ""
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-22 01:24+0000\n"
 "Last-Translator: Fábio Martinelli - http://zupy.com.br "
-"<webmaster@guaru.net>\n"
+"<webmaster@zupy.com.br>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@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: 2013-09-12 06:30+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
+"X-Launchpad-Export-Date: 2014-01-28 06:36+0000\n"
+"X-Generator: Launchpad (build 16914)\n"
 
 #. module: mail
 #: view:mail.followers:0
diff --git a/addons/mail/i18n/ro.po b/addons/mail/i18n/ro.po
index 14e77512ac7..0d33d180754 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: 2013-09-12 06:30+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
+"X-Launchpad-Export-Date: 2014-01-28 06:36+0000\n"
+"X-Generator: Launchpad (build 16914)\n"
 
 #. module: mail
 #: view:mail.followers:0
@@ -720,7 +720,7 @@ msgstr "Modelul resursei urmate"
 #: code:addons/mail/static/src/xml/mail.xml:337
 #, python-format
 msgid "like"
-msgstr "ca și"
+msgstr "e bine"
 
 #. module: mail
 #: view:mail.compose.message:0
@@ -817,10 +817,9 @@ msgid ""
 "            "
 msgstr ""
 "<p>\n"
-"                    <b>Bună Treabă!</b> Căsuța dumneavoastră postala este "
-"goală.\n"
+"                    <b>E bine!</b> Căsuța dumneavoastră poștală este goală.\n"
 "                </p><p>\n"
-"                    Căsuța dumneavoastră poștala conține mesaje sau email-"
+"                    Căsuța dumneavoastră poștală conține mesaje sau email-"
 "uri personale care v-au fost trimise dumneavoastră,\n"
 "                    precum și informații legate de documentele sau "
 "persoanele pe care le urmăriți.\n"
@@ -1320,7 +1319,7 @@ msgstr "Cc (copie carbon)"
 #. module: mail
 #: help:mail.notification,starred:0
 msgid "Starred message that goes into the todo mailbox"
-msgstr "Mesaj marcat cu asterisc care ajunge în cutia poștala de efectuat"
+msgstr "Mesaj marcat cu asterisc care ajunge în cutia poștală de efectuat"
 
 #. module: mail
 #. openerp-web
@@ -1684,7 +1683,7 @@ msgstr "Modelul Documentului Asociat"
 #: code:addons/mail/static/src/xml/mail.xml:338
 #, python-format
 msgid "unlike"
-msgstr "spre deosebire de"
+msgstr "nu e bine"
 
 #. module: mail
 #: help:mail.compose.message,author_id:0
diff --git a/addons/mail/i18n/ru.po b/addons/mail/i18n/ru.po
index 2da83368bd1..976c972a800 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: 2013-09-12 06:30+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
+"X-Launchpad-Export-Date: 2014-01-28 06:36+0000\n"
+"X-Generator: Launchpad (build 16914)\n"
 
 #. module: mail
 #: view:mail.followers:0
diff --git a/addons/mail/i18n/sl.po b/addons/mail/i18n/sl.po
index 791309c399c..6edd2ec3e8c 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: 2013-09-12 06:30+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
+"X-Launchpad-Export-Date: 2014-01-28 06:36+0000\n"
+"X-Generator: Launchpad (build 16914)\n"
 
 #. module: mail
 #: view:mail.followers:0
@@ -72,6 +72,8 @@ msgid ""
 "The name of the email alias, e.g. 'jobs' if you want to catch emails for "
 "<jobs@example.my.openerp.com>"
 msgstr ""
+"Ime vzdevka v e-mailu, npr. 'jobs', če želite iskati e-maile za "
+"<jobs@example.my.openerp.com>"
 
 #. module: mail
 #: model:ir.actions.act_window,name:mail.action_email_compose_message_wizard
@@ -113,6 +115,8 @@ msgid ""
 "Email address of the sender. This field is set when no matching partner is "
 "found for incoming emails."
 msgstr ""
+"Elektronski naslov pošiljatelja. To polje je označeno, če ni najden ustrezen "
+"partner za vhodno pošto."
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_compose_message
@@ -151,6 +155,8 @@ msgid ""
 "Members of those groups will automatically added as followers. Note that "
 "they will be able to manage their subscription manually if necessary."
 msgstr ""
+"Člani te skupine bodo avtomatično dodani kot sledilci. Lahko bodo upravljali "
+"svojo prijavo tudi ročno, če bo treba."
 
 #. module: mail
 #. openerp-web
@@ -190,6 +196,9 @@ msgid ""
 "image, with aspect ratio preserved. Use this field in form views or some "
 "kanban views."
 msgstr ""
+"Slika srednje velikosti za to skupino. Avtomatično bo prilagojena na "
+"128x128px, z upoštevanjem razmerja. Uporabite to polje v pogledih forme ali "
+"nekaterih pogledih kanban."
 
 #. module: mail
 #. openerp-web
@@ -232,14 +241,14 @@ msgstr "Nit"
 #: code:addons/mail/static/src/xml/mail.xml:29
 #, python-format
 msgid "Open the full mail composer"
-msgstr ""
+msgstr "Odpri celotni oblikovalca elektronske pošte"
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:29
 #, python-format
 msgid "&ograve"
-msgstr ""
+msgstr "&ograve"
 
 #. module: mail
 #: field:base.config.settings,alias_domain:0
@@ -249,7 +258,7 @@ msgstr ""
 #. module: mail
 #: field:mail.group,group_ids:0
 msgid "Auto Subscription"
-msgstr ""
+msgstr "avto-prijava"
 
 #. module: mail
 #: field:mail.mail,references:0
@@ -290,6 +299,9 @@ msgid ""
 "Message type: email for email message, notification for system message, "
 "comment for other messages such as user replies"
 msgstr ""
+"Tip sporočila: elektronska pošta za elektronsko sporočilo, zaznamek za "
+"sistemsko sporočilo, komentar za ostala sporočila kot npr. uporabnikov "
+"odgovor"
 
 #. module: mail
 #: help:mail.message.subtype,relation_field:0
@@ -313,7 +325,7 @@ msgstr "Odgovori"
 #: code:addons/mail/wizard/invite.py:37
 #, python-format
 msgid "<div>You have been invited to follow %s.</div>"
-msgstr ""
+msgstr "<div>Bili ste povabljeni, da sledite %s.</div>"
 
 #. module: mail
 #: help:mail.group,message_unread:0
@@ -341,7 +353,7 @@ msgstr "Vrsta sporočila"
 #. module: mail
 #: field:mail.mail,auto_delete:0
 msgid "Auto Delete"
-msgstr ""
+msgstr "avtomatsko brisanje"
 
 #. module: mail
 #. openerp-web
@@ -349,14 +361,14 @@ msgstr ""
 #: view:mail.group:0
 #, python-format
 msgid "Unfollow"
-msgstr ""
+msgstr "prekini sledenje"
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:312
 #, python-format
 msgid "show one more message"
-msgstr ""
+msgstr "pokaži še eno sporočilo"
 
 #. module: mail
 #: code:addons/mail/mail_mail.py:75
@@ -370,7 +382,7 @@ msgstr "Napačno dejanje!"
 #: code:addons/mail/static/src/xml/mail.xml:25
 #, python-format
 msgid "User img"
-msgstr ""
+msgstr "slika uporabnika"
 
 #. module: mail
 #: model:ir.actions.act_window,name:mail.action_view_mail_mail
@@ -405,13 +417,13 @@ msgstr ""
 #. module: mail
 #: field:mail.message.subtype,relation_field:0
 msgid "Relation field"
-msgstr ""
+msgstr "Polje povezave"
 
 #. module: mail
 #: selection:mail.compose.message,type:0
 #: selection:mail.message,type:0
 msgid "System notification"
-msgstr ""
+msgstr "Sistemsko sporočilo"
 
 #. module: mail
 #: model:ir.model,name:mail.model_res_partner
@@ -450,7 +462,7 @@ msgstr "Od"
 #: view:mail.mail:0
 #: view:mail.message.subtype:0
 msgid "Email message"
-msgstr ""
+msgstr "Elektronsko sporočilo"
 
 #. module: mail
 #: model:ir.model,name:mail.model_base_config_settings
@@ -470,7 +482,7 @@ msgstr "Pošlji"
 #: code:addons/mail/static/src/js/mail_followers.js:153
 #, python-format
 msgid "No followers"
-msgstr ""
+msgstr "Ni sledilcev"
 
 #. module: mail
 #: view:mail.mail:0
@@ -614,7 +626,7 @@ msgstr "Nadrejeno sporočilo"
 #: field:mail.message,res_id:0
 #: field:mail.wizard.invite,res_id:0
 msgid "Related Document ID"
-msgstr ""
+msgstr "ID povezanega dokumenta"
 
 #. module: mail
 #: model:ir.actions.client,help:mail.action_mail_to_me_feeds
@@ -1144,7 +1156,7 @@ msgstr ""
 #: field:mail.message,subtype_id:0
 #: view:mail.message.subtype:0
 msgid "Subtype"
-msgstr ""
+msgstr "Podvrsta"
 
 #. module: mail
 #: view:mail.group:0
@@ -1163,7 +1175,7 @@ msgstr "Začeto"
 #: code:addons/mail/static/src/xml/mail.xml:313
 #, python-format
 msgid "more messages"
-msgstr ""
+msgstr "več sporočil"
 
 #. module: mail
 #: code:addons/mail/update.py:93
@@ -1348,6 +1360,8 @@ msgid ""
 "Invalid expression, it must be a literal python dictionary definition e.g. "
 "\"{'field': 'value'}\""
 msgstr ""
+"Napačen izraz, mora biti skladen z definicijo python slovarja, npr. "
+"\"{'field':'value'}\""
 
 #. module: mail
 #: field:mail.alias,alias_model_id:0
@@ -1586,6 +1600,8 @@ msgid ""
 "Author of the message. If not set, email_from may hold an email address that "
 "did not match any partner."
 msgstr ""
+"Avtor sporočila. Če ni nastavljen, lahko email_from vsebuje elektronski "
+"naslov, ki ni povezan z nobenim partnerjem."
 
 #. module: mail
 #: help:mail.mail,email_cc:0
diff --git a/addons/mail/i18n/sr@latin.po b/addons/mail/i18n/sr@latin.po
index ed49b202840..fb138f8d10b 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: 2013-09-12 06:30+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
+"X-Launchpad-Export-Date: 2014-01-28 06:36+0000\n"
+"X-Generator: Launchpad (build 16914)\n"
 
 #. module: mail
 #: view:mail.followers:0
diff --git a/addons/mail/i18n/sv.po b/addons/mail/i18n/sv.po
index 5f8cacce230..67415f4a6ce 100644
--- a/addons/mail/i18n/sv.po
+++ b/addons/mail/i18n/sv.po
@@ -14,13 +14,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-09-12 06:30+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
+"X-Launchpad-Export-Date: 2014-01-28 06:36+0000\n"
+"X-Generator: Launchpad (build 16914)\n"
 
 #. module: mail
 #: view:mail.followers:0
 msgid "Followers Form"
-msgstr ""
+msgstr "Följarformulär"
 
 #. module: mail
 #: model:ir.model,name:mail.model_publisher_warranty_contract
@@ -32,7 +32,7 @@ msgstr ""
 #: view:mail.mail:0
 #: field:mail.message,author_id:0
 msgid "Author"
-msgstr ""
+msgstr "Författare"
 
 #. module: mail
 #: view:mail.mail:0
@@ -47,12 +47,12 @@ msgstr "Mottagare"
 #. module: mail
 #: help:mail.message.subtype,default:0
 msgid "Activated by default when subscribing."
-msgstr ""
+msgstr "Automatiskt aktiverad vid prenumeration"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Comments"
-msgstr ""
+msgstr "Kommentarer"
 
 #. module: mail
 #: view:mail.alias:0
@@ -64,7 +64,7 @@ msgstr "Gruppera på..."
 #: help:mail.compose.message,body:0
 #: help:mail.message,body:0
 msgid "Automatically sanitized HTML contents"
-msgstr ""
+msgstr "Rensa HTML-innehållet automatiskt"
 
 #. module: mail
 #: help:mail.alias,alias_name:0
@@ -72,6 +72,8 @@ msgid ""
 "The name of the email alias, e.g. 'jobs' if you want to catch emails for "
 "<jobs@example.my.openerp.com>"
 msgstr ""
+"Namnet på e-postalias, e.g. 'jobb' om du vill fånga e-postmeddelanden till "
+"<jobb@example.my.openerp.com>"
 
 #. module: mail
 #: model:ir.actions.act_window,name:mail.action_email_compose_message_wizard
@@ -89,12 +91,12 @@ msgstr ""
 #. module: mail
 #: view:mail.group:0
 msgid "Group Name"
-msgstr ""
+msgstr "Gruppnamn"
 
 #. module: mail
 #: selection:mail.group,public:0
 msgid "Public"
-msgstr ""
+msgstr "Publik"
 
 #. module: mail
 #: view:mail.mail:0
@@ -104,7 +106,7 @@ msgstr "Brödtext"
 #. module: mail
 #: view:mail.message:0
 msgid "Show messages to read"
-msgstr ""
+msgstr "Visa meddelanden att läsa"
 
 #. module: mail
 #: help:mail.compose.message,email_from:0
@@ -117,33 +119,33 @@ msgstr ""
 #. module: mail
 #: model:ir.model,name:mail.model_mail_compose_message
 msgid "Email composition wizard"
-msgstr ""
+msgstr "E-postredigeringsguide"
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail_followers.xml:23
 #, python-format
 msgid "Add others"
-msgstr ""
+msgstr "Lägg till andra"
 
 #. module: mail
 #: field:mail.message.subtype,parent_id:0
 msgid "Parent"
-msgstr ""
+msgstr "Överliggande"
 
 #. module: mail
 #: field:mail.group,message_unread:0
 #: field:mail.thread,message_unread:0
 #: field:res.partner,message_unread:0
 msgid "Unread Messages"
-msgstr ""
+msgstr "Olästa meddelanden"
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:313
 #, python-format
 msgid "show"
-msgstr ""
+msgstr "visa"
 
 #. module: mail
 #: help:mail.group,group_ids:0
@@ -157,31 +159,31 @@ msgstr ""
 #: code:addons/mail/static/src/js/mail.js:1029
 #, python-format
 msgid "Do you really want to delete this message?"
-msgstr ""
+msgstr "Vill du verkligen radera detta meddelande?"
 
 #. module: mail
 #: view:mail.message:0
 #: field:mail.notification,read:0
 msgid "Read"
-msgstr ""
+msgstr "Läst"
 
 #. module: mail
 #: view:mail.group:0
 msgid "Search Groups"
-msgstr ""
+msgstr "Sökgrupper"
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/js/mail_followers.js:157
 #, python-format
 msgid "followers"
-msgstr ""
+msgstr "Följare formulär"
 
 #. module: mail
 #: code:addons/mail/mail_message.py:737
 #, python-format
 msgid "Access Denied"
-msgstr ""
+msgstr "Åtkomst nekad"
 
 #. module: mail
 #: help:mail.group,image_medium:0
@@ -196,12 +198,12 @@ msgstr ""
 #: code:addons/mail/static/src/xml/mail.xml:212
 #, python-format
 msgid "Uploading error"
-msgstr ""
+msgstr "Uppladdningsfel"
 
 #. module: mail
 #: model:mail.group,name:mail.group_support
 msgid "Support"
-msgstr ""
+msgstr "Stöd"
 
 #. module: mail
 #: code:addons/mail/mail_message.py:738
@@ -241,12 +243,12 @@ msgstr ""
 #. module: mail
 #: field:base.config.settings,alias_domain:0
 msgid "Alias Domain"
-msgstr ""
+msgstr "Domänvärde"
 
 #. module: mail
 #: field:mail.group,group_ids:0
 msgid "Auto Subscription"
-msgstr ""
+msgstr "Automatisk prenumeration"
 
 #. module: mail
 #: field:mail.mail,references:0
@@ -258,7 +260,7 @@ msgstr "Referenser"
 #: code:addons/mail/static/src/xml/mail.xml:206
 #, python-format
 msgid "No messages."
-msgstr ""
+msgstr "Inga meddelanen"
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_group
@@ -271,14 +273,14 @@ msgstr ""
 #: code:addons/mail/static/src/xml/mail.xml:108
 #, python-format
 msgid "uploading"
-msgstr ""
+msgstr "laddar upp"
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail_followers.xml:52
 #, python-format
 msgid "more."
-msgstr ""
+msgstr "mer"
 
 #. module: mail
 #: help:mail.compose.message,type:0
@@ -317,7 +319,7 @@ msgstr ""
 #: help:mail.thread,message_unread:0
 #: help:res.partner,message_unread:0
 msgid "If checked new messages require your attention."
-msgstr ""
+msgstr "Om ikryssad nya meddelanden som kräver din uppmärksamhet"
 
 #. module: mail
 #: field:mail.group,image_medium:0
@@ -328,12 +330,12 @@ msgstr ""
 #: model:ir.actions.client,name:mail.action_mail_to_me_feeds
 #: model:ir.ui.menu,name:mail.mail_tomefeeds
 msgid "To: me"
-msgstr ""
+msgstr "Till: mig"
 
 #. module: mail
 #: field:mail.message.subtype,name:0
 msgid "Message Type"
-msgstr ""
+msgstr "Meddelandetyp"
 
 #. module: mail
 #: field:mail.mail,auto_delete:0
@@ -346,28 +348,28 @@ msgstr "Autoradera"
 #: view:mail.group:0
 #, python-format
 msgid "Unfollow"
-msgstr ""
+msgstr "Sluta följa"
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:312
 #, python-format
 msgid "show one more message"
-msgstr ""
+msgstr "visa ytterligare meddelande"
 
 #. module: mail
 #: code:addons/mail/mail_mail.py:75
 #: code:addons/mail/res_users.py:69
 #, python-format
 msgid "Invalid Action!"
-msgstr ""
+msgstr "Ogiltig åtgärd"
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:25
 #, python-format
 msgid "User img"
-msgstr ""
+msgstr "Användarbild"
 
 #. module: mail
 #: model:ir.actions.act_window,name:mail.action_view_mail_mail
@@ -375,12 +377,12 @@ msgstr ""
 #: view:mail.mail:0
 #: view:mail.message:0
 msgid "Emails"
-msgstr "Epost"
+msgstr "E-post"
 
 #. module: mail
 #: field:mail.followers,partner_id:0
 msgid "Related Partner"
-msgstr ""
+msgstr "Relaterat företag"
 
 #. module: mail
 #: help:mail.group,message_summary:0
@@ -402,13 +404,13 @@ msgstr ""
 #. module: mail
 #: field:mail.message.subtype,relation_field:0
 msgid "Relation field"
-msgstr ""
+msgstr "Relationsfält"
 
 #. module: mail
 #: selection:mail.compose.message,type:0
 #: selection:mail.message,type:0
 msgid "System notification"
-msgstr ""
+msgstr "Varningsmeddelande"
 
 #. module: mail
 #: model:ir.model,name:mail.model_res_partner
@@ -418,7 +420,7 @@ msgstr "Partner"
 #. module: mail
 #: model:ir.ui.menu,name:mail.mail_my_stuff
 msgid "Organizer"
-msgstr ""
+msgstr "Organisatör"
 
 #. module: mail
 #: field:mail.compose.message,subject:0
@@ -429,7 +431,7 @@ msgstr "Ämne"
 #. module: mail
 #: field:mail.wizard.invite,partner_ids:0
 msgid "Partners"
-msgstr ""
+msgstr "Företag"
 
 #. module: mail
 #: view:mail.mail:0
@@ -467,7 +469,7 @@ msgstr "Skicka"
 #: code:addons/mail/static/src/js/mail_followers.js:153
 #, python-format
 msgid "No followers"
-msgstr ""
+msgstr "Inga följare"
 
 #. module: mail
 #: view:mail.mail:0
@@ -485,13 +487,13 @@ msgstr "Misslyckades"
 #: field:res.partner,message_follower_ids:0
 #, python-format
 msgid "Followers"
-msgstr ""
+msgstr "Följare"
 
 #. module: mail
 #: model:ir.actions.client,name:mail.action_mail_archives_feeds
 #: model:ir.ui.menu,name:mail.mail_archivesfeeds
 msgid "Archives"
-msgstr ""
+msgstr "Arkiv"
 
 #. module: mail
 #. openerp-web
@@ -499,7 +501,7 @@ msgstr ""
 #: code:addons/mail/static/src/xml/mail.xml:107
 #, python-format
 msgid "Delete this attachment"
-msgstr ""
+msgstr "Radera denna  bilaga"
 
 #. module: mail
 #. openerp-web
@@ -514,25 +516,25 @@ msgstr "Besvara"
 #: code:addons/mail/static/src/js/mail_followers.js:155
 #, python-format
 msgid "One follower"
-msgstr ""
+msgstr "En följate"
 
 #. module: mail
 #: field:mail.compose.message,type:0
 #: field:mail.message,type:0
 msgid "Type"
-msgstr ""
+msgstr "Typ"
 
 #. module: mail
 #: selection:mail.compose.message,type:0
 #: view:mail.mail:0
 #: selection:mail.message,type:0
 msgid "Email"
-msgstr ""
+msgstr "E-Post"
 
 #. module: mail
 #: field:ir.ui.menu,mail_group_id:0
 msgid "Mail Group"
-msgstr ""
+msgstr "E-postgrupp"
 
 #. module: mail
 #: selection:res.partner,notification_email_send:0
@@ -542,13 +544,13 @@ msgstr ""
 #. module: mail
 #: field:mail.alias,alias_defaults:0
 msgid "Default Values"
-msgstr ""
+msgstr "Standardvärden"
 
 #. module: mail
 #: code:addons/mail/res_users.py:89
 #, python-format
 msgid "%s has joined the %s network."
-msgstr ""
+msgstr "%s har gått med i %s nätverket."
 
 #. module: mail
 #: help:mail.group,image_small:0
@@ -569,7 +571,7 @@ msgstr "Mottagare"
 #: code:addons/mail/static/src/xml/mail.xml:140
 #, python-format
 msgid "<<<"
-msgstr ""
+msgstr "<<<"
 
 #. module: mail
 #. openerp-web
@@ -581,17 +583,17 @@ msgstr ""
 #. module: mail
 #: field:mail.group,group_public_id:0
 msgid "Authorized Group"
-msgstr ""
+msgstr "Bemyndigad grupp"
 
 #. module: mail
 #: view:mail.group:0
 msgid "Join Group"
-msgstr ""
+msgstr "Gå med i grupen"
 
 #. module: mail
 #: help:mail.mail,email_from:0
 msgid "Message sender, taken from user preferences."
-msgstr ""
+msgstr "Avsändare, från dina inställningar"
 
 #. module: mail
 #: code:addons/mail/wizard/invite.py:40
@@ -603,7 +605,7 @@ msgstr ""
 #: field:mail.compose.message,parent_id:0
 #: field:mail.message,parent_id:0
 msgid "Parent Message"
-msgstr ""
+msgstr "Överliggande meddelande"
 
 #. module: mail
 #: field:mail.compose.message,res_id:0
@@ -627,7 +629,7 @@ msgstr ""
 #. module: mail
 #: model:mail.group,name:mail.group_rd
 msgid "R&D"
-msgstr ""
+msgstr "FoU"
 
 #. module: mail
 #. openerp-web
@@ -651,7 +653,7 @@ msgstr "Avancerat"
 #: code:addons/mail/static/src/xml/mail.xml:244
 #, python-format
 msgid "Move to Inbox"
-msgstr ""
+msgstr "Flytta till inboxen"
 
 #. module: mail
 #: code:addons/mail/wizard/mail_compose_message.py:193
@@ -663,7 +665,7 @@ msgstr "Re:"
 #: field:mail.compose.message,to_read:0
 #: field:mail.message,to_read:0
 msgid "To read"
-msgstr ""
+msgstr "Att läsa"
 
 #. module: mail
 #: code:addons/mail/res_users.py:69
@@ -684,7 +686,7 @@ msgstr ""
 #: code:addons/mail/static/src/xml/mail.xml:337
 #, python-format
 msgid "like"
-msgstr ""
+msgstr "gilla"
 
 #. module: mail
 #: view:mail.compose.message:0
@@ -697,12 +699,12 @@ msgstr "Avbryt"
 #: code:addons/mail/static/src/xml/mail.xml:47
 #, python-format
 msgid "Share with my followers..."
-msgstr ""
+msgstr "Dela med mina följare..."
 
 #. module: mail
 #: field:mail.notification,partner_id:0
 msgid "Contact"
-msgstr ""
+msgstr "Kontakt"
 
 #. module: mail
 #: view:mail.group:0
@@ -724,7 +726,7 @@ msgstr ""
 #. module: mail
 #: view:mail.mail:0
 msgid "on"
-msgstr ""
+msgstr "på"
 
 #. module: mail
 #: code:addons/mail/mail_message.py:926
@@ -758,7 +760,7 @@ msgstr ""
 #: view:mail.mail:0
 #: selection:mail.message,type:0
 msgid "Comment"
-msgstr ""
+msgstr "Kommentar"
 
 #. module: mail
 #: model:ir.actions.client,help:mail.action_mail_inbox_feeds
@@ -785,7 +787,7 @@ msgstr ""
 #: code:addons/mail/static/src/xml/mail.xml:188
 #, python-format
 msgid "Compose a new message"
-msgstr ""
+msgstr "Skriv nytt meddelande"
 
 #. module: mail
 #: view:mail.mail:0
@@ -809,7 +811,7 @@ msgstr ""
 #. module: mail
 #: field:mail.group,image:0
 msgid "Photo"
-msgstr ""
+msgstr "Foto"
 
 #. module: mail
 #. openerp-web
@@ -819,7 +821,7 @@ msgstr ""
 #: view:mail.wizard.invite:0
 #, python-format
 msgid "or"
-msgstr ""
+msgstr "eller"
 
 #. module: mail
 #: help:mail.compose.message,vote_user_ids:0
@@ -848,12 +850,12 @@ msgstr "Sök e-post"
 #: field:mail.compose.message,child_ids:0
 #: field:mail.message,child_ids:0
 msgid "Child Messages"
-msgstr ""
+msgstr "undermeddelanden"
 
 #. module: mail
 #: field:mail.alias,alias_user_id:0
 msgid "Owner"
-msgstr ""
+msgstr "Ägare"
 
 #. module: mail
 #: model:ir.model,name:mail.model_res_users
@@ -867,7 +869,7 @@ msgstr ""
 #: field:mail.notification,message_id:0
 #: field:mail.wizard.invite,message:0
 msgid "Message"
-msgstr ""
+msgstr "Meddelanden"
 
 #. module: mail
 #: help:mail.followers,res_id:0
@@ -879,13 +881,13 @@ msgstr ""
 #: field:mail.compose.message,body:0
 #: field:mail.message,body:0
 msgid "Contents"
-msgstr ""
+msgstr "Innehåll"
 
 #. module: mail
 #: model:ir.actions.act_window,name:mail.action_view_mail_alias
 #: model:ir.ui.menu,name:mail.mail_alias_menu
 msgid "Aliases"
-msgstr ""
+msgstr "Alias"
 
 #. module: mail
 #: help:mail.message.subtype,description:0
@@ -898,12 +900,12 @@ msgstr ""
 #: field:mail.compose.message,vote_user_ids:0
 #: field:mail.message,vote_user_ids:0
 msgid "Votes"
-msgstr ""
+msgstr "Röster"
 
 #. module: mail
 #: view:mail.group:0
 msgid "Group"
-msgstr ""
+msgstr "Gruppera"
 
 #. module: mail
 #: help:mail.compose.message,starred:0
@@ -931,7 +933,7 @@ msgstr ""
 #. module: mail
 #: view:mail.wizard.invite:0
 msgid "Add Followers"
-msgstr ""
+msgstr "Lägg till följare"
 
 #. module: mail
 #: view:mail.compose.message:0
@@ -960,12 +962,21 @@ msgid ""
 "                </p>\n"
 "            "
 msgstr ""
+"<p>\n"
+"                    Meddelande saknas och inget skickat ännu.\n"
+"                </p><p>\n"
+"                    Klicka på översta högra ikonen för att skapa ett "
+"meddelande. Detta\n"
+"                    meddelande skickas via e-post om det är en intern "
+"kontakt.\n"
+"                </p>\n"
+"            "
 
 #. module: mail
 #: view:mail.mail:0
 #: field:mail.mail,state:0
 msgid "Status"
-msgstr ""
+msgstr "Status"
 
 #. module: mail
 #: view:mail.mail:0
@@ -993,12 +1004,12 @@ msgstr ""
 #: field:mail.message,notification_ids:0
 #: view:mail.notification:0
 msgid "Notifications"
-msgstr ""
+msgstr "Notifikationer"
 
 #. module: mail
 #: view:mail.alias:0
 msgid "Search Alias"
-msgstr ""
+msgstr "Sök alias"
 
 #. module: mail
 #: help:mail.alias,alias_force_thread_id:0
@@ -1021,7 +1032,7 @@ msgstr ""
 #. module: mail
 #: view:mail.mail:0
 msgid "by"
-msgstr ""
+msgstr "av"
 
 #. module: mail
 #: model:mail.group,name:mail.group_best_sales_practices
@@ -1038,7 +1049,7 @@ msgstr ""
 #: field:mail.thread,message_is_follower:0
 #: field:res.partner,message_is_follower:0
 msgid "Is a Follower"
-msgstr ""
+msgstr "Är en följare"
 
 #. module: mail
 #: view:mail.alias:0
@@ -1049,12 +1060,12 @@ msgstr "Användare"
 #. module: mail
 #: view:mail.group:0
 msgid "Groups"
-msgstr ""
+msgstr "Grupper"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Messages Search"
-msgstr ""
+msgstr "E-postsökning"
 
 #. module: mail
 #: field:mail.compose.message,date:0
@@ -1079,14 +1090,14 @@ msgstr "Utökade filter..."
 #: code:addons/mail/static/src/xml/mail.xml:120
 #, python-format
 msgid "To:"
-msgstr ""
+msgstr "Till:"
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:193
 #, python-format
 msgid "Write to my followers"
-msgstr ""
+msgstr "Skriv till mina följare"
 
 #. module: mail
 #: model:ir.model,name:mail.model_res_groups
@@ -1120,7 +1131,7 @@ msgstr ""
 #. module: mail
 #: model:ir.model,name:mail.model_mail_wizard_invite
 msgid "Invite wizard"
-msgstr ""
+msgstr "Inbjudningsguide"
 
 #. module: mail
 #: field:mail.group,message_summary:0
@@ -1146,34 +1157,34 @@ msgstr ""
 #. module: mail
 #: view:mail.group:0
 msgid "Group Form"
-msgstr ""
+msgstr "Gruppformulär"
 
 #. module: mail
 #: field:mail.compose.message,starred:0
 #: field:mail.message,starred:0
 #: field:mail.notification,starred:0
 msgid "Starred"
-msgstr ""
+msgstr "Blockerad"
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:313
 #, python-format
 msgid "more messages"
-msgstr ""
+msgstr "fler meddelanden"
 
 #. module: mail
 #: code:addons/mail/update.py:93
 #, python-format
 msgid "Error"
-msgstr ""
+msgstr "Fel"
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail_followers.xml:13
 #, python-format
 msgid "Following"
-msgstr ""
+msgstr "Följer"
 
 #. module: mail
 #: sql_constraint:mail.alias:0
@@ -1262,14 +1273,14 @@ msgstr ""
 #. module: mail
 #: model:mail.message.subtype,name:mail.mt_comment
 msgid "Discussions"
-msgstr ""
+msgstr "Diskussioner"
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail_followers.xml:11
 #, python-format
 msgid "Follow"
-msgstr ""
+msgstr "Följ"
 
 #. module: mail
 #: field:mail.group,name:0
@@ -1279,7 +1290,7 @@ msgstr ""
 #. module: mail
 #: model:mail.group,name:mail.group_all_employees
 msgid "Whole Company"
-msgstr ""
+msgstr "Hela företaget"
 
 #. module: mail
 #. openerp-web
@@ -1305,7 +1316,7 @@ msgstr "Månad skapad"
 #: code:addons/mail/static/src/xml/mail.xml:323
 #, python-format
 msgid "Compose new Message"
-msgstr ""
+msgstr "Skriv nytt meddelande"
 
 #. module: mail
 #: field:mail.group,menu_id:0
@@ -1326,7 +1337,7 @@ msgstr "Till"
 #: field:mail.compose.message,notified_partner_ids:0
 #: field:mail.message,notified_partner_ids:0
 msgid "Notified partners"
-msgstr ""
+msgstr "Meddelade företag"
 
 #. module: mail
 #: help:mail.group,public:0
@@ -1338,7 +1349,7 @@ msgstr ""
 #. module: mail
 #: model:mail.group,name:mail.group_board
 msgid "Board meetings"
-msgstr ""
+msgstr "Styrelsemöten"
 
 #. module: mail
 #: constraint:mail.alias:0
@@ -1346,6 +1357,8 @@ msgid ""
 "Invalid expression, it must be a literal python dictionary definition e.g. "
 "\"{'field': 'value'}\""
 msgstr ""
+"Felaktigt uttryck, det måste vara en python dict-definition eg "
+"{'fält':'värde'}"
 
 #. module: mail
 #: field:mail.alias,alias_model_id:0
@@ -1379,7 +1392,7 @@ msgstr ""
 #. module: mail
 #: selection:res.partner,notification_email_send:0
 msgid "Never"
-msgstr ""
+msgstr "Aldrig"
 
 #. module: mail
 #: field:mail.mail,mail_server_id:0
@@ -1419,7 +1432,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:mail.action_view_groups
 #: model:ir.ui.menu,name:mail.mail_allgroups
 msgid "Join a group"
-msgstr ""
+msgstr "Delta i en grupp"
 
 #. module: mail
 #: model:ir.actions.client,help:mail.action_mail_group_feeds
@@ -1458,7 +1471,7 @@ msgstr ""
 #: code:addons/mail/static/src/xml/mail.xml:126
 #, python-format
 msgid "this document"
-msgstr ""
+msgstr "detta dokument"
 
 #. module: mail
 #: field:mail.compose.message,filter_id:0
@@ -1498,7 +1511,7 @@ msgstr ""
 #: model:ir.actions.client,name:mail.action_mail_star_feeds
 #: model:ir.ui.menu,name:mail.mail_starfeeds
 msgid "To-do"
-msgstr ""
+msgstr "Att göra"
 
 #. module: mail
 #: view:mail.alias:0
@@ -1525,13 +1538,13 @@ msgstr ""
 #: model:ir.ui.menu,name:mail.mail_feeds
 #: model:ir.ui.menu,name:mail.mail_feeds_main
 msgid "Messaging"
-msgstr ""
+msgstr "Meddelanden"
 
 #. module: mail
 #: view:mail.alias:0
 #: field:mail.message.subtype,res_model:0
 msgid "Model"
-msgstr ""
+msgstr "Modell"
 
 #. module: mail
 #: view:mail.message:0
@@ -1568,14 +1581,14 @@ msgstr ""
 #: field:mail.message,model:0
 #: field:mail.wizard.invite,res_model:0
 msgid "Related Document Model"
-msgstr ""
+msgstr "Modell för relaterade dokument"
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:338
 #, python-format
 msgid "unlike"
-msgstr ""
+msgstr "avgilla"
 
 #. module: mail
 #: help:mail.compose.message,author_id:0
@@ -1604,7 +1617,7 @@ msgstr ""
 #. module: mail
 #: selection:mail.group,public:0
 msgid "Private"
-msgstr ""
+msgstr "Privat"
 
 #. module: mail
 #: model:ir.actions.client,help:mail.action_mail_star_feeds
@@ -1634,7 +1647,7 @@ msgstr ""
 #: help:mail.compose.message,parent_id:0
 #: help:mail.message,parent_id:0
 msgid "Initial thread message."
-msgstr ""
+msgstr "Inledande meddelande i tråd."
 
 #. module: mail
 #: model:mail.group,name:mail.group_hr_policies
@@ -1650,7 +1663,7 @@ msgstr ""
 #: model:ir.actions.client,name:mail.action_mail_inbox_feeds
 #: model:ir.ui.menu,name:mail.mail_inboxfeeds
 msgid "Inbox"
-msgstr ""
+msgstr "Inkorg"
 
 #. module: mail
 #. openerp-web
@@ -1670,17 +1683,17 @@ msgstr ""
 #: model:ir.actions.act_window,name:mail.action_view_message_subtype
 #: model:ir.ui.menu,name:mail.menu_message_subtype
 msgid "Subtypes"
-msgstr ""
+msgstr "Undertyper"
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_alias
 msgid "Email Aliases"
-msgstr ""
+msgstr "E-postalias"
 
 #. module: mail
 #: field:mail.group,image_small:0
 msgid "Small-sized photo"
-msgstr ""
+msgstr "Litet fotografi"
 
 #. module: mail
 #: help:mail.mail,reply_to:0
diff --git a/addons/mail/i18n/th.po b/addons/mail/i18n/th.po
index 00dcb3716f7..19a37425c25 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: 2013-09-12 06:30+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
+"X-Launchpad-Export-Date: 2014-01-28 06:36+0000\n"
+"X-Generator: Launchpad (build 16914)\n"
 
 #. module: mail
 #: view:mail.followers:0
diff --git a/addons/mail/i18n/tr.po b/addons/mail/i18n/tr.po
index 4689131e42a..af0be1b0293 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: 2013-09-12 06:30+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
+"X-Launchpad-Export-Date: 2014-01-28 06:36+0000\n"
+"X-Generator: Launchpad (build 16914)\n"
 
 #. module: mail
 #: view:mail.followers:0
diff --git a/addons/mail/i18n/vi.po b/addons/mail/i18n/vi.po
index f2496c2f1cd..6e275c38faa 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: 2013-09-12 06:30+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
+"X-Launchpad-Export-Date: 2014-01-28 06:36+0000\n"
+"X-Generator: Launchpad (build 16914)\n"
 
 #. module: mail
 #: view:mail.followers:0
diff --git a/addons/mail/i18n/zh_CN.po b/addons/mail/i18n/zh_CN.po
index 3aa7c826e21..eb2e1a51886 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: 2013-11-20 05:25+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-01-28 06:36+0000\n"
+"X-Generator: Launchpad (build 16914)\n"
 
 #. module: mail
 #: view:mail.followers:0
diff --git a/addons/mail/i18n/zh_TW.po b/addons/mail/i18n/zh_TW.po
index f31639fd15d..65249ea1c69 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: 2013-09-12 06:30+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
+"X-Launchpad-Export-Date: 2014-01-28 06:36+0000\n"
+"X-Generator: Launchpad (build 16914)\n"
 
 #. module: mail
 #: view:mail.followers:0
diff --git a/addons/mail/ir_attachment.py b/addons/mail/ir_attachment.py
new file mode 100644
index 00000000000..99c5a9e054e
--- /dev/null
+++ b/addons/mail/ir_attachment.py
@@ -0,0 +1,197 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2014-TODAY OpenERP SA (http://www.openerp.com)
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from openerp.osv import fields, osv
+
+import os.path
+
+
+class IrAttachment(osv.Model):
+    """ Update partner to add a field about notification preferences """
+    _name = "ir.attachment"
+    _inherit = 'ir.attachment'
+
+    _fileext_to_type = {
+        '7z': 'archive',
+        'aac': 'audio',
+        'ace': 'archive',
+        'ai': 'vector',
+        'aiff': 'audio',
+        'apk': 'archive',
+        'app': 'binary',
+        'as': 'script',
+        'asf': 'video',
+        'ass': 'text',
+        'avi': 'video',
+        'bat': 'script',
+        'bin': 'binary',
+        'bmp': 'image',
+        'bzip2': 'archive',
+        'c': 'script',
+        'cab': 'archive',
+        'cc': 'script',
+        'ccd': 'disk',
+        'cdi': 'disk',
+        'cdr': 'vector',
+        'cer': 'certificate',
+        'cgm': 'vector',
+        'cmd': 'script',
+        'coffee': 'script',
+        'com': 'binary',
+        'cpp': 'script',
+        'crl': 'certificate',
+        'crt': 'certificate',
+        'cs': 'script',
+        'csr': 'certificate',
+        'css': 'html',
+        'csv': 'spreadsheet',
+        'cue': 'disk',
+        'd': 'script',
+        'dds': 'image',
+        'deb': 'archive',
+        'der': 'certificate',
+        'djvu': 'image',
+        'dmg': 'archive',
+        'dng': 'image',
+        'doc': 'document',
+        'docx': 'document',
+        'dvi': 'print',
+        'eot': 'font',
+        'eps': 'vector',
+        'exe': 'binary',
+        'exr': 'image',
+        'flac': 'audio',
+        'flv': 'video',
+        'gif': 'webimage',
+        'gz': 'archive',
+        'gzip': 'archive',
+        'h': 'script',
+        'htm': 'html',
+        'html': 'html',
+        'ico': 'image',
+        'icon': 'image',
+        'img': 'disk',
+        'iso': 'disk',
+        'jar': 'archive',
+        'java': 'script',
+        'jp2': 'image',
+        'jpe': 'webimage',
+        'jpeg': 'webimage',
+        'jpg': 'webimage',
+        'jpx': 'image',
+        'js': 'script',
+        'key': 'presentation',
+        'keynote': 'presentation',
+        'lisp': 'script',
+        'lz': 'archive',
+        'lzip': 'archive',
+        'm': 'script',
+        'm4a': 'audio',
+        'm4v': 'video',
+        'mds': 'disk',
+        'mdx': 'disk',
+        'mid': 'audio',
+        'midi': 'audio',
+        'mkv': 'video',
+        'mng': 'image',
+        'mp2': 'audio',
+        'mp3': 'audio',
+        'mp4': 'video',
+        'mpe': 'video',
+        'mpeg': 'video',
+        'mpg': 'video',
+        'nrg': 'disk',
+        'numbers': 'spreadsheet',
+        'odg': 'vector',
+        'odm': 'document',
+        'odp': 'presentation',
+        'ods': 'spreadsheet',
+        'odt': 'document',
+        'ogg': 'audio',
+        'ogm': 'video',
+        'otf': 'font',
+        'p12': 'certificate',
+        'pak': 'archive',
+        'pbm': 'image',
+        'pdf': 'print',
+        'pem': 'certificate',
+        'pfx': 'certificate',
+        'pgf': 'image',
+        'pgm': 'image',
+        'pk3': 'archive',
+        'pk4': 'archive',
+        'pl': 'script',
+        'png': 'webimage',
+        'pnm': 'image',
+        'ppm': 'image',
+        'pps': 'presentation',
+        'ppt': 'presentation',
+        'ps': 'print',
+        'psd': 'image',
+        'psp': 'image',
+        'py': 'script',
+        'r': 'script',
+        'ra': 'audio',
+        'rar': 'archive',
+        'rb': 'script',
+        'rpm': 'archive',
+        'rtf': 'text',
+        'sh': 'script',
+        'sub': 'disk',
+        'svg': 'vector',
+        'sxc': 'spreadsheet',
+        'sxd': 'vector',
+        'tar': 'archive',
+        'tga': 'image',
+        'tif': 'image',
+        'tiff': 'image',
+        'ttf': 'font',
+        'txt': 'text',
+        'vbs': 'script',
+        'vc': 'spreadsheet',
+        'vml': 'vector',
+        'wav': 'audio',
+        'webp': 'image',
+        'wma': 'audio',
+        'wmv': 'video',
+        'woff': 'font',
+        'xar': 'vector',
+        'xbm': 'image',
+        'xcf': 'image',
+        'xhtml': 'html',
+        'xls': 'spreadsheet',
+        'xlsx': 'spreadsheet',
+        'xml': 'html',
+        'zip': 'archive'
+    }
+
+    def get_attachment_type(self, cr, uid, ids, name, args, context=None):
+        result = {}
+        for attachment in self.browse(cr, uid, ids, context=context):
+            fileext = os.path.splitext(attachment.datas_fname)[1].lower()
+            if not fileext or not fileext[1:] in self._fileext_to_type:
+                return 'unknown'
+            result[attachment.id] = self._fileext_to_type[fileext[1:]]
+        return result
+
+    _columns = {
+        'file_type': fields.function(get_attachment_type, type='char', string='File Type'),
+    }
diff --git a/addons/mail/mail_alias.py b/addons/mail/mail_alias.py
index 1eacb902e0f..d8a79dd98e0 100644
--- a/addons/mail/mail_alias.py
+++ b/addons/mail/mail_alias.py
@@ -154,6 +154,12 @@ class mail_alias(osv.Model):
             sequence = (sequence + 1) if sequence else 2
         return new_name
 
+    def _clean_and_make_unique(self, cr, uid, name, context=None):
+        # when an alias name appears to already be an email, we keep the local part only
+        name = remove_accents(name).lower().split('@')[0]
+        name = re.sub(r'[^\w+.]+', '-', name)
+        return self._find_unique(cr, uid, name, context=context)
+
     def migrate_to_alias(self, cr, child_model_name, child_table_name, child_model_auto_init_fct,
         alias_model_name, alias_id_column, alias_key, alias_prefix='', alias_force_key='', alias_defaults={},
         alias_generate_name=False, context=None):
@@ -199,7 +205,7 @@ class mail_alias(osv.Model):
             alias_vals['alias_parent_thread_id'] = obj_data['id']
             alias_create_ctx = dict(context, alias_model_name=alias_model_name, alias_parent_model_name=child_model_name)
             alias_id = mail_alias.create(cr, SUPERUSER_ID, alias_vals, context=alias_create_ctx)
-            child_class_model.write(cr, SUPERUSER_ID, obj_data['id'], {'alias_id': alias_id})
+            child_class_model.write(cr, SUPERUSER_ID, obj_data['id'], {'alias_id': alias_id}, context={'mail_notrack': True})
             _logger.info('Mail alias created for %s %s (id %s)', child_model_name, obj_data[alias_key], obj_data['id'])
 
         # Finally attempt to reinstate the missing constraint
@@ -227,11 +233,7 @@ class mail_alias(osv.Model):
         model_name = context.get('alias_model_name')
         parent_model_name = context.get('alias_parent_model_name')
         if vals.get('alias_name'):
-            # when an alias name appears to already be an email, we keep the local part only
-            alias_name = remove_accents(vals['alias_name']).lower().split('@')[0]
-            alias_name = re.sub(r'[^\w+.]+', '-', alias_name)
-            alias_name = self._find_unique(cr, uid, alias_name, context=context)
-            vals['alias_name'] = alias_name
+            vals['alias_name'] = self._clean_and_make_unique(cr, uid, vals.get('alias_name'), context=context)
         if model_name:
             model_id = self.pool.get('ir.model').search(cr, uid, [('model', '=', model_name)], context=context)[0]
             vals['alias_model_id'] = model_id
@@ -240,6 +242,12 @@ class mail_alias(osv.Model):
             vals['alias_parent_model_id'] = model_id
         return super(mail_alias, self).create(cr, uid, vals, context=context)
 
+    def write(self, cr, uid, ids, vals, context=None):
+        """"give uniqe alias name if given alias name is allready assigned"""
+        if vals.get('alias_name'):
+            vals['alias_name'] = self._clean_and_make_unique(cr, uid, vals.get('alias_name'), context=context)
+        return super(mail_alias, self).write(cr, uid, ids, vals, context=context)
+
     def open_document(self, cr, uid, ids, context=None):
         alias = self.browse(cr, uid, ids, context=context)[0]
         if not alias.alias_model_id or not alias.alias_force_thread_id:
diff --git a/addons/mail/mail_mail.py b/addons/mail/mail_mail.py
index 8e99655dddb..a8726c16a0d 100644
--- a/addons/mail/mail_mail.py
+++ b/addons/mail/mail_mail.py
@@ -160,8 +160,9 @@ class mail_mail(osv.Model):
                 fragment['message_id'] = mail.mail_message_id.id
             elif mail.model and mail.res_id:
                 fragment.update(model=mail.model, res_id=mail.res_id)
+            
             url = urljoin(base_url, "?%s#%s" % (urlencode(query), urlencode(fragment)))
-            return _("""<small>Access your messages and documents <a style='color:inherit' href="%s">in OpenERP</a></small>""") % url
+            return _("""<span class='oe_mail_footer_access'><small>Access your messages and documents <a style='color:inherit' href="%s">in OpenERP</a></small></span>""") % url
         else:
             return None
 
@@ -239,6 +240,7 @@ class mail_mail(osv.Model):
             :return: True
         """
         ir_mail_server = self.pool.get('ir.mail_server')
+                
         for mail in self.browse(cr, SUPERUSER_ID, ids, context=context):
             try:
                 # handle attachments
@@ -282,6 +284,7 @@ class mail_mail(osv.Model):
                     res = ir_mail_server.send_email(cr, uid, msg,
                                                     mail_server_id=mail.mail_server_id.id,
                                                     context=context)
+                    
                 if res:
                     mail.write({'state': 'sent', 'message_id': res})
                     mail_sent = True
diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index 9dfec55b075..40a51df91d2 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -201,7 +201,7 @@ class mail_message(osv.Model):
 
     def _get_default_from(self, cr, uid, context=None):
         this = self.pool.get('res.users').browse(cr, SUPERUSER_ID, uid, context=context)
-        if this.alias_domain:
+        if this.alias_name and this.alias_domain:
             return '%s <%s@%s>' % (this.name, this.alias_name, this.alias_domain)
         elif this.email:
             return '%s <%s>' % (this.name, this.email)
@@ -351,8 +351,13 @@ class mail_message(osv.Model):
         partner_tree = dict((partner[0], partner) for partner in partners)
 
         # 2. Attachments as SUPERUSER, because could receive msg and attachments for doc uid cannot see
-        attachments = ir_attachment_obj.read(cr, SUPERUSER_ID, list(attachment_ids), ['id', 'datas_fname', 'name'], context=context)
-        attachments_tree = dict((attachment['id'], {'id': attachment['id'], 'filename': attachment['datas_fname'], 'name': attachment['name']}) for attachment in attachments)
+        attachments = ir_attachment_obj.read(cr, SUPERUSER_ID, list(attachment_ids), ['id', 'datas_fname', 'name', 'file_type'], context=context)
+        attachments_tree = dict((attachment['id'], {
+            'id': attachment['id'],
+            'filename': attachment['datas_fname'],
+            'name': attachment['name'],
+            'file_type': attachment['file_type'],
+        }) for attachment in attachments)
 
         # 3. Update message dictionaries
         for message_dict in messages:
diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 57950376beb..9a8adee31c3 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -113,11 +113,10 @@ class mail_thread(osv.AbstractModel):
                     object_id.alias_id.alias_model_id.model == self._name and \
                     object_id.alias_id.alias_force_thread_id == 0:
                 alias = object_id.alias_id
-        elif catchall_domain and model:  # no specific res_id given -> generic help message, take an example alias (i.e. alias of some section_id)
-            model_id = self.pool.get('ir.model').search(cr, uid, [("model", "=", self._name)], context=context)[0]
+        if not alias and catchall_domain and model:  # no res_id or res_id not linked to an alias -> generic help message, take a generic alias of the model
             alias_obj = self.pool.get('mail.alias')
-            alias_ids = alias_obj.search(cr, uid, [("alias_model_id", "=", model_id), ("alias_name", "!=", False), ('alias_force_thread_id', '=', 0)], context=context, order='id ASC')
-            if alias_ids and len(alias_ids) == 1:  # if several aliases -> incoherent to propose one guessed from nowhere, therefore avoid if several aliases
+            alias_ids = alias_obj.search(cr, uid, [("alias_parent_model_id.model", "=", model), ("alias_name", "!=", False), ('alias_force_thread_id', '=', False), ('alias_parent_thread_id', '=', False)], context=context, order='id ASC')
+            if alias_ids and len(alias_ids) == 1:
                 alias = alias_obj.browse(cr, uid, alias_ids[0], context=context)
 
         if alias:
@@ -165,7 +164,7 @@ class mail_thread(osv.AbstractModel):
 
     def read_followers_data(self, cr, uid, follower_ids, context=None):
         result = []
-        technical_group = self.pool.get('ir.model.data').get_object(cr, uid, 'base', 'group_no_one')
+        technical_group = self.pool.get('ir.model.data').get_object(cr, uid, 'base', 'group_no_one', context=context)
         for follower in self.pool.get('res.partner').browse(cr, uid, follower_ids, context=context):
             is_editable = uid in map(lambda x: x.id, technical_group.users)
             is_uid = uid in map(lambda x: x.id, follower.user_ids)
@@ -252,10 +251,9 @@ class mail_thread(osv.AbstractModel):
                 new = set(command[2])
 
         # remove partners that are no longer followers
-        self.message_unsubscribe(cr, uid, [id], list(old-new))
-
+        self.message_unsubscribe(cr, uid, [id], list(old-new), context=context)
         # add new followers
-        self.message_subscribe(cr, uid, [id], list(new-old))
+        self.message_subscribe(cr, uid, [id], list(new-old), context=context)
 
     def _search_followers(self, cr, uid, obj, name, args, context):
         """Search function for message_follower_ids
@@ -291,7 +289,7 @@ class mail_thread(osv.AbstractModel):
         'message_is_follower': fields.function(_get_followers, type='boolean',
             fnct_search=_search_is_follower, string='Is a Follower', multi='_get_followers,'),
         'message_follower_ids': fields.function(_get_followers, fnct_inv=_set_followers,
-            fnct_search=_search_followers, type='many2many',
+            fnct_search=_search_followers, type='many2many', priority=-10,
             obj='res.partner', string='Followers', multi='_get_followers'),
         'message_ids': fields.one2many('mail.message', 'res_id',
             domain=lambda self: [('model', '=', self._name)],
@@ -344,16 +342,22 @@ class mail_thread(osv.AbstractModel):
         if context is None:
             context = {}
 
-        thread_id = super(mail_thread, self).create(cr, uid, values, context=context)
+        # subscribe uid unless asked not to
+        if not context.get('mail_create_nosubscribe'):
+            pid = self.pool['res.users'].browse(cr, SUPERUSER_ID, uid).partner_id.id
+            message_follower_ids = values.get('message_follower_ids') or []  # webclient can send None or False
+            message_follower_ids.append([4, pid])
+            values['message_follower_ids'] = message_follower_ids
+            # add operation to ignore access rule checking for subscription
+            context_operation = dict(context, operation='create')
+        else:
+            context_operation = context
+        thread_id = super(mail_thread, self).create(cr, uid, values, context=context_operation)
 
         # automatic logging unless asked not to (mainly for various testing purpose)
         if not context.get('mail_create_nolog'):
             self.message_post(cr, uid, thread_id, body=_('%s created') % (self._description), context=context)
 
-        # subscribe uid unless asked not to
-        if not context.get('mail_create_nosubscribe'):
-            self.message_subscribe_users(cr, uid, [thread_id], [uid], context=context)
-
         # auto_subscribe: take values and defaults into account
         create_values = dict(values)
         for key, val in context.iteritems():
@@ -380,7 +384,10 @@ class mail_thread(osv.AbstractModel):
         track_ctx = dict(context)
         if 'lang' not in track_ctx:
             track_ctx['lang'] = self.pool.get('res.users').browse(cr, uid, uid, context=context).lang
-        tracked_fields = self._get_tracked_fields(cr, uid, values.keys(), context=track_ctx)
+        if not context.get('mail_notrack'):
+            tracked_fields = self._get_tracked_fields(cr, uid, values.keys(), context=track_ctx)
+        else:
+            tracked_fields = []
         if tracked_fields:
             records = self.browse(cr, uid, ids, context=track_ctx)
             initial_values = dict((this.id, dict((key, getattr(this, key)) for key in tracked_fields.keys())) for this in records)
@@ -495,10 +502,9 @@ class mail_thread(osv.AbstractModel):
 
             posted = False
             for subtype in subtypes:
-                try:
-                    subtype_rec = self.pool.get('ir.model.data').get_object(cr, uid, subtype.split('.')[0], subtype.split('.')[1], context=context)
-                except ValueError, e:
-                    _logger.debug('subtype %s not found, giving error "%s"' % (subtype, e))
+                subtype_rec = self.pool.get('ir.model.data').xmlid_to_object(cr, uid, subtype, context=context)
+                if not (subtype_rec and subtype_rec.exists()):
+                    _logger.debug('subtype %s not found' % subtype)
                     continue
                 message = format_message(subtype_rec.description if subtype_rec.description else subtype_rec.name, tracked_values)
                 self.message_post(cr, uid, browse_record.id, body=message, subtype=subtype, context=context)
@@ -1115,11 +1121,23 @@ class mail_thread(osv.AbstractModel):
                     alternative = True
                 if part.get_content_maintype() == 'multipart':
                     continue  # skip container
-                filename = part.get_filename()  # None if normal part
+                # part.get_filename returns decoded value if able to decode, coded otherwise.
+                # original get_filename is not able to decode iso-8859-1 (for instance).
+                # therefore, iso encoded attachements are not able to be decoded properly with get_filename
+                # code here partially copy the original get_filename method, but handle more encoding
+                filename=part.get_param('filename', None, 'content-disposition')
+                if not filename:
+                    filename=part.get_param('name', None)
+                if filename:
+                    if isinstance(filename, tuple):
+                        # RFC2231
+                        filename=email.utils.collapse_rfc2231_value(filename).strip()
+                    else:
+                        filename=decode(filename)
                 encoding = part.get_content_charset()  # None if attachment
                 # 1) Explicit Attachments -> attachments
                 if filename or part.get('content-disposition', '').strip().startswith('attachment'):
-                    attachments.append((decode(filename) or 'attachment', part.get_payload(decode=True)))
+                    attachments.append((filename or 'attachment', part.get_payload(decode=True)))
                     continue
                 # 2) text/plain -> <pre/>
                 if part.get_content_type() == 'text/plain' and (not alternative or not body):
@@ -1532,20 +1550,26 @@ class mail_thread(osv.AbstractModel):
 
     def message_subscribe(self, cr, uid, ids, partner_ids, subtype_ids=None, context=None):
         """ Add partners to the records followers. """
+        if context is None:
+            context = {}
+
         mail_followers_obj = self.pool.get('mail.followers')
         subtype_obj = self.pool.get('mail.message.subtype')
 
         user_pid = self.pool.get('res.users').browse(cr, uid, uid, context=context).partner_id.id
         if set(partner_ids) == set([user_pid]):
-            try:
-                self.check_access_rights(cr, uid, 'read')
-            except (osv.except_osv, orm.except_orm):
-                return
+            if context.get('operation', '') != 'create':
+                try:
+                    self.check_access_rights(cr, uid, 'read')
+                    self.check_access_rule(cr, uid, ids, 'read')
+                except (osv.except_osv, orm.except_orm):
+                    return False
         else:
             self.check_access_rights(cr, uid, 'write')
+            self.check_access_rule(cr, uid, ids, 'write')
 
         existing_pids_dict = {}
-        fol_ids = mail_followers_obj.search(cr, SUPERUSER_ID, [('res_model', '=', self._name), ('res_id', 'in', ids)])
+        fol_ids = mail_followers_obj.search(cr, SUPERUSER_ID, ['&', '&', ('res_model', '=', self._name), ('res_id', 'in', ids), ('partner_id', 'in', partner_ids)])
         for fol in mail_followers_obj.browse(cr, SUPERUSER_ID, fol_ids, context=context):
             existing_pids_dict.setdefault(fol.res_id, set()).add(fol.partner_id.id)
 
@@ -1587,8 +1611,10 @@ class mail_thread(osv.AbstractModel):
         user_pid = self.pool.get('res.users').read(cr, uid, uid, ['partner_id'], context=context)['partner_id'][0]
         if set(partner_ids) == set([user_pid]):
             self.check_access_rights(cr, uid, 'read')
+            self.check_access_rule(cr, uid, ids, 'read')
         else:
             self.check_access_rights(cr, uid, 'write')
+            self.check_access_rule(cr, uid, ids, 'write')
         fol_obj = self.pool['mail.followers']
         fol_ids = fol_obj.search(
             cr, SUPERUSER_ID, [
diff --git a/addons/mail/res_users.py b/addons/mail/res_users.py
index e335929ec2f..645a77ea707 100644
--- a/addons/mail/res_users.py
+++ b/addons/mail/res_users.py
@@ -83,7 +83,7 @@ class res_users(osv.Model):
 
     def copy_data(self, *args, **kwargs):
         data = super(res_users, self).copy_data(*args, **kwargs)
-        if data.get('alias_name'):
+        if data and data.get('alias_name'):
             data['alias_name'] = data['login']
         return data
 
diff --git a/addons/mail/static/img/msg_discus4_attach2-datas.jpg b/addons/mail/static/img/msg_discus4_attach2-datas.jpg
new file mode 100644
index 00000000000..385a116f07e
--- /dev/null
+++ b/addons/mail/static/img/msg_discus4_attach2-datas.jpg
diff --git a/addons/mail/static/src/css/announcement.css b/addons/mail/static/src/css/announcement.css
new file mode 100644
index 00000000000..5d2a0ecba44
--- /dev/null
+++ b/addons/mail/static/src/css/announcement.css
@@ -0,0 +1,3 @@
+.openerp .annoucement_bar {
+    display: none;
+}
diff --git a/addons/mail/static/src/css/mail_group.css b/addons/mail/static/src/css/mail_group.css
index 9560a4765d0..39cdf5c0b4c 100644
--- a/addons/mail/static/src/css/mail_group.css
+++ b/addons/mail/static/src/css/mail_group.css
@@ -90,7 +90,9 @@
 }
 
 .openerp .oe_group_button {
-    padding-top: 7px;
+    position: absolute;
+    padding-bottom: 50px;
+    bottom: 0;
 }
 
 .openerp .oe_group_button .oe_group_join {
diff --git a/addons/mail/static/src/js/announcement.js b/addons/mail/static/src/js/announcement.js
new file mode 100644
index 00000000000..0dd438d13af
--- /dev/null
+++ b/addons/mail/static/src/js/announcement.js
@@ -0,0 +1,42 @@
+openerp_announcement = function(instance) {
+    instance.web.WebClient.include({
+        show_application: function() {
+            return $.when(this._super.apply(this, arguments)).then(this.proxy('show_annoucement_bar'));
+        },
+        _ab_location: function(dbuuid) {
+            return _.str.sprintf('https://services.openerp.com/openerp-enterprise/ab/css/%s.css', dbuuid);
+        },
+        show_annoucement_bar: function() {
+            if (this.session.get_cookie('ab') === 'c') {
+                return;
+            }
+            var self = this;
+            var config_parameter = new instance.web.Model('ir.config_parameter');
+            var $bar = this.$el.find('.announcement_bar');
+            return config_parameter.call('get_param', ['database.uuid', false]).then(function(dbuuid) {
+                if (!dbuuid) {
+                    return;
+                }
+                var $link = $bar.find('.url a');
+                $link.attr('href', _.str.sprintf('%s/%s', $link.attr('href'), dbuuid));
+                var $css = $('<link />').attr({
+                    rel : 'stylesheet',
+                    type: 'text/css',
+                    media: 'screen',
+                    href: self._ab_location(dbuuid)
+                });
+                $css.on('load', function() {
+                    var close = function() {
+                        var ttl = 7*24*60*60;
+                        self.session.set_cookie('ab', 'c', ttl);
+                        $bar.slideUp('slow');
+                    };
+                    $bar.find('.close').on('click', close);
+                    self.trigger('ab_loaded', $bar);
+                });
+
+                $('head').append($css);
+            });
+        }
+    });
+};
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 269187df8cd..58d44bab50e 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -6,6 +6,7 @@ openerp.mail = function (session) {
 
     openerp_mail_followers(session, mail);          // import mail_followers.js
     openerp_FieldMany2ManyTagsEmail(session);       // import manyy2many_tags_email.js
+    openerp_announcement(session);
 
     /**
      * ------------------------------------------------------------
@@ -113,57 +114,6 @@ openerp.mail = function (session) {
             }
             return out;
         },
-
-        // returns the file type of a file based on its extension 
-        // As it only looks at the extension it is quite approximative. 
-        filetype: function(url){
-            var url = url && url.filename || url;
-            var tokens = typeof url == 'string' ? url.split('.') : [];
-            if(tokens.length <= 1){
-                return 'unknown';
-            }
-            var extension = tokens[tokens.length -1];
-            if(extension.length === 0){
-                return 'unknown';
-            }else{
-                extension = extension.toLowerCase();
-            }
-            var filetypes = {
-                'webimage':     ['png','jpg','jpeg','jpe','gif'], // those have browser preview
-                'image':        ['tif','tiff','tga',
-                                 'bmp','xcf','psd','ppm','pbm','pgm','pnm','mng',
-                                 'xbm','ico','icon','exr','webp','psp','pgf','xcf',
-                                 'jp2','jpx','dng','djvu','dds'],
-                'vector':       ['ai','svg','eps','vml','cdr','xar','cgm','odg','sxd'],
-                'print':        ['dvi','pdf','ps'],
-                'document':     ['doc','docx','odm','odt'],
-                'presentation': ['key','keynote','odp','pps','ppt'],
-                'font':         ['otf','ttf','woff','eot'],
-                'archive':      ['zip','7z','ace','apk','bzip2','cab','deb','dmg','gzip','jar',
-                                 'rar','tar','gz','pak','pk3','pk4','lzip','lz','rpm'],
-                'certificate':  ['cer','key','pfx','p12','pem','crl','der','crt','csr'],
-                'audio':        ['aiff','wav','mp3','ogg','flac','wma','mp2','aac',
-                                 'm4a','ra','mid','midi'],
-                'video':        ['asf','avi','flv','mkv','m4v','mpeg','mpg','mpe','wmv','mp4','ogm'],
-                'text':         ['txt','rtf','ass'],
-                'html':         ['html','xhtml','xml','htm','css'],
-                'disk':         ['iso','nrg','img','ccd','sub','cdi','cue','mds','mdx'],
-                'script':       ['py','js','c','cc','cpp','cs','h','java','bat','sh',
-                                 'd','rb','pl','as','cmd','coffee','m','r','vbs','lisp'],
-                'spreadsheet':  ['123','csv','ods','numbers','sxc','xls','vc','xlsx'],
-                'binary':       ['exe','com','bin','app'],
-            };
-            for(filetype in filetypes){
-                var ext_list = filetypes[filetype];
-                for(var i = 0, len = ext_list.length; i < len; i++){
-                    if(extension === ext_list[i]){
-                        return filetype;
-                    }
-                }
-            }
-            return 'unknown';
-        },
-
     };
 
 
@@ -303,7 +253,6 @@ openerp.mail = function (session) {
                 var attach = this.attachment_ids[l];
                 if (!attach.formating) {
                     attach.url = mail.ChatterUtils.get_attachment_url(this.session, this.id, attach.id);
-                    attach.filetype = mail.ChatterUtils.filetype(attach.filename || attach.name);
                     attach.name = mail.ChatterUtils.breakword(attach.name || attach.filename);
                     attach.formating = true;
                 }
@@ -1437,7 +1386,7 @@ openerp.mail = function (session) {
         message_fetch: function (replace_domain, replace_context, ids, callback) {
             return this.ds_message.call('message_read', [
                     // ids force to read
-                    ids == false ? undefined : ids, 
+                    ids === false ? undefined : ids, 
                     // domain + additional
                     (replace_domain ? replace_domain : this.domain), 
                     // ids allready loaded
@@ -1813,7 +1762,7 @@ openerp.mail = function (session) {
             if ('display_log_button' in this.options) {
                 this.node.params.display_log_button = this.options.display_log_button;
             }
-            this.domain = this.node.params && this.node.params.domain || [];
+            this.domain = (this.node.params && this.node.params.domain) || (this.field && this.field.domain) || [];
 
             if (!this.ParentViewManager.is_action_enabled('edit')) {
                 this.node.params.show_link = false;
diff --git a/addons/mail/static/src/xml/announcement.xml b/addons/mail/static/src/xml/announcement.xml
new file mode 100644
index 00000000000..84dfa426796
--- /dev/null
+++ b/addons/mail/static/src/xml/announcement.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<templates id="template" xml:space="preserve">
+  <t t-extend="WebClient">
+    <t t-jquery="table.oe_webclient" t-operation="prepend">
+      <td colspan="2" class="announcement_bar">
+        <span class="message"></span>
+        <span class="url"><a href="https://services.openerp.com/openerp-enterprise/ab/register" target="_blank"></a></span>
+        <span class="close"></span>
+      </td>
+    </t>
+  </t>
+</templates>
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 31539e24ab3..3a7a5469ee1 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -88,10 +88,10 @@
         -->
     <t t-name="mail.thread.message.attachments">
         <t t-foreach='widget.attachment_ids' t-as='attachment'>
-            <t t-if="attachment.filetype !== 'webimage'">
+            <t t-if="attachment.file_type !== 'webimage'">
                 <div t-attf-class="oe_attachment #{attachment.upload ? 'oe_uploading' : ''}">
                     <a t-att-href='attachment.url' target="_blank">
-                        <img t-att-src="'/mail/static/src/img/mimetypes/' + attachment.filetype + '.png'"></img>
+                        <img t-att-src="'/mail/static/src/img/mimetypes/' + attachment.file_type + '.png'"></img>
                         <div class='oe_name'><t t-raw='attachment.name' /></div>
                     </a>
                     <div class='oe_delete oe_e' title="Delete this attachment" t-att-data-id="attachment.id">[</div>
@@ -100,7 +100,7 @@
                     </div>
                 </div>
             </t>
-            <t t-if="attachment.filetype === 'webimage'">
+            <t t-if="attachment.file_type === 'webimage'">
                 <div t-attf-class="oe_attachment oe_preview #{attachment.upload ? 'oe_uploading' : ''}">
                     <a t-att-href='attachment.url' target="_blank">
                         <img t-att-src="widget.attachments_resize_image(attachment.id, [100,80])"></img>
diff --git a/addons/mail/tests/test_mail_group.py b/addons/mail/tests/test_mail_group.py
index c1512441b13..34c7f0c00e0 100644
--- a/addons/mail/tests/test_mail_group.py
+++ b/addons/mail/tests/test_mail_group.py
@@ -20,6 +20,7 @@
 ##############################################################################
 
 from openerp.addons.mail.tests.common import TestMail
+from openerp.exceptions import AccessError
 from openerp.osv.orm import except_orm
 from openerp.tools import mute_logger
 
@@ -40,7 +41,7 @@ class TestMailGroup(TestMail):
         self.mail_group.read(cr, user_employee_id, [self.group_pigs_id])
 
         # Do: Bert creates a group -> ko, no access rights
-        with self.assertRaises(except_orm):
+        with self.assertRaises(AccessError):
             self.mail_group.create(cr, user_noone_id, {'name': 'Test'})
         # Do: Raoul creates a restricted group -> ok
         new_group_id = self.mail_group.create(cr, user_employee_id, {'name': 'Test'})
@@ -58,7 +59,7 @@ class TestMailGroup(TestMail):
         # Do: Raoul write on Jobs -> ok
         self.mail_group.write(cr, user_employee_id, [self.group_priv_id], {'name': 'modified'})
         # Do: Bert cannot write on Private -> ko (read but no write)
-        with self.assertRaises(except_orm):
+        with self.assertRaises(AccessError):
             self.mail_group.write(cr, user_noone_id, [self.group_priv_id], {'name': 're-modified'})
         # Test: Bert cannot unlink the group
         with self.assertRaises(except_orm):
diff --git a/addons/mail/tests/test_mail_message.py b/addons/mail/tests/test_mail_message.py
index 5dc5e9e247d..180661a0707 100644
--- a/addons/mail/tests/test_mail_message.py
+++ b/addons/mail/tests/test_mail_message.py
@@ -20,6 +20,7 @@
 ##############################################################################
 
 from openerp.addons.mail.tests.common import TestMail
+from openerp.exceptions import AccessError
 from openerp.osv.orm import except_orm
 from openerp.tools import mute_logger
 
@@ -258,13 +259,13 @@ class TestMailMessage(TestMail):
         # ----------------------------------------
 
         # Do: Bert creates a message on Pigs -> ko, no creation rights
-        self.assertRaises(except_orm, self.mail_message.create,
+        self.assertRaises(AccessError, self.mail_message.create,
             cr, user_bert_id, {'model': 'mail.group', 'res_id': self.group_pigs_id, 'body': 'Test'})
         # Do: Bert create a message on Jobs -> ko, no creation rights
-        self.assertRaises(except_orm, self.mail_message.create,
+        self.assertRaises(AccessError, self.mail_message.create,
             cr, user_bert_id, {'model': 'mail.group', 'res_id': self.group_jobs_id, 'body': 'Test'})
         # Do: Bert create a private message -> ko, no creation rights
-        self.assertRaises(except_orm, self.mail_message.create,
+        self.assertRaises(AccessError, self.mail_message.create,
             cr, user_bert_id, {'body': 'Test'})
 
         # Do: Raoul creates a message on Jobs -> ok, write access to the related document
@@ -410,15 +411,15 @@ class TestMailMessage(TestMail):
         for message in bert_jobs.message_ids:
             trigger_read = message.subject
         for partner in bert_jobs.message_follower_ids:
-            with self.assertRaises(except_orm):
+            with self.assertRaises(AccessError):
                 trigger_read = partner.name
         # Do: Bert comments Jobs, ko because no creation right
-        self.assertRaises(except_orm,
+        self.assertRaises(AccessError,
                           self.mail_group.message_post,
                           cr, user_bert_id, self.group_jobs_id, body='I love Pigs')
 
         # Do: Bert writes on its own profile, ko because no message create access
-        with self.assertRaises(except_orm):
+        with self.assertRaises(AccessError):
             self.res_users.message_post(cr, user_bert_id, user_bert_id, body='I love Bert')
             self.res_partner.message_post(cr, user_bert_id, partner_bert_id, body='I love Bert')
 
diff --git a/addons/mail/update.py b/addons/mail/update.py
index bcf9bb8c7c9..6969b1479b1 100644
--- a/addons/mail/update.py
+++ b/addons/mail/update.py
@@ -2,7 +2,7 @@
 import datetime
 import logging
 import sys
-import urllib
+import werkzeug.urls
 import urllib2
 
 import openerp
@@ -59,7 +59,7 @@ def get_sys_logs(self, cr, uid):
 
     add_arg = {"timeout":30} if sys.version_info >= (2,6) else {}
     arguments = {'arg0': msg, "action": "update",}
-    arguments_raw = urllib.urlencode(arguments)
+    arguments_raw = werkzeug.url_encode(arguments)
 
     url = config.get("publisher_warranty_url")
 
@@ -94,13 +94,11 @@ class publisher_warranty_contract(osv.osv):
             # old behavior based on res.log; now on mail.message, that is not necessarily installed
             IMD = self.pool['ir.model.data']
             user = self.pool['res.users'].browse(cr, SUPERUSER_ID, SUPERUSER_ID)
-            try:
-                poster = IMD.get_object(cr, SUPERUSER_ID, 'mail', 'group_all_employees')
-            except ValueError:
-                # Cannot found group, post the message on the wall of the admin
+            poster = IMD.xmlid_to_object(cr, SUPERUSER_ID, 'mail.group_all_employees', context=context)
+            if not (poster and poster.exists()):
+                if not user.exists():
+                    return True
                 poster = user
-            if not poster.exists():
-                return True
             for message in result["messages"]:
                 try:
                     poster.message_post(body=message, subtype='mt_comment', partner_ids=[user.partner_id.id])
diff --git a/addons/mail/wizard/mail_compose_message.py b/addons/mail/wizard/mail_compose_message.py
index 833811c07a1..74aea3dfc01 100644
--- a/addons/mail/wizard/mail_compose_message.py
+++ b/addons/mail/wizard/mail_compose_message.py
@@ -322,9 +322,9 @@ class mail_compose_message(osv.TransientModel):
                     mail_values['email_from'] = email_dict.pop('email_from')
                 # replies redirection: mass mailing only
                 if not wizard.same_thread:
-                    mail_values['reply_to'] = email_dict.pop('reply_to')
+                    mail_values['reply_to'] = email_dict.pop('reply_to', None)
                 else:
-                    email_dict.pop('reply_to')
+                    email_dict.pop('reply_to', None)
                 mail_values.update(email_dict)
             # mass mailing without post: mail_mail values
             if mass_mail_mode and not wizard.post:
author	Atul Patel (OpenERP) <atp@tinyerp.com>	2014-02-18 11:26:18 +0530
committer	Atul Patel (OpenERP) <atp@tinyerp.com>	2014-02-18 11:26:18 +0530
commit	33b99c8a0737e08e6a243e41bb455d3ab7e6c851 (patch)
tree	a1db52bfbeecf0c6fd9096604b7ec4540bb04197 /addons/mail
parent	caa3510ea434e10c32dcbc134f9c74b2b9f18b2a (diff)
parent	aa0eac1257b97c1be693e8a804fec6ecbf2bb22f (diff)