diff --git a/bin/addons/base/base_data.xml b/bin/addons/base/base_data.xml
index 710bddeb73d..c8d3e39dd22 100644
--- a/bin/addons/base/base_data.xml
+++ b/bin/addons/base/base_data.xml
@@ -1245,6 +1245,9 @@
             <test expr="currency_id.code == 'eur'.upper()"/>
             <test expr="name">Tiny sprl</test>
         </assert>
+        <record id="user_admin" model="res.users">
+            <field name="company_id" ref="main_company"/>
+        </record>    
 
     </data>
 </openerp>
diff --git a/bin/addons/base/base_update.xml b/bin/addons/base/base_update.xml
index ceceaac42ec..ad17852306e 100644
--- a/bin/addons/base/base_update.xml
+++ b/bin/addons/base/base_update.xml
@@ -76,13 +76,21 @@
             <field eval="18" name="priority"/>
             <field name="arch" type="xml">
                 <form string="Users">
-                    <field name="password" password="True" readonly="0"/>
-                    <label colspan="4" string="Please note that you will have to logout and relog if you change your password."/>
-                    <field name="company_id" widget="selection" readonly="0" domain="[('user_ids','=',uid)]"/>
-                    <field name="context_lang" completion="1" readonly="0"/>
-                    <field name="context_tz" completion="1" readonly="0" colspan="4"/>
-                    <newline/>
-                    <field colspan="4" name="signature" readonly="0"/>
+                	<notebook colspan="4">
+                		<page string="Current Activity">
+                    		<field name="company_id" widget="selection" readonly="0" domain="[('user_ids','=',uid)]"/>
+                    		<newline/>
+                    		<separator colspan="4" string="Preferences"/>
+                    	</page>
+                 		<page string="Preferences">
+                    		<field name="password" password="True" readonly="0"/>
+                    		<label colspan="4" string="Please note that you will have to logout and relog if you change your password."/>
+                    		<field name="context_lang" completion="1" readonly="0"/>
+                    		<field name="context_tz" completion="1" readonly="0" colspan="4"/>
+                    		<newline/>
+                    		<field colspan="4" name="signature" readonly="0"/>
+                  		</page>
+                    </notebook>
                 </form>
             </field>
         </record>
diff --git a/bin/addons/base/i18n/uk.po b/bin/addons/base/i18n/uk.po
index d61a025d1d3..a75f9cdb7b9 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-01-05 06:38+0000\n"
+"PO-Revision-Date: 2010-01-08 15:21+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-01-06 04:36+0000\n"
+"X-Launchpad-Export-Date: 2010-01-09 07:48+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 86f271f40a3..73e0e1fec3a 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: 2009-12-27 06:10+0000\n"
+"PO-Revision-Date: 2010-01-08 17:14+0000\n"
 "Last-Translator: Wei \"oldrev\" Li <oldrev@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: 2009-12-29 04:35+0000\n"
+"X-Launchpad-Export-Date: 2010-01-09 07:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
@@ -172,7 +172,7 @@ msgstr "ir.report.custom.fields"
 #. module: base
 #: view:res.partner:0
 msgid "Search Partner"
-msgstr ""
+msgstr "搜索业务伙伴"
 
 #. module: base
 #: code:addons/base/module/wizard/wizard_export_lang.py:0
@@ -310,7 +310,7 @@ msgstr "已卸载的模块"
 #. module: base
 #: selection:ir.actions.report.xml,report_type:0
 msgid "txt"
-msgstr ""
+msgstr "txt"
 
 #. module: base
 #: wizard_view:server.action.create,init:0
@@ -383,7 +383,7 @@ 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 ".PO 文件翻译使用的 ISO 国家代码"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -582,7 +582,7 @@ msgstr ","
 #. module: base
 #: view:res.partner:0
 msgid "My Partners"
-msgstr ""
+msgstr "我的业务伙伴列表"
 
 #. module: base
 #: model:res.country,name:base.es
