diff --git a/gunicorn.conf.py b/gunicorn.conf.py
index 55adfb55070..9962493d549 100644
--- a/gunicorn.conf.py
+++ b/gunicorn.conf.py
@@ -1,19 +1,56 @@
+# Gunicorn sample configuration file.
+# See http://gunicorn.org/configure.html for more details.
+#
+# To run OpenERP via Gunicorn, change the appropriate
+# settings below, in order to provide the parameters that
+# would normally be passed in the command-line,
+# (at least `bind` and `conf['addons_path']`), then execute:
+# $ gunicorn openerp:wsgi.application -c gunicorn.conf.py
+
import openerp
-# Standard OpenERP XML-RPC port.
+
+# Standard OpenERP XML-RPC port is 8069
bind = '127.0.0.1:8069'
+
pidfile = '.gunicorn.pid'
-# This is the big TODO: safely use more than a single worker.
-workers = 1
+
+# Gunicorn recommends 2-4 x number_of_cpu_cores, but
+# you'll want to vary this a bit to find the best for your
+# particular work load.
+workers = 4
+
# Some application-wide initialization is needed.
on_starting = openerp.wsgi.on_starting
when_ready = openerp.wsgi.when_ready
-timeout = 240 # openerp request-response cycle can be quite long
-# Setting openerp.conf.xxx will be better than setting
-# openerp.tools.config['xxx']
+# openerp request-response cycle can be quite long for
+# big reports for example
+timeout = 240
+
+# Equivalent of --load command-line option
+openerp.conf.server_wide_modules = ['web']
+
+# internal TODO: use openerp.conf.xxx when available
conf = openerp.tools.config
-conf['addons_path'] = '/home/openerp/repos/addons/trunk-xmlrpc'
-conf['static_http_document_root'] = '/tmp'
-#conf['log_level'] = 10 # 10 is DEBUG
+
+# Path to the OpenERP Addons repository (comma-separated for
+# multiple locations)
+conf['addons_path'] = '/home/openerp/addons/trunk,/home/openerp/web/trunk/addons'
+
+# Optional database config if not using local socket
+#conf['db_name'] = 'mycompany'
+#conf['db_host'] = 'localhost'
+#conf['db_user'] = 'foo'
+#conf['db_port'] = 5432
+#conf['db_password'] = 'secret'
+
+# OpenERP Log Level
+# DEBUG=10, DEBUG_RPC=8, DEBUG_RPC_ANSWER=6, DEBUG_SQL=5, INFO=20,
+# WARNING=30, ERROR=40, CRITICAL=50
+# conf['log_level'] = 20
+
+# If --static-http-enable is used, path for the static web directory
+#conf['static_http_document_root'] = '/var/www'
+
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/openerp/addons/base/__openerp__.py b/openerp/addons/base/__openerp__.py
index 41edfcbe0a3..ab9231b129c 100644
--- a/openerp/addons/base/__openerp__.py
+++ b/openerp/addons/base/__openerp__.py
@@ -34,7 +34,6 @@
'base_data.xml',
'security/base_security.xml',
'base_menu.xml',
- 'base_module_meta.xml',
'res/res_security.xml',
'res/res_config.xml',
'data/res.country.state.csv'
diff --git a/openerp/addons/base/base.sql b/openerp/addons/base/base.sql
index ebc870789cf..31872b46730 100644
--- a/openerp/addons/base/base.sql
+++ b/openerp/addons/base/base.sql
@@ -301,6 +301,7 @@ CREATE TABLE ir_module_module (
demo boolean default False,
web boolean DEFAULT FALSE,
license character varying(32),
+ sequence integer DEFAULT 100,
primary key(id)
);
ALTER TABLE ir_module_module add constraint name_uniq unique (name);
diff --git a/openerp/addons/base/base_module_meta.xml b/openerp/addons/base/base_module_meta.xml
deleted file mode 100644
index 09e28609cec..00000000000
--- a/openerp/addons/base/base_module_meta.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-
-
-
-
-
- 10
-
-
- 32
-
-
- 4
-
-
- 2
-
-
- 12
-
-
- 30
-
-
- 28
-
-
- 38
-
-
- 24
-
-
- 16
-
-
- 18
-
-
- 6
-
-
- 8
-
-
- 20
-
-
- 22
-
-
- 19
-
-
- 14
-
-
- 16
-
-
-
-
diff --git a/openerp/addons/base/i18n/ar.po b/openerp/addons/base/i18n/ar.po
index 4fa6d87b6fa..4001ab9f0c5 100644
--- a/openerp/addons/base/i18n/ar.po
+++ b/openerp/addons/base/i18n/ar.po
@@ -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: 2011-12-22 20:22+0000\n"
-"PO-Revision-Date: 2011-12-27 08:31+0000\n"
-"Last-Translator: kifcaliph \n"
+"PO-Revision-Date: 2012-01-08 15:06+0000\n"
+"Last-Translator: kifcaliph \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-01-05 05:27+0000\n"
-"X-Generator: Launchpad (build 14625)\n"
+"X-Launchpad-Export-Date: 2012-01-09 04:49+0000\n"
+"X-Generator: Launchpad (build 14640)\n"
#. module: base
#: model:res.country,name:base.sh
@@ -210,7 +210,7 @@ msgstr "ir.ui.view.custom"
#. module: base
#: model:res.country,name:base.sz
msgid "Swaziland"
-msgstr "سوسرا"
+msgstr "سوازيلاند"
#. module: base
#: code:addons/orm.py:4171
@@ -247,7 +247,7 @@ msgstr "هيكل الشركة"
#. module: base
#: selection:base.language.install,lang:0
msgid "Inuktitut / ᐃᓄᒃᑎᑐᑦ"
-msgstr ""
+msgstr "إنكتيتوتية / ᐃᓄᒃᑎᑐᑦ"
#. module: base
#: model:ir.actions.todo.category,name:base.category_sales_management_config
@@ -696,7 +696,7 @@ msgstr "اسم نموذج اختياري للكائنات التي ينطبق ع
#. module: base
#: field:workflow.transition,trigger_expr_id:0
msgid "Trigger Expression"
-msgstr ""
+msgstr "صيغة المشغل"
#. module: base
#: model:res.country,name:base.jo
@@ -813,7 +813,7 @@ msgstr "استيراد لغة"
#. module: base
#: selection:base.language.install,lang:0
msgid "Albanian / Shqip"
-msgstr ""
+msgstr "الألبانية / Shqip"
#. module: base
#: model:ir.ui.menu,name:base.menu_crm_config_opportunity
@@ -1821,7 +1821,7 @@ msgstr ""
#. module: base
#: field:ir.attachment,res_model:0
msgid "Attached Model"
-msgstr ""
+msgstr "نموذج ملحق"
#. module: base
#: field:res.partner.bank,footer:0
@@ -2037,12 +2037,12 @@ msgstr "السجلات"
#. module: base
#: selection:base.language.install,lang:0
msgid "Spanish / Español"
-msgstr ""
+msgstr "الأسبانية / Español"
#. module: base
#: selection:base.language.install,lang:0
msgid "Korean (KP) / 한국어 (KP)"
-msgstr ""
+msgstr "الكورية / 한국어 (KP)"
#. module: base
#: view:base.module.update:0
@@ -2132,7 +2132,7 @@ msgstr ""
#. module: base
#: model:res.country,name:base.bs
msgid "Bahamas"
-msgstr ""
+msgstr "جزر الباهاما"
#. module: base
#: selection:res.request,state:0
@@ -3367,7 +3367,7 @@ msgstr "الوصف"
#: model:ir.actions.act_window,name:base.action_workflow_instance_form
#: model:ir.ui.menu,name:base.menu_workflow_instance
msgid "Instances"
-msgstr ""
+msgstr "الأمثلة"
#. module: base
#: help:ir.mail_server,smtp_host:0
@@ -3407,7 +3407,7 @@ msgstr ""
#. module: base
#: selection:publisher_warranty.contract,state:0
msgid "Unvalidated"
-msgstr ""
+msgstr "غير محقق"
#. module: base
#: model:ir.ui.menu,name:base.next_id_9
@@ -5725,7 +5725,7 @@ msgstr "الكائن المتأثر بهذه القاعدة"
#. module: base
#: report:ir.module.reference.graph:0
msgid "Directory"
-msgstr "الدليل"
+msgstr "مسار"
#. module: base
#: field:wizard.ir.model.menu.create,name:0
@@ -9911,7 +9911,7 @@ msgstr "في الذاكرة"
#. module: base
#: view:ir.actions.todo:0
msgid "Todo"
-msgstr "في انتظار التنفيذ"
+msgstr "قيد التنفيذ"
#. module: base
#: model:ir.module.module,shortdesc:base.module_product_visible_discount
@@ -10996,7 +10996,7 @@ msgstr ""
#: field:res.company,street2:0
#: field:res.partner.address,street2:0
msgid "Street2"
-msgstr "الشارع الثاني"
+msgstr "الشارع ٢"
#. module: base
#: model:ir.actions.act_window,name:base.action_view_base_module_update
@@ -14188,7 +14188,7 @@ msgstr ""
#. module: base
#: view:res.partner.address:0
msgid "Search Contact"
-msgstr ""
+msgstr "بحث جهة الإتصال"
#. module: base
#: view:ir.attachment:0
@@ -15204,9 +15204,6 @@ msgstr "الروسية / русский язык"
#~ msgid "Objects"
#~ msgstr "الكائنات"
-#~ msgid "Create Action"
-#~ msgstr "أنشئ الإجراء"
-
#~ msgid "Create User"
#~ msgstr "إنشاء مستخدم"
@@ -15425,3 +15422,9 @@ msgstr "الروسية / русский язык"
#~ msgid "Is Object"
#~ msgstr "هو كائن"
+
+#~ msgid "Create Action"
+#~ msgstr "أنشأ إجراء"
+
+#~ msgid "Trigger Name"
+#~ msgstr "اسم المشغل"
diff --git a/openerp/addons/base/i18n/tr.po b/openerp/addons/base/i18n/tr.po
index 242b44e62ce..b0fab27f83a 100644
--- a/openerp/addons/base/i18n/tr.po
+++ b/openerp/addons/base/i18n/tr.po
@@ -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: 2011-12-22 20:22+0000\n"
-"PO-Revision-Date: 2011-09-30 21:21+0000\n"
-"Last-Translator: Antony Lesuisse (OpenERP) \n"
+"PO-Revision-Date: 2012-01-08 00:18+0000\n"
+"Last-Translator: Ahmet Altınışık \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-01-05 05:34+0000\n"
-"X-Generator: Launchpad (build 14625)\n"
+"X-Launchpad-Export-Date: 2012-01-09 04:49+0000\n"
+"X-Generator: Launchpad (build 14640)\n"
#. module: base
#: model:res.country,name:base.sh
@@ -34,7 +34,7 @@ msgstr "TarihSaat"
#. module: base
#: model:ir.module.module,shortdesc:base.module_project_mailgate
msgid "Tasks-Mail Integration"
-msgstr ""
+msgstr "Görev-E-posta Entegrasyonu"
#. module: base
#: code:addons/fields.py:571
@@ -50,7 +50,7 @@ msgstr ""
#: field:ir.ui.view,arch:0
#: field:ir.ui.view.custom,arch:0
msgid "View Architecture"
-msgstr "Görünüm Yapısı"
+msgstr "Mimari Görüntüleme"
#. module: base
#: model:ir.module.module,description:base.module_project
@@ -90,12 +90,12 @@ msgstr "İş Akışı"
#. module: base
#: selection:ir.sequence,implementation:0
msgid "No gap"
-msgstr ""
+msgstr "Boşluk Yok"
#. module: base
#: selection:base.language.install,lang:0
msgid "Hungarian / Magyar"
-msgstr "Macarca"
+msgstr "Macarca / Magyar"
#. module: base
#: selection:base.language.install,lang:0
@@ -108,6 +108,8 @@ msgid ""
"Helps you manage your projects and tasks by tracking them, generating "
"plannings, etc..."
msgstr ""
+"Projelerinizi ve görevlerinizi yönetmenize yardımcı olur (planlamalar "
+"oluşturarak, görev ve projeleri takip ederek, vb...)"
#. module: base
#: field:ir.actions.act_window,display_menu_tip:0
@@ -161,7 +163,7 @@ msgstr "Kaynak"
#. module: base
#: model:ir.module.module,shortdesc:base.module_l10n_be_invoice_bba
msgid "Belgium - Structured Communication"
-msgstr ""
+msgstr "Belçika - Yapılandırılmış İletişim"
#. module: base
#: field:ir.actions.act_window,target:0
@@ -171,12 +173,12 @@ msgstr "Hedef Pencere"
#. module: base
#: model:ir.module.module,shortdesc:base.module_sale_analytic_plans
msgid "Sales Analytic Distribution"
-msgstr ""
+msgstr "Satışların analitik dağılımı"
#. module: base
#: model:ir.module.module,shortdesc:base.module_analytic_journal_billing_rate
msgid "Billing Rates on Contracts"
-msgstr ""
+msgstr "Sözleşmelerdeki Faturalama oranları"
#. module: base
#: code:addons/base/res/res_users.py:541
@@ -191,14 +193,14 @@ msgid ""
"Properties of base fields cannot be altered in this manner! Please modify "
"them through Python code, preferably through a custom addon!"
msgstr ""
-"Temel alanların özellikleri bu şekilde değiştirilemez! Lütfen bunları python "
+"Temel alanların özellikleri bu şekilde değiştirilemez! Lütfen bunu python "
"kodundan değiştirin. Tercihen özel bir eklenti ile!"
#. module: base
#: code:addons/osv.py:129
#, python-format
msgid "Constraint Error"
-msgstr "Kısıtl Hatası"
+msgstr "Kısıt Hatası"
#. module: base
#: model:ir.model,name:base.model_ir_ui_view_custom
@@ -208,7 +210,7 @@ msgstr "ir.ui.view.custom"
#. module: base
#: model:res.country,name:base.sz
msgid "Swaziland"
-msgstr "Svaziland"
+msgstr "Swaziland"
#. module: base
#: code:addons/orm.py:4171
@@ -219,7 +221,7 @@ msgstr "Oluşturuldu."
#. module: base
#: model:ir.module.module,shortdesc:base.module_mrp_subproduct
msgid "MRP Subproducts"
-msgstr ""
+msgstr "MRP Alt Ürünleri"
#. module: base
#: code:addons/base/module/module.py:379
@@ -234,7 +236,7 @@ msgstr ""
#. module: base
#: field:ir.sequence,number_increment:0
msgid "Increment Number"
-msgstr "Artan"
+msgstr "Artış Miktarı"
#. module: base
#: model:ir.actions.act_window,name:base.action_res_company_tree
@@ -252,7 +254,7 @@ msgstr "Eskimo / ᐃᓄᒃᑎᑐᑦ"
#: model:ir.module.category,name:base.module_category_sales_management
#: model:ir.module.module,shortdesc:base.module_sale
msgid "Sales Management"
-msgstr ""
+msgstr "Satış Yönetimi"
#. module: base
#: view:res.partner:0
@@ -268,7 +270,7 @@ msgstr "yeni"
#. module: base
#: field:ir.actions.report.xml,multi:0
msgid "On multiple doc."
-msgstr "Birden fazla belge üzerinde"
+msgstr "Çoklu döküman üzerinde"
#. module: base
#: field:ir.module.category,module_nr:0
@@ -278,7 +280,7 @@ msgstr "Modül Sayısı"
#. module: base
#: help:multi_company.default,company_dest_id:0
msgid "Company to store the current record"
-msgstr "Güncel kaydın kaydedileceği şirket"
+msgstr "Güncel kaydın yapılacağı şirket"
#. module: base
#: field:res.partner.bank.type.field,size:0
@@ -348,17 +350,17 @@ msgstr "Sihirbaz Adı"
#. module: base
#: model:res.groups,name:base.group_partner_manager
msgid "Partner Manager"
-msgstr ""
+msgstr "Cari Yöneticisi"
#. module: base
#: model:ir.module.category,name:base.module_category_customer_relationship_management
msgid "Customer Relationship Management"
-msgstr ""
+msgstr "Müşteri İlişkileri Yönetimi (CRM)"
#. module: base
#: view:ir.module.module:0
msgid "Extra"
-msgstr ""
+msgstr "Ekstra"
#. module: base
#: code:addons/orm.py:2493
@@ -389,7 +391,7 @@ msgstr "Güncelleme Tarihi"
#. module: base
#: model:ir.module.module,shortdesc:base.module_base_action_rule
msgid "Automated Action Rules"
-msgstr ""
+msgstr "Otomatik Eylem Kuralları"
#. module: base
#: view:ir.attachment:0
@@ -404,7 +406,7 @@ msgstr "Kaynak Obje"
#. module: base
#: model:res.partner.bank.type,format_layout:base.bank_normal
msgid "%(bank_name)s: %(acc_number)s"
-msgstr ""
+msgstr "%(bank_name)s: %(acc_number)s"
#. module: base
#: view:ir.actions.todo:0
@@ -450,7 +452,7 @@ msgstr ""
#. module: base
#: help:res.partner,website:0
msgid "Website of Partner."
-msgstr ""
+msgstr "Carinin Websitesi."
#. module: base
#: help:ir.actions.act_window,views:0
@@ -479,13 +481,13 @@ msgstr "Tarih Biçimi"
#. module: base
#: model:ir.module.module,shortdesc:base.module_base_report_designer
msgid "OpenOffice Report Designer"
-msgstr ""
+msgstr "OpenOffice Rapor Tasarımcısı"
#. module: base
#: field:res.bank,email:0
#: field:res.partner.address,email:0
msgid "E-Mail"
-msgstr "E-Posta"
+msgstr "E-posta"
#. module: base
#: model:res.country,name:base.an
@@ -510,7 +512,7 @@ msgstr ""
#. module: base
#: view:ir.values:0
msgid "Action Binding"
-msgstr ""
+msgstr "Eylem Bağlantısı"
#. module: base
#: model:res.country,name:base.gf
@@ -539,7 +541,7 @@ msgstr ""
#. module: base
#: model:ir.module.module,shortdesc:base.module_sale_layout
msgid "Sales Orders Print Layout"
-msgstr ""
+msgstr "Satış Siparişi baskı düzeni"
#. module: base
#: selection:base.language.install,lang:0
@@ -649,7 +651,7 @@ msgstr "Özel alanların 'x_' ile başlayan bir adı olmalıdır !"
#. module: base
#: model:ir.module.module,shortdesc:base.module_l10n_mx
msgid "Mexico - Accounting"
-msgstr ""
+msgstr "Meksika - Muhasebe"
#. module: base
#: help:ir.actions.server,action_id:0
@@ -669,7 +671,7 @@ msgstr "Dışa Aktarım tamamlandı."
#. module: base
#: model:ir.module.module,shortdesc:base.module_outlook
msgid "Outlook Plug-In"
-msgstr ""
+msgstr "Outlook Eklentisi"
#. module: base
#: view:ir.model:0
@@ -705,7 +707,7 @@ msgstr "Ürdün"
#. module: base
#: help:ir.cron,nextcall:0
msgid "Next planned execution date for this job."
-msgstr ""
+msgstr "Bir sonraki planlı çalışma tarihi"
#. module: base
#: code:addons/base/ir/ir_model.py:139
@@ -721,7 +723,7 @@ msgstr "Eritre"
#. module: base
#: sql_constraint:res.company:0
msgid "The company name must be unique !"
-msgstr ""
+msgstr "Şirket adı tekil olmalı !"
#. module: base
#: view:res.config:0
@@ -738,7 +740,7 @@ msgstr "Otomatik Eylemler"
#. module: base
#: model:ir.module.module,shortdesc:base.module_l10n_ro
msgid "Romania - Accounting"
-msgstr ""
+msgstr "Romanya - Muhasebe"
#. module: base
#: view:partner.wizard.ean.check:0
@@ -759,7 +761,7 @@ msgstr ""
#. module: base
#: view:ir.mail_server:0
msgid "Security and Authentication"
-msgstr ""
+msgstr "Güvenlik ve Kimlik Doğrulama"
#. module: base
#: view:base.language.export:0
@@ -844,7 +846,7 @@ msgstr "Rapor tipi, ör: pdf, html, raw, sxw, odt, html2html, mako2html, ..."
#. module: base
#: model:ir.module.module,shortdesc:base.module_document_webdav
msgid "Shared Repositories (WebDAV)"
-msgstr ""
+msgstr "Ortak Havuz (WebDAV)"
#. module: base
#: model:ir.module.module,description:base.module_import_google
@@ -852,11 +854,13 @@ msgid ""
"The module adds google contact in partner address and add google calendar "
"events details in Meeting"
msgstr ""
+"Modül google kişilerini cari adreslerine, google takvim kayıtlarını "
+"toplantılara ekler"
#. module: base
#: view:res.users:0
msgid "Email Preferences"
-msgstr ""
+msgstr "E-posta Seçenekleri"
#. module: base
#: model:ir.module.module,description:base.module_audittrail
@@ -929,7 +933,7 @@ msgstr "Umman"
#. module: base
#: model:ir.module.module,shortdesc:base.module_mrp
msgid "MRP"
-msgstr ""
+msgstr "MRP"
#. module: base
#: report:ir.module.reference.graph:0
@@ -944,7 +948,7 @@ msgstr "Niue"
#. module: base
#: model:ir.module.module,shortdesc:base.module_membership
msgid "Membership Management"
-msgstr ""
+msgstr "Üyelik Yönetimi"
#. module: base
#: selection:ir.module.module,license:0
@@ -971,7 +975,7 @@ msgstr "Referans tiplerini İste"
#. module: base
#: model:ir.module.module,shortdesc:base.module_google_base_account
msgid "Google Users"
-msgstr ""
+msgstr "Google Kullanıcıları"
#. module: base
#: help:ir.server.object.lines,value:0
@@ -1008,6 +1012,7 @@ msgstr "TGZ Arşivi"
msgid ""
"Users added to this group are automatically added in the following groups."
msgstr ""
+"Bu gruba eklenen kullanıcılar otomatikman aşağıdaki gruplara eklenir."
#. module: base
#: view:res.lang:0
@@ -1034,7 +1039,7 @@ msgstr "Tür"
#. module: base
#: field:ir.mail_server,smtp_user:0
msgid "Username"
-msgstr ""
+msgstr "Kullanıcı Adı"
#. module: base
#: code:addons/orm.py:396
@@ -1061,7 +1066,7 @@ msgstr "Güvenlik sebebiyle boş şifrelere izin verilmemektedir!"
#: code:addons/base/ir/ir_mail_server.py:193
#, python-format
msgid "Connection test failed!"
-msgstr ""
+msgstr "Bağlantı denemesi başarısız!"
#. module: base
#: selection:ir.actions.server,state:0
@@ -1182,12 +1187,12 @@ msgstr "İspanyolca (GT) / Español (GT)"
#. module: base
#: field:ir.mail_server,smtp_port:0
msgid "SMTP Port"
-msgstr ""
+msgstr "SMTP bağlantı noktası"
#. module: base
#: model:ir.module.module,shortdesc:base.module_import_sugarcrm
msgid "SugarCRM Import"
-msgstr ""
+msgstr "SugarCRM'den veri al"
#. module: base
#: view:res.lang:0
@@ -1204,12 +1209,12 @@ msgstr ""
#: code:addons/base/module/wizard/base_language_install.py:55
#, python-format
msgid "Language Pack"
-msgstr ""
+msgstr "Dil Paketi"
#. module: base
#: model:ir.module.module,shortdesc:base.module_web_tests
msgid "Tests"
-msgstr ""
+msgstr "Testler"
#. module: base
#: field:ir.ui.view_sc,res_id:0
@@ -1270,7 +1275,7 @@ msgstr ""
#. module: base
#: field:ir.module.category,parent_id:0
msgid "Parent Application"
-msgstr ""
+msgstr "Ana Uygulama"
#. module: base
#: code:addons/base/res/res_users.py:222
@@ -1287,7 +1292,7 @@ msgstr "Yeni bir dili dışa aktarmak için, hiç bir dil seçmeyiniz."
#: model:ir.module.module,shortdesc:base.module_document
#: model:ir.module.module,shortdesc:base.module_knowledge
msgid "Document Management System"
-msgstr ""
+msgstr "Döküman Yönetim Sistemi"
#. module: base
#: model:ir.module.module,description:base.module_account_coda
@@ -1300,11 +1305,16 @@ msgid ""
"same.\n"
" "
msgstr ""
+"\n"
+"Modül coda dosyalarından banka ekstrelerini sisteme aktarma fonksiyonu "
+"sağlar.\n"
+"========================================================================\n"
+" "
#. module: base
#: model:ir.module.module,shortdesc:base.module_crm_claim
msgid "Claims Management"
-msgstr ""
+msgstr "Şikayet Yönetimi"
#. module: base
#: model:ir.ui.menu,name:base.menu_purchase_root
@@ -1343,7 +1353,7 @@ msgstr ""
#. module: base
#: model:ir.module.module,shortdesc:base.module_account_sequence
msgid "Entries Sequence Numbering"
-msgstr ""
+msgstr "Kayıt Sıra Numaraları"
#. module: base
#: model:ir.model,name:base.model_ir_exports
@@ -1393,6 +1403,9 @@ msgid ""
" OpenERP Web gantt chart view.\n"
" "
msgstr ""
+"\n"
+" OpenERP Web gantt şeması görünümü.\n"
+" "
#. module: base
#: report:ir.module.reference.graph:0
@@ -1452,6 +1465,8 @@ msgid ""
"Helps you manage your purchase-related processes such as requests for "
"quotations, supplier invoices, etc..."
msgstr ""
+"Satınalma ilişkili işlemleri (teklif istekleri, tedarikçi faturaları gibi) "
+"yönetmenize yardım eder"
#. module: base
#: help:base.language.install,overwrite:0
@@ -1547,7 +1562,7 @@ msgstr "Float"
#: model:ir.module.category,name:base.module_category_warehouse_management
#: model:ir.module.module,shortdesc:base.module_stock
msgid "Warehouse Management"
-msgstr ""
+msgstr "Depo Yönetimi"
#. module: base
#: model:ir.model,name:base.model_res_request_link
@@ -1578,7 +1593,7 @@ msgstr ""
#. module: base
#: model:ir.module.module,shortdesc:base.module_l10n_lu
msgid "Luxembourg - Accounting"
-msgstr ""
+msgstr "Lüksemburg - Muhasebe"
#. module: base
#: model:res.country,name:base.tp
@@ -1651,6 +1666,11 @@ msgid ""
" Apply Different Category for the product.\n"
" "
msgstr ""
+"\n"
+" Öğle yemeklerini yönetmek için Temel Modül\n"
+"\n"
+" Yemek siparişlerini, Nakit akışını, Kasa, ürün\n"
+" "
#. module: base
#: model:res.country,name:base.kg
@@ -1773,7 +1793,7 @@ msgstr ""
#. module: base
#: model:ir.module.module,shortdesc:base.module_html_view
msgid "Html View"
-msgstr ""
+msgstr "Html Görünümü"
#. module: base
#: field:res.currency,position:0
@@ -1783,7 +1803,7 @@ msgstr ""
#. module: base
#: model:ir.module.module,shortdesc:base.module_process
msgid "Enterprise Process"
-msgstr ""
+msgstr "Kurumsal İşlem"
#. module: base
#: help:ir.cron,function:0
@@ -1999,12 +2019,12 @@ msgstr "Finlandiya"
#: code:addons/base/res/res_company.py:156
#, python-format
msgid "Website: "
-msgstr ""
+msgstr "Web Sitesi: "
#. module: base
#: model:ir.ui.menu,name:base.menu_administration
msgid "Settings"
-msgstr ""
+msgstr "Ayarlar"
#. module: base
#: selection:ir.actions.act_window,view_type:0
@@ -2109,7 +2129,7 @@ msgstr "Amblem"
#. module: base
#: model:ir.module.module,shortdesc:base.module_l10n_cr
msgid "Costa Rica - Accounting"
-msgstr ""
+msgstr "Kosta Rika - Muhasebe"
#. module: base
#: view:ir.module.module:0
@@ -2139,12 +2159,12 @@ msgstr ""
#. module: base
#: field:ir.values,action_id:0
msgid "Action (change only)"
-msgstr ""
+msgstr "Eylem (sadece değişiklik)"
#. module: base
#: model:ir.module.module,shortdesc:base.module_subscription
msgid "Recurring Documents"
-msgstr ""
+msgstr "Tekrarlanan Dökümanlar"
#. module: base
#: model:res.country,name:base.bs
@@ -2183,7 +2203,7 @@ msgstr "Bir kaç modül güncllendi"
#. module: base
#: field:ir.cron,function:0
msgid "Method"
-msgstr ""
+msgstr "Yöntem"
#. module: base
#: view:res.partner.event:0
@@ -2265,7 +2285,7 @@ msgstr "Anasayfa Araçları Yönetimi"
#. module: base
#: field:res.company,rml_header1:0
msgid "Report Header / Company Slogan"
-msgstr ""
+msgstr "Rapor Başlığı / Şirket Sloganı"
#. module: base
#: model:res.country,name:base.pl
@@ -2316,7 +2336,7 @@ msgstr ""
#. module: base
#: field:ir.mail_server,smtp_debug:0
msgid "Debugging"
-msgstr ""
+msgstr "Hata Ayıklama"
#. module: base
#: model:ir.module.module,description:base.module_crm_helpdesk
@@ -2432,12 +2452,12 @@ msgstr "Geçerli Kur"
#. module: base
#: model:ir.module.module,shortdesc:base.module_idea
msgid "Ideas"
-msgstr ""
+msgstr "Fikirler"
#. module: base
#: model:ir.module.module,shortdesc:base.module_sale_crm
msgid "Opportunity to Quotation"
-msgstr ""
+msgstr "Fırsatı Teklife Çevir"
#. module: base
#: model:ir.module.module,description:base.module_sale_analytic_plans
@@ -2459,7 +2479,7 @@ msgstr "İşlem Hedefi"
#. module: base
#: model:ir.module.module,shortdesc:base.module_base_calendar
msgid "Calendar Layer"
-msgstr ""
+msgstr "Takvim Katmanı"
#. module: base
#: model:ir.actions.report.xml,name:base.report_ir_model_overview
@@ -2469,12 +2489,12 @@ msgstr ""
#. module: base
#: model:ir.module.module,shortdesc:base.module_product_margin
msgid "Margins by Products"
-msgstr ""
+msgstr "Ürünlere göre Oranlar"
#. module: base
#: model:ir.ui.menu,name:base.menu_invoiced
msgid "Invoicing"
-msgstr ""
+msgstr "Faturalandırma"
#. module: base
#: field:ir.ui.view_sc,name:0
@@ -2509,13 +2529,13 @@ msgstr "İçe aktarım / Dışa aktarım"
#. module: base
#: model:ir.actions.todo.category,name:base.category_tools_customization_config
msgid "Tools / Customization"
-msgstr ""
+msgstr "Araçlar / Özelleştirme"
#. module: base
#: field:ir.model.data,res_id:0
#: field:ir.values,res_id:0
msgid "Record ID"
-msgstr ""
+msgstr "Kayıt ID"
#. module: base
#: field:ir.actions.server,email:0
@@ -2599,7 +2619,7 @@ msgstr "Yayıncı garanti sunucusuyla iletişim kurulurken hata oluştu."
#: model:res.groups,name:base.group_sale_manager
#: model:res.groups,name:base.group_tool_manager
msgid "Manager"
-msgstr ""
+msgstr "Yönetici"
#. module: base
#: model:ir.ui.menu,name:base.menu_custom
@@ -2641,12 +2661,12 @@ msgstr "IDleri Temizle"
#. module: base
#: view:res.groups:0
msgid "Inherited"
-msgstr ""
+msgstr "Kalıtsal"
#. module: base
#: model:ir.module.module,shortdesc:base.module_account_chart
msgid "Template of Charts of Accounts"
-msgstr ""
+msgstr "Hesap planı Şablonu"
#. module: base
#: model:ir.module.module,description:base.module_pad_project
@@ -2663,6 +2683,8 @@ msgid ""
"Lets you install various tools to simplify and enhance OpenERP's report "
"creation."
msgstr ""
+"OpenERP nin raporlama kabiliyetlerini kolaylaştırıp geliştiren çeşitli "
+"araçlar kurun."
#. module: base
#: view:res.lang:0
@@ -2673,7 +2695,7 @@ msgstr "%y - Yüzyıl olmadan Yıl [00,99]."
#: code:addons/base/res/res_company.py:155
#, python-format
msgid "Fax: "
-msgstr ""
+msgstr "Faks: "
#. module: base
#: model:res.country,name:base.si
@@ -2683,7 +2705,7 @@ msgstr "Slovenya"
#. module: base
#: help:res.currency,name:0
msgid "Currency Code (ISO 4217)"
-msgstr ""
+msgstr "Döviz Kodu (ISO 4217)"
#. module: base
#: model:ir.actions.act_window,name:base.res_log_act_window
@@ -2800,19 +2822,19 @@ msgstr "Bangladeş"
#. module: base
#: model:ir.module.module,shortdesc:base.module_project_retro_planning
msgid "Project Retro-planning"
-msgstr ""
+msgstr "Proje Retro-planlama"
#. module: base
#: model:ir.module.module,shortdesc:base.module_stock_planning
msgid "Master Procurement Schedule"
-msgstr ""
+msgstr "Ana Satınalma Planı"
#. module: base
#: model:ir.model,name:base.model_ir_module_category
#: field:ir.module.module,application:0
#: field:res.groups,category_id:0
msgid "Application"
-msgstr ""
+msgstr "Uygulama"
#. module: base
#: selection:publisher_warranty.contract,state:0
@@ -2887,7 +2909,7 @@ msgstr ""
#: code:addons/report_sxw.py:435
#, python-format
msgid "Unknown report type: %s"
-msgstr ""
+msgstr "Bilinmeyen Rapor tipi: %s"
#. module: base
#: code:addons/base/ir/ir_model.py:277
@@ -3001,7 +3023,7 @@ msgstr ""
#. module: base
#: model:ir.module.module,shortdesc:base.module_wiki_quality_manual
msgid "Wiki: Quality Manual"
-msgstr ""
+msgstr "Wiki: Kalite El Kitabı"
#. module: base
#: selection:ir.actions.act_window.view,view_mode:0
@@ -3024,7 +3046,7 @@ msgstr "Sinyal (subflow.*)"
#. module: base
#: model:ir.ui.menu,name:base.menu_dashboard_admin
msgid "Administration Dashboard"
-msgstr ""
+msgstr "Yönetim Paneli"
#. module: base
#: code:addons/orm.py:4373
@@ -3083,7 +3105,7 @@ msgstr ""
#. module: base
#: model:res.groups,name:base.group_survey_user
msgid "Survey / User"
-msgstr ""
+msgstr "Araştırma / Kullanıcı"
#. module: base
#: view:ir.module.module:0
@@ -3104,17 +3126,17 @@ msgstr "Web ikon dosyası (hover)"
#. module: base
#: model:ir.module.module,description:base.module_web_diagram
msgid "Openerp web Diagram view"
-msgstr ""
+msgstr "Openerp web şema görünümü"
#. module: base
#: model:res.groups,name:base.group_hr_user
msgid "HR Officer"
-msgstr ""
+msgstr "İK Çalışanı"
#. module: base
#: model:ir.module.module,shortdesc:base.module_hr_contract
msgid "Employee Contracts"
-msgstr ""
+msgstr "Çalışan Şözleşmeleri"
#. module: base
#: model:ir.module.module,description:base.module_wiki_faq
@@ -3173,12 +3195,12 @@ msgstr ""
#: code:addons/base/ir/ir_mail_server.py:218
#, python-format
msgid "SMTP-over-SSL mode unavailable"
-msgstr ""
+msgstr "SSL üzerinden SMTP biçimi mevcut değil"
#. module: base
#: model:ir.module.module,shortdesc:base.module_survey
msgid "Survey"
-msgstr ""
+msgstr "Anket"
#. module: base
#: view:base.language.import:0
@@ -3225,7 +3247,7 @@ msgstr "Uruguay"
#. module: base
#: model:ir.module.module,shortdesc:base.module_fetchmail_crm
msgid "eMail Gateway for Leads"
-msgstr ""
+msgstr "Fırsatlar için e-posta kapısı"
#. module: base
#: selection:base.language.install,lang:0
@@ -3255,7 +3277,7 @@ msgstr "Alan Eşleşmeleri"
#. module: base
#: model:ir.module.module,shortdesc:base.module_web_dashboard
msgid "web Dashboard"
-msgstr ""
+msgstr "Web yönetim paneli"
#. module: base
#: model:ir.module.module,description:base.module_sale
@@ -3405,7 +3427,7 @@ msgstr "Örnekler"
#. module: base
#: help:ir.mail_server,smtp_host:0
msgid "Hostname or IP of SMTP server"
-msgstr ""
+msgstr "SMTP sunucunun IP adresi ya da alan adı"
#. module: base
#: selection:base.language.install,lang:0
@@ -3462,13 +3484,13 @@ msgstr "Mayotte"
#. module: base
#: model:ir.module.module,shortdesc:base.module_crm_todo
msgid "Tasks on CRM"
-msgstr ""
+msgstr "CRM deki Görevler"
#. module: base
#: model:ir.module.category,name:base.module_category_generic_modules_accounting
#: view:res.company:0
msgid "Accounting"
-msgstr ""
+msgstr "Muhasebe"
#. module: base
#: model:ir.module.module,description:base.module_account_payment
@@ -3487,7 +3509,7 @@ msgstr ""
#. module: base
#: view:ir.rule:0
msgid "Interaction between rules"
-msgstr ""
+msgstr "Kurallar arası etkileşim"
#. module: base
#: model:ir.module.module,description:base.module_account_invoice_layout
@@ -3584,12 +3606,12 @@ msgstr "kendini çağırma tespit edildi."
#. module: base
#: model:ir.module.module,shortdesc:base.module_report_webkit_sample
msgid "Webkit Report Samples"
-msgstr ""
+msgstr "Webkit Rapor Örnekleri"
#. module: base
#: model:ir.module.module,shortdesc:base.module_point_of_sale
msgid "Point Of Sale"
-msgstr ""
+msgstr "Satış Noktası"
#. module: base
#: code:addons/base/module/module.py:298
@@ -3625,7 +3647,7 @@ msgstr ""
#. module: base
#: selection:ir.sequence,implementation:0
msgid "Standard"
-msgstr ""
+msgstr "Standart"
#. module: base
#: model:ir.model,name:base.model_maintenance_contract
@@ -3713,7 +3735,7 @@ msgstr "KDV"
#. module: base
#: field:res.users,new_password:0
msgid "Set password"
-msgstr ""
+msgstr "Şifre Belirle"
#. module: base
#: view:res.lang:0
@@ -3737,6 +3759,9 @@ msgid ""
" OpenERP Web mobile.\n"
" "
msgstr ""
+"\n"
+" OpenERP Mobil Web\n"
+" "
#. module: base
#: view:res.lang:0
@@ -3807,6 +3832,9 @@ msgid ""
"la moneda Lempira. -- Adds accounting chart for Honduras. It also includes "
"taxes and the Lempira currency"
msgstr ""
+"Agrega una nomenclatura contable para Honduras. También incluye impuestos y "
+"la moneda Lempira. -- Honduras için Hesap planı, lempira para birimi vergi "
+"tipleri."
#. module: base
#: selection:ir.actions.act_window,view_type:0
@@ -3836,12 +3864,12 @@ msgstr "Karadağ"
#. module: base
#: model:ir.module.module,shortdesc:base.module_document_ics
msgid "iCal Support"
-msgstr ""
+msgstr "iCal Desteği"
#. module: base
#: model:ir.module.module,shortdesc:base.module_fetchmail
msgid "Email Gateway"
-msgstr ""
+msgstr "E-posta Kapısı"
#. module: base
#: code:addons/base/ir/ir_mail_server.py:440
@@ -3865,7 +3893,7 @@ msgstr "Sınıflandırmalar"
#. module: base
#: model:ir.module.module,shortdesc:base.module_web_mobile
msgid "OpenERP Web mobile"
-msgstr ""
+msgstr "OpenERP Web mobil"
#. module: base
#: view:base.language.import:0
@@ -3917,7 +3945,7 @@ msgstr "Lihtenştayn"
#. module: base
#: model:ir.module.module,description:base.module_web_rpc
msgid "Openerp web web"
-msgstr ""
+msgstr "Openerp web web"
#. module: base
#: model:ir.module.module,shortdesc:base.module_project_issue_sheet
@@ -4013,7 +4041,7 @@ msgstr ""
#. module: base
#: model:ir.module.module,shortdesc:base.module_l10n_it
msgid "Italy - Accounting"
-msgstr ""
+msgstr "İtalya - Muhasebe"
#. module: base
#: field:ir.actions.act_window,help:0
@@ -4056,7 +4084,7 @@ msgstr "Xor"
#. module: base
#: model:ir.module.category,name:base.module_category_localization_account_charts
msgid "Account Charts"
-msgstr ""
+msgstr "Hesap Planları"
#. module: base
#: view:res.request:0
@@ -4159,7 +4187,7 @@ msgstr "SXW İçeriği"
#. module: base
#: model:ir.module.module,shortdesc:base.module_l10n_pl
msgid "Poland - Accounting"
-msgstr ""
+msgstr "Polonya - Muhasebe"
#. module: base
#: view:ir.cron:0
@@ -4210,7 +4238,7 @@ msgstr "Özet"
#. module: base
#: model:ir.module.category,name:base.module_category_hidden_dependency
msgid "Dependency"
-msgstr ""
+msgstr "Bağımlılık"
#. module: base
#: field:multi_company.default,expression:0
diff --git a/openerp/addons/base/i18n/zh_CN.po b/openerp/addons/base/i18n/zh_CN.po
index 8d629b69de8..e1ad74725bd 100644
--- a/openerp/addons/base/i18n/zh_CN.po
+++ b/openerp/addons/base/i18n/zh_CN.po
@@ -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: 2011-12-22 20:22+0000\n"
-"PO-Revision-Date: 2011-09-30 21:27+0000\n"
+"PO-Revision-Date: 2012-01-07 05:02+0000\n"
"Last-Translator: Wei \"oldrev\" Li \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-01-05 05:36+0000\n"
-"X-Generator: Launchpad (build 14625)\n"
+"X-Launchpad-Export-Date: 2012-01-08 05:03+0000\n"
+"X-Generator: Launchpad (build 14640)\n"
#. module: base
#: model:res.country,name:base.sh
@@ -244,7 +244,7 @@ msgstr "因纽特语"
#: model:ir.module.category,name:base.module_category_sales_management
#: model:ir.module.module,shortdesc:base.module_sale
msgid "Sales Management"
-msgstr ""
+msgstr "销售管理"
#. module: base
#: view:res.partner:0
@@ -338,17 +338,17 @@ msgstr "向导名称"
#. module: base
#: model:res.groups,name:base.group_partner_manager
msgid "Partner Manager"
-msgstr ""
+msgstr "业务伙伴经理"
#. module: base
#: model:ir.module.category,name:base.module_category_customer_relationship_management
msgid "Customer Relationship Management"
-msgstr ""
+msgstr "客户关系管理"
#. module: base
#: view:ir.module.module:0
msgid "Extra"
-msgstr ""
+msgstr "额外的"
#. module: base
#: code:addons/orm.py:2493
@@ -359,7 +359,7 @@ msgstr "无效的 group_by"
#. module: base
#: field:ir.module.category,child_ids:0
msgid "Child Applications"
-msgstr ""
+msgstr "子应用"
#. module: base
#: field:res.partner,credit_limit:0
@@ -369,7 +369,7 @@ msgstr "信用额度"
#. module: base
#: model:ir.module.module,description:base.module_web_graph
msgid "Openerp web graph view"
-msgstr ""
+msgstr "OpenERP Web 图表视图"
#. module: base
#: field:ir.model.data,date_update:0
@@ -379,7 +379,7 @@ msgstr "更新日期"
#. module: base
#: model:ir.module.module,shortdesc:base.module_base_action_rule
msgid "Automated Action Rules"
-msgstr ""
+msgstr "自动化动作规则"
#. module: base
#: view:ir.attachment:0
@@ -440,7 +440,7 @@ msgstr ""
#. module: base
#: help:res.partner,website:0
msgid "Website of Partner."
-msgstr ""
+msgstr "业务伙伴网站"
#. module: base
#: help:ir.actions.act_window,views:0
@@ -469,7 +469,7 @@ msgstr "日期格式"
#. module: base
#: model:ir.module.module,shortdesc:base.module_base_report_designer
msgid "OpenOffice Report Designer"
-msgstr ""
+msgstr "OpenOffice 报表设计器"
#. module: base
#: field:res.bank,email:0
@@ -498,7 +498,7 @@ msgstr "您不能删除 admin 用户，因为其由 OpenERP 创建并被系统
#. module: base
#: view:ir.values:0
msgid "Action Binding"
-msgstr ""
+msgstr "动作绑定"
#. module: base
#: model:res.country,name:base.gf
@@ -525,7 +525,7 @@ msgstr "如果您选中此处，当下次用户使用相同的附件名称打印
#. module: base
#: model:ir.module.module,shortdesc:base.module_sale_layout
msgid "Sales Orders Print Layout"
-msgstr ""
+msgstr "销售单打印布局"
#. module: base
#: selection:base.language.install,lang:0
@@ -634,7 +634,7 @@ msgstr "自定义的字段名称必须以“x_”开始！"
#. module: base
#: model:ir.module.module,shortdesc:base.module_l10n_mx
msgid "Mexico - Accounting"
-msgstr ""
+msgstr "墨西哥——财会"
#. module: base
#: help:ir.actions.server,action_id:0
@@ -654,7 +654,7 @@ msgstr "导出完成"
#. module: base
#: model:ir.module.module,shortdesc:base.module_outlook
msgid "Outlook Plug-In"
-msgstr ""
+msgstr "Outlook 插件"
#. module: base
#: view:ir.model:0
@@ -690,7 +690,7 @@ msgstr "约旦"
#. module: base
#: help:ir.cron,nextcall:0
msgid "Next planned execution date for this job."
-msgstr ""
+msgstr "此任务的下一次执行时间"
#. module: base
#: code:addons/base/ir/ir_model.py:139
@@ -706,7 +706,7 @@ msgstr "厄立特里亚"
#. module: base
#: sql_constraint:res.company:0
msgid "The company name must be unique !"
-msgstr ""
+msgstr "公司名称必须唯一！"
#. module: base
#: view:res.config:0
@@ -723,7 +723,7 @@ msgstr "自动动作"
#. module: base
#: model:ir.module.module,shortdesc:base.module_l10n_ro
msgid "Romania - Accounting"
-msgstr ""
+msgstr "罗马尼亚——财务"
#. module: base
#: view:partner.wizard.ean.check:0
@@ -742,7 +742,7 @@ msgstr ""
#. module: base
#: view:ir.mail_server:0
msgid "Security and Authentication"
-msgstr ""
+msgstr "安全与验证"
#. module: base
#: view:base.language.export:0
@@ -822,7 +822,7 @@ msgstr "报表类型，如：pdf, html, raw, sxw, odt, html2html, mako2html, ...
#. module: base
#: model:ir.module.module,shortdesc:base.module_document_webdav
msgid "Shared Repositories (WebDAV)"
-msgstr ""
+msgstr "共享仓库（WebDAV）"
#. module: base
#: model:ir.module.module,description:base.module_import_google
@@ -834,7 +834,7 @@ msgstr ""
#. module: base
#: view:res.users:0
msgid "Email Preferences"
-msgstr ""
+msgstr "Email 首选项"
#. module: base
#: model:ir.module.module,description:base.module_audittrail
@@ -906,7 +906,7 @@ msgstr "阿曼"
#. module: base
#: model:ir.module.module,shortdesc:base.module_mrp
msgid "MRP"
-msgstr ""
+msgstr "生产资源计划模块"
#. module: base
#: report:ir.module.reference.graph:0
@@ -921,7 +921,7 @@ msgstr "纽埃岛"
#. module: base
#: model:ir.module.module,shortdesc:base.module_membership
msgid "Membership Management"
-msgstr ""
+msgstr "会员管理"
#. module: base
#: selection:ir.module.module,license:0
@@ -948,7 +948,7 @@ msgstr "短消息链接类型"
#. module: base
#: model:ir.module.module,shortdesc:base.module_google_base_account
msgid "Google Users"
-msgstr ""
+msgstr "Google 账户"
#. module: base
#: help:ir.server.object.lines,value:0
@@ -1011,7 +1011,7 @@ msgstr "类型"
#. module: base
#: field:ir.mail_server,smtp_user:0
msgid "Username"
-msgstr ""
+msgstr "用户名"
#. module: base
#: code:addons/orm.py:396
@@ -1038,7 +1038,7 @@ msgstr "基于安全上的考虑不允许设置空密码！"
#: code:addons/base/ir/ir_mail_server.py:193
#, python-format
msgid "Connection test failed!"
-msgstr ""
+msgstr "连接测试失败！"
#. module: base
#: selection:ir.actions.server,state:0
@@ -1156,12 +1156,12 @@ msgstr "Spanish (GT) / Español (GT)"
#. module: base
#: field:ir.mail_server,smtp_port:0
msgid "SMTP Port"
-msgstr ""
+msgstr "SMTP 端口"
#. module: base
#: model:ir.module.module,shortdesc:base.module_import_sugarcrm
msgid "SugarCRM Import"
-msgstr ""
+msgstr "SugarCRM 导入"
#. module: base
#: view:res.lang:0
@@ -1175,12 +1175,12 @@ msgstr "%W - 一年中的周数（周一为一周的开始）[00,53]。在新年
#: code:addons/base/module/wizard/base_language_install.py:55
#, python-format
msgid "Language Pack"
-msgstr ""
+msgstr "语言包"
#. module: base
#: model:ir.module.module,shortdesc:base.module_web_tests
msgid "Tests"
-msgstr ""
+msgstr "测试"
#. module: base
#: field:ir.ui.view_sc,res_id:0
@@ -1240,7 +1240,7 @@ msgstr ""
#. module: base
#: field:ir.module.category,parent_id:0
msgid "Parent Application"
-msgstr ""
+msgstr "上级应用"
#. module: base
#: code:addons/base/res/res_users.py:222
@@ -1257,7 +1257,7 @@ msgstr "如果要导出新语言，这里请不要选择语言"
#: model:ir.module.module,shortdesc:base.module_document
#: model:ir.module.module,shortdesc:base.module_knowledge
msgid "Document Management System"
-msgstr ""
+msgstr "文档管理系统"
#. module: base
#: model:ir.module.module,description:base.module_account_coda
@@ -1363,6 +1363,9 @@ msgid ""
" OpenERP Web gantt chart view.\n"
" "
msgstr ""
+"\n"
+" OpenERP Web 甘特图视图。\n"
+" "
#. module: base
#: report:ir.module.reference.graph:0
@@ -1418,7 +1421,7 @@ msgstr ""
msgid ""
"Helps you manage your purchase-related processes such as requests for "
"quotations, supplier invoices, etc..."
-msgstr ""
+msgstr "帮助您管理采购相关流程，如询价、供货商发票等等"
#. module: base
#: help:base.language.install,overwrite:0
@@ -1505,7 +1508,7 @@ msgstr "浮点数"
#: model:ir.module.category,name:base.module_category_warehouse_management
#: model:ir.module.module,shortdesc:base.module_stock
msgid "Warehouse Management"
-msgstr ""
+msgstr "仓库管理"
#. module: base
#: model:ir.model,name:base.model_res_request_link
@@ -1729,7 +1732,7 @@ msgstr ""
#. module: base
#: model:ir.module.module,shortdesc:base.module_html_view
msgid "Html View"
-msgstr ""
+msgstr "HTML 视图"
#. module: base
#: field:res.currency,position:0
@@ -1739,7 +1742,7 @@ msgstr ""
#. module: base
#: model:ir.module.module,shortdesc:base.module_process
msgid "Enterprise Process"
-msgstr ""
+msgstr "企业流程"
#. module: base
#: help:ir.cron,function:0
@@ -1749,7 +1752,7 @@ msgstr ""
#. module: base
#: model:ir.module.module,shortdesc:base.module_hr_evaluation
msgid "Employee Appraisals"
-msgstr ""
+msgstr "员工评估"
#. module: base
#: selection:ir.actions.server,state:0
@@ -1766,7 +1769,7 @@ msgstr " (副本)"
#. module: base
#: field:res.company,rml_footer1:0
msgid "General Information Footer"
-msgstr ""
+msgstr "常规信息页脚"
#. module: base
#: view:res.lang:0
@@ -1788,7 +1791,7 @@ msgstr "Left parent"
#. module: base
#: model:ir.module.module,shortdesc:base.module_project_mrp
msgid "Create Tasks on SO"
-msgstr ""
+msgstr "以订单创建任务"
#. module: base
#: field:ir.attachment,res_model:0
@@ -1798,7 +1801,7 @@ msgstr "附加的模型"
#. module: base
#: field:res.partner.bank,footer:0
msgid "Display on Reports"
-msgstr ""
+msgstr "显示报表"
#. module: base
#: model:ir.module.module,description:base.module_l10n_cn
@@ -1952,12 +1955,12 @@ msgstr "芬兰"
#: code:addons/base/res/res_company.py:156
#, python-format
msgid "Website: "
-msgstr ""
+msgstr "网站： "
#. module: base
#: model:ir.ui.menu,name:base.menu_administration
msgid "Settings"
-msgstr ""
+msgstr "设置"
#. module: base
#: selection:ir.actions.act_window,view_type:0
@@ -2093,7 +2096,7 @@ msgstr ""
#. module: base
#: model:ir.module.module,shortdesc:base.module_subscription
msgid "Recurring Documents"
-msgstr ""
+msgstr "周期性凭证"
#. module: base
#: model:res.country,name:base.bs
@@ -2130,7 +2133,7 @@ msgstr "已更新的模块数"
#. module: base
#: field:ir.cron,function:0
msgid "Method"
-msgstr ""
+msgstr "方法"
#. module: base
#: view:res.partner.event:0
@@ -2152,7 +2155,7 @@ msgstr "您可以自定义OpenERP中的任意一个视图。可以添加字段
#. module: base
#: model:ir.module.module,shortdesc:base.module_base_setup
msgid "Initial Setup Tools"
-msgstr ""
+msgstr "初期设置工具"
#. module: base
#: field:ir.actions.act_window,groups_id:0
@@ -2257,7 +2260,7 @@ msgstr ""
#. module: base
#: field:ir.mail_server,smtp_debug:0
msgid "Debugging"
-msgstr ""
+msgstr "调试"
#. module: base
#: model:ir.module.module,description:base.module_crm_helpdesk
@@ -2373,12 +2376,12 @@ msgstr "当前汇率"
#. module: base
#: model:ir.module.module,shortdesc:base.module_idea
msgid "Ideas"
-msgstr ""
+msgstr "创意管理模块"
#. module: base
#: model:ir.module.module,shortdesc:base.module_sale_crm
msgid "Opportunity to Quotation"
-msgstr ""
+msgstr "商机转为报价单"
#. module: base
#: model:ir.module.module,description:base.module_sale_analytic_plans
@@ -2400,22 +2403,22 @@ msgstr "动作目标"
#. module: base
#: model:ir.module.module,shortdesc:base.module_base_calendar
msgid "Calendar Layer"
-msgstr ""
+msgstr "日历层"
#. module: base
#: model:ir.actions.report.xml,name:base.report_ir_model_overview
msgid "Model Overview"
-msgstr ""
+msgstr "模型视图"
#. module: base
#: model:ir.module.module,shortdesc:base.module_product_margin
msgid "Margins by Products"
-msgstr ""
+msgstr "产品利润模块"
#. module: base
#: model:ir.ui.menu,name:base.menu_invoiced
msgid "Invoicing"
-msgstr ""
+msgstr "开发票"
#. module: base
#: field:ir.ui.view_sc,name:0
@@ -2450,13 +2453,13 @@ msgstr "导入/导出"
#. module: base
#: model:ir.actions.todo.category,name:base.category_tools_customization_config
msgid "Tools / Customization"
-msgstr ""
+msgstr "工具/自定义"
#. module: base
#: field:ir.model.data,res_id:0
#: field:ir.values,res_id:0
msgid "Record ID"
-msgstr ""
+msgstr "记录 ID"
#. module: base
#: field:ir.actions.server,email:0
@@ -2540,7 +2543,7 @@ msgstr "当与保障服务器通信时发生错误。"
#: model:res.groups,name:base.group_sale_manager
#: model:res.groups,name:base.group_tool_manager
msgid "Manager"
-msgstr ""
+msgstr "经理"
#. module: base
#: model:ir.ui.menu,name:base.menu_custom
@@ -2582,7 +2585,7 @@ msgstr "清除 ID"
#. module: base
#: view:res.groups:0
msgid "Inherited"
-msgstr ""
+msgstr "继承"
#. module: base
#: model:ir.module.module,shortdesc:base.module_account_chart
@@ -2603,7 +2606,7 @@ msgstr ""
msgid ""
"Lets you install various tools to simplify and enhance OpenERP's report "
"creation."
-msgstr ""
+msgstr "让您安装工具来简化和增强 OpenERP 的报表创建功能."
#. module: base
#: view:res.lang:0
@@ -2614,7 +2617,7 @@ msgstr "%y - 两位数年份"
#: code:addons/base/res/res_company.py:155
#, python-format
msgid "Fax: "
-msgstr ""
+msgstr "传真： "
#. module: base
#: model:res.country,name:base.si
@@ -2624,7 +2627,7 @@ msgstr "斯洛文尼亚"
#. module: base
#: help:res.currency,name:0
msgid "Currency Code (ISO 4217)"
-msgstr ""
+msgstr "货币代码（ISO 4217）"
#. module: base
#: model:ir.actions.act_window,name:base.res_log_act_window
@@ -2744,7 +2747,7 @@ msgstr ""
#. module: base
#: model:ir.module.module,shortdesc:base.module_stock_planning
msgid "Master Procurement Schedule"
-msgstr ""
+msgstr "主需求计划表"
#. module: base
#: model:ir.model,name:base.model_ir_module_category
@@ -2826,7 +2829,7 @@ msgstr ""
#: code:addons/report_sxw.py:435
#, python-format
msgid "Unknown report type: %s"
-msgstr ""
+msgstr "未知报表类型：%s"
#. module: base
#: code:addons/base/ir/ir_model.py:277
@@ -2963,7 +2966,7 @@ msgstr "信号（subflow.*）"
#. module: base
#: model:ir.ui.menu,name:base.menu_dashboard_admin
msgid "Administration Dashboard"
-msgstr ""
+msgstr "管理员仪表盘"
#. module: base
#: code:addons/orm.py:4373
@@ -3041,12 +3044,12 @@ msgstr ""
#. module: base
#: model:res.groups,name:base.group_hr_user
msgid "HR Officer"
-msgstr ""
+msgstr "人事官员"
#. module: base
#: model:ir.module.module,shortdesc:base.module_hr_contract
msgid "Employee Contracts"
-msgstr ""
+msgstr "劳动合同管理"
#. module: base
#: model:ir.module.module,description:base.module_wiki_faq
@@ -3097,13 +3100,13 @@ msgstr "联系人称谓"
#. module: base
#: model:ir.module.module,shortdesc:base.module_product_manufacturer
msgid "Products Manufacturers"
-msgstr ""
+msgstr "产品生产商管理"
#. module: base
#: code:addons/base/ir/ir_mail_server.py:218
#, python-format
msgid "SMTP-over-SSL mode unavailable"
-msgstr ""
+msgstr "SMTP-over-SSL 模式不可用"
#. module: base
#: model:ir.module.module,shortdesc:base.module_survey
diff --git a/openerp/addons/base/module/module.py b/openerp/addons/base/module/module.py
index e4c848eb2b0..34ed48378e6 100644
--- a/openerp/addons/base/module/module.py
+++ b/openerp/addons/base/module/module.py
@@ -437,6 +437,8 @@ class module(osv.osv):
'license': terp.get('license', 'AGPL-3'),
'certificate': terp.get('certificate') or False,
'complexity': terp.get('complexity', ''),
+ 'sequence': terp.get('sequence', 100),
+ 'application': terp.get('application', False),
}
# update the list of available packages
diff --git a/openerp/modules/db.py b/openerp/modules/db.py
index d9c4f76dd3b..a670a29deed 100644
--- a/openerp/modules/db.py
+++ b/openerp/modules/db.py
@@ -75,14 +75,15 @@ def initialize(cr):
cr.execute('INSERT INTO ir_module_module \
(author, website, name, shortdesc, description, \
- category_id, state, certificate, web, license, complexity, application, icon) \
- VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s) RETURNING id', (
+ category_id, state, certificate, web, license, complexity, application, icon, sequence) \
+ VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s) RETURNING id', (
info['author'],
info['website'], i, info['name'],
info['description'], category_id, state, info['certificate'],
info['web'],
info['license'],
- info['complexity'], info['application'], info['icon']))
+ info['complexity'], info['application'], info['icon'],
+ info['sequence']))
id = cr.fetchone()[0]
cr.execute('INSERT INTO ir_model_data \
(name,model,module, res_id, noupdate) VALUES (%s,%s,%s,%s,%s)', (
diff --git a/openerp/modules/module.py b/openerp/modules/module.py
index 2282067c3b6..43b11b0d1b0 100644
--- a/openerp/modules/module.py
+++ b/openerp/modules/module.py
@@ -244,6 +244,7 @@ def load_information_from_description_file(module):
'version': '0.0.0',
'web': False,
'website': '',
+ 'sequence': 100,
}
info.update(itertools.izip(
'depends data demo test init_xml update_xml demo_xml'.split(),
diff --git a/openerp/wsgi.py b/openerp/wsgi.py
index bb8cfc9a781..193d30fb285 100644
--- a/openerp/wsgi.py
+++ b/openerp/wsgi.py
@@ -462,6 +462,22 @@ def on_starting(server):
openerp.netsvc.init_logger()
openerp.osv.osv.start_object_proxy()
openerp.service.web_services.start_web_services()
+ openerp.modules.module.initialize_sys_path()
+ openerp.modules.loading.open_openerp_namespace()
+ for m in openerp.conf.server_wide_modules:
+ try:
+ __import__(m)
+ # Call any post_load hook.
+ info = openerp.modules.module.load_information_from_description_file(m)
+ if info['post_load']:
+ getattr(sys.modules[m], info['post_load'])()
+ except Exception:
+ msg = ''
+ if m == 'web':
+ msg = """
+The `web` module is provided by the addons found in the `openerp-web` project.
+Maybe you forgot to add those addons in your addons_path configuration."""
+ logging.exception('Failed to load server-wide module `%s`.%s', m, msg)
# Install our own signal handler on the master process.
def when_ready(server):
diff --git a/setup.nsi b/setup.nsi
index 3c7d5935886..e23cf46bb51 100644
--- a/setup.nsi
+++ b/setup.nsi
@@ -229,7 +229,7 @@ Section "Uninstall"
sleep 2
; Uninstall the OpenERP Service
- nsExec::Exec '"$INSTDIR\service\OpenERPServerService.exe" -remove'
+ nsExec::Exec '"$INSTDIR\..\service\OpenERPServerService.exe" -remove'
sleep 2
Rmdir /r "$INSTDIR\service"