merge

bzr revid: fp@tinyerp.com-20100824124700-mdefo6j77yaifhxc

18 files changed, 429 insertions, 343 deletions

diff --git a/bin/addons/base/base_update.xml b/bin/addons/base/base_update.xml
index 08f235c8215..26da68633f4 100644
--- a/bin/addons/base/base_update.xml
+++ b/bin/addons/base/base_update.xml
@@ -179,7 +179,7 @@
                 <form string="Company">
                     <group colspan="4" col="6">
                         <field colspan="4" name="name" select="1"/>
-                        <field name="partner_id" select="1"/>
+                        <field name="partner_id" readonly="1" select="1" required="0"/>
                         <field name="parent_id" select="1" groups="base.group_multi_company"/>
                     </group>
                     <notebook colspan="4">
diff --git a/bin/addons/base/i18n/hr.po b/bin/addons/base/i18n/hr.po
index 0fc64c81ca4..4a50898ceb1 100644
--- a/bin/addons/base/i18n/hr.po
+++ b/bin/addons/base/i18n/hr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-08-18 12:49+0000\n"
+"PO-Revision-Date: 2010-08-23 06:26+0000\n"
 "Last-Translator: Goran Kliska <gkliska@gmail.com>\n"
 "Language-Team: openerp-translators\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-19 03:45+0000\n"
+"X-Launchpad-Export-Date: 2010-08-24 03:36+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: hr\n"
 
diff --git a/bin/addons/base/i18n/it.po b/bin/addons/base/i18n/it.po
index 313c90be3d1..0f9c2802c17 100644
--- a/bin/addons/base/i18n/it.po
+++ b/bin/addons/base/i18n/it.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-08-18 12:43+0000\n"
+"PO-Revision-Date: 2010-08-23 06:23+0000\n"
 "Last-Translator: OpenERP Administrators <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: 2010-08-19 03:44+0000\n"
+"X-Launchpad-Export-Date: 2010-08-24 03:36+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
diff --git a/bin/addons/base/i18n/ja.po b/bin/addons/base/i18n/ja.po
index 11278c17ec3..7a07ddc9eff 100644
--- a/bin/addons/base/i18n/ja.po
+++ b/bin/addons/base/i18n/ja.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-server\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-08-18 12:51+0000\n"
+"PO-Revision-Date: 2010-08-23 06:18+0000\n"
 "Last-Translator: Harry (Open ERP) <hmo@tinyerp.com>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-19 03:45+0000\n"
+"X-Launchpad-Export-Date: 2010-08-24 03:36+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
diff --git a/bin/addons/base/i18n/pt_BR.po b/bin/addons/base/i18n/pt_BR.po
index bd187fff810..bc30d1af304 100644
--- a/bin/addons/base/i18n/pt_BR.po
+++ b/bin/addons/base/i18n/pt_BR.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: pt_BR\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-08-18 12:44+0000\n"
+"PO-Revision-Date: 2010-08-23 06:28+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-19 03:45+0000\n"
+"X-Launchpad-Export-Date: 2010-08-24 03:36+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
diff --git a/bin/addons/base/i18n/sv.po b/bin/addons/base/i18n/sv.po
index 61fd670b851..b0e777d31ef 100644
--- a/bin/addons/base/i18n/sv.po
+++ b/bin/addons/base/i18n/sv.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-08-18 12:56+0000\n"
+"PO-Revision-Date: 2010-08-23 06:14+0000\n"
 "Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\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: 2010-08-19 03:45+0000\n"
+"X-Launchpad-Export-Date: 2010-08-24 03:36+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
diff --git a/bin/addons/base/i18n/uk.po b/bin/addons/base/i18n/uk.po
index d9cef2f6010..d66c47fe4c5 100644
--- a/bin/addons/base/i18n/uk.po
+++ b/bin/addons/base/i18n/uk.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-08-18 12:47+0000\n"
+"PO-Revision-Date: 2010-08-23 06:22+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.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: 2010-08-19 03:45+0000\n"
+"X-Launchpad-Export-Date: 2010-08-24 03:36+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
diff --git a/bin/addons/base/i18n/zh_CN.po b/bin/addons/base/i18n/zh_CN.po
index 16bf58db3b4..4cf27bbf174 100644
--- a/bin/addons/base/i18n/zh_CN.po
+++ b/bin/addons/base/i18n/zh_CN.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-08-18 12:53+0000\n"
+"PO-Revision-Date: 2010-08-23 06:24+0000\n"
 "Last-Translator: Eleanor Chen <chenyueg@gmail.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: 2010-08-19 03:45+0000\n"
+"X-Launchpad-Export-Date: 2010-08-24 03:37+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
diff --git a/bin/addons/base/i18n/zh_TW.po b/bin/addons/base/i18n/zh_TW.po
index 978c8bace8f..1c93b4ad775 100644
--- a/bin/addons/base/i18n/zh_TW.po
+++ b/bin/addons/base/i18n/zh_TW.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-02-24 06:09+0000\n"
+"PO-Revision-Date: 2010-08-20 04:54+0000\n"
 "Last-Translator: OpenERP Administrators <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: 2010-07-13 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-21 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
@@ -24,17 +24,17 @@ msgstr ""
 #. module: base
 #: wizard_view:res.partner.sms_send,init:0
 msgid "SMS - Gateway: clickatell"
-msgstr ""
+msgstr "短信網關：clickatell"
 
 #. module: base
 #: view:res.lang:0
 msgid "%j - Day of the year as a decimal number [001,366]."
-msgstr ""
+msgstr "%j - 十進製表示的該年中的天數 [001,366]."
 
 #. module: base
 #: field:ir.values,meta_unpickle:0
 msgid "Metadata"
-msgstr ""
+msgstr "其他相關資料"
 
 #. module: base
 #: field:ir.ui.view,arch:0
@@ -46,12 +46,12 @@ msgstr "視圖結構"
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
 msgid "You can not create this kind of document! (%s)"
-msgstr ""
+msgstr "您無法建立這種文件! (%s)"
 
 #. module: base
 #: wizard_field:module.lang.import,init,code:0
 msgid "Code (eg:en__US)"
-msgstr ""
+msgstr "語言代碼(如：en__US)"
 
 #. module: base
 #: view:workflow:0
@@ -63,7 +63,7 @@ msgstr "工作流程"
 #. module: base
 #: view:wizard.module.lang.export:0
 msgid "To browse official translations, you can visit this link: "
-msgstr ""
+msgstr "要瀏覽官方翻譯，請訪問此連接： "
 
 #. module: base
 #: selection:module.lang.install,init,lang:0
@@ -73,27 +73,27 @@ msgstr ""
 #. module: base
 #: field:ir.actions.server,wkf_model_id:0
 msgid "Workflow On"
-msgstr ""
+msgstr "工作流程作用於"
 
 #. module: base
 #: view:ir.module.module:0
 msgid "Created Views"
-msgstr ""
+msgstr "已建立的視圖"
 
 #. module: base
 #: view:workflow.activity:0
 msgid "Outgoing transitions"
-msgstr ""
+msgstr "傳出轉換"
 
 #. module: base
 #: selection:ir.report.custom,frequency:0
 msgid "Yearly"
-msgstr ""
+msgstr "每年"
 
 #. module: base
 #: field:ir.actions.act_window,target:0
 msgid "Target Window"
-msgstr ""
+msgstr "目標視窗"
 
 #. module: base
 #: model:ir.actions.todo,note:base.config_wizard_simple_view
@@ -106,11 +106,16 @@ msgid ""
 "understand. You will be able to switch to the extended view later.\n"
 "            "
 msgstr ""
+"請在「簡化界面」和擴展界面之間選擇。\n"
+"如果您是第一次測試或使用 OpenERP，我們建議您使用簡化界面，\n"
+"它的選項和欄位更少更容易理解。\n"
+"以後您可以切換到擴展視圖方式。\n"
+"            "
 
 #. module: base
 #: field:ir.rule,operand:0
 msgid "Operand"
-msgstr ""
+msgstr "運算元素"
 
 #. module: base
 #: model:res.country,name:base.kr
@@ -122,7 +127,7 @@ msgstr ""
 #: model:ir.ui.menu,name:base.menu_workflow_transition
 #: view:workflow.activity:0
 msgid "Transitions"
-msgstr ""
+msgstr "轉換"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_ui_view_custom
@@ -159,7 +164,7 @@ msgstr "编号增量"
 #: model:ir.actions.act_window,name:base.action_res_company_tree
 #: model:ir.ui.menu,name:base.menu_action_res_company_tree
 msgid "Company's Structure"
-msgstr ""
+msgstr "公司結構"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_report_custom_fields
@@ -186,17 +191,17 @@ msgstr ""
 #: field:ir.actions.report.custom,multi:0
 #: field:ir.actions.report.xml,multi:0
 msgid "On multiple doc."
-msgstr ""
+msgstr "作用於多個文檔。"
 
 #. module: base
 #: field:ir.module.category,module_nr:0
 msgid "Number of Modules"
-msgstr ""
+msgstr "模組數"
 
 #. module: base
 #: field:res.partner.bank.type.field,size:0
 msgid "Max. Size"
-msgstr ""
+msgstr "最大尺寸"
 
 #. module: base
 #: field:res.partner.address,name:0
@@ -209,7 +214,7 @@ msgstr "联系人名称"
 msgid ""
 "Save this document to a %s file and edit it with a specific software or a "
 "text editor. The file encoding is UTF-8."
-msgstr ""
+msgstr "把此檔案保存為%s檔案之後可以用編輯器或對應的軟體修改它. 該檔案的格式是 UTF-8."
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -220,28 +225,28 @@ msgstr ""
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
 msgid "Password mismatch !"
-msgstr ""
+msgstr "密碼錯誤 !"
 
 #. module: base
 #: code:addons/base/module/module.py:0
 #, python-format
 msgid "This url '%s' must provide an html file with links to zip modules"
-msgstr ""
+msgstr "這個URL '%s' 必須提供一個連結到zip模組的HTML檔案"
 
 #. module: base
 #: selection:res.request,state:0
 msgid "active"
-msgstr ""
+msgstr "啟用"
 
 #. module: base
 #: field:ir.actions.wizard,wiz_name:0
 msgid "Wizard Name"
-msgstr ""
+msgstr "嚮導名稱"
 
 #. module: base
 #: view:res.lang:0
 msgid "%y - Year without century as a decimal number [00,99]."
-msgstr ""
+msgstr "%y - 不包含世紀的十進制年份數 [00,99]。"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -251,34 +256,34 @@ msgstr ""
 #. module: base
 #: help:ir.rule.group,rules:0
 msgid "The rule is satisfied if at least one test is True"
-msgstr ""
+msgstr "只要一個條件判斷為真，該規則即滿足"
 
 #. module: base
 #: selection:ir.report.custom.fields,operation:0
 msgid "Get Max"
-msgstr ""
+msgstr "獲取最大值"
 
 #. module: base
 #: help:ir.actions.act_window,limit:0
 msgid "Default limit for the list view"
