From c7d281d8462eaaa5c1074f35ea85bc9202ed6ba7 Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Wed, 6 Jan 2016 08:16:23 +0100 Subject: [PATCH] [FIX] auth_signup,mass_mailing: export added terms Forward port added a few terms, reexporting, removing bad ones --- addons/auth_signup/i18n/auth_signup.pot | 76 ++++++----------------- addons/mass_mailing/i18n/mass_mailing.pot | 40 +++++------- 2 files changed, 33 insertions(+), 83 deletions(-) diff --git a/addons/auth_signup/i18n/auth_signup.pot b/addons/auth_signup/i18n/auth_signup.pot index b229e9027d8..f31ec11d68b 100644 --- a/addons/auth_signup/i18n/auth_signup.pot +++ b/addons/auth_signup/i18n/auth_signup.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 9.0\n" +"Project-Id-Version: Odoo Server 9.0c\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-09-14 10:27+0000\n" -"PO-Revision-Date: 2015-09-14 10:27+0000\n" +"POT-Creation-Date: 2016-01-06 07:13+0000\n" +"PO-Revision-Date: 2016-01-06 07:13+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -75,13 +75,19 @@ msgid "Allow external users to sign up" msgstr "" #. module: auth_signup -#: code:addons/auth_signup/controllers/main.py:60 +#: code:addons/auth_signup/controllers/main.py:64 #, python-format msgid "An email has been sent with credentials to reset your password" msgstr "" #. module: auth_signup -#: code:addons/auth_signup/controllers/main.py:108 +#: code:addons/auth_signup/controllers/main.py:40 +#, python-format +msgid "Another user is already registered using this email address." +msgstr "" + +#. module: auth_signup +#: code:addons/auth_signup/controllers/main.py:115 #, python-format msgid "Authentication Failed." msgstr "" @@ -114,7 +120,13 @@ msgid "Connected" msgstr "" #. module: auth_signup -#: code:addons/auth_signup/controllers/main.py:62 +#: code:addons/auth_signup/controllers/main.py:43 +#, python-format +msgid "Could not create a new account." +msgstr "" + +#. module: auth_signup +#: code:addons/auth_signup/controllers/main.py:66 #, python-format msgid "Could not reset your password" msgstr "" @@ -155,18 +167,13 @@ msgstr "" msgid "Password reset" msgstr "" -#. module: auth_signup -#: model:ir.model.fields,field_description:auth_signup.field_res_users_website_private -msgid "Private Profile" -msgstr "" - #. module: auth_signup #: model:ir.ui.view,arch_db:auth_signup.login msgid "Reset Password" msgstr "" #. module: auth_signup -#: code:addons/auth_signup/res_users.py:250 +#: code:addons/auth_signup/res_users.py:253 #, python-format msgid "Reset password: invalid username or email" msgstr "" @@ -227,11 +234,6 @@ msgstr "" msgid "Template user for new users created through signup" msgstr "" -#. module: auth_signup -#: model:ir.model.fields,help:auth_signup.field_res_users_website_url -msgid "The full URL to access the document through the website." -msgstr "" - #. module: auth_signup #: model:ir.model.fields,help:auth_signup.field_base_config_settings_auth_signup_reset_password msgid "This allows users to trigger a password reset from the Login page." @@ -242,41 +244,6 @@ msgstr "" msgid "Users" msgstr "" -#. module: auth_signup -#: model:ir.model.fields,field_description:auth_signup.field_res_users_website_published -msgid "Visible in Website" -msgstr "" - -#. module: auth_signup -#: model:ir.model.fields,field_description:auth_signup.field_res_users_website_description -msgid "Website Partner Full Description" -msgstr "" - -#. module: auth_signup -#: model:ir.model.fields,field_description:auth_signup.field_res_users_website_short_description -msgid "Website Partner Short Description" -msgstr "" - -#. module: auth_signup -#: model:ir.model.fields,field_description:auth_signup.field_res_users_website_url -msgid "Website URL" -msgstr "" - -#. module: auth_signup -#: model:ir.model.fields,field_description:auth_signup.field_res_users_website_meta_description -msgid "Website meta description" -msgstr "" - -#. module: auth_signup -#: model:ir.model.fields,field_description:auth_signup.field_res_users_website_meta_keywords -msgid "Website meta keywords" -msgstr "" - -#. module: auth_signup -#: model:ir.model.fields,field_description:auth_signup.field_res_users_website_meta_title -msgid "Website meta title" -msgstr "" - #. module: auth_signup #: model:ir.ui.view,arch_db:auth_signup.fields #: model:ir.ui.view,arch_db:auth_signup.reset_password @@ -298,8 +265,3 @@ msgstr "" msgid "e.g. John Doe" msgstr "" -#. module: auth_signup -#: model:ir.model.fields,field_description:auth_signup.field_res_users_self -msgid "unknown" -msgstr "" - diff --git a/addons/mass_mailing/i18n/mass_mailing.pot b/addons/mass_mailing/i18n/mass_mailing.pot index 08c325ce36e..40e25c0bfa8 100644 --- a/addons/mass_mailing/i18n/mass_mailing.pot +++ b/addons/mass_mailing/i18n/mass_mailing.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 9.0\n" +"Project-Id-Version: Odoo Server 9.0c\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-10-09 09:20+0000\n" -"PO-Revision-Date: 2015-10-09 09:20+0000\n" +"POT-Creation-Date: 2016-01-06 07:17+0000\n" +"PO-Revision-Date: 2016-01-06 07:17+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -640,10 +640,14 @@ msgstr "" #. module: mass_mailing #: model:ir.ui.view,arch_db:mass_mailing.email_designer_snippets -#: model:mail.mass_mailing,body_html:mass_mailing.mass_mail_1 msgid "Great stories have personality. Consider telling a great story that provides personality. Writing a story with personality for potential clients will assist with making a relationship connection. This shows up in small quirks like word choices or phrases. Write from your point of view, not from someone else's experience.
" msgstr "" +#. module: mass_mailing +#: model:mail.mass_mailing,body_html:mass_mailing.mass_mail_1 +msgid "Great stories have personality. Consider telling a great story that provides personality. Writing a story with personality for potential clients will assist with making a relationship connection. This shows up in small quirks like word choices or phrases. Write from your point of view, not from someone else's experience.
" +msgstr "" + #. module: mass_mailing #: model:ir.ui.view,arch_db:mass_mailing.view_mail_mail_statistics_search #: model:ir.ui.view,arch_db:mass_mailing.view_mail_mass_mailing_campaign_search @@ -660,7 +664,7 @@ msgstr "" #. module: mass_mailing #: model:ir.ui.view,arch_db:mass_mailing.FieldTextHtmlInline -msgid "Help" +msgid "Here you can design your own template from scratch by selecting your favorite theme." msgstr "" #. module: mass_mailing @@ -1023,11 +1027,6 @@ msgstr "" msgid "Messages" msgstr "" -#. module: mass_mailing -#: model:ir.model.fields,help:mass_mailing.field_mail_mass_mailing_contact_message_ids -msgid "Messages and communication history" -msgstr "" - #. module: mass_mailing #: model:ir.ui.view,arch_db:mass_mailing.email_designer_snippets #: model:mail.mass_mailing,body_html:mass_mailing.mass_mail_1 @@ -1551,6 +1550,11 @@ msgstr "" msgid "This mass mailing is scheduled to" msgstr "" +#. module: mass_mailing +#: model:ir.ui.view,arch_db:mass_mailing.view_mail_mass_mailing_form +msgid "This will send the email to all recipients. Do you still want to proceed ?" +msgstr "" + #. module: mass_mailing #: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_campaign_total #: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_total @@ -1614,11 +1618,6 @@ msgstr "" msgid "We would like you to know that your order has shipped! To track your order or make any changes please click the \"my order\" button below." msgstr "" -#. module: mass_mailing -#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_contact_website_message_ids -msgid "Website Messages" -msgstr "" - #. module: mass_mailing #: model:ir.model.fields,field_description:mass_mailing.field_mass_mailing_config_settings_group_website_popup_on_exit msgid "Website Pop-up" @@ -1634,11 +1633,6 @@ msgstr "" msgid "Website Popup Redirect URL" msgstr "" -#. module: mass_mailing -#: model:ir.model.fields,help:mass_mailing.field_mail_mass_mailing_contact_website_message_ids -msgid "Website communication history" -msgstr "" - #. module: mass_mailing #: model:mail.mass_mailing,body_html:mass_mailing.mass_mail_1 msgid "You get a 20% discount for signing up!" @@ -1714,9 +1708,3 @@ msgstr "" msgid "© 2014 All Rights Reserved" msgstr "" -#. module: mass_mailing -#: code:addons/mass_mailing/models/mail_mail.py:72 -#, python-format -msgid "Click to unsubscribe" -msgstr "" -