Merge with trunk-server

bzr revid: ysa@tinyerp.com-20110104054925-mhs1vnkyqs7z6yy6
2011-01-04 11:19:25 +05:30
parent 3acdf9f9c1 ac3f37be8f
commit bf5765b3ef
3 changed files with 123 additions and 60 deletions
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-29 18:06:01+0000\n"
-"PO-Revision-Date: 2010-12-29 18:06:01+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57:13+0000\n"
+"PO-Revision-Date: 2011-01-03 16:57:13+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -280,6 +280,7 @@ msgstr ""

 #. module: base
 #: field:res.widget.user,widget_id:0
+#: field:res.widget.wizard,widgets_list:0
 msgid "Widget"
 msgstr ""

@@ -781,7 +782,7 @@ msgid "Transitions"
 msgstr ""

 #. module: base
-#: code:addons/orm.py:4018
+#: code:addons/orm.py:4020
 #, python-format
 msgid "Record #%d of %s not found, cannot copy!"
 msgstr ""
@@ -1317,8 +1318,6 @@ msgid "Not implemented search_memory method !"
 msgstr ""

 #. module: base
-#: model:ir.actions.act_window,name:base.res_log_act_window
-#: model:ir.ui.menu,name:base.menu_res_log_act_window
 #: view:res.log:0
 msgid "Logs"
 msgstr ""
@@ -1401,6 +1400,11 @@ msgstr ""
 msgid "Example: GLOBAL_RULE_1 AND GLOBAL_RULE_2 AND ( (GROUP_A_RULE_1 AND GROUP_A_RULE_2) OR (GROUP_B_RULE_1 AND GROUP_B_RULE_2) )"
 msgstr ""

+#. module: base
+#: field:change.user.password,new_password:0
+msgid "New Password"
+msgstr ""
+
 #. module: base
 #: model:ir.actions.act_window,help:base.action_ui_view
 msgid "Views allows you to personalize each view of OpenERP. You can add new fields, move fields, rename them or delete the ones that you do not need."
@@ -1695,6 +1699,11 @@ msgstr ""
 msgid "Slovenia"
 msgstr ""

+#. module: base
+#: model:res.country,name:base.pk
+msgid "Pakistan"
+msgstr ""
+
 #. module: base
 #: code:addons/orm.py:1350
 #, python-format
@@ -1763,11 +1772,6 @@ msgstr ""
 msgid "Korean (KR) / 한국어 (KR)"
 msgstr ""

-#. module: base
-#: model:res.widget,title:base.matrixise_twitter_widget
-msgid "Stéphane Wirtel's tweets"
-msgstr ""
-
 #. module: base
 #: field:ir.actions.server,action_id:0
 #: selection:ir.actions.server,state:0
@@ -1805,6 +1809,11 @@ msgstr ""
 msgid "Cuba"
 msgstr ""

+#. module: base
+#: model:res.widget,title:base.facebook_widget
+msgid "Facebook"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.am
 msgid "Armenia"
@@ -2298,6 +2307,11 @@ msgstr ""
 msgid "%x - Appropriate date representation."
 msgstr ""

+#. module: base
+#: model:ir.model,name:base.model_change_user_password
+msgid "change.user.password"
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%d - Day of the month [01,31]."
@@ -2611,6 +2625,11 @@ msgstr ""
 msgid "Trigger Object"
 msgstr ""

+#. module: base
+#: help:change.user.password,confirm_password:0
+msgid "Enter the new password again for confirmation."
+msgstr ""
+
 #. module: base
 #: view:res.users:0
 msgid "Current Activity"
@@ -3108,11 +3127,6 @@ msgstr ""
 msgid "If set to true, the action will not be displayed on the right toolbar of a form view."
 msgstr ""

-#. module: base
-#: model:res.country,name:base.al
-msgid "Albania"
-msgstr ""
-
 #. module: base
 #: view:ir.attachment:0
 msgid "Attached To"
@@ -3243,6 +3257,11 @@ msgstr ""
 msgid "%w - Weekday number [0(Sunday),6]."
 msgstr ""

