[MERGE] from trunk

bzr revid: rco@openerp.com-20120628131210-hyx2t1lqbl5hwm9g

31 files changed, 436 insertions, 258 deletions

diff --git a/addons/share/i18n/ar.po b/addons/share/i18n/ar.po
index fc27dce44d3..997a324099c 100644
--- a/addons/share/i18n/ar.po
+++ b/addons/share/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:10+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: share
 #: field:share.wizard,embed_option_title:0
@@ -34,7 +34,7 @@ msgstr ""
 
 #. module: share
 #: view:share.wizard:0
-msgid "Share with these People (one e-mail per line)"
+msgid "Share with these People (one email per line)"
 msgstr ""
 
 #. module: share
@@ -356,7 +356,7 @@ msgstr ""
 #. module: share
 #: view:share.wizard:0
 msgid ""
-"An e-mail notification with instructions has been sent to the following "
+"An email notification with instructions has been sent to the following "
 "people:"
 msgstr ""
 
@@ -388,7 +388,7 @@ msgstr ""
 #. module: share
 #: help:share.wizard,message:0
 msgid ""
-"An optional personal message, to be included in the e-mail notification."
+"An optional personal message, to be included in the email notification."
 msgstr ""
 
 #. module: share
@@ -456,7 +456,7 @@ msgstr ""
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:197
 #, python-format
-msgid "No e-mail address configured"
+msgid "No email address configured"
 msgstr ""
 
 #. module: share
@@ -496,7 +496,7 @@ msgstr ""
 #: code:addons/share/wizard/share_wizard.py:198
 #, python-format
 msgid ""
-"You must configure your e-mail address in the user preferences before using "
+"You must configure your email address in the user preferences before using "
 "the Share button."
 msgstr ""
 
diff --git a/addons/share/i18n/bg.po b/addons/share/i18n/bg.po
index 82127b66f9e..43c816a5398 100644
--- a/addons/share/i18n/bg.po
+++ b/addons/share/i18n/bg.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:10+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: share
 #: field:share.wizard,embed_option_title:0
@@ -34,7 +34,7 @@ msgstr ""
 
 #. module: share
 #: view:share.wizard:0
-msgid "Share with these People (one e-mail per line)"
+msgid "Share with these People (one email per line)"
 msgstr ""
 
 #. module: share
@@ -355,7 +355,7 @@ msgstr ""
 #. module: share
 #: view:share.wizard:0
 msgid ""
-"An e-mail notification with instructions has been sent to the following "
+"An email notification with instructions has been sent to the following "
 "people:"
 msgstr ""
 
@@ -387,7 +387,7 @@ msgstr ""
 #. module: share
 #: help:share.wizard,message:0
 msgid ""
-"An optional personal message, to be included in the e-mail notification."
+"An optional personal message, to be included in the email notification."
 msgstr ""
 
 #. module: share
@@ -455,7 +455,7 @@ msgstr ""
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:197
 #, python-format
-msgid "No e-mail address configured"
+msgid "No email address configured"
 msgstr ""
 
 #. module: share
@@ -495,7 +495,7 @@ msgstr ""
 #: code:addons/share/wizard/share_wizard.py:198
 #, python-format
 msgid ""
-"You must configure your e-mail address in the user preferences before using "
+"You must configure your email address in the user preferences before using "
 "the Share button."
 msgstr ""
 
diff --git a/addons/share/i18n/ca.po b/addons/share/i18n/ca.po
index 7ae94629767..9fab8492cbe 100644
--- a/addons/share/i18n/ca.po
+++ b/addons/share/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:10+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: share
 #: field:share.wizard,embed_option_title:0
@@ -34,7 +34,7 @@ msgstr ""
 
 #. module: share
 #: view:share.wizard:0
-msgid "Share with these People (one e-mail per line)"
+msgid "Share with these People (one email per line)"
 msgstr ""
 
 #. module: share
@@ -368,7 +368,7 @@ msgstr ""
 #. module: share
 #: view:share.wizard:0
 msgid ""
-"An e-mail notification with instructions has been sent to the following "
+"An email notification with instructions has been sent to the following "
 "people:"
 msgstr ""
 
@@ -401,7 +401,7 @@ msgstr ""
 #. module: share
 #: help:share.wizard,message:0
 msgid ""
-"An optional personal message, to be included in the e-mail notification."
+"An optional personal message, to be included in the email notification."
 msgstr ""
 
 #. module: share
@@ -471,7 +471,7 @@ msgstr ""
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:197
 #, python-format
-msgid "No e-mail address configured"
+msgid "No email address configured"
 msgstr ""
 
 #. module: share
@@ -513,7 +513,7 @@ msgstr ""
 #: code:addons/share/wizard/share_wizard.py:198
 #, python-format
 msgid ""
-"You must configure your e-mail address in the user preferences before using "
+"You must configure your email address in the user preferences before using "
 "the Share button."
 msgstr ""
 
diff --git a/addons/share/i18n/cs.po b/addons/share/i18n/cs.po
index 23ede08d6c4..fb05c117ca2 100644
--- a/addons/share/i18n/cs.po
+++ b/addons/share/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: 2012-05-11 05:10+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: share
@@ -35,7 +35,7 @@ msgstr ""
 
 #. module: share
 #: view:share.wizard:0
-msgid "Share with these People (one e-mail per line)"
+msgid "Share with these People (one email per line)"
 msgstr ""
 
 #. module: share
@@ -367,7 +367,7 @@ msgstr ""
 #. module: share
 #: view:share.wizard:0
 msgid ""
-"An e-mail notification with instructions has been sent to the following "
+"An email notification with instructions has been sent to the following "
 "people:"
 msgstr ""
 
@@ -399,7 +399,7 @@ msgstr ""
 #. module: share
 #: help:share.wizard,message:0
 msgid ""
-"An optional personal message, to be included in the e-mail notification."
+"An optional personal message, to be included in the email notification."
 msgstr ""
 
 #. module: share
@@ -468,7 +468,7 @@ msgstr ""
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:197
 #, python-format
-msgid "No e-mail address configured"
+msgid "No email address configured"
 msgstr ""
 
 #. module: share
@@ -510,7 +510,7 @@ msgstr ""
 #: code:addons/share/wizard/share_wizard.py:198
 #, python-format
 msgid ""
-"You must configure your e-mail address in the user preferences before using "
+"You must configure your email address in the user preferences before using "
 "the Share button."
 msgstr ""
 
diff --git a/addons/share/i18n/da.po b/addons/share/i18n/da.po
index daca6b6b475..4097b5f4083 100644
--- a/addons/share/i18n/da.po
+++ b/addons/share/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:10+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: share
 #: field:share.wizard,embed_option_title:0
@@ -34,7 +34,7 @@ msgstr ""
 
 #. module: share
 #: view:share.wizard:0
-msgid "Share with these People (one e-mail per line)"
+msgid "Share with these People (one email per line)"
 msgstr ""
 
 #. module: share
@@ -355,7 +355,7 @@ msgstr ""
 #. module: share
 #: view:share.wizard:0
 msgid ""
-"An e-mail notification with instructions has been sent to the following "
+"An email notification with instructions has been sent to the following "
 "people:"
 msgstr ""
 
@@ -387,7 +387,7 @@ msgstr ""
 #. module: share
 #: help:share.wizard,message:0
 msgid ""
-"An optional personal message, to be included in the e-mail notification."
+"An optional personal message, to be included in the email notification."
 msgstr ""
 
 #. module: share
@@ -455,7 +455,7 @@ msgstr ""
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:197
 #, python-format
-msgid "No e-mail address configured"
+msgid "No email address configured"
 msgstr ""
 
 #. module: share
@@ -495,7 +495,7 @@ msgstr ""
 #: code:addons/share/wizard/share_wizard.py:198
 #, python-format
 msgid ""
-"You must configure your e-mail address in the user preferences before using "
+"You must configure your email address in the user preferences before using "
 "the Share button."
 msgstr ""
 
diff --git a/addons/share/i18n/de.po b/addons/share/i18n/de.po
index 7408ccdd0b7..6917879a417 100644
--- a/addons/share/i18n/de.po
+++ b/addons/share/i18n/de.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: 2012-05-11 05:10+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: share
 #: field:share.wizard,embed_option_title:0
@@ -33,8 +33,8 @@ msgstr "Freigabe Methode"
 
 #. module: share
 #: view:share.wizard:0
