diff options
| author | Vijaykumar Baladaniya <vba@tinyerp.com> | 2012-07-09 18:31:13 +0530 |
|---|---|---|
| committer | Vijaykumar Baladaniya <vba@tinyerp.com> | 2012-07-09 18:31:13 +0530 |
| commit | be2e95656aaa113addea2b510fcdcf2f890eaaa4 (patch) | |
| tree | abcb3dd4ef350a1b8ad0eaffdd2b9a1cb91521af /addons/share | |
| parent | b982ea278b33132def3927417b7a854b98b5028a (diff) | |
| parent | 3925f76ce85854e5d4834902a05f57bcfc5ace85 (diff) | |
[MERGE]merged with trunk-survey-layout-tta
bzr revid: vba@tinyerp.com-20120709130113-3lchipgil9oqpglg
Diffstat (limited to 'addons/share')
31 files changed, 510 insertions, 326 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..d9684cbefac 100644 --- a/addons/share/i18n/ja.po +++ b/addons/share/i18n/ja.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" "POT-Creation-Date: 2012-02-08 01:37+0100\n" -"PO-Revision-Date: 2012-06-21 21:29+0000\n" +"PO-Revision-Date: 2012-06-29 23:24+0000\n" "Last-Translator: Akira Hiyama <Unknown>\n" "Language-Team: Japanese <ja@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: 2012-06-22 04:47+0000\n" -"X-Generator: Launchpad (build 15461)\n" +"X-Launchpad-Export-Date: 2012-07-01 04:40+0000\n" +"X-Generator: Launchpad (build 15520)\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 "共有する人々（行毎に１Eメール）" #. 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 "指示に従いEメールの通知は次の人に送信されました：" #. 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 "Eメールの通知似含まれるオプションの個人的なメッセージ" #. module: share #: model:ir.model,name:share.model_res_users @@ -461,7 +461,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 "Eメールアドレスが設定されていません。" #. module: share @@ -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 "共有ボタンを使用する前にユーザ設定であなたのEメールアドレスを設定する必要があります。" #. 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..bf405c272b7 100644 --- a/addons/share/i18n/nl.po +++ b/addons/share/i18n/nl.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" "POT-Creation-Date: 2012-02-08 01:37+0100\n" -"PO-Revision-Date: 2012-05-10 18:23+0000\n" -"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n" +"PO-Revision-Date: 2012-06-28 12:52+0000\n" +"Last-Translator: Erwin <Unknown>\n" "Language-Team: Dutch <nl@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: 2012-05-11 05:10+0000\n" -"X-Generator: Launchpad (build 15225)\n" +"X-Launchpad-Export-Date: 2012-06-29 04:38+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 "deel deze met mensen (een e-mail per regel)" #. 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 "Geen e-mail adres ingesteld" #. 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..dbbb8bea943 100644 --- a/addons/share/static/src/css/share.css +++ b/addons/share/static/src/css/share.css @@ -1,7 +1,4 @@ -button.oe-share-mail { - display: none; -} - -a.oe-share_link, a.oe-share { +/* Added invite button, hidden by default */ +button.oe_share_invite { display: none; } diff --git a/addons/share/static/src/js/share.js b/addons/share/static/src/js/share.js index 3563a4bb859..33aa3d1aab9 100644 --- a/addons/share/static/src/js/share.js +++ b/addons/share/static/src/js/share.js @@ -50,29 +50,46 @@ openerp.share = function(session) { session.connection.share_flag.done(yes).fail(no); } + /* Extend the Sidebar to add Share and Embed links in the 'More' menu */ session.web.Sidebar = session.web.Sidebar.extend({ - add_default_sections: function() { - this._super(); + + start: function() { var self = this; + this._super(this); has_share(function() { - self.add_items('other', [{ - label: 'Share', - callback: self.on_sidebar_click_share, - classname: 'oe-share', - }]); + self.add_items('other', [ + { label: 'Share', + callback: self.on_click_share, + classname: 'oe_share' }, + { label: 'Embed', + callback: self.on_click_share_link, + classname: 'oe_share' }, + ]); }); }, - on_sidebar_click_share: function(item) { + + on_click_share: function(item) { + var view = this.getParent() + launch_wizard(this, view, 'emails', false); + }, + + on_click_share_link: function(item) { var view = this.getParent() - launch_wizard(this, view); + launch_wizard(this, view, 'embedded', false); }, }); + /** + * Extends mail (Chatter widget) + * - show the 'invite' button' only we came on the form view through + * an action. We do this because 'invite' is based on the share + * mechanism, and it tries to share an action. + */ session.mail.RecordThread.include( { 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_invite').show(); } return start_res; } @@ -83,12 +100,7 @@ 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); - }, function() { - self.$element.find('a.oe-share_link').remove(); - self.$element.find('a.oe-share').remove(); + self.$element.delegate('button.oe_share_invite', 'click', self.on_click_share_invite); }); return this._super.apply(this, arguments); }, @@ -96,23 +108,13 @@ 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(); } else { has_action_id = false; } }, - - on_click_share_link: function(e) { - e.preventDefault(); - launch_wizard(this, this.views[this.active_view].controller, 'embedded', false); - }, - on_click_share: function(e) { - e.preventDefault(); - launch_wizard(this, this.views[this.active_view].controller, 'emails', false); - }, - on_click_share_mail: function(e) { + + on_click_share_invite: function(e) { e.preventDefault(); launch_wizard(this, this.views[this.active_view].controller, 'emails', true); }, diff --git a/addons/share/static/src/xml/share.xml b/addons/share/static/src/xml/share.xml index df9cb165c36..1d9bc987afc 100644 --- a/addons/share/static/src/xml/share.xml +++ b/addons/share/static/src/xml/share.xml @@ -3,18 +3,11 @@ --> <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> - - <t t-extend="RecordThread"> + <!-- Extends Chatter widget in form view to add the invite button --> + <t t-extend="mail.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_invite">Invite</button> </t> </t> - </templates> diff --git a/addons/share/wizard/share_wizard.py b/addons/share/wizard/share_wizard.py index 07004f333a8..41871480f45 100644 --- a/addons/share/wizard/share_wizard.py +++ b/addons/share/wizard/share_wizard.py @@ -32,6 +32,7 @@ from osv import expression from tools.translate import _ from tools.safe_eval import safe_eval import openerp +_logger = logging.getLogger(__name__) FULL_ACCESS = ('perm_read', 'perm_write', 'perm_create', 'perm_unlink') READ_WRITE_ACCESS = ('perm_read', 'perm_write') @@ -47,8 +48,7 @@ RANDOM_PASS_CHARACTERS = 'aaaabcdeeeefghjkmnpqrstuvwxyzAAAABCDEEEEFGHJKLMNPQRSTU def generate_random_pass(): return ''.join(random.sample(RANDOM_PASS_CHARACTERS,10)) -class share_wizard(osv.osv_memory): - _logger = logging.getLogger('share.wizard') +class share_wizard(osv.TransientModel): _name = 'share.wizard' _description = 'Share Wizard' @@ -176,10 +176,11 @@ 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."), - - 'embed_code': fields.function(_embed_code, type='text'), - 'embed_option_title': fields.boolean("Display title"), + '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', string='Code', + help="Embed this code in your documents to provide a link to the "\ + "shared document."), + 'embed_option_title': fields.boolean('Display title'), 'embed_option_search': fields.boolean('Display search view'), 'embed_url': fields.function(_embed_url, string='Share URL', type='char', size=512, readonly=True), } @@ -200,8 +201,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] @@ -335,7 +336,7 @@ class share_wizard(osv.osv_memory): except Exception: # Note: must catch all exceptions, as UnquoteEvalContext may cause many # different exceptions, as it shadows builtins. - self._logger.debug("Failed to cleanup action context as it does not parse server-side", exc_info=True) + _logger.debug("Failed to cleanup action context as it does not parse server-side", exc_info=True) result = context_str return result @@ -496,8 +497,8 @@ class share_wizard(osv.osv_memory): [x.id for x in current_user.groups_id], target_model_ids, context=context) group_access_map = self._get_access_map_for_groups_and_models(cr, uid, [group_id], target_model_ids, context=context) - self._logger.debug("Current user access matrix: %r", current_user_access_map) - self._logger.debug("New group current access matrix: %r", group_access_map) + _logger.debug("Current user access matrix: %r", current_user_access_map) + _logger.debug("New group current access matrix: %r", group_access_map) # Create required rights if allowed by current user rights and not # already granted @@ -520,7 +521,7 @@ class share_wizard(osv.osv_memory): need_creation = True if need_creation: model_access_obj.create(cr, UID_ROOT, values) - self._logger.debug("Creating access right for model %s with values: %r", model.model, values) + _logger.debug("Creating access right for model %s with values: %r", model.model, values) def _link_or_copy_current_user_rules(self, cr, current_user, group_id, fields_relations, context=None): rule_obj = self.pool.get('ir.rule') @@ -542,13 +543,13 @@ class share_wizard(osv.osv_memory): 'groups': [(6,0,[group_id])], 'domain_force': rule.domain, # evaluated version! }) - self._logger.debug("Copying rule %s (%s) on model %s with domain: %s", rule.name, rule.id, model.model, rule.domain_force) + _logger.debug("Copying rule %s (%s) on model %s with domain: %s", rule.name, rule.id, model.model, rule.domain_force) else: # otherwise we can simply link the rule to keep it dynamic rule_obj.write(cr, 1, [rule.id], { 'groups': [(4,group_id)] }) - self._logger.debug("Linking rule %s (%s) on model %s with domain: %s", rule.name, rule.id, model.model, rule.domain_force) + _logger.debug("Linking rule %s (%s) on model %s with domain: %s", rule.name, rule.id, model.model, rule.domain_force) def _check_personal_rule_or_duplicate(self, cr, group_id, rule, context=None): """Verifies that the given rule only belongs to the given group_id, otherwise @@ -567,7 +568,7 @@ class share_wizard(osv.osv_memory): 'groups': [(6,0,[group_id])], 'domain_force': rule.domain_force, # non evaluated! }) - self._logger.debug("Duplicating rule %s (%s) (domain: %s) for modified access ", rule.name, rule.id, rule.domain_force) + _logger.debug("Duplicating rule %s (%s) (domain: %s) for modified access ", rule.name, rule.id, rule.domain_force) # then disconnect from group_id: rule.write({'groups':[(3,group_id)]}) # disconnects, does not delete! return rule_obj.browse(cr, UID_ROOT, new_id, context=context) @@ -602,7 +603,7 @@ class share_wizard(osv.osv_memory): if restrict: continue else: - self._logger.debug("Ignoring sharing rule on model %s with domain: %s the same rule exists already", model_id, domain) + _logger.debug("Ignoring sharing rule on model %s with domain: %s the same rule exists already", model_id, domain) return if restrict: # restricting existing rules is done by adding the clause @@ -614,7 +615,7 @@ class share_wizard(osv.osv_memory): new_clause = expression.normalize(eval(domain, eval_ctx)) combined_domain = expression.AND([new_clause, org_domain]) rule.write({'domain_force': combined_domain, 'name': rule.name + _('(Modified)')}) - self._logger.debug("Combining sharing rule %s on model %s with domain: %s", rule.id, model_id, domain) + _logger.debug("Combining sharing rule %s on model %s with domain: %s", rule.id, model_id, domain) if not rule_ids or not restrict: # Adding the new rule in the group is ok for normal cases, because rules # in the same group and for the same model will be combined with OR @@ -625,7 +626,7 @@ class share_wizard(osv.osv_memory): 'domain_force': domain, 'groups': [(4,group_id)] }) - self._logger.debug("Created sharing rule on model %s with domain: %s", model_id, domain) + _logger.debug("Created sharing rule on model %s with domain: %s", model_id, domain) def _create_indirect_sharing_rules(self, cr, current_user, wizard_data, group_id, fields_relations, context=None): rule_name = _('Indirect sharing filter created by user %s (%s) for group %s') % \ @@ -648,7 +649,7 @@ class share_wizard(osv.osv_memory): group_id, model_id=model.id, domain=str(related_domain), rule_name=rule_name, restrict=True, context=context) except Exception: - self._logger.exception('Failed to create share access') + _logger.exception('Failed to create share access') raise osv.except_osv(_('Sharing access could not be created'), _('Sorry, the current screen and filter you are trying to share are not supported at the moment.\nYou may want to try a simpler filter.')) @@ -668,7 +669,8 @@ class share_wizard(osv.osv_memory): """Creates the appropriate share group and share users, and populates result_line_ids of wizard_data with one line for each user. - :return: the new group id (to which the shared access should be granted) + :return: a tuple composed of the new group id (to which the shared access should be granted), + the ids of the new share users that have been created and the ids of the existing share users """ group_id = self._create_share_group(cr, uid, wizard_data, context=context) # First create any missing user, based on the email addresses provided @@ -739,7 +741,7 @@ class share_wizard(osv.osv_memory): all_relations = obj0 + obj1 + obj2 self._link_or_copy_current_user_rules(cr, current_user, group_id, all_relations, context=context) # B. - main_domain = wizard_data.domain if wizard_data.domain != '[]' else DOMAIN_ALL + main_domain = wizard_data.domain if wizard_data.domain != '[]' else str(DOMAIN_ALL) self._create_or_combine_sharing_rule(cr, current_user, wizard_data, group_id, model_id=model.id, domain=main_domain, restrict=True, context=context) @@ -852,7 +854,7 @@ class share_wizard(osv.osv_memory): notification_obj.create(cr, uid, {'user_id': result_line.user_id.id, 'message_id': msg_id}, context=context) def send_emails(self, cr, uid, wizard_data, context=None): - self._logger.info('Sending share notifications by email...') + _logger.info('Sending share notifications by email...') mail_message = self.pool.get('mail.message') user = self.pool.get('res.users').browse(cr, UID_ROOT, uid) if not user.user_email: @@ -885,7 +887,7 @@ class share_wizard(osv.osv_memory): msg_ids.append(mail_message.schedule_with_attach(cr, uid, user.user_email, [email_to], subject, body, model='share.wizard', context=context)) # force direct delivery, as users expect instant notification mail_message.send(cr, uid, msg_ids, context=context) - self._logger.info('%d share notification(s) sent.', len(msg_ids)) + _logger.info('%d share notification(s) sent.', len(msg_ids)) def onchange_embed_options(self, cr, uid, ids, opt_title, opt_search, context=None): wizard = self.browse(cr, uid, ids[0], context) @@ -902,8 +904,11 @@ class share_result_line(osv.osv_memory): def _share_url(self, cr, uid, ids, _fieldname, _args, context=None): result = dict.fromkeys(ids, '') for this in self.browse(cr, uid, ids, context=context): - data = dict(dbname=cr.dbname, login=this.login, password='') - result[this.id] = this.share_wizard_id.share_url_template() % data + data = dict(dbname=cr.dbname, login=this.login, password=this.password) + if this.share_wizard_id and this.share_wizard_id.action_id: + data['action_id'] = this.share_wizard_id.action_id.id + ctx = dict(context, share_url_template_hash_arguments=['action_id']) + result[this.id] = this.share_wizard_id.share_url_template(context=ctx) % data return result _columns = { diff --git a/addons/share/wizard/share_wizard_view.xml b/addons/share/wizard/share_wizard_view.xml index 1c9bb011432..58734caa25b 100644 --- a/addons/share/wizard/share_wizard_view.xml +++ b/addons/share/wizard/share_wizard_view.xml @@ -9,8 +9,9 @@ <field name="arch" type="xml"> <form string="Sharing: preparation" version="7.0"> <header> - <button name="go_step_1" string="Next" type="object" icon="gtk-go-forward"/> - <button special="cancel" string="Cancel" icon='gtk-cancel'/> + <button name="go_step_1" string="Next" type="object" class="oe_highlight"/> + or + <button string="Cancel" class="oe_link" special="cancel" /> </header> <separator string="Please select the action that opens the screen containing the data you want to share."/> @@ -31,21 +32,27 @@ <field name="arch" type="xml"> <form version="7.0"> <header> - <button name="go_step_2" string="Share" type="object" icon="gtk-go-forward"/> - <button special="cancel" string="Cancel" icon='gtk-cancel'/> + <button name="go_step_2" string="Share" type="object" class="oe_highlight"/> + or + <button string="Cancel" class="oe_link" special="cancel" /> </header> - <field name="user_type" invisible="1"/> - <field name="invite" invisible="1"/> <group> - <group name="emails_group" attrs="{'invisible':['|', ('user_type', '!=', 'emails'), ('invite', '=', True)]}" string="Share with these People (one e-mail per line)"> - <field colspan="2" nolabel="1" name="new_users" attrs="{'required':[('user_type','=','emails'), ('invite', '!=', True)]}"/> + <field name="user_type" invisible="1"/> + <field name="invite" invisible="1"/> + </group> + <group> + <group colspan="4" name="emails_group" attrs="{'invisible':['|', ('user_type', '!=', 'emails'), ('invite', '=', True)]}" + string="Share with these People (one email per line)"> + <field 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 colspan="4" name="email_lines" attrs="{'invisible':['|', ('invite', '!=', True), ('user_type', '!=', 'emails')]}" + string="Share with these People (one email per line)"> <field name="email_1"/> <field name="email_2"/> <field name="email_3"/> </group> - <group attrs="{'invisible':[('user_type', '=', 'embedded')]}" string="Include an Optional Personal Message"> + <group colspan="4" attrs="{'invisible':[('user_type', '=', 'embedded')]}" + string="Include an Optional Personal Message"> <field name="message" colspan="2" nolabel="1"/> </group> <group attrs="{'invisible':[('invite', '=', True)]}" string="Sharing Options"> @@ -64,12 +71,11 @@ <field name="arch" type="xml"> <form string="Access granted!" version="7.0"> <header> - <button special="cancel" string="Close" icon='gtk-ok'/> <field name="user_type" invisible="1"/> <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:"/> + <group attrs="{'invisible':[('user_type','=','embedded')]}" + 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"/> @@ -82,14 +88,17 @@ </field> </group> <group colspan="4" col="1" attrs="{'invisible':[('user_type','!=','embedded')]}"> - <separator string="Use this Link"/> - <field name="embed_url"/> - <separator string="Or insert the following code where you want to embed your documents"/> - <group string="Options"> - <field name="embed_option_title" on_change="onchange_embed_options(embed_option_title, embed_option_search)"/> - <field name="embed_option_search" on_change="onchange_embed_options(embed_option_title, embed_option_search)" attrs="{'invisible':[('access_mode','=','readonly')]}"/> + <group string="Use this link"> + <field name="embed_url"/> + </group> + <group string="Or insert the following code where you want to embed your documents"> <field name="embed_code"/> </group> + <group string="Embedded code options"> + <field name="embed_option_title" on_change="onchange_embed_options(embed_option_title, embed_option_search)"/> + <field name="embed_option_search" on_change="onchange_embed_options(embed_option_title, embed_option_search)" + attrs="{'invisible':[('access_mode','=','readonly')]}"/> + </group> </group> </form> |