-msgstr ""
+msgstr "列表視圖的預設數目限制"
 
 #. module: base
 #: field:ir.model.data,date_update:0
 msgid "Update Date"
-msgstr ""
+msgstr "更新日期"
 
 #. module: base
 #: field:ir.actions.act_window,src_model:0
 msgid "Source Object"
-msgstr ""
+msgstr "來源對象"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.act_ir_actions_todo_form
 #: view:ir.actions.todo:0
 #: model:ir.ui.menu,name:base.menu_ir_actions_todo_form
 msgid "Config Wizard Steps"
-msgstr ""
+msgstr "配置嚮導步驟"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_ui_view_sc
@@ -289,7 +294,7 @@ msgstr ""
 #: field:ir.model.access,group_id:0
 #: field:ir.rule,rule_group:0
 msgid "Group"
-msgstr ""
+msgstr "群組"
 
 #. module: base
 #: field:ir.exports.line,name:0
@@ -302,7 +307,7 @@ msgstr "名称字段"
 #: model:ir.actions.act_window,name:base.open_module_tree_uninstall
 #: model:ir.ui.menu,name:base.menu_module_tree_uninstall
 msgid "Uninstalled modules"
-msgstr ""
+msgstr "未安裝的模組"
 
 #. module: base
 #: selection:ir.actions.report.xml,report_type:0
@@ -313,12 +318,12 @@ msgstr ""
 #: wizard_view:server.action.create,init:0
 #: wizard_field:server.action.create,init,type:0
 msgid "Select Action Type"
-msgstr ""
+msgstr "選擇動作類型"
 
 #. module: base
 #: selection:ir.actions.todo,type:0
 msgid "Configure"
-msgstr ""
+msgstr "組態"
 
 #. module: base
 #: model:res.country,name:base.tv
@@ -329,18 +334,18 @@ msgstr ""
 #: selection:ir.model,state:0
 #: selection:ir.model.grid,state:0
 msgid "Custom Object"
-msgstr ""
+msgstr "自定義對象"
 
 #. module: base
 #: field:res.lang,date_format:0
 msgid "Date Format"
-msgstr ""
+msgstr "日期格式"
 
 #. module: base
 #: field:res.bank,email:0
 #: field:res.partner.address,email:0
 msgid "E-Mail"
-msgstr ""
+msgstr "電子郵件"
 
 #. module: base
 #: model:res.country,name:base.an
@@ -353,7 +358,7 @@ msgstr ""
 msgid ""
 "You can not remove the admin user as it is used internally for resources "
 "created by OpenERP (updates, module installation, ...)"
-msgstr ""
+msgstr "您無法移除admin帳號,它必須要操作內部資源!例如升級,模組安裝,...等"
 
 #. module: base
 #: model:res.country,name:base.gf
@@ -363,7 +368,7 @@ msgstr ""
 #. module: base
 #: field:ir.ui.view.custom,ref_id:0
 msgid "Original View"
-msgstr ""
+msgstr "原始視圖"
 
 #. module: base
 #: selection:module.lang.install,init,lang:0
@@ -375,12 +380,12 @@ msgstr ""
 msgid ""
 "If you check this, then the second time the user prints with same attachment "
 "name, it returns the previous report."
-msgstr ""
+msgstr "如果您選中此處，當下次用戶使用相同的附件名稱列印時將返回以前的報表。"
 
 #. module: base
 #: help:res.lang,iso_code:0
 msgid "This ISO code is the name of po files to use for translations"
-msgstr ""
+msgstr "ISO代碼即為 po 翻譯檔的名稱"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -418,6 +423,8 @@ msgid ""
 "The ISO country code in two chars.\n"
 "You can use this field for quick search."
 msgstr ""
+"ISO 國家代碼使用兩個字符。\n"
+"您可以使用該欄位來快速搜索。"
 
 #. module: base
 #: selection:workflow.activity,join_mode:0
@@ -428,13 +435,13 @@ msgstr ""
 #. module: base
 #: view:res.partner:0
 msgid "Sales & Purchases"
-msgstr ""
+msgstr "銷售&採購"
 
 #. module: base
 #: view:ir.actions.wizard:0
 #: field:wizard.ir.model.menu.create.line,wizard_id:0
 msgid "Wizard"
-msgstr ""
+msgstr "嚮導"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -446,38 +453,38 @@ msgstr ""
 #: view:ir.actions.wizard:0
 #: model:ir.ui.menu,name:base.menu_ir_action_wizard
 msgid "Wizards"
-msgstr ""
+msgstr "嚮導"
 
 #. module: base
 #: selection:res.config.view,view:0
 msgid "Extended Interface"
-msgstr ""
+msgstr "擴展界面"
 
 #. module: base
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
 msgid "Custom fields must have a name that starts with 'x_' !"
-msgstr ""
+msgstr "自製的欄位名稱開頭必須是 'x_' !"
 
 #. module: base
 #: help:ir.actions.server,action_id:0
 msgid "Select the Action Window, Report, Wizard to be executed."
-msgstr ""
+msgstr "選擇要執行的動作視窗、報表或嚮導。"
 
 #. module: base
 #: view:wizard.module.lang.export:0
 msgid "Export done"
-msgstr ""
+msgstr "匯出完成"
 
 #. module: base
 #: view:ir.model:0
 msgid "Model Description"
-msgstr ""
+msgstr "區域說明"
 
 #. module: base
 #: field:workflow.transition,trigger_expr_id:0
 msgid "Trigger Expression"
-msgstr ""
+msgstr "觸發器表達式"
 
 #. module: base
 #: model:res.country,name:base.jo
@@ -488,7 +495,7 @@ msgstr ""
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
 msgid "You can not remove the model '%s' !"
-msgstr ""
+msgstr "您無法移除 '%s' 這個區域"
 
 #. module: base
 #: model:res.country,name:base.er
@@ -498,7 +505,7 @@ msgstr ""
 #. module: base
 #: view:res.config.view:0
 msgid "Configure simple view"
-msgstr ""
+msgstr "配置為簡單視圖"
 
 #. module: base
 #: selection:module.lang.install,init,lang:0
@@ -514,12 +521,12 @@ msgstr ""
 #: model:ir.actions.act_window,name:base.action_report_custom
 #: view:ir.report.custom:0
 msgid "Custom Report"
-msgstr ""
+msgstr "自定義報表"
 
 #. module: base
 #: selection:ir.report.custom,type:0
 msgid "Bar Chart"
-msgstr ""
+msgstr "柱狀圖表"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -539,7 +546,7 @@ msgstr ""
 #. module: base
 #: selection:ir.translation,type:0
 msgid "Wizard View"
-msgstr ""
+msgstr "嚮導視圖"
 
 #. module: base
 #: model:res.country,name:base.kh
@@ -552,7 +559,7 @@ msgstr ""
 #: model:ir.ui.menu,name:base.menu_ir_sequence_form
 #: model:ir.ui.menu,name:base.next_id_5
 msgid "Sequences"
-msgstr ""
+msgstr "序列"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -588,7 +595,7 @@ msgstr ""
 #: wizard_view:module.upgrade,end:0
 #: wizard_view:module.upgrade,start:0
 msgid "You may have to reinstall some language pack."
-msgstr ""
+msgstr "你可能需要重新安裝一些語言包"
 
 #. module: base
 #: field:res.partner.address,mobile:0
@@ -604,7 +611,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:base.action_payterm_form
 #: model:ir.model,name:base.model_res_payterm
 msgid "Payment term"
-msgstr ""
+msgstr "付款條件"
 
 #. module: base
 #: model:res.country,name:base.nu
@@ -614,18 +621,18 @@ msgstr ""
 #. module: base
 #: selection:ir.cron,interval_type:0
 msgid "Work Days"
-msgstr ""
+msgstr "工作日"
 
 #. module: base
 #: help:ir.values,action_id:0
 msgid "This field is not used, it only helps you to select the right action."
-msgstr ""
+msgstr "該欄位並未使用，只是為了幫您選擇正確的動作。"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.act_menu_create
 #: view:wizard.ir.model.menu.create:0
 msgid "Create Menu"
-msgstr ""
+msgstr "建立選單"
 
 #. module: base
 #: model:res.country,name:base.in
@@ -635,7 +642,7 @@ msgstr ""
 #. module: base
 #: model:ir.model,name:base.model_maintenance_contract_module
 msgid "maintenance contract modules"
-msgstr ""
+msgstr "維護合約模組"
 
 #. module: base
 #: view:ir.values:0
@@ -651,12 +658,12 @@ msgstr ""
 #: field:ir.module.category,child_ids:0
 #: field:res.partner.category,child_ids:0
 msgid "Child Categories"
-msgstr ""
+msgstr "子類別"
 
 #. module: base
 #: selection:wizard.module.lang.export,format:0
 msgid "TGZ Archive"
-msgstr ""
+msgstr "TGZ 壓縮包"
 
 #. module: base
 #: field:res.partner.som,factor:0
@@ -666,7 +673,7 @@ msgstr "因素"
 #. module: base
 #: view:res.lang:0
 msgid "%B - Full month name."
-msgstr ""
+msgstr "%B——月份全稱"
 
 #. module: base
 #: field:ir.actions.report.xml,report_type:0
@@ -676,22 +683,22 @@ msgstr ""
 #: field:ir.values,key:0
 #: view:res.partner:0
 msgid "Type"
-msgstr ""
+msgstr "類型"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_FILE"
-msgstr ""
+msgstr "STOCK_FILE"
 
 #. module: base
 #: model:res.country,name:base.gu
 msgid "Guam (USA)"
-msgstr ""
+msgstr "關島（Guam (USA)）"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_model_grid
 msgid "Objects Security Grid"
-msgstr ""
+msgstr "對象安全配置參照表"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -707,12 +714,12 @@ msgstr ""
 #: selection:ir.actions.server,state:0
 #: selection:workflow.activity,kind:0
 msgid "Dummy"
-msgstr ""
+msgstr "虛假"
 
 #. module: base
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "無效的XML視圖結構!"
 
 #. module: base
 #: model:res.country,name:base.ky
@@ -777,7 +784,7 @@ msgid ""
 "%W - Week number of the year (Monday as the first day of the week) as a "
 "decimal number [00,53]. All days in a new year preceding the first Monday "
 "are considered to be in week 0."
-msgstr ""
+msgstr "%W - 一年中的周數（週一為一周的開始）[00,53]。在新年的第一個星期一前的所有天數將歸入周0."
 
 #. module: base
 #: field:res.partner.event,planned_cost:0
@@ -793,7 +800,7 @@ msgstr ""
 #: field:ir.module.module,website:0
 #: field:res.partner,website:0
 msgid "Website"
-msgstr ""
+msgstr "網站"
 
 #. module: base
 #: field:ir.rule.group,rules:0
@@ -803,7 +810,7 @@ msgstr ""
 #. module: base
 #: view:ir.module.repository:0
 msgid "Repository"
-msgstr ""
+msgstr "模組庫"
 
 #. module: base
 #: model:res.country,name:base.gs