-msgid "Share with these People (one e-mail per line)"
-msgstr "Freigabe für diese Personen (eine EMail pro Zeile)"
+msgid "Share with these People (one email per line)"
+msgstr ""
 
 #. module: share
 #: field:share.wizard,name:0
@@ -386,9 +386,9 @@ msgstr ""
 #. module: share
 #: view:share.wizard:0
 msgid ""
-"An e-mail notification with instructions has been sent to the following "
+"An email notification with instructions has been sent to the following "
 "people:"
-msgstr "Eine EMail mit Anleitung wurde an folgende Personen versandt"
+msgstr ""
 
 #. module: share
 #: model:ir.model,name:share.model_share_wizard_result_line
@@ -418,10 +418,8 @@ msgstr "Kann verändern"
 #. module: share
 #: help:share.wizard,message:0
 msgid ""
-"An optional personal message, to be included in the e-mail notification."
+"An optional personal message, to be included in the email notification."
 msgstr ""
-"Eine optionale persönliche Nachricht, die in der EMail Verständigung "
-"gedruckt wird."
 
 #. module: share
 #: model:ir.model,name:share.model_res_users
@@ -492,8 +490,8 @@ msgstr "Zeige Such Ansicht"
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:197
 #, python-format
-msgid "No e-mail address configured"
-msgstr "Keine EMail Adresse konfiguriert"
+msgid "No email address configured"
+msgstr ""
 
 #. module: share
 #: field:share.wizard,message:0
@@ -534,11 +532,9 @@ msgstr "Freigabe: Voerbereitung"
 #: code:addons/share/wizard/share_wizard.py:198
 #, python-format
 msgid ""
-"You must configure your e-mail address in the user preferences before using "
+"You must configure your email address in the user preferences before using "
 "the Share button."
 msgstr ""
-"Sie müssen Ihre EMail-Adresse in Ihren Einstellungen definieren, bevor Sie "
-"den Freigabe Schaltfläche verwenden können."
 
 #. module: share
 #: help:share.wizard,access_mode:0
@@ -699,5 +695,28 @@ msgstr "Teile mit ...."
 #~ msgid "Share with these people (one e-mail per line)"
 #~ msgstr "Freigabe für diese Personen (eine EMail pro Zeile)"
 
+#~ msgid ""
+#~ "An e-mail notification with instructions has been sent to the following "
+#~ "people:"
+#~ msgstr "Eine EMail mit Anleitung wurde an folgende Personen versandt"
+
 #~ msgid "Use this link"
 #~ msgstr "Verwenden Sie diesen Link"
+
+#~ msgid ""
+#~ "An optional personal message, to be included in the e-mail notification."
+#~ msgstr ""
+#~ "Eine optionale persönliche Nachricht, die in der EMail Verständigung "
+#~ "gedruckt wird."
+
+#, python-format
+#~ msgid "No e-mail address configured"
+#~ msgstr "Keine EMail Adresse konfiguriert"
+
+#, python-format
+#~ msgid ""
+#~ "You must configure your e-mail address in the user preferences before using "
+#~ "the Share button."
+#~ msgstr ""
+#~ "Sie müssen Ihre EMail-Adresse in Ihren Einstellungen definieren, bevor Sie "
+#~ "den Freigabe Schaltfläche verwenden können."
diff --git a/addons/share/i18n/es.po b/addons/share/i18n/es.po
index 6be18e56c1e..111f8e9ec1a 100644
--- a/addons/share/i18n/es.po
+++ b/addons/share/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:11+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: share
 #: field:share.wizard,embed_option_title:0
@@ -34,7 +34,7 @@ msgstr ""
 
 #. module: share
 #: view:share.wizard:0
-msgid "Share with these People (one e-mail per line)"
+msgid "Share with these People (one email per line)"
 msgstr ""
 
 #. module: share
@@ -371,7 +371,7 @@ msgstr ""
 #. module: share
 #: view:share.wizard:0
 msgid ""
-"An e-mail notification with instructions has been sent to the following "
+"An email notification with instructions has been sent to the following "
 "people:"
 msgstr ""
 
@@ -404,7 +404,7 @@ msgstr ""
 #. module: share
 #: help:share.wizard,message:0
 msgid ""
-"An optional personal message, to be included in the e-mail notification."
+"An optional personal message, to be included in the email notification."
 msgstr ""
 
 #. module: share
@@ -474,7 +474,7 @@ msgstr ""
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:197
 #, python-format
-msgid "No e-mail address configured"
+msgid "No email address configured"
 msgstr ""
 
 #. module: share
@@ -516,7 +516,7 @@ msgstr ""
 #: code:addons/share/wizard/share_wizard.py:198
 #, python-format
 msgid ""
-"You must configure your e-mail address in the user preferences before using "
+"You must configure your email address in the user preferences before using "
 "the Share button."
 msgstr ""
 
diff --git a/addons/share/i18n/es_CR.po b/addons/share/i18n/es_CR.po
index a5ae3a95a63..c8ab1a20820 100644
--- a/addons/share/i18n/es_CR.po
+++ b/addons/share/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:11+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 "Language: es\n"
 
 #. module: share
@@ -35,7 +35,7 @@ msgstr "Compartir el método"
 
 #. module: share
 #: view:share.wizard:0
-msgid "Share with these People (one e-mail per line)"
+msgid "Share with these People (one email per line)"
 msgstr ""
 
 #. module: share
@@ -389,11 +389,9 @@ msgstr ""
 #. module: share
 #: view:share.wizard:0
 msgid ""
-"An e-mail notification with instructions has been sent to the following "
+"An email notification with instructions has been sent to the following "
 "people:"
 msgstr ""
-"Una notificación por correo electrónico con las instrucciones que ha sido "
-"enviado a las siguientes personas:"
 
 #. module: share
 #: model:ir.model,name:share.model_share_wizard_result_line
@@ -424,10 +422,8 @@ msgstr "Puede Editar"
 #. module: share
 #: help:share.wizard,message:0
 msgid ""
-"An optional personal message, to be included in the e-mail notification."
+"An optional personal message, to be included in the email notification."
 msgstr ""
-"Un mensaje personal opcional, que se incluirá en la notificación por correo "
-"electrónico."
 
 #. module: share
 #: model:ir.model,name:share.model_res_users
@@ -500,8 +496,8 @@ msgstr "Mostrar Vista de búsqueda"
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:197
 #, python-format
-msgid "No e-mail address configured"
-msgstr "No hay dirección de correo electrónico configurado"
+msgid "No email address configured"
+msgstr ""
 
 #. module: share
 #: field:share.wizard,message:0
@@ -542,11 +538,9 @@ msgstr "Compartir: la preparación"
 #: code:addons/share/wizard/share_wizard.py:198
 #, python-format
 msgid ""
-"You must configure your e-mail address in the user preferences before using "
+"You must configure your email address in the user preferences before using "
 "the Share button."
 msgstr ""
-"Usted debe configurar su dirección de correo electrónico en las preferencias "
-"del usuario antes de utilizar el botón Compartir."
 
 #. module: share
 #: help:share.wizard,access_mode:0
@@ -711,5 +705,30 @@ msgstr "Compartir con ..."
 #~ msgstr ""
 #~ "Compartir con estas personas (un mensaje de correo electrónico por línea)"
 
+#~ msgid ""
+#~ "An e-mail notification with instructions has been sent to the following "
+#~ "people:"
+#~ msgstr ""
+#~ "Una notificación por correo electrónico con las instrucciones que ha sido "
+#~ "enviado a las siguientes personas:"
+
 #~ msgid "Use this link"
 #~ msgstr "Use este enlace"
+
+#~ msgid ""
+#~ "An optional personal message, to be included in the e-mail notification."
+#~ msgstr ""
+#~ "Un mensaje personal opcional, que se incluirá en la notificación por correo "
+#~ "electrónico."
+
+#, python-format
+#~ msgid "No e-mail address configured"
+#~ msgstr "No hay dirección de correo electrónico configurado"
+
+#, python-format
+#~ msgid ""
+#~ "You must configure your e-mail address in the user preferences before using "
+#~ "the Share button."
+#~ msgstr ""
+#~ "Usted debe configurar su dirección de correo electrónico en las preferencias "
+#~ "del usuario antes de utilizar el botón Compartir."
diff --git a/addons/share/i18n/fi.po b/addons/share/i18n/fi.po
index d70e0964e6c..db2c1d76098 100644
--- a/addons/share/i18n/fi.po
+++ b/addons/share/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:10+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: share
 #: field:share.wizard,embed_option_title:0