+#. module: base
+#: model:ir.actions.act_window,help:base.action_partner_form
+msgid "A customer is an entity you do business with, like a company or an organization. A customer can have several contacts or addresses which are the people working for this company. You can use the history tab, to follow all transactions related to a customer: sales order, emails, opportunities, claims, etc. If you use the email gateway, the Outlook or the Thunderbird plugin, don't forget to register emails to each contact so that the gateway will automatically attach incoming emails to the right partner."
+msgstr ""
+
 #. module: base
 #: field:ir.actions.report.xml,name:0
 #: field:ir.actions.todo,name:0
@@ -3603,6 +3622,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:base.act_res_partner_event
 #: field:res.partner,events:0
 #: field:res.partner.event,name:0
+#: model:res.widget,title:base.events_widget
 msgid "Events"
 msgstr ""

@@ -3612,6 +3632,11 @@ msgstr ""
 msgid "ir.actions.url"
 msgstr ""

+#. module: base
+#: model:res.widget,title:base.currency_converter_widget
+msgid "Currency Converter"
+msgstr ""
+
 #. module: base
 #: code:addons/orm.py:156
 #, python-format
@@ -3661,6 +3686,11 @@ msgstr ""
 msgid "Workitem"
 msgstr ""

+#. module: base
+#: view:ir.actions.todo:0
+msgid "Set as Todo"
+msgstr ""
+
 #. module: base
 #: field:ir.actions.act_window.view,act_window_id:0
 #: view:ir.actions.actions:0
@@ -4006,6 +4036,11 @@ msgstr ""
 msgid "Create Access"
 msgstr ""

+#. module: base
+#: field:change.user.password,current_password:0
+msgid "Current Password"
+msgstr ""
+
 #. module: base
 #: field:res.partner.address,state_id:0
 msgid "Fed. State"
@@ -4193,6 +4228,11 @@ msgstr ""
 msgid "Widget Wizard"
 msgstr ""

+#. module: base
+#: model:ir.actions.act_window,help:base.act_ir_actions_todo_form
+msgid "The configuration wizards are used to help you configure a new instance of OpenERP. They are launched during the installation of new modules, but you can choose to restart some wizards manually from this menu."
+msgstr ""
+
 #. module: base
 #: code:addons/orm.py:1350
 #, python-format
@@ -4511,11 +4551,6 @@ msgstr ""
 msgid "Dutch / Nederlands"
 msgstr ""

-#. module: base
-#: model:res.widget,title:base.rvalyi_twitter_widget
-msgid "Raphaël Valyi's tweets"
-msgstr ""
-
 #. module: base
 #: code:addons/base/res/res_config.py:384
 #, python-format
@@ -4725,6 +4760,12 @@ msgstr ""
 msgid "Values for Event Type"
 msgstr ""

+#. module: base
+#: code:addons/base/res/res_user.py:605
+#, python-format
+msgid "The current password does not match, please double-check it."
+msgstr ""
+
 #. module: base
 #: selection:ir.model.fields,select_level:0
 msgid "Always Searchable"
@@ -4816,11 +4857,6 @@ msgstr ""
 msgid "Choose between the simplified interface and the extended one"
 msgstr ""

-#. module: base
-#: model:res.widget,title:base.odony_twitter_widget
-msgid "Olivier Dony's tweets"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.np
 msgid "Nepal"
@@ -5045,7 +5081,7 @@ msgid "Global"
 msgstr ""

 #. module: base
-#: view:res.users:0
+#: view:change.user.password:0
 msgid "You must logout and login again after changing your password."
 msgstr ""

@@ -5322,6 +5358,7 @@ msgstr ""
 #: view:base.module.update:0
 #: view:base.module.upgrade:0
 #: view:base.update.translations:0
+#: view:change.user.password:0
 #: view:partner.clear.ids:0
 #: view:partner.sms.send:0
 #: view:partner.wizard.spam:0
@@ -5350,6 +5387,11 @@ msgstr ""
 msgid "Current"
 msgstr ""

+#. module: base
+#: help:change.user.password,new_password:0
+msgid "Enter the new password."
+msgstr ""
+
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_9
 msgid "Components Supplier"
@@ -5545,6 +5587,7 @@ msgstr ""
 #: view:res.groups:0
 #: view:res.partner:0
 #: field:res.partner,comment:0