@@ -813,7 +820,7 @@ msgstr ""
 #. module: base
 #: field:ir.actions.url,url:0
 msgid "Action URL"
-msgstr ""
+msgstr "動作 URL"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -838,18 +845,18 @@ msgstr ""
 #. module: base
 #: selection:ir.ui.view,type:0
 msgid "Search"
-msgstr ""
+msgstr "搜尋"
 
 #. module: base
 #: code:addons/base/ir/ir_report_custom.py:0
 #, python-format
 msgid "Pie charts need exactly two fields"
-msgstr ""
+msgstr "圓形統計圖需要2個正確的欄位值"
 
 #. module: base
 #: help:wizard.module.lang.export,lang:0
 msgid "To export a new language, do not select a language."
-msgstr ""
+msgstr "如果要匯出新語言，這裡請不要選擇語言"
 
 #. module: base
 #: model:res.country,name:base.md
@@ -859,12 +866,12 @@ msgstr ""
 #. module: base
 #: view:ir.module.module:0
 msgid "Features"
-msgstr ""
+msgstr "功能"
 
 #. module: base
 #: field:ir.report.custom,frequency:0
 msgid "Frequency"
-msgstr ""
+msgstr "頻率"
 
 #. module: base
 #: field:ir.report.custom.fields,fc0_op:0
@@ -872,12 +879,12 @@ msgstr ""
 #: field:ir.report.custom.fields,fc2_op:0
 #: field:ir.report.custom.fields,fc3_op:0
 msgid "Relation"
-msgstr ""
+msgstr "關聯"
 
 #. module: base
 #: field:ir.model.access,perm_read:0
 msgid "Read Access"
-msgstr ""
+msgstr "閱讀權限"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_exports
@@ -892,7 +899,7 @@ msgstr ""
 #. module: base
 #: view:res.users:0
 msgid "Define New Users"
-msgstr ""
+msgstr "定義新用戶"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -902,7 +909,7 @@ msgstr ""
 #. module: base
 #: selection:ir.actions.report.xml,report_type:0
 msgid "raw"
-msgstr ""
+msgstr "原始格式"
 
 #. module: base
 #: help:ir.actions.server,email:0
@@ -911,6 +918,7 @@ msgid ""
 "you select the invoice, then `object.invoice_address_id.email` is the field "
 "which gives the correct address"
 msgstr ""
+"指定用於獲取電子郵件的欄位，比如您選擇了發票，那麼「object.invoice_address_id.email」就是提供電子郵件的欄位。"
 
 #. module: base
 #: field:res.roles,name:0
@@ -920,7 +928,7 @@ msgstr "角色名称"
 #. module: base
 #: field:res.partner,user_id:0
 msgid "Dedicated Salesman"
-msgstr ""
+msgstr "業務專員"
 
 #. module: base
 #: rml:ir.module.reference:0
@@ -930,24 +938,24 @@ msgstr ""
 #. module: base
 #: field:res.payterm,name:0
 msgid "Payment Term (short name)"
-msgstr ""
+msgstr "付款條件（縮寫）"
 
 #. module: base
 #: model:ir.model,name:base.model_res_bank
 #: view:res.bank:0
 #: field:res.partner.bank,bank:0
 msgid "Bank"
-msgstr ""
+msgstr "銀行"
 
 #. module: base
 #: view:res.lang:0
 msgid "Examples"
-msgstr ""
+msgstr "範例"
 
 #. module: base
 #: field:ir.module.module,reports_by_module:0
 msgid "Reports"
-msgstr ""
+msgstr "報表"
 
 #. module: base
 #: field:workflow,on_create:0
@@ -957,7 +965,7 @@ msgstr "On创建"
 #. module: base
 #: wizard_view:base.module.import,init:0
 msgid "Please give your module .ZIP file to import."
-msgstr ""
+msgstr "請指定要匯入的模組文件"
 
 #. module: base
 #: field:ir.default,value:0
@@ -968,13 +976,13 @@ msgstr "默认价值"
 #: wizard_field:res.partner.sms_send,init,user:0
 #: field:res.users,login:0
 msgid "Login"
-msgstr ""
+msgstr "登入"
 
 #. module: base
 #: view:maintenance.contract:0
 #: field:maintenance.contract,module_ids:0
 msgid "Covered Modules"
-msgstr ""
+msgstr "涉及的模組"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -1003,7 +1011,7 @@ msgstr ""
 #. module: base
 #: wizard_button:module.module.update,init,update:0
 msgid "Check new modules"
-msgstr ""
+msgstr "檢查新模組"
 
 #. module: base
 #: model:res.country,name:base.km
@@ -1015,7 +1023,7 @@ msgstr ""
 #: view:ir.actions.server:0
 #: model:ir.ui.menu,name:base.menu_server_action
 msgid "Server Actions"
-msgstr ""
+msgstr "伺服器動作"
 
 #. module: base
 #: model:res.country,name:base.tp
@@ -1025,12 +1033,12 @@ msgstr ""
 #. module: base
 #: view:ir.rule:0
 msgid "Simple domain setup"
-msgstr ""
+msgstr "簡單域設置"
 
 #. module: base
 #: field:res.currency,accuracy:0
 msgid "Computational Accuracy"
-msgstr ""
+msgstr "計算精度"
 
 #. module: base
 #: model:res.country,name:base.kg
@@ -1045,13 +1053,13 @@ msgstr ""
 #. module: base
 #: view:ir.sequence:0
 msgid "Day: %(day)s"
-msgstr ""
+msgstr "天： %天"
 
 #. module: base
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
 msgid "You can not read this document! (%s)"
-msgstr ""
+msgstr "您無法讀取這份文件! (%s)"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -1066,7 +1074,7 @@ msgstr ""
 #. module: base
 #: help:ir.values,res_id:0
 msgid "Keep 0 if the action must appear on all resources."
-msgstr ""
+msgstr "如果該動作要顯示於所有資源上的話請保持為「0」。"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_rule
@@ -1076,7 +1084,7 @@ msgstr ""
 #. module: base
 #: selection:ir.cron,interval_type:0
 msgid "Days"
-msgstr ""
+msgstr "日"
 
 #. module: base
 #: field:ir.report.custom.fields,width:0
@@ -1105,7 +1113,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:base.ir_action_report_custom
 #: model:ir.ui.menu,name:base.menu_ir_action_report_custom
 msgid "Report Custom"
-msgstr ""
+msgstr "自定義報表"
 
 #. module: base
 #: code:addons/base/res/partner/partner.py:0
@@ -1135,12 +1143,12 @@ msgstr ""
 msgid ""
 "Specify the message. You can use the fields from the object. e.g. `Dear [[ "
 "object.partner_id.name ]]`"
-msgstr ""
+msgstr "請指定該消息。您可以使用對象的欄位，如： `親愛的 [[ object.partner_id.name ]]`"
 
 #. module: base
 #: field:ir.actions.server,trigger_name:0
 msgid "Trigger Name"
-msgstr ""
+msgstr "觸發器名稱"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_model_access
@@ -1163,18 +1171,18 @@ msgstr "源活动"
 #. module: base
 #: view:ir.sequence:0
 msgid "Legend (for prefix, suffix)"
-msgstr ""
+msgstr "圖例（前綴，後綴）"
 
 #. module: base
 #: selection:ir.server.object.lines,type:0
 msgid "Formula"
-msgstr ""
+msgstr "公式"
 
 #. module: base
 #: code:addons/base/res/res_user.py:0
 #, python-format
 msgid "Can not remove root user!"
-msgstr ""
+msgstr "無法移除root使用者"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -1194,17 +1202,17 @@ msgstr "地址类型"
 #. module: base
 #: selection:ir.actions.todo,start_on:0
 msgid "Auto"
-msgstr ""
+msgstr "自動"
 
 #. module: base
 #: view:res.request:0
 msgid "End of Request"
-msgstr ""
+msgstr "請求結束"
 
 #. module: base
 #: view:res.request:0
 msgid "References"
-msgstr ""
+msgstr "參考"
 
 #. module: base
 #: view:res.lang:0
@@ -1212,12 +1220,12 @@ msgid ""
 "%U - Week number of the year (Sunday as the first day of the week) as a "
 "decimal number [00,53]. All days in a new year preceding the first Sunday "
 "are considered to be in week 0."
-msgstr ""
+msgstr "%U - 一年中的周數（週日是每週的第一天）[00,53]。在新年的第一個星期日之前的日子歸於周0."
 
 #. module: base
 #: wizard_view:module.lang.install,init:0
 msgid "Note that this operation may take a few minutes."
-msgstr ""
+msgstr "提示：這個操作會花費一些時間"
 
 #. module: base
 #: help:ir.sequence,condition:0
@@ -1237,7 +1245,7 @@ msgstr ""
 #. module: base
 #: view:maintenance.contract.wizard:0
 msgid "Could you check your contract information ?"
-msgstr ""
+msgstr "您能否檢查一下合約訊息？"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -1248,13 +1256,13 @@ msgstr ""
 #: help:res.users,password:0
 msgid ""
 "Keep empty if you don't want the user to be able to connect on the system."
-msgstr ""
+msgstr "如果您不想讓該用戶連接到本系統的話請保持為空。"
 
 #. module: base
 #: field:ir.actions.act_window,view_mode:0
 #: field:res.config.view,view:0
 msgid "View Mode"
-msgstr ""
+msgstr "視圖模式"
 
 #. module: base
 #: selection:module.lang.install,init,lang:0
@@ -1264,7 +1272,7 @@ msgstr ""
 #. module: base
 #: field:res.company,logo:0
 msgid "Logo"
-msgstr ""
+msgstr "公司Logo"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -1279,13 +1287,13 @@ msgstr ""
 #. module: base
 #: view:ir.module.module:0
 msgid "Uninstall (beta)"
-msgstr ""
+msgstr "卸載"
 
 #. module: base
 #: selection:ir.actions.act_window,target:0
 #: selection:ir.actions.url,target:0
 msgid "New Window"
-msgstr ""
+msgstr "新視窗"
 
 #. module: base
 #: model:res.country,name:base.bs
@@ -1295,19 +1303,19 @@ msgstr ""
 #. module: base
 #: selection:res.partner.event,partner_type:0
 msgid "Commercial Prospect"
-msgstr ""
+msgstr "潛在客戶"
 
 #. module: base
 #: code:addons/base/res/partner/partner.py:0
 #, python-format
 msgid ""
 "Couldn't generate the next id because some partners have an alphabetic id !"
-msgstr ""
+msgstr "無法產生下一個ID,因為有些業務夥伴已有一個按照次序的ID"
 
 #. module: base
 #: view:ir.attachment:0
 msgid "Attachment"
-msgstr ""
+msgstr "附件"
 
 #. module: base
 #: model:res.country,name:base.ie
@@ -1317,7 +1325,7 @@ msgstr ""
 #. module: base
 #: wizard_field:module.module.update,update,update:0
 msgid "Number of modules updated"
-msgstr ""
+msgstr "已更新的模組數"
 
 #. module: base
 #: field:ir.actions.act_window,groups_id:0