@@ -34,7 +34,7 @@ msgstr "Jakometodi"
 
 #. module: share
 #: view:share.wizard:0
-msgid "Share with these People (one e-mail per line)"
+msgid "Share with these People (one email per line)"
 msgstr ""
 
 #. module: share
@@ -372,9 +372,9 @@ msgstr "Tai liitä seuraaava koodi kun haluat upottaa dokumenttisi"
 #. module: share
 #: view:share.wizard:0
 msgid ""
-"An e-mail notification with instructions has been sent to the following "
+"An email notification with instructions has been sent to the following "
 "people:"
-msgstr "Sähköpostitiedote ohjeineen on lähetetty seuraaville henkilöille:"
+msgstr ""
 
 #. module: share
 #: model:ir.model,name:share.model_share_wizard_result_line
@@ -404,10 +404,8 @@ msgstr "Voi muokata"
 #. module: share
 #: help:share.wizard,message:0
 msgid ""
-"An optional personal message, to be included in the e-mail notification."
+"An optional personal message, to be included in the email notification."
 msgstr ""
-"Vaihtoehtoinen henkilökohtainen viesti, joka liitetään sähköposti-"
-"ilmoitukseen."
 
 #. module: share
 #: model:ir.model,name:share.model_res_users
@@ -476,8 +474,8 @@ msgstr "Näytä hakunäkymä"
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:197
 #, python-format
-msgid "No e-mail address configured"
-msgstr "Sähköpostiosoitetta ei ole konfiguroitu"
+msgid "No email address configured"
+msgstr ""
 
 #. module: share
 #: field:share.wizard,message:0
@@ -518,11 +516,9 @@ msgstr "Jakaminen: valmistelu"
 #: code:addons/share/wizard/share_wizard.py:198
 #, python-format
 msgid ""
-"You must configure your e-mail address in the user preferences before using "
+"You must configure your email address in the user preferences before using "
 "the Share button."
 msgstr ""
-"Sinun pitää määritellä sähköpostiosoitteesi käyttäjän asetuksiin ennenkuin "
-"voit käyttää Jaa nappia."
 
 #. module: share
 #: help:share.wizard,access_mode:0
@@ -681,3 +677,26 @@ msgstr "Jaa henkilöiden kanssa..."
 
 #~ msgid "Use this link"
 #~ msgstr "Käytä tätä linkkiä"
+
+#~ msgid ""
+#~ "An optional personal message, to be included in the e-mail notification."
+#~ msgstr ""
+#~ "Vaihtoehtoinen henkilökohtainen viesti, joka liitetään sähköposti-"
+#~ "ilmoitukseen."
+
+#, python-format
+#~ msgid "No e-mail address configured"
+#~ msgstr "Sähköpostiosoitetta ei ole konfiguroitu"
+
+#, python-format
+#~ msgid ""
+#~ "You must configure your e-mail address in the user preferences before using "
+#~ "the Share button."
+#~ msgstr ""
+#~ "Sinun pitää määritellä sähköpostiosoitteesi käyttäjän asetuksiin ennenkuin "
+#~ "voit käyttää Jaa nappia."
+
+#~ msgid ""
+#~ "An e-mail notification with instructions has been sent to the following "
+#~ "people:"
+#~ msgstr "Sähköpostitiedote ohjeineen on lähetetty seuraaville henkilöille:"
diff --git a/addons/share/i18n/fr.po b/addons/share/i18n/fr.po
index 536e3fa0c52..80e56d59370 100644
--- a/addons/share/i18n/fr.po
+++ b/addons/share/i18n/fr.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: 2012-05-11 05:10+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: share
 #: field:share.wizard,embed_option_title:0
@@ -33,7 +33,7 @@ msgstr "Méthode de partage"
 
 #. module: share
 #: view:share.wizard:0
-msgid "Share with these People (one e-mail per line)"
+msgid "Share with these People (one email per line)"
 msgstr ""
 
 #. module: share
@@ -386,11 +386,9 @@ msgstr "Ou insérez le code suivant où vous souhaitez intégrer vos documents"
 #. module: share
 #: view:share.wizard:0
 msgid ""
-"An e-mail notification with instructions has been sent to the following "
+"An email notification with instructions has been sent to the following "
 "people:"
 msgstr ""
-"Une notification par courriel avec les instructions a été envoyée aux "
-"personnes suivantes:"
 
 #. module: share
 #: model:ir.model,name:share.model_share_wizard_result_line
@@ -422,9 +420,8 @@ msgstr "Peut éditer"
 #. module: share
 #: help:share.wizard,message:0
 msgid ""
-"An optional personal message, to be included in the e-mail notification."
+"An optional personal message, to be included in the email notification."
 msgstr ""
-"Un message personnel optionnel à inclure dans la notification par courriel."
 
 #. module: share
 #: model:ir.model,name:share.model_res_users
@@ -497,8 +494,8 @@ msgstr "Affiche lu vue de recherche"
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:197
 #, python-format
-msgid "No e-mail address configured"
-msgstr "Aucune adresse de courriel configurée"
+msgid "No email address configured"
+msgstr ""
 
 #. module: share
 #: field:share.wizard,message:0
@@ -539,11 +536,9 @@ msgstr "Partage : préparation"
 #: code:addons/share/wizard/share_wizard.py:198
 #, python-format
 msgid ""
-"You must configure your e-mail address in the user preferences before using "
+"You must configure your email address in the user preferences before using "
 "the Share button."
 msgstr ""
-"Vous devez configurer votre adresse de courriel dans les préférences de "
-"l'utilisateur avant d'utiliser le bouton partager."
 
 #. module: share
 #: help:share.wizard,access_mode:0
@@ -707,3 +702,27 @@ msgstr "Partager avec..."
 
 #~ msgid "Use this link"
 #~ msgstr "Utiliser ce lien"
+
+#~ msgid ""
+#~ "An optional personal message, to be included in the e-mail notification."
+#~ msgstr ""
+#~ "Un message personnel optionnel à inclure dans la notification par courriel."
+
+#~ msgid ""
+#~ "An e-mail notification with instructions has been sent to the following "
+#~ "people:"
+#~ msgstr ""
+#~ "Une notification par courriel avec les instructions a été envoyée aux "
+#~ "personnes suivantes:"
+
+#, python-format
+#~ msgid "No e-mail address configured"
+#~ msgstr "Aucune adresse de courriel configurée"
+
+#, python-format
+#~ msgid ""
+#~ "You must configure your e-mail address in the user preferences before using "
+#~ "the Share button."
+#~ msgstr ""
+#~ "Vous devez configurer votre adresse de courriel dans les préférences de "
+#~ "l'utilisateur avant d'utiliser le bouton partager."
diff --git a/addons/share/i18n/gl.po b/addons/share/i18n/gl.po
index f9116a35b92..762444c27ce 100644
--- a/addons/share/i18n/gl.po
+++ b/addons/share/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:11+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: share
 #: field:share.wizard,embed_option_title:0
@@ -34,7 +34,7 @@ msgstr ""
 
 #. module: share
 #: view:share.wizard:0
-msgid "Share with these People (one e-mail per line)"
+msgid "Share with these People (one email per line)"
 msgstr ""
 
 #. module: share
@@ -366,7 +366,7 @@ msgstr ""
 #. module: share
 #: view:share.wizard:0
 msgid ""
-"An e-mail notification with instructions has been sent to the following "
+"An email notification with instructions has been sent to the following "
 "people:"
 msgstr ""
 
@@ -399,7 +399,7 @@ msgstr ""
 #. module: share
 #: help:share.wizard,message:0
 msgid ""
-"An optional personal message, to be included in the e-mail notification."
+"An optional personal message, to be included in the email notification."
 msgstr ""
 
 #. module: share
@@ -469,7 +469,7 @@ msgstr ""
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:197
 #, python-format
-msgid "No e-mail address configured"
+msgid "No email address configured"
 msgstr ""
 
 #. module: share
@@ -511,7 +511,7 @@ msgstr ""
 #: code:addons/share/wizard/share_wizard.py:198
 #, python-format
 msgid ""