@@ -733,7 +733,7 @@ msgstr "伊朗"
 #: model:ir.actions.act_window,name:base.res_request-act
 #: model:ir.ui.menu,name:base.menu_res_request_act
 msgid "My Requests"
-msgstr ""
+msgstr "我的请求列表"
 
 #. module: base
 #: field:ir.sequence,name:0
@@ -843,7 +843,7 @@ msgstr "RML"
 #. module: base
 #: selection:ir.ui.view,type:0
 msgid "Search"
-msgstr ""
+msgstr "搜索"
 
 #. module: base
 #: code:addons/base/ir/ir_report_custom.py:0
@@ -974,7 +974,7 @@ 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
@@ -991,7 +991,7 @@ msgstr "STOCK_COPY"
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
 msgid "Model %s Does not Exist !"
-msgstr ""
+msgstr "模型 %s 不存在！"
 
 #. module: base
 #: code:addons/base/module/module.py:0
@@ -1000,6 +1000,8 @@ msgid ""
 "You try to install the module '%s' that depends on the module:'%s'.\n"
 "But this module is not available in your system."
 msgstr ""
+"您试图安装模块'%s'.这模块依赖模块： %s。\n"
+"但您的系统中该模块不可用。"
 
 #. module: base
 #: model:ir.model,name:base.model_res_request_link
@@ -1119,7 +1121,7 @@ msgstr "自定义报表"
 #: code:addons/base/res/res_user.py:0
 #, python-format
 msgid " (copy)"
-msgstr ""
+msgstr " (副本)"
 
 #. module: base
 #: view:ir.sequence:0
@@ -1134,7 +1136,7 @@ msgstr "7.  %H:%M:%S      ==> 18:25:20"
 #. module: base
 #: help:res.users,company_id:0
 msgid "The company this user is currently working on."
-msgstr ""
+msgstr "该用户当前工作的公司。"
 
 #. module: base
 #: help:ir.actions.server,message:0
@@ -1280,7 +1282,7 @@ msgstr "STOCK_PROPERTIES"
 #. module: base
 #: view:res.partner.address:0
 msgid "Search Contact"
-msgstr ""
+msgstr "搜索联系人"
 
 #. module: base
 #: view:ir.module.module:0
@@ -1344,7 +1346,7 @@ msgstr "组"
 #. module: base
 #: constraint:res.users:0
 msgid "This user can not connect using this company !"
-msgstr ""
+msgstr "该用户不能使用该公司连接。"
 
 #. module: base
 #: model:res.country,name:base.bz
@@ -1455,7 +1457,7 @@ msgstr "当前汇率"
 #. module: base
 #: selection:module.lang.install,init,lang:0
 msgid "Greek / Ελληνικά"
-msgstr ""
+msgstr "希腊语 / Ελληνικά"
 
 #. module: base
 #: view:ir.values:0
@@ -1533,7 +1535,7 @@ msgstr "电子邮件地址"
 #. module: base
 #: selection:module.lang.install,init,lang:0
 msgid "French (BE) / Français (BE)"
-msgstr ""
+msgstr "法语（比利时）/ Français (BE)"
 
 #. module: base
 #: code:addons/base/ir/ir_model.py:0
@@ -1571,7 +1573,7 @@ msgstr "字段映射"
 #: model:ir.actions.act_window,name:base.res_request-closed
 #: model:ir.ui.menu,name:base.next_id_12_close
 msgid "My Closed Requests"
-msgstr ""
+msgstr "我的已关闭请求列表"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_custom
@@ -1952,7 +1954,7 @@ msgstr "模块"
 #: 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
@@ -2037,7 +2039,7 @@ msgstr "STOCK_JUSTIFY_RIGHT"
 #. 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
@@ -2360,7 +2362,7 @@ msgstr "把文件存为 .CSV 格式用您喜好的电子表格程序打开。该
 #: model:ir.actions.act_window,name:base.action_partner_customer_form
 #: view:res.partner:0
 msgid "Customers"