@@ -1333,7 +1341,7 @@ msgstr ""
 #: view:res.users:0
 #: field:res.users,groups_id:0
 msgid "Groups"
-msgstr ""
+msgstr "群組"
 
 #. module: base
 #: constraint:res.users:0
@@ -1359,7 +1367,7 @@ msgstr ""
 #: selection:ir.module.module,state:0
 #: selection:ir.module.module.dependency,state:0
 msgid "To be removed"
-msgstr ""
+msgstr "將要移除的模組"
 
 #. module: base
 #: field:ir.values,meta:0
@@ -1371,7 +1379,7 @@ msgstr "元数据"
 msgid ""
 "This wizard will detect new terms in the application so that you can update "
 "them manually."
-msgstr ""
+msgstr "本項倒將自動偵測程式中的新的詞彙，您可在稍後手動更新這些詞彙。"
 
 #. module: base
 #: help:ir.actions.server,expression:0
@@ -1380,11 +1388,12 @@ msgid ""
 "order in Object, and you can have loop on the sales order line. Expression = "
 "`object.order_line`."
 msgstr ""
+"輸入返回列表的欄位／表達式。比如當選擇的對象是銷售訂單，那麼您可以在銷售訂單明細中使用循環，表達式：`object.order_line`。"
 
 #. module: base
 #: selection:ir.translation,type:0
 msgid "Wizard Field"
-msgstr ""
+msgstr "嚮導欄位"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -1404,7 +1413,7 @@ msgstr ""
 #. module: base
 #: selection:res.partner.address,type:0
 msgid "Invoice"
-msgstr ""
+msgstr "發票"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -1425,12 +1434,12 @@ msgstr ""
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr ""
+msgstr "對象名稱必須以「x_」開頭且不能包含任何特殊字符！"
 
 #. module: base
 #: help:ir.rule.group,global:0
 msgid "Make the rule global, otherwise it needs to be put on a group"
-msgstr ""
+msgstr "請設定全域規則,否則將會成為單一群組規則"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_menu_admin
@@ -1438,12 +1447,12 @@ msgstr ""
 #: view:ir.ui.menu:0
 #: field:ir.ui.menu,name:0
 msgid "Menu"
-msgstr ""
+msgstr "功能列表"
 
 #. module: base
 #: field:res.currency,rate:0
 msgid "Current Rate"
-msgstr ""
+msgstr "目前匯率"
 
 #. module: base
 #: selection:module.lang.install,init,lang:0
@@ -1453,7 +1462,7 @@ msgstr ""
 #. module: base
 #: view:ir.values:0
 msgid "Action To Launch"
-msgstr ""
+msgstr "要啟動的動作"
 
 #. module: base
 #: selection:ir.report.custom.fields,fc0_op:0
@@ -1462,12 +1471,12 @@ msgstr ""
 #: selection:ir.report.custom.fields,fc3_op:0
 #: selection:ir.rule,operator:0
 msgid "in"
-msgstr ""
+msgstr "包含"
 
 #. module: base
 #: field:ir.actions.url,target:0
 msgid "Action Target"
-msgstr ""
+msgstr "動作目標"
 
 #. module: base
 #: model:res.country,name:base.ai
@@ -1483,7 +1492,7 @@ msgstr ""
 #: code:addons/base/ir/ir_report_custom.py:0
 #, python-format
 msgid "Enter at least one field !"
-msgstr ""
+msgstr "輸入下一個欄位"
 
 #. module: base
 #: field:ir.ui.view_sc,name:0
@@ -1493,14 +1502,14 @@ msgstr "快捷键名称"
 #. module: base
 #: field:res.partner,credit_limit:0
 msgid "Credit Limit"
-msgstr ""
+msgstr "信用額度"
 
 #. module: base
 #: help:ir.actions.server,write_id:0
 msgid ""
 "Provide the field name that the record id refers to for the write operation. "
 "If it is empty it will refer to the active id of the object."
-msgstr ""
+msgstr "提供記錄ID所指定的欄位名稱作寫入操作，如果為空，則使用對象的活動ID"
 
 #. module: base
 #: model:res.country,name:base.zw
@@ -1510,18 +1519,18 @@ msgstr ""
 #. module: base
 #: model:ir.ui.menu,name:base.menu_translation_export
 msgid "Import / Export"
-msgstr ""
+msgstr "匯入／匯出"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_config_user_form
 #: view:res.users:0
 msgid "Configure User"
-msgstr ""
+msgstr "用戶設置"
 
 #. module: base
 #: field:ir.actions.server,email:0
 msgid "Email Address"
-msgstr ""
+msgstr "電子郵件地址"
 
 #. module: base
 #: selection:module.lang.install,init,lang:0
@@ -1532,13 +1541,13 @@ msgstr ""
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
 msgid "You can not write in this document! (%s)"
-msgstr ""
+msgstr "您無法編寫這個文件! (%s)"
 
 #. module: base
 #: view:ir.actions.server:0
 #: field:workflow.activity,action_id:0
 msgid "Server Action"
-msgstr ""
+msgstr "伺服器動作"
 
 #. module: base
 #: model:res.country,name:base.tt
@@ -1553,12 +1562,12 @@ msgstr ""
 #. module: base
 #: view:ir.values:0
 msgid "Values"
-msgstr ""
+msgstr "?"
 
 #. module: base
 #: view:ir.actions.server:0
 msgid "Field Mappings"
-msgstr ""
+msgstr "欄位地圖"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.res_request-closed
@@ -1569,7 +1578,7 @@ msgstr ""
 #. module: base
 #: model:ir.ui.menu,name:base.menu_custom
 msgid "Customization"
-msgstr ""
+msgstr "自定義"
 
 #. module: base
 #: model:res.country,name:base.py
@@ -1579,7 +1588,7 @@ msgstr ""
 #. module: base
 #: selection:ir.report.custom.fields,alignment:0
 msgid "left"
-msgstr ""
+msgstr "左對齊"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_actions_act_window_close
@@ -1589,7 +1598,7 @@ msgstr ""
 #. module: base
 #: field:ir.server.object.lines,col1:0
 msgid "Destination"
-msgstr ""
+msgstr "目標"
 
 #. module: base
 #: model:res.country,name:base.lt
@@ -1615,17 +1624,17 @@ msgstr "销售渠道"
 #. module: base
 #: view:res.lang:0
 msgid "%p - Equivalent of either AM or PM."
-msgstr ""
+msgstr "%p - 等價於 AM 或 PM"
 
 #. module: base
 #: view:ir.actions.server:0
 msgid "Iteration Actions"
-msgstr ""
+msgstr "遍歷動作"
 
 #. module: base
 #: field:maintenance.contract,date_stop:0
 msgid "Ending Date"
-msgstr ""
+msgstr "結束日期"
 
 #. module: base
 #: model:res.country,name:base.nz
@@ -1650,12 +1659,12 @@ msgstr ""
 #. module: base
 #: field:ir.rule,operator:0
 msgid "Operator"
-msgstr ""
+msgstr "操作符"
 
 #. module: base
 #: wizard_view:module.lang.install,start:0
 msgid "Installation Done"
-msgstr ""
+msgstr "安裝完成"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -1666,12 +1675,12 @@ msgstr ""
 #: field:ir.actions.server,action_id:0
 #: selection:ir.actions.server,state:0
 msgid "Client Action"
-msgstr ""
+msgstr "客戶端動作"
 
 #. module: base
 #: selection:ir.report.custom.fields,alignment:0
 msgid "right"
-msgstr ""
+msgstr "右對齊"
 
 #. module: base
 #: model:res.country,name:base.bd
@@ -1681,18 +1690,18 @@ msgstr ""
 #. module: base
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr ""
+msgstr "錯誤！您不能建立循環的公司。"
 
 #. module: base
 #: selection:maintenance.contract,state:0
 msgid "Valid"
-msgstr ""
+msgstr "有效"
 
 #. module: base
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
 msgid "You can not delete this document! (%s)"
-msgstr ""
+msgstr "您無法移除此文件! (%s)"
 
 #. module: base
 #: selection:ir.translation,type:0
@@ -1703,7 +1712,7 @@ msgstr ""
 #: code:addons/base/module/module.py:0
 #, python-format
 msgid "Can not upgrade module '%s'. It is not installed."
-msgstr ""
+msgstr "無法升級此模組 '%s'. 它並沒有安裝!"
 
 #. module: base
 #: model:res.country,name:base.cu
@@ -1713,7 +1722,7 @@ msgstr ""
 #. module: base
 #: view:res.lang:0
 msgid "%S - Second as a decimal number [00,61]."
-msgstr ""
+msgstr "%S - 十進制的秒數 [00,61]."
 
 #. module: base
 #: model:res.country,name:base.am
@@ -1728,7 +1737,7 @@ msgstr ""
 #. module: base
 #: selection:ir.report.custom,frequency:0
 msgid "Daily"
-msgstr ""
+msgstr "每日"
 
 #. module: base
 #: model:res.country,name:base.se
@@ -1740,18 +1749,18 @@ msgstr ""
 #: selection:ir.ui.view,type:0
 #: selection:wizard.ir.model.menu.create.line,view_type:0
 msgid "Gantt"
-msgstr ""
+msgstr "甘特圖"
 
 #. module: base
 #: view:ir.property:0
 msgid "Property"
-msgstr ""
+msgstr "屬性"
 
 #. module: base
 #: model:ir.model,name:base.model_res_partner_bank_type
 #: view:res.partner.bank.type:0
 msgid "Bank Account Type"
-msgstr ""
+msgstr "銀行帳戶類型"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -1761,7 +1770,7 @@ msgstr ""
 #. module: base
 #: view:ir.actions.server:0
 msgid "Iteration Action Configuration"
-msgstr ""
+msgstr "重複活動配置"
 
 #. module: base
 #: model:res.country,name:base.at
@@ -1773,22 +1782,22 @@ msgstr ""
 #: selection:ir.ui.view,type:0
 #: selection:wizard.ir.model.menu.create.line,view_type:0
 msgid "Calendar"
-msgstr ""
+msgstr "日曆"
 
 #. module: base
 #: field:workflow.activity,signal_send:0
 msgid "Signal (subflow.*)"
-msgstr ""
+msgstr "信號（subflow.*）"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_module_module_dependency
 msgid "Module dependency"
-msgstr ""
+msgstr "模組相依性"
 
 #. module: base
 #: selection:maintenance.contract.wizard,state:0
 msgid "Draft"
-msgstr ""
+msgstr "草稿"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -1798,17 +1807,17 @@ msgstr ""
 #. module: base
 #: view:res.config.view:0
 msgid "Choose Your Mode"
-msgstr ""
+msgstr "選擇您的模式"
 
 #. module: base
 #: field:res.company,rml_footer1:0
 msgid "Report Footer 1"
-msgstr ""
+msgstr "報表頁尾1"
 
 #. module: base
 #: field:res.company,rml_footer2:0
 msgid "Report Footer 2"
-msgstr ""
+msgstr "報表頁尾2"
 
 #. module: base
 #: view:ir.model.access:0