-"You must configure your e-mail address in the user preferences before using "
+"You must configure your email address in the user preferences before using "
 "the Share button."
 msgstr ""
 
diff --git a/addons/share/i18n/hr.po b/addons/share/i18n/hr.po
index 2372597fa5c..c5dab6cc24f 100644
--- a/addons/share/i18n/hr.po
+++ b/addons/share/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:11+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: share
 #: field:share.wizard,embed_option_title:0
@@ -34,8 +34,8 @@ msgstr "Način dijeljenja"
 
 #. module: share
 #: view:share.wizard:0
-msgid "Share with these People (one e-mail per line)"
-msgstr "Dijeli sa ovim korisnicima (jedan e-mail po liniji)"
+msgid "Share with these People (one email per line)"
+msgstr ""
 
 #. module: share
 #: field:share.wizard,name:0
@@ -368,7 +368,7 @@ msgstr ""
 #. module: share
 #: view:share.wizard:0
 msgid ""
-"An e-mail notification with instructions has been sent to the following "
+"An email notification with instructions has been sent to the following "
 "people:"
 msgstr ""
 
@@ -400,7 +400,7 @@ msgstr ""
 #. module: share
 #: help:share.wizard,message:0
 msgid ""
-"An optional personal message, to be included in the e-mail notification."
+"An optional personal message, to be included in the email notification."
 msgstr ""
 
 #. module: share
@@ -470,7 +470,7 @@ msgstr ""
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:197
 #, python-format
-msgid "No e-mail address configured"
+msgid "No email address configured"
 msgstr ""
 
 #. module: share
@@ -512,7 +512,7 @@ msgstr ""
 #: code:addons/share/wizard/share_wizard.py:198
 #, python-format
 msgid ""
-"You must configure your e-mail address in the user preferences before using "
+"You must configure your email address in the user preferences before using "
 "the Share button."
 msgstr ""
 
diff --git a/addons/share/i18n/hu.po b/addons/share/i18n/hu.po
index 6b1609268c5..beb1eceb262 100644
--- a/addons/share/i18n/hu.po
+++ b/addons/share/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:11+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: share
 #: field:share.wizard,embed_option_title:0
@@ -34,7 +34,7 @@ msgstr ""
 
 #. module: share
 #: view:share.wizard:0
-msgid "Share with these People (one e-mail per line)"
+msgid "Share with these People (one email per line)"
 msgstr ""
 
 #. module: share
@@ -355,7 +355,7 @@ msgstr ""
 #. module: share
 #: view:share.wizard:0
 msgid ""
-"An e-mail notification with instructions has been sent to the following "
+"An email notification with instructions has been sent to the following "
 "people:"
 msgstr ""
 
@@ -387,7 +387,7 @@ msgstr ""
 #. module: share
 #: help:share.wizard,message:0
 msgid ""
-"An optional personal message, to be included in the e-mail notification."
+"An optional personal message, to be included in the email notification."
 msgstr ""
 
 #. module: share
@@ -455,7 +455,7 @@ msgstr ""
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:197
 #, python-format
-msgid "No e-mail address configured"
+msgid "No email address configured"
 msgstr ""
 
 #. module: share
@@ -495,7 +495,7 @@ msgstr ""
 #: code:addons/share/wizard/share_wizard.py:198
 #, python-format
 msgid ""
-"You must configure your e-mail address in the user preferences before using "
+"You must configure your email address in the user preferences before using "
 "the Share button."
 msgstr ""
 
diff --git a/addons/share/i18n/it.po b/addons/share/i18n/it.po
index c8b5193f92e..ced913214df 100644
--- a/addons/share/i18n/it.po
+++ b/addons/share/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:11+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: share
 #: field:share.wizard,embed_option_title:0
@@ -34,7 +34,7 @@ msgstr "Metodi di condivisione"
 
 #. module: share
 #: view:share.wizard:0
-msgid "Share with these People (one e-mail per line)"
+msgid "Share with these People (one email per line)"
 msgstr ""
 
 #. module: share
@@ -362,7 +362,7 @@ msgstr ""
 #. module: share
 #: view:share.wizard:0
 msgid ""
-"An e-mail notification with instructions has been sent to the following "
+"An email notification with instructions has been sent to the following "
 "people:"
 msgstr ""
 
@@ -394,7 +394,7 @@ msgstr ""
 #. module: share
 #: help:share.wizard,message:0
 msgid ""
-"An optional personal message, to be included in the e-mail notification."
+"An optional personal message, to be included in the email notification."
 msgstr ""
 
 #. module: share
@@ -464,8 +464,8 @@ msgstr ""
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:197
 #, python-format
-msgid "No e-mail address configured"
-msgstr "Nessun indirizzo e-mail configurato"
+msgid "No email address configured"
+msgstr ""
 
 #. module: share
 #: field:share.wizard,message:0
@@ -506,7 +506,7 @@ msgstr ""
 #: code:addons/share/wizard/share_wizard.py:198
 #, python-format
 msgid ""
-"You must configure your e-mail address in the user preferences before using "
+"You must configure your email address in the user preferences before using "
 "the Share button."
 msgstr ""
 
@@ -666,3 +666,7 @@ msgstr ""
 
 #~ msgid "Use this link"
 #~ msgstr "Usa questo collegamento"
+
+#, python-format
+#~ msgid "No e-mail address configured"
+#~ msgstr "Nessun indirizzo e-mail configurato"
diff --git a/addons/share/i18n/ja.po b/addons/share/i18n/ja.po
index 0db52a2c09e..a2c3401458c 100644
--- a/addons/share/i18n/ja.po
+++ b/addons/share/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-22 04:47+0000\n"
-"X-Generator: Launchpad (build 15461)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: share
 #: field:share.wizard,embed_option_title:0
@@ -34,8 +34,8 @@ msgstr "共有方法"
 
 #. module: share
 #: view:share.wizard:0
-msgid "Share with these People (one e-mail per line)"
-msgstr "人々と共有（行毎に１つのEメール）"
+msgid "Share with these People (one email per line)"
+msgstr ""
 
 #. module: share
 #: field:share.wizard,name:0
@@ -359,9 +359,9 @@ msgstr "またはドキュメントを埋め込みたい場所に、次のコー
 #. module: share
 #: view:share.wizard:0
 msgid ""
-"An e-mail notification with instructions has been sent to the following "
+"An email notification with instructions has been sent to the following "
 "people:"
-msgstr "指示によるEメール通知は次の人々に送信されました："
+msgstr ""
 
 #. module: share
 #: model:ir.model,name:share.model_share_wizard_result_line
@@ -391,8 +391,8 @@ msgstr "編集可能"
 #. module: share
 #: help:share.wizard,message:0
 msgid ""
-"An optional personal message, to be included in the e-mail notification."
-msgstr "Eメール通知に含まれるオプションの個人的なメッセージ"
+"An optional personal message, to be included in the email notification."
+msgstr ""
 
 #. module: share
 #: model:ir.model,name:share.model_res_users
@@ -461,8 +461,8 @@ msgstr "検索ビューを表示"
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:197
 #, python-format
-msgid "No e-mail address configured"
-msgstr "Eメールアドレスが設定されていません。"
+msgid "No email address configured"
+msgstr ""
 
 #. module: share
 #: field:share.wizard,message:0
@@ -501,9 +501,9 @@ msgstr "共有操作"
 #: code:addons/share/wizard/share_wizard.py:198
 #, python-format
 msgid ""
-"You must configure your e-mail address in the user preferences before using "
+"You must configure your email address in the user preferences before using "
 "the Share button."
-msgstr "共有ボタンを使う前に、ユーザ設定の中のEメールアドレスを設定する必要があります。"
+msgstr ""
 
 #. module: share
 #: help:share.wizard,access_mode:0
@@ -519,3 +519,22 @@ msgstr "リンクまたは埋め込み"
 #: /home/odo/repositories/addons/trunk/share/static/src/xml/share.xml:9
 msgid "Share with..."
 msgstr "共有先"