-msgstr ""
+msgstr "客户列表"
 
 #. module: base
 #: model:res.country,name:base.au
@@ -2553,7 +2555,7 @@ msgstr "STOCK_SAVE_AS"
 #. module: base
 #: selection:ir.translation,type:0
 msgid "SQL Constraint"
-msgstr ""
+msgstr "SQL 约束"
 
 #. module: base
 #: field:ir.actions.server,srcmodel_id:0
@@ -2964,7 +2966,7 @@ msgstr "如果设为真，该动作将不会显示表单右侧的工具栏中。
 #. module: base
 #: model:ir.ui.menu,name:base.menu_custom_multicompany
 msgid "Multi company"
-msgstr ""
+msgstr "多公司"
 
 #. module: base
 #: view:ir.attachment:0
@@ -3066,7 +3068,7 @@ msgstr "负责与该业务伙伴沟通的内部用户"
 #. module: base
 #: field:res.partner,parent_id:0
 msgid "Parent Partner"
-msgstr ""
+msgstr "上级业务伙伴"
 
 #. module: base
 #: view:ir.module.module:0
@@ -3134,7 +3136,7 @@ msgstr "示范数据"
 #. module: base
 #: selection:module.lang.install,init,lang:0
 msgid "English (UK)"
-msgstr ""
+msgstr "英语（英国）"
 
 #. module: base
 #: model:res.country,name:base.aq
@@ -3159,7 +3161,7 @@ msgstr "网页"
 #. module: base
 #: selection:module.lang.install,init,lang:0
 msgid "English (CA)"
-msgstr ""
+msgstr "英语（加拿大）"
 
 #. module: base
 #: field:res.partner.event,planned_revenue:0
@@ -3569,7 +3571,7 @@ msgstr "创建动作"
 #. module: base
 #: selection:ir.actions.report.xml,report_type:0
 msgid "HTML from HTML"
-msgstr ""
+msgstr "HTML 来自 HTML"
 
 #. module: base
 #: selection:ir.actions.report.xml,report_type:0
@@ -3874,7 +3876,7 @@ msgstr "莫桑比克"
 #: model:ir.actions.act_window,name:base.grant_menu_access
 #: model:ir.ui.menu,name:base.menu_grant_menu_access
 msgid "Manage Menus"
-msgstr ""
+msgstr "管理菜单"
 
 #. module: base
 #: field:ir.actions.server,message:0
@@ -3988,7 +3990,7 @@ msgstr "业务伙伴满意度"
 #. module: base
 #: selection:ir.ui.view,type:0
 msgid "mdx"
-msgstr ""
+msgstr "mdx"
 
 #. module: base
 #: model:res.country,name:base.bi
@@ -4028,7 +4030,7 @@ msgstr "文件格式"
 #. module: base
 #: field:res.lang,iso_code:0
 msgid "ISO code"
-msgstr ""
+msgstr "ISO 国家代码"
 
 #. module: base
 #: model:ir.model,name:base.model_res_config_view
@@ -4090,7 +4092,7 @@ msgstr "a4"
 #. module: base
 #: field:ir.actions.act_window,search_view_id:0
 msgid "Search View Ref."
-msgstr ""
+msgstr "搜索视图引用"
 
 #. module: base
 #: view:ir.rule.group:0
@@ -4282,7 +4284,7 @@ msgstr "对象字段"
 #. module: base
 #: selection:module.lang.install,init,lang:0
 msgid "French (CH) / Français (CH)"
-msgstr ""
+msgstr "法语（瑞士）/ Français (CH)"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -4356,7 +4358,7 @@ msgstr "取消卸载"
 #: view:res.partner:0
 #: view:res.partner.address:0
 msgid "Communication"
-msgstr ""
+msgstr "交流"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_server_object_lines
@@ -4575,7 +4577,7 @@ msgstr "继续"
 #. module: base
 #: selection:module.lang.install,init,lang:0
 msgid "Thai / ภาษาไทย"