+#: model:res.widget,title:base.note_widget
 msgid "Notes"
 msgstr ""

@@ -5615,6 +5658,11 @@ msgstr ""
 msgid "Sequence Codes"
 msgstr ""

+#. module: base
+#: field:change.user.password,confirm_password:0
+msgid "Confirm Password"
+msgstr ""
+
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (CO) / Español (CO)"
@@ -5668,6 +5716,8 @@ msgstr ""

 #. module: base
 #: code:addons/base/module/wizard/base_module_import.py:67
+#: code:addons/base/res/res_user.py:594
+#: code:addons/base/res/res_user.py:605
 #, python-format
 msgid "Error !"
 msgstr ""
@@ -5776,6 +5826,12 @@ msgstr ""
 msgid "Pitcairn Island"
 msgstr ""

+#. module: base
+#: code:addons/base/res/res_user.py:594
+#, python-format
+msgid "The new and confirmation passwords do not match, please double-check them."
+msgstr ""
+
 #. module: base
 #: view:base.module.upgrade:0
 msgid "We suggest to reload the menu tab to see the new menus (Ctrl+T then Ctrl+R)."
@@ -5856,6 +5912,11 @@ msgstr ""
 msgid "Done"
 msgstr ""

+#. module: base
+#: view:change.user.password:0
+msgid "Change"
+msgstr ""
+
 #. module: base
 #: model:res.partner.title,name:base.res_partner_title_miss
 msgid "Miss"
@@ -6100,13 +6161,14 @@ msgid "Or"
 msgstr ""

 #. module: base
-#: model:res.country,name:base.pk
-msgid "Pakistan"
+#: model:ir.actions.act_window,name:base.res_log_act_window
+#: model:ir.ui.menu,name:base.menu_res_log_act_window
+msgid "Client Logs"
 msgstr ""

 #. module: base
-#: view:ir.actions.todo:0
-msgid "Set as Todo"
+#: model:res.country,name:base.al
+msgid "Albania"
 msgstr ""

 #. module: base
@@ -6381,7 +6443,7 @@ msgid "Module Update"
 msgstr ""

 #. module: base
-#: code:addons/base/module/wizard/base_module_upgrade.py:97
+#: code:addons/base/module/wizard/base_module_upgrade.py:95
 #, python-format
 msgid "Following modules are not installed or unknown: %s"
 msgstr ""
@@ -6468,6 +6530,11 @@ msgstr ""
 msgid "Integrity Error"
 msgstr ""

+#. module: base
+#: model:ir.model,name:base.model_ir_wizard_screen
+msgid "ir.wizard.screen"
+msgstr ""
+
 #. module: base
 #: code:addons/base/ir/ir_model.py:189
 #, python-format
@@ -6748,6 +6815,11 @@ msgstr ""
 msgid "Warning !"
 msgstr ""

+#. module: base
+#: model:res.widget,title:base.google_maps_widget
+msgid "Google Maps"
+msgstr ""
+
 #. module: base
 #: model:ir.ui.menu,name:base.menu_base_config
 #: model:ir.ui.menu,name:base.menu_config
@@ -6919,6 +6991,13 @@ msgstr ""
 msgid "Selection"
 msgstr ""

+#. module: base
+#: view:change.user.password:0
+#: model:ir.actions.act_window,name:base.action_view_change_password_form
+#: view:res.users:0
+msgid "Change Password"
+msgstr ""
+
 #. module: base
 #: field:res.company,rml_header1:0
 msgid "Report Header"
@@ -6980,11 +7059,6 @@ msgstr ""
 msgid "Costa Rica"
 msgstr ""

-#. module: base
-#: model:ir.actions.act_window,help:base.action_partner_supplier_form
-msgid "With the Suppliers menu, you have access to all informations regarding your suppliers, including an history to track event (crm) and his accounting properties."
-msgstr ""
-
 #. module: base
 #: view:workflow.activity:0
 msgid "Conditions"
@@ -7168,6 +7242,11 @@ msgstr ""
 msgid "Croatian / hrvatski jezik"
 msgstr ""

+#. module: base
+#: help:change.user.password,current_password:0
+msgid "Enter your current password."
+msgstr ""
+
 #. module: base
 #: field:base.language.install,overwrite:0
 msgid "Overwrite Existing Terms"