+
+#~ msgid ""
+#~ "An optional personal message, to be included in the e-mail notification."
+#~ msgstr "Eメール通知に含まれるオプションの個人的なメッセージ"
+
+#~ msgid ""
+#~ "An e-mail notification with instructions has been sent to the following "
+#~ "people:"
+#~ msgstr "指示によるEメール通知は次の人々に送信されました："
+
+#, python-format
+#~ msgid "No e-mail address configured"
+#~ msgstr "Eメールアドレスが設定されていません。"
+
+#, python-format
+#~ msgid ""
+#~ "You must configure your e-mail address in the user preferences before using "
+#~ "the Share button."
+#~ msgstr "共有ボタンを使う前に、ユーザ設定の中のEメールアドレスを設定する必要があります。"
diff --git a/addons/share/i18n/mn.po b/addons/share/i18n/mn.po
index 448d9c9fd88..affc27756f1 100644
--- a/addons/share/i18n/mn.po
+++ b/addons/share/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:11+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: share
 #: field:share.wizard,embed_option_title:0
@@ -34,7 +34,7 @@ msgstr ""
 
 #. module: share
 #: view:share.wizard:0
-msgid "Share with these People (one e-mail per line)"
+msgid "Share with these People (one email per line)"
 msgstr ""
 
 #. module: share
@@ -355,7 +355,7 @@ msgstr ""
 #. module: share
 #: view:share.wizard:0
 msgid ""
-"An e-mail notification with instructions has been sent to the following "
+"An email notification with instructions has been sent to the following "
 "people:"
 msgstr ""
 
@@ -387,7 +387,7 @@ msgstr ""
 #. module: share
 #: help:share.wizard,message:0
 msgid ""
-"An optional personal message, to be included in the e-mail notification."
+"An optional personal message, to be included in the email notification."
 msgstr ""
 
 #. module: share
@@ -455,7 +455,7 @@ msgstr ""
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:197
 #, python-format
-msgid "No e-mail address configured"
+msgid "No email address configured"
 msgstr ""
 
 #. module: share
@@ -495,7 +495,7 @@ msgstr ""
 #: code:addons/share/wizard/share_wizard.py:198
 #, python-format
 msgid ""
-"You must configure your e-mail address in the user preferences before using "
+"You must configure your email address in the user preferences before using "
 "the Share button."
 msgstr ""
 
diff --git a/addons/share/i18n/nl.po b/addons/share/i18n/nl.po
index 51632a56be3..4dc9fac9906 100644
--- a/addons/share/i18n/nl.po
+++ b/addons/share/i18n/nl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:10+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: share
 #: field:share.wizard,embed_option_title:0
@@ -34,8 +34,8 @@ msgstr "Deel methode"
 
 #. module: share
 #: view:share.wizard:0
-msgid "Share with these People (one e-mail per line)"
-msgstr "Deel dit met mensen (één e-mail per regel)"
+msgid "Share with these People (one email per line)"
+msgstr ""
 
 #. module: share
 #: field:share.wizard,name:0
@@ -381,10 +381,9 @@ msgstr "Of voeg te volgende code toe waar u, uw documenten wilt insluiten"
 #. module: share
 #: view:share.wizard:0
 msgid ""
-"An e-mail notification with instructions has been sent to the following "
+"An email notification with instructions has been sent to the following "
 "people:"
 msgstr ""
-"Een e-mail bericht met instructies is verstuurt naar de volgende mensen:"
 
 #. module: share
 #: model:ir.model,name:share.model_share_wizard_result_line
@@ -414,9 +413,8 @@ msgstr "Kan bewerken"
 #. module: share
 #: help:share.wizard,message:0
 msgid ""
-"An optional personal message, to be included in the e-mail notification."
+"An optional personal message, to be included in the email notification."
 msgstr ""
-"Een optioneel bericht welke kan worden toegevoegd aan de e-mail notificatie."
 
 #. module: share
 #: model:ir.model,name:share.model_res_users
@@ -489,8 +487,8 @@ msgstr "Zoek weergave tonen"
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:197
 #, python-format
-msgid "No e-mail address configured"
-msgstr "Geen e-mail adres geconfigureerd"
+msgid "No email address configured"
+msgstr ""
 
 #. module: share
 #: field:share.wizard,message:0
@@ -531,11 +529,9 @@ msgstr "Delen: voorbereiding"
 #: code:addons/share/wizard/share_wizard.py:198
 #, python-format
 msgid ""
-"You must configure your e-mail address in the user preferences before using "
+"You must configure your email address in the user preferences before using "
 "the Share button."
 msgstr ""
-"Voordat u de deel knop kunt gebruiken dient u een e-mail adres te "
-"configureren in uw gebruikersinstellingen."
 
 #. module: share
 #: help:share.wizard,access_mode:0
@@ -697,3 +693,26 @@ msgstr "Deel met..."
 
 #~ msgid "Use this link"
 #~ msgstr "Gebruik deze link"
+
+#, python-format
+#~ msgid "No e-mail address configured"
+#~ msgstr "Geen e-mail adres geconfigureerd"
+
+#, python-format
+#~ msgid ""
+#~ "You must configure your e-mail address in the user preferences before using "
+#~ "the Share button."
+#~ msgstr ""
+#~ "Voordat u de deel knop kunt gebruiken dient u een e-mail adres te "
+#~ "configureren in uw gebruikersinstellingen."
+
+#~ msgid ""
+#~ "An optional personal message, to be included in the e-mail notification."
+#~ msgstr ""
+#~ "Een optioneel bericht welke kan worden toegevoegd aan de e-mail notificatie."
+
+#~ msgid ""
+#~ "An e-mail notification with instructions has been sent to the following "
+#~ "people:"
+#~ msgstr ""
+#~ "Een e-mail bericht met instructies is verstuurt naar de volgende mensen:"
diff --git a/addons/share/i18n/pl.po b/addons/share/i18n/pl.po
index f6ed100f75f..a32c9e09251 100644
--- a/addons/share/i18n/pl.po
+++ b/addons/share/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:11+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: share
 #: field:share.wizard,embed_option_title:0
@@ -34,7 +34,7 @@ msgstr ""
 
 #. module: share
 #: view:share.wizard:0
-msgid "Share with these People (one e-mail per line)"
+msgid "Share with these People (one email per line)"
 msgstr ""
 
 #. module: share
@@ -355,7 +355,7 @@ msgstr ""
 #. module: share
 #: view:share.wizard:0
 msgid ""
-"An e-mail notification with instructions has been sent to the following "
+"An email notification with instructions has been sent to the following "
 "people:"
 msgstr ""
 
@@ -387,7 +387,7 @@ msgstr ""
 #. module: share
 #: help:share.wizard,message:0
 msgid ""
-"An optional personal message, to be included in the e-mail notification."
+"An optional personal message, to be included in the email notification."
 msgstr ""
 
 #. module: share
@@ -455,7 +455,7 @@ msgstr ""
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:197
 #, python-format
-msgid "No e-mail address configured"
+msgid "No email address configured"
 msgstr ""
 
 #. module: share
@@ -495,7 +495,7 @@ msgstr ""
 #: code:addons/share/wizard/share_wizard.py:198
 #, python-format
 msgid ""
-"You must configure your e-mail address in the user preferences before using "
+"You must configure your email address in the user preferences before using "
 "the Share button."
 msgstr ""
 
diff --git a/addons/share/i18n/pt.po b/addons/share/i18n/pt.po
index 56add3e1561..6fc86a1cdb2 100644
--- a/addons/share/i18n/pt.po
+++ b/addons/share/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:11+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: share
 #: field:share.wizard,embed_option_title:0
@@ -34,7 +34,7 @@ msgstr "A compartilhar método"
 
 #. module: share
 #: view:share.wizard:0
-msgid "Share with these People (one e-mail per line)"
+msgid "Share with these People (one email per line)"
 msgstr ""
 
 #. module: share
@@ -233,6 +233,9 @@ msgid ""
 "Sales, HR, etc.)\n"
 "It is open source and can be found on http://www.openerp.com."
 msgstr ""
+"OpenERP é uma poderosa e intuitiva suite de Aplicações de Gestão(CRM, "
+"Vendas, RH, etc.)\n"
+"É open source e pode ser encontrado em http://www.openerp.com."
 
 #. module: share
 #: field:share.wizard,action_id:0
@@ -377,11 +380,9 @@ msgstr "Ou insira o seguinte código onde quer inserir os seus documentos"
 #. module: share
 #: view:share.wizard:0
 msgid ""
-"An e-mail notification with instructions has been sent to the following "
+"An email notification with instructions has been sent to the following "
 "people:"
 msgstr ""
