[tryton-debian-vcs] tryton-modules-carrier branch upstream updated. upstream/4.2.0-1-g4918d04
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Wed Jun 7 13:33:03 UTC 2017
The following commit has been merged in the upstream branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-carrier.git;a=commitdiff;h=upstream/4.2.0-1-g4918d04
commit 4918d047d35f05048635d8502fda3fee74545d68
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Jun 7 15:26:03 2017 +0200
Adding upstream version 4.4.0.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/CHANGELOG b/CHANGELOG
index 1d62f79..9803b32 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 4.4.0 - 2017-05-01
+* Bug fixes (see mercurial logs for details)
+
Version 4.2.0 - 2016-11-28
* Bug fixes (see mercurial logs for details)
* Add carrier selection
diff --git a/COPYRIGHT b/COPYRIGHT
index 2d2b387..bf012da 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,7 +1,7 @@
-Copyright (C) 2011-2016 Cédric Krier.
+Copyright (C) 2011-2017 Cédric Krier.
Copyright (C) 2011-2013 Bertrand Chenal.
-Copyright (C) 2011-2016 Nicolas Évrard.
-Copyright (C) 2011-2016 B2CK SPRL.
+Copyright (C) 2011-2017 Nicolas Évrard.
+Copyright (C) 2011-2017 B2CK SPRL.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/PKG-INFO b/PKG-INFO
index b5a30ab..4086e91 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_carrier
-Version: 4.2.0
+Version: 4.4.0
Summary: Tryton module with carriers
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: issue_tracker at tryton.org
License: GPL-3
-Download-URL: http://downloads.tryton.org/4.2/
+Download-URL: http://downloads.tryton.org/4.4/
Description: trytond_carrier
===============
@@ -52,7 +52,7 @@ Classifier: Intended Audience :: Developers
Classifier: Intended Audience :: Financial and Insurance Industry
Classifier: Intended Audience :: Legal Industry
Classifier: Intended Audience :: Manufacturing
-Classifier: License :: OSI Approved :: GNU General Public License (GPL)
+Classifier: License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)
Classifier: Natural Language :: Bulgarian
Classifier: Natural Language :: Catalan
Classifier: Natural Language :: Chinese (Simplified)
diff --git a/locale/es_419.po b/locale/es_419.po
index 227322c..160741b 100644
--- a/locale/es_419.po
+++ b/locale/es_419.po
@@ -16,7 +16,7 @@ msgstr ""
msgctxt "field:carrier,create_uid:"
msgid "Create User"
-msgstr "Creado por usuario"
+msgstr ""
msgctxt "field:carrier,id:"
msgid "ID"
@@ -36,11 +36,11 @@ msgstr ""
msgctxt "field:carrier,write_uid:"
msgid "Write User"
-msgstr "Modificado por usuario"
+msgstr ""
msgctxt "field:carrier.selection,active:"
msgid "Active"
-msgstr ""
+msgstr "Activo"
msgctxt "field:carrier.selection,carrier:"
msgid "Carrier"
@@ -52,7 +52,7 @@ msgstr ""
msgctxt "field:carrier.selection,create_uid:"
msgid "Create User"
-msgstr "Creado por usuario"
+msgstr ""
msgctxt "field:carrier.selection,from_country:"
msgid "From Country"
@@ -80,7 +80,7 @@ msgstr ""
msgctxt "field:carrier.selection,write_uid:"
msgid "Write User"
-msgstr "Modificado por usuario"
+msgstr ""
msgctxt "help:carrier,carrier_cost_method:"
msgid "Method to compute carrier cost"
diff --git a/locale/lo.po b/locale/lo.po
index 9eddae3..8f63b35 100644
--- a/locale/lo.po
+++ b/locale/lo.po
@@ -4,141 +4,124 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "field:carrier,carrier_cost_method:"
msgid "Carrier Cost Method"
-msgstr ""
+msgstr "ວິທີການຄິດໄລ່ລາຄາຂອງຜູ້ບໍລິການ"
msgctxt "field:carrier,carrier_product:"
msgid "Carrier Product"
-msgstr ""
+msgstr "ຜະລິດຕະພັນຂອງຜູ້ບໍລິການ"
-#, fuzzy
msgctxt "field:carrier,create_date:"
msgid "Create Date"
-msgstr "ສ້າງວັນທີ"
+msgstr "ວັນທີສ້າງ"
-#, fuzzy
msgctxt "field:carrier,create_uid:"
msgid "Create User"
-msgstr "ສ້າງຜູ້ໃຊ້ງານ"
+msgstr "ຜູ້ສ້າງ"
-#, fuzzy
msgctxt "field:carrier,id:"
msgid "ID"
-msgstr "ເລດລຳດັບ"
+msgstr "ເລກລຳດັບ"
-#, fuzzy
msgctxt "field:carrier,party:"
msgid "Party"
msgstr "ພາກສ່ວນ"
-#, fuzzy
msgctxt "field:carrier,rec_name:"
msgid "Name"
msgstr "ຊື່"
-#, fuzzy
msgctxt "field:carrier,write_date:"
msgid "Write Date"
msgstr "ວັນທີບັນທຶກ"
-#, fuzzy
msgctxt "field:carrier,write_uid:"
msgid "Write User"
-msgstr "ສ້າງຜູ້ໃຊ້"
+msgstr "ຜູ້ບັນທຶກ"
-#, fuzzy
msgctxt "field:carrier.selection,active:"
msgid "Active"
msgstr "ໃຊ້ຢູ່"
msgctxt "field:carrier.selection,carrier:"
msgid "Carrier"
-msgstr ""
+msgstr "ຜູ້ໃຫ້ບໍລິການ"
-#, fuzzy
msgctxt "field:carrier.selection,create_date:"
msgid "Create Date"
-msgstr "ສ້າງວັນທີ"
+msgstr "ວັນທີສ້າງ"
-#, fuzzy
msgctxt "field:carrier.selection,create_uid:"
msgid "Create User"
-msgstr "ສ້າງຜູ້ໃຊ້ງານ"
+msgstr "ຜູ້ສ້າງ"
-#, fuzzy
msgctxt "field:carrier.selection,from_country:"
msgid "From Country"
msgstr "ຈາກປະເທດ"
-#, fuzzy
msgctxt "field:carrier.selection,id:"
msgid "ID"
-msgstr "ເລດລຳດັບ"
+msgstr "ເລກລຳດັບ"
-#, fuzzy
msgctxt "field:carrier.selection,rec_name:"
msgid "Name"
msgstr "ຊື່"
-#, fuzzy
msgctxt "field:carrier.selection,sequence:"
msgid "Sequence"
msgstr "ລໍາດັບ"
-#, fuzzy
msgctxt "field:carrier.selection,to_country:"
msgid "To Country"
-msgstr "ເຖິງປະເທດ"
+msgstr "ເຖິງ ປະເທດ"
-#, fuzzy
msgctxt "field:carrier.selection,write_date:"
msgid "Write Date"
msgstr "ວັນທີບັນທຶກ"
-#, fuzzy
msgctxt "field:carrier.selection,write_uid:"
msgid "Write User"
-msgstr "ສ້າງຜູ້ໃຊ້"
+msgstr "ຜູ້ບັນທຶກ"
msgctxt "help:carrier,carrier_cost_method:"
msgid "Method to compute carrier cost"
-msgstr ""
+msgstr "ວິທີການຄິດໄລ່ຄ່າໃຊ້ຈ່າຍຂອງຜູ້ບໍລິການ"
msgctxt "model:carrier,name:"
msgid "Carrier"
-msgstr ""
+msgstr "ຜູ້ໃຫ້ບໍລິການ"
msgctxt "model:carrier.selection,name:"
msgid "Carrier Selection"
-msgstr ""
+msgstr "ການເລືອກຜູ້ໃຫ້ບໍລິການ"
msgctxt "model:ir.action,name:act_carrier_form"
msgid "Carriers"
-msgstr ""
+msgstr "ຜູ້ໃຫ້ບໍລິການ"
msgctxt "model:ir.action,name:act_carrier_selection_form"
msgid "Carrier Selection"
-msgstr ""
+msgstr "ການເລຶອກຜູ້ໃຫ້ບໍລິການ"
msgctxt "model:ir.ui.menu,name:menu_carrier"
msgid "Carrier"
-msgstr ""
+msgstr "ຜູ້ໃຫ້ບໍລິການ"
msgctxt "model:ir.ui.menu,name:menu_carrier_form"
msgid "Carriers"
-msgstr ""
+msgstr "ຜູ້ໃຫ້ບໍລິການ"
msgctxt "model:ir.ui.menu,name:menu_carrier_selection"
msgid "Carrier Selection"
-msgstr ""
+msgstr "ການເລືອກຜູ້ໃຫ້ບໍລິການ"
msgctxt "model:res.group,name:group_carrier_admin"
msgid "Carrier Administration"
-msgstr ""
+msgstr "ການບໍລິການຜູ້ໃຫ້ບໍລິການ"
msgctxt "selection:carrier,carrier_cost_method:"
msgid "Product Price"
-msgstr ""
+msgstr "ລາຄາຜະລິດຕະພັນ"
msgctxt "view:carrier.selection:"
msgid "Criteria"
-msgstr ""
+msgstr "ເງື່ອນມາດຖານ"
diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index 8399894..b9adbae 100644
--- a/locale/pt_BR.po
+++ b/locale/pt_BR.po
@@ -38,60 +38,49 @@ msgctxt "field:carrier,write_uid:"
msgid "Write User"
msgstr "Criado por"
-#, fuzzy
msgctxt "field:carrier.selection,active:"
msgid "Active"
msgstr "Ativo"
-#, fuzzy
msgctxt "field:carrier.selection,carrier:"
msgid "Carrier"
msgstr "Transportadora"
-#, fuzzy
msgctxt "field:carrier.selection,create_date:"
msgid "Create Date"
msgstr "Data de criação"
-#, fuzzy
msgctxt "field:carrier.selection,create_uid:"
msgid "Create User"
-msgstr "Usuário de Criação"
+msgstr "Criado por"
-#, fuzzy
msgctxt "field:carrier.selection,from_country:"
msgid "From Country"
msgstr "País de Origem"
-#, fuzzy
msgctxt "field:carrier.selection,id:"
msgid "ID"
msgstr "ID"
-#, fuzzy
msgctxt "field:carrier.selection,rec_name:"
msgid "Name"
msgstr "Nome"
-#, fuzzy
msgctxt "field:carrier.selection,sequence:"
msgid "Sequence"
msgstr "Sequência"
-#, fuzzy
msgctxt "field:carrier.selection,to_country:"
msgid "To Country"
msgstr "País de Destino"
-#, fuzzy
msgctxt "field:carrier.selection,write_date:"
msgid "Write Date"
-msgstr "Editado por"
+msgstr "Data de edição"
-#, fuzzy
msgctxt "field:carrier.selection,write_uid:"
msgid "Write User"
-msgstr "Gravado por"
+msgstr "Editado por"
msgctxt "help:carrier,carrier_cost_method:"
msgid "Method to compute carrier cost"
@@ -103,7 +92,7 @@ msgstr "Transportadora"
msgctxt "model:carrier.selection,name:"
msgid "Carrier Selection"
-msgstr ""
+msgstr "Seleção de Transportadora"
msgctxt "model:ir.action,name:act_carrier_form"
msgid "Carriers"
@@ -111,7 +100,7 @@ msgstr "Transportadoras"
msgctxt "model:ir.action,name:act_carrier_selection_form"
msgid "Carrier Selection"
-msgstr ""
+msgstr " Seleção de Transportadora"
msgctxt "model:ir.ui.menu,name:menu_carrier"
msgid "Carrier"
@@ -123,7 +112,7 @@ msgstr "Transportadoras"
msgctxt "model:ir.ui.menu,name:menu_carrier_selection"
msgid "Carrier Selection"
-msgstr ""
+msgstr " Seleção de Transportadora"
msgctxt "model:res.group,name:group_carrier_admin"
msgid "Carrier Administration"
@@ -135,7 +124,7 @@ msgstr "Preço do produto"
msgctxt "view:carrier.selection:"
msgid "Criteria"
-msgstr ""
+msgstr "Critério"
msgctxt "view:carrier:"
msgid "Carrier"
diff --git a/locale/sl.po b/locale/sl.po
index ba51911..8a30b69 100644
--- a/locale/sl.po
+++ b/locale/sl.po
@@ -38,32 +38,26 @@ msgctxt "field:carrier,write_uid:"
msgid "Write User"
msgstr "Zapisal"
-#, fuzzy
msgctxt "field:carrier.selection,active:"
msgid "Active"
msgstr "Aktivno"
-#, fuzzy
msgctxt "field:carrier.selection,carrier:"
msgid "Carrier"
msgstr "Špediter"
-#, fuzzy
msgctxt "field:carrier.selection,create_date:"
msgid "Create Date"
msgstr "Izdelano"
-#, fuzzy
msgctxt "field:carrier.selection,create_uid:"
msgid "Create User"
msgstr "Izdelal"
-#, fuzzy
msgctxt "field:carrier.selection,from_country:"
msgid "From Country"
msgstr "Iz države"
-#, fuzzy
msgctxt "field:carrier.selection,id:"
msgid "ID"
msgstr "ID"
@@ -76,17 +70,14 @@ msgctxt "field:carrier.selection,sequence:"
msgid "Sequence"
msgstr "Zap.št."
-#, fuzzy
msgctxt "field:carrier.selection,to_country:"
msgid "To Country"
msgstr "V državo"
-#, fuzzy
msgctxt "field:carrier.selection,write_date:"
msgid "Write Date"
msgstr "Zapisano"
-#, fuzzy
msgctxt "field:carrier.selection,write_uid:"
msgid "Write User"
msgstr "Zapisal"
@@ -101,7 +92,7 @@ msgstr "Špediter"
msgctxt "model:carrier.selection,name:"
msgid "Carrier Selection"
-msgstr ""
+msgstr "Izbira špediterja"
msgctxt "model:ir.action,name:act_carrier_form"
msgid "Carriers"
@@ -109,7 +100,7 @@ msgstr "Špediterji"
msgctxt "model:ir.action,name:act_carrier_selection_form"
msgid "Carrier Selection"
-msgstr ""
+msgstr "Izbira špediterja"
msgctxt "model:ir.ui.menu,name:menu_carrier"
msgid "Carrier"
@@ -121,7 +112,7 @@ msgstr "Špediterji"
msgctxt "model:ir.ui.menu,name:menu_carrier_selection"
msgid "Carrier Selection"
-msgstr ""
+msgstr "Izbira špediterja"
msgctxt "model:res.group,name:group_carrier_admin"
msgid "Carrier Administration"
@@ -133,7 +124,7 @@ msgstr "Cena izdelka"
msgctxt "view:carrier.selection:"
msgid "Criteria"
-msgstr ""
+msgstr "Kriterij"
msgctxt "view:carrier:"
msgid "Carrier"
diff --git a/setup.py b/setup.py
index df9d8b9..d1050d8 100644
--- a/setup.py
+++ b/setup.py
@@ -79,7 +79,7 @@ setup(name=name,
'Intended Audience :: Financial and Insurance Industry',
'Intended Audience :: Legal Industry',
'Intended Audience :: Manufacturing',
- 'License :: OSI Approved :: GNU General Public License (GPL)',
+ 'License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)',
'Natural Language :: Bulgarian',
'Natural Language :: Catalan',
'Natural Language :: Chinese (Simplified)',
diff --git a/tryton.cfg b/tryton.cfg
index 7969fd8..3d69ae6 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=4.2.0
+version=4.4.0
depends:
country
ir
diff --git a/trytond_carrier.egg-info/PKG-INFO b/trytond_carrier.egg-info/PKG-INFO
index 80c7786..99c74ce 100644
--- a/trytond_carrier.egg-info/PKG-INFO
+++ b/trytond_carrier.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond-carrier
-Version: 4.2.0
+Version: 4.4.0
Summary: Tryton module with carriers
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: issue_tracker at tryton.org
License: GPL-3
-Download-URL: http://downloads.tryton.org/4.2/
+Download-URL: http://downloads.tryton.org/4.4/
Description: trytond_carrier
===============
@@ -52,7 +52,7 @@ Classifier: Intended Audience :: Developers
Classifier: Intended Audience :: Financial and Insurance Industry
Classifier: Intended Audience :: Legal Industry
Classifier: Intended Audience :: Manufacturing
-Classifier: License :: OSI Approved :: GNU General Public License (GPL)
+Classifier: License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)
Classifier: Natural Language :: Bulgarian
Classifier: Natural Language :: Catalan
Classifier: Natural Language :: Chinese (Simplified)
diff --git a/trytond_carrier.egg-info/requires.txt b/trytond_carrier.egg-info/requires.txt
index f8e4ee7..a936cbf 100644
--- a/trytond_carrier.egg-info/requires.txt
+++ b/trytond_carrier.egg-info/requires.txt
@@ -1,4 +1,4 @@
-trytond_country >= 4.2, < 4.3
-trytond_party >= 4.2, < 4.3
-trytond_product >= 4.2, < 4.3
-trytond >= 4.2, < 4.3
+trytond_country >= 4.4, < 4.5
+trytond_party >= 4.4, < 4.5
+trytond_product >= 4.4, < 4.5
+trytond >= 4.4, < 4.5
--
tryton-modules-carrier
More information about the tryton-debian-vcs
mailing list