[MERGE] merged trunk.
bzr revid: vmt@openerp.com-20120229160123-hzsm15d8zjuga4sv
This commit is contained in:
Vo Minh Thu
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -7,14 +7,14 @@ msgstr ""
|
||||
"Project-Id-Version: OpenERP Server 5.0.4\n"
|
||||
"Report-Msgid-Bugs-To: support@openerp.com\n"
|
||||
"POT-Creation-Date: 2012-02-08 00:44+0000\n"
|
||||
"PO-Revision-Date: 2012-01-31 16:53+0000\n"
|
||||
"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
|
||||
"PO-Revision-Date: 2012-02-20 08:50+0000\n"
|
||||
"Last-Translator: German Figueredo <Unknown>\n"
|
||||
"Language-Team: \n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2012-02-09 05:52+0000\n"
|
||||
"X-Generator: Launchpad (build 14763)\n"
|
||||
"X-Launchpad-Export-Date: 2012-02-21 05:54+0000\n"
|
||||
"X-Generator: Launchpad (build 14838)\n"
|
||||
|
||||
#. module: base
|
||||
#: model:res.country,name:base.sh
|
||||
@@ -258,7 +258,7 @@ msgstr "creado."
|
||||
#. module: base
|
||||
#: model:ir.module.module,shortdesc:base.module_l10n_tr
|
||||
msgid "Turkey - Accounting"
|
||||
msgstr ""
|
||||
msgstr "Contabilidad - Turca"
|
||||
|
||||
#. module: base
|
||||
#: model:ir.module.module,shortdesc:base.module_mrp_subproduct
|
||||
|
||||
+10273
-2901
File diff suppressed because it is too large
Load Diff
+190
-176
File diff suppressed because it is too large
Load Diff
+1587
-384
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -7,25 +7,24 @@ msgstr ""
|
||||
"Project-Id-Version: OpenERP Server 5.0.4\n"
|
||||
"Report-Msgid-Bugs-To: support@openerp.com\n"
|
||||
"POT-Creation-Date: 2012-02-08 00:44+0000\n"
|
||||
"PO-Revision-Date: 2012-01-31 15:49+0000\n"
|
||||
"Last-Translator: Lorenzo Battistini - Agile BG - Domsense "
|
||||
"<lorenzo.battistini@agilebg.com>\n"
|
||||
"PO-Revision-Date: 2012-02-16 22:06+0000\n"
|
||||
"Last-Translator: Davide Corio - agilebg.com <davide.corio@agilebg.com>\n"
|
||||
"Language-Team: \n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2012-02-09 05:49+0000\n"
|
||||
"X-Generator: Launchpad (build 14763)\n"
|
||||
"X-Launchpad-Export-Date: 2012-02-17 04:57+0000\n"
|
||||
"X-Generator: Launchpad (build 14814)\n"
|
||||
|
||||
#. module: base
|
||||
#: model:res.country,name:base.sh
|
||||
msgid "Saint Helena"
|
||||
msgstr "Sant'Elena"
|
||||
msgstr "Saint Helena"
|
||||
|
||||
#. module: base
|
||||
#: view:ir.actions.report.xml:0
|
||||
msgid "Other Configuration"
|
||||
msgstr "Altra configurazione"
|
||||
msgstr "Altre Configurazioni"
|
||||
|
||||
#. module: base
|
||||
#: selection:ir.property,type:0
|
||||
@@ -35,7 +34,7 @@ msgstr "DateTime"
|
||||
#. module: base
|
||||
#: model:ir.module.module,shortdesc:base.module_project_mailgate
|
||||
msgid "Tasks-Mail Integration"
|
||||
msgstr ""
|
||||
msgstr "Integrazione Tasks-Mail"
|
||||
|
||||
#. module: base
|
||||
#: code:addons/fields.py:582
|
||||
@@ -165,7 +164,7 @@ msgstr "Riferimento"
|
||||
#. module: base
|
||||
#: model:ir.module.module,shortdesc:base.module_l10n_be_invoice_bba
|
||||
msgid "Belgium - Structured Communication"
|
||||
msgstr ""
|
||||
msgstr "Belgio - Comunicazione Strutturata"
|
||||
|
||||
#. module: base
|
||||
#: field:ir.actions.act_window,target:0
|
||||
@@ -175,12 +174,12 @@ msgstr "Finestra di Destinazione"
|
||||
#. module: base
|
||||
#: model:ir.module.module,shortdesc:base.module_sale_analytic_plans
|
||||
msgid "Sales Analytic Distribution"
|
||||
msgstr ""
|
||||
msgstr "Distribuzione Analitica Vendite"
|
||||
|
||||
#. module: base
|
||||
#: model:ir.module.module,shortdesc:base.module_web_process
|
||||
msgid "Process"
|
||||
msgstr ""
|
||||
msgstr "Processo"
|
||||
|
||||
#. module: base
|
||||
#: model:ir.module.module,shortdesc:base.module_analytic_journal_billing_rate
|
||||
@@ -240,7 +239,7 @@ msgstr ""
|
||||
#. module: base
|
||||
#: model:ir.module.module,shortdesc:base.module_mrp_subproduct
|
||||
msgid "MRP Subproducts"
|
||||
msgstr ""
|
||||
msgstr "Sottoprodotti MRP"
|
||||
|
||||
#. module: base
|
||||
#: code:addons/base/module/module.py:390
|
||||
@@ -273,7 +272,7 @@ msgstr "Inuktitut / ᐃᓄᒃᑎᑐᑦ"
|
||||
#: model:ir.module.category,name:base.module_category_sales_management
|
||||
#: model:ir.module.module,shortdesc:base.module_sale
|
||||
msgid "Sales Management"
|
||||
msgstr ""
|
||||
msgstr "Gestione Vendite"
|
||||
|
||||
#. module: base
|
||||
#: view:res.partner:0
|
||||
@@ -369,7 +368,7 @@ msgstr "Nome del Wizard"
|
||||
#. module: base
|
||||
#: model:res.groups,name:base.group_partner_manager
|
||||
msgid "Partner Manager"
|
||||
msgstr ""
|
||||
msgstr "Partner Manager"
|
||||
|
||||
#. module: base
|
||||
#: model:ir.module.category,name:base.module_category_customer_relationship_management
|
||||
@@ -379,7 +378,7 @@ msgstr ""
|
||||
#. module: base
|
||||
#: view:ir.module.module:0
|
||||
msgid "Extra"
|
||||
msgstr ""
|
||||
msgstr "Extra"
|
||||
|
||||
#. module: base
|
||||
#: code:addons/orm.py:2526
|
||||
|
||||
+472
-245
File diff suppressed because it is too large
Load Diff
@@ -7,14 +7,14 @@ msgstr ""
|
||||
"Project-Id-Version: OpenERP Server 5.0.0\n"
|
||||
"Report-Msgid-Bugs-To: support@openerp.com\n"
|
||||
"POT-Creation-Date: 2012-02-08 00:44+0000\n"
|
||||
"PO-Revision-Date: 2012-02-15 14:35+0000\n"
|
||||
"PO-Revision-Date: 2012-02-19 13:01+0000\n"
|
||||
"Last-Translator: Erwin <Unknown>\n"
|
||||
"Language-Team: \n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2012-02-16 05:03+0000\n"
|
||||
"X-Generator: Launchpad (build 14781)\n"
|
||||
"X-Launchpad-Export-Date: 2012-02-20 05:39+0000\n"
|
||||
"X-Generator: Launchpad (build 14833)\n"
|
||||
|
||||
#. module: base
|
||||
#: model:res.country,name:base.sh
|
||||
@@ -236,7 +236,7 @@ msgstr "gemaakt."
|
||||
#. module: base
|
||||
#: model:ir.module.module,shortdesc:base.module_l10n_tr
|
||||
msgid "Turkey - Accounting"
|
||||
msgstr ""
|
||||
msgstr "Turkije - Boekhouding"
|
||||
|
||||
#. module: base
|
||||
#: model:ir.module.module,shortdesc:base.module_mrp_subproduct
|
||||
@@ -697,7 +697,7 @@ msgstr "Eigen velden dienen een naam te hebben die begint met 'x_' !"
|
||||
#. module: base
|
||||
#: model:ir.module.module,shortdesc:base.module_l10n_mx
|
||||
msgid "Mexico - Accounting"
|
||||
msgstr ""
|
||||
msgstr "Mexico - Boekhouding"
|
||||
|
||||
#. module: base
|
||||
#: help:ir.actions.server,action_id:0
|
||||
@@ -778,7 +778,7 @@ msgstr "Automatische acties"
|
||||
#. module: base
|
||||
#: model:ir.module.module,shortdesc:base.module_l10n_ro
|
||||
msgid "Romania - Accounting"
|
||||
msgstr ""
|
||||
msgstr "Roemenië - Boekhouding"
|
||||
|
||||
#. module: base
|
||||
#: view:partner.wizard.ean.check:0
|
||||
@@ -1643,7 +1643,7 @@ msgstr ""
|
||||
#. module: base
|
||||
#: model:ir.module.module,shortdesc:base.module_l10n_lu
|
||||
msgid "Luxembourg - Accounting"
|
||||
msgstr ""
|
||||
msgstr "Luxemburg - Boekhouding"
|
||||
|
||||
#. module: base
|
||||
#: model:res.country,name:base.tp
|
||||
@@ -2064,7 +2064,7 @@ msgstr "Website: "
|
||||
#. module: base
|
||||
#: model:ir.ui.menu,name:base.menu_administration
|
||||
msgid "Settings"
|
||||
msgstr "Voorkeuren"
|
||||
msgstr "Instellingen"
|
||||
|
||||
#. module: base
|
||||
#: selection:ir.actions.act_window,view_type:0
|
||||
@@ -2171,7 +2171,7 @@ msgstr "Logo"
|
||||
#. module: base
|
||||
#: model:ir.module.module,shortdesc:base.module_l10n_cr
|
||||
msgid "Costa Rica - Accounting"
|
||||
msgstr ""
|
||||
msgstr "Costa Rica - Boekhouding"
|
||||
|
||||
#. module: base
|
||||
#: view:ir.module.module:0
|
||||
@@ -4092,7 +4092,7 @@ msgstr ""
|
||||
#. module: base
|
||||
#: model:ir.module.module,shortdesc:base.module_l10n_it
|
||||
msgid "Italy - Accounting"
|
||||
msgstr ""
|
||||
msgstr "Italië - Boekhouding"
|
||||
|
||||
#. module: base
|
||||
#: field:ir.actions.act_window,help:0
|
||||
@@ -4249,7 +4249,7 @@ msgstr "SXW-inhoud"
|
||||
#. module: base
|
||||
#: model:ir.module.module,shortdesc:base.module_l10n_pl
|
||||
msgid "Poland - Accounting"
|
||||
msgstr ""
|
||||
msgstr "Polen - Boekhouding"
|
||||
|
||||
#. module: base
|
||||
#: view:ir.cron:0
|
||||
@@ -4315,7 +4315,7 @@ msgstr "Bevestigen"
|
||||
#. module: base
|
||||
#: view:res.company:0
|
||||
msgid "Header/Footer"
|
||||
msgstr "Kop-/voetregels"
|
||||
msgstr "Koptekst/Voettekst"
|
||||
|
||||
#. module: base
|
||||
#: help:ir.mail_server,sequence:0
|
||||
@@ -4420,7 +4420,7 @@ msgstr "Bankrekening"
|
||||
#. module: base
|
||||
#: model:ir.module.module,shortdesc:base.module_l10n_gr
|
||||
msgid "Greece - Accounting"
|
||||
msgstr ""
|
||||
msgstr "Griekenland - Boekhouding"
|
||||
|
||||
#. module: base
|
||||
#: selection:base.language.install,lang:0
|
||||
@@ -4545,7 +4545,7 @@ msgstr "Importeer module"
|
||||
#. module: base
|
||||
#: model:ir.module.module,shortdesc:base.module_l10n_ch
|
||||
msgid "Switzerland - Accounting"
|
||||
msgstr ""
|
||||
msgstr "Zwitserland - Boekhouding"
|
||||
|
||||
#. module: base
|
||||
#: field:res.bank,zip:0
|
||||
@@ -5869,7 +5869,7 @@ msgstr "Toepassingen"
|
||||
#: view:ir.ui.view_sc:0
|
||||
#: field:res.partner.title,shortcut:0
|
||||
msgid "Shortcut"
|
||||
msgstr "Snelkoppeling"
|
||||
msgstr "Kort"
|
||||
|
||||
#. module: base
|
||||
#: field:ir.model.data,date_init:0
|
||||
@@ -6390,7 +6390,7 @@ msgstr "Israël"
|
||||
#. module: base
|
||||
#: model:ir.module.module,shortdesc:base.module_l10n_syscohada
|
||||
msgid "OHADA - Accounting"
|
||||
msgstr ""
|
||||
msgstr "OHADA - Boekhouding"
|
||||
|
||||
#. module: base
|
||||
#: help:res.bank,bic:0
|
||||
@@ -7021,7 +7021,7 @@ msgstr "Toevoegen"
|
||||
#. module: base
|
||||
#: model:ir.module.module,shortdesc:base.module_l10n_ec
|
||||
msgid "Ecuador - Accounting"
|
||||
msgstr ""
|
||||
msgstr "Ecuador - Boekhouding"
|
||||
|
||||
#. module: base
|
||||
#: field:res.partner.category,name:0
|
||||
@@ -7061,7 +7061,7 @@ msgstr "Componenten assistent"
|
||||
#. module: base
|
||||
#: model:ir.module.module,shortdesc:base.module_l10n_hn
|
||||
msgid "Honduras - Accounting"
|
||||
msgstr ""
|
||||
msgstr "Honduras - Boekhouding"
|
||||
|
||||
#. module: base
|
||||
#: model:ir.module.module,shortdesc:base.module_report_intrastat
|
||||
@@ -7128,7 +7128,7 @@ msgstr "Actief"
|
||||
#. module: base
|
||||
#: model:ir.module.module,shortdesc:base.module_l10n_ma
|
||||
msgid "Maroc - Accounting"
|
||||
msgstr ""
|
||||
msgstr "Marokko - Boekhouding"
|
||||
|
||||
#. module: base
|
||||
#: model:res.country,name:base.mn
|
||||
@@ -7344,7 +7344,7 @@ msgstr ""
|
||||
#. module: base
|
||||
#: field:res.partner,title:0
|
||||
msgid "Partner Firm"
|
||||
msgstr ""
|
||||
msgstr "Relatie titel"
|
||||
|
||||
#. module: base
|
||||
#: model:ir.actions.act_window,name:base.action_model_fields
|
||||
@@ -8027,7 +8027,7 @@ msgstr "ir.server.object.lines"
|
||||
#. module: base
|
||||
#: model:ir.module.module,shortdesc:base.module_l10n_be
|
||||
msgid "Belgium - Accounting"
|
||||
msgstr ""
|
||||
msgstr "België - Boekhouding"
|
||||
|
||||
#. module: base
|
||||
#: code:addons/base/module/module.py:622
|
||||
@@ -8286,7 +8286,7 @@ msgstr ""
|
||||
#. module: base
|
||||
#: model:ir.module.module,shortdesc:base.module_account_anglo_saxon
|
||||
msgid "Anglo-Saxon Accounting"
|
||||
msgstr "Angelsaksische boekhouding"
|
||||
msgstr ""
|
||||
|
||||
#. module: base
|
||||
#: model:res.country,name:base.np
|
||||
@@ -10950,6 +10950,17 @@ msgid ""
|
||||
"trigger an automatic reminder email.\n"
|
||||
" "
|
||||
msgstr ""
|
||||
"\n"
|
||||
"Met deze module kunt u automatische acties definiëren voor ieder object.\n"
|
||||
"=============================================================\n"
|
||||
"\n"
|
||||
"Gebruik dit om automatische acties te triggeren voor diverse schermen.\n"
|
||||
"\n"
|
||||
"Bijvoorbeeld: Een lead aangemaakt door een speciale gebruiker kan\n"
|
||||
"automatisch worden toegewezen aan een verkoopteam. Of een prospect \n"
|
||||
"welke nog na 14 dagen nog steeds de status 'Lopende' heeft, kan een \n"
|
||||
"automatische herinneringsmail versturen.\n"
|
||||
" "
|
||||
|
||||
#. module: base
|
||||
#: model:ir.actions.act_window,name:base.res_request-act
|
||||
@@ -10972,7 +10983,7 @@ msgstr "Of"
|
||||
#. module: base
|
||||
#: model:ir.module.module,shortdesc:base.module_l10n_br
|
||||
msgid "Brazilian - Accounting"
|
||||
msgstr ""
|
||||
msgstr "Brazilië - Boekhouding"
|
||||
|
||||
#. module: base
|
||||
#: model:res.country,name:base.pk
|
||||
@@ -12007,7 +12018,7 @@ msgstr ""
|
||||
#. module: base
|
||||
#: model:ir.module.module,shortdesc:base.module_l10n_uk
|
||||
msgid "UK - Accounting"
|
||||
msgstr ""
|
||||
msgstr "UK - Boekhouding"
|
||||
|
||||
#. module: base
|
||||
#: model:ir.module.module,description:base.module_project_scrum
|
||||
@@ -12080,7 +12091,7 @@ msgstr "Instellingen"
|
||||
#. module: base
|
||||
#: model:ir.module.module,shortdesc:base.module_l10n_in
|
||||
msgid "India - Accounting"
|
||||
msgstr ""
|
||||
msgstr "India - Boekhouding"
|
||||
|
||||
#. module: base
|
||||
#: field:ir.actions.server,expression:0
|
||||
@@ -12095,7 +12106,7 @@ msgstr "Begindatum"
|
||||
#. module: base
|
||||
#: model:ir.module.module,shortdesc:base.module_l10n_gt
|
||||
msgid "Guatemala - Accounting"
|
||||
msgstr ""
|
||||
msgstr "Guatemala - Boekhouding"
|
||||
|
||||
#. module: base
|
||||
#: help:ir.cron,args:0
|
||||
@@ -13079,7 +13090,7 @@ msgstr ""
|
||||
#. module: base
|
||||
#: model:ir.module.module,shortdesc:base.module_l10n_th
|
||||
msgid "Thailand - Accounting"
|
||||
msgstr ""
|
||||
msgstr "Thailand - Boekhouding"
|
||||
|
||||
#. module: base
|
||||
#: view:res.lang:0
|
||||
@@ -13715,7 +13726,7 @@ msgstr "Diagram"
|
||||
#. module: base
|
||||
#: model:ir.module.module,shortdesc:base.module_l10n_es
|
||||
msgid "Spanish - Accounting (PGCE 2008)"
|
||||
msgstr ""
|
||||
msgstr "Spaans - Boekhouding (PGCE 2008)"
|
||||
|
||||
#. module: base
|
||||
#: model:ir.module.module,shortdesc:base.module_stock_no_autopicking
|
||||
@@ -14072,7 +14083,7 @@ msgstr "Vanuatu"
|
||||
#. module: base
|
||||
#: view:res.company:0
|
||||
msgid "Internal Header/Footer"
|
||||
msgstr "Interne kop-/voetregels"
|
||||
msgstr "Interne Koptekst/Voettekst"
|
||||
|
||||
#. module: base
|
||||
#: model:ir.module.module,shortdesc:base.module_crm
|
||||
@@ -14545,7 +14556,7 @@ msgstr "Toegestane bedrijven"
|
||||
#. module: base
|
||||
#: model:ir.module.module,shortdesc:base.module_l10n_de
|
||||
msgid "Deutschland - Accounting"
|
||||
msgstr ""
|
||||
msgstr "Duitsland - Boekhouding"
|
||||
|
||||
#. module: base
|
||||
#: model:ir.module.module,shortdesc:base.module_auction
|
||||
@@ -14803,7 +14814,7 @@ msgstr "Nazorg"
|
||||
#. module: base
|
||||
#: model:ir.module.module,shortdesc:base.module_l10n_fr
|
||||
msgid "France - Accounting"
|
||||
msgstr ""
|
||||
msgstr "Frankrijk - Boekhouding"
|
||||
|
||||
#. module: base
|
||||
#: view:ir.actions.todo:0
|
||||
@@ -15232,7 +15243,7 @@ msgstr "ir.actions.server"
|
||||
#. module: base
|
||||
#: model:ir.module.module,shortdesc:base.module_l10n_ca
|
||||
msgid "Canada - Accounting"
|
||||
msgstr ""
|
||||
msgstr "Canada - Boekhouding"
|
||||
|
||||
#. module: base
|
||||
#: model:ir.actions.act_window,name:base.act_ir_actions_todo_form
|
||||
@@ -15271,7 +15282,7 @@ msgstr "Implementatie"
|
||||
#. module: base
|
||||
#: model:ir.module.module,shortdesc:base.module_l10n_ve
|
||||
msgid "Venezuela - Accounting"
|
||||
msgstr ""
|
||||
msgstr "Venezuela - Boekhouding"
|
||||
|
||||
#. module: base
|
||||
#: model:res.country,name:base.cl
|
||||
@@ -15516,7 +15527,7 @@ msgstr "Context"
|
||||
#. module: base
|
||||
#: model:ir.module.module,shortdesc:base.module_sale_mrp
|
||||
msgid "Sales and MRP Management"
|
||||
msgstr ""
|
||||
msgstr "Verkoop en productie beheer"
|
||||
|
||||
#. module: base
|
||||
#: model:ir.actions.act_window,name:base.action_partner_sms_send
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
+1
-1
@@ -30,7 +30,7 @@ RELEASE_LEVELS_DISPLAY = {ALPHA: ALPHA,
|
||||
# properly comparable using normal operarors, for example:
|
||||
# (6,1,0,'beta',0) < (6,1,0,'candidate',1) < (6,1,0,'candidate',2)
|
||||
# (6,1,0,'candidate',2) < (6,1,0,'final',0) < (6,1,2,'final',0)
|
||||
version_info = (6,1,0,RELEASE_CANDIDATE,1)
|
||||
version_info = (6,1,0,FINAL,0)
|
||||
version = '.'.join(map(str,version_info[:2])) + RELEASE_LEVELS_DISPLAY[version_info[3]] + str(version_info[4] or '')
|
||||
major_version = '.'.join(map(str,version_info[:2]))
|
||||
|
||||
|
||||
@@ -430,7 +430,7 @@ def serve():
|
||||
else:
|
||||
app = application
|
||||
suffix = ''
|
||||
httpd = werkzeug.serving.make_server(interface, port, application, threaded=True)
|
||||
httpd = werkzeug.serving.make_server(interface, port, app, threaded=True)
|
||||
_logger.info('HTTP service (werkzeug) running on %s:%s%s', interface, port, suffix)
|
||||
except ImportError:
|
||||
import wsgiref.simple_server
|
||||
|
||||
Reference in New Issue
Block a user