-"Uma notificação por email com instruções foi enviada para as seguintes "
-"pessoas:"
 
 #. module: share
 #: model:ir.model,name:share.model_share_wizard_result_line
@@ -412,9 +413,8 @@ msgstr "Pode editar"
 #. module: share
 #: help:share.wizard,message:0
 msgid ""
-"An optional personal message, to be included in the e-mail notification."
+"An optional personal message, to be included in the email notification."
 msgstr ""
-"Uma mensagem pessoal opcional, a ser incluída na notificação de email."
 
 #. module: share
 #: model:ir.model,name:share.model_res_users
@@ -482,13 +482,13 @@ msgstr "Emails"
 #. module: share
 #: field:share.wizard,embed_option_search:0
 msgid "Display search view"
-msgstr ""
+msgstr "Mostrar vista de pesquisa"
 
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:197
 #, python-format
-msgid "No e-mail address configured"
-msgstr "Sem endereço de email configurado"
+msgid "No email address configured"
+msgstr ""
 
 #. module: share
 #: field:share.wizard,message:0
@@ -529,11 +529,9 @@ msgstr "Compartilhamento: preparação"
 #: code:addons/share/wizard/share_wizard.py:198
 #, python-format
 msgid ""
-"You must configure your e-mail address in the user preferences before using "
+"You must configure your email address in the user preferences before using "
 "the Share button."
 msgstr ""
-"Deve configurar o seu endereço de email nas preferências do utilizador antes "
-"de usar o botão Partilhar."
 
 #. module: share
 #: help:share.wizard,access_mode:0
@@ -638,3 +636,27 @@ msgstr "Partilhar com..."
 
 #~ msgid "Use this link"
 #~ msgstr "Utilize este link"
+
+#~ msgid ""
+#~ "An e-mail notification with instructions has been sent to the following "
+#~ "people:"
+#~ msgstr ""
+#~ "Uma notificação por email com instruções foi enviada para as seguintes "
+#~ "pessoas:"
+
+#~ msgid ""
+#~ "An optional personal message, to be included in the e-mail notification."
+#~ msgstr ""
+#~ "Uma mensagem pessoal opcional, a ser incluída na notificação de email."
+
+#, python-format
+#~ msgid "No e-mail address configured"
+#~ msgstr "Sem endereço de email configurado"
+
+#, python-format
+#~ msgid ""
+#~ "You must configure your e-mail address in the user preferences before using "
+#~ "the Share button."
+#~ msgstr ""
+#~ "Deve configurar o seu endereço de email nas preferências do utilizador antes "
+#~ "de usar o botão Partilhar."
diff --git a/addons/share/i18n/pt_BR.po b/addons/share/i18n/pt_BR.po
index d3fbf3585d4..8203cf06437 100644
--- a/addons/share/i18n/pt_BR.po
+++ b/addons/share/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:11+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: share
 #: field:share.wizard,embed_option_title:0
@@ -34,7 +34,7 @@ msgstr ""
 
 #. module: share
 #: view:share.wizard:0
-msgid "Share with these People (one e-mail per line)"
+msgid "Share with these People (one email per line)"
 msgstr ""
 
 #. module: share
@@ -356,7 +356,7 @@ msgstr ""
 #. module: share
 #: view:share.wizard:0
 msgid ""
-"An e-mail notification with instructions has been sent to the following "
+"An email notification with instructions has been sent to the following "
 "people:"
 msgstr ""
 
@@ -390,7 +390,7 @@ msgstr ""
 #. module: share
 #: help:share.wizard,message:0
 msgid ""
-"An optional personal message, to be included in the e-mail notification."
+"An optional personal message, to be included in the email notification."
 msgstr ""
 
 #. module: share
@@ -458,7 +458,7 @@ msgstr ""
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:197
 #, python-format
-msgid "No e-mail address configured"
+msgid "No email address configured"
 msgstr ""
 
 #. module: share
@@ -500,7 +500,7 @@ msgstr ""
 #: code:addons/share/wizard/share_wizard.py:198
 #, python-format
 msgid ""
-"You must configure your e-mail address in the user preferences before using "
+"You must configure your email address in the user preferences before using "
 "the Share button."
 msgstr ""
 
diff --git a/addons/share/i18n/ro.po b/addons/share/i18n/ro.po
index d13b92a6f35..00f3c5738b3 100644
--- a/addons/share/i18n/ro.po
+++ b/addons/share/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:11+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: share
 #: field:share.wizard,embed_option_title:0
@@ -34,7 +34,7 @@ msgstr "Metoda de partajare"
 
 #. module: share
 #: view:share.wizard:0
-msgid "Share with these People (one e-mail per line)"
+msgid "Share with these People (one email per line)"
 msgstr ""
 
 #. module: share
@@ -390,10 +390,9 @@ msgstr ""
 #. module: share
 #: view:share.wizard:0
 msgid ""
-"An e-mail notification with instructions has been sent to the following "
+"An email notification with instructions has been sent to the following "
 "people:"
 msgstr ""
-"A fost trimis un e-mail de notificare cu instructiuni urmatoarelor persoane:"
 
 #. module: share
 #: model:ir.model,name:share.model_share_wizard_result_line
@@ -424,8 +423,8 @@ msgstr "Puteti edita"
 #. module: share
 #: help:share.wizard,message:0
 msgid ""
-"An optional personal message, to be included in the e-mail notification."
-msgstr "Un mesaj personal optional va fi inclus in e-mail-ul de notificare."
+"An optional personal message, to be included in the email notification."
+msgstr ""
 
 #. module: share
 #: model:ir.model,name:share.model_res_users
@@ -497,8 +496,8 @@ msgstr "Afiseaza vizualizarea cautarii"
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:197
 #, python-format
-msgid "No e-mail address configured"
-msgstr "Nu este configurata nicio adresa de e-mail"
+msgid "No email address configured"
+msgstr ""
 
 #. module: share
 #: field:share.wizard,message:0
@@ -539,11 +538,9 @@ msgstr "Partajare: pregatire"
 #: code:addons/share/wizard/share_wizard.py:198
 #, python-format
 msgid ""
-"You must configure your e-mail address in the user preferences before using "
+"You must configure your email address in the user preferences before using "
 "the Share button."
 msgstr ""
-"Trebuie sa va configurati adresa de e-mail in preferintele utilizatorului "
-"inainte de a folosi butonul Partajeaza."
 
 #. module: share
 #: help:share.wizard,access_mode:0
@@ -705,3 +702,25 @@ msgstr "Partajeaza cu..."
 
 #~ msgid "Use this link"
 #~ msgstr "Folositi acest link"
+
+#~ msgid ""
+#~ "An optional personal message, to be included in the e-mail notification."
+#~ msgstr "Un mesaj personal optional va fi inclus in e-mail-ul de notificare."
+
+#~ msgid ""
+#~ "An e-mail notification with instructions has been sent to the following "
+#~ "people:"
+#~ msgstr ""
+#~ "A fost trimis un e-mail de notificare cu instructiuni urmatoarelor persoane:"
+
+#, python-format
+#~ msgid "No e-mail address configured"
+#~ msgstr "Nu este configurata nicio adresa de e-mail"
+
+#, python-format
+#~ msgid ""
+#~ "You must configure your e-mail address in the user preferences before using "
+#~ "the Share button."
+#~ msgstr ""
+#~ "Trebuie sa va configurati adresa de e-mail in preferintele utilizatorului "
+#~ "inainte de a folosi butonul Partajeaza."
diff --git a/addons/share/i18n/ru.po b/addons/share/i18n/ru.po
index 4bfe538b8f7..9e8e7ed7b12 100644
--- a/addons/share/i18n/ru.po
+++ b/addons/share/i18n/ru.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:11+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: share
 #: field:share.wizard,embed_option_title:0
@@ -34,7 +34,7 @@ msgstr ""
 
 #. module: share
 #: view:share.wizard:0
-msgid "Share with these People (one e-mail per line)"
+msgid "Share with these People (one email per line)"
 msgstr ""
 
 #. module: share
@@ -370,7 +370,7 @@ msgstr ""
 #. module: share
 #: view:share.wizard:0
 msgid ""
-"An e-mail notification with instructions has been sent to the following "
+"An email notification with instructions has been sent to the following "
 "people:"
 msgstr ""
 
