summaryrefslogtreecommitdiff
path: root/addons/website_mail_channel
diff options
context:
space:
mode:
authorOdoo Translation Bot <c3p@odoo.com>2018-08-24 15:22:47 +0200
committerOdoo Translation Bot <c3p@odoo.com>2018-08-24 15:22:47 +0200
commit10c9f07286d497f2a8c0602a90d00a18ce110179 (patch)
treededefe5ac9ad83e539111eb28b67925b671996ca /addons/website_mail_channel
parenta183a5125a33d5672a53bacc7fb435abff50751a (diff)
[I18N] Update translation terms from Transifex
Diffstat (limited to 'addons/website_mail_channel')
-rw-r--r--addons/website_mail_channel/i18n/de.po302
-rw-r--r--addons/website_mail_channel/i18n/es.po307
-rw-r--r--addons/website_mail_channel/i18n/fr.po309
-rw-r--r--addons/website_mail_channel/i18n/mn.po282
-rw-r--r--addons/website_mail_channel/i18n/nb.po281
-rw-r--r--addons/website_mail_channel/i18n/nl.po291
-rw-r--r--addons/website_mail_channel/i18n/ro.po261
-rw-r--r--addons/website_mail_channel/i18n/ru.po292
-rw-r--r--addons/website_mail_channel/i18n/uk.po286
-rw-r--r--addons/website_mail_channel/i18n/zh_CN.po307
-rw-r--r--addons/website_mail_channel/i18n/zh_TW.po280
11 files changed, 2326 insertions, 872 deletions
diff --git a/addons/website_mail_channel/i18n/de.po b/addons/website_mail_channel/i18n/de.po
index 67b87793218..84b213b2696 100644
--- a/addons/website_mail_channel/i18n/de.po
+++ b/addons/website_mail_channel/i18n/de.po
@@ -3,20 +3,19 @@
# * website_mail_channel
#
# Translators:
-# Martin Trigaux, 2017
-# Ermin Trevisan <trevi@twanda.com>, 2017
-# Ralf Hilgenstock <rh@dialoge.info>, 2017
-# Wolfgang Taferner, 2017
-# Niki Waibel, 2017
-# DE T2 <e2f48d4s5vd1s2@outlook.com>, 2017
-# DE R1 <e2fes1@hotmail.com>, 2017
+# DE R1 <e2fes1@hotmail.com>, 2018
+# DE T2 <e2f48d4s5vd1s2@outlook.com>, 2018
+# Ralf Hilgenstock <rh@dialoge.info>, 2018
+# Martin Trigaux, 2018
+# Wolfgang Taferner, 2018
+# Ermin Trevisan <trevi@twanda.com>, 2018
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.2\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-03-22 14:11+0000\n"
-"PO-Revision-Date: 2018-03-22 14:11+0000\n"
-"Last-Translator: DE R1 <e2fes1@hotmail.com>, 2017\n"
+"POT-Creation-Date: 2018-08-24 09:05+0000\n"
+"PO-Revision-Date: 2018-08-24 09:05+0000\n"
+"Last-Translator: Ermin Trevisan <trevi@twanda.com>, 2018\n"
"Language-Team: German (https://www.transifex.com/odoo/teams/41243/de/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -25,42 +24,22 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. module: website_mail_channel
-#: model:mail.template,body_html:website_mail_channel.mail_template_list_subscribe
-msgid ""
-"<?xml version=\"1.0\"?>\n"
-"<data><p>Hello,</p>\n"
-"<p>You have requested to be subscribed to the mailing list <strong>${object.name}</strong></p>\n"
-"<p>To confirm, please visit the following link:</p>\n"
-"<p><strong><a href=\"${ctx['token_url']}\">${ctx['token_url']}</a></strong></p>\n"
-"<p>If this was a mistake or you did not requested this action, please ignore this message.</p>\n"
-"</data>"
+#: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
+#: model:ir.ui.view,arch_db:website_mail_channel.subscribe
+msgid "<i class=\"fa fa-envelope-o\"/> send mail"
msgstr ""
-"<?xml version=\"1.0\"?>\n"
-"<data><p>Hallo,</p>\n"
-"<p>Sie haben ein Abonnement der Mailingliste <strong>${object.name}</strong> angefragt.</p>\n"
-"<p>To confirm, please visit the following link:</p>\n"
-"<p><strong><a href=\"${ctx['token_url']}\">${ctx['token_url']}</a></strong></p>\n"
-"<p>If this was a mistake or you did not requested this action, please ignore this message.</p>\n"
-"</data>"
#. module: website_mail_channel
-#: model:mail.template,body_html:website_mail_channel.mail_template_list_unsubscribe
-msgid ""
-"<?xml version=\"1.0\"?>\n"
-"<data><p>Hello,</p>\n"
-"<p>You have requested to be unsubscribed to the mailing list <strong>${object.name}</strong></p>\n"
-"<p>To confirm, please visit the following link:</p>\n"
-"<p><strong><a href=\"${ctx['token_url']}\">${ctx['token_url']}</a></strong></p>\n"
-"<p>If this was a mistake or you did not requested this action, please ignore this message.</p>\n"
-"</data>"
+#: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
+#: model:ir.ui.view,arch_db:website_mail_channel.subscribe
+msgid "<i class=\"fa fa-file-o\"/> archives"
+msgstr ""
+
+#. module: website_mail_channel
+#: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
+#: model:ir.ui.view,arch_db:website_mail_channel.subscribe
+msgid "<i class=\"fa fa-times\"/> unsubscribe"
msgstr ""
-"<?xml version=\"1.0\"?>\n"
-"<data><p>Hallo,</p>\n"
-"<p>Sie haben die Abmeldung bei der E-Mailversandliste <strong>${object.name}</strong> beantragt.</p>\n"
-"<p>To confirm, please visit the following link:</p>\n"
-"<p><strong><a href=\"${ctx['token_url']}\">${ctx['token_url']}</a></strong></p>\n"
-"<p>If this was a mistake or you did not requested this action, please ignore this message.</p>\n"
-"</data>"
#. module: website_mail_channel
#: model:ir.ui.view,arch_db:website_mail_channel.subscribe
@@ -68,6 +47,172 @@ msgid "<span class=\"oe_snippet_thumbnail_title\">Discussion Group</span>"
msgstr "<span class=\"oe_snippet_thumbnail_title\">Diskussionsgruppe</span>"
#. module: website_mail_channel
+#: model:mail.template,body_html:website_mail_channel.mail_template_list_subscribe
+msgid ""
+"<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" style=\"padding-top: 16px; background-color: #F1F1F1; font-family:Verdana, Arial,sans-serif; color: #454748; width: 100%; border-collapse:separate;\"><tr><td align=\"center\">\n"
+"<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"padding: 16px; background-color: white; color: #454748; border-collapse:separate;\">\n"
+"<tbody>\n"
+" <!-- HEADER -->\n"
+" <tr>\n"
+" <td align=\"center\" style=\"min-width: 590px;\">\n"
+" <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: white; padding: 0px 8px 0px 8px; border-collapse:separate;\">\n"
+" <tr><td valign=\"middle\">\n"
+" <span style=\"font-size: 10px;\">Your Channel</span><br/>\n"
+" <span style=\"font-size: 20px; font-weight: bold;\">${object.name}</span>\n"
+" </td><td valign=\"middle\" align=\"right\">\n"
+" <img src=\"/logo.png?company=${user.company_id.id}\" style=\"padding: 0px; margin: 0px; height: auto; width: 80px;\" alt=\"${user.company_id.name}\"/>\n"
+" </td></tr>\n"
+" <tr><td colspan=\"2\" style=\"text-align:center;\">\n"
+" <hr width=\"100%\" style=\"background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0; margin:16px 0px 16px 0px;\"/>\n"
+" </td></tr>\n"
+" </table>\n"
+" </td>\n"
+" </tr>\n"
+" <!-- CONTENT -->\n"
+" <tr>\n"
+" <td align=\"center\" style=\"min-width: 590px;\">\n"
+" <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: white; padding: 0px 8px 0px 8px; border-collapse:separate;\">\n"
+" <tr><td valign=\"top\" style=\"font-size: 13px;\">\n"
+" <div style=\"margin: 0px; padding: 0px;\">\n"
+" Hello,<br/><br/>\n"
+" You have requested to be subscribed to the mailing list <strong>${object.name}</strong>.\n"
+" <br/><br/>\n"
+" To confirm, please visit the following link: <strong><a href=\"${ctx['token_url']}\">${ctx['token_url']}</a></strong>\n"
+" <br/><br/>\n"
+" If this was a mistake or you did not requested this action, please ignore this message.\n"
+" % if user.signature\n"
+" <br/>\n"
+" ${user.signature | safe}\n"
+" % endif\n"
+" </div>\n"
+" </td></tr>\n"
+" <tr><td style=\"text-align:center;\">\n"
+" <hr width=\"100%\" style=\"background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0; margin: 16px 0px 16px 0px;\"/>\n"
+" </td></tr>\n"
+" </table>\n"
+" </td>\n"
+" </tr>\n"
+" <!-- FOOTER -->\n"
+" <tr>\n"
+" <td align=\"center\" style=\"min-width: 590px;\">\n"
+" <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: white; font-size: 11px; padding: 0px 8px 0px 8px; border-collapse:separate;\">\n"
+" <tr><td valign=\"middle\" align=\"left\">\n"
+" ${user.company_id.name}\n"
+" </td></tr>\n"
+" <tr><td valign=\"middle\" align=\"left\" style=\"opacity: 0.7;\">\n"
+" % if user.company_id.phone\n"
+" ${user.company_id.phone} |\n"
+" %endif\n"
+" % if user.company_id.email\n"
+" <a href=\"'mailto:%s' % ${user.company_id.email}\" style=\"text-decoration:none; color: #454748;\">${user.company_id.email}</a> |\n"
+" % endif\n"
+" % if user.company_id.website\n"
+" <a href=\"'%s' % ${user.company_id.website}\" style=\"text-decoration:none; color: #454748;\">${user.company_id.website}\n"
+" </a>\n"
+" % endif\n"
+" </td></tr>\n"
+" </table>\n"
+" </td>\n"
+" </tr>\n"
+"</tbody>\n"
+"</table>\n"
+"</td></tr>\n"
+"<!-- POWERED BY -->\n"
+"<tr><td align=\"center\" style=\"min-width: 590px;\">\n"
+" <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: #F1F1F1; color: #454748; padding: 8px; border-collapse:separate;\">\n"
+" <tr><td style=\"text-align: center; font-size: 13px;\">\n"
+" Powered by <a target=\"_blank\" href=\"https://www.odoo.com?utm_source=db&amp;utm_medium=mail\" style=\"color: #875A7B;\">Odoo</a>\n"
+" </td></tr>\n"
+" </table>\n"
+"</td></tr>\n"
+"</table>\n"
+" "
+msgstr ""
+
+#. module: website_mail_channel
+#: model:mail.template,body_html:website_mail_channel.mail_template_list_unsubscribe
+msgid ""
+"<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" style=\"padding-top: 16px; background-color: #F1F1F1; font-family:Verdana, Arial,sans-serif; color: #454748; width: 100%; border-collapse:separate;\"><tr><td align=\"center\">\n"
+"<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"padding: 16px; background-color: white; color: #454748; border-collapse:separate;\">\n"
+"<tbody>\n"
+" <!-- HEADER -->\n"
+" <tr>\n"
+" <td align=\"center\" style=\"min-width: 590px;\">\n"
+" <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: white; padding: 0px 8px 0px 8px; border-collapse:separate;\">\n"
+" <tr><td valign=\"middle\">\n"
+" <span style=\"font-size: 10px;\">Your Channel</span><br/>\n"
+" <span style=\"font-size: 20px; font-weight: bold;\">${object.name}</span>\n"
+" </td><td valign=\"middle\" align=\"right\">\n"
+" <img src=\"/logo.png?company=${user.company_id.id}\" style=\"padding: 0px; margin: 0px; height: auto; width: 80px;\" alt=\"${user.company_id.name}\"/>\n"
+" </td></tr>\n"
+" <tr><td colspan=\"2\" style=\"text-align:center;\">\n"
+" <hr width=\"100%\" style=\"background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0; margin:16px 0px 16px 0px;\"/>\n"
+" </td></tr>\n"
+" </table>\n"
+" </td>\n"
+" </tr>\n"
+" <!-- CONTENT -->\n"
+" <tr>\n"
+" <td align=\"center\" style=\"min-width: 590px;\">\n"
+" <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: white; padding: 0px 8px 0px 8px; border-collapse:separate;\">\n"
+" <tr><td valign=\"top\" style=\"font-size: 13px;\">\n"
+" <div style=\"margin: 0px; padding: 0px;\">\n"
+" Hello,<br/><br/>\n"
+" You have requested to be unsubscribed to the mailing list <strong>${object.name}</strong>.\n"
+" <br/><br/>\n"
+" To confirm, please visit the following link: <strong><a href=\"${ctx['token_url']}\">${ctx['token_url']}</a></strong>.\n"
+" <br/><br/>\n"
+" If this was a mistake or you did not requested this action, please ignore this message.\n"
+" % if user.signature:\n"
+" <br/>\n"
+" ${user.signature | safe}\n"
+" % endif\n"
+" </div>\n"
+" </td></tr>\n"
+" <tr><td style=\"text-align:center;\">\n"
+" <hr width=\"100%\" style=\"background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0; margin: 16px 0px 16px 0px;\"/>\n"
+" </td></tr>\n"
+" </table>\n"
+" </td>\n"
+" </tr>\n"
+" <!-- FOOTER -->\n"
+" <tr>\n"
+" <td align=\"center\" style=\"min-width: 590px;\">\n"
+" <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: white; font-size: 11px; padding: 0px 8px 0px 8px; border-collapse:separate;\">\n"
+" <tr><td valign=\"middle\" align=\"left\">\n"
+" ${user.company_id.name}\n"
+" </td></tr>\n"
+" <tr><td valign=\"middle\" align=\"left\" style=\"opacity: 0.7;\">\n"
+" % if user.company_id.phone\n"
+" ${user.company_id.phone} |\n"
+" %endif\n"
+" % if user.company_id.email\n"
+" <a href=\"'mailto:%s' % ${user.company_id.email}\" style=\"text-decoration:none; color: #454748;\">${user.company_id.email}</a> |\n"
+" % endif\n"
+" % if user.company_id.website\n"
+" <a href=\"'%s' % ${user.company_id.website}\" style=\"text-decoration:none; color: #454748;\">${user.company_id.website}\n"
+" </a>\n"
+" % endif\n"
+" </td></tr>\n"
+" </table>\n"
+" </td>\n"
+" </tr>\n"
+"</tbody>\n"
+"</table>\n"
+"</td></tr>\n"
+"<!-- POWERED BY -->\n"
+"<tr><td align=\"center\" style=\"min-width: 590px;\">\n"
+" <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: #F1F1F1; color: #454748; padding: 8px; border-collapse:separate;\">\n"
+" <tr><td style=\"text-align: center; font-size: 13px;\">\n"
+" Powered by <a target=\"_blank\" href=\"https://www.odoo.com?utm_source=db&amp;utm_medium=mail\" style=\"color: #875A7B;\">Odoo</a>\n"
+" </td></tr>\n"
+" </table>\n"
+"</td></tr>\n"
+"</table>\n"
+" "
+msgstr ""
+
+#. module: website_mail_channel
#. openerp-web
#: code:addons/website_mail_channel/static/src/js/website_mail_channel.editor.js:17
#, python-format
@@ -82,7 +227,13 @@ msgstr "Alleine können wir wenig erreichen, zusammen sehr viel."
#. module: website_mail_channel
#: model:ir.ui.view,arch_db:website_mail_channel.group_messages
msgid "Archives"
-msgstr "Archiv"
+msgstr "Archive"
+
+#. module: website_mail_channel
+#: model:ir.ui.view,arch_db:website_mail_channel.group_message
+#: model:ir.ui.view,arch_db:website_mail_channel.messages_short
+msgid "Avatar"
+msgstr "Avatar"
#. module: website_mail_channel
#: model:ir.ui.view,arch_db:website_mail_channel.group_message
@@ -107,6 +258,16 @@ msgid "Change Discussion List"
msgstr "Ändere Diskussionsliste"
#. module: website_mail_channel
+#: model:mail.template,subject:website_mail_channel.mail_template_list_subscribe
+msgid "Confirm subscription to ${object.name}"
+msgstr ""
+
+#. module: website_mail_channel
+#: model:mail.template,subject:website_mail_channel.mail_template_list_unsubscribe
+msgid "Confirm unsubscription to ${object.name}"
+msgstr ""
+
+#. module: website_mail_channel
#. openerp-web
#: code:addons/website_mail_channel/static/src/js/website_mail_channel.editor.js:18
#, python-format
@@ -121,7 +282,12 @@ msgstr "Diskussionskanal"
#. module: website_mail_channel
#: model:ir.ui.view,arch_db:website_mail_channel.group_message
msgid "Follow-Ups"
-msgstr "Mahnungen"
+msgstr "Folgenachrichten"
+
+#. module: website_mail_channel
+#: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
+msgid "Group"
+msgstr "Gruppe"
#. module: website_mail_channel
#: model:ir.ui.view,arch_db:website_mail_channel.invalid_token_subscription
@@ -129,13 +295,9 @@ msgid "Invalid or expired confirmation link."
msgstr "Bestätigungslink ungültig oder abgelaufen."
#. module: website_mail_channel
-#: model:ir.ui.view,arch_db:website_mail_channel.footer_mailing_list
-msgid "Mailing List"
-msgstr "E-Mail Empfängerliste"
-
-#. module: website_mail_channel
#: model:ir.ui.view,arch_db:website_mail_channel.group_message
#: model:ir.ui.view,arch_db:website_mail_channel.group_messages
+#: model:website.menu,name:website_mail_channel.menu_mailing_list
msgid "Mailing Lists"
msgstr "E-Mail-Empfängerlisten"
@@ -143,16 +305,14 @@ msgstr "E-Mail-Empfängerlisten"
#: code:addons/website_mail_channel/models/mail_mail.py:20
#, python-format
msgid "Mailing-List"
-msgstr "E-Mailversandliste"
+msgstr "E-Mail-Versandliste"
#. module: website_mail_channel
#: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
msgid ""
"Need to unsubscribe? It's right here! <span class=\"fa fa-2x fa-arrow-down "
-"pull-right\"/>"
+"float-right\" role=\"img\" aria-label=\"\" title=\"Read this !\"/>"
msgstr ""
-"Wollen Sie sich eintragen? Dann gleich hier.<span class=\"fa fa-2x fa-arrow-"
-"down pull-right\"/>"
#. module: website_mail_channel
#: model:ir.model,name:website_mail_channel.model_mail_mail
@@ -160,16 +320,6 @@ msgid "Outgoing Mails"
msgstr "Postausgang"
#. module: website_mail_channel
-#: model:mail.template,subject:website_mail_channel.mail_template_list_subscribe
-msgid "Please confirm subscription to ${object.name}"
-msgstr "Bitte bestätigen Sie die Anmeldung bei ${object.name}"
-
-#. module: website_mail_channel
-#: model:mail.template,subject:website_mail_channel.mail_template_list_unsubscribe
-msgid "Please confirm unsubscription to ${object.name}"
-msgstr "Bitte bestätigen Sie die Anmeldung zu ${object.name}"
-
-#. module: website_mail_channel
#: code:addons/website_mail_channel/models/mail_mail.py:21
#, python-format
msgid "Post to"
@@ -224,12 +374,6 @@ msgid "a confirmation email has been sent."
msgstr "eine Bestätigungs-E-Mail wurde gesendet."
#. module: website_mail_channel
-#: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
-#: model:ir.ui.view,arch_db:website_mail_channel.subscribe
-msgid "archives"
-msgstr "Archive"
-
-#. module: website_mail_channel
#: model:ir.ui.view,arch_db:website_mail_channel.group_message
msgid "attachments"
msgstr "Dateianhänge"
@@ -263,10 +407,8 @@ msgstr "Mailinglisten Archive"
#: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
msgid ""
"members<br/>\n"
-" <i class=\"fa fa-fw fa-envelope-o\"/>"
+" <i class=\"fa fa-fw fa-envelope-o\" role=\"img\" aria-label=\"Traffic\" title=\"Traffic\"/>"
msgstr ""
-"Mitglieder<br/>\n"
-" <i class=\"fa fa-fw fa-envelope-o\"/>"
#. module: website_mail_channel
#: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
@@ -284,12 +426,6 @@ msgid "replies"
msgstr "Antworten"
#. module: website_mail_channel
-#: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
-#: model:ir.ui.view,arch_db:website_mail_channel.subscribe
-msgid "send mail"
-msgstr "E-Mail senden"
-
-#. module: website_mail_channel
#: model:ir.ui.view,arch_db:website_mail_channel.messages_short
msgid "show"
msgstr "anzeigen"
@@ -302,13 +438,7 @@ msgstr "angemeldet"
#. module: website_mail_channel
#: model:ir.ui.view,arch_db:website_mail_channel.confirmation_subscription
msgid "to the mailing list."
-msgstr "bei der E-Mailversandliste."
-
-#. module: website_mail_channel
-#: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
-#: model:ir.ui.view,arch_db:website_mail_channel.subscribe
-msgid "unsubscribe"
-msgstr "Abmelden"
+msgstr "bei der E-Mail-Versandliste."
#. module: website_mail_channel
#: model:ir.ui.view,arch_db:website_mail_channel.confirmation_subscription
diff --git a/addons/website_mail_channel/i18n/es.po b/addons/website_mail_channel/i18n/es.po
index 1aa6a30405b..da092926269 100644
--- a/addons/website_mail_channel/i18n/es.po
+++ b/addons/website_mail_channel/i18n/es.po
@@ -3,21 +3,19 @@
# * website_mail_channel
#
# Translators:
-# Martin Trigaux, 2016
-# Luis M. Triana <luis.triana@jarsa.com.mx>, 2016
-# José Vicente <txusev@gmail.com>, 2016
-# Galileo Sanchez <galileopy@gmail.com>, 2016
-# Gelo Joga Landoo <gj@landoo.es>, 2017
-# e2f_es_ t7 <e2f_es_t7@outlook.com>, 2017
-# ES T2 <e2f48ds4f2ds1@outlook.com>, 2017
-# e2f_EPV Translator <e2f_EPV@outlook.com>, 2017
+# Martin Trigaux, 2018
+# Luis M. Triana <luis.triana@jarsa.com.mx>, 2018
+# Gelo Joga Landoo <gj@landoo.es>, 2018
+# e2f_EPV Translator <e2f_EPV@outlook.com>, 2018
+# e2f_es_ t7 <e2f_es_t7@outlook.com>, 2018
+# Nicolás Broggi <rnbroggi@gmail.com>, 2018
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.2\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-03-22 14:11+0000\n"
-"PO-Revision-Date: 2018-03-22 14:11+0000\n"
-"Last-Translator: e2f_EPV Translator <e2f_EPV@outlook.com>, 2017\n"
+"POT-Creation-Date: 2018-08-24 09:05+0000\n"
+"PO-Revision-Date: 2018-08-24 09:05+0000\n"
+"Last-Translator: Nicolás Broggi <rnbroggi@gmail.com>, 2018\n"
"Language-Team: Spanish (https://www.transifex.com/odoo/teams/41243/es/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -26,42 +24,22 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. module: website_mail_channel
-#: model:mail.template,body_html:website_mail_channel.mail_template_list_subscribe
-msgid ""
-"<?xml version=\"1.0\"?>\n"
-"<data><p>Hello,</p>\n"
-"<p>You have requested to be subscribed to the mailing list <strong>${object.name}</strong></p>\n"
-"<p>To confirm, please visit the following link:</p>\n"
-"<p><strong><a href=\"${ctx['token_url']}\">${ctx['token_url']}</a></strong></p>\n"
-"<p>If this was a mistake or you did not requested this action, please ignore this message.</p>\n"
-"</data>"
+#: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
+#: model:ir.ui.view,arch_db:website_mail_channel.subscribe
+msgid "<i class=\"fa fa-envelope-o\"/> send mail"
msgstr ""
-"<?xml version=\"1.0\"?>\n"
-"<data>Hola:</p>\n"
-"<p>Ha solicitado la suscripción a la lista de correo <strong>${object.name}</strong></p>\n"
-"<p>Para confirmarlo, visite el siguiente enlace:</p>\n"
-"<p><strong><a href=\"${ctx['token_url']}\">${ctx['token_url']}</a></strong></p>\n"
-"<p>Si se trata de un error o no ha solicitado esta acción, ignore este mensaje.</p>\n"
-"</data>"
#. module: website_mail_channel
-#: model:mail.template,body_html:website_mail_channel.mail_template_list_unsubscribe
-msgid ""
-"<?xml version=\"1.0\"?>\n"
-"<data><p>Hello,</p>\n"
-"<p>You have requested to be unsubscribed to the mailing list <strong>${object.name}</strong></p>\n"
-"<p>To confirm, please visit the following link:</p>\n"
-"<p><strong><a href=\"${ctx['token_url']}\">${ctx['token_url']}</a></strong></p>\n"
-"<p>If this was a mistake or you did not requested this action, please ignore this message.</p>\n"
-"</data>"
+#: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
+#: model:ir.ui.view,arch_db:website_mail_channel.subscribe
+msgid "<i class=\"fa fa-file-o\"/> archives"
+msgstr ""
+
+#. module: website_mail_channel
+#: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
+#: model:ir.ui.view,arch_db:website_mail_channel.subscribe
+msgid "<i class=\"fa fa-times\"/> unsubscribe"
msgstr ""
-"<?xml version=\"1.0\"?>\n"
-"<data>Hola:</p>\n"
-"<p>Ha solicitado la anulación de su suscripción a la lista de correo <strong>${object.name}</strong></p>\n"
-"<p>Para confirmarlo, visite el siguiente enlace:</p>\n"
-"<p><strong><a href=\"${ctx['token_url']}\">${ctx['token_url']}</a></strong></p>\n"
-"<p>Si se trata de un error o no ha solicitado esta acción, ignore este mensaje.</p>\n"
-"</data>"
#. module: website_mail_channel
#: model:ir.ui.view,arch_db:website_mail_channel.subscribe
@@ -69,6 +47,172 @@ msgid "<span class=\"oe_snippet_thumbnail_title\">Discussion Group</span>"
msgstr "<span class=\"oe_snippet_thumbnail_title\">Grupo de Discusión</span>"
#. module: website_mail_channel
+#: model:mail.template,body_html:website_mail_channel.mail_template_list_subscribe
+msgid ""
+"<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" style=\"padding-top: 16px; background-color: #F1F1F1; font-family:Verdana, Arial,sans-serif; color: #454748; width: 100%; border-collapse:separate;\"><tr><td align=\"center\">\n"
+"<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"padding: 16px; background-color: white; color: #454748; border-collapse:separate;\">\n"
+"<tbody>\n"
+" <!-- HEADER -->\n"
+" <tr>\n"
+" <td align=\"center\" style=\"min-width: 590px;\">\n"
+" <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: white; padding: 0px 8px 0px 8px; border-collapse:separate;\">\n"
+" <tr><td valign=\"middle\">\n"
+" <span style=\"font-size: 10px;\">Your Channel</span><br/>\n"
+" <span style=\"font-size: 20px; font-weight: bold;\">${object.name}</span>\n"
+" </td><td valign=\"middle\" align=\"right\">\n"
+" <img src=\"/logo.png?company=${user.company_id.id}\" style=\"padding: 0px; margin: 0px; height: auto; width: 80px;\" alt=\"${user.company_id.name}\"/>\n"
+" </td></tr>\n"
+" <tr><td colspan=\"2\" style=\"text-align:center;\">\n"
+" <hr width=\"100%\" style=\"background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0; margin:16px 0px 16px 0px;\"/>\n"
+" </td></tr>\n"
+" </table>\n"
+" </td>\n"
+" </tr>\n"
+" <!-- CONTENT -->\n"
+" <tr>\n"
+" <td align=\"center\" style=\"min-width: 590px;\">\n"
+" <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: white; padding: 0px 8px 0px 8px; border-collapse:separate;\">\n"
+" <tr><td valign=\"top\" style=\"font-size: 13px;\">\n"
+" <div style=\"margin: 0px; padding: 0px;\">\n"
+" Hello,<br/><br/>\n"
+" You have requested to be subscribed to the mailing list <strong>${object.name}</strong>.\n"
+" <br/><br/>\n"
+" To confirm, please visit the following link: <strong><a href=\"${ctx['token_url']}\">${ctx['token_url']}</a></strong>\n"
+" <br/><br/>\n"
+" If this was a mistake or you did not requested this action, please ignore this message.\n"
+" % if user.signature\n"
+" <br/>\n"
+" ${user.signature | safe}\n"
+" % endif\n"
+" </div>\n"
+" </td></tr>\n"
+" <tr><td style=\"text-align:center;\">\n"
+" <hr width=\"100%\" style=\"background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0; margin: 16px 0px 16px 0px;\"/>\n"
+" </td></tr>\n"
+" </table>\n"
+" </td>\n"
+" </tr>\n"
+" <!-- FOOTER -->\n"
+" <tr>\n"
+" <td align=\"center\" style=\"min-width: 590px;\">\n"
+" <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: white; font-size: 11px; padding: 0px 8px 0px 8px; border-collapse:separate;\">\n"
+" <tr><td valign=\"middle\" align=\"left\">\n"
+" ${user.company_id.name}\n"
+" </td></tr>\n"
+" <tr><td valign=\"middle\" align=\"left\" style=\"opacity: 0.7;\">\n"
+" % if user.company_id.phone\n"
+" ${user.company_id.phone} |\n"
+" %endif\n"
+" % if user.company_id.email\n"
+" <a href=\"'mailto:%s' % ${user.company_id.email}\" style=\"text-decoration:none; color: #454748;\">${user.company_id.email}</a> |\n"
+" % endif\n"
+" % if user.company_id.website\n"
+" <a href=\"'%s' % ${user.company_id.website}\" style=\"text-decoration:none; color: #454748;\">${user.company_id.website}\n"
+" </a>\n"
+" % endif\n"
+" </td></tr>\n"
+" </table>\n"
+" </td>\n"
+" </tr>\n"
+"</tbody>\n"
+"</table>\n"
+"</td></tr>\n"
+"<!-- POWERED BY -->\n"
+"<tr><td align=\"center\" style=\"min-width: 590px;\">\n"
+" <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: #F1F1F1; color: #454748; padding: 8px; border-collapse:separate;\">\n"
+" <tr><td style=\"text-align: center; font-size: 13px;\">\n"
+" Powered by <a target=\"_blank\" href=\"https://www.odoo.com?utm_source=db&amp;utm_medium=mail\" style=\"color: #875A7B;\">Odoo</a>\n"
+" </td></tr>\n"
+" </table>\n"
+"</td></tr>\n"
+"</table>\n"
+" "
+msgstr ""
+
+#. module: website_mail_channel
+#: model:mail.template,body_html:website_mail_channel.mail_template_list_unsubscribe
+msgid ""
+"<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" style=\"padding-top: 16px; background-color: #F1F1F1; font-family:Verdana, Arial,sans-serif; color: #454748; width: 100%; border-collapse:separate;\"><tr><td align=\"center\">\n"
+"<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"padding: 16px; background-color: white; color: #454748; border-collapse:separate;\">\n"
+"<tbody>\n"
+" <!-- HEADER -->\n"
+" <tr>\n"
+" <td align=\"center\" style=\"min-width: 590px;\">\n"
+" <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: white; padding: 0px 8px 0px 8px; border-collapse:separate;\">\n"
+" <tr><td valign=\"middle\">\n"
+" <span style=\"font-size: 10px;\">Your Channel</span><br/>\n"
+" <span style=\"font-size: 20px; font-weight: bold;\">${object.name}</span>\n"
+" </td><td valign=\"middle\" align=\"right\">\n"
+" <img src=\"/logo.png?company=${user.company_id.id}\" style=\"padding: 0px; margin: 0px; height: auto; width: 80px;\" alt=\"${user.company_id.name}\"/>\n"
+" </td></tr>\n"
+" <tr><td colspan=\"2\" style=\"text-align:center;\">\n"
+" <hr width=\"100%\" style=\"background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0; margin:16px 0px 16px 0px;\"/>\n"
+" </td></tr>\n"
+" </table>\n"
+" </td>\n"
+" </tr>\n"
+" <!-- CONTENT -->\n"
+" <tr>\n"
+" <td align=\"center\" style=\"min-width: 590px;\">\n"
+" <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: white; padding: 0px 8px 0px 8px; border-collapse:separate;\">\n"
+" <tr><td valign=\"top\" style=\"font-size: 13px;\">\n"
+" <div style=\"margin: 0px; padding: 0px;\">\n"
+" Hello,<br/><br/>\n"
+" You have requested to be unsubscribed to the mailing list <strong>${object.name}</strong>.\n"
+" <br/><br/>\n"
+" To confirm, please visit the following link: <strong><a href=\"${ctx['token_url']}\">${ctx['token_url']}</a></strong>.\n"
+" <br/><br/>\n"
+" If this was a mistake or you did not requested this action, please ignore this message.\n"
+" % if user.signature:\n"
+" <br/>\n"
+" ${user.signature | safe}\n"
+" % endif\n"
+" </div>\n"
+" </td></tr>\n"
+" <tr><td style=\"text-align:center;\">\n"
+" <hr width=\"100%\" style=\"background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0; margin: 16px 0px 16px 0px;\"/>\n"
+" </td></tr>\n"
+" </table>\n"
+" </td>\n"
+" </tr>\n"
+" <!-- FOOTER -->\n"
+" <tr>\n"
+" <td align=\"center\" style=\"min-width: 590px;\">\n"
+" <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: white; font-size: 11px; padding: 0px 8px 0px 8px; border-collapse:separate;\">\n"
+" <tr><td valign=\"middle\" align=\"left\">\n"
+" ${user.company_id.name}\n"
+" </td></tr>\n"
+" <tr><td valign=\"middle\" align=\"left\" style=\"opacity: 0.7;\">\n"
+" % if user.company_id.phone\n"
+" ${user.company_id.phone} |\n"
+" %endif\n"
+" % if user.company_id.email\n"
+" <a href=\"'mailto:%s' % ${user.company_id.email}\" style=\"text-decoration:none; color: #454748;\">${user.company_id.email}</a> |\n"
+" % endif\n"
+" % if user.company_id.website\n"
+" <a href=\"'%s' % ${user.company_id.website}\" style=\"text-decoration:none; color: #454748;\">${user.company_id.website}\n"
+" </a>\n"
+" % endif\n"
+" </td></tr>\n"
+" </table>\n"
+" </td>\n"
+" </tr>\n"
+"</tbody>\n"
+"</table>\n"
+"</td></tr>\n"
+"<!-- POWERED BY -->\n"
+"<tr><td align=\"center\" style=\"min-width: 590px;\">\n"
+" <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: #F1F1F1; color: #454748; padding: 8px; border-collapse:separate;\">\n"
+" <tr><td style=\"text-align: center; font-size: 13px;\">\n"
+" Powered by <a target=\"_blank\" href=\"https://www.odoo.com?utm_source=db&amp;utm_medium=mail\" style=\"color: #875A7B;\">Odoo</a>\n"
+" </td></tr>\n"
+" </table>\n"
+"</td></tr>\n"
+"</table>\n"
+" "
+msgstr ""
+
+#. module: website_mail_channel
#. openerp-web
#: code:addons/website_mail_channel/static/src/js/website_mail_channel.editor.js:17
#, python-format
@@ -87,6 +231,12 @@ msgstr "Archivados"
#. module: website_mail_channel
#: model:ir.ui.view,arch_db:website_mail_channel.group_message
+#: model:ir.ui.view,arch_db:website_mail_channel.messages_short
+msgid "Avatar"
+msgstr "Avatar"
+
+#. module: website_mail_channel
+#: model:ir.ui.view,arch_db:website_mail_channel.group_message
msgid "Browse archives"
msgstr "Examinar archivados"
@@ -108,6 +258,16 @@ msgid "Change Discussion List"
msgstr "Cambiar lista de discusión"
#. module: website_mail_channel
+#: model:mail.template,subject:website_mail_channel.mail_template_list_subscribe
+msgid "Confirm subscription to ${object.name}"
+msgstr ""
+
+#. module: website_mail_channel
+#: model:mail.template,subject:website_mail_channel.mail_template_list_unsubscribe
+msgid "Confirm unsubscription to ${object.name}"
+msgstr ""
+
+#. module: website_mail_channel
#. openerp-web
#: code:addons/website_mail_channel/static/src/js/website_mail_channel.editor.js:18
#, python-format
@@ -117,7 +277,7 @@ msgstr "Lista de discusión"
#. module: website_mail_channel
#: model:ir.model,name:website_mail_channel.model_mail_channel
msgid "Discussion channel"
-msgstr "Canal de discución"
+msgstr "Canal de discusión"
#. module: website_mail_channel
#: model:ir.ui.view,arch_db:website_mail_channel.group_message
@@ -125,18 +285,19 @@ msgid "Follow-Ups"
msgstr "Seguimientos"
#. module: website_mail_channel
-#: model:ir.ui.view,arch_db:website_mail_channel.invalid_token_subscription
-msgid "Invalid or expired confirmation link."
-msgstr "El enlace de confirmación no es válido o ha caducado."
+#: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
+msgid "Group"
+msgstr "Grupo"
#. module: website_mail_channel
-#: model:ir.ui.view,arch_db:website_mail_channel.footer_mailing_list
-msgid "Mailing List"
-msgstr "Lista de correo"
+#: model:ir.ui.view,arch_db:website_mail_channel.invalid_token_subscription
+msgid "Invalid or expired confirmation link."
+msgstr "El enlace de confirmación no es válido o ha expirado."
#. module: website_mail_channel
#: model:ir.ui.view,arch_db:website_mail_channel.group_message
#: model:ir.ui.view,arch_db:website_mail_channel.group_messages
+#: model:website.menu,name:website_mail_channel.menu_mailing_list
msgid "Mailing Lists"
msgstr "Listas de correo"
@@ -150,10 +311,8 @@ msgstr "Lista de correo"
#: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
msgid ""
"Need to unsubscribe? It's right here! <span class=\"fa fa-2x fa-arrow-down "
-"pull-right\"/>"
+"float-right\" role=\"img\" aria-label=\"\" title=\"Read this !\"/>"
msgstr ""
-"Darse de baja?Está justo aquí! <span class=\"fa fa-2x fa-arrow-down pull-"
-"right\"/>"
#. module: website_mail_channel
#: model:ir.model,name:website_mail_channel.model_mail_mail
@@ -161,16 +320,6 @@ msgid "Outgoing Mails"
msgstr "Correos salientes"
#. module: website_mail_channel
-#: model:mail.template,subject:website_mail_channel.mail_template_list_subscribe
-msgid "Please confirm subscription to ${object.name}"
-msgstr "Confirme su suscripción a ${object.name}"
-
-#. module: website_mail_channel
-#: model:mail.template,subject:website_mail_channel.mail_template_list_unsubscribe
-msgid "Please confirm unsubscription to ${object.name}"
-msgstr "Confirme la cancelación de su suscripción a ${object.name}"
-
-#. module: website_mail_channel
#: code:addons/website_mail_channel/models/mail_mail.py:21
#, python-format
msgid "Post to"
@@ -190,7 +339,7 @@ msgstr "Permanecer en contacto con nuestra comunidad"
#: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
#: model:ir.ui.view,arch_db:website_mail_channel.subscribe
msgid "Subscribe"
-msgstr "Suscribir"
+msgstr "Suscribirse"
#. module: website_mail_channel
#: model:ir.ui.view,arch_db:website_mail_channel.not_subscribed
@@ -217,7 +366,7 @@ msgstr "Anular subscripción"
#. module: website_mail_channel
#: model:ir.ui.view,arch_db:website_mail_channel.confirmation_subscription
msgid "You have been correctly"
-msgstr "Ha sido convenientemente"
+msgstr "Se ha"
#. module: website_mail_channel
#: model:ir.ui.view,arch_db:website_mail_channel.subscribe
@@ -225,12 +374,6 @@ msgid "a confirmation email has been sent."
msgstr "Se ha enviado un mail de confirmación"
#. module: website_mail_channel
-#: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
-#: model:ir.ui.view,arch_db:website_mail_channel.subscribe
-msgid "archives"
-msgstr "archivos"
-
-#. module: website_mail_channel
#: model:ir.ui.view,arch_db:website_mail_channel.group_message
msgid "attachments"
msgstr "archivos adjuntos"
@@ -264,10 +407,8 @@ msgstr "archivos de la lista de correo"
#: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
msgid ""
"members<br/>\n"
-" <i class=\"fa fa-fw fa-envelope-o\"/>"
+" <i class=\"fa fa-fw fa-envelope-o\" role=\"img\" aria-label=\"Traffic\" title=\"Traffic\"/>"
msgstr ""
-"miembros<br/>\n"
-"<i class=\"fa fa-fw fa-envelope-o\"/>"
#. module: website_mail_channel
#: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
@@ -285,12 +426,6 @@ msgid "replies"
msgstr "respuestas"
#. module: website_mail_channel
-#: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
-#: model:ir.ui.view,arch_db:website_mail_channel.subscribe
-msgid "send mail"
-msgstr "enviar correo"
-
-#. module: website_mail_channel
#: model:ir.ui.view,arch_db:website_mail_channel.messages_short
msgid "show"
msgstr "mostrar"
@@ -298,7 +433,7 @@ msgstr "mostrar"
#. module: website_mail_channel
#: model:ir.ui.view,arch_db:website_mail_channel.confirmation_subscription
msgid "subscribed"
-msgstr "suscrito"
+msgstr "suscrito correctamente"
#. module: website_mail_channel
#: model:ir.ui.view,arch_db:website_mail_channel.confirmation_subscription
@@ -306,15 +441,9 @@ msgid "to the mailing list."
msgstr "a la lista de correo"
#. module: website_mail_channel
-#: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
-#: model:ir.ui.view,arch_db:website_mail_channel.subscribe
-msgid "unsubscribe"
-msgstr "anular suscripción"
-
-#. module: website_mail_channel
#: model:ir.ui.view,arch_db:website_mail_channel.confirmation_subscription
msgid "unsubscribed"
-msgstr "dado de baja de la suscripción"
+msgstr "suscripción anulada"
#. module: website_mail_channel
#: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
diff --git a/addons/website_mail_channel/i18n/fr.po b/addons/website_mail_channel/i18n/fr.po
index 93b810f675d..1767060d212 100644
--- a/addons/website_mail_channel/i18n/fr.po
+++ b/addons/website_mail_channel/i18n/fr.po
@@ -3,24 +3,22 @@
# * website_mail_channel
#
# Translators:
-# Xavier Belmere <Info@cartmeleon.com>, 2016
-# Olivier Lenoir <olivier.lenoir@free.fr>, 2016
-# Florian Hatat, 2016
-# Martin Trigaux, 2016
-# Quentin THEURET <odoo@kerpeo.com>, 2016
-# Saad Thaifa <saad.thaifa@gmail.com>, 2016
-# ShevAbam, 2016
-# lucasdeliege <deliegelucas@gmail.com>, 2016
-# Maxime Chambreuil <mchambreuil@ursainfosystems.com>, 2016
-# Eloïse Stilmant <est@odoo.com>, 2017
-# fr rev <e2ffr02@hotmail.com>, 2017
+# Saad Thaifa <saad.thaifa@gmail.com>, 2018
+# fr rev <e2ffr02@hotmail.com>, 2018
+# Martin Trigaux, 2018
+# ShevAbam, 2018
+# Maxime Chambreuil <mchambreuil@ursainfosystems.com>, 2018
+# Olivier Lenoir <olivier.lenoir@free.fr>, 2018
+# Fabien Bourgeois <fabien@yaltik.com>, 2018
+# Florian Hatat, 2018
+# Eloïse Stilmant <est@odoo.com>, 2018
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.2\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-03-22 14:11+0000\n"
-"PO-Revision-Date: 2018-03-22 14:11+0000\n"
-"Last-Translator: fr rev <e2ffr02@hotmail.com>, 2017\n"
+"POT-Creation-Date: 2018-08-24 09:05+0000\n"
+"PO-Revision-Date: 2018-08-24 09:05+0000\n"
+"Last-Translator: Eloïse Stilmant <est@odoo.com>, 2018\n"
"Language-Team: French (https://www.transifex.com/odoo/teams/41243/fr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -29,42 +27,22 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
#. module: website_mail_channel
-#: model:mail.template,body_html:website_mail_channel.mail_template_list_subscribe
-msgid ""
-"<?xml version=\"1.0\"?>\n"
-"<data><p>Hello,</p>\n"
-"<p>You have requested to be subscribed to the mailing list <strong>${object.name}</strong></p>\n"
-"<p>To confirm, please visit the following link:</p>\n"
-"<p><strong><a href=\"${ctx['token_url']}\">${ctx['token_url']}</a></strong></p>\n"
-"<p>If this was a mistake or you did not requested this action, please ignore this message.</p>\n"
-"</data>"
+#: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
+#: model:ir.ui.view,arch_db:website_mail_channel.subscribe
+msgid "<i class=\"fa fa-envelope-o\"/> send mail"
msgstr ""
-"<?xml version=\"1.0\"?>\n"
-"<data><p>Bonjour,</p>\n"
-"<p>Vous avez demandé à vous abonner à la liste de diffusion <strong>${object.name}</strong></p>\n"
-"<p>Pour confirmer votre demande, consultez le lien suivant :</p>\n"
-"<p><strong><a href=\"${ctx['token_url']}\">${ctx['token_url']}</a></strong></p>\n"
-"<p>Si vous avez effectué cette demande par erreur ou si vous n'êtes pas à l'origine de cette demande, vous pouvez ignorer ce message.</p>\n"
-"</data>"
#. module: website_mail_channel
-#: model:mail.template,body_html:website_mail_channel.mail_template_list_unsubscribe
-msgid ""
-"<?xml version=\"1.0\"?>\n"
-"<data><p>Hello,</p>\n"
-"<p>You have requested to be unsubscribed to the mailing list <strong>${object.name}</strong></p>\n"
-"<p>To confirm, please visit the following link:</p>\n"
-"<p><strong><a href=\"${ctx['token_url']}\">${ctx['token_url']}</a></strong></p>\n"
-"<p>If this was a mistake or you did not requested this action, please ignore this message.</p>\n"
-"</data>"
+#: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
+#: model:ir.ui.view,arch_db:website_mail_channel.subscribe
+msgid "<i class=\"fa fa-file-o\"/> archives"
+msgstr ""
+
+#. module: website_mail_channel
+#: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
+#: model:ir.ui.view,arch_db:website_mail_channel.subscribe
+msgid "<i class=\"fa fa-times\"/> unsubscribe"
msgstr ""
-"<?xml version=\"1.0\"?>\n"
-"<data><p>Bonjour,</p>\n"
-"<p>Vous avez demandé à vous désabonner de la liste de diffusion <strong>${object.name}</strong></p>\n"
-"<p>Pour confirmer votre demande, consultez le lien suivant :</p>\n"
-"<p><strong><a href=\"${ctx['token_url']}\">${ctx['token_url']}</a></strong></p>\n"
-"<p>Si vous avez effectué cette demande par erreur ou si vous n'êtes pas à l'origine de cette demande, vous pouvez ignorer ce message.</p>\n"
-"</data>"
#. module: website_mail_channel
#: model:ir.ui.view,arch_db:website_mail_channel.subscribe
@@ -72,6 +50,172 @@ msgid "<span class=\"oe_snippet_thumbnail_title\">Discussion Group</span>"
msgstr "<span class=\"oe_snippet_thumbnail_title\">Groupe de discussion</span>"
#. module: website_mail_channel
+#: model:mail.template,body_html:website_mail_channel.mail_template_list_subscribe
+msgid ""
+"<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" style=\"padding-top: 16px; background-color: #F1F1F1; font-family:Verdana, Arial,sans-serif; color: #454748; width: 100%; border-collapse:separate;\"><tr><td align=\"center\">\n"
+"<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"padding: 16px; background-color: white; color: #454748; border-collapse:separate;\">\n"
+"<tbody>\n"
+" <!-- HEADER -->\n"
+" <tr>\n"
+" <td align=\"center\" style=\"min-width: 590px;\">\n"
+" <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: white; padding: 0px 8px 0px 8px; border-collapse:separate;\">\n"
+" <tr><td valign=\"middle\">\n"
+" <span style=\"font-size: 10px;\">Your Channel</span><br/>\n"
+" <span style=\"font-size: 20px; font-weight: bold;\">${object.name}</span>\n"
+" </td><td valign=\"middle\" align=\"right\">\n"
+" <img src=\"/logo.png?company=${user.company_id.id}\" style=\"padding: 0px; margin: 0px; height: auto; width: 80px;\" alt=\"${user.company_id.name}\"/>\n"
+" </td></tr>\n"
+" <tr><td colspan=\"2\" style=\"text-align:center;\">\n"
+" <hr width=\"100%\" style=\"background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0; margin:16px 0px 16px 0px;\"/>\n"
+" </td></tr>\n"
+" </table>\n"
+" </td>\n"
+" </tr>\n"
+" <!-- CONTENT -->\n"
+" <tr>\n"
+" <td align=\"center\" style=\"min-width: 590px;\">\n"
+" <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: white; padding: 0px 8px 0px 8px; border-collapse:separate;\">\n"
+" <tr><td valign=\"top\" style=\"font-size: 13px;\">\n"
+" <div style=\"margin: 0px; padding: 0px;\">\n"
+" Hello,<br/><br/>\n"
+" You have requested to be subscribed to the mailing list <strong>${object.name}</strong>.\n"
+" <br/><br/>\n"
+" To confirm, please visit the following link: <strong><a href=\"${ctx['token_url']}\">${ctx['token_url']}</a></strong>\n"
+" <br/><br/>\n"
+" If this was a mistake or you did not requested this action, please ignore this message.\n"
+" % if user.signature\n"
+" <br/>\n"
+" ${user.signature | safe}\n"
+" % endif\n"
+" </div>\n"
+" </td></tr>\n"
+" <tr><td style=\"text-align:center;\">\n"
+" <hr width=\"100%\" style=\"background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0; margin: 16px 0px 16px 0px;\"/>\n"
+" </td></tr>\n"
+" </table>\n"
+" </td>\n"
+" </tr>\n"
+" <!-- FOOTER -->\n"
+" <tr>\n"
+" <td align=\"center\" style=\"min-width: 590px;\">\n"
+" <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: white; font-size: 11px; padding: 0px 8px 0px 8px; border-collapse:separate;\">\n"
+" <tr><td valign=\"middle\" align=\"left\">\n"
+" ${user.company_id.name}\n"
+" </td></tr>\n"
+" <tr><td valign=\"middle\" align=\"left\" style=\"opacity: 0.7;\">\n"
+" % if user.company_id.phone\n"
+" ${user.company_id.phone} |\n"
+" %endif\n"
+" % if user.company_id.email\n"
+" <a href=\"'mailto:%s' % ${user.company_id.email}\" style=\"text-decoration:none; color: #454748;\">${user.company_id.email}</a> |\n"
+" % endif\n"
+" % if user.company_id.website\n"
+" <a href=\"'%s' % ${user.company_id.website}\" style=\"text-decoration:none; color: #454748;\">${user.company_id.website}\n"
+" </a>\n"
+" % endif\n"
+" </td></tr>\n"
+" </table>\n"
+" </td>\n"
+" </tr>\n"
+"</tbody>\n"
+"</table>\n"
+"</td></tr>\n"
+"<!-- POWERED BY -->\n"
+"<tr><td align=\"center\" style=\"min-width: 590px;\">\n"
+" <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: #F1F1F1; color: #454748; padding: 8px; border-collapse:separate;\">\n"
+" <tr><td style=\"text-align: center; font-size: 13px;\">\n"
+" Powered by <a target=\"_blank\" href=\"https://www.odoo.com?utm_source=db&amp;utm_medium=mail\" style=\"color: #875A7B;\">Odoo</a>\n"
+" </td></tr>\n"
+" </table>\n"
+"</td></tr>\n"
+"</table>\n"
+" "
+msgstr ""
+
+#. module: website_mail_channel
+#: model:mail.template,body_html:website_mail_channel.mail_template_list_unsubscribe
+msgid ""
+"<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" style=\"padding-top: 16px; background-color: #F1F1F1; font-family:Verdana, Arial,sans-serif; color: #454748; width: 100%; border-collapse:separate;\"><tr><td align=\"center\">\n"
+"<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"padding: 16px; background-color: white; color: #454748; border-collapse:separate;\">\n"
+"<tbody>\n"
+" <!-- HEADER -->\n"
+" <tr>\n"
+" <td align=\"center\" style=\"min-width: 590px;\">\n"
+" <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: white; padding: 0px 8px 0px 8px; border-collapse:separate;\">\n"
+" <tr><td valign=\"middle\">\n"
+" <span style=\"font-size: 10px;\">Your Channel</span><br/>\n"
+" <span style=\"font-size: 20px; font-weight: bold;\">${object.name}</span>\n"
+" </td><td valign=\"middle\" align=\"right\">\n"
+" <img src=\"/logo.png?company=${user.company_id.id}\" style=\"padding: 0px; margin: 0px; height: auto; width: 80px;\" alt=\"${user.company_id.name}\"/>\n"
+" </td></tr>\n"
+" <tr><td colspan=\"2\" style=\"text-align:center;\">\n"
+" <hr width=\"100%\" style=\"background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0; margin:16px 0px 16px 0px;\"/>\n"
+" </td></tr>\n"
+" </table>\n"
+" </td>\n"
+" </tr>\n"
+" <!-- CONTENT -->\n"
+" <tr>\n"
+" <td align=\"center\" style=\"min-width: 590px;\">\n"
+" <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: white; padding: 0px 8px 0px 8px; border-collapse:separate;\">\n"
+" <tr><td valign=\"top\" style=\"font-size: 13px;\">\n"
+" <div style=\"margin: 0px; padding: 0px;\">\n"
+" Hello,<br/><br/>\n"
+" You have requested to be unsubscribed to the mailing list <strong>${object.name}</strong>.\n"
+" <br/><br/>\n"
+" To confirm, please visit the following link: <strong><a href=\"${ctx['token_url']}\">${ctx['token_url']}</a></strong>.\n"
+" <br/><br/>\n"
+" If this was a mistake or you did not requested this action, please ignore this message.\n"
+" % if user.signature:\n"
+" <br/>\n"
+" ${user.signature | safe}\n"
+" % endif\n"
+" </div>\n"
+" </td></tr>\n"
+" <tr><td style=\"text-align:center;\">\n"
+" <hr width=\"100%\" style=\"background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0; margin: 16px 0px 16px 0px;\"/>\n"
+" </td></tr>\n"
+" </table>\n"
+" </td>\n"
+" </tr>\n"
+" <!-- FOOTER -->\n"
+" <tr>\n"
+" <td align=\"center\" style=\"min-width: 590px;\">\n"
+" <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: white; font-size: 11px; padding: 0px 8px 0px 8px; border-collapse:separate;\">\n"
+" <tr><td valign=\"middle\" align=\"left\">\n"
+" ${user.company_id.name}\n"
+" </td></tr>\n"
+" <tr><td valign=\"middle\" align=\"left\" style=\"opacity: 0.7;\">\n"
+" % if user.company_id.phone\n"
+" ${user.company_id.phone} |\n"
+" %endif\n"
+" % if user.company_id.email\n"
+" <a href=\"'mailto:%s' % ${user.company_id.email}\" style=\"text-decoration:none; color: #454748;\">${user.company_id.email}</a> |\n"
+" % endif\n"
+" % if user.company_id.website\n"
+" <a href=\"'%s' % ${user.company_id.website}\" style=\"text-decoration:none; color: #454748;\">${user.company_id.website}\n"
+" </a>\n"
+" % endif\n"
+" </td></tr>\n"
+" </table>\n"
+" </td>\n"
+" </tr>\n"
+"</tbody>\n"
+"</table>\n"
+"</td></tr>\n"
+"<!-- POWERED BY -->\n"
+"<tr><td align=\"center\" style=\"min-width: 590px;\">\n"
+" <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: #F1F1F1; color: #454748; padding: 8px; border-collapse:separate;\">\n"
+" <tr><td style=\"text-align: center; font-size: 13px;\">\n"
+" Powered by <a target=\"_blank\" href=\"https://www.odoo.com?utm_source=db&amp;utm_medium=mail\" style=\"color: #875A7B;\">Odoo</a>\n"
+" </td></tr>\n"
+" </table>\n"
+"</td></tr>\n"
+"</table>\n"
+" "
+msgstr ""
+
+#. module: website_mail_channel
#. openerp-web
#: code:addons/website_mail_channel/static/src/js/website_mail_channel.editor.js:17
#, python-format
@@ -90,6 +234,12 @@ msgstr "Archives"
#. module: website_mail_channel
#: model:ir.ui.view,arch_db:website_mail_channel.group_message
+#: model:ir.ui.view,arch_db:website_mail_channel.messages_short
+msgid "Avatar"
+msgstr "Avatar"
+
+#. module: website_mail_channel
+#: model:ir.ui.view,arch_db:website_mail_channel.group_message
msgid "Browse archives"
msgstr "Explorer les archives"
@@ -111,6 +261,16 @@ msgid "Change Discussion List"
msgstr "Changer de Liste de Discussion"
#. module: website_mail_channel
+#: model:mail.template,subject:website_mail_channel.mail_template_list_subscribe
+msgid "Confirm subscription to ${object.name}"
+msgstr ""
+
+#. module: website_mail_channel
+#: model:mail.template,subject:website_mail_channel.mail_template_list_unsubscribe
+msgid "Confirm unsubscription to ${object.name}"
+msgstr ""
+
+#. module: website_mail_channel
#. openerp-web
#: code:addons/website_mail_channel/static/src/js/website_mail_channel.editor.js:18
#, python-format
@@ -128,18 +288,19 @@ msgid "Follow-Ups"
msgstr "Suiveurs"
#. module: website_mail_channel
+#: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
+msgid "Group"
+msgstr "Groupe"
+
+#. module: website_mail_channel
#: model:ir.ui.view,arch_db:website_mail_channel.invalid_token_subscription
msgid "Invalid or expired confirmation link."
msgstr "Lien de confirmation invalide ou expiré."
#. module: website_mail_channel
-#: model:ir.ui.view,arch_db:website_mail_channel.footer_mailing_list
-msgid "Mailing List"
-msgstr "Liste de diffusion"
-
-#. module: website_mail_channel
#: model:ir.ui.view,arch_db:website_mail_channel.group_message
#: model:ir.ui.view,arch_db:website_mail_channel.group_messages
+#: model:website.menu,name:website_mail_channel.menu_mailing_list
msgid "Mailing Lists"
msgstr "Listes de diffusion"
@@ -153,10 +314,8 @@ msgstr "Liste de diffusion"
#: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
msgid ""
"Need to unsubscribe? It's right here! <span class=\"fa fa-2x fa-arrow-down "
-"pull-right\"/>"
+"float-right\" role=\"img\" aria-label=\"\" title=\"Read this !\"/>"
msgstr ""
-"Besoin de se désinscrire ? C'est par ici ! <span class=\"fa fa-2x fa-arrow-"
-"down pull-right\"/>"
#. module: website_mail_channel
#: model:ir.model,name:website_mail_channel.model_mail_mail
@@ -164,16 +323,6 @@ msgid "Outgoing Mails"
msgstr "Courriels à envoyer"
#. module: website_mail_channel
-#: model:mail.template,subject:website_mail_channel.mail_template_list_subscribe
-msgid "Please confirm subscription to ${object.name}"
-msgstr "Confirmez votre abonnement à ${object.name}"
-
-#. module: website_mail_channel
-#: model:mail.template,subject:website_mail_channel.mail_template_list_unsubscribe
-msgid "Please confirm unsubscription to ${object.name}"
-msgstr "Confirmez votre désabonnement de ${object.name}"
-
-#. module: website_mail_channel
#: code:addons/website_mail_channel/models/mail_mail.py:21
#, python-format
msgid "Post to"
@@ -225,13 +374,7 @@ msgstr "Vous avez été correctement"
#. module: website_mail_channel
#: model:ir.ui.view,arch_db:website_mail_channel.subscribe
msgid "a confirmation email has been sent."
-msgstr "un courriel de confirmation a été envoyé"
-
-#. module: website_mail_channel
-#: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
-#: model:ir.ui.view,arch_db:website_mail_channel.subscribe
-msgid "archives"
-msgstr "archives"
+msgstr "un email de confirmation a été envoyé"
#. module: website_mail_channel
#: model:ir.ui.view,arch_db:website_mail_channel.group_message
@@ -261,16 +404,14 @@ msgstr ""
#: model:ir.ui.view,arch_db:website_mail_channel.group_message
#: model:ir.ui.view,arch_db:website_mail_channel.group_messages
msgid "mailing list archives"
-msgstr "archives des diffusions par email"
+msgstr "archives"
#. module: website_mail_channel
#: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
msgid ""
"members<br/>\n"
-" <i class=\"fa fa-fw fa-envelope-o\"/>"
+" <i class=\"fa fa-fw fa-envelope-o\" role=\"img\" aria-label=\"Traffic\" title=\"Traffic\"/>"
msgstr ""
-"membres<br/>\n"
-"<i class=\"fa fa-fw fa-envelope-o\"/>"
#. module: website_mail_channel
#: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
@@ -288,12 +429,6 @@ msgid "replies"
msgstr "réponses"
#. module: website_mail_channel
-#: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
-#: model:ir.ui.view,arch_db:website_mail_channel.subscribe
-msgid "send mail"
-msgstr "envoyer un email"
-
-#. module: website_mail_channel
#: model:ir.ui.view,arch_db:website_mail_channel.messages_short
msgid "show"
msgstr "montrer"
@@ -301,7 +436,7 @@ msgstr "montrer"
#. module: website_mail_channel
#: model:ir.ui.view,arch_db:website_mail_channel.confirmation_subscription
msgid "subscribed"
-msgstr "abonnée"
+msgstr "abonné(e)"
#. module: website_mail_channel
#: model:ir.ui.view,arch_db:website_mail_channel.confirmation_subscription
@@ -309,12 +444,6 @@ msgid "to the mailing list."
msgstr "à la liste de diffusion."
#. module: website_mail_channel
-#: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
-#: model:ir.ui.view,arch_db:website_mail_channel.subscribe
-msgid "unsubscribe"
-msgstr "se désinscrire"
-
-#. module: website_mail_channel
#: model:ir.ui.view,arch_db:website_mail_channel.confirmation_subscription
msgid "unsubscribed"
msgstr "désabonné"
@@ -323,4 +452,4 @@ msgstr "désabonné"
#: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
#: model:ir.ui.view,arch_db:website_mail_channel.subscribe
msgid "your email..."
-msgstr "Votre adresse courriel..."
+msgstr "Votre adresse email..."
diff --git a/addons/website_mail_channel/i18n/mn.po b/addons/website_mail_channel/i18n/mn.po
index 2febeda89cd..4a3e49ec7b8 100644
--- a/addons/website_mail_channel/i18n/mn.po
+++ b/addons/website_mail_channel/i18n/mn.po
@@ -6,14 +6,13 @@
# Martin Trigaux, 2018
# Otgonbayar.A <gobi.mn@gmail.com>, 2018
# Khishigbat Ganbold <khishigbat@asterisk-tech.mn>, 2018
-# Onii Onii <onii0223@yahoo.com>, 2018
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.2\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-03-22 14:11+0000\n"
-"PO-Revision-Date: 2018-03-22 14:11+0000\n"
-"Last-Translator: Onii Onii <onii0223@yahoo.com>, 2018\n"
+"POT-Creation-Date: 2018-08-24 09:05+0000\n"
+"PO-Revision-Date: 2018-08-24 09:05+0000\n"
+"Last-Translator: Khishigbat Ganbold <khishigbat@asterisk-tech.mn>, 2018\n"
"Language-Team: Mongolian (https://www.transifex.com/odoo/teams/41243/mn/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -22,42 +21,22 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. module: website_mail_channel
-#: model:mail.template,body_html:website_mail_channel.mail_template_list_subscribe
-msgid ""
-"<?xml version=\"1.0\"?>\n"
-"<data><p>Hello,</p>\n"
-"<p>You have requested to be subscribed to the mailing list <strong>${object.name}</strong></p>\n"
-"<p>To confirm, please visit the following link:</p>\n"
-"<p><strong><a href=\"${ctx['token_url']}\">${ctx['token_url']}</a></strong></p>\n"
-"<p>If this was a mistake or you did not requested this action, please ignore this message.</p>\n"
-"</data>"
+#: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
+#: model:ir.ui.view,arch_db:website_mail_channel.subscribe
+msgid "<i class=\"fa fa-envelope-o\"/> send mail"
msgstr ""
-" \n"
-"<data><p>Сайн байна уу,</p>\n"
-"<p>Та <strong>${object.name}</strong> мэйлийн жагсаалтад бүртгүүлэхийг хүссэн байна.</p>\n"
-"<p>Батлахын тулд дараах холбоос дээр дарна уу:</p>\n"
-"<p><strong><a href=\"${ctx['token_url']}\">${ctx['token_url']}</a></strong></p>\n"
-"<p>Хэрэв энэ алдаа байсан бол эсвэл та энэ хүсэлтийг илгээгээгүй бол энэ зурвасыг орхино уу.</p>\n"
-"</data>"
#. module: website_mail_channel
-#: model:mail.template,body_html:website_mail_channel.mail_template_list_unsubscribe
-msgid ""
-"<?xml version=\"1.0\"?>\n"
-"<data><p>Hello,</p>\n"
-"<p>You have requested to be unsubscribed to the mailing list <strong>${object.name}</strong></p>\n"
-"<p>To confirm, please visit the following link:</p>\n"
-"<p><strong><a href=\"${ctx['token_url']}\">${ctx['token_url']}</a></strong></p>\n"
-"<p>If this was a mistake or you did not requested this action, please ignore this message.</p>\n"
-"</data>"
+#: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
+#: model:ir.ui.view,arch_db:website_mail_channel.subscribe
+msgid "<i class=\"fa fa-file-o\"/> archives"
+msgstr ""
+
+#. module: website_mail_channel
+#: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
+#: model:ir.ui.view,arch_db:website_mail_channel.subscribe
+msgid "<i class=\"fa fa-times\"/> unsubscribe"
msgstr ""
-" \n"
-"<data><p>Сайн байна уу,</p>\n"
-"<p>Та <strong>${object.name}</strong> мэйлийн жагсаалтаас хасуулахыг хүссэн байна.</p>\n"
-"<p>Батлах бол дараах холбоос дээр дарна уу:</p>\n"
-"<p><strong><a href=\"${ctx['token_url']}\">${ctx['token_url']}</a></strong></p>\n"
-"<p>Хэрэв энэ алдаа байсан бол эсвэл та энэ хүсэлтийг илгээгээгүй бол энэ зурвасыг орхино уу.</p>\n"
-"</data>"
#. module: website_mail_channel
#: model:ir.ui.view,arch_db:website_mail_channel.subscribe
@@ -65,6 +44,172 @@ msgid "<span class=\"oe_snippet_thumbnail_title\">Discussion Group</span>"
msgstr "<span class=\"oe_snippet_thumbnail_title\">Хэлэлцүүлгийн Бүлэг</span>"
#. module: website_mail_channel
+#: model:mail.template,body_html:website_mail_channel.mail_template_list_subscribe
+msgid ""
+"<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" style=\"padding-top: 16px; background-color: #F1F1F1; font-family:Verdana, Arial,sans-serif; color: #454748; width: 100%; border-collapse:separate;\"><tr><td align=\"center\">\n"
+"<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"padding: 16px; background-color: white; color: #454748; border-collapse:separate;\">\n"
+"<tbody>\n"
+" <!-- HEADER -->\n"
+" <tr>\n"
+" <td align=\"center\" style=\"min-width: 590px;\">\n"
+" <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: white; padding: 0px 8px 0px 8px; border-collapse:separate;\">\n"
+" <tr><td valign=\"middle\">\n"
+" <span style=\"font-size: 10px;\">Your Channel</span><br/>\n"
+" <span style=\"font-size: 20px; font-weight: bold;\">${object.name}</span>\n"
+" </td><td valign=\"middle\" align=\"right\">\n"
+" <img src=\"/logo.png?company=${user.company_id.id}\" style=\"padding: 0px; margin: 0px; height: auto; width: 80px;\" alt=\"${user.company_id.name}\"/>\n"
+" </td></tr>\n"
+" <tr><td colspan=\"2\" style=\"text-align:center;\">\n"
+" <hr width=\"100%\" style=\"background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0; margin:16px 0px 16px 0px;\"/>\n"
+" </td></tr>\n"
+" </table>\n"
+" </td>\n"
+" </tr>\n"
+" <!-- CONTENT -->\n"
+" <tr>\n"
+" <td align=\"center\" style=\"min-width: 590px;\">\n"
+" <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: white; padding: 0px 8px 0px 8px; border-collapse:separate;\">\n"
+" <tr><td valign=\"top\" style=\"font-size: 13px;\">\n"
+" <div style=\"margin: 0px; padding: 0px;\">\n"
+" Hello,<br/><br/>\n"
+" You have requested to be subscribed to the mailing list <strong>${object.name}</strong>.\n"
+" <br/><br/>\n"
+" To confirm, please visit the following link: <strong><a href=\"${ctx['token_url']}\">${ctx['token_url']}</a></strong>\n"
+" <br/><br/>\n"
+" If this was a mistake or you did not requested this action, please ignore this message.\n"
+" % if user.signature\n"
+" <br/>\n"
+" ${user.signature | safe}\n"
+" % endif\n"
+" </div>\n"
+" </td></tr>\n"
+" <tr><td style=\"text-align:center;\">\n"
+" <hr width=\"100%\" style=\"background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0; margin: 16px 0px 16px 0px;\"/>\n"
+" </td></tr>\n"
+" </table>\n"
+" </td>\n"
+" </tr>\n"
+" <!-- FOOTER -->\n"
+" <tr>\n"
+" <td align=\"center\" style=\"min-width: 590px;\">\n"
+" <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: white; font-size: 11px; padding: 0px 8px 0px 8px; border-collapse:separate;\">\n"
+" <tr><td valign=\"middle\" align=\"left\">\n"
+" ${user.company_id.name}\n"
+" </td></tr>\n"
+" <tr><td valign=\"middle\" align=\"left\" style=\"opacity: 0.7;\">\n"
+" % if user.company_id.phone\n"
+" ${user.company_id.phone} |\n"
+" %endif\n"
+" % if user.company_id.email\n"
+" <a href=\"'mailto:%s' % ${user.company_id.email}\" style=\"text-decoration:none; color: #454748;\">${user.company_id.email}</a> |\n"
+" % endif\n"
+" % if user.company_id.website\n"
+" <a href=\"'%s' % ${user.company_id.website}\" style=\"text-decoration:none; color: #454748;\">${user.company_id.website}\n"
+" </a>\n"
+" % endif\n"
+" </td></tr>\n"
+" </table>\n"
+" </td>\n"
+" </tr>\n"
+"</tbody>\n"
+"</table>\n"
+"</td></tr>\n"
+"<!-- POWERED BY -->\n"
+"<tr><td align=\"center\" style=\"min-width: 590px;\">\n"
+" <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: #F1F1F1; color: #454748; padding: 8px; border-collapse:separate;\">\n"
+" <tr><td style=\"text-align: center; font-size: 13px;\">\n"
+" Powered by <a target=\"_blank\" href=\"https://www.odoo.com?utm_source=db&amp;utm_medium=mail\" style=\"color: #875A7B;\">Odoo</a>\n"
+" </td></tr>\n"
+" </table>\n"
+"</td></tr>\n"
+"</table>\n"
+" "
+msgstr ""
+
+#. module: website_mail_channel
+#: model:mail.template,body_html:website_mail_channel.mail_template_list_unsubscribe
+msgid ""
+"<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" style=\"padding-top: 16px; background-color: #F1F1F1; font-family:Verdana, Arial,sans-serif; color: #454748; width: 100%; border-collapse:separate;\"><tr><td align=\"center\">\n"
+"<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"padding: 16px; background-color: white; color: #454748; border-collapse:separate;\">\n"
+"<tbody>\n"
+" <!-- HEADER -->\n"
+" <tr>\n"
+" <td align=\"center\" style=\"min-width: 590px;\">\n"
+" <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: white; padding: 0px 8px 0px 8px; border-collapse:separate;\">\n"
+" <tr><td valign=\"middle\">\n"
+" <span style=\"font-size: 10px;\">Your Channel</span><br/>\n"
+" <span style=\"font-size: 20px; font-weight: bold;\">${object.name}</span>\n"
+" </td><td valign=\"middle\" align=\"right\">\n"
+" <img src=\"/logo.png?company=${user.company_id.id}\" style=\"padding: 0px; margin: 0px; height: auto; width: 80px;\" alt=\"${user.company_id.name}\"/>\n"
+" </td></tr>\n"
+" <tr><td colspan=\"2\" style=\"text-align:center;\">\n"
+" <hr width=\"100%\" style=\"background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0; margin:16px 0px 16px 0px;\"/>\n"
+" </td></tr>\n"
+" </table>\n"
+" </td>\n"
+" </tr>\n"
+" <!-- CONTENT -->\n"
+" <tr>\n"
+" <td align=\"center\" style=\"min-width: 590px;\">\n"
+" <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: white; padding: 0px 8px 0px 8px; border-collapse:separate;\">\n"
+" <tr><td valign=\"top\" style=\"font-size: 13px;\">\n"
+" <div style=\"margin: 0px; padding: 0px;\">\n"
+" Hello,<br/><br/>\n"
+" You have requested to be unsubscribed to the mailing list <strong>${object.name}</strong>.\n"
+" <br/><br/>\n"
+" To confirm, please visit the following link: <strong><a href=\"${ctx['token_url']}\">${ctx['token_url']}</a></strong>.\n"
+" <br/><br/>\n"
+" If this was a mistake or you did not requested this action, please ignore this message.\n"
+" % if user.signature:\n"
+" <br/>\n"
+" ${user.signature | safe}\n"
+" % endif\n"
+" </div>\n"
+" </td></tr>\n"
+" <tr><td style=\"text-align:center;\">\n"
+" <hr width=\"100%\" style=\"background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0; margin: 16px 0px 16px 0px;\"/>\n"
+" </td></tr>\n"
+" </table>\n"
+" </td>\n"
+" </tr>\n"
+" <!-- FOOTER -->\n"
+" <tr>\n"
+" <td align=\"center\" style=\"min-width: 590px;\">\n"
+" <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: white; font-size: 11px; padding: 0px 8px 0px 8px; border-collapse:separate;\">\n"
+" <tr><td valign=\"middle\" align=\"left\">\n"
+" ${user.company_id.name}\n"
+" </td></tr>\n"
+" <tr><td valign=\"middle\" align=\"left\" style=\"opacity: 0.7;\">\n"
+" % if user.company_id.phone\n"
+" ${user.company_id.phone} |\n"
+" %endif\n"
+" % if user.company_id.email\n"
+" <a href=\"'mailto:%s' % ${user.company_id.email}\" style=\"text-decoration:none; color: #454748;\">${user.company_id.email}</a> |\n"
+" % endif\n"
+" % if user.company_id.website\n"
+" <a href=\"'%s' % ${user.company_id.website}\" style=\"text-decoration:none; color: #454748;\">${user.company_id.website}\n"
+" </a>\n"
+" % endif\n"
+" </td></tr>\n"
+" </table>\n"
+" </td>\n"
+" </tr>\n"
+"</tbody>\n"
+"</table>\n"
+"</td></tr>\n"
+"<!-- POWERED BY -->\n"
+"<tr><td align=\"center\" style=\"min-width: 590px;\">\n"
+" <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: #F1F1F1; color: #454748; padding: 8px; border-collapse:separate;\">\n"
+" <tr><td style=\"text-align: center; font-size: 13px;\">\n"
+" Powered by <a target=\"_blank\" href=\"https://www.odoo.com?utm_source=db&amp;utm_medium=mail\" style=\"color: #875A7B;\">Odoo</a>\n"
+" </td></tr>\n"
+" </table>\n"
+"</td></tr>\n"
+"</table>\n"
+" "
+msgstr ""
+
+#. module: website_mail_channel
#. openerp-web
#: code:addons/website_mail_channel/static/src/js/website_mail_channel.editor.js:17
#, python-format
@@ -83,6 +228,12 @@ msgstr "Архив"
#. module: website_mail_channel
#: model:ir.ui.view,arch_db:website_mail_channel.group_message
+#: model:ir.ui.view,arch_db:website_mail_channel.messages_short
+msgid "Avatar"
+msgstr "Зураг"
+
+#. module: website_mail_channel
+#: model:ir.ui.view,arch_db:website_mail_channel.group_message
msgid "Browse archives"
msgstr "Архивыг үзэх"
@@ -104,6 +255,16 @@ msgid "Change Discussion List"
msgstr "Хөөрөлдөөний жагсаалтыг өөрчлөх"
#. module: website_mail_channel
+#: model:mail.template,subject:website_mail_channel.mail_template_list_subscribe
+msgid "Confirm subscription to ${object.name}"
+msgstr ""
+
+#. module: website_mail_channel
+#: model:mail.template,subject:website_mail_channel.mail_template_list_unsubscribe
+msgid "Confirm unsubscription to ${object.name}"
+msgstr ""
+
+#. module: website_mail_channel
#. openerp-web
#: code:addons/website_mail_channel/static/src/js/website_mail_channel.editor.js:18
#, python-format
@@ -121,18 +282,19 @@ msgid "Follow-Ups"
msgstr "Мөшгөлтүүд"
#. module: website_mail_channel
+#: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
+msgid "Group"
+msgstr "Групп"
+
+#. module: website_mail_channel
#: model:ir.ui.view,arch_db:website_mail_channel.invalid_token_subscription
msgid "Invalid or expired confirmation link."
msgstr "Буруу эсвэл хугацаа нь дууссан баталгаажуулалтын холбоос."
#. module: website_mail_channel
-#: model:ir.ui.view,arch_db:website_mail_channel.footer_mailing_list
-msgid "Mailing List"
-msgstr "Мэйлийн жагсаалт"
-
-#. module: website_mail_channel
#: model:ir.ui.view,arch_db:website_mail_channel.group_message
#: model:ir.ui.view,arch_db:website_mail_channel.group_messages
+#: model:website.menu,name:website_mail_channel.menu_mailing_list
msgid "Mailing Lists"
msgstr "Мэйлийн жагсаалт"
@@ -146,10 +308,8 @@ msgstr "Мэйлийн жагсаалт"
#: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
msgid ""
"Need to unsubscribe? It's right here! <span class=\"fa fa-2x fa-arrow-down "
-"pull-right\"/>"
+"float-right\" role=\"img\" aria-label=\"\" title=\"Read this !\"/>"
msgstr ""
-"Бүртгэлээ хасуулмаар байна уу? <span class=\"fa fa-2x fa-arrow-down pull-"
-"right\"/>"
#. module: website_mail_channel
#: model:ir.model,name:website_mail_channel.model_mail_mail
@@ -157,16 +317,6 @@ msgid "Outgoing Mails"
msgstr "Явсан мэйлүүд"
#. module: website_mail_channel
-#: model:mail.template,subject:website_mail_channel.mail_template_list_subscribe
-msgid "Please confirm subscription to ${object.name}"
-msgstr "${object.name} -н бүртгэлийг батлана уу"
-
-#. module: website_mail_channel
-#: model:mail.template,subject:website_mail_channel.mail_template_list_unsubscribe
-msgid "Please confirm unsubscription to ${object.name}"
-msgstr "${object.name} -н бүртгэлээс хасахыг батлана уу"
-
-#. module: website_mail_channel
#: code:addons/website_mail_channel/models/mail_mail.py:21
#, python-format
msgid "Post to"
@@ -219,12 +369,6 @@ msgid "a confirmation email has been sent."
msgstr "баталгаажуулалтын имэйл илгээгдсэн."
#. module: website_mail_channel
-#: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
-#: model:ir.ui.view,arch_db:website_mail_channel.subscribe
-msgid "archives"
-msgstr "архивууд"
-
-#. module: website_mail_channel
#: model:ir.ui.view,arch_db:website_mail_channel.group_message
msgid "attachments"
msgstr "хавсралтууд"
@@ -254,10 +398,8 @@ msgstr "мэйлийн жагсаалтын архивууд"
#: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
msgid ""
"members<br/>\n"
-" <i class=\"fa fa-fw fa-envelope-o\"/>"
+" <i class=\"fa fa-fw fa-envelope-o\" role=\"img\" aria-label=\"Traffic\" title=\"Traffic\"/>"
msgstr ""
-"гишүүд<br/>\n"
-" <i class=\"fa fa-fw fa-envelope-o\"/>"
#. module: website_mail_channel
#: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
@@ -275,12 +417,6 @@ msgid "replies"
msgstr "хариунууд"
#. module: website_mail_channel
-#: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
-#: model:ir.ui.view,arch_db:website_mail_channel.subscribe
-msgid "send mail"
-msgstr "мэйл илгээх"
-
-#. module: website_mail_channel
#: model:ir.ui.view,arch_db:website_mail_channel.messages_short
msgid "show"
msgstr "үзүүлэх"
@@ -296,12 +432,6 @@ msgid "to the mailing list."
msgstr "мэйлийн жагсаалтад."
#. module: website_mail_channel
-#: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
-#: model:ir.ui.view,arch_db:website_mail_channel.subscribe
-msgid "unsubscribe"
-msgstr "бүртгэлээ хасуулах"
-
-#. module: website_mail_channel
#: model:ir.ui.view,arch_db:website_mail_channel.confirmation_subscription
msgid "unsubscribed"
msgstr "бүртгэл хасуулсан"
diff --git a/addons/website_mail_channel/i18n/nb.po b/addons/website_mail_channel/i18n/nb.po
index f2089cbc61b..bf8e682c62d 100644
--- a/addons/website_mail_channel/i18n/nb.po
+++ b/addons/website_mail_channel/i18n/nb.po
@@ -3,14 +3,14 @@
# * website_mail_channel
#
# Translators:
-# Viktor Basso <viktor@voit.no>, 2018
+# Martin Trigaux, 2018
# Jorunn D. Newth, 2018
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.2\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-03-22 14:11+0000\n"
-"PO-Revision-Date: 2018-03-22 14:11+0000\n"
+"POT-Creation-Date: 2018-08-24 09:05+0000\n"
+"PO-Revision-Date: 2018-08-24 09:05+0000\n"
"Last-Translator: Jorunn D. Newth, 2018\n"
"Language-Team: Norwegian Bokmål (https://www.transifex.com/odoo/teams/41243/nb/)\n"
"MIME-Version: 1.0\n"
@@ -20,42 +20,22 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. module: website_mail_channel
-#: model:mail.template,body_html:website_mail_channel.mail_template_list_subscribe
-msgid ""
-"<?xml version=\"1.0\"?>\n"
-"<data><p>Hello,</p>\n"
-"<p>You have requested to be subscribed to the mailing list <strong>${object.name}</strong></p>\n"
-"<p>To confirm, please visit the following link:</p>\n"
-"<p><strong><a href=\"${ctx['token_url']}\">${ctx['token_url']}</a></strong></p>\n"
-"<p>If this was a mistake or you did not requested this action, please ignore this message.</p>\n"
-"</data>"
+#: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
+#: model:ir.ui.view,arch_db:website_mail_channel.subscribe
+msgid "<i class=\"fa fa-envelope-o\"/> send mail"
msgstr ""
-"<?xml version=\"1.0\"?>\n"
-"<data><p>Hei,</p>\n"
-"<p>Vi har mottatt en forespørsel om å melde deg på epostlisten <strong>${object.name}</strong></p>\n"
-"<p>Bekreft påmelding ved å gå hit:</p>\n"
-"<p><strong><a href=\"${ctx['token_url']}\">${ctx['token_url']}</a></strong></p>\n"
-"<p>Hvis dette var en feil, eller du ikke har bedt om å bli påmeldt, kan du se bort fra denne meldingen.</p>\n"
-"</data>"
#. module: website_mail_channel
-#: model:mail.template,body_html:website_mail_channel.mail_template_list_unsubscribe
-msgid ""
-"<?xml version=\"1.0\"?>\n"
-"<data><p>Hello,</p>\n"
-"<p>You have requested to be unsubscribed to the mailing list <strong>${object.name}</strong></p>\n"
-"<p>To confirm, please visit the following link:</p>\n"
-"<p><strong><a href=\"${ctx['token_url']}\">${ctx['token_url']}</a></strong></p>\n"
-"<p>If this was a mistake or you did not requested this action, please ignore this message.</p>\n"
-"</data>"
+#: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
+#: model:ir.ui.view,arch_db:website_mail_channel.subscribe
+msgid "<i class=\"fa fa-file-o\"/> archives"
+msgstr ""
+
+#. module: website_mail_channel
+#: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
+#: model:ir.ui.view,arch_db:website_mail_channel.subscribe
+msgid "<i class=\"fa fa-times\"/> unsubscribe"
msgstr ""
-"<?xml version=\"1.0\"?>\n"
-"<data><p>Hei,</p>\n"
-"<p>Vi har mottatt en forespørsel om å melde deg av epostlisten <strong>${object.name}</strong></p>\n"
-"<p>Bekreft avmelding ved å gå hit:</p>\n"
-"<p><strong><a href=\"${ctx['token_url']}\">${ctx['token_url']}</a></strong></p>\n"
-"<p>Hvis dette var en feil, eller du ikke har bedt om å bli avmeldt, kan du se bort fra denne meldingen.</p>\n"
-"</data>"
#. module: website_mail_channel
#: model:ir.ui.view,arch_db:website_mail_channel.subscribe
@@ -63,6 +43,172 @@ msgid "<span class=\"oe_snippet_thumbnail_title\">Discussion Group</span>"
msgstr "<span class=\"oe_snippet_thumbnail_title\">Diskusjonsgruppe</span>"
#. module: website_mail_channel
+#: model:mail.template,body_html:website_mail_channel.mail_template_list_subscribe
+msgid ""
+"<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" style=\"padding-top: 16px; background-color: #F1F1F1; font-family:Verdana, Arial,sans-serif; color: #454748; width: 100%; border-collapse:separate;\"><tr><td align=\"center\">\n"
+"<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"padding: 16px; background-color: white; color: #454748; border-collapse:separate;\">\n"
+"<tbody>\n"
+" <!-- HEADER -->\n"
+" <tr>\n"
+" <td align=\"center\" style=\"min-width: 590px;\">\n"
+" <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: white; padding: 0px 8px 0px 8px; border-collapse:separate;\">\n"
+" <tr><td valign=\"middle\">\n"
+" <span style=\"font-size: 10px;\">Your Channel</span><br/>\n"
+" <span style=\"font-size: 20px; font-weight: bold;\">${object.name}</span>\n"
+" </td><td valign=\"middle\" align=\"right\">\n"
+" <img src=\"/logo.png?company=${user.company_id.id}\" style=\"padding: 0px; margin: 0px; height: auto; width: 80px;\" alt=\"${user.company_id.name}\"/>\n"
+" </td></tr>\n"
+" <tr><td colspan=\"2\" style=\"text-align:center;\">\n"
+" <hr width=\"100%\" style=\"background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0; margin:16px 0px 16px 0px;\"/>\n"
+" </td></tr>\n"
+" </table>\n"
+" </td>\n"
+" </tr>\n"
+" <!-- CONTENT -->\n"
+" <tr>\n"
+" <td align=\"center\" style=\"min-width: 590px;\">\n"
+" <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: white; padding: 0px 8px 0px 8px; border-collapse:separate;\">\n"
+" <tr><td valign=\"top\" style=\"font-size: 13px;\">\n"
+" <div style=\"margin: 0px; padding: 0px;\">\n"
+" Hello,<br/><br/>\n"
+" You have requested to be subscribed to the mailing list <strong>${object.name}</strong>.\n"
+" <br/><br/>\n"
+" To confirm, please visit the following link: <strong><a href=\"${ctx['token_url']}\">${ctx['token_url']}</a></strong>\n"
+" <br/><br/>\n"
+" If this was a mistake or you did not requested this action, please ignore this message.\n"
+" % if user.signature\n"
+" <br/>\n"
+" ${user.signature | safe}\n"
+" % endif\n"
+" </div>\n"
+" </td></tr>\n"
+" <tr><td style=\"text-align:center;\">\n"
+" <hr width=\"100%\" style=\"background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0; margin: 16px 0px 16px 0px;\"/>\n"
+" </td></tr>\n"
+" </table>\n"
+" </td>\n"
+" </tr>\n"
+" <!-- FOOTER -->\n"
+" <tr>\n"
+" <td align=\"center\" style=\"min-width: 590px;\">\n"
+" <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: white; font-size: 11px; padding: 0px 8px 0px 8px; border-collapse:separate;\">\n"
+" <tr><td valign=\"middle\" align=\"left\">\n"
+" ${user.company_id.name}\n"
+" </td></tr>\n"
+" <tr><td valign=\"middle\" align=\"left\" style=\"opacity: 0.7;\">\n"
+" % if user.company_id.phone\n"
+" ${user.company_id.phone} |\n"
+" %endif\n"
+" % if user.company_id.email\n"
+" <a href=\"'mailto:%s' % ${user.company_id.email}\" style=\"text-decoration:none; color: #454748;\">${user.company_id.email}</a> |\n"
+" % endif\n"
+" % if user.company_id.website\n"
+" <a href=\"'%s' % ${user.company_id.website}\" style=\"text-decoration:none; color: #454748;\">${user.company_id.website}\n"
+" </a>\n"
+" % endif\n"
+" </td></tr>\n"
+" </table>\n"
+" </td>\n"
+" </tr>\n"
+"</tbody>\n"
+"</table>\n"
+"</td></tr>\n"
+"<!-- POWERED BY -->\n"
+"<tr><td align=\"center\" style=\"min-width: 590px;\">\n"
+" <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: #F1F1F1; color: #454748; padding: 8px; border-collapse:separate;\">\n"
+" <tr><td style=\"text-align: center; font-size: 13px;\">\n"
+" Powered by <a target=\"_blank\" href=\"https://www.odoo.com?utm_source=db&amp;utm_medium=mail\" style=\"color: #875A7B;\">Odoo</a>\n"
+" </td></tr>\n"
+" </table>\n"
+"</td></tr>\n"
+"</table>\n"
+" "
+msgstr ""
+
+#. module: website_mail_channel
+#: model:mail.template,body_html:website_mail_channel.mail_template_list_unsubscribe
+msgid ""
+"<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" style=\"padding-top: 16px; background-color: #F1F1F1; font-family:Verdana, Arial,sans-serif; color: #454748; width: 100%; border-collapse:separate;\"><tr><td align=\"center\">\n"
+"<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"padding: 16px; background-color: white; color: #454748; border-collapse:separate;\">\n"
+"<tbody>\n"
+" <!-- HEADER -->\n"
+" <tr>\n"
+" <td align=\"center\" style=\"min-width: 590px;\">\n"
+" <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: white; padding: 0px 8px 0px 8px; border-collapse:separate;\">\n"
+" <tr><td valign=\"middle\">\n"
+" <span style=\"font-size: 10px;\">Your Channel</span><br/>\n"
+" <span style=\"font-size: 20px; font-weight: bold;\">${object.name}</span>\n"
+" </td><td valign=\"middle\" align=\"right\">\n"
+" <img src=\"/logo.png?company=${user.company_id.id}\" style=\"padding: 0px; margin: 0px; height: auto; width: 80px;\" alt=\"${user.company_id.name}\"/>\n"
+" </td></tr>\n"
+" <tr><td colspan=\"2\" style=\"text-align:center;\">\n"
+" <hr width=\"100%\" style=\"background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0; margin:16px 0px 16px 0px;\"/>\n"
+" </td></tr>\n"
+" </table>\n"
+" </td>\n"
+" </tr>\n"
+" <!-- CONTENT -->\n"
+" <tr>\n"
+" <td align=\"center\" style=\"min-width: 590px;\">\n"
+" <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: white; padding: 0px 8px 0px 8px; border-collapse:separate;\">\n"
+" <tr><td valign=\"top\" style=\"font-size: 13px;\">\n"
+" <div style=\"margin: 0px; padding: 0px;\">\n"
+" Hello,<br/><br/>\n"
+" You have requested to be unsubscribed to the mailing list <strong>${object.name}</strong>.\n"
+" <br/><br/>\n"
+" To confirm, please visit the following link: <strong><a href=\"${ctx['token_url']}\">${ctx['token_url']}</a></strong>.\n"
+" <br/><br/>\n"
+" If this was a mistake or you did not requested this action, please ignore this message.\n"
+" % if user.signature:\n"
+" <br/>\n"
+" ${user.signature | safe}\n"
+" % endif\n"
+" </div>\n"
+" </td></tr>\n"
+" <tr><td style=\"text-align:center;\">\n"
+" <hr width=\"100%\" style=\"background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0; margin: 16px 0px 16px 0px;\"/>\n"
+" </td></tr>\n"
+" </table>\n"
+" </td>\n"
+" </tr>\n"
+" <!-- FOOTER -->\n"
+" <tr>\n"
+" <td align=\"center\" style=\"min-width: 590px;\">\n"
+" <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: white; font-size: 11px; padding: 0px 8px 0px 8px; border-collapse:separate;\">\n"
+" <tr><td valign=\"middle\" align=\"left\">\n"
+" ${user.company_id.name}\n"
+" </td></tr>\n"
+" <tr><td valign=\"middle\" align=\"left\" style=\"opacity: 0.7;\">\n"
+" % if user.company_id.phone\n"
+" ${user.company_id.phone} |\n"
+" %endif\n"
+" % if user.company_id.email\n"
+" <a href=\"'mailto:%s' % ${user.company_id.email}\" style=\"text-decoration:none; color: #454748;\">${user.company_id.email}</a> |\n"
+" % endif\n"
+" % if user.company_id.website\n"
+" <a href=\"'%s' % ${user.company_id.website}\" style=\"text-decoration:none; color: #454748;\">${user.company_id.website}\n"
+" </a>\n"
+" % endif\n"
+" </td></tr>\n"
+" </table>\n"
+" </td>\n"
+" </tr>\n"
+"</tbody>\n"
+"</table>\n"
+"</td></tr>\n"
+"<!-- POWERED BY -->\n"
+"<tr><td align=\"center\" style=\"min-width: 590px;\">\n"
+" <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: #F1F1F1; color: #454748; padding: 8px; border-collapse:separate;\">\n"
+" <tr><td style=\"text-align: center; font-size: 13px;\">\n"
+" Powered by <a target=\"_blank\" href=\"https://www.odoo.com?utm_source=db&amp;utm_medium=mail\" style=\"color: #875A7B;\">Odoo</a>\n"
+" </td></tr>\n"
+" </table>\n"
+"</td></tr>\n"
+"</table>\n"
+" "
+msgstr ""
+
+#. module: website_mail_channel
#. openerp-web
#: code:addons/website_mail_channel/static/src/js/website_mail_channel.editor.js:17
#, python-format
@@ -81,6 +227,12 @@ msgstr "Arkiv"
#. module: website_mail_channel
#: model:ir.ui.view,arch_db:website_mail_channel.group_message
+#: model:ir.ui.view,arch_db:website_mail_channel.messages_short
+msgid "Avatar"
+msgstr "Avatar"
+
+#. module: website_mail_channel
+#: model:ir.ui.view,arch_db:website_mail_channel.group_message
msgid "Browse archives"
msgstr "Bla i arkivet"
@@ -102,6 +254,16 @@ msgid "Change Discussion List"
msgstr "Bytt diskusjonsliste"
#. module: website_mail_channel
+#: model:mail.template,subject:website_mail_channel.mail_template_list_subscribe
+msgid "Confirm subscription to ${object.name}"
+msgstr ""
+
+#. module: website_mail_channel
+#: model:mail.template,subject:website_mail_channel.mail_template_list_unsubscribe
+msgid "Confirm unsubscription to ${object.name}"
+msgstr ""
+
+#. module: website_mail_channel
#. openerp-web
#: code:addons/website_mail_channel/static/src/js/website_mail_channel.editor.js:18
#, python-format
@@ -119,18 +281,19 @@ msgid "Follow-Ups"
msgstr "Oppfølginger"
#. module: website_mail_channel
+#: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
+msgid "Group"
+msgstr "Gruppe"
+
+#. module: website_mail_channel
#: model:ir.ui.view,arch_db:website_mail_channel.invalid_token_subscription
msgid "Invalid or expired confirmation link."
msgstr "Ugyldig eller utløpt bekreftelseslink."
#. module: website_mail_channel
-#: model:ir.ui.view,arch_db:website_mail_channel.footer_mailing_list
-msgid "Mailing List"
-msgstr "Epostliste"
-
-#. module: website_mail_channel
#: model:ir.ui.view,arch_db:website_mail_channel.group_message
#: model:ir.ui.view,arch_db:website_mail_channel.group_messages
+#: model:website.menu,name:website_mail_channel.menu_mailing_list
msgid "Mailing Lists"
msgstr "Epostlister"
@@ -144,10 +307,8 @@ msgstr "Epostliste"
#: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
msgid ""
"Need to unsubscribe? It's right here! <span class=\"fa fa-2x fa-arrow-down "
-"pull-right\"/>"
+"float-right\" role=\"img\" aria-label=\"\" title=\"Read this !\"/>"
msgstr ""
-"Skal du melde deg av? Det gjør du her! <span class=\"fa fa-2x fa-arrow-down "
-"pull-right\"/>"
#. module: website_mail_channel
#: model:ir.model,name:website_mail_channel.model_mail_mail
@@ -155,16 +316,6 @@ msgid "Outgoing Mails"
msgstr "Utgående meldinger"
#. module: website_mail_channel
-#: model:mail.template,subject:website_mail_channel.mail_template_list_subscribe
-msgid "Please confirm subscription to ${object.name}"
-msgstr "Bekreft påmelding til ${object.name}"
-
-#. module: website_mail_channel
-#: model:mail.template,subject:website_mail_channel.mail_template_list_unsubscribe
-msgid "Please confirm unsubscription to ${object.name}"
-msgstr "Bekreft avmelding fra ${object.name}"
-
-#. module: website_mail_channel
#: code:addons/website_mail_channel/models/mail_mail.py:21
#, python-format
msgid "Post to"
@@ -218,12 +369,6 @@ msgid "a confirmation email has been sent."
msgstr "bekreftelse på epost er sendt."
#. module: website_mail_channel
-#: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
-#: model:ir.ui.view,arch_db:website_mail_channel.subscribe
-msgid "archives"
-msgstr "arkiv"
-
-#. module: website_mail_channel
#: model:ir.ui.view,arch_db:website_mail_channel.group_message
msgid "attachments"
msgstr "vedlegg"
@@ -257,10 +402,8 @@ msgstr "epostlistearkiv"
#: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
msgid ""
"members<br/>\n"
-" <i class=\"fa fa-fw fa-envelope-o\"/>"
+" <i class=\"fa fa-fw fa-envelope-o\" role=\"img\" aria-label=\"Traffic\" title=\"Traffic\"/>"
msgstr ""
-"medlemmer<br/>\n"
-" <i class=\"fa fa-fw fa-envelope-o\"/>"
#. module: website_mail_channel
#: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
@@ -278,12 +421,6 @@ msgid "replies"
msgstr "svar"
#. module: website_mail_channel
-#: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
-#: model:ir.ui.view,arch_db:website_mail_channel.subscribe
-msgid "send mail"
-msgstr "send epost"
-
-#. module: website_mail_channel
#: model:ir.ui.view,arch_db:website_mail_channel.messages_short
msgid "show"
msgstr "vis"
@@ -299,12 +436,6 @@ msgid "to the mailing list."
msgstr "epostlisten"
#. module: website_mail_channel
-#: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
-#: model:ir.ui.view,arch_db:website_mail_channel.subscribe
-msgid "unsubscribe"
-msgstr "avmeld"
-
-#. module: website_mail_channel
#: model:ir.ui.view,arch_db:website_mail_channel.confirmation_subscription
msgid "unsubscribed"
msgstr "avmeldt"
diff --git a/addons/website_mail_channel/i18n/nl.po b/addons/website_mail_channel/i18n/nl.po
index 0e8bd6059a6..5857a7776dd 100644
--- a/addons/website_mail_channel/i18n/nl.po
+++ b/addons/website_mail_channel/i18n/nl.po
@@ -3,17 +3,17 @@
# * website_mail_channel
#
# Translators:
-# Yenthe Van Ginneken <yenthespam@gmail.com>, 2016
-# Martin Trigaux, 2016
-# Erwin van der Ploeg <erwin@odooexperts.nl>, 2016
-# Julia van Orsouw <julia@odooexperts.nl>, 2017
+# Yenthe Van Ginneken <yenthespam@gmail.com>, 2018
+# Martin Trigaux, 2018
+# Erwin van der Ploeg <erwin@odooexperts.nl>, 2018
+# Julia van Orsouw <julia@odooexperts.nl>, 2018
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.2\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-03-22 14:11+0000\n"
-"PO-Revision-Date: 2018-03-22 14:11+0000\n"
-"Last-Translator: Julia van Orsouw <julia@odooexperts.nl>, 2017\n"
+"POT-Creation-Date: 2018-08-24 09:05+0000\n"
+"PO-Revision-Date: 2018-08-24 09:05+0000\n"
+"Last-Translator: Julia van Orsouw <julia@odooexperts.nl>, 2018\n"
"Language-Team: Dutch (https://www.transifex.com/odoo/teams/41243/nl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -22,42 +22,22 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. module: website_mail_channel
-#: model:mail.template,body_html:website_mail_channel.mail_template_list_subscribe
-msgid ""
-"<?xml version=\"1.0\"?>\n"
-"<data><p>Hello,</p>\n"
-"<p>You have requested to be subscribed to the mailing list <strong>${object.name}</strong></p>\n"
-"<p>To confirm, please visit the following link:</p>\n"
-"<p><strong><a href=\"${ctx['token_url']}\">${ctx['token_url']}</a></strong></p>\n"
-"<p>If this was a mistake or you did not requested this action, please ignore this message.</p>\n"
-"</data>"
+#: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
+#: model:ir.ui.view,arch_db:website_mail_channel.subscribe
+msgid "<i class=\"fa fa-envelope-o\"/> send mail"
+msgstr "<i class=\"fa fa-envelope-o\"/>Verzend e-mail"
+
+#. module: website_mail_channel
+#: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
+#: model:ir.ui.view,arch_db:website_mail_channel.subscribe
+msgid "<i class=\"fa fa-file-o\"/> archives"
msgstr ""
-"<data><p>Hallo,</p>\n"
-"<p>U heeft aangevraagd om te worden ingeschreven voor de mailinglijst\n"
-"<strong>${object.name}</strong></p>\n"
-"<p>Om te bevestigen, volg de volgende link:</p>\n"
-"<p><strong><a href=\"${ctx['token_url']}\">${ctx['token_url']}</a></strong></p>\n"
-"<p>Als u deze aanvraag niet zelf hebt gedaan dan kunt u dit bericht negeren</p>\n"
-"</data>"
#. module: website_mail_channel
-#: model:mail.template,body_html:website_mail_channel.mail_template_list_unsubscribe
-msgid ""
-"<?xml version=\"1.0\"?>\n"
-"<data><p>Hello,</p>\n"
-"<p>You have requested to be unsubscribed to the mailing list <strong>${object.name}</strong></p>\n"
-"<p>To confirm, please visit the following link:</p>\n"
-"<p><strong><a href=\"${ctx['token_url']}\">${ctx['token_url']}</a></strong></p>\n"
-"<p>If this was a mistake or you did not requested this action, please ignore this message.</p>\n"
-"</data>"
+#: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
+#: model:ir.ui.view,arch_db:website_mail_channel.subscribe
+msgid "<i class=\"fa fa-times\"/> unsubscribe"
msgstr ""
-"<data><p>Hallo,</p>\n"
-"<p>U heeft aangevraagd om te worden ingeschreven voor de mailinglijst\n"
-"<strong>${object.name}</strong></p>\n"
-"<p>Om te bevestigen, volg de volgende link:</p>\n"
-"<p><strong><a href=\"${ctx['token_url']}\">${ctx['token_url']}</a></strong></p>\n"
-"<p>Als u deze aanvraag niet zelf hebt gedaan dan kunt u dit bericht negeren</p>\n"
-"</data>"
#. module: website_mail_channel
#: model:ir.ui.view,arch_db:website_mail_channel.subscribe
@@ -65,6 +45,172 @@ msgid "<span class=\"oe_snippet_thumbnail_title\">Discussion Group</span>"
msgstr "<span class=\"oe_snippet_thumbnail_title\">Discussie groep</span>"
#. module: website_mail_channel
+#: model:mail.template,body_html:website_mail_channel.mail_template_list_subscribe
+msgid ""
+"<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" style=\"padding-top: 16px; background-color: #F1F1F1; font-family:Verdana, Arial,sans-serif; color: #454748; width: 100%; border-collapse:separate;\"><tr><td align=\"center\">\n"
+"<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"padding: 16px; background-color: white; color: #454748; border-collapse:separate;\">\n"
+"<tbody>\n"
+" <!-- HEADER -->\n"
+" <tr>\n"
+" <td align=\"center\" style=\"min-width: 590px;\">\n"
+" <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: white; padding: 0px 8px 0px 8px; border-collapse:separate;\">\n"
+" <tr><td valign=\"middle\">\n"
+" <span style=\"font-size: 10px;\">Your Channel</span><br/>\n"
+" <span style=\"font-size: 20px; font-weight: bold;\">${object.name}</span>\n"
+" </td><td valign=\"middle\" align=\"right\">\n"
+" <img src=\"/logo.png?company=${user.company_id.id}\" style=\"padding: 0px; margin: 0px; height: auto; width: 80px;\" alt=\"${user.company_id.name}\"/>\n"
+" </td></tr>\n"
+" <tr><td colspan=\"2\" style=\"text-align:center;\">\n"
+" <hr width=\"100%\" style=\"background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0; margin:16px 0px 16px 0px;\"/>\n"
+" </td></tr>\n"
+" </table>\n"
+" </td>\n"
+" </tr>\n"
+" <!-- CONTENT -->\n"
+" <tr>\n"
+" <td align=\"center\" style=\"min-width: 590px;\">\n"
+" <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: white; padding: 0px 8px 0px 8px; border-collapse:separate;\">\n"
+" <tr><td valign=\"top\" style=\"font-size: 13px;\">\n"
+" <div style=\"margin: 0px; padding: 0px;\">\n"
+" Hello,<br/><br/>\n"
+" You have requested to be subscribed to the mailing list <strong>${object.name}</strong>.\n"
+" <br/><br/>\n"
+" To confirm, please visit the following link: <strong><a href=\"${ctx['token_url']}\">${ctx['token_url']}</a></strong>\n"
+" <br/><br/>\n"
+" If this was a mistake or you did not requested this action, please ignore this message.\n"
+" % if user.signature\n"
+" <br/>\n"
+" ${user.signature | safe}\n"
+" % endif\n"
+" </div>\n"
+" </td></tr>\n"
+" <tr><td style=\"text-align:center;\">\n"
+" <hr width=\"100%\" style=\"background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0; margin: 16px 0px 16px 0px;\"/>\n"
+" </td></tr>\n"
+" </table>\n"
+" </td>\n"
+" </tr>\n"
+" <!-- FOOTER -->\n"
+" <tr>\n"
+" <td align=\"center\" style=\"min-width: 590px;\">\n"
+" <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: white; font-size: 11px; padding: 0px 8px 0px 8px; border-collapse:separate;\">\n"
+" <tr><td valign=\"middle\" align=\"left\">\n"
+" ${user.company_id.name}\n"
+" </td></tr>\n"
+" <tr><td valign=\"middle\" align=\"left\" style=\"opacity: 0.7;\">\n"
+" % if user.company_id.phone\n"
+" ${user.company_id.phone} |\n"
+" %endif\n"
+" % if user.company_id.email\n"
+" <a href=\"'mailto:%s' % ${user.company_id.email}\" style=\"text-decoration:none; color: #454748;\">${user.company_id.email}</a> |\n"
+" % endif\n"
+" % if user.company_id.website\n"
+" <a href=\"'%s' % ${user.company_id.website}\" style=\"text-decoration:none; color: #454748;\">${user.company_id.website}\n"
+" </a>\n"
+" % endif\n"
+" </td></tr>\n"
+" </table>\n"
+" </td>\n"
+" </tr>\n"
+"</tbody>\n"
+"</table>\n"
+"</td></tr>\n"
+"<!-- POWERED BY -->\n"
+"<tr><td align=\"center\" style=\"min-width: 590px;\">\n"
+" <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: #F1F1F1; color: #454748; padding: 8px; border-collapse:separate;\">\n"
+" <tr><td style=\"text-align: center; font-size: 13px;\">\n"
+" Powered by <a target=\"_blank\" href=\"https://www.odoo.com?utm_source=db&amp;utm_medium=mail\" style=\"color: #875A7B;\">Odoo</a>\n"
+" </td></tr>\n"
+" </table>\n"
+"</td></tr>\n"
+"</table>\n"
+" "
+msgstr ""
+
+#. module: website_mail_channel
+#: model:mail.template,body_html:website_mail_channel.mail_template_list_unsubscribe
+msgid ""
+"<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" style=\"padding-top: 16px; background-color: #F1F1F1; font-family:Verdana, Arial,sans-serif; color: #454748; width: 100%; border-collapse:separate;\"><tr><td align=\"center\">\n"
+"<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"padding: 16px; background-color: white; color: #454748; border-collapse:separate;\">\n"
+"<tbody>\n"
+" <!-- HEADER -->\n"
+" <tr>\n"
+" <td align=\"center\" style=\"min-width: 590px;\">\n"
+" <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: white; padding: 0px 8px 0px 8px; border-collapse:separate;\">\n"
+" <tr><td valign=\"middle\">\n"
+" <span style=\"font-size: 10px;\">Your Channel</span><br/>\n"
+" <span style=\"font-size: 20px; font-weight: bold;\">${object.name}</span>\n"
+" </td><td valign=\"middle\" align=\"right\">\n"
+" <img src=\"/logo.png?company=${user.company_id.id}\" style=\"padding: 0px; margin: 0px; height: auto; width: 80px;\" alt=\"${user.company_id.name}\"/>\n"
+" </td></tr>\n"
+" <tr><td colspan=\"2\" style=\"text-align:center;\">\n"
+" <hr width=\"100%\" style=\"background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0; margin:16px 0px 16px 0px;\"/>\n"
+" </td></tr>\n"
+" </table>\n"
+" </td>\n"
+" </tr>\n"
+" <!-- CONTENT -->\n"
+" <tr>\n"
+" <td align=\"center\" style=\"min-width: 590px;\">\n"
+" <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: white; padding: 0px 8px 0px 8px; border-collapse:separate;\">\n"
+" <tr><td valign=\"top\" style=\"font-size: 13px;\">\n"
+" <div style=\"margin: 0px; padding: 0px;\">\n"
+" Hello,<br/><br/>\n"
+" You have requested to be unsubscribed to the mailing list <strong>${object.name}</strong>.\n"
+" <br/><br/>\n"
+" To confirm, please visit the following link: <strong><a href=\"${ctx['token_url']}\">${ctx['token_url']}</a></strong>.\n"
+" <br/><br/>\n"
+" If this was a mistake or you did not requested this action, please ignore this message.\n"
+" % if user.signature:\n"
+" <br/>\n"
+" ${user.signature | safe}\n"
+" % endif\n"
+" </div>\n"
+" </td></tr>\n"
+" <tr><td style=\"text-align:center;\">\n"
+" <hr width=\"100%\" style=\"background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0; margin: 16px 0px 16px 0px;\"/>\n"
+" </td></tr>\n"
+" </table>\n"
+" </td>\n"
+" </tr>\n"
+" <!-- FOOTER -->\n"
+" <tr>\n"
+" <td align=\"center\" style=\"min-width: 590px;\">\n"
+" <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: white; font-size: 11px; padding: 0px 8px 0px 8px; border-collapse:separate;\">\n"
+" <tr><td valign=\"middle\" align=\"left\">\n"
+" ${user.company_id.name}\n"
+" </td></tr>\n"
+" <tr><td valign=\"middle\" align=\"left\" style=\"opacity: 0.7;\">\n"
+" % if user.company_id.phone\n"
+" ${user.company_id.phone} |\n"
+" %endif\n"
+" % if user.company_id.email\n"
+" <a href=\"'mailto:%s' % ${user.company_id.email}\" style=\"text-decoration:none; color: #454748;\">${user.company_id.email}</a> |\n"
+" % endif\n"
+" % if user.company_id.website\n"
+" <a href=\"'%s' % ${user.company_id.website}\" style=\"text-decoration:none; color: #454748;\">${user.company_id.website}\n"
+" </a>\n"
+" % endif\n"
+" </td></tr>\n"
+" </table>\n"
+" </td>\n"
+" </tr>\n"
+"</tbody>\n"
+"</table>\n"
+"</td></tr>\n"
+"<!-- POWERED BY -->\n"
+"<tr><td align=\"center\" style=\"min-width: 590px;\">\n"
+" <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: #F1F1F1; color: #454748; padding: 8px; border-collapse:separate;\">\n"
+" <tr><td style=\"text-align: center; font-size: 13px;\">\n"
+" Powered by <a target=\"_blank\" href=\"https://www.odoo.com?utm_source=db&amp;utm_medium=mail\" style=\"color: #875A7B;\">Odoo</a>\n"
+" </td></tr>\n"
+" </table>\n"
+"</td></tr>\n"
+"</table>\n"
+" "
+msgstr ""
+
+#. module: website_mail_channel
#. openerp-web
#: code:addons/website_mail_channel/static/src/js/website_mail_channel.editor.js:17
#, python-format
@@ -83,6 +229,12 @@ msgstr "Archieven"
#. module: website_mail_channel
#: model:ir.ui.view,arch_db:website_mail_channel.group_message
+#: model:ir.ui.view,arch_db:website_mail_channel.messages_short
+msgid "Avatar"
+msgstr "Avatar"
+
+#. module: website_mail_channel
+#: model:ir.ui.view,arch_db:website_mail_channel.group_message
msgid "Browse archives"
msgstr "Door archief bladeren"
@@ -104,6 +256,16 @@ msgid "Change Discussion List"
msgstr "Wijzig discussie lijst"
#. module: website_mail_channel
+#: model:mail.template,subject:website_mail_channel.mail_template_list_subscribe
+msgid "Confirm subscription to ${object.name}"
+msgstr ""
+
+#. module: website_mail_channel
+#: model:mail.template,subject:website_mail_channel.mail_template_list_unsubscribe
+msgid "Confirm unsubscription to ${object.name}"
+msgstr ""
+
+#. module: website_mail_channel
#. openerp-web
#: code:addons/website_mail_channel/static/src/js/website_mail_channel.editor.js:18
#, python-format
@@ -118,7 +280,12 @@ msgstr "Discussiekanaal"
#. module: website_mail_channel
#: model:ir.ui.view,arch_db:website_mail_channel.group_message
msgid "Follow-Ups"
-msgstr "Betalingsherinneringen"
+msgstr "Opvolgingen"
+
+#. module: website_mail_channel
+#: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
+msgid "Group"
+msgstr "Groep"
#. module: website_mail_channel
#: model:ir.ui.view,arch_db:website_mail_channel.invalid_token_subscription
@@ -126,13 +293,9 @@ msgid "Invalid or expired confirmation link."
msgstr "Ongeldige of verlopen bevesttigingslink."
#. module: website_mail_channel
-#: model:ir.ui.view,arch_db:website_mail_channel.footer_mailing_list
-msgid "Mailing List"
-msgstr "Mailinglijst"
-
-#. module: website_mail_channel
#: model:ir.ui.view,arch_db:website_mail_channel.group_message
#: model:ir.ui.view,arch_db:website_mail_channel.group_messages
+#: model:website.menu,name:website_mail_channel.menu_mailing_list
msgid "Mailing Lists"
msgstr "Mailinglijsten"
@@ -146,10 +309,8 @@ msgstr "Mailing-lijst"
#: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
msgid ""
"Need to unsubscribe? It's right here! <span class=\"fa fa-2x fa-arrow-down "
-"pull-right\"/>"
+"float-right\" role=\"img\" aria-label=\"\" title=\"Read this !\"/>"
msgstr ""
-"Wilt u zich uitschrijven? Dat kan hier! <span class=\"fa fa-2x fa-arrow-down"
-" pull-right\"/>"
#. module: website_mail_channel
#: model:ir.model,name:website_mail_channel.model_mail_mail
@@ -157,16 +318,6 @@ msgid "Outgoing Mails"
msgstr "Uitgaande e-mails"
#. module: website_mail_channel
-#: model:mail.template,subject:website_mail_channel.mail_template_list_subscribe
-msgid "Please confirm subscription to ${object.name}"
-msgstr "Bevestig a.u.b uw abonnement op ${object.name}"
-
-#. module: website_mail_channel
-#: model:mail.template,subject:website_mail_channel.mail_template_list_unsubscribe
-msgid "Please confirm unsubscription to ${object.name}"
-msgstr "Bevestig a.u.b uw abonnementsopzegging op ${object.name}"
-
-#. module: website_mail_channel
#: code:addons/website_mail_channel/models/mail_mail.py:21
#, python-format
msgid "Post to"
@@ -221,12 +372,6 @@ msgid "a confirmation email has been sent."
msgstr "een bevestigingsmail is verzonden."
#. module: website_mail_channel
-#: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
-#: model:ir.ui.view,arch_db:website_mail_channel.subscribe
-msgid "archives"
-msgstr "archieven"
-
-#. module: website_mail_channel
#: model:ir.ui.view,arch_db:website_mail_channel.group_message
msgid "attachments"
msgstr "Bijlages"
@@ -258,10 +403,8 @@ msgstr "Mailing lijst archieven"
#: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
msgid ""
"members<br/>\n"
-" <i class=\"fa fa-fw fa-envelope-o\"/>"
+" <i class=\"fa fa-fw fa-envelope-o\" role=\"img\" aria-label=\"Traffic\" title=\"Traffic\"/>"
msgstr ""
-"members<br/>\n"
-" <i class=\"fa fa-fw fa-envelope-o\"/>"
#. module: website_mail_channel
#: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
@@ -279,12 +422,6 @@ msgid "replies"
msgstr "reacties"
#. module: website_mail_channel
-#: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
-#: model:ir.ui.view,arch_db:website_mail_channel.subscribe
-msgid "send mail"
-msgstr "Verstuur e-mail"
-
-#. module: website_mail_channel
#: model:ir.ui.view,arch_db:website_mail_channel.messages_short
msgid "show"
msgstr "toon"
@@ -300,12 +437,6 @@ msgid "to the mailing list."
msgstr "aan de mailing lijst."
#. module: website_mail_channel
-#: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
-#: model:ir.ui.view,arch_db:website_mail_channel.subscribe
-msgid "unsubscribe"
-msgstr "Uitschrijven"
-
-#. module: website_mail_channel
#: model:ir.ui.view,arch_db:website_mail_channel.confirmation_subscription
msgid "unsubscribed"
msgstr "uitgeschreven"
diff --git a/addons/website_mail_channel/i18n/ro.po b/addons/website_mail_channel/i18n/ro.po
index ca43695f69b..9844eaa8080 100644
--- a/addons/website_mail_channel/i18n/ro.po
+++ b/addons/website_mail_channel/i18n/ro.po
@@ -7,10 +7,10 @@
# Dorin Hongu <dhongu@gmail.com>, 2018
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.2\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-03-22 14:11+0000\n"
-"PO-Revision-Date: 2018-03-22 14:11+0000\n"
+"POT-Creation-Date: 2018-08-24 09:05+0000\n"
+"PO-Revision-Date: 2018-08-24 09:05+0000\n"
"Last-Translator: Dorin Hongu <dhongu@gmail.com>, 2018\n"
"Language-Team: Romanian (https://www.transifex.com/odoo/teams/41243/ro/)\n"
"MIME-Version: 1.0\n"
@@ -20,27 +20,21 @@ msgstr ""
"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
#. module: website_mail_channel
-#: model:mail.template,body_html:website_mail_channel.mail_template_list_subscribe
-msgid ""
-"<?xml version=\"1.0\"?>\n"
-"<data><p>Hello,</p>\n"
-"<p>You have requested to be subscribed to the mailing list <strong>${object.name}</strong></p>\n"
-"<p>To confirm, please visit the following link:</p>\n"
-"<p><strong><a href=\"${ctx['token_url']}\">${ctx['token_url']}</a></strong></p>\n"
-"<p>If this was a mistake or you did not requested this action, please ignore this message.</p>\n"
-"</data>"
+#: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
+#: model:ir.ui.view,arch_db:website_mail_channel.subscribe
+msgid "<i class=\"fa fa-envelope-o\"/> send mail"
msgstr ""
#. module: website_mail_channel
-#: model:mail.template,body_html:website_mail_channel.mail_template_list_unsubscribe
-msgid ""
-"<?xml version=\"1.0\"?>\n"
-"<data><p>Hello,</p>\n"
-"<p>You have requested to be unsubscribed to the mailing list <strong>${object.name}</strong></p>\n"
-"<p>To confirm, please visit the following link:</p>\n"
-"<p><strong><a href=\"${ctx['token_url']}\">${ctx['token_url']}</a></strong></p>\n"
-"<p>If this was a mistake or you did not requested this action, please ignore this message.</p>\n"
-"</data>"
+#: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
+#: model:ir.ui.view,arch_db:website_mail_channel.subscribe
+msgid "<i class=\"fa fa-file-o\"/> archives"
+msgstr ""
+
+#. module: website_mail_channel
+#: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
+#: model:ir.ui.view,arch_db:website_mail_channel.subscribe
+msgid "<i class=\"fa fa-times\"/> unsubscribe"
msgstr ""
#. module: website_mail_channel
@@ -49,6 +43,172 @@ msgid "<span class=\"oe_snippet_thumbnail_title\">Discussion Group</span>"
msgstr ""
#. module: website_mail_channel
+#: model:mail.template,body_html:website_mail_channel.mail_template_list_subscribe
+msgid ""
+"<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" style=\"padding-top: 16px; background-color: #F1F1F1; font-family:Verdana, Arial,sans-serif; color: #454748; width: 100%; border-collapse:separate;\"><tr><td align=\"center\">\n"
+"<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"padding: 16px; background-color: white; color: #454748; border-collapse:separate;\">\n"
+"<tbody>\n"
+" <!-- HEADER -->\n"
+" <tr>\n"
+" <td align=\"center\" style=\"min-width: 590px;\">\n"
+" <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: white; padding: 0px 8px 0px 8px; border-collapse:separate;\">\n"
+" <tr><td valign=\"middle\">\n"
+" <span style=\"font-size: 10px;\">Your Channel</span><br/>\n"
+" <span style=\"font-size: 20px; font-weight: bold;\">${object.name}</span>\n"
+" </td><td valign=\"middle\" align=\"right\">\n"
+" <img src=\"/logo.png?company=${user.company_id.id}\" style=\"padding: 0px; margin: 0px; height: auto; width: 80px;\" alt=\"${user.company_id.name}\"/>\n"
+" </td></tr>\n"
+" <tr><td colspan=\"2\" style=\"text-align:center;\">\n"
+" <hr width=\"100%\" style=\"background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0; margin:16px 0px 16px 0px;\"/>\n"
+" </td></tr>\n"
+" </table>\n"
+" </td>\n"
+" </tr>\n"
+" <!-- CONTENT -->\n"
+" <tr>\n"
+" <td align=\"center\" style=\"min-width: 590px;\">\n"
+" <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: white; padding: 0px 8px 0px 8px; border-collapse:separate;\">\n"
+" <tr><td valign=\"top\" style=\"font-size: 13px;\">\n"
+" <div style=\"margin: 0px; padding: 0px;\">\n"
+" Hello,<br/><br/>\n"
+" You have requested to be subscribed to the mailing list <strong>${object.name}</strong>.\n"
+" <br/><br/>\n"
+" To confirm, please visit the following link: <strong><a href=\"${ctx['token_url']}\">${ctx['token_url']}</a></strong>\n"
+" <br/><br/>\n"
+" If this was a mistake or you did not requested this action, please ignore this message.\n"
+" % if user.signature\n"
+" <br/>\n"
+" ${user.signature | safe}\n"
+" % endif\n"
+" </div>\n"
+" </td></tr>\n"
+" <tr><td style=\"text-align:center;\">\n"
+" <hr width=\"100%\" style=\"background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0; margin: 16px 0px 16px 0px;\"/>\n"
+" </td></tr>\n"
+" </table>\n"
+" </td>\n"
+" </tr>\n"
+" <!-- FOOTER -->\n"
+" <tr>\n"
+" <td align=\"center\" style=\"min-width: 590px;\">\n"
+" <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: white; font-size: 11px; padding: 0px 8px 0px 8px; border-collapse:separate;\">\n"
+" <tr><td valign=\"middle\" align=\"left\">\n"
+" ${user.company_id.name}\n"
+" </td></tr>\n"
+" <tr><td valign=\"middle\" align=\"left\" style=\"opacity: 0.7;\">\n"
+" % if user.company_id.phone\n"
+" ${user.company_id.phone} |\n"
+" %endif\n"
+" % if user.company_id.email\n"
+" <a href=\"'mailto:%s' % ${user.company_id.email}\" style=\"text-decoration:none; color: #454748;\">${user.company_id.email}</a> |\n"
+" % endif\n"
+" % if user.company_id.website\n"
+" <a href=\"'%s' % ${user.company_id.website}\" style=\"text-decoration:none; color: #454748;\">${user.company_id.website}\n"
+" </a>\n"
+" % endif\n"
+" </td></tr>\n"
+" </table>\n"
+" </td>\n"
+" </tr>\n"
+"</tbody>\n"
+"</table>\n"
+"</td></tr>\n"
+"<!-- POWERED BY -->\n"
+"<tr><td align=\"center\" style=\"min-width: 590px;\">\n"
+" <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: #F1F1F1; color: #454748; padding: 8px; border-collapse:separate;\">\n"
+" <tr><td style=\"text-align: center; font-size: 13px;\">\n"
+" Powered by <a target=\"_blank\" href=\"https://www.odoo.com?utm_source=db&amp;utm_medium=mail\" style=\"color: #875A7B;\">Odoo</a>\n"
+" </td></tr>\n"
+" </table>\n"
+"</td></tr>\n"
+"</table>\n"
+" "
+msgstr ""
+
+#. module: website_mail_channel
+#: model:mail.template,body_html:website_mail_channel.mail_template_list_unsubscribe
+msgid ""
+"<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" style=\"padding-top: 16px; background-color: #F1F1F1; font-family:Verdana, Arial,sans-serif; color: #454748; width: 100%; border-collapse:separate;\"><tr><td align=\"center\">\n"
+"<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"padding: 16px; background-color: white; color: #454748; border-collapse:separate;\">\n"
+"<tbody>\n"
+" <!-- HEADER -->\n"
+" <tr>\n"
+" <td align=\"center\" style=\"min-width: 590px;\">\n"
+" <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: white; padding: 0px 8px 0px 8px; border-collapse:separate;\">\n"
+" <tr><td valign=\"middle\">\n"
+" <span style=\"font-size: 10px;\">Your Channel</span><br/>\n"
+" <span style=\"font-size: 20px; font-weight: bold;\">${object.name}</span>\n"
+" </td><td valign=\"middle\" align=\"right\">\n"
+" <img src=\"/logo.png?company=${user.company_id.id}\" style=\"padding: 0px; margin: 0px; height: auto; width: 80px;\" alt=\"${user.company_id.name}\"/>\n"
+" </td></tr>\n"
+" <tr><td colspan=\"2\" style=\"text-align:center;\">\n"
+" <hr width=\"100%\" style=\"background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0; margin:16px 0px 16px 0px;\"/>\n"
+" </td></tr>\n"
+" </table>\n"
+" </td>\n"
+" </tr>\n"
+" <!-- CONTENT -->\n"
+" <tr>\n"
+" <td align=\"center\" style=\"min-width: 590px;\">\n"
+" <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: white; padding: 0px 8px 0px 8px; border-collapse:separate;\">\n"
+" <tr><td valign=\"top\" style=\"font-size: 13px;\">\n"
+" <div style=\"margin: 0px; padding: 0px;\">\n"
+" Hello,<br/><br/>\n"
+" You have requested to be unsubscribed to the mailing list <strong>${object.name}</strong>.\n"
+" <br/><br/>\n"
+" To confirm, please visit the following link: <strong><a href=\"${ctx['token_url']}\">${ctx['token_url']}</a></strong>.\n"
+" <br/><br/>\n"
+" If this was a mistake or you did not requested this action, please ignore this message.\n"
+" % if user.signature:\n"
+" <br/>\n"
+" ${user.signature | safe}\n"
+" % endif\n"
+" </div>\n"
+" </td></tr>\n"
+" <tr><td style=\"text-align:center;\">\n"
+" <hr width=\"100%\" style=\"background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0; margin: 16px 0px 16px 0px;\"/>\n"
+" </td></tr>\n"
+" </table>\n"
+" </td>\n"
+" </tr>\n"
+" <!-- FOOTER -->\n"
+" <tr>\n"
+" <td align=\"center\" style=\"min-width: 590px;\">\n"
+" <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: white; font-size: 11px; padding: 0px 8px 0px 8px; border-collapse:separate;\">\n"
+" <tr><td valign=\"middle\" align=\"left\">\n"
+" ${user.company_id.name}\n"
+" </td></tr>\n"
+" <tr><td valign=\"middle\" align=\"left\" style=\"opacity: 0.7;\">\n"
+" % if user.company_id.phone\n"
+" ${user.company_id.phone} |\n"
+" %endif\n"
+" % if user.company_id.email\n"
+" <a href=\"'mailto:%s' % ${user.company_id.email}\" style=\"text-decoration:none; color: #454748;\">${user.company_id.email}</a> |\n"
+" % endif\n"
+" % if user.company_id.website\n"
+" <a href=\"'%s' % ${user.company_id.website}\" style=\"text-decoration:none; color: #454748;\">${user.company_id.website}\n"
+" </a>\n"
+" % endif\n"
+" </td></tr>\n"
+" </table>\n"
+" </td>\n"
+" </tr>\n"
+"</tbody>\n"
+"</table>\n"
+"</td></tr>\n"
+"<!-- POWERED BY -->\n"
+"<tr><td align=\"center\" style=\"min-width: 590px;\">\n"
+" <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: #F1F1F1; color: #454748; padding: 8px; border-collapse:separate;\">\n"
+" <tr><td style=\"text-align: center; font-size: 13px;\">\n"
+" Powered by <a target=\"_blank\" href=\"https://www.odoo.com?utm_source=db&amp;utm_medium=mail\" style=\"color: #875A7B;\">Odoo</a>\n"
+" </td></tr>\n"
+" </table>\n"
+"</td></tr>\n"
+"</table>\n"
+" "
+msgstr ""
+
+#. module: website_mail_channel
#. openerp-web
#: code:addons/website_mail_channel/static/src/js/website_mail_channel.editor.js:17
#, python-format
@@ -67,6 +227,12 @@ msgstr "Arhive"
#. module: website_mail_channel
#: model:ir.ui.view,arch_db:website_mail_channel.group_message
+#: model:ir.ui.view,arch_db:website_mail_channel.messages_short
+msgid "Avatar"
+msgstr ""
+
+#. module: website_mail_channel
+#: model:ir.ui.view,arch_db:website_mail_channel.group_message
msgid "Browse archives"
msgstr "Navigare arhive"
@@ -88,6 +254,16 @@ msgid "Change Discussion List"
msgstr "Modifică listă discuții"
#. module: website_mail_channel
+#: model:mail.template,subject:website_mail_channel.mail_template_list_subscribe
+msgid "Confirm subscription to ${object.name}"
+msgstr ""
+
+#. module: website_mail_channel
+#: model:mail.template,subject:website_mail_channel.mail_template_list_unsubscribe
+msgid "Confirm unsubscription to ${object.name}"
+msgstr ""
+
+#. module: website_mail_channel
#. openerp-web
#: code:addons/website_mail_channel/static/src/js/website_mail_channel.editor.js:18
#, python-format
@@ -105,18 +281,19 @@ msgid "Follow-Ups"
msgstr "Urmăriri"
#. module: website_mail_channel
+#: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
+msgid "Group"
+msgstr "Grup"
+
+#. module: website_mail_channel
#: model:ir.ui.view,arch_db:website_mail_channel.invalid_token_subscription
msgid "Invalid or expired confirmation link."
msgstr ""
#. module: website_mail_channel
-#: model:ir.ui.view,arch_db:website_mail_channel.footer_mailing_list
-msgid "Mailing List"
-msgstr "Listă de discuții"
-
-#. module: website_mail_channel
#: model:ir.ui.view,arch_db:website_mail_channel.group_message
#: model:ir.ui.view,arch_db:website_mail_channel.group_messages
+#: model:website.menu,name:website_mail_channel.menu_mailing_list
msgid "Mailing Lists"
msgstr "Liste de e-mail"
@@ -130,7 +307,7 @@ msgstr ""
#: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
msgid ""
"Need to unsubscribe? It's right here! <span class=\"fa fa-2x fa-arrow-down "
-"pull-right\"/>"
+"float-right\" role=\"img\" aria-label=\"\" title=\"Read this !\"/>"
msgstr ""
#. module: website_mail_channel
@@ -139,16 +316,6 @@ msgid "Outgoing Mails"
msgstr "Email-uri Expediate"
#. module: website_mail_channel
-#: model:mail.template,subject:website_mail_channel.mail_template_list_subscribe
-msgid "Please confirm subscription to ${object.name}"
-msgstr ""
-
-#. module: website_mail_channel
-#: model:mail.template,subject:website_mail_channel.mail_template_list_unsubscribe
-msgid "Please confirm unsubscription to ${object.name}"
-msgstr ""
-
-#. module: website_mail_channel
#: code:addons/website_mail_channel/models/mail_mail.py:21
#, python-format
msgid "Post to"
@@ -201,12 +368,6 @@ msgid "a confirmation email has been sent."
msgstr ""
#. module: website_mail_channel
-#: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
-#: model:ir.ui.view,arch_db:website_mail_channel.subscribe
-msgid "archives"
-msgstr "arhive"
-
-#. module: website_mail_channel
#: model:ir.ui.view,arch_db:website_mail_channel.group_message
msgid "attachments"
msgstr "atașamente"
@@ -236,7 +397,7 @@ msgstr ""
#: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
msgid ""
"members<br/>\n"
-" <i class=\"fa fa-fw fa-envelope-o\"/>"
+" <i class=\"fa fa-fw fa-envelope-o\" role=\"img\" aria-label=\"Traffic\" title=\"Traffic\"/>"
msgstr ""
#. module: website_mail_channel
@@ -255,12 +416,6 @@ msgid "replies"
msgstr ""
#. module: website_mail_channel
-#: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
-#: model:ir.ui.view,arch_db:website_mail_channel.subscribe
-msgid "send mail"
-msgstr "trimite mail"
-
-#. module: website_mail_channel
#: model:ir.ui.view,arch_db:website_mail_channel.messages_short
msgid "show"
msgstr "afișează"
@@ -276,12 +431,6 @@ msgid "to the mailing list."
msgstr ""
#. module: website_mail_channel
-#: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
-#: model:ir.ui.view,arch_db:website_mail_channel.subscribe
-msgid "unsubscribe"
-msgstr "dezabonare"
-
-#. module: website_mail_channel
#: model:ir.ui.view,arch_db:website_mail_channel.confirmation_subscription
msgid "unsubscribed"
msgstr ""
diff --git a/addons/website_mail_channel/i18n/ru.po b/addons/website_mail_channel/i18n/ru.po
index e6b4529f55c..f293e586ce8 100644
--- a/addons/website_mail_channel/i18n/ru.po
+++ b/addons/website_mail_channel/i18n/ru.po
@@ -3,20 +3,17 @@
# * website_mail_channel
#
# Translators:
-# Collex100, 2017
-# Martin Trigaux, 2017
-# Max Belyanin <maxbelyanin@gmail.com>, 2017
-# Viktor Pogrebniak <vp@aifil.ru>, 2017
-# Максим Дронь <dronmax@gmail.com>, 2017
-# Sergey Vilizhanin, 2017
-# Masha Koc <mariya.kos.ua@gmail.com>, 2017
+# Максим Дронь <dronmax@gmail.com>, 2018
+# Martin Trigaux, 2018
+# Collex100, 2018
+# Max Belyanin <maxbelyanin@gmail.com>, 2018
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.2\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-03-22 14:11+0000\n"
-"PO-Revision-Date: 2018-03-22 14:11+0000\n"
-"Last-Translator: Masha Koc <mariya.kos.ua@gmail.com>, 2017\n"
+"POT-Creation-Date: 2018-08-24 09:05+0000\n"
+"PO-Revision-Date: 2018-08-24 09:05+0000\n"
+"Last-Translator: Max Belyanin <maxbelyanin@gmail.com>, 2018\n"
"Language-Team: Russian (https://www.transifex.com/odoo/teams/41243/ru/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -25,42 +22,22 @@ msgstr ""
"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
#. module: website_mail_channel
-#: model:mail.template,body_html:website_mail_channel.mail_template_list_subscribe
-msgid ""
-"<?xml version=\"1.0\"?>\n"
-"<data><p>Hello,</p>\n"
-"<p>You have requested to be subscribed to the mailing list <strong>${object.name}</strong></p>\n"
-"<p>To confirm, please visit the following link:</p>\n"
-"<p><strong><a href=\"${ctx['token_url']}\">${ctx['token_url']}</a></strong></p>\n"
-"<p>If this was a mistake or you did not requested this action, please ignore this message.</p>\n"
-"</data>"
+#: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
+#: model:ir.ui.view,arch_db:website_mail_channel.subscribe
+msgid "<i class=\"fa fa-envelope-o\"/> send mail"
msgstr ""
-"<?xml version=\"1.0\"?>\n"
-"<data><p>Здравствуйте,</p>\n"
-"<p>Вы попросили подписаться на список рассылки <strong>${object.name}</strong></p>\n"
-"<p>Для подтверждения, пожалуйста, перейдите по следующей ссылке:</p>\n"
-"<p><strong><a href=\"${ctx['token_url']}\">${ctx['token_url']}</a></strong></p>\n"
-"<p>Если это была ошибка или вы не просили это действие, не обращайте внимания на это сообщение.</p>\n"
-"</data>"
#. module: website_mail_channel
-#: model:mail.template,body_html:website_mail_channel.mail_template_list_unsubscribe
-msgid ""
-"<?xml version=\"1.0\"?>\n"
-"<data><p>Hello,</p>\n"
-"<p>You have requested to be unsubscribed to the mailing list <strong>${object.name}</strong></p>\n"
-"<p>To confirm, please visit the following link:</p>\n"
-"<p><strong><a href=\"${ctx['token_url']}\">${ctx['token_url']}</a></strong></p>\n"
-"<p>If this was a mistake or you did not requested this action, please ignore this message.</p>\n"
-"</data>"
+#: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
+#: model:ir.ui.view,arch_db:website_mail_channel.subscribe
+msgid "<i class=\"fa fa-file-o\"/> archives"
+msgstr ""
+
+#. module: website_mail_channel
+#: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
+#: model:ir.ui.view,arch_db:website_mail_channel.subscribe
+msgid "<i class=\"fa fa-times\"/> unsubscribe"
msgstr ""
-"<?xml version=\"1.0\"?>\n"
-"<data><p>Здравствуйте,</p>\n"
-"<p>Вы попросили подписаться на список рассылки <strong>${object.name}</strong></p>\n"
-"<p>Для подтверждения, пожалуйста, перейдите по следующей ссылке:</p>\n"
-"<p><strong><a href=\"${ctx['token_url']}\">${ctx['token_url']}</a></strong></p>\n"
-"<p>Если это была ошибка или вы не просили это действие, не обращайте внимания на это сообщение.</p>\n"
-"</data>"
#. module: website_mail_channel
#: model:ir.ui.view,arch_db:website_mail_channel.subscribe
@@ -68,6 +45,172 @@ msgid "<span class=\"oe_snippet_thumbnail_title\">Discussion Group</span>"
msgstr "<span сlass=\"oe_snippet_thumbnail_title\">Дискуссионная группа</span>"
#. module: website_mail_channel
+#: model:mail.template,body_html:website_mail_channel.mail_template_list_subscribe
+msgid ""
+"<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" style=\"padding-top: 16px; background-color: #F1F1F1; font-family:Verdana, Arial,sans-serif; color: #454748; width: 100%; border-collapse:separate;\"><tr><td align=\"center\">\n"
+"<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"padding: 16px; background-color: white; color: #454748; border-collapse:separate;\">\n"
+"<tbody>\n"
+" <!-- HEADER -->\n"
+" <tr>\n"
+" <td align=\"center\" style=\"min-width: 590px;\">\n"
+" <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: white; padding: 0px 8px 0px 8px; border-collapse:separate;\">\n"
+" <tr><td valign=\"middle\">\n"
+" <span style=\"font-size: 10px;\">Your Channel</span><br/>\n"
+" <span style=\"font-size: 20px; font-weight: bold;\">${object.name}</span>\n"
+" </td><td valign=\"middle\" align=\"right\">\n"
+" <img src=\"/logo.png?company=${user.company_id.id}\" style=\"padding: 0px; margin: 0px; height: auto; width: 80px;\" alt=\"${user.company_id.name}\"/>\n"
+" </td></tr>\n"
+" <tr><td colspan=\"2\" style=\"text-align:center;\">\n"
+" <hr width=\"100%\" style=\"background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0; margin:16px 0px 16px 0px;\"/>\n"
+" </td></tr>\n"
+" </table>\n"
+" </td>\n"
+" </tr>\n"
+" <!-- CONTENT -->\n"
+" <tr>\n"
+" <td align=\"center\" style=\"min-width: 590px;\">\n"
+" <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: white; padding: 0px 8px 0px 8px; border-collapse:separate;\">\n"
+" <tr><td valign=\"top\" style=\"font-size: 13px;\">\n"
+" <div style=\"margin: 0px; padding: 0px;\">\n"
+" Hello,<br/><br/>\n"
+" You have requested to be subscribed to the mailing list <strong>${object.name}</strong>.\n"
+" <br/><br/>\n"
+" To confirm, please visit the following link: <strong><a href=\"${ctx['token_url']}\">${ctx['token_url']}</a></strong>\n"
+" <br/><br/>\n"
+" If this was a mistake or you did not requested this action, please ignore this message.\n"
+" % if user.signature\n"
+" <br/>\n"
+" ${user.signature | safe}\n"
+" % endif\n"
+" </div>\n"
+" </td></tr>\n"
+" <tr><td style=\"text-align:center;\">\n"
+" <hr width=\"100%\" style=\"background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0; margin: 16px 0px 16px 0px;\"/>\n"
+" </td></tr>\n"
+" </table>\n"
+" </td>\n"
+" </tr>\n"
+" <!-- FOOTER -->\n"
+" <tr>\n"
+" <td align=\"center\" style=\"min-width: 590px;\">\n"
+" <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: white; font-size: 11px; padding: 0px 8px 0px 8px; border-collapse:separate;\">\n"
+" <tr><td valign=\"middle\" align=\"left\">\n"
+" ${user.company_id.name}\n"
+" </td></tr>\n"
+" <tr><td valign=\"middle\" align=\"left\" style=\"opacity: 0.7;\">\n"
+" % if user.company_id.phone\n"
+" ${user.company_id.phone} |\n"
+" %endif\n"
+" % if user.company_id.email\n"
+" <a href=\"'mailto:%s' % ${user.company_id.email}\" style=\"text-decoration:none; color: #454748;\">${user.company_id.email}</a> |\n"
+" % endif\n"
+" % if user.company_id.website\n"
+" <a href=\"'%s' % ${user.company_id.website}\" style=\"text-decoration:none; color: #454748;\">${user.company_id.website}\n"
+" </a>\n"
+" % endif\n"
+" </td></tr>\n"
+" </table>\n"
+" </td>\n"
+" </tr>\n"
+"</tbody>\n"
+"</table>\n"
+"</td></tr>\n"
+"<!-- POWERED BY -->\n"
+"<tr><td align=\"center\" style=\"min-width: 590px;\">\n"
+" <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: #F1F1F1; color: #454748; padding: 8px; border-collapse:separate;\">\n"
+" <tr><td style=\"text-align: center; font-size: 13px;\">\n"
+" Powered by <a target=\"_blank\" href=\"https://www.odoo.com?utm_source=db&amp;utm_medium=mail\" style=\"color: #875A7B;\">Odoo</a>\n"
+" </td></tr>\n"
+" </table>\n"
+"</td></tr>\n"
+"</table>\n"
+" "
+msgstr ""
+
+#. module: website_mail_channel
+#: model:mail.template,body_html:website_mail_channel.mail_template_list_unsubscribe
+msgid ""
+"<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" style=\"padding-top: 16px; background-color: #F1F1F1; font-family:Verdana, Arial,sans-serif; color: #454748; width: 100%; border-collapse:separate;\"><tr><td align=\"center\">\n"
+"<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"padding: 16px; background-color: white; color: #454748; border-collapse:separate;\">\n"
+"<tbody>\n"
+" <!-- HEADER -->\n"
+" <tr>\n"
+" <td align=\"center\" style=\"min-width: 590px;\">\n"
+" <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: white; padding: 0px 8px 0px 8px; border-collapse:separate;\">\n"
+" <tr><td valign=\"middle\">\n"
+" <span style=\"font-size: 10px;\">Your Channel</span><br/>\n"
+" <span style=\"font-size: 20px; font-weight: bold;\">${object.name}</span>\n"
+" </td><td valign=\"middle\" align=\"right\">\n"
+" <img src=\"/logo.png?company=${user.company_id.id}\" style=\"padding: 0px; margin: 0px; height: auto; width: 80px;\" alt=\"${user.company_id.name}\"/>\n"
+" </td></tr>\n"
+" <tr><td colspan=\"2\" style=\"text-align:center;\">\n"
+" <hr width=\"100%\" style=\"background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0; margin:16px 0px 16px 0px;\"/>\n"
+" </td></tr>\n"
+" </table>\n"
+" </td>\n"
+" </tr>\n"
+" <!-- CONTENT -->\n"
+" <tr>\n"
+" <td align=\"center\" style=\"min-width: 590px;\">\n"
+" <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: white; padding: 0px 8px 0px 8px; border-collapse:separate;\">\n"
+" <tr><td valign=\"top\" style=\"font-size: 13px;\">\n"
+" <div style=\"margin: 0px; padding: 0px;\">\n"
+" Hello,<br/><br/>\n"
+" You have requested to be unsubscribed to the mailing list <strong>${object.name}</strong>.\n"
+" <br/><br/>\n"
+" To confirm, please visit the following link: <strong><a href=\"${ctx['token_url']}\">${ctx['token_url']}</a></strong>.\n"
+" <br/><br/>\n"
+" If this was a mistake or you did not requested this action, please ignore this message.\n"
+" % if user.signature:\n"
+" <br/>\n"
+" ${user.signature | safe}\n"
+" % endif\n"
+" </div>\n"
+" </td></tr>\n"
+" <tr><td style=\"text-align:center;\">\n"
+" <hr width=\"100%\" style=\"background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0; margin: 16px 0px 16px 0px;\"/>\n"
+" </td></tr>\n"
+" </table>\n"
+" </td>\n"
+" </tr>\n"
+" <!-- FOOTER -->\n"
+" <tr>\n"
+" <td align=\"center\" style=\"min-width: 590px;\">\n"
+" <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: white; font-size: 11px; padding: 0px 8px 0px 8px; border-collapse:separate;\">\n"
+" <tr><td valign=\"middle\" align=\"left\">\n"
+" ${user.company_id.name}\n"
+" </td></tr>\n"
+" <tr><td valign=\"middle\" align=\"left\" style=\"opacity: 0.7;\">\n"
+" % if user.company_id.phone\n"
+" ${user.company_id.phone} |\n"
+" %endif\n"
+" % if user.company_id.email\n"
+" <a href=\"'mailto:%s' % ${user.company_id.email}\" style=\"text-decoration:none; color: #454748;\">${user.company_id.email}</a> |\n"
+" % endif\n"
+" % if user.company_id.website\n"
+" <a href=\"'%s' % ${user.company_id.website}\" style=\"text-decoration:none; color: #454748;\">${user.company_id.website}\n"
+" </a>\n"
+" % endif\n"
+" </td></tr>\n"
+" </table>\n"
+" </td>\n"
+" </tr>\n"
+"</tbody>\n"
+"</table>\n"
+"</td></tr>\n"
+"<!-- POWERED BY -->\n"
+"<tr><td align=\"center\" style=\"min-width: 590px;\">\n"
+" <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: #F1F1F1; color: #454748; padding: 8px; border-collapse:separate;\">\n"
+" <tr><td style=\"text-align: center; font-size: 13px;\">\n"
+" Powered by <a target=\"_blank\" href=\"https://www.odoo.com?utm_source=db&amp;utm_medium=mail\" style=\"color: #875A7B;\">Odoo</a>\n"
+" </td></tr>\n"
+" </table>\n"
+"</td></tr>\n"
+"</table>\n"
+" "
+msgstr ""
+
+#. module: website_mail_channel
#. openerp-web
#: code:addons/website_mail_channel/static/src/js/website_mail_channel.editor.js:17
#, python-format
@@ -86,6 +229,12 @@ msgstr "Архивы"
#. module: website_mail_channel
#: model:ir.ui.view,arch_db:website_mail_channel.group_message
+#: model:ir.ui.view,arch_db:website_mail_channel.messages_short
+msgid "Avatar"
+msgstr "Аватар"
+
+#. module: website_mail_channel
+#: model:ir.ui.view,arch_db:website_mail_channel.group_message
msgid "Browse archives"
msgstr "Просмотреть архивы"
@@ -107,6 +256,16 @@ msgid "Change Discussion List"
msgstr "Изменить список обсуждений"
#. module: website_mail_channel
+#: model:mail.template,subject:website_mail_channel.mail_template_list_subscribe
+msgid "Confirm subscription to ${object.name}"
+msgstr ""
+
+#. module: website_mail_channel
+#: model:mail.template,subject:website_mail_channel.mail_template_list_unsubscribe
+msgid "Confirm unsubscription to ${object.name}"
+msgstr ""
+
+#. module: website_mail_channel
#. openerp-web
#: code:addons/website_mail_channel/static/src/js/website_mail_channel.editor.js:18
#, python-format
@@ -124,18 +283,19 @@ msgid "Follow-Ups"
msgstr "Напоминания"
#. module: website_mail_channel
+#: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
+msgid "Group"
+msgstr "Группа"
+
+#. module: website_mail_channel
#: model:ir.ui.view,arch_db:website_mail_channel.invalid_token_subscription
msgid "Invalid or expired confirmation link."
msgstr "Неверный или истек срок ссылки для подтверждения."
#. module: website_mail_channel
-#: model:ir.ui.view,arch_db:website_mail_channel.footer_mailing_list
-msgid "Mailing List"
-msgstr "Список рассылки"
-
-#. module: website_mail_channel
#: model:ir.ui.view,arch_db:website_mail_channel.group_message
#: model:ir.ui.view,arch_db:website_mail_channel.group_messages
+#: model:website.menu,name:website_mail_channel.menu_mailing_list
msgid "Mailing Lists"
msgstr "Списки рассылки"
@@ -149,10 +309,8 @@ msgstr "Список рассылки"
#: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
msgid ""
"Need to unsubscribe? It's right here! <span class=\"fa fa-2x fa-arrow-down "
-"pull-right\"/>"
+"float-right\" role=\"img\" aria-label=\"\" title=\"Read this !\"/>"
msgstr ""
-"Нужно отписаться? Это возможно прямо отсюда! <span class=\"fa fa-2x fa-"
-"arrow-down pull-right\"/>"
#. module: website_mail_channel
#: model:ir.model,name:website_mail_channel.model_mail_mail
@@ -160,16 +318,6 @@ msgid "Outgoing Mails"
msgstr "Исходящие письма"
#. module: website_mail_channel
-#: model:mail.template,subject:website_mail_channel.mail_template_list_subscribe
-msgid "Please confirm subscription to ${object.name}"
-msgstr "Пожалуйста, подтвердите подписку на ${object.name}"
-
-#. module: website_mail_channel
-#: model:mail.template,subject:website_mail_channel.mail_template_list_unsubscribe
-msgid "Please confirm unsubscription to ${object.name}"
-msgstr "Пожалуйста, подтвердите отписку к ${object.name}"
-
-#. module: website_mail_channel
#: code:addons/website_mail_channel/models/mail_mail.py:21
#, python-format
msgid "Post to"
@@ -222,12 +370,6 @@ msgid "a confirmation email has been sent."
msgstr "подтверждение по электронной почте было отправлено."
#. module: website_mail_channel
-#: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
-#: model:ir.ui.view,arch_db:website_mail_channel.subscribe
-msgid "archives"
-msgstr "архивы"
-
-#. module: website_mail_channel
#: model:ir.ui.view,arch_db:website_mail_channel.group_message
msgid "attachments"
msgstr "приложения"
@@ -257,10 +399,8 @@ msgstr "архивы списка рассылки"
#: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
msgid ""
"members<br/>\n"
-" <i class=\"fa fa-fw fa-envelope-o\"/>"
+" <i class=\"fa fa-fw fa-envelope-o\" role=\"img\" aria-label=\"Traffic\" title=\"Traffic\"/>"
msgstr ""
-"члены<br/>\n"
-"<i class=\"fa fa-fw fa-envelope-o\"/>"
#. module: website_mail_channel
#: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
@@ -278,12 +418,6 @@ msgid "replies"
msgstr "ответы"
#. module: website_mail_channel
-#: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
-#: model:ir.ui.view,arch_db:website_mail_channel.subscribe
-msgid "send mail"
-msgstr "отправить письмо"
-
-#. module: website_mail_channel
#: model:ir.ui.view,arch_db:website_mail_channel.messages_short
msgid "show"
msgstr "показать"
@@ -299,12 +433,6 @@ msgid "to the mailing list."
msgstr "в список рассылки."
#. module: website_mail_channel
-#: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
-#: model:ir.ui.view,arch_db:website_mail_channel.subscribe
-msgid "unsubscribe"
-msgstr "отписаться"
-
-#. module: website_mail_channel
#: model:ir.ui.view,arch_db:website_mail_channel.confirmation_subscription
msgid "unsubscribed"
msgstr "отписан"
diff --git a/addons/website_mail_channel/i18n/uk.po b/addons/website_mail_channel/i18n/uk.po
index a6e625678c1..638f2d04d9f 100644
--- a/addons/website_mail_channel/i18n/uk.po
+++ b/addons/website_mail_channel/i18n/uk.po
@@ -4,17 +4,16 @@
#
# Translators:
# Yaroslav Molochko <onorua@gmail.com>, 2018
-# Zoriana Zaiats, 2018
-# Bohdan Lisnenko, 2018
+# Martin Trigaux, 2018
# ТАрас <tratatuta@i.ua>, 2018
-# Alina Semeniuk <alinasemeniuk1@gmail.com>, 2018
+# Alina Lisnenko <alinasemeniuk1@gmail.com>, 2018
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.2\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-03-22 14:11+0000\n"
-"PO-Revision-Date: 2018-03-22 14:11+0000\n"
-"Last-Translator: Alina Semeniuk <alinasemeniuk1@gmail.com>, 2018\n"
+"POT-Creation-Date: 2018-08-24 09:05+0000\n"
+"PO-Revision-Date: 2018-08-24 09:05+0000\n"
+"Last-Translator: Alina Lisnenko <alinasemeniuk1@gmail.com>, 2018\n"
"Language-Team: Ukrainian (https://www.transifex.com/odoo/teams/41243/uk/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -23,42 +22,22 @@ msgstr ""
"Plural-Forms: nplurals=4; plural=(n % 1 == 0 && n % 10 == 1 && n % 100 != 11 ? 0 : n % 1 == 0 && n % 10 >= 2 && n % 10 <= 4 && (n % 100 < 12 || n % 100 > 14) ? 1 : n % 1 == 0 && (n % 10 ==0 || (n % 10 >=5 && n % 10 <=9) || (n % 100 >=11 && n % 100 <=14 )) ? 2: 3);\n"
#. module: website_mail_channel
-#: model:mail.template,body_html:website_mail_channel.mail_template_list_subscribe
-msgid ""
-"<?xml version=\"1.0\"?>\n"
-"<data><p>Hello,</p>\n"
-"<p>You have requested to be subscribed to the mailing list <strong>${object.name}</strong></p>\n"
-"<p>To confirm, please visit the following link:</p>\n"
-"<p><strong><a href=\"${ctx['token_url']}\">${ctx['token_url']}</a></strong></p>\n"
-"<p>If this was a mistake or you did not requested this action, please ignore this message.</p>\n"
-"</data>"
+#: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
+#: model:ir.ui.view,arch_db:website_mail_channel.subscribe
+msgid "<i class=\"fa fa-envelope-o\"/> send mail"
msgstr ""
-"<?xml version=\"1.0\"?>\n"
-"<data><p>Вітаємо,</p>\n"
-"<p>Ви просили підписатися на список розсилки <strong>${object.name}</strong></p>\n"
-"<p>Для підтвердження, будь ласка, відвідайте таке посилання:</p>\n"
-"<p><strong><a href=\"${ctx['token_url']}\">${ctx['token_url']}</a></strong></p>\n"
-"<p>Якщо це була помилка або ви не просили цю дію, проігноруйте це повідомлення.</p>\n"
-"</data>"
#. module: website_mail_channel
-#: model:mail.template,body_html:website_mail_channel.mail_template_list_unsubscribe
-msgid ""
-"<?xml version=\"1.0\"?>\n"
-"<data><p>Hello,</p>\n"
-"<p>You have requested to be unsubscribed to the mailing list <strong>${object.name}</strong></p>\n"
-"<p>To confirm, please visit the following link:</p>\n"
-"<p><strong><a href=\"${ctx['token_url']}\">${ctx['token_url']}</a></strong></p>\n"
-"<p>If this was a mistake or you did not requested this action, please ignore this message.</p>\n"
-"</data>"
+#: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
+#: model:ir.ui.view,arch_db:website_mail_channel.subscribe
+msgid "<i class=\"fa fa-file-o\"/> archives"
+msgstr ""
+
+#. module: website_mail_channel
+#: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
+#: model:ir.ui.view,arch_db:website_mail_channel.subscribe
+msgid "<i class=\"fa fa-times\"/> unsubscribe"
msgstr ""
-"<?xml version=\"1.0\"?>\n"
-"<data><p>Вітаємо,</p>\n"
-"<p>Ви просили скасувати підписку на список розсилки <strong>${object.name}</strong></p>\n"
-"<p>Для підтвердження, будь ласка, відвідайте таке посилання:</p>\n"
-"<p><strong><a href=\"${ctx['token_url']}\">${ctx['token_url']}</a></strong></p>\n"
-"<p>Якщо це була помилка або ви не просили цю дію, проігноруйте це повідомлення.</p>\n"
-"</data>"
#. module: website_mail_channel
#: model:ir.ui.view,arch_db:website_mail_channel.subscribe
@@ -66,6 +45,172 @@ msgid "<span class=\"oe_snippet_thumbnail_title\">Discussion Group</span>"
msgstr "<span class=\"oe_snippet_thumbnail_title\">Дискусійна група</span>"
#. module: website_mail_channel
+#: model:mail.template,body_html:website_mail_channel.mail_template_list_subscribe
+msgid ""
+"<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" style=\"padding-top: 16px; background-color: #F1F1F1; font-family:Verdana, Arial,sans-serif; color: #454748; width: 100%; border-collapse:separate;\"><tr><td align=\"center\">\n"
+"<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"padding: 16px; background-color: white; color: #454748; border-collapse:separate;\">\n"
+"<tbody>\n"
+" <!-- HEADER -->\n"
+" <tr>\n"
+" <td align=\"center\" style=\"min-width: 590px;\">\n"
+" <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: white; padding: 0px 8px 0px 8px; border-collapse:separate;\">\n"
+" <tr><td valign=\"middle\">\n"
+" <span style=\"font-size: 10px;\">Your Channel</span><br/>\n"
+" <span style=\"font-size: 20px; font-weight: bold;\">${object.name}</span>\n"
+" </td><td valign=\"middle\" align=\"right\">\n"
+" <img src=\"/logo.png?company=${user.company_id.id}\" style=\"padding: 0px; margin: 0px; height: auto; width: 80px;\" alt=\"${user.company_id.name}\"/>\n"
+" </td></tr>\n"
+" <tr><td colspan=\"2\" style=\"text-align:center;\">\n"
+" <hr width=\"100%\" style=\"background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0; margin:16px 0px 16px 0px;\"/>\n"
+" </td></tr>\n"
+" </table>\n"
+" </td>\n"
+" </tr>\n"
+" <!-- CONTENT -->\n"
+" <tr>\n"
+" <td align=\"center\" style=\"min-width: 590px;\">\n"
+" <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: white; padding: 0px 8px 0px 8px; border-collapse:separate;\">\n"
+" <tr><td valign=\"top\" style=\"font-size: 13px;\">\n"
+" <div style=\"margin: 0px; padding: 0px;\">\n"
+" Hello,<br/><br/>\n"
+" You have requested to be subscribed to the mailing list <strong>${object.name}</strong>.\n"
+" <br/><br/>\n"
+" To confirm, please visit the following link: <strong><a href=\"${ctx['token_url']}\">${ctx['token_url']}</a></strong>\n"
+" <br/><br/>\n"
+" If this was a mistake or you did not requested this action, please ignore this message.\n"
+" % if user.signature\n"
+" <br/>\n"
+" ${user.signature | safe}\n"
+" % endif\n"
+" </div>\n"
+" </td></tr>\n"
+" <tr><td style=\"text-align:center;\">\n"
+" <hr width=\"100%\" style=\"background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0; margin: 16px 0px 16px 0px;\"/>\n"
+" </td></tr>\n"
+" </table>\n"
+" </td>\n"
+" </tr>\n"
+" <!-- FOOTER -->\n"
+" <tr>\n"
+" <td align=\"center\" style=\"min-width: 590px;\">\n"
+" <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: white; font-size: 11px; padding: 0px 8px 0px 8px; border-collapse:separate;\">\n"
+" <tr><td valign=\"middle\" align=\"left\">\n"
+" ${user.company_id.name}\n"
+" </td></tr>\n"
+" <tr><td valign=\"middle\" align=\"left\" style=\"opacity: 0.7;\">\n"
+" % if user.company_id.phone\n"
+" ${user.company_id.phone} |\n"
+" %endif\n"
+" % if user.company_id.email\n"
+" <a href=\"'mailto:%s' % ${user.company_id.email}\" style=\"text-decoration:none; color: #454748;\">${user.company_id.email}</a> |\n"
+" % endif\n"
+" % if user.company_id.website\n"
+" <a href=\"'%s' % ${user.company_id.website}\" style=\"text-decoration:none; color: #454748;\">${user.company_id.website}\n"
+" </a>\n"
+" % endif\n"
+" </td></tr>\n"
+" </table>\n"
+" </td>\n"
+" </tr>\n"
+"</tbody>\n"
+"</table>\n"
+"</td></tr>\n"
+"<!-- POWERED BY -->\n"
+"<tr><td align=\"center\" style=\"min-width: 590px;\">\n"
+" <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: #F1F1F1; color: #454748; padding: 8px; border-collapse:separate;\">\n"
+" <tr><td style=\"text-align: center; font-size: 13px;\">\n"
+" Powered by <a target=\"_blank\" href=\"https://www.odoo.com?utm_source=db&amp;utm_medium=mail\" style=\"color: #875A7B;\">Odoo</a>\n"
+" </td></tr>\n"
+" </table>\n"
+"</td></tr>\n"
+"</table>\n"
+" "
+msgstr ""
+
+#. module: website_mail_channel
+#: model:mail.template,body_html:website_mail_channel.mail_template_list_unsubscribe
+msgid ""
+"<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" style=\"padding-top: 16px; background-color: #F1F1F1; font-family:Verdana, Arial,sans-serif; color: #454748; width: 100%; border-collapse:separate;\"><tr><td align=\"center\">\n"
+"<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"padding: 16px; background-color: white; color: #454748; border-collapse:separate;\">\n"
+"<tbody>\n"
+" <!-- HEADER -->\n"
+" <tr>\n"
+" <td align=\"center\" style=\"min-width: 590px;\">\n"
+" <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: white; padding: 0px 8px 0px 8px; border-collapse:separate;\">\n"
+" <tr><td valign=\"middle\">\n"
+" <span style=\"font-size: 10px;\">Your Channel</span><br/>\n"
+" <span style=\"font-size: 20px; font-weight: bold;\">${object.name}</span>\n"
+" </td><td valign=\"middle\" align=\"right\">\n"
+" <img src=\"/logo.png?company=${user.company_id.id}\" style=\"padding: 0px; margin: 0px; height: auto; width: 80px;\" alt=\"${user.company_id.name}\"/>\n"
+" </td></tr>\n"
+" <tr><td colspan=\"2\" style=\"text-align:center;\">\n"
+" <hr width=\"100%\" style=\"background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0; margin:16px 0px 16px 0px;\"/>\n"
+" </td></tr>\n"
+" </table>\n"
+" </td>\n"
+" </tr>\n"
+" <!-- CONTENT -->\n"
+" <tr>\n"
+" <td align=\"center\" style=\"min-width: 590px;\">\n"
+" <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: white; padding: 0px 8px 0px 8px; border-collapse:separate;\">\n"
+" <tr><td valign=\"top\" style=\"font-size: 13px;\">\n"
+" <div style=\"margin: 0px; padding: 0px;\">\n"
+" Hello,<br/><br/>\n"
+" You have requested to be unsubscribed to the mailing list <strong>${object.name}</strong>.\n"
+" <br/><br/>\n"
+" To confirm, please visit the following link: <strong><a href=\"${ctx['token_url']}\">${ctx['token_url']}</a></strong>.\n"
+" <br/><br/>\n"
+" If this was a mistake or you did not requested this action, please ignore this message.\n"
+" % if user.signature:\n"
+" <br/>\n"
+" ${user.signature | safe}\n"
+" % endif\n"
+" </div>\n"
+" </td></tr>\n"
+" <tr><td style=\"text-align:center;\">\n"
+" <hr width=\"100%\" style=\"background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0; margin: 16px 0px 16px 0px;\"/>\n"
+" </td></tr>\n"
+" </table>\n"
+" </td>\n"
+" </tr>\n"
+" <!-- FOOTER -->\n"
+" <tr>\n"
+" <td align=\"center\" style=\"min-width: 590px;\">\n"
+" <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: white; font-size: 11px; padding: 0px 8px 0px 8px; border-collapse:separate;\">\n"
+" <tr><td valign=\"middle\" align=\"left\">\n"
+" ${user.company_id.name}\n"
+" </td></tr>\n"
+" <tr><td valign=\"middle\" align=\"left\" style=\"opacity: 0.7;\">\n"
+" % if user.company_id.phone\n"
+" ${user.company_id.phone} |\n"
+" %endif\n"
+" % if user.company_id.email\n"
+" <a href=\"'mailto:%s' % ${user.company_id.email}\" style=\"text-decoration:none; color: #454748;\">${user.company_id.email}</a> |\n"
+" % endif\n"
+" % if user.company_id.website\n"
+" <a href=\"'%s' % ${user.company_id.website}\" style=\"text-decoration:none; color: #454748;\">${user.company_id.website}\n"
+" </a>\n"
+" % endif\n"
+" </td></tr>\n"
+" </table>\n"
+" </td>\n"
+" </tr>\n"
+"</tbody>\n"
+"</table>\n"
+"</td></tr>\n"
+"<!-- POWERED BY -->\n"
+"<tr><td align=\"center\" style=\"min-width: 590px;\">\n"
+" <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: #F1F1F1; color: #454748; padding: 8px; border-collapse:separate;\">\n"
+" <tr><td style=\"text-align: center; font-size: 13px;\">\n"
+" Powered by <a target=\"_blank\" href=\"https://www.odoo.com?utm_source=db&amp;utm_medium=mail\" style=\"color: #875A7B;\">Odoo</a>\n"
+" </td></tr>\n"
+" </table>\n"
+"</td></tr>\n"
+"</table>\n"
+" "
+msgstr ""
+
+#. module: website_mail_channel
#. openerp-web
#: code:addons/website_mail_channel/static/src/js/website_mail_channel.editor.js:17
#, python-format
@@ -84,6 +229,12 @@ msgstr "Архіви"
#. module: website_mail_channel
#: model:ir.ui.view,arch_db:website_mail_channel.group_message
+#: model:ir.ui.view,arch_db:website_mail_channel.messages_short
+msgid "Avatar"
+msgstr "Аватар"
+
+#. module: website_mail_channel
+#: model:ir.ui.view,arch_db:website_mail_channel.group_message
msgid "Browse archives"
msgstr "Переглянути архіви"
@@ -105,6 +256,16 @@ msgid "Change Discussion List"
msgstr "Змінити список обговорення"
#. module: website_mail_channel
+#: model:mail.template,subject:website_mail_channel.mail_template_list_subscribe
+msgid "Confirm subscription to ${object.name}"
+msgstr ""
+
+#. module: website_mail_channel
+#: model:mail.template,subject:website_mail_channel.mail_template_list_unsubscribe
+msgid "Confirm unsubscription to ${object.name}"
+msgstr ""
+
+#. module: website_mail_channel
#. openerp-web
#: code:addons/website_mail_channel/static/src/js/website_mail_channel.editor.js:18
#, python-format
@@ -122,18 +283,19 @@ msgid "Follow-Ups"
msgstr "Нагадування "
#. module: website_mail_channel
+#: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
+msgid "Group"
+msgstr "Група"
+
+#. module: website_mail_channel
#: model:ir.ui.view,arch_db:website_mail_channel.invalid_token_subscription
msgid "Invalid or expired confirmation link."
msgstr "Невірне посилання або підтвердження, що закінчилося."
#. module: website_mail_channel
-#: model:ir.ui.view,arch_db:website_mail_channel.footer_mailing_list
-msgid "Mailing List"
-msgstr "Список розсилок"
-
-#. module: website_mail_channel
#: model:ir.ui.view,arch_db:website_mail_channel.group_message
#: model:ir.ui.view,arch_db:website_mail_channel.group_messages
+#: model:website.menu,name:website_mail_channel.menu_mailing_list
msgid "Mailing Lists"
msgstr "Списки розсилки"
@@ -147,10 +309,8 @@ msgstr "Список розсилки"
#: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
msgid ""
"Need to unsubscribe? It's right here! <span class=\"fa fa-2x fa-arrow-down "
-"pull-right\"/>"
+"float-right\" role=\"img\" aria-label=\"\" title=\"Read this !\"/>"
msgstr ""
-"Потрібно відписатися? Це прямо тут! <span class=\"fa fa-2x fa-arrow-down "
-"pull-right\"/>"
#. module: website_mail_channel
#: model:ir.model,name:website_mail_channel.model_mail_mail
@@ -158,16 +318,6 @@ msgid "Outgoing Mails"
msgstr "Вихідна пошта"
#. module: website_mail_channel
-#: model:mail.template,subject:website_mail_channel.mail_template_list_subscribe
-msgid "Please confirm subscription to ${object.name}"
-msgstr "Будь ласка, підтвердіть підписку на ${object.name}"
-
-#. module: website_mail_channel
-#: model:mail.template,subject:website_mail_channel.mail_template_list_unsubscribe
-msgid "Please confirm unsubscription to ${object.name}"
-msgstr "Будь ласка, підтвердьте відписку на ${object.name}"
-
-#. module: website_mail_channel
#: code:addons/website_mail_channel/models/mail_mail.py:21
#, python-format
msgid "Post to"
@@ -222,12 +372,6 @@ msgid "a confirmation email has been sent."
msgstr "було надіслано підтвердження електронною поштою."
#. module: website_mail_channel
-#: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
-#: model:ir.ui.view,arch_db:website_mail_channel.subscribe
-msgid "archives"
-msgstr "архіви"
-
-#. module: website_mail_channel
#: model:ir.ui.view,arch_db:website_mail_channel.group_message
msgid "attachments"
msgstr "вкладення"
@@ -261,10 +405,8 @@ msgstr "архів поштової розсилки"
#: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
msgid ""
"members<br/>\n"
-" <i class=\"fa fa-fw fa-envelope-o\"/>"
+" <i class=\"fa fa-fw fa-envelope-o\" role=\"img\" aria-label=\"Traffic\" title=\"Traffic\"/>"
msgstr ""
-"члени<br/>\n"
-" <i class=\"fa fa-fw fa-envelope-o\"/>"
#. module: website_mail_channel
#: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
@@ -282,12 +424,6 @@ msgid "replies"
msgstr "відповіді"
#. module: website_mail_channel
-#: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
-#: model:ir.ui.view,arch_db:website_mail_channel.subscribe
-msgid "send mail"
-msgstr "надіслати листа"
-
-#. module: website_mail_channel
#: model:ir.ui.view,arch_db:website_mail_channel.messages_short
msgid "show"
msgstr "показати"
@@ -303,12 +439,6 @@ msgid "to the mailing list."
msgstr "до списку розсилок."
#. module: website_mail_channel
-#: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
-#: model:ir.ui.view,arch_db:website_mail_channel.subscribe
-msgid "unsubscribe"
-msgstr "скасувати підписку"
-
-#. module: website_mail_channel
#: model:ir.ui.view,arch_db:website_mail_channel.confirmation_subscription
msgid "unsubscribed"
msgstr "скасовано підписку"
diff --git a/addons/website_mail_channel/i18n/zh_CN.po b/addons/website_mail_channel/i18n/zh_CN.po
index dc444e70120..d5e5b805040 100644
--- a/addons/website_mail_channel/i18n/zh_CN.po
+++ b/addons/website_mail_channel/i18n/zh_CN.po
@@ -3,23 +3,21 @@
# * website_mail_channel
#
# Translators:
-# liAnGjiA <liangjia@qq.com>, 2016
-# Talway <9010446@qq.com>, 2016
-# Martin Trigaux, 2016
-# Jeffery CHEN Fan <jeffery9@gmail.com>, 2016
-# fausthuang, 2016
-# Joray <13637815@qq.com>, 2016
-# 苏州远鼎 <tiexinliu@126.com>, 2016
-# Bo Cao, 2017
# e2f <projects@e2f.com>, 2018
+# Martin Trigaux, 2018
+# Jeffery CHEN Fan <jeffery9@gmail.com>, 2018
+# liAnGjiA <liangjia@qq.com>, 2018
+# Talway <9010446@qq.com>, 2018
+# 苏州远鼎 <tiexinliu@126.com>, 2018
# e2f_cn c5 <jarvisn@ecinnovations.com>, 2018
+# e2f_cn c7 <e2f_cn_c7@outlook.com>, 2018
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.2\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-03-22 14:11+0000\n"
-"PO-Revision-Date: 2018-03-22 14:11+0000\n"
-"Last-Translator: e2f_cn c5 <jarvisn@ecinnovations.com>, 2018\n"
+"POT-Creation-Date: 2018-08-24 09:05+0000\n"
+"PO-Revision-Date: 2018-08-24 09:05+0000\n"
+"Last-Translator: e2f_cn c7 <e2f_cn_c7@outlook.com>, 2018\n"
"Language-Team: Chinese (China) (https://www.transifex.com/odoo/teams/41243/zh_CN/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -28,42 +26,22 @@ msgstr ""
"Plural-Forms: nplurals=1; plural=0;\n"
#. module: website_mail_channel
-#: model:mail.template,body_html:website_mail_channel.mail_template_list_subscribe
-msgid ""
-"<?xml version=\"1.0\"?>\n"
-"<data><p>Hello,</p>\n"
-"<p>You have requested to be subscribed to the mailing list <strong>${object.name}</strong></p>\n"
-"<p>To confirm, please visit the following link:</p>\n"
-"<p><strong><a href=\"${ctx['token_url']}\">${ctx['token_url']}</a></strong></p>\n"
-"<p>If this was a mistake or you did not requested this action, please ignore this message.</p>\n"
-"</data>"
+#: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
+#: model:ir.ui.view,arch_db:website_mail_channel.subscribe
+msgid "<i class=\"fa fa-envelope-o\"/> send mail"
msgstr ""
-"<?xml version=\"1.0\"?>\n"
-"<data><p>您好,</p>\n"
-"<p>您已请求订阅邮件列表 <strong>${object.name}</strong></p>\n"
-"<p>需要您点击以下链接进行二次确认,请访问以下链接:</p>\n"
-"<p><strong><a href=\"${ctx['token_url']}\">${ctx['token_url']}</a></strong></p>\n"
-"<p>如不是您本人意愿,或者您未请求执行此操作,请忽略此消息。</p>\n"
-"</data>"
#. module: website_mail_channel
-#: model:mail.template,body_html:website_mail_channel.mail_template_list_unsubscribe
-msgid ""
-"<?xml version=\"1.0\"?>\n"
-"<data><p>Hello,</p>\n"
-"<p>You have requested to be unsubscribed to the mailing list <strong>${object.name}</strong></p>\n"
-"<p>To confirm, please visit the following link:</p>\n"
-"<p><strong><a href=\"${ctx['token_url']}\">${ctx['token_url']}</a></strong></p>\n"
-"<p>If this was a mistake or you did not requested this action, please ignore this message.</p>\n"
-"</data>"
+#: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
+#: model:ir.ui.view,arch_db:website_mail_channel.subscribe
+msgid "<i class=\"fa fa-file-o\"/> archives"
+msgstr ""
+
+#. module: website_mail_channel
+#: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
+#: model:ir.ui.view,arch_db:website_mail_channel.subscribe
+msgid "<i class=\"fa fa-times\"/> unsubscribe"
msgstr ""
-"<?xml version=\"1.0\"?>\n"
-"<data><p>您好,</p>\n"
-"<p>您已请求退订邮件列表 <strong>${object.name}</strong></p>\n"
-"<p>要进行确认,请访问以下链接:</p>\n"
-"<p><strong><a href=\"${ctx['token_url']}\">${ctx['token_url']}</a></strong></p>\n"
-"<p>如果这是一个错误,或者您未请求执行此操作,请忽略此消息。</p>\n"
-"</data>"
#. module: website_mail_channel
#: model:ir.ui.view,arch_db:website_mail_channel.subscribe
@@ -71,6 +49,172 @@ msgid "<span class=\"oe_snippet_thumbnail_title\">Discussion Group</span>"
msgstr "<span class=\"oe_snippet_thumbnail_title\">讨论组</span>"
#. module: website_mail_channel
+#: model:mail.template,body_html:website_mail_channel.mail_template_list_subscribe
+msgid ""
+"<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" style=\"padding-top: 16px; background-color: #F1F1F1; font-family:Verdana, Arial,sans-serif; color: #454748; width: 100%; border-collapse:separate;\"><tr><td align=\"center\">\n"
+"<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"padding: 16px; background-color: white; color: #454748; border-collapse:separate;\">\n"
+"<tbody>\n"
+" <!-- HEADER -->\n"
+" <tr>\n"
+" <td align=\"center\" style=\"min-width: 590px;\">\n"
+" <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: white; padding: 0px 8px 0px 8px; border-collapse:separate;\">\n"
+" <tr><td valign=\"middle\">\n"
+" <span style=\"font-size: 10px;\">Your Channel</span><br/>\n"
+" <span style=\"font-size: 20px; font-weight: bold;\">${object.name}</span>\n"
+" </td><td valign=\"middle\" align=\"right\">\n"
+" <img src=\"/logo.png?company=${user.company_id.id}\" style=\"padding: 0px; margin: 0px; height: auto; width: 80px;\" alt=\"${user.company_id.name}\"/>\n"
+" </td></tr>\n"
+" <tr><td colspan=\"2\" style=\"text-align:center;\">\n"
+" <hr width=\"100%\" style=\"background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0; margin:16px 0px 16px 0px;\"/>\n"
+" </td></tr>\n"
+" </table>\n"
+" </td>\n"
+" </tr>\n"
+" <!-- CONTENT -->\n"
+" <tr>\n"
+" <td align=\"center\" style=\"min-width: 590px;\">\n"
+" <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: white; padding: 0px 8px 0px 8px; border-collapse:separate;\">\n"
+" <tr><td valign=\"top\" style=\"font-size: 13px;\">\n"
+" <div style=\"margin: 0px; padding: 0px;\">\n"
+" Hello,<br/><br/>\n"
+" You have requested to be subscribed to the mailing list <strong>${object.name}</strong>.\n"
+" <br/><br/>\n"
+" To confirm, please visit the following link: <strong><a href=\"${ctx['token_url']}\">${ctx['token_url']}</a></strong>\n"
+" <br/><br/>\n"
+" If this was a mistake or you did not requested this action, please ignore this message.\n"
+" % if user.signature\n"
+" <br/>\n"
+" ${user.signature | safe}\n"
+" % endif\n"
+" </div>\n"
+" </td></tr>\n"
+" <tr><td style=\"text-align:center;\">\n"
+" <hr width=\"100%\" style=\"background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0; margin: 16px 0px 16px 0px;\"/>\n"
+" </td></tr>\n"
+" </table>\n"
+" </td>\n"
+" </tr>\n"
+" <!-- FOOTER -->\n"
+" <tr>\n"
+" <td align=\"center\" style=\"min-width: 590px;\">\n"
+" <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: white; font-size: 11px; padding: 0px 8px 0px 8px; border-collapse:separate;\">\n"
+" <tr><td valign=\"middle\" align=\"left\">\n"
+" ${user.company_id.name}\n"
+" </td></tr>\n"
+" <tr><td valign=\"middle\" align=\"left\" style=\"opacity: 0.7;\">\n"
+" % if user.company_id.phone\n"
+" ${user.company_id.phone} |\n"
+" %endif\n"
+" % if user.company_id.email\n"
+" <a href=\"'mailto:%s' % ${user.company_id.email}\" style=\"text-decoration:none; color: #454748;\">${user.company_id.email}</a> |\n"
+" % endif\n"
+" % if user.company_id.website\n"
+" <a href=\"'%s' % ${user.company_id.website}\" style=\"text-decoration:none; color: #454748;\">${user.company_id.website}\n"
+" </a>\n"
+" % endif\n"
+" </td></tr>\n"
+" </table>\n"
+" </td>\n"
+" </tr>\n"
+"</tbody>\n"
+"</table>\n"
+"</td></tr>\n"
+"<!-- POWERED BY -->\n"
+"<tr><td align=\"center\" style=\"min-width: 590px;\">\n"
+" <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: #F1F1F1; color: #454748; padding: 8px; border-collapse:separate;\">\n"
+" <tr><td style=\"text-align: center; font-size: 13px;\">\n"
+" Powered by <a target=\"_blank\" href=\"https://www.odoo.com?utm_source=db&amp;utm_medium=mail\" style=\"color: #875A7B;\">Odoo</a>\n"
+" </td></tr>\n"
+" </table>\n"
+"</td></tr>\n"
+"</table>\n"
+" "
+msgstr ""
+
+#. module: website_mail_channel
+#: model:mail.template,body_html:website_mail_channel.mail_template_list_unsubscribe
+msgid ""
+"<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" style=\"padding-top: 16px; background-color: #F1F1F1; font-family:Verdana, Arial,sans-serif; color: #454748; width: 100%; border-collapse:separate;\"><tr><td align=\"center\">\n"
+"<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"padding: 16px; background-color: white; color: #454748; border-collapse:separate;\">\n"
+"<tbody>\n"
+" <!-- HEADER -->\n"
+" <tr>\n"
+" <td align=\"center\" style=\"min-width: 590px;\">\n"
+" <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: white; padding: 0px 8px 0px 8px; border-collapse:separate;\">\n"
+" <tr><td valign=\"middle\">\n"
+" <span style=\"font-size: 10px;\">Your Channel</span><br/>\n"
+" <span style=\"font-size: 20px; font-weight: bold;\">${object.name}</span>\n"
+" </td><td valign=\"middle\" align=\"right\">\n"
+" <img src=\"/logo.png?company=${user.company_id.id}\" style=\"padding: 0px; margin: 0px; height: auto; width: 80px;\" alt=\"${user.company_id.name}\"/>\n"
+" </td></tr>\n"
+" <tr><td colspan=\"2\" style=\"text-align:center;\">\n"
+" <hr width=\"100%\" style=\"background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0; margin:16px 0px 16px 0px;\"/>\n"
+" </td></tr>\n"
+" </table>\n"
+" </td>\n"
+" </tr>\n"
+" <!-- CONTENT -->\n"
+" <tr>\n"
+" <td align=\"center\" style=\"min-width: 590px;\">\n"
+" <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: white; padding: 0px 8px 0px 8px; border-collapse:separate;\">\n"
+" <tr><td valign=\"top\" style=\"font-size: 13px;\">\n"
+" <div style=\"margin: 0px; padding: 0px;\">\n"
+" Hello,<br/><br/>\n"
+" You have requested to be unsubscribed to the mailing list <strong>${object.name}</strong>.\n"
+" <br/><br/>\n"
+" To confirm, please visit the following link: <strong><a href=\"${ctx['token_url']}\">${ctx['token_url']}</a></strong>.\n"
+" <br/><br/>\n"
+" If this was a mistake or you did not requested this action, please ignore this message.\n"
+" % if user.signature:\n"
+" <br/>\n"
+" ${user.signature | safe}\n"
+" % endif\n"
+" </div>\n"
+" </td></tr>\n"
+" <tr><td style=\"text-align:center;\">\n"
+" <hr width=\"100%\" style=\"background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0; margin: 16px 0px 16px 0px;\"/>\n"
+" </td></tr>\n"
+" </table>\n"
+" </td>\n"
+" </tr>\n"
+" <!-- FOOTER -->\n"
+" <tr>\n"
+" <td align=\"center\" style=\"min-width: 590px;\">\n"
+" <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: white; font-size: 11px; padding: 0px 8px 0px 8px; border-collapse:separate;\">\n"
+" <tr><td valign=\"middle\" align=\"left\">\n"
+" ${user.company_id.name}\n"
+" </td></tr>\n"
+" <tr><td valign=\"middle\" align=\"left\" style=\"opacity: 0.7;\">\n"
+" % if user.company_id.phone\n"
+" ${user.company_id.phone} |\n"
+" %endif\n"
+" % if user.company_id.email\n"
+" <a href=\"'mailto:%s' % ${user.company_id.email}\" style=\"text-decoration:none; color: #454748;\">${user.company_id.email}</a> |\n"
+" % endif\n"
+" % if user.company_id.website\n"
+" <a href=\"'%s' % ${user.company_id.website}\" style=\"text-decoration:none; color: #454748;\">${user.company_id.website}\n"
+" </a>\n"
+" % endif\n"
+" </td></tr>\n"
+" </table>\n"
+" </td>\n"
+" </tr>\n"
+"</tbody>\n"
+"</table>\n"
+"</td></tr>\n"
+"<!-- POWERED BY -->\n"
+"<tr><td align=\"center\" style=\"min-width: 590px;\">\n"
+" <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: #F1F1F1; color: #454748; padding: 8px; border-collapse:separate;\">\n"
+" <tr><td style=\"text-align: center; font-size: 13px;\">\n"
+" Powered by <a target=\"_blank\" href=\"https://www.odoo.com?utm_source=db&amp;utm_medium=mail\" style=\"color: #875A7B;\">Odoo</a>\n"
+" </td></tr>\n"
+" </table>\n"
+"</td></tr>\n"
+"</table>\n"
+" "
+msgstr ""
+
+#. module: website_mail_channel
#. openerp-web
#: code:addons/website_mail_channel/static/src/js/website_mail_channel.editor.js:17
#, python-format
@@ -89,6 +233,12 @@ msgstr "归档"
#. module: website_mail_channel
#: model:ir.ui.view,arch_db:website_mail_channel.group_message
+#: model:ir.ui.view,arch_db:website_mail_channel.messages_short
+msgid "Avatar"
+msgstr "头像"
+
+#. module: website_mail_channel
+#: model:ir.ui.view,arch_db:website_mail_channel.group_message
msgid "Browse archives"
msgstr "浏览存档"
@@ -102,7 +252,7 @@ msgstr "日期"
#: model:ir.ui.view,arch_db:website_mail_channel.group_message
#: model:ir.ui.view,arch_db:website_mail_channel.group_messages
msgid "By thread"
-msgstr "线程"
+msgstr "按线索"
#. module: website_mail_channel
#: model:ir.ui.view,arch_db:website_mail_channel.subscribe
@@ -110,6 +260,16 @@ msgid "Change Discussion List"
msgstr "变更讨论列表"
#. module: website_mail_channel
+#: model:mail.template,subject:website_mail_channel.mail_template_list_subscribe
+msgid "Confirm subscription to ${object.name}"
+msgstr ""
+
+#. module: website_mail_channel
+#: model:mail.template,subject:website_mail_channel.mail_template_list_unsubscribe
+msgid "Confirm unsubscription to ${object.name}"
+msgstr ""
+
+#. module: website_mail_channel
#. openerp-web
#: code:addons/website_mail_channel/static/src/js/website_mail_channel.editor.js:18
#, python-format
@@ -127,18 +287,19 @@ msgid "Follow-Ups"
msgstr "催款"
#. module: website_mail_channel
+#: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
+msgid "Group"
+msgstr "组"
+
+#. module: website_mail_channel
#: model:ir.ui.view,arch_db:website_mail_channel.invalid_token_subscription
msgid "Invalid or expired confirmation link."
msgstr "非法或者过期的确认链接。"
#. module: website_mail_channel
-#: model:ir.ui.view,arch_db:website_mail_channel.footer_mailing_list
-msgid "Mailing List"
-msgstr "邮件列表"
-
-#. module: website_mail_channel
#: model:ir.ui.view,arch_db:website_mail_channel.group_message
#: model:ir.ui.view,arch_db:website_mail_channel.group_messages
+#: model:website.menu,name:website_mail_channel.menu_mailing_list
msgid "Mailing Lists"
msgstr "邮件列表"
@@ -152,8 +313,8 @@ msgstr "邮件列表"
#: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
msgid ""
"Need to unsubscribe? It's right here! <span class=\"fa fa-2x fa-arrow-down "
-"pull-right\"/>"
-msgstr "需要取消订阅? 在这里!<span class=\"fa fa-2x fa-arrow-down pull-right\"/>"
+"float-right\" role=\"img\" aria-label=\"\" title=\"Read this !\"/>"
+msgstr ""
#. module: website_mail_channel
#: model:ir.model,name:website_mail_channel.model_mail_mail
@@ -161,16 +322,6 @@ msgid "Outgoing Mails"
msgstr "出去的邮件"
#. module: website_mail_channel
-#: model:mail.template,subject:website_mail_channel.mail_template_list_subscribe
-msgid "Please confirm subscription to ${object.name}"
-msgstr "请确认订阅 ${object.name}"
-
-#. module: website_mail_channel
-#: model:mail.template,subject:website_mail_channel.mail_template_list_unsubscribe
-msgid "Please confirm unsubscription to ${object.name}"
-msgstr "请确认取消订阅 ${object.name}"
-
-#. module: website_mail_channel
#: code:addons/website_mail_channel/models/mail_mail.py:21
#, python-format
msgid "Post to"
@@ -179,12 +330,12 @@ msgstr "寄到"
#. module: website_mail_channel
#: model:ir.ui.view,arch_db:website_mail_channel.group_message
msgid "Reference"
-msgstr "参考"
+msgstr "编号"
#. module: website_mail_channel
#: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
msgid "Stay in touch with our Community"
-msgstr "请通过我们的社区和我们保持联系"
+msgstr "与我们的社区保持联系"
#. module: website_mail_channel
#: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
@@ -215,18 +366,12 @@ msgstr "退订"
#. module: website_mail_channel
#: model:ir.ui.view,arch_db:website_mail_channel.confirmation_subscription
msgid "You have been correctly"
-msgstr "您已正确操作"
+msgstr "您已正确订阅/取消订阅邮件列表"
#. module: website_mail_channel
#: model:ir.ui.view,arch_db:website_mail_channel.subscribe
msgid "a confirmation email has been sent."
-msgstr "已发送确认电子邮件"
-
-#. module: website_mail_channel
-#: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
-#: model:ir.ui.view,arch_db:website_mail_channel.subscribe
-msgid "archives"
-msgstr "存档"
+msgstr "已发送确认电子邮件。"
#. module: website_mail_channel
#: model:ir.ui.view,arch_db:website_mail_channel.group_message
@@ -262,8 +407,8 @@ msgstr "邮件列表存档 "
#: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
msgid ""
"members<br/>\n"
-" <i class=\"fa fa-fw fa-envelope-o\"/>"
-msgstr "成员"
+" <i class=\"fa fa-fw fa-envelope-o\" role=\"img\" aria-label=\"Traffic\" title=\"Traffic\"/>"
+msgstr ""
#. module: website_mail_channel
#: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
@@ -281,12 +426,6 @@ msgid "replies"
msgstr "回复"
#. module: website_mail_channel
-#: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
-#: model:ir.ui.view,arch_db:website_mail_channel.subscribe
-msgid "send mail"
-msgstr "发送邮件"
-
-#. module: website_mail_channel
#: model:ir.ui.view,arch_db:website_mail_channel.messages_short
msgid "show"
msgstr "显示"
@@ -302,12 +441,6 @@ msgid "to the mailing list."
msgstr "至邮件列表。"
#. module: website_mail_channel
-#: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
-#: model:ir.ui.view,arch_db:website_mail_channel.subscribe
-msgid "unsubscribe"
-msgstr "退订"
-
-#. module: website_mail_channel
#: model:ir.ui.view,arch_db:website_mail_channel.confirmation_subscription
msgid "unsubscribed"
msgstr "退订"
@@ -316,4 +449,4 @@ msgstr "退订"
#: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
#: model:ir.ui.view,arch_db:website_mail_channel.subscribe
msgid "your email..."
-msgstr "你的电子邮件..."
+msgstr "您的电子邮件..."
diff --git a/addons/website_mail_channel/i18n/zh_TW.po b/addons/website_mail_channel/i18n/zh_TW.po
index aac91095856..69737ebacde 100644
--- a/addons/website_mail_channel/i18n/zh_TW.po
+++ b/addons/website_mail_channel/i18n/zh_TW.po
@@ -3,13 +3,14 @@
# * website_mail_channel
#
# Translators:
+# Martin Trigaux, 2018
# 敬雲 林 <chingyun@yuanchih-consult.com>, 2018
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.2\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-03-22 14:11+0000\n"
-"PO-Revision-Date: 2018-03-22 14:11+0000\n"
+"POT-Creation-Date: 2018-08-24 09:05+0000\n"
+"PO-Revision-Date: 2018-08-24 09:05+0000\n"
"Last-Translator: 敬雲 林 <chingyun@yuanchih-consult.com>, 2018\n"
"Language-Team: Chinese (Taiwan) (https://www.transifex.com/odoo/teams/41243/zh_TW/)\n"
"MIME-Version: 1.0\n"
@@ -19,42 +20,22 @@ msgstr ""
"Plural-Forms: nplurals=1; plural=0;\n"
#. module: website_mail_channel
-#: model:mail.template,body_html:website_mail_channel.mail_template_list_subscribe
-msgid ""
-"<?xml version=\"1.0\"?>\n"
-"<data><p>Hello,</p>\n"
-"<p>You have requested to be subscribed to the mailing list <strong>${object.name}</strong></p>\n"
-"<p>To confirm, please visit the following link:</p>\n"
-"<p><strong><a href=\"${ctx['token_url']}\">${ctx['token_url']}</a></strong></p>\n"
-"<p>If this was a mistake or you did not requested this action, please ignore this message.</p>\n"
-"</data>"
+#: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
+#: model:ir.ui.view,arch_db:website_mail_channel.subscribe
+msgid "<i class=\"fa fa-envelope-o\"/> send mail"
msgstr ""
-"<?xml version=\"1.0\"?>\n"
-"<data><p>您好,</p>\n"
-"<p>您已請求訂閱信件列表 <strong>${object.name}</strong></p>\n"
-"<p>要進行確認,請訪問以下鏈接:</p>\n"
-"<p><strong><a href=\"${ctx['token_url']}\">${ctx['token_url']}</a></strong></p>\n"
-"<p>如果這是一個錯誤,或者您未請求執行此操作,請忽略此消息。</p>\n"
-"</data>"
#. module: website_mail_channel
-#: model:mail.template,body_html:website_mail_channel.mail_template_list_unsubscribe
-msgid ""
-"<?xml version=\"1.0\"?>\n"
-"<data><p>Hello,</p>\n"
-"<p>You have requested to be unsubscribed to the mailing list <strong>${object.name}</strong></p>\n"
-"<p>To confirm, please visit the following link:</p>\n"
-"<p><strong><a href=\"${ctx['token_url']}\">${ctx['token_url']}</a></strong></p>\n"
-"<p>If this was a mistake or you did not requested this action, please ignore this message.</p>\n"
-"</data>"
+#: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
+#: model:ir.ui.view,arch_db:website_mail_channel.subscribe
+msgid "<i class=\"fa fa-file-o\"/> archives"
+msgstr ""
+
+#. module: website_mail_channel
+#: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
+#: model:ir.ui.view,arch_db:website_mail_channel.subscribe
+msgid "<i class=\"fa fa-times\"/> unsubscribe"
msgstr ""
-"<?xml version=\"1.0\"?>\n"
-"<data><p>您好,</p>\n"
-"<p>您已請求退訂信件列表 <strong>${object.name}</strong></p>\n"
-"<p>要進行確認,請訪問以下鏈接:</p>\n"
-"<p><strong><a href=\"${ctx['token_url']}\">${ctx['token_url']}</a></strong></p>\n"
-"<p>如果這是一個錯誤,或者您未請求執行此操作,請忽略此消息。</p>\n"
-"</data>"
#. module: website_mail_channel
#: model:ir.ui.view,arch_db:website_mail_channel.subscribe
@@ -62,6 +43,172 @@ msgid "<span class=\"oe_snippet_thumbnail_title\">Discussion Group</span>"
msgstr "<span class=\"oe_snippet_thumbnail_title\">討論組</span>"
#. module: website_mail_channel
+#: model:mail.template,body_html:website_mail_channel.mail_template_list_subscribe
+msgid ""
+"<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" style=\"padding-top: 16px; background-color: #F1F1F1; font-family:Verdana, Arial,sans-serif; color: #454748; width: 100%; border-collapse:separate;\"><tr><td align=\"center\">\n"
+"<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"padding: 16px; background-color: white; color: #454748; border-collapse:separate;\">\n"
+"<tbody>\n"
+" <!-- HEADER -->\n"
+" <tr>\n"
+" <td align=\"center\" style=\"min-width: 590px;\">\n"
+" <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: white; padding: 0px 8px 0px 8px; border-collapse:separate;\">\n"
+" <tr><td valign=\"middle\">\n"
+" <span style=\"font-size: 10px;\">Your Channel</span><br/>\n"
+" <span style=\"font-size: 20px; font-weight: bold;\">${object.name}</span>\n"
+" </td><td valign=\"middle\" align=\"right\">\n"
+" <img src=\"/logo.png?company=${user.company_id.id}\" style=\"padding: 0px; margin: 0px; height: auto; width: 80px;\" alt=\"${user.company_id.name}\"/>\n"
+" </td></tr>\n"
+" <tr><td colspan=\"2\" style=\"text-align:center;\">\n"
+" <hr width=\"100%\" style=\"background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0; margin:16px 0px 16px 0px;\"/>\n"
+" </td></tr>\n"
+" </table>\n"
+" </td>\n"
+" </tr>\n"
+" <!-- CONTENT -->\n"
+" <tr>\n"
+" <td align=\"center\" style=\"min-width: 590px;\">\n"
+" <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: white; padding: 0px 8px 0px 8px; border-collapse:separate;\">\n"
+" <tr><td valign=\"top\" style=\"font-size: 13px;\">\n"
+" <div style=\"margin: 0px; padding: 0px;\">\n"
+" Hello,<br/><br/>\n"
+" You have requested to be subscribed to the mailing list <strong>${object.name}</strong>.\n"
+" <br/><br/>\n"
+" To confirm, please visit the following link: <strong><a href=\"${ctx['token_url']}\">${ctx['token_url']}</a></strong>\n"
+" <br/><br/>\n"
+" If this was a mistake or you did not requested this action, please ignore this message.\n"
+" % if user.signature\n"
+" <br/>\n"
+" ${user.signature | safe}\n"
+" % endif\n"
+" </div>\n"
+" </td></tr>\n"
+" <tr><td style=\"text-align:center;\">\n"
+" <hr width=\"100%\" style=\"background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0; margin: 16px 0px 16px 0px;\"/>\n"
+" </td></tr>\n"
+" </table>\n"
+" </td>\n"
+" </tr>\n"
+" <!-- FOOTER -->\n"
+" <tr>\n"
+" <td align=\"center\" style=\"min-width: 590px;\">\n"
+" <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: white; font-size: 11px; padding: 0px 8px 0px 8px; border-collapse:separate;\">\n"
+" <tr><td valign=\"middle\" align=\"left\">\n"
+" ${user.company_id.name}\n"
+" </td></tr>\n"
+" <tr><td valign=\"middle\" align=\"left\" style=\"opacity: 0.7;\">\n"
+" % if user.company_id.phone\n"
+" ${user.company_id.phone} |\n"
+" %endif\n"
+" % if user.company_id.email\n"
+" <a href=\"'mailto:%s' % ${user.company_id.email}\" style=\"text-decoration:none; color: #454748;\">${user.company_id.email}</a> |\n"
+" % endif\n"
+" % if user.company_id.website\n"
+" <a href=\"'%s' % ${user.company_id.website}\" style=\"text-decoration:none; color: #454748;\">${user.company_id.website}\n"
+" </a>\n"
+" % endif\n"
+" </td></tr>\n"
+" </table>\n"
+" </td>\n"
+" </tr>\n"
+"</tbody>\n"
+"</table>\n"
+"</td></tr>\n"
+"<!-- POWERED BY -->\n"
+"<tr><td align=\"center\" style=\"min-width: 590px;\">\n"
+" <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: #F1F1F1; color: #454748; padding: 8px; border-collapse:separate;\">\n"
+" <tr><td style=\"text-align: center; font-size: 13px;\">\n"
+" Powered by <a target=\"_blank\" href=\"https://www.odoo.com?utm_source=db&amp;utm_medium=mail\" style=\"color: #875A7B;\">Odoo</a>\n"
+" </td></tr>\n"
+" </table>\n"
+"</td></tr>\n"
+"</table>\n"
+" "
+msgstr ""
+
+#. module: website_mail_channel
+#: model:mail.template,body_html:website_mail_channel.mail_template_list_unsubscribe
+msgid ""
+"<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" style=\"padding-top: 16px; background-color: #F1F1F1; font-family:Verdana, Arial,sans-serif; color: #454748; width: 100%; border-collapse:separate;\"><tr><td align=\"center\">\n"
+"<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"padding: 16px; background-color: white; color: #454748; border-collapse:separate;\">\n"
+"<tbody>\n"
+" <!-- HEADER -->\n"
+" <tr>\n"
+" <td align=\"center\" style=\"min-width: 590px;\">\n"
+" <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: white; padding: 0px 8px 0px 8px; border-collapse:separate;\">\n"
+" <tr><td valign=\"middle\">\n"
+" <span style=\"font-size: 10px;\">Your Channel</span><br/>\n"
+" <span style=\"font-size: 20px; font-weight: bold;\">${object.name}</span>\n"
+" </td><td valign=\"middle\" align=\"right\">\n"
+" <img src=\"/logo.png?company=${user.company_id.id}\" style=\"padding: 0px; margin: 0px; height: auto; width: 80px;\" alt=\"${user.company_id.name}\"/>\n"
+" </td></tr>\n"
+" <tr><td colspan=\"2\" style=\"text-align:center;\">\n"
+" <hr width=\"100%\" style=\"background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0; margin:16px 0px 16px 0px;\"/>\n"
+" </td></tr>\n"
+" </table>\n"
+" </td>\n"
+" </tr>\n"
+" <!-- CONTENT -->\n"
+" <tr>\n"
+" <td align=\"center\" style=\"min-width: 590px;\">\n"
+" <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: white; padding: 0px 8px 0px 8px; border-collapse:separate;\">\n"
+" <tr><td valign=\"top\" style=\"font-size: 13px;\">\n"
+" <div style=\"margin: 0px; padding: 0px;\">\n"
+" Hello,<br/><br/>\n"
+" You have requested to be unsubscribed to the mailing list <strong>${object.name}</strong>.\n"
+" <br/><br/>\n"
+" To confirm, please visit the following link: <strong><a href=\"${ctx['token_url']}\">${ctx['token_url']}</a></strong>.\n"
+" <br/><br/>\n"
+" If this was a mistake or you did not requested this action, please ignore this message.\n"
+" % if user.signature:\n"
+" <br/>\n"
+" ${user.signature | safe}\n"
+" % endif\n"
+" </div>\n"
+" </td></tr>\n"
+" <tr><td style=\"text-align:center;\">\n"
+" <hr width=\"100%\" style=\"background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0; margin: 16px 0px 16px 0px;\"/>\n"
+" </td></tr>\n"
+" </table>\n"
+" </td>\n"
+" </tr>\n"
+" <!-- FOOTER -->\n"
+" <tr>\n"
+" <td align=\"center\" style=\"min-width: 590px;\">\n"
+" <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: white; font-size: 11px; padding: 0px 8px 0px 8px; border-collapse:separate;\">\n"
+" <tr><td valign=\"middle\" align=\"left\">\n"
+" ${user.company_id.name}\n"
+" </td></tr>\n"
+" <tr><td valign=\"middle\" align=\"left\" style=\"opacity: 0.7;\">\n"
+" % if user.company_id.phone\n"
+" ${user.company_id.phone} |\n"
+" %endif\n"
+" % if user.company_id.email\n"
+" <a href=\"'mailto:%s' % ${user.company_id.email}\" style=\"text-decoration:none; color: #454748;\">${user.company_id.email}</a> |\n"
+" % endif\n"
+" % if user.company_id.website\n"
+" <a href=\"'%s' % ${user.company_id.website}\" style=\"text-decoration:none; color: #454748;\">${user.company_id.website}\n"
+" </a>\n"
+" % endif\n"
+" </td></tr>\n"
+" </table>\n"
+" </td>\n"
+" </tr>\n"
+"</tbody>\n"
+"</table>\n"
+"</td></tr>\n"
+"<!-- POWERED BY -->\n"
+"<tr><td align=\"center\" style=\"min-width: 590px;\">\n"
+" <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: #F1F1F1; color: #454748; padding: 8px; border-collapse:separate;\">\n"
+" <tr><td style=\"text-align: center; font-size: 13px;\">\n"
+" Powered by <a target=\"_blank\" href=\"https://www.odoo.com?utm_source=db&amp;utm_medium=mail\" style=\"color: #875A7B;\">Odoo</a>\n"
+" </td></tr>\n"
+" </table>\n"
+"</td></tr>\n"
+"</table>\n"
+" "
+msgstr ""
+
+#. module: website_mail_channel
#. openerp-web
#: code:addons/website_mail_channel/static/src/js/website_mail_channel.editor.js:17
#, python-format
@@ -80,6 +227,12 @@ msgstr "歸檔"
#. module: website_mail_channel
#: model:ir.ui.view,arch_db:website_mail_channel.group_message
+#: model:ir.ui.view,arch_db:website_mail_channel.messages_short
+msgid "Avatar"
+msgstr "頭像"
+
+#. module: website_mail_channel
+#: model:ir.ui.view,arch_db:website_mail_channel.group_message
msgid "Browse archives"
msgstr "瀏覽存檔"
@@ -101,6 +254,16 @@ msgid "Change Discussion List"
msgstr "變更討論列表"
#. module: website_mail_channel
+#: model:mail.template,subject:website_mail_channel.mail_template_list_subscribe
+msgid "Confirm subscription to ${object.name}"
+msgstr ""
+
+#. module: website_mail_channel
+#: model:mail.template,subject:website_mail_channel.mail_template_list_unsubscribe
+msgid "Confirm unsubscription to ${object.name}"
+msgstr ""
+
+#. module: website_mail_channel
#. openerp-web
#: code:addons/website_mail_channel/static/src/js/website_mail_channel.editor.js:18
#, python-format
@@ -118,18 +281,19 @@ msgid "Follow-Ups"
msgstr "催款"
#. module: website_mail_channel
+#: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
+msgid "Group"
+msgstr "群組"
+
+#. module: website_mail_channel
#: model:ir.ui.view,arch_db:website_mail_channel.invalid_token_subscription
msgid "Invalid or expired confirmation link."
msgstr "非法或者過期的確認鏈接。"
#. module: website_mail_channel
-#: model:ir.ui.view,arch_db:website_mail_channel.footer_mailing_list
-msgid "Mailing List"
-msgstr "信件列表"
-
-#. module: website_mail_channel
#: model:ir.ui.view,arch_db:website_mail_channel.group_message
#: model:ir.ui.view,arch_db:website_mail_channel.group_messages
+#: model:website.menu,name:website_mail_channel.menu_mailing_list
msgid "Mailing Lists"
msgstr "信件列表"
@@ -143,8 +307,8 @@ msgstr "信件列表"
#: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
msgid ""
"Need to unsubscribe? It's right here! <span class=\"fa fa-2x fa-arrow-down "
-"pull-right\"/>"
-msgstr "需要取消訂閱? 在這裡!<span class=\"fa fa-2x fa-arrow-down pull-right\"/>"
+"float-right\" role=\"img\" aria-label=\"\" title=\"Read this !\"/>"
+msgstr ""
#. module: website_mail_channel
#: model:ir.model,name:website_mail_channel.model_mail_mail
@@ -152,16 +316,6 @@ msgid "Outgoing Mails"
msgstr "出向信件"
#. module: website_mail_channel
-#: model:mail.template,subject:website_mail_channel.mail_template_list_subscribe
-msgid "Please confirm subscription to ${object.name}"
-msgstr "請確認訂閱 ${object.name}"
-
-#. module: website_mail_channel
-#: model:mail.template,subject:website_mail_channel.mail_template_list_unsubscribe
-msgid "Please confirm unsubscription to ${object.name}"
-msgstr "請確認取消訂閱 ${object.name}"
-
-#. module: website_mail_channel
#: code:addons/website_mail_channel/models/mail_mail.py:21
#, python-format
msgid "Post to"
@@ -214,12 +368,6 @@ msgid "a confirmation email has been sent."
msgstr "已發送確認電子信件。"
#. module: website_mail_channel
-#: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
-#: model:ir.ui.view,arch_db:website_mail_channel.subscribe
-msgid "archives"
-msgstr "歸檔"
-
-#. module: website_mail_channel
#: model:ir.ui.view,arch_db:website_mail_channel.group_message
msgid "attachments"
msgstr "附件"
@@ -253,10 +401,8 @@ msgstr "信件列表存檔 "
#: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
msgid ""
"members<br/>\n"
-" <i class=\"fa fa-fw fa-envelope-o\"/>"
+" <i class=\"fa fa-fw fa-envelope-o\" role=\"img\" aria-label=\"Traffic\" title=\"Traffic\"/>"
msgstr ""
-"成員<br/>\n"
-"<i class=\"fa fa-fw fa-envelope-o\"/>"
#. module: website_mail_channel
#: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
@@ -274,12 +420,6 @@ msgid "replies"
msgstr "回覆"
#. module: website_mail_channel
-#: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
-#: model:ir.ui.view,arch_db:website_mail_channel.subscribe
-msgid "send mail"
-msgstr "發送信件"
-
-#. module: website_mail_channel
#: model:ir.ui.view,arch_db:website_mail_channel.messages_short
msgid "show"
msgstr "顯示"
@@ -295,12 +435,6 @@ msgid "to the mailing list."
msgstr "至信件列表。"
#. module: website_mail_channel
-#: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
-#: model:ir.ui.view,arch_db:website_mail_channel.subscribe
-msgid "unsubscribe"
-msgstr "退訂"
-
-#. module: website_mail_channel
#: model:ir.ui.view,arch_db:website_mail_channel.confirmation_subscription
msgid "unsubscribed"
msgstr "退訂"