Merge 107c356 into 1e6d24d

OCA · Jul 17, 2018 · 1aa0be1 · 1aa0be1
2 parents 1e6d24d + 107c356
commit 1aa0be1
Show file tree

Hide file tree

Showing 18 changed files with 267 additions and 159 deletions.
diff --git a/l10n_ca_states_translations/README.rst b/l10n_ca_states_translations/README.rst
diff --git a/l10n_ca_states_translations/i18n/fr.po b/l10n_ca_states_translations/i18n/fr.po
diff --git a/l10n_ca_states_translations/__init__.py → ...try_state_translations_canada/__init__.py b/l10n_ca_states_translations/__init__.py → ...try_state_translations_canada/__init__.py
@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
-# © 2010 Savoir-faire Linux
+# © 2018 Savoir-faire Linux
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
diff --git a/res_country_state_translations_canada/__manifest__.py b/res_country_state_translations_canada/__manifest__.py
@@ -0,0 +1,15 @@
+# -*- coding: utf-8 -*-
+# © 2018 Savoir-faire Linux
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+
+{
+    'name': 'Canada - Provinces and Territories Translations in French',
+    'version': '10.0.1.0.0',
+    'author': "Savoir-faire Linux,Odoo Community Association (OCA)",
+    'website': 'http://www.savoirfairelinux.com',
+    'category': 'Localisation/Canada',
+    'license': 'AGPL-3',
+    'depends': ['l10n_multilang'],
+    'data': [],
+    'installable': True,
+}
diff --git a/res_country_state_translations_canada/i18n/fr.po b/res_country_state_translations_canada/i18n/fr.po
@@ -0,0 +1,18 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* base
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 10.0+e\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2018-06-21 11:54-0400\n"
+"PO-Revision-Date: 2018-06-21 11:55-0400\n"
+"Last-Translator: Agathe Mollé <agathe.molle@savoirfairelinux.com>\n"
+"Language-Team: \n"
+"Language: fr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Poedit 1.8.7.1\n"
diff --git a/...ions/i18n/l10n_ca_states_translations.pot → ...res_country_state_translations_canada.pot b/...ions/i18n/l10n_ca_states_translations.pot → ...res_country_state_translations_canada.pot
diff --git a/res_country_state_translations_canada/i18n_extra/fr.po b/res_country_state_translations_canada/i18n_extra/fr.po
@@ -0,0 +1,53 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* base
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 10.0+e\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2018-06-21 11:54-0400\n"
+"PO-Revision-Date: 2018-06-21 11:55-0400\n"
+"Last-Translator: Agathe Mollé <agathe.molle@savoirfairelinux.com>\n"
+"Language-Team: \n"
+"Language: fr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Poedit 1.8.7.1\n"
+
+#. module: base
+#: model:res.country.state,name:base.state_ca_bc
+msgid "British Columbia"
+msgstr "Colombie-Britannique"
+
+#. module: base
+#: model:res.country.state,name:base.state_ca_nb
+msgid "New Brunswick"
+msgstr "Nouveau-Brunswick"
+
+#. module: base
+#: model:res.country.state,name:base.state_ca_nl
+msgid "Newfoundland and Labrador"
+msgstr "Terre-Neuve-et-Labrador"
+
+#. module: base
+#: model:res.country.state,name:base.state_ca_nt
+msgid "Northwest Territories"
+msgstr "Territoires du Nord-Ouest"
+
+#. module: base
+#: model:res.country.state,name:base.state_ca_ns
+msgid "Nova Scotia"
+msgstr "Nouvelle-Écosse"
+
+#. module: base
+#: model:res.country.state,name:base.state_ca_pe
+msgid "Prince Edward Island"
+msgstr "Île-du-Prince-Édouard"
+
+#. module: base
+#: model:res.country.state,name:base.state_ca_qc
+msgid "Quebec"
+msgstr "Québec"
diff --git a/res_country_state_translations_canada/readme/CONTRIBUTORS.rst b/res_country_state_translations_canada/readme/CONTRIBUTORS.rst
@@ -0,0 +1 @@
+* Agathe Mollé <agathe.molle@savoirfairelinux.com>
diff --git a/res_country_state_translations_canada/readme/DESCRIPTION.rst b/res_country_state_translations_canada/readme/DESCRIPTION.rst
@@ -0,0 +1 @@
+This module adds the Canadian provinces and territories translations in French.
diff --git a/..._translations/static/description/icon.png → ...ations_canada/static/description/icon.png b/..._translations/static/description/icon.png → ...ations_canada/static/description/icon.png
diff --git a/res_country_state_translations_us/__init__.py b/res_country_state_translations_us/__init__.py
@@ -0,0 +1,3 @@
+# -*- coding: utf-8 -*-
+# © 2018 Savoir-faire Linux
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
diff --git a/l10n_ca_states_translations/__manifest__.py → ...try_state_translations_us/__manifest__.py b/l10n_ca_states_translations/__manifest__.py → ...try_state_translations_us/__manifest__.py
@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
-# © 2010 Savoir-faire Linux
+# © 2018 Savoir-faire Linux
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
 
 {
-    'name': 'Canada - States, Provinces and Territories Translations',
-    'version': '10.0.0.1.0',
+    'name': 'USA - States Translations in French',
+    'version': '10.0.1.0.0',
     'author': "Savoir-faire Linux,Odoo Community Association (OCA)",
     'website': 'http://www.savoirfairelinux.com',
     'category': 'Localisation/Canada',

diff --git a/res_country_state_translations_us/i18n/fr.po b/res_country_state_translations_us/i18n/fr.po
@@ -0,0 +1,18 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* base
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 10.0+e\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2018-06-21 11:54-0400\n"
+"PO-Revision-Date: 2018-06-21 11:55-0400\n"
+"Last-Translator: Agathe Mollé <agathe.molle@savoirfairelinux.com>\n"
+"Language-Team: \n"
+"Language: fr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Poedit 1.8.7.1\n"
diff --git a/res_country_state_translations_us/i18n/res_country_state_translations_us.pot b/res_country_state_translations_us/i18n/res_country_state_translations_us.pot
@@ -0,0 +1,14 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 10.0\n"
+"Report-Msgid-Bugs-To: \n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+