@@ -404,7 +404,7 @@ msgstr ""
 #. module: share
 #: help:share.wizard,message:0
 msgid ""
-"An optional personal message, to be included in the e-mail notification."
+"An optional personal message, to be included in the email notification."
 msgstr ""
 
 #. module: share
@@ -474,7 +474,7 @@ msgstr ""
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:197
 #, python-format
-msgid "No e-mail address configured"
+msgid "No email address configured"
 msgstr ""
 
 #. module: share
@@ -516,7 +516,7 @@ msgstr ""
 #: code:addons/share/wizard/share_wizard.py:198
 #, python-format
 msgid ""
-"You must configure your e-mail address in the user preferences before using "
+"You must configure your email address in the user preferences before using "
 "the Share button."
 msgstr ""
 
diff --git a/addons/share/i18n/share.pot b/addons/share/i18n/share.pot
index c9c9e09cd2f..8d4c4c57024 100644
--- a/addons/share/i18n/share.pot
+++ b/addons/share/i18n/share.pot
@@ -52,7 +52,7 @@ msgstr ""
 
 #. module: share
 #: view:share.wizard:0
-msgid "Share with these People (one e-mail per line)"
+msgid "Share with these People (one email per line)"
 msgstr ""
 
 #. module: share
@@ -372,7 +372,7 @@ msgstr ""
 #. module: share
 #: view:share.wizard:0
 msgid ""
-"An e-mail notification with instructions has been sent to the following "
+"An email notification with instructions has been sent to the following "
 "people:"
 msgstr ""
 
@@ -404,7 +404,7 @@ msgstr ""
 #. module: share
 #: help:share.wizard,message:0
 msgid ""
-"An optional personal message, to be included in the e-mail notification."
+"An optional personal message, to be included in the email notification."
 msgstr ""
 
 #. module: share
@@ -472,7 +472,7 @@ msgstr ""
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:197
 #, python-format
-msgid "No e-mail address configured"
+msgid "No email address configured"
 msgstr ""
 
 #. module: share
@@ -512,7 +512,7 @@ msgstr ""
 #: code:addons/share/wizard/share_wizard.py:198
 #, python-format
 msgid ""
-"You must configure your e-mail address in the user preferences before using "
+"You must configure your email address in the user preferences before using "
 "the Share button."
 msgstr ""
 
diff --git a/addons/share/i18n/sv.po b/addons/share/i18n/sv.po
index c704c8373eb..1aa3b6f0ee9 100644
--- a/addons/share/i18n/sv.po
+++ b/addons/share/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-05 04:54+0000\n"
-"X-Generator: Launchpad (build 15353)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: share
 #: field:share.wizard,embed_option_title:0
@@ -34,7 +34,7 @@ msgstr "Delningsmetod"
 
 #. module: share
 #: view:share.wizard:0
-msgid "Share with these People (one e-mail per line)"
+msgid "Share with these People (one email per line)"
 msgstr ""
 
 #. module: share
@@ -358,7 +358,7 @@ msgstr ""
 #. module: share
 #: view:share.wizard:0
 msgid ""
-"An e-mail notification with instructions has been sent to the following "
+"An email notification with instructions has been sent to the following "
 "people:"
 msgstr ""
 
@@ -390,7 +390,7 @@ msgstr "Kan ändra"
 #. module: share
 #: help:share.wizard,message:0
 msgid ""
-"An optional personal message, to be included in the e-mail notification."
+"An optional personal message, to be included in the email notification."
 msgstr ""
 
 #. module: share
@@ -458,7 +458,7 @@ msgstr ""
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:197
 #, python-format
-msgid "No e-mail address configured"
+msgid "No email address configured"
 msgstr ""
 
 #. module: share
@@ -498,7 +498,7 @@ msgstr ""
 #: code:addons/share/wizard/share_wizard.py:198
 #, python-format
 msgid ""
-"You must configure your e-mail address in the user preferences before using "
+"You must configure your email address in the user preferences before using "
 "the Share button."
 msgstr ""
 
diff --git a/addons/share/i18n/tr.po b/addons/share/i18n/tr.po
index af5a0030ac5..ff39759e71d 100644
--- a/addons/share/i18n/tr.po
+++ b/addons/share/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:11+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: share
 #: field:share.wizard,embed_option_title:0
@@ -34,8 +34,8 @@ msgstr "Paylaşım Metodu"
 
 #. module: share
 #: view:share.wizard:0
-msgid "Share with these People (one e-mail per line)"
-msgstr "Şu kişilerle paylaş (her satırda bir e-posta)"
+msgid "Share with these People (one email per line)"
+msgstr ""
 
 #. module: share
 #: field:share.wizard,name:0
@@ -376,10 +376,9 @@ msgstr "ya da dökümanlarınızı gömmek istediğiniz yere kodu yerleştirin"
 #. module: share
 #: view:share.wizard:0
 msgid ""
-"An e-mail notification with instructions has been sent to the following "
+"An email notification with instructions has been sent to the following "
 "people:"
 msgstr ""
-"Talimatları içeren bir e-posta mesajı, aşağıdaki kişilere gönderildi:"
 
 #. module: share
 #: model:ir.model,name:share.model_share_wizard_result_line
@@ -409,8 +408,8 @@ msgstr "Düzenleyebilir"
 #. module: share
 #: help:share.wizard,message:0
 msgid ""
-"An optional personal message, to be included in the e-mail notification."
-msgstr "E-posta mesajına eklemek için, kişisel mesaj (opsiyonel)"
+"An optional personal message, to be included in the email notification."
+msgstr ""
 
 #. module: share
 #: model:ir.model,name:share.model_res_users
@@ -481,8 +480,8 @@ msgstr "Arama Ekranını Göster"
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:197
 #, python-format
-msgid "No e-mail address configured"
-msgstr "Hiç bir E-posta adresi tanımlanmamış"
+msgid "No email address configured"
+msgstr ""
 
 #. module: share
 #: field:share.wizard,message:0
@@ -523,11 +522,9 @@ msgstr "Paylaşım: Hazırlama"
 #: code:addons/share/wizard/share_wizard.py:198
 #, python-format
 msgid ""
-"You must configure your e-mail address in the user preferences before using "
+"You must configure your email address in the user preferences before using "
 "the Share button."
 msgstr ""
-"Share (Paylaş) düğmesi kullanmadan önce, kullanıcı tercihleri ​​e-posta "
-"adresini yapılandırmanız gerekir."
 
 #. module: share
 #: help:share.wizard,access_mode:0
@@ -549,3 +546,25 @@ msgstr "Paylaş..."
 
 #~ msgid "Use this link"
 #~ msgstr "Bu adrese gidin"
+
+#~ msgid ""
+#~ "An optional personal message, to be included in the e-mail notification."
+#~ msgstr "E-posta mesajına eklemek için, kişisel mesaj (opsiyonel)"
+
+#~ msgid ""
+#~ "An e-mail notification with instructions has been sent to the following "
+#~ "people:"
+#~ msgstr ""
+#~ "Talimatları içeren bir e-posta mesajı, aşağıdaki kişilere gönderildi:"
+
+#, python-format
+#~ msgid "No e-mail address configured"
+#~ msgstr "Hiç bir E-posta adresi tanımlanmamış"
+
+#, python-format
+#~ msgid ""
+#~ "You must configure your e-mail address in the user preferences before using "
+#~ "the Share button."
+#~ msgstr ""
+#~ "Share (Paylaş) düğmesi kullanmadan önce, kullanıcı tercihleri ​​e-posta "
+#~ "adresini yapılandırmanız gerekir."
diff --git a/addons/share/i18n/zh_CN.po b/addons/share/i18n/zh_CN.po
index 136584284dd..b292a973205 100644
--- a/addons/share/i18n/zh_CN.po
+++ b/addons/share/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-08 04:40+0000\n"
-"X-Generator: Launchpad (build 15376)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: share
 #: field:share.wizard,embed_option_title:0
@@ -34,7 +34,7 @@ msgstr ""
 
 #. module: share
 #: view:share.wizard:0
-msgid "Share with these People (one e-mail per line)"
+msgid "Share with these People (one email per line)"
 msgstr ""
 
 #. module: share
@@ -355,7 +355,7 @@ msgstr ""
 #. module: share
 #: view:share.wizard:0
 msgid ""
