Merge pull request OCA#414 from OCA/9.0

Syncing from upstream OCA/server-tools (9.0)
grueneerde · Jan 4, 2019 · fd07371 · fd07371
2 parents 77b3f8e + a332d53
commit fd07371
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 18 deletions.
diff --git a/base_user_role/README.rst b/base_user_role/README.rst
@@ -1,6 +1,6 @@
-.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg
-   :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
-   :alt: License: AGPL-3
+.. image:: https://img.shields.io/badge/licence-LGPL--3-blue.svg
+   :target: http://www.gnu.org/licenses/lgpl-3.0-standalone.html
+   :alt: License: LGPL-3
 
 ==========
 User roles

diff --git a/base_user_role/__openerp__.py b/base_user_role/__openerp__.py
@@ -1,13 +1,13 @@
 # -*- coding: utf-8 -*-
 # Copyright 2014 ABF OSIELL <http://osiell.com>
-# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl).
 
 {
     'name': 'User roles',
     'version': '9.0.1.0.0',
     'category': 'Tools',
     'author': 'ABF OSIELL, Odoo Community Association (OCA)',
-    'license': 'AGPL-3',
+    'license': 'LGPL-3',
     'maintainer': 'ABF OSIELL',
     'website': 'http://www.osiell.com',
     'depends': [

diff --git a/base_user_role/data/ir_cron.xml b/base_user_role/data/ir_cron.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright 2016 ABF OSIELL <http://osiell.com>
-     License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->
+     License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl). -->
 <odoo noupdate="1">
 
 <record model="ir.cron" id="cron_update_users">

diff --git a/base_user_role/data/ir_module_category.xml b/base_user_role/data/ir_module_category.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright 2016 ABF OSIELL <http://osiell.com>
-     License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->
+     License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl). -->
 <odoo>
 
 <record model="ir.module.category" id="ir_module_category_role">

diff --git a/base_user_role/models/role.py b/base_user_role/models/role.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 # Copyright 2014 ABF OSIELL <http://osiell.com>
-# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl).
 
 import datetime
 import logging

diff --git a/base_user_role/models/user.py b/base_user_role/models/user.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 # Copyright 2014 ABF OSIELL <http://osiell.com>
-# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl).
 
 from openerp import api, fields, models
 

diff --git a/base_user_role/tests/test_user_role.py b/base_user_role/tests/test_user_role.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 # Copyright 2014 ABF OSIELL <http://osiell.com>
-# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl).
 
 import datetime
 

diff --git a/base_user_role/views/role.xml b/base_user_role/views/role.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright 2014 ABF OSIELL <http://osiell.com>
-     License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->
+     License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl). -->
 <odoo>
 
 <record id="view_res_users_role_form" model="ir.ui.view">

diff --git a/base_user_role/views/user.xml b/base_user_role/views/user.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright 2014 ABF OSIELL <http://osiell.com>
-     License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->
+     License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl). -->
 <odoo>
 
 <record id="view_res_users_form_inherit" model="ir.ui.view">

diff --git a/keychain/i18n/ca.po b/keychain/i18n/ca.po
@@ -10,15 +10,15 @@ msgstr ""
 "Project-Id-Version: Odoo Server 9.0c\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-04-19 18:00+0000\n"
-"PO-Revision-Date: 2018-07-03 14:05+0000\n"
+"PO-Revision-Date: 2018-12-15 19:58+0000\n"
 "Last-Translator: mtbochaca <[email protected]>\n"
 "Language-Team: Catalan (https://www.transifex.com/oca/teams/23907/ca/)\n"
 "Language: ca\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 3.0.1\n"
+"X-Generator: Weblate 3.3\n"
 
 #. module: keychain
 #: code:addons/keychain/models/keychain.py:76
@@ -108,9 +108,8 @@ msgstr "Clauer"
 
 #. module: keychain
 #: model:ir.model.fields,field_description:keychain.field_keychain_backend_keychain_account_id
-#, fuzzy
 msgid "Keychain account id"
-msgstr "keychain.account"
+msgstr "Id de compte Keychain"
 
 #. module: keychain
 #: model:ir.model.fields,field_description:keychain.field_keychain_account___last_update
@@ -202,9 +201,8 @@ msgstr "keychain.account"
 
 #. module: keychain
 #: model:ir.model,name:keychain.model_keychain_backend
-#, fuzzy
 msgid "keychain.backend"
-msgstr "keychain.account"
+msgstr "keychain.backend"
 
 #~ msgid "Accounts form"
 #~ msgstr "Formularis de comptes"