@@ -1816,13 +1825,13 @@ msgstr ""
 #: view:res.groups:0
 #: field:res.groups,model_access:0
 msgid "Access Controls"
-msgstr ""
+msgstr "權限控制"
 
 #. module: base
 #: view:ir.module.module:0
 #: field:ir.module.module,dependencies_id:0
 msgid "Dependencies"
-msgstr ""
+msgstr "相依性"
 
 #. module: base
 #: field:ir.report.custom.fields,bgcolor:0
@@ -1834,18 +1843,18 @@ msgstr "背景色"
 msgid ""
 "If you use a formula type, use a python expression using the variable "
 "'object'."
-msgstr ""
+msgstr "如果是公式類型，請在 Python 語言表達式中使用變數「object」。"
 
 #. module: base
 #: field:res.partner.address,birthdate:0
 msgid "Birthdate"
-msgstr ""
+msgstr "生日"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_partner_title_contact
 #: model:ir.ui.menu,name:base.menu_partner_title_contact
 msgid "Contact Titles"
-msgstr ""
+msgstr "聯絡人稱謂"
 
 #. module: base
 #: model:ir.model,name:base.model_res_partner_som
@@ -1860,7 +1869,7 @@ msgstr ""
 #. module: base
 #: field:ir.model.fields,select_level:0
 msgid "Searchable"
-msgstr ""
+msgstr "可搜尋"
 
 #. module: base
 #: model:res.country,name:base.uy
@@ -1885,7 +1894,7 @@ msgstr "前缀"
 #. module: base
 #: field:ir.actions.server,loop_action:0
 msgid "Loop Action"
-msgstr ""
+msgstr "循環動作"
 
 #. module: base
 #: selection:module.lang.install,init,lang:0
@@ -1895,22 +1904,22 @@ msgstr ""
 #. module: base
 #: help:ir.actions.server,trigger_name:0
 msgid "Select the Signal name that is to be used as the trigger."
-msgstr ""
+msgstr "選擇要作為觸發器的信號名稱"
 
 #. module: base
 #: view:ir.actions.server:0
 msgid "Fields Mapping"
-msgstr ""
+msgstr "欄位地圖"
 
 #. module: base
 #: model:res.partner.title,name:base.res_partner_title_sir
 msgid "Sir"
-msgstr ""
+msgstr "先生"
 
 #. module: base
 #: wizard_button:module.upgrade,next,start:0
 msgid "Start Upgrade"
-msgstr ""
+msgstr "開始升級"
 
 #. module: base
 #: field:ir.default,ref_id:0
@@ -1930,7 +1939,7 @@ msgstr ""
 #. module: base
 #: field:ir.actions.server,fields_lines:0
 msgid "Field Mappings."
-msgstr ""
+msgstr "欄位地圖"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_module_module
@@ -1939,13 +1948,13 @@ msgstr ""
 #: field:ir.module.module.dependency,module_id:0
 #: rml:ir.module.reference:0
 msgid "Module"
-msgstr ""
+msgstr "模組"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_res_bank_form
 #: model:ir.ui.menu,name:base.menu_action_res_bank_form
 msgid "Bank List"
-msgstr ""
+msgstr "銀行列表"
 
 #. module: base
 #: field:ir.attachment,description:0
@@ -1962,7 +1971,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
 #: model:ir.model,name:base.model_ir_attachment
@@ -1977,28 +1986,28 @@ msgstr "动作"
 #. module: base
 #: field:res.lang,grouping:0
 msgid "Separator Format"
-msgstr ""
+msgstr "分格格式"
 
 #. module: base
 #: view:wizard.module.lang.export:0
 msgid "Export language"
-msgstr ""
+msgstr "匯出語言"
 
 #. module: base
 #: selection:maintenance.contract.wizard,state:0
 msgid "Unvalidated"
-msgstr ""
+msgstr "未驗證"
 
 #. module: base
 #: model:ir.ui.menu,name:base.next_id_9
 msgid "Database Structure"
-msgstr ""
+msgstr "資料庫結構"
 
 #. module: base
 #: model:ir.actions.wizard,name:base.res_partner_mass_mailing_wizard
 #: wizard_view:res.partner.spam_send,init:0
 msgid "Mass Mailing"
-msgstr ""
+msgstr "海量發信"
 
 #. module: base
 #: model:res.country,name:base.yt
@@ -2008,19 +2017,19 @@ msgstr ""
 #. module: base
 #: wizard_view:module.lang.import,init:0
 msgid "You can also import .po files."
-msgstr ""
+msgstr "您也可以匯入 .po 文件。"
 
 #. module: base
 #: code:addons/base/maintenance/maintenance.py:0
 #, python-format
 msgid "Unable to find a valid contract"
-msgstr ""
+msgstr "無法找到符合的合約"
 
 #. module: base
 #: code:addons/base/ir/ir_actions.py:0
 #, python-format
 msgid "Please specify an action to launch !"
-msgstr ""
+msgstr "請指示一個執行動作!"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -2030,18 +2039,18 @@ msgstr ""
 #. module: base
 #: model:ir.model,name:base.model_res_partner_function
 msgid "Function of the contact"
-msgstr ""
+msgstr "聯絡人自定義功能"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.open_module_tree_upgrade
 #: model:ir.ui.menu,name:base.menu_module_tree_upgrade
 msgid "Modules to be installed, upgraded or removed"
-msgstr ""
+msgstr "將要安裝，升級或刪除的模組"
 
 #. module: base
 #: view:res.payterm:0
 msgid "Payment Term"
-msgstr ""
+msgstr "付款條件"
 
 #. module: base
 #: field:ir.report.custom,footer:0
@@ -2051,19 +2060,19 @@ msgstr "报告尾"
 #. module: base
 #: selection:res.lang,direction:0
 msgid "Right-to-Left"
-msgstr ""
+msgstr "從右到左"
 
 #. module: base
 #: wizard_view:module.lang.import,init:0
 msgid "Import language"
-msgstr ""
+msgstr "匯入語言"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.ir_cron_act
 #: view:ir.cron:0
 #: model:ir.ui.menu,name:base.menu_ir_cron_act
 msgid "Scheduled Actions"
-msgstr ""
+msgstr "計劃的動作"
 
 #. module: base
 #: field:res.partner,title:0
@@ -2091,20 +2100,20 @@ msgstr ""
 #. module: base
 #: view:ir.model:0
 msgid "Create a Menu"
-msgstr ""
+msgstr "建立選單"
 
 #. module: base
 #: help:res.partner,vat:0
 msgid ""
 "Value Added Tax number. Check the box if the partner is subjected to the "
 "VAT. Used by the VAT legal statement."
-msgstr ""
+msgstr "增值稅編號，如該業務夥伴適用於增值稅，請選擇。用於增值稅申報。"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_module_category_tree
 #: model:ir.ui.menu,name:base.menu_action_module_category_tree
 msgid "Categories of Modules"
-msgstr ""
+msgstr "模組分類"
 
 #. module: base
 #: selection:module.lang.install,init,lang:0
@@ -2114,7 +2123,7 @@ msgstr ""
 #. module: base
 #: selection:ir.actions.todo,state:0
 msgid "Not Started"
-msgstr ""
+msgstr "尚未開始"
 
 #. module: base
 #: model:res.country,name:base.ru
@@ -2124,7 +2133,7 @@ msgstr ""
 #. module: base
 #: field:res.company,name:0
 msgid "Company Name"
-msgstr ""
+msgstr "公司名稱"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_res_roles_form
@@ -2133,18 +2142,18 @@ msgstr ""
 #: view:res.users:0
 #: field:res.users,roles_id:0
 msgid "Roles"
-msgstr ""
+msgstr "角色"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_country
 #: model:ir.ui.menu,name:base.menu_country_partner
 msgid "Countries"
-msgstr ""
+msgstr "國家"
 
 #. module: base
 #: view:ir.rule.group:0
 msgid "Record rules"
-msgstr ""
+msgstr "記錄規則"
 
 #. module: base
 #: field:res.partner,vat:0
@@ -2154,7 +2163,7 @@ msgstr "VAT"
 #. module: base
 #: view:res.lang:0
 msgid "12. %w              ==> 5 ( Friday is the 6th day)"
-msgstr ""
+msgstr "12. %w ==> 5 ( 星期五是第六天)"
 
 #. module: base
 #: constraint:res.partner.category:0
@@ -2164,7 +2173,7 @@ msgstr ""
 #. module: base
 #: view:res.lang:0
 msgid "%x - Appropriate date representation."
-msgstr ""
+msgstr "%x - 使用日期表示"
 
 #. module: base
 #: help:ir.module.repository,filter:0
@@ -2174,11 +2183,15 @@ msgid ""
 "- The second parenthesis must match the whole version number.\n"
 "- The last parenthesis must match the extension of the module."
 msgstr ""
+"在 Web 頁上搜索模組的正則表達式：\n"
+"- 第一個括號必須配置模組名稱。\n"
+"- 第二個括號必須配置完整版本號。\n"
+"- 最後一個括號必須配置模組擴展名。"
 
 #. module: base
 #: view:res.lang:0
 msgid "%M - Minute as a decimal number [00,59]."
-msgstr ""
+msgstr "%M - 十進制的分鐘數 [00,59]."
 
 #. module: base
 #: model:res.country,name:base.tj
@@ -2189,17 +2202,17 @@ msgstr ""
 #: model:ir.actions.act_window,name:base.act_values_form_action
 #: model:ir.ui.menu,name:base.menu_values_form_action
 msgid "Connect Actions To Client Events"
-msgstr ""
+msgstr "關聯動作到客戶端事件"
 
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL-2 or later version"
-msgstr ""
+msgstr "GPL-2 或更新版本"
 
 #. module: base
 #: selection:res.partner.event,type:0
 msgid "Prospect Contact"
-msgstr ""
+msgstr "潛在客戶聯絡人"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_actions_wizard
@@ -2223,7 +2236,7 @@ msgstr ""
 #: selection:ir.ui.view,type:0
 #: selection:wizard.ir.model.menu.create.line,view_type:0
 msgid "Form"
-msgstr ""
+msgstr "表單"
 
 #. module: base
 #: model:res.country,name:base.me
@@ -2238,7 +2251,7 @@ msgstr ""
 #. module: base
 #: view:ir.cron:0
 msgid "Technical Data"
-msgstr ""
+msgstr "技術資料"
 
 #. module: base
 #: view:res.partner:0
@@ -2250,13 +2263,13 @@ msgstr "分类"
 #: model:ir.actions.wizard,name:base.res_partner_send_sms_wizard
 #: wizard_button:res.partner.sms_send,init,send:0
 msgid "Send SMS"
-msgstr ""
+msgstr "發送SMS"
 
 #. module: base
 #: selection:ir.module.module,state:0
 #: selection:ir.module.module.dependency,state:0
 msgid "To be upgraded"
-msgstr ""
+msgstr "將要升級的模組"
 
 #. module: base
 #: model:res.country,name:base.ly
@@ -2271,7 +2284,7 @@ msgstr ""
 #. module: base
 #: wizard_field:module.module.update,init,repositories:0
 msgid "Repositories"
-msgstr ""
+msgstr "模組庫"
 
 #. module: base
 #: model:res.country,name:base.cf
@@ -2286,12 +2299,12 @@ msgstr ""
 #. module: base
 #: model:res.partner.title,name:base.res_partner_title_ltd
 msgid "Ltd"
-msgstr ""
+msgstr "有限公司"
 
 #. module: base
 #: field:res.partner,ean13:0
 msgid "EAN13"
-msgstr ""
+msgstr "條碼類型（EAN13）"
 
 #. module: base
 #: model:res.country,name:base.pt
@@ -2301,12 +2314,12 @@ msgstr ""
 #. module: base
 #: selection:maintenance.contract,state:0
 msgid "Unvalid"
-msgstr ""
+msgstr "未驗證"
 
 #. module: base
 #: field:ir.module.module,certificate:0
 msgid "Quality Certificate"
-msgstr ""
+msgstr "質量證書編號"
 
 #. module: base
 #: view:res.lang:0
@@ -2316,7 +2329,7 @@ msgstr ""
 #. module: base
 #: help:res.partner,customer:0
 msgid "Check this box if the partner is a customer."
-msgstr ""
+msgstr "如果該業務夥伴是客戶的話請選擇"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.res_lang_act_window
@@ -2324,7 +2337,7 @@ msgstr ""
 #: model:ir.ui.menu,name:base.menu_res_lang_act_window
 #: view:res.lang:0
 msgid "Languages"
-msgstr ""
+msgstr "語言"
 
 #. module: base
 #: model:res.country,name:base.pw
@@ -2343,7 +2356,7 @@ msgid ""
 "Save this document to a .CSV file and open it with your favourite "
 "spreadsheet software. The file encoding is UTF-8. You have to translate the "
 "latest column before reimporting it."
-msgstr ""
+msgstr "此文件副檔名為 .CSV 檔,您可使用您喜愛的軟體將它儲存或開啟,此文件編碼為UTF-8,請在輸入前先行轉換!"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_partner_customer_form
@@ -2361,33 +2374,33 @@ msgstr ""
 msgid ""
 "If the selected language is loaded in the system, all documents related to "
 "this partner will be printed in this language. If not, it will be english."
-msgstr ""
+msgstr "如果選擇的語言被載入到系統，那麼所有與業務夥伴相關的文檔將使用該語言列印，留空則為英語。"
 
 #. module: base
 #: rml:ir.module.reference:0
 msgid "Menu :"
-msgstr ""
+msgstr "選單:"
 
 #. module: base
 #: selection:ir.model.fields,state:0
 msgid "Base Field"
-msgstr ""
+msgstr "基本欄位"
 
 #. module: base
 #: wizard_view:module.module.update,update:0
 msgid "New modules"
-msgstr ""
+msgstr "新模組"
 
 #. module: base
 #: field:ir.actions.report.xml,report_sxw_content:0
 #: field:ir.actions.report.xml,report_sxw_content_data:0
 msgid "SXW content"
-msgstr ""
+msgstr "SXW 內容"
 
 #. module: base
 #: view:ir.cron:0
 msgid "Action to Trigger"
-msgstr ""
+msgstr "待觸發動作"
 
 #. module: base
 #: field:ir.report.custom.fields,fc0_operande:0
@@ -2396,26 +2409,26 @@ msgstr ""
 #: field:ir.report.custom.fields,fc3_operande:0
 #: selection:ir.translation,type:0
 msgid "Constraint"
-msgstr ""
+msgstr "約束"
 
 #. module: base
 #: selection:ir.values,key:0
 #: selection:res.partner.address,type:0
 msgid "Default"
-msgstr ""
+msgstr "預設"
 
 #. module: base
 #: field:ir.model.fields,required:0
 #: field:res.partner.bank.type.field,required:0
 msgid "Required"
-msgstr ""
+msgstr "必填"
 
 #. module: base
 #: field:ir.model.fields,domain:0
 #: field:ir.rule,domain:0
 #: field:res.partner.title,domain:0
 msgid "Domain"
-msgstr ""
+msgstr "網域"
 
 #. module: base
 #: field:res.request.history,name:0
@@ -2427,12 +2440,12 @@ msgstr "动作结果"
 msgid ""
 "Specify the subject. You can use fields from the object, e.g. `Hello [[ "
 "object.partner_id.name ]]`"
-msgstr ""
+msgstr "請指定主題。您可以使用對象的欄位，如：「尊敬的[[ object.partner_id.name ]]，您好：」"
 
 #. module: base
 #: view:res.company:0
 msgid "Header/Footer"
-msgstr ""
+msgstr "頁首/頁尾"
 
 #. module: base
 #: model:res.country,name:base.lb
@@ -2442,7 +2455,7 @@ msgstr ""
 #. module: base
 #: wizard_field:module.lang.import,init,name:0
 msgid "Language name"
-msgstr ""
+msgstr "語言名稱"
 
 #. module: base
 #: model:res.country,name:base.va
@@ -2454,38 +2467,38 @@ msgstr ""
 msgid ""
 "Condition that is to be tested before action is executed, e.g. "
 "object.list_price > object.cost_price"
-msgstr ""
+msgstr "動作執行前所做的條件判斷，如：object.list_price > object.cost_price"
 
 #. module: base
 #: wizard_field:base.module.import,init,module_file:0
 msgid "Module .ZIP file"
-msgstr ""
+msgstr "模組 .ZIP 文件"
 
 #. module: base
 #: field:res.roles,child_id:0
 msgid "Children"
-msgstr ""
+msgstr "下級"
 
 #. module: base
 #: field:workflow.transition,trigger_model:0
 msgid "Trigger Object"
-msgstr ""
+msgstr "觸發器對象"
 
 #. module: base
 #: selection:ir.report.custom,state:0
 msgid "Subscribed"
-msgstr ""
+msgstr "已訂閱"
 
 #. module: base
 #: wizard_view:module.lang.install,init:0
 #: wizard_view:module.upgrade,next:0
 msgid "System Upgrade"
-msgstr ""
+msgstr "系統升級"
 
 #. module: base
 #: field:workflow.activity,in_transitions:0
 msgid "Incoming Transitions"
-msgstr ""
+msgstr "傳入轉換"
 
 #. module: base
 #: model:res.country,name:base.sr
@@ -2497,18 +2510,18 @@ msgstr ""
 #: view:res.partner.event.type:0
 #: field:res.partner.event.type,name:0
 msgid "Event Type"
-msgstr ""
+msgstr "活動類型"
 
 #. module: base
 #: view:res.partner.bank:0
 #: model:res.partner.bank.type,name:base.bank_normal
 msgid "Bank account"
-msgstr ""
+msgstr "銀行帳號"
 
 #. module: base
 #: view:ir.sequence.type:0
 msgid "Sequence Type"
-msgstr ""
+msgstr "序號類型"
 
 #. module: base
 #: code:addons/base/module/module.py:0
@@ -2517,22 +2530,24 @@ msgid ""
 "You try to upgrade a module that depends on the module: %s.\n"
 "But this module is not available in your system."
 msgstr ""
+"您嘗試升級依附在此模組內: %s.\n"
+"但是此模組在系統內是無效的"
 
 #. module: base
 #: view:res.partner.address:0
 msgid "Partner Address"
-msgstr ""
+msgstr "業務夥伴地址"
 
 #. module: base
 #: field:ir.module.module,license:0
 msgid "License"
-msgstr ""
+msgstr "授權許可"
 
 #. module: base
 #: code:addons/base/ir/ir_report_custom.py:0
 #, python-format
 msgid "Invalid operation"
-msgstr ""
+msgstr "無效的操作"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -2542,12 +2557,12 @@ msgstr ""
 #. module: base
 #: selection:ir.translation,type:0
 msgid "SQL Constraint"
-msgstr ""
+msgstr "SQL 限制"
 
 #. module: base
 #: field:ir.actions.server,srcmodel_id:0
 msgid "Model"
-msgstr ""
+msgstr "模型"
 
 #. module: base
 #: field:ir.actions.act_window.view,view_id:0
@@ -2555,7 +2570,7 @@ msgstr ""
 #: selection:ir.translation,type:0
 #: field:wizard.ir.model.menu.create.line,view_id:0
 msgid "View"
-msgstr ""
+msgstr "視圖"
 
 #. module: base
 #: view:ir.actions.act_window:0
@@ -2570,25 +2585,25 @@ msgstr ""
 #. module: base
 #: wizard_view:base.module.import,init:0
 msgid "Module Import"
-msgstr ""
+msgstr "模組匯入"
 
 #. module: base
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
 msgid "You can not remove the field '%s' !"
-msgstr ""
+msgstr "欄位 '%s' 不可以移除！"
 
 #. module: base
 #: field:res.bank,zip:0
 #: field:res.partner.address,zip:0
 #: field:res.partner.bank,zip:0
 msgid "Zip"
-msgstr ""
+msgstr "郵政編碼"
 
 #. module: base
 #: field:ir.module.module,author:0
 msgid "Author"
-msgstr ""
+msgstr "作者"
 
 #. module: base
 #: model:res.country,name:base.mk
@@ -2603,7 +2618,7 @@ msgstr ""
 #. module: base
 #: view:res.lang:0
 msgid "%c - Appropriate date and time representation."
-msgstr ""
+msgstr "%c - 日期時間表示"
 
 #. module: base
 #: selection:module.lang.install,init,lang:0
@@ -2623,7 +2638,7 @@ msgstr ""
 #. module: base
 #: field:res.lang,direction:0
 msgid "Direction"
-msgstr ""
+msgstr "方向"
 
 #. module: base
 #: model:ir.model,name:base.model_wizard_module_update_translations
@@ -2641,26 +2656,26 @@ msgstr ""
 #: view:wizard.ir.model.menu.create:0
 #: field:wizard.ir.model.menu.create,view_ids:0
 msgid "Views"
-msgstr ""
+msgstr "視圖"
 
 #. module: base
 #: view:res.groups:0
 #: field:res.groups,rule_groups:0
 #: field:res.users,rules_id:0
 msgid "Rules"
-msgstr ""
+msgstr "規則"
 
 #. module: base
 #: code:addons/base/module/module.py:0
 #, python-format
 msgid "You try to remove a module that is installed or will be installed"
-msgstr ""
+msgstr "您嘗試移除已安裝或將被安裝的模組"
 
 #. module: base
 #: help:ir.values,key2:0
 msgid ""
 "The kind of action or button in the client side that will trigger the action."
-msgstr ""
+msgstr "客戶端的該類動作或按鈕將觸發此動作。"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -2676,36 +2691,36 @@ msgstr ""
 #: model:ir.actions.act_window,name:base.action_workflow_form
 #: model:ir.ui.menu,name:base.menu_workflow
 msgid "Workflows"
-msgstr ""
+msgstr "工作流程"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_config_wizard_form
 #: model:ir.ui.menu,name:base.menu_config_module
 msgid "Configuration Wizard"