-"An e-mail notification with instructions has been sent to the following "
+"An email notification with instructions has been sent to the following "
 "people:"
 msgstr ""
 
@@ -387,7 +387,7 @@ msgstr ""
 #. module: share
 #: help:share.wizard,message:0
 msgid ""
-"An optional personal message, to be included in the e-mail notification."
+"An optional personal message, to be included in the email notification."
 msgstr ""
 
 #. module: share
@@ -455,7 +455,7 @@ msgstr ""
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:197
 #, python-format
-msgid "No e-mail address configured"
+msgid "No email address configured"
 msgstr ""
 
 #. module: share
@@ -495,7 +495,7 @@ msgstr ""
 #: code:addons/share/wizard/share_wizard.py:198
 #, python-format
 msgid ""
-"You must configure your e-mail address in the user preferences before using "
+"You must configure your email address in the user preferences before using "
 "the Share button."
 msgstr ""
 
diff --git a/addons/share/static/src/css/share.css b/addons/share/static/src/css/share.css
index 2cab9c6d2f2..997c070fe54 100644
--- a/addons/share/static/src/css/share.css
+++ b/addons/share/static/src/css/share.css
@@ -1,7 +1,7 @@
-button.oe-share-mail {
+button.oe_share_mail {
     display: none;
 }
 
-a.oe-share_link, a.oe-share {
+a.oe_share_link, a.oe_share {
     display: none;
 }
diff --git a/addons/share/static/src/js/share.js b/addons/share/static/src/js/share.js
index 3563a4bb859..e88616546a3 100644
--- a/addons/share/static/src/js/share.js
+++ b/addons/share/static/src/js/share.js
@@ -58,7 +58,7 @@ openerp.share = function(session) {
                 self.add_items('other', [{
                     label: 'Share',
                     callback: self.on_sidebar_click_share,
-                    classname: 'oe-share',
+                    classname: 'oe_share',
                 }]);
             });
         },
@@ -72,7 +72,7 @@ openerp.share = function(session) {
         start: function() {
             start_res = this._super.apply(this, arguments);
             if (has_action_id) {
-                this.$element.find('button.oe-share-mail').show();
+                this.$element.find('button.oe_share_mail').show();
             }
             return start_res;
         }
@@ -83,12 +83,12 @@ openerp.share = function(session) {
             var self = this;
             this.check_if_action_is_defined();
             has_share(function() {
-                self.$element.find('a.oe-share_link').click(self.on_click_share_link);
-                self.$element.find('a.oe-share').click(self.on_click_share);
-                self.$element.delegate('button.oe-share-mail', 'click', self.on_click_share_mail);
+                self.$element.find('a.oe_share_link').click(self.on_click_share_link);
+                self.$element.find('a.oe_share').click(self.on_click_share);
+                self.$element.delegate('button.oe_share_mail', 'click', self.on_click_share_mail);
             }, function() {
-                self.$element.find('a.oe-share_link').remove();
-                self.$element.find('a.oe-share').remove();
+                self.$element.find('a.oe_share_link').remove();
+                self.$element.find('a.oe_share').remove();
             });
             return this._super.apply(this, arguments);
         },
@@ -96,8 +96,8 @@ openerp.share = function(session) {
         check_if_action_is_defined: function() {
             if (this.action && this.action.id) {
                 has_action_id = true;
-                this.$element.find('a.oe-share_link').show();
-                this.$element.find('a.oe-share').show();            
+                this.$element.find('a.oe_share_link').show();
+                this.$element.find('a.oe_share').show();
             }
             else {
                 has_action_id = false;
diff --git a/addons/share/static/src/xml/share.xml b/addons/share/static/src/xml/share.xml
index df9cb165c36..e51dc135c0b 100644
--- a/addons/share/static/src/xml/share.xml
+++ b/addons/share/static/src/xml/share.xml
@@ -4,15 +4,15 @@
 <templates id="template" xml:space="preserve">
 
     <t t-extend="ViewManagerAction">
-        <t t-jquery=".oe-shortcut-toggle" t-operation="after">
-            <a class="oe-share_link" href="#share_link" title="Link or embed..."><img t-att-src='_s + "/share/static/src/img/share.png"'/></a>
-            <a class="oe-share" href="#share" title="Share with..."><img t-att-src='_s + "/share/static/src/img/share.png"'/></a>
+        <t t-jquery=".oe_shortcuts_toggle" t-operation="after">
+            <a class="oe_share_link" href="#share_link" title="Link or embed..."><img t-att-src='_s + "/share/static/src/img/share.png"'/></a>
+            <a class="oe_share" href="#share" title="Share with..."><img t-att-src='_s + "/share/static/src/img/share.png"'/></a>
         </t>
     </t>
 
     <t t-extend="RecordThread">
         <t t-jquery="button.oe_mail_button_unfollow" t-operation="after">
-            <button type="button" class="oe-share-mail oe_mail_button_mouseout">Invite</button>
+            <button type="button" class="oe_share_mail oe_mail_button_mouseout">Invite</button>
         </t>
     </t>
 
diff --git a/addons/share/wizard/share_wizard.py b/addons/share/wizard/share_wizard.py
index 336f56a5f97..274570e9169 100644
--- a/addons/share/wizard/share_wizard.py
+++ b/addons/share/wizard/share_wizard.py
@@ -176,7 +176,7 @@ class share_wizard(osv.osv_memory):
                                 help='Main access page for users that are granted shared access'),
         'name': fields.char('Share Title', size=64, required=True, help="Title for the share (displayed to users as menu and shortcut name)"),
         'record_name': fields.char('Record name', size=128, help="Name of the shared record, if sharing a precise record"),
-        'message': fields.text("Personal Message", help="An optional personal message, to be included in the e-mail notification."),
+        'message': fields.text("Personal Message", help="An optional personal message, to be included in the email notification."),
 
         'embed_code': fields.function(_embed_code, type='text'),
         'embed_option_title': fields.boolean("Display title"),
@@ -200,8 +200,8 @@ class share_wizard(osv.osv_memory):
     def go_step_1(self, cr, uid, ids, context=None):
         wizard_data = self.browse(cr,uid,ids,context)[0]
         if wizard_data.user_type == 'emails' and not self.has_email(cr, uid, context=context):
-            raise osv.except_osv(_('No e-mail address configured'),
-                                 _('You must configure your e-mail address in the user preferences before using the Share button.'))
+            raise osv.except_osv(_('No email address configured'),
+                                 _('You must configure your email address in the user preferences before using the Share button.'))
         model, res_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'share', 'action_share_wizard_step1')
         action = self.pool.get(model).read(cr, uid, res_id, context=context)
         action['res_id'] = ids[0]
diff --git a/addons/share/wizard/share_wizard_view.xml b/addons/share/wizard/share_wizard_view.xml
index 246efa01f51..41f356ce583 100644
--- a/addons/share/wizard/share_wizard_view.xml
+++ b/addons/share/wizard/share_wizard_view.xml
@@ -41,10 +41,10 @@
                         <field name="invite" invisible="1"/>
                     </group>    
                     <group>
-                        <group name="emails_group" attrs="{'invisible':['|', ('user_type', '!=', 'emails'), ('invite', '=', True)]}" string="Share with these People (one e-mail per line)">
+                        <group name="emails_group" attrs="{'invisible':['|', ('user_type', '!=', 'emails'), ('invite', '=', True)]}" string="Share with these People (one email per line)">
                             <field colspan="2" nolabel="1" name="new_users" attrs="{'required':[('user_type','=','emails'), ('invite', '!=', True)]}"/>
                         </group>
-                        <group name="email_lines" attrs="{'invisible':[('invite', '!=', True)]}" string="Share with these People (one e-mail per line)">
+                        <group name="email_lines" attrs="{'invisible':[('invite', '!=', True)]}" string="Share with these People (one email per line)">
                             <field name="email_1"/>
                             <field name="email_2"/>
                             <field name="email_3"/>
@@ -72,7 +72,7 @@
                         <field name="access_mode" invisible="1"/>
                     </header>
                     <group attrs="{'invisible':[('user_type','=','embedded')]}">
-                        <separator string="An e-mail notification with instructions has been sent to the following people:"/>
+                        <separator string="An email notification with instructions has been sent to the following people:"/>
                         <field name="result_line_ids" nolabel="1" mode="tree">
                             <tree string="Summary">
                                 <field name="login"/>