-msgstr ""
+msgstr "泰国语 / ภาษาไทย"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.ir_property_form
@@ -4672,7 +4674,7 @@ msgstr "对象"
 #. module: base
 #: field:ir.model.fields,selectable:0
 msgid "Selectable"
-msgstr ""
+msgstr "可选择"
 
 #. module: base
 #: view:res.request.link:0
@@ -4861,12 +4863,12 @@ msgstr "STOCK_GO_BACK"
 #. module: base
 #: view:ir.actions.act_window:0
 msgid "General Settings"
-msgstr ""
+msgstr "常规设置"
 
 #. module: base
 #: model:ir.ui.menu,name:base.custom_shortcuts
 msgid "Custom Shortcuts"
-msgstr ""
+msgstr "自定义快捷方式"
 
 #. module: base
 #: model:res.country,name:base.dz
@@ -5331,12 +5333,12 @@ msgstr "进行中的业务伙伴事件"
 #: model:ir.ui.menu,name:base.menu_partner_function_form
 #: view:res.partner.function:0
 msgid "Contact Functions"
-msgstr ""
+msgstr "联系人职能"
 
 #. module: base
 #: view:multi_company.default:0
 msgid "Multi Company"
-msgstr ""
+msgstr "多公司"
 
 #. module: base
 #: view:ir.sequence:0
@@ -5474,7 +5476,7 @@ msgstr "GPL-3 或更新版本"
 #. module: base
 #: selection:ir.actions.report.xml,report_type:0
 msgid "HTML from HTML(Mako)"
-msgstr ""
+msgstr "HTML 到 HTML 报表（使用 Mako 模板）"
 
 #. module: base
 #: field:workflow.activity,action:0
@@ -5730,7 +5732,7 @@ msgstr "字段 %d 应该是数字"
 #: model:ir.actions.act_window,name:base.action_inventory_form
 #: model:ir.ui.menu,name:base.menu_action_inventory_form
 msgid "Default Company per Object"
-msgstr ""
+msgstr "每对象的默认公司"
 
 #. module: base
 #: view:ir.actions.configuration.wizard:0
@@ -5796,7 +5798,7 @@ msgstr "开始安装"
 #. module: base
 #: help:res.lang,code:0
 msgid "This field is used to set/get locales for user"
-msgstr ""
+msgstr "此字段用于设定或获取地区设置"
 
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_2
@@ -5978,7 +5980,7 @@ msgstr "小时 00->24: %(h24)s"
 #. module: base
 #: help:multi_company.default,field_id:0
 msgid "Select field property"
-msgstr ""
+msgstr "选择字段属性"
 
 #. module: base
 #: field:res.request.history,date_sent:0
@@ -6820,7 +6822,7 @@ msgstr "子项"
 #: view:res.users:0
 #: field:res.users,company_ids:0
 msgid "Accepted Companies"
-msgstr ""
+msgstr "已接受公司列表"
 
 #. module: base
 #: field:ir.report.custom.fields,operation:0
@@ -7021,7 +7023,7 @@ msgstr "="
 #: code:addons/base/ir/ir_report_custom.py:0
 #, python-format
 msgid "Second field should be figures"
-msgstr ""
+msgstr "第二字段应该是数字"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_model_grid_security
@@ -7105,7 +7107,7 @@ msgstr "坦桑尼亚"
 #. module: base
 #: selection:module.lang.install,init,lang:0
 msgid "Danish / Dansk"
-msgstr ""
+msgstr "丹麦语 / Dansk"
 
 #. module: base
 #: model:res.country,name:base.cx
@@ -7316,7 +7318,7 @@ msgstr "删除权限"
 #. module: base
 #: model:ir.model,name:base.model_multi_company_default
 msgid "multi_company.default"
-msgstr ""
+msgstr "multi_company.default"
 
 #. module: base
 #: selection:workflow.activity,join_mode:0