@@ -7573,11 +7652,6 @@ msgstr ""
 msgid "Field Label"
 msgstr ""

-#. module: base
-#: model:ir.actions.act_window,help:base.action_partner_form
-msgid "The Address book manages your customers list. The form for customer allows you to record detailed on your customers (address, contacts, pricelist, account, etc.). With the history tab, you can follow all moves transactions related to a customer, like sales order, claims."
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.dj
 msgid "Djibouti"
@@ -8032,11 +8106,6 @@ msgstr ""
 msgid "Phone"
 msgstr ""

-#. module: base
-#: model:res.widget,title:base.albertnan_twitter_widget
-msgid "Albert Cervera Areny's tweets"
-msgstr ""
-
 #. module: base
 #: field:ir.cron,active:0
 #: field:ir.sequence,active:0
@@ -8192,7 +8261,7 @@ msgid "View Ordering"
 msgstr ""

 #. module: base
-#: code:addons/base/module/wizard/base_module_upgrade.py:97
+#: code:addons/base/module/wizard/base_module_upgrade.py:95
 #, python-format
 msgid "Unmet dependency !"
 msgstr ""
@@ -8360,8 +8429,8 @@ msgid "Advanced Search"
 msgstr ""

 #. module: base
-#: model:ir.model,name:base.model_ir_wizard_screen
-msgid "ir.wizard.screen"
+#: model:ir.actions.act_window,help:base.action_partner_supplier_form
+msgid "You can access all information regarding your suppliers from the supplier form: accounting data, history of emails, meetings, purchases, etc. You can uncheck the 'Suppliers' filter button in order to search in all your partners, including customers and prospects."
 msgstr ""

 #. module: base
@@ -8611,11 +8680,6 @@ msgstr ""
 msgid "Seychelles"
 msgstr ""

-#. module: base
-#: model:res.widget,title:base.nhomar_twitter_widget
-msgid "Nhomar Hernandez's tweets"
-msgstr ""
-
 #. module: base
 #: model:ir.model,name:base.model_res_partner_bank
 #: view:res.partner.bank:0
@@ -82,12 +82,10 @@ class base_module_upgrade(osv.osv_memory):
        return {'module_info': '\n'.join(map(lambda x: x['name']+' : '+x['state'], res))}

    def upgrade_module(self, cr, uid, ids, context=None):
-        pool = pooler.get_pool(cr.dbname)
        mod_obj = self.pool.get('ir.module.module')
-        data_obj = self.pool.get('ir.model.data')
        ids = mod_obj.search(cr, uid, [('state', 'in', ['to upgrade', 'to remove', 'to install'])])
        unmet_packages = []
-        mod_dep_obj = pool.get('ir.module.module.dependency')
+        mod_dep_obj = self.pool.get('ir.module.module.dependency')
        for mod in mod_obj.browse(cr, uid, ids):
            depends_mod_ids = mod_dep_obj.search(cr, uid, [('module_id', '=', mod.id)])
            for dep_mod in mod_dep_obj.browse(cr, uid, depends_mod_ids):
@@ -97,8 +95,9 @@ class base_module_upgrade(osv.osv_memory):
            raise osv.except_osv(_('Unmet dependency !'), _('Following modules are not installed or unknown: %s') % ('\n\n' + '\n'.join(unmet_packages)))
        mod_obj.download(cr, uid, ids, context=context)
        cr.commit()
-        _, pool = pooler.restart_pool(cr.dbname, update_module=True)
+        _db, pool = pooler.restart_pool(cr.dbname, update_module=True)

+        data_obj = pool.get('ir.model.data')
        id2 = data_obj._get_id(cr, uid, 'base', 'view_base_module_upgrade_install')
        if id2:
            id2 = data_obj.browse(cr, uid, id2, context=context).res_id
@@ -21,7 +21,7 @@
 ##############################################################################

 name = 'openerp-server'
-version = '6.0.0-rc1'
+version = '6.0.0-rc2'
 major_version = '6.0'
 description = 'OpenERP Server'
 long_desc = '''OpenERP is a complete ERP and CRM. The main features are accounting (analytic