-msgstr ""
+msgstr "配置嚮導"
 
 #. module: base
 #: model:ir.model,name:base.model_res_roles
 msgid "res.roles"
-msgstr ""
+msgstr "角色"
 
 #. module: base
 #: help:ir.cron,priority:0
 msgid ""
 "0=Very Urgent\n"
 "10=Not urgent"
-msgstr ""
+msgstr "0=非常緊急10=不緊急"
 
 #. module: base
 #: view:res.users:0
 msgid "Skip"
-msgstr ""
+msgstr "跳過"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.res_request_link-act
 #: model:ir.ui.menu,name:base.menu_res_request_link_act
 msgid "Accepted Links in Requests"
-msgstr ""
+msgstr "已接受的請求的連結"
 
 #. module: base
 #: model:res.country,name:base.ls
@@ -2723,7 +2738,7 @@ msgid ""
 "Choose the simplified interface if you are testing OpenERP for the first "
 "time. Less used options or fields are automatically hidden. You will be able "
 "to change this, later, through the Administration menu."
-msgstr ""
+msgstr "如果您是初次使用系統建議選擇簡單模式，這樣會減少或隱藏一些設置。以後您可以通過管理Menu修改。"
 
 #. module: base
 #: model:res.country,name:base.sm
@@ -2743,7 +2758,7 @@ msgstr ""
 #. module: base
 #: selection:ir.model.fields,on_delete:0
 msgid "Set NULL"
-msgstr ""
+msgstr "設為空（NULL）"
 
 #. module: base
 #: field:res.partner.event,som:0
@@ -2759,7 +2774,7 @@ msgstr ""
 #. module: base
 #: view:ir.rule.group:0
 msgid "The rule is satisfied if all test are True (AND)"
-msgstr ""
+msgstr "如果所有測試都為真的話該規則將滿足條件（「與」運算）"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -2769,22 +2784,22 @@ msgstr ""
 #. module: base
 #: selection:ir.model.fields,select_level:0
 msgid "Not Searchable"
-msgstr ""
+msgstr "不可搜尋"
 
 #. module: base
 #: field:res.partner.event.type,key:0
 msgid "Key"
-msgstr ""
+msgstr "關鍵字"
 
 #. module: base
 #: field:ir.cron,nextcall:0
 msgid "Next Call Date"
-msgstr ""
+msgstr "下次調用時間"
 
 #. module: base
 #: field:res.company,rml_header:0
 msgid "RML Header"
-msgstr ""
+msgstr "RML 頁首"
 
 #. module: base
 #: wizard_field:res.partner.sms_send,init,app_id:0
@@ -2799,19 +2814,19 @@ msgstr ""
 #. module: base
 #: wizard_view:module.module.update,init:0
 msgid "Scan for new modules"
-msgstr ""
+msgstr "搜尋新模組"
 
 #. module: base
 #: view:ir.actions.act_window:0
 #: model:ir.ui.menu,name:base.menu_security
 msgid "Security"
-msgstr ""
+msgstr "安全設定"
 
 #. module: base
 #: code:addons/base/ir/ir_report_custom.py:0
 #, python-format
 msgid "Using a relation field which uses an unknown object"
-msgstr ""
+msgstr "使用一個關聯欄位在不知名的對象中"
 
 #. module: base
 #: model:res.country,name:base.za
@@ -2827,7 +2842,7 @@ msgstr ""
 #: selection:ir.module.module,state:0
 #: selection:ir.module.module.dependency,state:0
 msgid "Installed"
-msgstr ""
+msgstr "已安裝的模組"
 
 #. module: base
 #: model:res.country,name:base.sn
@@ -2858,7 +2873,7 @@ msgstr "下一编号"
 #: view:res.currency:0
 #: field:res.currency,rate_ids:0
 msgid "Rates"
-msgstr ""
+msgstr "匯率"
 
 #. module: base
 #: selection:module.lang.install,init,lang:0
@@ -2878,32 +2893,32 @@ msgstr ""
 #. module: base
 #: field:ir.report.custom.fields,field_child2:0
 msgid "Field child2"
-msgstr ""
+msgstr "欄位 child2"
 
 #. module: base
 #: field:ir.report.custom.fields,field_child3:0
 msgid "Field child3"
-msgstr ""
+msgstr "欄位 child3"
 
 #. module: base
 #: field:ir.report.custom.fields,field_child0:0
 msgid "Field child0"
-msgstr ""
+msgstr "欄位 child0"
 
 #. module: base
 #: field:ir.report.custom.fields,field_child1:0
 msgid "Field child1"
-msgstr ""
+msgstr "欄位 child1"
 
 #. module: base
 #: field:ir.model.fields,selection:0
 msgid "Field Selection"
-msgstr ""
+msgstr "選擇欄位"
 
 #. module: base
 #: selection:res.request,state:0
 msgid "draft"
-msgstr ""
+msgstr "草稿"
 
 #. module: base
 #: field:res.currency,date:0
@@ -2912,23 +2927,23 @@ msgstr ""
 #: field:res.partner.event,date:0
 #: field:res.request,date_sent:0
 msgid "Date"
-msgstr ""
+msgstr "日期"
 
 #. module: base
 #: field:ir.actions.report.xml,report_sxw:0
 msgid "SXW path"
-msgstr ""
+msgstr "SXW 路徑"
 
 #. module: base
 #: view:ir.attachment:0
 #: field:ir.attachment,datas:0
 msgid "Data"
-msgstr ""
+msgstr "資料"
 
 #. module: base
 #: view:res.users:0
 msgid "Groups are used to defined access rights on each screen and menu."
-msgstr ""
+msgstr "群組用於定義選單及頁面的存取權限"
 
 #. module: base
 #: field:ir.ui.menu,parent_id:0
@@ -2943,7 +2958,7 @@ msgstr "父项菜单"
 msgid ""
 "If set to true, the action will not be displayed on the right toolbar of a "
 "form view."
-msgstr ""
+msgstr "如果設為真，該動作將不會顯示表單右側的工具欄中。"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_custom_multicompany
@@ -2953,24 +2968,24 @@ msgstr ""
 #. module: base
 #: view:ir.attachment:0
 msgid "Attached To"
-msgstr ""
+msgstr "附屬於"
 
 #. module: base
 #: field:res.lang,decimal_point:0
 msgid "Decimal Separator"
-msgstr ""
+msgstr "十進位分割符"
 
 #. module: base
 #: view:res.partner:0
 #: view:res.request:0
 #: field:res.request,history:0
 msgid "History"
-msgstr ""
+msgstr "記錄"
 
 #. module: base
 #: field:ir.attachment,create_uid:0
 msgid "Creator"
-msgstr ""
+msgstr "建立者"
 
 #. module: base
 #: model:res.country,name:base.mx
@@ -2985,7 +3000,7 @@ msgstr ""
 #. module: base
 #: field:res.company,child_ids:0
 msgid "Child Companies"
-msgstr ""
+msgstr "下級公司"
 
 #. module: base
 #: model:ir.model,name:base.model_res_users
@@ -3005,19 +3020,19 @@ msgstr "一般说明"
 #. module: base
 #: selection:res.partner.event,type:0
 msgid "Sale Opportunity"
-msgstr ""
+msgstr "商機"
 
 #. module: base
 #: view:maintenance.contract.wizard:0
 msgid "Maintenance contract added !"
-msgstr ""
+msgstr "維護合約已添加！"
 
 #. module: base
 #: field:ir.rule,field_id:0
 #: selection:ir.translation,type:0
 #: field:multi_company.default,field_id:0
 msgid "Field"
-msgstr ""
+msgstr "欄位"
 
 #. module: base
 #: model:res.country,name:base.ve
@@ -3038,14 +3053,14 @@ msgstr ""
 #: model:ir.actions.act_window,name:base.ir_action_report_xml
 #: model:ir.ui.menu,name:base.menu_ir_action_report_xml
 msgid "Report Xml"
-msgstr ""
+msgstr "報表Xml"
 
 #. module: base
 #: help:res.partner,user_id:0
 msgid ""
 "The internal user that is in charge of communicating with this partner if "
 "any."
-msgstr ""
+msgstr "負責與該業務夥伴溝通的內部用戶"
 
 #. module: base
 #: field:res.partner,parent_id:0
@@ -3055,7 +3070,7 @@ msgstr ""
 #. module: base
 #: view:ir.module.module:0
 msgid "Cancel Upgrade"
-msgstr ""
+msgstr "取消升級"
 
 #. module: base
 #: model:res.country,name:base.ci
@@ -3103,17 +3118,17 @@ msgstr ""
 #. module: base
 #: model:ir.ui.menu,name:base.menu_translation_app
 msgid "Application Terms"
-msgstr ""
+msgstr "應用程式詞彙"
 
 #. module: base
 #: selection:ir.report.custom.fields,operation:0
 msgid "Calculate Average"
-msgstr ""
+msgstr "計算平均值"
 
 #. module: base
 #: field:ir.module.module,demo:0
 msgid "Demo data"
-msgstr ""
+msgstr "展示資料"
 
 #. module: base
 #: selection:module.lang.install,init,lang:0
@@ -3155,7 +3170,7 @@ msgstr "计划收入"
 msgid ""
 "You have to import a .CSV file wich is encoded in UTF-8.  Please check that "
 "the first line of your file is one of the following:"
-msgstr ""
+msgstr "您必須匯入 UTF-8 編碼的 .CSV 文件。請確保該文件的首行為："
 
 #. module: base
 #: model:res.country,name:base.et
@@ -3165,17 +3180,17 @@ msgstr ""
 #. module: base
 #: view:res.lang:0
 msgid "%H - Hour (24-hour clock) as a decimal number [00,23]."
-msgstr ""
+msgstr "%H - 十進製表示的小時數（24 小時） [00,23]."
 
 #. module: base
 #: view:res.roles:0
 msgid "Role"
-msgstr ""
+msgstr "角色"
 
 #. module: base
 #: help:res.country.state,code:0
 msgid "The state code in three chars.\n"
-msgstr ""
+msgstr "三個字符的省／州代碼\n"
 
 #. module: base
 #: model:res.country,name:base.sj
@@ -3185,12 +3200,12 @@ msgstr ""
 #. module: base
 #: view:ir.rule:0
 msgid "Test"
-msgstr ""
+msgstr "測試"
 
 #. module: base
 #: field:ir.report.custom.fields,groupby:0
 msgid "Group By"
-msgstr ""
+msgstr "分組方式"
 
 #. module: base
 #: code:addons/base/ir/ir_model.py:0
@@ -3213,7 +3228,7 @@ msgstr ""
 #. module: base
 #: selection:res.request,state:0
 msgid "closed"
-msgstr ""
+msgstr "已結束"
 
 #. module: base
 #: selection:wizard.module.lang.export,state:0
@@ -3223,7 +3238,7 @@ msgstr ""
 #. module: base
 #: help:ir.model.fields,on_delete:0
 msgid "On delete property for many2one fields"
-msgstr ""
+msgstr "多對一（many2one）欄位的 on delete 屬性"
 
 #. module: base
 #: field:ir.actions.server,write_id:0