@@ -7409,7 +7411,7 @@ msgstr "自动加载视图"
 #: model:ir.actions.act_window,name:base.action_partner_supplier_form
 #: view:res.partner:0
 msgid "Suppliers"
-msgstr ""
+msgstr "供应商列表"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -7446,7 +7448,7 @@ msgstr "省/州"
 #. module: base
 #: view:multi_company.default:0
 msgid "Matching"
-msgstr ""
+msgstr "匹配"
 
 #. module: base
 #: field:ir.actions.configuration.wizard,name:0
@@ -7510,7 +7512,7 @@ msgstr "添加技术维护合同"
 #. module: base
 #: selection:module.lang.install,init,lang:0
 msgid "Vietnam / Cộng hòa xã hội chủ nghĩa Việt Nam"
-msgstr ""
+msgstr "越南 / Cộng hòa xã hội chủ nghĩa Việt Nam"
 
 #. module: base
 #: field:ir.actions.act_window,limit:0
@@ -7611,7 +7613,7 @@ msgstr "不能更新"
 #. module: base
 #: selection:module.lang.install,init,lang:0
 msgid "Klingon"
-msgstr ""
+msgstr "克林贡文"
 
 #. module: base
 #: model:res.country,name:base.sg
@@ -7668,7 +7670,7 @@ msgstr "分类名称"
 #. module: base
 #: view:ir.actions.act_window:0
 msgid "Select Groups"
-msgstr ""
+msgstr "选择组"
 
 #. module: base
 #: field:ir.sequence,weight:0
@@ -7842,7 +7844,7 @@ msgstr "塞舌尔"
 #: code:addons/base/res/res_user.py:0
 #, python-format
 msgid "You can not have two users with the same login !"
-msgstr ""
+msgstr "用户名必须唯一！"
 
 #. module: base
 #: model:res.country,name:base.sl
@@ -7882,7 +7884,7 @@ msgstr "资源对象"
 #: field:res.partner.address,function:0
 #: selection:workflow.activity,kind:0
 msgid "Function"
-msgstr "功能"
+msgstr "职能"
 
 #. module: base
 #: selection:res.partner.address,type:0
diff --git a/bin/osv/orm.py b/bin/osv/orm.py
index f1c36026c32..648e8c87989 100644
--- a/bin/osv/orm.py
+++ b/bin/osv/orm.py
@@ -1401,7 +1401,7 @@ class orm_template(object):
                 
             else:
                 xml = '<?xml version="1.0"?>' # what happens here, graph case?
-                # raise except_orm(_('Invalid Architecture!'),_("There is no view of type '%s' defined for the structure!") % view_type)
+                raise except_orm(_('Invalid Architecture!'),_("There is no view of type '%s' defined for the structure!") % view_type)
             result['arch'] = etree.fromstring(encode(xml))
             result['name'] = 'default'
             result['field_parent'] = False
diff --git a/bin/service/web_services.py b/bin/service/web_services.py
index acfe1bfd41e..85b7056aa8d 100644
--- a/bin/service/web_services.py
+++ b/bin/service/web_services.py
@@ -93,7 +93,7 @@ class db(netsvc.ExportService):
                     serv.actions[id]['progress'] = 0
                     clean = False
                     cr = sql_db.db_connect(db_name).cursor()
-                    tools.init_db(cr)
+#                    tools.init_db(cr)
                     cr.commit()
                     cr.close()
                     cr = None
diff --git a/bin/tools/misc.py b/bin/tools/misc.py
index 331649b53c7..a237ee1b603 100644
--- a/bin/tools/misc.py
+++ b/bin/tools/misc.py
@@ -1240,7 +1240,7 @@ def detect_server_timezone():
         # of timezones in windows is rarely something that is known to pytz.
         # But that's ok, it is always possible to use a config option to set
         # it explicitly.
-        sources.append((get_win32_tz(),"Windows Registry"))
+        sources.append((get_win32_timezone(),"Windows Registry"))
 
     for (value,source) in sources:
         if value: