[MERGE] forward port of branch 9.0 up to 97e87a4

3 files changed, 94 insertions, 3 deletions

diff --git a/addons/theme_bootswatch/__openerp__.py b/addons/theme_bootswatch/__openerp__.py
index 968f095b0ef..e3446ea4a1f 100644
--- a/addons/theme_bootswatch/__openerp__.py
+++ b/addons/theme_bootswatch/__openerp__.py
@@ -3,6 +3,7 @@
     'summary': 'Support for Bootswatch themes in master',
     'description': 'This theme module is exclusively for master to keep the support of Bootswatch themes which were previously part of the website module in 8.0.',
     'category': 'Theme',
+    'sequence': 900,
     'version': '1.0',
     'depends': ['website'],
     'data': [
diff --git a/addons/theme_bootswatch/i18n/es_EC.po b/addons/theme_bootswatch/i18n/es_EC.po
new file mode 100644
index 00000000000..6281bf02270
--- /dev/null
+++ b/addons/theme_bootswatch/i18n/es_EC.po
@@ -0,0 +1,89 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * theme_bootswatch
+# 
+# Translators:
+# Rick Hunter <rick_hunter_ec@yahoo.com>, 2015
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo 9.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-08-21 14:56+0000\n"
+"PO-Revision-Date: 2015-12-28 17:43+0000\n"
+"Last-Translator: Rick Hunter <rick_hunter_ec@yahoo.com>\n"
+"Language-Team: Spanish (Ecuador) (http://www.transifex.com/odoo/odoo-9/language/es_EC/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Language: es_EC\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. module: theme_bootswatch
+#: model:ir.ui.view,arch_db:theme_bootswatch.theme_customize
+msgid "Amelia"
+msgstr "Amelia"
+
+#. module: theme_bootswatch
+#: model:ir.ui.view,arch_db:theme_bootswatch.theme_customize
+msgid "Cerulean"
+msgstr ""
+
+#. module: theme_bootswatch
+#: model:ir.ui.view,arch_db:theme_bootswatch.theme_customize
+msgid "Cosmo"
+msgstr ""
+
+#. module: theme_bootswatch
+#: model:ir.ui.view,arch_db:theme_bootswatch.theme_customize
+msgid "Customize your theme"
+msgstr ""
+
+#. module: theme_bootswatch
+#: model:ir.ui.view,arch_db:theme_bootswatch.theme_customize
+msgid "Cyborg"
+msgstr ""
+
+#. module: theme_bootswatch
+#: model:ir.ui.view,arch_db:theme_bootswatch.theme_customize
+msgid "Default Theme"
+msgstr ""
+
+#. module: theme_bootswatch
+#: model:ir.ui.view,arch_db:theme_bootswatch.theme_customize
+msgid "Flatly"
+msgstr ""
+
+#. module: theme_bootswatch
+#: model:ir.ui.view,arch_db:theme_bootswatch.theme_customize
+msgid "Journal"
+msgstr "Diario"
+
+#. module: theme_bootswatch
+#: model:ir.ui.view,arch_db:theme_bootswatch.theme_customize
+msgid "Readable"
+msgstr ""
+
+#. module: theme_bootswatch
+#: model:ir.ui.view,arch_db:theme_bootswatch.theme_customize
+msgid "Simplex"
+msgstr ""
+
+#. module: theme_bootswatch
+#: model:ir.ui.view,arch_db:theme_bootswatch.theme_customize
+msgid "Slate"
+msgstr ""
+
+#. module: theme_bootswatch
+#: model:ir.ui.view,arch_db:theme_bootswatch.theme_customize
+msgid "Spacelab"
+msgstr ""
+
+#. module: theme_bootswatch
+#: model:ir.ui.view,arch_db:theme_bootswatch.theme_customize
+msgid "United"
+msgstr ""
+
+#. module: theme_bootswatch
+#: model:ir.ui.view,arch_db:theme_bootswatch.theme_customize
+msgid "×"
+msgstr ""
diff --git a/addons/theme_bootswatch/i18n/zh_CN.po b/addons/theme_bootswatch/i18n/zh_CN.po
index 34d804fefe7..4da085bdab6 100644
--- a/addons/theme_bootswatch/i18n/zh_CN.po
+++ b/addons/theme_bootswatch/i18n/zh_CN.po
@@ -3,13 +3,14 @@
 # * theme_bootswatch
 # 
 # Translators:
+# Gary Wei <Gary.wei@elico-corp.com>, 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo 9.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-08-21 14:56+0000\n"
-"PO-Revision-Date: 2015-11-13 07:04+0000\n"
-"Last-Translator: Martin Trigaux\n"
+"PO-Revision-Date: 2015-12-29 03:19+0000\n"
+"Last-Translator: Gary Wei <Gary.wei@elico-corp.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/odoo/odoo-9/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -35,7 +36,7 @@ msgstr "Cosmo"
 #. module: theme_bootswatch
 #: model:ir.ui.view,arch_db:theme_bootswatch.theme_customize
 msgid "Customize your theme"
-msgstr ""
+msgstr "定制主题"
 
 #. module: theme_bootswatch
 #: model:ir.ui.view,arch_db:theme_bootswatch.theme_customize