diff --git a/bin/addons/base/ir/ir.xml b/bin/addons/base/ir/ir.xml
index f84a0868709..f5422607d3f 100644
--- a/bin/addons/base/ir/ir.xml
+++ b/bin/addons/base/ir/ir.xml
@@ -606,8 +606,20 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Role">
-                    <field colspan="4" name="name" select="1"/>
-                    <field colspan="4" name="parent_id"/>
+                    <field name="name" select="1"/>
+                    <field name="parent_id"/>
+                    <separator string="Description" colspan="4"/>
+                    <field name="description" nolabel="1" colspan="4"/>
+                    <separator string="Workflow transitions" colspan="4"/>
+                     <field name="workflow_transition_ids" nolabel="1" colspan="4">
+                        <tree string="Workflow transitions">
+                            <field name="wkf_id"/>
+                            <field name="act_from"/>
+                            <field name="act_to"/>
+                            <field name="signal"/>
+                            <field name="condition"/>
+                        </tree>
+                     </field>
                 </form>
             </field>
         </record>
@@ -619,6 +631,8 @@
             <field name="arch" type="xml">
                 <tree string="Roles">
                     <field name="name"/>
+                    <field name="parent_id"/>
+                    <field name="description"/>
                 </tree>
             </field>
         </record>
diff --git a/bin/addons/base/ir/workflow/workflow.py b/bin/addons/base/ir/workflow/workflow.py
index 7518700a3c3..dae77781503 100644
--- a/bin/addons/base/ir/workflow/workflow.py
+++ b/bin/addons/base/ir/workflow/workflow.py
@@ -151,6 +151,7 @@ class wkf_transition(osv.osv):
         'condition': fields.char('Condition', required=True, size=128),
         'act_from': fields.many2one('workflow.activity', 'Source Activity', required=True, select=True, ondelete='cascade'),
         'act_to': fields.many2one('workflow.activity', 'Destination Activity', required=True, select=True, ondelete='cascade'),
+        'wkf_id': fields.related('act_from','wkf_id', type='many2one', relation='workflow', string='Workflow', select=True),
     }
     _defaults = {
         'condition': lambda *a: 'True',
diff --git a/bin/addons/base/module/wizard/wizard_import_lang.py b/bin/addons/base/module/wizard/wizard_import_lang.py
index 70f94a68f98..471c02e8f9f 100644
--- a/bin/addons/base/module/wizard/wizard_import_lang.py
+++ b/bin/addons/base/module/wizard/wizard_import_lang.py
@@ -33,7 +33,7 @@ view_form="""<?xml version="1.0"?>
         <field name="name" width="200"/>
         <field name="code"/>
         <field name="data" colspan="4"/>
-        <label string="You have to import a .CSV file wich is encoded in UTF-8.\n
+        <label string="You have to import a .CSV file which is encoded in UTF-8.\n
 Please check that the first line of your file is one of the following:" colspan="4" align="0.0"/>
         <label string="type,name,res_id,src,value" colspan="4"/>
         <label string="module,type,name,res_id,src,value" colspan="4"/>
diff --git a/bin/addons/base/res/partner/partner_view.xml b/bin/addons/base/res/partner/partner_view.xml
index f66e114b920..2a47ba471a0 100644
--- a/bin/addons/base/res/partner/partner_view.xml
+++ b/bin/addons/base/res/partner/partner_view.xml
@@ -396,6 +396,7 @@
             <field name="domain">[]</field>
             <field name="context">{'default_customer':0, 'search_default_supplier': 1, 'default_supplier':1}</field>
             <field name="filter" eval="True"/>
+            <field name="help">With the Suppliers menu, you have access to all informations regarding your suppliers, including an history to track event (crm) and his accounting properties.</field>
         </record>
 
         <record id="action_partner_employee_form" model="ir.actions.act_window">
diff --git a/bin/addons/base/res/res_company.py b/bin/addons/base/res/res_company.py
index d061da86f9d..bbc1c78af2b 100644
--- a/bin/addons/base/res/res_company.py
+++ b/bin/addons/base/res/res_company.py
@@ -42,7 +42,7 @@ class multi_company_default(osv.osv):
         'company_dest_id': fields.many2one('res.company', 'Default Company', required=True,
             help='Company to store the current record'),
         'object_id': fields.many2one('ir.model', 'Object', required=True,
-            help='Object affect by this rules'),
+            help='Object affected by this rule'),
         'expression': fields.char('Expression', size=256, required=True,
             help='Expression, must be True to match\nuse context.get or user (browse)'),
         'field_id': fields.many2one('ir.model.fields', 'Field', help='Select field property'),
@@ -162,9 +162,17 @@ class res_company(osv.osv):
     def cache_restart(self, cr):
         self._get_company_children.clear_cache(cr.dbname)
 
-    def create(self, cr, *args, **argv):
+    def create(self, cr, uid, vals, context=None):
+        if not vals.get('name', False) or vals.get('partner_id', False):
+            self.cache_restart(cr)
+            return super(res_company, self).create(cr, uid, vals, context=context)
+        obj_partner = self.pool.get('res.partner')
+        partner_id = obj_partner.create(cr, uid, {'name': vals['name']}, context=context)
+        vals.update({'partner_id': partner_id})
         self.cache_restart(cr)
-        return super(res_company, self).create(cr, *args, **argv)
+        company_id = super(res_company, self).create(cr, uid, vals, context=context)
+        obj_partner.write(cr, uid, partner_id, {'company_id': company_id}, context=context)
+        return company_id
 
     def write(self, cr, *args, **argv):
         self.cache_restart(cr)
diff --git a/bin/addons/base/res/res_security.xml b/bin/addons/base/res/res_security.xml
index 99584de3103..f2ff90a804a 100644
--- a/bin/addons/base/res/res_security.xml
+++ b/bin/addons/base/res/res_security.xml
@@ -10,5 +10,24 @@
         <field eval="[(6,0,[ref('group_system'), ref('group_partner_manager')])]" name="groups_id"/>
     </record>
 
+
+    <!-- Record Rule For Company -->
+    
+    <record id="res_company_rule" model="ir.rule">
+        <field name="name">company rule</field>
+        <field model="ir.model" name="model_id" ref="model_res_company"/>
+        <field eval="True" name="global"/>
+        <field name="domain_force">['|',('user_ids','=',user.id),('parent_id','=',user.company_id.id)]</field>
+    </record>
+
+    <!-- Record Rule For User -->
+    <record id="res_users_rule" model="ir.rule">
+        <field name="name">user rule</field>
+        <field model="ir.model" name="model_id" ref="model_res_users"/>
+        <field eval="True" name="global"/>
+        <field name="domain_force">['|',('company_id','=',user.company_id.id),('company_id','child_of',[user.company_id.id])]</field>
+    </record>
+
+
 </data>
 </openerp>
diff --git a/bin/addons/base/res/res_user.py b/bin/addons/base/res/res_user.py
index 59351b80d71..99e75fd7ec3 100644
--- a/bin/addons/base/res/res_user.py
+++ b/bin/addons/base/res/res_user.py
@@ -93,13 +93,19 @@ class roles(osv.osv):
     _name = "res.roles"
     _columns = {
         'name': fields.char('Role Name', size=64, required=True),
-        'parent_id': fields.many2one('res.roles', 'Parent', select=True),
+        'parent_id': fields.many2one('res.roles', 'Parent', select=True,
+            help="The parent role can be used to construct a hierarchy of roles. Parent roles inherit from the roles of their descendants."),
         'child_id': fields.one2many('res.roles', 'parent_id', 'Children'),
         'users': fields.many2many('res.users', 'res_roles_users_rel', 'rid', 'uid', 'Users'),
-    }
-    _defaults = {
+        'description': fields.text('Description', help="Description of this role and where it is relevant in workflows and processes"),
+        'workflow_transition_ids': fields.one2many('workflow.transition', 'role_id', 'Workflow Transitions',
+            help="The workflow transitions associated with this role"),
     }
     def check(self, cr, uid, ids, role_id):
+        """Verifies that the role with id ``role_id`` is granted directly or indirectly to a
+           user that possesses the roles with ids ``ids``. Indirectly means that one of the
+           roles with id in ``ids`` is an ancestor role of the role with id ``role_id``.
+        """
         if role_id in ids:
             return True
         cr.execute('select parent_id from res_roles where id=%s', (role_id,))
diff --git a/bin/netsvc.py b/bin/netsvc.py
index 3b77f3b1cf2..6a4badd2711 100644
--- a/bin/netsvc.py
+++ b/bin/netsvc.py
@@ -103,10 +103,12 @@ class ExportService(object):
     
     _services = {}
     _groups = {}
+    _logger = logging.getLogger('web-services')
     
     def __init__(self, name, audience=''):
         ExportService._services[name] = self
         self.__name = name
+        self._logger.info("Exported service registered: %s" % name)
 
     def joinGroup(self, name):
         ExportService._groups.setdefault(name, {})[self.__name] = self
diff --git a/bin/osv/expression.py b/bin/osv/expression.py
index 322ee3cd18d..f251f0bc444 100644
--- a/bin/osv/expression.py
+++ b/bin/osv/expression.py
@@ -115,6 +115,7 @@ class expression(object):
             if self._is_operator(e) or e == self.__DUMMY_LEAF:
                 continue
             left, operator, right = e
+            operator = operator.lower()
             working_table = table
             main_table = table
             fargs = left.split('.', 1)
@@ -278,15 +279,34 @@ class expression(object):
                         dom = _rec_get(ids2, working_table, parent=left)
                     self.__exp = self.__exp[:i] + dom + self.__exp[i+1:]
                 else:
-                    if isinstance(right, basestring): # and not isinstance(field, fields.related):
+                    def _get_expression(field_obj,cr, uid, left, right, operator, context=None):
+                        if context is None:
+                            context = {}                        
                         c = context.copy()
                         c['active_test'] = False
+                        dict_op = {'not in':'!=','in':'='}
+                        if isinstance(right,tuple):
+                            right = list(right)
+                        if (not isinstance(right,list)) and operator in ['not in','in']:
+                            operator = dict_op[operator]
                         res_ids = field_obj.name_search(cr, uid, right, [], operator, limit=None, context=c)
                         if not res_ids:
-                            self.__exp[i] = ('id','=',0)
+                           return ('id','=',0)
                         else:
                             right = map(lambda x: x[0], res_ids)
-                            self.__exp[i] = (left, 'in', right)
+                            return (left, 'in', right)
+
+                    m2o_str = False
+                    if isinstance(right, basestring): # and not isinstance(field, fields.related):
+                        m2o_str = True
+                    elif isinstance(right, list) or isinstance(right, tuple):
+                        m2o_str = True
+                        for ele in right:
+                            if not isinstance(ele, basestring): 
+                                m2o_str = False
+                                break
+                    if m2o_str:
+                        self.__exp[i] = _get_expression(field_obj,cr, uid, left, right, operator, context=context)
             else:
                 # other field type
                 # add the time part to datetime field when it's not there: