From 33c550f1c94088ac935964e39c94cbf8466886fd Mon Sep 17 00:00:00 2001
From: gpa <gpa@tinyerp.com>
Date: Tue, 11 Jan 2011 12:14:20 +0530
Subject: [PATCH 001/331] [IMP]partner:added suppliers menu domain

bzr revid: gpa@tinyerp.com-20110111064420-9p05fwjsizqbtubz
---
 bin/addons/base/res/partner/partner_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/addons/base/res/partner/partner_view.xml b/bin/addons/base/res/partner/partner_view.xml
index 8c949a7f410..3f225f29e49 100644
--- a/bin/addons/base/res/partner/partner_view.xml
+++ b/bin/addons/base/res/partner/partner_view.xml
@@ -394,7 +394,7 @@
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">res.partner</field>
             <field name="view_type">form</field>
-            <field name="domain">[]</field>
+            <field name="domain">[('supplier','=',1)]</field>
             <field name="context">{'default_customer':0, 'search_default_supplier': 1, 'default_supplier':1}</field>
             <field name="filter" eval="True"/>
             <field name="help">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.</field>

From 6a11b89e1729c6ac06efba1e75405e1ecd24dc8a Mon Sep 17 00:00:00 2001
From: Julien Thewys <jth@openerp.com>
Date: Wed, 9 Feb 2011 11:07:35 +0100
Subject: [PATCH 002/331] [FIX] ensures no illegitimate cli argument is
 silently discarded

This avoids an insidious behavior: when copy-pasting a command from a
Microsoft document to the cmd terminal, one might not see that a hyphen ('-')
preceding an option has been converted to a dash (u'\u2012') which is then
interpreted as a normal cli argument (i.e. not an option) and thus silently
discarded.

bzr revid: jth@openerp.com-20110209100735-jaschhlv3cfqjry5
---
 openerp/tools/config.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/openerp/tools/config.py b/openerp/tools/config.py
index 7d0b04739e4..626720a43c2 100644
--- a/openerp/tools/config.py
+++ b/openerp/tools/config.py
@@ -251,12 +251,14 @@ class configmanager(object):
         self.parse_config()
 
     def parse_config(self, args=[]):
-        opt = self.parser.parse_args(args)[0]
+        opt, args = self.parser.parse_args()
 
         def die(cond, msg):
             if cond:
-                print msg
-                sys.exit(1)
+                self.parser.error(msg)
+
+        # Ensures no illegitimate argument is silently discarded (avoids insidious "hyphen to dash" problem)
+        die(args, "unrecognized parameters were passed: '%s'" % " ".join(args))
 
         die(bool(opt.syslog) and bool(opt.logfile),
             "the syslog and logfile options are exclusive")

From 8392b4d3d08809050a1238a3f6bbd0e6b7805839 Mon Sep 17 00:00:00 2001
From: Thibault Francois <tfr@openerp.com>
Date: Thu, 24 Feb 2011 15:22:16 +0100
Subject: [PATCH 003/331] [FIX] hard code template

bzr revid: tfr@openerp.com-20110224142216-x61sd77ad269cquk
---
 addons/crm/wizard/crm_send_email.py           |  3 +-
 .../wizard/crm_forward_to_partner.py          | 56 +++++++++++--------
 2 files changed, 34 insertions(+), 25 deletions(-)

diff --git a/addons/crm/wizard/crm_send_email.py b/addons/crm/wizard/crm_send_email.py
index 3ce5942272d..8dff88296ab 100644
--- a/addons/crm/wizard/crm_send_email.py
+++ b/addons/crm/wizard/crm_send_email.py
@@ -57,7 +57,7 @@ class crm_send_new_email(osv.osv_memory):
         'body': fields.text('Message Body', required=True),
         'state': fields.selection(AVAILABLE_STATES, string='Set New State To', required=True),
         'attachment_ids' : fields.one2many('crm.send.mail.attachment', 'wizard_id'),
-        'html': fields.boolean('HTML formatting?', help="Select this if you want to send email with HTML formatting."), 
+        'html': fields.boolean('HTML formatting?', help="Select this if you want to send email with HTML formatting."),
     }
 
     def action_send(self, cr, uid, ids, context=None):
@@ -180,7 +180,6 @@ class crm_send_new_email(osv.osv_memory):
 
         user_obj = self.pool.get('res.users')
         user_mail_from = user_obj._get_email_from(cr, uid, [uid], context=context)[uid]
-
         for case in mod_obj.browse(cr, uid, res_id, context=context):
             if 'email_to' in fields:
                 res.update({'email_to': case.email_from and tools.ustr(case.email_from) or ''})
diff --git a/addons/crm_partner_assign/wizard/crm_forward_to_partner.py b/addons/crm_partner_assign/wizard/crm_forward_to_partner.py
index 7173f466148..b06881f6b60 100644
--- a/addons/crm_partner_assign/wizard/crm_forward_to_partner.py
+++ b/addons/crm_partner_assign/wizard/crm_forward_to_partner.py
@@ -44,9 +44,10 @@ class crm_lead_forward_to_partner(osv.osv_memory):
     _defaults = {
         'name' : 'email',
         'history': 'latest',
-        'email_from': lambda self, cr, uid, *a: self.pool.get('res.users')._get_email_from(cr, uid, uid)[uid]
+        'email_from': lambda self, cr, uid, *a: self.pool.get('res.users')._get_email_from(cr, uid, uid)[uid],
     }
 
+
     def get_whole_history(self, cr, uid, ids, context=None):
         """This function gets whole communication history and returns as top posting style
         @param self: The object pointer
@@ -87,7 +88,7 @@ class crm_lead_forward_to_partner(osv.osv_memory):
         @param uid: the current user’s ID for security checks,
         @param ids: List of Mail’s IDs
         @param user: Changed User id
-        @param partner: Changed Partner id  
+        @param partner: Changed Partner id
         """
         if not user:
             return {'value': {'email_to': False}}
@@ -146,7 +147,7 @@ class crm_lead_forward_to_partner(osv.osv_memory):
         @param uid: the current user’s ID for security checks,
         @param ids: List of Mail’s IDs
         @param user: Changed User id
-        @param partner: Changed Partner id  
+        @param partner: Changed Partner id
         """
         if not partner_id:
             return {'value' : {'email_to' : False, 'address_id': False}}
@@ -155,13 +156,13 @@ class crm_lead_forward_to_partner(osv.osv_memory):
         addr = partner_obj.address_get(cr, uid, [partner_id], ['contact'])
         data = {'address_id': addr['contact']}
         data.update(self.on_change_address(cr, uid, ids, addr['contact'])['value'])
-        
+
         partner = partner_obj.browse(cr, uid, [partner_id])
         user_id = partner and partner[0].user_id or False
         email = user_id and user_id.user_email or ''
         data.update({'email_cc' : email})
         return {
-            'value' : data, 
+            'value' : data,
             'domain' : {'address_id' : partner_id and "[('partner_id', '=', partner_id)]" or "[]"}
             }
 
@@ -207,7 +208,17 @@ class crm_lead_forward_to_partner(osv.osv_memory):
         return {'type': 'ir.actions.act_window_close'}
 
     def get_lead_details(self, cr, uid, lead_id, context=None):
-        body = []
+        body = ["""Hello,
+
+OpenERP Leads are now forwarded to our trusted partners, through the CRM, we hope that they provide you with interesting projects, we know that they have shown keen interest in our software.
+Below is an interesting lead for you. I have notified the lead that you would contact them.
+
+Please let us know about the advancements of this lead or if you are not able to answer to its requests by replying to this email. This way, we can keep track of closed leads or forward them to other partners.
+Don't forget to propose our maintenance at the beginning of your implementation projects, together with your services quotation. The maintenance provides unlimited bugfixing that will avoid you waste time on bugs detected during the implementation. It also provides free migration services for the current stable version at the time of signature; otherwise if we released a new version during your implementation, the customer would not always be able to easily migrate to newer versions.
+
+Kind regards, OpenERP Team
+
+            """, "\n\n"]
         lead_proxy = self.pool.get('crm.lead')
         lead = lead_proxy.browse(cr, uid, lead_id, context=context)
         if not lead.type or lead.type == 'lead' or not lead.partner_address_id:
@@ -237,22 +248,22 @@ class crm_lead_forward_to_partner(osv.osv_memory):
         elif lead.type == 'opportunity':
             pa = lead.partner_address_id
             body = [
-                "Partner: %s" % (lead.partner_id and lead.partner_id.name_get()[0][1]), 
-                "Contact: %s" % (pa.name or ''), 
-                "Title: %s" % (pa.title or ''), 
-                "Function: %s" % (pa.function or ''), 
-                "Street: %s" % (pa.street or ''), 
-                "Street2: %s" % (pa.street2 or ''), 
-                "Zip: %s" % (pa.zip or ''), 
-                "City: %s" % (pa.city or ''), 
-                "Country: %s" % (pa.country_id and pa.country_id.name_get()[0][1] or ''), 
-                "State: %s" % (pa.state_id and pa.state_id.name_get()[0][1] or ''), 
-                "Email: %s" % (pa.email or ''), 
-                "Phone: %s" % (pa.phone or ''), 
-                "Fax: %s" % (pa.fax or ''), 
-                "Mobile: %s" % (pa.mobile or ''), 
-                "Lead Category: %s" % (lead.categ_id and lead.categ_id.name or ''), 
-                "Details: %s" % (lead.description or ''), 
+                "Partner: %s" % (lead.partner_id and lead.partner_id.name_get()[0][1]),
+                "Contact: %s" % (pa.name or ''),
+                "Title: %s" % (pa.title or ''),
+                "Function: %s" % (pa.function or ''),
+                "Street: %s" % (pa.street or ''),
+                "Street2: %s" % (pa.street2 or ''),
+                "Zip: %s" % (pa.zip or ''),
+                "City: %s" % (pa.city or ''),
+                "Country: %s" % (pa.country_id and pa.country_id.name_get()[0][1] or ''),
+                "State: %s" % (pa.state_id and pa.state_id.name_get()[0][1] or ''),
+                "Email: %s" % (pa.email or ''),
+                "Phone: %s" % (pa.phone or ''),
+                "Fax: %s" % (pa.fax or ''),
+                "Mobile: %s" % (pa.mobile or ''),
+                "Lead Category: %s" % (lead.categ_id and lead.categ_id.name or ''),
+                "Details: %s" % (lead.description or ''),
             ]
         return "\n".join(body + ['---'])
 
@@ -264,7 +275,6 @@ class crm_lead_forward_to_partner(osv.osv_memory):
             context = {}
 
         defaults = super(crm_lead_forward_to_partner, self).default_get(cr, uid, fields, context=context)
-
         active_id = context.get('active_id')
         if not active_id:
             return defaults

From 739dd7000e04030896c7f63c2a16426ef14ef966 Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stephane@openerp.com>
Date: Thu, 24 Feb 2011 16:28:50 +0100
Subject: [PATCH 004/331] [IMP] We use the analytic account associated to the
 project

bzr revid: stephane@openerp.com-20110224152850-3poei06fhja3wm5w
---
 addons/project_issue_sheet/project_issue_sheet.py    | 12 +++++++++++-
 .../project_issue_sheet/project_issue_sheet_view.xml |  9 ++++++++-
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/addons/project_issue_sheet/project_issue_sheet.py b/addons/project_issue_sheet/project_issue_sheet.py
index f96ce9a4ac5..ed14fc99177 100644
--- a/addons/project_issue_sheet/project_issue_sheet.py
+++ b/addons/project_issue_sheet/project_issue_sheet.py
@@ -27,8 +27,18 @@ class project_issue(osv.osv):
     _description = 'project issue'
     _columns = {
         'timesheet_ids': fields.one2many('hr.analytic.timesheet', 'issue_id', 'Timesheets'),
-        'analytic_account_id': fields.related('project_id', 'analytic_account_id', type='many2one', relation='account.analytic.account',string='Analytic Account')
+        'analytic_account_id': fields.many2one('account.analytic.account', 'Analytic Account'), 
     }
+    
+    def on_change_project(self, cr, uid, ids, project_id, context=None):
+        if not project_id:
+            return {}
+        project = self.pool.get('project.project').browse(cr, uid, project_id, context=context)
+        account = project.analytic_account_id
+        if account:
+            return {'value' : {'analytic_account_id' : account.id}}
+        else:
+            return {}
 
 project_issue()
 
diff --git a/addons/project_issue_sheet/project_issue_sheet_view.xml b/addons/project_issue_sheet/project_issue_sheet_view.xml
index 2222ef12ea5..78950e5f749 100644
--- a/addons/project_issue_sheet/project_issue_sheet_view.xml
+++ b/addons/project_issue_sheet/project_issue_sheet_view.xml
@@ -7,9 +7,16 @@
             <field name="inherit_id" ref="project_issue.project_issue_form_view" />
             <field name="type">form</field>
             <field name="arch" type="xml">
+                <field name="project_id" position="attributes">
+                    <attribute name="on_change">on_change_project(project_id)</attribute>
+                </field>
+                <xpath expr="/form/notebook" position="before">
+                    <field name="analytic_account_id"
+                        domain="[('parent_id','!=',False),('partner_id', '=', partner_id),('type', '!=', 'view')]"
+                        groups="base.group_extended" />
+                </xpath>
                 <notebook colspan="4">
                     <page string="Worklogs">
-                        <field name="analytic_account_id" invisible="1" domain="[('parent_id','!=',False)]" groups="base.group_extended"/>
                         <field name="timesheet_ids" colspan="4" nolabel="1" context="{'default_user_id' : user_id, 'default_account_id' : analytic_account_id}">
                             <tree editable="top" string="Timesheet">
                               <field name="name"/>

From c0bee8c4e3924c33d66a20b7b47325fd8e3971e0 Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stephane@openerp.com>
Date: Thu, 24 Feb 2011 17:09:53 +0100
Subject: [PATCH 005/331] [IMP] The responsible of the project issue is the
 manager of the associated project. [IMP] There is a new domain on the
 resolution field, allow to select the project.task.type associated to the
 selected project. [IMP] The assigned_to field is the connected user, but can
 be changed by the user

bzr revid: stephane@openerp.com-20110224160953-fv9p2qhkqdseh183
---
 addons/project/project.py                   |  5 +++
 addons/project_issue/project_issue.py       |  9 +++---
 addons/project_issue/project_issue_view.xml | 35 ++++++++++-----------
 3 files changed, 27 insertions(+), 22 deletions(-)

diff --git a/addons/project/project.py b/addons/project/project.py
index bff63746d9a..d197da37709 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -26,6 +26,10 @@ from datetime import datetime, date
 from tools.translate import _
 from osv import fields, osv
 
+class project_project(osv.osv):
+    _name = 'project.project'
+    
+project_project()    
 
 class project_task_type(osv.osv):
     _name = 'project.task.type'
@@ -35,6 +39,7 @@ class project_task_type(osv.osv):
         'name': fields.char('Stage Name', required=True, size=64, translate=True),
         'description': fields.text('Description'),
         'sequence': fields.integer('Sequence'),
+        'project_ids': fields.many2many('project.project', 'project_task_type_rel', 'type_id', 'project_id', 'Projects'),
     }
 
     _defaults = {
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index aaaff37305e..b4ec852a558 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -45,7 +45,7 @@ class project_issue(crm.crm_case, osv.osv):
     _description = "Project Issue"
     _order = "priority, id desc"
     _inherit = ['mailgate.thread']
-
+    
     def case_open(self, cr, uid, ids, *args):
         """
         @param self: The object pointer
@@ -175,7 +175,7 @@ class project_issue(crm.crm_case, osv.osv):
         'section_id': fields.many2one('crm.case.section', 'Sales Team', \
                         select=True, help='Sales team to which Case belongs to.\
                              Define Responsible user and Email account for mail gateway.'),
-        'user_id': fields.many2one('res.users', 'Responsible'),
+        'user_id': fields.related('project_id', 'user_id', type='many2one', relation='res.users', store=True, select=1, string='Responsible'),
         'partner_id': fields.many2one('res.partner', 'Partner'),
         'partner_address_id': fields.many2one('res.partner.address', 'Partner Contact', \
                                  domain="[('partner_id','=',partner_id)]"),
@@ -200,7 +200,7 @@ class project_issue(crm.crm_case, osv.osv):
         'partner_name': fields.char("Employee's Name", size=64),
         'partner_mobile': fields.char('Mobile', size=32),
         'partner_phone': fields.char('Phone', size=32),
-        'type_id': fields.many2one ('project.task.type', 'Resolution'),
+        'type_id': fields.many2one ('project.task.type', 'Resolution', domain="[('project_ids', '=', project_id)]"),
         'project_id':fields.many2one('project.project', 'Project'),
         'duration': fields.float('Duration'),
         'task_id': fields.many2one('project.task', 'Task', domain="[('project_id','=',project_id)]"),
@@ -208,7 +208,7 @@ class project_issue(crm.crm_case, osv.osv):
                                 method=True, multi='day_open', type="float", store=True),
         'day_close': fields.function(_compute_day, string='Days to Close', \
                                 method=True, multi='day_close', type="float", store=True),
-        'assigned_to': fields.related('task_id', 'user_id', string = 'Assigned to', type="many2one", relation="res.users", store=True, help='This is the current user to whom the related task have been assigned'),
+        'assigned_to': fields.many2one('res.users', 'Assigned to', required=True, select=1),
         'working_hours_open': fields.function(_compute_day, string='Working Hours to Open the Issue', \
                                 method=True, multi='working_days_open', type="float", store=True),
         'working_hours_close': fields.function(_compute_day, string='Working Hours to Close the Issue', \
@@ -241,6 +241,7 @@ class project_issue(crm.crm_case, osv.osv):
         'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'crm.helpdesk', context=c),
         'priority': crm.AVAILABLE_PRIORITIES[2][0],
         'project_id':_get_project,
+        'assigned_to' : lambda obj, cr, uid, context: uid,
     }
 
     def convert_issue_task(self, cr, uid, ids, context=None):
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 23a361b0ff9..36fee3f661c 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -52,13 +52,14 @@
             <field name="arch" type="xml">
                 <form string="Issue Tracker Form">
                     <group colspan="4" col="6">
-                    <field name="name"/>
-                    <field name="project_id" required="True"/>
-                    <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'project.issue')]"/>
-                    <field name="user_id"/>
-                    <field name="assigned_to" />
+                        <field name="name"/>
+                        <field name="project_id" required="True"/>
+                        <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'project.issue')]"/>
+                        <field name="user_id" invisible="1" />
+                        <field name="assigned_to"/>
+                        <field name="version_id" colspan="2" widget="selection"/>
                         <group colspan="2" col="4">
-                            <field name="type_id" readonly="1"/>
+                            <field name="type_id" string="Resolution" />
                             <button name="prev_type" string="Previous" type="object" icon="gtk-go-back" help="Change to Previous Stage"/>
                             <button name="next_type" string="Next" type="object" icon="gtk-go-forward" help="Change to Next Stage"/>
                         </group>
@@ -73,7 +74,6 @@
                             </group>
                             <group col="3" colspan="2">
                             <separator colspan="3" string="Status"/>
-                            <field name="version_id" colspan="3" widget="selection"/>
                             <field name="priority" colspan="3"/>
                             <field name="task_id" on_change="onchange_task_id(task_id)"/>
                             <button string="Convert To Task" name="convert_issue_task" icon="gtk-index" type="object"
@@ -184,11 +184,10 @@
                     <field name="partner_id" groups="base.group_extended"/>
                     <field name="project_id" />
                     <field name="priority" string="Priority"/>
-                    <field name="type_id" widget="selection" readonly="1"/>
+                    <field name="type_id" widget="selection" readonly="1" string="Resolution" />
                     <button name="prev_type" string="Previous" type="object" icon="gtk-go-back" help="Change to Previous Stage"/>
                     <button name="next_type" string="Next" type="object" icon="gtk-go-forward" help="Change to Next Stage"/>
                     <field name="version_id" widget="selection"/>
-                    <field name="user_id"/>
                     <field name="assigned_to"/>
                     <field name="progress" widget="progressbar" attrs="{'invisible':[('task_id','=',False)]}"/>
                     <field name="state"/>
@@ -218,8 +217,8 @@
                         <separator orientation="vertical"/>
                         <field name="name"/>
                         <field name="partner_id" groups="base.group_extended"/>
-                        <field name="user_id">
-                            <filter domain="[('user_id','=',False)]"  help="Unassigned Issues" icon="terp-personal-" separator="1"/>
+                        <field name="assigned_to">
+                            <filter domain="[('assigned_to','=',False)]"  help="Unassigned Issues" icon="terp-personal-" separator="1"/>
                         </field>
                         <field name="project_id"/>
                     </group>
@@ -233,7 +232,7 @@
                     <newline/>
                     <group expand="0" string="Group By..."  groups="base.group_extended">
                         <filter string="Responsible" icon="terp-personal"
-                            domain="[]" context="{'group_by':'user_id'}" />
+                            domain="[]" context="{'group_by':'assigned_to'}" />
                         <filter string="Partner" icon="terp-partner" domain="[]"
                             context="{'group_by':'partner_id'}" />
                         <separator orientation="vertical"/>
@@ -264,7 +263,7 @@
             <field name="type">calendar</field>
             <field name="priority" eval="2"/>
             <field name="arch" type="xml">
-                <calendar string="Issues" date_start="date" color="user_id" date_delay="duration">
+                <calendar string="Issues" date_start="date" color="assigned_to" date_delay="duration">
                     <field name="name"/>
                     <field name="partner_id"/>
                 </calendar>
@@ -285,11 +284,11 @@
                     <field name="name" string="Feature description"/>
                     <field name="partner_id" groups="base.group_extended"/>
                     <field name="priority" string="Priority"/>
-                                <field name="type_id" widget="selection" readonly="1"/>
-                                <button name="prev_type" string="Previous" type="object" icon="gtk-go-back" help="Change to Previous Stage"/>
-                                <button name="next_type" string="Next" type="object" icon="gtk-go-forward" help="Change to Next Stage"/>
+                    <field name="type_id" widget="selection" readonly="1"/>
+                    <button name="prev_type" string="Previous" type="object" icon="gtk-go-back" help="Change to Previous Stage"/>
+                    <button name="next_type" string="Next" type="object" icon="gtk-go-forward" help="Change to Next Stage"/>
                     <field name="version_id"/>
-                    <field name="user_id"/>
+                    <field name="assigned_to"/>
                     <field name="state"/>
                     <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" icon="gtk-cancel"/>
                     <button name="case_close" string="Done" states="open,draft,pending" type="object" icon="gtk-jump-to"/>
@@ -312,7 +311,7 @@
                     <separator orientation="vertical"/>
                     <group>
                         <field name="name" select='1' string="Feature description"/>
-                        <field name="user_id" select="1"/>
+                        <field name="assigned_to" select="1"/>
                         <field name="state" select="1">
                             <filter icon="terp-check" domain="[('state','in',('open','draft'))]" help="Current Features" name="current_feature"/>
                             <filter icon="terp-camera_test" domain="[('state','=','open')]" help="Open Features"/>

From 1f2f2ef7bad257a473f1c674f8e301f36268ec47 Mon Sep 17 00:00:00 2001
From: Thibault Francois <tfr@openerp.com>
Date: Mon, 28 Feb 2011 11:59:04 +0100
Subject: [PATCH 006/331] [IMP] update hard coded message

bzr revid: tfr@openerp.com-20110228105904-w2398n95mk17spyd
---
 .../wizard/crm_forward_to_partner.py                | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/addons/crm_partner_assign/wizard/crm_forward_to_partner.py b/addons/crm_partner_assign/wizard/crm_forward_to_partner.py
index b06881f6b60..0075d5c33f1 100644
--- a/addons/crm_partner_assign/wizard/crm_forward_to_partner.py
+++ b/addons/crm_partner_assign/wizard/crm_forward_to_partner.py
@@ -208,13 +208,16 @@ class crm_lead_forward_to_partner(osv.osv_memory):
         return {'type': 'ir.actions.act_window_close'}
 
     def get_lead_details(self, cr, uid, lead_id, context=None):
-        body = ["""Hello,
+        body = ["""Dear,
 
-OpenERP Leads are now forwarded to our trusted partners, through the CRM, we hope that they provide you with interesting projects, we know that they have shown keen interest in our software.
-Below is an interesting lead for you. I have notified the lead that you would contact them.
+Below is possibly an interesting lead for you.
 
-Please let us know about the advancements of this lead or if you are not able to answer to its requests by replying to this email. This way, we can keep track of closed leads or forward them to other partners.
-Don't forget to propose our maintenance at the beginning of your implementation projects, together with your services quotation. The maintenance provides unlimited bugfixing that will avoid you waste time on bugs detected during the implementation. It also provides free migration services for the current stable version at the time of signature; otherwise if we released a new version during your implementation, the customer would not always be able to easily migrate to newer versions.
+OpenERP Leads are now forwarded to our trusted partners, through our OpenERP CRM.
+We hope that this one will provide you an interesting project, as they've recently contacted us showing interest in our software.
+
+Please keep your account manager informed about the advancements of this lead or if you are not able to answer to its requests by replying to this email. This way, we can keep track of closed leads or forward them to other partners.
+
+Please don't forget to propose our OpenERP Publisher's Warranty at the beginning of your implementation projects, together with your services quotation. The Warranty will provide unlimited bugfixing that will avoid you waste time on bugs detected during the implementation. It also provides free migration services for the current stable version at the time of signature; otherwise if we released a new version during your implementation, the customer would not always be able to easily migrate to newer versions. Please find all related information via http://www.openerp.com/services/pricing
 
 Kind regards, OpenERP Team
 

From 6e3a357e8be49e342ddf556c26505daf3290dbdb Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stephane@openerp.com>
Date: Mon, 28 Feb 2011 12:10:36 +0100
Subject: [PATCH 007/331] [IMP] document: Replace the existing file with the
 new content

bzr revid: stephane@openerp.com-20110228111036-hfzxq0e9ez8gudfk
---
 addons/document/document.py | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/addons/document/document.py b/addons/document/document.py
index 79fb83b5b1f..bd354d67d22 100644
--- a/addons/document/document.py
+++ b/addons/document/document.py
@@ -257,10 +257,22 @@ class document_file(osv.osv):
         else:
             if vals.get('file_size'):
                 del vals['file_size']
-        if not self._check_duplication(cr, uid, vals):
-            raise osv.except_osv(_('ValidateError'), _('File name must be unique!'))
-        result = super(document_file, self).create(cr, uid, vals, context)
-        cr.commit() # ?
+        result = self._check_duplication(cr, uid, vals)
+        if not result:
+            domain = [
+                ('res_id', '=', vals['res_id']),
+                ('res_model', '=', vals['res_model']),
+                ('datas_fname', '=', vals['datas_fname']),
+            ]
+            attach_ids = self.search(cr, uid, domain, context=context)
+            super(document_file, self).write(cr, uid, attach_ids, 
+                                             {'datas' : vals['datas']},
+                                             context=context)
+            result = attach_ids[0]
+        else:
+            #raise osv.except_osv(_('ValidateError'), _('File name must be unique!'))
+            result = super(document_file, self).create(cr, uid, vals, context)
+            cr.commit() # ?
         return result
 
     def __get_partner_id(self, cr, uid, res_model, res_id, context=None):

From fb544b4212d552739ed318be8f68db91e1f9e315 Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stephane@openerp.com>
Date: Mon, 28 Feb 2011 13:38:17 +0100
Subject: [PATCH 008/331] [FIX] Remove the readonly attribute on the Manager of
 the department

bzr revid: stephane@openerp.com-20110228123817-e9xstt1ugcduoqmy
---
 addons/hr/hr.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr/hr.py b/addons/hr/hr.py
index e2b9a7089f3..917e5f77b7a 100644
--- a/addons/hr/hr.py
+++ b/addons/hr/hr.py
@@ -154,7 +154,7 @@ class hr_employee(osv.osv):
         'work_email': fields.char('Work E-mail', size=240),
         'work_location': fields.char('Office Location', size=32),
         'notes': fields.text('Notes'),
-        'parent_id': fields.related('department_id', 'manager_id', relation='hr.employee', string='Manager', type='many2one', store=True, select=True, readonly=True, help="It is linked with manager of Department"),
+        'parent_id': fields.related('department_id', 'manager_id', relation='hr.employee', string='Manager', type='many2one', store=True, select=True, help="It is linked with manager of Department"),
         'category_ids': fields.many2many('hr.employee.category', 'employee_category_rel','category_id','emp_id','Category'),
         'child_ids': fields.one2many('hr.employee', 'parent_id', 'Subordinates'),
         'resource_id': fields.many2one('resource.resource', 'Resource', ondelete='cascade', required=True),

From 6ef20247f077116d1c6598e7ef77658afeb5eef1 Mon Sep 17 00:00:00 2001
From: Thibault Francois <tfr@openerp.com>
Date: Mon, 28 Feb 2011 18:18:27 +0100
Subject: [PATCH 009/331] [ADD] Mass mailing + Mass forward

bzr revid: tfr@openerp.com-20110228171827-32ftmy34psg9c600
---
 addons/crm/wizard/crm_merge_opportunities.py  |  1 +
 addons/crm/wizard/crm_send_email.py           | 30 ++++++++++
 addons/crm/wizard/crm_send_email_view.xml     | 51 ++++++++++++++++
 .../wizard/crm_forward_to_partner.py          | 53 ++++++++++++++++-
 .../wizard/crm_forward_to_partner_view.xml    | 59 ++++++++++++++++++-
 5 files changed, 190 insertions(+), 4 deletions(-)

diff --git a/addons/crm/wizard/crm_merge_opportunities.py b/addons/crm/wizard/crm_merge_opportunities.py
index 0c024873fd2..01407b9688d 100644
--- a/addons/crm/wizard/crm_merge_opportunities.py
+++ b/addons/crm/wizard/crm_merge_opportunities.py
@@ -108,6 +108,7 @@ class crm_merge_opportunity(osv.osv_memory):
                 'street' : self._get_first_not_null('street', op_ids),
                 'street2' : self._get_first_not_null('street2', op_ids),
                 'zip' : self._get_first_not_null('zip', op_ids),
+                'state' : 'open'
 
             }
 
diff --git a/addons/crm/wizard/crm_send_email.py b/addons/crm/wizard/crm_send_email.py
index 8dff88296ab..344350b2baa 100644
--- a/addons/crm/wizard/crm_send_email.py
+++ b/addons/crm/wizard/crm_send_email.py
@@ -60,6 +60,22 @@ class crm_send_new_email(osv.osv_memory):
         'html': fields.boolean('HTML formatting?', help="Select this if you want to send email with HTML formatting."),
     }
 
+    def action_mass_send(self, cr, uid, ids, context=None):
+
+        if not context:
+            context = {}
+
+        context.update({'mail' : 'new'})
+        actives_ids = context.get('active_ids')
+        print "mass_mail", context.get('mass_mail')
+        model = context.get('active_model')
+        case_pool = self.pool.get(model)
+        for id in actives_ids:
+            context.update({'active_id' : id})
+            self.action_send(cr, uid, ids, context=context)
+
+        return {'type': 'ir.actions.act_window_close'}
+
     def action_send(self, cr, uid, ids, context=None):
         """ This sends an email to ALL the addresses of the selected partners.
         """
@@ -75,6 +91,8 @@ class crm_send_new_email(osv.osv_memory):
         case_pool = self.pool.get(model)
         res_id = context and context.get('active_id', False) or False
 
+
+
         for obj in self.browse(cr, uid, ids, context=context):
             attach = [
                 (x.name, base64.decodestring(x.binary)) for x in obj.attachment_ids
@@ -110,8 +128,14 @@ class crm_send_new_email(osv.osv_memory):
                 res_id = hist.res_id
                 ref_id = hist.ref_id
                 case = case_pool.browse(cr, uid, res_id, context=context)
+
             emails = re.findall(r'([^ ,<@]+@[^> ,]+)', obj.email_to or '')
+            if context.get('mass_mail'):
+                email_temp = case.email_from and tools.ustr(case.email_from) or ''
+                emails = re.findall(r'([^ ,<@]+@[^> ,]+)', email_temp)
+
             email_cc = re.findall(r'([^ ,<@]+@[^> ,]+)', obj.email_cc or '')
+
             emails = filter(None, emails)
             body = obj.body
 
@@ -183,6 +207,8 @@ class crm_send_new_email(osv.osv_memory):
         for case in mod_obj.browse(cr, uid, res_id, context=context):
             if 'email_to' in fields:
                 res.update({'email_to': case.email_from and tools.ustr(case.email_from) or ''})
+                if context.get('mass_mail'):
+                    res.update({'email_to': ''})
             if 'email_from' in fields:
                 res.update({'email_from': user_mail_from and tools.ustr(user_mail_from) or ''})
             if 'reply_to' in fields:
@@ -190,8 +216,12 @@ class crm_send_new_email(osv.osv_memory):
                     res.update({'reply_to': case.section_id and case.section_id.reply_to or False})
             if 'subject' in fields:
                 res.update({'subject': tools.ustr(context.get('subject', case.name) or '')})
+                if context.get('mass_mail'):
+                    res.update({'subject': ''})
             if 'email_cc' in fields:
                 res.update({'email_cc': tools.ustr(case.email_cc or '')})
+                if context.get('mass_mail'):
+                    res.update({'email_cc': ''})
             if 'body' in fields:
                 res.update({'body': u'\n'+(tools.ustr(case.user_id.signature or ''))})
             if 'state' in fields:
diff --git a/addons/crm/wizard/crm_send_email_view.xml b/addons/crm/wizard/crm_send_email_view.xml
index ebbb72592f2..b9aa336cb28 100644
--- a/addons/crm/wizard/crm_send_email_view.xml
+++ b/addons/crm/wizard/crm_send_email_view.xml
@@ -44,6 +44,46 @@
             </field>
         </record>
 
+        <record model="ir.ui.view" id="crm_send_new_mass_mail_view">
+            <field name="name">crm.new.send.mass.mail.form</field>
+            <field name="model">crm.send.mail</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Send Mail" col="4">
+                    <group colspan="4" col="2">
+                    <field name="email_from"/>
+                    <field name="reply_to"/>
+                    <field name="email_to" invisible="True" />
+                    <field name="email_cc"/>
+                    <field name="subject" />
+                    <field name="html"/>
+                    </group>
+                    <notebook colspan="6">
+                        <page string="Message">
+                            <field name="body" nolabel="1" colspan="4" default_focus="1"/>
+                        </page>
+                        <page string="Attachments">
+                            <field name="attachment_ids" colspan="4" nolabel="1">
+                                <form string="Attachment">
+                                    <field name="binary" filename="name" />
+                                    <field name="name" />
+                                </form>
+                                <tree string="Attachments">
+                                    <field name="name" />
+                                </tree>
+                            </field>
+                        </page>
+                    </notebook>
+                    <separator string="" colspan="6"/>
+                    <group colspan="6" col="4" >
+                        <field name="state" />
+                        <button string="_Cancel" icon="gtk-cancel" special="cancel" />
+                        <button name="action_mass_send" type="object" string="_Send to All" icon="gtk-go-forward" />
+                    </group>
+                </form>
+            </field>
+        </record>
+
 <!-- Send New Mail action -->
 
         <record model="ir.actions.act_window" id="action_crm_send_mail">
@@ -56,6 +96,14 @@
         </record>
 
 
+        <act_window id="action_crm_send_mass_mail"
+            multi="True"
+            key2="client_action_multi" name="Send emails"
+            res_model="crm.send.mail" src_model="crm.lead"
+            view_mode="form" target="new" view_type="form"
+            context="{'mass_mail' : True}"
+            view_id="crm_send_new_mass_mail_view"/>
+
     <!-- Reply to Mail view -->
 
         <record model="ir.ui.view" id="crm_reply_mail_view">
@@ -89,6 +137,9 @@
             </field>
         </record>
 
+
+
+
 <!-- Reply to Mail action -->
 
         <record model="ir.actions.act_window" id="action_crm_reply_mail">
diff --git a/addons/crm_partner_assign/wizard/crm_forward_to_partner.py b/addons/crm_partner_assign/wizard/crm_forward_to_partner.py
index 0075d5c33f1..6273e054aab 100644
--- a/addons/crm_partner_assign/wizard/crm_forward_to_partner.py
+++ b/addons/crm_partner_assign/wizard/crm_forward_to_partner.py
@@ -208,7 +208,7 @@ class crm_lead_forward_to_partner(osv.osv_memory):
         return {'type': 'ir.actions.act_window_close'}
 
     def get_lead_details(self, cr, uid, lead_id, context=None):
-        body = ["""Dear,
+        template = ["""Dear,
 
 Below is possibly an interesting lead for you.
 
@@ -268,12 +268,13 @@ Kind regards, OpenERP Team
                 "Lead Category: %s" % (lead.categ_id and lead.categ_id.name or ''),
                 "Details: %s" % (lead.description or ''),
             ]
-        return "\n".join(body + ['---'])
+        return "\n".join(template + body + ['---'])
 
     def default_get(self, cr, uid, fields, context=None):
         """
         This function gets default values
         """
+
         if context is None:
             context = {}
 
@@ -283,15 +284,61 @@ Kind regards, OpenERP Team
             return defaults
 
         lead_proxy = self.pool.get('crm.lead')
+        partner_obj = self.pool.get('res.partner')
         lead = lead_proxy.browse(cr, uid, active_id, context=context)
 
+        email_cc = ''
+        email = ''
+        if lead.partner_assigned_id:
+            partner = partner_obj.browse(cr, uid, [lead.partner_assigned_id.id])
+            user_id = partner and partner[0].user_id or False
+            email_cc = user_id and user_id.user_email or ''
+
+            addr = partner_obj.address_get(cr, uid, [partner[0].id], ['contact'])
+            email = self.pool.get('res.partner.address').browse(cr, uid, addr['contact']).email
+
+
+
         body = self._get_case_history(cr, uid, defaults.get('history', 'latest'), lead.id, context=context)
         defaults.update({
-            'subject' : '%s: %s' % (_('Fwd'), lead.name),
+            'subject' : '%s: %s - %s' % (_('Fwd'), 'Openerp lead forward', lead.name),
             'body' : body,
+            'email_cc' : email_cc,
+            'email_to' : email,
         })
         return defaults
 
 crm_lead_forward_to_partner()
 
+class crm_lead_mass_forward_to_partner(osv.osv_memory):
+    _name = 'crm.lead.mass.forward.to.partner'
+    _inherit = 'crm.lead.forward.to.partner'
+
+    def action_mass_forward(self, cr, uid, ids, context=None):
+        if not context:
+            context = {}
+
+        active_ids = context.get('active_ids')
+        case_obj = self.pool.get('crm.lead')
+        for case in case_obj.browse(cr, uid, active_ids, context=context):
+            if case.type != "opportunity":
+                continue
+
+            if not case.partner_assigned_id:
+                case_obj.assign_partner(cr,uid, [case.id], context=context)
+                case = case_obj.browse(cr, uid, case.id, context=context)
+
+            if not case.partner_assigned_id:
+                continue
+
+            context.update({'active_id' : case.id})
+            value = self.default_get(cr, uid, ['body', 'email_to', 'email_cc', 'subject', 'history'], context=context)
+            self.write(cr, uid, ids, value, context=context)
+            self.action_forward(cr,uid, ids, context=context)
+
+        return {'type': 'ir.actions.act_window_close'}
+
+
+crm_lead_mass_forward_to_partner()
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm_partner_assign/wizard/crm_forward_to_partner_view.xml b/addons/crm_partner_assign/wizard/crm_forward_to_partner_view.xml
index 9ee2870335a..3e28c56ee53 100644
--- a/addons/crm_partner_assign/wizard/crm_forward_to_partner_view.xml
+++ b/addons/crm_partner_assign/wizard/crm_forward_to_partner_view.xml
@@ -38,14 +38,71 @@
                 </button>
             </field>
         </record>
+
         <record model="ir.actions.act_window" id="crm_lead_forward_to_partner_act">
             <field name="name">Forward to Partner</field>
             <field name="res_model">crm.lead.forward.to.partner</field>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
-            <field name="view_id" ref="crm_lead_forward_to_partner_form1"/>
+            <field name="view_id" ref="crm_lead_forward_to_partner_form"/>
             <field name="target">new</field>
         </record>
 
+
+        <record model="ir.ui.view" id="crm_forward_mass_mail_view">
+            <field name="name">crm.new.mass.forward.mail.form</field>
+            <field name="model">crm.lead.mass.forward.to.partner</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Send Mail" col="4">
+                    <group colspan="4" col="2">
+                    <separator string="Forward to Partner" colspan="4" />
+
+                    <field name="history" colspan="2" on_change="on_change_history(history, context)" invisible="1"/>
+                    <field name="email_from"/>
+                    <field name="reply_to"/>
+                    <field name="email_to" invisible="1" />
+                    <field name="email_cc" invisible="1" />
+                    <field name="subject"  invisible="1" />
+                    <field name="html"/>
+                    </group>
+                    <notebook colspan="6" >
+                        <page string="Message" >
+                            <field name="body" nolabel="1" colspan="4" default_focus="1" readonly="1"/>
+                        </page>
+                        <page string="Attachments" >
+                            <field name="attachment_ids" colspan="4" nolabel="1">
+                                <form string="Attachment">
+                                    <field name="binary" filename="name" />
+                                    <field name="name" />
+                                </form>
+                                <tree string="Attachments">
+                                    <field name="name" />
+                                </tree>
+                            </field>
+                        </page>
+                    </notebook>
+                    <separator string="" colspan="6"/>
+                    <group colspan="6" col="4" >
+                        <field name="state" />
+                        <button string="_Cancel" icon="gtk-cancel" special="cancel" />
+                        <button name="action_mass_forward" type="object" string="_Mass forward" icon="gtk-go-forward" />
+                    </group>
+                </form>
+            </field>
+        </record>
+
+
+        <record model="ir.actions.act_window" id="action_crm_send_mass_forward">
+            <field name="name">Mass forward to partner</field>
+            <field name="res_model">crm.lead.mass.forward.to.partner</field>
+            <field name="src_model">crm.lead</field>
+            <field name="view_id" ref="crm_forward_mass_mail_view"/>
+            <field name="target">new</field>
+            <field name="key2">client_action_multi</field>
+            <field name="context">{'mass_forward' : True}</field>
+        </record>
+
+
     </data>
 </openerp>

From c2531d6426c9815716f5d945bdff29a40d3dc533 Mon Sep 17 00:00:00 2001
From: Thibault Francois <tfr@openerp.com>
Date: Tue, 8 Mar 2011 17:40:02 +0100
Subject: [PATCH 010/331] [IMP] mass forward lead also + fix email_to empty +
 fix body not defined

bzr revid: tfr@openerp.com-20110308164002-e28rir542eim9fff
---
 .../wizard/crm_forward_to_partner.py            | 13 ++++---------
 .../wizard/crm_forward_to_partner_view.xml      | 17 ++++++++---------
 2 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/addons/crm_partner_assign/wizard/crm_forward_to_partner.py b/addons/crm_partner_assign/wizard/crm_forward_to_partner.py
index 6273e054aab..1abbb65c72d 100644
--- a/addons/crm_partner_assign/wizard/crm_forward_to_partner.py
+++ b/addons/crm_partner_assign/wizard/crm_forward_to_partner.py
@@ -208,7 +208,7 @@ class crm_lead_forward_to_partner(osv.osv_memory):
         return {'type': 'ir.actions.act_window_close'}
 
     def get_lead_details(self, cr, uid, lead_id, context=None):
-        template = ["""Dear,
+        body = ["""Dear,
 
 Below is possibly an interesting lead for you.
 
@@ -250,7 +250,7 @@ Kind regards, OpenERP Team
                     body.append("%s: %s" % (field_definition.string, value or ''))
         elif lead.type == 'opportunity':
             pa = lead.partner_address_id
-            body = [
+            body += [
                 "Partner: %s" % (lead.partner_id and lead.partner_id.name_get()[0][1]),
                 "Contact: %s" % (pa.name or ''),
                 "Title: %s" % (pa.title or ''),
@@ -268,7 +268,7 @@ Kind regards, OpenERP Team
                 "Lead Category: %s" % (lead.categ_id and lead.categ_id.name or ''),
                 "Details: %s" % (lead.description or ''),
             ]
-        return "\n".join(template + body + ['---'])
+        return "\n".join(body + ['---'])
 
     def default_get(self, cr, uid, fields, context=None):
         """
@@ -297,14 +297,12 @@ Kind regards, OpenERP Team
             addr = partner_obj.address_get(cr, uid, [partner[0].id], ['contact'])
             email = self.pool.get('res.partner.address').browse(cr, uid, addr['contact']).email
 
-
-
         body = self._get_case_history(cr, uid, defaults.get('history', 'latest'), lead.id, context=context)
         defaults.update({
             'subject' : '%s: %s - %s' % (_('Fwd'), 'Openerp lead forward', lead.name),
             'body' : body,
             'email_cc' : email_cc,
-            'email_to' : email,
+            'email_to' : email or 'dummy@dummy.ly'
         })
         return defaults
 
@@ -321,9 +319,6 @@ class crm_lead_mass_forward_to_partner(osv.osv_memory):
         active_ids = context.get('active_ids')
         case_obj = self.pool.get('crm.lead')
         for case in case_obj.browse(cr, uid, active_ids, context=context):
-            if case.type != "opportunity":
-                continue
-
             if not case.partner_assigned_id:
                 case_obj.assign_partner(cr,uid, [case.id], context=context)
                 case = case_obj.browse(cr, uid, case.id, context=context)
diff --git a/addons/crm_partner_assign/wizard/crm_forward_to_partner_view.xml b/addons/crm_partner_assign/wizard/crm_forward_to_partner_view.xml
index 3e28c56ee53..9826bf9d45c 100644
--- a/addons/crm_partner_assign/wizard/crm_forward_to_partner_view.xml
+++ b/addons/crm_partner_assign/wizard/crm_forward_to_partner_view.xml
@@ -92,16 +92,15 @@
             </field>
         </record>
 
+        <act_window id="action_crm_send_mass_forward"
+            multi="True"
+            key2="client_action_multi" name="Mass forward to partner"
+            res_model="crm.lead.mass.forward.to.partner" src_model="crm.lead"
+            view_mode="form" target="new" view_type="form"
+            context="{'mass_forward' : True}"
+            view_id="crm_forward_mass_mail_view"
+        />
 
-        <record model="ir.actions.act_window" id="action_crm_send_mass_forward">
-            <field name="name">Mass forward to partner</field>
-            <field name="res_model">crm.lead.mass.forward.to.partner</field>
-            <field name="src_model">crm.lead</field>
-            <field name="view_id" ref="crm_forward_mass_mail_view"/>
-            <field name="target">new</field>
-            <field name="key2">client_action_multi</field>
-            <field name="context">{'mass_forward' : True}</field>
-        </record>
 
 
     </data>

From 6b7a10e4bf130697c76a50ee2ad881bf97c7f977 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Tue, 8 Mar 2011 17:40:37 +0100
Subject: [PATCH 011/331] [FIX] account: correct default unit price for
 supplier invoices (issue #4346)

bzr revid: chs@openerp.com-20110308164037-iknvpeo079u68bo5
---
 addons/account/invoice.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/invoice.py b/addons/account/invoice.py
index 34c7b24028b..9ef72204b60 100644
--- a/addons/account/invoice.py
+++ b/addons/account/invoice.py
@@ -1258,7 +1258,7 @@ class account_invoice_line(osv.osv):
                     t = t - (p * l[2].get('quantity'))
                     taxes = l[2].get('invoice_line_tax_id')
                     if len(taxes[0]) >= 3 and taxes[0][2]:
-                        taxes = tax_obj.browse(cr, uid, taxes[0][2])
+                        taxes = tax_obj.browse(cr, uid, list(taxes[0][2]))
                         for tax in tax_obj.compute_all(cr, uid, taxes, p,l[2].get('quantity'), context.get('address_invoice_id', False), l[2].get('product_id', False), context.get('partner_id', False))['taxes']:
                             t = t - tax['amount']
             return t

From e70d9106c2d810c3a841fde952e34fbc1ec3cc47 Mon Sep 17 00:00:00 2001
From: Thibault Francois <tfr@openerp.com>
Date: Thu, 10 Mar 2011 10:53:21 +0100
Subject: [PATCH 012/331] [ADD] partner assignement + [FIX] assign in the
 country then closest

bzr revid: tfr@openerp.com-20110310095321-0dv7e4yr3ezul89r
---
 addons/crm_partner_assign/__openerp__.py      |  1 +
 .../crm_partner_assign/partner_geo_assign.py  | 15 ----
 addons/crm_partner_assign/report/__init__.py  |  5 +-
 .../report/crm_partner_report.py              | 63 +++++++++++++++++
 .../report/crm_partner_report_view.xml        | 69 +++++++++++++++++++
 5 files changed, 136 insertions(+), 17 deletions(-)
 create mode 100644 addons/crm_partner_assign/report/crm_partner_report.py
 create mode 100644 addons/crm_partner_assign/report/crm_partner_report_view.xml

diff --git a/addons/crm_partner_assign/__openerp__.py b/addons/crm_partner_assign/__openerp__.py
index b6f91cffda2..646467c5295 100644
--- a/addons/crm_partner_assign/__openerp__.py
+++ b/addons/crm_partner_assign/__openerp__.py
@@ -36,6 +36,7 @@ based on geolocalization.
         'wizard/crm_forward_to_partner_view.xml',
         'crm_lead_view.xml',
         'report/crm_lead_report_view.xml',
+        'report/crm_partner_report_view.xml',
     ],
     'test': ['test/test_crm_partner_assign.yml'],
     'installable': True,
diff --git a/addons/crm_partner_assign/partner_geo_assign.py b/addons/crm_partner_assign/partner_geo_assign.py
index 3d524e32c42..50eae5825cb 100644
--- a/addons/crm_partner_assign/partner_geo_assign.py
+++ b/addons/crm_partner_assign/partner_geo_assign.py
@@ -142,21 +142,6 @@ class crm_lead(osv.osv):
                         ('country', '=', part.country_id.id),
                     ], context=context)
 
-                # 3. third way: other countries, small area
-                if not part_ids:
-                    part_ids = self.pool.get('res.partner').search(cr, uid, [
-                        ('partner_weight','>',0),
-                        ('partner_latitude','>',result[0]-2), ('partner_latitude','<',result[0]+2),
-                        ('partner_longitude','>',result[1]-1.5), ('partner_longitude','<',result[1]+1.5)
-                    ], context=context)
-
-                # 4. fourth way: other countries, big area
-                if not part_ids:
-                    part_ids = self.pool.get('res.partner').search(cr, uid, [
-                        ('partner_weight','>',0),
-                        ('partner_latitude','>',result[0]-4), ('partner_latitude','<',result[0]+4),
-                        ('partner_longitude','>',result[1]-3), ('partner_longitude','<',result[1]+3)
-                    ], context=context)
 
                 # 5. fifth way: anywhere in same country
                 if not part_ids:
diff --git a/addons/crm_partner_assign/report/__init__.py b/addons/crm_partner_assign/report/__init__.py
index 9b7860b8de4..a211aeede1e 100644
--- a/addons/crm_partner_assign/report/__init__.py
+++ b/addons/crm_partner_assign/report/__init__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,9 +15,10 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
 import crm_lead_report
+import crm_partner_report
 
diff --git a/addons/crm_partner_assign/report/crm_partner_report.py b/addons/crm_partner_assign/report/crm_partner_report.py
new file mode 100644
index 00000000000..0fbd9e40694
--- /dev/null
+++ b/addons/crm_partner_assign/report/crm_partner_report.py
@@ -0,0 +1,63 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+from osv import fields,osv
+import tools
+
+
+class crm_partner_report_assign(osv.osv):
+    """ CRM Lead Report """
+    _name = "crm.partner.report.assign"
+    _auto = False
+    _description = "CRM Partner Report"
+    _columns = {
+        'name': fields.char('Partner name', size=64, required=False, readonly=True),
+        'grade_id':fields.many2one('res.partner.grade', 'Grade', readonly=True),
+        'user_id':fields.many2one('res.users', 'User', readonly=True),
+        'country_id':fields.many2one('res.country', 'Country', readonly=True),
+        'section_id':fields.many2one('crm.case.section', 'Sales Team', readonly=True),
+        'nbr': fields.integer('# of Partner', readonly=True),
+        'opp': fields.integer('# of Opportunity', readonly=True),
+    }
+
+    def init(self, cr):
+
+        """
+            CRM Lead Report
+            @param cr: the current row, from the database cursor
+        """
+        tools.drop_view_if_exists(cr, 'crm_partner_report_assign')
+        cr.execute("""
+            CREATE OR REPLACE VIEW crm_partner_report_assign AS (
+                SELECT
+                    p.id,
+                    p.name,
+                    a.country_id,
+                    p.grade_id,
+                    p.user_id,
+                    p.section_id,
+                    1 as nbr,
+                    (SELECT count(id) FROM crm_lead WHERE partner_assigned_id=p.id) AS opp
+                FROM
+                    res_partner p
+                    left join res_partner_address a on (p.id=a.partner_id)
+            )""")
+
+crm_partner_report_assign()
diff --git a/addons/crm_partner_assign/report/crm_partner_report_view.xml b/addons/crm_partner_assign/report/crm_partner_report_view.xml
new file mode 100644
index 00000000000..576019604fc
--- /dev/null
+++ b/addons/crm_partner_assign/report/crm_partner_report_view.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <!--     Opportunity tree view  -->
+        <record id="view_report_crm_partner_assign_filter" model="ir.ui.view">
+            <field name="name">crm.partner.report.assign.select</field>
+            <field name="model">crm.partner.report.assign</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Partner assigned Analysis">
+                    <group col="20" colspan="8">
+                        <field name="country_id" />
+                        <field name="grade_id"/>
+                        <field name="user_id"/>
+                        <field name="section_id"/>
+                   </group>
+                   <newline/>
+                   <group  expand="1" string="Group By...">
+                       <filter string="Salesman" name="user" icon="terp-personal"
+                            domain="[]" context="{'group_by':'user_id'}" />
+                       <filter string="Country" icon="terp-go-home" name="group_country" context="{'group_by':'country_id'}" />
+                        <separator orientation="vertical" />
+                        <filter string="Section" icon="terp-personal+"
+                            domain="[]"
+                            context="{'group_by':'section_id'}" />
+                        <filter string="Grade" name="group_grade" icon="terp-stock_symbol-selection"
+                            domain="[]" context="{'group_by':'grade_id'}" />
+                        <separator orientation="vertical" />
+                  </group>
+               </search>
+            </field>
+        </record>
+
+<!-- Crm Lead Assign report Graph View -->
+
+       <record id="view_report_crm_partner_assign_tree" model="ir.ui.view">
+            <field name="name">crm.partner.assign.report.tree</field>
+            <field name="model">crm.partner.report.assign</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+            <tree string="Opportunities Assignment Analysis">
+                <field name="name" invisible="1"/>
+                <field name="country_id" invisible="1"/>
+                <field name="grade_id" invisible="1"/>
+                <field name="section_id" invisible="1" groups="base.group_extended"/>
+                <field name="user_id" invisible="1"/>
+                <field name="nbr" string="#Partner" sum="#Partner"/>
+                <field name="opp"/>
+             </tree>
+            </field>
+       </record>
+
+       <!-- Leads by user and section Action -->
+
+       <record id="action_report_crm_partner_assign" model="ir.actions.act_window">
+            <field name="name">Partner Assignment  Analysis</field>
+            <field name="res_model">crm.partner.report.assign</field>
+            <field name="context">{'search_default_group_country': 1, 'search_default_group_grade': 1, 'group_by_no_leaf':1,'group_by':[]}</field>
+            <field name="view_mode">tree</field>
+            <field name="domain">[('grade_id', '!=', False)]</field>
+        </record>
+
+       <menuitem id="menu_report_crm_partner_assign_tree"
+           groups="base.group_extended"
+           parent="base.next_id_64" action="action_report_crm_partner_assign" sequence="5"/>
+
+    </data>
+</openerp>

From 7babc214b91844928780b4164b46cbcb9700156d Mon Sep 17 00:00:00 2001
From: Thibault Francois <tfr@openerp.com>
Date: Thu, 10 Mar 2011 11:47:45 +0100
Subject: [PATCH 013/331] [FIX] fix doube attachement bug based on uco trunk
 fix

bzr revid: tfr@openerp.com-20110310104745-qnq6xzazi73oqpkf
---
 addons/mail_gateway/mail_gateway.py | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/addons/mail_gateway/mail_gateway.py b/addons/mail_gateway/mail_gateway.py
index a801a71fdde..ba6b07e5c54 100644
--- a/addons/mail_gateway/mail_gateway.py
+++ b/addons/mail_gateway/mail_gateway.py
@@ -128,7 +128,11 @@ class mailgate_thread(osv.osv):
         for case in cases:
             attachments = []
             for att in attach:
-                    attachments.append(att_obj.create(cr, uid, {'res_model':case._name,'res_id':case.id,'name': att[0], 'datas': base64.encodestring(att[1])}))
+                att_ids = att_obj.search(cr, uid, [('name','=',att[0]), ('res_id', '=', case.id)])
+                if att_ids:
+                    attachments.append(att_ids[0])
+                else:
+                    attachments.append(att_obj.create(cr, uid, {'res_model':case._name,'res_id':case.id, 'name': att[0], 'datas': base64.encodestring(att[1])}))
 
             partner_id = hasattr(case, 'partner_id') and (case.partner_id and case.partner_id.id or False) or False
             if not partner_id and case._name == 'res.partner':
@@ -169,7 +173,7 @@ class mailgate_thread(osv.osv):
                     'message_id': message_id,
                     'attachment_ids': [(6, 0, attachments)]
                 }
-                
+
             obj.create(cr, uid, data, context=context)
         return True
 mailgate_thread()
@@ -221,7 +225,7 @@ class mailgate_message(osv.osv):
         action_data = False
         action_pool = self.pool.get('ir.actions.act_window')
         message_pool = self.browse(cr ,uid, ids, context=context)[0]
-        att_ids = [x.id for x in message_pool.attachment_ids] 
+        att_ids = [x.id for x in message_pool.attachment_ids]
         action_ids = action_pool.search(cr, uid, [('res_model', '=', 'ir.attachment')])
         if action_ids:
             action_data = action_pool.read(cr, uid, action_ids[0], context=context)

From 02a703770a1c748bde5a01e47b6a3f731bbf6e2a Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Fri, 11 Mar 2011 11:43:00 +0100
Subject: [PATCH 014/331] [IMP] marketing_campaign: activity now passes
 workitem to server actions via context

bzr revid: odo@openerp.com-20110311104300-ka3616hqa8ad52qg
---
 addons/marketing_campaign/marketing_campaign.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/marketing_campaign/marketing_campaign.py b/addons/marketing_campaign/marketing_campaign.py
index 2ca21a3031c..33ed2abb1ba 100644
--- a/addons/marketing_campaign/marketing_campaign.py
+++ b/addons/marketing_campaign/marketing_campaign.py
@@ -453,7 +453,8 @@ class marketing_campaign_activity(osv.osv):
         action_context = dict(context,
                               active_id=workitem.res_id,
                               active_ids=[workitem.res_id],
-                              active_model=workitem.object_id.model)
+                              active_model=workitem.object_id.model,
+                              workitem=workitem)
         res = server_obj.run(cr, uid, [activity.server_action_id.id],
                              context=action_context)
         # server action return False if the action is perfomed

From 599d655465d534570c37f21b54168739b3c2bb50 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Fri, 11 Mar 2011 11:48:31 +0100
Subject: [PATCH 015/331] [FIX] marketing_campaign: workitem.process_all() must
 respect campaign states

bzr revid: odo@openerp.com-20110311104831-ewujjdgwg1jd5qhc
---
 addons/marketing_campaign/marketing_campaign.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/marketing_campaign/marketing_campaign.py b/addons/marketing_campaign/marketing_campaign.py
index 33ed2abb1ba..e7b88b5ae36 100644
--- a/addons/marketing_campaign/marketing_campaign.py
+++ b/addons/marketing_campaign/marketing_campaign.py
@@ -723,7 +723,7 @@ class marketing_campaign_workitem(osv.osv):
                 # manual states are not processed automatically
                 continue
             while True:
-                domain = [('state', '=', 'todo'), ('date', '!=', False)]
+                domain = [('campaign_id', '=', camp.id), ('state', '=', 'todo'), ('date', '!=', False)]
                 if camp.mode in ('test_realtime', 'active'):
                     domain += [('date','<=', time.strftime('%Y-%m-%d %H:%M:%S'))]
 

From cbb98b719bc5b9724a8ef2ad1441a5d34e7d83f0 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Sat, 12 Mar 2011 01:07:05 +0100
Subject: [PATCH 016/331] [FIX] marketing_campaign: fixed search on res_name on
 workitems + minor tweaks

bzr revid: odo@openerp.com-20110312000705-rbjet1wg30y79v12
---
 .../marketing_campaign/marketing_campaign.py  | 31 +++++++++++++------
 1 file changed, 21 insertions(+), 10 deletions(-)

diff --git a/addons/marketing_campaign/marketing_campaign.py b/addons/marketing_campaign/marketing_campaign.py
index e7b88b5ae36..b163297e49c 100644
--- a/addons/marketing_campaign/marketing_campaign.py
+++ b/addons/marketing_campaign/marketing_campaign.py
@@ -21,6 +21,7 @@
 
 import time
 import base64
+import itertools
 from datetime import datetime
 from dateutil.relativedelta import relativedelta
 from operator import itemgetter
@@ -213,6 +214,7 @@ marketing_campaign()
 class marketing_campaign_segment(osv.osv):
     _name = "marketing.campaign.segment"
     _description = "Campaign Segment"
+    _order = "name"
 
     def _get_next_sync(self, cr, uid, ids, fn, args, context=None):
         # next auto sync date is same for all segments
@@ -352,6 +354,7 @@ marketing_campaign_segment()
 
 class marketing_campaign_activity(osv.osv):
     _name = "marketing.campaign.activity"
+    _order = "name"
     _description = "Campaign Activity"
 
     _action_types = [
@@ -457,7 +460,7 @@ class marketing_campaign_activity(osv.osv):
                               workitem=workitem)
         res = server_obj.run(cr, uid, [activity.server_action_id.id],
                              context=action_context)
-        # server action return False if the action is perfomed
+        # server action return False if the action is performed
         # except client_action, other and python code
         return res == False and True or res
 
@@ -567,8 +570,14 @@ class marketing_campaign_workitem(osv.osv):
         if not len(args):
             return []
 
-        condition = []
-        final_ids = []
+        condition_name = None
+        for domain_item in args:
+            # we only use the first domain criterion and ignore all the rest including operators
+            if isinstance(domain_item, (list,tuple)) and len(domain_item) == 3 and domain_item[0] == 'res_name':
+                condition_name = [None, domain_item[1], domain_item[2]]
+                break
+
+        assert condition_name, "Invalid search domain for marketing_campaign_workitem.res_name. It should use 'res_name'"
 
         cr.execute("""select w.id, w.res_id, m.model  \
                                 from marketing_campaign_workitem w \
@@ -577,15 +586,17 @@ class marketing_campaign_workitem(osv.osv):
                                     left join ir_model m on (m.id=c.object_id)
                                     """)
         res = cr.fetchall()
+        workitem_map = {}
+        matching_workitems = []
         for id, res_id, model in res:
+            workitem_map.setdefault(model,{}).setdefault(res_id,set()).add(id)
+        for model, id_map in workitem_map.iteritems():
             model_pool = self.pool.get(model)
-            for arg in args:
-                if arg[1] == 'ilike':
-                    condition.append((model_pool._rec_name, 'ilike', arg[2]))
-            res_ids = model_pool.search(cr, uid, condition, context=context)
-            if res_id in res_ids:
-                final_ids.append(id)
-        return [('id', 'in', final_ids)]
+            condition_name[0] = model_pool._rec_name
+            condition = [('id', 'in', id_map.keys()), condition_name]
+            for res_id in model_pool.search(cr, uid, condition, context=context):
+                matching_workitems.extend(id_map[res_id])
+        return [('id', 'in', list(set(matching_workitems)))]
 
     _columns = {
         'segment_id': fields.many2one('marketing.campaign.segment', 'Segment', readonly=True),

From d5129c1eebca410cbbeb8198269551fdd5e3f91e Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Sat, 12 Mar 2011 01:45:14 +0100
Subject: [PATCH 017/331] [FIX] email_template: avoid trying to write on
 auto-deleted messages

bzr revid: odo@openerp.com-20110312004514-gbsfs68kbdho0c8m
---
 addons/email_template/email_template_mailbox.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/email_template/email_template_mailbox.py b/addons/email_template/email_template_mailbox.py
index 49d61bf05df..4486cb5451e 100644
--- a/addons/email_template/email_template_mailbox.py
+++ b/addons/email_template/email_template_mailbox.py
@@ -92,6 +92,7 @@ class email_template_mailbox(osv.osv):
                         self.unlink(cr, uid, [id], context=context)
                         # Remove attachments for this mail
                         attachment_pool.unlink(cr, uid, values['attachments_ids'], context=context)
+                        return result
                     else:
                         self.write(cr, uid, id, {'folder':'sent', 'state':'na', 'date_mail':time.strftime("%Y-%m-%d %H:%M:%S")}, context)
                         self.historise(cr, uid, [id], "Email sent successfully", context)

From 488200e0c9626f08f95f879c52d77120b21c6434 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Sat, 12 Mar 2011 02:14:01 +0100
Subject: [PATCH 018/331] [FIX] marketing_campaign: avoid exception when
 resource linked to workitem was deleted

bzr revid: odo@openerp.com-20110312011401-qy5lmffp4owfsxf6
---
 addons/marketing_campaign/marketing_campaign.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/addons/marketing_campaign/marketing_campaign.py b/addons/marketing_campaign/marketing_campaign.py
index b163297e49c..ab99a15f30b 100644
--- a/addons/marketing_campaign/marketing_campaign.py
+++ b/addons/marketing_campaign/marketing_campaign.py
@@ -560,6 +560,8 @@ class marketing_campaign_workitem(osv.osv):
                 continue
 
             proxy = self.pool.get(wi.object_id.model)
+            if not proxy.exists(cr, uid, [wi.res_id]):
+                continue
             ng = proxy.name_get(cr, uid, [wi.res_id], context=context)
             if ng:
                 res[wi.id] = ng[0][1]

From 2ec4bcb5c7a62b8057513c3306f8042e0191f521 Mon Sep 17 00:00:00 2001
From: "Anup (OpenERP)" <ach@tinyerp.com>
Date: Mon, 14 Mar 2011 12:02:30 +0530
Subject: [PATCH 019/331] [FIX] account:Translation for wizard 'New Financial
 Company setting' fixed.(Maintenance Case:4477)

bzr revid: ach@tinyerp.com-20110314063230-usy3ifil2w8wss51
---
 addons/account/i18n/de.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/i18n/de.po b/addons/account/i18n/de.po
index 7472e994a5c..3ebb9dca2f5 100644
--- a/addons/account/i18n/de.po
+++ b/addons/account/i18n/de.po
@@ -2671,7 +2671,7 @@ msgstr ""
 #: model:ir.actions.server,name:account.ir_actions_server_action_wizard_multi_chart
 #: model:ir.ui.menu,name:account.menu_act_ir_actions_bleble
 msgid "New Company Financial Setting"
-msgstr "Basiskonfiguration Unternehmen"
+msgstr "Neue Firma Financial Rahmen"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all

From 51fda3b52f52e60163f385fed82570cc6673fdbf Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Mon, 14 Mar 2011 11:43:27 +0100
Subject: [PATCH 020/331] [MERGE] cherry picking of revision 4422-4423 of
 lp:~openerp-dev/openobject-addons/trunk-dev2-hr-improvements

bzr revid: qdp-launchpad@openerp.com-20110314104327-3n3xfjibl4x0yy2y
---
 addons/hr/hr.py                               | 12 ++--
 addons/hr/security/hr_security.xml            |  2 +-
 addons/hr_holidays/hr_holidays_data.xml       |  1 +
 addons/hr_holidays/hr_holidays_view.xml       | 12 ++--
 addons/hr_recruitment/__openerp__.py          |  1 +
 addons/hr_recruitment/hr_recruitment.py       | 23 ++++++-
 addons/hr_recruitment/hr_recruitment_view.xml |  3 +-
 addons/hr_recruitment/wizard/__init__.py      |  1 +
 .../wizard/hr_recruitment_employee_hired.py   | 61 +++++++++++++++++++
 .../wizard/hr_recruitment_employee_hired.xml  | 33 ++++++++++
 10 files changed, 131 insertions(+), 18 deletions(-)
 create mode 100644 addons/hr_recruitment/wizard/hr_recruitment_employee_hired.py
 create mode 100644 addons/hr_recruitment/wizard/hr_recruitment_employee_hired.xml

diff --git a/addons/hr/hr.py b/addons/hr/hr.py
index 917e5f77b7a..4a5529c11a4 100644
--- a/addons/hr/hr.py
+++ b/addons/hr/hr.py
@@ -204,15 +204,15 @@ class hr_employee(osv.osv):
             level -= 1
         return True
 
-    def _check_department_id(self, cr, uid, ids, context=None):
-        for emp in self.browse(cr, uid, ids, context=context):
-            if emp.department_id.manager_id and emp.id == emp.department_id.manager_id.id:
-                return False
-        return True
+#    def _check_department_id(self, cr, uid, ids, context=None):
+#        for emp in self.browse(cr, uid, ids, context=context):
+#            if emp.department_id.manager_id and emp.id == emp.department_id.manager_id.id:
+#                return False
+#        return True
 
     _constraints = [
         (_check_recursion, 'Error ! You cannot create recursive Hierarchy of Employees.', ['parent_id']),
-        (_check_department_id, 'Error ! You cannot select a department for which the employee is the manager.', ['department_id']),
+#        (_check_department_id, 'Error ! You cannot select a department for which the employee is the manager.', ['department_id']),
     ]
 
 hr_employee()
diff --git a/addons/hr/security/hr_security.xml b/addons/hr/security/hr_security.xml
index 61aa5a93b12..aba7d4b45e1 100644
--- a/addons/hr/security/hr_security.xml
+++ b/addons/hr/security/hr_security.xml
@@ -7,7 +7,7 @@
     </record>
 
     <record id="base.group_hr_user" model="res.groups">
-        <field name="name">Human Resources / User</field>
+        <field name="name">Human Resources / Officer</field>
     </record>
 </data>
 </openerp>
diff --git a/addons/hr_holidays/hr_holidays_data.xml b/addons/hr_holidays/hr_holidays_data.xml
index 96fb29deae2..4e3a79f18f1 100644
--- a/addons/hr_holidays/hr_holidays_data.xml
+++ b/addons/hr_holidays/hr_holidays_data.xml
@@ -5,6 +5,7 @@
     <!-- Casual leave -->
     <record model="hr.holidays.status" id="holiday_status_cl">
       <field name="name">Casual Leave</field>
+      <field name="limit">True</field>
       <field name="color_name">black</field>
     </record>
 
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index a6adb1926d2..481d8cf87e9 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -93,11 +93,11 @@
                             <newline/>
                             <field name="state" colspan="2"/>
                             <group colspan="2" col="6">
-                                <button string="Refuse" name="refuse" states="confirm,validate,validate1" type="workflow" icon="gtk-no" groups="base.group_hr_user,base.group_hr_manager"/>
-                                <button string="Confirm" name="confirm" states="draft" type="workflow" icon="gtk-yes"/>
+                                <button string="Refuse" name="refuse" states="confirm" type="workflow" icon="gtk-no" groups="base.group_hr_user,base.group_hr_manager"/>
+                                <button string="Submit to Manager" name="confirm" states="draft" type="workflow" icon="gtk-yes"/>
                                 <button string="Approve" name="validate" states="confirm" type="workflow" icon="gtk-apply" groups="base.group_hr_user"/>
                                 <button string="Approved" name="second_validate" states="validate1" type="workflow" icon="gtk-apply" groups="base.group_hr_user"/>
-                                <button string="Set to Draft" name="set_to_draft" states="refuse" type="object" icon="gtk-convert" groups="base.group_hr_user"/>
+                                <button string="Set to Draft" name="set_to_draft" states="refuse,validate,validate1" type="object" icon="gtk-convert" groups="base.group_hr_user"/>
                             </group>
                         </page>
                     </notebook>
@@ -135,11 +135,11 @@
                         <newline/>
                         <field name="state" colspan="2"/>
                         <group colspan="2" col="6">
-                            <button string="Refuse" name="refuse" states="confirm,validate,validate1" type="workflow" icon="gtk-no" groups="base.group_hr_user"/>
+                            <button string="Refuse" name="refuse" states="confirm" type="workflow" icon="gtk-no" groups="base.group_hr_user"/>
                             <button string="Confirm" name="confirm" states="draft" type="workflow" icon="gtk-yes"/>
                             <button string="Approve" name="validate" states="confirm" type="workflow" icon="gtk-apply" groups="base.group_hr_user"/>
                             <button string="Approved" name="second_validate" states="validate1" type="workflow" icon="gtk-apply" groups="base.group_hr_user"/>
-                            <button string="Set to Draft" name="set_to_draft" states="cancel" type="object" icon="gtk-convert" groups="base.group_hr_user"/>
+                            <button string="Set to Draft" name="set_to_draft" states="cancel,validate,validate1" type="object" icon="gtk-convert" groups="base.group_hr_user"/>
                         </group>
                     </page>
                 </notebook>
@@ -413,7 +413,7 @@
         </record>
 
         <menuitem sequence="3" id="hr.menu_open_view_attendance_reason_config" parent="hr.menu_hr_configuration" name="Holidays"/>
-        
+
         <menuitem name="Leave Type"
             action="open_view_holiday_status"
             id="menu_open_view_holiday_status"
diff --git a/addons/hr_recruitment/__openerp__.py b/addons/hr_recruitment/__openerp__.py
index 5ac4c20184c..1d0e8bd6375 100644
--- a/addons/hr_recruitment/__openerp__.py
+++ b/addons/hr_recruitment/__openerp__.py
@@ -36,6 +36,7 @@ system to store and search in your CV base.
     'depends': ['hr','survey','crm'],
     'update_xml': [
         'wizard/hr_recruitment_phonecall_view.xml',
+        'wizard/hr_recruitment_employee_hired.xml',
         'wizard/hr_recruitment_create_partner_job_view.xml',
         'hr_recruitment_view.xml',
         'hr_recruitment_menu.xml',
diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index 02643a3e90e..6645a6f45c1 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -411,12 +411,29 @@ class hr_applicant(crm.crm_case, osv.osv):
         for (id, name) in self.name_get(cr, uid, ids):
             message = _("Applicant '%s' is being hired.") % name
             self.log(cr, uid, id, message)
-
         applicant = self.browse(cr, uid, ids)[0]
-        if applicant.job_id:
-            emp_id = employee_obj.create(cr,uid,{'name': applicant.name,'job_id': applicant.job_id.id})
+        if not applicant.job_id:
+            raise osv.except_osv(_('Warning!'),_('You must define job Id for Applicant !')) 
+        emp_id = employee_obj.create(cr,uid,{'name': applicant.name,'job_id': applicant.job_id.id})
         return res
 
+    def case_close_without_emp(self, cr, uid, ids, *args):
+        """
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of case's Ids
+        @param *args: Give Tuple Value
+        """
+        employee_obj = self.pool.get('hr.employee')
+        job_obj = self.pool.get('hr.job')
+        res = super(hr_applicant, self).case_close(cr, uid, ids, *args)
+        for (id, name) in self.name_get(cr, uid, ids):
+            message = _("Applicant '%s' is being hired.") % name
+            self.log(cr, uid, id, message)
+        return res
+
+
     def case_reset(self, cr, uid, ids, *args):
         """Resets case as draft
         @param self: The object pointer
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 3738a1d8be6..f26d0347e4c 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -77,7 +77,6 @@
                         <field name="name" string="Subject"/>
                         <field name="partner_name"/>
                         <field name="job_id" on_change="onchange_job(job_id)"/>
-                        <button string="Phone Call" name="%(action_hr_recruitment_phonecall)d" icon="terp-call-start" type="action" groups="base.group_extended"/>
                         <button name="action_makeMeeting" type="object" string="Meeting" icon="gtk-index"/>
                     <newline/>
                     <field name="department_id" widget="selection"/>
@@ -133,7 +132,7 @@
                             <button name="case_cancel" string="Refused" states="draft,open,pending" type="object" icon="gtk-cancel"/>
                             <button name="case_open" string="In Progress" states="draft,pending" type="object" icon="gtk-go-forward"/>
                             <button name="case_pending" string="Pending" states="open" type="object" icon="gtk-media-pause"/>
-                            <button name="case_close" string="Hired" states="open,pending" type="object" icon="terp-partner"/>
+                            <button name="%(action_hr_recruitment_hired_employee)d" string="Hired" states="open,pending" type="action" icon="terp-partner"/>
                             <button name="case_reset" string="Reset to New" states="done,cancel" type="object" icon="gtk-convert"/>
                         </group>
                    </page>
diff --git a/addons/hr_recruitment/wizard/__init__.py b/addons/hr_recruitment/wizard/__init__.py
index c946ed7264f..acabd219857 100644
--- a/addons/hr_recruitment/wizard/__init__.py
+++ b/addons/hr_recruitment/wizard/__init__.py
@@ -22,6 +22,7 @@
 
 import hr_recruitment_phonecall
 import hr_recruitment_create_partner_job
+import hr_recruitment_employee_hired
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/hr_recruitment/wizard/hr_recruitment_employee_hired.py b/addons/hr_recruitment/wizard/hr_recruitment_employee_hired.py
new file mode 100644
index 00000000000..bcb5a5c2507
--- /dev/null
+++ b/addons/hr_recruitment/wizard/hr_recruitment_employee_hired.py
@@ -0,0 +1,61 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+from osv import osv, fields
+from tools.translate import _
+
+class hired_employee(osv.osv_memory):
+    _name = 'hired.employee'
+    _description = 'Create Employee'
+
+    def case_close(self, cr, uid,ids, context=None):
+        """
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of case's Ids
+        @param *args: Give Tuple Value
+        """
+        if context is None:
+            context = {}
+
+        hr_app = self.pool.get('hr.applicant')
+        hr_app.case_close(cr, uid,context.get('active_ids',False))
+        return {}
+
+    def case_close_without_emp(self, cr, uid,ids, context=None):
+        """
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of case's Ids
+        """
+        if context is None:
+            context = {}
+
+        hr_app = self.pool.get('hr.applicant')
+        hr_app.case_close_without_emp(cr, uid,context.get('active_ids',False))
+
+        return {}
+
+hired_employee()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_recruitment/wizard/hr_recruitment_employee_hired.xml b/addons/hr_recruitment/wizard/hr_recruitment_employee_hired.xml
new file mode 100644
index 00000000000..b447782719a
--- /dev/null
+++ b/addons/hr_recruitment/wizard/hr_recruitment_employee_hired.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <record id="view_hr_recruitment_hired_employee" model="ir.ui.view">
+            <field name="name">hr.recruitment.hired2employee.form</field>
+            <field name="model">hired.employee</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+            <form string="Create New Employee">
+                <group col="4" colspan="6">
+                    <separator string="Would you like to create an employee ?" colspan="4" />
+                    <newline />
+                </group>
+                <group col="3" colspan="4">
+                    <button special="cancel"  string="Cancel" icon='gtk-cancel'/>
+                    <button name="case_close_without_emp" string="No" icon='gtk-no' type="object"/>
+                    <button name="case_close" string="Yes" colspan="1" type="object" icon="terp-camera_test"/>
+                </group>
+            </form>
+            </field>
+        </record>
+        <record id="action_hr_recruitment_hired_employee" model="ir.actions.act_window">
+            <field name="name">Create Employee</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">hired.employee</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+
+    </data>
+</openerp>
\ No newline at end of file

From 670141cbf5e4089ebcd597ab21f2efe97409ce13 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Mon, 14 Mar 2011 11:44:31 +0100
Subject: [PATCH 021/331] [MERGE] cherry picking of revision 4425-4432 of
 lp:~openerp-dev/openobject-addons/trunk-dev2-hr-improvements

bzr revid: qdp-launchpad@openerp.com-20110314104431-xxyxcv7mercqqhzt
---
 addons/hr/hr.py                               | 33 ++++++++++++++-----
 addons/hr/hr_view.xml                         | 11 +++++--
 addons/hr_holidays/hr_holidays_data.xml       |  9 +++++
 addons/hr_holidays/hr_holidays_view.xml       | 12 +++----
 .../test/test_hr_recruitment.yml              |  1 +
 5 files changed, 49 insertions(+), 17 deletions(-)

diff --git a/addons/hr/hr.py b/addons/hr/hr.py
index 4a5529c11a4..d93c1ae3986 100644
--- a/addons/hr/hr.py
+++ b/addons/hr/hr.py
@@ -20,7 +20,7 @@
 ##############################################################################
 
 from osv import fields, osv
-
+import logging
 import addons
 
 class hr_employee_category(osv.osv):
@@ -154,7 +154,7 @@ class hr_employee(osv.osv):
         'work_email': fields.char('Work E-mail', size=240),
         'work_location': fields.char('Office Location', size=32),
         'notes': fields.text('Notes'),
-        'parent_id': fields.related('department_id', 'manager_id', relation='hr.employee', string='Manager', type='many2one', store=True, select=True, help="It is linked with manager of Department"),
+        'parent_id': fields.many2one('hr.employee', 'Manager'), 
         'category_ids': fields.many2many('hr.employee.category', 'employee_category_rel','category_id','emp_id','Category'),
         'child_ids': fields.one2many('hr.employee', 'parent_id', 'Subordinates'),
         'resource_id': fields.many2one('resource.resource', 'Resource', ondelete='cascade', required=True),
@@ -204,15 +204,8 @@ class hr_employee(osv.osv):
             level -= 1
         return True
 
-#    def _check_department_id(self, cr, uid, ids, context=None):
-#        for emp in self.browse(cr, uid, ids, context=context):
-#            if emp.department_id.manager_id and emp.id == emp.department_id.manager_id.id:
-#                return False
-#        return True
-
     _constraints = [
         (_check_recursion, 'Error ! You cannot create recursive Hierarchy of Employees.', ['parent_id']),
-#        (_check_department_id, 'Error ! You cannot select a department for which the employee is the manager.', ['department_id']),
     ]
 
 hr_employee()
@@ -227,4 +220,26 @@ class hr_department(osv.osv):
 
 hr_department()
 
+
+class res_users(osv.osv):
+    _name = 'res.users'
+    _inherit = 'res.users'
+
+    def create(self, cr, uid, data, context=None):
+        user_id = super(res_users, self).create(cr, uid, data, context=context)
+        data_obj = self.pool.get('ir.model.data')
+        try:
+            data_id = data_obj._get_id(cr, uid, 'hr', 'ir_ui_view_sc_employee')
+            view_id  = data_obj.browse(cr, uid, data_id, context=context).res_id
+            self.pool.get('ir.ui.view_sc').copy(cr, uid, view_id, default = {
+                                        'user_id': user_id}, context=context)
+        except:
+            # Tolerate a missing shortcut. See product/product.py for similar code.
+            logging.getLogger('orm').debug('Skipped meetings shortcut for user "%s"', data.get('name','<new'))
+            
+        return user_id
+
+res_users()
+
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index c2b738351aa..fcd0b6cc972 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -157,6 +157,13 @@
 
         <menuitem action="open_view_employee_list_my" id="menu_open_view_employee_list_my" sequence="3" parent="menu_hr_main"/>
 
+	    <record id="ir_ui_view_sc_employee" model="ir.ui.view_sc">
+	        <field name="name">Employees</field>
+	        <field name="resource">ir.ui.menu</field>
+	        <field name="user_id" ref="base.user_root"/>
+	        <field name="res_id" ref="hr.menu_open_view_employee_list_my"/>
+	    </record>
+
         <!--
         =======================
         Employee marital status
@@ -220,7 +227,7 @@
         </record>
 
         <record id="action2" model="ir.actions.act_window">
-            <field name="name">Employee Hierarchy</field>
+            <field name="name">Subordonate Hierarchy</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">hr.employee</field>
             <field name="domain">[('id','in',active_ids)]</field>
@@ -232,7 +239,7 @@
             <field eval="'action'" name="key"/>
             <field eval="'client_action_multi'" name="key2"/>
             <field eval="['hr.employee']" name="models"/>
-            <field name="name">Employees Hierarchy</field>
+            <field name="name">Subordonate Hierarchy</field>
             <field eval="'ir.actions.act_window,'+str(action2)" name="value"/>
             <field eval="True" name="isobject"/>
             <field eval="True" name="replace"/>
diff --git a/addons/hr_holidays/hr_holidays_data.xml b/addons/hr_holidays/hr_holidays_data.xml
index 4e3a79f18f1..aac3763c470 100644
--- a/addons/hr_holidays/hr_holidays_data.xml
+++ b/addons/hr_holidays/hr_holidays_data.xml
@@ -22,5 +22,14 @@
       <field name="color_name">red</field>
     </record>
 
+
+    <!-- Compensatory Days -->
+    <record model="hr.holidays.status" id="holiday_status_comp">
+      <field name="name">Compensatory Days</field>
+      <field name="limit">False</field>
+      <field name="color_name">brown</field>
+    </record>
+
+
   </data>
 </openerp>
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 481d8cf87e9..f21ccb52bf5 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -24,7 +24,7 @@
                                 help="My Leaves" />
                         </field>
                         <field name="department_id" widget="selection">
-                            <filter icon="terp-personal+" help="My Department Holidays"
+                            <filter icon="terp-personal+" help="My Department Leaves"
                                 domain="[('department_id.manager_id','=',uid)]" />
                         </field>
                         <field name="holiday_status_id" widget="selection"/>
@@ -70,7 +70,7 @@
                 <form string="Leave Request">
                     <group col="8" colspan="4">
                     <field name="name" attrs="{'readonly':[('state','!=','draft'),('state','!=','confirm')]}" />
-                    <field name="holiday_type" on_change="onchange_type(holiday_type)" attrs="{'readonly':[('state','!=','draft')]}" width="130" groups="base.group_hr_manager, base.group_extended" string="Leave Type"/>
+                    <field name="holiday_type" on_change="onchange_type(holiday_type)" attrs="{'readonly':[('state','!=','draft')]}" width="130" groups="base.group_hr_manager,base.group_extended"/>
                     <group attrs="{'invisible':[('holiday_type','=','employee')]}">
                         <field name="category_id"  attrs="{'required':[('holiday_type','=','category')], 'readonly':[('state','!=','draft')]}"/>
                         </group>
@@ -114,7 +114,7 @@
             <form string="Allocation Request">
                 <group col="8" colspan="4">
                     <field name="name" />
-                    <field name="holiday_type" on_change="onchange_type(holiday_type)" attrs="{'readonly':[('state','!=','draft')]}" string="Allocation Type" groups="base.group_hr_manager, base.group_extended"/>
+                    <field name="holiday_type" on_change="onchange_type(holiday_type)" attrs="{'readonly':[('state','!=','draft')]}" groups="base.group_hr_manager, base.group_extended"/>
                         <group attrs="{'invisible':[('holiday_type','=','category')]}">
                         <field name="employee_id" attrs="{'required':[('holiday_type','=','employee')]}"/>
                         </group>
@@ -250,7 +250,7 @@
 
         <!-- My leave dashboard -->
         <menuitem
-            name="Holidays"
+            name="Leaves"
             parent="hr.menu_hr_root"
             id="menu_open_ask_holidays"
             sequence="5"/>
@@ -412,7 +412,7 @@
             <field name="search_view_id" ref="view_hr_holidays_status_search"/>
         </record>
 
-        <menuitem sequence="3" id="hr.menu_open_view_attendance_reason_config" parent="hr.menu_hr_configuration" name="Holidays"/>
+        <menuitem sequence="3" id="hr.menu_open_view_attendance_reason_config" parent="hr.menu_hr_configuration" name="Leaves"/>
 
         <menuitem name="Leave Type"
             action="open_view_holiday_status"
@@ -433,7 +433,7 @@
         </record>
 
     <!--  Shortcuts -->
-        <act_window name="Holidays"
+        <act_window name="Leaves"
             domain="[('type','=','remove')]"
             context="{'search_default_employee_id': [active_id]}"
             res_model="hr.holidays"
diff --git a/addons/hr_recruitment/test/test_hr_recruitment.yml b/addons/hr_recruitment/test/test_hr_recruitment.yml
index ae322475a62..c805b38fcc8 100644
--- a/addons/hr_recruitment/test/test_hr_recruitment.yml
+++ b/addons/hr_recruitment/test/test_hr_recruitment.yml
@@ -34,6 +34,7 @@
     partner_name: Marion Jones
     partner_phone: '1111112223'
     response: 0.0
+    job_id: hr.job_jr_developers
     salary_expected: 0.0
     salary_proposed: 0.0
     stage_id: hr_recrutiment_stage_first0

From 1548e4af2145251a548169ed07f4aa4713d45b1f Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Mon, 14 Mar 2011 11:58:35 +0100
Subject: [PATCH 022/331] [MERGE] cherry picking of revision 4434-4443 of
 lp:~openerp-dev/openobject-addons/trunk-dev2-hr-improvements

bzr revid: qdp-launchpad@openerp.com-20110314105835-39g2ajzfhs8cco6q
---
 addons/hr/hr.py                               | 40 ++++++++++---------
 addons/hr/hr_view.xml                         | 11 ++---
 addons/hr_holidays/hr_holidays_data.xml       | 12 ++----
 addons/hr_holidays/hr_holidays_demo.xml       |  3 ++
 addons/hr_holidays/hr_holidays_view.xml       |  6 +--
 addons/hr_recruitment/hr_recruitment.py       | 21 +++++-----
 .../wizard/hr_recruitment_employee_hired.py   | 11 ++---
 .../wizard/hr_recruitment_employee_hired.xml  | 13 +++---
 addons/hr_timesheet/hr_timesheet_view.xml     |  2 +-
 .../hr_timesheet_sheet/hr_timesheet_sheet.py  |  2 +-
 .../hr_timesheet_sheet_view.xml               |  2 +-
 11 files changed, 57 insertions(+), 66 deletions(-)

diff --git a/addons/hr/hr.py b/addons/hr/hr.py
index d93c1ae3986..2a17a64097b 100644
--- a/addons/hr/hr.py
+++ b/addons/hr/hr.py
@@ -81,22 +81,20 @@ class hr_job(osv.osv):
     def _no_of_employee(self, cr, uid, ids, name, args, context=None):
         res = {}
         for job in self.browse(cr, uid, ids, context=context):
-            res[job.id] = len(job.employee_ids or [])
-        return res
-
-    def _no_of_recruitement(self, cr, uid, ids, name, args, context=None):
-        res = {}
-        for job in self.browse(cr, uid, ids, context=context):
-            res[job.id] = job.expected_employees - job.no_of_employee
+            nb_employees = len(job.employee_ids or [])
+            res[job.id] = {
+                'no_of_employee': nb_employees,
+                'expected_employees': nb_employees + job.no_of_recruitment,
+            }
         return res
 
     _name = "hr.job"
     _description = "Job Description"
     _columns = {
         'name': fields.char('Job Name', size=128, required=True, select=True),
-        'expected_employees': fields.integer('Expected Employees', help='Required number of Employees in total for that job.'),
-        'no_of_employee': fields.function(_no_of_employee, method=True, string="No of Employee", help='Number of employee with that job.'),
-        'no_of_recruitment': fields.function(_no_of_recruitement, method=True, string='Expected in Recruitment', readonly=True),
+        'expected_employees': fields.function(_no_of_employee, method=True, string='Expected Employees', help='Required number of Employees in total for that job.', multi="no_of_employee"),
+        'no_of_employee': fields.function(_no_of_employee, method=True, string="No of Employee", help='Number of employee with that job.', multi="no_of_employee"),
+        'no_of_recruitment': fields.float('Expected in Recruitment'),
         'employee_ids': fields.one2many('hr.employee', 'job_id', 'Employees'),
         'description': fields.text('Job Description'),
         'requirements': fields.text('Requirements'),
@@ -110,24 +108,23 @@ class hr_job(osv.osv):
         'state': 'open',
     }
 
-    def on_change_expected_employee(self, cr, uid, ids, expected_employee, no_of_employee, context=None):
+    def on_change_expected_employee(self, cr, uid, ids, no_of_recruitment, no_of_employee, context=None):
         if context is None:
             context = {}
-        result = {}
-        if expected_employee:
-            result['no_of_recruitment'] = expected_employee - no_of_employee
-        return {'value': result}
+        return {'value': {'expected_employees': no_of_recruitment + no_of_employee}}
 
     def job_old(self, cr, uid, ids, *args):
-        self.write(cr, uid, ids, {'state': 'old'})
+        self.write(cr, uid, ids, {'state': 'old', 'no_of_recruitment': 0})
         return True
 
     def job_recruitement(self, cr, uid, ids, *args):
-        self.write(cr, uid, ids, {'state': 'recruit'})
+        for job in self.browse(cr, uid, ids):
+            no_of_recruitment = job.no_of_recruitment == 0 and 1 or job.no_of_recruitment
+            self.write(cr, uid, [job.id], {'state': 'recruit', 'no_of_recruitment': no_of_recruitment})
         return True
 
     def job_open(self, cr, uid, ids, *args):
-        self.write(cr, uid, ids, {'state': 'open'})
+        self.write(cr, uid, ids, {'state': 'open', 'no_of_recruitment': 0})
         return True
 
 hr_job()
@@ -178,6 +175,13 @@ class hr_employee(osv.osv):
             address_id = address and address['default'] or False
         return {'value': {'address_id' : address_id}}
 
+    def onchange_department_id(self, cr, uid, ids, department_id, context=None):
+        value = {'parent_id': False}
+        if department_id:
+            department = self.pool.get('hr.department').browse(cr, uid, department_id)
+            value['parent_id'] = department.manager_id.id
+        return {'value': value}
+
     def onchange_user(self, cr, uid, ids, user_id, context=None):
         work_email = False
         if user_id:
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index fcd0b6cc972..e613bdf846d 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -28,7 +28,7 @@
                         <field name="company_id" widget="selection" groups="base.group_multi_company,base.group_extended" on_change="onchange_company(company_id)"/>
                         <field name="active" groups="base.group_extended"/>
                         <newline/>
-                        <field name="department_id" widget="selection" />
+                        <field name="department_id" widget="selection" on_change="onchange_department_id(department_id)" />
                         <field name="parent_id" />
                         </group>
                         <group colspan="2" col="1">
@@ -295,7 +295,7 @@
         </record>
 
         <menuitem action="open_view_categ_form" id="menu_view_employee_category_form"
-            parent="menu_view_employee_category_configuration_form" sequence="1" groups="base.group_extended"/>
+            parent="menu_view_employee_category_configuration_form" sequence="1"/>
 
         <record id="open_view_categ_tree" model="ir.actions.act_window">
             <field name="name">Categories structure</field>
@@ -321,7 +321,7 @@
             <field eval="True" name="object"/>
         </record>
 
-        <menuitem action="open_view_categ_tree" groups="base.group_extended"
+        <menuitem action="open_view_categ_tree" 
             id="menu_view_employee_category_tree" parent="hr.menu_view_employee_category_form"/>
 
         <record id="view_hr_job_form" model="ir.ui.view">
@@ -334,9 +334,10 @@
                     <field name="name" />
                     <field name="department_id" />
                     <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                    <field name="expected_employees" on_change="on_change_expected_employee(expected_employees,no_of_employee)"/>
+                    <newline/>
+                    <field name="no_of_recruitment" on_change="on_change_expected_employee(no_of_recruitment,no_of_employee)"/>
                     <field name="no_of_employee"/>
-                    <field name="no_of_recruitment"/>
+                    <field name="expected_employees"/>
                     </group>
                     <newline/>
                     <notebook colspan="4">
diff --git a/addons/hr_holidays/hr_holidays_data.xml b/addons/hr_holidays/hr_holidays_data.xml
index aac3763c470..825f8b672d2 100644
--- a/addons/hr_holidays/hr_holidays_data.xml
+++ b/addons/hr_holidays/hr_holidays_data.xml
@@ -4,20 +4,14 @@
 
     <!-- Casual leave -->
     <record model="hr.holidays.status" id="holiday_status_cl">
-      <field name="name">Casual Leave</field>
-      <field name="limit">True</field>
+      <field name="name">Legal Leaves</field>
+      <field name="limit">False</field>
       <field name="color_name">black</field>
     </record>
 
-    <!-- Legal Holidays -->
-    <record model="hr.holidays.status" id="holiday_status_sl">
-      <field name="name">Legal Holidays</field>
-      <field name="color_name">blue</field>
-    </record>
-
     <!-- Sick leave -->
     <record model="hr.holidays.status" id="holiday_status_sl">
-      <field name="name">Sick Leave</field>
+      <field name="name">Sick Leaves</field>
       <field name="limit">True</field>
       <field name="color_name">red</field>
     </record>
diff --git a/addons/hr_holidays/hr_holidays_demo.xml b/addons/hr_holidays/hr_holidays_demo.xml
index b4a971dc328..f68e3e01632 100644
--- a/addons/hr_holidays/hr_holidays_demo.xml
+++ b/addons/hr_holidays/hr_holidays_demo.xml
@@ -31,6 +31,9 @@
       <field name="employee_id" ref="hr.employee1"/>
     </record>
 
+    <workflow action="confirm" model="hr.holidays" ref="hr_holidays_employee1_allocation_cl"/>
+    <workflow action="validate" model="hr.holidays" ref="hr_holidays_employee1_allocation_cl"/>
+
     <workflow action="confirm" model="hr.holidays" ref="hr_holidays_employee1_sl"/>
     <workflow action="validate" model="hr.holidays" ref="hr_holidays_employee1_sl"/>
   </data>
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index f21ccb52bf5..5be1a3d24ab 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -70,7 +70,7 @@
                 <form string="Leave Request">
                     <group col="8" colspan="4">
                     <field name="name" attrs="{'readonly':[('state','!=','draft'),('state','!=','confirm')]}" />
-                    <field name="holiday_type" on_change="onchange_type(holiday_type)" attrs="{'readonly':[('state','!=','draft')]}" width="130" groups="base.group_hr_manager,base.group_extended"/>
+                    <field name="holiday_type" on_change="onchange_type(holiday_type)" attrs="{'readonly':[('state','!=','draft')]}" width="130" groups="base.group_hr_manager"/>
                     <group attrs="{'invisible':[('holiday_type','=','employee')]}">
                         <field name="category_id"  attrs="{'required':[('holiday_type','=','category')], 'readonly':[('state','!=','draft')]}"/>
                         </group>
@@ -94,7 +94,7 @@
                             <field name="state" colspan="2"/>
                             <group colspan="2" col="6">
                                 <button string="Refuse" name="refuse" states="confirm" type="workflow" icon="gtk-no" groups="base.group_hr_user,base.group_hr_manager"/>
-                                <button string="Submit to Manager" name="confirm" states="draft" type="workflow" icon="gtk-yes"/>
+                                <button string="Confirm" name="confirm" states="draft" type="workflow" icon="gtk-yes"/>
                                 <button string="Approve" name="validate" states="confirm" type="workflow" icon="gtk-apply" groups="base.group_hr_user"/>
                                 <button string="Approved" name="second_validate" states="validate1" type="workflow" icon="gtk-apply" groups="base.group_hr_user"/>
                                 <button string="Set to Draft" name="set_to_draft" states="refuse,validate,validate1" type="object" icon="gtk-convert" groups="base.group_hr_user"/>
@@ -114,7 +114,7 @@
             <form string="Allocation Request">
                 <group col="8" colspan="4">
                     <field name="name" />
-                    <field name="holiday_type" on_change="onchange_type(holiday_type)" attrs="{'readonly':[('state','!=','draft')]}" groups="base.group_hr_manager, base.group_extended"/>
+                    <field name="holiday_type" on_change="onchange_type(holiday_type)" attrs="{'readonly':[('state','!=','draft')]}" string="Allocation Category" groups="base.group_hr_manager"/>
                         <group attrs="{'invisible':[('holiday_type','=','category')]}">
                         <field name="employee_id" attrs="{'required':[('holiday_type','=','employee')]}"/>
                         </group>
diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index 6645a6f45c1..5fc979696ad 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -406,18 +406,13 @@ class hr_applicant(crm.crm_case, osv.osv):
         @param *args: Give Tuple Value
         """
         employee_obj = self.pool.get('hr.employee')
-        job_obj = self.pool.get('hr.job')
         res = super(hr_applicant, self).case_close(cr, uid, ids, *args)
         for (id, name) in self.name_get(cr, uid, ids):
             message = _("Applicant '%s' is being hired.") % name
             self.log(cr, uid, id, message)
-        applicant = self.browse(cr, uid, ids)[0]
-        if not applicant.job_id:
-            raise osv.except_osv(_('Warning!'),_('You must define job Id for Applicant !')) 
-        emp_id = employee_obj.create(cr,uid,{'name': applicant.name,'job_id': applicant.job_id.id})
         return res
 
-    def case_close_without_emp(self, cr, uid, ids, *args):
+    def case_close_with_emp(self, cr, uid, ids, *args):
         """
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
@@ -426,12 +421,14 @@ class hr_applicant(crm.crm_case, osv.osv):
         @param *args: Give Tuple Value
         """
         employee_obj = self.pool.get('hr.employee')
-        job_obj = self.pool.get('hr.job')
-        res = super(hr_applicant, self).case_close(cr, uid, ids, *args)
-        for (id, name) in self.name_get(cr, uid, ids):
-            message = _("Applicant '%s' is being hired.") % name
-            self.log(cr, uid, id, message)
-        return res
+        partner_obj = self.pool.get('res.partner')
+        address_id = False
+        applicant = self.browse(cr, uid, ids)[0]
+            self.pool.get('hr.job').write(cr, uid, [applicant.job_id.id], {'no_of_recruitment': applicant.job_id.no_of_recruitment - 1})
+                                                 'address_home_id': address_id,
+                                                 'department_id': applicant.department_id.id
+            raise osv.except_osv(_('Warning!'),_('You must define Applied Job for Applicant !'))
+        return self.case_close(cr, uid, ids, *args)
 
 
     def case_reset(self, cr, uid, ids, *args):
diff --git a/addons/hr_recruitment/wizard/hr_recruitment_employee_hired.py b/addons/hr_recruitment/wizard/hr_recruitment_employee_hired.py
index bcb5a5c2507..d11a1f16775 100644
--- a/addons/hr_recruitment/wizard/hr_recruitment_employee_hired.py
+++ b/addons/hr_recruitment/wizard/hr_recruitment_employee_hired.py
@@ -36,12 +36,10 @@ class hired_employee(osv.osv_memory):
         """
         if context is None:
             context = {}
-
-        hr_app = self.pool.get('hr.applicant')
-        hr_app.case_close(cr, uid,context.get('active_ids',False))
+        self.pool.get('hr.applicant').case_close(cr, uid,context.get('active_ids',[]))
         return {}
 
-    def case_close_without_emp(self, cr, uid,ids, context=None):
+    def case_close_with_emp(self, cr, uid,ids, context=None):
         """
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
@@ -50,10 +48,7 @@ class hired_employee(osv.osv_memory):
         """
         if context is None:
             context = {}
-
-        hr_app = self.pool.get('hr.applicant')
-        hr_app.case_close_without_emp(cr, uid,context.get('active_ids',False))
-
+        self.pool.get('hr.applicant').case_close_with_emp(cr, uid,context.get('active_ids', []))
         return {}
 
 hired_employee()
diff --git a/addons/hr_recruitment/wizard/hr_recruitment_employee_hired.xml b/addons/hr_recruitment/wizard/hr_recruitment_employee_hired.xml
index b447782719a..7a66d070291 100644
--- a/addons/hr_recruitment/wizard/hr_recruitment_employee_hired.xml
+++ b/addons/hr_recruitment/wizard/hr_recruitment_employee_hired.xml
@@ -8,15 +8,12 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
             <form string="Create New Employee">
-                <group col="4" colspan="6">
-                    <separator string="Would you like to create an employee ?" colspan="4" />
+                    <label string="Would you like to create an employee ?" colspan="4" />
+                    <separator string="" colspan="4"/>
                     <newline />
-                </group>
-                <group col="3" colspan="4">
                     <button special="cancel"  string="Cancel" icon='gtk-cancel'/>
-                    <button name="case_close_without_emp" string="No" icon='gtk-no' type="object"/>
-                    <button name="case_close" string="Yes" colspan="1" type="object" icon="terp-camera_test"/>
-                </group>
+                    <button name="case_close" string="No" icon='gtk-no' type="object"/>
+                    <button name="case_close_with_emp" string="Yes" colspan="1" type="object" icon="terp-camera_test"/>
             </form>
             </field>
         </record>
@@ -30,4 +27,4 @@
         </record>
 
     </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml
index 131148f373a..1a06b3b23bf 100644
--- a/addons/hr_timesheet/hr_timesheet_view.xml
+++ b/addons/hr_timesheet/hr_timesheet_view.xml
@@ -73,7 +73,7 @@
                     <group expand="0" string="Group By...">
                         <filter string="Users" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
                         <separator orientation="vertical"/>
-                        <filter string="Anlytic account" icon="terp-folder-green" domain="[]" context="{'group_by':'account_id'}"/>
+                        <filter string="Analytic account" icon="terp-folder-green" domain="[]" context="{'group_by':'account_id'}"/>
                         <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
                         <separator orientation="vertical"/>
                         <filter string="Date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/>
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
index 3a4c4e5e29d..34134942e0a 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
@@ -269,7 +269,7 @@ class hr_timesheet_sheet(osv.osv):
                 'draft': [('readonly', False)],
                 'new': [('readonly', False)]}
             ),
-        'attendances_ids' : one2many_mod2('hr.attendance', 'sheet_id', 'Attendances', readonly=True,),
+        'attendances_ids' : one2many_mod2('hr.attendance', 'sheet_id', 'Attendances'),
         'state' : fields.selection([
             ('new', 'New'),
             ('draft','Draft'),
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index 2409b3d86b3..6e645c8ac4c 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -144,7 +144,7 @@
                     </notebook>
                     <group col="6" colspan="4">
                         <field name="state"/>
-                        <button name="button_confirm" states="draft" string="Confirm" type="object" icon="terp-check"/>
+                        <button name="button_confirm" states="draft" string="Submit to Manager" type="object" icon="terp-check"/>
                         <button name="action_set_to_draft" states="done" string="Set to Draft" type="object" icon="terp-stock_effects-object-colorize"/>
                         <button name="cancel" states="confirm" string="Refuse" type="workflow" icon="gtk-cancel" groups="base.group_hr_user"/>
                         <button name="done" states="confirm" string="Approve" type="workflow" icon="terp-camera_test" groups="base.group_hr_user"/>

From 1bd8c14a326a684cc36445417fd6f765c9391f14 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Mon, 14 Mar 2011 12:10:01 +0100
Subject: [PATCH 023/331] [FIX] hr_recruitement: fixed syntax error due to
 cherry picking

bzr revid: qdp-launchpad@openerp.com-20110314111001-ott2if279azjqbmt
---
 addons/hr_recruitment/hr_recruitment.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index 5fc979696ad..f8b85f98b2f 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -424,9 +424,16 @@ class hr_applicant(crm.crm_case, osv.osv):
         partner_obj = self.pool.get('res.partner')
         address_id = False
         applicant = self.browse(cr, uid, ids)[0]
+        if applicant.partner_id:
+            address_id = partner_obj.address_get(cr, uid, [applicant.partner_id.id], ['contact'])['contact']
+        if applicant.job_id:
             self.pool.get('hr.job').write(cr, uid, [applicant.job_id.id], {'no_of_recruitment': applicant.job_id.no_of_recruitment - 1})
+            emp_id = employee_obj.create(cr,uid,{'name': applicant.partner_name or applicant.name,
+                                                 'job_id': applicant.job_id.id,
                                                  'address_home_id': address_id,
                                                  'department_id': applicant.department_id.id
+                                                 })
+        else:
             raise osv.except_osv(_('Warning!'),_('You must define Applied Job for Applicant !'))
         return self.case_close(cr, uid, ids, *args)
 

From 800c44769793f83ce9172f657fdaed39a546a056 Mon Sep 17 00:00:00 2001
From: Thibault Francois <tfr@openerp.com>
Date: Mon, 14 Mar 2011 17:00:46 +0100
Subject: [PATCH 024/331] [FIX] multiple id in partnership analysis

bzr revid: tfr@openerp.com-20110314160046-tynjher2jb7eq6ir
---
 .../crm_partner_assign/report/crm_partner_report.py   |  4 ++--
 .../report/crm_partner_report_view.xml                |  4 +++-
 .../crm_partner_assign/security/ir.model.access.csv   | 11 ++++++-----
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/addons/crm_partner_assign/report/crm_partner_report.py b/addons/crm_partner_assign/report/crm_partner_report.py
index 0fbd9e40694..10e74a34b76 100644
--- a/addons/crm_partner_assign/report/crm_partner_report.py
+++ b/addons/crm_partner_assign/report/crm_partner_report.py
@@ -49,7 +49,7 @@ class crm_partner_report_assign(osv.osv):
                 SELECT
                     p.id,
                     p.name,
-                    a.country_id,
+                    (SELECT country_id FROM res_partner_address a WHERE a.partner_id=p.id AND country_id is not null limit 1) as country_id,
                     p.grade_id,
                     p.user_id,
                     p.section_id,
@@ -57,7 +57,7 @@ class crm_partner_report_assign(osv.osv):
                     (SELECT count(id) FROM crm_lead WHERE partner_assigned_id=p.id) AS opp
                 FROM
                     res_partner p
-                    left join res_partner_address a on (p.id=a.partner_id)
+
             )""")
 
 crm_partner_report_assign()
diff --git a/addons/crm_partner_assign/report/crm_partner_report_view.xml b/addons/crm_partner_assign/report/crm_partner_report_view.xml
index 576019604fc..8ac65f6b57e 100644
--- a/addons/crm_partner_assign/report/crm_partner_report_view.xml
+++ b/addons/crm_partner_assign/report/crm_partner_report_view.xml
@@ -26,6 +26,8 @@
                             context="{'group_by':'section_id'}" />
                         <filter string="Grade" name="group_grade" icon="terp-stock_symbol-selection"
                             domain="[]" context="{'group_by':'grade_id'}" />
+                        <filter string="Name" name="" icon="terp-stock_symbol-selection"
+                            domain="[]" context="{'group_by':'name'}" />
                         <separator orientation="vertical" />
                   </group>
                </search>
@@ -54,7 +56,7 @@
        <!-- Leads by user and section Action -->
 
        <record id="action_report_crm_partner_assign" model="ir.actions.act_window">
-            <field name="name">Partner Assignment  Analysis</field>
+            <field name="name">Partnership Analysis</field>
             <field name="res_model">crm.partner.report.assign</field>
             <field name="context">{'search_default_group_country': 1, 'search_default_group_grade': 1, 'group_by_no_leaf':1,'group_by':[]}</field>
             <field name="view_mode">tree</field>
diff --git a/addons/crm_partner_assign/security/ir.model.access.csv b/addons/crm_partner_assign/security/ir.model.access.csv
index 79e7611eedb..d845765cbf3 100644
--- a/addons/crm_partner_assign/security/ir.model.access.csv
+++ b/addons/crm_partner_assign/security/ir.model.access.csv
@@ -1,5 +1,6 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_ crm_lead_report_assign"," crm.lead.report.assign","model_crm_lead_report_assign","base.group_sale_salesman",1,1,1,0
-"access_ crm_lead_report_assign_all","crm.lead.report.assign.all","model_crm_lead_report_assign","base.group_user",1,0,0,0
-"access_res_partner_grade","res.partner.grade","model_res_partner_grade","base.group_sale_salesman",1,1,1,0
-"access_res_partner_grade_manager","res.partner.grade.manager","model_res_partner_grade","base.group_sale_manager",1,1,1,1
+"id";"name";"model_id:id";"group_id:id";"perm_read";"perm_write";"perm_create";"perm_unlink"
+"access_ crm_lead_report_assign";" crm.lead.report.assign";"model_crm_lead_report_assign";"base.group_sale_salesman";1;1;1;0
+"access_ crm_lead_report_assign_all";"crm.lead.report.assign.all";"model_crm_lead_report_assign";"base.group_user";1;0;0;0
+"access_crm_partner_report";"crm.partner.report.assign.all";"model_crm_partner_report_assign";"base.group_sale_salesman";1;0;0;0
+"access_res_partner_grade";"res.partner.grade";"model_res_partner_grade";"base.group_sale_salesman";1;1;1;0
+"access_res_partner_grade_manager";"res.partner.grade.manager";"model_res_partner_grade";"base.group_sale_manager";1;1;1;1

From 8389acb3123ffd7ddd99a4d300921b26c37d2008 Mon Sep 17 00:00:00 2001
From: Thibault Francois <tfr@openerp.com>
Date: Tue, 15 Mar 2011 13:58:31 +0100
Subject: [PATCH 025/331] [FIX] red field

bzr revid: tfr@openerp.com-20110315125831-6iu67dryicrol1nm
---
 addons/crm/wizard/crm_send_email_view.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/crm/wizard/crm_send_email_view.xml b/addons/crm/wizard/crm_send_email_view.xml
index b9aa336cb28..d61c2a60878 100644
--- a/addons/crm/wizard/crm_send_email_view.xml
+++ b/addons/crm/wizard/crm_send_email_view.xml
@@ -53,7 +53,6 @@
                     <group colspan="4" col="2">
                     <field name="email_from"/>
                     <field name="reply_to"/>
-                    <field name="email_to" invisible="True" />
                     <field name="email_cc"/>
                     <field name="subject" />
                     <field name="html"/>

From f193393d01ab83b13978be2a5999499de34133db Mon Sep 17 00:00:00 2001
From: Thibault Francois <tfr@openerp.com>
Date: Tue, 15 Mar 2011 14:03:13 +0100
Subject: [PATCH 026/331] [fix] clean

bzr revid: tfr@openerp.com-20110315130313-yqgoo5h9r38bru42
---
 addons/crm/wizard/crm_send_email.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/crm/wizard/crm_send_email.py b/addons/crm/wizard/crm_send_email.py
index 344350b2baa..bde9ec1dc54 100644
--- a/addons/crm/wizard/crm_send_email.py
+++ b/addons/crm/wizard/crm_send_email.py
@@ -129,10 +129,11 @@ class crm_send_new_email(osv.osv_memory):
                 ref_id = hist.ref_id
                 case = case_pool.browse(cr, uid, res_id, context=context)
 
-            emails = re.findall(r'([^ ,<@]+@[^> ,]+)', obj.email_to or '')
             if context.get('mass_mail'):
                 email_temp = case.email_from and tools.ustr(case.email_from) or ''
                 emails = re.findall(r'([^ ,<@]+@[^> ,]+)', email_temp)
+            else:
+                emails = re.findall(r'([^ ,<@]+@[^> ,]+)', obj.email_to or '')
 
             email_cc = re.findall(r'([^ ,<@]+@[^> ,]+)', obj.email_cc or '')
 

From 84fca706818ecefe66088ca14edd06222325980d Mon Sep 17 00:00:00 2001
From: Thibault Francois <tfr@openerp.com>
Date: Wed, 16 Mar 2011 15:30:25 +0100
Subject: [PATCH 027/331] [ADD] Mass convert lead 2 opp

bzr revid: tfr@openerp.com-20110316143025-92c4khhhwjlc3c86
---
 addons/crm/wizard/crm_lead_to_opportunity.py  | 70 ++++++++++++++++++-
 .../wizard/crm_lead_to_opportunity_view.xml   | 37 ++++++++++
 addons/crm/wizard/crm_lead_to_partner.py      |  2 +-
 addons/crm/wizard/crm_merge_opportunities.py  |  3 +-
 4 files changed, 107 insertions(+), 5 deletions(-)

diff --git a/addons/crm/wizard/crm_lead_to_opportunity.py b/addons/crm/wizard/crm_lead_to_opportunity.py
index ead591d39c6..51d3c80a92e 100644
--- a/addons/crm/wizard/crm_lead_to_opportunity.py
+++ b/addons/crm/wizard/crm_lead_to_opportunity.py
@@ -130,6 +130,9 @@ Leads Could not convert into Opportunity"))
 
         @return : View dictionary opening the Opportunity form view
         """
+        if not context:
+            context = {}
+        
         record_id = context and context.get('active_ids') or False
         if not record_id:
             return {'type': 'ir.actions.act_window_close'}
@@ -154,7 +157,7 @@ Leads Could not convert into Opportunity"))
                 cr, uid, opportunity_view_tree, context=context).res_id
 
         for lead in leads.browse(cr, uid, record_id, context=context):
-            if(lead.section_id):
+            if lead.section_id:
                 stage_ids = self.pool.get('crm.case.stage').search(cr, uid, [('type','=','opportunity'),('sequence','>=',1), ('section_ids','=', lead.section_id.id)])
             else:
                 stage_ids = self.pool.get('crm.case.stage').search(cr, uid, [('type','=','opportunity'),('sequence','>=',1)])
@@ -166,7 +169,8 @@ Leads Could not convert into Opportunity"))
 
             partner_id = partner_ids and partner_ids[0] or data.partner_id.id
             self._convert(cr, uid, ids, lead, partner_id, stage_ids, context=context)
-            if data.name == 'merge':
+            #If we convert in mass, don't merge if there is no other opportunity but no warning
+            if data.name == 'merge' and (len(data.opportunity_ids) > 1 or not context.get('mass-convert') ): 
                 merge_obj = self.pool.get('crm.merge.opportunity')
                 self.write(cr, uid, ids, {'opportunity_ids' : [(6,0, [data.opportunity_ids[0].id])]}, context=context)
                 context.update({'lead_ids' : record_id})
@@ -189,4 +193,66 @@ Leads Could not convert into Opportunity"))
 
 crm_lead2opportunity_partner()
 
+class crm_lead2opportunity_mass_convert(osv.osv_memory):
+    _name = 'crm.lead2opportunity.partner.mass'
+    _description = 'Mass Lead To Opportunity Partner'
+    _inherit = 'crm.lead2opportunity.partner'
+    
+    
+    _columns = {
+            'user_ids':  fields.many2many('res.users', 'mass_convert_rel', 'user_id', 'wizard_id', 'Salesmans'),
+            'section_id': fields.many2one('crm.case.section', 'Sales Team'),
+              
+    }
+    
+    def mass_convert(self, cr, uid, ids, context=None):
+        lead_obj = self.pool.get('crm.lead')
+        if not context:
+            context = {}
+            
+        active_ids = context.get('active_ids')
+        data = self.browse(cr, uid, ids, context=context)[0]
+        
+        salesteam = data.section_id and data.section_id.id
+        if data.user_ids:
+            salesmans = map(lambda x : x.id, data.user_ids)
+            index = 0
+        else:
+            salesmans = False
+        
+        for lead_id in active_ids:
+            value = {}
+            if salesteam:
+                value['section_id'] = salesteam                
+            if salesmans:
+                value['user_id'] = salesmans[index]
+                index += 1
+                index = index < len(salesmans) and index or 0
+            if value:
+                lead_obj.write(cr, uid, [lead_id], value, context=context)
+                
+            context['active_ids'] = [lead_id]
+            value = self.default_get(cr, uid, ['partner_id', 'opportunity_ids'], context=context)
+            value['opportunity_ids'] = [(6, 0, value['opportunity_ids'])]
+            self.write(cr, uid, ids, value, context=context)
+            
+            self.action_apply(cr, uid, ids, context=context)
+            
+            
+                
+        models_data = self.pool.get('ir.model.data')
+        result = models_data._get_id(cr, uid, 'crm', 'view_crm_case_opportunities_filter')
+        opportunity_view_search = models_data.browse(cr, uid, result, context=context).res_id
+
+        return {
+            'name': _('Opportunity'),
+            'view_type': 'form',
+            'view_mode': 'tree,form',
+            'res_model': 'crm.lead',
+            'domain': [('type', '=', 'opportunity'), ('id', 'in', active_ids)],
+            'type': 'ir.actions.act_window',
+            'search_view_id': opportunity_view_search,
+        }
+    
+crm_lead2opportunity_mass_convert()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm/wizard/crm_lead_to_opportunity_view.xml b/addons/crm/wizard/crm_lead_to_opportunity_view.xml
index e86e14af218..833c04c3575 100644
--- a/addons/crm/wizard/crm_lead_to_opportunity_view.xml
+++ b/addons/crm/wizard/crm_lead_to_opportunity_view.xml
@@ -36,5 +36,42 @@
           </field>
        </record> 
 
+		<record id="view_crm_lead2opportunity_partner_mass" model="ir.ui.view">
+	          <field name="name">crm.lead2opportunity.partner.mass.form</field>
+	          <field name="model">crm.lead2opportunity.partner.mass</field>
+	          <field name="type">form</field>
+	          <field name="arch" type="xml">
+	               <form string="Convert to Opportunity">
+	                   
+	                        <field name="action"/>
+	                        <field name="name" colspan="4"/>
+	                        
+	                        <separator string="Assigned opportunities to" colspan="4" />
+							<field name="section_id" />
+							<group col="4" colspan="4">
+								<separator string="Select Salesman" colspan="4" />
+							</group>
+							<field name="user_ids" nolabel="1" colspan="4">
+								<tree>
+									<field name="name" />
+								</tree>
+							</field>
+	                        <separator string="" colspan="4" />
+	                        <group col="4" colspan="4">
+	                            <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+	                            <button name="mass_convert" string="Convert into Opportunities" type="object" icon="gtk-ok"/>
+	                        </group>
+	                  
+	              </form>
+	          </field>
+	       </record>
+	       
+	      <act_window id="action_crm_send_mass_convert"
+            multi="True"
+            key2="client_action_multi" name="Convert opportunities"
+            res_model="crm.lead2opportunity.partner.mass" src_model="crm.lead"
+            view_mode="form" target="new" view_type="form"
+            context="{'mass_convert' : True}"
+            view_id="view_crm_lead2opportunity_partner_mass"/> 
      </data>
 </openerp>
diff --git a/addons/crm/wizard/crm_lead_to_partner.py b/addons/crm/wizard/crm_lead_to_partner.py
index d7ef2800239..e44102bf6b7 100644
--- a/addons/crm/wizard/crm_lead_to_partner.py
+++ b/addons/crm/wizard/crm_lead_to_partner.py
@@ -71,7 +71,7 @@ class crm_lead2partner(osv.osv_memory):
         contact_obj = self.pool.get('res.partner.address')
         partner_id = False
 
-        data = context and context.get('active_ids', []) or []
+        data = list(context and context.get('active_ids', []) or [])
         res = super(crm_lead2partner, self).default_get(cr, uid, fields, context=context)
 
         for lead in lead_obj.browse(cr, uid, data, context=context):
diff --git a/addons/crm/wizard/crm_merge_opportunities.py b/addons/crm/wizard/crm_merge_opportunities.py
index 01407b9688d..4e87871d0a4 100644
--- a/addons/crm/wizard/crm_merge_opportunities.py
+++ b/addons/crm/wizard/crm_merge_opportunities.py
@@ -64,7 +64,6 @@ class crm_merge_opportunity(osv.osv_memory):
 
         lead_ids = context and context.pop('lead_ids', []) or []
 
-
         if len(op_ids) <= 1:
             raise osv.except_osv(_('Warning !'),_('Please select more than one opportunities.'))
 
@@ -77,7 +76,7 @@ class crm_merge_opportunity(osv.osv_memory):
         else:
             first_opportunity = opportunities_list[0]
             tail_opportunities = opportunities_list[1:]
-
+            
 
         data = {
                 'partner_id': self._get_first_not_null_id('partner_id', op_ids),  # !!

From e48220bf9d36d9c5aaebd0e16a112c41a165da99 Mon Sep 17 00:00:00 2001
From: Thibault Francois <tfr@openerp.com>
Date: Wed, 16 Mar 2011 15:36:16 +0100
Subject: [PATCH 028/331] [FIX] no warning in mass convert if merge

bzr revid: tfr@openerp.com-20110316143616-h5bs0klfnbqcd6ob
---
 addons/crm/wizard/crm_lead_to_opportunity.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/crm/wizard/crm_lead_to_opportunity.py b/addons/crm/wizard/crm_lead_to_opportunity.py
index 51d3c80a92e..ec342ab8245 100644
--- a/addons/crm/wizard/crm_lead_to_opportunity.py
+++ b/addons/crm/wizard/crm_lead_to_opportunity.py
@@ -170,7 +170,7 @@ Leads Could not convert into Opportunity"))
             partner_id = partner_ids and partner_ids[0] or data.partner_id.id
             self._convert(cr, uid, ids, lead, partner_id, stage_ids, context=context)
             #If we convert in mass, don't merge if there is no other opportunity but no warning
-            if data.name == 'merge' and (len(data.opportunity_ids) > 1 or not context.get('mass-convert') ): 
+            if data.name == 'merge' and (len(data.opportunity_ids) > 1 or not context.get('mass_convert') ): 
                 merge_obj = self.pool.get('crm.merge.opportunity')
                 self.write(cr, uid, ids, {'opportunity_ids' : [(6,0, [data.opportunity_ids[0].id])]}, context=context)
                 context.update({'lead_ids' : record_id})

From 0045ab984cbe31222a0eaff57335ffe583e34017 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Wed, 16 Mar 2011 19:23:56 +0100
Subject: [PATCH 029/331] [IMP] marketing_campaign: duplicate prevention for
 segments can now use a unique field set on the campaign

bzr revid: odo@openerp.com-20110316182356-r7xqcmz42se6n4ms
---
 .../marketing_campaign/marketing_campaign.py  | 58 ++++++++++++++++---
 1 file changed, 49 insertions(+), 9 deletions(-)

diff --git a/addons/marketing_campaign/marketing_campaign.py b/addons/marketing_campaign/marketing_campaign.py
index ab99a15f30b..15c86f5298e 100644
--- a/addons/marketing_campaign/marketing_campaign.py
+++ b/addons/marketing_campaign/marketing_campaign.py
@@ -93,7 +93,17 @@ class marketing_campaign(osv.osv):
 this campaign to be run"),
         'partner_field_id': fields.many2one('ir.model.fields', 'Partner Field',
                                             domain="[('model_id', '=', object_id), ('ttype', '=', 'many2one'), ('relation', '=', 'res.partner')]",
-                                            help="The generated workitems will be linked to the partner related to the record. If the record is the partner itself leave this field empty."),
+                                            help="The generated workitems will be linked to the partner related to the record. "\
+                                                  "If the record is the partner itself leave this field empty. "\
+                                                  "This is useful for reporting purposes, via the Campaign Analysis or Campaign Follow-up views."),
+        'unique_field_id': fields.many2one('ir.model.fields', 'Unique Field',
+                                            domain="[('model_id', '=', object_id), ('ttype', 'in', ['char','int','many2one','text','selection'])]",
+                                            help='If set, this field will help segments that work in "no duplicates" mode to avoid '\
+                                                 'selecting similar records twice. Similar records are records that have the same value for '\
+                                                 'this unique field. For example by choosing the "email_from" field for CRM Leads you would prevent '\
+                                                 'sending the same campaign to the same email address again. If not set, the "no duplicates" segments '\
+                                                 "will only avoid selecting the same record again if it entered the campaign previously. "\
+                                                 "Only easily comparable fields like textfields, integers, selections or single relationships may be used."),
         'mode': fields.selection([('test', 'Test Directly'),
                                 ('test_realtime', 'Test in Realtime'),
                                 ('manual', 'With Manual Confirmation'),
@@ -209,6 +219,30 @@ Normal - the campaign runs normally and automatically sends all emails and repor
     def copy(self, cr, uid, id, default=None, context=None):
         raise osv.except_osv(_("Operation not supported"), _("Sorry, campaign duplication is not supported at the moment."))
 
+    def _find_duplicate_workitems(self, cr, uid, record, campaign_rec, context=None):
+        """Finds possible duplicates workitems for a record in this campaign, based on a uniqueness
+           field.
+
+           :param record: browse_record to find duplicates workitems for.
+           :param campaign_rec: browse_record of campaign
+        """
+        Workitems = self.pool.get('marketing.campaign.workitem')
+        duplicate_workitem_domain = [('res_id','=', record.id),
+                                     ('campaign_id','=', campaign_rec.id)]
+        unique_field = campaign_rec.unique_field_id
+        if unique_field:
+            unique_value = getattr(record, unique_field.name, None)
+            if unique_value:
+                if unique_field.ttype == 'many2one':
+                    unique_value = unique_value.id
+                similar_res_ids = self.pool.get(campaign_rec.object_id.model).search(cr, uid,
+                                    [(unique_field.name, '=', unique_value)], context=context)
+                if similar_res_ids:
+                    duplicate_workitem_domain = [('res_id','in', similar_res_ids),
+                                                 ('campaign_id','=', campaign_rec.id)]
+        return Workitems.search(cr, uid, duplicate_workitem_domain, context=context)
+
+
 marketing_campaign()
 
 class marketing_campaign_segment(osv.osv):
@@ -227,13 +261,19 @@ class marketing_campaign_segment(osv.osv):
         'campaign_id': fields.many2one('marketing.campaign', 'Campaign', required=True, select=1, ondelete="cascade"),
         'object_id': fields.related('campaign_id','object_id', type='many2one', relation='ir.model', string='Resource'),
         'ir_filter_id': fields.many2one('ir.filters', 'Filter', ondelete="restrict",
-                            help="Filter to select the matching resource records that belong to this segment. New filters can be created and saved using the advanced search on the list view of the Resource. If no filter is set, all records are selected without filtering. The synchronization mode may also add a criterion to the filter."),
+                            help="Filter to select the matching resource records that belong to this segment. "\
+                                 "New filters can be created and saved using the advanced search on the list view of the Resource. "\
+                                 "If no filter is set, all records are selected without filtering. "\
+                                 "The synchronization mode may also add a criterion to the filter."),
         'sync_last_date': fields.datetime('Last Synchronization', help="Date on which this segment was synchronized last time (automatically or manually)"),
         'sync_mode': fields.selection([('create_date', 'Only records created after last sync'),
                                       ('write_date', 'Only records modified after last sync (no duplicates)'),
                                       ('all', 'All records (no duplicates)')],
                                       'Synchronization mode',
-                                      help="Determines an additional criterion to add to the filter when selecting new records to inject in the campaign."),
+                                      help="Determines an additional criterion to add to the filter when selecting new records to inject in the campaign. "\
+                                           '"No duplicates" prevents selecting records which have already entered the campaign previously.'\
+                                           'If the campaign has a "unique field" set, "no duplicates" will also prevent selecting records which have '\
+                                           'the same value for the unique field as other records that already entered the campaign.'),
         'state': fields.selection([('draft', 'Draft'),
                                    ('running', 'Running'),
                                    ('done', 'Done'),
@@ -302,6 +342,7 @@ class marketing_campaign_segment(osv.osv):
 
     def process_segment(self, cr, uid, segment_ids=None, context=None):
         Workitems = self.pool.get('marketing.campaign.workitem')
+        Campaigns = self.pool.get('marketing.campaign')
         if not segment_ids:
             segment_ids = self.search(cr, uid, [('state', '=', 'running')], context=context)
 
@@ -324,21 +365,20 @@ class marketing_campaign_segment(osv.osv):
             object_ids = model_obj.search(cr, uid, criteria, context=context)
 
             # XXX TODO: rewrite this loop more efficiently without doing 1 search per record!
-            for o_ids in model_obj.browse(cr, uid, object_ids, context=context):
-                # avoid duplicated workitem for the same resource
+            for record in model_obj.browse(cr, uid, object_ids, context=context):
+                # avoid duplicate workitem for the same resource
                 if segment.sync_mode in ('write_date','all'):
-                    wi_ids = Workitems.search(cr, uid, [('res_id','=',o_ids.id),('segment_id','=',segment.id)], context=context)
-                    if wi_ids:
+                    if Campaigns._find_duplicate_workitems(cr, uid, record, segment.campaign_id, context=context):
                         continue
 
                 wi_vals = {
                     'segment_id': segment.id,
                     'date': action_date,
                     'state': 'todo',
-                    'res_id': o_ids.id
+                    'res_id': record.id
                 }
 
-                partner = self.pool.get('marketing.campaign')._get_partner_for(segment.campaign_id, o_ids)
+                partner = self.pool.get('marketing.campaign')._get_partner_for(segment.campaign_id, record)
                 if partner:
                     wi_vals['partner_id'] = partner.id
 

From f74b1bafe0532507e436b6e4fada060d1e76c1f3 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Wed, 16 Mar 2011 19:29:03 +0100
Subject: [PATCH 030/331] [IMP] marketing_campaign: added unique field for
 duplicate prevention on the campaign form

bzr revid: odo@openerp.com-20110316182903-9qh08k4wu2wb14hr
---
 addons/marketing_campaign/marketing_campaign_view.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/marketing_campaign/marketing_campaign_view.xml b/addons/marketing_campaign/marketing_campaign_view.xml
index 89b459b8896..9390dc540d7 100644
--- a/addons/marketing_campaign/marketing_campaign_view.xml
+++ b/addons/marketing_campaign/marketing_campaign_view.xml
@@ -26,6 +26,7 @@
                         <separator string="Resource" colspan="2" />
                         <field name="object_id"/>
                         <field name="partner_field_id"/>
+                        <field name="unique_field_id"/>
                     </group>
                     <group colspan="2" col="2">
                         <separator string="Cost" colspan="2" />

From 04c0ae02bacccc3a262f8732c74a7f7ccaa829ae Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Fri, 18 Mar 2011 00:35:56 +0100
Subject: [PATCH 031/331] [IMP] email_template: moved templates menu out of
 configuration

bzr revid: odo@openerp.com-20110317233556-ciuuc81bcl21m21d
---
 addons/email_template/email_template_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/email_template/email_template_view.xml b/addons/email_template/email_template_view.xml
index 5da74772c44..7d2a5f7ad5c 100644
--- a/addons/email_template/email_template_view.xml
+++ b/addons/email_template/email_template_view.xml
@@ -201,7 +201,7 @@
         </record>
 
         <menuitem name="Email Templates" id="menu_email_template_all"
-            parent="menu_email_template_configuration" action="action_email_template_tree_all" />
+            parent="menu_email_template" action="action_email_template_tree_all" />
 
         <!-- Email Template menu in Tools -->
         <menuitem name="Email Templates" id="menu_email_template_all_tools"

From b2075cece27ad7af748d148c0c3c9240a9e124e0 Mon Sep 17 00:00:00 2001
From: Thibault Francois <tfr@openerp.com>
Date: Tue, 22 Mar 2011 13:02:41 +0100
Subject: [PATCH 032/331] [FIX] security ;

bzr revid: tfr@openerp.com-20110322120241-aa5ll265eksmzy3j
---
 .../crm_partner_assign/security/ir.model.access.csv  | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/crm_partner_assign/security/ir.model.access.csv b/addons/crm_partner_assign/security/ir.model.access.csv
index d845765cbf3..b5bb64ad3dd 100644
--- a/addons/crm_partner_assign/security/ir.model.access.csv
+++ b/addons/crm_partner_assign/security/ir.model.access.csv
@@ -1,6 +1,6 @@
-"id";"name";"model_id:id";"group_id:id";"perm_read";"perm_write";"perm_create";"perm_unlink"
-"access_ crm_lead_report_assign";" crm.lead.report.assign";"model_crm_lead_report_assign";"base.group_sale_salesman";1;1;1;0
-"access_ crm_lead_report_assign_all";"crm.lead.report.assign.all";"model_crm_lead_report_assign";"base.group_user";1;0;0;0
-"access_crm_partner_report";"crm.partner.report.assign.all";"model_crm_partner_report_assign";"base.group_sale_salesman";1;0;0;0
-"access_res_partner_grade";"res.partner.grade";"model_res_partner_grade";"base.group_sale_salesman";1;1;1;0
-"access_res_partner_grade_manager";"res.partner.grade.manager";"model_res_partner_grade";"base.group_sale_manager";1;1;1;1
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"access_ crm_lead_report_assign","crm.lead.report.assign","model_crm_lead_report_assign","base.group_sale_salesman",1,1,1,0
+"access_ crm_lead_report_assign_all","crm.lead.report.assign.all","model_crm_lead_report_assign","base.group_user",1,0,0,0
+"access_crm_partner_report","crm.partner.report.assign.all","model_crm_partner_report_assign","base.group_sale_salesman",1,0,0,0
+"access_res_partner_grade","res.partner.grade","model_res_partner_grade","base.group_sale_salesman",1,1,1,0
+"access_res_partner_grade_manager","res.partner.grade.manager","model_res_partner_grade","base.group_sale_manager",1,1,1,1

From 329d6814eb247c9d7c317996918c854477e54ae0 Mon Sep 17 00:00:00 2001
From: Thibault Francois <tfr@openerp.com>
Date: Wed, 23 Mar 2011 17:22:06 +0100
Subject: [PATCH 033/331] [IMP] apply patch from crm imp + history + subject

bzr revid: tfr@openerp.com-20110323162206-3k2xwpvral9lb66o
---
 addons/crm/crm_lead.py              | 10 +++++
 addons/crm/crm_lead_view.xml        | 59 +++++++++++++++--------------
 addons/crm/crm_opportunity_view.xml |  6 ++-
 addons/mail_gateway/mail_gateway.py |  2 +-
 4 files changed, 45 insertions(+), 32 deletions(-)

diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 7248c9f684c..b46bef7f003 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -97,6 +97,15 @@ class crm_lead(crm_case, osv.osv):
                         duration =  len(no_days)
                 res[lead.id][field] = abs(int(duration))
         return res
+    
+    def _get_email_subject(self, cr, uid, ids, fields, args, context=None):
+        res = {}
+        for obj in self.browse(cr, uid, ids, context=context):
+            res[obj.id] = ''
+            for msg in obj.message_ids:
+                if msg.history:
+                    res[obj.id] = msg.name
+        return res
 
     _columns = {
         # Overridden from res.partner.address:
@@ -149,6 +158,7 @@ class crm_lead(crm_case, osv.osv):
                                   \nWhen the case is over, the state is set to \'Done\'.\
                                   \nIf the case needs to be reviewed then the state is set to \'Pending\'.'), 
         'message_ids': fields.one2many('mailgate.message', 'res_id', 'Messages', domain=[('model','=',_name)]),
+        'subjects': fields.function(_get_email_subject, string='Subject of Email', method=True, type='char', size=64, store=True),
     }
     
 
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 564c9e35fce..bf9b6484a0a 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -168,7 +168,7 @@
                        <field colspan="4" name="email_cc" widget="char" size="512"/>
                    </group>
                     <field name="message_ids" colspan="4" nolabel="1" mode="tree,form">
-                        <tree string="Communication history">
+                        <tree string="History">
                             <field name="display_text" string="History Information"/>
                             <field name="history" invisible="1"/>
                             <button
@@ -177,34 +177,33 @@
                                 context="{'mail':'reply', 'model': 'crm.lead', 'include_original' : True}"
                                 icon="terp-mail-replied" type="action" />
                         </tree>
-                        <form string="Communication history">
-                            <group col="4" colspan="4">
-                                <field name="email_from"/>
-                                <field name="date"/>
-                                <field name="email_to" widget="char" size="512"/>
-                                <field name="email_cc" widget="char" size="512"/>
-                                <field name="name" colspan="4" widget="char" size="512"/>
-                                <field name="history" invisible="1"/>
-                            </group>
-                            <notebook colspan="4">
-                                <page string="Details">
-                                    <group attrs="{'invisible': [('history', '!=', True)]}">
-                                        <field name="description" colspan="4" nolabel="1" height="250"/>
-                                        <button colspan="4"
-                                            string="Reply"
-                                            name="%(crm.action_crm_send_mail)d"
-                                            context="{'mail':'reply', 'model': 'crm.lead', 'include_original' : True}"
-                                            icon="terp-mail-replied" type="action" />
-                                    </group>
-                                    <group attrs="{'invisible': [('history', '=', True)]}">
-                                        <field name="display_text" colspan="4" nolabel="1"  height="250"/>
-                                    </group>
-                                </page>
-                                <page string="Attachments">
-                                    <field name="attachment_ids" colspan="4" readonly="1" nolabel="1"/>
-                                </page>
-                            </notebook>
-                        </form>
+                            <form string="History">
+                                <group col="4" colspan="4">
+                                    <field name="email_from"/>
+                                    <field name="date"/>
+                                    <field name="email_to" size="512"/>
+                                    <field name="email_cc" size="512"/>
+                                    <field name="name" colspan="4" widget="char" attrs="{'invisible': [('history', '=', False)]}" size="512"/>
+                                    <field name="display_text" colspan="4"   attrs="{'invisible': [('history', '=', True)]}"/>
+                                    <field name="history" invisible="1"/>
+                                </group>
+                                <notebook colspan="4">
+                                    <page string="Details">
+                                        <field name="description" colspan="4" nolabel="1"/>
+                                        <group attrs="{'invisible': [('history', '!=', True)]}">
+                                            <button colspan="4"
+                                                    string="Reply"
+                                                    name="%(crm.action_crm_send_mail)d"
+                                                    context="{'mail':'reply', 'model': 'crm.lead', 'include_original' : True}"
+                                                    icon="terp-mail-replied" type="action" />
+                                            </group>
+
+                                    </page>
+                                    <page string="Attachments">
+                                        <field name="attachment_ids" colspan="4" readonly="1" nolabel="1"/>
+                                    </page>
+                                    </notebook>
+                                </form>
                     </field>
                     <button string="Add Internal Note"
                         name="%(crm.action_crm_add_note)d"
@@ -240,6 +239,7 @@
                 <field name="type_id" invisible="1"/>
                 <field name="referred" invisible="1"/>
                 <field name="channel_id" invisible="1"/>
+                <field name="subjects" invisible="1"/>
 
                 <field name="stage_id"/>
                 <button name="stage_previous" string="Previous Stage"
@@ -320,6 +320,7 @@
                         domain="[('user_id','=', False)]"
                         help="Unassigned Leads" />
                 </field>
+                <field name="subjects"/>
                 <field name="section_id" widget="selection"
                     context="{'invisible_section': False}">
                     <filter icon="terp-personal+" groups="base.group_extended"
diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index 977998ce6c0..fddb79b3ef1 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -173,8 +173,8 @@
                                         <field name="date"/>
                                         <field name="email_to" size="512"/>
                                         <field name="email_cc" size="512"/>
-                                        <field name="name" colspan="4" attrs="{'invisible': [('history', '=', True)]}"/>
-                                        <field name="display_text" colspan="4"   attrs="{'invisible': [('history', '=', False)]}"/>
+                                        <field name="name" colspan="4" widget="char" attrs="{'invisible': [('history', '=', False)]}" size="512"/>
+                                        <field name="display_text" colspan="4"   attrs="{'invisible': [('history', '=', True)]}"/>
                                         <field name="history" invisible="1"/>
                                     </group>
                                     <notebook colspan="4">
@@ -247,6 +247,7 @@
                         <field name="stage_id"/>
                         <field name="channel_id" invisible="1"/>
                         <field name="type_id" invisible="1"/>
+                        <field name="subjects" invisible="1"/>
                         <button name="stage_previous" string="Previous Stage"
                             states="open,pending" type="object" icon="gtk-go-back" />
                         <button name="stage_next" string="Next Stage"
@@ -326,6 +327,7 @@
                                 domain="[]"
                                 help="Show Sales Team"/>
                         </field>
+                        <field name="subjects"/>
                         <newline/>
                         <group  expand="0" string="Extended Filters..." groups="base.group_extended">
                               <field name="stage_id" widget="selection" domain="[('type', '=', 'opportunity')]"/>
diff --git a/addons/mail_gateway/mail_gateway.py b/addons/mail_gateway/mail_gateway.py
index ba6b07e5c54..ce6c475596f 100644
--- a/addons/mail_gateway/mail_gateway.py
+++ b/addons/mail_gateway/mail_gateway.py
@@ -251,7 +251,7 @@ class mailgate_message(osv.osv):
         for message in self.browse(cr, uid, ids, context=context):
             msg_txt = ''
             if message.history:
-                msg_txt += (message.email_from or '/') + _(' wrote on ') + format_date_tz(message.date, tz) + ':\n\t'
+                msg_txt += _('%s wrote on %s: \n Subject: %s \n\t') % (message.email_from or '/', format_date_tz(message.date, tz), message.name)
                 if message.description:
                     msg_txt += self.truncate_data(cr, uid, message.description, context=context)
             else:

From d2f7cd18108399153c8e11a07eb63861543c4bd5 Mon Sep 17 00:00:00 2001
From: Thibault Francois <tfr@openerp.com>
Date: Thu, 24 Mar 2011 15:34:28 +0100
Subject: [PATCH 034/331] [IMP] search on email

bzr revid: tfr@openerp.com-20110324143428-kamrtx5gsgzje4ez
---
 addons/crm/crm_lead.py | 50 ++++++++++++++++++++++++++----------------
 1 file changed, 31 insertions(+), 19 deletions(-)

diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index b46bef7f003..872556e2833 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -97,7 +97,18 @@ class crm_lead(crm_case, osv.osv):
                         duration =  len(no_days)
                 res[lead.id][field] = abs(int(duration))
         return res
-    
+
+    def _history_search(self, cr, uid, obj, name, args, context=None):
+        res = []
+        msg_obj = self.pool.get('mailgate.message')
+        message_ids = msg_obj.search(cr, uid, [('history','=',True), ('name', args[0][1], args[0][2])], context=context)
+        lead_ids = self.search(cr, uid, [('message_ids', 'in', message_ids)], context=context)
+
+        if lead_ids:
+            return [('id', 'in', lead_ids)]
+        else:
+            return [('id', '=', '0')]
+
     def _get_email_subject(self, cr, uid, ids, fields, args, context=None):
         res = {}
         for obj in self.browse(cr, uid, ids, context=context):
@@ -105,11 +116,12 @@ class crm_lead(crm_case, osv.osv):
             for msg in obj.message_ids:
                 if msg.history:
                     res[obj.id] = msg.name
+                    break
         return res
 
     _columns = {
         # Overridden from res.partner.address:
-        'partner_id': fields.many2one('res.partner', 'Partner', ondelete='set null', 
+        'partner_id': fields.many2one('res.partner', 'Partner', ondelete='set null',
             select=True, help="Optional linked partner, usually after conversion of the lead"),
 
         # From crm.case
@@ -133,7 +145,7 @@ class crm_lead(crm_case, osv.osv):
             domain="['|',('section_id','=',section_id),('section_id','=',False)]"),
         'channel_id': fields.many2one('res.partner.canal', 'Channel'),
 
-        'contact_name': fields.char('Contact Name', size=64), 
+        'contact_name': fields.char('Contact Name', size=64),
         'partner_name': fields.char("Customer Name", size=64,help='The name of the future partner that will be created while converting the into opportunity'),
         'optin': fields.boolean('Opt-In', help="If opt-in is checked, this contact has accepted to receive emails."),
         'optout': fields.boolean('Opt-Out', help="If opt-out is checked, this contact has refused to receive emails or unsubscribed to a campaign."),
@@ -156,11 +168,11 @@ class crm_lead(crm_case, osv.osv):
                                   help='The state is set to \'Draft\', when a case is created.\
                                   \nIf the case is in progress the state is set to \'Open\'.\
                                   \nWhen the case is over, the state is set to \'Done\'.\
-                                  \nIf the case needs to be reviewed then the state is set to \'Pending\'.'), 
+                                  \nIf the case needs to be reviewed then the state is set to \'Pending\'.'),
         'message_ids': fields.one2many('mailgate.message', 'res_id', 'Messages', domain=[('model','=',_name)]),
-        'subjects': fields.function(_get_email_subject, string='Subject of Email', method=True, type='char', size=64, store=True),
+        'subjects': fields.function(_get_email_subject, fnct_search=_history_search, string='Subject of Email', method=True, type='char', size=64),
     }
-    
+
 
     _defaults = {
         'active': lambda *a: 1,
@@ -173,8 +185,8 @@ class crm_lead(crm_case, osv.osv):
         'priority': lambda *a: crm.AVAILABLE_PRIORITIES[2][0],
         #'stage_id': _get_stage_id,
     }
-    
-    
+
+
 
     def onchange_partner_address_id(self, cr, uid, ids, add, email=False):
         """This function returns value of partner email based on Partner Address
@@ -199,10 +211,10 @@ class crm_lead(crm_case, osv.osv):
         @param *args: Give Tuple Value
         """
         leads = self.browse(cr, uid, ids)
-        
-        
-        
-        for i in xrange(0, len(ids)): 
+
+
+
+        for i in xrange(0, len(ids)):
             if leads[i].state == 'draft':
                 value = {}
                 if not leads[i].stage_id :
@@ -213,7 +225,7 @@ class crm_lead(crm_case, osv.osv):
             self.log_open( cr, uid, leads[i])
         res = super(crm_lead, self).case_open(cr, uid, ids, *args)
         return res
-        
+
     def log_open(self, cr, uid, case):
         if case.type == 'lead':
             message = _("The lead '%s' has been opened.") % case.name
@@ -283,10 +295,10 @@ class crm_lead(crm_case, osv.osv):
     def write(self, cr, uid, ids, vals, context=None):
         if not context:
             context = {}
-            
+
         if 'date_closed' in vals:
             return super(crm_lead,self).write(cr, uid, ids, vals, context=context)
-            
+
         if 'stage_id' in vals and vals['stage_id']:
             stage_obj = self.pool.get('crm.case.stage').browse(cr, uid, vals['stage_id'], context=context)
             self.history(cr, uid, ids, _("Changed Stage to: ") + stage_obj.name, details=_("Changed Stage to: ") + stage_obj.name)
@@ -298,7 +310,7 @@ class crm_lead(crm_case, osv.osv):
                     message = _("The stage of opportunity '%s' has been changed to '%s'.") % (case.name, stage_obj.name)
                 self.log(cr, uid, case.id, message)
         return super(crm_lead,self).write(cr, uid, ids, vals, context)
-    
+
     def stage_next(self, cr, uid, ids, context=None):
         stage = super(crm_lead, self).stage_next(cr, uid, ids, context=context)
         if stage:
@@ -307,7 +319,7 @@ class crm_lead(crm_case, osv.osv):
                 data = {'probability': stage_obj.probability}
                 self.write(cr, uid, ids, data)
         return stage
-        
+
     def stage_previous(self, cr, uid, ids, context=None):
         stage = super(crm_lead, self).stage_previous(cr, uid, ids, context=context)
         if stage:
@@ -317,7 +329,7 @@ class crm_lead(crm_case, osv.osv):
                 self.write(cr, uid, ids, data)
         return stage
 
-    
+
     def message_new(self, cr, uid, msg, context=None):
         """
         Automatically calls when new email message arrives
@@ -367,7 +379,7 @@ class crm_lead(crm_case, osv.osv):
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
-        @param ids: List of update mail’s IDs 
+        @param ids: List of update mail’s IDs
         """
         if isinstance(ids, (str, int, long)):
             ids = [ids]

From 3c56db725138951c91cc1db2331b5072acca59a4 Mon Sep 17 00:00:00 2001
From: Thibault Francois <tfr@openerp.com>
Date: Thu, 24 Mar 2011 17:09:29 +0100
Subject: [PATCH 035/331] [FIX] assign random contact : not anymore

bzr revid: tfr@openerp.com-20110324160929-2xqdk28abdzi8sol
---
 addons/crm/wizard/crm_lead_to_opportunity.py | 36 +++++++++++---------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/addons/crm/wizard/crm_lead_to_opportunity.py b/addons/crm/wizard/crm_lead_to_opportunity.py
index ec342ab8245..e41e92d0929 100644
--- a/addons/crm/wizard/crm_lead_to_opportunity.py
+++ b/addons/crm/wizard/crm_lead_to_opportunity.py
@@ -96,7 +96,9 @@ Leads Could not convert into Opportunity"))
 
     def _convert(self, cr, uid, ids, lead, partner_id, stage_ids, context=None):
         leads = self.pool.get('crm.lead')
-        address_id = self.pool.get('res.partner.address').search(cr, uid,
+        address_id = False
+        if partner_id:
+            address_id = self.pool.get('res.partner.address').search(cr, uid,
                                                                  [('partner_id', '=', partner_id)],
                                                                  order='create_date desc',
                                                                  limit=1)
@@ -132,7 +134,7 @@ Leads Could not convert into Opportunity"))
         """
         if not context:
             context = {}
-        
+
         record_id = context and context.get('active_ids') or False
         if not record_id:
             return {'type': 'ir.actions.act_window_close'}
@@ -170,7 +172,7 @@ Leads Could not convert into Opportunity"))
             partner_id = partner_ids and partner_ids[0] or data.partner_id.id
             self._convert(cr, uid, ids, lead, partner_id, stage_ids, context=context)
             #If we convert in mass, don't merge if there is no other opportunity but no warning
-            if data.name == 'merge' and (len(data.opportunity_ids) > 1 or not context.get('mass_convert') ): 
+            if data.name == 'merge' and (len(data.opportunity_ids) > 1 or not context.get('mass_convert') ):
                 merge_obj = self.pool.get('crm.merge.opportunity')
                 self.write(cr, uid, ids, {'opportunity_ids' : [(6,0, [data.opportunity_ids[0].id])]}, context=context)
                 context.update({'lead_ids' : record_id})
@@ -197,49 +199,49 @@ class crm_lead2opportunity_mass_convert(osv.osv_memory):
     _name = 'crm.lead2opportunity.partner.mass'
     _description = 'Mass Lead To Opportunity Partner'
     _inherit = 'crm.lead2opportunity.partner'
-    
-    
+
+
     _columns = {
             'user_ids':  fields.many2many('res.users', 'mass_convert_rel', 'user_id', 'wizard_id', 'Salesmans'),
             'section_id': fields.many2one('crm.case.section', 'Sales Team'),
-              
+
     }
-    
+
     def mass_convert(self, cr, uid, ids, context=None):
         lead_obj = self.pool.get('crm.lead')
         if not context:
             context = {}
-            
+
         active_ids = context.get('active_ids')
         data = self.browse(cr, uid, ids, context=context)[0]
-        
+
         salesteam = data.section_id and data.section_id.id
         if data.user_ids:
             salesmans = map(lambda x : x.id, data.user_ids)
             index = 0
         else:
             salesmans = False
-        
+
         for lead_id in active_ids:
             value = {}
             if salesteam:
-                value['section_id'] = salesteam                
+                value['section_id'] = salesteam
             if salesmans:
                 value['user_id'] = salesmans[index]
                 index += 1
                 index = index < len(salesmans) and index or 0
             if value:
                 lead_obj.write(cr, uid, [lead_id], value, context=context)
-                
+
             context['active_ids'] = [lead_id]
             value = self.default_get(cr, uid, ['partner_id', 'opportunity_ids'], context=context)
             value['opportunity_ids'] = [(6, 0, value['opportunity_ids'])]
             self.write(cr, uid, ids, value, context=context)
-            
+
             self.action_apply(cr, uid, ids, context=context)
-            
-            
-                
+
+
+
         models_data = self.pool.get('ir.model.data')
         result = models_data._get_id(cr, uid, 'crm', 'view_crm_case_opportunities_filter')
         opportunity_view_search = models_data.browse(cr, uid, result, context=context).res_id
@@ -253,6 +255,6 @@ class crm_lead2opportunity_mass_convert(osv.osv_memory):
             'type': 'ir.actions.act_window',
             'search_view_id': opportunity_view_search,
         }
-    
+
 crm_lead2opportunity_mass_convert()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From 878a554bdbba728ffe2d16fe014e5baf36d893d4 Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stephane@openerp.com>
Date: Thu, 17 Mar 2011 11:24:58 +0100
Subject: [PATCH 036/331] [IMP] sort the analytic account by the name

bzr revid: stephane@openerp.com-20110317102458-mdik9wimoxgo9m1j
---
 addons/analytic/analytic.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/analytic/analytic.py b/addons/analytic/analytic.py
index 124607112a9..109b34590e7 100644
--- a/addons/analytic/analytic.py
+++ b/addons/analytic/analytic.py
@@ -186,7 +186,8 @@ class account_analytic_account(osv.osv):
     def check_recursion(self, cr, uid, ids, parent=None):
         return super(account_analytic_account, self)._check_recursion(cr, uid, ids, parent=parent)
 
-    _order = 'date_start desc,parent_id desc,code'
+    #_order = 'date_start desc,parent_id desc,code'
+    _order = 'name asc'
     _constraints = [
         (check_recursion, 'Error! You can not create recursive analytic accounts.', ['parent_id']),
         (check_currency, 'Error! The currency has to be the same as the currency of the selected company', ['currency_id', 'company_id']),

From 1984fc62cb3a96412b10337e43a2a56914fb3b07 Mon Sep 17 00:00:00 2001
From: "ARA (OpenERP)" <ara@tinyerp.com>
Date: Thu, 17 Mar 2011 19:04:19 +0530
Subject: [PATCH 037/331] [FIX] account: journal seqence not respected

lp bug: https://launchpad.net/bugs/726092 fixed

bzr revid: ara@tinyerp.com-20110317133419-87dwll6uv39lw3cl
---
 addons/account/account_cash_statement.py | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/addons/account/account_cash_statement.py b/addons/account/account_cash_statement.py
index ff0f0117ff5..04e780ade30 100644
--- a/addons/account/account_cash_statement.py
+++ b/addons/account/account_cash_statement.py
@@ -320,6 +320,7 @@ class account_cash_statement(osv.osv):
         """ Changes statement state to Running.
         @return: True
         """
+        obj_seq = self.pool.get('ir.sequence')
         if context is None:
             context = {}
         statement_pool = self.pool.get('account.bank.statement')
@@ -329,15 +330,18 @@ class account_cash_statement(osv.osv):
                 raise osv.except_osv(_('Error !'), (_('User %s does not have rights to access %s journal !') % (statement.user_id.name, statement.journal_id.name)))
 
             if statement.name and statement.name == '/':
-                number = self.pool.get('ir.sequence').get(cr, uid, 'account.cash.statement')
+                if statement.journal_id.sequence_id:
+                    c = {'fiscalyear_id': statement.period_id.fiscalyear_id.id}
+                    st_number = obj_seq.get_id(cr, uid, statement.journal_id.sequence_id.id, context=c)
+                else:
+                    st_number = obj_seq.get(cr, uid, 'account.cash.statement')
                 vals.update({
-                    'name': number
+                    'name': st_number
                 })
 
             vals.update({
                 'date': time.strftime("%Y-%m-%d %H:%M:%S"),
                 'state': 'open',
-
             })
             self.write(cr, uid, [statement.id], vals, context=context)
         return True

From e767f08a8590b7a5b29fd9b6d5c9bec6e0a8d032 Mon Sep 17 00:00:00 2001
From: "Jay (OpenERP)" <jvo@openerp.com>
Date: Mon, 21 Mar 2011 15:46:37 +0530
Subject: [PATCH 038/331] [FIX] Audittrail : System was crashing if I audit
 Users (ref : 4527)

bzr revid: jvo@openerp.com-20110321101637-5h0ir8ew1jg0j817
---
 addons/audittrail/audittrail.py | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/addons/audittrail/audittrail.py b/addons/audittrail/audittrail.py
index 2f769246bcf..f280dd0ab36 100644
--- a/addons/audittrail/audittrail.py
+++ b/addons/audittrail/audittrail.py
@@ -404,13 +404,16 @@ class audittrail_objects_proxy(object_proxy):
             cr.close()
             return res
         else:
-            res_ids = args[0]
-            old_values = {}
-            fields = []
-            if len(args)>1 and type(args[1]) == dict:
-                fields = args[1].keys()
-            if type(res_ids) in (long, int):
-                res_ids = [res_ids]
+            res_ids = []
+            res = True
+            if args:
+                res_ids = args[0]
+                old_values = {}
+                fields = []
+                if len(args)>1 and type(args[1]) == dict:
+                    fields = args[1].keys()
+                if type(res_ids) in (long, int):
+                    res_ids = [res_ids]
             if res_ids:
                 for resource in resource_pool.read(cr, uid, res_ids):
                     resource_id = resource['id']

From f7505ecfca955ddf264c14f3cec0d8b6fd8a7c54 Mon Sep 17 00:00:00 2001
From: "Anup (OpenERP)" <ach@tinyerp.com>
Date: Mon, 21 Mar 2011 16:35:19 +0530
Subject: [PATCH 039/331] [FIX] account_budget : Reports were crashing due to
 Analytic Account not being mandatory, Fixed it.(Support Case 4577)

bzr revid: ach@tinyerp.com-20110321110519-8nh05bh8z0bwqjrq
---
 addons/account_budget/account_budget.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account_budget/account_budget.py b/addons/account_budget/account_budget.py
index d8616a94ebf..12caba17374 100644
--- a/addons/account_budget/account_budget.py
+++ b/addons/account_budget/account_budget.py
@@ -190,7 +190,7 @@ class crossovered_budget_lines(osv.osv):
     _description = "Budget Line"
     _columns = {
         'crossovered_budget_id': fields.many2one('crossovered.budget', 'Budget', ondelete='cascade', select=True, required=True),
-        'analytic_account_id': fields.many2one('account.analytic.account', 'Analytic Account',required=False),
+        'analytic_account_id': fields.many2one('account.analytic.account', 'Analytic Account',required=True),
         'general_budget_id': fields.many2one('account.budget.post', 'Budgetary Position',required=True),
         'date_from': fields.date('Start Date', required=True),
         'date_to': fields.date('End Date', required=True),

From 7e7369face30eb90153f7c8d15ee7ec0f35a7742 Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stephane@openerp.com>
Date: Mon, 28 Mar 2011 11:45:48 +0200
Subject: [PATCH 040/331] [IMP] set assign_to when the state is open [FIX]
 Recompute the working days [IMP] Add an onchange event on the project, to
 assign the project manager for the user_id field [FIX] Review the reports for
 the project.issue [FIX] Use avg instead of sum for the working days [IMP]
 Raise a warning if the analytic account is in pending [FIX] Use the
 assigned_To user for the worklogs

bzr revid: stephane@openerp.com-20110328094548-pdzuc4ukf8n7743p
---
 addons/project_issue/project_issue.py         | 32 +++++++++++++------
 addons/project_issue/project_issue_view.xml   |  2 +-
 .../report/project_issue_report.py            |  4 +--
 .../report/project_issue_report_view.xml      |  4 +--
 .../project_issue_sheet.py                    | 22 +++++++++++--
 .../project_issue_sheet_view.xml              |  9 +++---
 6 files changed, 52 insertions(+), 21 deletions(-)

diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index b4ec852a558..2f3abaf6e6f 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -56,7 +56,7 @@ class project_issue(crm.crm_case, osv.osv):
         """
 
         res = super(project_issue, self).case_open(cr, uid, ids, *args)
-        self.write(cr, uid, ids, {'date_open': time.strftime('%Y-%m-%d %H:%M:%S')})
+        self.write(cr, uid, ids, {'date_open': time.strftime('%Y-%m-%d %H:%M:%S'), 'assigned_to' : uid})
         for (id, name) in self.name_get(cr, uid, ids):
             message = _("Issue '%s' has been opened.") % name
             self.log(cr, uid, id, message)
@@ -205,14 +205,14 @@ class project_issue(crm.crm_case, osv.osv):
         'duration': fields.float('Duration'),
         'task_id': fields.many2one('project.task', 'Task', domain="[('project_id','=',project_id)]"),
         'day_open': fields.function(_compute_day, string='Days to Open', \
-                                method=True, multi='day_open', type="float", store=True),
+                                method=True, multi='compute_day', type="float", store=True),
         'day_close': fields.function(_compute_day, string='Days to Close', \
-                                method=True, multi='day_close', type="float", store=True),
-        'assigned_to': fields.many2one('res.users', 'Assigned to', required=True, select=1),
+                                method=True, multi='compute_day', type="float", store=True),
+        'assigned_to': fields.many2one('res.users', 'Assigned to', required=False, select=1),
         'working_hours_open': fields.function(_compute_day, string='Working Hours to Open the Issue', \
-                                method=True, multi='working_days_open', type="float", store=True),
+                                method=True, multi='compute_day', type="float", store=True),
         'working_hours_close': fields.function(_compute_day, string='Working Hours to Close the Issue', \
-                                method=True, multi='working_days_close', type="float", store=True),
+                                method=True, multi='compute_day', type="float", store=True),
         'message_ids': fields.one2many('mailgate.message', 'res_id', 'Messages', domain=[('model','=',_name)]),
         'date_action_last': fields.datetime('Last Action', readonly=1),
         'date_action_next': fields.datetime('Next Action', readonly=1),
@@ -230,18 +230,30 @@ class project_issue(crm.crm_case, osv.osv):
             return user.context_project_id.id
         return False
 
+    def on_change_project(self, cr, uid, ids, project_id, context=None):
+        result = {}
+
+        if project_id:
+            project = self.pool.get('project.project').browse(cr, uid, project_id, context=context)
+            if project.user_id:
+                result['value'] = {'user_id' : project.user_id.id}
+
+        return result
+
+
     _defaults = {
         'active': 1,
-        'user_id': crm.crm_case._get_default_user,
+        #'user_id': crm.crm_case._get_default_user,
         'partner_id': crm.crm_case._get_default_partner,
         'partner_address_id': crm.crm_case._get_default_partner_address,
-        'email_from': crm.crm_case. _get_default_email,
+        'email_from': crm.crm_case._get_default_email,
         'state': 'draft',
-        'section_id': crm.crm_case. _get_section,
+        'section_id': crm.crm_case._get_section,
         'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'crm.helpdesk', context=c),
         'priority': crm.AVAILABLE_PRIORITIES[2][0],
         'project_id':_get_project,
-        'assigned_to' : lambda obj, cr, uid, context: uid,
+        'categ_id' : lambda *a: False,
+        #'assigned_to' : lambda obj, cr, uid, context: uid,
     }
 
     def convert_issue_task(self, cr, uid, ids, context=None):
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 36fee3f661c..2224527e9d2 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -53,7 +53,7 @@
                 <form string="Issue Tracker Form">
                     <group colspan="4" col="6">
                         <field name="name"/>
-                        <field name="project_id" required="True"/>
+                        <field name="project_id" required="True" on_change="on_change_project(project_id)"/>
                         <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'project.issue')]"/>
                         <field name="user_id" invisible="1" />
                         <field name="assigned_to"/>
diff --git a/addons/project_issue/report/project_issue_report.py b/addons/project_issue/report/project_issue_report.py
index d6f8cae363b..e877ebbbb4a 100644
--- a/addons/project_issue/report/project_issue_report.py
+++ b/addons/project_issue/report/project_issue_report.py
@@ -101,11 +101,11 @@ class project_issue_report(osv.osv):
                     c.task_id,
                     date_trunc('day',c.create_date) as create_date,
                     extract('epoch' from (c.date_open-c.create_date))/(3600*24) as  delay_open,
-                    extract('epoch' from (c.date_closed-c.create_date))/(3600*24) as  delay_close,
+                    extract('epoch' from (c.date_closed-c.date_open))/(3600*24) as  delay_close,
                     (SELECT count(id) FROM mailgate_message WHERE model='project.issue' AND res_id=c.id) AS email
                 FROM
                     project_issue c
-                WHERE c.categ_id IN (select res_id from ir_model_data WHERE model = 'crm.case.categ' and name='bug_categ')
+                WHERE c.categ_id IN (select id from crm_case_categ where object_id in (select id from ir_model where model = 'project.issue'))
             )""")
 
 project_issue_report()
diff --git a/addons/project_issue/report/project_issue_report_view.xml b/addons/project_issue/report/project_issue_report_view.xml
index 4ca0fbf2279..015a7750548 100644
--- a/addons/project_issue/report/project_issue_report_view.xml
+++ b/addons/project_issue/report/project_issue_report_view.xml
@@ -28,8 +28,8 @@
                     <field name="nbr" string="#Project Issues" sum='#Number of Project Issues'/>
                     <field name="delay_open" avg='Avg Opening Delay'/>
                     <field name="delay_close" avg='Avg Closing Delay'/>
-                    <field name="working_hours_open" sum='Open Working Hours'/>
-                    <field name="working_hours_close" sum='Close Working hours'/>
+                    <field name="working_hours_open" avg='Open Working Hours'/>
+                    <field name="working_hours_close" avg='Close Working hours'/>
                     <field name="email" sum='# Emails'/>
                   </tree>
             </field>
diff --git a/addons/project_issue_sheet/project_issue_sheet.py b/addons/project_issue_sheet/project_issue_sheet.py
index ed14fc99177..e9396f9d030 100644
--- a/addons/project_issue_sheet/project_issue_sheet.py
+++ b/addons/project_issue_sheet/project_issue_sheet.py
@@ -33,13 +33,31 @@ class project_issue(osv.osv):
     def on_change_project(self, cr, uid, ids, project_id, context=None):
         if not project_id:
             return {}
+
+        result = super(project_issue, self).on_change_project(cr, uid, ids, project_id, context=context)
+        
         project = self.pool.get('project.project').browse(cr, uid, project_id, context=context)
+        if 'value' not in result:
+            result['value'] = {}
+
         account = project.analytic_account_id
         if account:
-            return {'value' : {'analytic_account_id' : account.id}}
-        else:
+            result['value']['analytic_account_id'] = account.id
+
+        return result
+
+    def on_change_account_id(self, cr, uid, ids, account_id, context=None):
+        if not account_id:
             return {}
 
+        account = self.pool.get('account.analytic.account').browse(cr, uid, account_id, context=context)
+        result = {}
+
+        if account and account.state == 'pending':
+            result = {'warning' : {'title' : _('Analytic Account'), 'message' : _('The Analytic Account is in pending !')}}
+            
+        return result
+
 project_issue()
 
 class account_analytic_line(osv.osv):
diff --git a/addons/project_issue_sheet/project_issue_sheet_view.xml b/addons/project_issue_sheet/project_issue_sheet_view.xml
index 78950e5f749..058fd67a946 100644
--- a/addons/project_issue_sheet/project_issue_sheet_view.xml
+++ b/addons/project_issue_sheet/project_issue_sheet_view.xml
@@ -13,15 +13,16 @@
                 <xpath expr="/form/notebook" position="before">
                     <field name="analytic_account_id"
                         domain="[('parent_id','!=',False),('partner_id', '=', partner_id),('type', '!=', 'view')]"
+                        on_change='on_change_account_id(analytic_account_id)'
                         groups="base.group_extended" />
                 </xpath>
                 <notebook colspan="4">
                     <page string="Worklogs">
-                        <field name="timesheet_ids" colspan="4" nolabel="1" context="{'default_user_id' : user_id, 'default_account_id' : analytic_account_id}">
+                        <field name="timesheet_ids" colspan="4" nolabel="1" context="{'default_user_id' : assigned_to, 'default_account_id' : analytic_account_id}">
                             <tree editable="top" string="Timesheet">
-                              <field name="name"/>
-                              <field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)" widget="float_time"/>
-                              <field name="account_id" invisible="0" domain="[('partner_id', '=', parent.partner_id)]" on_change="on_change_account_id(account_id)"/>
+                                <field name="name"/>
+                                <field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)" widget="float_time"/>
+                                <field name="account_id" invisible="0" domain="[('partner_id', '=', parent.partner_id)]" on_change="on_change_account_id(account_id)"/>
                                 <field name="date"/>
                                 <field name="user_id"/>
                                 <field invisible="1" name="journal_id"/>

From 832e251a932c03bac9d975ee5bb12a5891ee22a7 Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stephane@openerp.com>
Date: Mon, 28 Mar 2011 11:51:08 +0200
Subject: [PATCH 041/331] [IMP] Sort the project issue by priority and create
 date

bzr revid: stephane@openerp.com-20110328095108-a1uap927ravb202f
---
 addons/project_issue/project_issue.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index 2f3abaf6e6f..a8a32847243 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -43,7 +43,7 @@ project_issue_version()
 class project_issue(crm.crm_case, osv.osv):
     _name = "project.issue"
     _description = "Project Issue"
-    _order = "priority, id desc"
+    _order = "priority, create_date desc"
     _inherit = ['mailgate.thread']
     
     def case_open(self, cr, uid, ids, *args):

From 2638641b899a155957314abdf2b46fcbcf5a6123 Mon Sep 17 00:00:00 2001
From: odoo <odoo@ns307129.ovh.net>
Date: Mon, 28 Mar 2011 16:10:53 +0200
Subject: [PATCH 042/331] [FIX] crm: when looking for existing partners,
 consider digits as a meaningful part of the name

bzr revid: odoo@ns307129.ovh.net-20110328141053-mqul5io5na9wf2j6
---
 addons/crm/wizard/crm_lead_to_partner.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/crm/wizard/crm_lead_to_partner.py b/addons/crm/wizard/crm_lead_to_partner.py
index e44102bf6b7..56d92c41a6b 100644
--- a/addons/crm/wizard/crm_lead_to_partner.py
+++ b/addons/crm/wizard/crm_lead_to_partner.py
@@ -93,7 +93,7 @@ class crm_lead2partner(osv.osv_memory):
                 partner_ids = partner_obj.search(cr, uid, [('name', '=', lead.partner_name)], context=context)
             if not partner_ids:
                 cr.execute("""SELECT p.id from res_partner p
-                            where regexp_replace(lower(p.name), '[^a-z]*', '', 'g') = regexp_replace(%s, '[^a-z]*', '', 'g')""", (lead.name.lower(), ))
+                            where regexp_replace(lower(p.name), '[^a-z0-9]+', '', 'g') = regexp_replace(%s, '[^a-z0-9]+', '', 'g')""", (lead.name.lower(), ))
                 partner_ids = map(lambda x: x[0], cr.fetchall())
             partner_id = partner_ids and partner_ids[0] or False
 

From adc1e1b8182224eb6fabf54a3ff00f64aca33f40 Mon Sep 17 00:00:00 2001
From: Thibault Francois <tfr@openerp.com>
Date: Tue, 29 Mar 2011 10:48:22 +0200
Subject: [PATCH 043/331] [FIX] do not assign to partner if do not link is
 selected

bzr revid: tfr@openerp.com-20110329084822-fdvagtj4j8q62nbt
---
 addons/crm/wizard/crm_lead_to_opportunity.py | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/addons/crm/wizard/crm_lead_to_opportunity.py b/addons/crm/wizard/crm_lead_to_opportunity.py
index e41e92d0929..f6626aabb89 100644
--- a/addons/crm/wizard/crm_lead_to_opportunity.py
+++ b/addons/crm/wizard/crm_lead_to_opportunity.py
@@ -165,11 +165,18 @@ Leads Could not convert into Opportunity"))
                 stage_ids = self.pool.get('crm.case.stage').search(cr, uid, [('type','=','opportunity'),('sequence','>=',1)])
 
             data = self.browse(cr, uid, ids[0], context=context)
-            partner_ids = []
-            if data.action == 'create':
-                partner_ids = self._create_partner(cr, uid, ids, context=context)
 
-            partner_id = partner_ids and partner_ids[0] or data.partner_id.id
+
+            if data.action == 'create':
+                partner_ids = []
+                partner_ids = self._create_partner(cr, uid, ids, context=context)
+                partner_id = partner_ids and partner_ids[0]
+            elif data.action == 'exist':
+                partner_id = data.partner_id and data.partner_id.id
+            else:
+                partner_id = False
+
+
             self._convert(cr, uid, ids, lead, partner_id, stage_ids, context=context)
             #If we convert in mass, don't merge if there is no other opportunity but no warning
             if data.name == 'merge' and (len(data.opportunity_ids) > 1 or not context.get('mass_convert') ):

From 49a52d542a822f65f821a41de938059292b5bce7 Mon Sep 17 00:00:00 2001
From: Thibault Francois <tfr@openerp.com>
Date: Tue, 29 Mar 2011 15:12:42 +0200
Subject: [PATCH 044/331] [IMP, FIX] partner look up, only name =, convert
 merge only with one opp, don't merge cancelled and done, fix history loss,
 take info from oldest opp

bzr revid: tfr@openerp.com-20110329131242-z8rtt70fj7u8ishi
---
 addons/crm/wizard/crm_lead_to_opportunity.py |  4 +-
 addons/crm/wizard/crm_lead_to_partner.py     |  5 +-
 addons/crm/wizard/crm_merge_opportunities.py | 91 ++++++++++++--------
 3 files changed, 61 insertions(+), 39 deletions(-)

diff --git a/addons/crm/wizard/crm_lead_to_opportunity.py b/addons/crm/wizard/crm_lead_to_opportunity.py
index f6626aabb89..2d9aa4a3ab0 100644
--- a/addons/crm/wizard/crm_lead_to_opportunity.py
+++ b/addons/crm/wizard/crm_lead_to_opportunity.py
@@ -59,8 +59,8 @@ class crm_lead2opportunity_partner(osv.osv_memory):
 
         ids = []
         if partner_id:
-            ids = lead_obj.search(cr, uid, [('partner_id', '=', partner_id), ('type', '=', 'opportunity')])
-            opportunities += ids
+            ids = lead_obj.search(cr, uid, [('partner_id', '=', partner_id), ('type', '=', 'opportunity'), '!', ('state', 'in', ['done', 'cancel'])])
+            opportunities.append(ids[0])
 
         if 'action' in fields:
             res.update({'action' : partner_id and 'exist' or 'create'})
diff --git a/addons/crm/wizard/crm_lead_to_partner.py b/addons/crm/wizard/crm_lead_to_partner.py
index 56d92c41a6b..b5fe4eed783 100644
--- a/addons/crm/wizard/crm_lead_to_partner.py
+++ b/addons/crm/wizard/crm_lead_to_partner.py
@@ -92,9 +92,8 @@ class crm_lead2partner(osv.osv_memory):
             if not partner_ids and lead.partner_name:
                 partner_ids = partner_obj.search(cr, uid, [('name', '=', lead.partner_name)], context=context)
             if not partner_ids:
-                cr.execute("""SELECT p.id from res_partner p
-                            where regexp_replace(lower(p.name), '[^a-z0-9]+', '', 'g') = regexp_replace(%s, '[^a-z0-9]+', '', 'g')""", (lead.name.lower(), ))
-                partner_ids = map(lambda x: x[0], cr.fetchall())
+                partner_ids = partner_obj.search(cr, uid, [('name', '=', lead.name)], context=context)
+                
             partner_id = partner_ids and partner_ids[0] or False
 
             if 'partner_id' in fields:
diff --git a/addons/crm/wizard/crm_merge_opportunities.py b/addons/crm/wizard/crm_merge_opportunities.py
index 4e87871d0a4..5bcd14ee6c6 100644
--- a/addons/crm/wizard/crm_merge_opportunities.py
+++ b/addons/crm/wizard/crm_merge_opportunities.py
@@ -27,13 +27,19 @@ class crm_merge_opportunity(osv.osv_memory):
     _name = 'crm.merge.opportunity'
     _description = 'Merge two Opportunities'
 
-    def _get_first_not_null_id(self, attr, ops):
+    def _get_first_not_null_id(self, attr, ops, oldest):
+        if hasattr(oldest, attr) and getattr(oldest, attr):
+            return getattr(oldest, attr).id
+        
         for op in ops:
             if hasattr(op, attr) and getattr(op, attr):
                 return getattr(op, attr).id
         return False
 
-    def _get_first_not_null(self, attr, ops):
+    def _get_first_not_null(self, attr, ops, oldest):
+        if hasattr(oldest, attr) and getattr(oldest, attr):
+            return getattr(oldest, attr)
+        
         for op in ops:
             if hasattr(op, attr) and getattr(op, attr):
                 return getattr(op, attr)
@@ -54,6 +60,12 @@ class crm_merge_opportunity(osv.osv_memory):
         attach_obj.write(cr, uid, attach_ids, {'res_id' : op_id})
 
 
+    def find_oldest(self, cr, uid, op_ids, context=None):
+        ids = [op_id.id for op_id in op_ids]
+        lead_obj = self.pool.get('crm.lead')
+        op_id = lead_obj.search(cr, uid, [('id', 'in', ids)], order='create_date' , context=context)
+        opps = lead_obj.browse(cr, uid, [op_id[0]], context=context)
+        return opps[0]
 
     def merge(self, cr, uid, op_ids, context=None):
         """
@@ -69,7 +81,7 @@ class crm_merge_opportunity(osv.osv_memory):
 
         opportunities = opp_obj.browse(cr, uid, lead_ids, context=context)
         opportunities_list = list(set(op_ids) - set(opportunities))
-
+        oldest_opp = self.find_oldest(cr, uid, op_ids, context=context)
         if opportunities :
             first_opportunity = opportunities[0]
             tail_opportunities = opportunities_list
@@ -79,44 +91,50 @@ class crm_merge_opportunity(osv.osv_memory):
             
 
         data = {
-                'partner_id': self._get_first_not_null_id('partner_id', op_ids),  # !!
-                'title': self._get_first_not_null_id('title', op_ids),
-                'name' : self._concat_all('name', op_ids),  #not lost
-                'categ_id' : self._get_first_not_null_id('categ_id', op_ids), # !!
-                'channel_id' : self._get_first_not_null_id('channel_id', op_ids), # !!
-                'city' : self._get_first_not_null('city', op_ids),  # !!
-                'company_id' : self._get_first_not_null_id('company_id', op_ids), #!!
-                'contact_name' : self._concat_all('contact_name', op_ids), #not lost
-                'country_id' : self._get_first_not_null_id('country_id', op_ids), #!!
-                'partner_address_id' : self._get_first_not_null_id('partner_address_id', op_ids), #!!
-                'partner_assigned_id' : hasattr(opp_obj,'partner_assigned_id') and self._get_first_not_null_id('partner_assigned_id', op_ids), #!!
-                'type_id' : self._get_first_not_null_id('type_id', op_ids), #!!
-                'user_id' : self._get_first_not_null_id('user_id', op_ids), #!!
-                'section_id' : self._get_first_not_null_id('section_id', op_ids), #!!
-                'state_id' : self._get_first_not_null_id('state_id', op_ids),
+                'partner_id': self._get_first_not_null_id('partner_id', op_ids, oldest_opp),  # !!
+                'title': self._get_first_not_null_id('title', op_ids, oldest_opp),
+                'name' : self._get_first_not_null('name', op_ids, oldest_opp),  #not lost
+                'categ_id' : self._get_first_not_null_id('categ_id', op_ids, oldest_opp), # !!
+                'channel_id' : self._get_first_not_null_id('channel_id', op_ids, oldest_opp), # !!
+                'city' : self._get_first_not_null('city', op_ids, oldest_opp),  # !!
+                'company_id' : self._get_first_not_null_id('company_id', op_ids, oldest_opp), #!!
+                'contact_name' : self._get_first_not_null('contact_name', op_ids, oldest_opp), #not lost
+                'country_id' : self._get_first_not_null_id('country_id', op_ids, oldest_opp), #!!
+                'partner_address_id' : self._get_first_not_null_id('partner_address_id', op_ids, oldest_opp), #!!
+                'partner_assigned_id' : hasattr(opp_obj,'partner_assigned_id') and self._get_first_not_null_id('partner_assigned_id', op_ids, oldest_opp), #!!
+                'type_id' : self._get_first_not_null_id('type_id', op_ids, oldest_opp), #!!
+                'user_id' : self._get_first_not_null_id('user_id', op_ids, oldest_opp), #!!
+                'section_id' : self._get_first_not_null_id('section_id', op_ids, oldest_opp), #!!
+                'state_id' : self._get_first_not_null_id('state_id', op_ids, oldest_opp),
                 'description' : self._concat_all('description', op_ids),  #not lost
-                'email' : self._get_first_not_null('email', op_ids), # !!
-                'fax' : self._get_first_not_null('fax', op_ids),
-                'mobile' : self._get_first_not_null('mobile', op_ids),
-                'partner_latitude' : hasattr(opp_obj,'partner_latitude') and self._get_first_not_null('partner_latitude', op_ids),
-                'partner_longitude' : hasattr(opp_obj,'partner_longitude') and self._get_first_not_null('partner_longitude', op_ids),
-                'partner_name' : self._get_first_not_null('partner_name', op_ids),
-                'phone' : self._get_first_not_null('phone', op_ids),
-                'probability' : self._get_first_not_null('probability', op_ids),
-                'planned_revenue' : self._get_first_not_null('planned_revenue', op_ids),
-                'street' : self._get_first_not_null('street', op_ids),
-                'street2' : self._get_first_not_null('street2', op_ids),
-                'zip' : self._get_first_not_null('zip', op_ids),
-                'state' : 'open'
+                'email' : self._get_first_not_null('email', op_ids, oldest_opp), # !!
+                'fax' : self._get_first_not_null('fax', op_ids, oldest_opp),
+                'mobile' : self._get_first_not_null('mobile', op_ids, oldest_opp),
+                'partner_latitude' : hasattr(opp_obj,'partner_latitude') and self._get_first_not_null('partner_latitude', op_ids, oldest_opp),
+                'partner_longitude' : hasattr(opp_obj,'partner_longitude') and self._get_first_not_null('partner_longitude', op_ids, oldest_opp),
+                'partner_name' : self._get_first_not_null('partner_name', op_ids, oldest_opp),
+                'phone' : self._get_first_not_null('phone', op_ids, oldest_opp),
+                'probability' : self._get_first_not_null('probability', op_ids, oldest_opp),
+                'planned_revenue' : self._get_first_not_null('planned_revenue', op_ids, oldest_opp),
+                'street' : self._get_first_not_null('street', op_ids, oldest_opp),
+                'street2' : self._get_first_not_null('street2', op_ids, oldest_opp),
+                'zip' : self._get_first_not_null('zip', op_ids, oldest_opp),
+                'state' : 'open',
+                'create_date' : self._get_first_not_null('create_date', op_ids, oldest_opp),
+                'date_action_last': self._get_first_not_null('date_action_last', op_ids, oldest_opp),
+                'date_action_next': self._get_first_not_null('date_action_nexte', op_ids, oldest_opp),
+                'email_from' : self._get_first_not_null('email_from', op_ids, oldest_opp),
+                'email_cc' : self._get_first_not_null('email_cc', op_ids, oldest_opp),
+                'partner_name' : self._get_first_not_null('partner_name', op_ids, oldest_opp),
 
             }
-
+        
         #copy message into the first opportunity + merge attachement
         for opp in tail_opportunities:
             attach_ids = self.get_attachments(cr, uid, opp, context=context)
             self.set_attachements_res_id(cr, uid, first_opportunity.id, attach_ids)
             for history in opp.message_ids:
-                new_history = message_obj.copy(cr, uid, history.id, default={'res_id': opp.id})
+                new_history = message_obj.copy(cr, uid, history.id, default={'res_id': first_opportunity.id, 'name' : _("From %s : %s") % (opp.name, history.name) })
 
         #Notification about loss of information
         details = []
@@ -213,8 +231,13 @@ class crm_merge_opportunity(osv.osv_memory):
         res = super(crm_merge_opportunity, self).default_get(cr, uid, fields, context=context)
 
         if record_ids:
+            opp_ids = []
+            opps = self.pool.get('crm.lead').browse(cr, uid, record_ids, context=context)
+            for opp in opps:
+                if opp.state not in ('done', 'cancel'):
+                    opp_ids.append(opp.id)
             if 'opportunity_ids' in fields:
-                res.update({'opportunity_ids': record_ids})
+                res.update({'opportunity_ids': opp_ids})
 
         return res
 

From 0703c5d50601734625cd7d60052040947ca3a64d Mon Sep 17 00:00:00 2001
From: Thibault Francois <tfr@openerp.com>
Date: Tue, 29 Mar 2011 15:40:22 +0200
Subject: [PATCH 045/331] [IMP, FIX] partner look up, only name =, convert
 merge only with one opp, don't merge cancelled and done, fix history loss,
 take info from oldest opp

bzr revid: tfr@openerp.com-20110329134022-80wkml8mbgwp9igy
---
 addons/crm/wizard/crm_merge_opportunities.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/addons/crm/wizard/crm_merge_opportunities.py b/addons/crm/wizard/crm_merge_opportunities.py
index 5bcd14ee6c6..e9a957bcf24 100644
--- a/addons/crm/wizard/crm_merge_opportunities.py
+++ b/addons/crm/wizard/crm_merge_opportunities.py
@@ -130,11 +130,12 @@ class crm_merge_opportunity(osv.osv_memory):
             }
         
         #copy message into the first opportunity + merge attachement
-        for opp in tail_opportunities:
+        
+        for opp in tail_opportunities + [first_opportunity]:
             attach_ids = self.get_attachments(cr, uid, opp, context=context)
             self.set_attachements_res_id(cr, uid, first_opportunity.id, attach_ids)
             for history in opp.message_ids:
-                new_history = message_obj.copy(cr, uid, history.id, default={'res_id': first_opportunity.id, 'name' : _("From %s : %s") % (opp.name, history.name) })
+                new_history = message_obj.write(cr, uid, history.id, {'res_id': first_opportunity.id, 'name' : _("From %s : %s") % (opp.name, history.name) }, context=context)
 
         #Notification about loss of information
         details = []

From 3b24b3ce06d4cab70b36c9ae5eebaf1d0a5274e1 Mon Sep 17 00:00:00 2001
From: Thibault Francois <tfr@openerp.com>
Date: Tue, 29 Mar 2011 17:19:09 +0200
Subject: [PATCH 046/331] [IMP] send notification to salesman

bzr revid: tfr@openerp.com-20110329151909-k2nh055fjj9ugqgh
---
 addons/crm/wizard/crm_lead_to_opportunity.py | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/addons/crm/wizard/crm_lead_to_opportunity.py b/addons/crm/wizard/crm_lead_to_opportunity.py
index 2d9aa4a3ab0..3aee5afd00e 100644
--- a/addons/crm/wizard/crm_lead_to_opportunity.py
+++ b/addons/crm/wizard/crm_lead_to_opportunity.py
@@ -21,6 +21,7 @@
 
 from osv import osv, fields
 from tools.translate import _
+import tools
 
 import time
 
@@ -60,7 +61,8 @@ class crm_lead2opportunity_partner(osv.osv_memory):
         ids = []
         if partner_id:
             ids = lead_obj.search(cr, uid, [('partner_id', '=', partner_id), ('type', '=', 'opportunity'), '!', ('state', 'in', ['done', 'cancel'])])
-            opportunities.append(ids[0])
+            if ids:
+                opportunities.append(ids[0])
 
         if 'action' in fields:
             res.update({'action' : partner_id and 'exist' or 'create'})
@@ -124,6 +126,16 @@ Leads Could not convert into Opportunity"))
                     }, context=context)
             leads.log(cr, uid, lead.id, _("Lead '%s' has been converted to an opportunity.") % lead.name)
 
+    def send_mail_to_salesman(self, lead):
+        email_to = lead.user_id and lead.user_id.user_email
+        email_from = lead.section_id and lead.section_id.user_id and lead.section_id.user_id.user_email or email_to
+        partner = lead.partner_id and lead.partner_id.name or lead.partner_name 
+        subject = "lead %s converted into opportunity" % lead.name
+        body = "Info \n Id : %s \n Subject: %s \n Partner: %s \n Description : %s " % (lead.id, lead.name, lead.partner_id.name, lead.description)  
+        try :
+            tools.email_send(email_from, email_to, subject, body)
+        except:
+            pass
 
     def action_apply(self, cr, uid, ids, context=None):
         """
@@ -178,6 +190,7 @@ Leads Could not convert into Opportunity"))
 
 
             self._convert(cr, uid, ids, lead, partner_id, stage_ids, context=context)
+            self.send_mail_to_salesman(lead)
             #If we convert in mass, don't merge if there is no other opportunity but no warning
             if data.name == 'merge' and (len(data.opportunity_ids) > 1 or not context.get('mass_convert') ):
                 merge_obj = self.pool.get('crm.merge.opportunity')

From f3433d30aaf59dbf8f73f6a187646570f3554eb0 Mon Sep 17 00:00:00 2001
From: odoo <odoo@ns307129.ovh.net>
Date: Wed, 30 Mar 2011 13:43:24 +0200
Subject: [PATCH 047/331] [FIX] do not send email if email_to is false, do not
 link with contact if no partner

bzr revid: odoo@ns307129.ovh.net-20110330114324-4ry4pixddj8jppd7
---
 addons/crm/wizard/crm_lead_to_opportunity.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/addons/crm/wizard/crm_lead_to_opportunity.py b/addons/crm/wizard/crm_lead_to_opportunity.py
index 3aee5afd00e..44c83f7c70c 100644
--- a/addons/crm/wizard/crm_lead_to_opportunity.py
+++ b/addons/crm/wizard/crm_lead_to_opportunity.py
@@ -114,8 +114,10 @@ Leads Could not convert into Opportunity"))
             'stage_id': stage_ids and stage_ids[0] or False,
             'date_action': time.strftime('%Y-%m-%d %H:%M:%S'),
         }
-        if address_id:
+        if partner_id and address_id:
             vals['partner_address_id'] = address_id[0]
+        else:
+            vals['partner_address_id'] = False
 
         lead.write(vals, context=context)
         leads.history(cr, uid, [lead], _('Converted to opportunity'), details='Converted to Opportunity', context=context)
@@ -128,6 +130,8 @@ Leads Could not convert into Opportunity"))
 
     def send_mail_to_salesman(self, lead):
         email_to = lead.user_id and lead.user_id.user_email
+        if not email_to:
+            return
         email_from = lead.section_id and lead.section_id.user_id and lead.section_id.user_id.user_email or email_to
         partner = lead.partner_id and lead.partner_id.name or lead.partner_name 
         subject = "lead %s converted into opportunity" % lead.name
@@ -188,7 +192,6 @@ Leads Could not convert into Opportunity"))
             else:
                 partner_id = False
 
-
             self._convert(cr, uid, ids, lead, partner_id, stage_ids, context=context)
             self.send_mail_to_salesman(lead)
             #If we convert in mass, don't merge if there is no other opportunity but no warning

From 838d9a3e60f49895bc54c3b58bc3d8ed36445c08 Mon Sep 17 00:00:00 2001
From: "pso (OpenERP)" <pso@tinyerp.com>
Date: Fri, 1 Apr 2011 10:55:32 +0530
Subject: [PATCH 048/331] [FIX] hr_holidays: possible to set to draft a refused
 allocation request

lp bug: https://launchpad.net/bugs/746471 fixed

bzr revid: pso@tinyerp.com-20110401052532-5op996ya8rxbq0kb
---
 addons/hr_holidays/hr_holidays_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 7740470ccc7..f49b2ab388a 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -139,7 +139,7 @@
                             <button string="Confirm" name="confirm" states="draft" type="workflow" icon="gtk-yes"/>
                             <button string="Approve" name="validate" states="confirm" type="workflow" icon="gtk-apply" groups="base.group_hr_user"/>
                             <button string="Approved" name="second_validate" states="validate1" type="workflow" icon="gtk-apply" groups="base.group_hr_user"/>
-                            <button string="Set to Draft" name="set_to_draft" states="cancel,validate,validate1" type="object" icon="gtk-convert" groups="base.group_hr_user"/>
+                            <button string="Set to Draft" name="set_to_draft" states="cancel,validate,validate1,refuse" type="object" icon="gtk-convert" groups="base.group_hr_user"/>
                         </group>
                     </page>
                 </notebook>

From 468f05c2099d5860896cf81a128bd22b0d514af0 Mon Sep 17 00:00:00 2001
From: "pso (OpenERP)" <pso@tinyerp.com>
Date: Fri, 1 Apr 2011 11:23:51 +0530
Subject: [PATCH 049/331] [FIX] hr: Put groups on HR menu

lp bug: https://launchpad.net/bugs/746488 fixed

bzr revid: pso@tinyerp.com-20110401055351-uor3osh5vz761612
---
 addons/hr/hr_view.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index a3512b65588..75cbd88e64d 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -4,7 +4,8 @@
 
         <menuitem id="menu_hr_root" icon="terp-hr" name="Human Resources" sequence="15"
             web_icon="images/hr.png"
-            web_icon_hover="images/hr-hover.png"/>
+            web_icon_hover="images/hr-hover.png"
+            groups="base.group_hr_manager,base.group_hr_user,base.group_user"/>
         <menuitem id="menu_hr_main" parent="menu_hr_root" name="Human Resources" sequence="0"/>
         <menuitem id="menu_hr_configuration" name="Configuration" parent="hr.menu_hr_root" groups="base.group_hr_manager" sequence="50"/>
         <menuitem id="menu_hr_management" name="Human Resources" parent="hr.menu_hr_configuration" sequence="1"/>
@@ -320,7 +321,7 @@
             <field eval="True" name="object"/>
         </record>
 
-        <menuitem action="open_view_categ_tree" 
+        <menuitem action="open_view_categ_tree"
             id="menu_view_employee_category_tree" parent="hr.menu_view_employee_category_form"/>
 
         <record id="view_hr_job_form" model="ir.ui.view">

From 609d962b97e33398f745f87aafc489e5b11217b4 Mon Sep 17 00:00:00 2001
From: Thibault Francois <tfr@openerp.com>
Date: Fri, 1 Apr 2011 14:25:20 +0200
Subject: [PATCH 050/331] [CHANGE] change opp assign reporter with assign date
 instead of creation date + remove find similar partner with lead name

bzr revid: tfr@openerp.com-20110401122520-389zigbr34qe9u2m
---
 addons/crm/wizard/crm_lead_to_partner.py             |  3 +--
 addons/crm_partner_assign/report/crm_lead_report.py  | 12 +++++++-----
 .../report/crm_lead_report_view.xml                  | 10 +++++-----
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/addons/crm/wizard/crm_lead_to_partner.py b/addons/crm/wizard/crm_lead_to_partner.py
index b5fe4eed783..1a9304adc85 100644
--- a/addons/crm/wizard/crm_lead_to_partner.py
+++ b/addons/crm/wizard/crm_lead_to_partner.py
@@ -91,8 +91,7 @@ class crm_lead2partner(osv.osv_memory):
             # Find partner name that matches the name of the lead
             if not partner_ids and lead.partner_name:
                 partner_ids = partner_obj.search(cr, uid, [('name', '=', lead.partner_name)], context=context)
-            if not partner_ids:
-                partner_ids = partner_obj.search(cr, uid, [('name', '=', lead.name)], context=context)
+            
                 
             partner_id = partner_ids and partner_ids[0] or False
 
diff --git a/addons/crm_partner_assign/report/crm_lead_report.py b/addons/crm_partner_assign/report/crm_lead_report.py
index cf1d06dc36d..8fa9963a945 100644
--- a/addons/crm_partner_assign/report/crm_lead_report.py
+++ b/addons/crm_partner_assign/report/crm_lead_report.py
@@ -37,7 +37,7 @@ class crm_lead_report_assign(osv.osv):
     _auto = False
     _description = "CRM Lead Report"
     _columns = {
-        'name': fields.char('Year', size=64, required=False, readonly=True),
+        'year': fields.char('Year', size=64, required=False, readonly=True),
         'partner_assigned_id':fields.many2one('res.partner', 'Partner', readonly=True),
         'grade_id':fields.many2one('res.partner.grade', 'Grade', readonly=True),
         'user_id':fields.many2one('res.users', 'User', readonly=True),
@@ -51,7 +51,7 @@ class crm_lead_report_assign(osv.osv):
                                   ('09', 'September'), ('10', 'October'),\
                                   ('11', 'November'), ('12', 'December')], 'Month', readonly=True),
         'company_id': fields.many2one('res.company', 'Company', readonly=True),
-        'partner_date': fields.date('Partner Date', readonly=True),
+        'date_assign': fields.date('Partner Date', readonly=True),
         'create_date': fields.datetime('Create Date', readonly=True),
         'day': fields.char('Day', size=128, readonly=True),
         'delay_open': fields.float('Delay to Open',digits=(16,2),readonly=True, group_operator="avg",help="Number of Days to open the case"),
@@ -82,18 +82,20 @@ class crm_lead_report_assign(osv.osv):
             CRM Lead Report
             @param cr: the current row, from the database cursor
         """
+        print "WHATTT "
         tools.drop_view_if_exists(cr, 'crm_lead_report_assign')
         cr.execute("""
             CREATE OR REPLACE VIEW crm_lead_report_assign AS (
                 SELECT
                     c.id,
-                    to_char(c.create_date, 'YYYY') as name,
-                    to_char(c.create_date, 'MM') as month,
-                    to_char(c.create_date, 'YYYY-MM-DD') as day,
+                    to_char(c.date_assign, 'YYYY') as year,
+                    to_char(c.date_assign, 'MM') as month,
+                    to_char(c.date_assign, 'YYYY-MM-DD') as day,
                     to_char(c.create_date, 'YYYY-MM-DD') as creation_date,
                     to_char(c.date_open, 'YYYY-MM-DD') as opening_date,
                     to_char(c.date_closed, 'YYYY-mm-dd') as date_closed,
                     c.state,
+                    c.date_assign,
                     c.user_id,
                     c.probability,
                     c.probability as probability_max,
diff --git a/addons/crm_partner_assign/report/crm_lead_report_view.xml b/addons/crm_partner_assign/report/crm_lead_report_view.xml
index c71d19df49d..3b1e067f4c3 100644
--- a/addons/crm_partner_assign/report/crm_lead_report_view.xml
+++ b/addons/crm_partner_assign/report/crm_lead_report_view.xml
@@ -69,17 +69,17 @@
                             domain="[]"
                             context="{'group_by':'company_id'}" />
                         <separator orientation="vertical" />
-                        <filter string="Partner Date" icon="terp-go-today"
+                        <filter string="Assign Date" icon="terp-go-today"
                             domain="[]"
                             name="group_partner_date"
-                            context="{'group_by':'partner_date'}"/>
+                            context="{'group_by':'date_assign'}"/>
                         <separator orientation="vertical"/>
                         <filter string="Day" icon="terp-go-today"
                             domain="[]" context="{'group_by':'day'}"/>
                         <filter string="Month" icon="terp-go-month"
                             domain="[]" context="{'group_by':'month'}" />
                         <filter string="Year" icon="terp-go-year"
-                            domain="[]" context="{'group_by':'name'}" />
+                            domain="[]" context="{'group_by':'year'}" />
                   </group>
 
                </search>
@@ -107,9 +107,9 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
             <tree string="Opportunities Assignment Analysis">
-                <field name="name" invisible="1"/>
+                <field name="year" invisible="1"/>
                 <field name="month" invisible="1"/>
-                <field name="partner_date" invisible="1"/>
+                <field name="date_assign" invisible="1"/>
                 <field name="section_id" invisible="1" groups="base.group_extended"/>
                 <field name="user_id" invisible="1"/>
                 <field name="grade_id" invisible="1" widget="selection"/>

From 2f4a82f7f6318a9f2bfbfae0c056731209f00e5c Mon Sep 17 00:00:00 2001
From: "ARA (OpenERP)" <ara@tinyerp.com>
Date: Fri, 1 Apr 2011 18:18:04 +0530
Subject: [PATCH 051/331] [FIX] account: Cancel of invoice throws error,
 validate of move_id is invalid

lp bug: https://launchpad.net/bugs/746544 fixed

bzr revid: ara@tinyerp.com-20110401124804-rvbqlbaosphsqv8c
---
 addons/account/account_move_line.py | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index 83a67df9178..e5c06213061 100644
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -1085,15 +1085,26 @@ class account_move_line(osv.osv):
         if context is None:
             context = {}
         move_obj = self.pool.get('account.move')
+        analytic_obj = self.pool.get('account.analytic.line')
         self._update_check(cr, uid, ids, context)
         result = False
         move_ids = set()
+        analytic_ids = set()
+        move_line_ids = set()
         for line in self.browse(cr, uid, ids, context=context):
             move_ids.add(line.move_id.id)
             context['journal_id'] = line.journal_id.id
             context['period_id'] = line.period_id.id
-            result = super(account_move_line, self).unlink(cr, uid, [line.id], context=context)
+            move_line_ids.add(line.id)
+            for obj in line.analytic_lines:
+                analytic_ids.add(obj.id)
+
+        analytic_ids = list(analytic_ids)
         move_ids = list(move_ids)
+
+        if analytic_ids:
+            analytic_obj.unlink(cr,uid, analytic_ids, context=context)
+        result = super(account_move_line, self).unlink(cr, uid, list(move_line_ids), context=context)
         if check and move_ids:
             move_obj.validate(cr, uid, move_ids, context=context)
         return result

From 08695d543309b3f64581440f70037699861a337c Mon Sep 17 00:00:00 2001
From: "ARA (OpenERP)" <ara@tinyerp.com>
Date: Mon, 4 Apr 2011 12:09:17 +0530
Subject: [PATCH 052/331] [FIX] account: Cancel of invoice throws error,
 validate of move_id is invalid

bzr revid: ara@tinyerp.com-20110404063917-kunaq8rj59pvvjsf
---
 addons/account/account_move_line.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index e5c06213061..2cbe9de9630 100644
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -1093,11 +1093,9 @@ class account_move_line(osv.osv):
         move_line_ids = set()
         for line in self.browse(cr, uid, ids, context=context):
             move_ids.add(line.move_id.id)
-            context['journal_id'] = line.journal_id.id
-            context['period_id'] = line.period_id.id
             move_line_ids.add(line.id)
-            for obj in line.analytic_lines:
-                analytic_ids.add(obj.id)
+            for analytic in line.analytic_lines:
+                analytic_ids.add(analytic.id)
 
         analytic_ids = list(analytic_ids)
         move_ids = list(move_ids)

From ccbf1f434b8bf43e83dd0466dc9bfb226bb56f81 Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Tue, 5 Apr 2011 10:50:41 +0530
Subject: [PATCH 053/331] [FIX]stock:Multiple UOM not handled by Inventory
 Analysis

lp bug: https://launchpad.net/bugs/741457 fixed

bzr revid: ron@tinyerp.com-20110405052041-hu8odbfg12cm2xc2
---
 addons/stock/report/report_stock_move.py | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/addons/stock/report/report_stock_move.py b/addons/stock/report/report_stock_move.py
index 15e430d0599..f489b824062 100644
--- a/addons/stock/report/report_stock_move.py
+++ b/addons/stock/report/report_stock_move.py
@@ -176,18 +176,23 @@ CREATE OR REPLACE view report_stock_inventory AS (
         m.product_id as product_id, pt.categ_id as product_categ_id, l.usage as location_type,
         m.company_id,
         m.state as state, m.prodlot_id as prodlot_id,
-        coalesce(sum(-m.product_qty * u.factor)::decimal, 0.0) as product_qty,
-        coalesce(sum(-pt.standard_price * m.product_qty * u.factor)::decimal, 0.0) as value
+        coalesce(sum(-pt.standard_price * m.product_qty)::decimal, 0.0) as value,
+        CASE when pt.uom_id = m.product_uom 
+        THEN
+        coalesce(sum(-m.product_qty)::decimal, 0.0) 
+        ELSE
+        coalesce(sum(-m.product_qty * pu.factor)::decimal, 0.0) END as product_qty
     FROM
         stock_move m
             LEFT JOIN stock_picking p ON (m.picking_id=p.id)
             LEFT JOIN product_product pp ON (m.product_id=pp.id)
                 LEFT JOIN product_template pt ON (pp.product_tmpl_id=pt.id)
+                LEFT JOIN product_uom pu ON (pt.uom_id=pu.id)
             LEFT JOIN product_uom u ON (m.product_uom=u.id)
             LEFT JOIN stock_location l ON (m.location_id=l.id)
     GROUP BY
         m.id, m.product_id, m.product_uom, pt.categ_id, m.address_id, m.location_id,  m.location_dest_id,
-        m.prodlot_id, m.date, m.state, l.usage, m.company_id
+        m.prodlot_id, m.date, m.state, l.usage, m.company_id,pt.uom_id
 ) UNION ALL (
     SELECT
         -m.id as id, m.date as date,
@@ -195,18 +200,23 @@ CREATE OR REPLACE view report_stock_inventory AS (
         m.product_id as product_id, pt.categ_id as product_categ_id, l.usage as location_type,
         m.company_id,
         m.state as state, m.prodlot_id as prodlot_id,
-        coalesce(sum(m.product_qty*u.factor)::decimal, 0.0) as product_qty,
-        coalesce(sum(pt.standard_price * m.product_qty * u.factor)::decimal, 0.0) as value
+        coalesce(sum(pt.standard_price * m.product_qty )::decimal, 0.0) as value,
+        CASE when pt.uom_id = m.product_uom 
+        THEN 
+        coalesce(sum(m.product_qty)::decimal, 0.0) 
+        ELSE
+        coalesce(sum(m.product_qty * pu.factor)::decimal, 0.0) END as product_qty
     FROM
         stock_move m
             LEFT JOIN stock_picking p ON (m.picking_id=p.id)
             LEFT JOIN product_product pp ON (m.product_id=pp.id)
                 LEFT JOIN product_template pt ON (pp.product_tmpl_id=pt.id)
+                LEFT JOIN product_uom pu ON (pt.uom_id=pu.id)
             LEFT JOIN product_uom u ON (m.product_uom=u.id)
             LEFT JOIN stock_location l ON (m.location_dest_id=l.id)
     GROUP BY
         m.id, m.product_id, m.product_uom, pt.categ_id, m.address_id, m.location_id, m.location_dest_id,
-        m.prodlot_id, m.date, m.state, l.usage, m.company_id
+        m.prodlot_id, m.date, m.state, l.usage, m.company_id,pt.uom_id
     )
 );
         """)

From a21ecf80c5b18d00fb180f2d7237d63126d14ef8 Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Tue, 5 Apr 2011 12:01:28 +0530
Subject: [PATCH 054/331] [REF]stock: Multiple UOM not handled by Inventory
 Analysis

bzr revid: ron@tinyerp.com-20110405063128-73v7uoqq3h3kt59s
---
 addons/stock/report/report_stock_move.py | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/addons/stock/report/report_stock_move.py b/addons/stock/report/report_stock_move.py
index f489b824062..d2dbcb72a46 100644
--- a/addons/stock/report/report_stock_move.py
+++ b/addons/stock/report/report_stock_move.py
@@ -177,11 +177,10 @@ CREATE OR REPLACE view report_stock_inventory AS (
         m.company_id,
         m.state as state, m.prodlot_id as prodlot_id,
         coalesce(sum(-pt.standard_price * m.product_qty)::decimal, 0.0) as value,
-        CASE when pt.uom_id = m.product_uom 
-        THEN
-        coalesce(sum(-m.product_qty)::decimal, 0.0) 
-        ELSE
-        coalesce(sum(-m.product_qty * pu.factor)::decimal, 0.0) END as product_qty
+        case when pt.uom_id = m.product_uom then
+            coalesce(sum(-m.product_qty)::decimal, 0.0) 
+        else
+            coalesce(sum(-m.product_qty * pu.factor)::decimal, 0.0) END as product_qty
     FROM
         stock_move m
             LEFT JOIN stock_picking p ON (m.picking_id=p.id)
@@ -192,7 +191,7 @@ CREATE OR REPLACE view report_stock_inventory AS (
             LEFT JOIN stock_location l ON (m.location_id=l.id)
     GROUP BY
         m.id, m.product_id, m.product_uom, pt.categ_id, m.address_id, m.location_id,  m.location_dest_id,
-        m.prodlot_id, m.date, m.state, l.usage, m.company_id,pt.uom_id
+        m.prodlot_id, m.date, m.state, l.usage, m.company_id, pt.uom_id
 ) UNION ALL (
     SELECT
         -m.id as id, m.date as date,
@@ -201,11 +200,10 @@ CREATE OR REPLACE view report_stock_inventory AS (
         m.company_id,
         m.state as state, m.prodlot_id as prodlot_id,
         coalesce(sum(pt.standard_price * m.product_qty )::decimal, 0.0) as value,
-        CASE when pt.uom_id = m.product_uom 
-        THEN 
-        coalesce(sum(m.product_qty)::decimal, 0.0) 
-        ELSE
-        coalesce(sum(m.product_qty * pu.factor)::decimal, 0.0) END as product_qty
+        case when pt.uom_id = m.product_uom  then 
+            coalesce(sum(m.product_qty)::decimal, 0.0) 
+        else
+            coalesce(sum(m.product_qty * pu.factor)::decimal, 0.0) END as product_qty
     FROM
         stock_move m
             LEFT JOIN stock_picking p ON (m.picking_id=p.id)
@@ -216,7 +214,7 @@ CREATE OR REPLACE view report_stock_inventory AS (
             LEFT JOIN stock_location l ON (m.location_dest_id=l.id)
     GROUP BY
         m.id, m.product_id, m.product_uom, pt.categ_id, m.address_id, m.location_id, m.location_dest_id,
-        m.prodlot_id, m.date, m.state, l.usage, m.company_id,pt.uom_id
+        m.prodlot_id, m.date, m.state, l.usage, m.company_id, pt.uom_id
     )
 );
         """)

From 53d0655f2821566a9128e49aa8f188898934b706 Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Tue, 5 Apr 2011 12:20:13 +0530
Subject: [PATCH 055/331] [REF]stock: Multiple UOM not handled by Inventory
 Analysis

bzr revid: ron@tinyerp.com-20110405065013-4ntnsbij883vj5gi
---
 addons/stock/report/report_stock_move.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/stock/report/report_stock_move.py b/addons/stock/report/report_stock_move.py
index d2dbcb72a46..07289a4379a 100644
--- a/addons/stock/report/report_stock_move.py
+++ b/addons/stock/report/report_stock_move.py
@@ -177,9 +177,9 @@ CREATE OR REPLACE view report_stock_inventory AS (
         m.company_id,
         m.state as state, m.prodlot_id as prodlot_id,
         coalesce(sum(-pt.standard_price * m.product_qty)::decimal, 0.0) as value,
-        case when pt.uom_id = m.product_uom then
+        CASE when pt.uom_id = m.product_uom THEN
             coalesce(sum(-m.product_qty)::decimal, 0.0) 
-        else
+        ELSE
             coalesce(sum(-m.product_qty * pu.factor)::decimal, 0.0) END as product_qty
     FROM
         stock_move m
@@ -200,9 +200,9 @@ CREATE OR REPLACE view report_stock_inventory AS (
         m.company_id,
         m.state as state, m.prodlot_id as prodlot_id,
         coalesce(sum(pt.standard_price * m.product_qty )::decimal, 0.0) as value,
-        case when pt.uom_id = m.product_uom  then 
+        CASE when pt.uom_id = m.product_uom  THEN 
             coalesce(sum(m.product_qty)::decimal, 0.0) 
-        else
+        ELSE
             coalesce(sum(m.product_qty * pu.factor)::decimal, 0.0) END as product_qty
     FROM
         stock_move m

From e6ebac0a38ce43b4b8245714ad702375ca8183a0 Mon Sep 17 00:00:00 2001
From: "AMP (OpenERP)" <amp@tinyerp.com>
Date: Tue, 5 Apr 2011 15:00:17 +0530
Subject: [PATCH 056/331] [FIX] crm_claim : claim history should not be deleted

bzr revid: amp@tinyerp.com-20110405093017-hnob35dw5gt39x2t
---
 addons/crm_claim/crm_claim_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index 63df2c35d0d..e7a0961a846 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -177,7 +177,7 @@
                                 <group colspan="4">
                                     <field colspan="4" name="email_cc" string="Global CC" widget="char"/>
                                 </group>
-                                <field name="message_ids" colspan="4" nolabel="1" mode="tree,form">
+                                <field name="message_ids" colspan="4" nolabel="1" mode="tree,form" readonly="1">
                                     <tree string="History">
                                         <field name="display_text" string="History Information"/>
                                         <button

From 84f97f57e66297011214044cd360d0e18392f222 Mon Sep 17 00:00:00 2001
From: "AMP (OpenERP)" <amp@tinyerp.com>
Date: Tue, 5 Apr 2011 16:01:34 +0530
Subject: [PATCH 057/331] [FIX] hr_holidays : Fixes the holidays workflow issue

bzr revid: amp@tinyerp.com-20110405103134-2lu512lqup2w57o5
---
 addons/hr_holidays/hr_holidays_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 7740470ccc7..ed062a38502 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -93,7 +93,7 @@
                             <newline/>
                             <field name="state" colspan="2"/>
                             <group colspan="2" col="6">
-                                <button string="Refuse" name="refuse" states="confirm" type="workflow" icon="gtk-no" groups="base.group_hr_user,base.group_hr_manager"/>
+                                <button string="Refuse" name="refuse" states="confirm,validate1" type="workflow" icon="gtk-no" groups="base.group_hr_user,base.group_hr_manager"/>
                                 <button string="Confirm" name="confirm" states="draft" type="workflow" icon="gtk-yes"/>
                                 <button string="Approve" name="validate" states="confirm" type="workflow" icon="gtk-apply" groups="base.group_hr_user"/>
                                 <button string="Approved" name="second_validate" states="validate1" type="workflow" icon="gtk-apply" groups="base.group_hr_user"/>

From dba0f626205b1195ab9351a71202113f427f1154 Mon Sep 17 00:00:00 2001
From: "AMP (OpenERP)" <amp@tinyerp.com>
Date: Tue, 5 Apr 2011 17:20:15 +0530
Subject: [PATCH 059/331] [FIX] hr_evaluation : Fixes the syntex problem on
 filter

bzr revid: amp@tinyerp.com-20110405115015-uymwebdn8b9b7j3e
---
 addons/hr_evaluation/hr_evaluation_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index 27b3ba53d10..46d5cf55a98 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -252,7 +252,7 @@
             <field name="arch" type="xml">
                 <search string="Search Evaluation">
                    <group col='10' colspan='4'>
-                    <filter icon="terp-check" string="Current" domain="[('state','=','wait'))]" help="Evaluations that are in waiting state"/>
+                    <filter icon="terp-check" string="Current" domain="[('state','=','wait')]" help="Evaluations that are in waiting state"/>
                     <filter icon="terp-camera_test" string="In progress" domain="[('state','=','progress')]" help="Evaluations that are in progress state"/>
                     <separator orientation="vertical"/>
                     <filter icon="terp-go-week" string="7 Days" help="Evaluations to close within the next 7 days"

From f1f16b884e4099734799a0c876d03fd2eca5d45f Mon Sep 17 00:00:00 2001
From: "RME (OpenERP)" <rme@tinyerp.com>
Date: Tue, 5 Apr 2011 17:32:37 +0530
Subject: [PATCH 060/331] [FIX] crm : partner form having convert to
 opportunity wizard's name improper

bzr revid: rme@tinyerp.com-20110405120237-6i304fb39sivoxxn
---
 addons/crm/wizard/crm_partner_to_opportunity_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/crm/wizard/crm_partner_to_opportunity_view.xml b/addons/crm/wizard/crm_partner_to_opportunity_view.xml
index 7ceb9bc40d9..762303f06ba 100644
--- a/addons/crm/wizard/crm_partner_to_opportunity_view.xml
+++ b/addons/crm/wizard/crm_partner_to_opportunity_view.xml
@@ -8,7 +8,7 @@
           <field name="model">crm.partner2opportunity</field>
           <field name="type">form</field>
           <field name="arch" type="xml">
-              <form string="Convert To Opportunity">
+              <form string="Create Opportunity">
             <field name="name"/>
             <field name="partner_id"/>
             <newline/>

From e21a561cb19cb3b99730f4fb7970dbc202584354 Mon Sep 17 00:00:00 2001
From: skh <skh@tinyerp.com>
Date: Tue, 5 Apr 2011 18:09:58 +0530
Subject: [PATCH 061/331] [FIX] payment mode - account must belong to company

lp bug: https://launchpad.net/bugs/739562 fixed

bzr revid: skh@tinyerp.com-20110405123958-savml2himnvrhsr3
---
 addons/account_payment/account_payment.py       | 11 ++++++++++-
 addons/account_payment/account_payment_view.xml |  5 +++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/addons/account_payment/account_payment.py b/addons/account_payment/account_payment.py
index f3259f846cc..9a089110d37 100644
--- a/addons/account_payment/account_payment.py
+++ b/addons/account_payment/account_payment.py
@@ -33,7 +33,9 @@ class payment_mode(osv.osv):
             required=True,help='Bank Account for the Payment Mode'),
         'journal': fields.many2one('account.journal', 'Journal', required=True,
             domain=[('type', 'in', ('bank','cash'))], help='Bank or Cash Journal for the Payment Mode'),
-        'company_id': fields.many2one('res.company', 'Company', required=True),
+        'company_id': fields.many2one('res.company', 'Company',required=True),
+        'partner_id':fields.related('company_id','partner_id',type='many2one',relation='res.partner',string='Partner',store=True,),
+        
     }
     _defaults = {
         'company_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id
@@ -49,6 +51,13 @@ class payment_mode(osv.osv):
             JOIN payment_mode pm ON (pm.bank_id = pb.id)
             WHERE pm.id = %s """, [payment_code])
         return [x[0] for x in cr.fetchall()]
+    
+    def onchange_company_id (self,cr,uid,ids,company_id,context=None):
+        vals={}
+        if company_id:
+            partner = self.pool.get('res.company').read(cr, uid, [company_id], ['partner_id'])[0]['partner_id']
+        return {'value': {'partner_id': partner}}
+                
 
 payment_mode()
 
diff --git a/addons/account_payment/account_payment_view.xml b/addons/account_payment/account_payment_view.xml
index 56ff30e5ded..6f7acc7a367 100644
--- a/addons/account_payment/account_payment_view.xml
+++ b/addons/account_payment/account_payment_view.xml
@@ -79,8 +79,9 @@
                 <form string="Payment Mode">
                     <field name="name" select="1"/>
                     <field name="journal" select="1"/>
-                    <field name="bank_id"/>
-                    <field name="company_id" select="1" widget='selection' groups="base.group_multi_company"/>
+                    <field name="bank_id" domain="[('partner_id','=',partner_id)]"  />
+                    <field name="company_id" select="1" widget='selection' groups="base.group_multi_company" on_change="onchange_company_id(company_id)"/>
+                    <field name="partner_id" select="1" widget='selection' invisible="1"/>
                 </form>
             </field>
         </record>

From 0e97026d171be10a9b93954a1b9cfabbb8be0312 Mon Sep 17 00:00:00 2001
From: skh <skh@tinyerp.com>
Date: Tue, 5 Apr 2011 18:52:02 +0530
Subject: [PATCH 062/331] [FIX] payment mode - account must belong to company

lp bug: https://launchpad.net/bugs/739562 fixed

bzr revid: skh@tinyerp.com-20110405132202-sbnuwnhc9h8mrzbb
---
 addons/account_payment/account_payment.py | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/addons/account_payment/account_payment.py b/addons/account_payment/account_payment.py
index 9a089110d37..ec5367150f2 100644
--- a/addons/account_payment/account_payment.py
+++ b/addons/account_payment/account_payment.py
@@ -52,11 +52,15 @@ class payment_mode(osv.osv):
             WHERE pm.id = %s """, [payment_code])
         return [x[0] for x in cr.fetchall()]
     
-    def onchange_company_id (self,cr,uid,ids,company_id,context=None):
-        vals={}
+    def onchange_company_id (self,cr,uid,ids,company_id=False,context=None):
+        result={}
         if company_id:
-            partner = self.pool.get('res.company').read(cr, uid, [company_id], ['partner_id'])[0]['partner_id']
-        return {'value': {'partner_id': partner}}
+            company = self.pool.get('res.company').browse(cr,uid,company_id)
+            partner = company.partner_id.id
+            result = {'value': 
+                         {'partner_id': partner}
+                      }
+        return result
                 
 
 payment_mode()

From abc1e151124fe36e770631563b11c0e7a903609a Mon Sep 17 00:00:00 2001
From: skh <skh@tinyerp.com>
Date: Tue, 5 Apr 2011 19:06:31 +0530
Subject: [PATCH 063/331] [FIX] payment mode - account must belong to company

lp bug: https://launchpad.net/bugs/739562 fixed

bzr revid: skh@tinyerp.com-20110405133631-53w2l2xurliqee3y
---
 addons/account_payment/account_payment.py | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/addons/account_payment/account_payment.py b/addons/account_payment/account_payment.py
index ec5367150f2..1840176519a 100644
--- a/addons/account_payment/account_payment.py
+++ b/addons/account_payment/account_payment.py
@@ -52,15 +52,12 @@ class payment_mode(osv.osv):
             WHERE pm.id = %s """, [payment_code])
         return [x[0] for x in cr.fetchall()]
     
-    def onchange_company_id (self,cr,uid,ids,company_id=False,context=None):
+    def onchange_company_id (self, cr, uid, ids, company_id = False, context = None):
         result={}
         if company_id:
-            company = self.pool.get('res.company').browse(cr,uid,company_id)
-            partner = company.partner_id.id
-            result = {'value': 
-                         {'partner_id': partner}
-                      }
-        return result
+            partner_id = self.pool.get('res.company').browse(cr, uid, company_id).partner_id.id
+            result['partner_id'] = partner_id
+        return {'value': result}
                 
 
 payment_mode()

From 0195b0755c09c9c898dcbd94a35897f594eac85e Mon Sep 17 00:00:00 2001
From: "pso (OpenERP)" <pso@tinyerp.com>
Date: Wed, 6 Apr 2011 10:35:34 +0530
Subject: [PATCH 064/331] [FIX] sale: Improved Usability for Product UOM and
 Product UOS in order line

lp bug: https://launchpad.net/bugs/751472 fixed

bzr revid: pso@tinyerp.com-20110406050534-22rekrajfk0b1p4h
---
 addons/sale/sale_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 9925354346b..9b6664daf20 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -135,10 +135,10 @@
                                                 name="product_uom_qty"
                                                 on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, 'lang' in context and context['lang'], False, parent.date_order, product_packaging, parent.fiscal_position, True)"
                                                 />
-                                                <field groups="product.group_uos" name="product_uos_qty"/>
-                                                <field groups="product.group_uos" name="product_uos"/>
                                             <field name="product_uom"
                                                 on_change="product_uom_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, 'lang' in context and context['lang'], False, parent.date_order)"/>
+                                            <field groups="product.group_uos" name="product_uos_qty"/>
+                                            <field groups="product.group_uos" name="product_uos"/>
                                             <field
                                                 name="product_packaging"
                                                 context="partner_id=parent.partner_id,quantity=product_uom_qty,pricelist=parent.pricelist_id,shop=parent.shop_id,uom=product_uom"

From 93c75e59e6363ac006c024342c05316f7f86da24 Mon Sep 17 00:00:00 2001
From: skh <skh@tinyerp.com>
Date: Wed, 6 Apr 2011 10:43:37 +0530
Subject: [PATCH 065/331] [FIX] payment mode - account must belong to company

lp bug: https://launchpad.net/bugs/739562 fixed

bzr revid: skh@tinyerp.com-20110406051337-852xk8bsz2feloro
---
 addons/account_payment/account_payment.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/account_payment/account_payment.py b/addons/account_payment/account_payment.py
index 1840176519a..4119aa28e38 100644
--- a/addons/account_payment/account_payment.py
+++ b/addons/account_payment/account_payment.py
@@ -52,8 +52,8 @@ class payment_mode(osv.osv):
             WHERE pm.id = %s """, [payment_code])
         return [x[0] for x in cr.fetchall()]
     
-    def onchange_company_id (self, cr, uid, ids, company_id = False, context = None):
-        result={}
+    def onchange_company_id (self, cr, uid, ids, company_id=False, context=None):
+        result = {}
         if company_id:
             partner_id = self.pool.get('res.company').browse(cr, uid, company_id).partner_id.id
             result['partner_id'] = partner_id

From bc23be6ebaa3e8e2ef4d2e09f1bf97e73642a3af Mon Sep 17 00:00:00 2001
From: skh <skh@tinyerp.com>
Date: Wed, 6 Apr 2011 11:39:50 +0530
Subject: [PATCH 066/331] [FIX] [PS] Generating an invoice from an expense
 doesn't create a correct supplier invoice

lp bug: https://launchpad.net/bugs/751296 fixed

bzr revid: skh@tinyerp.com-20110406060950-x1ndypq04szpsmvr
---
 addons/hr_expense/hr_expense.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py
index 1fdbb56f40b..e366d7a6afd 100644
--- a/addons/hr_expense/hr_expense.py
+++ b/addons/hr_expense/hr_expense.py
@@ -127,7 +127,7 @@ class hr_expense_expense(osv.osv):
     def invoice(self, cr, uid, ids, context=None):
         wf_service = netsvc.LocalService("workflow")
         mod_obj = self.pool.get('ir.model.data')
-        res = mod_obj.get_object_reference(cr, uid, 'account', 'invoice_form')
+        res = mod_obj.get_object_reference(cr, uid, 'account', 'invoice_supplier_form')
         res_id = res and res[1] or False,
         inv_ids = []
         for id in ids:

From 29b7fddceb341e42721775b71de7ad754214dde5 Mon Sep 17 00:00:00 2001
From: Jigar Amin <jam@tinyerp.com>
Date: Wed, 6 Apr 2011 12:06:23 +0530
Subject: [PATCH 067/331] [IMP] account_analytic_analysis: All univoived menu
 should show all uninvocied entry

lp bug: https://launchpad.net/bugs/751507 fixed

bzr revid: jam@tinyerp.com-20110406063623-m960iw15syjfgoq0
---
 .../account_analytic_analysis_menu.xml                          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
index badd7e1816a..4ee4693abcb 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
@@ -8,7 +8,7 @@
             <field name="res_model">account.analytic.line</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-            <field name="domain">[('invoice_id','=',False),('to_invoice','!=',False)]</field>
+            <field name="domain">[('invoice_id','=',False)]</field>
             <field name="search_view_id" ref="account.view_account_analytic_line_filter"/>
         </record>
         <menuitem action="action_hr_tree_invoiced_all" id="menu_action_hr_tree_invoiced_all" parent="menu_invoicing" groups="base.group_extended"/>

From 49dd2cae4ed2fa726d7c7d1b3d1dbc260bd6d6c2 Mon Sep 17 00:00:00 2001
From: "RME (OpenERP)" <rme@tinyerp.com>
Date: Wed, 6 Apr 2011 12:32:01 +0530
Subject: [PATCH 068/331] [FIX] crm : Opportunity 'communication & history' tab
 sequence improper

bzr revid: rme@tinyerp.com-20110406070201-m0eg56c6lvwxm8w7
---
 addons/crm/crm_opportunity_view.xml | 40 +++++++++++++++--------------
 1 file changed, 21 insertions(+), 19 deletions(-)

diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index 9b87c64483e..a6fb9166186 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -136,6 +136,26 @@
                             </group>
                         </page>
 
+						<page string="Extra Info" groups="base.group_extended">
+                            <group col="2" colspan="2">
+                                <separator string="Dates" colspan="2"/>
+                                <field name="create_date"/>
+                                <field name="write_date"/>
+                                <field name="date_closed"/>
+                                <field name="date_open"/>
+                            </group>
+                            <group col="2" colspan="2">
+                                <separator string="Misc" colspan="2"/>
+                                <field name="active"/>
+                                <field name="day_open"/>
+                                <field name="day_close"/>
+                                <field name="referred"/>
+                            </group>
+                            <separator colspan="4" string="References"/>
+                            <field name="ref"/>
+                            <field name="ref2"/>
+                        </page>
+
                         <page string="Communication &amp; History" groups="base.group_extended">
                             <group colspan="4">
                                 <field colspan="4" name="email_cc" string="Global CC" widget="char" size="512"/>
@@ -188,25 +208,7 @@
                                 context="{'mail':'new', 'model': 'crm.lead'}"
                                 icon="terp-mail-message-new" type="action" />
                         </page>
-                        <page string="Extra Info" groups="base.group_extended">
-                            <group col="2" colspan="2">
-                                <separator string="Dates" colspan="2"/>
-                                <field name="create_date"/>
-                                <field name="write_date"/>
-                                <field name="date_closed"/>
-                                <field name="date_open"/>
-                            </group>
-                            <group col="2" colspan="2">
-                                <separator string="Misc" colspan="2"/>
-                                <field name="active"/>
-                                <field name="day_open"/>
-                                <field name="day_close"/>
-                                <field name="referred"/>
-                            </group>
-                            <separator colspan="4" string="References"/>
-                            <field name="ref"/>
-                            <field name="ref2"/>
-                        </page>
+
                         </notebook>
                     </form>
                 </field>

From 06bf22682caf19e7cd531770d7e0ea6412f45c51 Mon Sep 17 00:00:00 2001
From: Thibault Francois <tfr@openerp.com>
Date: Wed, 6 Apr 2011 10:52:52 +0200
Subject: [PATCH 069/331] [FIX] find partner with email or opp with email

bzr revid: tfr@openerp.com-20110406085252-6cddo7mke2ijr3ao
---
 addons/crm/wizard/crm_lead_to_opportunity.py | 19 ++++++++++++++++---
 addons/crm/wizard/crm_lead_to_partner.py     |  8 ++++----
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/addons/crm/wizard/crm_lead_to_opportunity.py b/addons/crm/wizard/crm_lead_to_opportunity.py
index 44c83f7c70c..ea6145f3719 100644
--- a/addons/crm/wizard/crm_lead_to_opportunity.py
+++ b/addons/crm/wizard/crm_lead_to_opportunity.py
@@ -22,6 +22,7 @@
 from osv import osv, fields
 from tools.translate import _
 import tools
+import re
 
 import time
 
@@ -54,6 +55,8 @@ class crm_lead2opportunity_partner(osv.osv_memory):
         partner_id = False
         for lead in lead_obj.browse(cr, uid, opportunities, context=context):
             partner_id = lead.partner_id and lead.partner_id.id or False
+            email = re.findall(r'([^ ,<@]+@[^> ,]+)', lead.email_from or '')
+            email = map(lambda x: "'" + x + "'", email)
 
         if not partner_id and res.get('partner_id'):
             partner_id = res.get('partner_id')
@@ -63,6 +66,18 @@ class crm_lead2opportunity_partner(osv.osv_memory):
             ids = lead_obj.search(cr, uid, [('partner_id', '=', partner_id), ('type', '=', 'opportunity'), '!', ('state', 'in', ['done', 'cancel'])])
             if ids:
                 opportunities.append(ids[0])
+                
+                
+        if not partner_id:
+            label = False
+            opp_ids = []
+            if email:
+                # Find email of existing opportunity matches the email_from of the lead
+                cr.execute("""select id from crm_lead where type='opportunity' and
+                                substring(email_from from '([^ ,<@]+@[^> ,]+)') in (%s)""" % (','.join(email)))
+                ids = map(lambda x:x[0], cr.fetchall())
+            if ids:
+                opportunities.append(ids[0])
 
         if 'action' in fields:
             res.update({'action' : partner_id and 'exist' or 'create'})
@@ -84,7 +99,6 @@ class crm_lead2opportunity_partner(osv.osv_memory):
         @param uid: the current user’s ID for security checks,
         @param fields: List of fields for default value
         @param context: A standard dictionary for contextual values
-
         """
         if context is None:
             context = {}
@@ -92,8 +106,7 @@ class crm_lead2opportunity_partner(osv.osv_memory):
 
         for lead in lead_obj.browse(cr, uid, context.get('active_ids', []), context=context):
             if lead.state in ['done', 'cancel']:
-                raise osv.except_osv(_("Warning !"), _("Closed/Cancelled \
-Leads Could not convert into Opportunity"))
+                raise osv.except_osv(_("Warning !"), _("Closed/Cancelled Leads Could not convert into Opportunity"))
         return False
 
     def _convert(self, cr, uid, ids, lead, partner_id, stage_ids, context=None):
diff --git a/addons/crm/wizard/crm_lead_to_partner.py b/addons/crm/wizard/crm_lead_to_partner.py
index 1a9304adc85..a3db910a815 100644
--- a/addons/crm/wizard/crm_lead_to_partner.py
+++ b/addons/crm/wizard/crm_lead_to_partner.py
@@ -85,15 +85,15 @@ class crm_lead2partner(osv.osv_memory):
                                 substring(email from '([^ ,<@]+@[^> ,]+)') in (%s)""" % (','.join(email)))
                 address_ids = map(lambda x: x[0], cr.fetchall())
                 if address_ids:
-                    addresses = contact_obj.browse(cr, uid, address_ids)
-                    partner_ids = addresses and [addresses[0].partner_id.id] or False
-
+                    partner_ids = partner_obj.search(cr, uid, [('address', 'in', address_ids)], context=context)
+                    
             # Find partner name that matches the name of the lead
             if not partner_ids and lead.partner_name:
                 partner_ids = partner_obj.search(cr, uid, [('name', '=', lead.partner_name)], context=context)
-            
                 
             partner_id = partner_ids and partner_ids[0] or False
+            
+            
 
             if 'partner_id' in fields:
                 res.update({'partner_id': partner_id})

From 2e7d3b5ee15134b93944efa5a99a281cf76a9dc7 Mon Sep 17 00:00:00 2001
From: "RME (OpenERP)" <rme@tinyerp.com>
Date: Wed, 6 Apr 2011 15:48:54 +0530
Subject: [PATCH 070/331] [FIX] crm : history field should be present cause
 attrs on the same, due to that reply button appears for all

bzr revid: rme@tinyerp.com-20110406101854-1em722yxk9ufcovp
---
 addons/crm_claim/crm_claim_view.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index 63df2c35d0d..77ab2320b7a 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -180,6 +180,7 @@
                                 <field name="message_ids" colspan="4" nolabel="1" mode="tree,form">
                                     <tree string="History">
                                         <field name="display_text" string="History Information"/>
+                                        <field name="history" invisible="1"/>
                                         <button
                                             string="Reply"
                                             name="%(crm.action_crm_send_mail)d"

From 41b425897567b03cd7cd0a914cdc758b2be21bf2 Mon Sep 17 00:00:00 2001
From: "Anup (OpenERP)" <ach@tinyerp.com>
Date: Wed, 6 Apr 2011 17:15:29 +0530
Subject: [PATCH 071/331] [FIX] stock : Fill Inventory Wizard should import
 production lot too. (Courtsey KSA(OpenERP))

lp bug: https://launchpad.net/bugs/725908 fixed

bzr revid: ach@tinyerp.com-20110406114529-7icmcd44va27tlwm
---
 addons/stock/wizard/stock_fill_inventory.py | 84 ++++++++++-----------
 1 file changed, 42 insertions(+), 42 deletions(-)

diff --git a/addons/stock/wizard/stock_fill_inventory.py b/addons/stock/wizard/stock_fill_inventory.py
index afb1299fe2b..3f0036631e7 100644
--- a/addons/stock/wizard/stock_fill_inventory.py
+++ b/addons/stock/wizard/stock_fill_inventory.py
@@ -58,61 +58,61 @@ class stock_fill_inventory(osv.osv_memory):
         @return:
         """
         if context is None:
-            context = {}        
+            context = {}
         inventory_line_obj = self.pool.get('stock.inventory.line')
         location_obj = self.pool.get('stock.location')
         product_obj = self.pool.get('product.product')
-        stock_location_obj = self.pool.get('stock.location')
-        if ids and len(ids): 
+        move_obj = self.pool.get('stock.move')
+
+        if ids and len(ids):
             ids = ids[0]
         else:
-             return {'type': 'ir.actions.act_window_close'}    
+             return {'type': 'ir.actions.act_window_close'}
         fill_inventory = self.browse(cr, uid, ids, context=context)
         res = {}
         res_location = {}
         if fill_inventory.recursive :
             location_ids = location_obj.search(cr, uid, [('location_id',
-                             'child_of', fill_inventory.location_id.id)])
-            for location in location_ids :
-                res = location_obj._product_get(cr, uid, location)
-                res_location[location] = res
+                             'child_of', fill_inventory.location_id.id)], order="id")
         else:
-            context.update({'compute_child': False})
-            res = location_obj._product_get(cr, uid,
-                        fill_inventory.location_id.id, context=context)
-            res_location[fill_inventory.location_id.id] = res
-    
-        product_ids = []
-        for location in res_location.keys():
-            res = res_location[location]
-            for product_id in res.keys():
-                prod = product_obj.browse(cr, uid, product_id, context=context)
-                uom = prod.uom_id.id
-                context.update(uom=uom, compute_child=False)
-                amount = stock_location_obj._product_get(cr, uid,
-                         location, [product_id], context=context)[product_id]
-                if(amount):
-                    if fill_inventory.set_stock_zero:
-                        amount = 0                    
-                    line_ids=inventory_line_obj.search(cr, uid,
-                        [('inventory_id', '=', context['active_ids']),
-                         ('location_id', '=', location),
-                         ('product_id', '=', product_id),
-                         ('product_uom', '=', uom),
-                        ('product_qty', '=', amount)])
-                    if not len(line_ids):
-                        inventory_line = {
-                            'inventory_id': context['active_ids'][0],
-                            'location_id': location,
-                            'product_id': product_id,
-                            'product_uom': uom,
-                            'product_qty': amount
-                        }
-                        inventory_line_obj.create(cr, uid, inventory_line)
-                    product_ids.append(product_id)
+            location_ids = [fill_inventory.location_id.id]
 
-        if(len(product_ids) == 0):
+        res = {}
+        flag = False
+        for location in location_ids:
+            datas = {}
+            res[location] = {}
+            move_ids = move_obj.search(cr, uid, [('location_dest_id','=',location),('state','=','done')], context=context)
+
+            for move in move_obj.browse(cr, uid, move_ids, context=context):
+                lot_id = move.prodlot_id.id
+                prod_id = move.product_id.id
+                qty = move.product_qty
+                location_dest_id = move.location_dest_id.id
+                if datas.get((prod_id, lot_id)):
+                    qty = datas[(prod_id, lot_id)]['product_qty'] + qty
+                datas[(prod_id, lot_id)] = {'product_id': prod_id, 'location_id': location_dest_id, 'product_qty': qty, 'product_uom': move.product_id.uom_id.id, 'prod_lot_id': lot_id}
+            if datas:
+                flag = True
+                res[location] = datas
+
+        if not flag:
             raise osv.except_osv(_('Message !'), _('No product in this location.'))
+
+        for i in res.values():
+            if i.values():
+                for mydata in i.values():
+                    mydata.update({'inventory_id': context['active_ids'][0]})
+                    domain = []
+                    if fill_inventory.set_stock_zero:
+                        mydata.update({'product_qty': 0})
+                    for k, v in mydata.items():
+                        domain.append((k, '=', v))
+                    line_ids = inventory_line_obj.search(cr, uid, domain, context=context)
+
+                    if not len(line_ids):
+                        inventory_line_obj.create(cr, uid, mydata, context=context)
+
         return {'type': 'ir.actions.act_window_close'}
 
 stock_fill_inventory()

From 1f2ebfbc44c60b262696488999418f0987f4879f Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Wed, 6 Apr 2011 15:44:18 +0200
Subject: [PATCH 072/331] [IMP] small improvement to fields_view_get

bzr revid: nicolas.vanhoren@openerp.com-20110406134418-hv5gii3htphwz4g8
---
 addons/base/controllers/main.py | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/addons/base/controllers/main.py b/addons/base/controllers/main.py
index 58dde297338..1ae2a7c1fad 100644
--- a/addons/base/controllers/main.py
+++ b/addons/base/controllers/main.py
@@ -352,9 +352,9 @@ class DataRecord(openerpweb.Controller):
         return {'result': r}
 
 class View(openerpweb.Controller):
-    def fields_view_get(self, session, model, view_id, view_type, transform=True):
+    def fields_view_get(self, session, model, view_id, view_type, transform=True, toolbar=False, submenu=False):
         Model = session.model(model)
-        r = Model.fields_view_get(view_id, view_type)
+        r = Model.fields_view_get(view_id, view_type, {}, toolbar, submenu)
         if transform:
             context = {} # TODO: dict(ctx_sesssion, **ctx_action)
             xml = self.transform_view(r['arch'], session, context)
@@ -458,8 +458,8 @@ class FormView(View):
     _cp_path = "/base/formview"
 
     @openerpweb.jsonrequest
-    def load(self, req, model, view_id):
-        fields_view = self.fields_view_get(req.session, model, view_id, 'form')
+    def load(self, req, model, view_id, sidebar=False):
+        fields_view = self.fields_view_get(req.session, model, view_id, 'form', sidebar)
         return {'fields_view': fields_view}
 
 
@@ -467,8 +467,8 @@ class ListView(View):
     _cp_path = "/base/listview"
 
     @openerpweb.jsonrequest
-    def load(self, req, model, view_id):
-        fields_view = self.fields_view_get(req.session, model, view_id, 'tree')
+    def load(self, req, model, view_id, sidebar=False):
+        fields_view = self.fields_view_get(req.session, model, view_id, 'tree', sidebar)
         return {'fields_view': fields_view}
 
 
@@ -485,6 +485,7 @@ class SideBar(View):
     
     @openerpweb.jsonrequest
     def get_actions(self, request, model, object_id=0):
+        #probably useless now
         result = load_actions_from_ir_values(request, "action", "client_action_multi",
                                              [[model, object_id]], False, {})
         return result

From a7db3360655d814d42553005a7ab91766f9dee87 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Wed, 6 Apr 2011 16:47:51 +0200
Subject: [PATCH 073/331] [IMP] Changed way the sidebar is created.

bzr revid: nicolas.vanhoren@openerp.com-20110406144751-or0o86gvqe5sa21h
---
 addons/base/controllers/main.py     | 18 ++++--------------
 addons/base/static/src/js/form.js   |  5 +++--
 addons/base/static/src/js/list.js   |  8 +++++---
 addons/base/static/src/js/views.js  | 17 +++++++++--------
 addons/base/static/src/xml/base.xml |  2 +-
 5 files changed, 22 insertions(+), 28 deletions(-)

diff --git a/addons/base/controllers/main.py b/addons/base/controllers/main.py
index 1ae2a7c1fad..4e27f3cb4a8 100644
--- a/addons/base/controllers/main.py
+++ b/addons/base/controllers/main.py
@@ -458,8 +458,8 @@ class FormView(View):
     _cp_path = "/base/formview"
 
     @openerpweb.jsonrequest
-    def load(self, req, model, view_id, sidebar=False):
-        fields_view = self.fields_view_get(req.session, model, view_id, 'form', sidebar)
+    def load(self, req, model, view_id, toolbar=False):
+        fields_view = self.fields_view_get(req.session, model, view_id, 'form', toolbar=toolbar)
         return {'fields_view': fields_view}
 
 
@@ -467,8 +467,8 @@ class ListView(View):
     _cp_path = "/base/listview"
 
     @openerpweb.jsonrequest
-    def load(self, req, model, view_id, sidebar=False):
-        fields_view = self.fields_view_get(req.session, model, view_id, 'tree', sidebar)
+    def load(self, req, model, view_id, toolbar=False):
+        fields_view = self.fields_view_get(req.session, model, view_id, 'tree', toolbar=toolbar)
         return {'fields_view': fields_view}
 
 
@@ -479,16 +479,6 @@ class SearchView(View):
     def load(self, req, model, view_id):
         fields_view = self.fields_view_get(req.session, model, view_id, 'search')
         return {'fields_view': fields_view}
-    
-class SideBar(View):
-    _cp_path = "/base/sidebar"
-    
-    @openerpweb.jsonrequest
-    def get_actions(self, request, model, object_id=0):
-        #probably useless now
-        result = load_actions_from_ir_values(request, "action", "client_action_multi",
-                                             [[model, object_id]], False, {})
-        return result
 
 
 class Action(openerpweb.Controller):
diff --git a/addons/base/static/src/js/form.js b/addons/base/static/src/js/form.js
index 9c2c7004c1e..12609ed9c53 100644
--- a/addons/base/static/src/js/form.js
+++ b/addons/base/static/src/js/form.js
@@ -30,7 +30,8 @@ openerp.base.FormView =  openerp.base.Controller.extend( /** @lends openerp.base
     },
     start: function() {
         //this.log('Starting FormView '+this.model+this.view_id)
-        return this.rpc("/base/formview/load", {"model": this.model, "view_id": this.view_id}, this.on_loaded);
+        return this.rpc("/base/formview/load", {"model": this.model, "view_id": this.view_id,
+            toolbar:!!this.view_manager.sidebar}, this.on_loaded);
     },
     on_loaded: function(data) {
         var self = this;
@@ -53,7 +54,7 @@ openerp.base.FormView =  openerp.base.Controller.extend( /** @lends openerp.base
 
         // sidebar stuff
         if (this.view_manager.sidebar) {
-            this.view_manager.sidebar.load_multi_actions();
+            this.view_manager.sidebar.set_toolbar(data.fields_view.toolbar);
         }
     },
     on_record_loaded: function(record) {
diff --git a/addons/base/static/src/js/list.js b/addons/base/static/src/js/list.js
index 273f71ed82d..7f88b13e979 100644
--- a/addons/base/static/src/js/list.js
+++ b/addons/base/static/src/js/list.js
@@ -24,7 +24,8 @@ openerp.base.ListView = openerp.base.Controller.extend({
     },
     start: function() {
         //this.log('Starting ListView '+this.model+this.view_id)
-        return this.rpc("/base/listview/load", {"model": this.model, "view_id":this.view_id}, this.on_loaded);
+        return this.rpc("/base/listview/load", {"model": this.model, "view_id":this.view_id,
+            toolbar:!!this.view_manager.sidebar}, this.on_loaded);
     },
     on_loaded: function(data) {
         this.fields_view = data.fields_view;
@@ -68,8 +69,9 @@ openerp.base.ListView = openerp.base.Controller.extend({
         }).trigger('resize');
         
         // sidebar stuff
-        if (this.view_manager.sidebar)
-            this.view_manager.sidebar.load_multi_actions();
+        if (this.view_manager.sidebar) {
+            this.view_manager.sidebar.set_toolbar(data.fields_view.toolbar);
+        }
     },
     do_fill_table: function(records) {
         this.$table
diff --git a/addons/base/static/src/js/views.js b/addons/base/static/src/js/views.js
index 11d4aa5c66a..05a07eb99a1 100644
--- a/addons/base/static/src/js/views.js
+++ b/addons/base/static/src/js/views.js
@@ -288,16 +288,17 @@ openerp.base.Sidebar = openerp.base.BaseWidget.extend({
         this.view_manager = view_manager;
         this.sections = [];
     },
-    load_multi_actions: function() {
-        if (_.detect(this.sections, function(x) {return x.type=="multi_actions";}) != undefined)
-            return;
+    set_toolbar: function(toolbar) {
+        debugger;
+        this.sections = [];
         var self = this;
-        this.rpc("/base/sidebar/get_actions",
-                {"model": this.view_manager.dataset.model}, function(result) {
-            self.sections.push({type: "multi_actions", elements:
-            _.map(result, function(x) {return {text:x[2].name, action:x}; })});
-            self.refresh();
+        _.each(["print", "action", "relate"], function(type) {
+            if (toolbar[type].length == 0)
+                return;
+            var section = {elements:toolbar[type]};
+            self.sections.push(section);
         });
+        this.refresh();
     },
     refresh: function() {
         this.$element.html(QWeb.render("ViewManager.sidebar.internal", _.extend({_:_}, this)));
diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml
index b26c481327a..fbf3f728ef3 100644
--- a/addons/base/static/src/xml/base.xml
+++ b/addons/base/static/src/xml/base.xml
@@ -453,7 +453,7 @@
         <ul>
             <t t-set="j" t-value="0"/>
             <t t-foreach="section.elements" t-as="element">
-                <li><a t-att-data-i="i" t-att-data-j="j" href="#"><t t-esc="element.text"/></a></li>
+                <li><a t-att-data-i="i" t-att-data-j="j" href="#"><t t-esc="element.name"/></a></li>
                 <t t-set="j+1" t-value="0"/>
             </t>
         </ul>

From 3ea48a453d0bd0d367f4768821dd21e41a4a3f2d Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Wed, 6 Apr 2011 17:05:25 +0200
Subject: [PATCH 074/331] [FIX]: evaluate one2many domains instead of using
 them as string.

lp bug: https://launchpad.net/bugs/715654 fixed

bzr revid: vmt@openerp.com-20110406150525-hnmq4wsfbmfwgxpl
---
 bin/addons/base/ir/ir_model.py | 4 ++--
 bin/osv/orm.py                 | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/bin/addons/base/ir/ir_model.py b/bin/addons/base/ir/ir_model.py
index efb6878c03f..0c3cd46356f 100644
--- a/bin/addons/base/ir/ir_model.py
+++ b/bin/addons/base/ir/ir_model.py
@@ -303,10 +303,10 @@ class ir_model_fields(osv.osv):
 
         # static table of properties
         model_props = [ # (our-name, fields.prop, set_fn)
-            ('field_description', 'string', lambda a: a),
+            ('field_description', 'string', str),
             ('required', 'required', bool),
             ('readonly', 'readonly', bool),
-            ('domain', '_domain', lambda a: a),
+            ('domain', '_domain', eval),
             ('size', 'size', int),
             ('on_delete', 'ondelete', str),
             ('translate', 'translate', bool),
diff --git a/bin/osv/orm.py b/bin/osv/orm.py
index 5b70c6604b5..7fc8744737b 100644
--- a/bin/osv/orm.py
+++ b/bin/osv/orm.py
@@ -2821,7 +2821,7 @@ class orm(orm_template):
                     'string': field['field_description'],
                     'required': bool(field['required']),
                     'readonly': bool(field['readonly']),
-                    'domain': field['domain'] or None,
+                    'domain': eval(field['domain']) if field['domain'] else None,
                     'size': field['size'],
                     'ondelete': field['on_delete'],
                     'translate': (field['translate']),

From 448e551276858fc6af25a7bd1f80fffe4999f65d Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Wed, 6 Apr 2011 17:26:15 +0200
Subject: [PATCH 075/331] [FIX] typo

bzr revid: nicolas.vanhoren@openerp.com-20110406152615-0s00pfvbl8mhjb8x
---
 addons/base/static/src/js/views.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/base/static/src/js/views.js b/addons/base/static/src/js/views.js
index 05a07eb99a1..4ffb9076a19 100644
--- a/addons/base/static/src/js/views.js
+++ b/addons/base/static/src/js/views.js
@@ -289,7 +289,6 @@ openerp.base.Sidebar = openerp.base.BaseWidget.extend({
         this.sections = [];
     },
     set_toolbar: function(toolbar) {
-        debugger;
         this.sections = [];
         var self = this;
         _.each(["print", "action", "relate"], function(type) {

From 05e833ccfa3efc4f3c716c4e632d0528574e5d91 Mon Sep 17 00:00:00 2001
From: "Kervel,PSO" <>
Date: Thu, 7 Apr 2011 11:06:42 +0530
Subject: [PATCH 076/331] [FIX] hr_timesheet_invoice: Passed to_invocie while
 creating of analytic lines

lp bug: https://launchpad.net/bugs/734497 fixed

bzr revid: pso@tinyerp.com-20110407053642-ao3itgzmfg94oboy
---
 .../hr_timesheet_invoice/hr_timesheet_invoice.py  | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice.py b/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
index 215c98c02ac..2ffa628a12d 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
@@ -176,5 +176,20 @@ class account_invoice(osv.osv):
 
 account_invoice()
 
+class account_move_line(osv.osv):
+    _inherit = "account.move.line"
+
+    def create_analytic_lines(self, cr, uid, ids, context=None):
+        res = super(account_move_line, self).create_analytic_lines(cr, uid, ids,context=context)
+        analytic_line_obj = self.pool.get('account.analytic.line')
+        for move_line in self.pool.get('account.move.line').browse(cr, uid, ids, context=context):
+            for line in move_line.analytic_lines:
+                toinv = line.account_id.to_invoice.id
+                if toinv:
+                    analytic_line_obj.write(cr, uid, line.id, {'to_invoice': toinv})
+        return res
+
+account_move_line()
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 

From 996f3359650feb4782dffc75082195a602c20875 Mon Sep 17 00:00:00 2001
From: "pso (OpenERP)" <pso@tinyerp.com>
Date: Thu, 7 Apr 2011 11:12:43 +0530
Subject: [PATCH 077/331] [IMP] hr_timesheet_invoice: Improved
 create_analytic_lines func

bzr revid: pso@tinyerp.com-20110407054243-6rus1i8rcx0cj1qs
---
 addons/hr_timesheet_invoice/hr_timesheet_invoice.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice.py b/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
index 2ffa628a12d..5c042c5c7e3 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
@@ -182,7 +182,7 @@ class account_move_line(osv.osv):
     def create_analytic_lines(self, cr, uid, ids, context=None):
         res = super(account_move_line, self).create_analytic_lines(cr, uid, ids,context=context)
         analytic_line_obj = self.pool.get('account.analytic.line')
-        for move_line in self.pool.get('account.move.line').browse(cr, uid, ids, context=context):
+        for move_line in self.browse(cr, uid, ids, context=context):
             for line in move_line.analytic_lines:
                 toinv = line.account_id.to_invoice.id
                 if toinv:

From ce937912ce8d922303a095da5c4c27298c19cb44 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Thu, 7 Apr 2011 05:54:57 +0000
Subject: [PATCH 078/331] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20110406060228-pyb9f2qgl1betbp2
bzr revid: launchpad_translations_on_behalf_of_openerp-20110407055457-2bu9my2e5ltros01
---
 addons/base_calendar/i18n/nb.po       | 1658 +++++++++++++++++++++
 addons/base_contact/i18n/nb.po        |  514 +++++++
 addons/base_report_creator/i18n/nb.po |  527 +++++++
 addons/base_tools/i18n/sr@latin.po    |    2 +-
 addons/crm/i18n/nb.po                 |    2 +-
 addons/decimal_precision/i18n/nb.po   |   71 +
 addons/delivery/i18n/nb.po            |  517 +++++++
 addons/document/i18n/gl.po            | 1078 ++++++++++++++
 addons/email_template/i18n/nb.po      | 1280 +++++++++++++++++
 addons/hr/i18n/nb.po                  |  829 +++++++++++
 addons/process/i18n/ru.po             |   28 +-
 addons/procurement/i18n/nb.po         |  890 ++++++++++++
 addons/product/i18n/ru.po             |   10 +-
 addons/project/i18n/nb.po             | 1903 +++++++++++++++++++++++++
 addons/sale_layout/i18n/nb.po         |  292 ++++
 addons/stock/i18n/el.po               |  294 ++--
 addons/stock_location/i18n/el.po      |   82 +-
 addons/stock_planning/i18n/el.po      | 1475 +++++++++++++++++++
 18 files changed, 11249 insertions(+), 203 deletions(-)
 create mode 100644 addons/base_calendar/i18n/nb.po
 create mode 100644 addons/base_contact/i18n/nb.po
 create mode 100644 addons/base_report_creator/i18n/nb.po
 create mode 100644 addons/decimal_precision/i18n/nb.po
 create mode 100644 addons/delivery/i18n/nb.po
 create mode 100644 addons/document/i18n/gl.po
 create mode 100644 addons/email_template/i18n/nb.po
 create mode 100644 addons/hr/i18n/nb.po
 create mode 100644 addons/procurement/i18n/nb.po
 create mode 100644 addons/project/i18n/nb.po
 create mode 100644 addons/sale_layout/i18n/nb.po
 create mode 100644 addons/stock_planning/i18n/el.po

diff --git a/addons/base_calendar/i18n/nb.po b/addons/base_calendar/i18n/nb.po
new file mode 100644
index 00000000000..51f39e05f4e
--- /dev/null
+++ b/addons/base_calendar/i18n/nb.po
@@ -0,0 +1,1658 @@
+# Norwegian Bokmal translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2011-04-06 16:38+0000\n"
+"Last-Translator: Rolv Råen (adEgo) <Unknown>\n"
+"Language-Team: Norwegian Bokmal <nb@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: 2011-04-07 05:54+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
+
+#. module: base_calendar
+#: selection:calendar.alarm,trigger_related:0
+#: selection:res.alarm,trigger_related:0
+msgid "The event starts"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,freq:0
+msgid "Hourly"
+msgstr "Hver time"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Required to Join"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.event,exdate:0
+#: help:calendar.todo,exdate:0
+msgid ""
+"This property defines the list of date/time exceptions for a recurring "
+"calendar component."
+msgstr ""
+
+#. module: base_calendar
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event.edit.all,name:0
+msgid "Title"
+msgstr "Tittel"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,freq:0
+#: selection:calendar.event,rrule_type:0
+#: selection:calendar.todo,rrule_type:0
+msgid "Monthly"
+msgstr "Månedlig"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Invited User"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Invitation"
+msgstr "Invitasjon"
+
+#. module: base_calendar
+#: help:calendar.event,recurrency:0
+#: help:calendar.todo,recurrency:0
+msgid "Recurrent Meeting"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.actions.act_window,name:base_calendar.action_res_alarm_view
+#: model:ir.ui.menu,name:base_calendar.menu_crm_meeting_avail_alarm
+msgid "Alarms"
+msgstr "Alarmer"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,week_list:0
+#: selection:calendar.event,week_list:0
+#: selection:calendar.todo,week_list:0
+msgid "Sunday"
+msgstr "Søndag"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: field:calendar.attendee,role:0
+msgid "Role"
+msgstr "Rolle"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: view:calendar.event:0
+msgid "Invitation details"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,byday:0
+#: selection:calendar.event,byday:0
+#: selection:calendar.todo,byday:0
+msgid "Fourth"
+msgstr "Fjerde"
+
+#. module: base_calendar
+#: field:calendar.event,show_as:0
+#: field:calendar.todo,show_as:0
+msgid "Show as"
+msgstr "Vis som"
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,day:0
+#: selection:base.calendar.set.exrule,select1:0
+#: field:calendar.event,day:0
+#: selection:calendar.event,select1:0
+#: field:calendar.todo,day:0
+#: selection:calendar.todo,select1:0
+msgid "Date of month"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,class:0
+#: selection:calendar.todo,class:0
+msgid "Public"
+msgstr "Offentlig"
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid " "
+msgstr " "
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "March"
+msgstr "Mars"
+
+#. module: base_calendar
+#: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:90
+#, python-format
+msgid "Warning !"
+msgstr "Advarsel !"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,week_list:0
+#: selection:calendar.event,week_list:0
+#: selection:calendar.todo,week_list:0
+msgid "Friday"
+msgstr "Fredag"
+
+#. module: base_calendar
+#: field:calendar.event,allday:0
+#: field:calendar.todo,allday:0
+msgid "All Day"
+msgstr "Hele dagen"
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,select1:0
+#: field:calendar.event,select1:0
+#: field:calendar.todo,select1:0
+msgid "Option"
+msgstr "Alternativ"
+
+#. module: base_calendar
+#: selection:calendar.attendee,availability:0
+#: selection:calendar.event,show_as:0
+#: selection:calendar.todo,show_as:0
+#: selection:res.users,availability:0
+msgid "Free"
+msgstr "Ledig"
+
+#. module: base_calendar
+#: help:calendar.attendee,rsvp:0
+msgid "Indicats whether the favor of a reply is requested"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_ir_attachment
+msgid "ir.attachment"
+msgstr "ir.attachment"
+
+#. module: base_calendar
+#: help:calendar.attendee,delegated_to:0
+msgid "The users that the original request was delegated to"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,ref:0
+msgid "Event Ref"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,we:0
+#: field:calendar.event,we:0
+#: field:calendar.todo,we:0
+msgid "Wed"
+msgstr "Ons"
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Show time as"
+msgstr "Vis tid som"
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,tu:0
+#: field:calendar.event,tu:0
+#: field:calendar.todo,tu:0
+msgid "Tue"
+msgstr "Tir"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,freq:0
+#: selection:calendar.event,rrule_type:0
+#: selection:calendar.todo,rrule_type:0
+msgid "Yearly"
+msgstr "Årlig"
+
+#. module: base_calendar
+#: selection:calendar.alarm,trigger_related:0
+#: selection:res.alarm,trigger_related:0
+msgid "The event ends"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,byday:0
+#: selection:calendar.event,byday:0
+#: selection:calendar.todo,byday:0
+msgid "Last"
+msgstr "Siste"
+
+#. module: base_calendar
+#: help:calendar.attendee,state:0
+msgid "Status of the attendee's participation"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,cutype:0
+msgid "Room"
+msgstr "Rom"
+
+#. module: base_calendar
+#: selection:calendar.alarm,trigger_interval:0
+#: selection:calendar.event,freq:0
+#: selection:calendar.todo,freq:0
+#: selection:res.alarm,trigger_interval:0
+msgid "Days"
+msgstr "Dager"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: view:calendar.event:0
+msgid "Invitation Detail"
+msgstr ""
+
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:1356
+#: code:addons/base_calendar/wizard/base_calendar_invite_attendee.py:96
+#: code:addons/base_calendar/wizard/base_calendar_invite_attendee.py:143
+#: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:128
+#: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:136
+#, python-format
+msgid "Error!"
+msgstr "Feil!"
+
+#. module: base_calendar
+#: selection:calendar.attendee,role:0
+msgid "Chair Person"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,action:0
+msgid "Procedure"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,state:0
+#: selection:calendar.todo,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,trigger_interval:0
+#: selection:res.alarm,trigger_interval:0
+msgid "Minutes"
+msgstr "Minutter"
+
+#. module: base_calendar
+#: selection:calendar.alarm,action:0
+msgid "Display"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event.edit.all:0
+msgid "Edit all Occurrences"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Invitation type"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,freq:0
+msgid "Secondly"
+msgstr "Hvert sekund"
+
+#. module: base_calendar
+#: field:calendar.alarm,event_date:0
+#: field:calendar.attendee,event_date:0
+#: view:calendar.event:0
+msgid "Event Date"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: view:calendar.event:0
+msgid "Group By..."
+msgstr ""
+
+#. module: base_calendar
+#: help:base_calendar.invite.attendee,email:0
+msgid "Provide external email address who will receive this invitation."
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.module.module,description:base_calendar.module_meta_information
+msgid ""
+"Full featured calendar system that supports:\n"
+"    - Calendar of events\n"
+"    - Alerts (create requests)\n"
+"    - Recurring events\n"
+"    - Invitations to people"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.attendee,cutype:0
+msgid "Specify the type of Invitation"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,freq:0
+#: selection:calendar.todo,freq:0
+msgid "Years"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,event_end_date:0
+#: field:calendar.attendee,event_end_date:0
+msgid "Event End Date"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,role:0
+msgid "Optional Participation"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,date_deadline:0
+#: field:calendar.todo,date_deadline:0
+msgid "Deadline"
+msgstr ""
+
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:385
+#: code:addons/base_calendar/base_calendar.py:1090
+#: code:addons/base_calendar/base_calendar.py:1092
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.event,active:0
+#: help:calendar.todo,active:0
+msgid ""
+"If the active field is set to          true, it will allow you to hide the "
+"event alarm information without removing it."
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.module.module,shortdesc:base_calendar.module_meta_information
+msgid "Basic Calendar Functionality"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,organizer:0
+#: field:calendar.event,organizer_id:0
+#: field:calendar.todo,organizer:0
+#: field:calendar.todo,organizer_id:0
+msgid "Organizer"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: view:calendar.event:0
+#: field:calendar.event,user_id:0
+#: field:calendar.todo,user_id:0
+msgid "Responsible"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+#: model:res.request.link,name:base_calendar.request_link_meeting
+msgid "Event"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.event,edit_all:0
+#: help:calendar.todo,edit_all:0
+msgid "Edit all Occurrences  of recurrent Meeting."
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,trigger_occurs:0
+#: selection:res.alarm,trigger_occurs:0
+msgid "Before"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+#: selection:calendar.event,state:0
+#: selection:calendar.todo,state:0
+msgid "Confirmed"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.actions.act_window,name:base_calendar.action_calendar_event_edit_all
+msgid "Edit all events"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,attendee_ids:0
+#: field:calendar.event,attendee_ids:0
+#: field:calendar.todo,attendee_ids:0
+msgid "Attendees"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Confirm"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_calendar_todo
+msgid "Calendar Task"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,su:0
+#: field:calendar.event,su:0
+#: field:calendar.todo,su:0
+msgid "Sun"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,cutype:0
+msgid "Invite Type"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.attendee,partner_id:0
+msgid "Partner related to contact"
+msgstr ""
+
+#. module: base_calendar
+#: view:res.alarm:0
+msgid "Reminder details"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,parent_ids:0
+msgid "Delegrated From"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,select1:0
+#: selection:calendar.event,select1:0
+#: selection:calendar.todo,select1:0
+msgid "Day of month"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+#: field:calendar.event,location:0
+#: field:calendar.event.edit.all,location:0
+#: field:calendar.todo,location:0
+msgid "Location"
+msgstr ""
+
+#. module: base_calendar
+#: field:base_calendar.invite.attendee,send_mail:0
+msgid "Send mail?"
+msgstr ""
+
+#. module: base_calendar
+#: field:base_calendar.invite.attendee,email:0
+#: selection:calendar.alarm,action:0
+#: field:calendar.attendee,email:0
+msgid "Email"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Event Detail"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,state:0
+msgid "Run"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,exdate:0
+#: field:calendar.todo,exdate:0
+msgid "Exception Date/Times"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,class:0
+#: selection:calendar.todo,class:0
+msgid "Confidential"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,end_date:0
+#: field:calendar.event,end_date:0
+#: field:calendar.todo,end_date:0
+msgid "Repeat Until"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.actions.act_window,help:base_calendar.action_res_alarm_view
+msgid ""
+"Create specific calendar alarms that may be assigned to calendar events or "
+"meetings."
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Visibility"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,rsvp:0
+msgid "Required Reply?"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,base_calendar_url:0
+#: field:calendar.todo,base_calendar_url:0
+msgid "Caldav URL"
+msgstr ""
+
+#. module: base_calendar
+#: view:base.calendar.set.exrule:0
+msgid "Select range to Exclude"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,recurrent_uid:0
+#: field:calendar.todo,recurrent_uid:0
+msgid "Recurrent ID"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "July"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: selection:calendar.attendee,state:0
+msgid "Accepted"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,th:0
+#: field:calendar.event,th:0
+#: field:calendar.todo,th:0
+msgid "Thu"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,child_ids:0
+msgid "Delegrated To"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Required Reply"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,end_type:0
+#: selection:calendar.todo,end_type:0
+msgid "Forever"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,role:0
+msgid "Participation required"
+msgstr ""
+
+#. module: base_calendar
+#: view:base.calendar.set.exrule:0
+msgid "_Cancel"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,create_date:0
+#: field:calendar.todo,create_date:0
+msgid "Created"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,class:0
+#: selection:calendar.todo,class:0
+msgid "Private"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,freq:0
+#: selection:calendar.event,rrule_type:0
+#: selection:calendar.todo,rrule_type:0
+msgid "Daily"
+msgstr ""
+
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:385
+#, python-format
+msgid "Can not Duplicate"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,class:0
+#: field:calendar.todo,class:0
+msgid "Mark as"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: field:calendar.attendee,partner_address_id:0
+msgid "Contact"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.event,rrule_type:0
+#: help:calendar.todo,rrule_type:0
+msgid "Let the event automatically repeat at that interval"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: view:calendar.event:0
+msgid "Delegate"
+msgstr ""
+
+#. module: base_calendar
+#: field:base_calendar.invite.attendee,partner_id:0
+#: view:calendar.attendee:0
+#: field:calendar.attendee,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: base_calendar
+#: view:base_calendar.invite.attendee:0
+#: selection:base_calendar.invite.attendee,type:0
+msgid "Partner Contacts"
+msgstr ""
+
+#. module: base_calendar
+#: view:base.calendar.set.exrule:0
+msgid "_Ok"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,byday:0
+#: selection:calendar.event,byday:0
+#: selection:calendar.todo,byday:0
+msgid "First"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Privacy"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,vtimezone:0
+#: field:calendar.todo,vtimezone:0
+msgid "Timezone"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Subject"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "September"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "December"
+msgstr ""
+
+#. module: base_calendar
+#: help:base_calendar.invite.attendee,send_mail:0
+msgid "Check this if you want to send an Email to Invited Person"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Availability"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event.edit.all:0
+msgid "_Save"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,cutype:0
+msgid "Individual"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.event,count:0
+#: help:calendar.todo,count:0
+msgid "Repeat x times"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,user_id:0
+msgid "Owner"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Delegation Info"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+#: field:calendar.event.edit.all,date:0
+msgid "Start Date"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,cn:0
+msgid "Common name"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: selection:calendar.attendee,state:0
+msgid "Declined"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "My Role"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "My Events"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: view:calendar.event:0
+msgid "Decline"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,freq:0
+#: selection:calendar.todo,freq:0
+msgid "Weeks"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,cutype:0
+msgid "Group"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,edit_all:0
+#: field:calendar.todo,edit_all:0
+msgid "Edit All"
+msgstr ""
+
+#. module: base_calendar
+#: field:base_calendar.invite.attendee,contact_ids:0
+msgid "Contacts"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_res_alarm
+msgid "Basic Alarm Information"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,fr:0
+#: field:calendar.event,fr:0
+#: field:calendar.todo,fr:0
+msgid "Fri"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,trigger_interval:0
+#: selection:calendar.event,freq:0
+#: selection:calendar.todo,freq:0
+#: selection:res.alarm,trigger_interval:0
+msgid "Hours"
+msgstr ""
+
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:1092
+#, python-format
+msgid "Count can not be Negative"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,member:0
+msgid "Member"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.event,location:0
+#: help:calendar.todo,location:0
+msgid "Location of Event"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,rrule:0
+#: field:calendar.todo,rrule:0
+msgid "Recurrent Rule"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,attach:0
+msgid "Attachment"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Invitation From"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "End of recurrency"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+#: field:calendar.event.edit.all,alarm_id:0
+msgid "Reminder"
+msgstr ""
+
+#. module: base_calendar
+#: view:base.calendar.set.exrule:0
+#: model:ir.actions.act_window,name:base_calendar.action_base_calendar_set_exrule
+#: model:ir.model,name:base_calendar.model_base_calendar_set_exrule
+msgid "Set Exrule"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+#: model:ir.actions.act_window,name:base_calendar.action_view_event
+#: model:ir.ui.menu,name:base_calendar.menu_events
+msgid "Events"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.actions.act_window,name:base_calendar.action_view_calendar_invite_attendee_wizard
+#: model:ir.model,name:base_calendar.model_base_calendar_invite_attendee
+msgid "Invite Attendees"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.attendee,email:0
+msgid "Email of Invited Person"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,repeat:0
+#: field:calendar.event,count:0
+#: field:calendar.todo,count:0
+#: field:res.alarm,repeat:0
+msgid "Repeat"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.attendee,dir:0
+msgid ""
+"Reference to the URIthat points to the directory information corresponding "
+"to the attendee."
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "August"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,week_list:0
+#: selection:calendar.event,week_list:0
+#: selection:calendar.todo,week_list:0
+msgid "Monday"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,byday:0
+#: selection:calendar.event,byday:0
+#: selection:calendar.todo,byday:0
+msgid "Third"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "June"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,alarm_id:0
+msgid "Basic Alarm"
+msgstr ""
+
+#. module: base_calendar
+#: view:base.calendar.set.exrule:0
+#: view:calendar.event:0
+msgid "The"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: field:calendar.attendee,delegated_from:0
+msgid "Delegated From"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+#: field:calendar.event,date:0
+msgid "Date"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "November"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.attendee,member:0
+msgid "Indicate the groups that the attendee belongs to"
+msgstr ""
+
+#. module: base_calendar
+#: view:base_calendar.invite.attendee:0
+msgid "Data"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,mo:0
+#: field:calendar.event,mo:0
+#: field:calendar.todo,mo:0
+msgid "Mon"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,count:0
+msgid "Count"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,freq:0
+#: selection:calendar.event,freq:0
+#: selection:calendar.todo,freq:0
+msgid "No Repeat"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "October"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: view:calendar.event:0
+msgid "Uncertain"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,language:0
+msgid "Language"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,trigger_occurs:0
+#: field:res.alarm,trigger_occurs:0
+msgid "Triggers"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "January"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,trigger_related:0
+#: field:res.alarm,trigger_related:0
+msgid "Related to"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,interval:0
+#: field:calendar.alarm,trigger_interval:0
+#: field:res.alarm,trigger_interval:0
+msgid "Interval"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,week_list:0
+#: selection:calendar.event,week_list:0
+#: selection:calendar.todo,week_list:0
+msgid "Wednesday"
+msgstr ""
+
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:1090
+#, python-format
+msgid "Interval can not be Negative"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,name:0
+#: view:calendar.event:0
+msgid "Summary"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,active:0
+#: field:calendar.event,active:0
+#: field:calendar.todo,active:0
+#: field:res.alarm,active:0
+msgid "Active"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Choose day in the month where repeat the meeting"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,action:0
+msgid "Action"
+msgstr ""
+
+#. module: base_calendar
+#: help:base_calendar.invite.attendee,type:0
+msgid "Select whom you want to Invite"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.alarm,duration:0
+#: help:res.alarm,duration:0
+msgid ""
+"Duration' and 'Repeat' are both optional, but if one occurs, so MUST the "
+"other"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_calendar_event_edit_all
+msgid "Calendar Edit all event"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.attendee,role:0
+msgid "Participation role for the calendar user"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: field:calendar.attendee,delegated_to:0
+msgid "Delegated To"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.alarm,action:0
+msgid "Defines the action to be invoked when an alarm is triggered"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,end_type:0
+#: selection:calendar.todo,end_type:0
+msgid "End date"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Search Events"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Recurrency Option"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,freq:0
+#: selection:calendar.event,rrule_type:0
+#: selection:calendar.todo,rrule_type:0
+msgid "Weekly"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.alarm,active:0
+#: help:res.alarm,active:0
+msgid ""
+"If the active field is set to true, it will allow you to hide the event "
+"alarm information without removing it."
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,recurrent_id:0
+#: field:calendar.todo,recurrent_id:0
+msgid "Recurrent ID date"
+msgstr ""
+
+#. module: base_calendar
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,state:0
+#: view:calendar.attendee:0
+#: field:calendar.attendee,state:0
+#: view:calendar.event:0
+#: field:calendar.event,state:0
+#: field:calendar.todo,state:0
+msgid "State"
+msgstr ""
+
+#. module: base_calendar
+#: view:res.alarm:0
+msgid "Reminder Details"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "To Review"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,freq:0
+#: field:calendar.event,freq:0
+#: field:calendar.todo,freq:0
+msgid "Frequency"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,state:0
+msgid "Done"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.event,interval:0
+#: help:calendar.todo,interval:0
+msgid "Repeat every (Days/Week/Month/Year)"
+msgstr ""
+
+#. module: base_calendar
+#: view:base_calendar.invite.attendee:0
+#: field:base_calendar.invite.attendee,user_ids:0
+msgid "Users"
+msgstr ""
+
+#. module: base_calendar
+#: view:base.calendar.set.exrule:0
+msgid "of"
+msgstr ""
+
+#. module: base_calendar
+#: view:base_calendar.invite.attendee:0
+#: view:calendar.event:0
+#: view:calendar.event.edit.all:0
+msgid "Cancel"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_res_users
+msgid "res.users"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,week_list:0
+#: selection:calendar.event,week_list:0
+#: selection:calendar.todo,week_list:0
+msgid "Tuesday"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.alarm,description:0
+msgid ""
+"Provides a more complete                             description of the "
+"calendar component, than that                             provided by the "
+"\"SUMMARY\" property"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Responsible User"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,availability:0
+#: selection:calendar.event,show_as:0
+#: selection:calendar.todo,show_as:0
+#: selection:res.users,availability:0
+msgid "Busy"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_calendar_event
+msgid "Calendar Event"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,state:0
+#: selection:calendar.event,state:0
+#: selection:calendar.todo,state:0
+msgid "Tentative"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,interval:0
+#: field:calendar.todo,interval:0
+msgid "Repeat every"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,end_type:0
+#: selection:calendar.todo,end_type:0
+msgid "Fix amout of times"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,recurrency:0
+#: field:calendar.todo,recurrency:0
+msgid "Recurrent"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,rrule_type:0
+#: field:calendar.todo,rrule_type:0
+msgid "Recurrency"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.actions.act_window,name:base_calendar.action_view_attendee_form
+#: model:ir.ui.menu,name:base_calendar.menu_attendee_invitations
+msgid "Event Invitations"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,week_list:0
+#: selection:calendar.event,week_list:0
+#: selection:calendar.todo,week_list:0
+msgid "Thursday"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,exrule:0
+#: field:calendar.todo,exrule:0
+msgid "Exception Rule"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.attendee,language:0
+msgid ""
+"To specify the language for text values in aproperty or property parameter."
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Details"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.event,exrule:0
+#: help:calendar.todo,exrule:0
+msgid ""
+"Defines a rule or repeating pattern of time to exclude from the recurring "
+"rule."
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,month_list:0
+#: field:calendar.event,month_list:0
+#: field:calendar.todo,month_list:0
+msgid "Month"
+msgstr ""
+
+#. module: base_calendar
+#: view:base_calendar.invite.attendee:0
+#: view:calendar.event:0
+msgid "Invite People"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.event,rrule:0
+#: help:calendar.todo,rrule:0
+msgid ""
+"Defines a rule or repeating pattern for recurring events\n"
+"e.g.: Every other month on the last Sunday of the month for 10 occurrences:  "
+"      FREQ=MONTHLY;INTERVAL=2;COUNT=10;BYDAY=-1SU"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,dir:0
+msgid "URI Reference"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,description:0
+#: view:calendar.event:0
+#: field:calendar.event,description:0
+#: field:calendar.event,name:0
+#: field:calendar.todo,description:0
+#: field:calendar.todo,name:0
+msgid "Description"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "May"
+msgstr ""
+
+#. module: base_calendar
+#: field:base_calendar.invite.attendee,type:0
+#: view:calendar.attendee:0
+msgid "Type"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Search Invitations"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,trigger_occurs:0
+#: selection:res.alarm,trigger_occurs:0
+msgid "After"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,state:0
+msgid "Stop"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_ir_values
+msgid "ir.values"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_ir_model
+msgid "Objects"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: selection:calendar.attendee,state:0
+msgid "Delegated"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,sa:0
+#: field:calendar.event,sa:0
+#: field:calendar.todo,sa:0
+msgid "Sat"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Choose day where repeat the meeting"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,freq:0
+msgid "Minutely"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.attendee,sent_by:0
+msgid "Specify the user that is acting on behalf of the calendar user"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+#: field:calendar.event.edit.all,date_deadline:0
+msgid "End Date"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "February"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,freq:0
+#: selection:calendar.todo,freq:0
+msgid "Months"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,cutype:0
+msgid "Resource"
+msgstr ""
+
+#. module: base_calendar
+#: field:res.alarm,name:0
+msgid "Name"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_calendar_alarm
+msgid "Event alarm information"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.alarm,name:0
+msgid ""
+"Contains the text to be                      used as the message subject for "
+"email                      or contains the text to be used for display"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,alarm_id:0
+#: field:calendar.event,base_calendar_alarm_id:0
+#: field:calendar.todo,alarm_id:0
+#: field:calendar.todo,base_calendar_alarm_id:0
+msgid "Alarm"
+msgstr ""
+
+#. module: base_calendar
+#: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:90
+#, python-format
+msgid "Please Apply Recurrency before applying Exception Rule."
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,sent_by_uid:0
+msgid "Sent By User"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "April"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Recurrency period"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,week_list:0
+#: field:calendar.event,week_list:0
+#: field:calendar.todo,week_list:0
+msgid "Weekday"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,byday:0
+#: field:calendar.event,byday:0
+#: field:calendar.todo,byday:0
+msgid "By day"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,model_id:0
+msgid "Model"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,action:0
+msgid "Audio"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,id:0
+#: field:calendar.todo,id:0
+msgid "ID"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,role:0
+msgid "For information Purpose"
+msgstr ""
+
+#. module: base_calendar
+#: view:base_calendar.invite.attendee:0
+msgid "Invite"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_calendar_attendee
+msgid "Attendee information"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,res_id:0
+msgid "Resource ID"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,state:0
+msgid "Needs Action"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,sent_by:0
+msgid "Sent By"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,sequence:0
+#: field:calendar.todo,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.event,alarm_id:0
+#: help:calendar.todo,alarm_id:0
+msgid "Set an alarm at this time, before the event occurs"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base_calendar.invite.attendee,type:0
+msgid "Internal User"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: view:calendar.event:0
+msgid "Accept"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,week_list:0
+#: selection:calendar.event,week_list:0
+#: selection:calendar.todo,week_list:0
+msgid "Saturday"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Invitation To"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,byday:0
+#: selection:calendar.event,byday:0
+#: selection:calendar.todo,byday:0
+msgid "Second"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,availability:0
+#: field:res.users,availability:0
+msgid "Free/Busy"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,end_type:0
+#: field:calendar.todo,end_type:0
+msgid "Way to end reccurency"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,duration:0
+#: field:calendar.alarm,trigger_duration:0
+#: field:calendar.event,duration:0
+#: field:calendar.todo,date:0
+#: field:calendar.todo,duration:0
+#: field:res.alarm,duration:0
+#: field:res.alarm,trigger_duration:0
+msgid "Duration"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base_calendar.invite.attendee,type:0
+msgid "External Email"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,trigger_date:0
+msgid "Trigger Date"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.alarm,attach:0
+msgid ""
+"* Points to a sound resource,                     which is rendered when the "
+"alarm is triggered for audio,\n"
+"                    * File which is intended to be sent as message "
+"attachments for email,\n"
+"                    * Points to a procedure resource, which is invoked when  "
+"                    the alarm is triggered for procedure."
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,byday:0
+#: selection:calendar.event,byday:0
+#: selection:calendar.todo,byday:0
+msgid "Fifth"
+msgstr ""
diff --git a/addons/base_contact/i18n/nb.po b/addons/base_contact/i18n/nb.po
new file mode 100644
index 00000000000..ad2b8e438fc
--- /dev/null
+++ b/addons/base_contact/i18n/nb.po
@@ -0,0 +1,514 @@
+# Norwegian Bokmal translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# Rolv Råen<rora@adego.no>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2011-04-07 03:46+0000\n"
+"Last-Translator: Rolv Råen <Unknown>\n"
+"Language-Team: Norwegian Bokmal <nb@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: 2011-04-07 05:54+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
+
+#. module: base_contact
+#: field:res.partner.contact,title:0
+msgid "Title"
+msgstr "Tittel"
+
+#. module: base_contact
+#: view:res.partner.address:0
+msgid "# of Contacts"
+msgstr "# kontakter"
+
+#. module: base_contact
+#: field:res.partner.job,fax:0
+msgid "Fax"
+msgstr "Fax"
+
+#. module: base_contact
+#: view:base.contact.installer:0
+msgid "title"
+msgstr "tittel"
+
+#. module: base_contact
+#: help:res.partner.job,date_start:0
+msgid "Start date of job(Joining Date)"
+msgstr ""
+
+#. module: base_contact
+#: view:base.contact.installer:0
+msgid "Select the Option for Addresses Migration"
+msgstr ""
+
+#. module: base_contact
+#: help:res.partner.job,function:0
+msgid "Function of this contact with this partner"
+msgstr ""
+
+#. module: base_contact
+#: help:res.partner.job,state:0
+msgid "Status of Address"
+msgstr ""
+
+#. module: base_contact
+#: help:res.partner.job,name:0
+msgid ""
+"You may                     enter Address first,Partner will be linked "
+"automatically if any."
+msgstr ""
+
+#. module: base_contact
+#: help:res.partner.job,fax:0
+msgid "Job FAX no."
+msgstr "Jobb FAX no."
+
+#. module: base_contact
+#: field:res.partner.contact,mobile:0
+msgid "Mobile"
+msgstr "Mobil"
+
+#. module: base_contact
+#: view:res.partner.contact:0
+#: field:res.partner.contact,comment:0
+msgid "Notes"
+msgstr "Notater"
+
+#. module: base_contact
+#: model:process.node,note:base_contact.process_node_contacts0
+msgid "People you work with."
+msgstr "Arbeidskollegaer"
+
+#. module: base_contact
+#: model:process.transition,note:base_contact.process_transition_functiontoaddress0
+msgid "Define functions and address."
+msgstr "Definer funksjon og adresse"
+
+#. module: base_contact
+#: help:res.partner.job,date_stop:0
+msgid "Last date of job"
+msgstr ""
+
+#. module: base_contact
+#: view:base.contact.installer:0
+#: field:base.contact.installer,migrate:0
+msgid "Migrate"
+msgstr ""
+
+#. module: base_contact
+#: view:res.partner.contact:0
+#: field:res.partner.job,name:0
+msgid "Partner"
+msgstr "Klient"
+
+#. module: base_contact
+#: model:process.node,note:base_contact.process_node_function0
+msgid "Jobs at a same partner address."
+msgstr "Jobber på samme partneradresse."
+
+#. module: base_contact
+#: model:process.node,name:base_contact.process_node_partners0
+msgid "Partners"
+msgstr "Partnere"
+
+#. module: base_contact
+#: field:res.partner.job,state:0
+msgid "State"
+msgstr "Bekreft"
+
+#. module: base_contact
+#: help:res.partner.contact,active:0
+msgid ""
+"If the active field is set to False,                 it will allow you to "
+"hide the partner contact without removing it."
+msgstr ""
+
+#. module: base_contact
+#: model:ir.module.module,description:base_contact.module_meta_information
+msgid ""
+"\n"
+"        This module allows you to manage your contacts entirely.\n"
+"\n"
+"    It lets you define\n"
+"        *contacts unrelated to a partner,\n"
+"        *contacts working at several addresses (possibly for different "
+"partners),\n"
+"        *contacts with possibly different functions for each of its job's "
+"addresses\n"
+"\n"
+"    It also adds new menu items located in\n"
+"        Partners \\ Contacts\n"
+"        Partners \\ Functions\n"
+"\n"
+"    Pay attention that this module converts the existing addresses into "
+"\"addresses + contacts\". It means that some fields of the addresses will be "
+"missing (like the contact name), since these are supposed to be defined in "
+"an other object.\n"
+"    "
+msgstr ""
+
+#. module: base_contact
+#: model:ir.module.module,shortdesc:base_contact.module_meta_information
+#: model:process.process,name:base_contact.process_process_basecontactprocess0
+msgid "Base Contact"
+msgstr "Grunnleggende kontakt"
+
+#. module: base_contact
+#: field:res.partner.job,date_stop:0
+msgid "Date Stop"
+msgstr "Sluttdato"
+
+#. module: base_contact
+#: model:ir.actions.act_window,name:base_contact.action_res_partner_job
+msgid "Contact's Jobs"
+msgstr "Kontaktens jobb"
+
+#. module: base_contact
+#: view:res.partner:0
+msgid "Categories"
+msgstr "Kategorier"
+
+#. module: base_contact
+#: help:res.partner.job,sequence_partner:0
+msgid ""
+"Order of importance                 of this job title in the list of job "
+"title of the linked partner"
+msgstr ""
+
+#. module: base_contact
+#: field:res.partner.job,extension:0
+msgid "Extension"
+msgstr "Internnummer"
+
+#. module: base_contact
+#: help:res.partner.job,extension:0
+msgid "Internal/External extension phone number"
+msgstr "Internt/ Eksternt telefonnummer"
+
+#. module: base_contact
+#: help:res.partner.job,phone:0
+msgid "Job Phone no."
+msgstr ""
+
+#. module: base_contact
+#: view:res.partner.contact:0
+#: field:res.partner.contact,job_ids:0
+msgid "Functions and Addresses"
+msgstr "Roller og adresser"
+
+#. module: base_contact
+#: model:ir.model,name:base_contact.model_res_partner_contact
+#: field:res.partner.job,contact_id:0
+msgid "Contact"
+msgstr "Kontakt"
+
+#. module: base_contact
+#: help:res.partner.job,email:0
+msgid "Job E-Mail"
+msgstr "Jobb e-post"
+
+#. module: base_contact
+#: field:res.partner.job,sequence_partner:0
+msgid "Partner Seq."
+msgstr "Partnersekvens"
+
+#. module: base_contact
+#: model:process.transition,name:base_contact.process_transition_functiontoaddress0
+msgid "Function to address"
+msgstr "Funksjon til adresse"
+
+#. module: base_contact
+#: field:base.contact.installer,progress:0
+msgid "Configuration Progress"
+msgstr ""
+
+#. module: base_contact
+#: field:res.partner.contact,name:0
+msgid "Last Name"
+msgstr "Etternavn"
+
+#. module: base_contact
+#: view:res.partner:0
+#: view:res.partner.contact:0
+msgid "Communication"
+msgstr "Kommunikasjon"
+
+#. module: base_contact
+#: field:base.contact.installer,config_logo:0
+#: field:res.partner.contact,photo:0
+msgid "Image"
+msgstr ""
+
+#. module: base_contact
+#: selection:res.partner.job,state:0
+msgid "Past"
+msgstr "Forrige"
+
+#. module: base_contact
+#: model:ir.model,name:base_contact.model_res_partner_address
+msgid "Partner Addresses"
+msgstr "Partner adresser"
+
+#. module: base_contact
+#: view:base.contact.installer:0
+msgid "Address's Migration to Contacts"
+msgstr ""
+
+#. module: base_contact
+#: field:res.partner.job,sequence_contact:0
+msgid "Contact Seq."
+msgstr "Kontaktsekvens"
+
+#. module: base_contact
+#: view:res.partner.address:0
+msgid "Search Contact"
+msgstr "Søk kontakt"
+
+#. module: base_contact
+#: model:ir.actions.act_window,name:base_contact.action_partner_contact_form
+#: model:ir.ui.menu,name:base_contact.menu_partner_contact_form
+#: model:ir.ui.menu,name:base_contact.menu_purchases_partner_contact_form
+#: model:process.node,name:base_contact.process_node_contacts0
+#: view:res.partner:0
+#: field:res.partner.address,job_ids:0
+msgid "Contacts"
+msgstr "Kontakter"
+
+#. module: base_contact
+#: view:base.contact.installer:0
+msgid ""
+"Due to changes in Address and Partner's relation, some of the details from "
+"address are needed to be migrated into contact information."
+msgstr ""
+
+#. module: base_contact
+#: model:process.node,note:base_contact.process_node_addresses0
+msgid "Working and private addresses."
+msgstr "Adresser (privat og arbeid)"
+
+#. module: base_contact
+#: help:res.partner.job,address_id:0
+msgid "Address which is linked to the Partner"
+msgstr ""
+
+#. module: base_contact
+#: field:res.partner.job,function:0
+msgid "Partner Function"
+msgstr "Partnerfunksjon"
+
+#. module: base_contact
+#: help:res.partner.job,other:0
+msgid "Additional phone field"
+msgstr "Tilleggfelt for telefon"
+
+#. module: base_contact
+#: field:res.partner.contact,website:0
+msgid "Website"
+msgstr "Nettside"
+
+#. module: base_contact
+#: view:base.contact.installer:0
+msgid "Otherwise these details will not be visible from address/contact."
+msgstr ""
+
+#. module: base_contact
+#: view:base.contact.installer:0
+msgid "Configure"
+msgstr ""
+
+#. module: base_contact
+#: field:res.partner.contact,email:0
+#: field:res.partner.job,email:0
+msgid "E-Mail"
+msgstr "E-post"
+
+#. module: base_contact
+#: model:ir.model,name:base_contact.model_base_contact_installer
+msgid "base.contact.installer"
+msgstr "base.contact.installer"
+
+#. module: base_contact
+#: view:res.partner.job:0
+msgid "Contact Functions"
+msgstr "Kontaktfunksjoner"
+
+#. module: base_contact
+#: field:res.partner.job,phone:0
+msgid "Phone"
+msgstr "Telefon"
+
+#. module: base_contact
+#: view:base.contact.installer:0
+msgid "Do you want to migrate your Address data in Contact Data?"
+msgstr ""
+
+#. module: base_contact
+#: field:res.partner.contact,active:0
+msgid "Active"
+msgstr "Aktiv"
+
+#. module: base_contact
+#: field:res.partner.contact,function:0
+msgid "Main Function"
+msgstr "Hovedfunksjon"
+
+#. module: base_contact
+#: model:process.transition,note:base_contact.process_transition_partnertoaddress0
+msgid "Define partners and their addresses."
+msgstr "Definer partnere og deres adresser"
+
+#. module: base_contact
+#: view:res.partner.contact:0
+msgid "Seq."
+msgstr "Sekvens"
+
+#. module: base_contact
+#: field:res.partner.contact,lang_id:0
+msgid "Language"
+msgstr "Språk"
+
+#. module: base_contact
+#: view:res.partner.contact:0
+msgid "Extra Information"
+msgstr "Ekstra informasjon"
+
+#. module: base_contact
+#: model:process.node,note:base_contact.process_node_partners0
+msgid "Companies you work with."
+msgstr "Firmaer du jobber sammen med."
+
+#. module: base_contact
+#: view:res.partner.contact:0
+msgid "Partner Contact"
+msgstr "Partnerkontakt"
+
+#. module: base_contact
+#: view:res.partner.contact:0
+msgid "General"
+msgstr "Generell"
+
+#. module: base_contact
+#: view:res.partner.contact:0
+msgid "Photo"
+msgstr "Bilde"
+
+#. module: base_contact
+#: field:res.partner.contact,birthdate:0
+msgid "Birth Date"
+msgstr "Fødselsdag"
+
+#. module: base_contact
+#: help:base.contact.installer,migrate:0
+msgid "If you select this, all addresses will be migrated."
+msgstr ""
+
+#. module: base_contact
+#: selection:res.partner.job,state:0
+msgid "Current"
+msgstr "Nåværende"
+
+#. module: base_contact
+#: field:res.partner.contact,first_name:0
+msgid "First Name"
+msgstr "Fornavn"
+
+#. module: base_contact
+#: model:ir.model,name:base_contact.model_res_partner_job
+msgid "Contact Partner Function"
+msgstr "Kontakt partnerfunksjon"
+
+#. module: base_contact
+#: field:res.partner.job,other:0
+msgid "Other"
+msgstr "Andre"
+
+#. module: base_contact
+#: model:process.node,name:base_contact.process_node_function0
+msgid "Function"
+msgstr "Funksjon"
+
+#. module: base_contact
+#: field:res.partner.address,job_id:0
+#: field:res.partner.contact,job_id:0
+msgid "Main Job"
+msgstr "Hovedjobb"
+
+#. module: base_contact
+#: model:process.transition,note:base_contact.process_transition_contacttofunction0
+msgid "Defines contacts and functions."
+msgstr "Definer kontakter og funksjoner"
+
+#. module: base_contact
+#: model:process.transition,name:base_contact.process_transition_contacttofunction0
+msgid "Contact to function"
+msgstr "Kontakt til funksjon"
+
+#. module: base_contact
+#: view:res.partner:0
+#: field:res.partner.job,address_id:0
+msgid "Address"
+msgstr "Adresse"
+
+#. module: base_contact
+#: field:res.partner.contact,country_id:0
+msgid "Nationality"
+msgstr "Nasjonalitet"
+
+#. module: base_contact
+#: model:ir.actions.act_window,name:base_contact.act_res_partner_jobs
+msgid "Open Jobs"
+msgstr ""
+
+#. module: base_contact
+#: field:base.contact.installer,name:0
+msgid "Name"
+msgstr "Navn"
+
+#. module: base_contact
+#: view:base.contact.installer:0
+msgid "You can migrate Partner's current addresses to the contact."
+msgstr ""
+
+#. module: base_contact
+#: field:res.partner.contact,partner_id:0
+msgid "Main Employer"
+msgstr "Hovedarbeidsgiver"
+
+#. module: base_contact
+#: model:ir.actions.act_window,name:base_contact.action_base_contact_installer
+msgid "Address Migration"
+msgstr ""
+
+#. module: base_contact
+#: view:res.partner:0
+msgid "Postal Address"
+msgstr "Postadresse"
+
+#. module: base_contact
+#: model:process.node,name:base_contact.process_node_addresses0
+#: view:res.partner:0
+msgid "Addresses"
+msgstr "Adresser"
+
+#. module: base_contact
+#: model:process.transition,name:base_contact.process_transition_partnertoaddress0
+msgid "Partner to address"
+msgstr "Partner til adresse"
+
+#. module: base_contact
+#: field:res.partner.job,date_start:0
+msgid "Date Start"
+msgstr "Startdato"
+
+#. module: base_contact
+#: help:res.partner.job,sequence_contact:0
+msgid ""
+"Order of                     importance of this address in the list of "
+"addresses of the linked contact"
+msgstr ""
diff --git a/addons/base_report_creator/i18n/nb.po b/addons/base_report_creator/i18n/nb.po
new file mode 100644
index 00000000000..8871365e952
--- /dev/null
+++ b/addons/base_report_creator/i18n/nb.po
@@ -0,0 +1,527 @@
+# Norwegian Bokmal translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# Rolv Råen <rora@adego.no>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2011-04-07 03:09+0000\n"
+"Last-Translator: Rolv Råen <Unknown>\n"
+"Language-Team: Norwegian Bokmal <nb@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: 2011-04-07 05:54+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
+
+#. module: base_report_creator
+#: help:base_report_creator.report.filter,expression:0
+msgid ""
+"Provide an expression for the field based on which you want to filter the "
+"records.\n"
+" e.g. res_partner.id=3"
+msgstr ""
+
+#. module: base_report_creator
+#: model:ir.model,name:base_report_creator.model_report_menu_create
+msgid "Menu Create"
+msgstr ""
+
+#. module: base_report_creator
+#: field:base_report_creator.report,view_graph_type:0
+msgid "Graph Type"
+msgstr "Graftype"
+
+#. module: base_report_creator
+#: view:base_report_creator.report:0
+msgid "Used View"
+msgstr "Benyttet visning"
+
+#. module: base_report_creator
+#: wizard_view:base_report_creator.report_filter.fields,set_value_select_field:0
+msgid "Filter Values"
+msgstr "Filterverdier"
+
+#. module: base_report_creator
+#: field:base_report_creator.report.fields,graph_mode:0
+msgid "Graph Mode"
+msgstr "Grafmodus"
+
+#. module: base_report_creator
+#: code:addons/base_report_creator/base_report_creator.py:320
+#, python-format
+msgid ""
+"These is/are model(s) (%s) in selection which is/are not related to any "
+"other model"
+msgstr "Det er valgt modeller (%s) som ikke er relatert til en annen modell."
+
+#. module: base_report_creator
+#: view:base_report_creator.report:0
+msgid "Legend"
+msgstr "Forklaringstekst"
+
+#. module: base_report_creator
+#: view:base_report_creator.report:0
+msgid "Graph View"
+msgstr "Grafvisning"
+
+#. module: base_report_creator
+#: field:base_report_creator.report.filter,expression:0
+msgid "Value"
+msgstr "Verdi"
+
+#. module: base_report_creator
+#: model:ir.actions.wizard,name:base_report_creator.wizard_set_filter_fields
+msgid "Set Filter Fields"
+msgstr "Sett filterfelter"
+
+#. module: base_report_creator
+#: selection:base_report_creator.report.fields,calendar_mode:0
+msgid "Ending Date"
+msgstr "Sluttdato"
+
+#. module: base_report_creator
+#: model:ir.model,name:base_report_creator.model_base_report_creator_report_filter
+msgid "Report Filters"
+msgstr "Rapportfiltere"
+
+#. module: base_report_creator
+#: view:base_report_creator.report:0
+#: field:base_report_creator.report,sql_query:0
+msgid "SQL Query"
+msgstr "SQL-spørring"
+
+#. module: base_report_creator
+#: view:base_report_creator.report:0
+#: view:report.menu.create:0
+msgid "Create Menu"
+msgstr "Opprett meny"
+
+#. module: base_report_creator
+#: selection:base_report_creator.report.fields,group_method:0
+msgid "Minimum"
+msgstr "Minimum"
+
+#. module: base_report_creator
+#: wizard_field:base_report_creator.report_filter.fields,set_value_select_field,operator:0
+msgid "Operator"
+msgstr "Operator"
+
+#. module: base_report_creator
+#: selection:base_report_creator.report.filter,condition:0
+#: selection:base_report_creator.report_filter.fields,set_value_select_field,condition:0
+msgid "OR"
+msgstr "ELLER"
+
+#. module: base_report_creator
+#: model:ir.actions.act_window,name:base_report_creator.base_report_creator_action
+msgid "Custom Reports"
+msgstr "Tilpasset rapport"
+
+#. module: base_report_creator
+#: code:addons/base_report_creator/base_report_creator.py:320
+#, python-format
+msgid "No Related Models!!"
+msgstr "Ingen relaterte modeller!"
+
+#. module: base_report_creator
+#: view:report.menu.create:0
+msgid "Menu Information"
+msgstr "Menyinformasjon"
+
+#. module: base_report_creator
+#: selection:base_report_creator.report.fields,group_method:0
+msgid "Sum"
+msgstr "Sum"
+
+#. module: base_report_creator
+#: constraint:base_report_creator.report:0
+msgid "You must have to give calendar view's color,start date and delay."
+msgstr ""
+
+#. module: base_report_creator
+#: field:base_report_creator.report,model_ids:0
+msgid "Reported Objects"
+msgstr "Rapporterte objekter"
+
+#. module: base_report_creator
+#: view:base_report_creator.report:0
+msgid "Field List"
+msgstr "Feltliste"
+
+#. module: base_report_creator
+#: field:base_report_creator.report,type:0
+msgid "Report Type"
+msgstr "Rapporttype"
+
+#. module: base_report_creator
+#: view:base_report_creator.report:0
+msgid "Add filter"
+msgstr "Legg til filter"
+
+#. module: base_report_creator
+#: model:ir.actions.act_window,name:base_report_creator.action_report_menu_create
+msgid "Create Menu for Report"
+msgstr "Opprett meny for rapport"
+
+#. module: base_report_creator
+#: selection:base_report_creator.report,view_type1:0
+#: selection:base_report_creator.report,view_type2:0
+#: selection:base_report_creator.report,view_type3:0
+msgid "Form"
+msgstr "Skjema"
+
+#. module: base_report_creator
+#: selection:base_report_creator.report,view_type2:0
+#: selection:base_report_creator.report,view_type3:0
+#: selection:base_report_creator.report.fields,calendar_mode:0
+#: selection:base_report_creator.report.fields,graph_mode:0
+msgid "/"
+msgstr "/"
+
+#. module: base_report_creator
+#: view:base_report_creator.report:0
+#: field:base_report_creator.report.fields,report_id:0
+#: field:base_report_creator.report.filter,report_id:0
+#: model:ir.model,name:base_report_creator.model_base_report_creator_report
+msgid "Report"
+msgstr "Rapport"
+
+#. module: base_report_creator
+#: selection:base_report_creator.report.fields,calendar_mode:0
+msgid "Starting Date"
+msgstr "Startdato"
+
+#. module: base_report_creator
+#: view:base_report_creator.report:0
+msgid "Filters on Fields"
+msgstr "Filtere på felter"
+
+#. module: base_report_creator
+#: field:base_report_creator.report,group_ids:0
+msgid "Authorized Groups"
+msgstr "Autoriserte grupper"
+
+#. module: base_report_creator
+#: selection:base_report_creator.report,view_type1:0
+#: selection:base_report_creator.report,view_type2:0
+#: selection:base_report_creator.report,view_type3:0
+msgid "Tree"
+msgstr "Tre"
+
+#. module: base_report_creator
+#: field:base_report_creator.report,view_graph_orientation:0
+msgid "Graph Orientation"
+msgstr "Garforientering"
+
+#. module: base_report_creator
+#: view:base_report_creator.report:0
+msgid "Authorized Groups (empty for all)"
+msgstr "Autoriserte grupper (tomt for alle)"
+
+#. module: base_report_creator
+#: view:base_report_creator.report:0
+msgid "Security"
+msgstr "Sikkerhet"
+
+#. module: base_report_creator
+#: field:report.menu.create,menu_name:0
+msgid "Menu Name"
+msgstr "Menynavn"
+
+#. module: base_report_creator
+#: selection:base_report_creator.report.filter,condition:0
+#: selection:base_report_creator.report_filter.fields,set_value_select_field,condition:0
+msgid "AND"
+msgstr "OG"
+
+#. module: base_report_creator
+#: constraint:base_report_creator.report:0
+msgid "You can not display field which are not stored in Database."
+msgstr "Du kan ikke vise felter som ikke er lagret i databasen"
+
+#. module: base_report_creator
+#: field:base_report_creator.report.fields,calendar_mode:0
+msgid "Calendar Mode"
+msgstr "Kalendermodus"
+
+#. module: base_report_creator
+#: model:ir.model,name:base_report_creator.model_base_report_creator_report_fields
+msgid "Display Fields"
+msgstr "Vis felter"
+
+#. module: base_report_creator
+#: selection:base_report_creator.report.fields,graph_mode:0
+msgid "Y Axis"
+msgstr "Y-akse"
+
+#. module: base_report_creator
+#: selection:base_report_creator.report,view_type1:0
+#: selection:base_report_creator.report,view_type2:0
+#: selection:base_report_creator.report,view_type3:0
+msgid "Calendar"
+msgstr "Kalender"
+
+#. module: base_report_creator
+#: selection:base_report_creator.report,view_type1:0
+#: selection:base_report_creator.report,view_type2:0
+#: selection:base_report_creator.report,view_type3:0
+msgid "Graph"
+msgstr "Graf"
+
+#. module: base_report_creator
+#: wizard_field:base_report_creator.report_filter.fields,set_value_select_field,field_id:0
+msgid "Field Name"
+msgstr "Feltnavn"
+
+#. module: base_report_creator
+#: wizard_view:base_report_creator.report_filter.fields,set_value_select_field:0
+msgid "Set Filter Values"
+msgstr "Sett filterverdier"
+
+#. module: base_report_creator
+#: selection:base_report_creator.report,view_graph_orientation:0
+msgid "Vertical"
+msgstr "Vertikal"
+
+#. module: base_report_creator
+#: selection:base_report_creator.report,type:0
+msgid "Rows And Columns Report"
+msgstr "Rapport med rader og kolonner"
+
+#. module: base_report_creator
+#: view:base_report_creator.report:0
+msgid "General Configuration"
+msgstr "Generell konfigurasjon"
+
+#. module: base_report_creator
+#: help:base_report_creator.report.fields,sequence:0
+msgid "Gives the sequence order when displaying a list of fields."
+msgstr ""
+
+#. module: base_report_creator
+#: wizard_view:base_report_creator.report_filter.fields,init:0
+msgid "Select Field to filter"
+msgstr "Velg felt å filtrere på"
+
+#. module: base_report_creator
+#: field:base_report_creator.report,active:0
+msgid "Active"
+msgstr "Aktiv"
+
+#. module: base_report_creator
+#: selection:base_report_creator.report,view_graph_orientation:0
+msgid "Horizontal"
+msgstr "Horisontal"
+
+#. module: base_report_creator
+#: field:base_report_creator.report.fields,group_method:0
+msgid "Grouping Method"
+msgstr "Grupperingsmetode"
+
+#. module: base_report_creator
+#: field:base_report_creator.report.filter,condition:0
+#: wizard_field:base_report_creator.report_filter.fields,set_value_select_field,condition:0
+msgid "Condition"
+msgstr "Betingelse"
+
+#. module: base_report_creator
+#: selection:base_report_creator.report.fields,group_method:0
+msgid "Count"
+msgstr "Antall"
+
+#. module: base_report_creator
+#: selection:base_report_creator.report.fields,graph_mode:0
+msgid "X Axis"
+msgstr "X-akse"
+
+#. module: base_report_creator
+#: field:report.menu.create,menu_parent_id:0
+msgid "Parent Menu"
+msgstr "Foreldremeny"
+
+#. module: base_report_creator
+#: wizard_button:base_report_creator.report_filter.fields,set_value_select_field,set_value:0
+msgid "Confirm Filter"
+msgstr "Bekreft filter"
+
+#. module: base_report_creator
+#: field:base_report_creator.report.filter,name:0
+msgid "Filter Name"
+msgstr "Filternavn"
+
+#. module: base_report_creator
+#: view:base_report_creator.report:0
+msgid "Open Report"
+msgstr "Åpne rapport"
+
+#. module: base_report_creator
+#: selection:base_report_creator.report.fields,group_method:0
+msgid "Grouped"
+msgstr "Gruppert"
+
+#. module: base_report_creator
+#: view:base_report_creator.report:0
+#: model:ir.module.module,shortdesc:base_report_creator.module_meta_information
+msgid "Report Creator"
+msgstr "Opprettet av"
+
+#. module: base_report_creator
+#: wizard_button:base_report_creator.report_filter.fields,init,end:0
+#: wizard_button:base_report_creator.report_filter.fields,set_value_select_field,end:0
+#: view:report.menu.create:0
+msgid "Cancel"
+msgstr "Avbryt"
+
+#. module: base_report_creator
+#: constraint:base_report_creator.report:0
+msgid "You can apply aggregate function to the non calculated field."
+msgstr ""
+
+#. module: base_report_creator
+#: field:base_report_creator.report,menu_id:0
+msgid "Menu"
+msgstr "Meny"
+
+#. module: base_report_creator
+#: field:base_report_creator.report,view_type1:0
+msgid "First View"
+msgstr "Første visning"
+
+#. module: base_report_creator
+#: selection:base_report_creator.report.fields,calendar_mode:0
+msgid "Delay"
+msgstr "Forsikelse"
+
+#. module: base_report_creator
+#: field:base_report_creator.report.fields,field_id:0
+msgid "Field"
+msgstr "Felt"
+
+#. module: base_report_creator
+#: selection:base_report_creator.report.fields,calendar_mode:0
+msgid "Unique Colors"
+msgstr "Unike farger"
+
+#. module: base_report_creator
+#: help:base_report_creator.report,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the report "
+"without removing it."
+msgstr ""
+"Hvis det aktive feltet settes til False, så kan du gjemme rapporten uten å "
+"måtte fjerne den."
+
+#. module: base_report_creator
+#: selection:base_report_creator.report,view_graph_type:0
+msgid "Pie Chart"
+msgstr "Sektordiagram"
+
+#. module: base_report_creator
+#: field:base_report_creator.report,view_type3:0
+msgid "Third View"
+msgstr "Tredje visning"
+
+#. module: base_report_creator
+#: selection:base_report_creator.report.fields,calendar_mode:0
+msgid "End Date"
+msgstr "Sluttdato"
+
+#. module: base_report_creator
+#: field:base_report_creator.report,name:0
+msgid "Report Name"
+msgstr "Rapportnavn"
+
+#. module: base_report_creator
+#: view:base_report_creator.report:0
+msgid "Fields"
+msgstr "Felter"
+
+#. module: base_report_creator
+#: selection:base_report_creator.report.fields,group_method:0
+msgid "Average"
+msgstr "Gjennomsnitt"
+
+#. module: base_report_creator
+#: view:base_report_creator.report:0
+msgid "Use %(uid)s to filter by the connected user"
+msgstr "Bruk %(uid)er for å filtrere på pålogget bruker"
+
+#. module: base_report_creator
+#: selection:base_report_creator.report.fields,group_method:0
+msgid "Maximum"
+msgstr "Maksimum"
+
+#. module: base_report_creator
+#: wizard_button:base_report_creator.report_filter.fields,init,set_value_select_field:0
+msgid "Continue"
+msgstr "Fortsett"
+
+#. module: base_report_creator
+#: wizard_field:base_report_creator.report_filter.fields,set_value_select_field,value:0
+msgid "Values"
+msgstr "Verdier"
+
+#. module: base_report_creator
+#: selection:base_report_creator.report,view_graph_type:0
+msgid "Bar Chart"
+msgstr "Stolpediagram"
+
+#. module: base_report_creator
+#: field:base_report_creator.report,view_type2:0
+msgid "Second View"
+msgstr "Andre visning"
+
+#. module: base_report_creator
+#: view:report.menu.create:0
+msgid "Create Menu For This Report"
+msgstr "Opprett meny for denne rapporten"
+
+#. module: base_report_creator
+#: view:base_report_creator.report:0
+msgid "View parameters"
+msgstr "Visningsparametre"
+
+#. module: base_report_creator
+#: field:base_report_creator.report.fields,sequence:0
+msgid "Sequence"
+msgstr "Sekvens"
+
+#. module: base_report_creator
+#: wizard_field:base_report_creator.report_filter.fields,init,field_id:0
+msgid "Filter Field"
+msgstr "Filterfelt"
+
+#. module: base_report_creator
+#: view:base_report_creator.report:0
+#: field:base_report_creator.report,field_ids:0
+msgid "Fields to Display"
+msgstr "Felter for visning"
+
+#. module: base_report_creator
+#: view:base_report_creator.report:0
+#: field:base_report_creator.report,filter_ids:0
+msgid "Filters"
+msgstr "Filtre"
+
+#. module: base_report_creator
+#: model:ir.module.module,description:base_report_creator.module_meta_information
+msgid ""
+"This module allows you to create any statistic\n"
+"report on several objects. It's a SQL query builder and browser\n"
+"for and users.\n"
+"\n"
+"After installing the module, it adds a menu to define custom report in\n"
+"the \"Dashboard\" menu.\n"
+msgstr ""
+"Denne modulen gjør deg i stand til å opprette statistiske\n"
+"rapporter basert på flere objekter. Modulen er et verktøy for å bygge SQL-"
+"spørringer både for administratorer\n"
+"og sluttbrukere.\n"
+"\n"
+"Etter installasjon vil det bli lagt til et menyelement for å definere "
+"tilpassede rapporter\n"
+"i  \"Dashboard\" menyen.\n"
diff --git a/addons/base_tools/i18n/sr@latin.po b/addons/base_tools/i18n/sr@latin.po
index f919d5f92cd..d88348e8156 100644
--- a/addons/base_tools/i18n/sr@latin.po
+++ b/addons/base_tools/i18n/sr@latin.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-05 06:06+0000\n"
+"X-Launchpad-Export-Date: 2011-04-06 06:02+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
 
 #. module: base_tools
diff --git a/addons/crm/i18n/nb.po b/addons/crm/i18n/nb.po
index bb1855552b0..9ce055c5132 100644
--- a/addons/crm/i18n/nb.po
+++ b/addons/crm/i18n/nb.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-05 06:06+0000\n"
+"X-Launchpad-Export-Date: 2011-04-06 06:02+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
 
 #. module: crm
diff --git a/addons/decimal_precision/i18n/nb.po b/addons/decimal_precision/i18n/nb.po
new file mode 100644
index 00000000000..dce24454670
--- /dev/null
+++ b/addons/decimal_precision/i18n/nb.po
@@ -0,0 +1,71 @@
+# Norwegian Bokmal translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-04-06 17:18+0000\n"
+"Last-Translator: Rolv Råen (adEgo) <Unknown>\n"
+"Language-Team: Norwegian Bokmal <nb@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: 2011-04-07 05:54+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
+
+#. module: decimal_precision
+#: field:decimal.precision,digits:0
+msgid "Digits"
+msgstr "Tall"
+
+#. module: decimal_precision
+#: view:decimal.precision:0
+msgid "Decimal Precision"
+msgstr "Desimalpresisjon"
+
+#. module: decimal_precision
+#: model:ir.actions.act_window,name:decimal_precision.action_decimal_precision_form
+#: model:ir.ui.menu,name:decimal_precision.menu_decimal_precision_form
+msgid "Decimal Accuracy Definitions"
+msgstr "Desimalpresisjon definisjoner"
+
+#. module: decimal_precision
+#: model:ir.module.module,description:decimal_precision.module_meta_information
+msgid ""
+"\n"
+"This module allows to configure the price accuracy you need for different "
+"kind\n"
+"of usage: accounting, sales, purchases, ...\n"
+"\n"
+"The decimal precision is configured per company.\n"
+msgstr ""
+"\n"
+"Denne modulen gir deg mulighet til å konfigurere pris nøyaktigheten du "
+"trenger for\n"
+"forskjellige formål: regnskap, salg, innkjøp,etc...\n"
+"\n"
+"Desimalpresisjonen er konfigurerbar pr. firma.\n"
+
+#. module: decimal_precision
+#: field:decimal.precision,name:0
+msgid "Usage"
+msgstr "Bruk"
+
+#. module: decimal_precision
+#: sql_constraint:decimal.precision:0
+msgid "Only one value can be defined for each given usage!"
+msgstr ""
+
+#. module: decimal_precision
+#: model:ir.module.module,shortdesc:decimal_precision.module_meta_information
+msgid "Decimal Precision Configuration"
+msgstr "Desimalpresisjon konfigurasjon"
+
+#. module: decimal_precision
+#: model:ir.model,name:decimal_precision.model_decimal_precision
+msgid "decimal.precision"
+msgstr "decimal.precision"
diff --git a/addons/delivery/i18n/nb.po b/addons/delivery/i18n/nb.po
new file mode 100644
index 00000000000..b9ffd901904
--- /dev/null
+++ b/addons/delivery/i18n/nb.po
@@ -0,0 +1,517 @@
+# Norwegian Bokmal translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-04-05 09:13+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Bokmal <nb@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: 2011-04-06 06:02+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+
+#. module: delivery
+#: report:sale.shipping:0
+msgid "Order Ref."
+msgstr "Ordre ref."
+
+#. module: delivery
+#: model:product.template,name:delivery.delivery_product_product_template
+msgid "Delivery by Poste"
+msgstr ""
+
+#. module: delivery
+#: view:delivery.grid:0
+msgid "Destination"
+msgstr "Destinasjon"
+
+#. module: delivery
+#: field:stock.move,weight_net:0
+msgid "Net weight"
+msgstr ""
+
+#. module: delivery
+#: view:stock.picking:0
+msgid "Delivery Order"
+msgstr ""
+
+#. module: delivery
+#: code:addons/delivery/delivery.py:141
+#, python-format
+msgid "No price available !"
+msgstr "Ingen pris tilgjengelig !"
+
+#. module: delivery
+#: model:ir.model,name:delivery.model_delivery_grid_line
+msgid "Delivery Grid Line"
+msgstr ""
+
+#. module: delivery
+#: view:delivery.grid:0
+msgid "Delivery grids"
+msgstr "Delivery grids"
+
+#. module: delivery
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+#: field:stock.picking,volume:0
+msgid "Volume"
+msgstr "Mengde"
+
+#. module: delivery
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique !"
+msgstr "Ordre referanse må være unik !"
+
+#. module: delivery
+#: field:delivery.grid,line_ids:0
+msgid "Grid Line"
+msgstr "Linjebredde i rutenett"
+
+#. module: delivery
+#: model:ir.actions.report.xml,name:delivery.report_shipping
+msgid "Delivery order"
+msgstr ""
+
+#. module: delivery
+#: view:res.partner:0
+msgid "Deliveries Properties"
+msgstr "Deliveries Properties"
+
+#. module: delivery
+#: model:ir.actions.act_window,name:delivery.action_picking_tree4
+msgid "Picking to be invoiced"
+msgstr ""
+
+#. module: delivery
+#: help:delivery.grid,sequence:0
+msgid "Gives the sequence order when displaying a list of delivery grid."
+msgstr ""
+
+#. module: delivery
+#: view:delivery.grid:0
+#: field:delivery.grid,country_ids:0
+msgid "Countries"
+msgstr "Land"
+
+#. module: delivery
+#: report:sale.shipping:0
+msgid "Delivery Order :"
+msgstr ""
+
+#. module: delivery
+#: field:delivery.grid.line,variable_factor:0
+msgid "Variable Factor"
+msgstr "Variabel faktor"
+
+#. module: delivery
+#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
+msgid ""
+"The delivery price list allows you to compute the cost and sales price of "
+"the delivery according to the weight of the products and other criteria. You "
+"can define several price lists for one delivery method, per country or a "
+"zone in a specific country defined by a postal code range."
+msgstr ""
+
+#. module: delivery
+#: selection:delivery.grid.line,price_type:0
+msgid "Fixed"
+msgstr "Fast"
+
+#. module: delivery
+#: view:delivery.sale.order:0
+#: field:delivery.sale.order,carrier_id:0
+#: model:ir.actions.act_window,name:delivery.action_delivery_carrier_form
+#: model:ir.ui.menu,name:delivery.menu_action_delivery_carrier_form
+#: field:res.partner,property_delivery_carrier:0
+#: field:sale.order,carrier_id:0
+msgid "Delivery Method"
+msgstr "Leveringsmåte"
+
+#. module: delivery
+#: model:ir.model,name:delivery.model_stock_move
+msgid "Stock Move"
+msgstr "Lagerflytting"
+
+#. module: delivery
+#: code:addons/delivery/delivery.py:141
+#, python-format
+msgid "No line matched this order in the choosed delivery grids !"
+msgstr "Ingen linjer på aktuell ordre passer valgt spedisjonsnettverk!"
+
+#. module: delivery
+#: field:stock.picking,carrier_tracking_ref:0
+msgid "Carrier Tracking Ref"
+msgstr ""
+
+#. module: delivery
+#: field:stock.picking,weight_net:0
+msgid "Net Weight"
+msgstr ""
+
+#. module: delivery
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid ""
+"Create and manage the delivery methods you need for your sales activities. "
+"Each delivery method can be assigned to a price list which computes the "
+"price of the delivery according to the products sold or delivered."
+msgstr ""
+
+#. module: delivery
+#: code:addons/delivery/stock.py:98
+#, python-format
+msgid "Warning"
+msgstr "Advarsel"
+
+#. module: delivery
+#: view:delivery.grid:0
+msgid "Grid definition"
+msgstr "Avgiftsdefinisjon"
+
+#. module: delivery
+#: view:delivery.sale.order:0
+msgid "_Cancel"
+msgstr "_Avbryt"
+
+#. module: delivery
+#: field:delivery.grid.line,operator:0
+msgid "Operator"
+msgstr "Operatør"
+
+#. module: delivery
+#: model:ir.model,name:delivery.model_res_partner
+msgid "Partner"
+msgstr "Partner"
+
+#. module: delivery
+#: model:ir.model,name:delivery.model_sale_order
+msgid "Sales Order"
+msgstr "Salgsordre"
+
+#. module: delivery
+#: model:ir.model,name:delivery.model_delivery_grid
+msgid "Delivery Grid"
+msgstr ""
+
+#. module: delivery
+#: report:sale.shipping:0
+msgid "Invoiced to"
+msgstr ""
+
+#. module: delivery
+#: model:ir.model,name:delivery.model_stock_picking
+msgid "Picking List"
+msgstr "Plukkliste"
+
+#. module: delivery
+#: model:ir.model,name:delivery.model_delivery_sale_order
+msgid "Make Delievery"
+msgstr ""
+
+#. module: delivery
+#: model:ir.module.module,description:delivery.module_meta_information
+msgid ""
+"Allows you to add delivery methods in sale orders and picking.\n"
+"     You can define your own carrier and delivery grids for prices.\n"
+"     When creating invoices from picking, OpenERP is able to add and compute "
+"the shipping line.\n"
+"\n"
+"     "
+msgstr ""
+
+#. module: delivery
+#: view:delivery.grid.line:0
+msgid "Grid Lines"
+msgstr "Aktiver linjer i rutenett"
+
+#. module: delivery
+#: field:delivery.grid.line,grid_id:0
+msgid "Grid"
+msgstr "Aktiver linjer i rutenett"
+
+#. module: delivery
+#: help:delivery.grid,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the delivery "
+"grid without removing it."
+msgstr ""
+
+#. module: delivery
+#: field:delivery.grid,zip_to:0
+msgid "To Zip"
+msgstr "Til postnummer"
+
+#. module: delivery
+#: report:sale.shipping:0
+msgid "Order Date"
+msgstr "Ordredato"
+
+#. module: delivery
+#: field:delivery.grid,name:0
+msgid "Grid Name"
+msgstr "Tilgjengelig navn"
+
+#. module: delivery
+#: view:stock.move:0
+msgid "Weights"
+msgstr ""
+
+#. module: delivery
+#: field:stock.picking,number_of_packages:0
+msgid "Number of Packages"
+msgstr "Antall kolli"
+
+#. module: delivery
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+#: report:sale.shipping:0
+#: field:stock.move,weight:0
+#: field:stock.picking,weight:0
+msgid "Weight"
+msgstr "Vekt"
+
+#. module: delivery
+#: help:delivery.carrier,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the delivery "
+"carrier without removing it."
+msgstr ""
+
+#. module: delivery
+#: code:addons/delivery/wizard/delivery_sale_order.py:95
+#, python-format
+msgid "No grid available !"
+msgstr ""
+
+#. module: delivery
+#: selection:delivery.grid.line,operator:0
+msgid ">="
+msgstr ">="
+
+#. module: delivery
+#: code:addons/delivery/wizard/delivery_sale_order.py:66
+#: code:addons/delivery/wizard/delivery_sale_order.py:98
+#, python-format
+msgid "Order not in draft state !"
+msgstr "Ordren har ikke utkast-status!"
+
+#. module: delivery
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr ""
+
+#. module: delivery
+#: report:sale.shipping:0
+msgid "Lot"
+msgstr ""
+
+#. module: delivery
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product"
+msgstr ""
+
+#. module: delivery
+#: field:delivery.carrier,active:0
+#: field:delivery.grid,active:0
+msgid "Active"
+msgstr "Aktiv"
+
+#. module: delivery
+#: report:sale.shipping:0
+msgid "Shipping Date"
+msgstr ""
+
+#. module: delivery
+#: field:delivery.carrier,product_id:0
+msgid "Delivery Product"
+msgstr "Vareleveranse"
+
+#. module: delivery
+#: view:delivery.grid.line:0
+msgid "Condition"
+msgstr "Betingelse"
+
+#. module: delivery
+#: field:delivery.grid.line,standard_price:0
+msgid "Cost Price"
+msgstr "Kostpris"
+
+#. module: delivery
+#: selection:delivery.grid.line,price_type:0
+#: field:delivery.grid.line,type:0
+msgid "Variable"
+msgstr "Variabel"
+
+#. module: delivery
+#: help:res.partner,property_delivery_carrier:0
+msgid "This delivery method will be used when invoicing from picking."
+msgstr ""
+
+#. module: delivery
+#: field:delivery.grid.line,max_value:0
+msgid "Maximum Value"
+msgstr "Maksimumsverdi"
+
+#. module: delivery
+#: report:sale.shipping:0
+msgid "Quantity"
+msgstr "Antall"
+
+#. module: delivery
+#: field:delivery.grid,zip_from:0
+msgid "Start Zip"
+msgstr "Start postnummer"
+
+#. module: delivery
+#: help:sale.order,carrier_id:0
+msgid ""
+"Complete this field if you plan to invoice the shipping based on picking."
+msgstr ""
+
+#. module: delivery
+#: field:delivery.carrier,partner_id:0
+msgid "Carrier Partner"
+msgstr "Transportør"
+
+#. module: delivery
+#: view:res.partner:0
+msgid "Sales & Purchases"
+msgstr "Salg & Innkjøp"
+
+#. module: delivery
+#: selection:delivery.grid.line,operator:0
+msgid "<="
+msgstr "<="
+
+#. module: delivery
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr ""
+
+#. module: delivery
+#: view:delivery.sale.order:0
+msgid "Create Deliveries"
+msgstr ""
+
+#. module: delivery
+#: model:ir.actions.act_window,name:delivery.action_delivery_cost
+#: view:sale.order:0
+msgid "Delivery Costs"
+msgstr ""
+
+#. module: delivery
+#: report:sale.shipping:0
+msgid "Description"
+msgstr "Beskrivelse"
+
+#. module: delivery
+#: model:ir.actions.act_window,name:delivery.action_delivery_grid_form
+#: model:ir.ui.menu,name:delivery.menu_action_delivery_grid_form
+msgid "Delivery Pricelist"
+msgstr ""
+
+#. module: delivery
+#: field:delivery.carrier,price:0
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+msgid "Price"
+msgstr "Pris"
+
+#. module: delivery
+#: code:addons/delivery/wizard/delivery_sale_order.py:95
+#, python-format
+msgid "No grid matching for this carrier !"
+msgstr "No grid matching for this carrier !"
+
+#. module: delivery
+#: model:ir.ui.menu,name:delivery.menu_delivery
+msgid "Delivery"
+msgstr ""
+
+#. module: delivery
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+msgid "Weight * Volume"
+msgstr "Vekt * Volum"
+
+#. module: delivery
+#: selection:delivery.grid.line,operator:0
+msgid "="
+msgstr "="
+
+#. module: delivery
+#: code:addons/delivery/stock.py:99
+#, python-format
+msgid "The carrier %s (id: %d) has no delivery grid!"
+msgstr "Transportøren %s (ID %d) har ingen leveringsnett!"
+
+#. module: delivery
+#: field:delivery.grid.line,name:0
+msgid "Name"
+msgstr "Navn"
+
+#. module: delivery
+#: view:delivery.carrier:0
+#: field:delivery.carrier,name:0
+#: field:delivery.grid,carrier_id:0
+#: model:ir.model,name:delivery.model_delivery_carrier
+#: report:sale.shipping:0
+#: field:stock.picking,carrier_id:0
+msgid "Carrier"
+msgstr "Transportør"
+
+#. module: delivery
+#: view:delivery.sale.order:0
+msgid "_Apply"
+msgstr ""
+
+#. module: delivery
+#: field:sale.order,id:0
+msgid "ID"
+msgstr "ID"
+
+#. module: delivery
+#: code:addons/delivery/wizard/delivery_sale_order.py:66
+#: code:addons/delivery/wizard/delivery_sale_order.py:98
+#, python-format
+msgid "The order state have to be draft to add delivery lines."
+msgstr ""
+"Ordrestatusen må være \"utkast\" for å kunne legge til leveringslinjer."
+
+#. module: delivery
+#: model:ir.module.module,shortdesc:delivery.module_meta_information
+msgid "Carriers and deliveries"
+msgstr "Finn og e_rstatt"
+
+#. module: delivery
+#: field:delivery.carrier,grids_id:0
+msgid "Delivery Grids"
+msgstr "Leveringsmåte"
+
+#. module: delivery
+#: field:delivery.grid,sequence:0
+msgid "Sequence"
+msgstr "Sekvens"
+
+#. module: delivery
+#: field:delivery.grid.line,list_price:0
+msgid "Sale Price"
+msgstr "Salgspris"
+
+#. module: delivery
+#: view:delivery.grid:0
+#: field:delivery.grid,state_ids:0
+msgid "States"
+msgstr "Bekreftelser"
+
+#. module: delivery
+#: field:delivery.grid.line,price_type:0
+msgid "Price Type"
+msgstr "Pristype"
diff --git a/addons/document/i18n/gl.po b/addons/document/i18n/gl.po
new file mode 100644
index 00000000000..e3344e345bc
--- /dev/null
+++ b/addons/document/i18n/gl.po
@@ -0,0 +1,1078 @@
+# Galician translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-04-05 11:43+0000\n"
+"Last-Translator: Santi (Pexego) <santiago@pexego.es>\n"
+"Language-Team: Galician <gl@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: 2011-04-06 06:02+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+
+#. module: document
+#: field:document.directory,parent_id:0
+msgid "Parent Directory"
+msgstr "Directorio Pai"
+
+#. module: document
+#: model:ir.model,name:document.model_document_configuration
+msgid "Auto Directory Configuration"
+msgstr "Configuración automática de directorios"
+
+#. module: document
+#: field:document.directory,resource_field:0
+msgid "Name field"
+msgstr "Campo Nome"
+
+#. module: document
+#: view:board.board:0
+msgid "Document board"
+msgstr "Taboleiro de documentos"
+
+#. module: document
+#: model:ir.model,name:document.model_process_node
+msgid "Process Node"
+msgstr "Nodo do proceso"
+
+#. module: document
+#: view:document.directory:0
+msgid "Search Document Directory"
+msgstr "Buscar directorio de documentos"
+
+#. module: document
+#: help:document.directory,resource_field:0
+msgid ""
+"Field to be used as name on resource directories. If empty, the \"name\" "
+"will be used."
+msgstr ""
+"Campo a usar como nome dos directorios de recursos. Se está baleiro, usarase "
+"o campo \"Nome\"."
+
+#. module: document
+#: code:addons/document/document_directory.py:276
+#, python-format
+msgid "Directory name contains special characters!"
+msgstr "O nome do directorio contén caracteres especiais!"
+
+#. module: document
+#: view:document.directory:0
+#: view:document.storage:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: document
+#: model:ir.model,name:document.model_document_directory_content_type
+msgid "Directory Content Type"
+msgstr "Tipo de contido do directorio"
+
+#. module: document
+#: view:document.directory:0
+msgid "Resources"
+msgstr "Recursos"
+
+#. module: document
+#: field:document.directory,file_ids:0
+#: view:report.document.user:0
+msgid "Files"
+msgstr "Arquivos"
+
+#. module: document
+#: view:report.files.partner:0
+msgid "Files per Month"
+msgstr "Arquivos por mes"
+
+#. module: document
+#: selection:report.document.user,month:0
+#: selection:report.files.partner,month:0
+msgid "March"
+msgstr "Marzo"
+
+#. module: document
+#: view:document.configuration:0
+msgid "title"
+msgstr "título"
+
+#. module: document
+#: view:document.directory:0
+#: field:document.directory,company_id:0
+msgid "Company"
+msgstr "Compañía"
+
+#. module: document
+#: model:ir.model,name:document.model_document_directory_content
+msgid "Directory Content"
+msgstr "Contido do directorio"
+
+#. module: document
+#: view:document.directory:0
+msgid "Dynamic context"
+msgstr "Contexto dinámico"
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_document_management_configuration
+msgid "Document Management"
+msgstr "Xestión de documentos"
+
+#. module: document
+#: help:document.directory.dctx,expr:0
+msgid ""
+"A python expression used to evaluate the field.\n"
+"You can use 'dir_id' for current dir, 'res_id', 'res_model' as a reference "
+"to the current record, in dynamic folders"
+msgstr ""
+"Expresión Python utilizada para avaliar o campo. Pode utilizar 'dir_id' para "
+"o directorio actual, 'res_id', 'res_model' como referencia ó rexistro actual "
+"en directorios dinámicos."
+
+#. module: document
+#: view:report.document.user:0
+msgid "This Year"
+msgstr "Este ano"
+
+#. module: document
+#: field:document.storage,path:0
+msgid "Path"
+msgstr "Ruta"
+
+#. module: document
+#: code:addons/document/document_directory.py:266
+#: code:addons/document/document_directory.py:271
+#, python-format
+msgid "Directory name must be unique!"
+msgstr "O nome do directorio debe ser único!"
+
+#. module: document
+#: view:ir.attachment:0
+#: field:ir.attachment,index_content:0
+msgid "Indexed Content"
+msgstr "Contido indexado"
+
+#. module: document
+#: help:document.directory,resource_find_all:0
+msgid ""
+"If true, all attachments that match this resource will  be located. If "
+"false, only ones that have this as parent."
+msgstr ""
+"Se está marcada, atoparanse tódolos arquivos adxuntos que coincidan con este "
+"recurso. Se está desmarcada, atoparanse só aqueles que teñan este pai."
+
+#. module: document
+#: view:document.directory:0
+#: field:document.storage,dir_ids:0
+#: model:ir.actions.act_window,name:document.action_document_directory_form
+#: model:ir.ui.menu,name:document.menu_document_directories
+msgid "Directories"
+msgstr "Directorios"
+
+#. module: document
+#: field:document.configuration,sale_order:0
+msgid "Sale Order"
+msgstr "Pedido de venda"
+
+#. module: document
+#: model:ir.model,name:document.model_report_document_user
+msgid "Files details by Users"
+msgstr "Arquivos detallados por usuarios"
+
+#. module: document
+#: field:document.configuration,project:0
+msgid "Project"
+msgstr "Proxecto"
+
+#. module: document
+#: code:addons/document/document_storage.py:573
+#: code:addons/document/document_storage.py:601
+#, python-format
+msgid "Error!"
+msgstr "Erro!"
+
+#. module: document
+#: help:document.configuration,product:0
+msgid "Auto directory configuration for Products."
+msgstr "Configuración automática dos directorios para produtos."
+
+#. module: document
+#: field:document.directory,resource_find_all:0
+msgid "Find all resources"
+msgstr "Atopar tódolos recursos"
+
+#. module: document
+#: selection:document.directory,type:0
+msgid "Folders per resource"
+msgstr "Directorios por recurso"
+
+#. module: document
+#: field:document.directory.content,suffix:0
+msgid "Suffix"
+msgstr "Sufixo"
+
+#. module: document
+#: field:report.document.user,change_date:0
+msgid "Modified Date"
+msgstr "Data modificada"
+
+#. module: document
+#: view:document.configuration:0
+msgid "Knowledge Application Configuration"
+msgstr "Configuración da aplicación do coñecemento"
+
+#. module: document
+#: view:ir.attachment:0
+#: field:ir.attachment,partner_id:0
+#: field:report.files.partner,partner:0
+msgid "Partner"
+msgstr "Socio"
+
+#. module: document
+#: view:board.board:0
+msgid "Files by Users"
+msgstr "Arquivos por usuarios"
+
+#. module: document
+#: field:process.node,directory_id:0
+msgid "Document directory"
+msgstr "Directorio do documento"
+
+#. module: document
+#: code:addons/document/document.py:154
+#: code:addons/document/document.py:222
+#: code:addons/document/document_directory.py:266
+#: code:addons/document/document_directory.py:271
+#: code:addons/document/document_directory.py:276
+#, python-format
+msgid "ValidateError"
+msgstr "Erro de validación"
+
+#. module: document
+#: model:ir.model,name:document.model_ir_actions_report_xml
+msgid "ir.actions.report.xml"
+msgstr "ir.actions.report.xml"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_document_file_form
+#: view:ir.attachment:0
+#: model:ir.ui.menu,name:document.menu_document_doc
+#: model:ir.ui.menu,name:document.menu_document_files
+msgid "Documents"
+msgstr "Documentos"
+
+#. module: document
+#: constraint:document.directory:0
+msgid "Error! You can not create recursive Directories."
+msgstr "Erro! Non se poden crear directorios recorrentes."
+
+#. module: document
+#: view:document.directory:0
+#: field:document.directory,storage_id:0
+msgid "Storage"
+msgstr "Almacenamento"
+
+#. module: document
+#: view:document.configuration:0
+msgid "Configure Resource Directory"
+msgstr "Configurar directorio de recursos"
+
+#. module: document
+#: field:ir.attachment,file_size:0
+#: field:report.document.file,file_size:0
+#: field:report.document.user,file_size:0
+#: field:report.files.partner,file_size:0
+msgid "File Size"
+msgstr "Tamaño do arquivo"
+
+#. module: document
+#: field:document.directory.content.type,name:0
+#: field:ir.attachment,file_type:0
+msgid "Content Type"
+msgstr "Tipo de contido"
+
+#. module: document
+#: view:document.directory:0
+#: field:document.directory,type:0
+#: view:document.storage:0
+#: field:document.storage,type:0
+msgid "Type"
+msgstr "Tipo"
+
+#. module: document
+#: help:document.directory,ressource_type_id:0
+msgid ""
+"Select an object here and there will be one folder per record of that "
+"resource."
+msgstr ""
+"Seleccione aquí un obxecto e haberá un directorio por cada rexistro dese "
+"recurso."
+
+#. module: document
+#: help:document.directory,domain:0
+msgid ""
+"Use a domain if you want to apply an automatic filter on visible resources."
+msgstr ""
+"Use un dominio, se desexa aplicar un filtro automático nos recursos visibles."
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_files_by_partner
+msgid "Files Per Partner"
+msgstr "Arquivos por empresa"
+
+#. module: document
+#: field:document.directory,dctx_ids:0
+msgid "Context fields"
+msgstr "Campos de contexto"
+
+#. module: document
+#: field:ir.attachment,store_fname:0
+msgid "Stored Filename"
+msgstr "Nome do arquivo gardado"
+
+#. module: document
+#: field:document.directory,ressource_type_id:0
+msgid "Resource model"
+msgstr "Modelo de recurso"
+
+#. module: document
+#: view:document.directory:0
+#: field:report.document.user,type:0
+msgid "Directory Type"
+msgstr "Tipo de directorio"
+
+#. module: document
+#: field:document.directory.content,report_id:0
+msgid "Report"
+msgstr "Informe"
+
+#. module: document
+#: selection:report.document.user,month:0
+#: selection:report.files.partner,month:0
+msgid "July"
+msgstr "Xullo"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.open_board_document_manager
+#: model:ir.ui.menu,name:document.menu_reports_document_manager
+msgid "Document Dashboard"
+msgstr "Taboleiro de documentos"
+
+#. module: document
+#: field:document.directory.content.type,code:0
+msgid "Extension"
+msgstr "Extensión"
+
+#. module: document
+#: view:ir.attachment:0
+msgid "Created"
+msgstr "Creado"
+
+#. module: document
+#: field:document.directory,content_ids:0
+msgid "Virtual Files"
+msgstr "Arquivos virtuais"
+
+#. module: document
+#: view:ir.attachment:0
+msgid "Modified"
+msgstr "Modificado"
+
+#. module: document
+#: code:addons/document/document_storage.py:639
+#, python-format
+msgid "Error at doc write!"
+msgstr "Erro de escritura no documento!"
+
+#. module: document
+#: view:document.directory:0
+msgid "Generated Files"
+msgstr "Arquivos xerados"
+
+#. module: document
+#: field:document.directory.content,directory_id:0
+#: field:document.directory.dctx,dir_id:0
+#: model:ir.actions.act_window,name:document.action_document_file_directory_form
+#: view:ir.attachment:0
+#: field:ir.attachment,parent_id:0
+#: model:ir.model,name:document.model_document_directory
+#: field:report.document.user,directory:0
+msgid "Directory"
+msgstr "Directorio"
+
+#. module: document
+#: view:board.board:0
+msgid "Files by Partner"
+msgstr "Arquivos por empresa"
+
+#. module: document
+#: field:document.directory,write_uid:0
+#: field:document.storage,write_uid:0
+#: field:ir.attachment,write_uid:0
+msgid "Last Modification User"
+msgstr "Usuario da última modificación"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.act_res_partner_document
+#: model:ir.actions.act_window,name:document.zoom_directory
+msgid "Related Documents"
+msgstr "Documentos relacionados"
+
+#. module: document
+#: field:document.configuration,progress:0
+msgid "Configuration Progress"
+msgstr "Progreso da configuración"
+
+#. module: document
+#: field:document.directory,domain:0
+msgid "Domain"
+msgstr "Dominio"
+
+#. module: document
+#: field:document.directory,write_date:0
+#: field:document.storage,write_date:0
+#: field:ir.attachment,write_date:0
+msgid "Date Modified"
+msgstr "Data de modificación"
+
+#. module: document
+#: model:ir.model,name:document.model_report_document_file
+msgid "Files details by Directory"
+msgstr "Arquivos detallados por directorio"
+
+#. module: document
+#: view:report.document.user:0
+msgid "All users files"
+msgstr "Arquivos de tódolos usuarios"
+
+#. module: document
+#: view:board.board:0
+#: model:ir.actions.act_window,name:document.action_view_size_month
+#: view:report.document.file:0
+msgid "File Size by Month"
+msgstr "Tamaño de arquivo por mes"
+
+#. module: document
+#: selection:report.document.user,month:0
+#: selection:report.files.partner,month:0
+msgid "December"
+msgstr "Decembro"
+
+#. module: document
+#: field:document.configuration,config_logo:0
+msgid "Image"
+msgstr "Imaxe"
+
+#. module: document
+#: selection:document.directory,type:0
+msgid "Static Directory"
+msgstr "Directorio estático"
+
+#. module: document
+#: field:document.directory,child_ids:0
+msgid "Children"
+msgstr "Fillos"
+
+#. module: document
+#: view:document.directory:0
+msgid "Define words in the context, for all child directories and files"
+msgstr ""
+"Define palabras no contexto para tódolos directorios e arquivos fillos"
+
+#. module: document
+#: model:ir.module.module,description:document.module_meta_information
+msgid ""
+"This is a complete document management system:\n"
+"    * User Authentication\n"
+"    * Document Indexation :- .pptx and .docx files are not support in "
+"windows platform.\n"
+"    * Dashboard for Document that includes:\n"
+"        * New Files (list)\n"
+"        * Files by Resource Type (graph)\n"
+"        * Files by Partner (graph)\n"
+"        * Files by Month (graph)\n"
+"    ATTENTION:\n"
+"    - When you install this module in a running company that have already "
+"PDF files stored into the database,\n"
+"      you will lose them all.\n"
+"    - After installing this module PDF's are no longer stored into the "
+"database,\n"
+"      but in the servers rootpad like /server/bin/filestore.\n"
+msgstr ""
+"Este é un completo xestor de documentos:* Autenticación de usuario* "
+"Indexación de documentos. Os documentos .pptx e .docx non están soportados "
+"baixo windows.* Taboleiro de documentos que abrangue:* Novos arquivos "
+"(lista)* Arquivos por tipo de recurso (gráfico)* Arquivos por empresa "
+"(gráfico)* Arquivos por mes (gráfico) ATENCIÓN:- Cando instale este módulo "
+"nunha compañía en produción que xa teña arquivos PDF gardados na base de "
+"datos, perderaos todos.- Despois de instalar este módulo, os arquivos PDF xa "
+"non se gardarán na base de datos, senón no directorio raíz do servidor como "
+"/server/bin/filestore.\n"
+
+#. module: document
+#: help:document.storage,online:0
+msgid ""
+"If not checked, media is currently offline and its contents not available"
+msgstr ""
+"Se non se marca, o medio de almacenamento está actualmente fóra de liña e o "
+"seu contido non está dispoñible."
+
+#. module: document
+#: view:document.directory:0
+#: field:document.directory,user_id:0
+#: field:document.storage,user_id:0
+#: view:ir.attachment:0
+#: field:ir.attachment,user_id:0
+#: field:report.document.user,user_id:0
+#: field:report.document.wall,user_id:0
+msgid "Owner"
+msgstr "Proprietario"
+
+#. module: document
+#: view:document.directory:0
+msgid "PDF Report"
+msgstr "Informe PDF"
+
+#. module: document
+#: view:document.directory:0
+msgid "Contents"
+msgstr "Contidos"
+
+#. module: document
+#: field:document.directory,create_date:0
+#: field:document.storage,create_date:0
+#: field:report.document.user,create_date:0
+msgid "Date Created"
+msgstr "Data de creación"
+
+#. module: document
+#: help:document.directory.content,include_name:0
+msgid ""
+"Check this field if you want that the name of the file to contain the record "
+"name.\n"
+"If set, the directory will have to be a resource one."
+msgstr ""
+"Marque este campo se desexa que o nome do arquivo conteña o nome do "
+"rexistro. Se está marcado, o directorio tén que ser un recurso."
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_config_auto_directory
+msgid "Auto Configure Directory"
+msgstr "Configuración automática de directorios"
+
+#. module: document
+#: field:document.directory.content,include_name:0
+msgid "Include Record Name"
+msgstr "Incluír o nome do rexistro"
+
+#. module: document
+#: view:ir.attachment:0
+msgid "Attachment"
+msgstr "Anexo"
+
+#. module: document
+#: field:ir.actions.report.xml,model_id:0
+msgid "Model Id"
+msgstr "ID modelo"
+
+#. module: document
+#: field:document.storage,online:0
+msgid "Online"
+msgstr "En liña"
+
+#. module: document
+#: help:document.directory,ressource_tree:0
+msgid ""
+"Check this if you want to use the same tree structure as the object selected "
+"in the system."
+msgstr ""
+"Marque esta opción se desexa utilizar a mesma estrutura de árbore coma "
+"obxecto seleccionado no sistema."
+
+#. module: document
+#: view:document.directory:0
+msgid "Security"
+msgstr "Seguridade"
+
+#. module: document
+#: help:document.directory,ressource_id:0
+msgid ""
+"Along with Parent Model, this ID attaches this folder to a specific record "
+"of Parent Model."
+msgstr ""
+"Xunto ó modelo pai, este ID anexa este directorio a un rexistro específico "
+"do modelo pai."
+
+#. module: document
+#: selection:report.document.user,month:0
+#: selection:report.files.partner,month:0
+msgid "August"
+msgstr "Agosto"
+
+#. module: document
+#: sql_constraint:document.directory:0
+msgid "Directory cannot be parent of itself!"
+msgstr "O directorio non pode ser o seu propio pai!"
+
+#. module: document
+#: selection:report.document.user,month:0
+#: selection:report.files.partner,month:0
+msgid "June"
+msgstr "Xuño"
+
+#. module: document
+#: field:report.document.user,user:0
+#: field:report.document.wall,user:0
+msgid "User"
+msgstr "Usuario"
+
+#. module: document
+#: field:document.directory,group_ids:0
+#: field:document.storage,group_ids:0
+msgid "Groups"
+msgstr "Grupos"
+
+#. module: document
+#: field:document.directory.content.type,active:0
+msgid "Active"
+msgstr "Activo"
+
+#. module: document
+#: selection:report.document.user,month:0
+#: selection:report.files.partner,month:0
+msgid "November"
+msgstr "Novembro"
+
+#. module: document
+#: view:ir.attachment:0
+#: field:ir.attachment,db_datas:0
+msgid "Data"
+msgstr "Datos"
+
+#. module: document
+#: help:document.directory,ressource_parent_type_id:0
+msgid ""
+"If you put an object here, this directory template will appear bellow all of "
+"these objects. Such directories are \"attached\" to the specific model or "
+"record, just like attachments. Don't put a parent directory if you select a "
+"parent model."
+msgstr ""
+"Se introduce aquí un obxecto, este modelo de directorio aparecerá baixo "
+"todos estes obxectos. Estes directorios \"anéxanse\" ó modelo ou rexistro "
+"específico, como anexos. Se selecciona un modelo pai, non poña un directorio "
+"pai."
+
+#. module: document
+#: view:document.directory:0
+msgid "Definition"
+msgstr "Definición"
+
+#. module: document
+#: selection:report.document.user,month:0
+#: selection:report.files.partner,month:0
+msgid "October"
+msgstr "Outubro"
+
+#. module: document
+#: view:document.directory:0
+msgid "Seq."
+msgstr "Sec."
+
+#. module: document
+#: selection:document.storage,type:0
+msgid "Database"
+msgstr "Bases de datos"
+
+#. module: document
+#: help:document.configuration,project:0
+msgid "Auto directory configuration for Projects."
+msgstr "Configuración automática de directorios para proxectos."
+
+#. module: document
+#: view:ir.attachment:0
+msgid "Related to"
+msgstr "Relacionado con"
+
+#. module: document
+#: model:ir.module.module,shortdesc:document.module_meta_information
+msgid "Integrated Document Management System"
+msgstr "Sistema de xestión integrada de documentos"
+
+#. module: document
+#: view:document.configuration:0
+msgid "Choose the following Resouces to auto directory configuration."
+msgstr ""
+"Seleccione os recursos seguintes para configurar directorios automáticos."
+
+#. module: document
+#: view:ir.attachment:0
+msgid "Attached To"
+msgstr "Adxunto a"
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_reports_document
+msgid "Dashboard"
+msgstr "Panel de control"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_user_graph
+msgid "Files By Users"
+msgstr "Arquivos por usuarios"
+
+#. module: document
+#: field:document.storage,readonly:0
+msgid "Read Only"
+msgstr "Só lectura"
+
+#. module: document
+#: field:document.directory.dctx,expr:0
+msgid "Expression"
+msgstr "Expresión"
+
+#. module: document
+#: sql_constraint:document.directory:0
+msgid "The directory name must be unique !"
+msgstr "O nome do directorio debe ser único!"
+
+#. module: document
+#: field:document.directory,create_uid:0
+#: field:document.storage,create_uid:0
+msgid "Creator"
+msgstr "Autor"
+
+#. module: document
+#: view:board.board:0
+#: model:ir.actions.act_window,name:document.action_view_files_by_month_graph
+#: view:report.document.user:0
+msgid "Files by Month"
+msgstr "Arquivos por mes"
+
+#. module: document
+#: selection:report.document.user,month:0
+#: selection:report.files.partner,month:0
+msgid "September"
+msgstr "Setembro"
+
+#. module: document
+#: field:document.directory.content,prefix:0
+msgid "Prefix"
+msgstr "Prefixo"
+
+#. module: document
+#: field:report.document.wall,last:0
+msgid "Last Posted Time"
+msgstr "Hora do último arquivo engadido"
+
+#. module: document
+#: field:report.document.user,datas_fname:0
+msgid "File Name"
+msgstr "Nome do arquivo"
+
+#. module: document
+#: view:document.configuration:0
+msgid "res_config_contents"
+msgstr "res_config_contidos"
+
+#. module: document
+#: field:document.directory,ressource_id:0
+msgid "Resource ID"
+msgstr "ID do recurso"
+
+#. module: document
+#: selection:document.storage,type:0
+msgid "External file storage"
+msgstr "Almacenamento externo"
+
+#. module: document
+#: view:board.board:0
+#: model:ir.actions.act_window,name:document.action_view_wall
+#: view:report.document.wall:0
+msgid "Wall of Shame"
+msgstr "Muro da vergoña"
+
+#. module: document
+#: help:document.storage,path:0
+msgid "For file storage, the root path of the storage"
+msgstr "Para o almacenamento de arquivos, a ruta raíz onde se almacenan."
+
+#. module: document
+#: model:ir.model,name:document.model_report_files_partner
+msgid "Files details by Partners"
+msgstr "Arquivos detallados por empresas"
+
+#. module: document
+#: field:document.directory.dctx,field:0
+msgid "Field"
+msgstr "Campo"
+
+#. module: document
+#: model:ir.model,name:document.model_document_directory_dctx
+msgid "Directory Dynamic Context"
+msgstr "Contexto dinámico de directorio"
+
+#. module: document
+#: field:document.directory,ressource_parent_type_id:0
+msgid "Parent Model"
+msgstr "Modelo pai"
+
+#. module: document
+#: view:report.document.user:0
+msgid "Files by users"
+msgstr "Arquivos por usuarios"
+
+#. module: document
+#: field:report.document.file,month:0
+#: field:report.document.user,month:0
+#: field:report.document.wall,month:0
+#: field:report.document.wall,name:0
+#: field:report.files.partner,month:0
+msgid "Month"
+msgstr "Mes"
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_reporting
+msgid "Reporting"
+msgstr "Informe"
+
+#. module: document
+#: field:document.configuration,product:0
+msgid "Product"
+msgstr "Produto"
+
+#. module: document
+#: field:document.directory,ressource_tree:0
+msgid "Tree Structure"
+msgstr "Estrutura árbore"
+
+#. module: document
+#: selection:report.document.user,month:0
+#: selection:report.files.partner,month:0
+msgid "May"
+msgstr "Maio"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_all_document_tree1
+msgid "All Users files"
+msgstr "Arquivos de tódolos usuarios"
+
+#. module: document
+#: model:ir.model,name:document.model_report_document_wall
+msgid "Users that did not inserted documents since one month"
+msgstr "Usuarios que non insertaron documentos desde hai un mes"
+
+#. module: document
+#: model:ir.actions.act_window,help:document.action_document_file_form
+msgid ""
+"The Documents repository gives you access to all attachments, such as mails, "
+"project documents, invoices etc."
+msgstr ""
+"O repositorio de documentación proporciónalle o acceso a tódolos anexos "
+"tales coma os correos, os proxectos, as facturas, etc."
+
+#. module: document
+#: view:document.directory:0
+msgid "For each entry here, virtual files will appear in this folder."
+msgstr "Para cada entrada, os arquivos virtuais aparecerán neste directorio."
+
+#. module: document
+#: model:ir.model,name:document.model_ir_attachment
+msgid "ir.attachment"
+msgstr "ir.adxunto"
+
+#. module: document
+#: view:board.board:0
+msgid "New Files"
+msgstr "Novos arquivos"
+
+#. module: document
+#: selection:report.document.user,month:0
+#: selection:report.files.partner,month:0
+msgid "January"
+msgstr "Xaneiro"
+
+#. module: document
+#: view:document.directory:0
+msgid "Static"
+msgstr "Estático"
+
+#. module: document
+#: view:report.files.partner:0
+msgid "Files By Partner"
+msgstr "Arquivos por empresa"
+
+#. module: document
+#: help:document.directory.dctx,field:0
+msgid ""
+"The name of the field. Note that the prefix \"dctx_\" will be prepended to "
+"what is typed here."
+msgstr ""
+"O nome do arquivo. Teña en conta que o prefixo \"dctx_\" anteporase ó que "
+"escriba aquí."
+
+#. module: document
+#: view:report.document.user:0
+msgid "This Month"
+msgstr "Este mes"
+
+#. module: document
+#: view:ir.attachment:0
+msgid "Notes"
+msgstr "Notas"
+
+#. module: document
+#: help:document.configuration,sale_order:0
+msgid ""
+"Auto directory configuration for Sale Orders and Quotation with report."
+msgstr ""
+"Configuración automática de directorios para orzamentos e pedidos de venda "
+"con informes."
+
+#. module: document
+#: help:document.directory,type:0
+msgid ""
+"Each directory can either have the type Static or be linked to another "
+"resource. A static directory, as with Operating Systems, is the classic "
+"directory that can contain a set of files. The directories linked to systems "
+"resources automatically possess sub-directories for each of resource types "
+"defined in the parent directory."
+msgstr ""
+"Cada directorio pode ser de tipo estático ou pódese asociar a outro recurso. "
+"Un directorio estático, coma nos sistemas operativos, é o clásico directorio "
+"que pode conter un conxunto de arquivos. Os directorios asociados a recursos "
+"do sistema automaticamente posúen subdirectorios para cada recurso definido "
+"no directorio pai."
+
+#. module: document
+#: selection:report.document.user,month:0
+#: selection:report.files.partner,month:0
+msgid "February"
+msgstr "Febreiro"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.open_board_document_manager1
+#: model:ir.ui.menu,name:document.menu_reports_document_manager1
+msgid "Statistics by User"
+msgstr "Estatísticas por usuario"
+
+#. module: document
+#: field:document.directory,name:0
+#: field:document.storage,name:0
+msgid "Name"
+msgstr "Nome"
+
+#. module: document
+#: sql_constraint:document.storage:0
+msgid "The storage path must be unique!"
+msgstr "A ruta de almacenamento debe ser única!"
+
+#. module: document
+#: view:document.directory:0
+msgid "Fields"
+msgstr "Campos"
+
+#. module: document
+#: help:document.storage,readonly:0
+msgid "If set, media is for reading only"
+msgstr "Se está marcado, o medio de almacenamento é só de lectura."
+
+#. module: document
+#: selection:report.document.user,month:0
+#: selection:report.files.partner,month:0
+msgid "April"
+msgstr "Abril"
+
+#. module: document
+#: field:report.document.file,nbr:0
+#: field:report.document.user,nbr:0
+#: field:report.files.partner,nbr:0
+msgid "# of Files"
+msgstr "Núm. de arquivos"
+
+#. module: document
+#: view:document.directory:0
+msgid ""
+"Only members of these groups will have access to this directory and its "
+"files."
+msgstr ""
+"Só os membros destes grupos terán acceso a este directorio e ós seus "
+"arquivos."
+
+#. module: document
+#: view:document.directory:0
+msgid ""
+"These groups, however, do NOT apply to children directories, which must "
+"define their own groups."
+msgstr ""
+"Porén, estes grupos non se aplican ós directorios fillos, que deben definir "
+"os seus propios grupos."
+
+#. module: document
+#: field:document.directory.content.type,mimetype:0
+msgid "Mime Type"
+msgstr "Tipo Mime"
+
+#. module: document
+#: field:document.directory.content,sequence:0
+msgid "Sequence"
+msgstr "Secuencia"
+
+#. module: document
+#: field:document.directory.content,name:0
+msgid "Content Name"
+msgstr "Nome do Contido"
+
+#. module: document
+#: code:addons/document/document.py:154
+#: code:addons/document/document.py:222
+#, python-format
+msgid "File name must be unique!"
+msgstr "O nome de arquivo debe ser único!"
+
+#. module: document
+#: selection:document.storage,type:0
+msgid "Internal File storage"
+msgstr "Almacenamento interno"
+
+#. module: document
+#: sql_constraint:document.directory:0
+msgid "Directory must have a parent or a storage"
+msgstr "O directorio debe ter un pai ou un almacenamento."
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_document_directory_tree
+#: model:ir.ui.menu,name:document.menu_document_directories_tree
+msgid "Directories' Structure"
+msgstr "Estrutura de directorios"
+
+#. module: document
+#: view:board.board:0
+#: model:ir.actions.act_window,name:document.action_view_document_by_resourcetype_graph
+#: view:report.document.user:0
+msgid "Files by Resource Type"
+msgstr "Arquivos por tipo de rexistro"
+
+#. module: document
+#: field:report.document.user,name:0
+#: field:report.files.partner,name:0
+msgid "Year"
+msgstr "Ano"
+
+#. module: document
+#: view:document.storage:0
+#: model:ir.model,name:document.model_document_storage
+#: model:ir.ui.menu,name:document.menu_document_storage_media
+msgid "Storage Media"
+msgstr "Medios de almacenamento"
+
+#. module: document
+#: view:document.storage:0
+msgid "Search Document storage"
+msgstr "Buscar almacenamento documentos"
+
+#. module: document
+#: field:document.directory.content,extension:0
+msgid "Document Type"
+msgstr "Tipo de documento"
diff --git a/addons/email_template/i18n/nb.po b/addons/email_template/i18n/nb.po
new file mode 100644
index 00000000000..1ae166893ec
--- /dev/null
+++ b/addons/email_template/i18n/nb.po
@@ -0,0 +1,1280 @@
+# Norwegian Bokmal translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# Rolv Råen <rora@adego.no>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-04-07 04:20+0000\n"
+"Last-Translator: Rolv Råen <Unknown>\n"
+"Language-Team: Norwegian Bokmal <nb@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: 2011-04-07 05:54+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
+
+#. module: email_template
+#: help:email_template.account,auto_delete:0
+msgid "Permanently delete emails after sending"
+msgstr "Slett e-poster permanent etter sending"
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Email Account Configuration"
+msgstr "E-post konto konfigurasjon"
+
+#. module: email_template
+#: code:addons/email_template/wizard/email_template_send_wizard.py:195
+#, python-format
+msgid "Emails for multiple items saved in outbox."
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/wizard/email_template_send_wizard.py:59
+#: code:addons/email_template/wizard/email_template_send_wizard.py:60
+#, python-format
+msgid ""
+"No personal email accounts are configured for you. \n"
+"Either ask admin to enforce an account for this template or get yourself a "
+"personal email account."
+msgstr ""
+
+#. module: email_template
+#: view:email_template.mailbox:0
+msgid "Personal Emails"
+msgstr "Personlig e-post"
+
+#. module: email_template
+#: field:email.template,file_name:0
+msgid "Report Filename"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Email Content  "
+msgstr ""
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid "Send mail Wizard"
+msgstr "Send e-post veiviser"
+
+#. module: email_template
+#: selection:email_template.mailbox,mail_type:0
+msgid "Plain Text & HTML with no attachments"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,model_object_field:0
+msgid ""
+"Select the field from the model you want to use.\n"
+"If it is a relationship field you will be able to choose the nested values "
+"in the box below\n"
+"(Note:If there are no values make sure you have selected the correct model)"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.preview,body_html:0
+#: field:email_template.preview,body_text:0
+#: field:email_template.send.wizard,body_html:0
+#: field:email_template.send.wizard,body_text:0
+msgid "Body"
+msgstr "Innhold"
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:304
+#, python-format
+msgid "Deletion of Record failed"
+msgstr ""
+
+#. module: email_template
+#: help:email_template.account,company:0
+msgid ""
+"Select if this mail account does not belong to specific user but to the "
+"organization as a whole. eg: info@companydomain.com"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid "Send now"
+msgstr "Send nå"
+
+#. module: email_template
+#: selection:email_template.mailbox,state:0
+msgid "Not Applicable"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.account:0
+#: model:ir.ui.menu,name:email_template.menu_email_account_all_tools
+#: model:ir.ui.menu,name:email_template.menu_email_template_account_all
+msgid "Email Accounts"
+msgstr "E-post kontoer"
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid "Send all mails"
+msgstr "Send alle e-poster"
+
+#. module: email_template
+#: help:email_template.account,smtpuname:0
+msgid ""
+"Specify the username if your SMTP server requires authentication, otherwise "
+"leave it empty."
+msgstr ""
+
+#. module: email_template
+#: field:email_template.mailbox,server_ref:0
+msgid "Server Reference of mail"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.account:0
+#: selection:email_template.account,state:0
+msgid "Approved"
+msgstr "Godkjent"
+
+#. module: email_template
+#: help:email.template,def_cc:0
+msgid ""
+"Carbon Copy address(es), comma-separated. Placeholders can be used here. "
+"e.g. ${object.email_cc}"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Account"
+msgstr "Konto"
+
+#. module: email_template
+#: field:email.template,table_html:0
+msgid "HTML code"
+msgstr "HTML kode"
+
+#. module: email_template
+#: view:email_template.mailbox:0
+msgid "Send Mail"
+msgstr "Send e-post"
+
+#. module: email_template
+#: help:email_template.account,name:0
+msgid ""
+"The description is used as the Sender name along with the provided From "
+"Email, unless it is already specified in the From Email, e.g: John Doe "
+"<john@doe.com>"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,from_account:0
+msgid "Email Account"
+msgstr "E-post konto"
+
+#. module: email_template
+#: code:addons/email_template/wizard/email_template_send_wizard.py:201
+#, python-format
+msgid "Email sending failed for one or more objects."
+msgstr ""
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid ""
+"Add here all attachments of the current document you want to include in the "
+"Email."
+msgstr ""
+
+#. module: email_template
+#: help:email.template,lang:0
+msgid ""
+"The default language for the email. Placeholders can be used here. eg. "
+"${object.partner_id.lang}"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,sub_model_object_field:0
+msgid ""
+"When you choose relationship fields this field will specify the sub value "
+"you can use."
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.send.wizard,state:0
+msgid "Wizard Complete"
+msgstr "Veiviser fullført"
+
+#. module: email_template
+#: field:email.template,reply_to:0
+#: field:email_template.mailbox,reply_to:0
+#: field:email_template.preview,reply_to:0
+#: field:email_template.send.wizard,reply_to:0
+msgid "Reply-To"
+msgstr "Svar-til"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Delete Action"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Approve Account"
+msgstr "Godkjenn konto"
+
+#. module: email_template
+#: field:email_template.preview,rel_model_ref:0
+#: field:email_template.send.wizard,rel_model_ref:0
+msgid "Referred Document"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.send.wizard,full_success:0
+msgid "Complete Success"
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.account,send_pref:0
+msgid "Both HTML & Text (Mixed)"
+msgstr "Både HTML & Tekst(Miks)"
+
+#. module: email_template
+#: view:email_template.preview:0
+msgid "OK"
+msgstr "OK"
+
+#. module: email_template
+#: field:email_template.account,auto_delete:0
+msgid "Auto Delete"
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.account,send_pref:0
+msgid "Both HTML & Text (Alternative)"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.send.wizard,requested:0
+msgid "No of requested Mails"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,def_body_text:0
+#: view:email_template.mailbox:0
+#: field:email_template.mailbox,body_text:0
+msgid "Standard Body (Text)"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,attachment_ids:0
+msgid "Attached Files"
+msgstr "Vedlagte filer"
+
+#. module: email_template
+#: field:email_template.account,smtpssl:0
+msgid "SSL/TLS (only in python 2.6)"
+msgstr "SSL/TLS(bare i python 2.6)"
+
+#. module: email_template
+#: field:email_template.account,email_id:0
+msgid "From Email"
+msgstr "Fra e-post"
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:304
+#, python-format
+msgid "Warning"
+msgstr "Advarsel"
+
+#. module: email_template
+#: model:ir.actions.act_window,name:email_template.action_email_template_account_tree_all
+msgid "Accounts"
+msgstr "Kontoer"
+
+#. module: email_template
+#: view:email_template.preview:0
+msgid "Body(Text)"
+msgstr "Bod"
+
+#. module: email_template
+#: view:email_template.mailbox:0
+msgid "Company Emails"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid ""
+"Tip: Multiple emails are sent in the same language (the first one is "
+"proposed). We suggest you send emails in groups according to language."
+msgstr ""
+
+#. module: email_template
+#: help:email_template.preview,reply_to:0
+#: help:email_template.send.wizard,reply_to:0
+msgid ""
+"The address recipients should reply to, if different from the From address. "
+"Placeholders can be used here."
+msgstr ""
+
+#. module: email_template
+#: field:email.template,def_subject:0
+#: field:email_template.mailbox,subject:0
+#: field:email_template.preview,subject:0
+#: field:email_template.send.wizard,subject:0
+msgid "Subject"
+msgstr "Emne"
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:256
+#, python-format
+msgid "Reason: %s"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.mailbox,email_from:0
+msgid "From"
+msgstr "Fra"
+
+#. module: email_template
+#: field:email_template.preview,ref_template:0
+#: field:email_template.send.wizard,ref_template:0
+msgid "Template"
+msgstr "Mal"
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:367
+#, python-format
+msgid ""
+"Mail from Account %s failed. Probable Reason: Server Send Error\n"
+" Description: %s"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Insert Simple Field"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.preview:0
+msgid "Body(Html)"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,def_bcc:0
+msgid ""
+"Blind Carbon Copy address(es), comma-separated. Placeholders can be used "
+"here. e.g. ${object.email_bcc}"
+msgstr ""
+
+#. module: email_template
+#: model:ir.actions.act_window,name:email_template.wizard_email_template_preview
+msgid "Template Preview"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,def_body_html:0
+msgid "Body (Text-Web Client Only)"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.account,state:0
+#: view:email_template.mailbox:0
+msgid "State"
+msgstr "Status"
+
+#. module: email_template
+#: field:email.template,ref_ir_value:0
+msgid "Wizard Button"
+msgstr "Veiviser knapp"
+
+#. module: email_template
+#: help:email_template.account,email_id:0
+msgid "eg: 'john@doe.com' or 'John Doe <john@doe.com>'"
+msgstr "f.eks 'ola@nordmann.no' eller Ola Nordmann<ola@nordmann.no>'"
+
+#. module: email_template
+#: view:email.template:0
+#: field:email.template,object_name:0
+msgid "Resource"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:255
+#, python-format
+msgid "Out going connection test failed"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:371
+#, python-format
+msgid "Mail from Account %s successfully Sent."
+msgstr ""
+
+#. module: email_template
+#: view:email_template.mailbox:0
+msgid "Standard Body"
+msgstr ""
+
+#. module: email_template
+#: selection:email.template,template_language:0
+msgid "Mako Templates"
+msgstr "Mako maler"
+
+#. module: email_template
+#: help:email.template,def_body_html:0
+#: help:email.template,def_body_text:0
+msgid "The text version of the mail"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:449
+#, python-format
+msgid " (Email Attachment)"
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.mailbox,folder:0
+msgid "Sent Items"
+msgstr "Sendte elementer"
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Test Outgoing Connection"
+msgstr "Test utgående forbindelse"
+
+#. module: email_template
+#: model:ir.actions.act_window,name:email_template.action_email_template_mailbox
+msgid "Mailbox"
+msgstr "Postkasse"
+
+#. module: email_template
+#: help:email.template,reply_to:0
+msgid ""
+"The address recipients should reply to, if different from the From address. "
+"Placeholders can be used here. e.g. ${object.email_reply_to}"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,ref_ir_value:0
+msgid ""
+"Button in the side bar of the form view of this Resource that will invoke "
+"the Window Action"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.mailbox,account_id:0
+msgid "User account"
+msgstr "Brukerkonto"
+
+#. module: email_template
+#: field:email_template.send.wizard,signature:0
+msgid "Attach my signature to mail"
+msgstr "Legg til signaturen min på e-poster"
+
+#. module: email_template
+#: code:addons/email_template/wizard/email_template_send_wizard.py:255
+#: view:email.template:0
+#, python-format
+msgid "Report"
+msgstr "Rapport"
+
+#. module: email_template
+#: field:email.template,sub_model_object_field:0
+msgid "Sub Field"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+#: view:email_template.mailbox:0
+msgid "Advanced"
+msgstr "Avansert"
+
+#. module: email_template
+#: view:email_template.mailbox:0
+msgid "My Emails"
+msgstr "Mine e-post"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Expression Builder"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,sub_object:0
+msgid ""
+"When a relation field is used this field will show you the type of field you "
+"have selected"
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.mailbox,mail_type:0
+msgid "HTML Body"
+msgstr "HTML innhold"
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Suspend Account"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,null_value:0
+msgid "This Value is used if the field is empty"
+msgstr "Denne verdien blir brukt dersom feltet er tomt"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Preview Template"
+msgstr "Forhåndsvis malen"
+
+#. module: email_template
+#: field:email_template.account,smtpserver:0
+msgid "Server"
+msgstr "Server"
+
+#. module: email_template
+#: help:email.template,copyvalue:0
+msgid ""
+"Copy and paste the value in the location you want to use a system value."
+msgstr ""
+
+#. module: email_template
+#: help:email.template,track_campaign_item:0
+msgid ""
+"Enable this is you wish to include a special tracking marker in outgoing "
+"emails so you can identify replies and link them back to the corresponding "
+"resource record. This is useful for CRM leads for example"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Body (Raw HTML)"
+msgstr "Innhold (HTML)"
+
+#. module: email_template
+#: field:email.template,use_sign:0
+msgid "Signature"
+msgstr "Signatur"
+
+#. module: email_template
+#: field:email.template,sub_object:0
+msgid "Sub-model"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Options"
+msgstr "Alternativer"
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid "Body (Plain Text)"
+msgstr "Innhold(Ren tekst)"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Body (Text)"
+msgstr "Innhold(tekst)"
+
+#. module: email_template
+#: field:email_template.mailbox,date_mail:0
+msgid "Rec/Sent Date"
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.account,state:0
+msgid "Initiated"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,report_template:0
+msgid "Report to send"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Server Information"
+msgstr "Serverinformasjon"
+
+#. module: email_template
+#: field:email_template.send.wizard,generated:0
+msgid "No of generated Mails"
+msgstr "Antall genererte e-poster"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Mail Details"
+msgstr "E-post detaljer"
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:235
+#, python-format
+msgid "SMTP SERVER or PORT not specified"
+msgstr "SMTP SERVER eller PORT ikke angitt"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Note: This is Raw HTML."
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Group by..."
+msgstr "Grupper etter..."
+
+#. module: email_template
+#: selection:email_template.send.wizard,state:0
+msgid "Multiple Mail Wizard Step 1"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.account,user:0
+msgid "Related User"
+msgstr "Assosiert bruker"
+
+#. module: email_template
+#: field:email_template.mailbox,body_html:0
+msgid "Body (Rich Text Clients Only)"
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.account,company:0
+msgid "Yes"
+msgstr "Ja"
+
+#. module: email_template
+#: field:email.template,ref_ir_act_window:0
+msgid "Window Action"
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.account,send_pref:0
+msgid "HTML, otherwise Text"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.mailbox:0
+#: selection:email_template.mailbox,folder:0
+msgid "Drafts"
+msgstr "Utkast"
+
+#. module: email_template
+#: selection:email_template.account,company:0
+msgid "No"
+msgstr "Nei"
+
+#. module: email_template
+#: field:email_template.account,smtpport:0
+msgid "SMTP Port"
+msgstr "SMTP Port"
+
+#. module: email_template
+#: field:email_template.mailbox,mail_type:0
+msgid "Mail Contents"
+msgstr ""
+
+#. module: email_template
+#: sql_constraint:email.template:0
+msgid "The template name must be unique !"
+msgstr "Malnavnet må være unikt !"
+
+#. module: email_template
+#: field:email.template,def_bcc:0
+#: field:email_template.mailbox,email_bcc:0
+#: field:email_template.preview,bcc:0
+#: field:email_template.send.wizard,bcc:0
+msgid "BCC"
+msgstr "BCC"
+
+#. module: email_template
+#: selection:email_template.mailbox,mail_type:0
+msgid "Plain Text"
+msgstr "Ren tekst"
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Draft"
+msgstr "Utkast"
+
+#. module: email_template
+#: field:email.template,model_int_name:0
+msgid "Model Internal Name"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,message_id:0
+#: field:email_template.mailbox,message_id:0
+#: field:email_template.preview,message_id:0
+#: field:email_template.send.wizard,message_id:0
+msgid "Message-ID"
+msgstr "Meldings-ID"
+
+#. module: email_template
+#: help:email_template.mailbox,server_ref:0
+msgid "Applicable for inward items only"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid ""
+"After clicking send all mails, mails will be sent to outbox and cleared in "
+"next Send/Recieve"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.mailbox,state:0
+#: field:email_template.send.wizard,state:0
+msgid "Status"
+msgstr "Status"
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Outgoing"
+msgstr "Utgående"
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:427
+#, python-format
+msgid "Datetime Extraction failed.Date:%s                       \tError:%s"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,use_sign:0
+msgid "the signature from the User details will be appended to the mail"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.send.wizard,from:0
+msgid "From Account"
+msgstr "Fra konto"
+
+#. module: email_template
+#: selection:email_template.mailbox,mail_type:0
+msgid "Intermixed content"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Request Re-activation"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+#: model:ir.actions.act_window,name:email_template.action_email_template_tree_all
+#: model:ir.ui.menu,name:email_template.menu_email_template_all
+#: model:ir.ui.menu,name:email_template.menu_email_template_all_tools
+msgid "Email Templates"
+msgstr "E-post maler"
+
+#. module: email_template
+#: field:email_template.account,smtpuname:0
+msgid "User Name"
+msgstr "Brukernavn"
+
+#. module: email_template
+#: field:email_template.mailbox,user:0
+msgid "User"
+msgstr "Bruker"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Advanced Options"
+msgstr "Avanserte alternativer"
+
+#. module: email_template
+#: view:email_template.mailbox:0
+#: selection:email_template.mailbox,folder:0
+msgid "Outbox"
+msgstr "Utboks"
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid "Save in Drafts"
+msgstr "Lagre som utkast"
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:362
+#, python-format
+msgid ""
+"Mail from Account %s failed. Probable Reason:MIME Error\n"
+"Description: %s"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.account,smtptls:0
+msgid "TLS"
+msgstr "TLS"
+
+#. module: email_template
+#: field:email.template,lang:0
+msgid "Language"
+msgstr "Språk"
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:275
+#: code:addons/email_template/email_template_account.py:280
+#: code:addons/email_template/email_template_account.py:362
+#: code:addons/email_template/email_template_account.py:371
+#: code:addons/email_template/email_template_account.py:374
+#: code:addons/email_template/email_template_account.py:424
+#: code:addons/email_template/wizard/email_template_send_wizard.py:201
+#: model:ir.ui.menu,name:email_template.menu_email_template
+#: model:ir.ui.menu,name:email_template.menu_email_template_config_tools
+#: model:ir.ui.menu,name:email_template.menu_email_template_configuration
+#: model:ir.ui.menu,name:email_template.menu_email_template_tools
+#, python-format
+msgid "Email Template"
+msgstr "E-post mal"
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Send/Receive"
+msgstr "Send/Motta"
+
+#. module: email_template
+#: model:ir.ui.menu,name:email_template.menu_email_template_personal_mails
+msgid "Personal Mails"
+msgstr "Personlig e-post"
+
+#. module: email_template
+#: view:email_template.account:0
+#: selection:email_template.account,state:0
+msgid "Suspended"
+msgstr "Suspendert"
+
+#. module: email_template
+#: help:email.template,allowed_groups:0
+msgid ""
+"Only users from these groups will be allowed to send mails from this Template"
+msgstr ""
+"Bare brukere fra disse gruppene vil ha rettigheter til å sende e-post fra "
+"denne malen"
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:284
+#, python-format
+msgid "Send Mail (%s)"
+msgstr "Send e-post(%s)"
+
+#. module: email_template
+#: help:email.template,def_subject:0
+msgid "The subject of email. Placeholders can be used here."
+msgstr ""
+
+#. module: email_template
+#: field:email_template.send.wizard,report:0
+msgid "Report File Name"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,copyvalue:0
+msgid "Expression"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.mailbox:0
+#: field:email_template.mailbox,history:0
+msgid "History"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+#: view:email_template.mailbox:0
+#: field:email_template.mailbox,attachments_ids:0
+#: view:email_template.send.wizard:0
+#: field:email_template.send.wizard,attachment_ids:0
+msgid "Attachments"
+msgstr "Vedlegg"
+
+#. module: email_template
+#: field:email_template.preview,to:0
+#: field:email_template.send.wizard,to:0
+msgid "To"
+msgstr "Til"
+
+#. module: email_template
+#: selection:email_template.account,send_pref:0
+msgid "Text, otherwise HTML"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:319
+#, python-format
+msgid "Copy of template "
+msgstr "Kopi av mal "
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid "Discard Mail"
+msgstr ""
+
+#. module: email_template
+#: model:ir.model,name:email_template.model_email_template
+msgid "Email Templates for Models"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid "Close"
+msgstr "Lukk"
+
+#. module: email_template
+#: code:addons/email_template/email_template_mailbox.py:49
+#, python-format
+msgid "Error sending mail: %s"
+msgstr "Feil ved sending av e-post: %s"
+
+#. module: email_template
+#: constraint:email_template.account:0
+msgid "Error: You are not allowed to have more than 1 account."
+msgstr ""
+
+#. module: email_template
+#: view:email_template.mailbox:0
+msgid "Body (HTML-Web Client Only)"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/wizard/email_template_send_wizard.py:253
+#, python-format
+msgid "%s (Email Attachment)"
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.mailbox,state:0
+msgid "Sending"
+msgstr "Sender"
+
+#. module: email_template
+#: model:ir.actions.act_window,help:email_template.action_email_template_mailbox
+msgid ""
+"An email template is an email document that will be sent as part of a "
+"marketing campaign. You can personalize it according to specific customer "
+"profile fields, so that a partner name or other partner related information "
+"may be inserted automatically."
+msgstr ""
+
+#. module: email_template
+#: field:email.template,allowed_groups:0
+msgid "Allowed User Groups"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,model_object_field:0
+msgid "Field"
+msgstr "Felt"
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "User Information"
+msgstr "Brukerinformasjon"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Actions"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:363
+#: code:addons/email_template/email_template_account.py:368
+#, python-format
+msgid ""
+"Server Send Error\n"
+"Description: %s"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,file_name:0
+msgid ""
+"Name of the generated report file. Placeholders can be used in the filename. "
+"eg: 2009_SO003.pdf"
+msgstr ""
+
+#. module: email_template
+#: help:email_template.mailbox,date_mail:0
+msgid "Date on which Email Sent or Received"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.mailbox:0
+#: selection:email_template.mailbox,folder:0
+msgid "Trash"
+msgstr "Søppel"
+
+#. module: email_template
+#: model:ir.model,name:email_template.model_email_template_mailbox
+msgid "Email Mailbox"
+msgstr "E-post postkasse"
+
+#. module: email_template
+#: code:addons/email_template/email_template_mailbox.py:116
+#, python-format
+msgid ""
+"Sending of Mail %s failed. Probable Reason:Could not login to server\n"
+"Error: %s"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/wizard/email_template_send_wizard.py:60
+#, python-format
+msgid "Missing mail account"
+msgstr "Manglende e-post konto"
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:250
+#, python-format
+msgid "SMTP Test Connection Was Successful"
+msgstr ""
+
+#. module: email_template
+#: model:ir.module.module,shortdesc:email_template.module_meta_information
+msgid "Email Template for OpenERP"
+msgstr "E-post mal for OpenERP"
+
+#. module: email_template
+#: field:email_template.account,name:0
+msgid "Description"
+msgstr "Beskrivelse"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Create Action"
+msgstr ""
+
+#. module: email_template
+#: help:email_template.account,smtpserver:0
+msgid "Enter name of outgoing server, eg: smtp.yourdomain.com"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,attachment_ids:0
+msgid ""
+"You may attach existing files to this template, so they will be added in all "
+"emails created from this template"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,message_id:0
+msgid ""
+"Specify the Message-ID SMTP header to use in outgoing emails. Please note "
+"that this overrides the Resource tracking option! Placeholders can be used "
+"here."
+msgstr ""
+
+#. module: email_template
+#: field:email.template,def_to:0
+#: field:email_template.mailbox,email_to:0
+msgid "Recipient (To)"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,null_value:0
+msgid "Null Value"
+msgstr "Null verdi"
+
+#. module: email_template
+#: field:email.template,template_language:0
+msgid "Templating Language"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,def_cc:0
+#: field:email_template.mailbox,email_cc:0
+#: field:email_template.preview,cc:0
+#: field:email_template.send.wizard,cc:0
+msgid "CC"
+msgstr "CC"
+
+#. module: email_template
+#: view:email_template.mailbox:0
+msgid "Sent"
+msgstr "Sendt"
+
+#. module: email_template
+#: sql_constraint:email_template.account:0
+msgid "Another setting already exists with this email ID !"
+msgstr "En annen innstilling med samme ID eksisterer allerede !"
+
+#. module: email_template
+#: help:email.template,ref_ir_act_window:0
+msgid "Action that will open this email template on Resource records"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.account,smtppass:0
+msgid "Password"
+msgstr "Passord"
+
+#. module: email_template
+#: help:email_template.preview,message_id:0
+#: help:email_template.send.wizard,message_id:0
+msgid ""
+"The Message-ID header value, if you need tospecify it, for example to "
+"automatically recognize the replies later. Placeholders can be used here."
+msgstr ""
+
+#. module: email_template
+#: view:email_template.mailbox:0
+#: model:ir.ui.menu,name:email_template.menu_email_template_mails_tools
+msgid "Emails"
+msgstr "E-poster"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Templates"
+msgstr "Maler"
+
+#. module: email_template
+#: field:email_template.preview,report:0
+msgid "Report Name"
+msgstr "Rapportnavn"
+
+#. module: email_template
+#: field:email.template,name:0
+msgid "Name"
+msgstr "Navn"
+
+#. module: email_template
+#: field:email.template,track_campaign_item:0
+msgid "Resource Tracking"
+msgstr ""
+
+#. module: email_template
+#: model:ir.model,name:email_template.model_email_template_preview
+msgid "Email Template Preview"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.preview:0
+msgid "Email Preview"
+msgstr "Forhåndsvisning av e-post"
+
+#. module: email_template
+#: help:email.template,def_to:0
+msgid ""
+"The Recipient of email. Placeholders can be used here. e.g. "
+"${object.email_to}"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Existing files"
+msgstr "Eksisterende filer"
+
+#. module: email_template
+#: model:ir.module.module,description:email_template.module_meta_information
+msgid ""
+"\n"
+"    Email Template is extraction of Power Email basically just to send the "
+"emails.\n"
+"    "
+msgstr ""
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid "Body (HTML)"
+msgstr "Innhold (HTML)"
+
+#. module: email_template
+#: help:email.template,table_html:0
+msgid ""
+"Copy this html code to your HTML message body for displaying the info in "
+"your mail."
+msgstr ""
+
+#. module: email_template
+#: model:ir.model,name:email_template.model_email_template_account
+msgid "email_template.account"
+msgstr "email_template.account"
+
+#. module: email_template
+#: field:email_template.preview,rel_model:0
+#: field:email_template.send.wizard,rel_model:0
+msgid "Model"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:236
+#, python-format
+msgid "Core connection for the given ID does not exist"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.account,company:0
+msgid "Corporate"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:275
+#, python-format
+msgid ""
+"Mail from Account %s failed on login. Probable Reason:Could not login to "
+"server\n"
+"Error: %s"
+msgstr ""
+
+#. module: email_template
+#: model:ir.model,name:email_template.model_email_template_send_wizard
+msgid "This is the wizard for sending mail"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Addresses"
+msgstr "Adresser"
+
+#. module: email_template
+#: help:email.template,from_account:0
+msgid "Emails will be sent from this approved account."
+msgstr ""
+
+#. module: email_template
+#: field:email_template.account,send_pref:0
+msgid "Mail Format"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.mailbox,folder:0
+msgid "Folder"
+msgstr "Mappe"
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Company Accounts"
+msgstr "Firmakontoer"
+
+#. module: email_template
+#: help:email_template.account,smtpport:0
+msgid "Enter port number, eg: 25 or 587"
+msgstr "Skriv inn port nummer, f.eks 25 eller 587"
+
+#. module: email_template
+#: code:addons/email_template/wizard/email_template_send_wizard.py:59
+#, python-format
+msgid "email-template"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:280
+#: code:addons/email_template/email_template_account.py:374
+#: code:addons/email_template/email_template_account.py:375
+#, python-format
+msgid "Mail from Account %s failed. Probable Reason:Account not approved"
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.send.wizard,state:0
+msgid "Simple Mail Wizard Step 1"
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.mailbox,mail_type:0
+msgid "Has Attachments"
+msgstr "Har vedlegg"
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:452
+#: code:addons/email_template/wizard/email_template_send_wizard.py:256
+#, python-format
+msgid "No Description"
+msgstr "Ingen beskrivelse"
diff --git a/addons/hr/i18n/nb.po b/addons/hr/i18n/nb.po
new file mode 100644
index 00000000000..7fdbf338c28
--- /dev/null
+++ b/addons/hr/i18n/nb.po
@@ -0,0 +1,829 @@
+# Norwegian Bokmal translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-04-05 11:48+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Bokmal <nb@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: 2011-04-06 06:02+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+
+#. module: hr
+#: model:process.node,name:hr.process_node_openerpuser0
+msgid "Openerp user"
+msgstr "OpenERP bruker"
+
+#. module: hr
+#: view:hr.job:0
+#: field:hr.job,requirements:0
+msgid "Requirements"
+msgstr ""
+
+#. module: hr
+#: constraint:hr.department:0
+msgid "Error! You can not create recursive departments."
+msgstr "Feil! Du kan ikke opprette rekursive avdelinger."
+
+#. module: hr
+#: model:process.transition,name:hr.process_transition_contactofemployee0
+msgid "Link the employee to information"
+msgstr "Koble den ansatte til informasjon"
+
+#. module: hr
+#: field:hr.employee,sinid:0
+msgid "SIN No"
+msgstr ""
+
+#. module: hr
+#: model:ir.module.module,shortdesc:hr.module_meta_information
+#: model:ir.ui.menu,name:hr.menu_hr_deshboard
+#: model:ir.ui.menu,name:hr.menu_hr_main
+#: model:ir.ui.menu,name:hr.menu_hr_management
+#: model:ir.ui.menu,name:hr.menu_hr_root
+msgid "Human Resources"
+msgstr "Personal"
+
+#. module: hr
+#: view:hr.employee:0
+#: view:hr.job:0
+msgid "Group By..."
+msgstr "Grupper etter..."
+
+#. module: hr
+#: model:ir.actions.act_window,help:hr.action_hr_job
+msgid ""
+"Job Positions are used to define jobs and their requirements. You can keep "
+"track of the number of employees you have per job position and how many you "
+"expect in the future. You can also attach a survey to a job position that "
+"will be used in the recruitment process to evaluate the applicants for this "
+"job position."
+msgstr ""
+
+#. module: hr
+#: view:hr.employee:0
+#: field:hr.employee,department_id:0
+#: view:hr.job:0
+#: field:hr.job,department_id:0
+#: view:res.users:0
+msgid "Department"
+msgstr "Avdeling"
+
+#. module: hr
+#: help:hr.installer,hr_attendance:0
+msgid "Simplifies the management of employee's attendances."
+msgstr ""
+
+#. module: hr
+#: view:hr.job:0
+msgid "Mark as Old"
+msgstr ""
+
+#. module: hr
+#: view:hr.job:0
+msgid "Jobs"
+msgstr ""
+
+#. module: hr
+#: view:hr.job:0
+msgid "In Recruitment"
+msgstr ""
+
+#. module: hr
+#: view:hr.installer:0
+msgid "title"
+msgstr "tittel"
+
+#. module: hr
+#: field:hr.department,company_id:0
+#: view:hr.employee:0
+#: view:hr.job:0
+#: field:hr.job,company_id:0
+msgid "Company"
+msgstr "Firma"
+
+#. module: hr
+#: field:hr.job,no_of_recruitment:0
+msgid "Expected in Recruitment"
+msgstr ""
+
+#. module: hr
+#: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason_config
+msgid "Holidays"
+msgstr ""
+
+#. module: hr
+#: help:hr.installer,hr_holidays:0
+msgid "Tracks employee leaves, allocation requests and planning."
+msgstr ""
+
+#. module: hr
+#: model:ir.model,name:hr.model_hr_employee_marital_status
+msgid "Employee Marital Status"
+msgstr "Sivilstand"
+
+#. module: hr
+#: help:hr.employee,partner_id:0
+msgid ""
+"Partner that is related to the current employee. Accounting transaction will "
+"be written on this partner belongs to employee."
+msgstr ""
+
+#. module: hr
+#: model:process.transition,name:hr.process_transition_employeeuser0
+msgid "Link a user to an employee"
+msgstr "Koble en bruker til en ansatt"
+
+#. module: hr
+#: field:hr.installer,hr_contract:0
+msgid "Employee's Contracts"
+msgstr "Ansattkontrakter"
+
+#. module: hr
+#: help:hr.installer,hr_payroll:0
+msgid "Generic Payroll system."
+msgstr ""
+
+#. module: hr
+#: view:hr.employee:0
+msgid "My Departments Employee"
+msgstr "Mine avdelingers ansatte"
+
+#. module: hr
+#: model:hr.employee.marital.status,name:hr.hr_employee_marital_status_married
+msgid "Married"
+msgstr "Gift"
+
+#. module: hr
+#: constraint:hr.employee:0
+msgid ""
+"Error ! You cannot select a department for which the employee is the manager."
+msgstr ""
+
+#. module: hr
+#: help:hr.employee,passport_id:0
+msgid "Employee Passport Information"
+msgstr ""
+
+#. module: hr
+#: model:ir.actions.act_window,help:hr.open_module_tree_department
+msgid ""
+"Your Company's Department Structure is used to manage all documents related "
+"to employees by departments: expenses and timesheet validation, leaves "
+"management, recruitments, etc."
+msgstr ""
+
+#. module: hr
+#: view:hr.employee:0
+msgid "Position"
+msgstr ""
+
+#. module: hr
+#: model:ir.actions.act_window,name:hr.action2
+msgid "Employee Hierarchy"
+msgstr "Ansatthierarki"
+
+#. module: hr
+#: model:process.transition,note:hr.process_transition_employeeuser0
+msgid ""
+"The Related user field on the Employee form allows to link the OpenERP user "
+"(and her rights) to the employee."
+msgstr ""
+
+#. module: hr
+#: view:hr.job:0
+#: selection:hr.job,state:0
+msgid "In Recruitement"
+msgstr ""
+
+#. module: hr
+#: field:hr.employee,identification_id:0
+msgid "Identification No"
+msgstr ""
+
+#. module: hr
+#: field:hr.job,no_of_employee:0
+msgid "No of Employee"
+msgstr "Antall ansatte"
+
+#. module: hr
+#: selection:hr.employee,gender:0
+msgid "Female"
+msgstr "Kvinne"
+
+#. module: hr
+#: help:hr.installer,hr_timesheet_sheet:0
+msgid ""
+"Tracks and helps employees encode and validate timesheets and attendances."
+msgstr ""
+
+#. module: hr
+#: field:hr.installer,hr_evaluation:0
+msgid "Periodic Evaluations"
+msgstr ""
+
+#. module: hr
+#: field:hr.installer,hr_timesheet_sheet:0
+msgid "Timesheets"
+msgstr "Timelister"
+
+#. module: hr
+#: model:ir.actions.act_window,name:hr.open_view_employee_tree
+msgid "Employees Structure"
+msgstr "Ansattstruktur"
+
+#. module: hr
+#: view:hr.employee:0
+msgid "Social IDs"
+msgstr "Personnummer"
+
+#. module: hr
+#: help:hr.job,no_of_employee:0
+msgid "Number of employee with that job."
+msgstr ""
+
+#. module: hr
+#: field:hr.employee,work_phone:0
+msgid "Work Phone"
+msgstr "Telefonnummer arbeid:"
+
+#. module: hr
+#: field:hr.employee.category,child_ids:0
+msgid "Child Categories"
+msgstr "Underordnede kategorier"
+
+#. module: hr
+#: view:hr.job:0
+#: field:hr.job,description:0
+#: model:ir.model,name:hr.model_hr_job
+msgid "Job Description"
+msgstr "Arbeidsbeskrivelse"
+
+#. module: hr
+#: field:hr.employee,work_location:0
+msgid "Office Location"
+msgstr "Kontorsted"
+
+#. module: hr
+#: view:hr.employee:0
+#: view:hr.job:0
+#: model:ir.model,name:hr.model_hr_employee
+#: model:process.node,name:hr.process_node_employee0
+msgid "Employee"
+msgstr "Ansatt"
+
+#. module: hr
+#: model:process.node,note:hr.process_node_employeecontact0
+msgid "Other information"
+msgstr "Annen informasjon"
+
+#. module: hr
+#: field:hr.employee,work_email:0
+msgid "Work E-mail"
+msgstr "E-postaddresse arbeid"
+
+#. module: hr
+#: field:hr.department,complete_name:0
+#: field:hr.employee.category,complete_name:0
+msgid "Name"
+msgstr "Navn"
+
+#. module: hr
+#: field:hr.employee,birthday:0
+msgid "Date of Birth"
+msgstr "Fødselsdato"
+
+#. module: hr
+#: model:ir.ui.menu,name:hr.menu_hr_reporting
+msgid "Reporting"
+msgstr "Rapportering"
+
+#. module: hr
+#: model:ir.model,name:hr.model_ir_actions_act_window
+msgid "ir.actions.act_window"
+msgstr "ir.actions.act_window"
+
+#. module: hr
+#: model:ir.actions.act_window,name:hr.open_board_hr
+msgid "Human Resources Dashboard"
+msgstr ""
+
+#. module: hr
+#: view:hr.employee:0
+#: field:hr.employee,job_id:0
+#: view:hr.job:0
+msgid "Job"
+msgstr ""
+
+#. module: hr
+#: view:hr.department:0
+#: field:hr.department,member_ids:0
+msgid "Members"
+msgstr "Medlemmer"
+
+#. module: hr
+#: model:ir.ui.menu,name:hr.menu_hr_configuration
+msgid "Configuration"
+msgstr "Konfigurasjon"
+
+#. module: hr
+#: view:hr.installer:0
+msgid ""
+"You can enhance the base HR Application by installing few HR-related "
+"functionalities."
+msgstr ""
+
+#. module: hr
+#: view:hr.employee:0
+msgid "Categories"
+msgstr "Kategorier"
+
+#. module: hr
+#: field:hr.job,expected_employees:0
+msgid "Expected Employees"
+msgstr ""
+
+#. module: hr
+#: help:hr.employee,sinid:0
+msgid "Social Insurance Number"
+msgstr ""
+
+#. module: hr
+#: model:hr.employee.marital.status,name:hr.hr_employee_marital_status_divorced
+msgid "Divorced"
+msgstr "Skilt"
+
+#. module: hr
+#: field:hr.employee.category,parent_id:0
+msgid "Parent Category"
+msgstr "Overordnet kategori"
+
+#. module: hr
+#: constraint:hr.employee.category:0
+msgid "Error ! You cannot create recursive Categories."
+msgstr "Feil ! Du kan ikke opprette rekursive kategorier."
+
+#. module: hr
+#: view:hr.department:0
+#: model:ir.actions.act_window,name:hr.open_module_tree_department
+#: model:ir.ui.menu,name:hr.menu_hr_department_tree
+#: view:res.users:0
+#: field:res.users,context_department_id:0
+msgid "Departments"
+msgstr "Avdelinger"
+
+#. module: hr
+#: model:process.node,name:hr.process_node_employeecontact0
+msgid "Employee Contact"
+msgstr "Ansattkontakt"
+
+#. module: hr
+#: view:board.board:0
+msgid "My Board"
+msgstr ""
+
+#. module: hr
+#: selection:hr.employee,gender:0
+msgid "Male"
+msgstr "Mann"
+
+#. module: hr
+#: field:hr.installer,progress:0
+msgid "Configuration Progress"
+msgstr ""
+
+#. module: hr
+#: model:ir.actions.act_window,name:hr.open_view_categ_form
+#: model:ir.ui.menu,name:hr.menu_view_employee_category_form
+msgid "Categories of Employee"
+msgstr "Ansattgrupper"
+
+#. module: hr
+#: view:hr.employee.category:0
+#: model:ir.model,name:hr.model_hr_employee_category
+msgid "Employee Category"
+msgstr "Ansattkategori"
+
+#. module: hr
+#: field:hr.installer,config_logo:0
+msgid "Image"
+msgstr ""
+
+#. module: hr
+#: model:process.process,name:hr.process_process_employeecontractprocess0
+msgid "Employee Contract"
+msgstr "Ansattkontakt"
+
+#. module: hr
+#: help:hr.installer,hr_evaluation:0
+msgid ""
+"Lets you create and manage the periodic evaluation and performance review of "
+"employees."
+msgstr ""
+
+#. module: hr
+#: model:ir.model,name:hr.model_hr_department
+msgid "hr.department"
+msgstr "hr.department"
+
+#. module: hr
+#: help:hr.employee,parent_id:0
+msgid "It is linked with manager of Department"
+msgstr ""
+
+#. module: hr
+#: field:hr.installer,hr_recruitment:0
+msgid "Recruitment Process"
+msgstr "Rekurtteringsprosess"
+
+#. module: hr
+#: field:hr.employee,category_ids:0
+#: field:hr.employee.category,name:0
+msgid "Category"
+msgstr "Kategori"
+
+#. module: hr
+#: model:ir.actions.act_window,help:hr.open_view_employee_list_my
+msgid ""
+"Here you can manage your work force by creating employees and assigning them "
+"specific properties in the system. Maintain all employee related information "
+"and keep track of anything that needs to be recorded for them. The personal "
+"information tab will help you maintain their identity data. The Categories "
+"tab gives you the opportunity to assign them related employee categories "
+"depending on their position and activities within the company. A category "
+"can be a seniority level within the company or a department. The Timesheets "
+"tab allows to assign them a specific timesheet and analytic journal where "
+"they will be able to enter time through the system. In the note tab, you can "
+"enter text data that should be recorded for a specific employee."
+msgstr ""
+
+#. module: hr
+#: help:hr.employee,bank_account_id:0
+msgid "Employee bank salary account"
+msgstr ""
+
+#. module: hr
+#: field:hr.department,note:0
+msgid "Note"
+msgstr "Notat"
+
+#. module: hr
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+
+#. module: hr
+#: view:hr.employee:0
+msgid "Contact Information"
+msgstr "Kontaktinformasjon"
+
+#. module: hr
+#: field:hr.employee,address_id:0
+msgid "Working Address"
+msgstr "Adresse arbeid"
+
+#. module: hr
+#: model:ir.actions.act_window,name:hr.open_board_hr_manager
+msgid "HR Manager Dashboard"
+msgstr ""
+
+#. module: hr
+#: view:hr.employee:0
+msgid "Status"
+msgstr "Status"
+
+#. module: hr
+#: view:hr.installer:0
+msgid "Configure"
+msgstr ""
+
+#. module: hr
+#: model:ir.actions.act_window,name:hr.open_view_categ_tree
+#: model:ir.ui.menu,name:hr.menu_view_employee_category_tree
+msgid "Categories structure"
+msgstr "Kategoristruktur"
+
+#. module: hr
+#: field:hr.employee,partner_id:0
+msgid "unknown"
+msgstr "ukjent"
+
+#. module: hr
+#: field:hr.installer,hr_holidays:0
+msgid "Holidays / Leaves Management"
+msgstr ""
+
+#. module: hr
+#: field:hr.employee,ssnid:0
+msgid "SSN No"
+msgstr "Personnummer"
+
+#. module: hr
+#: view:hr.employee:0
+msgid "Active"
+msgstr "Aktiv"
+
+#. module: hr
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
+msgstr ""
+
+#. module: hr
+#: view:hr.department:0
+msgid "Companies"
+msgstr "Firma"
+
+#. module: hr
+#: model:ir.module.module,description:hr.module_meta_information
+msgid ""
+"\n"
+"    Module for human resource management. You can manage:\n"
+"    * Employees and hierarchies : You can define your employee with User and "
+"display hierarchies\n"
+"    * HR Departments\n"
+"    * HR Jobs\n"
+"    "
+msgstr ""
+
+#. module: hr
+#: model:process.transition,note:hr.process_transition_contactofemployee0
+msgid ""
+"In the Employee form, there are different kind of information like Contact "
+"information."
+msgstr ""
+
+#. module: hr
+#: help:hr.job,expected_employees:0
+msgid "Required number of Employees in total for that job."
+msgstr ""
+
+#. module: hr
+#: selection:hr.job,state:0
+msgid "Old"
+msgstr ""
+
+#. module: hr
+#: field:hr.employee.marital.status,description:0
+msgid "Status Description"
+msgstr ""
+
+#. module: hr
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr "Du kan ikke ha to brukere med samme login !"
+
+#. module: hr
+#: view:hr.job:0
+#: field:hr.job,state:0
+msgid "State"
+msgstr "Status"
+
+#. module: hr
+#: field:hr.employee,marital:0
+#: view:hr.employee.marital.status:0
+#: field:hr.employee.marital.status,name:0
+#: model:ir.actions.act_window,name:hr.action_hr_marital_status
+#: model:ir.ui.menu,name:hr.hr_menu_marital_status
+msgid "Marital Status"
+msgstr "Sivilstand"
+
+#. module: hr
+#: help:hr.installer,hr_recruitment:0
+msgid "Helps you manage and streamline your recruitment process."
+msgstr ""
+
+#. module: hr
+#: model:process.node,note:hr.process_node_employee0
+msgid "Employee form and structure"
+msgstr ""
+
+#. module: hr
+#: field:hr.employee,photo:0
+msgid "Photo"
+msgstr "Bilde"
+
+#. module: hr
+#: model:ir.model,name:hr.model_res_users
+msgid "res.users"
+msgstr "res.users"
+
+#. module: hr
+#: field:hr.installer,hr_payroll_account:0
+msgid "Payroll Accounting"
+msgstr ""
+
+#. module: hr
+#: view:hr.employee:0
+msgid "Personal Information"
+msgstr "Personlig informasjon"
+
+#. module: hr
+#: field:hr.employee,passport_id:0
+msgid "Passport No"
+msgstr ""
+
+#. module: hr
+#: view:res.users:0
+msgid "Current Activity"
+msgstr ""
+
+#. module: hr
+#: help:hr.installer,hr_expense:0
+msgid ""
+"Tracks and manages employee expenses, and can automatically re-invoice "
+"clients if the expenses are project-related."
+msgstr ""
+
+#. module: hr
+#: view:hr.job:0
+msgid "Current"
+msgstr ""
+
+#. module: hr
+#: field:hr.department,parent_id:0
+msgid "Parent Department"
+msgstr "Overordnet avdeling"
+
+#. module: hr
+#: view:hr.employee.category:0
+msgid "Employees Categories"
+msgstr "Ansattkategorier"
+
+#. module: hr
+#: field:hr.employee,address_home_id:0
+msgid "Home Address"
+msgstr "Adresse hjem"
+
+#. module: hr
+#: field:hr.installer,hr_attendance:0
+#: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason_new_config
+msgid "Attendances"
+msgstr ""
+
+#. module: hr
+#: view:hr.employee.marital.status:0
+#: view:hr.job:0
+msgid "Description"
+msgstr "Beskrivelse"
+
+#. module: hr
+#: help:hr.installer,hr_contract:0
+msgid "Extends employee profiles to help manage their contracts."
+msgstr ""
+
+#. module: hr
+#: field:hr.installer,hr_payroll:0
+msgid "Payroll"
+msgstr ""
+
+#. module: hr
+#: model:hr.employee.marital.status,name:hr.hr_employee_marital_status_single
+msgid "Single"
+msgstr "Single"
+
+#. module: hr
+#: field:hr.job,name:0
+msgid "Job Name"
+msgstr ""
+
+#. module: hr
+#: view:hr.job:0
+#: selection:hr.job,state:0
+msgid "In Position"
+msgstr ""
+
+#. module: hr
+#: field:hr.employee,mobile_phone:0
+msgid "Mobile"
+msgstr "Mobil"
+
+#. module: hr
+#: view:hr.department:0
+msgid "department"
+msgstr "avdeling"
+
+#. module: hr
+#: field:hr.employee,country_id:0
+msgid "Nationality"
+msgstr "Nasjonalitet"
+
+#. module: hr
+#: view:hr.department:0
+#: view:hr.employee:0
+#: field:hr.employee,notes:0
+msgid "Notes"
+msgstr "Notater"
+
+#. module: hr
+#: model:ir.model,name:hr.model_hr_installer
+msgid "hr.installer"
+msgstr "hr.installer"
+
+#. module: hr
+#: view:board.board:0
+msgid "HR Manager Board"
+msgstr ""
+
+#. module: hr
+#: field:hr.employee,resource_id:0
+msgid "Resource"
+msgstr "Ressurs"
+
+#. module: hr
+#: view:hr.installer:0
+#: model:ir.actions.act_window,name:hr.action_hr_installer
+msgid "Human Resources Application Configuration"
+msgstr ""
+
+#. module: hr
+#: field:hr.employee,gender:0
+msgid "Gender"
+msgstr "Kjønn"
+
+#. module: hr
+#: view:hr.employee:0
+#: field:hr.job,employee_ids:0
+#: model:ir.actions.act_window,name:hr.hr_employee_normal_action_tree
+#: model:ir.actions.act_window,name:hr.open_view_employee_list
+#: model:ir.actions.act_window,name:hr.open_view_employee_list_my
+#: model:ir.ui.menu,name:hr.menu_open_view_employee_list_my
+#: model:ir.ui.menu,name:hr.menu_view_employee_category_configuration_form
+msgid "Employees"
+msgstr "Ansatte"
+
+#. module: hr
+#: field:hr.employee,bank_account_id:0
+msgid "Bank Account"
+msgstr "Bankkonto"
+
+#. module: hr
+#: field:hr.department,name:0
+msgid "Department Name"
+msgstr "Avdelingsnavn"
+
+#. module: hr
+#: help:hr.employee,ssnid:0
+msgid "Social Security Number"
+msgstr ""
+
+#. module: hr
+#: model:process.node,note:hr.process_node_openerpuser0
+msgid "Creation of a OpenERP user"
+msgstr "Opprettelse av en OpenERP bruker"
+
+#. module: hr
+#: field:hr.department,child_ids:0
+msgid "Child Departments"
+msgstr ""
+
+#. module: hr
+#: model:ir.actions.act_window,name:hr.action_hr_job
+#: model:ir.ui.menu,name:hr.menu_hr_job
+msgid "Job Positions"
+msgstr ""
+
+#. module: hr
+#: view:hr.employee:0
+#: field:hr.employee,coach_id:0
+msgid "Coach"
+msgstr ""
+
+#. module: hr
+#: view:hr.installer:0
+msgid "Configure Your Human Resources Application"
+msgstr ""
+
+#. module: hr
+#: field:hr.installer,hr_expense:0
+msgid "Expenses"
+msgstr ""
+
+#. module: hr
+#: field:hr.department,manager_id:0
+#: view:hr.employee:0
+#: field:hr.employee,parent_id:0
+msgid "Manager"
+msgstr ""
+
+#. module: hr
+#: model:hr.employee.marital.status,name:hr.hr_employee_marital_status_widower
+msgid "Widower"
+msgstr "Enke"
+
+#. module: hr
+#: help:hr.installer,hr_payroll_account:0
+msgid "Generic Payroll system Integrated with Accountings."
+msgstr ""
+
+#. module: hr
+#: field:hr.employee,child_ids:0
+msgid "Subordinates"
+msgstr "Underordnet"
diff --git a/addons/process/i18n/ru.po b/addons/process/i18n/ru.po
index 3483a257bb8..e6f1ef9f428 100644
--- a/addons/process/i18n/ru.po
+++ b/addons/process/i18n/ru.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-03-19 12:36+0000\n"
-"Last-Translator: Viktor Prokopiev <Unknown>\n"
+"PO-Revision-Date: 2011-04-06 06:20+0000\n"
+"Last-Translator: Stanislav Hanzhin <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: 2011-03-20 06:31+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-04-07 05:54+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
 #. module: process
 #: model:ir.model,name:process.model_process_node
@@ -69,7 +69,7 @@ msgstr "Адрес справки"
 #: view:process.node:0
 #: view:process.process:0
 msgid "Process Nodes"
-msgstr "Узел процесса"
+msgstr "Узлы процесса"
 
 #. module: process
 #: view:process.process:0
@@ -87,7 +87,7 @@ msgstr "Условия"
 #. module: process
 #: view:process.transition:0
 msgid "Search Process Transition"
-msgstr ""
+msgstr "Найти переход процесса"
 
 #. module: process
 #: field:process.condition,node_id:0
@@ -127,7 +127,7 @@ msgstr "Исходный узел"
 #: view:process.transition:0
 #: field:process.transition,transition_ids:0
 msgid "Workflow Transitions"
-msgstr ""
+msgstr "Переходы рабочего процесса"
 
 #. module: process
 #: field:process.transition.action,action:0
@@ -138,7 +138,7 @@ msgstr "Идентификатор действия"
 #: model:ir.model,name:process.model_process_transition
 #: view:process.transition:0
 msgid "Process Transition"
-msgstr ""
+msgstr "Переход процесса"
 
 #. module: process
 #: model:ir.model,name:process.model_process_condition
@@ -168,7 +168,7 @@ msgstr "Название"
 #. module: process
 #: field:process.node,transition_in:0
 msgid "Starting Transitions"
-msgstr ""
+msgstr "Начало переходов"
 
 #. module: process
 #: view:process.node:0
@@ -187,7 +187,7 @@ msgstr "Переход"
 #. module: process
 #: view:process.process:0
 msgid "Search Process"
-msgstr ""
+msgstr "Искать процесс"
 
 #. module: process
 #: selection:process.node,kind:0
@@ -218,7 +218,7 @@ msgstr "Действие"
 #. module: process
 #: field:process.node,flow_start:0
 msgid "Starting Flow"
-msgstr ""
+msgstr "Запуск потока"
 
 #. module: process
 #: model:ir.module.module,description:process.module_meta_information
@@ -258,7 +258,7 @@ msgstr "Тип"
 #. module: process
 #: field:process.node,transition_out:0
 msgid "Ending Transitions"
-msgstr ""
+msgstr "Завершаются переходы"
 
 #. module: process
 #: model:ir.model,name:process.model_process_process
@@ -282,7 +282,7 @@ msgstr "Другие условия"
 #: model:ir.module.module,shortdesc:process.module_meta_information
 #: model:ir.ui.menu,name:process.menu_process
 msgid "Enterprise Process"
-msgstr ""
+msgstr "Процесс предприятия"
 
 #. module: process
 #: view:process.transition:0
@@ -299,7 +299,7 @@ msgstr "Свойства"
 #: model:ir.actions.act_window,name:process.action_process_transition_form
 #: model:ir.ui.menu,name:process.menu_process_transition_form
 msgid "Process Transitions"
-msgstr ""
+msgstr "Выполнить переходы"
 
 #. module: process
 #: field:process.transition,target_node_id:0
diff --git a/addons/procurement/i18n/nb.po b/addons/procurement/i18n/nb.po
new file mode 100644
index 00000000000..628b200de2a
--- /dev/null
+++ b/addons/procurement/i18n/nb.po
@@ -0,0 +1,890 @@
+# Norwegian Bokmal translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-04-06 16:23+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Bokmal <nb@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: 2011-04-07 05:54+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
+
+#. module: procurement
+#: view:make.procurement:0
+msgid "Ask New Products"
+msgstr ""
+
+#. module: procurement
+#: model:ir.ui.menu,name:procurement.menu_stock_sched
+msgid "Schedulers"
+msgstr ""
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_make_procurement
+msgid "Make Procurements"
+msgstr ""
+
+#. module: procurement
+#: help:procurement.order.compute.all,automatic:0
+msgid ""
+"Triggers an automatic procurement for all products that have a virtual stock "
+"under 0. You should probably not use this option, we suggest using a MTO "
+"configuration on products."
+msgstr ""
+
+#. module: procurement
+#: view:stock.warehouse.orderpoint:0
+msgid "Group By..."
+msgstr ""
+
+#. module: procurement
+#: help:stock.warehouse.orderpoint,procurement_draft_ids:0
+msgid "Draft procurement of the product and location of that orderpoint"
+msgstr ""
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:288
+#, python-format
+msgid "No supplier defined for this product !"
+msgstr ""
+
+#. module: procurement
+#: field:make.procurement,uom_id:0
+msgid "Unit of Measure"
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order,procure_method:0
+msgid "Procurement Method"
+msgstr ""
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:298
+#, python-format
+msgid "No address defined for the supplier"
+msgstr ""
+
+#. module: procurement
+#: model:ir.actions.act_window,name:procurement.action_procurement_compute
+msgid "Compute Stock Minimum Rules Only"
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order,company_id:0
+#: field:stock.warehouse.orderpoint,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order,product_uos_qty:0
+msgid "UoS Quantity"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+#: field:procurement.order,name:0
+msgid "Reason"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order.compute:0
+msgid "Compute Procurements"
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order,message:0
+msgid "Latest error"
+msgstr ""
+
+#. module: procurement
+#: help:mrp.property,composition:0
+msgid "Not used in computations, for information purpose only."
+msgstr ""
+
+#. module: procurement
+#: field:stock.warehouse.orderpoint,procurement_id:0
+msgid "Latest procurement"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Notes"
+msgstr ""
+
+#. module: procurement
+#: selection:procurement.order,procure_method:0
+msgid "on order"
+msgstr ""
+
+#. module: procurement
+#: help:procurement.order,message:0
+msgid "Exception occurred while computing procurement orders."
+msgstr ""
+
+#. module: procurement
+#: help:procurement.order,state:0
+msgid ""
+"When a procurement is created the state is set to 'Draft'.\n"
+" If the procurement is confirmed, the state is set to 'Confirmed'.           "
+" \n"
+"After confirming the state is set to 'Running'.\n"
+" If any exception arises in the order then the state is set to 'Exception'.\n"
+" Once the exception is removed the state becomes 'Ready'.\n"
+" It is in 'Waiting'. state when the procurement is waiting for another one "
+"to finish."
+msgstr ""
+
+#. module: procurement
+#: view:stock.warehouse.orderpoint:0
+msgid "Minimum Stock Rules Search"
+msgstr ""
+
+#. module: procurement
+#: help:stock.warehouse.orderpoint,product_min_qty:0
+msgid ""
+"When the virtual stock goes belong the Min Quantity, OpenERP generates a "
+"procurement to bring the virtual stock to the Max Quantity."
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order.compute.all:0
+msgid "Scheduler Parameters"
+msgstr ""
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_stock_move
+msgid "Stock Move"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Planification"
+msgstr ""
+
+#. module: procurement
+#: selection:procurement.order,state:0
+msgid "Ready"
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order.compute.all,automatic:0
+msgid "Automatic orderpoint"
+msgstr ""
+
+#. module: procurement
+#: field:mrp.property,composition:0
+msgid "Properties composition"
+msgstr ""
+
+#. module: procurement
+#: selection:procurement.order,state:0
+msgid "Confirmed"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Retry"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order.compute:0
+#: view:procurement.orderpoint.compute:0
+msgid "Parameters"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Confirm"
+msgstr ""
+
+#. module: procurement
+#: help:procurement.order,origin:0
+msgid ""
+"Reference of the document that created this Procurement.\n"
+"This is automatically completed by OpenERP."
+msgstr ""
+
+#. module: procurement
+#: view:stock.warehouse.orderpoint:0
+msgid "Procurement Orders to Process"
+msgstr ""
+
+#. module: procurement
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order,priority:0
+msgid "Priority"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+#: field:procurement.order,state:0
+msgid "State"
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order,location_id:0
+#: view:stock.warehouse.orderpoint:0
+#: field:stock.warehouse.orderpoint,location_id:0
+msgid "Location"
+msgstr ""
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_stock_picking
+msgid "Picking List"
+msgstr ""
+
+#. module: procurement
+#: field:make.procurement,warehouse_id:0
+#: view:stock.warehouse.orderpoint:0
+#: field:stock.warehouse.orderpoint,warehouse_id:0
+msgid "Warehouse"
+msgstr ""
+
+#. module: procurement
+#: selection:stock.warehouse.orderpoint,logic:0
+msgid "Best price (not yet active!)"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Product & Location"
+msgstr ""
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_procurement_order_compute
+msgid "Compute Procurement"
+msgstr ""
+
+#. module: procurement
+#: model:ir.module.module,shortdesc:procurement.module_meta_information
+#: field:stock.move,procurements:0
+msgid "Procurements"
+msgstr ""
+
+#. module: procurement
+#: field:res.company,schedule_range:0
+msgid "Scheduler Range Days"
+msgstr ""
+
+#. module: procurement
+#: model:ir.actions.act_window,help:procurement.procurement_action
+msgid ""
+"A procurement order is used to record a need for a specific product at a "
+"specific location. A procurement order is usually created automatically from "
+"sales orders, a Pull Logistics rule or Minimum Stock Rules. When the "
+"procurement order is confirmed, it automatically creates the necessary "
+"operations to fullfil the need: purchase order proposition, manufacturing "
+"order, etc."
+msgstr ""
+
+#. module: procurement
+#: field:make.procurement,date_planned:0
+msgid "Planned Date"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Group By"
+msgstr ""
+
+#. module: procurement
+#: field:make.procurement,qty:0
+#: field:procurement.order,product_qty:0
+msgid "Quantity"
+msgstr ""
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:370
+#, python-format
+msgid "Not enough stock and no minimum orderpoint rule defined."
+msgstr ""
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:137
+#, python-format
+msgid "Invalid action !"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "References"
+msgstr ""
+
+#. module: procurement
+#: view:res.company:0
+msgid "Configuration"
+msgstr ""
+
+#. module: procurement
+#: field:stock.warehouse.orderpoint,qty_multiple:0
+msgid "Qty Multiple"
+msgstr ""
+
+#. module: procurement
+#: help:procurement.order,procure_method:0
+msgid ""
+"If you encode manually a Procurement, you probably want to use a make to "
+"order method."
+msgstr ""
+
+#. module: procurement
+#: model:ir.ui.menu,name:procurement.menu_stock_procurement
+msgid "Automatic Procurements"
+msgstr ""
+
+#. module: procurement
+#: field:stock.warehouse.orderpoint,product_max_qty:0
+msgid "Max Quantity"
+msgstr ""
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_procurement_order
+#: model:process.process,name:procurement.process_process_procurementprocess0
+#: view:procurement.order:0
+msgid "Procurement"
+msgstr ""
+
+#. module: procurement
+#: model:ir.actions.act_window,name:procurement.procurement_action
+msgid "Procurement Orders"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "To Fix"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Exceptions"
+msgstr ""
+
+#. module: procurement
+#: model:process.node,note:procurement.process_node_serviceonorder0
+msgid "Assignment from Production or Purchase Order."
+msgstr ""
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_mrp_property
+msgid "Property"
+msgstr ""
+
+#. module: procurement
+#: model:ir.actions.act_window,name:procurement.act_make_procurement
+#: view:make.procurement:0
+msgid "Procurement Request"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.orderpoint.compute:0
+msgid "Compute Stock"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Late"
+msgstr ""
+
+#. module: procurement
+#: model:process.process,name:procurement.process_process_serviceproductprocess0
+msgid "Service"
+msgstr ""
+
+#. module: procurement
+#: model:ir.module.module,description:procurement.module_meta_information
+msgid ""
+"\n"
+"    This is the module for computing Procurements.\n"
+"    "
+msgstr ""
+
+#. module: procurement
+#: field:stock.warehouse.orderpoint,procurement_draft_ids:0
+msgid "Related Procurement Orders"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.orderpoint.compute:0
+msgid ""
+"Wizard checks all the stock minimum rules and generate procurement order."
+msgstr ""
+
+#. module: procurement
+#: field:stock.warehouse.orderpoint,product_min_qty:0
+msgid "Min Quantity"
+msgstr ""
+
+#. module: procurement
+#: selection:procurement.order,priority:0
+msgid "Urgent"
+msgstr ""
+
+#. module: procurement
+#: selection:mrp.property,composition:0
+msgid "plus"
+msgstr ""
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:319
+#, python-format
+msgid ""
+"Please check the Quantity in Procurement Order(s), it should not be less "
+"than 1!"
+msgstr ""
+
+#. module: procurement
+#: help:stock.warehouse.orderpoint,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the "
+"orderpoint without removing it."
+msgstr ""
+
+#. module: procurement
+#: help:stock.warehouse.orderpoint,product_max_qty:0
+msgid ""
+"When the virtual stock goes belong the Max Quantity, OpenERP generates a "
+"procurement to bring the virtual stock to the Max Quantity."
+msgstr ""
+
+#. module: procurement
+#: help:procurement.orderpoint.compute,automatic:0
+msgid "If the stock of a product is under 0, it will act like an orderpoint"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Procurement Lines"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order.compute.all:0
+msgid ""
+"This wizard allows you to run all procurement, production and/or purchase "
+"orders that should be processed based on their configuration. By default, "
+"the scheduler is launched automatically every night by OpenERP. You can use "
+"this menu to force it to be launched now. Note that it runs in the "
+"background, you may have to wait for a few minutes until it has finished "
+"computing."
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+#: field:procurement.order,note:0
+msgid "Note"
+msgstr ""
+
+#. module: procurement
+#: selection:procurement.order,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order.compute:0
+msgid "This wizard will schedule procurements."
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Status"
+msgstr ""
+
+#. module: procurement
+#: selection:procurement.order,priority:0
+msgid "Normal"
+msgstr ""
+
+#. module: procurement
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product"
+msgstr ""
+
+#. module: procurement
+#: field:stock.warehouse.orderpoint,active:0
+msgid "Active"
+msgstr ""
+
+#. module: procurement
+#: model:process.node,name:procurement.process_node_procureproducts0
+msgid "Procure Products"
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order,date_planned:0
+msgid "Scheduled date"
+msgstr ""
+
+#. module: procurement
+#: selection:procurement.order,state:0
+msgid "Exception"
+msgstr ""
+
+#. module: procurement
+#: code:addons/procurement/schedulers.py:179
+#, python-format
+msgid "Automatic OP: %s"
+msgstr ""
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_procurement_orderpoint_compute
+msgid "Automatic Order Point"
+msgstr ""
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_stock_warehouse_orderpoint
+msgid "Minimum Inventory Rule"
+msgstr ""
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Extra Information"
+msgstr ""
+
+#. module: procurement
+#: help:procurement.order,name:0
+msgid "Procurement name."
+msgstr ""
+
+#. module: procurement
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Procurement Reason"
+msgstr ""
+
+#. module: procurement
+#: sql_constraint:stock.warehouse.orderpoint:0
+msgid "Qty Multiple must be greater than zero."
+msgstr ""
+
+#. module: procurement
+#: selection:stock.warehouse.orderpoint,logic:0
+msgid "Order to Max"
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order,date_close:0
+msgid "Date Closed"
+msgstr ""
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:372
+#, python-format
+msgid "Procurement '%s' is in exception: not enough stock."
+msgstr ""
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:138
+#, python-format
+msgid "Cannot delete Procurement Order(s) which are in %s State!"
+msgstr ""
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:318
+#, python-format
+msgid "Data Insufficient !"
+msgstr ""
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_mrp_property_group
+#: field:mrp.property,group_id:0
+#: field:mrp.property.group,name:0
+msgid "Property Group"
+msgstr ""
+
+#. module: procurement
+#: view:stock.warehouse.orderpoint:0
+msgid "Misc"
+msgstr ""
+
+#. module: procurement
+#: view:stock.warehouse.orderpoint:0
+msgid "Locations"
+msgstr ""
+
+#. module: procurement
+#: selection:procurement.order,procure_method:0
+msgid "from stock"
+msgstr ""
+
+#. module: procurement
+#: view:stock.warehouse.orderpoint:0
+msgid "General Information"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Run Procurement"
+msgstr ""
+
+#. module: procurement
+#: selection:procurement.order,state:0
+msgid "Done"
+msgstr ""
+
+#. module: procurement
+#: help:stock.warehouse.orderpoint,qty_multiple:0
+msgid "The procurement quantity will by rounded up to this multiple."
+msgstr ""
+
+#. module: procurement
+#: view:make.procurement:0
+#: view:procurement.order:0
+#: selection:procurement.order,state:0
+#: view:procurement.order.compute:0
+#: view:procurement.order.compute.all:0
+#: view:procurement.orderpoint.compute:0
+msgid "Cancel"
+msgstr ""
+
+#. module: procurement
+#: field:stock.warehouse.orderpoint,logic:0
+msgid "Reordering Mode"
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order,origin:0
+msgid "Source Document"
+msgstr ""
+
+#. module: procurement
+#: selection:procurement.order,priority:0
+msgid "Not urgent"
+msgstr ""
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_procurement_order_compute_all
+msgid "Compute all schedulers"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Current"
+msgstr ""
+
+#. module: procurement
+#: view:board.board:0
+msgid "Procurements in Exception"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Details"
+msgstr ""
+
+#. module: procurement
+#: model:ir.actions.act_window,name:procurement.procurement_action5
+#: model:ir.actions.act_window,name:procurement.procurement_action_board
+#: model:ir.actions.act_window,name:procurement.procurement_exceptions
+#: model:ir.ui.menu,name:procurement.menu_stock_procurement_action
+msgid "Procurement Exceptions"
+msgstr ""
+
+#. module: procurement
+#: model:ir.actions.act_window,name:procurement.act_procurement_2_stock_warehouse_orderpoint
+#: model:ir.actions.act_window,name:procurement.act_product_product_2_stock_warehouse_orderpoint
+#: model:ir.actions.act_window,name:procurement.act_stock_warehouse_2_stock_warehouse_orderpoint
+#: model:ir.actions.act_window,name:procurement.action_orderpoint_form
+#: model:ir.ui.menu,name:procurement.menu_stock_order_points
+#: view:stock.warehouse.orderpoint:0
+msgid "Minimum Stock Rules"
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order,close_move:0
+msgid "Close Move at end"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Scheduled Date"
+msgstr ""
+
+#. module: procurement
+#: field:make.procurement,product_id:0
+#: view:procurement.order:0
+#: field:procurement.order,product_id:0
+#: field:stock.warehouse.orderpoint,product_id:0
+msgid "Product"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Temporary"
+msgstr ""
+
+#. module: procurement
+#: field:mrp.property,description:0
+#: field:mrp.property.group,description:0
+msgid "Description"
+msgstr ""
+
+#. module: procurement
+#: selection:mrp.property,composition:0
+msgid "min"
+msgstr ""
+
+#. module: procurement
+#: view:stock.warehouse.orderpoint:0
+msgid "Quantity Rules"
+msgstr ""
+
+#. module: procurement
+#: selection:procurement.order,state:0
+msgid "Running"
+msgstr ""
+
+#. module: procurement
+#: field:stock.warehouse.orderpoint,product_uom:0
+msgid "Product UOM"
+msgstr ""
+
+#. module: procurement
+#: model:process.node,name:procurement.process_node_serviceonorder0
+msgid "Make to Order"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "UOM"
+msgstr ""
+
+#. module: procurement
+#: selection:procurement.order,state:0
+msgid "Waiting"
+msgstr ""
+
+#. module: procurement
+#: model:ir.actions.act_window,help:procurement.action_orderpoint_form
+msgid ""
+"You can define your minimum stock rules, so that OpenERP will automatically "
+"create draft manufacturing orders or purchase quotations according to the "
+"stock level. Once the virtual stock of a product (= stock on hand minus all "
+"confirmed orders and reservations) is below the minimum quantity, OpenERP "
+"will generate a procurement request to increase the stock up to the maximum "
+"quantity."
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order,move_id:0
+msgid "Reservation"
+msgstr ""
+
+#. module: procurement
+#: model:process.node,note:procurement.process_node_procureproducts0
+msgid "The way to procurement depends on the product type."
+msgstr ""
+
+#. module: procurement
+#: view:make.procurement:0
+msgid ""
+"This wizard will plan the procurement for this product. This procurement may "
+"generate task, production orders or purchase orders."
+msgstr ""
+
+#. module: procurement
+#: view:res.company:0
+msgid "MRP & Logistics Scheduler"
+msgstr ""
+
+#. module: procurement
+#: field:mrp.property,name:0
+#: field:stock.warehouse.orderpoint,name:0
+msgid "Name"
+msgstr ""
+
+#. module: procurement
+#: selection:mrp.property,composition:0
+msgid "max"
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order,product_uos:0
+msgid "Product UoS"
+msgstr ""
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:347
+#, python-format
+msgid "from stock: products assigned."
+msgstr ""
+
+#. module: procurement
+#: model:ir.actions.act_window,name:procurement.action_compute_schedulers
+#: model:ir.ui.menu,name:procurement.menu_stock_proc_schedulers
+#: view:procurement.order.compute.all:0
+msgid "Compute Schedulers"
+msgstr ""
+
+#. module: procurement
+#: model:ir.actions.act_window,help:procurement.procurement_exceptions
+msgid ""
+"Procurement Orders represent the need for a certain quantity of products, at "
+"a given time, in a given location. Sales Orders are one typical source of "
+"Procurement Orders (but these are distinct documents). Depending on the "
+"procurement parameters and the product configuration, the procurement engine "
+"will attempt to satisfy the need by reserving products from stock, ordering "
+"products from a supplier, or passing a manufacturing order, etc. A "
+"Procurement Exception occurs when the system cannot find a way to fulfill a "
+"procurement. Some exceptions will resolve themselves automatically, but "
+"others require manual intervention (those are identified by a specific error "
+"message)."
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order,product_uom:0
+msgid "Product UoM"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Search Procurement"
+msgstr ""
+
+#. module: procurement
+#: help:res.company,schedule_range:0
+msgid ""
+"This is the time frame analysed by the scheduler when computing "
+"procurements. All procurements that are not between today and today+range "
+"are skipped for future computation."
+msgstr ""
+
+#. module: procurement
+#: selection:procurement.order,priority:0
+msgid "Very Urgent"
+msgstr ""
+
+#. module: procurement
+#: field:procurement.orderpoint.compute,automatic:0
+msgid "Automatic Orderpoint"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Procurement Details"
+msgstr ""
+
+#. module: procurement
+#: code:addons/procurement/schedulers.py:180
+#, python-format
+msgid "SCHEDULER"
+msgstr ""
diff --git a/addons/product/i18n/ru.po b/addons/product/i18n/ru.po
index 6375d21ad4a..9ff48063de4 100644
--- a/addons/product/i18n/ru.po
+++ b/addons/product/i18n/ru.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-03-09 17:11+0000\n"
-"Last-Translator: Viktor Prokopiev <Unknown>\n"
+"PO-Revision-Date: 2011-04-05 08:00+0000\n"
+"Last-Translator: Chertykov Denis <chertykov@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: 2011-03-10 06:23+0000\n"
-"X-Generator: Launchpad (build 12351)\n"
+"X-Launchpad-Export-Date: 2011-04-06 06:02+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
@@ -1554,7 +1554,7 @@ msgstr "Поле продукции"
 #: model:ir.actions.act_window,name:product.product_pricelist_type_action
 #: model:ir.ui.menu,name:product.menu_product_pricelist_type_action2
 msgid "Pricelists Types"
-msgstr "Тпипы каталогов"
+msgstr "Типы каталогов"
 
 #. module: product
 #: help:product.uom,factor:0
diff --git a/addons/project/i18n/nb.po b/addons/project/i18n/nb.po
new file mode 100644
index 00000000000..ec89bc9ce96
--- /dev/null
+++ b/addons/project/i18n/nb.po
@@ -0,0 +1,1903 @@
+# Norwegian Bokmal translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-04-05 06:53+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Bokmal <nb@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: 2011-04-06 06:02+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.act_res_users_2_project_task_opened
+msgid "Assigned tasks"
+msgstr "Tildelte oppgaver"
+
+#. module: project
+#: help:project.task.delegate,new_task_description:0
+msgid "Reinclude the description of the task in the task of the user"
+msgstr ""
+
+#. module: project
+#: code:addons/project/project.py:658
+#, python-format
+msgid "The task '%s' has been delegated to %s."
+msgstr ""
+
+#. module: project
+#: help:res.company,project_time_mode_id:0
+msgid ""
+"This will set the unit of measure used in projects and tasks.\n"
+"If you use the timesheet linked to projects (project_timesheet module), "
+"don't forget to setup the right unit of measure in your employees."
+msgstr ""
+
+#. module: project
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+
+#. module: project
+#: help:project.task.reevaluate,remaining_hours:0
+msgid "Put here the remaining hours required to close the task."
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+msgid "Deadlines"
+msgstr "Tidsfrister"
+
+#. module: project
+#: code:addons/project/project.py:121
+#, python-format
+msgid "Operation Not Permitted !"
+msgstr "Operasjon er ikke tillatt !"
+
+#. module: project
+#: code:addons/project/wizard/project_task_delegate.py:55
+#: code:addons/project/wizard/project_task_delegate.py:56
+#: code:addons/project/wizard/project_task_delegate.py:63
+#: code:addons/project/wizard/project_task_delegate.py:64
+#: code:addons/project/wizard/project_task_delegate.py:67
+#, python-format
+msgid "CHECK: "
+msgstr "SJEKK: "
+
+#. module: project
+#: field:project.installer,project_issue:0
+msgid "Issues Tracker"
+msgstr ""
+
+#. module: project
+#: field:project.installer,hr_timesheet_sheet:0
+msgid "Timesheets"
+msgstr "Timelister"
+
+#. module: project
+#: view:project.task:0
+msgid "Delegations"
+msgstr "Delegasjoner"
+
+#. module: project
+#: field:project.task.delegate,planned_hours_me:0
+msgid "Hours to Validate"
+msgstr ""
+
+#. module: project
+#: field:project.project,progress_rate:0
+#: view:report.project.task.user:0
+#: field:report.project.task.user,progress:0
+msgid "Progress"
+msgstr "Framdrift"
+
+#. module: project
+#: help:project.task,remaining_hours:0
+msgid ""
+"Total remaining time, can be re-estimated periodically by the assignee of "
+"the task."
+msgstr ""
+"Total gjenværende tid, kan gjenberegnes periodisk av oppgaveansvarlig."
+
+#. module: project
+#: help:project.project,priority:0
+msgid "Gives the sequence order when displaying the list of projects"
+msgstr ""
+
+#. module: project
+#: constraint:project.project:0
+msgid "Error! project start-date must be lower then project end-date."
+msgstr ""
+
+#. module: project
+#: view:project.task.reevaluate:0
+msgid "Reevaluation Task"
+msgstr ""
+
+#. module: project
+#: field:project.project,members:0
+msgid "Project Members"
+msgstr "Prosjektdeltakere"
+
+#. module: project
+#: model:process.node,name:project.process_node_taskbydelegate0
+msgid "Task by delegate"
+msgstr "Oppgave per ansvarlig"
+
+#. module: project
+#: selection:report.project.task.user,month:0
+msgid "March"
+msgstr "Mars"
+
+#. module: project
+#: view:project.task:0
+msgid "Delegated tasks"
+msgstr "Delegerte oppgaver"
+
+#. module: project
+#: field:project.task,child_ids:0
+msgid "Delegated Tasks"
+msgstr "Oppgaver fordelt"
+
+#. module: project
+#: help:project.project,warn_header:0
+msgid ""
+"Header added at the beginning of the email for the warning message sent to "
+"the customer when a task is closed."
+msgstr ""
+"Topptekst som blir lagt til i begynnelsen av e-posten som blir sendt til "
+"kunde for å varsle om at en oppgave er lukket."
+
+#. module: project
+#: view:project.task:0
+msgid "My Tasks"
+msgstr "Mine oppgaver"
+
+#. module: project
+#: constraint:project.task:0
+msgid "Error ! You cannot create recursive tasks."
+msgstr ""
+
+#. module: project
+#: field:project.task,company_id:0
+#: field:project.task.work,company_id:0
+#: view:report.project.task.user:0
+#: field:report.project.task.user,company_id:0
+msgid "Company"
+msgstr "Firma"
+
+#. module: project
+#: field:project.installer,project_scrum:0
+msgid "SCRUM"
+msgstr "SCRUM"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_vs_planned_total_hours_graph
+msgid "Projects: Planned Vs Total hours"
+msgstr ""
+
+#. module: project
+#: view:project.task.close:0
+msgid "Warn Message"
+msgstr ""
+
+#. module: project
+#: field:project.task.type,name:0
+msgid "Stage Name"
+msgstr ""
+
+#. module: project
+#: model:process.transition.action,name:project.process_transition_action_openpendingtask0
+msgid "Set pending"
+msgstr ""
+
+#. module: project
+#: view:report.project.task.user:0
+#: field:report.project.task.user,opening_days:0
+msgid "Days to Open"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+msgid "Change Stage"
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+msgid "New Project Based on Template"
+msgstr "Nytt prosjekt basert på mal"
+
+#. module: project
+#: constraint:project.project:0
+msgid "Error! You cannot assign escalation to the same project!"
+msgstr ""
+
+#. module: project
+#: selection:project.task,priority:0
+#: selection:report.project.task.user,priority:0
+msgid "Very urgent"
+msgstr "Haster veldig"
+
+#. module: project
+#: help:project.task.delegate,user_id:0
+msgid "User you want to delegate this task to"
+msgstr "Bruker som du ønsker å delegere denne oppgaven til"
+
+#. module: project
+#: view:report.project.task.user:0
+#: field:report.project.task.user,day:0
+#: field:task.by.days,day:0
+msgid "Day"
+msgstr "Dag"
+
+#. module: project
+#: code:addons/project/project.py:571
+#, python-format
+msgid "The task '%s' is done"
+msgstr "Oppgaven '%s' er ferdig"
+
+#. module: project
+#: model:ir.model,name:project.model_project_task_close
+msgid "Project Close Task"
+msgstr ""
+
+#. module: project
+#: model:process.node,name:project.process_node_drafttask0
+msgid "Draft task"
+msgstr ""
+
+#. module: project
+#: model:ir.model,name:project.model_project_task
+#: field:project.task.work,task_id:0
+#: view:report.project.task.user:0
+msgid "Task"
+msgstr "Oppgave"
+
+#. module: project
+#: view:project.project:0
+msgid "Members"
+msgstr "Prosjektdeltakere"
+
+#. module: project
+#: help:project.task,planned_hours:0
+msgid ""
+"Estimated time to do the task, usually set by the project manager when the "
+"task is in draft state."
+msgstr ""
+"Estimert tid for å fullføre oppgaven, settes vanligvis av prosjektleder mens "
+"oppgaven fortsatt har status utkast."
+
+#. module: project
+#: model:ir.model,name:project.model_project_task_work
+msgid "Project Task Work"
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+#: view:project.task:0
+#: field:project.task,notes:0
+msgid "Notes"
+msgstr "Notater"
+
+#. module: project
+#: view:project.vs.hours:0
+msgid "Project vs remaining hours"
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+msgid "Invoice Address"
+msgstr ""
+
+#. module: project
+#: field:report.project.task.user,name:0
+msgid "Task Summary"
+msgstr "Oppgavesammendrag"
+
+#. module: project
+#: field:project.task,active:0
+msgid "Not a Template Task"
+msgstr "Ikke en oppgavemal"
+
+#. module: project
+#: view:project.task:0
+msgid "Start Task"
+msgstr "Start oppgave"
+
+#. module: project
+#: help:project.installer,project_timesheet:0
+msgid ""
+"Helps generate invoices based on time spent on tasks, if activated on the "
+"project."
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+msgid ""
+"Automatic variables for headers and footer. Use exactly the same notation."
+msgstr ""
+"Automatisk variabler for topp- og bunntekst. Bruk nøyaktig den samme "
+"notasjonen."
+
+#. module: project
+#: selection:project.task,state:0
+#: selection:project.vs.hours,state:0
+#: selection:report.project.task.user,state:0
+#: selection:task.by.days,state:0
+msgid "Cancelled"
+msgstr "Kansellert"
+
+#. module: project
+#: view:board.board:0
+#: model:ir.actions.act_window,name:project.action_view_task_tree
+msgid "My Open Tasks"
+msgstr "Mine åpne oppgaver"
+
+#. module: project
+#: view:project.project:0
+#: field:project.project,warn_header:0
+msgid "Mail Header"
+msgstr "E-post topptekst"
+
+#. module: project
+#: view:project.installer:0
+msgid "Configure Your Project Management Application"
+msgstr ""
+
+#. module: project
+#: model:process.node,name:project.process_node_donetask0
+msgid "Done task"
+msgstr "Fullførte oppgaver"
+
+#. module: project
+#: help:project.task.delegate,prefix:0
+msgid "Title for your validation task"
+msgstr ""
+
+#. module: project
+#: view:report.project.task.user:0
+#: field:report.project.task.user,hours_delay:0
+msgid "Avg. Plan.-Eff."
+msgstr ""
+
+#. module: project
+#: model:process.node,note:project.process_node_donetask0
+msgid "Task is Completed"
+msgstr "Oppgave er fullført"
+
+#. module: project
+#: field:project.task,date_end:0
+#: field:report.project.task.user,date_end:0
+msgid "Ending Date"
+msgstr ""
+
+#. module: project
+#: view:report.project.task.user:0
+msgid "   Month   "
+msgstr "   Måned   "
+
+#. module: project
+#: model:process.transition,note:project.process_transition_delegate0
+msgid "Delegates tasks to the other user"
+msgstr "Delegerer oppgaver til den andre brukeren"
+
+#. module: project
+#: view:project.project:0
+#: view:project.task:0
+#: view:report.project.task.user:0
+msgid "Group By..."
+msgstr ""
+
+#. module: project
+#: help:project.task,effective_hours:0
+msgid "Computed using the sum of the task work done."
+msgstr "Beregnet ved sum av oppgaver fullført."
+
+#. module: project
+#: help:project.project,warn_customer:0
+msgid ""
+"If you check this, the user will have a popup when closing a task that "
+"propose a message to send by email to the customer."
+msgstr ""
+"Hvis du krysser av denne så vil brukeren få en melding som foreslår å sende "
+"en e-post til kunden når en oppgave blir lukket."
+
+#. module: project
+#: model:ir.model,name:project.model_res_users
+msgid "res.users"
+msgstr "res.users"
+
+#. module: project
+#: model:project.task.type,name:project.project_tt_testing
+msgid "Testing"
+msgstr ""
+
+#. module: project
+#: help:project.task.delegate,planned_hours:0
+msgid "Estimated time to close this task by the delegated user"
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+msgid "Reactivate Project"
+msgstr ""
+
+#. module: project
+#: code:addons/project/project.py:553
+#, python-format
+msgid "Task '%s' closed"
+msgstr "Task '%s' lukket"
+
+#. module: project
+#: model:ir.model,name:project.model_account_analytic_account
+#: field:project.project,analytic_account_id:0
+msgid "Analytic Account"
+msgstr "Kontodimensjon"
+
+#. module: project
+#: field:project.task.work,user_id:0
+msgid "Done by"
+msgstr "Utført av"
+
+#. module: project
+#: view:project.task:0
+msgid "Planning"
+msgstr "Planlegging"
+
+#. module: project
+#: view:project.task:0
+#: field:project.task,date_deadline:0
+#: field:report.project.task.user,date_deadline:0
+msgid "Deadline"
+msgstr "Frist"
+
+#. module: project
+#: view:project.task.close:0
+#: view:project.task.delegate:0
+#: view:project.task.reevaluate:0
+msgid "_Cancel"
+msgstr "_Avbryt"
+
+#. module: project
+#: model:ir.model,name:project.model_res_partner
+#: view:project.project:0
+#: field:project.task,partner_id:0
+#: view:report.project.task.user:0
+#: field:report.project.task.user,partner_id:0
+msgid "Partner"
+msgstr "Klient"
+
+#. module: project
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr ""
+
+#. module: project
+#: code:addons/project/project.py:225
+#: code:addons/project/project.py:246
+#, python-format
+msgid " (copy)"
+msgstr " (kopi)"
+
+#. module: project
+#: help:project.installer,hr_timesheet_sheet:0
+msgid ""
+"Tracks and helps employees encode and validate timesheets and attendances."
+msgstr ""
+
+#. module: project
+#: view:report.project.task.user:0
+#: field:report.project.task.user,nbr:0
+msgid "# of tasks"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+msgid "Previous"
+msgstr "Forrige"
+
+#. module: project
+#: view:project.task.reevaluate:0
+msgid "Reevaluate Task"
+msgstr ""
+
+#. module: project
+#: field:report.project.task.user,user_id:0
+msgid "Assigned To"
+msgstr "Tildelt til"
+
+#. module: project
+#: view:project.project:0
+msgid "Date Stop: %(date)s"
+msgstr ""
+
+#. module: project
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+msgid "Reset as Project"
+msgstr ""
+
+#. module: project
+#: selection:project.vs.hours,state:0
+msgid "Template"
+msgstr "Mal"
+
+#. module: project
+#: model:project.task.type,name:project.project_tt_specification
+msgid "Specification"
+msgstr "Spesifikasjon"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.act_my_project
+msgid "My projects"
+msgstr "Mine prosjekter"
+
+#. module: project
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+msgid "Next"
+msgstr "Neste"
+
+#. module: project
+#: model:process.transition,note:project.process_transition_draftopentask0
+msgid "From draft state, it will come into the open state."
+msgstr "From draft state, it will come into the open state."
+
+#. module: project
+#: view:report.project.task.user:0
+#: field:report.project.task.user,no_of_days:0
+msgid "# of Days"
+msgstr ""
+
+#. module: project
+#: help:project.task,active:0
+msgid ""
+"This field is computed automatically and have the same behavior than the "
+"boolean 'active' field: if the task is linked to a template or unactivated "
+"project, it will be hidden unless specifically asked."
+msgstr ""
+
+#. module: project
+#: help:project.project,progress_rate:0
+msgid "Percent of tasks closed according to the total of tasks todo."
+msgstr "Prosentvis andel av oppgaver avsluttet."
+
+#. module: project
+#: view:project.task.delegate:0
+#: field:project.task.delegate,new_task_description:0
+msgid "New Task Description"
+msgstr "Ny oppgavebeskrivelse"
+
+#. module: project
+#: model:res.request.link,name:project.req_link_task
+msgid "Project task"
+msgstr "Prosjektoppgave"
+
+#. module: project
+#: view:project.installer:0
+msgid "Methodologies"
+msgstr ""
+
+#. module: project
+#: help:project.task,total_hours:0
+msgid "Computed as: Time Spent + Remaining Time."
+msgstr "Beregnet som: Tid brukt + gjenstående tid."
+
+#. module: project
+#: help:project.task.close,partner_email:0
+msgid "Email Address of Customer"
+msgstr ""
+
+#. module: project
+#: view:report.project.task.user:0
+#: field:report.project.task.user,hours_effective:0
+msgid "Effective Hours"
+msgstr ""
+
+#. module: project
+#: view:project.task.delegate:0
+msgid "Validation Task Title"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+msgid "Reevaluate"
+msgstr ""
+
+#. module: project
+#: code:addons/project/project.py:531
+#, python-format
+msgid "Send Email after close task"
+msgstr "Send e-post etter at oppgave er lukket"
+
+#. module: project
+#: view:report.project.task.user:0
+msgid "OverPass delay"
+msgstr ""
+
+#. module: project
+#: selection:project.task,priority:0
+#: selection:report.project.task.user,priority:0
+msgid "Medium"
+msgstr "Medium"
+
+#. module: project
+#: view:project.task:0
+#: field:project.task,remaining_hours:0
+#: field:project.task.reevaluate,remaining_hours:0
+#: field:project.vs.hours,remaining_hours:0
+#: view:report.project.task.user:0
+#: field:report.project.task.user,remaining_hours:0
+msgid "Remaining Hours"
+msgstr "Gjenstående timer"
+
+#. module: project
+#: view:project.task:0
+#: view:project.task.work:0
+msgid "Task Work"
+msgstr "Task Work"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_view_board_note_tree
+msgid "Public Notes"
+msgstr ""
+
+#. module: project
+#: field:project.project,planned_hours:0
+msgid "Planned Time"
+msgstr "Planlagt tid"
+
+#. module: project
+#: code:addons/project/wizard/project_task_close.py:86
+#, python-format
+msgid "Task '%s' Closed"
+msgstr "Oppgave '%s' lukket"
+
+#. module: project
+#: view:report.project.task.user:0
+msgid "Non Assigned Tasks to users"
+msgstr "Ikke tildelte oppgaver"
+
+#. module: project
+#: help:project.project,planned_hours:0
+msgid ""
+"Sum of planned hours of all tasks related to this project and its child "
+"projects."
+msgstr ""
+"Sum av timer planlagt for alle oppgaver koblet til angitt prosjekt og dets "
+"underprosjekter"
+
+#. module: project
+#: field:project.task.delegate,name:0
+msgid "Delegated Title"
+msgstr ""
+
+#. module: project
+#: view:report.project.task.user:0
+msgid "My Projects"
+msgstr "Mine prosjekter"
+
+#. module: project
+#: view:project.task:0
+msgid "Extra Info"
+msgstr "Ekstra inforrmasjon"
+
+#. module: project
+#: selection:report.project.task.user,month:0
+msgid "July"
+msgstr "Juli"
+
+#. module: project
+#: model:ir.ui.menu,name:project.menu_definitions
+#: view:res.company:0
+msgid "Configuration"
+msgstr "Konfigurasjon"
+
+#. module: project
+#: field:project.task,date_start:0
+#: field:report.project.task.user,date_start:0
+msgid "Starting Date"
+msgstr "Startdato"
+
+#. module: project
+#: code:addons/project/project.py:267
+#: model:ir.actions.act_window,name:project.open_view_project_all
+#: model:ir.ui.menu,name:project.menu_open_view_project_all
+#: view:project.project:0
+#, python-format
+msgid "Projects"
+msgstr "Prosjekter"
+
+#. module: project
+#: view:project.task:0
+#: field:project.task,type_id:0
+#: view:report.project.task.user:0
+#: field:report.project.task.user,type_id:0
+msgid "Stage"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,help:project.open_task_type_form
+msgid ""
+"Define the steps that will be used in the project from the creation of the "
+"task, up to the closing of the task or issue. You will use these stages in "
+"order to track the progress in solving a task or an issue."
+msgstr ""
+
+#. module: project
+#: code:addons/project/project.py:622
+#, python-format
+msgid "The task '%s' is opened."
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+msgid "Dates"
+msgstr "Datoer"
+
+#. module: project
+#: help:project.task.delegate,name:0
+msgid "New title of the task delegated to the user"
+msgstr ""
+
+#. module: project
+#: view:report.project.task.user:0
+msgid "    Month-1    "
+msgstr ""
+
+#. module: project
+#: view:project.installer:0
+msgid ""
+"Various OpenERP applications are available to manage your projects with "
+"different level of control and flexibility."
+msgstr ""
+
+#. module: project
+#: view:project.vs.hours:0
+msgid "Project vs Planned and Total Hours"
+msgstr ""
+
+#. module: project
+#: model:process.transition,name:project.process_transition_draftopentask0
+msgid "Draft Open task"
+msgstr "Lag utkast til oppgave"
+
+#. module: project
+#: view:project.project:0
+msgid "User: %(user_id)s"
+msgstr "Bruker: %(user_id)s"
+
+#. module: project
+#: field:project.task,delay_hours:0
+msgid "Delay Hours"
+msgstr "Timer forsinket"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task_user_tree
+#: model:ir.ui.menu,name:project.menu_project_task_user_tree
+#: view:report.project.task.user:0
+msgid "Tasks Analysis"
+msgstr "Oppgaveanalyse"
+
+#. module: project
+#: model:ir.model,name:project.model_report_project_task_user
+msgid "Tasks by user and project"
+msgstr ""
+
+#. module: project
+#: model:process.transition,name:project.process_transition_delegate0
+#: view:project.task:0
+msgid "Delegate"
+msgstr "Delegert"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.open_view_template_project
+msgid "Templates of Projects"
+msgstr "Prosjektmaler"
+
+#. module: project
+#: model:ir.model,name:project.model_project_project
+#: model:ir.ui.menu,name:project.menu_project_management
+#: view:project.project:0
+#: view:project.task:0
+#: field:project.task,project_id:0
+#: field:project.vs.hours,project:0
+#: view:report.project.task.user:0
+#: field:report.project.task.user,project_id:0
+#: model:res.request.link,name:project.req_link_project
+#: field:res.users,context_project_id:0
+#: field:task.by.days,project_id:0
+msgid "Project"
+msgstr "Prosjekt"
+
+#. module: project
+#: view:project.task.reevaluate:0
+msgid "_Evaluate"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+msgid "My Board"
+msgstr ""
+
+#. module: project
+#: code:addons/project/wizard/project_task_close.py:79
+#, python-format
+msgid "Please specify the email address of Project Manager."
+msgstr ""
+
+#. module: project
+#: model:ir.module.module,shortdesc:project.module_meta_information
+#: view:res.company:0
+msgid "Project Management"
+msgstr "Prosjektledelse"
+
+#. module: project
+#: selection:report.project.task.user,month:0
+msgid "August"
+msgstr "August"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task_delegate
+#: view:project.task.delegate:0
+msgid "Project Task Delegate"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.act_project_project_2_project_task_all
+#: model:ir.actions.act_window,name:project.action_view_task
+#: model:ir.ui.menu,name:project.menu_action_view_task
+#: model:ir.ui.menu,name:project.menu_tasks_config
+#: model:process.process,name:project.process_process_tasksprocess0
+#: view:project.task:0
+#: view:res.partner:0
+#: field:res.partner,task_ids:0
+msgid "Tasks"
+msgstr "Oppgaver"
+
+#. module: project
+#: view:project.project:0
+msgid "Parent"
+msgstr "Overordnet"
+
+#. module: project
+#: model:ir.model,name:project.model_project_task_delegate
+msgid "Task Delegate"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,help:project.action_view_task
+msgid ""
+"A task represents a work that has to be done. Each user works in his own "
+"list of tasks where he can record his task work in hours. He can work and "
+"close the task itself or delegate it to another user. If you delegate a task "
+"to another user, you get a new task in pending state, which will be reopened "
+"when you have to review the work achieved. If you install the "
+"project_timesheet module, task work can be invoiced based on the project "
+"configuration. With the project_mrp module, sales orders can create tasks "
+"automatically when they are confirmed."
+msgstr ""
+
+#. module: project
+#: selection:report.project.task.user,month:0
+msgid "September"
+msgstr "September"
+
+#. module: project
+#: selection:report.project.task.user,month:0
+msgid "December"
+msgstr "Desember"
+
+#. module: project
+#: field:project.installer,config_logo:0
+msgid "Image"
+msgstr ""
+
+#. module: project
+#: field:project.task,progress:0
+msgid "Progress (%)"
+msgstr "Fremskritt (%)"
+
+#. module: project
+#: help:project.task,state:0
+msgid ""
+"If the task is created the state is 'Draft'.\n"
+" If the task is started, the state becomes 'In Progress'.\n"
+" If review is needed the task is in 'Pending' state.                         "
+"         \n"
+" If the task is over, the states is set to 'Done'."
+msgstr ""
+
+#. module: project
+#: help:project.task,progress:0
+msgid "Computed as: Time Spent / Total Time."
+msgstr "Beregnet som: Tid brukt / total tid."
+
+#. module: project
+#: view:report.project.task.user:0
+#: field:report.project.task.user,month:0
+msgid "Month"
+msgstr "Måned"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.dblc_proj
+msgid "Project's tasks"
+msgstr "Prosjektoppgaver"
+
+#. module: project
+#: model:ir.model,name:project.model_project_task_type
+#: view:project.task.type:0
+msgid "Task Stage"
+msgstr ""
+
+#. module: project
+#: field:project.task,planned_hours:0
+#: field:project.task.delegate,planned_hours:0
+#: field:project.vs.hours,planned_hours:0
+#: view:report.project.task.user:0
+#: field:report.project.task.user,hours_planned:0
+msgid "Planned Hours"
+msgstr "Planlagte timer"
+
+#. module: project
+#: view:project.project:0
+msgid "Set as Template"
+msgstr "Sett som mal"
+
+#. module: project
+#: view:project.project:0
+msgid "Status: %(state)s"
+msgstr ""
+
+#. module: project
+#: field:project.installer,project_long_term:0
+msgid "Long Term Planning"
+msgstr "Langtidsplanlegging"
+
+#. module: project
+#: view:project.project:0
+#: view:project.task:0
+msgid "Start Date"
+msgstr "Startdato"
+
+#. module: project
+#: view:project.task:0
+#: field:project.task,parent_ids:0
+msgid "Parent Tasks"
+msgstr "Overordnede oppgaver"
+
+#. module: project
+#: field:project.project,warn_customer:0
+msgid "Warn Partner"
+msgstr "Varsle klient"
+
+#. module: project
+#: view:report.project.task.user:0
+msgid "  Year  "
+msgstr "  År  "
+
+#. module: project
+#: view:project.project:0
+msgid "Billing"
+msgstr "Faktuerering"
+
+#. module: project
+#: view:project.task:0
+msgid "Information"
+msgstr "Informasjon"
+
+#. module: project
+#: help:project.installer,account_budget:0
+msgid "Helps accountants manage analytic and crossover budgets."
+msgstr ""
+
+#. module: project
+#: field:project.task,priority:0
+#: field:report.project.task.user,priority:0
+msgid "Priority"
+msgstr "Prioritet"
+
+#. module: project
+#: view:project.project:0
+msgid "Administration"
+msgstr "Administrasjon"
+
+#. module: project
+#: model:ir.model,name:project.model_project_task_reevaluate
+msgid "project.task.reevaluate"
+msgstr "project.task.reevaluate"
+
+#. module: project
+#: view:report.project.task.user:0
+msgid "My Task"
+msgstr "Mine oppgaver"
+
+#. module: project
+#: view:project.project:0
+msgid "Member"
+msgstr "Medlem"
+
+#. module: project
+#: view:project.task:0
+msgid "Project Tasks"
+msgstr "Prosjektoppgaver"
+
+#. module: project
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr ""
+
+#. module: project
+#: model:process.transition.action,name:project.process_transition_action_opendrafttask0
+#: view:project.task:0
+#: selection:project.task,state:0
+#: selection:project.vs.hours,state:0
+#: view:report.project.task.user:0
+#: selection:report.project.task.user,state:0
+#: selection:task.by.days,state:0
+msgid "Draft"
+msgstr "Utkast"
+
+#. module: project
+#: selection:project.task,priority:0
+#: selection:report.project.task.user,priority:0
+msgid "Low"
+msgstr "Lav"
+
+#. module: project
+#: view:project.project:0
+msgid "Performance"
+msgstr "Framdrift"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_view_task_tree_deadline
+msgid "My Task's Deadlines"
+msgstr "Mine oppgavers tidsfrister"
+
+#. module: project
+#: view:project.project:0
+#: field:project.task,manager_id:0
+msgid "Project Manager"
+msgstr "Prosjektleder"
+
+#. module: project
+#: view:project.project:0
+#: view:project.task:0
+#: selection:project.task,state:0
+#: selection:project.task.delegate,state:0
+#: selection:project.vs.hours,state:0
+#: view:report.project.task.user:0
+#: selection:report.project.task.user,state:0
+#: selection:task.by.days,state:0
+msgid "Pending"
+msgstr "I påvente"
+
+#. module: project
+#: view:project.task:0
+msgid "Task Edition"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.open_task_type_form
+#: model:ir.ui.menu,name:project.menu_task_types_view
+msgid "Stages"
+msgstr ""
+
+#. module: project
+#: view:project.installer:0
+msgid "Configure"
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+#: field:project.project,complete_name:0
+msgid "Project Name"
+msgstr "Prosjektnavn"
+
+#. module: project
+#: help:project.task.delegate,state:0
+msgid ""
+"New state of your own task. Pending will be reopened automatically when the "
+"delegated task is closed"
+msgstr ""
+
+#. module: project
+#: selection:report.project.task.user,month:0
+msgid "June"
+msgstr "Juni"
+
+#. module: project
+#: help:project.installer,project_scrum:0
+msgid ""
+"Implements and tracks the concepts and task types defined in the SCRUM "
+"methodology."
+msgstr ""
+
+#. module: project
+#: view:report.project.task.user:0
+#: field:report.project.task.user,closing_days:0
+msgid "Days to Close"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.open_board_project
+#: model:ir.ui.menu,name:project.menu_board_project
+msgid "Project Dashboard"
+msgstr "Prosjektkonsoll"
+
+#. module: project
+#: view:project.project:0
+#: field:project.project,parent_id:0
+msgid "Parent Project"
+msgstr "Overordnet prosjekt"
+
+#. module: project
+#: field:project.project,active:0
+msgid "Active"
+msgstr "Aktiv"
+
+#. module: project
+#: model:process.node,note:project.process_node_drafttask0
+msgid "Define the Requirements and Set Planned Hours."
+msgstr "Definer krav og oppgi planlagte timer"
+
+#. module: project
+#: selection:report.project.task.user,month:0
+msgid "November"
+msgstr "November"
+
+#. module: project
+#: view:report.project.task.user:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: project
+#: field:project.task.close,partner_email:0
+msgid "Customer Email"
+msgstr "Kundens e-post"
+
+#. module: project
+#: code:addons/project/project.py:190
+#, python-format
+msgid "The project '%s' has been closed."
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+msgid "Task edition"
+msgstr ""
+
+#. module: project
+#: selection:report.project.task.user,month:0
+msgid "October"
+msgstr "Oktober"
+
+#. module: project
+#: help:project.task.close,manager_warn:0
+msgid "Warn Manager by Email"
+msgstr "Varsle prosjektleder pr e-post"
+
+#. module: project
+#: model:process.node,name:project.process_node_opentask0
+msgid "Open task"
+msgstr "Åpne oppgaver"
+
+#. module: project
+#: field:project.task.close,manager_email:0
+msgid "Manager Email"
+msgstr "Prosjekleders e-post"
+
+#. module: project
+#: help:project.project,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the project "
+"without removing it."
+msgstr ""
+
+#. module: project
+#: model:ir.model,name:project.model_res_company
+msgid "Companies"
+msgstr "Firmaer"
+
+#. module: project
+#: model:process.transition,note:project.process_transition_opendonetask0
+msgid "When task is completed, it will come into the done state."
+msgstr "Når oppgaven er fullført vil den få status ferdig"
+
+#. module: project
+#: code:addons/project/project.py:212
+#, python-format
+msgid "The project '%s' has been opened."
+msgstr ""
+
+#. module: project
+#: field:project.task.work,date:0
+msgid "Date"
+msgstr "Dato"
+
+#. module: project
+#: model:ir.ui.menu,name:project.next_id_86
+msgid "Dashboard"
+msgstr ""
+
+#. module: project
+#: constraint:account.analytic.account:0
+msgid ""
+"Error! The currency has to be the same as the currency of the selected "
+"company"
+msgstr ""
+
+#. module: project
+#: code:addons/project/wizard/project_task_close.py:79
+#: code:addons/project/wizard/project_task_close.py:82
+#: code:addons/project/wizard/project_task_close.py:91
+#: code:addons/project/wizard/project_task_close.py:111
+#, python-format
+msgid "Error"
+msgstr "Feil"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.act_res_users_2_project_project
+msgid "User's projects"
+msgstr "Brukers prosjekter"
+
+#. module: project
+#: field:project.installer,progress:0
+msgid "Configuration Progress"
+msgstr ""
+
+#. module: project
+#: view:project.task.delegate:0
+msgid "_Delegate"
+msgstr ""
+
+#. module: project
+#: code:addons/project/wizard/project_task_close.py:91
+#, python-format
+msgid "Couldn't send mail because your email address is not configured!"
+msgstr "Kunne ikke sende epost fordi din epostadresse mangler!"
+
+#. module: project
+#: help:report.project.task.user,opening_days:0
+msgid "Number of Days to Open the task"
+msgstr ""
+
+#. module: project
+#: field:project.task,delegated_user_id:0
+msgid "Delegated To"
+msgstr "Delegert til"
+
+#. module: project
+#: view:res.partner:0
+msgid "History"
+msgstr "Historie"
+
+#. module: project
+#: view:report.project.task.user:0
+msgid "Assigned to"
+msgstr "Tildelt til"
+
+#. module: project
+#: view:project.task.delegate:0
+msgid "Delegated Task"
+msgstr "Delegerte oppgaver"
+
+#. module: project
+#: field:project.installer,project_gtd:0
+msgid "Getting Things Done"
+msgstr ""
+
+#. module: project
+#: help:project.project,members:0
+msgid ""
+"Project's member. Not used in any computation, just for information purpose, "
+"but a user has to be member of a project to add a the to this project."
+msgstr ""
+"Prosjektmedlemmer. Ikke brukt i noen beregninger, kun til informasjon."
+
+#. module: project
+#: help:project.task.close,partner_warn:0
+msgid "Warn Customer by Email"
+msgstr ""
+
+#. module: project
+#: model:ir.module.module,description:project.module_meta_information
+msgid ""
+"Project management module tracks multi-level projects, tasks,\n"
+"work done on tasks, eso. It is able to render planning, order tasks, eso.\n"
+" Dashboard for project members that includes:\n"
+"    * List of my open tasks\n"
+"    * Members list of project\n"
+"    "
+msgstr ""
+"Prosjektledelse modul som håndterer prosjekter med flere nivå, oppgaver, \n"
+"arbeid utført, osv. Modulen gir deg også mulighet til å planlegge grafisk, "
+"delegere oppgaver osv. \n"
+"Prosjektkonsoll for prosjektmedlemmer inkluderer:\n"
+"   *Liste over åpne oppgaver\n"
+"   *Liste over prosjektmedlemmer\n"
+"    "
+
+#. module: project
+#: model:ir.actions.act_window,name:project.act_res_users_2_project_task_work_month
+msgid "Month works"
+msgstr ""
+
+#. module: project
+#: field:project.project,priority:0
+#: field:project.project,sequence:0
+#: field:project.task,sequence:0
+#: field:project.task.type,sequence:0
+msgid "Sequence"
+msgstr "Sekvens"
+
+#. module: project
+#: view:project.task:0
+#: field:project.task,state:0
+#: field:project.vs.hours,state:0
+#: view:report.project.task.user:0
+#: field:report.project.task.user,state:0
+#: field:task.by.days,state:0
+msgid "State"
+msgstr "Bekreft"
+
+#. module: project
+#: model:ir.actions.act_window,help:project.action_project_task_user_tree
+msgid ""
+"This report allows you to analyse the performance of your projects and "
+"users. You can analyse the quantities of tasks, the hours spent compared to "
+"the planned hours, the average number of days to open or close a task, etc."
+msgstr ""
+
+#. module: project
+#: code:addons/project/project.py:582
+#, python-format
+msgid "Task '%s' set in progress"
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+msgid "Date Start: %(date_start)s"
+msgstr "Startdato: %(date_start)s"
+
+#. module: project
+#: help:project.project,analytic_account_id:0
+msgid ""
+"Link this project to an analytic account if you need financial management on "
+"projects. It enables you to connect projects with budgets, planning, cost "
+"and revenue analysis, timesheets on projects, etc."
+msgstr ""
+"Koble dette prosjekt til en kontodimensjon hvis du ønsker økonomistyring for "
+"prosjekter. Dette muliggjør kobling mellom prosjekt og budsjett, "
+"planlegging, kostnader og omsetning, prosjekttimelister, etc."
+
+#. module: project
+#: view:project.project:0
+#: view:project.task:0
+#: selection:project.task,state:0
+#: selection:project.task.delegate,state:0
+#: view:report.project.task.user:0
+#: selection:report.project.task.user,state:0
+#: selection:task.by.days,state:0
+msgid "Done"
+msgstr "Fullført"
+
+#. module: project
+#: model:process.transition.action,name:project.process_transition_action_draftcanceltask0
+#: model:process.transition.action,name:project.process_transition_action_opencanceltask0
+#: view:project.project:0
+#: view:project.task:0
+msgid "Cancel"
+msgstr "Avbryt"
+
+#. module: project
+#: selection:project.vs.hours,state:0
+msgid "Close"
+msgstr "Lukk"
+
+#. module: project
+#: model:process.transition.action,name:project.process_transition_action_draftopentask0
+#: selection:project.vs.hours,state:0
+msgid "Open"
+msgstr "Åpne"
+
+#. module: project
+#: code:addons/project/project.py:121
+#, python-format
+msgid ""
+"You can not delete a project with tasks. I suggest you to deactivate it."
+msgstr ""
+"Du kan ikke slette et prosjekt med oppgaver. Du må i såfall deaktivere det "
+"først."
+
+#. module: project
+#: view:project.project:0
+msgid "ID: %(task_id)s"
+msgstr "ID: %(task_id)s"
+
+#. module: project
+#: view:project.task:0
+#: selection:project.task,state:0
+#: selection:report.project.task.user,state:0
+#: selection:task.by.days,state:0
+msgid "In Progress"
+msgstr "I arbeid"
+
+#. module: project
+#: code:addons/project/wizard/project_task_close.py:82
+#, python-format
+msgid "Please specify the email address of Customer."
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+msgid "Reactivate"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task_close
+#: view:project.task.close:0
+msgid "Send Email"
+msgstr ""
+
+#. module: project
+#: view:res.users:0
+msgid "Current Activity"
+msgstr ""
+
+#. module: project
+#: field:project.task,user_id:0
+msgid "Responsible"
+msgstr "Ansvarlig"
+
+#. module: project
+#: view:project.project:0
+msgid "Search Project"
+msgstr "Søk i prosjekt"
+
+#. module: project
+#: help:project.installer,project_gtd:0
+msgid ""
+"GTD is a methodology to efficiently organise yourself and your tasks. This "
+"module fully integrates GTD principle with OpenERP's project management."
+msgstr ""
+
+#. module: project
+#: model:ir.model,name:project.model_project_vs_hours
+msgid " Project vs  hours"
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+#: view:project.task:0
+#: view:report.project.task.user:0
+msgid "Current"
+msgstr "Gjeldene"
+
+#. module: project
+#: selection:project.task,priority:0
+#: selection:report.project.task.user,priority:0
+msgid "Very Low"
+msgstr "Veldig lav"
+
+#. module: project
+#: field:project.project,warn_manager:0
+#: field:project.task.close,manager_warn:0
+msgid "Warn Manager"
+msgstr "Varsle prosjektleder"
+
+#. module: project
+#: field:report.project.task.user,delay_endings_days:0
+msgid "Overpassed Deadline"
+msgstr ""
+
+#. module: project
+#: help:project.project,effective_hours:0
+msgid ""
+"Sum of spent hours of all tasks related to this project and its child "
+"projects."
+msgstr ""
+"Sum av timer forbrukt for alle oppgaver koblet til angitt prosjekt og dets "
+"underprosjekter."
+
+#. module: project
+#: help:project.task,delay_hours:0
+msgid ""
+"Computed as difference of the time estimated by the project manager and the "
+"real time to close the task."
+msgstr ""
+"Beregnet som: Total tid - estimert tid. Det gir differansen mellom tiden "
+"estimert av prosjektlederen og den reelle tiden det tok å fullføre oppgaven."
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task_reevaluate
+msgid "Re-evaluate Task"
+msgstr ""
+
+#. module: project
+#: help:project.installer,project_long_term:0
+msgid ""
+"Enables long-term projects tracking, including multiple-phase projects and "
+"resource allocation handling."
+msgstr ""
+
+#. module: project
+#: model:project.task.type,name:project.project_tt_development
+msgid "Development"
+msgstr ""
+
+#. module: project
+#: field:project.installer,project_timesheet:0
+msgid "Bill Time on Tasks"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+msgid "My Remaining Hours by Project"
+msgstr "Mine gjenstående timer pr prosjekt"
+
+#. module: project
+#: field:project.task,description:0
+#: field:project.task,name:0
+#: field:project.task.close,description:0
+#: view:project.task.type:0
+#: field:project.task.type,description:0
+msgid "Description"
+msgstr "Beskrivelse"
+
+#. module: project
+#: field:project.task.delegate,prefix:0
+msgid "Your Task Title"
+msgstr "Din oppgavetittel"
+
+#. module: project
+#: selection:project.task,priority:0
+#: selection:report.project.task.user,priority:0
+msgid "Urgent"
+msgstr "Viktig"
+
+#. module: project
+#: selection:report.project.task.user,month:0
+msgid "May"
+msgstr "Mai"
+
+#. module: project
+#: view:project.task.delegate:0
+msgid "Validation Task"
+msgstr "Valideringsoppgave"
+
+#. module: project
+#: field:task.by.days,total_task:0
+msgid "Total tasks"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+#: model:ir.actions.act_window,name:project.action_view_delegate_task_tree
+#: view:project.task:0
+msgid "My Delegated Tasks"
+msgstr "Mine delegerte oppgaver"
+
+#. module: project
+#: view:project.project:0
+msgid "Task: %(name)s"
+msgstr "Oppgave:%(name)s"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_installer
+#: view:project.installer:0
+msgid "Project Application Configuration"
+msgstr ""
+
+#. module: project
+#: field:project.task.delegate,user_id:0
+msgid "Assign To"
+msgstr "Tildel til"
+
+#. module: project
+#: field:project.project,effective_hours:0
+#: field:project.task.work,hours:0
+msgid "Time Spent"
+msgstr "Tid brukt"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.act_my_account
+msgid "My accounts to invoice"
+msgstr ""
+
+#. module: project
+#: selection:report.project.task.user,month:0
+msgid "January"
+msgstr "Januar"
+
+#. module: project
+#: field:project.project,tasks:0
+msgid "Project tasks"
+msgstr "Prosjektoppgaver"
+
+#. module: project
+#: help:project.project,warn_manager:0
+msgid ""
+"If you check this field, the project manager will receive a request each "
+"time a task is completed by his team."
+msgstr ""
+"Hvis du krysser av dette feltet så vil prosjektlederen motta en melding hver "
+"gang en oppgave er fullført."
+
+#. module: project
+#: help:project.project,total_hours:0
+msgid ""
+"Sum of total hours of all tasks related to this project and its child "
+"projects."
+msgstr ""
+
+#. module: project
+#: help:project.task.close,manager_email:0
+msgid "Email Address of Project's Manager"
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+msgid "Customer"
+msgstr "Kunde"
+
+#. module: project
+#: view:project.project:0
+#: view:project.task:0
+msgid "End Date"
+msgstr "Sluttdato"
+
+#. module: project
+#: selection:report.project.task.user,month:0
+msgid "February"
+msgstr "Februar"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_task_by_days_graph
+#: model:ir.model,name:project.model_task_by_days
+#: view:task.by.days:0
+msgid "Task By Days"
+msgstr ""
+
+#. module: project
+#: code:addons/project/wizard/project_task_close.py:111
+#, python-format
+msgid ""
+"Couldn't send mail! Check the email ids and smtp configuration settings"
+msgstr ""
+
+#. module: project
+#: field:project.task.close,partner_warn:0
+msgid "Warn Customer"
+msgstr "Varsle kunde"
+
+#. module: project
+#: view:project.task:0
+msgid "Edit"
+msgstr "Rediger"
+
+#. module: project
+#: model:process.node,note:project.process_node_opentask0
+msgid "Encode your working hours."
+msgstr ""
+
+#. module: project
+#: view:report.project.task.user:0
+#: field:report.project.task.user,year:0
+msgid "Year"
+msgstr "År"
+
+#. module: project
+#: help:report.project.task.user,closing_days:0
+msgid "Number of Days to close the task"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+msgid "My Projects: Planned vs Total Hours"
+msgstr ""
+
+#. module: project
+#: model:ir.model,name:project.model_project_installer
+msgid "project.installer"
+msgstr "project.installer"
+
+#. module: project
+#: selection:report.project.task.user,month:0
+msgid "April"
+msgstr "April"
+
+#. module: project
+#: field:project.task,effective_hours:0
+msgid "Hours Spent"
+msgstr "Timer brukt"
+
+#. module: project
+#: view:project.project:0
+#: view:project.task:0
+msgid "Miscelleanous"
+msgstr "Diverse"
+
+#. module: project
+#: model:process.transition,name:project.process_transition_opendonetask0
+msgid "Open Done Task"
+msgstr "Åpne ferdigstilt oppgave"
+
+#. module: project
+#: field:res.company,project_time_mode_id:0
+msgid "Project Time Unit"
+msgstr "Prosjekt time enhet"
+
+#. module: project
+#: view:project.task:0
+msgid "Spent Hours"
+msgstr "Timer brukt"
+
+#. module: project
+#: code:addons/project/project.py:665
+#, python-format
+msgid "The task '%s' is pending."
+msgstr ""
+
+#. module: project
+#: field:project.task,total_hours:0
+#: field:project.vs.hours,total_hours:0
+#: view:report.project.task.user:0
+#: field:report.project.task.user,total_hours:0
+msgid "Total Hours"
+msgstr "Timer totalt"
+
+#. module: project
+#: help:project.project,sequence:0
+msgid "Gives the sequence order when displaying a list of Projects."
+msgstr ""
+
+#. module: project
+#: field:project.task,id:0
+msgid "ID"
+msgstr "ID"
+
+#. module: project
+#: view:project.task:0
+msgid "Users"
+msgstr "Brukere"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_view_task_overpassed_draft
+msgid "Overpassed Tasks"
+msgstr ""
+
+#. module: project
+#: model:project.task.type,name:project.project_tt_merge
+msgid "Merge"
+msgstr "Slå sammen"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_vs_remaining_hours_graph
+#: view:project.vs.hours:0
+msgid "Remaining Hours Per Project"
+msgstr "Gjenstående timer pr prosjekt"
+
+#. module: project
+#: help:project.project,warn_footer:0
+msgid ""
+"Footer added at the beginning of the email for the warning message sent to "
+"the customer when a task is closed."
+msgstr ""
+"Bunntekst som blir lagt til i begynnelsen av e-posten/varselet som sendes "
+"til kunde når en oppgaver er lukket."
+
+#. module: project
+#: model:ir.actions.act_window,help:project.open_view_project_all
+msgid ""
+"A project contains a set of tasks or issues that will be performed by your "
+"resources assigned to it. A project can be hierarchically structured, as a "
+"child of a Parent Project. This allows you to design large project "
+"structures with different phases spread over the project duration cycle. "
+"Each user can set his default project in his own preferences to "
+"automatically filter the tasks or issues he usually works on. If you choose "
+"to invoice the time spent on a project task, you can find project tasks to "
+"be invoiced in the billing section."
+msgstr ""
+
+#. module: project
+#: field:project.project,total_hours:0
+msgid "Total Time"
+msgstr "Totaltid"
+
+#. module: project
+#: field:project.task.delegate,state:0
+msgid "Validation State"
+msgstr ""
+
+#. module: project
+#: code:addons/project/project.py:602
+#, python-format
+msgid "Task '%s' cancelled"
+msgstr "Oppgave '%s' er kansellert"
+
+#. module: project
+#: field:project.task,work_ids:0
+msgid "Work done"
+msgstr "Arbeid utført"
+
+#. module: project
+#: help:project.task.delegate,planned_hours_me:0
+msgid ""
+"Estimated time for you to validate the work done by the user to whom you "
+"delegate this task"
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+msgid "Manager"
+msgstr "Prosjektleder"
+
+#. module: project
+#: field:project.task,create_date:0
+msgid "Create Date"
+msgstr "Opprettet dato"
+
+#. module: project
+#: code:addons/project/project.py:610
+#, python-format
+msgid "The task '%s' is cancelled."
+msgstr ""
+
+#. module: project
+#: view:project.task.close:0
+msgid "_Send"
+msgstr "_Send"
+
+#. module: project
+#: field:project.task.work,name:0
+msgid "Work summary"
+msgstr "Oppsummering av arbeid"
+
+#. module: project
+#: view:project.installer:0
+msgid "title"
+msgstr "tittel"
+
+#. module: project
+#: help:project.installer,project_issue:0
+msgid "Automatically synchronizes project tasks and crm cases."
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+#: field:project.project,type_ids:0
+msgid "Tasks Stages"
+msgstr ""
+
+#. module: project
+#: model:process.node,note:project.process_node_taskbydelegate0
+msgid "Delegate your task to the other user"
+msgstr "Deleger dine oppgaver til andre brukere"
+
+#. module: project
+#: view:project.project:0
+#: field:project.project,warn_footer:0
+msgid "Mail Footer"
+msgstr "Bunntekst e-post"
+
+#. module: project
+#: field:project.installer,account_budget:0
+msgid "Budgets"
+msgstr "Budsjetter"
diff --git a/addons/sale_layout/i18n/nb.po b/addons/sale_layout/i18n/nb.po
new file mode 100644
index 00000000000..e13cba5ae72
--- /dev/null
+++ b/addons/sale_layout/i18n/nb.po
@@ -0,0 +1,292 @@
+# Norwegian Bokmal translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:16+0000\n"
+"PO-Revision-Date: 2011-04-06 17:13+0000\n"
+"Last-Translator: Rolv Råen (adEgo) <Unknown>\n"
+"Language-Team: Norwegian Bokmal <nb@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: 2011-04-07 05:54+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
+
+#. module: sale_layout
+#: selection:sale.order.line,layout_type:0
+msgid "Sub Total"
+msgstr "Subtotal"
+
+#. module: sale_layout
+#: model:ir.module.module,description:sale_layout.module_meta_information
+msgid ""
+"\n"
+"    This module provides features to improve the layout of the Sales Order.\n"
+"\n"
+"    It gives you the possibility to\n"
+"        * order all the lines of a sales order\n"
+"        * add titles, comment lines, sub total lines\n"
+"        * draw horizontal lines and put page breaks\n"
+"\n"
+"    "
+msgstr ""
+
+#. module: sale_layout
+#: selection:sale.order.line,layout_type:0
+msgid "Title"
+msgstr "Tittel"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Disc. (%)"
+msgstr "Rabatt (%)"
+
+#. module: sale_layout
+#: selection:sale.order.line,layout_type:0
+msgid "Note"
+msgstr "Notat"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Unit Price"
+msgstr "Enhetspris"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Order N°"
+msgstr "Ordrenr."
+
+#. module: sale_layout
+#: field:sale.order,abstract_line_ids:0
+msgid "Order Lines"
+msgstr "Ordrelinjer"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Disc.(%)"
+msgstr "Rab.(%)"
+
+#. module: sale_layout
+#: field:sale.order.line,layout_type:0
+msgid "Layout Type"
+msgstr "Layout type"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Seq."
+msgstr "Sekv."
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "UoM"
+msgstr "Måleenhet"
+
+#. module: sale_layout
+#: selection:sale.order.line,layout_type:0
+msgid "Product"
+msgstr "Produkt"
+
+#. module: sale_layout
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique !"
+msgstr "Ordrereferanse må være unik !"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Description"
+msgstr "Beskrivelse"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Manual Description"
+msgstr "Manuell beskrivelse"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Our Salesman"
+msgstr "Vår salgsperson"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Automatic Declaration"
+msgstr "Automatisk deklarasjon"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Invoice Lines"
+msgstr "Fakturalinjer"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Quantity"
+msgstr "Antall"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Quotation N°"
+msgstr "Tilbudsnr."
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "VAT"
+msgstr "MVA"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Make Invoice"
+msgstr ""
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Properties"
+msgstr "Egenskaper"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Invoice address :"
+msgstr "Fakturaadresse :"
+
+#. module: sale_layout
+#: model:ir.module.module,shortdesc:sale_layout.module_meta_information
+msgid "Sale Order Layout"
+msgstr "Salgsordre layout"
+
+#. module: sale_layout
+#: selection:sale.order.line,layout_type:0
+msgid "Page Break"
+msgstr "Sideskift"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Notes"
+msgstr "Notater"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Date Ordered"
+msgstr "Ordredato"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Shipping address :"
+msgstr "Leveringsadresse :"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Taxes"
+msgstr "Avgifter"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Net Total :"
+msgstr ""
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Tel. :"
+msgstr "Tel.:"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Total :"
+msgstr "Totalt :"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Payment Terms"
+msgstr "Betalingsbetingelser"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "History"
+msgstr ""
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Sale Order Lines"
+msgstr "Salgsordrelinjer"
+
+#. module: sale_layout
+#: selection:sale.order.line,layout_type:0
+msgid "Separator Line"
+msgstr "Skillelinje"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Your Reference"
+msgstr "Deres referanse"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Quotation Date"
+msgstr "Tilbudsdato"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "TVA :"
+msgstr "MVA :"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Qty"
+msgstr "Ant"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "States"
+msgstr ""
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Sales order lines"
+msgstr "Salgsordrelinjer"
+
+#. module: sale_layout
+#: model:ir.actions.report.xml,name:sale_layout.sale_order_1
+msgid "Order with Layout"
+msgstr "Ordre med layout"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Extra Info"
+msgstr "Ekstra inforrmasjon"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Taxes :"
+msgstr "Avgifter :"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Fax :"
+msgstr "Fax:"
+
+#. module: sale_layout
+#: model:ir.model,name:sale_layout.model_sale_order
+msgid "Sales Order"
+msgstr "Salgsordre"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Order Line"
+msgstr "Ordrelinje"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Price"
+msgstr "Pris"
+
+#. module: sale_layout
+#: model:ir.model,name:sale_layout.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "Salgsordrelinje"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Stock Moves"
+msgstr "Lagerbevegelser"
diff --git a/addons/stock/i18n/el.po b/addons/stock/i18n/el.po
index e38060ba459..2644a5fb645 100644
--- a/addons/stock/i18n/el.po
+++ b/addons/stock/i18n/el.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2011-03-31 18:54+0000\n"
+"PO-Revision-Date: 2011-04-05 18:33+0000\n"
 "Last-Translator: Dimitris Andavoglou <dimitrisand@gmail.com>\n"
 "Language-Team: nls@hellug.gr <nls@hellug.gr>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-01 06:05+0000\n"
+"X-Launchpad-Export-Date: 2011-04-06 06:02+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
@@ -264,6 +264,8 @@ msgid ""
 "If checked, all product quantities will be set to zero to help ensure a real "
 "physical inventory is done"
 msgstr ""
+"Εάν τσεκαριστεί, όλες οι ποσότητες των προϊόντων θα τεθούν σε μηδέν για να "
+"είναι σίγουρο ότι έχει γίνει φυσική απογραφή αποθεμάτων"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_move_split_lines
@@ -306,7 +308,7 @@ msgstr "Συνεργάτης"
 #: help:stock.move.memory.in,currency:0
 #: help:stock.move.memory.out,currency:0
 msgid "Currency in which Unit cost is expressed"
-msgstr ""
+msgstr "Νόμισμα στο οποίο το κόστος Μονάδος εκφράζεται"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_return_picking.py:135
@@ -334,7 +336,7 @@ msgstr ""
 #. module: stock
 #: field:stock.tracking,move_ids:0
 msgid "Moves for this pack"
-msgstr ""
+msgstr "Κινήσεις για αυτό το Πακέτο"
 
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
@@ -371,7 +373,7 @@ msgstr "Πραγματική Αξία Αποθέματος"
 #. module: stock
 #: field:report.stock.move,day_diff2:0
 msgid "Lag (Days)"
-msgstr ""
+msgstr "Καθυστέρηση(Μέρες)"
 
 #. module: stock
 #: model:ir.model,name:stock.model_action_traceability
@@ -642,6 +644,7 @@ msgstr "Πακέτο"
 #: constraint:stock.move:0
 msgid "You try to assign a lot which is not from the same product"
 msgstr ""
+"Προσπαθείτε να αντιστοιχίσετε μια παρτίδα που δεν είναι από το ίδιο προϊόν"
 
 #. module: stock
 #: view:res.partner:0
@@ -699,7 +702,7 @@ msgstr ""
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_partial_picking
 msgid "Process Picking"
-msgstr ""
+msgstr "Διαδικασία Παραλαβής"
 
 #. module: stock
 #: code:addons/stock/product.py:355
@@ -788,7 +791,7 @@ msgstr "Άλλαξε την Ποσότητα Προϊόντος"
 #. module: stock
 #: model:ir.model,name:stock.model_stock_inventory_merge
 msgid "Merge Inventory"
-msgstr ""
+msgstr "Συγχώνευση Εμπορευμάτων"
 
 #. module: stock
 #: code:addons/stock/product.py:371
@@ -818,7 +821,7 @@ msgstr "Περιέχει"
 #. module: stock
 #: view:board.board:0
 msgid "Incoming Products Delay"
-msgstr ""
+msgstr "Καθυστερήσεις Εισερχομένων Προϊόντων"
 
 #. module: stock
 #: view:stock.location:0
@@ -934,7 +937,7 @@ msgstr "Πληροφορίες Παράδοσης"
 #: code:addons/stock/wizard/stock_fill_inventory.py:48
 #, python-format
 msgid "Stock Inventory is done"
-msgstr ""
+msgstr "Η Καταγραφή Στοκ ολοκληρώθηκε"
 
 #. module: stock
 #: constraint:product.product:0
@@ -1161,7 +1164,7 @@ msgstr ""
 #: code:addons/stock/stock.py:1322
 #, python-format
 msgid "is in draft state."
-msgstr ""
+msgstr "είναι σε πρόχειτη κατάσταση"
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_tracking_form
@@ -1189,7 +1192,7 @@ msgstr ""
 #. module: stock
 #: model:stock.location,name:stock.stock_location_shop0
 msgid "Shop 1"
-msgstr ""
+msgstr "Κατάστημα 1"
 
 #. module: stock
 #: view:stock.change.product.qty:0
@@ -1203,12 +1206,12 @@ msgstr ""
 #: view:stock.picking:0
 #: view:stock.split.into:0
 msgid "_Cancel"
-msgstr ""
+msgstr "_Άκυρο"
 
 #. module: stock
 #: view:stock.move:0
 msgid "Ready"
-msgstr ""
+msgstr "Έτοιμο"
 
 #. module: stock
 #: view:stock.picking:0
@@ -1218,13 +1221,13 @@ msgstr "Ημερολογιακή Προβολή"
 #. module: stock
 #: view:stock.picking:0
 msgid "Additional Info"
-msgstr ""
+msgstr "Επιπλέον Πληροφορίες"
 
 #. module: stock
 #: code:addons/stock/stock.py:1602
 #, python-format
 msgid "Operation forbidden"
-msgstr ""
+msgstr "Απαγορευμένη διαδικασία"
 
 #. module: stock
 #: field:stock.location.product,from_date:0
@@ -1251,7 +1254,7 @@ msgstr "Αναθεωρήσεις Παρτίδων Παραγωγής"
 #. module: stock
 #: view:stock.picking:0
 msgid "Internal Picking List"
-msgstr ""
+msgstr "Εσωτερική  Λίστα Διακίνησης"
 
 #. module: stock
 #: selection:report.stock.inventory,state:0
@@ -1277,7 +1280,7 @@ msgstr ""
 #: code:addons/stock/product.py:93
 #, python-format
 msgid "Company is not specified in Location"
-msgstr ""
+msgstr "Δεν προσδιορίζεται η Εταιρία στην Τοποθεσία"
 
 #. module: stock
 #: view:report.stock.move:0
@@ -1293,7 +1296,7 @@ msgstr "Γενικοί Προμηθευτές ΙΤ"
 #. module: stock
 #: report:stock.picking.list:0
 msgid "Picking List:"
-msgstr ""
+msgstr "Λίστα Παραλαβής:"
 
 #. module: stock
 #: field:stock.inventory,date:0
@@ -1301,7 +1304,7 @@ msgstr ""
 #: field:stock.production.lot,date:0
 #: field:stock.tracking,date:0
 msgid "Creation Date"
-msgstr ""
+msgstr "Ημερομηνία Δημιουργίας"
 
 #. module: stock
 #: field:report.stock.lines.date,id:0
@@ -1311,7 +1314,7 @@ msgstr "Αριθμός Γραμμής Απογραφής"
 #. module: stock
 #: help:stock.location,address_id:0
 msgid "Address of  customer or supplier."
-msgstr ""
+msgstr "Διεύθυνση πελάτη ή προμηθευτή"
 
 #. module: stock
 #: view:report.stock.move:0
@@ -1330,24 +1333,24 @@ msgstr "Τοποεθεσία Πελάτη"
 #: code:addons/stock/wizard/stock_partial_move.py:85
 #, python-format
 msgid "Invalid action !"
-msgstr ""
+msgstr "Μη επιτρεπόμενη ενέργεια!"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_partial_move.py:139
 #, python-format
 msgid "Receive Information"
-msgstr ""
+msgstr "Παραλαβή Πληροφοριών"
 
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_location_overview
 #: report:lot.stock.overview:0
 msgid "Location Inventory Overview"
-msgstr ""
+msgstr "Επισκόπηση Τοποθεσίας Εμπορευμάτων"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_replacement
 msgid "Stock Replacement"
-msgstr ""
+msgstr "Αντικατάσταση Στοκ"
 
 #. module: stock
 #: view:stock.inventory:0
@@ -1368,18 +1371,18 @@ msgstr "Ανιχνευσιμότητα προς τα κάτω"
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:113
 #, python-format
 msgid "No Invoices were created"
-msgstr ""
+msgstr "Δεν δημιουργήθηκε τιμολόγιο"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_company
 msgid "OpenERP S.A."
-msgstr ""
+msgstr "OpenERP A.E."
 
 #. module: stock
 #: code:addons/stock/wizard/stock_partial_move.py:140
 #, python-format
 msgid "Receive"
-msgstr ""
+msgstr "Παραλαβή"
 
 #. module: stock
 #: help:stock.incoterms,active:0
@@ -1392,7 +1395,7 @@ msgstr ""
 #: view:stock.picking:0
 #: field:stock.picking,date:0
 msgid "Order Date"
-msgstr ""
+msgstr "Ημερομηνία Παραγγελίας"
 
 #. module: stock
 #: field:stock.location,location_id:0
@@ -1415,12 +1418,13 @@ msgstr ""
 #: help:stock.location,company_id:0
 msgid "Let this field empty if this location is shared between all companies"
 msgstr ""
+"Αφήστε το πεδίο κενό εάν η τοποθεσία είναι κοινόχρηστη μεταξύ πολλών εταιριών"
 
 #. module: stock
 #: code:addons/stock/stock.py:2198
 #, python-format
 msgid "Please provide a positive quantity to scrap!"
-msgstr ""
+msgstr "Παρακαλώ δώστε μια θετική ποσότητα για να αχρηστευτεί!"
 
 #. module: stock
 #: field:stock.location,chained_delay:0
@@ -1460,18 +1464,18 @@ msgstr "Τοποθεσία Προμηθευτή"
 #: code:addons/stock/stock.py:2217
 #, python-format
 msgid "were scrapped"
-msgstr ""
+msgstr "Έχουν αχρηστευτεί"
 
 #. module: stock
 #: view:stock.move:0
 #: view:stock.picking:0
 msgid "Partial"
-msgstr ""
+msgstr "Μερική"
 
 #. module: stock
 #: selection:report.stock.move,month:0
 msgid "September"
-msgstr ""
+msgstr "Σεπτέμβριος"
 
 #. module: stock
 #: help:stock.picking,backorder_id:0
@@ -1483,18 +1487,18 @@ msgstr ""
 #. module: stock
 #: model:ir.model,name:stock.model_report_stock_inventory
 msgid "Stock Statistics"
-msgstr ""
+msgstr "Στατιστικά Στοκ"
 
 #. module: stock
 #: field:stock.move.memory.in,currency:0
 #: field:stock.move.memory.out,currency:0
 msgid "Currency"
-msgstr ""
+msgstr "Νόμισμα"
 
 #. module: stock
 #: field:product.product,track_production:0
 msgid "Track Manufacturing Lots"
-msgstr ""
+msgstr "Παρακολούθηση Παρτίδων Παραγωγής"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_inventory_merge.py:44
@@ -1540,17 +1544,17 @@ msgstr "Δημιουργημένες Κινήσεις"
 #. module: stock
 #: model:stock.location,name:stock.stock_location_14
 msgid "Shelf 2"
-msgstr ""
+msgstr "Ράφι 2"
 
 #. module: stock
 #: field:stock.report.tracklots,tracking_id:0
 msgid "Tracking lot"
-msgstr ""
+msgstr "Παρακολούθηση Παρτίδας"
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Back Orders"
-msgstr ""
+msgstr "Επιστροφές Παραγγελίών"
 
 #. module: stock
 #: view:product.product:0
@@ -1561,7 +1565,7 @@ msgstr "Συμπληρωματικές Ιδιότητες Τοποθεσίας"
 #. module: stock
 #: view:stock.location:0
 msgid "Localization"
-msgstr ""
+msgstr "Τοπικοποίηση"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_report_tracklots
@@ -1606,7 +1610,7 @@ msgstr "Ημερ/νία"
 #: view:stock.move:0
 #: view:stock.picking:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Εκτεταμένα Φίλτρα..."
 
 #. module: stock
 #: field:stock.warehouse,lot_stock_id:0
@@ -1622,12 +1626,12 @@ msgstr "Η συγχώνευση επιτρέπεται μόνο σε πρόχε
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_dashboard_stock
 msgid "Dashboard"
-msgstr ""
+msgstr "Πινακίδα"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_move_track
 msgid "Track moves"
-msgstr ""
+msgstr "Παρακολούθηση κινήσεων"
 
 #. module: stock
 #: field:stock.incoterms,code:0
@@ -1637,13 +1641,13 @@ msgstr "Κωδικός"
 #. module: stock
 #: view:stock.inventory.line.split:0
 msgid "Lots Number"
-msgstr ""
+msgstr "Αριθμόί παρτίδων"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.open_board_warehouse
 #: model:ir.ui.menu,name:stock.menu_board_warehouse
 msgid "Warehouse Dashboard"
-msgstr ""
+msgstr "Πινακίδα Αποθήκης"
 
 #. module: stock
 #: code:addons/stock/stock.py:510
@@ -1657,7 +1661,7 @@ msgstr "Οι γραμμές παρτίδων δε διαγράφονται!"
 #: view:stock.move.scrap:0
 #: view:stock.picking:0
 msgid "Scrap Products"
-msgstr ""
+msgstr "Άχρηστα Προϊόντα"
 
 #. module: stock
 #: code:addons/stock/stock.py:1135
@@ -1678,7 +1682,7 @@ msgstr "Ακύρωση"
 #: model:ir.actions.act_window,name:stock.act_stock_return_picking
 #: model:ir.model,name:stock.model_stock_return_picking
 msgid "Return Picking"
-msgstr ""
+msgstr "Επιστροφή Παραλαβής"
 
 #. module: stock
 #: view:stock.inventory:0
@@ -1733,18 +1737,18 @@ msgstr ""
 #. module: stock
 #: view:stock.change.standard.price:0
 msgid "Cost Price"
-msgstr ""
+msgstr "Τιμή Κόστους"
 
 #. module: stock
 #: view:product.product:0
 #: field:product.product,valuation:0
 msgid "Inventory Valuation"
-msgstr ""
+msgstr "Απογραφή Αποτίμηση"
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Create Invoice"
-msgstr ""
+msgstr "Δημιουργία Τιμολογίου"
 
 #. module: stock
 #: view:stock.move:0
@@ -1790,12 +1794,12 @@ msgstr ""
 #. module: stock
 #: field:stock.change.standard.price,new_price:0
 msgid "Price"
-msgstr ""
+msgstr "Τιμή"
 
 #. module: stock
 #: view:stock.inventory:0
 msgid "Search Inventory"
-msgstr ""
+msgstr "Αναζήτηση Εμπορευμάτων"
 
 #. module: stock
 #: field:stock.move.track,quantity:0
@@ -1819,7 +1823,7 @@ msgstr "Παραληφθήσα Ποσ."
 #. module: stock
 #: field:stock.production.lot,ref:0
 msgid "Internal Reference"
-msgstr ""
+msgstr "Εσωτερική Αναφορά"
 
 #. module: stock
 #: help:stock.production.lot,prefix:0
@@ -1833,7 +1837,7 @@ msgstr ""
 #: model:ir.model,name:stock.model_stock_fill_inventory
 #: view:stock.fill.inventory:0
 msgid "Import Inventory"
-msgstr ""
+msgstr "Εισαγωγή Αποθέμάτων"
 
 #. module: stock
 #: field:stock.incoterms,name:0
@@ -1883,12 +1887,12 @@ msgstr ""
 #. module: stock
 #: view:report.stock.lines.date:0
 msgid "Stockable"
-msgstr ""
+msgstr "Αποθηκεύσιμα"
 
 #. module: stock
 #: selection:product.product,valuation:0
 msgid "Real Time (automated)"
-msgstr ""
+msgstr "Σε Πραγματικό χρόνο(αυτόματα)"
 
 #. module: stock
 #: help:stock.move,tracking_id:0
@@ -1899,7 +1903,7 @@ msgstr ""
 #: view:stock.change.product.qty:0
 #: view:stock.change.standard.price:0
 msgid "_Apply"
-msgstr ""
+msgstr "_Εφαρμογή"
 
 #. module: stock
 #: report:lot.stock.overview:0
@@ -1918,7 +1922,7 @@ msgstr "Τοποθεσία Αποθήκευσης"
 #: view:report.stock.inventory:0
 #: view:report.stock.move:0
 msgid "Total value"
-msgstr ""
+msgstr "Συνολική Τιμή"
 
 #. module: stock
 #: help:stock.location,chained_journal_id:0
@@ -1931,18 +1935,18 @@ msgstr ""
 #: view:board.board:0
 #: model:ir.actions.act_window,name:stock.action_incoming_product_board
 msgid "Incoming Product"
-msgstr ""
+msgstr "Εισερχόμενο Προϊόν"
 
 #. module: stock
 #: view:stock.move:0
 msgid "Creation"
-msgstr ""
+msgstr "Δημιουργία"
 
 #. module: stock
 #: field:stock.move.memory.in,cost:0
 #: field:stock.move.memory.out,cost:0
 msgid "Cost"
-msgstr ""
+msgstr "Κόστος"
 
 #. module: stock
 #: field:product.category,property_stock_account_input_categ:0
@@ -1955,7 +1959,7 @@ msgstr "Λογαριασμός Εισερχομένων Αποθεμάτων"
 #: model:ir.ui.menu,name:stock.menu_stock_warehouse_mgmt
 #: model:ir.ui.menu,name:stock.menu_warehouse_config
 msgid "Warehouse Management"
-msgstr ""
+msgstr "Διαχείριση Αποθήκης"
 
 #. module: stock
 #: selection:stock.picking,move_type:0
@@ -1971,7 +1975,7 @@ msgstr "Προσθήκη βήματος Αυτόματης Αρίθμησης"
 #: code:addons/stock/stock.py:2348
 #, python-format
 msgid "Product "
-msgstr ""
+msgstr "Προϊόν "
 
 #. module: stock
 #: view:stock.location.product:0
@@ -1998,7 +2002,7 @@ msgstr ""
 #: view:stock.picking:0
 #: view:stock.production.lot:0
 msgid "Group By..."
-msgstr ""
+msgstr "Ομαδοποίηση ανά..."
 
 #. module: stock
 #: view:stock.location:0
@@ -2014,7 +2018,7 @@ msgstr "Απώλεια αποθέματος"
 #: code:addons/stock/stock.py:1314
 #, python-format
 msgid "Document"
-msgstr ""
+msgstr "Έγγραφο"
 
 #. module: stock
 #: view:stock.picking:0
@@ -2026,7 +2030,7 @@ msgstr ""
 #: field:stock.move.memory.in,product_uom:0
 #: field:stock.move.memory.out,product_uom:0
 msgid "Unit of Measure"
-msgstr ""
+msgstr "Μονάδα Μέτρησης"
 
 #. module: stock
 #: code:addons/stock/product.py:176
@@ -2050,23 +2054,23 @@ msgstr "Ανίχνευση κίνησης"
 #. module: stock
 #: view:product.product:0
 msgid "Update"
-msgstr ""
+msgstr "Ενημέρωση"
 
 #. module: stock
 #: view:stock.inventory:0
 msgid "Set to Draft"
-msgstr ""
+msgstr "Ορισμός ως Πρόχειρο"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_stock_journal_form
 #: model:ir.ui.menu,name:stock.menu_action_stock_journal_form
 msgid "Stock Journals"
-msgstr ""
+msgstr "Ημερολόγια Στοκ"
 
 #. module: stock
 #: selection:report.stock.move,type:0
 msgid "Others"
-msgstr ""
+msgstr "Άλλοι"
 
 #. module: stock
 #: code:addons/stock/product.py:90
@@ -2077,7 +2081,7 @@ msgstr ""
 #. module: stock
 #: model:ir.model,name:stock.model_stock_partial_picking
 msgid "Partial Picking"
-msgstr ""
+msgstr "Μερική Παραλαβή"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_scrapped
@@ -2088,7 +2092,7 @@ msgstr ""
 #. module: stock
 #: view:stock.inventory:0
 msgid "Products "
-msgstr ""
+msgstr "Προϊόντα "
 
 #. module: stock
 #: field:product.product,track_incoming:0
@@ -2098,13 +2102,13 @@ msgstr ""
 #. module: stock
 #: view:board.board:0
 msgid "Warehouse board"
-msgstr ""
+msgstr "Πινακίδα Αποθήκης"
 
 #. module: stock
 #: code:addons/stock/product.py:377
 #, python-format
 msgid "Future Qty"
-msgstr ""
+msgstr "Μελοντική Ποσ."
 
 #. module: stock
 #: field:product.category,property_stock_variation:0
@@ -2150,7 +2154,7 @@ msgstr "Προϊόντα"
 #. module: stock
 #: view:stock.change.standard.price:0
 msgid "Change Price"
-msgstr ""
+msgstr "Αλλαγή Τιμής"
 
 #. module: stock
 #: field:stock.picking,move_type:0
@@ -2162,7 +2166,7 @@ msgstr "Μέθοδος Παράδοσης"
 #: help:stock.move,location_dest_id:0
 #: help:stock.picking,location_dest_id:0
 msgid "Location where the system will stock the finished products."
-msgstr ""
+msgstr "Τοποθεσία όπου το σύστημα θα αποθηκεύσει τα ολοκληρωμένα προϊόντα."
 
 #. module: stock
 #: help:product.category,property_stock_variation:0
@@ -2189,18 +2193,18 @@ msgstr "Κίνηση Αποθέματος"
 #. module: stock
 #: view:report.stock.move:0
 msgid "Delay(Days)"
-msgstr ""
+msgstr "Καθυστέρηση(Μέρες)"
 
 #. module: stock
 #: field:stock.move.memory.in,move_id:0
 #: field:stock.move.memory.out,move_id:0
 msgid "Move"
-msgstr ""
+msgstr "Μετακίνηση"
 
 #. module: stock
 #: help:stock.picking,min_date:0
 msgid "Expected date for the picking to be processed"
-msgstr ""
+msgstr "Προβλεπόμενη ημερομηνία παραλαβής προς επεξεργασία"
 
 #. module: stock
 #: code:addons/stock/product.py:373
@@ -2218,6 +2222,8 @@ msgstr "Αναθεωρήσεις"
 #: view:stock.picking:0
 msgid "This operation will cancel the shipment. Do you want to continue?"
 msgstr ""
+"Αυτή η λειτουργία θα ακυρώσει την φόρτωση. Είστε σίγουροι ότι θέλετε να "
+"συνεχίσετε;"
 
 #. module: stock
 #: help:product.product,valuation:0
@@ -2262,13 +2268,13 @@ msgstr ""
 #. module: stock
 #: view:stock.invoice.onshipping:0
 msgid "Create"
-msgstr ""
+msgstr "Δημιουργία"
 
 #. module: stock
 #: view:stock.move:0
 #: view:stock.picking:0
 msgid "Dates"
-msgstr ""
+msgstr "Ημερομηνίες"
 
 #. module: stock
 #: field:stock.move,priority:0
@@ -2278,7 +2284,7 @@ msgstr "Προτεραιότητα"
 #. module: stock
 #: view:stock.move:0
 msgid "Source"
-msgstr ""
+msgstr "Πηγή"
 
 #. module: stock
 #: code:addons/stock/stock.py:2557
@@ -2294,7 +2300,7 @@ msgstr "Απογραφή"
 #. module: stock
 #: model:ir.model,name:stock.model_stock_picking
 msgid "Picking List"
-msgstr ""
+msgstr "Λίστα Παραλαβής"
 
 #. module: stock
 #: sql_constraint:stock.production.lot:0
@@ -2335,7 +2341,7 @@ msgstr ""
 #: model:ir.ui.menu,name:stock.menu_stock_unit_measure_stock
 #: model:ir.ui.menu,name:stock.menu_stock_uom_form_action
 msgid "Units of Measure"
-msgstr ""
+msgstr "Μονάδες μέτρησης"
 
 #. module: stock
 #: selection:stock.location,chained_location_type:0
@@ -2345,12 +2351,12 @@ msgstr "Μόνιμη Τοποεθσία"
 #. module: stock
 #: selection:report.stock.move,month:0
 msgid "July"
-msgstr ""
+msgstr "Ιούλιος"
 
 #. module: stock
 #: view:report.stock.lines.date:0
 msgid "Consumable"
-msgstr ""
+msgstr "Αναλώσιμο"
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_stock_line_date
@@ -2411,7 +2417,7 @@ msgstr ""
 #: view:stock.move:0
 #, python-format
 msgid "Receive Products"
-msgstr ""
+msgstr "Παραλαβή Προϊόντων"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_partial_move.py:131
@@ -2435,12 +2441,12 @@ msgstr ""
 #: view:report.stock.move:0
 #: field:report.stock.move,month:0
 msgid "Month"
-msgstr ""
+msgstr "Μήνας"
 
 #. module: stock
 #: help:stock.picking,date_done:0
 msgid "Date of Completion"
-msgstr ""
+msgstr "Ημερομηνία Ολοκλήρωσης"
 
 #. module: stock
 #: help:stock.production.lot,name:0
@@ -2466,7 +2472,7 @@ msgstr "Απογραφές"
 #. module: stock
 #: view:report.stock.move:0
 msgid "Todo"
-msgstr ""
+msgstr "Προς υλοποίηση"
 
 #. module: stock
 #: view:report.stock.inventory:0
@@ -2482,13 +2488,13 @@ msgstr ""
 #: field:stock.production.lot.revision,company_id:0
 #: field:stock.warehouse,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Εταιρεία"
 
 #. module: stock
 #: view:stock.move:0
 #: view:stock.picking:0
 msgid "Unit Of Measure"
-msgstr ""
+msgstr "Μονάδα Μέτρησης"
 
 #. module: stock
 #: code:addons/stock/product.py:122
@@ -2518,6 +2524,8 @@ msgstr "Συμπλήρωση Απογραφής"
 msgid ""
 "Error: The default UOM and the purchase UOM must be in the same category."
 msgstr ""
+"Σφάλμα: Η προκαθορισμένη ΜΜ και η ΜΜ αγορών πρέπει να είναι στην ίδια "
+"κατηγορία."
 
 #. module: stock
 #: help:product.category,property_stock_account_input_categ:0
@@ -2546,7 +2554,7 @@ msgstr "Παρτίδα"
 #. module: stock
 #: view:stock.move.split:0
 msgid "Production Lot Number"
-msgstr ""
+msgstr "Αριθμός Παρτίδας Παραγωγής"
 
 #. module: stock
 #: field:stock.move,product_uos_qty:0
@@ -2568,7 +2576,7 @@ msgstr "Ορισμός ως Διαθεσίμου"
 #. module: stock
 #: report:stock.picking.list:0
 msgid "Contact Address :"
-msgstr ""
+msgstr "Διεύθυνση Επαφής"
 
 #. module: stock
 #: field:stock.move,backorder_id:0
@@ -2641,12 +2649,12 @@ msgstr ""
 #: code:addons/stock/stock.py:1307
 #, python-format
 msgid "Internal picking"
-msgstr ""
+msgstr "Εσωτερική Παραλαβή"
 
 #. module: stock
 #: view:stock.location.product:0
 msgid "Open Product"
-msgstr ""
+msgstr "Ανοιχτό Προϊόν"
 
 #. module: stock
 #: field:stock.location.product,to_date:0
@@ -2657,7 +2665,7 @@ msgstr "Σε"
 #: view:stock.move:0
 #: view:stock.picking:0
 msgid "Process"
-msgstr ""
+msgstr "Διαδικασία"
 
 #. module: stock
 #: field:stock.production.lot.revision,name:0
@@ -2738,7 +2746,7 @@ msgstr "Όχι επείγον"
 #. module: stock
 #: view:stock.move:0
 msgid "To Do"
-msgstr ""
+msgstr "Εκκρεμότητες"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_warehouse_form
@@ -2749,7 +2757,7 @@ msgstr "Αποθηκευτικοί Χώροι"
 #. module: stock
 #: field:stock.journal,user_id:0
 msgid "Responsible"
-msgstr ""
+msgstr "Υπεύθυνος"
 
 #. module: stock
 #: field:stock.move,returned_price:0
@@ -2761,7 +2769,7 @@ msgstr ""
 #: model:ir.ui.menu,name:stock.menu_action_stock_inventory_report
 #: view:report.stock.inventory:0
 msgid "Inventory Analysis"
-msgstr ""
+msgstr "Ανάλυση καταγραφής εμπορευμάτων"
 
 #. module: stock
 #: field:stock.invoice.onshipping,journal_id:0
@@ -2805,7 +2813,7 @@ msgstr "Προϊόν"
 #: code:addons/stock/wizard/stock_return_picking.py:135
 #, python-format
 msgid "Invoicing"
-msgstr ""
+msgstr "Τιμολόγηση"
 
 #. module: stock
 #: code:addons/stock/stock.py:2237
@@ -2827,7 +2835,7 @@ msgstr "Ύψος (Ζ)"
 #. module: stock
 #: field:stock.ups,weight:0
 msgid "Lot weight"
-msgstr ""
+msgstr "Βάρος Παρτίδας"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_move_consume
@@ -2849,7 +2857,7 @@ msgstr "Δεξής γονέας"
 #. module: stock
 #: field:stock.picking,address_id:0
 msgid "Address"
-msgstr ""
+msgstr "Διεύθυνση"
 
 #. module: stock
 #: report:lot.stock.overview:0
@@ -2871,7 +2879,7 @@ msgstr "Προμηθευτές"
 #: field:report.stock.inventory,value:0
 #: field:report.stock.move,value:0
 msgid "Total Value"
-msgstr ""
+msgstr "Συνολική Αξία"
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_product_by_category_stock_form
@@ -2881,13 +2889,13 @@ msgstr ""
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_product_category_config_stock
 msgid "Products Categories"
-msgstr ""
+msgstr "Κατηγορίες Προϊόντων"
 
 #. module: stock
 #: field:stock.move.memory.in,wizard_id:0
 #: field:stock.move.memory.out,wizard_id:0
 msgid "Wizard"
-msgstr ""
+msgstr "Οδηγός"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_view_stock_location_product
@@ -2903,7 +2911,7 @@ msgstr ""
 #. module: stock
 #: model:stock.location,name:stock.stock_location_components
 msgid "Shelf 1"
-msgstr ""
+msgstr "Ράφι  1"
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_picking_tree6
@@ -2919,7 +2927,7 @@ msgstr ""
 #. module: stock
 #: view:stock.move:0
 msgid "Order"
-msgstr ""
+msgstr "Παραγγελία"
 
 #. module: stock
 #: field:stock.tracking,name:0
@@ -2941,12 +2949,12 @@ msgstr "Λογισιτκές Εγγραφές"
 #. module: stock
 #: report:stock.picking.list:0
 msgid "Total"
-msgstr ""
+msgstr "Σύνολο"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_intermediatelocation0
 msgid "Internal Shippings"
-msgstr ""
+msgstr "Εσωτερικές διακινήσεις"
 
 #. module: stock
 #: field:stock.change.standard.price,enable_stock_in_out_acc:0
@@ -2974,7 +2982,7 @@ msgstr ""
 #. module: stock
 #: view:stock.move:0
 msgid "Destination"
-msgstr ""
+msgstr "Προορισμός"
 
 #. module: stock
 #: selection:stock.picking,move_type:0
@@ -2998,7 +3006,7 @@ msgstr ""
 #. module: stock
 #: view:stock.picking:0
 msgid "To Invoice"
-msgstr ""
+msgstr "Προς Τιμολόγιση"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_return_picking.py:120
@@ -3036,7 +3044,7 @@ msgstr ""
 #: code:addons/stock/wizard/stock_fill_inventory.py:115
 #, python-format
 msgid "Message !"
-msgstr ""
+msgstr "Μύνημα !"
 
 #. module: stock
 #: view:stock.move:0
@@ -3052,7 +3060,7 @@ msgstr "Απογραφή Παρτίδας"
 #. module: stock
 #: view:stock.move:0
 msgid "Reason"
-msgstr ""
+msgstr "Αιτία"
 
 #. module: stock
 #: report:stock.picking.list:0
@@ -3137,12 +3145,12 @@ msgstr "Επιθυμείτε να συγχωνεύσετε αυτές τις α
 #: selection:stock.move,state:0
 #: selection:stock.picking,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Ακυρώθηκε"
 
 #. module: stock
 #: view:stock.move:0
 msgid "Picking"
-msgstr ""
+msgstr "Παραλαβή"
 
 #. module: stock
 #: help:stock.picking,move_type:0
@@ -3182,7 +3190,7 @@ msgstr ""
 #: code:addons/stock/wizard/stock_inventory_merge.py:63
 #, python-format
 msgid "Warning"
-msgstr ""
+msgstr "Προειδοποιήση"
 
 #. module: stock
 #: code:addons/stock/stock.py:1321
@@ -3235,7 +3243,7 @@ msgstr "Συγχώνευση Απογραφών"
 #. module: stock
 #: help:stock.change.product.qty,new_quantity:0
 msgid "This quantity is expressed in the Default UoM of the product."
-msgstr ""
+msgstr "Αυτή η ποσότητα εκφράζεται στην προεπιλεγμένη Μ.Μ. του προϊόντος."
 
 #. module: stock
 #: report:stock.picking.list:0
@@ -3276,7 +3284,7 @@ msgstr ""
 #: view:report.stock.move:0
 #: field:report.stock.move,categ_id:0
 msgid "Product Category"
-msgstr ""
+msgstr "Κατηγορία Προϊόντος"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_change_product_qty.py:74
@@ -3293,7 +3301,7 @@ msgstr "Αναφορές"
 #: code:addons/stock/stock.py:1316
 #, python-format
 msgid " for the "
-msgstr ""
+msgstr " για "
 
 #. module: stock
 #: view:stock.split.into:0
@@ -3315,7 +3323,7 @@ msgstr "Ρυθμίσεις"
 #: field:stock.inventory.line.split,use_exist:0
 #: field:stock.move.split,use_exist:0
 msgid "Existing Lots"
-msgstr ""
+msgstr "Υπάρχουσες Παρτίδες"
 
 #. module: stock
 #: field:product.product,location_id:0
@@ -3342,7 +3350,7 @@ msgstr ""
 #: code:addons/stock/stock.py:729
 #, python-format
 msgid "Not enough stock, unable to reserve the products."
-msgstr ""
+msgstr "Δεν υπάρχει αρκετό στοκ,δεν μπορούνε να διατηρηθούν τα προϊόντα"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_customers
@@ -3353,7 +3361,7 @@ msgstr "Πελάτες"
 #: code:addons/stock/stock.py:1320
 #, python-format
 msgid "is cancelled."
-msgstr ""
+msgstr "έχει ακυρωθεί"
 
 #. module: stock
 #: view:stock.inventory.line:0
@@ -3375,13 +3383,13 @@ msgstr "Μελοντικές Παραδόσεις"
 #. module: stock
 #: view:stock.picking:0
 msgid "Additional info"
-msgstr ""
+msgstr "Επιπλέον Πληροφορίες"
 
 #. module: stock
 #: view:stock.move:0
 #: field:stock.move,tracking_id:0
 msgid "Pack"
-msgstr ""
+msgstr "Πακέτο"
 
 #. module: stock
 #: view:stock.move:0
@@ -3406,17 +3414,17 @@ msgstr "Αυτόματη Επικύρωση"
 #. module: stock
 #: report:stock.picking.list:0
 msgid "Weight"
-msgstr ""
+msgstr "Βάρος"
 
 #. module: stock
 #: model:ir.model,name:stock.model_product_template
 msgid "Product Template"
-msgstr ""
+msgstr "Πρότυπο Προϊόντος"
 
 #. module: stock
 #: selection:report.stock.move,month:0
 msgid "December"
-msgstr ""
+msgstr "Δεκέμβριος"
 
 #. module: stock
 #: selection:stock.location,chained_auto_packing:0
@@ -3451,7 +3459,7 @@ msgstr ""
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_stock_products_moves
 msgid "Products Moves"
-msgstr ""
+msgstr "Κινήσεις Προϊόντων"
 
 #. module: stock
 #: selection:stock.picking,invoice_state:0
@@ -3461,7 +3469,7 @@ msgstr "Τιμολογημένο"
 #. module: stock
 #: field:stock.move,address_id:0
 msgid "Destination Address"
-msgstr ""
+msgstr "Διεύθυνση Προορισμού"
 
 #. module: stock
 #: field:stock.picking,max_date:0
@@ -3476,7 +3484,7 @@ msgstr ""
 #. module: stock
 #: model:stock.location,name:stock.stock_location_shop1
 msgid "Shop 2"
-msgstr ""
+msgstr "Κατάστημα 2"
 
 #. module: stock
 #: constraint:res.partner:0
@@ -3526,7 +3534,7 @@ msgstr ""
 #. module: stock
 #: field:stock.move.split.lines,use_exist:0
 msgid "Existing Lot"
-msgstr ""
+msgstr "Υπάρχουσες Παρτίδες"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_return_picking.py:204
@@ -3545,7 +3553,7 @@ msgstr ""
 #: code:addons/stock/stock.py:1319
 #, python-format
 msgid "is ready to process."
-msgstr ""
+msgstr "είναι έτοιμο για επεξεργασία"
 
 #. module: stock
 #: help:stock.picking,origin:0
@@ -3566,7 +3574,7 @@ msgstr ""
 #. module: stock
 #: selection:report.stock.move,month:0
 msgid "November"
-msgstr ""
+msgstr "Νοέμβριος"
 
 #. module: stock
 #: code:addons/stock/product.py:101
@@ -3585,7 +3593,7 @@ msgstr "Ποσ. Εκτός Προγραμματισμού"
 #: code:addons/stock/stock.py:1318
 #, python-format
 msgid "is scheduled"
-msgstr ""
+msgstr "είναι προγραμματιζμένο"
 
 #. module: stock
 #: field:stock.location,chained_company_id:0
@@ -3600,7 +3608,7 @@ msgstr "Έλεγχος Δαθεσιμότητας"
 #. module: stock
 #: selection:report.stock.move,month:0
 msgid "January"
-msgstr ""
+msgstr "Ιανουάριος"
 
 #. module: stock
 #: help:product.product,track_incoming:0
@@ -3637,12 +3645,12 @@ msgstr "Σφάλμα"
 #. module: stock
 #: field:stock.ups.final,xmlfile:0
 msgid "XML File"
-msgstr ""
+msgstr "Αρχείο XML"
 
 #. module: stock
 #: view:stock.change.product.qty:0
 msgid "Select Quantity"
-msgstr ""
+msgstr "Επιλογή Ποσότητας"
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_location_tree
@@ -3678,7 +3686,7 @@ msgstr "Ανιχνευσιμότητα"
 #. module: stock
 #: view:stock.picking:0
 msgid "To invoice"
-msgstr ""
+msgstr "Για τιμολόγιση"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_location_form
@@ -3695,7 +3703,7 @@ msgstr "Γενικές Πληροφορίες"
 #. module: stock
 #: field:stock.production.lot,prefix:0
 msgid "Prefix"
-msgstr ""
+msgstr "Πρόθεμα"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_splitinto.py:53
@@ -3731,7 +3739,7 @@ msgstr ""
 #: code:addons/stock/stock.py:2348
 #, python-format
 msgid "quantity."
-msgstr ""
+msgstr "ποσότητα."
 
 #. module: stock
 #: constraint:stock.move:0
@@ -3789,7 +3797,7 @@ msgstr "Μάιος"
 #: code:addons/stock/wizard/stock_partial_move.py:133
 #, python-format
 msgid "Deliver"
-msgstr "Παραδείδω"
+msgstr "Παραδίδω"
 
 #. module: stock
 #: help:product.template,property_stock_account_output:0
@@ -3848,7 +3856,7 @@ msgstr "Φεβρουάριος"
 #. module: stock
 #: view:stock.production.lot:0
 msgid "Production Lot Identification"
-msgstr ""
+msgstr "Ταυτοποίηση Παρτίδων Παραγωγής"
 
 #. module: stock
 #: field:stock.location,scrap_location:0
@@ -3870,7 +3878,7 @@ msgstr "Μελλοντικά"
 #. module: stock
 #: field:stock.invoice.onshipping,invoice_date:0
 msgid "Invoiced date"
-msgstr ""
+msgstr "Ημερομηνία Τιμολόγησης"
 
 #. module: stock
 #: code:addons/stock/stock.py:729
diff --git a/addons/stock_location/i18n/el.po b/addons/stock_location/i18n/el.po
index 7c52a23d572..cdd2b2d9bbc 100644
--- a/addons/stock_location/i18n/el.po
+++ b/addons/stock_location/i18n/el.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2011-01-19 12:00+0000\n"
-"Last-Translator: Panagiotis Kranidiotis <kranidiotis@vatica.org>\n"
+"PO-Revision-Date: 2011-04-05 18:13+0000\n"
+"Last-Translator: Dimitris Andavoglou <dimitrisand@gmail.com>\n"
 "Language-Team: nls@hellug.gr <nls@hellug.gr>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-01-25 07:07+0000\n"
-"X-Generator: Launchpad (build 12177)\n"
+"X-Launchpad-Export-Date: 2011-04-06 06:02+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
@@ -23,7 +23,7 @@ msgstr ""
 #: selection:product.pulled.flow,picking_type:0
 #: selection:stock.location.path,picking_type:0
 msgid "Sending Goods"
-msgstr ""
+msgstr "Αποστολή Αγαθών"
 
 #. module: stock_location
 #: view:product.product:0
@@ -33,7 +33,7 @@ msgstr ""
 #. module: stock_location
 #: selection:product.pulled.flow,type_proc:0
 msgid "Move"
-msgstr ""
+msgstr "Μετακίνηση"
 
 #. module: stock_location
 #: model:ir.model,name:stock_location.model_stock_location_path
@@ -48,10 +48,9 @@ msgstr "Βήμα Αυτόματης Αρίιθμησης προστέθηκε"
 #. module: stock_location
 #: view:product.product:0
 msgid "Parameters"
-msgstr ""
+msgstr "Παράμετροι"
 
 #. module: stock_location
-#: field:product.pulled.flow,location_src_id:0
 #: field:stock.location.path,location_from_id:0
 msgid "Source Location"
 msgstr "Τοποθεσία Προέλευσης"
@@ -81,7 +80,7 @@ msgstr ""
 #: selection:product.pulled.flow,picking_type:0
 #: selection:stock.location.path,picking_type:0
 msgid "Internal"
-msgstr ""
+msgstr "Εσωτερικό"
 
 #. module: stock_location
 #: code:addons/stock_location/procurement_pull.py:98
@@ -94,13 +93,13 @@ msgstr ""
 #. module: stock_location
 #: model:ir.model,name:stock_location.model_stock_location
 msgid "Location"
-msgstr ""
+msgstr "Τοποθεσία"
 
 #. module: stock_location
 #: field:product.pulled.flow,invoice_state:0
 #: field:stock.location.path,invoice_state:0
 msgid "Invoice Status"
-msgstr ""
+msgstr "Κατάσταση τιμολογίου"
 
 #. module: stock_location
 #: help:product.pulled.flow,name:0
@@ -128,12 +127,12 @@ msgstr ""
 #. module: stock_location
 #: model:ir.module.module,shortdesc:stock_location.module_meta_information
 msgid "Warehouse Locations Paths"
-msgstr ""
+msgstr "Τοποθεσία Αποθήκης"
 
 #. module: stock_location
 #: view:product.product:0
 msgid "Conditions"
-msgstr ""
+msgstr "Συνθήκες"
 
 #. module: stock_location
 #: model:stock.location,name:stock_location.location_pack_zone
@@ -143,17 +142,17 @@ msgstr ""
 #. module: stock_location
 #: model:stock.location,name:stock_location.location_gate_b
 msgid "Gate B"
-msgstr ""
+msgstr "Θύρα Β"
 
 #. module: stock_location
 #: model:stock.location,name:stock_location.location_gate_a
 msgid "Gate A"
-msgstr ""
+msgstr "Θύρα Α"
 
 #. module: stock_location
 #: selection:product.pulled.flow,type_proc:0
 msgid "Buy"
-msgstr ""
+msgstr "Αγορά"
 
 #. module: stock_location
 #: view:product.product:0
@@ -168,7 +167,7 @@ msgstr ""
 #. module: stock_location
 #: model:ir.model,name:stock_location.model_stock_move
 msgid "Stock Move"
-msgstr ""
+msgstr "Κίνηση Αποθέματος"
 
 #. module: stock_location
 #: view:product.product:0
@@ -179,12 +178,12 @@ msgstr ""
 #: field:product.pulled.flow,company_id:0
 #: field:stock.location.path,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Εταιρεία"
 
 #. module: stock_location
 #: view:product.product:0
 msgid "Logistics Flows"
-msgstr ""
+msgstr "Ροές Εφοδιαστικής"
 
 #. module: stock_location
 #: help:stock.move,cancel_cascade:0
@@ -194,28 +193,28 @@ msgstr ""
 #. module: stock_location
 #: selection:product.pulled.flow,type_proc:0
 msgid "Produce"
-msgstr ""
+msgstr "Παραγωγή"
 
 #. module: stock_location
 #: selection:product.pulled.flow,procure_method:0
 msgid "Make to Order"
-msgstr ""
+msgstr "Προς Παραγγελία"
 
 #. module: stock_location
 #: selection:product.pulled.flow,procure_method:0
 msgid "Make to Stock"
-msgstr ""
+msgstr "Προς Αποθήκευση"
 
 #. module: stock_location
 #: field:product.pulled.flow,partner_address_id:0
 msgid "Partner Address"
-msgstr ""
+msgstr "Διεύθυνση Συνεργάτη"
 
 #. module: stock_location
 #: selection:product.pulled.flow,invoice_state:0
 #: selection:stock.location.path,invoice_state:0
 msgid "To Be Invoiced"
-msgstr ""
+msgstr "Προς Τιμολόγηση"
 
 #. module: stock_location
 #: help:stock.location.path,delay:0
@@ -313,7 +312,7 @@ msgstr ""
 #. module: stock_location
 #: field:product.pulled.flow,type_proc:0
 msgid "Type of Procurement"
-msgstr ""
+msgstr "Τύπος Προμήθειας"
 
 #. module: stock_location
 #: help:product.pulled.flow,company_id:0
@@ -323,7 +322,7 @@ msgstr ""
 #. module: stock_location
 #: field:product.pulled.flow,name:0
 msgid "Name"
-msgstr ""
+msgstr "Όνομα"
 
 #. module: stock_location
 #: help:product.product,path_ids:0
@@ -342,18 +341,18 @@ msgstr "Μη Αυτοματοποιημένη Διαδικασία"
 #: model:ir.model,name:stock_location.model_product_product
 #: field:product.pulled.flow,product_id:0
 msgid "Product"
-msgstr ""
+msgstr "Προϊόν"
 
 #. module: stock_location
 #: field:product.pulled.flow,procure_method:0
 msgid "Procure Method"
-msgstr ""
+msgstr "Μέθοδος Προμήθειας"
 
 #. module: stock_location
 #: field:product.pulled.flow,picking_type:0
 #: field:stock.location.path,picking_type:0
 msgid "Shipping Type"
-msgstr ""
+msgstr "Τύπος Αποστολής"
 
 #. module: stock_location
 #: help:product.pulled.flow,procure_method:0
@@ -362,6 +361,9 @@ msgid ""
 "supplying. 'Make to Order': When needed, purchase or produce for the "
 "procurement request."
 msgstr ""
+"'Προς Αποθήκευση': Όταν χρειαστεί, εξαγωγή από το απόθεμα ή αναμονή μέχρι "
+"την επόμενη προμήθεια. 'Προς Παραγγελία': Όταν χρειαστεί προμήθεια ή "
+"παραγωγή του προϊόντος."
 
 #. module: stock_location
 #: help:product.pulled.flow,location_id:0
@@ -382,13 +384,13 @@ msgstr ""
 #. module: stock_location
 #: model:stock.location,name:stock_location.stock_location_qualitytest0
 msgid "Quality Control"
-msgstr ""
+msgstr "Έλεγχος Ποιότητας"
 
 #. module: stock_location
 #: selection:product.pulled.flow,invoice_state:0
 #: selection:stock.location.path,invoice_state:0
 msgid "Not Applicable"
-msgstr ""
+msgstr "Μη Εφαρμόσιμο"
 
 #. module: stock_location
 #: field:stock.location.path,delay:0
@@ -420,14 +422,14 @@ msgstr ""
 #: constraint:stock.move:0
 msgid "You try to assign a lot which is not from the same product"
 msgstr ""
+"Προσπαθείτε να αντιστοιχίσετε μια παρτίδα που δεν είναι από το ίδιο προϊόν"
 
 #. module: stock_location
 #: model:ir.model,name:stock_location.model_procurement_order
 msgid "Procurement"
-msgstr ""
+msgstr "Προμήθεια"
 
 #. module: stock_location
-#: field:product.pulled.flow,location_id:0
 #: field:stock.location.path,location_dest_id:0
 msgid "Destination Location"
 msgstr "Τοποθεσία Προορισμού"
@@ -442,17 +444,17 @@ msgstr "Αυτόματη Κίνηση"
 #: selection:product.pulled.flow,picking_type:0
 #: selection:stock.location.path,picking_type:0
 msgid "Getting Goods"
-msgstr ""
+msgstr "Παραλαβή Αγαθών"
 
 #. module: stock_location
 #: view:product.product:0
 msgid "Action Type"
-msgstr ""
+msgstr "Τύπος Ενέργειας"
 
 #. module: stock_location
 #: constraint:product.product:0
 msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "Σφάλμα: Λανθασμένος κωδικός ΕΑΝ"
 
 #. module: stock_location
 #: help:product.pulled.flow,picking_type:0
@@ -465,7 +467,7 @@ msgstr ""
 #. module: stock_location
 #: model:stock.location,name:stock_location.location_order
 msgid "Order Processing"
-msgstr ""
+msgstr "Επεξεργασία Παραγγελίας"
 
 #. module: stock_location
 #: field:stock.location.path,name:0
@@ -473,6 +475,8 @@ msgid "Operation"
 msgstr "Διαδικασία"
 
 #. module: stock_location
+#: view:product.product:0
+#: field:product.product,path_ids:0
 #: view:stock.location.path:0
 msgid "Location Paths"
 msgstr "Διαδρομές Τοποθεσιών"
@@ -481,7 +485,7 @@ msgstr "Διαδρομές Τοποθεσιών"
 #: field:product.pulled.flow,journal_id:0
 #: field:stock.location.path,journal_id:0
 msgid "Journal"
-msgstr ""
+msgstr "Ημερολόγιο"
 
 #. module: stock_location
 #: field:product.pulled.flow,cancel_cascade:0
@@ -493,4 +497,4 @@ msgstr ""
 #: selection:product.pulled.flow,invoice_state:0
 #: selection:stock.location.path,invoice_state:0
 msgid "Invoiced"
-msgstr ""
+msgstr "Τιμολογημένο"
diff --git a/addons/stock_planning/i18n/el.po b/addons/stock_planning/i18n/el.po
new file mode 100644
index 00000000000..30398abb690
--- /dev/null
+++ b/addons/stock_planning/i18n/el.po
@@ -0,0 +1,1475 @@
+# Greek translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:16+0000\n"
+"PO-Revision-Date: 2011-04-05 17:54+0000\n"
+"Last-Translator: Dimitris Andavoglou <dimitrisand@gmail.com>\n"
+"Language-Team: Greek <el@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: 2011-04-06 06:02+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+
+#. module: stock_planning
+#: code:addons/stock_planning/wizard/stock_planning_createlines.py:73
+#, python-format
+msgid ""
+"No forecasts for selected period or no products in selected category !"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,stock_only:0
+msgid ""
+"Check to calculate stock location of selected warehouse only. If not "
+"selected calculation is made for input, stock and output location of "
+"warehouse."
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,maximum_op:0
+msgid "Maximum Rule"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period1_per_company:0
+msgid "This Copmany Period1"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning:0
+#: view:stock.sale.forecast:0
+msgid "Group By..."
+msgstr "Ομαδοποίηση ανά..."
+
+#. module: stock_planning
+#: help:stock.sale.forecast,product_amt:0
+msgid ""
+"Forecast value which will be converted to Product Quantity according to "
+"prices."
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:621
+#: code:addons/stock_planning/stock_planning.py:663
+#, python-format
+msgid "Incoming Left must be greater than 0 !"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,outgoing_before:0
+msgid ""
+"Planned Out in periods before calculated. Between start date of current "
+"period and one day before start of calculated period."
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/wizard/stock_planning_forecast.py:59
+#, python-format
+msgid "No products in selected category !"
+msgstr "Κανένα προϊόν στην επιλεγμένη κατηγορία"
+
+#. module: stock_planning
+#: help:stock.sale.forecast.createlines,warehouse_id:0
+msgid ""
+"Warehouse which forecasts will concern. If during stock planning you will "
+"need sales forecast for all warehouses choose any warehouse now."
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,outgoing_left:0
+msgid "Expected Out"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.sale.forecast:0
+msgid " "
+msgstr " "
+
+#. module: stock_planning
+#: field:stock.planning,incoming_left:0
+msgid "Incoming Left"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Requisition history"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.sale.forecast.createlines:0
+msgid "Create Forecasts Lines"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,outgoing:0
+msgid "Quantity of all confirmed outgoing moves in calculated Period."
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.period.createlines:0
+msgid "Create Daily Periods"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning:0
+#: field:stock.planning,company_id:0
+#: field:stock.planning.createlines,company_id:0
+#: view:stock.sale.forecast:0
+#: field:stock.sale.forecast,company_id:0
+#: field:stock.sale.forecast.createlines,company_id:0
+msgid "Company"
+msgstr "Εταιρεία"
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:640
+#: code:addons/stock_planning/stock_planning.py:682
+#, python-format
+msgid ""
+"\n"
+" Initial Stock: "
+msgstr ""
+"\n"
+" Αρχικό Στοκ: "
+
+#. module: stock_planning
+#: help:stock.planning,warehouse_forecast:0
+msgid ""
+"All sales forecasts for selected Warehouse of selected Product during "
+"selected Period."
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.ui.menu,name:stock_planning.menu_stock_period_creatlines
+msgid "Create Stock and Sales Periods"
+msgstr "Δημιουργία Περιόδων Στοκ και Πωλήσεων"
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Minimum Stock Rule Indicators"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.sale.forecast.createlines,period_id:0
+msgid "Period which forecasts will concern."
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,stock_only:0
+msgid "Stock Location Only"
+msgstr "Τοποθεσία Στοκ Μόνο"
+
+#. module: stock_planning
+#: help:stock.planning,already_out:0
+msgid ""
+"Quantity which is already dispatched out of this warehouse in current period."
+msgstr ""
+"Ποστότα που έχει ήδη εξαχθεί από αυτήν την αποθήκη για την τρέχουσα περίοδο."
+
+#. module: stock_planning
+#: help:stock.planning,procure_to_stock:0
+msgid ""
+"Chect to make procurement to stock location of selected warehouse. If not "
+"selected procurement will be made into input location of warehouse."
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Current Period Situation"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.period.createlines:0
+msgid "Create Monthly Periods"
+msgstr "Δημιουργία Μηνιαίων Περιόδων"
+
+#. module: stock_planning
+#: help:stock.planning,supply_warehouse_id:0
+msgid ""
+"Warehouse used as source in supply pick move created by 'Supply from Another "
+"Warhouse'."
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.model,name:stock_planning.model_stock_period_createlines
+msgid "stock.period.createlines"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,outgoing_before:0
+msgid "Planned Out Before"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning.createlines,forecasted_products:0
+msgid "All Products with Forecast"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.sale.forecast:0
+msgid "Periods :"
+msgstr "Περίοδοι:"
+
+#. module: stock_planning
+#: help:stock.planning,already_in:0
+msgid ""
+"Quantity which is already picked up to this warehouse in current period."
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:644
+#: code:addons/stock_planning/stock_planning.py:686
+#, python-format
+msgid "    Confirmed In Before: "
+msgstr "    Επιβεβαιώθηκε Πριν: "
+
+#. module: stock_planning
+#: view:stock.sale.forecast:0
+msgid "Stock and Sales Forecast"
+msgstr "Πρόβλέψεις Στοκ και Πωλήσεων"
+
+#. module: stock_planning
+#: model:ir.model,name:stock_planning.model_stock_sale_forecast
+msgid "stock.sale.forecast"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_dept_id:0
+msgid "This Department"
+msgstr "Αυτό το Τμήμα"
+
+#. module: stock_planning
+#: field:stock.planning,to_procure:0
+msgid "Planned In"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,stock_simulation:0
+msgid "Stock Simulation"
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.model,name:stock_planning.model_stock_planning_createlines
+msgid "stock.planning.createlines"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,incoming_before:0
+msgid ""
+"Confirmed incoming in periods before calculated (Including Already In). "
+"Between start date of current period and one day before start of calculated "
+"period."
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.sale.forecast:0
+msgid "Search  Sales Forecast"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period5_per_user:0
+msgid "This User Period5"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,history:0
+msgid "History of procurement or internal supply of this planning line."
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,company_forecast:0
+msgid ""
+"All sales forecasts for whole company (for all Warehouses) of selected "
+"Product during selected Period."
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period1_per_user:0
+msgid "This User Period1"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period3_per_user:0
+msgid "This User Period3"
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.ui.menu,name:stock_planning.menu_stock_planning_main
+#: view:stock.planning:0
+msgid "Stock Planning"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,minimum_op:0
+msgid "Minimum Rule"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Procure Incoming Left"
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:646
+#: code:addons/stock_planning/stock_planning.py:688
+#, python-format
+msgid "    Incoming Left: "
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:715
+#, python-format
+msgid "Pick List "
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning.createlines:0
+#: view:stock.sale.forecast.createlines:0
+msgid "Create"
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.actions.act_window,name:stock_planning.action_view_stock_planning_form
+#: model:ir.module.module,shortdesc:stock_planning.module_meta_information
+#: model:ir.ui.menu,name:stock_planning.menu_stock_planning
+#: view:stock.planning:0
+msgid "Master Procurement Schedule"
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:636
+#: code:addons/stock_planning/stock_planning.py:678
+#, python-format
+msgid "  Creation Date: "
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,period_id:0
+#: field:stock.planning.createlines,period_id:0
+#: field:stock.sale.forecast,period_id:0
+#: field:stock.sale.forecast.createlines,period_id:0
+msgid "Period"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.period:0
+#: field:stock.period,state:0
+#: field:stock.planning,state:0
+#: field:stock.sale.forecast,state:0
+msgid "State"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.sale.forecast.createlines,product_categ_id:0
+msgid "Product Category of products which created forecasts will concern."
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.model,name:stock_planning.model_stock_period
+msgid "stock period"
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.model,name:stock_planning.model_stock_sale_forecast_createlines
+msgid "stock.sale.forecast.createlines"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,warehouse_id:0
+#: field:stock.planning.createlines,warehouse_id:0
+#: field:stock.sale.forecast,warehouse_id:0
+#: field:stock.sale.forecast.createlines,warehouse_id:0
+msgid "Warehouse"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,stock_simulation:0
+msgid ""
+"Stock simulation at the end of selected Period.\n"
+" For current period it is: \n"
+"Initial Stock - Already Out + Already In - Expected Out + Incoming Left.\n"
+"For periods ahead it is: \n"
+"Initial Stock - Planned Out Before + Incoming Before - Planned Out + Planned "
+"In."
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.sale.forecast,analyze_company:0
+msgid "Check this box to see the sales for whole company."
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,name:0
+msgid "Name"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Search Stock Planning"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,incoming_before:0
+msgid "Incoming Before"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning.createlines,product_categ_id:0
+#: field:stock.sale.forecast.createlines,product_categ_id:0
+msgid "Product Category"
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:621
+#: code:addons/stock_planning/stock_planning.py:663
+#: code:addons/stock_planning/stock_planning.py:665
+#: code:addons/stock_planning/stock_planning.py:667
+#: code:addons/stock_planning/wizard/stock_planning_createlines.py:73
+#: code:addons/stock_planning/wizard/stock_planning_forecast.py:59
+#, python-format
+msgid "Error !"
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:626
+#, python-format
+msgid "Manual planning for "
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_user_id:0
+msgid "This User"
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:643
+#: code:addons/stock_planning/stock_planning.py:685
+#, python-format
+msgid ""
+"\n"
+" Confirmed Out: "
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Forecasts"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Supply from Another Warehouse"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Calculate Planning"
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:636
+#, python-format
+msgid "Procurement created in MPS by user: "
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:140
+#, python-format
+msgid "Invalid action !"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,stock_start:0
+msgid "Stock quantity one day before current period."
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.period.createlines:0
+msgid "Create Weekly Periods"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,maximum_op:0
+msgid "Maximum quantity set in Minimum Stock Rules for this Warhouse"
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:665
+#, python-format
+msgid "You must specify a Source Warehouse !"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning.createlines:0
+msgid "Creates planning lines for selected period and warehouse."
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period4_per_user:0
+msgid "This User Period4"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning.createlines:0
+#: view:stock.sale.forecast.createlines:0
+msgid "Note: Doesn't duplicate existing lines created by you."
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.period:0
+msgid "Stock and Sales Period"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,company_forecast:0
+msgid "Company Forecast"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,product_uom:0
+#: help:stock.sale.forecast,product_uom:0
+msgid ""
+"Unit of Measure used to show the quanities of stock calculation.You can use "
+"units form default category or from second category (UoS category)."
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.sale.forecast:0
+msgid "Per User :"
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.ui.menu,name:stock_planning.menu_stock_sale_forecast
+#: model:ir.ui.menu,name:stock_planning.menu_stock_sale_forecast_all
+#: view:stock.sale.forecast:0
+msgid "Sales Forecasts"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.period,name:0
+#: field:stock.period.createlines,name:0
+msgid "Period Name"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,user_id:0
+msgid "Created/Validated by"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Internal Supply"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period4_per_company:0
+msgid "This Company Period4"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period5_per_company:0
+msgid "This Company Period5"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period2_per_company:0
+msgid "This Company Period2"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period3_per_company:0
+msgid "This Company Period3"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.period,date_start:0
+#: field:stock.period.createlines,date_start:0
+msgid "Start Date"
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:642
+#: code:addons/stock_planning/stock_planning.py:684
+#, python-format
+msgid ""
+"\n"
+" Already Out: "
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,confirmed_forecasts_only:0
+msgid "Validated Forecasts"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning.createlines,product_categ_id:0
+msgid ""
+"Planning will be created for products from Product Category selected by this "
+"field. This field is ignored when you check \"All Forecasted Product\" box."
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,planned_outgoing:0
+msgid "Planned Out"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.sale.forecast:0
+msgid "Per Department :"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Forecast"
+msgstr ""
+
+#. module: stock_planning
+#: selection:stock.period,state:0
+#: selection:stock.planning,state:0
+#: selection:stock.sale.forecast,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.period:0
+msgid "Closed"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning:0
+#: view:stock.sale.forecast:0
+msgid "Warehouse "
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:646
+#: code:addons/stock_planning/stock_planning.py:688
+#, python-format
+msgid ""
+"\n"
+" Expected Out: "
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.period.createlines:0
+msgid "Create periods for Stock and Sales Planning"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,planned_outgoing:0
+msgid ""
+"Enter planned outgoing quantity from selected Warehouse during the selected "
+"Period of selected Product. To plan this value look at Confirmed Out or "
+"Sales Forecasts. This value should be equal or greater than Confirmed Out."
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.module.module,description:stock_planning.module_meta_information
+msgid ""
+"\n"
+"This module is based on original OpenERP SA module stock_planning version "
+"1.0 of the same name Master Procurement Schedule.\n"
+"\n"
+"Purpose of MPS is to allow create a manual procurement (requisition) apart "
+"of MRP scheduler (which works automatically on minimum stock rules).\n"
+"\n"
+"Terms used in the module:\n"
+"- Stock and Sales Period - is the time (between Start Date and End Date) for "
+"which you plan Stock and Sales Forecast and make Procurement Planning. \n"
+"- Stock and Sales Forecast - is the quantity of products you plan to sell in "
+"the Period.\n"
+"- Stock Planning - is the quantity of products you plan to purchase or "
+"produce for the Period.\n"
+"\n"
+"Because we have another module sale_forecast which uses terms \"Sales "
+"Forecast\" and \"Planning\" as amount values we will use terms \"Stock and "
+"Sales Forecast\" and \"Stock Planning\" to emphasize that we use quantity "
+"values. \n"
+"\n"
+"Activity with this module is divided to three steps:\n"
+"- Creating Periods. Mandatory step.\n"
+"- Creating Sale Forecasts and entering quantities to them. Optional step but "
+"useful for further planning.\n"
+"- Creating Planning lines, entering quantities to them and making "
+"Procurement. Making procurement is the final step for the Period.\n"
+"\n"
+"Periods\n"
+"=======\n"
+"You have two menu items for Periods in \"Sales Management - Configuration\". "
+"There are:\n"
+"- \"Create Sales Periods\" - Which automates creating daily, weekly or "
+"monthly periods.\n"
+"- \"Stock and sales Periods\" - Which allows to create any type of periods, "
+"change the dates and change the State of period.\n"
+"\n"
+"Creating periods is the first step you have to do to use modules features. "
+"You can create custom periods using \"New\" button in \"Stock and Sales "
+"Periods\" form or view but it is recommended to use automating tool.\n"
+"\n"
+"Remarks:\n"
+"- These periods (officially Stock and Sales Periods) are separated of "
+"Financial or other periods in the system.\n"
+"- Periods are not assigned to companies (when you use multicompany feature "
+"at all). Module suppose that you use the same periods across companies. If "
+"you wish to use different periods for different companies define them as you "
+"wish (they can overlap). Later on in this text will be indications how to "
+"use such periods.\n"
+"- When periods are created automatically their start and finish dates are "
+"with start hour 00:00:00 and end hour 23:59:00. Fe. when you create daily "
+"periods they will have start date 31.01.2010 00:00:00 and end date "
+"31.01.2010 23:59:00. It works only in automatic creation of periods. When "
+"you create periods manually you have to take care about hours because you "
+"can have incorrect values form sales or stock. \n"
+"- If you use overlapping periods for the same product, warehouse and company "
+"results can be unpredictable.\n"
+"- If current date doesn't belong to any period or you have holes between "
+"periods results can be unpredictable.\n"
+"\n"
+"Sales Forecasts\n"
+"===============\n"
+"You have few menus for Sales forecast in \"Sales Management - Sales "
+"Forecasts\".\n"
+"- \"Create Sales Forecasts for Sales Periods\" - which automates creating "
+"forecasts lines according to some parameters.\n"
+"- \"Sales Forecasts\" - few menus for working with forecasts lists and "
+"forms.\n"
+"\n"
+"Menu \"Create Sales Forecasts for Sales Periods\" creates Forecasts for "
+"products from selected Category, for selected Period and for selected "
+"Warehouse. It is an option \"Copy Last Forecast\" to copy forecast and other "
+"settings of period before this one to created one.\n"
+"\n"
+"Remarks:\n"
+"- This tool doesn't create lines, if relevant lines (for the same Product, "
+"Period, Warehouse and validated or created by you) already exists. If you "
+"wish to create another forecast, if relevant lines exists you have to do it "
+"manually using menus described bellow.\n"
+"- When created lines are validated by someone else you can use this tool to "
+"create another lines for the same Period, Product and Warehouse. \n"
+"- When you choose \"Copy Last Forecast\" created line takes quantity and "
+"some settings from your (validated by you or created by you if not validated "
+"yet) forecast which is for last period before period of created forecast. If "
+"there are few your forecasts for period before this one (it is possible) "
+"system takes one of them (no rule which of them).\n"
+"\n"
+"\n"
+"Menus \"Sales Forecasts\"\n"
+"On \"Sales Forecast\" form mainly you have to enter a forecast quantity in "
+"\"Product Quantity\". Further calculation can work for draft forecasts. But "
+"validation can save your data against any accidental changes. You can click "
+"\"Validate\" button but it is not mandatory.\n"
+"\n"
+"Instead of forecast quantity you can enter amount of forecast sales in field "
+"\"Product Amount\". System will count quantity from amount according to Sale "
+"price of the Product.\n"
+"\n"
+"All values on the form are expressed in unit of measure selected on form. "
+"You can select one of unit of measure from default category or from second "
+"category. When you change unit of measure the quanities will be recalculated "
+"according to new UoM: editable values (blue fields) immediately, non edited "
+"fields after clicking of \"Calculate Planning\" button.\n"
+"\n"
+"To find proper value for Sale Forecast you can use \"Sales History\" table "
+"for this product. You have to enter parameters to the top and left of this "
+"table and system will count sale quantities according to these parameters. "
+"So you can select fe. your department (at the top) then (to the left): last "
+"period, period before last and period year ago.\n"
+"\n"
+"Remarks:\n"
+"\n"
+"\n"
+"Procurement Planning\n"
+"====================\n"
+"Menu for Planning you can find in \"Warehouse - Stock Planning\".\n"
+"- \"Create Stock Planning Lines\" - allows you to automate creating planning "
+"lines according to some parameters.\n"
+"- \"Master Procurement Scheduler\" - is the most important menu of the "
+"module which allows to create procurement.\n"
+"\n"
+"As Sales forecast is phase of planning sales. The Procurement Planning "
+"(Planning) is the phase of scheduling Purchasing or Producing. You can "
+"create Procurement Planning quickly using tool from menu \"Create Stock "
+"Planning Lines\", then you can review created planning and make procurement "
+"using menu \"Master Procurement Schedule\".\n"
+"\n"
+"Menu \"Create Stock Planning Lines\" allows you to create quickly Planning "
+"lines for products from selected Category, for selected Period, and for "
+"selected Warehouse. When you check option \"All Products with Forecast\" "
+"system creates lines for all products having forecast for selected Period "
+"and Warehouse. Selected Category will be ignored in this case.\n"
+"\n"
+"Under menu \"Master Procurement Scheduler\" you can generally change the "
+"values \"Planned Out\" and \"Planned In\" to observe the field \"Stock "
+"Simulation\" and decide if this value would be accurate for end of the "
+"Period. \n"
+"\"Planned Out\" can be based on \"Warehouse Forecast\" which is the sum of "
+"all forecasts for Period and Warehouse. But your planning can be based on "
+"any other information you have. It is not necessary to have any forecast. \n"
+"\"Planned In\" quantity is used to calculate field \"Incoming Left\" which "
+"is the quantity to be procured to make stock as indicated in \"Stock "
+"Simulation\" at the end of Period. You can compare \"Stock Simulation\" "
+"quantity to minimum stock rules visible on the form. But you can plan "
+"different quantity than in Minimum Stock Rules. Calculation is made for "
+"whole Warehouse by default. But if you want to see values for Stock location "
+"of calculated warehouse you can use check box \"Stock Location Only\".\n"
+"\n"
+"If after few tries you decide that you found correct quantities for "
+"\"Planned Out\" and \"Planned In\" and you are satisfied with end of period "
+"stock calculated in \"Stock Simulation\" you can click \"Procure Incoming "
+"Left\" button to procure quantity of field \"Incoming Left\" into the "
+"Warehouse. System creates appropriate Procurement Order. You can decide if "
+"procurement will be made to Stock or Input location of calculated Warehouse. "
+"\n"
+"\n"
+"If you don't want to Produce or Buy the product but just pick calculated "
+"quantity from another warehouse you can click \"Supply from Another "
+"Warehouse\" (instead of \"Procure Incoming Left\"). System creates pick list "
+"with move from selected source Warehouse to calculated Warehouse (as "
+"destination). You can also decide if this pick should be done from Stock or "
+"Output location of source warehouse. Destination location (Stock or Input) "
+"of destination warehouse will be used as set for \"Procure Incoming Left\". "
+"\n"
+"\n"
+"To see proper quantities in fields \"Confirmed In\", \"Confirmed Out\", "
+"\"Confirmed In Before\", \"Planned Out Before\" and \"Stock Simulation\" you "
+"have to click button \"Calculate Planning\".\n"
+"\n"
+"All values on the form are expressed in unit of measure selected on form. "
+"You can select one of unit of measure from default category or from second "
+"category. When you change unit of measure the quanities will be recalculated "
+"according to new UoM: editable values (blue fields) immediately, non edited "
+"fields after clicking of \"Calculate Planning\" button.\n"
+"\n"
+"How Stock Simulation field is calculated:\n"
+"Generally Stock Simulation shows the stock for end of the calculated period "
+"according to some planned or confirmed stock moves. Calculation always "
+"starts with quantity of real stock of beginning of current period. Then "
+"calculation adds or subtracts quantities of calculated period or periods "
+"before calculated.\n"
+"When you are in the same period (current period is the same as calculated) "
+"Stock Simulation is calculated as follows:\n"
+"Stock Simulation = \n"
+"\tStock of beginning of current Period\n"
+"\t- Planned Out \n"
+"\t+ Planned In\n"
+"\n"
+"When you calculate period next to current:\n"
+"Stock Simulation = \n"
+"\tStock of beginning of current Period\n"
+"\t- Planned Out of current Period \n"
+"\t+ Confirmed In of current Period  (incl. Already In)\n"
+"\t- Planned Out of calculated Period \n"
+"\t+ Planned In of calculated Period .\n"
+"\n"
+"As you see calculated Period is taken the same way like in case above. But "
+"calculation of current Period are made a little bit different. First you "
+"should note that system takes for current Period only Confirmed In moves. It "
+"means that you have to make planning and procurement for current Period "
+"before this calculation (for Period next to current). \n"
+"\n"
+"When you calculate Period ahead:\n"
+"Stock Simulation = \n"
+"\tStock of beginning of current Period \n"
+"\t- Sum of Planned Out of Periods before calculated \n"
+"\t+ Sum of Confirmed In of Periods before calculated (incl. Already In) \n"
+"\t- Planned Out of calculated Period \n"
+"\t+ Planned In of calculated Period.\n"
+"\n"
+"Periods before calculated means periods starting from current till period "
+"before calculated.\n"
+"\n"
+"Remarks:\n"
+"- Remember to make planning for all periods before calculated because "
+"omitting these quantities and procurements can cause wrong suggestions for "
+"procurements few periods ahead.\n"
+"- If you made planning few periods ahead and you find that real Confirmed "
+"Out is bigger than Planned Out in some periods before you can repeat "
+"Planning and make another procurement. You should do it in the same planning "
+"line. If you create another planning line the suggestions can be wrong.\n"
+"- When you wish to work with different periods for some part of products "
+"define two kinds of periods (fe. Weekly and Monthly) and use them for "
+"different products. Example: If you use always Weekly periods for Products "
+"A, and Monthly periods for Products B your all calculations will work "
+"correctly. You can also use different kind of periods for the same products "
+"from different warehouse or companies. But you cannot use overlapping "
+"periods for the same product, warehouse and company because results can be "
+"unpredictable. The same apply to Forecasts lines.\n"
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:140
+#, python-format
+msgid "Cannot delete Validated Sale Forecasts !"
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:641
+#: code:addons/stock_planning/stock_planning.py:683
+#, python-format
+msgid ""
+"\n"
+" Planned Out: "
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:667
+#, python-format
+msgid ""
+"You must specify a Source Warehouse different than calculated (destination) "
+"Warehouse !"
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.actions.act_window,name:stock_planning.action_stock_sale_forecast_createlines_form
+#: model:ir.ui.menu,name:stock_planning.menu_stock_sale_forecast_createlines
+msgid "Create Sales Forecasts"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.sale.forecast.createlines:0
+msgid "Creates forecast lines for selected warehouse and period."
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:655
+#, python-format
+msgid "Requisition ("
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,outgoing_left:0
+msgid ""
+"Quantity expected to go out in selected period. As a difference between "
+"Planned Out and Confirmed Out. For current period Already Out is also "
+"calculated"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period4_id:0
+msgid "Period4"
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:642
+#: code:addons/stock_planning/stock_planning.py:684
+#, python-format
+msgid "    Already In: "
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period2_id:0
+msgid "Period2"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period3_id:0
+msgid "Period3"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period1_id:0
+msgid "Period1"
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:647
+#: code:addons/stock_planning/stock_planning.py:689
+#, python-format
+msgid "    Minimum stock: "
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,active_uom:0
+#: field:stock.sale.forecast,active_uom:0
+msgid "Active UoM"
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.actions.act_window,name:stock_planning.action_stock_planning_createlines_form
+#: model:ir.ui.menu,name:stock_planning.menu_stock_planning_createlines
+#: view:stock.planning.createlines:0
+msgid "Create Stock Planning Lines"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "General Info"
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.actions.act_window,name:stock_planning.action_view_stock_sale_forecast_form
+msgid "Sales Forecast"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Planning and Situation for Calculated Period"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period1_per_warehouse:0
+msgid "This Warehouse Period1"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,warehouse_forecast:0
+msgid "Warehouse Forecast"
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:643
+#: code:addons/stock_planning/stock_planning.py:685
+#, python-format
+msgid "    Confirmed In: "
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.sale.forecast:0
+msgid "Sales history"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,supply_warehouse_id:0
+msgid "Source Warehouse"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.sale.forecast,product_qty:0
+msgid "Forecasted quantity."
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Stock"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,stock_supply_location:0
+msgid "Stock Supply Location"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.period.createlines,date_stop:0
+msgid "Ending date for planning period."
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period2_per_user:0
+msgid "This User Period2"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning.createlines,forecasted_products:0
+msgid ""
+"Check this box to create planning for all products having any forecast for "
+"selected Warehouse and Period. Product Category field will be ignored."
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,already_in:0
+msgid "Already In"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,product_uom_categ:0
+#: field:stock.planning,product_uos_categ:0
+#: field:stock.sale.forecast,product_uom_categ:0
+msgid "Product UoM Category"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,incoming:0
+msgid "Confirmed In"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,line_time:0
+msgid "Past/Future"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,product_uos_categ:0
+msgid "Product UoS Category"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,product_qty:0
+msgid "Product Quantity"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast.createlines,copy_forecast:0
+msgid "Copy Last Forecast"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.sale.forecast,product_id:0
+msgid "Shows which product this forecast concerns."
+msgstr ""
+
+#. module: stock_planning
+#: selection:stock.planning,state:0
+msgid "Done"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.period.createlines,period_ids:0
+msgid "Periods"
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:638
+#: code:addons/stock_planning/stock_planning.py:680
+#, python-format
+msgid " according to state:"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.period.createlines:0
+msgid "Cancel"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.period:0
+#: selection:stock.period,state:0
+#: view:stock.planning.createlines:0
+#: view:stock.sale.forecast.createlines:0
+msgid "Close"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.sale.forecast:0
+#: selection:stock.sale.forecast,state:0
+msgid "Validated"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.period:0
+#: selection:stock.period,state:0
+msgid "Open"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.sale.forecast.createlines,copy_forecast:0
+msgid "Copy quantities from last Stock and Sale Forecast."
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period1_per_dept:0
+msgid "This Dept Period1"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period3_per_dept:0
+msgid "This Dept Period3"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period2_per_dept:0
+msgid "This Dept Period2"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period5_per_dept:0
+msgid "This Dept Period5"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period4_per_dept:0
+msgid "This Dept Period4"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period2_per_warehouse:0
+msgid "This Warehouse Period2"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period3_per_warehouse:0
+msgid "This Warehouse Period3"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,outgoing:0
+msgid "Confirmed Out"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,create_uid:0
+msgid "Responsible"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.sale.forecast:0
+msgid "Default UOM"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period4_per_warehouse:0
+msgid "This Warehouse Period4"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period5_per_warehouse:0
+msgid "This Warehouse Period5"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.period:0
+msgid "Current"
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.model,name:stock_planning.model_stock_planning
+msgid "stock.planning"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.sale.forecast,warehouse_id:0
+msgid ""
+"Shows which warehouse this forecast concerns. If during stock planning you "
+"will need sales forecast for all warehouses choose any warehouse now."
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning.createlines,warehouse_id:0
+msgid "Warehouse which planning will concern."
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:647
+#: code:addons/stock_planning/stock_planning.py:689
+#, python-format
+msgid ""
+"\n"
+" Stock Simulation: "
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,to_procure:0
+msgid ""
+"Enter quantity which (by your plan) should come in. Change this value and "
+"observe Stock simulation. This value should be equal or greater than "
+"Confirmed In."
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning.createlines,period_id:0
+msgid "Period which planning will concern."
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,already_out:0
+msgid "Already Out"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,product_id:0
+msgid "Product which this planning is created for."
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.sale.forecast:0
+msgid "Per Warehouse :"
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:639
+#: code:addons/stock_planning/stock_planning.py:681
+#, python-format
+msgid ""
+"\n"
+" Warehouse Forecast: "
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,history:0
+msgid "Procurement History"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.period.createlines,date_start:0
+msgid "Starting date for planning period."
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:641
+#: code:addons/stock_planning/stock_planning.py:683
+#, python-format
+msgid "    Planned In: "
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyze_company:0
+msgid "Per Company"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,incoming_left:0
+msgid ""
+"Quantity left to Planned incoming quantity. This is calculated difference "
+"between Planned In and Confirmed In. For current period Already In is also "
+"calculated. This value is used to create procurement for lacking quantity."
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,incoming:0
+msgid "Quantity of all confirmed incoming moves in calculated Period."
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.period,date_stop:0
+#: field:stock.period.createlines,date_stop:0
+msgid "End Date"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,stock_supply_location:0
+msgid ""
+"Check to supply from Stock location of Supply Warehouse. If not checked "
+"supply will be made from Output location of Supply Warehouse. Used in "
+"'Supply from Another Warhouse' with Supply Warehouse."
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "No Requisition"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,minimum_op:0
+msgid "Minimum quantity set in Minimum Stock Rules for this Warhouse"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.sale.forecast,period_id:0
+msgid "Shows which period this forecast concerns."
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,product_uom:0
+msgid "UoM"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Calculated Period Simulation"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning:0
+#: field:stock.planning,product_id:0
+#: view:stock.sale.forecast:0
+#: field:stock.sale.forecast,product_id:0
+msgid "Product"
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:638
+#: code:addons/stock_planning/stock_planning.py:680
+#, python-format
+msgid ""
+"\n"
+"For period: "
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,product_uom:0
+msgid "Product UoM"
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:627
+#: code:addons/stock_planning/stock_planning.py:671
+#: code:addons/stock_planning/stock_planning.py:693
+#, python-format
+msgid "MPS("
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:678
+#, python-format
+msgid "Pick created from MPS by user: "
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,procure_to_stock:0
+msgid "Procure To Stock Location"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.sale.forecast:0
+msgid "Approve"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,period_id:0
+msgid ""
+"Period for this planning. Requisition will be created for beginning of the "
+"period."
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.sale.forecast:0
+msgid "Calculate Sales History"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,product_amt:0
+msgid "Product Amount"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,confirmed_forecasts_only:0
+msgid ""
+"Check to take validated forecasts only. If not checked system takes "
+"validated and draft forecasts."
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period5_id:0
+msgid "Period5"
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.actions.act_window,name:stock_planning.action_stock_period_createlines_form
+msgid "Stock and Sales Planning Periods"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_warehouse_id:0
+msgid "This Warehouse"
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.actions.act_window,name:stock_planning.action_stock_period_form
+#: model:ir.ui.menu,name:stock_planning.menu_stock_period
+#: model:ir.ui.menu,name:stock_planning.menu_stock_period_main
+#: view:stock.period:0
+#: view:stock.period.createlines:0
+msgid "Stock and Sales Periods"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.sale.forecast,user_id:0
+msgid "Shows who created this forecast, or who validated."
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:644
+#: code:addons/stock_planning/stock_planning.py:686
+#, python-format
+msgid ""
+"\n"
+" Planned Out Before: "
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,stock_start:0
+msgid "Initial Stock"
+msgstr ""

From 19fce03f9dd0742018a32443389d4fc7a7700695 Mon Sep 17 00:00:00 2001
From: "RME (OpenERP)" <rme@tinyerp.com>
Date: Thu, 7 Apr 2011 11:49:38 +0530
Subject: [PATCH 079/331] [FIX] crm : meeting invitation having improper label
 Mail TO

bzr revid: rme@tinyerp.com-20110407061938-l7m2mu4lg1lbpmr6
---
 addons/crm/crm_meeting_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index aba69889f57..3b87672d081 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -102,7 +102,7 @@
                             <tree string="Invitation details" editable="top">
                                 <field name="sent_by_uid" string="From"/>
                                 <field name="user_id" string="To"/>
-                                <field name="email" string="Mail TO"/>
+                                <field name="email" string="Mail To"/>
                                 <field name="role" select="1" />
                                 <field name="state" />
                                 <button name="do_tentative"

From 0cab8e6972f6206f7351363f7f48c0327547e0ae Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Thu, 7 Apr 2011 11:59:12 +0200
Subject: [PATCH 080/331] [IMP] Actions handling wip

bzr revid: nicolas.vanhoren@openerp.com-20110407095912-r6cqswx9pvo684ek
---
 addons/base/controllers/main.py    | 26 +++++++++++++++-----------
 addons/base/static/src/js/views.js | 28 +++++++++++++++++++++-------
 openerpweb/openerpweb.py           |  4 ++++
 3 files changed, 40 insertions(+), 18 deletions(-)

diff --git a/addons/base/controllers/main.py b/addons/base/controllers/main.py
index 4e27f3cb4a8..d06c42bb935 100644
--- a/addons/base/controllers/main.py
+++ b/addons/base/controllers/main.py
@@ -177,20 +177,24 @@ def load_actions_from_ir_values(req, key, key2, models, meta, context):
     actions = Values.get(key, key2, models, meta, context)
 
     for _, _, action in actions:
-        # values come from the server, we can just eval them
-        if isinstance(action['context'], basestring):
-            action['context'] = eval(
-                action['context'],
-                req.session.evaluation_context()) or {}
+        clean_action(action, req.session)
 
-        if isinstance(action['domain'], basestring):
-            action['domain'] = eval(
-                action['domain'],
-                req.session.evaluation_context(
-                    action['context'])) or []
-        fix_view_modes(action)
     return actions
 
+def clean_action(action, session):
+    # values come from the server, we can just eval them
+    if isinstance(action['context'], basestring):
+        action['context'] = eval(
+            action['context'],
+            session.evaluation_context()) or {}
+
+    if isinstance(action['domain'], basestring):
+        action['domain'] = eval(
+            action['domain'],
+            session.evaluation_context(
+                action['context'])) or []
+    fix_view_modes(action)
+
 def fix_view_modes(action):
     """ For historical reasons, OpenERP has weird dealings in relation to
     view_mode and the view_type attribute (on window actions):
diff --git a/addons/base/static/src/js/views.js b/addons/base/static/src/js/views.js
index 4ffb9076a19..d656bc0550c 100644
--- a/addons/base/static/src/js/views.js
+++ b/addons/base/static/src/js/views.js
@@ -20,7 +20,7 @@ openerp.base.ActionManager = openerp.base.Controller.extend({
             if (this.viewmanager) {
                 this.viewmanager.stop();
             }
-            this.viewmanager = new openerp.base.ViewManager(this.session,this.element_id, false);
+            this.viewmanager = new openerp.base.ViewManager(this.session,this.element_id, true);
             this.viewmanager.do_action_window(action);
             this.viewmanager.start();
         }
@@ -33,17 +33,17 @@ openerp.base.ActionManager = openerp.base.Controller.extend({
 openerp.base.views = new openerp.base.Registry();
 
 openerp.base.ViewManager =  openerp.base.Controller.extend({
-    init: function(session, element_id, desactivate_sidebar) {
+    init: function(session, element_id, has_sidebar) {
         this._super(session, element_id);
         this.action = null;
         this.dataset = null;
         this.searchview = null;
         this.active_view = null;
         this.views = {};
-        if (desactivate_sidebar)
-            this.sidebar = null;
-        else
+        if (has_sidebar)
             this.sidebar = new openerp.base.Sidebar(null, this);
+        else
+            this.sidebar = null;
     },
     start: function() {
         if (this.sidebar) {
@@ -307,8 +307,7 @@ openerp.base.Sidebar = openerp.base.BaseWidget.extend({
             var i = $this.attr("data-i");
             var j = $this.attr("data-i");
             var action = self.sections[i].elements[j];
-            // I know this doesn't work, one day it will
-            new openerp.base.ActionManager(this.view_manager, null).do_action(action);
+            openerp.base.handle_action(self.view_manager.session, action);
             e.stopPropagation();
             e.preventDefault();
         });
@@ -319,6 +318,21 @@ openerp.base.Sidebar = openerp.base.BaseWidget.extend({
     }
 });
 
+openerp.base.handle_action = function(session, action) {
+    if(action.type=="ir.actions.act_window") {
+        if(action.target=="new") {
+            var element_id = _.uniqueId("act_window_dialog");
+            var dialog = $('<div id="'+element_id+'"></div>');
+            dialog.dialog({
+                title: action.name
+            });
+            var viewmanager = new openerp.base.ViewManager(session,element_id, false);
+            viewmanager.do_action_window(action);
+            viewmanager.start();
+        }
+    }
+};
+
 openerp.base.views.add('calendar', 'openerp.base.CalendarView');
 
 openerp.base.CalendarView = openerp.base.Controller.extend({
diff --git a/openerpweb/openerpweb.py b/openerpweb/openerpweb.py
index 59fa21e27a0..e59f76908e9 100644
--- a/openerpweb/openerpweb.py
+++ b/openerpweb/openerpweb.py
@@ -17,6 +17,7 @@ import simplejson
 
 import nonliterals
 import xmlrpctimeout
+import logging
 
 #----------------------------------------------------------
 # OpenERP Client Library
@@ -320,6 +321,8 @@ class JsonRequest(object):
                 }
             }
         except Exception:
+            cherrypy.log("An error occured while handling a json request",
+                         severity=logging.ERROR, traceback=True)
             error = {
                 'code': 300,
                 'message': "OpenERP WebClient Error",
@@ -470,3 +473,4 @@ def main(argv):
     cherrypy.server.subscribe()
     cherrypy.engine.start()
     cherrypy.engine.block()
+

From d1128469dbbba4a4d6faa1079df4d766101611dc Mon Sep 17 00:00:00 2001
From: "RME (OpenERP)" <rme@tinyerp.com>
Date: Thu, 7 Apr 2011 16:19:20 +0530
Subject: [PATCH 081/331] [FIX] project_scrum : when click on postpone button
 than also button appears in cancel or done state

bzr revid: rme@tinyerp.com-20110407104920-mgv3rfi1aruoipxf
---
 addons/project_scrum/project_scrum_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/project_scrum/project_scrum_view.xml b/addons/project_scrum/project_scrum_view.xml
index 82c19c09238..99b74157466 100644
--- a/addons/project_scrum/project_scrum_view.xml
+++ b/addons/project_scrum/project_scrum_view.xml
@@ -63,7 +63,7 @@
                         <field domain="[('project_id','=',project_id), ('state','in', ['draft','open'])]" name="sprint_id" select="1"/>
      					<button name="%(action_postpone_wizard)d" string="Postpone" type="action"
 							help="Postpone backlog" colspan="2"
-                         icon="gtk-convert"  attrs="{'invisible':[('state','=','done')]}"/>
+                         icon="gtk-convert"  attrs="{'invisible':[('state','in',['done', 'cancel'])]}"/>
                         <field name="user_id" select="1"/>
                         <field name="sequence" groups="base.group_extended"/>
                         <field name="create_date"/>

From 2a86b85cadbd3895e04f79b97b51c9b77fd0e149 Mon Sep 17 00:00:00 2001
From: "vda (OpenERP)" <vda@tinyerp.com>
Date: Thu, 7 Apr 2011 16:48:18 +0530
Subject: [PATCH 082/331] [ADD] Diagragm using Raphel javascript Library.

bzr revid: vda@tinyerp.com-20110407111818-3j2l1ciknar2r2qd
---
 addons/base/static/src/base.html              |   6 +
 addons/base/static/src/js/base.js             |   1 +
 addons/base/static/src/xml/base.xml           |   4 +
 addons/base_diagram/__init__.py               |   1 +
 addons/base_diagram/__openerp__.py            |   6 +
 addons/base_diagram/controllers/__init__.py   |   1 +
 addons/base_diagram/controllers/main.py       | 125 ++++
 .../base_diagram/static/lib/js/Curry-1.0.1.js |  29 +
 .../static/lib/js/dracula_algorithms.js       | 599 ++++++++++++++++++
 .../static/lib/js/dracula_graffle.js          | 106 ++++
 .../static/lib/js/dracula_graph.coffee        | 524 +++++++++++++++
 .../static/lib/js/dracula_graph.js            | 525 +++++++++++++++
 .../base_diagram/static/lib/js/raphael-min.js |   7 +
 .../base_diagram/static/lib/js/seedrandom.js  | 266 ++++++++
 addons/base_diagram/static/src/js/diagram.js  | 175 +++++
 addons/base_diagram/static/src/js/views.js    |  12 -
 16 files changed, 2375 insertions(+), 12 deletions(-)
 create mode 100644 addons/base_diagram/__init__.py
 create mode 100644 addons/base_diagram/__openerp__.py
 create mode 100644 addons/base_diagram/controllers/__init__.py
 create mode 100644 addons/base_diagram/controllers/main.py
 create mode 100644 addons/base_diagram/static/lib/js/Curry-1.0.1.js
 create mode 100644 addons/base_diagram/static/lib/js/dracula_algorithms.js
 create mode 100644 addons/base_diagram/static/lib/js/dracula_graffle.js
 create mode 100644 addons/base_diagram/static/lib/js/dracula_graph.coffee
 create mode 100644 addons/base_diagram/static/lib/js/dracula_graph.js
 create mode 100644 addons/base_diagram/static/lib/js/raphael-min.js
 create mode 100644 addons/base_diagram/static/lib/js/seedrandom.js
 create mode 100644 addons/base_diagram/static/src/js/diagram.js
 delete mode 100644 addons/base_diagram/static/src/js/views.js

diff --git a/addons/base/static/src/base.html b/addons/base/static/src/base.html
index 8bb4793d42c..f6f7742343c 100644
--- a/addons/base/static/src/base.html
+++ b/addons/base/static/src/base.html
@@ -23,6 +23,12 @@
     <script type="text/javascript" src="/base/static/src/js/list.js"></script>
     <script type="text/javascript" src="/base/static/src/js/search.js"></script>
     <script type="text/javascript" src="/base/static/src/js/views.js"></script>
+	
+	<script type="text/javascript" src="/base_diagram/static/src/js/diagram.js"></script>
+	<script type="text/javascript" src="/base_diagram/static/lib/js/raphael-min.js"></script>
+	<script type="text/javascript" src="/base_diagram/static/lib/js/dracula_graffle.js"></script>
+	<script type="text/javascript" src="/base_diagram/static/lib/js/dracula_graph.js"></script>
+	
 
     <link rel="stylesheet" type="text/css" media="screen" href="/base/static/lib/jquery.ui/css/smoothness/jquery-ui-1.8.9.custom.css" />
     <link rel="stylesheet" type="text/css" media="screen" href="/base/static/lib/jquery.ui.notify/css/ui.notify.css" />
diff --git a/addons/base/static/src/js/base.js b/addons/base/static/src/js/base.js
index 4833551c24e..3adf4129cbb 100644
--- a/addons/base/static/src/js/base.js
+++ b/addons/base/static/src/js/base.js
@@ -122,6 +122,7 @@ openerp.base = function(instance) {
     openerp.base.search(instance);
     openerp.base.list(instance);
     openerp.base.form(instance);
+	openerp.base.diagram(instance);
 };
 
 // vim:et fdc=0 fdl=0 foldnestmax=3 fdm=syntax:
diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml
index 9a41ba630f3..8d8040fd48e 100644
--- a/addons/base/static/src/xml/base.xml
+++ b/addons/base/static/src/xml/base.xml
@@ -167,6 +167,10 @@
     </div>
     <table id="todo_use_unique_id" class="jqGrid"></table>
 </t>
+<t t-name="DiagramView">
+	<h2 class="oe_view_title"><t t-esc="fields_view.arch.attrs.string"/></h2>
+	<div id="dia-canvas"></div>
+</t>
 <t t-name="FormView">
     <h2 class="oe_view_title"><t t-esc="view.fields_view.arch.attrs.string"/></h2>
     <div class="oe_form_header">
diff --git a/addons/base_diagram/__init__.py b/addons/base_diagram/__init__.py
new file mode 100644
index 00000000000..355939a4922
--- /dev/null
+++ b/addons/base_diagram/__init__.py
@@ -0,0 +1 @@
+import controllers
\ No newline at end of file
diff --git a/addons/base_diagram/__openerp__.py b/addons/base_diagram/__openerp__.py
new file mode 100644
index 00000000000..fb2a849f630
--- /dev/null
+++ b/addons/base_diagram/__openerp__.py
@@ -0,0 +1,6 @@
+{
+    "name" : "OpenERP Web base Diagram",
+    "version" : "2.0",
+    "depends" : [],
+    'active': True,
+}
diff --git a/addons/base_diagram/controllers/__init__.py b/addons/base_diagram/controllers/__init__.py
new file mode 100644
index 00000000000..039d9715fab
--- /dev/null
+++ b/addons/base_diagram/controllers/__init__.py
@@ -0,0 +1 @@
+import main
\ No newline at end of file
diff --git a/addons/base_diagram/controllers/main.py b/addons/base_diagram/controllers/main.py
new file mode 100644
index 00000000000..b742021b5d7
--- /dev/null
+++ b/addons/base_diagram/controllers/main.py
@@ -0,0 +1,125 @@
+from base.controllers.main import View
+import openerpweb
+
+class DiagramView(View):
+    _cp_path = "/base_diagram/diagram"
+
+    @openerpweb.jsonrequest
+    def load(self, req, model, view_id):
+        fields_view = self.fields_view_get(req.session, model, view_id, 'diagram')
+        return {'fields_view': fields_view}
+    
+    @openerpweb.jsonrequest
+    def get_diagram_info(self, req, **kw):
+        id = kw['id']
+        model = kw['model']
+        node = kw['node']
+        connector = kw['connector']
+        src_node = kw['src_node']
+        des_node = kw['des_node']
+        
+        visible_node_fields = kw.get('visible_node_fields',[])
+        invisible_node_fields = kw.get('invisible_node_fields',[])
+        node_fields_string = kw.get('node_fields_string',[])
+        connector_fields = kw.get('connector_fields',[])
+        connector_fields_string = kw.get('connector_fields_string',[])
+        
+        bgcolors = {}
+        shapes = {}
+        bgcolor = kw.get('bgcolor','')
+        shape = kw.get('shape','')
+        
+        if bgcolor:
+            for color_spec in bgcolor.split(';'):
+                if color_spec:
+                    colour, color_state = color_spec.split(':')
+                    bgcolors[colour] = color_state
+                    
+        if shape:
+            for shape_spec in shape.split(';'):
+                if shape_spec:
+                    shape_colour, shape_color_state = shape_spec.split(':')
+                    shapes[shape_colour] = shape_color_state
+                    
+        ir_view = req.session.model('ir.ui.view')
+        graphs = ir_view.graph_get(id, model, node, connector, src_node, des_node, False,
+                          (140, 180), req.session.context)
+        
+        nodes = graphs['nodes']
+        transitions = graphs['transitions']
+        isolate_nodes = {}
+        
+        for node in graphs['blank_nodes']:
+            isolate_nodes[node['id']] = node
+        else:
+            y = map(lambda t: t['y'],filter(lambda x: x['y'] if x['x']==20 else None, nodes.values()))
+            y_max = (y and max(y)) or 120
+        
+        connectors = {}
+        list_tr = []
+
+        for tr in transitions:
+            list_tr.append(tr)
+            connectors.setdefault(tr, {
+                'id': tr,
+                's_id': transitions[tr][0],
+                'd_id': transitions[tr][1]
+            })
+        connector_tr = req.session.model(connector)
+        connector_ids = connector_tr.search([('id', 'in', list_tr)], 0, 0, 0, req.session.context)
+        
+        data_connectors =connector_tr.read(connector_ids, connector_fields, req.session.context)
+        
+        
+        for tr in data_connectors:
+            t = connectors.get(str(tr['id']))
+            t.update({
+                      'source': tr[src_node][1],
+                      'destination': tr[des_node][1],
+                      'options': {}
+                      })
+
+            for i, fld in enumerate(connector_fields):
+                t['options'][connector_fields_string[i]] = tr[fld]
+        
+        fields = req.session.model('ir.model.fields')
+        field_ids = fields.search([('model', '=', model), ('relation', '=', node)], 0, 0, 0, req.session.context)
+        field_data = fields.read(field_ids, ['relation_field'], req.session.context)
+        
+        node_act = req.session.model(node)
+        search_acts = node_act.search([(field_data[0]['relation_field'], '=', id)], 0, 0, 0, req.session.context)
+        data_acts = node_act.read(search_acts, invisible_node_fields + visible_node_fields, req.session.context)
+        
+        for act in data_acts:
+            n = nodes.get(str(act['id']))
+            if not n:
+                n = isolate_nodes.get(act['id'], {})
+                y_max += 140
+                n.update({'x': 20, 'y': y_max})
+                nodes[act['id']] = n
+
+            n.update(
+                id=act['id'],
+                color='white',
+                shape='ellipse',
+                options={}
+            )
+            for color, expr in bgcolors.items():
+                if eval(expr, act):
+                    n['color'] = color
+
+            for shape, expr in shapes.items():
+                if eval(expr, act):
+                    n['shape'] = shape
+
+            for i, fld in enumerate(visible_node_fields):
+                n['options'][node_fields_string[i]] = act[fld]
+                
+        #to relate m2o field of transition to corresponding o2m in activity
+        in_transition_field_id = fields.search([('relation', '=', connector), ('relation_field', '=', des_node), ('model', '=', node)], 0, 0, 0, req.session.context)
+        in_transition_field = fields.read(in_transition_field_id[0], ['name'], req.session.context)['name']
+
+        out_transition_field_id = fields.search([('relation', '=', connector), ('relation_field', '=', src_node), ('model', '=', node)], 0, 0, 0, req.session.context)
+        out_transition_field = fields.read(out_transition_field_id[0], ['name'], req.session.context)['name']
+
+        return dict(nodes=nodes, conn=connectors, in_transition_field=in_transition_field, out_transition_field=out_transition_field)
\ No newline at end of file
diff --git a/addons/base_diagram/static/lib/js/Curry-1.0.1.js b/addons/base_diagram/static/lib/js/Curry-1.0.1.js
new file mode 100644
index 00000000000..f5aa0f993a6
--- /dev/null
+++ b/addons/base_diagram/static/lib/js/Curry-1.0.1.js
@@ -0,0 +1,29 @@
+/**
+ * Curry - Function currying
+ * Copyright (c) 2008 Ariel Flesler - aflesler(at)gmail(dot)com | http://flesler.blogspot.com
+ * Licensed under BSD (http://www.opensource.org/licenses/bsd-license.php)
+ * Date: 10/4/2008
+ *
+ * @author Ariel Flesler
+ * @version 1.0.1
+ */
+
+function curry( fn ){
+	return function(){
+		var args = curry.args(arguments),
+			master = arguments.callee,
+			self = this;
+
+		return args.length >= fn.length ? fn.apply(self,args) :	function(){
+			return master.apply( self, args.concat(curry.args(arguments)) );
+		};
+	};
+};
+
+curry.args = function( args ){
+	return Array.prototype.slice.call(args);
+};
+
+Function.prototype.curry = function(){
+	return curry(this);
+};
\ No newline at end of file
diff --git a/addons/base_diagram/static/lib/js/dracula_algorithms.js b/addons/base_diagram/static/lib/js/dracula_algorithms.js
new file mode 100644
index 00000000000..0fbb0857fc8
--- /dev/null
+++ b/addons/base_diagram/static/lib/js/dracula_algorithms.js
@@ -0,0 +1,599 @@
+/*
+ * Various algorithms and data structures, licensed under the MIT-license.
+ * (c) 2010 by Johann Philipp Strathausen <strathausen@gmail.com>
+ * http://strathausen.eu
+ *
+ */
+
+
+
+/*
+        Bellman-Ford
+    
+    Path-finding algorithm, finds the shortest paths from one node to all nodes.
+    
+    
+        Complexity
+        
+    O( |E| · |V| ), where E = edges and V = vertices (nodes)
+    
+    
+        Constraints
+    
+    Can run on graphs with negative edge weights as long as they do not have
+    any negative weight cycles.
+    
+ */
+function bellman_ford(g, source) {
+
+    /* STEP 1: initialisation */
+    for(var n in g.nodes)
+        g.nodes[n].distance = Infinity;
+        /* predecessors are implicitly null */
+    source.distance = 0;
+    
+    step("Initially, all distances are infinite and all predecessors are null.");
+    
+    /* STEP 2: relax each edge (this is at the heart of Bellman-Ford) */
+    /* repeat this for the number of nodes minus one */
+    for(var i = 1; i < g.nodes.length; i++)
+        /* for each edge */
+        for(var e in g.edges) {
+            var edge = g.edges[e];
+            if(edge.source.distance + edge.weight < edge.target.distance) {
+                step("Relax edge between " + edge.source.id + " and " + edge.target.id + ".");
+                edge.target.distance = edge.source.distance + edge.weight;
+                edge.target.predecessor = edge.source;
+            }
+	    //Added by Jake Stothard (Needs to be tested)
+	    if(!edge.style.directed) {
+		if(edge.target.distance + edge.weight < edge.source.distance) {
+                    g.snapShot("Relax edge between "+edge.target.id+" and "+edge.source.id+".");
+                    edge.source.distance = edge.target.distance + edge.weight;
+                    edge.source.predecessor = edge.target;
+		}
+	    }
+        }
+    step("Ready.");
+    
+    /* STEP 3: TODO Check for negative cycles */
+    /* For now we assume here that the graph does not contain any negative
+       weights cycles. (this is left as an excercise to the reader[tm]) */
+}
+
+
+
+/*
+   Path-finding algorithm Dijkstra
+   
+   - worst-case running time is O((|E| + |V|) · log |V| ) thus better than
+     Bellman-Ford for sparse graphs (with less edges), but cannot handle
+     negative edge weights
+ */
+function dijkstra(g, source) {
+
+    /* initially, all distances are infinite and all predecessors are null */
+    for(var n in g.nodes)
+        g.nodes[n].distance = Infinity;
+        /* predecessors are implicitly null */
+
+    g.snapShot("Initially, all distances are infinite and all predecessors are null.");
+
+    source.distance = 0;
+    /* set of unoptimized nodes, sorted by their distance (but a Fibonacci heap
+       would be better) */
+    var q = new BinaryMinHeap(g.nodes, "distance");
+
+    /* pointer to the node in focus */
+    var node;
+
+    /* get the node with the smallest distance
+       as long as we have unoptimized nodes. q.min() can have O(log n). */
+    while(q.min() != undefined) {
+        /* remove the latest */
+        node = q.extractMin();
+        node.optimized = true;
+
+        /* no nodes accessible from this one, should not happen */
+        if(node.distance == Infinity)
+            throw "Orphaned node!";
+
+        /* for each neighbour of node */
+        for(e in node.edges) {
+	    var other = (node == node.edges[e].target) ? node.edges[e].source : node.edges[e].target;
+		
+            if(other.optimized)
+                continue;
+
+            /* look for an alternative route */
+            var alt = node.distance + node.edges[e].weight;
+            
+            /* update distance and route if a better one has been found */
+            if (alt < other.distance) {
+            
+                /* update distance of neighbour */
+                other.distance = alt;
+
+                /* update priority queue */
+                q.heapify();
+
+                /* update path */
+                other.predecessor = node;
+                g.snapShot("Enhancing node.")
+            }
+        }
+    }
+}
+
+
+/* All-Pairs-Shortest-Paths */
+/* Runs at worst in O(|V|³) and at best in Omega(|V|³) :-)
+   complexity Sigma(|V|²) */
+/* This implementation is not yet ready for general use, but works with the
+   Dracula graph library. */
+function floyd_warshall(g, source) {
+
+    /* Step 1: initialising empty path matrix (second dimension is implicit) */
+    var path = [];
+    var next = [];
+    var n = g.nodes.length;
+
+    /* construct path matrix, initialize with Infinity */
+    for(j in g.nodes) {
+        path[j] = [];
+        next[j] = [];
+        for(i in g.nodes)
+            path[j][i] = j == i ? 0 : Infinity;
+    }   
+    
+    /* initialize path with edge weights */
+    for(e in g.edges)
+        path[g.edges[e].source.id][g.edges[e].target.id] = g.edges[e].weight;
+    
+    /* Note: Usually, the initialisation is done by getting the edge weights
+       from a node matrix representation of the graph, not by iterating through
+       a list of edges as done here. */
+    
+    /* Step 2: find best distances (the heart of Floyd-Warshall) */
+    for(k in g.nodes){
+        for(i in g.nodes) {
+            for(j in g.nodes)
+                if(path[i][j] > path[i][k] + path[k][j]) {
+                    path[i][j] = path[i][k] + path[k][j];
+                    /* Step 2.b: remember the path */
+                    next[i][j] = k;
+                }
+        }
+    }
+
+    /* Step 3: Path reconstruction, get shortest path */
+    function getPath(i, j) {
+        if(path[i][j] == Infinity)
+            throw "There is no path.";
+        var intermediate = next[i][j];
+        if(intermediate == undefined)
+            return null;
+        else
+            return getPath(i, intermediate)
+                .concat([intermediate])
+                .concat(getPath(intermediate, j));
+    }
+
+    /* TODO use the knowledge, e.g. mark path in graph */
+}
+
+/*
+        Ford-Fulkerson
+    
+    Max-Flow-Min-Cut Algorithm finding the maximum flow through a directed
+    graph from source to sink.
+    
+    
+        Complexity
+
+    O(E * max(f)), max(f) being the maximum flow
+    
+    
+        Description
+
+    As long as there is an open path through the residual graph, send the
+    minimum of the residual capacities on the path.
+    
+    
+        Constraints
+    
+    The algorithm works only if all weights are integers. Otherwise it is
+    possible that the Ford–Fulkerson algorithm will not converge to the maximum
+    value.
+    
+    
+        Input
+    
+    g - Graph object
+    s - Source ID
+    t - Target (sink) ID
+    
+    
+        Output
+    
+    Maximum flow from Source s to Target t
+
+ */
+/*
+        Edmonds-Karp
+    
+    Max-Flow-Min-Cut Algorithm finding the maximum flow through a directed
+    graph from source to sink. An implementation of the Ford-Fulkerson
+    algorithm.
+    
+    
+        Complexity
+    
+    O(|V|*|E|²)
+    
+    
+        Input
+        
+    g - Graph object (with node and edge lists, capacity is a property of edge)
+    s - source ID
+    t - sink ID
+    
+ */
+function edmonds_karp(g, s, t) {
+
+}
+
+/*
+   A simple binary min-heap serving as a priority queue
+   - takes an array as the input, with elements having a key property
+   - elements will look like this:
+        {
+            key: "... key property ...", 
+            value: "... element content ..."
+        }
+    - provides insert(), min(), extractMin() and heapify()
+    - example usage (e.g. via the Firebug or Chromium console):
+        var x = {foo: 20, hui: "bla"};
+        var a = new BinaryMinHeap([x,{foo:3},{foo:10},{foo:20},{foo:30},{foo:6},{foo:1},{foo:3}],"foo");
+        console.log(a.extractMin());
+        console.log(a.extractMin());
+        x.foo = 0; // update key
+        a.heapify(); // call this always after having a key updated
+        console.log(a.extractMin());
+        console.log(a.extractMin());
+    - can also be used on a simple array, like [9,7,8,5]
+ */
+function BinaryMinHeap(array, key) {
+    
+    /* Binary tree stored in an array, no need for a complicated data structure */
+    var tree = [];
+    
+    var key = key || 'key';
+    
+    /* Calculate the index of the parent or a child */
+    var parent = function(index) { return Math.floor((index - 1)/2); };
+    var right = function(index) { return 2 * index + 2; };
+    var left = function(index) { return 2 * index + 1; };
+
+    /* Helper function to swap elements with their parent 
+       as long as the parent is bigger */
+    function bubble_up(i) {
+        var p = parent(i);
+        while((p >= 0) && (tree[i][key] < tree[p][key])) {
+            /* swap with parent */
+            tree[i] = tree.splice(p, 1, tree[i])[0];
+            /* go up one level */
+            i = p;
+            p = parent(i);
+        }
+    }
+
+    /* Helper function to swap elements with the smaller of their children
+       as long as there is one */
+    function bubble_down(i) {
+        var l = left(i);
+        var r = right(i);
+        
+        /* as long as there are smaller children */
+        while(tree[l] && (tree[i][key] > tree[l][key]) || tree[r] && (tree[i][key] > tree[r][key])) {
+            
+            /* find smaller child */
+            var child = tree[l] ? tree[r] ? tree[l][key] > tree[r][key] ? r : l : l : l;
+            
+            /* swap with smaller child with current element */
+            tree[i] = tree.splice(child, 1, tree[i])[0];
+            
+            /* go up one level */
+            i = child;
+            l = left(i);
+            r = right(i);
+        }
+    }
+    
+    /* Insert a new element with respect to the heap property
+       1. Insert the element at the end
+       2. Bubble it up until it is smaller than its parent */
+    this.insert = function(element) {
+    
+        /* make sure there's a key property */
+        (element[key] == undefined) && (element = {key:element});
+        
+        /* insert element at the end */
+        tree.push(element);
+
+        /* bubble up the element */
+        bubble_up(tree.length - 1);
+    }
+    
+    /* Only show us the minimum */
+    this.min = function() {
+        return tree.length == 1 ? undefined : tree[0];
+    }
+    
+    /* Return and remove the minimum
+       1. Take the root as the minimum that we are looking for
+       2. Move the last element to the root (thereby deleting the root) 
+       3. Compare the new root with both of its children, swap it with the
+          smaller child and then check again from there (bubble down)
+    */
+    this.extractMin = function() {
+        var result = this.min();
+        
+        /* move the last element to the root or empty the tree completely */
+        /* bubble down the new root if necessary */
+        (tree.length == 1) && (tree = []) || (tree[0] = tree.pop()) && bubble_down(0);
+        
+        return result;        
+    }
+    
+    /* currently unused, TODO implement */
+    this.changeKey = function(index, key) {
+        throw "function not implemented";
+    }
+
+    this.heapify = function() {
+        for(var start = Math.floor((tree.length - 2) / 2); start >= 0; start--) {
+            bubble_down(start);
+        }
+    }
+    
+    /* insert the input elements one by one only when we don't have a key property (TODO can be done more elegant) */
+    for(i in (array || []))
+        this.insert(array[i]);
+}
+
+
+
+/*
+    Quick Sort:
+        1. Select some random value from the array, the median.
+        2. Divide the array in three smaller arrays according to the elements
+           being less, equal or greater than the median.
+        3. Recursively sort the array containg the elements less than the
+           median and the one containing elements greater than the median.
+        4. Concatenate the three arrays (less, equal and greater).
+        5. One or no element is always sorted.
+    TODO: This could be implemented more efficiently by using only one array object and several pointers.
+*/
+function quickSort(arr) {
+    /* recursion anchor: one element is always sorted */
+    if(arr.length <= 1) return arr;
+    /* randomly selecting some value */
+    var median = arr[Math.floor(Math.random() * arr.length)];
+    var arr1 = [], arr2 = [], arr3 = [];
+    for(var i in arr) {
+        arr[i] < median && arr1.push(arr[i]);
+        arr[i] == median && arr2.push(arr[i]);
+        arr[i] > median && arr3.push(arr[i]);
+    }
+    /* recursive sorting and assembling final result */
+    return quickSort(arr1).concat(arr2).concat(quickSort(arr3));
+}
+
+/*
+    Selection Sort:
+        1. Select the minimum and remove it from the array
+        2. Sort the rest recursively
+        3. Return the minimum plus the sorted rest
+        4. An array with only one element is already sorted
+*/
+function selectionSort(arr) {
+    /* recursion anchor: one element is always sorted */
+    if(arr.length == 1) return arr;
+    var minimum = Infinity;
+    var index;
+    for(var i in arr) {
+        if(arr[i] < minimum) {
+            minimum = arr[i];
+            index = i; /* remember the minimum index for later removal */
+        }
+    }
+    /* remove the minimum */
+    arr.splice(index, 1);
+    /* assemble result and sort recursively (could be easily done iteratively as well)*/
+    return [minimum].concat(selectionSort(arr));
+}
+
+/*
+    Merge Sort:
+        1. Cut the array in half
+        2. Sort each of them recursively
+        3. Merge the two sorted arrays
+        4. An array with only one element is considered sorted
+
+*/
+function mergeSort(arr) {
+    /* merges two sorted arrays into one sorted array */
+    function merge(a, b) {
+        /* result set */
+        var c = [];
+        /* as long as there are elements in the arrays to be merged */
+        while(a.length > 0 || b.length > 0){
+            /* are there elements to be merged, if yes, compare them and merge */
+            var n = a.length > 0 && b.length > 0 ? a[0] < b[0] ? a.shift() : b.shift() : b.length > 0 ? b.shift() : a.length > 0 ? a.shift() : null;
+            /* always push the smaller one onto the result set */
+            n != null && c.push(n);
+        }
+        return c;
+    }
+    /* this mergeSort implementation cuts the array in half, wich should be fine with randomized arrays, but introduces the risk of a worst-case scenario */
+    median = Math.floor(arr.length / 2);
+    var part1 = arr.slice(0, median); /* for some reason it doesn't work if inserted directly in the return statement (tried so with firefox) */
+    var part2 = arr.slice(median - arr.length);
+    return arr.length <= 1 ? arr : merge(
+        mergeSort(part1), /* first half */
+        mergeSort(part2) /* second half */
+    );
+}
+
+/* Balanced Red-Black-Tree */
+function RedBlackTree(arr) {
+    
+}
+
+function BTree(arr) {
+    
+}
+
+function NaryTree(n, arr) {
+    
+}
+
+/**
+ * Knuth-Morris-Pratt string matching algorithm - finds a pattern in a text.
+ * FIXME: Doesn't work correctly yet.
+ */
+function kmp(p, t) {
+
+    /**
+     * PREFIX, OVERLAP or FALIURE function for KMP. Computes how many iterations
+     * the algorithm can skip after a mismatch.
+     *
+     * @input p - pattern (string)
+     * @result array of skippable iterations
+     */
+    function prefix(p) {
+        /* pi contains the computed skip marks */
+        var pi = [0], k = 0;
+        for(q = 1; q < p.length; q++) {
+            while(k > 0 && (p.charAt(k) != p.charAt(q)))
+                k = pi[k-1];
+            
+            (p.charAt(k) == p.charAt(q)) && k++;
+            
+            pi[q] = k;
+        }
+        return pi;
+    }
+    
+    /* The actual KMP algorithm starts here. */
+    
+    var pi = prefix(p), q = 0, result = [];
+    
+    for(var i = 0; i < t.length; i++) {
+        /* jump forward as long as the character doesn't match */
+        while((q > 0) && (p.charAt(q) != t.charAt(i)))
+            q = pi[q];
+        
+        (p.charAt(q) == t.charAt(i)) && q++;
+        
+        (q == p.length) && result.push(i - p.length) && (q = pi[q]);
+    }
+    
+    return result;
+}
+
+/* step for algorithm visualisation */
+function step(comment, funct) {
+    //wait for input
+    //display comment (before or after waiting)
+//    next.wait();
+    /* execute callback function */
+    funct();
+}
+
+/**
+ * Curry - Function currying
+ * Copyright (c) 2008 Ariel Flesler - aflesler(at)gmail(dot)com | http://flesler.blogspot.com
+ * Licensed under BSD (http://www.opensource.org/licenses/bsd-license.php)
+ * Date: 10/4/2008
+ *
+ * @author Ariel Flesler
+ * @version 1.0.1
+ */
+function curry( fn ){
+	return function(){
+		var args = curry.args(arguments),
+			master = arguments.callee,
+			self = this;
+
+		return args.length >= fn.length ? fn.apply(self,args) :	function(){
+			return master.apply( self, args.concat(curry.args(arguments)) );
+		};
+	};
+};
+
+curry.args = function( args ){
+	return Array.prototype.slice.call(args);
+};
+
+Function.prototype.curry = function(){
+	return curry(this);
+};
+
+/**
+ * Topological Sort
+ *
+ * Sort a directed graph based on incoming edges
+ *
+ * Coded by Jake Stothard
+ */
+function topological_sort(g) {
+    //Mark nodes as "deleted" instead of actually deleting them
+    //That way we don't have to copy g
+
+    for(i in g.nodes)
+	g.nodes[i].deleted = false;
+    
+    var ret = topological_sort_helper(g);
+
+    //Cleanup: Remove the deleted property
+    for(i in g.nodes)
+	delete g.nodes[i].deleted
+
+    return ret;
+}
+function topological_sort_helper(g) {
+    //Find node with no incoming edges
+    var node;
+    for(i in g.nodes) {
+	if(g.nodes[i].deleted)
+	    continue; //Bad style, meh
+	
+	var incoming = false;
+	for(j in g.nodes[i].edges) {
+	    if(g.nodes[i].edges[j].target == g.nodes[i]
+	      && g.nodes[i].edges[j].source.deleted == false) {
+		incoming = true;
+		break;
+	    }
+	}
+	if(!incoming) {
+	    node = g.nodes[i];
+	    break;
+	}
+    }
+
+    // Either unsortable or done. Either way, GTFO
+    if(node == undefined)
+	return [];
+
+    //"Delete" node from g
+    node.deleted = true;
+    
+    var tail = topological_sort_helper(g);
+
+    tail.unshift(node);
+
+    return tail;
+}
diff --git a/addons/base_diagram/static/lib/js/dracula_graffle.js b/addons/base_diagram/static/lib/js/dracula_graffle.js
new file mode 100644
index 00000000000..9d4fd2099e8
--- /dev/null
+++ b/addons/base_diagram/static/lib/js/dracula_graffle.js
@@ -0,0 +1,106 @@
+/**
+ * Originally grabbed from the official RaphaelJS Documentation
+ * http://raphaeljs.com/graffle.html
+ * Adopted (arrows) and commented by Philipp Strathausen http://blog.ameisenbar.de
+ * Licenced under the MIT licence.
+ */
+
+/**
+ * Usage:
+ * connect two shapes
+ * parameters: 
+ *      source shape [or connection for redrawing], 
+ *      target shape,
+ *      style with { fg : linecolor, bg : background color, directed: boolean }
+ * returns:
+ *      connection { draw = function() }
+ */
+Raphael.fn.connection = function (obj1, obj2, style) {
+    var selfRef = this;
+    /* create and return new connection */
+    var edge = {/*
+        from : obj1,
+        to : obj2,
+        style : style,*/
+        draw : function() {
+            /* get bounding boxes of target and source */
+            var bb1 = obj1.getBBox();
+            var bb2 = obj2.getBBox();
+            var off1 = 0;
+            var off2 = 0;
+            /* coordinates for potential connection coordinates from/to the objects */
+            var p = [
+                {x: bb1.x + bb1.width / 2, y: bb1.y - off1},              /* NORTH 1 */
+                {x: bb1.x + bb1.width / 2, y: bb1.y + bb1.height + off1}, /* SOUTH 1 */
+                {x: bb1.x - off1, y: bb1.y + bb1.height / 2},             /* WEST  1 */
+                {x: bb1.x + bb1.width + off1, y: bb1.y + bb1.height / 2}, /* EAST  1 */
+                {x: bb2.x + bb2.width / 2, y: bb2.y - off2},              /* NORTH 2 */
+                {x: bb2.x + bb2.width / 2, y: bb2.y + bb2.height + off2}, /* SOUTH 2 */
+                {x: bb2.x - off2, y: bb2.y + bb2.height / 2},             /* WEST  2 */
+                {x: bb2.x + bb2.width + off2, y: bb2.y + bb2.height / 2}  /* EAST  2 */
+            ];
+            
+            /* distances between objects and according coordinates connection */
+            var d = {}, dis = [];
+
+            /*
+             * find out the best connection coordinates by trying all possible ways
+             */
+            /* loop the first object's connection coordinates */
+            for (var i = 0; i < 4; i++) {
+                /* loop the seond object's connection coordinates */
+                for (var j = 4; j < 8; j++) {
+                    var dx = Math.abs(p[i].x - p[j].x),
+                        dy = Math.abs(p[i].y - p[j].y);
+                    if ((i == j - 4) || (((i != 3 && j != 6) || p[i].x < p[j].x) && ((i != 2 && j != 7) || p[i].x > p[j].x) && ((i != 0 && j != 5) || p[i].y > p[j].y) && ((i != 1 && j != 4) || p[i].y < p[j].y))) {
+                        dis.push(dx + dy);
+                        d[dis[dis.length - 1].toFixed(3)] = [i, j];
+                    }
+                }
+            }
+            var res = dis.length == 0 ? [0, 4] : d[Math.min.apply(Math, dis).toFixed(3)];
+            /* bezier path */
+            var x1 = p[res[0]].x,
+                y1 = p[res[0]].y,
+                x4 = p[res[1]].x,
+                y4 = p[res[1]].y,
+                dx = Math.max(Math.abs(x1 - x4) / 2, 10),
+                dy = Math.max(Math.abs(y1 - y4) / 2, 10),
+                x2 = [x1, x1, x1 - dx, x1 + dx][res[0]].toFixed(3),
+                y2 = [y1 - dy, y1 + dy, y1, y1][res[0]].toFixed(3),
+                x3 = [0, 0, 0, 0, x4, x4, x4 - dx, x4 + dx][res[1]].toFixed(3),
+                y3 = [0, 0, 0, 0, y1 + dy, y1 - dy, y4, y4][res[1]].toFixed(3);
+            /* assemble path and arrow */
+            var path = ["M", x1.toFixed(3), y1.toFixed(3), "C", x2, y2, x3, y3, x4.toFixed(3), y4.toFixed(3)].join(",");
+            /* arrow */
+            if(style && style.directed) {
+                /* magnitude, length of the last path vector */
+                var mag = Math.sqrt((y4 - y3) * (y4 - y3) + (x4 - x3) * (x4 - x3));
+                /* vector normalisation to specified length  */
+                var norm = function(x,l){return (-x*(l||5)/mag);};
+                /* calculate array coordinates (two lines orthogonal to the path vector) */
+                var arr = [
+                    {x:(norm(x4-x3)+norm(y4-y3)+x4).toFixed(3), y:(norm(y4-y3)+norm(x4-x3)+y4).toFixed(3)},
+                    {x:(norm(x4-x3)-norm(y4-y3)+x4).toFixed(3), y:(norm(y4-y3)-norm(x4-x3)+y4).toFixed(3)}
+                ];
+                path = path + ",M"+arr[0].x+","+arr[0].y+",L"+x4+","+y4+",L"+arr[1].x+","+arr[1].y; 
+            }
+            /* function to be used for moving existent path(s), e.g. animate() or attr() */
+            var move = "attr";
+            /* applying path(s) */
+            edge.fg && edge.fg[move]({path:path}) 
+                || (edge.fg = selfRef.path(path).attr({stroke: style && style.stroke || "#000", fill: "none"}).toBack());
+            edge.bg && edge.bg[move]({path:path})
+                || style && style.fill && (edge.bg = style.fill.split && selfRef.path(path).attr({stroke: style.fill.split("|")[0], fill: "none", "stroke-width": style.fill.split("|")[1] || 3}).toBack());
+            /* setting label */
+            style && style.label 
+                && (edge.label && edge.label.attr({x:(x1+x4)/2, y:(y1+y4)/2}) 
+                    || (edge.label = selfRef.text((x1+x4)/2, (y1+y4)/2, style.label).attr({fill: "#000", "font-size": style["font-size"] || "12px"})));
+//                && selfRef.text(x4, y4, style.label).attr({stroke: style && style.stroke || "#fff", "font-weight":"bold", "font-size":"20px"})
+//            style && style.callback && style.callback(edge);
+        }
+    }
+    edge.draw();
+    return edge;
+};
+//Raphael.prototype.set.prototype.dodo=function(){console.log("works");};
diff --git a/addons/base_diagram/static/lib/js/dracula_graph.coffee b/addons/base_diagram/static/lib/js/dracula_graph.coffee
new file mode 100644
index 00000000000..bb91945098d
--- /dev/null
+++ b/addons/base_diagram/static/lib/js/dracula_graph.coffee
@@ -0,0 +1,524 @@
+###
+ *  Dracula Graph Layout and Drawing Framework 0.0.3alpha
+ *  (c) 2010 Philipp Strathausen <strathausen@gmail.com>, http://strathausen.eu
+ *  
+ *  Contributions by:
+ *  Branched by Jake Stothard <stothardj@gmail.com>.
+ *
+ *  based on the Graph JavaScript framework, version 0.0.1
+ *  (c) 2006 Aslak Hellesoy <aslak.hellesoy@gmail.com>
+ *  (c) 2006 Dave Hoover <dave.hoover@gmail.com>
+ *
+ *  Ported from Graph::Layouter::Spring in
+ *    http://search.cpan.org/~pasky/Graph-Layderer-0.02/
+ *  The algorithm is based on a spring-style layouter of a Java-based social
+ *  network tracker PieSpy written by Paul Mutton E<lt>paul@jibble.orgE<gt>.
+ *
+ *  This code is freely distributable under the terms of an MIT-style license.
+ *  For details, see the Graph web site: http://dev.buildpatternd.com/trac
+ *
+ *  Links:
+ *
+ *  Graph Dracula JavaScript Framework:
+ *      http://graphdracula.net
+ *
+ *  Demo of the original applet:
+ *      http://redsquirrel.com/dave/work/webdep/
+ *
+ *  Mirrored original source code at snipplr:
+ *      http://snipplr.com/view/1950/graph-javascript-framework-version-001/
+ *
+ *  Original usage example:
+ *      http://ajaxian.com/archives/new-javascriptcanvas-graph-library
+ *
+###
+
+
+###
+    Edge Factory
+###
+AbstractEdge = ->
+
+AbstractEdge.prototype =
+    hide: ->
+        @connection.fg.hide()
+        @connection.bg && @bg.connection.hide()
+
+EdgeFactory = ->
+    @template = new AbstractEdge()
+    @template.style = new Object()
+    @template.style.directed = false
+    @template.weight = 1
+
+EdgeFactory.prototype =
+    build: (source, target) ->
+        e = jQuery.extend true, {}, @template
+        e.source = source
+        e.target = target
+        e
+
+###
+    Graph
+###
+Graph = ->
+    @nodes = {}
+    @edges = []
+    @snapshots = [] # previous graph states TODO to be implemented
+    @edgeFactory = new EdgeFactory()
+
+Graph.prototype =
+###
+    add a node
+    @id          the node's ID (string or number)
+    @content     (optional, dictionary) can contain any information that is
+                 being interpreted by the layout algorithm or the graph
+                 representation
+###
+    addNode: (id, content) ->
+        # testing if node is already existing in the graph
+        if @nodes[id] == undefined
+            @nodes[id] = new Graph.Node id, content
+        @nodes[id]
+
+    addEdge: (source, target, style) ->
+        s = @addNode source
+        t = @addNode target
+        var edge = @edgeFactory.build s, t
+        jQuery.extend edge.style, style
+        s.edges.push edge
+        @edges.push edge
+        # NOTE: Even directed edges are added to both nodes.
+        t.edges.push edge
+
+    # TODO to be implemented
+    # Preserve a copy of the graph state (nodes, positions, ...)
+    # @comment     a comment describing the state
+    snapShot: (comment) ->
+        ###/* FIXME
+        var graph = new Graph()
+        graph.nodes = jQuery.extend(true, {}, @nodes)
+        graph.edges = jQuery.extend(true, {}, @edges)
+        @snapshots.push({comment: comment, graph: graph})
+        */
+        ###
+
+    removeNode: (id) ->
+        delete @nodes[id]
+        for i = 0; i < @edges.length; i++
+            if @edges[i].source.id == id || @edges[i].target.id == id
+                @edges.splice(i, 1)
+                i--
+
+/*
+ * Node
+ */
+Graph.Node = (id, node) ->
+    node = node || {}
+    node.id = id
+    node.edges = []
+    node.hide = ->
+        @hidden = true
+        @shape && @shape.hide() # FIXME this is representation specific code and should be elsewhere */
+        for(i in @edges)
+            (@edges[i].source.id == id || @edges[i].target == id) && @edges[i].hide && @edges[i].hide()
+
+    node.show = ->
+        @hidden = false
+        @shape && @shape.show()
+        for(i in @edges)
+            (@edges[i].source.id == id || @edges[i].target == id) && @edges[i].show && @edges[i].show()
+
+    node
+
+Graph.Node.prototype = { }
+
+###
+    Renderer base class
+###
+Graph.Renderer = { }
+
+###
+    Renderer implementation using RaphaelJS
+###
+Graph.Renderer.Raphael = (element, graph, width, height) ->
+    @width = width || 400
+    @height = height || 400
+    var selfRef = this
+    @r = Raphael element, @width, @height
+    @radius = 40 # max dimension of a node
+    @graph = graph
+    @mouse_in = false
+
+    # TODO default node rendering
+    if(!@graph.render) {
+        @graph.render = ->
+            return
+        }
+    }
+    
+    /*
+     * Dragging
+     */
+    @isDrag = false
+    @dragger = (e) ->
+        @dx = e.clientX
+        @dy = e.clientY
+        selfRef.isDrag = this
+        @set && @set.animate "fill-opacity": .1, 200 && @set.toFront()
+        e.preventDefault && e.preventDefault()
+
+    document.onmousemove =  (e) {
+        e = e || window.event
+        if (selfRef.isDrag) {
+            var bBox = selfRef.isDrag.set.getBBox()
+            // TODO round the coordinates here (eg. for proper image representation)
+            var newX = e.clientX - selfRef.isDrag.dx + (bBox.x + bBox.width / 2)
+            var newY = e.clientY - selfRef.isDrag.dy + (bBox.y + bBox.height / 2)
+            /* prevent shapes from being dragged out of the canvas */
+            var clientX = e.clientX - (newX < 20 ? newX - 20 : newX > selfRef.width - 20 ? newX - selfRef.width + 20 : 0)
+            var clientY = e.clientY - (newY < 20 ? newY - 20 : newY > selfRef.height - 20 ? newY - selfRef.height + 20 : 0)
+            selfRef.isDrag.set.translate(clientX - Math.round(selfRef.isDrag.dx), clientY - Math.round(selfRef.isDrag.dy))
+            //            console.log(clientX - Math.round(selfRef.isDrag.dx), clientY - Math.round(selfRef.isDrag.dy))
+            for (var i in selfRef.graph.edges) {
+                selfRef.graph.edges[i].connection && selfRef.graph.edges[i].connection.draw()
+            }
+            //selfRef.r.safari()
+            selfRef.isDrag.dx = clientX
+            selfRef.isDrag.dy = clientY
+        }
+    }
+    document.onmouseup =  ->
+        selfRef.isDrag && selfRef.isDrag.set.animate({"fill-opacity": .6}, 500)
+        selfRef.isDrag = false
+    }
+    @draw()
+}
+Graph.Renderer.Raphael.prototype = {
+    translate: (point) {
+        return [
+            (point[0] - @graph.layoutMinX) * @factorX + @radius,
+            (point[1] - @graph.layoutMinY) * @factorY + @radius
+        ]
+    },
+
+    rotate: (point, length, angle) {
+        var dx = length * Math.cos(angle)
+        var dy = length * Math.sin(angle)
+        return [point[0]+dx, point[1]+dy]
+    },
+
+    draw: ->
+        @factorX = (@width - 2 * @radius) / (@graph.layoutMaxX - @graph.layoutMinX)
+        @factorY = (@height - 2 * @radius) / (@graph.layoutMaxY - @graph.layoutMinY)
+        for (i in @graph.nodes) {
+            @drawNode(@graph.nodes[i])
+        }
+        for (var i = 0; i < @graph.edges.length; i++) {
+            @drawEdge(@graph.edges[i])
+        }
+    },
+
+    drawNode: (node) {
+        var point = @translate([node.layoutPosX, node.layoutPosY])
+        node.point = point
+
+        /* if node has already been drawn, move the nodes */
+        if(node.shape) {
+            var oBBox = node.shape.getBBox()
+            var opoint = { x: oBBox.x + oBBox.width / 2, y: oBBox.y + oBBox.height / 2}
+            node.shape.translate(Math.round(point[0] - opoint.x), Math.round(point[1] - opoint.y))
+            @r.safari()
+            return node
+        }/* else, draw new nodes */
+
+        var shape
+
+        /* if a node renderer  is provided by the user, then use it 
+           or the default render  instead */
+        if(!node.render) {
+            node.render = (r, node) {
+                /* the default node drawing */
+                var color = Raphael.getColor()
+                var ellipse = r.ellipse(0, 0, 30, 20).attr({fill: color, stroke: color, "stroke-width": 2})
+                /* set DOM node ID */
+                ellipse.node.id = node.label || node.id
+                shape = r.set().
+                    push(ellipse).
+                    push(r.text(0, 30, node.label || node.id))
+                return shape
+            }
+        }
+        /* or check for an ajax representation of the nodes */
+        if(node.shapes) {
+            // TODO ajax representation evaluation
+        }
+
+        shape = node.render(@r, node).hide()
+
+        shape.attr({"fill-opacity": .6})
+        /* re-reference to the node an element belongs to, needed for dragging all elements of a node */
+        shape.items.forEach((item){ item.set = shape; item.node.style.cursor = "move"; })
+        shape.mousedown(@dragger)
+
+        var box = shape.getBBox()
+        shape.translate(Math.round(point[0]-(box.x+box.width/2)),Math.round(point[1]-(box.y+box.height/2)))
+        //console.log(box,point)
+        node.hidden || shape.show()
+        node.shape = shape
+    },
+    drawEdge: (edge) {
+        /* if this edge already exists the other way around and is undirected */
+        if(edge.backedge)
+            return
+        if(edge.source.hidden || edge.target.hidden) {
+            edge.connection && edge.connection.fg.hide() | edge.connection.bg && edge.connection.bg.hide()
+            return
+        }
+        /* if edge already has been drawn, only refresh the edge */
+        if(!edge.connection) {
+            edge.style && edge.style.callback && edge.style.callback(edge); // TODO move this somewhere else
+            edge.connection = @r.connection(edge.source.shape, edge.target.shape, edge.style)
+            return
+        }
+        //FIXME showing doesn't work well
+        edge.connection.fg.show()
+        edge.connection.bg && edge.connection.bg.show()
+        edge.connection.draw()
+    }
+}
+Graph.Layout = {}
+Graph.Layout.Spring = (graph) {
+    @graph = graph
+    @iterations = 500
+    @maxRepulsiveForceDistance = 6
+    @k = 2
+    @c = 0.01
+    @maxVertexMovement = 0.5
+    @layout()
+}
+Graph.Layout.Spring.prototype = {
+    layout: ->
+        @layoutPrepare()
+        for (var i = 0; i < @iterations; i++) {
+            @layoutIteration()
+        }
+        @layoutCalcBounds()
+    },
+    
+    layoutPrepare: ->
+        for (i in @graph.nodes) {
+            var node = @graph.nodes[i]
+            node.layoutPosX = 0
+            node.layoutPosY = 0
+            node.layoutForceX = 0
+            node.layoutForceY = 0
+        }
+        
+    },
+    
+    layoutCalcBounds: ->
+        var minx = Infinity, maxx = -Infinity, miny = Infinity, maxy = -Infinity
+
+        for (i in @graph.nodes) {
+            var x = @graph.nodes[i].layoutPosX
+            var y = @graph.nodes[i].layoutPosY
+            
+            if(x > maxx) maxx = x
+            if(x < minx) minx = x
+            if(y > maxy) maxy = y
+            if(y < miny) miny = y
+        }
+
+        @graph.layoutMinX = minx
+        @graph.layoutMaxX = maxx
+        @graph.layoutMinY = miny
+        @graph.layoutMaxY = maxy
+    },
+    
+    layoutIteration: ->
+        // Forces on nodes due to node-node repulsions
+
+        var prev = new Array()
+        for(var c in @graph.nodes) {
+            var node1 = @graph.nodes[c]
+            for (var d in prev) {
+                var node2 = @graph.nodes[prev[d]]
+                @layoutRepulsive(node1, node2)
+                
+            }
+            prev.push(c)
+        }
+        
+        // Forces on nodes due to edge attractions
+        for (var i = 0; i < @graph.edges.length; i++) {
+            var edge = @graph.edges[i]
+            @layoutAttractive(edge);             
+        }
+        
+        // Move by the given force
+        for (i in @graph.nodes) {
+            var node = @graph.nodes[i]
+            var xmove = @c * node.layoutForceX
+            var ymove = @c * node.layoutForceY
+
+            var max = @maxVertexMovement
+            if(xmove > max) xmove = max
+            if(xmove < -max) xmove = -max
+            if(ymove > max) ymove = max
+            if(ymove < -max) ymove = -max
+            
+            node.layoutPosX += xmove
+            node.layoutPosY += ymove
+            node.layoutForceX = 0
+            node.layoutForceY = 0
+        }
+    },
+
+    layoutRepulsive: (node1, node2) {
+        var dx = node2.layoutPosX - node1.layoutPosX
+        var dy = node2.layoutPosY - node1.layoutPosY
+        var d2 = dx * dx + dy * dy
+        if(d2 < 0.01) {
+            dx = 0.1 * Math.random() + 0.1
+            dy = 0.1 * Math.random() + 0.1
+            var d2 = dx * dx + dy * dy
+        }
+        var d = Math.sqrt(d2)
+        if(d < @maxRepulsiveForceDistance) {
+            var repulsiveForce = @k * @k / d
+            node2.layoutForceX += repulsiveForce * dx / d
+            node2.layoutForceY += repulsiveForce * dy / d
+            node1.layoutForceX -= repulsiveForce * dx / d
+            node1.layoutForceY -= repulsiveForce * dy / d
+        }
+    },
+
+    layoutAttractive: (edge) {
+        var node1 = edge.source
+        var node2 = edge.target
+        
+        var dx = node2.layoutPosX - node1.layoutPosX
+        var dy = node2.layoutPosY - node1.layoutPosY
+        var d2 = dx * dx + dy * dy
+        if(d2 < 0.01) {
+            dx = 0.1 * Math.random() + 0.1
+            dy = 0.1 * Math.random() + 0.1
+            var d2 = dx * dx + dy * dy
+        }
+        var d = Math.sqrt(d2)
+        if(d > @maxRepulsiveForceDistance) {
+            d = @maxRepulsiveForceDistance
+            d2 = d * d
+        }
+        var attractiveForce = (d2 - @k * @k) / @k
+        if(edge.attraction == undefined) edge.attraction = 1
+        attractiveForce *= Math.log(edge.attraction) * 0.5 + 1
+        
+        node2.layoutForceX -= attractiveForce * dx / d
+        node2.layoutForceY -= attractiveForce * dy / d
+        node1.layoutForceX += attractiveForce * dx / d
+        node1.layoutForceY += attractiveForce * dy / d
+    }
+}
+
+Graph.Layout.Ordered = (graph, order) {
+    @graph = graph
+    @order = order
+    @layout()
+}
+Graph.Layout.Ordered.prototype = {
+    layout: ->
+        @layoutPrepare()
+        @layoutCalcBounds()
+    },
+    
+    layoutPrepare: (order) {
+        for (i in @graph.nodes) {
+            var node = @graph.nodes[i]
+            node.layoutPosX = 0
+            node.layoutPosY = 0
+        }
+            var counter = 0
+            for (i in @order) {
+                var node = @order[i]
+                node.layoutPosX = counter
+                node.layoutPosY = Math.random()
+                counter++
+            }
+    },
+    
+    layoutCalcBounds: ->
+        var minx = Infinity, maxx = -Infinity, miny = Infinity, maxy = -Infinity
+
+        for (i in @graph.nodes) {
+            var x = @graph.nodes[i].layoutPosX
+            var y = @graph.nodes[i].layoutPosY
+            
+            if(x > maxx) maxx = x
+            if(x < minx) minx = x
+            if(y > maxy) maxy = y
+            if(y < miny) miny = y
+        }
+
+        @graph.layoutMinX = minx
+        @graph.layoutMaxX = maxx
+
+        @graph.layoutMinY = miny
+        @graph.layoutMaxY = maxy
+    }
+}
+
+/*
+ * usefull JavaScript extensions, 
+ */
+
+ log(a) {console.log&&console.log(a);}
+
+/*
+ * Raphael Tooltip Plugin
+ * - attaches an element as a tooltip to another element
+ *
+ * Usage example, adding a rectangle as a tooltip to a circle:
+ *
+ *      paper.circle(100,100,10).tooltip(paper.rect(0,0,20,30))
+ *
+ * If you want to use more shapes, you'll have to put them into a set.
+ *
+ */
+Raphael.el.tooltip =  (tp) {
+    @tp = tp
+    @tp.o = {x: 0, y: 0}
+    @tp.hide()
+    @hover(
+        (event){ 
+            @mousemove((event){ 
+                @tp.translate(event.clientX - 
+                                  @tp.o.x,event.clientY - @tp.o.y)
+                @tp.o = {x: event.clientX, y: event.clientY}
+            })
+            @tp.show().toFront()
+        }, 
+        (event){
+            @tp.hide()
+            @unmousemove()
+        })
+    return this
+}
+
+/* For IE */
+if (!Array.prototype.forEach)
+{
+  Array.prototype.forEach = (fun /*, thisp*/)
+  {
+    var len = @length
+    if (typeof fun != "")
+      throw new TypeError()
+
+    var thisp = arguments[1]
+    for (var i = 0; i < len; i++)
+    {
+      if (i in this)
+        fun.call(thisp, this[i], i, this)
+    }
+  }
+}
diff --git a/addons/base_diagram/static/lib/js/dracula_graph.js b/addons/base_diagram/static/lib/js/dracula_graph.js
new file mode 100644
index 00000000000..f7069c5d2e5
--- /dev/null
+++ b/addons/base_diagram/static/lib/js/dracula_graph.js
@@ -0,0 +1,525 @@
+/*
+ *  Dracula Graph Layout and Drawing Framework 0.0.3alpha
+ *  (c) 2010 Philipp Strathausen <strathausen@gmail.com>, http://strathausen.eu
+ *  Contributions by Jake Stothard <stothardj@gmail.com>.
+ *
+ *  based on the Graph JavaScript framework, version 0.0.1
+ *  (c) 2006 Aslak Hellesoy <aslak.hellesoy@gmail.com>
+ *  (c) 2006 Dave Hoover <dave.hoover@gmail.com>
+ *
+ *  Ported from Graph::Layouter::Spring in
+ *    http://search.cpan.org/~pasky/Graph-Layderer-0.02/
+ *  The algorithm is based on a spring-style layouter of a Java-based social
+ *  network tracker PieSpy written by Paul Mutton <paul@jibble.org>.
+ *
+ *  This code is freely distributable under the MIT license. Commercial use is
+ *  hereby granted without any cost or restriction.
+ *
+ *  Links:
+ *
+ *  Graph Dracula JavaScript Framework:
+ *      http://graphdracula.net
+ *
+ /*--------------------------------------------------------------------------*/
+
+/*
+ * Edge Factory
+ */
+var AbstractEdge = function() {
+}
+AbstractEdge.prototype = {
+    hide: function() {
+        this.connection.fg.hide();
+        this.connection.bg && this.bg.connection.hide();
+    }
+};
+var EdgeFactory = function() {
+    this.template = new AbstractEdge();
+    this.template.style = new Object();
+    this.template.style.directed = false;
+    this.template.weight = 1;
+};
+EdgeFactory.prototype = {
+    build: function(source, target) {
+        var e = jQuery.extend(true, {}, this.template);
+        e.source = source;
+        e.target = target;
+        return e;
+    }
+};
+
+/*
+ * Graph
+ */
+var Graph = function() {
+    this.nodes = {};
+    this.edges = [];
+    this.snapshots = []; // previous graph states TODO to be implemented
+    this.edgeFactory = new EdgeFactory();
+};
+Graph.prototype = {
+    /* 
+     * add a node
+     * @id          the node's ID (string or number)
+     * @content     (optional, dictionary) can contain any information that is
+     *              being interpreted by the layout algorithm or the graph
+     *              representation
+     */
+    addNode: function(id, content) {
+        /* testing if node is already existing in the graph */
+        if(this.nodes[id] == undefined) {
+            this.nodes[id] = new Graph.Node(id, content);
+        }
+        return this.nodes[id];
+    },
+
+    addEdge: function(source, target, style) {
+        var s = this.addNode(source);
+        var t = this.addNode(target);
+        var edge = this.edgeFactory.build(s, t);
+        jQuery.extend(edge.style,style);
+        s.edges.push(edge);
+        this.edges.push(edge);
+        // NOTE: Even directed edges are added to both nodes.
+        t.edges.push(edge);
+    },
+    
+    /* TODO to be implemented
+     * Preserve a copy of the graph state (nodes, positions, ...)
+     * @comment     a comment describing the state
+     */
+    snapShot: function(comment) {
+        /* FIXME
+        var graph = new Graph();
+        graph.nodes = jQuery.extend(true, {}, this.nodes);
+        graph.edges = jQuery.extend(true, {}, this.edges);
+        this.snapshots.push({comment: comment, graph: graph});
+        */
+    },
+    removeNode: function(id) {
+        delete this.nodes[id];
+        for(var i = 0; i < this.edges.length; i++) {
+            if (this.edges[i].source.id == id || this.edges[i].target.id == id) {
+                this.edges.splice(i, 1);
+                i--;
+            }
+        }
+    }
+};
+
+/*
+ * Node
+ */
+Graph.Node = function(id, node){
+    node = node || {};
+    node.id = id;
+    node.edges = [];
+    node.hide = function() {
+        this.hidden = true;
+        this.shape && this.shape.hide(); /* FIXME this is representation specific code and should be elsewhere */
+        for(i in this.edges)
+            (this.edges[i].source.id == id || this.edges[i].target == id) && this.edges[i].hide && this.edges[i].hide();
+    };
+    node.show = function() {
+        this.hidden = false;
+        this.shape && this.shape.show();
+        for(i in this.edges)
+            (this.edges[i].source.id == id || this.edges[i].target == id) && this.edges[i].show && this.edges[i].show();
+    };
+    return node;
+};
+Graph.Node.prototype = {
+};
+
+/*
+ * Renderer base class
+ */
+Graph.Renderer = {};
+
+/*
+ * Renderer implementation using RaphaelJS
+ */
+Graph.Renderer.Raphael = function(element, graph, width, height) {
+    this.width = width || 800;
+    this.height = height || 800;
+    var selfRef = this;
+    this.r = Raphael(element, this.width, this.height);
+    this.radius = 40; /* max dimension of a node */
+    this.graph = graph;
+    this.mouse_in = false;
+
+    /* TODO default node rendering function */
+    if(!this.graph.render) {
+        this.graph.render = function() {
+            return;
+        }
+    }
+    
+    /*
+     * Dragging
+     */
+    this.isDrag = false;
+    this.dragger = function (e) {
+        this.dx = e.clientX;
+        this.dy = e.clientY;
+        selfRef.isDrag = this;
+        this.set && this.set.animate({"fill-opacity": .1}, 200) && this.set.toFront();
+        e.preventDefault && e.preventDefault();
+    };
+    
+    var d = document.getElementById(element);
+    d.onmousemove = function (e) {
+        e = e || window.event;
+        if (selfRef.isDrag) {
+            var bBox = selfRef.isDrag.set.getBBox();
+            // TODO round the coordinates here (eg. for proper image representation)
+            var newX = e.clientX - selfRef.isDrag.dx + (bBox.x + bBox.width / 2);
+            var newY = e.clientY - selfRef.isDrag.dy + (bBox.y + bBox.height / 2);
+            /* prevent shapes from being dragged out of the canvas */
+            var clientX = e.clientX - (newX < 20 ? newX - 20 : newX > selfRef.width - 20 ? newX - selfRef.width + 20 : 0);
+            var clientY = e.clientY - (newY < 20 ? newY - 20 : newY > selfRef.height - 20 ? newY - selfRef.height + 20 : 0);
+            selfRef.isDrag.set.translate(clientX - Math.round(selfRef.isDrag.dx), clientY - Math.round(selfRef.isDrag.dy));
+            //            console.log(clientX - Math.round(selfRef.isDrag.dx), clientY - Math.round(selfRef.isDrag.dy));
+            for (var i in selfRef.graph.edges) {
+                selfRef.graph.edges[i].connection && selfRef.graph.edges[i].connection.draw();
+            }
+            //selfRef.r.safari();
+            selfRef.isDrag.dx = clientX;
+            selfRef.isDrag.dy = clientY;
+        }
+    };
+    d.onmouseup = function () {
+        selfRef.isDrag && selfRef.isDrag.set.animate({"fill-opacity": .6}, 500);
+        selfRef.isDrag = false;
+    };
+    this.draw();
+};
+Graph.Renderer.Raphael.prototype = {
+    translate: function(point) {
+        return [
+            (point[0] - this.graph.layoutMinX) * this.factorX + this.radius,
+            (point[1] - this.graph.layoutMinY) * this.factorY + this.radius
+        ];
+    },
+
+    rotate: function(point, length, angle) {
+        var dx = length * Math.cos(angle);
+        var dy = length * Math.sin(angle);
+        return [point[0]+dx, point[1]+dy];
+    },
+
+    draw: function() {
+        this.factorX = (this.width - 2 * this.radius) / (this.graph.layoutMaxX - this.graph.layoutMinX);
+        this.factorY = (this.height - 2 * this.radius) / (this.graph.layoutMaxY - this.graph.layoutMinY);
+        for (i in this.graph.nodes) {
+            this.drawNode(this.graph.nodes[i]);
+        }
+        for (var i = 0; i < this.graph.edges.length; i++) {
+            this.drawEdge(this.graph.edges[i]);
+        }
+    },
+
+    drawNode: function(node) {
+        var point = this.translate([node.layoutPosX, node.layoutPosY]);
+        node.point = point;
+
+        /* if node has already been drawn, move the nodes */
+        if(node.shape) {
+            var oBBox = node.shape.getBBox();
+            var opoint = { x: oBBox.x + oBBox.width / 2, y: oBBox.y + oBBox.height / 2};
+            node.shape.translate(Math.round(point[0] - opoint.x), Math.round(point[1] - opoint.y));
+            this.r.safari();
+            return node;
+        }/* else, draw new nodes */
+
+        var shape;
+
+        /* if a node renderer function is provided by the user, then use it 
+           or the default render function instead */
+        if(!node.render) {
+            node.render = function(r, node) {
+                /* the default node drawing */
+                var color = Raphael.getColor();
+                var ellipse = r.ellipse(0, 0, 30, 20).attr({fill: color, stroke: color, "stroke-width": 2});
+                /* set DOM node ID */
+                ellipse.node.id = node.label || node.id;
+                shape = r.set().
+                    push(ellipse).
+                    push(r.text(0, 30, node.label || node.id));
+                return shape;
+            }
+        }
+        /* or check for an ajax representation of the nodes */
+        if(node.shapes) {
+            // TODO ajax representation evaluation
+        }
+
+        shape = node.render(this.r, node).hide();
+
+        shape.attr({"fill-opacity": .6});
+        /* re-reference to the node an element belongs to, needed for dragging all elements of a node */
+        shape.items.forEach(function(item){ item.set = shape; item.node.style.cursor = "move"; });
+        shape.mousedown(this.dragger);
+
+        var box = shape.getBBox();
+        shape.translate(Math.round(point[0]-(box.x+box.width/2)),Math.round(point[1]-(box.y+box.height/2)))
+        //console.log(box,point);
+        node.hidden || shape.show();
+        node.shape = shape;
+    },
+    drawEdge: function(edge) {
+        /* if this edge already exists the other way around and is undirected */
+        if(edge.backedge)
+            return;
+        if(edge.source.hidden || edge.target.hidden) {
+            edge.connection && edge.connection.fg.hide() | edge.connection.bg && edge.connection.bg.hide();
+            return;
+        }
+        /* if edge already has been drawn, only refresh the edge */
+        if(!edge.connection) {
+            edge.style && edge.style.callback && edge.style.callback(edge); // TODO move this somewhere else
+            edge.connection = this.r.connection(edge.source.shape, edge.target.shape, edge.style);
+            return;
+        }
+        //FIXME showing doesn't work well
+        edge.connection.fg.show();
+        edge.connection.bg && edge.connection.bg.show();
+        edge.connection.draw();
+    }
+};
+Graph.Layout = {};
+Graph.Layout.Spring = function(graph) {
+    this.graph = graph;
+    this.iterations = 500;
+    this.maxRepulsiveForceDistance = 6;
+    this.k = 2;
+    this.c = 0.01;
+    this.maxVertexMovement = 0.5;
+    this.layout();
+};
+Graph.Layout.Spring.prototype = {
+    layout: function() {
+        this.layoutPrepare();
+        for (var i = 0; i < this.iterations; i++) {
+            this.layoutIteration();
+        }
+        this.layoutCalcBounds();
+    },
+    
+    layoutPrepare: function() {
+        for (i in this.graph.nodes) {
+            var node = this.graph.nodes[i];
+            node.layoutPosX = 0;
+            node.layoutPosY = 0;
+            node.layoutForceX = 0;
+            node.layoutForceY = 0;
+        }
+        
+    },
+    
+    layoutCalcBounds: function() {
+        var minx = Infinity, maxx = -Infinity, miny = Infinity, maxy = -Infinity;
+
+        for (i in this.graph.nodes) {
+            var x = this.graph.nodes[i].layoutPosX;
+            var y = this.graph.nodes[i].layoutPosY;
+            
+            if(x > maxx) maxx = x;
+            if(x < minx) minx = x;
+            if(y > maxy) maxy = y;
+            if(y < miny) miny = y;
+        }
+
+        this.graph.layoutMinX = minx;
+        this.graph.layoutMaxX = maxx;
+        this.graph.layoutMinY = miny;
+        this.graph.layoutMaxY = maxy;
+    },
+    
+    layoutIteration: function() {
+        // Forces on nodes due to node-node repulsions
+
+        var prev = new Array();
+        for(var c in this.graph.nodes) {
+            var node1 = this.graph.nodes[c];
+            for (var d in prev) {
+                var node2 = this.graph.nodes[prev[d]];
+                this.layoutRepulsive(node1, node2);
+                
+            }
+            prev.push(c);
+        }
+        
+        // Forces on nodes due to edge attractions
+        for (var i = 0; i < this.graph.edges.length; i++) {
+            var edge = this.graph.edges[i];
+            this.layoutAttractive(edge);             
+        }
+        
+        // Move by the given force
+        for (i in this.graph.nodes) {
+            var node = this.graph.nodes[i];
+            var xmove = this.c * node.layoutForceX;
+            var ymove = this.c * node.layoutForceY;
+
+            var max = this.maxVertexMovement;
+            if(xmove > max) xmove = max;
+            if(xmove < -max) xmove = -max;
+            if(ymove > max) ymove = max;
+            if(ymove < -max) ymove = -max;
+            
+            node.layoutPosX += xmove;
+            node.layoutPosY += ymove;
+            node.layoutForceX = 0;
+            node.layoutForceY = 0;
+        }
+    },
+
+    layoutRepulsive: function(node1, node2) {
+        var dx = node2.layoutPosX - node1.layoutPosX;
+        var dy = node2.layoutPosY - node1.layoutPosY;
+        var d2 = dx * dx + dy * dy;
+        if(d2 < 0.01) {
+            dx = 0.1 * Math.random() + 0.1;
+            dy = 0.1 * Math.random() + 0.1;
+            var d2 = dx * dx + dy * dy;
+        }
+        var d = Math.sqrt(d2);
+        if(d < this.maxRepulsiveForceDistance) {
+            var repulsiveForce = this.k * this.k / d;
+            node2.layoutForceX += repulsiveForce * dx / d;
+            node2.layoutForceY += repulsiveForce * dy / d;
+            node1.layoutForceX -= repulsiveForce * dx / d;
+            node1.layoutForceY -= repulsiveForce * dy / d;
+        }
+    },
+
+    layoutAttractive: function(edge) {
+        var node1 = edge.source;
+        var node2 = edge.target;
+        
+        var dx = node2.layoutPosX - node1.layoutPosX;
+        var dy = node2.layoutPosY - node1.layoutPosY;
+        var d2 = dx * dx + dy * dy;
+        if(d2 < 0.01) {
+            dx = 0.1 * Math.random() + 0.1;
+            dy = 0.1 * Math.random() + 0.1;
+            var d2 = dx * dx + dy * dy;
+        }
+        var d = Math.sqrt(d2);
+        if(d > this.maxRepulsiveForceDistance) {
+            d = this.maxRepulsiveForceDistance;
+            d2 = d * d;
+        }
+        var attractiveForce = (d2 - this.k * this.k) / this.k;
+        if(edge.attraction == undefined) edge.attraction = 1;
+        attractiveForce *= Math.log(edge.attraction) * 0.5 + 1;
+        
+        node2.layoutForceX -= attractiveForce * dx / d;
+        node2.layoutForceY -= attractiveForce * dy / d;
+        node1.layoutForceX += attractiveForce * dx / d;
+        node1.layoutForceY += attractiveForce * dy / d;
+    }
+};
+
+Graph.Layout.Ordered = function(graph, order) {
+    this.graph = graph;
+    this.order = order;
+    this.layout();
+};
+Graph.Layout.Ordered.prototype = {
+    layout: function() {
+        this.layoutPrepare();
+        this.layoutCalcBounds();
+    },
+    
+    layoutPrepare: function(order) {
+        for (i in this.graph.nodes) {
+            var node = this.graph.nodes[i];
+            node.layoutPosX = 0;
+            node.layoutPosY = 0;
+        }
+            var counter = 0;
+            for (i in this.order) {
+                var node = this.order[i];
+                node.layoutPosX = counter;
+                node.layoutPosY = Math.random();
+                counter++;
+            }
+    },
+    
+    layoutCalcBounds: function() {
+        var minx = Infinity, maxx = -Infinity, miny = Infinity, maxy = -Infinity;
+
+        for (i in this.graph.nodes) {
+            var x = this.graph.nodes[i].layoutPosX;
+            var y = this.graph.nodes[i].layoutPosY;
+            
+            if(x > maxx) maxx = x;
+            if(x < minx) minx = x;
+            if(y > maxy) maxy = y;
+            if(y < miny) miny = y;
+        }
+
+        this.graph.layoutMinX = minx;
+        this.graph.layoutMaxX = maxx;
+
+        this.graph.layoutMinY = miny;
+        this.graph.layoutMaxY = maxy;
+    }
+};
+
+/*
+ * usefull JavaScript extensions, 
+ */
+
+function log(a) {console.log&&console.log(a);}
+
+/*
+ * Raphael Tooltip Plugin
+ * - attaches an element as a tooltip to another element
+ *
+ * Usage example, adding a rectangle as a tooltip to a circle:
+ *
+ *      paper.circle(100,100,10).tooltip(paper.rect(0,0,20,30));
+ *
+ * If you want to use more shapes, you'll have to put them into a set.
+ *
+ */
+Raphael.el.tooltip = function (tp) {
+    this.tp = tp;
+    this.tp.o = {x: 0, y: 0};
+    this.tp.hide();
+    this.hover(
+        function(event){ 
+            this.mousemove(function(event){ 
+                this.tp.translate(event.clientX - 
+                                  this.tp.o.x,event.clientY - this.tp.o.y);
+                this.tp.o = {x: event.clientX, y: event.clientY};
+            });
+            this.tp.show().toFront();
+        }, 
+        function(event){
+            this.tp.hide();
+            this.unmousemove();
+        });
+    return this;
+};
+
+/* For IE */
+if (!Array.prototype.forEach)
+{
+  Array.prototype.forEach = function(fun /*, thisp*/)
+  {
+    var len = this.length;
+    if (typeof fun != "function")
+      throw new TypeError();
+
+    var thisp = arguments[1];
+    for (var i = 0; i < len; i++)
+    {
+      if (i in this)
+        fun.call(thisp, this[i], i, this);
+    }
+  };
+}
diff --git a/addons/base_diagram/static/lib/js/raphael-min.js b/addons/base_diagram/static/lib/js/raphael-min.js
new file mode 100644
index 00000000000..8718b5bc749
--- /dev/null
+++ b/addons/base_diagram/static/lib/js/raphael-min.js
@@ -0,0 +1,7 @@
+/*
+ * Raphael 1.3.1 - JavaScript Vector Library
+ *
+ * Copyright (c) 2008 - 2009 Dmitry Baranovskiy (http://raphaeljs.com)
+ * Licensed under the MIT (http://www.opensource.org/licenses/mit-license.php) license.
+ */
+Raphael=(function(){var a=/[, ]+/,aO=/^(circle|rect|path|ellipse|text|image)$/,L=document,au=window,l={was:"Raphael" in au,is:au.Raphael},an=function(){if(an.is(arguments[0],"array")){var d=arguments[0],e=w[aW](an,d.splice(0,3+an.is(d[0],al))),S=e.set();for(var R=0,a0=d[m];R<a0;R++){var E=d[R]||{};aO.test(E.type)&&S[f](e[E.type]().attr(E));}return S;}return w[aW](an,arguments);},aT=function(){},aL="appendChild",aW="apply",aS="concat",at="",am=" ",z="split",F="click dblclick mousedown mousemove mouseout mouseover mouseup"[z](am),Q="hasOwnProperty",az="join",m="length",aY="prototype",aZ=String[aY].toLowerCase,ab=Math,g=ab.max,aI=ab.min,al="number",aA="toString",aw=Object[aY][aA],aQ={},aM=ab.pow,f="push",aU=/^(?=[\da-f]$)/,c=/^url\(['"]?([^\)]+)['"]?\)$/i,x=/^\s*((#[a-f\d]{6})|(#[a-f\d]{3})|rgb\(\s*([\d\.]+\s*,\s*[\d\.]+\s*,\s*[\d\.]+)\s*\)|rgb\(\s*([\d\.]+%\s*,\s*[\d\.]+%\s*,\s*[\d\.]+%)\s*\)|hs[bl]\(\s*([\d\.]+\s*,\s*[\d\.]+\s*,\s*[\d\.]+)\s*\)|hs[bl]\(\s*([\d\.]+%\s*,\s*[\d\.]+%\s*,\s*[\d\.]+%)\s*\))\s*$/i,O=ab.round,v="setAttribute",W=parseFloat,G=parseInt,aN=String[aY].toUpperCase,j={"clip-rect":"0 0 1e9 1e9",cursor:"default",cx:0,cy:0,fill:"#fff","fill-opacity":1,font:'10px "Arial"',"font-family":'"Arial"',"font-size":"10","font-style":"normal","font-weight":400,gradient:0,height:0,href:"http://raphaeljs.com/",opacity:1,path:"M0,0",r:0,rotation:0,rx:0,ry:0,scale:"1 1",src:"",stroke:"#000","stroke-dasharray":"","stroke-linecap":"butt","stroke-linejoin":"butt","stroke-miterlimit":0,"stroke-opacity":1,"stroke-width":1,target:"_blank","text-anchor":"middle",title:"Raphael",translation:"0 0",width:0,x:0,y:0},Z={along:"along","clip-rect":"csv",cx:al,cy:al,fill:"colour","fill-opacity":al,"font-size":al,height:al,opacity:al,path:"path",r:al,rotation:"csv",rx:al,ry:al,scale:"csv",stroke:"colour","stroke-opacity":al,"stroke-width":al,translation:"csv",width:al,x:al,y:al},aP="replace";an.version="1.3.1";an.type=(au.SVGAngle||L.implementation.hasFeature("http://www.w3.org/TR/SVG11/feature#BasicStructure","1.1")?"SVG":"VML");if(an.type=="VML"){var ag=document.createElement("div");ag.innerHTML="<!--[if vml]><br><br><![endif]-->";if(ag.childNodes[m]!=2){return null;}}an.svg=!(an.vml=an.type=="VML");aT[aY]=an[aY];an._id=0;an._oid=0;an.fn={};an.is=function(e,d){d=aZ.call(d);return((d=="object"||d=="undefined")&&typeof e==d)||(e==null&&d=="null")||aZ.call(aw.call(e).slice(8,-1))==d;};an.setWindow=function(d){au=d;L=au.document;};var aD=function(e){if(an.vml){var d=/^\s+|\s+$/g;aD=aj(function(R){var S;R=(R+at)[aP](d,at);try{var a0=new ActiveXObject("htmlfile");a0.write("<body>");a0.close();S=a0.body;}catch(a2){S=createPopup().document.body;}var i=S.createTextRange();try{S.style.color=R;var a1=i.queryCommandValue("ForeColor");a1=((a1&255)<<16)|(a1&65280)|((a1&16711680)>>>16);return"#"+("000000"+a1[aA](16)).slice(-6);}catch(a2){return"none";}});}else{var E=L.createElement("i");E.title="Rapha\xebl Colour Picker";E.style.display="none";L.body[aL](E);aD=aj(function(i){E.style.color=i;return L.defaultView.getComputedStyle(E,at).getPropertyValue("color");});}return aD(e);};an.hsb2rgb=aj(function(a3,a1,a7){if(an.is(a3,"object")&&"h" in a3&&"s" in a3&&"b" in a3){a7=a3.b;a1=a3.s;a3=a3.h;}var R,S,a8;if(a7==0){return{r:0,g:0,b:0,hex:"#000"};}if(a3>1||a1>1||a7>1){a3/=255;a1/=255;a7/=255;}var a0=~~(a3*6),a4=(a3*6)-a0,E=a7*(1-a1),e=a7*(1-(a1*a4)),a9=a7*(1-(a1*(1-a4)));R=[a7,e,E,E,a9,a7,a7][a0];S=[a9,a7,a7,e,E,E,a9][a0];a8=[E,E,a9,a7,a7,e,E][a0];R*=255;S*=255;a8*=255;var a5={r:R,g:S,b:a8},d=(~~R)[aA](16),a2=(~~S)[aA](16),a6=(~~a8)[aA](16);d=d[aP](aU,"0");a2=a2[aP](aU,"0");a6=a6[aP](aU,"0");a5.hex="#"+d+a2+a6;return a5;},an);an.rgb2hsb=aj(function(d,e,a1){if(an.is(d,"object")&&"r" in d&&"g" in d&&"b" in d){a1=d.b;e=d.g;d=d.r;}if(an.is(d,"string")){var a3=an.getRGB(d);d=a3.r;e=a3.g;a1=a3.b;}if(d>1||e>1||a1>1){d/=255;e/=255;a1/=255;}var a0=g(d,e,a1),i=aI(d,e,a1),R,E,S=a0;if(i==a0){return{h:0,s:0,b:a0};}else{var a2=(a0-i);E=a2/a0;if(d==a0){R=(e-a1)/a2;}else{if(e==a0){R=2+((a1-d)/a2);}else{R=4+((d-e)/a2);}}R/=6;R<0&&R++;R>1&&R--;}return{h:R,s:E,b:S};},an);var aE=/,?([achlmqrstvxz]),?/gi;an._path2string=function(){return this.join(",")[aP](aE,"$1");};function aj(E,e,d){function i(){var R=Array[aY].slice.call(arguments,0),a0=R[az]("\u25ba"),S=i.cache=i.cache||{},a1=i.count=i.count||[];if(S[Q](a0)){return d?d(S[a0]):S[a0];}a1[m]>=1000&&delete S[a1.shift()];a1[f](a0);S[a0]=E[aW](e,R);return d?d(S[a0]):S[a0];}return i;}an.getRGB=aj(function(d){if(!d||!!((d=d+at).indexOf("-")+1)){return{r:-1,g:-1,b:-1,hex:"none",error:1};}if(d=="none"){return{r:-1,g:-1,b:-1,hex:"none"};}!(({hs:1,rg:1})[Q](d.substring(0,2))||d.charAt()=="#")&&(d=aD(d));var S,i,E,a2,a3,a0=d.match(x);if(a0){if(a0[2]){a2=G(a0[2].substring(5),16);E=G(a0[2].substring(3,5),16);i=G(a0[2].substring(1,3),16);}if(a0[3]){a2=G((a3=a0[3].charAt(3))+a3,16);E=G((a3=a0[3].charAt(2))+a3,16);i=G((a3=a0[3].charAt(1))+a3,16);}if(a0[4]){a0=a0[4][z](/\s*,\s*/);i=W(a0[0]);E=W(a0[1]);a2=W(a0[2]);}if(a0[5]){a0=a0[5][z](/\s*,\s*/);i=W(a0[0])*2.55;E=W(a0[1])*2.55;a2=W(a0[2])*2.55;}if(a0[6]){a0=a0[6][z](/\s*,\s*/);i=W(a0[0]);E=W(a0[1]);a2=W(a0[2]);return an.hsb2rgb(i,E,a2);}if(a0[7]){a0=a0[7][z](/\s*,\s*/);i=W(a0[0])*2.55;E=W(a0[1])*2.55;a2=W(a0[2])*2.55;return an.hsb2rgb(i,E,a2);}a0={r:i,g:E,b:a2};var e=(~~i)[aA](16),R=(~~E)[aA](16),a1=(~~a2)[aA](16);e=e[aP](aU,"0");R=R[aP](aU,"0");a1=a1[aP](aU,"0");a0.hex="#"+e+R+a1;return a0;}return{r:-1,g:-1,b:-1,hex:"none",error:1};},an);an.getColor=function(e){var i=this.getColor.start=this.getColor.start||{h:0,s:1,b:e||0.75},d=this.hsb2rgb(i.h,i.s,i.b);i.h+=0.075;if(i.h>1){i.h=0;i.s-=0.2;i.s<=0&&(this.getColor.start={h:0,s:1,b:i.b});}return d.hex;};an.getColor.reset=function(){delete this.start;};an.parsePathString=aj(function(d){if(!d){return null;}var i={a:7,c:6,h:1,l:2,m:2,q:4,s:4,t:2,v:1,z:0},e=[];if(an.is(d,"array")&&an.is(d[0],"array")){e=av(d);}if(!e[m]){(d+at)[aP](/([achlmqstvz])[\s,]*((-?\d*\.?\d*(?:e[-+]?\d+)?\s*,?\s*)+)/ig,function(R,E,a1){var a0=[],S=aZ.call(E);a1[aP](/(-?\d*\.?\d*(?:e[-+]?\d+)?)\s*,?\s*/ig,function(a3,a2){a2&&a0[f](+a2);});while(a0[m]>=i[S]){e[f]([E][aS](a0.splice(0,i[S])));if(!i[S]){break;}}});}e[aA]=an._path2string;return e;});an.findDotsAtSegment=function(e,d,be,bc,a0,R,a2,a1,a8){var a6=1-a8,a5=aM(a6,3)*e+aM(a6,2)*3*a8*be+a6*3*a8*a8*a0+aM(a8,3)*a2,a3=aM(a6,3)*d+aM(a6,2)*3*a8*bc+a6*3*a8*a8*R+aM(a8,3)*a1,ba=e+2*a8*(be-e)+a8*a8*(a0-2*be+e),a9=d+2*a8*(bc-d)+a8*a8*(R-2*bc+d),bd=be+2*a8*(a0-be)+a8*a8*(a2-2*a0+be),bb=bc+2*a8*(R-bc)+a8*a8*(a1-2*R+bc),a7=(1-a8)*e+a8*be,a4=(1-a8)*d+a8*bc,E=(1-a8)*a0+a8*a2,i=(1-a8)*R+a8*a1,S=(90-ab.atan((ba-bd)/(a9-bb))*180/ab.PI);(ba>bd||a9<bb)&&(S+=180);return{x:a5,y:a3,m:{x:ba,y:a9},n:{x:bd,y:bb},start:{x:a7,y:a4},end:{x:E,y:i},alpha:S};};var U=aj(function(a5){if(!a5){return{x:0,y:0,width:0,height:0};}a5=H(a5);var a2=0,a1=0,R=[],e=[],E;for(var S=0,a4=a5[m];S<a4;S++){E=a5[S];if(E[0]=="M"){a2=E[1];a1=E[2];R[f](a2);e[f](a1);}else{var a0=aC(a2,a1,E[1],E[2],E[3],E[4],E[5],E[6]);R=R[aS](a0.min.x,a0.max.x);e=e[aS](a0.min.y,a0.max.y);a2=E[5];a1=E[6];}}var d=aI[aW](0,R),a3=aI[aW](0,e);return{x:d,y:a3,width:g[aW](0,R)-d,height:g[aW](0,e)-a3};}),av=function(a0){var E=[];if(!an.is(a0,"array")||!an.is(a0&&a0[0],"array")){a0=an.parsePathString(a0);}for(var e=0,R=a0[m];e<R;e++){E[e]=[];for(var d=0,S=a0[e][m];d<S;d++){E[e][d]=a0[e][d];}}E[aA]=an._path2string;return E;},ad=aj(function(R){if(!an.is(R,"array")||!an.is(R&&R[0],"array")){R=an.parsePathString(R);}var a4=[],a6=0,a5=0,a9=0,a8=0,E=0;if(R[0][0]=="M"){a6=R[0][1];a5=R[0][2];a9=a6;a8=a5;E++;a4[f](["M",a6,a5]);}for(var a1=E,ba=R[m];a1<ba;a1++){var d=a4[a1]=[],a7=R[a1];if(a7[0]!=aZ.call(a7[0])){d[0]=aZ.call(a7[0]);switch(d[0]){case"a":d[1]=a7[1];d[2]=a7[2];d[3]=a7[3];d[4]=a7[4];d[5]=a7[5];d[6]=+(a7[6]-a6).toFixed(3);d[7]=+(a7[7]-a5).toFixed(3);break;case"v":d[1]=+(a7[1]-a5).toFixed(3);break;case"m":a9=a7[1];a8=a7[2];default:for(var a0=1,a2=a7[m];a0<a2;a0++){d[a0]=+(a7[a0]-((a0%2)?a6:a5)).toFixed(3);}}}else{d=a4[a1]=[];if(a7[0]=="m"){a9=a7[1]+a6;a8=a7[2]+a5;}for(var S=0,e=a7[m];S<e;S++){a4[a1][S]=a7[S];}}var a3=a4[a1][m];switch(a4[a1][0]){case"z":a6=a9;a5=a8;break;case"h":a6+=+a4[a1][a3-1];break;case"v":a5+=+a4[a1][a3-1];break;default:a6+=+a4[a1][a3-2];a5+=+a4[a1][a3-1];}}a4[aA]=an._path2string;return a4;},0,av),r=aj(function(R){if(!an.is(R,"array")||!an.is(R&&R[0],"array")){R=an.parsePathString(R);}var a3=[],a5=0,a4=0,a8=0,a7=0,E=0;if(R[0][0]=="M"){a5=+R[0][1];a4=+R[0][2];a8=a5;a7=a4;E++;a3[0]=["M",a5,a4];}for(var a1=E,a9=R[m];a1<a9;a1++){var d=a3[a1]=[],a6=R[a1];if(a6[0]!=aN.call(a6[0])){d[0]=aN.call(a6[0]);switch(d[0]){case"A":d[1]=a6[1];d[2]=a6[2];d[3]=a6[3];d[4]=a6[4];d[5]=a6[5];d[6]=+(a6[6]+a5);d[7]=+(a6[7]+a4);break;case"V":d[1]=+a6[1]+a4;break;case"H":d[1]=+a6[1]+a5;break;case"M":a8=+a6[1]+a5;a7=+a6[2]+a4;default:for(var a0=1,a2=a6[m];a0<a2;a0++){d[a0]=+a6[a0]+((a0%2)?a5:a4);}}}else{for(var S=0,e=a6[m];S<e;S++){a3[a1][S]=a6[S];}}switch(d[0]){case"Z":a5=a8;a4=a7;break;case"H":a5=d[1];break;case"V":a4=d[1];break;default:a5=a3[a1][a3[a1][m]-2];a4=a3[a1][a3[a1][m]-1];}}a3[aA]=an._path2string;return a3;},null,av),aX=function(e,E,d,i){return[e,E,d,i,d,i];},aK=function(e,E,a0,R,d,i){var S=1/3,a1=2/3;return[S*e+a1*a0,S*E+a1*R,S*d+a1*a0,S*i+a1*R,d,i];},K=function(a9,bE,bi,bg,ba,a4,S,a8,bD,bb){var R=ab.PI,bf=R*120/180,d=R/180*(+ba||0),bm=[],bj,bA=aj(function(bF,bI,i){var bH=bF*ab.cos(i)-bI*ab.sin(i),bG=bF*ab.sin(i)+bI*ab.cos(i);return{x:bH,y:bG};});if(!bb){bj=bA(a9,bE,-d);a9=bj.x;bE=bj.y;bj=bA(a8,bD,-d);a8=bj.x;bD=bj.y;var e=ab.cos(R/180*ba),a6=ab.sin(R/180*ba),bo=(a9-a8)/2,bn=(bE-bD)/2;bi=g(bi,ab.abs(bo));bg=g(bg,ab.abs(bn));var by=(bo*bo)/(bi*bi)+(bn*bn)/(bg*bg);if(by>1){bi=ab.sqrt(by)*bi;bg=ab.sqrt(by)*bg;}var E=bi*bi,br=bg*bg,bt=(a4==S?-1:1)*ab.sqrt(ab.abs((E*br-E*bn*bn-br*bo*bo)/(E*bn*bn+br*bo*bo))),bd=bt*bi*bn/bg+(a9+a8)/2,bc=bt*-bg*bo/bi+(bE+bD)/2,a3=ab.asin(((bE-bc)/bg).toFixed(7)),a2=ab.asin(((bD-bc)/bg).toFixed(7));a3=a9<bd?R-a3:a3;a2=a8<bd?R-a2:a2;a3<0&&(a3=R*2+a3);a2<0&&(a2=R*2+a2);if(S&&a3>a2){a3=a3-R*2;}if(!S&&a2>a3){a2=a2-R*2;}}else{a3=bb[0];a2=bb[1];bd=bb[2];bc=bb[3];}var a7=a2-a3;if(ab.abs(a7)>bf){var be=a2,bh=a8,a5=bD;a2=a3+bf*(S&&a2>a3?1:-1);a8=bd+bi*ab.cos(a2);bD=bc+bg*ab.sin(a2);bm=K(a8,bD,bi,bg,ba,0,S,bh,a5,[a2,be,bd,bc]);}a7=a2-a3;var a1=ab.cos(a3),bC=ab.sin(a3),a0=ab.cos(a2),bB=ab.sin(a2),bp=ab.tan(a7/4),bs=4/3*bi*bp,bq=4/3*bg*bp,bz=[a9,bE],bx=[a9+bs*bC,bE-bq*a1],bw=[a8+bs*bB,bD-bq*a0],bu=[a8,bD];bx[0]=2*bz[0]-bx[0];bx[1]=2*bz[1]-bx[1];if(bb){return[bx,bw,bu][aS](bm);}else{bm=[bx,bw,bu][aS](bm)[az]()[z](",");var bk=[];for(var bv=0,bl=bm[m];bv<bl;bv++){bk[bv]=bv%2?bA(bm[bv-1],bm[bv],d).y:bA(bm[bv],bm[bv+1],d).x;}return bk;}},M=function(e,d,E,i,a2,a1,a0,S,a3){var R=1-a3;return{x:aM(R,3)*e+aM(R,2)*3*a3*E+R*3*a3*a3*a2+aM(a3,3)*a0,y:aM(R,3)*d+aM(R,2)*3*a3*i+R*3*a3*a3*a1+aM(a3,3)*S};},aC=aj(function(i,d,R,E,a9,a8,a5,a2){var a7=(a9-2*R+i)-(a5-2*a9+R),a4=2*(R-i)-2*(a9-R),a1=i-R,a0=(-a4+ab.sqrt(a4*a4-4*a7*a1))/2/a7,S=(-a4-ab.sqrt(a4*a4-4*a7*a1))/2/a7,a3=[d,a2],a6=[i,a5],e;ab.abs(a0)>1000000000000&&(a0=0.5);ab.abs(S)>1000000000000&&(S=0.5);if(a0>0&&a0<1){e=M(i,d,R,E,a9,a8,a5,a2,a0);a6[f](e.x);a3[f](e.y);}if(S>0&&S<1){e=M(i,d,R,E,a9,a8,a5,a2,S);a6[f](e.x);a3[f](e.y);}a7=(a8-2*E+d)-(a2-2*a8+E);a4=2*(E-d)-2*(a8-E);a1=d-E;a0=(-a4+ab.sqrt(a4*a4-4*a7*a1))/2/a7;S=(-a4-ab.sqrt(a4*a4-4*a7*a1))/2/a7;ab.abs(a0)>1000000000000&&(a0=0.5);ab.abs(S)>1000000000000&&(S=0.5);if(a0>0&&a0<1){e=M(i,d,R,E,a9,a8,a5,a2,a0);a6[f](e.x);a3[f](e.y);}if(S>0&&S<1){e=M(i,d,R,E,a9,a8,a5,a2,S);a6[f](e.x);a3[f](e.y);}return{min:{x:aI[aW](0,a6),y:aI[aW](0,a3)},max:{x:g[aW](0,a6),y:g[aW](0,a3)}};}),H=aj(function(a9,a4){var R=r(a9),a5=a4&&r(a4),a6={x:0,y:0,bx:0,by:0,X:0,Y:0,qx:null,qy:null},d={x:0,y:0,bx:0,by:0,X:0,Y:0,qx:null,qy:null},a0=function(ba,bb){var i,bc;if(!ba){return["C",bb.x,bb.y,bb.x,bb.y,bb.x,bb.y];}!(ba[0] in {T:1,Q:1})&&(bb.qx=bb.qy=null);switch(ba[0]){case"M":bb.X=ba[1];bb.Y=ba[2];break;case"A":ba=["C"][aS](K[aW](0,[bb.x,bb.y][aS](ba.slice(1))));break;case"S":i=bb.x+(bb.x-(bb.bx||bb.x));bc=bb.y+(bb.y-(bb.by||bb.y));ba=["C",i,bc][aS](ba.slice(1));break;case"T":bb.qx=bb.x+(bb.x-(bb.qx||bb.x));bb.qy=bb.y+(bb.y-(bb.qy||bb.y));ba=["C"][aS](aK(bb.x,bb.y,bb.qx,bb.qy,ba[1],ba[2]));break;case"Q":bb.qx=ba[1];bb.qy=ba[2];ba=["C"][aS](aK(bb.x,bb.y,ba[1],ba[2],ba[3],ba[4]));break;case"L":ba=["C"][aS](aX(bb.x,bb.y,ba[1],ba[2]));break;case"H":ba=["C"][aS](aX(bb.x,bb.y,ba[1],bb.y));break;case"V":ba=["C"][aS](aX(bb.x,bb.y,bb.x,ba[1]));break;case"Z":ba=["C"][aS](aX(bb.x,bb.y,bb.X,bb.Y));break;}return ba;},e=function(ba,bb){if(ba[bb][m]>7){ba[bb].shift();var bc=ba[bb];while(bc[m]){ba.splice(bb++,0,["C"][aS](bc.splice(0,6)));}ba.splice(bb,1);a7=g(R[m],a5&&a5[m]||0);}},E=function(be,bd,bb,ba,bc){if(be&&bd&&be[bc][0]=="M"&&bd[bc][0]!="M"){bd.splice(bc,0,["M",ba.x,ba.y]);bb.bx=0;bb.by=0;bb.x=be[bc][1];bb.y=be[bc][2];a7=g(R[m],a5&&a5[m]||0);}};for(var a2=0,a7=g(R[m],a5&&a5[m]||0);a2<a7;a2++){R[a2]=a0(R[a2],a6);e(R,a2);a5&&(a5[a2]=a0(a5[a2],d));a5&&e(a5,a2);E(R,a5,a6,d,a2);E(a5,R,d,a6,a2);var a1=R[a2],a8=a5&&a5[a2],S=a1[m],a3=a5&&a8[m];a6.x=a1[S-2];a6.y=a1[S-1];a6.bx=W(a1[S-4])||a6.x;a6.by=W(a1[S-3])||a6.y;d.bx=a5&&(W(a8[a3-4])||d.x);d.by=a5&&(W(a8[a3-3])||d.y);d.x=a5&&a8[a3-2];d.y=a5&&a8[a3-1];}return a5?[R,a5]:R;},null,av),p=aj(function(a4){var a3=[];for(var a0=0,a5=a4[m];a0<a5;a0++){var e={},a2=a4[a0].match(/^([^:]*):?([\d\.]*)/);e.color=an.getRGB(a2[1]);if(e.color.error){return null;}e.color=e.color.hex;a2[2]&&(e.offset=a2[2]+"%");a3[f](e);}for(var a0=1,a5=a3[m]-1;a0<a5;a0++){if(!a3[a0].offset){var E=W(a3[a0-1].offset||0),R=0;for(var S=a0+1;S<a5;S++){if(a3[S].offset){R=a3[S].offset;break;}}if(!R){R=100;S=a5;}R=W(R);var a1=(R-E)/(S-a0+1);for(;a0<S;a0++){E+=a1;a3[a0].offset=E+"%";}}}return a3;}),ao=function(){var i,e,R,E,d;if(an.is(arguments[0],"string")||an.is(arguments[0],"object")){if(an.is(arguments[0],"string")){i=L.getElementById(arguments[0]);}else{i=arguments[0];}if(i.tagName){if(arguments[1]==null){return{container:i,width:i.style.pixelWidth||i.offsetWidth,height:i.style.pixelHeight||i.offsetHeight};}else{return{container:i,width:arguments[1],height:arguments[2]};}}}else{if(an.is(arguments[0],al)&&arguments[m]>3){return{container:1,x:arguments[0],y:arguments[1],width:arguments[2],height:arguments[3]};}}},aG=function(d,i){var e=this;for(var E in i){if(i[Q](E)&&!(E in d)){switch(typeof i[E]){case"function":(function(R){d[E]=d===e?R:function(){return R[aW](e,arguments);};})(i[E]);break;case"object":d[E]=d[E]||{};aG.call(this,d[E],i[E]);break;default:d[E]=i[E];break;}}}},ak=function(d,e){d==e.top&&(e.top=d.prev);d==e.bottom&&(e.bottom=d.next);d.next&&(d.next.prev=d.prev);d.prev&&(d.prev.next=d.next);},Y=function(d,e){if(e.top===d){return;}ak(d,e);d.next=null;d.prev=e.top;e.top.next=d;e.top=d;},k=function(d,e){if(e.bottom===d){return;}ak(d,e);d.next=e.bottom;d.prev=null;e.bottom.prev=d;e.bottom=d;},A=function(e,d,i){ak(e,i);d==i.top&&(i.top=e);d.next&&(d.next.prev=e);e.next=d.next;e.prev=d;d.next=e;},aq=function(e,d,i){ak(e,i);d==i.bottom&&(i.bottom=e);d.prev&&(d.prev.next=e);e.prev=d.prev;d.prev=e;e.next=d;},s=function(d){return function(){throw new Error("Rapha\xebl: you are calling to method \u201c"+d+"\u201d of removed object");};},ar=/^r(?:\(([^,]+?)\s*,\s*([^\)]+?)\))?/;if(an.svg){aT[aY].svgns="http://www.w3.org/2000/svg";aT[aY].xlink="http://www.w3.org/1999/xlink";var O=function(d){return +d+(~~d===d)*0.5;},V=function(S){for(var e=0,E=S[m];e<E;e++){if(aZ.call(S[e][0])!="a"){for(var d=1,R=S[e][m];d<R;d++){S[e][d]=O(S[e][d]);}}else{S[e][6]=O(S[e][6]);S[e][7]=O(S[e][7]);}}return S;},aJ=function(i,d){if(d){for(var e in d){if(d[Q](e)){i[v](e,d[e]);}}}else{return L.createElementNS(aT[aY].svgns,i);}};an[aA]=function(){return"Your browser supports SVG.\nYou are running Rapha\xebl "+this.version;};var q=function(d,E){var e=aJ("path");E.canvas&&E.canvas[aL](e);var i=new ax(e,E);i.type="path";aa(i,{fill:"none",stroke:"#000",path:d});return i;};var b=function(E,a7,d){var a4="linear",a1=0.5,S=0.5,a9=E.style;a7=(a7+at)[aP](ar,function(bb,i,bc){a4="radial";if(i&&bc){a1=W(i);S=W(bc);var ba=((S>0.5)*2-1);aM(a1-0.5,2)+aM(S-0.5,2)>0.25&&(S=ab.sqrt(0.25-aM(a1-0.5,2))*ba+0.5)&&S!=0.5&&(S=S.toFixed(5)-0.00001*ba);}return at;});a7=a7[z](/\s*\-\s*/);if(a4=="linear"){var a0=a7.shift();a0=-W(a0);if(isNaN(a0)){return null;}var R=[0,0,ab.cos(a0*ab.PI/180),ab.sin(a0*ab.PI/180)],a6=1/(g(ab.abs(R[2]),ab.abs(R[3]))||1);R[2]*=a6;R[3]*=a6;if(R[2]<0){R[0]=-R[2];R[2]=0;}if(R[3]<0){R[1]=-R[3];R[3]=0;}}var a3=p(a7);if(!a3){return null;}var e=aJ(a4+"Gradient");e.id="r"+(an._id++)[aA](36);aJ(e,a4=="radial"?{fx:a1,fy:S}:{x1:R[0],y1:R[1],x2:R[2],y2:R[3]});d.defs[aL](e);for(var a2=0,a8=a3[m];a2<a8;a2++){var a5=aJ("stop");aJ(a5,{offset:a3[a2].offset?a3[a2].offset:!a2?"0%":"100%","stop-color":a3[a2].color||"#fff"});e[aL](a5);}aJ(E,{fill:"url(#"+e.id+")",opacity:1,"fill-opacity":1});a9.fill=at;a9.opacity=1;a9.fillOpacity=1;return 1;};var N=function(e){var d=e.getBBox();aJ(e.pattern,{patternTransform:an.format("translate({0},{1})",d.x,d.y)});};var aa=function(a6,bf){var a9={"":[0],none:[0],"-":[3,1],".":[1,1],"-.":[3,1,1,1],"-..":[3,1,1,1,1,1],". ":[1,3],"- ":[4,3],"--":[8,3],"- .":[4,3,1,3],"--.":[8,3,1,3],"--..":[8,3,1,3,1,3]},bb=a6.node,a7=a6.attrs,a3=a6.rotate(),S=function(bm,bl){bl=a9[aZ.call(bl)];if(bl){var bj=bm.attrs["stroke-width"]||"1",bh={round:bj,square:bj,butt:0}[bm.attrs["stroke-linecap"]||bf["stroke-linecap"]]||0,bk=[];var bi=bl[m];while(bi--){bk[bi]=bl[bi]*bj+((bi%2)?1:-1)*bh;}aJ(bb,{"stroke-dasharray":bk[az](",")});}};bf[Q]("rotation")&&(a3=bf.rotation);var a2=(a3+at)[z](a);if(!(a2.length-1)){a2=null;}else{a2[1]=+a2[1];a2[2]=+a2[2];}W(a3)&&a6.rotate(0,true);for(var ba in bf){if(bf[Q](ba)){if(!j[Q](ba)){continue;}var a8=bf[ba];a7[ba]=a8;switch(ba){case"rotation":a6.rotate(a8,true);break;case"href":case"title":case"target":var bd=bb.parentNode;if(aZ.call(bd.tagName)!="a"){var E=aJ("a");bd.insertBefore(E,bb);E[aL](bb);bd=E;}bd.setAttributeNS(a6.paper.xlink,ba,a8);break;case"cursor":bb.style.cursor=a8;break;case"clip-rect":var e=(a8+at)[z](a);if(e[m]==4){a6.clip&&a6.clip.parentNode.parentNode.removeChild(a6.clip.parentNode);var i=aJ("clipPath"),bc=aJ("rect");i.id="r"+(an._id++)[aA](36);aJ(bc,{x:e[0],y:e[1],width:e[2],height:e[3]});i[aL](bc);a6.paper.defs[aL](i);aJ(bb,{"clip-path":"url(#"+i.id+")"});a6.clip=bc;}if(!a8){var be=L.getElementById(bb.getAttribute("clip-path")[aP](/(^url\(#|\)$)/g,at));be&&be.parentNode.removeChild(be);aJ(bb,{"clip-path":at});delete a6.clip;}break;case"path":if(a8&&a6.type=="path"){a7.path=V(r(a8));aJ(bb,{d:a7.path});}break;case"width":bb[v](ba,a8);if(a7.fx){ba="x";a8=a7.x;}else{break;}case"x":if(a7.fx){a8=-a7.x-(a7.width||0);}case"rx":if(ba=="rx"&&a6.type=="rect"){break;}case"cx":a2&&(ba=="x"||ba=="cx")&&(a2[1]+=a8-a7[ba]);bb[v](ba,O(a8));a6.pattern&&N(a6);break;case"height":bb[v](ba,a8);if(a7.fy){ba="y";a8=a7.y;}else{break;}case"y":if(a7.fy){a8=-a7.y-(a7.height||0);}case"ry":if(ba=="ry"&&a6.type=="rect"){break;}case"cy":a2&&(ba=="y"||ba=="cy")&&(a2[2]+=a8-a7[ba]);bb[v](ba,O(a8));a6.pattern&&N(a6);break;case"r":if(a6.type=="rect"){aJ(bb,{rx:a8,ry:a8});}else{bb[v](ba,a8);}break;case"src":if(a6.type=="image"){bb.setAttributeNS(a6.paper.xlink,"href",a8);}break;case"stroke-width":bb.style.strokeWidth=a8;bb[v](ba,a8);if(a7["stroke-dasharray"]){S(a6,a7["stroke-dasharray"]);}break;case"stroke-dasharray":S(a6,a8);break;case"translation":var a0=(a8+at)[z](a);a0[0]=+a0[0]||0;a0[1]=+a0[1]||0;if(a2){a2[1]+=a0[0];a2[2]+=a0[1];}t.call(a6,a0[0],a0[1]);break;case"scale":var a0=(a8+at)[z](a);a6.scale(+a0[0]||1,+a0[1]||+a0[0]||1,+a0[2]||null,+a0[3]||null);break;case"fill":var R=(a8+at).match(c);if(R){var i=aJ("pattern"),a5=aJ("image");i.id="r"+(an._id++)[aA](36);aJ(i,{x:0,y:0,patternUnits:"userSpaceOnUse",height:1,width:1});aJ(a5,{x:0,y:0});a5.setAttributeNS(a6.paper.xlink,"href",R[1]);i[aL](a5);var bg=L.createElement("img");bg.style.cssText="position:absolute;left:-9999em;top-9999em";bg.onload=function(){aJ(i,{width:this.offsetWidth,height:this.offsetHeight});aJ(a5,{width:this.offsetWidth,height:this.offsetHeight});L.body.removeChild(this);a6.paper.safari();};L.body[aL](bg);bg.src=R[1];a6.paper.defs[aL](i);bb.style.fill="url(#"+i.id+")";aJ(bb,{fill:"url(#"+i.id+")"});a6.pattern=i;a6.pattern&&N(a6);break;}if(!an.getRGB(a8).error){delete bf.gradient;delete a7.gradient;!an.is(a7.opacity,"undefined")&&an.is(bf.opacity,"undefined")&&aJ(bb,{opacity:a7.opacity});!an.is(a7["fill-opacity"],"undefined")&&an.is(bf["fill-opacity"],"undefined")&&aJ(bb,{"fill-opacity":a7["fill-opacity"]});}else{if((({circle:1,ellipse:1})[Q](a6.type)||(a8+at).charAt()!="r")&&b(bb,a8,a6.paper)){a7.gradient=a8;a7.fill="none";break;}}case"stroke":bb[v](ba,an.getRGB(a8).hex);break;case"gradient":(({circle:1,ellipse:1})[Q](a6.type)||(a8+at).charAt()!="r")&&b(bb,a8,a6.paper);break;case"opacity":case"fill-opacity":if(a7.gradient){var d=L.getElementById(bb.getAttribute("fill")[aP](/^url\(#|\)$/g,at));if(d){var a1=d.getElementsByTagName("stop");a1[a1[m]-1][v]("stop-opacity",a8);}break;}default:ba=="font-size"&&(a8=G(a8,10)+"px");var a4=ba[aP](/(\-.)/g,function(bh){return aN.call(bh.substring(1));});bb.style[a4]=a8;bb[v](ba,a8);break;}}}D(a6,bf);if(a2){a6.rotate(a2.join(am));}else{W(a3)&&a6.rotate(a3,true);}};var h=1.2;var D=function(d,R){if(d.type!="text"||!(R[Q]("text")||R[Q]("font")||R[Q]("font-size")||R[Q]("x")||R[Q]("y"))){return;}var a3=d.attrs,e=d.node,a5=e.firstChild?G(L.defaultView.getComputedStyle(e.firstChild,at).getPropertyValue("font-size"),10):10;if(R[Q]("text")){a3.text=R.text;while(e.firstChild){e.removeChild(e.firstChild);}var E=(R.text+at)[z]("\n");for(var S=0,a4=E[m];S<a4;S++){if(E[S]){var a1=aJ("tspan");S&&aJ(a1,{dy:a5*h,x:a3.x});a1[aL](L.createTextNode(E[S]));e[aL](a1);}}}else{var E=e.getElementsByTagName("tspan");for(var S=0,a4=E[m];S<a4;S++){S&&aJ(E[S],{dy:a5*h,x:a3.x});}}aJ(e,{y:a3.y});var a0=d.getBBox(),a2=a3.y-(a0.y+a0.height/2);a2&&isFinite(a2)&&aJ(e,{y:a3.y+a2});};var ax=function(e,d){var E=0,i=0;this[0]=e;this.id=an._oid++;this.node=e;e.raphael=this;this.paper=d;this.attrs=this.attrs||{};this.transformations=[];this._={tx:0,ty:0,rt:{deg:0,cx:0,cy:0},sx:1,sy:1};!d.bottom&&(d.bottom=this);this.prev=d.top;d.top&&(d.top.next=this);d.top=this;this.next=null;};ax[aY].rotate=function(e,d,E){if(this.removed){return this;}if(e==null){if(this._.rt.cx){return[this._.rt.deg,this._.rt.cx,this._.rt.cy][az](am);}return this._.rt.deg;}var i=this.getBBox();e=(e+at)[z](a);if(e[m]-1){d=W(e[1]);E=W(e[2]);}e=W(e[0]);if(d!=null){this._.rt.deg=e;}else{this._.rt.deg+=e;}(E==null)&&(d=null);this._.rt.cx=d;this._.rt.cy=E;d=d==null?i.x+i.width/2:d;E=E==null?i.y+i.height/2:E;if(this._.rt.deg){this.transformations[0]=an.format("rotate({0} {1} {2})",this._.rt.deg,d,E);this.clip&&aJ(this.clip,{transform:an.format("rotate({0} {1} {2})",-this._.rt.deg,d,E)});}else{this.transformations[0]=at;this.clip&&aJ(this.clip,{transform:at});}aJ(this.node,{transform:this.transformations[az](am)});return this;};ax[aY].hide=function(){!this.removed&&(this.node.style.display="none");return this;};ax[aY].show=function(){!this.removed&&(this.node.style.display="");return this;};ax[aY].remove=function(){if(this.removed){return;}ak(this,this.paper);this.node.parentNode.removeChild(this.node);for(var d in this){delete this[d];}this.removed=true;};ax[aY].getBBox=function(){if(this.removed){return this;}if(this.type=="path"){return U(this.attrs.path);}if(this.node.style.display=="none"){this.show();var E=true;}var a1={};try{a1=this.node.getBBox();}catch(S){}finally{a1=a1||{};}if(this.type=="text"){a1={x:a1.x,y:Infinity,width:0,height:0};for(var d=0,R=this.node.getNumberOfChars();d<R;d++){var a0=this.node.getExtentOfChar(d);(a0.y<a1.y)&&(a1.y=a0.y);(a0.y+a0.height-a1.y>a1.height)&&(a1.height=a0.y+a0.height-a1.y);(a0.x+a0.width-a1.x>a1.width)&&(a1.width=a0.x+a0.width-a1.x);}}E&&this.hide();return a1;};ax[aY].attr=function(){if(this.removed){return this;}if(arguments[m]==0){var R={};for(var E in this.attrs){if(this.attrs[Q](E)){R[E]=this.attrs[E];}}this._.rt.deg&&(R.rotation=this.rotate());(this._.sx!=1||this._.sy!=1)&&(R.scale=this.scale());R.gradient&&R.fill=="none"&&(R.fill=R.gradient)&&delete R.gradient;return R;}if(arguments[m]==1&&an.is(arguments[0],"string")){if(arguments[0]=="translation"){return t.call(this);}if(arguments[0]=="rotation"){return this.rotate();}if(arguments[0]=="scale"){return this.scale();}if(arguments[0]=="fill"&&this.attrs.fill=="none"&&this.attrs.gradient){return this.attrs.gradient;}return this.attrs[arguments[0]];}if(arguments[m]==1&&an.is(arguments[0],"array")){var d={};for(var e in arguments[0]){if(arguments[0][Q](e)){d[arguments[0][e]]=this.attrs[arguments[0][e]];}}return d;}if(arguments[m]==2){var S={};S[arguments[0]]=arguments[1];aa(this,S);}else{if(arguments[m]==1&&an.is(arguments[0],"object")){aa(this,arguments[0]);}}return this;};ax[aY].toFront=function(){if(this.removed){return this;}this.node.parentNode[aL](this.node);var d=this.paper;d.top!=this&&Y(this,d);return this;};ax[aY].toBack=function(){if(this.removed){return this;}if(this.node.parentNode.firstChild!=this.node){this.node.parentNode.insertBefore(this.node,this.node.parentNode.firstChild);k(this,this.paper);var d=this.paper;}return this;};ax[aY].insertAfter=function(d){if(this.removed){return this;}var e=d.node;if(e.nextSibling){e.parentNode.insertBefore(this.node,e.nextSibling);}else{e.parentNode[aL](this.node);}A(this,d,this.paper);return this;};ax[aY].insertBefore=function(d){if(this.removed){return this;}var e=d.node;e.parentNode.insertBefore(this.node,e);aq(this,d,this.paper);return this;};var P=function(e,d,S,R){d=O(d);S=O(S);var E=aJ("circle");e.canvas&&e.canvas[aL](E);var i=new ax(E,e);i.attrs={cx:d,cy:S,r:R,fill:"none",stroke:"#000"};i.type="circle";aJ(E,i.attrs);return i;};var aF=function(i,d,a1,e,S,a0){d=O(d);a1=O(a1);var R=aJ("rect");i.canvas&&i.canvas[aL](R);var E=new ax(R,i);E.attrs={x:d,y:a1,width:e,height:S,r:a0||0,rx:a0||0,ry:a0||0,fill:"none",stroke:"#000"};E.type="rect";aJ(R,E.attrs);return E;};var ai=function(e,d,a0,S,R){d=O(d);a0=O(a0);var E=aJ("ellipse");e.canvas&&e.canvas[aL](E);var i=new ax(E,e);i.attrs={cx:d,cy:a0,rx:S,ry:R,fill:"none",stroke:"#000"};i.type="ellipse";aJ(E,i.attrs);return i;};var o=function(i,a0,d,a1,e,S){var R=aJ("image");aJ(R,{x:d,y:a1,width:e,height:S,preserveAspectRatio:"none"});R.setAttributeNS(i.xlink,"href",a0);i.canvas&&i.canvas[aL](R);var E=new ax(R,i);E.attrs={x:d,y:a1,width:e,height:S,src:a0};E.type="image";return E;};var X=function(e,d,S,R){var E=aJ("text");aJ(E,{x:d,y:S,"text-anchor":"middle"});e.canvas&&e.canvas[aL](E);var i=new ax(E,e);i.attrs={x:d,y:S,"text-anchor":"middle",text:R,font:j.font,stroke:"none",fill:"#000"};i.type="text";aa(i,i.attrs);return i;};var aV=function(e,d){this.width=e||this.width;this.height=d||this.height;this.canvas[v]("width",this.width);this.canvas[v]("height",this.height);return this;};var w=function(){var E=ao[aW](null,arguments),i=E&&E.container,e=E.x,a0=E.y,R=E.width,d=E.height;if(!i){throw new Error("SVG container not found.");}var S=aJ("svg");R=R||512;d=d||342;aJ(S,{xmlns:"http://www.w3.org/2000/svg",version:1.1,width:R,height:d});if(i==1){S.style.cssText="position:absolute;left:"+e+"px;top:"+a0+"px";L.body[aL](S);}else{if(i.firstChild){i.insertBefore(S,i.firstChild);}else{i[aL](S);}}i=new aT;i.width=R;i.height=d;i.canvas=S;aG.call(i,i,an.fn);i.clear();return i;};aT[aY].clear=function(){var d=this.canvas;while(d.firstChild){d.removeChild(d.firstChild);}this.bottom=this.top=null;(this.desc=aJ("desc"))[aL](L.createTextNode("Created with Rapha\xebl"));d[aL](this.desc);d[aL](this.defs=aJ("defs"));};aT[aY].remove=function(){this.canvas.parentNode&&this.canvas.parentNode.removeChild(this.canvas);for(var d in this){this[d]=s(d);}};}if(an.vml){var aH=function(a8){var a5=/[ahqstv]/ig,a0=r;(a8+at).match(a5)&&(a0=H);a5=/[clmz]/g;if(a0==r&&!(a8+at).match(a5)){var e={M:"m",L:"l",C:"c",Z:"x",m:"t",l:"r",c:"v",z:"x"},R=/([clmz]),?([^clmz]*)/gi,S=/-?[^,\s-]+/g;var a4=(a8+at)[aP](R,function(a9,bb,i){var ba=[];i[aP](S,function(bc){ba[f](O(bc));});return e[bb]+ba;});return a4;}var a6=a0(a8),E,a4=[],d;for(var a2=0,a7=a6[m];a2<a7;a2++){E=a6[a2];d=aZ.call(a6[a2][0]);d=="z"&&(d="x");for(var a1=1,a3=E[m];a1<a3;a1++){d+=O(E[a1])+(a1!=a3-1?",":at);}a4[f](d);}return a4[az](am);};an[aA]=function(){return"Your browser doesn\u2019t support SVG. Falling down to VML.\nYou are running Rapha\xebl "+this.version;};var q=function(d,S){var E=ah("group");E.style.cssText="position:absolute;left:0;top:0;width:"+S.width+"px;height:"+S.height+"px";E.coordsize=S.coordsize;E.coordorigin=S.coordorigin;var i=ah("shape"),e=i.style;e.width=S.width+"px";e.height=S.height+"px";i.coordsize=this.coordsize;i.coordorigin=this.coordorigin;E[aL](i);var R=new ax(i,E,S);R.isAbsolute=true;R.type="path";R.path=[];R.Path=at;d&&aa(R,{fill:"none",stroke:"#000",path:d});S.canvas[aL](E);return R;};var aa=function(a3,a8){a3.attrs=a3.attrs||{};var a6=a3.node,a9=a3.attrs,a0=a6.style,E,bd=a3;for(var a1 in a8){if(a8[Q](a1)){a9[a1]=a8[a1];}}a8.href&&(a6.href=a8.href);a8.title&&(a6.title=a8.title);a8.target&&(a6.target=a8.target);a8.cursor&&(a0.cursor=a8.cursor);if(a8.path&&a3.type=="path"){a9.path=a8.path;a6.path=aH(a9.path);}if(a8.rotation!=null){a3.rotate(a8.rotation,true);}if(a8.translation){E=(a8.translation+at)[z](a);t.call(a3,E[0],E[1]);if(a3._.rt.cx!=null){a3._.rt.cx+=+E[0];a3._.rt.cy+=+E[1];a3.setBox(a3.attrs,E[0],E[1]);}}if(a8.scale){E=(a8.scale+at)[z](a);a3.scale(+E[0]||1,+E[1]||+E[0]||1,+E[2]||null,+E[3]||null);}if("clip-rect" in a8){var d=(a8["clip-rect"]+at)[z](a);if(d[m]==4){d[2]=+d[2]+(+d[0]);d[3]=+d[3]+(+d[1]);var a2=a6.clipRect||L.createElement("div"),bc=a2.style,S=a6.parentNode;bc.clip=an.format("rect({1}px {2}px {3}px {0}px)",d);if(!a6.clipRect){bc.position="absolute";bc.top=0;bc.left=0;bc.width=a3.paper.width+"px";bc.height=a3.paper.height+"px";S.parentNode.insertBefore(a2,S);a2[aL](S);a6.clipRect=a2;}}if(!a8["clip-rect"]){a6.clipRect&&(a6.clipRect.style.clip=at);}}if(a3.type=="image"&&a8.src){a6.src=a8.src;}if(a3.type=="image"&&a8.opacity){a6.filterOpacity=" progid:DXImageTransform.Microsoft.Alpha(opacity="+(a8.opacity*100)+")";a0.filter=(a6.filterMatrix||at)+(a6.filterOpacity||at);}a8.font&&(a0.font=a8.font);a8["font-family"]&&(a0.fontFamily='"'+a8["font-family"][z](",")[0][aP](/^['"]+|['"]+$/g,at)+'"');a8["font-size"]&&(a0.fontSize=a8["font-size"]);a8["font-weight"]&&(a0.fontWeight=a8["font-weight"]);a8["font-style"]&&(a0.fontStyle=a8["font-style"]);if(a8.opacity!=null||a8["stroke-width"]!=null||a8.fill!=null||a8.stroke!=null||a8["stroke-width"]!=null||a8["stroke-opacity"]!=null||a8["fill-opacity"]!=null||a8["stroke-dasharray"]!=null||a8["stroke-miterlimit"]!=null||a8["stroke-linejoin"]!=null||a8["stroke-linecap"]!=null){a6=a3.shape||a6;var a7=(a6.getElementsByTagName("fill")&&a6.getElementsByTagName("fill")[0]),ba=false;!a7&&(ba=a7=ah("fill"));if("fill-opacity" in a8||"opacity" in a8){var e=((+a9["fill-opacity"]+1||2)-1)*((+a9.opacity+1||2)-1);e<0&&(e=0);e>1&&(e=1);a7.opacity=e;}a8.fill&&(a7.on=true);if(a7.on==null||a8.fill=="none"){a7.on=false;}if(a7.on&&a8.fill){var i=a8.fill.match(c);if(i){a7.src=i[1];a7.type="tile";}else{a7.color=an.getRGB(a8.fill).hex;a7.src=at;a7.type="solid";if(an.getRGB(a8.fill).error&&(bd.type in {circle:1,ellipse:1}||(a8.fill+at).charAt()!="r")&&b(bd,a8.fill)){a9.fill="none";a9.gradient=a8.fill;}}}ba&&a6[aL](a7);var R=(a6.getElementsByTagName("stroke")&&a6.getElementsByTagName("stroke")[0]),bb=false;!R&&(bb=R=ah("stroke"));if((a8.stroke&&a8.stroke!="none")||a8["stroke-width"]||a8["stroke-opacity"]!=null||a8["stroke-dasharray"]||a8["stroke-miterlimit"]||a8["stroke-linejoin"]||a8["stroke-linecap"]){R.on=true;}(a8.stroke=="none"||R.on==null||a8.stroke==0||a8["stroke-width"]==0)&&(R.on=false);R.on&&a8.stroke&&(R.color=an.getRGB(a8.stroke).hex);var e=((+a9["stroke-opacity"]+1||2)-1)*((+a9.opacity+1||2)-1),a4=(W(a8["stroke-width"])||1)*0.75;e<0&&(e=0);e>1&&(e=1);a8["stroke-width"]==null&&(a4=a9["stroke-width"]);a8["stroke-width"]&&(R.weight=a4);a4&&a4<1&&(e*=a4)&&(R.weight=1);R.opacity=e;a8["stroke-linejoin"]&&(R.joinstyle=a8["stroke-linejoin"]||"miter");R.miterlimit=a8["stroke-miterlimit"]||8;a8["stroke-linecap"]&&(R.endcap=a8["stroke-linecap"]=="butt"?"flat":a8["stroke-linecap"]=="square"?"square":"round");if(a8["stroke-dasharray"]){var a5={"-":"shortdash",".":"shortdot","-.":"shortdashdot","-..":"shortdashdotdot",". ":"dot","- ":"dash","--":"longdash","- .":"dashdot","--.":"longdashdot","--..":"longdashdotdot"};R.dashstyle=a5[Q](a8["stroke-dasharray"])?a5[a8["stroke-dasharray"]]:at;}bb&&a6[aL](R);}if(bd.type=="text"){var a0=bd.paper.span.style;a9.font&&(a0.font=a9.font);a9["font-family"]&&(a0.fontFamily=a9["font-family"]);a9["font-size"]&&(a0.fontSize=a9["font-size"]);a9["font-weight"]&&(a0.fontWeight=a9["font-weight"]);a9["font-style"]&&(a0.fontStyle=a9["font-style"]);bd.node.string&&(bd.paper.span.innerHTML=(bd.node.string+at)[aP](/</g,"&#60;")[aP](/&/g,"&#38;")[aP](/\n/g,"<br>"));bd.W=a9.w=bd.paper.span.offsetWidth;bd.H=a9.h=bd.paper.span.offsetHeight;bd.X=a9.x;bd.Y=a9.y+O(bd.H/2);switch(a9["text-anchor"]){case"start":bd.node.style["v-text-align"]="left";bd.bbx=O(bd.W/2);break;case"end":bd.node.style["v-text-align"]="right";bd.bbx=-O(bd.W/2);break;default:bd.node.style["v-text-align"]="center";break;}}};var b=function(d,a1){d.attrs=d.attrs||{};var a2=d.attrs,a4=d.node.getElementsByTagName("fill"),S="linear",a0=".5 .5";d.attrs.gradient=a1;a1=(a1+at)[aP](ar,function(a6,a7,i){S="radial";if(a7&&i){a7=W(a7);i=W(i);aM(a7-0.5,2)+aM(i-0.5,2)>0.25&&(i=ab.sqrt(0.25-aM(a7-0.5,2))*((i>0.5)*2-1)+0.5);a0=a7+am+i;}return at;});a1=a1[z](/\s*\-\s*/);if(S=="linear"){var e=a1.shift();e=-W(e);if(isNaN(e)){return null;}}var R=p(a1);if(!R){return null;}d=d.shape||d.node;a4=a4[0]||ah("fill");if(R[m]){a4.on=true;a4.method="none";a4.type=(S=="radial")?"gradientradial":"gradient";a4.color=R[0].color;a4.color2=R[R[m]-1].color;var a5=[];for(var E=0,a3=R[m];E<a3;E++){R[E].offset&&a5[f](R[E].offset+am+R[E].color);}a4.colors&&(a4.colors.value=a5[m]?a5[az](","):"0% "+a4.color);if(S=="radial"){a4.focus="100%";a4.focussize=a0;a4.focusposition=a0;}else{a4.angle=(270-e)%360;}}return 1;};var ax=function(R,a0,d){var S=0,i=0,e=0,E=1;this[0]=R;this.id=an._oid++;this.node=R;R.raphael=this;this.X=0;this.Y=0;this.attrs={};this.Group=a0;this.paper=d;this._={tx:0,ty:0,rt:{deg:0},sx:1,sy:1};!d.bottom&&(d.bottom=this);this.prev=d.top;d.top&&(d.top.next=this);d.top=this;this.next=null;};ax[aY].rotate=function(e,d,i){if(this.removed){return this;}if(e==null){if(this._.rt.cx){return[this._.rt.deg,this._.rt.cx,this._.rt.cy][az](am);}return this._.rt.deg;}e=(e+at)[z](a);if(e[m]-1){d=W(e[1]);i=W(e[2]);}e=W(e[0]);if(d!=null){this._.rt.deg=e;}else{this._.rt.deg+=e;}i==null&&(d=null);this._.rt.cx=d;this._.rt.cy=i;this.setBox(this.attrs,d,i);this.Group.style.rotation=this._.rt.deg;return this;};ax[aY].setBox=function(bb,e,d){if(this.removed){return this;}var a5=this.Group.style,R=(this.shape&&this.shape.style)||this.node.style;bb=bb||{};for(var a9 in bb){if(bb[Q](a9)){this.attrs[a9]=bb[a9];}}e=e||this._.rt.cx;d=d||this._.rt.cy;var a7=this.attrs,a1,a0,a2,ba;switch(this.type){case"circle":a1=a7.cx-a7.r;a0=a7.cy-a7.r;a2=ba=a7.r*2;break;case"ellipse":a1=a7.cx-a7.rx;a0=a7.cy-a7.ry;a2=a7.rx*2;ba=a7.ry*2;break;case"rect":case"image":a1=+a7.x;a0=+a7.y;a2=a7.width||0;ba=a7.height||0;break;case"text":this.textpath.v=["m",O(a7.x),", ",O(a7.y-2),"l",O(a7.x)+1,", ",O(a7.y-2)][az](at);a1=a7.x-O(this.W/2);a0=a7.y-this.H/2;a2=this.W;ba=this.H;break;case"path":if(!this.attrs.path){a1=0;a0=0;a2=this.paper.width;ba=this.paper.height;}else{var a8=U(this.attrs.path);a1=a8.x;a0=a8.y;a2=a8.width;ba=a8.height;}break;default:a1=0;a0=0;a2=this.paper.width;ba=this.paper.height;break;}e=(e==null)?a1+a2/2:e;d=(d==null)?a0+ba/2:d;var E=e-this.paper.width/2,a4=d-this.paper.height/2;if(this.type=="path"||this.type=="text"){(a5.left!=E+"px")&&(a5.left=E+"px");(a5.top!=a4+"px")&&(a5.top=a4+"px");this.X=this.type=="text"?a1:-E;this.Y=this.type=="text"?a0:-a4;this.W=a2;this.H=ba;(R.left!=-E+"px")&&(R.left=-E+"px");(R.top!=-a4+"px")&&(R.top=-a4+"px");}else{(a5.left!=E+"px")&&(a5.left=E+"px");(a5.top!=a4+"px")&&(a5.top=a4+"px");this.X=a1;this.Y=a0;this.W=a2;this.H=ba;(a5.width!=this.paper.width+"px")&&(a5.width=this.paper.width+"px");(a5.height!=this.paper.height+"px")&&(a5.height=this.paper.height+"px");(R.left!=a1-E+"px")&&(R.left=a1-E+"px");(R.top!=a0-a4+"px")&&(R.top=a0-a4+"px");(R.width!=a2+"px")&&(R.width=a2+"px");(R.height!=ba+"px")&&(R.height=ba+"px");var S=(+bb.r||0)/aI(a2,ba);if(this.type=="rect"&&this.arcsize.toFixed(4)!=S.toFixed(4)&&(S||this.arcsize)){var a6=ah("roundrect"),bc={},a9=0,a3=this.events&&this.events[m];a6.arcsize=S;a6.raphael=this;this.Group[aL](a6);this.Group.removeChild(this.node);this[0]=this.node=a6;this.arcsize=S;for(var a9 in a7){bc[a9]=a7[a9];}delete bc.scale;this.attr(bc);if(this.events){for(;a9<a3;a9++){this.events[a9].unbind=ae(this.node,this.events[a9].name,this.events[a9].f,this);}}}}};ax[aY].hide=function(){!this.removed&&(this.Group.style.display="none");return this;};ax[aY].show=function(){!this.removed&&(this.Group.style.display="block");return this;};ax[aY].getBBox=function(){if(this.removed){return this;}if(this.type=="path"){return U(this.attrs.path);}return{x:this.X+(this.bbx||0),y:this.Y,width:this.W,height:this.H};};ax[aY].remove=function(){if(this.removed){return;}ak(this,this.paper);this.node.parentNode.removeChild(this.node);this.Group.parentNode.removeChild(this.Group);this.shape&&this.shape.parentNode.removeChild(this.shape);for(var d in this){delete this[d];}this.removed=true;};ax[aY].attr=function(){if(this.removed){return this;}if(arguments[m]==0){var E={};for(var e in this.attrs){if(this.attrs[Q](e)){E[e]=this.attrs[e];}}this._.rt.deg&&(E.rotation=this.rotate());(this._.sx!=1||this._.sy!=1)&&(E.scale=this.scale());E.gradient&&E.fill=="none"&&(E.fill=E.gradient)&&delete E.gradient;return E;}if(arguments[m]==1&&an.is(arguments[0],"string")){if(arguments[0]=="translation"){return t.call(this);}if(arguments[0]=="rotation"){return this.rotate();}if(arguments[0]=="scale"){return this.scale();}if(arguments[0]=="fill"&&this.attrs.fill=="none"&&this.attrs.gradient){return this.attrs.gradient;}return this.attrs[arguments[0]];}if(this.attrs&&arguments[m]==1&&an.is(arguments[0],"array")){var d={};for(var e=0,R=arguments[0][m];e<R;e++){d[arguments[0][e]]=this.attrs[arguments[0][e]];}return d;}var S;if(arguments[m]==2){S={};S[arguments[0]]=arguments[1];}arguments[m]==1&&an.is(arguments[0],"object")&&(S=arguments[0]);if(S){if(S.text&&this.type=="text"){this.node.string=S.text;}aa(this,S);if(S.gradient&&(({circle:1,ellipse:1})[Q](this.type)||(S.gradient+at).charAt()!="r")){b(this,S.gradient);}(this.type!="path"||this._.rt.deg)&&this.setBox(this.attrs);}return this;};ax[aY].toFront=function(){!this.removed&&this.Group.parentNode[aL](this.Group);this.paper.top!=this&&Y(this,this.paper);return this;};ax[aY].toBack=function(){if(this.removed){return this;}if(this.Group.parentNode.firstChild!=this.Group){this.Group.parentNode.insertBefore(this.Group,this.Group.parentNode.firstChild);k(this,this.paper);}return this;};ax[aY].insertAfter=function(d){if(this.removed){return this;}if(d.Group.nextSibling){d.Group.parentNode.insertBefore(this.Group,d.Group.nextSibling);}else{d.Group.parentNode[aL](this.Group);}A(this,d,this.paper);return this;};ax[aY].insertBefore=function(d){if(this.removed){return this;}d.Group.parentNode.insertBefore(this.Group,d.Group);aq(this,d,this.paper);return this;};var P=function(e,d,a1,S){var R=ah("group"),a0=ah("oval"),i=a0.style;R.style.cssText="position:absolute;left:0;top:0;width:"+e.width+"px;height:"+e.height+"px";R.coordsize=e.coordsize;R.coordorigin=e.coordorigin;R[aL](a0);var E=new ax(a0,R,e);E.type="circle";aa(E,{stroke:"#000",fill:"none"});E.attrs.cx=d;E.attrs.cy=a1;E.attrs.r=S;E.setBox({x:d-S,y:a1-S,width:S*2,height:S*2});e.canvas[aL](R);return E;},aF=function(e,a1,a0,a2,E,d){var R=ah("group"),i=ah("roundrect"),a3=(+d||0)/(aI(a2,E));R.style.cssText="position:absolute;left:0;top:0;width:"+e.width+"px;height:"+e.height+"px";R.coordsize=e.coordsize;R.coordorigin=e.coordorigin;R[aL](i);i.arcsize=a3;var S=new ax(i,R,e);S.type="rect";aa(S,{stroke:"#000"});S.arcsize=a3;S.setBox({x:a1,y:a0,width:a2,height:E,r:d});e.canvas[aL](R);return S;},ai=function(d,a2,a1,i,e){var R=ah("group"),E=ah("oval"),a0=E.style;R.style.cssText="position:absolute;left:0;top:0;width:"+d.width+"px;height:"+d.height+"px";R.coordsize=d.coordsize;R.coordorigin=d.coordorigin;R[aL](E);var S=new ax(E,R,d);S.type="ellipse";aa(S,{stroke:"#000"});S.attrs.cx=a2;S.attrs.cy=a1;S.attrs.rx=i;S.attrs.ry=e;S.setBox({x:a2-i,y:a1-e,width:i*2,height:e*2});d.canvas[aL](R);return S;},o=function(e,d,a2,a1,a3,E){var R=ah("group"),i=ah("image"),a0=i.style;R.style.cssText="position:absolute;left:0;top:0;width:"+e.width+"px;height:"+e.height+"px";R.coordsize=e.coordsize;R.coordorigin=e.coordorigin;i.src=d;R[aL](i);var S=new ax(i,R,e);S.type="image";S.attrs.src=d;S.attrs.x=a2;S.attrs.y=a1;S.attrs.w=a3;S.attrs.h=E;S.setBox({x:a2,y:a1,width:a3,height:E});e.canvas[aL](R);return S;},X=function(e,a2,a1,a3){var R=ah("group"),E=ah("shape"),a0=E.style,a4=ah("path"),d=a4.style,i=ah("textpath");R.style.cssText="position:absolute;left:0;top:0;width:"+e.width+"px;height:"+e.height+"px";R.coordsize=e.coordsize;R.coordorigin=e.coordorigin;a4.v=an.format("m{0},{1}l{2},{1}",O(a2),O(a1),O(a2)+1);a4.textpathok=true;a0.width=e.width;a0.height=e.height;i.string=a3+at;i.on=true;E[aL](i);E[aL](a4);R[aL](E);var S=new ax(i,R,e);S.shape=E;S.textpath=a4;S.type="text";S.attrs.text=a3;S.attrs.x=a2;S.attrs.y=a1;S.attrs.w=1;S.attrs.h=1;aa(S,{font:j.font,stroke:"none",fill:"#000"});S.setBox();e.canvas[aL](R);return S;},aV=function(i,d){var e=this.canvas.style;i==+i&&(i+="px");d==+d&&(d+="px");e.width=i;e.height=d;e.clip="rect(0 "+i+" "+d+" 0)";return this;},ah;L.createStyleSheet().addRule(".rvml","behavior:url(#default#VML)");try{!L.namespaces.rvml&&L.namespaces.add("rvml","urn:schemas-microsoft-com:vml");ah=function(d){return L.createElement("<rvml:"+d+' class="rvml">');};}catch(af){ah=function(d){return L.createElement("<"+d+' xmlns="urn:schemas-microsoft.com:vml" class="rvml">');};}var w=function(){var i=ao[aW](null,arguments),d=i.container,a2=i.height,a3,e=i.width,a1=i.x,a0=i.y;if(!d){throw new Error("VML container not found.");}var R=new aT,S=R.canvas=L.createElement("div"),E=S.style;e=e||512;a2=a2||342;e==+e&&(e+="px");a2==+a2&&(a2+="px");R.width=1000;R.height=1000;R.coordsize="1000 1000";R.coordorigin="0 0";R.span=L.createElement("span");R.span.style.cssText="position:absolute;left:-9999em;top:-9999em;padding:0;margin:0;line-height:1;display:inline;";S[aL](R.span);E.cssText=an.format("width:{0};height:{1};position:absolute;clip:rect(0 {0} {1} 0);overflow:hidden",e,a2);if(d==1){L.body[aL](S);E.left=a1+"px";E.top=a0+"px";}else{d.style.width=e;d.style.height=a2;if(d.firstChild){d.insertBefore(S,d.firstChild);}else{d[aL](S);}}aG.call(R,R,an.fn);return R;};aT[aY].clear=function(){this.canvas.innerHTML=at;this.span=L.createElement("span");this.span.style.cssText="position:absolute;left:-9999em;top:-9999em;padding:0;margin:0;line-height:1;display:inline;";this.canvas[aL](this.span);this.bottom=this.top=null;};aT[aY].remove=function(){this.canvas.parentNode.removeChild(this.canvas);for(var d in this){this[d]=s(d);}};}if((/^Apple|^Google/).test(navigator.vendor)&&!(navigator.userAgent.indexOf("Version/4.0")+1)){aT[aY].safari=function(){var d=this.rect(-99,-99,this.width+99,this.height+99);setTimeout(function(){d.remove();});};}else{aT[aY].safari=function(){};}var ae=(function(){if(L.addEventListener){return function(R,i,e,d){var E=function(S){return e.call(d,S);};R.addEventListener(i,E,false);return function(){R.removeEventListener(i,E,false);return true;};};}else{if(L.attachEvent){return function(S,E,i,e){var R=function(a0){return i.call(e,a0||au.event);};S.attachEvent("on"+E,R);var d=function(){S.detachEvent("on"+E,R);return true;};return d;};}}})();for(var ac=F[m];ac--;){(function(d){ax[aY][d]=function(e){if(an.is(e,"function")){this.events=this.events||[];this.events.push({name:d,f:e,unbind:ae(this.shape||this.node,d,e,this)});}return this;};ax[aY]["un"+d]=function(E){var i=this.events,e=i[m];while(e--){if(i[e].name==d&&i[e].f==E){i[e].unbind();i.splice(e,1);!i.length&&delete this.events;return this;}}return this;};})(F[ac]);}ax[aY].hover=function(e,d){return this.mouseover(e).mouseout(d);};ax[aY].unhover=function(e,d){return this.unmouseover(e).unmouseout(d);};aT[aY].circle=function(d,i,e){return P(this,d||0,i||0,e||0);};aT[aY].rect=function(d,R,e,i,E){return aF(this,d||0,R||0,e||0,i||0,E||0);};aT[aY].ellipse=function(d,E,i,e){return ai(this,d||0,E||0,i||0,e||0);};aT[aY].path=function(d){d&&!an.is(d,"string")&&!an.is(d[0],"array")&&(d+=at);return q(an.format[aW](an,arguments),this);};aT[aY].image=function(E,d,R,e,i){return o(this,E||"about:blank",d||0,R||0,e||0,i||0);};aT[aY].text=function(d,i,e){return X(this,d||0,i||0,e||at);};aT[aY].set=function(d){arguments[m]>1&&(d=Array[aY].splice.call(arguments,0,arguments[m]));return new T(d);};aT[aY].setSize=aV;aT[aY].top=aT[aY].bottom=null;aT[aY].raphael=an;function u(){return this.x+am+this.y;}ax[aY].scale=function(a6,a5,E,e){if(a6==null&&a5==null){return{x:this._.sx,y:this._.sy,toString:u};}a5=a5||a6;!+a5&&(a5=a6);var ba,a8,a9,a7,bm=this.attrs;if(a6!=0){var a4=this.getBBox(),a1=a4.x+a4.width/2,R=a4.y+a4.height/2,bl=a6/this._.sx,bk=a5/this._.sy;E=(+E||E==0)?E:a1;e=(+e||e==0)?e:R;var a3=~~(a6/ab.abs(a6)),a0=~~(a5/ab.abs(a5)),be=this.node.style,bo=E+(a1-E)*bl,bn=e+(R-e)*bk;switch(this.type){case"rect":case"image":var a2=bm.width*a3*bl,bd=bm.height*a0*bk;this.attr({height:bd,r:bm.r*aI(a3*bl,a0*bk),width:a2,x:bo-a2/2,y:bn-bd/2});break;case"circle":case"ellipse":this.attr({rx:bm.rx*a3*bl,ry:bm.ry*a0*bk,r:bm.r*aI(a3*bl,a0*bk),cx:bo,cy:bn});break;case"path":var bg=ad(bm.path),bh=true;for(var bj=0,bc=bg[m];bj<bc;bj++){var bf=bg[bj],bi,S=aN.call(bf[0]);if(S=="M"&&bh){continue;}else{bh=false;}if(S=="A"){bf[bg[bj][m]-2]*=bl;bf[bg[bj][m]-1]*=bk;bf[1]*=a3*bl;bf[2]*=a0*bk;bf[5]=+(a3+a0?!!+bf[5]:!+bf[5]);}else{if(S=="H"){for(bi=1,jj=bf[m];bi<jj;bi++){bf[bi]*=bl;}}else{if(S=="V"){for(bi=1,jj=bf[m];bi<jj;bi++){bf[bi]*=bk;}}else{for(bi=1,jj=bf[m];bi<jj;bi++){bf[bi]*=(bi%2)?bl:bk;}}}}}var d=U(bg),ba=bo-d.x-d.width/2,a8=bn-d.y-d.height/2;bg[0][1]+=ba;bg[0][2]+=a8;this.attr({path:bg});break;}if(this.type in {text:1,image:1}&&(a3!=1||a0!=1)){if(this.transformations){this.transformations[2]="scale("[aS](a3,",",a0,")");this.node[v]("transform",this.transformations[az](am));ba=(a3==-1)?-bm.x-(a2||0):bm.x;a8=(a0==-1)?-bm.y-(bd||0):bm.y;this.attr({x:ba,y:a8});bm.fx=a3-1;bm.fy=a0-1;}else{this.node.filterMatrix=" progid:DXImageTransform.Microsoft.Matrix(M11="[aS](a3,", M12=0, M21=0, M22=",a0,", Dx=0, Dy=0, sizingmethod='auto expand', filtertype='bilinear')");be.filter=(this.node.filterMatrix||at)+(this.node.filterOpacity||at);}}else{if(this.transformations){this.transformations[2]=at;this.node[v]("transform",this.transformations[az](am));bm.fx=0;bm.fy=0;}else{this.node.filterMatrix=at;be.filter=(this.node.filterMatrix||at)+(this.node.filterOpacity||at);}}bm.scale=[a6,a5,E,e][az](am);this._.sx=a6;this._.sy=a5;}return this;};ax[aY].clone=function(){var d=this.attr();delete d.scale;delete d.translation;return this.paper[this.type]().attr(d);};var aB=function(d,e){return function(a9,S,a0){a9=H(a9);var a5,a4,E,a1,R="",a8={},a6,a3=0;for(var a2=0,a7=a9.length;a2<a7;a2++){E=a9[a2];if(E[0]=="M"){a5=+E[1];a4=+E[2];}else{a1=n(a5,a4,E[1],E[2],E[3],E[4],E[5],E[6]);if(a3+a1>S){if(e&&!a8.start){a6=an.findDotsAtSegment(a5,a4,E[1],E[2],E[3],E[4],E[5],E[6],(S-a3)/a1);R+=["C",a6.start.x,a6.start.y,a6.m.x,a6.m.y,a6.x,a6.y];if(a0){return R;}a8.start=R;R=["M",a6.x,a6.y+"C",a6.n.x,a6.n.y,a6.end.x,a6.end.y,E[5],E[6]][az]();a3+=a1;a5=+E[5];a4=+E[6];continue;}if(!d&&!e){a6=an.findDotsAtSegment(a5,a4,E[1],E[2],E[3],E[4],E[5],E[6],(S-a3)/a1);return{x:a6.x,y:a6.y,alpha:a6.alpha};}}a3+=a1;a5=+E[5];a4=+E[6];}R+=E;}a8.end=R;a6=d?a3:e?a8:an.findDotsAtSegment(a5,a4,E[1],E[2],E[3],E[4],E[5],E[6],1);a6.alpha&&(a6={x:a6.x,y:a6.y,alpha:a6.alpha});return a6;};},n=aj(function(E,d,a0,S,a6,a5,a4,a3){var R={x:0,y:0},a2=0;for(var a1=0;a1<1.01;a1+=0.01){var e=M(E,d,a0,S,a6,a5,a4,a3,a1);a1&&(a2+=ab.sqrt(aM(R.x-e.x,2)+aM(R.y-e.y,2)));R=e;}return a2;});var ap=aB(1),C=aB(),J=aB(0,1);ax[aY].getTotalLength=function(){if(this.type!="path"){return;}return ap(this.attrs.path);};ax[aY].getPointAtLength=function(d){if(this.type!="path"){return;}return C(this.attrs.path,d);};ax[aY].getSubpath=function(i,e){if(this.type!="path"){return;}if(ab.abs(this.getTotalLength()-e)<0.000001){return J(this.attrs.path,i).end;}var d=J(this.attrs.path,e,1);return i?J(d,i).end:d;};an.easing_formulas={linear:function(d){return d;},"<":function(d){return aM(d,3);},">":function(d){return aM(d-1,3)+1;},"<>":function(d){d=d*2;if(d<1){return aM(d,3)/2;}d-=2;return(aM(d,3)+2)/2;},backIn:function(e){var d=1.70158;return e*e*((d+1)*e-d);},backOut:function(e){e=e-1;var d=1.70158;return e*e*((d+1)*e+d)+1;},elastic:function(i){if(i==0||i==1){return i;}var e=0.3,d=e/4;return aM(2,-10*i)*ab.sin((i-d)*(2*ab.PI)/e)+1;},bounce:function(E){var e=7.5625,i=2.75,d;if(E<(1/i)){d=e*E*E;}else{if(E<(2/i)){E-=(1.5/i);d=e*E*E+0.75;}else{if(E<(2.5/i)){E-=(2.25/i);d=e*E*E+0.9375;}else{E-=(2.625/i);d=e*E*E+0.984375;}}}return d;}};var I={length:0},aR=function(){var a2=+new Date;for(var be in I){if(be!="length"&&I[Q](be)){var bj=I[be];if(bj.stop){delete I[be];I[m]--;continue;}var a0=a2-bj.start,bb=bj.ms,ba=bj.easing,bf=bj.from,a7=bj.diff,E=bj.to,a6=bj.t,a9=bj.prev||0,a1=bj.el,R=bj.callback,a8={},d;if(a0<bb){var S=an.easing_formulas[ba]?an.easing_formulas[ba](a0/bb):a0/bb;for(var bc in bf){if(bf[Q](bc)){switch(Z[bc]){case"along":d=S*bb*a7[bc];E.back&&(d=E.len-d);var bd=C(E[bc],d);a1.translate(a7.sx-a7.x||0,a7.sy-a7.y||0);a7.x=bd.x;a7.y=bd.y;a1.translate(bd.x-a7.sx,bd.y-a7.sy);E.rot&&a1.rotate(a7.r+bd.alpha,bd.x,bd.y);break;case"number":d=+bf[bc]+S*bb*a7[bc];break;case"colour":d="rgb("+[B(O(bf[bc].r+S*bb*a7[bc].r)),B(O(bf[bc].g+S*bb*a7[bc].g)),B(O(bf[bc].b+S*bb*a7[bc].b))][az](",")+")";break;case"path":d=[];for(var bh=0,a5=bf[bc][m];bh<a5;bh++){d[bh]=[bf[bc][bh][0]];for(var bg=1,bi=bf[bc][bh][m];bg<bi;bg++){d[bh][bg]=+bf[bc][bh][bg]+S*bb*a7[bc][bh][bg];}d[bh]=d[bh][az](am);}d=d[az](am);break;case"csv":switch(bc){case"translation":var a4=a7[bc][0]*(a0-a9),a3=a7[bc][1]*(a0-a9);a6.x+=a4;a6.y+=a3;d=a4+am+a3;break;case"rotation":d=+bf[bc][0]+S*bb*a7[bc][0];bf[bc][1]&&(d+=","+bf[bc][1]+","+bf[bc][2]);break;case"scale":d=[+bf[bc][0]+S*bb*a7[bc][0],+bf[bc][1]+S*bb*a7[bc][1],(2 in E[bc]?E[bc][2]:at),(3 in E[bc]?E[bc][3]:at)][az](am);break;case"clip-rect":d=[];var bh=4;while(bh--){d[bh]=+bf[bc][bh]+S*bb*a7[bc][bh];}break;}break;}a8[bc]=d;}}a1.attr(a8);a1._run&&a1._run.call(a1);}else{if(E.along){var bd=C(E.along,E.len*!E.back);a1.translate(a7.sx-(a7.x||0)+bd.x-a7.sx,a7.sy-(a7.y||0)+bd.y-a7.sy);E.rot&&a1.rotate(a7.r+bd.alpha,bd.x,bd.y);}(a6.x||a6.y)&&a1.translate(-a6.x,-a6.y);E.scale&&(E.scale=E.scale+at);a1.attr(E);delete I[be];I[m]--;a1.in_animation=null;an.is(R,"function")&&R.call(a1);}bj.prev=a0;}}an.svg&&a1&&a1.paper.safari();I[m]&&setTimeout(aR);},B=function(d){return d>255?255:(d<0?0:d);},t=function(d,i){if(d==null){return{x:this._.tx,y:this._.ty,toString:u};}this._.tx+=+d;this._.ty+=+i;switch(this.type){case"circle":case"ellipse":this.attr({cx:+d+this.attrs.cx,cy:+i+this.attrs.cy});break;case"rect":case"image":case"text":this.attr({x:+d+this.attrs.x,y:+i+this.attrs.y});break;case"path":var e=ad(this.attrs.path);e[0][1]+=+d;e[0][2]+=+i;this.attr({path:e});break;}return this;};ax[aY].animateWith=function(e,i,d,R,E){I[e.id]&&(i.start=I[e.id].start);return this.animate(i,d,R,E);};ax[aY].animateAlong=ay();ax[aY].animateAlongBack=ay(1);function ay(d){return function(E,i,e,S){var R={back:d};an.is(e,"function")?(S=e):(R.rot=e);E&&E.constructor==ax&&(E=E.attrs.path);E&&(R.along=E);return this.animate(R,i,S);};}ax[aY].onAnimation=function(d){this._run=d||0;return this;};ax[aY].animate=function(be,a5,a4,E){if(an.is(a4,"function")||!a4){E=a4||null;}var a9={},e={},a2={};for(var a6 in be){if(be[Q](a6)){if(Z[Q](a6)){a9[a6]=this.attr(a6);(a9[a6]==null)&&(a9[a6]=j[a6]);e[a6]=be[a6];switch(Z[a6]){case"along":var bc=ap(be[a6]),a7=C(be[a6],bc*!!be.back),R=this.getBBox();a2[a6]=bc/a5;a2.tx=R.x;a2.ty=R.y;a2.sx=a7.x;a2.sy=a7.y;e.rot=be.rot;e.back=be.back;e.len=bc;be.rot&&(a2.r=W(this.rotate())||0);break;case"number":a2[a6]=(e[a6]-a9[a6])/a5;break;case"colour":a9[a6]=an.getRGB(a9[a6]);var a8=an.getRGB(e[a6]);a2[a6]={r:(a8.r-a9[a6].r)/a5,g:(a8.g-a9[a6].g)/a5,b:(a8.b-a9[a6].b)/a5};break;case"path":var S=H(a9[a6],e[a6]);a9[a6]=S[0];var a3=S[1];a2[a6]=[];for(var bb=0,a1=a9[a6][m];bb<a1;bb++){a2[a6][bb]=[0];for(var ba=1,bd=a9[a6][bb][m];ba<bd;ba++){a2[a6][bb][ba]=(a3[bb][ba]-a9[a6][bb][ba])/a5;}}break;case"csv":var d=(be[a6]+at)[z](a),a0=(a9[a6]+at)[z](a);switch(a6){case"translation":a9[a6]=[0,0];a2[a6]=[d[0]/a5,d[1]/a5];break;case"rotation":a9[a6]=(a0[1]==d[1]&&a0[2]==d[2])?a0:[0,d[1],d[2]];a2[a6]=[(d[0]-a9[a6][0])/a5,0,0];break;case"scale":be[a6]=d;a9[a6]=(a9[a6]+at)[z](a);a2[a6]=[(d[0]-a9[a6][0])/a5,(d[1]-a9[a6][1])/a5,0,0];break;case"clip-rect":a9[a6]=(a9[a6]+at)[z](a);a2[a6]=[];var bb=4;while(bb--){a2[a6][bb]=(d[bb]-a9[a6][bb])/a5;}break;}e[a6]=d;}}}}this.stop();this.in_animation=1;I[this.id]={start:be.start||+new Date,ms:a5,easing:a4,from:a9,diff:a2,to:e,el:this,callback:E,t:{x:0,y:0}};++I[m]==1&&aR();return this;};ax[aY].stop=function(){I[this.id]&&I[m]--;delete I[this.id];return this;};ax[aY].translate=function(d,e){return this.attr({translation:d+" "+e});};ax[aY][aA]=function(){return"Rapha\xebl\u2019s object";};an.ae=I;var T=function(d){this.items=[];this[m]=0;if(d){for(var e=0,E=d[m];e<E;e++){if(d[e]&&(d[e].constructor==ax||d[e].constructor==T)){this[this.items[m]]=this.items[this.items[m]]=d[e];this[m]++;}}}};T[aY][f]=function(){var R,d;for(var e=0,E=arguments[m];e<E;e++){R=arguments[e];if(R&&(R.constructor==ax||R.constructor==T)){d=this.items[m];this[d]=this.items[d]=R;this[m]++;}}return this;};T[aY].pop=function(){delete this[this[m]--];return this.items.pop();};for(var y in ax[aY]){if(ax[aY][Q](y)){T[aY][y]=(function(d){return function(){for(var e=0,E=this.items[m];e<E;e++){this.items[e][d][aW](this.items[e],arguments);}return this;};})(y);}}T[aY].attr=function(e,a0){if(e&&an.is(e,"array")&&an.is(e[0],"object")){for(var d=0,S=e[m];d<S;d++){this.items[d].attr(e[d]);}}else{for(var E=0,R=this.items[m];E<R;E++){this.items[E].attr[aW](this.items[E],arguments);}}return this;};T[aY].animate=function(S,e,a2,a1){(an.is(a2,"function")||!a2)&&(a1=a2||null);var d=this.items[m],E=d,a0=this,R;a1&&(R=function(){!--d&&a1.call(a0);});this.items[--E].animate(S,e,a2||R,R);while(E--){this.items[E].animateWith(this.items[d-1],S,e,a2||R,R);}return this;};T[aY].insertAfter=function(e){var d=this.items[m];while(d--){this.items[d].insertAfter(e);}return this;};T[aY].getBBox=function(){var d=[],a0=[],e=[],R=[];for(var E=this.items[m];E--;){var S=this.items[E].getBBox();d[f](S.x);a0[f](S.y);e[f](S.x+S.width);R[f](S.y+S.height);}d=aI[aW](0,d);a0=aI[aW](0,a0);return{x:d,y:a0,width:g[aW](0,e)-d,height:g[aW](0,R)-a0};};an.registerFont=function(e){if(!e.face){return e;}this.fonts=this.fonts||{};var E={w:e.w,face:{},glyphs:{}},i=e.face["font-family"];for(var a0 in e.face){if(e.face[Q](a0)){E.face[a0]=e.face[a0];}}if(this.fonts[i]){this.fonts[i][f](E);}else{this.fonts[i]=[E];}if(!e.svg){E.face["units-per-em"]=G(e.face["units-per-em"],10);for(var R in e.glyphs){if(e.glyphs[Q](R)){var S=e.glyphs[R];E.glyphs[R]={w:S.w,k:{},d:S.d&&"M"+S.d[aP](/[mlcxtrv]/g,function(a1){return{l:"L",c:"C",x:"z",t:"m",r:"l",v:"c"}[a1]||"M";})+"z"};if(S.k){for(var d in S.k){if(S[Q](d)){E.glyphs[R].k[d]=S.k[d];}}}}}}return e;};aT[aY].getFont=function(a2,a3,e,R){R=R||"normal";e=e||"normal";a3=+a3||{normal:400,bold:700,lighter:300,bolder:800}[a3]||400;var S=an.fonts[a2];if(!S){var E=new RegExp("(^|\\s)"+a2[aP](/[^\w\d\s+!~.:_-]/g,at)+"(\\s|$)","i");for(var d in an.fonts){if(an.fonts[Q](d)){if(E.test(d)){S=an.fonts[d];break;}}}}var a0;if(S){for(var a1=0,a4=S[m];a1<a4;a1++){a0=S[a1];if(a0.face["font-weight"]==a3&&(a0.face["font-style"]==e||!a0.face["font-style"])&&a0.face["font-stretch"]==R){break;}}}return a0;};aT[aY].print=function(R,E,d,a1,a2,bb){bb=bb||"middle";var a7=this.set(),ba=(d+at)[z](at),a8=0,a4=at,bc;an.is(a1,"string")&&(a1=this.getFont(a1));if(a1){bc=(a2||16)/a1.face["units-per-em"];var e=a1.face.bbox.split(a),a0=+e[0],a3=+e[1]+(bb=="baseline"?e[3]-e[1]+(+a1.face.descent):(e[3]-e[1])/2);for(var a6=0,S=ba[m];a6<S;a6++){var a5=a6&&a1.glyphs[ba[a6-1]]||{},a9=a1.glyphs[ba[a6]];a8+=a6?(a5.w||a1.w)+(a5.k&&a5.k[ba[a6]]||0):0;a9&&a9.d&&a7[f](this.path(a9.d).attr({fill:"#000",stroke:"none",translation:[a8,0]}));}a7.scale(bc,bc,a0,a3).translate(R-a0,E-a3);}return a7;};an.format=function(i){var e=an.is(arguments[1],"array")?[0][aS](arguments[1]):arguments,d=/\{(\d+)\}/g;i&&an.is(i,"string")&&e[m]-1&&(i=i[aP](d,function(R,E){return e[++E]==null?at:e[E];}));return i||at;};an.ninja=function(){var d=Raphael;if(l.was){Raphael=l.is;}else{delete Raphael;}return d;};an.el=ax[aY];return an;})();
\ No newline at end of file
diff --git a/addons/base_diagram/static/lib/js/seedrandom.js b/addons/base_diagram/static/lib/js/seedrandom.js
new file mode 100644
index 00000000000..ce8ce8b578e
--- /dev/null
+++ b/addons/base_diagram/static/lib/js/seedrandom.js
@@ -0,0 +1,266 @@
+// seedrandom.js
+// Author: David Bau 3/11/2010
+//
+// Defines a method Math.seedrandom() that, when called, substitutes
+// an explicitly seeded RC4-based algorithm for Math.random().  Also
+// supports automatic seeding from local or network sources of entropy.
+//
+// Usage:
+//
+//   <script src=http://davidbau.com/encode/seedrandom-min.js></script>
+//
+//   Math.seedrandom('yipee'); Sets Math.random to a function that is
+//                             initialized using the given explicit seed.
+//
+//   Math.seedrandom();        Sets Math.random to a function that is
+//                             seeded using the current time, dom state,
+//                             and other accumulated local entropy.
+//                             The generated seed string is returned.
+//
+//   Math.seedrandom('yowza', true);
+//                             Seeds using the given explicit seed mixed
+//                             together with accumulated entropy.
+//
+//   <script src="http://bit.ly/srandom-512"></script>
+//                             Seeds using physical random bits downloaded
+//                             from random.org.
+//
+// Examples:
+//
+//   Math.seedrandom("hello");            // Use "hello" as the seed.
+//   document.write(Math.random());       // Always 0.5463663768140734
+//   document.write(Math.random());       // Always 0.43973793770592234
+//   var rng1 = Math.random;              // Remember the current prng.
+//
+//   var autoseed = Math.seedrandom();    // New prng with an automatic seed.
+//   document.write(Math.random());       // Pretty much unpredictable.
+//
+//   Math.random = rng1;                  // Continue "hello" prng sequence.
+//   document.write(Math.random());       // Always 0.554769432473455
+//
+//   Math.seedrandom(autoseed);           // Restart at the previous seed.
+//   document.write(Math.random());       // Repeat the 'unpredictable' value.
+//
+// Notes:
+//
+// Each time seedrandom('arg') is called, entropy from the passed seed
+// is accumulated in a pool to help generate future seeds for the
+// zero-argument form of Math.seedrandom, so entropy can be injected over
+// time by calling seedrandom with explicit data repeatedly.
+//
+// On speed - This javascript implementation of Math.random() is about
+// 3-10x slower than the built-in Math.random() because it is not native
+// code, but this is typically fast enough anyway.  Seeding is more expensive,
+// especially if you use auto-seeding.  Some details (timings on Chrome 4):
+//
+// Our Math.random()            - avg less than 0.002 milliseconds per call
+// seedrandom('explicit')       - avg less than 0.5 milliseconds per call
+// seedrandom('explicit', true) - avg less than 2 milliseconds per call
+// seedrandom()                 - avg about 38 milliseconds per call
+//
+// LICENSE (BSD):
+//
+// Copyright 2010 David Bau, all rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+// 
+//   1. Redistributions of source code must retain the above copyright
+//      notice, this list of conditions and the following disclaimer.
+//
+//   2. Redistributions in binary form must reproduce the above copyright
+//      notice, this list of conditions and the following disclaimer in the
+//      documentation and/or other materials provided with the distribution.
+// 
+//   3. Neither the name of this module nor the names of its contributors may
+//      be used to endorse or promote products derived from this software
+//      without specific prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+/**
+ * All code is in an anonymous closure to keep the global namespace clean.
+ *
+ * @param {number=} overflow 
+ * @param {number=} startdenom
+ */
+(function (pool, math, width, chunks, significance, overflow, startdenom) {
+
+
+//
+// seedrandom()
+// This is the seedrandom function described above.
+//
+math['seedrandom'] = function seedrandom(seed, use_entropy) {
+  var key = [];
+  var arc4;
+
+  // Flatten the seed string or build one from local entropy if needed.
+  seed = mixkey(flatten(
+    use_entropy ? [seed, pool] :
+    arguments.length ? seed :
+    [new Date().getTime(), pool, window], 3), key);
+
+  // Use the seed to initialize an ARC4 generator.
+  arc4 = new ARC4(key);
+
+  // Mix the randomness into accumulated entropy.
+  mixkey(arc4.S, pool);
+
+  // Override Math.random
+
+  // This function returns a random double in [0, 1) that contains
+  // randomness in every bit of the mantissa of the IEEE 754 value.
+
+  math['random'] = function random() {  // Closure to return a random double:
+    var n = arc4.g(chunks);             // Start with a numerator n < 2 ^ 48
+    var d = startdenom;                 //   and denominator d = 2 ^ 48.
+    var x = 0;                          //   and no 'extra last byte'.
+    while (n < significance) {          // Fill up all significant digits by
+      n = (n + x) * width;              //   shifting numerator and
+      d *= width;                       //   denominator and generating a
+      x = arc4.g(1);                    //   new least-significant-byte.
+    }
+    while (n >= overflow) {             // To avoid rounding up, before adding
+      n /= 2;                           //   last byte, shift everything
+      d /= 2;                           //   right using integer math until
+      x >>>= 1;                         //   we have exactly the desired bits.
+    }
+    return (n + x) / d;                 // Form the number within [0, 1).
+  };
+
+  // Return the seed that was used
+  return seed;
+};
+
+//
+// ARC4
+//
+// An ARC4 implementation.  The constructor takes a key in the form of
+// an array of at most (width) integers that should be 0 <= x < (width).
+//
+// The g(count) method returns a pseudorandom integer that concatenates
+// the next (count) outputs from ARC4.  Its return value is a number x
+// that is in the range 0 <= x < (width ^ count).
+//
+/** @constructor */
+function ARC4(key) {
+  var t, u, me = this, keylen = key.length;
+  var i = 0, j = me.i = me.j = me.m = 0;
+  me.S = [];
+  me.c = [];
+
+  // The empty key [] is treated as [0].
+  if (!keylen) { key = [keylen++]; }
+
+  // Set up S using the standard key scheduling algorithm.
+  while (i < width) { me.S[i] = i++; }
+  for (i = 0; i < width; i++) {
+    t = me.S[i];
+    j = lowbits(j + t + key[i % keylen]);
+    u = me.S[j];
+    me.S[i] = u;
+    me.S[j] = t;
+  }
+
+  // The "g" method returns the next (count) outputs as one number.
+  me.g = function getnext(count) {
+    var s = me.S;
+    var i = lowbits(me.i + 1); var t = s[i];
+    var j = lowbits(me.j + t); var u = s[j];
+    s[i] = u;
+    s[j] = t;
+    var r = s[lowbits(t + u)];
+    while (--count) {
+      i = lowbits(i + 1); t = s[i];
+      j = lowbits(j + t); u = s[j];
+      s[i] = u;
+      s[j] = t;
+      r = r * width + s[lowbits(t + u)];
+    }
+    me.i = i;
+    me.j = j;
+    return r;
+  };
+  // For robust unpredictability discard an initial batch of values.
+  // See http://www.rsa.com/rsalabs/node.asp?id=2009
+  me.g(width);
+}
+
+//
+// flatten()
+// Converts an object tree to nested arrays of strings.
+//
+/** @param {Object=} result 
+  * @param {string=} prop */
+function flatten(obj, depth, result, prop) {
+  result = [];
+  if (depth && typeof(obj) == 'object') {
+    for (prop in obj) {
+      if (prop.indexOf('S') < 5) {    // Avoid FF3 bug (local/sessionStorage)
+        try { result.push(flatten(obj[prop], depth - 1)); } catch (e) {}
+      }
+    }
+  }
+  return result.length ? result : '' + obj;
+}
+
+//
+// mixkey()
+// Mixes a string seed into a key that is an array of integers, and
+// returns a shortened string seed that is equivalent to the result key.
+//
+/** @param {number=} smear 
+  * @param {number=} j */
+function mixkey(seed, key, smear, j) {
+  seed += '';                         // Ensure the seed is a string
+  smear = 0;
+  for (j = 0; j < seed.length; j++) {
+    key[lowbits(j)] =
+      lowbits((smear ^= key[lowbits(j)] * 19) + seed.charCodeAt(j));
+  }
+  seed = '';
+  for (j in key) { seed += String.fromCharCode(key[j]); }
+  return seed;
+}
+
+//
+// lowbits()
+// A quick "n mod width" for width a power of 2.
+//
+function lowbits(n) { return n & (width - 1); }
+
+//
+// The following constants are related to IEEE 754 limits.
+//
+startdenom = math.pow(width, chunks);
+significance = math.pow(2, significance);
+overflow = significance * 2;
+
+//
+// When seedrandom.js is loaded, we immediately mix a few bits
+// from the built-in RNG into the entropy pool.  Because we do
+// not want to intefere with determinstic PRNG state later,
+// seedrandom will not call math.random on its own again after
+// initialization.
+//
+mixkey(math.random(), pool);
+
+// End anonymous scope, and pass initial values.
+})(
+  [],   // pool: entropy pool starts empty
+  Math, // math: package containing random, pow, and seedrandom
+  256,  // width: each RC4 output is 0 <= x < 256
+  6,    // chunks: at least six RC4 outputs for each double
+  52    // significance: there are 52 significant digits in a double
+);
diff --git a/addons/base_diagram/static/src/js/diagram.js b/addons/base_diagram/static/src/js/diagram.js
new file mode 100644
index 00000000000..cc0f69b9eb5
--- /dev/null
+++ b/addons/base_diagram/static/src/js/diagram.js
@@ -0,0 +1,175 @@
+/*---------------------------------------------------------
+ * OpenERP base library
+ *---------------------------------------------------------*/
+
+openerp.base.diagram = function (openerp) {
+	
+openerp.base.views.add('diagram', 'openerp.base.DiagramView');
+openerp.base.DiagramView = openerp.base.Controller.extend({
+	init: function(view_manager, session, element_id, dataset, view_id){
+		this._super(session, element_id);
+        this.view_manager = view_manager;
+        this.dataset = dataset;
+        this.model = dataset.model;
+        this.view_id = view_id;
+        this.name = "";
+		this.domain = this.dataset._domain ? this.dataset._domain: [];
+		this.context = {};
+		this.ids = this.dataset.ids;
+		
+		console.log('data set>>',this.dataset)
+	},
+	start: function() {
+		this.rpc("/base_diagram/diagram/load", {"model": this.model, "view_id": this.view_id}, this.on_loaded);
+	},
+	
+	toTitleCase: function(str) {
+		return str.replace(/\w\S*/g, function(txt){return txt.charAt(0).toUpperCase() + txt.substr(1).toLowerCase();});
+	},
+	
+	on_loaded: function(result) {
+		
+		var self = this;
+		if(this.ids && this.ids.length) {
+			this.id = this.ids[0];
+		}
+		
+		this.fields_view = result.fields_view;
+		this.view_id = this.fields_view.view_id;
+		this.name = this.fields_view.name;
+		
+		this.fields = this.fields_view.fields;
+		
+		var children = this.fields_view.arch.children;
+		/*
+		 * For Nodes (Fields)
+		 */
+		this.node = '';
+		this.bgcolor = '';
+		this.shape = '';
+		this.visible_fields_nodes = [];
+		this.invisible_fields_nodes = [];
+		this.fields_nodes_string = [];
+		
+		/*
+		 * For Arraows(Connector)
+		 */
+		this.connector = '';
+		this.src_node = '';
+		this.des_node = '';
+		this.connector_fields = [];
+		this.fields_connector_string = [];
+		
+		for(ch in children) {
+			if(children[ch]['tag'] == 'node') {
+				this.node = children[ch]['attrs']['object'];
+				this.bgcolor = children[ch]['attrs']['bgcolor'] || '';
+				this.shape = children[ch]['attrs']['shape'] || '';
+				for(node_chld in children[ch]['children']) {
+					if (children[ch]['children'][node_chld]['tag'] = 'field') {
+						var ch_name = children[ch]['children'][node_chld]['attrs']['name'];
+						
+						if (children[ch]['children'][node_chld]['attrs']['invisible']) {
+							if (children[ch]['children'][node_chld]['attrs']['invisible'] == 1 && children[ch]['children'][node_chld]['attrs']['invisible'] == '1') {
+								this.invisible_fields_nodes.push(ch_name)
+							}
+						}
+						else {
+							this.visible_fields_nodes.push(ch_name);
+							var ch_node_string = this.fields[ch_name]['string'] || this.toTitleCase(ch_name);
+							this.fields_nodes_string.push(ch_node_string)
+						}
+					}
+				}
+			} else if(children[ch]['tag'] == 'arrow') {
+				this.connector = children[ch]['attrs']['object'];
+				this.src_node = children[ch]['attrs']['source'];
+				this.des_node = children[ch]['attrs']['destination'];
+				for (arrow_chld in children[ch]['children']) {
+					if (children[ch]['children'][arrow_chld]['tag'] = 'field') {
+						var arr_ch_name = children[ch]['children'][arrow_chld]['attrs']['name'];
+						var ch_node_string = this.fields[arr_ch_name]['string'] || this.toTitleCase(arr_ch_name);
+						this.fields_connector_string.push(ch_node_string);
+						this.connector_fields.push(arr_ch_name);
+					}
+				}
+			}
+		}
+		this.$element.html(QWeb.render("DiagramView", {"fields_view": this.fields_view}));
+		
+ 
+//		g.addEdge("strawberry", "cherry");
+//		g.addEdge("strawberry", "apple");
+//		g.addEdge("strawberry", "tomato");
+//		 
+//		g.addEdge("tomato", "apple");
+//		g.addEdge("tomato", "kiwi");
+//		 
+//		g.addEdge("cherry", "apple");
+//		g.addEdge("cherry", "kiwi");
+		 
+		
+		
+		if(this.id) {
+			this.rpc(
+			'/base_diagram/diagram/get_diagram_info',
+			{
+				'id': this.id,
+				'model': this.model,
+				'bgcolor': this.bgcolor,
+				'shape': this.shape,
+				'node': this.node,
+				'connector': this.connector,
+				'src_node': this.src_node,
+				'des_node': this.des_node,
+				'visible_node_fields': this.visible_fields_nodes,
+				'invisible_node_fields': this.invisible_fields_nodes,
+				'node_fields_string': this.fields_nodes_string,
+				'connector_fields': this.connector_fields,
+				'connector_fields_string': this.fields_connector_string
+			},
+			function(result) {
+				self.draw_diagram(result);
+			}
+			)
+		}
+	},
+	
+	draw_diagram: function(result) {
+		console.log('this>>>',this)
+		var g = new Graph();
+		
+		this.in_transition_field = result['in_transition_field'];
+		this.out_transition_field = result['out_transition_field'];
+		var res_nodes = result['nodes'];
+		var res_connectors = result['conn'];
+//		for(nd in res_nodes) {
+//			var res_node = res_nodes[nd];
+//			console.log('nodes',res_node, res_node['shape'])
+//			var state;
+//		}
+		
+		for(cr in res_connectors) {
+			var res_connector = res_connectors[cr];
+			g.addEdge(res_connector['source'], res_connector['destination']);
+			
+		}
+		
+		var layouter = new Graph.Layout.Spring(g);
+		layouter.layout();
+		
+		var renderer = new Graph.Renderer.Raphael('dia-canvas', g, 800, 500);
+		renderer.draw();
+	},
+	
+	do_show: function () {
+        this.$element.show();
+    },
+	
+    do_hide: function () {
+        this.$element.hide();
+    }
+});
+};
+
+// vim:et fdc=0 fdl=0 foldnestmax=3 fdm=syntax:
diff --git a/addons/base_diagram/static/src/js/views.js b/addons/base_diagram/static/src/js/views.js
deleted file mode 100644
index 606e1e5c78c..00000000000
--- a/addons/base_diagram/static/src/js/views.js
+++ /dev/null
@@ -1,12 +0,0 @@
-/*---------------------------------------------------------
- * OpenERP base library
- *---------------------------------------------------------*/
-
-openerp.base_diagram = function(openerp) {
-
-openerp.base_diagram.DiagramView = openerp.base.Controller.extend({
-});
-
-};
-
-// vim:et fdc=0 fdl=0 foldnestmax=3 fdm=syntax:

From b11a71fd8751bc4fb33faa1f95f7915e230b86ab Mon Sep 17 00:00:00 2001
From: Thibault Francois <tfr@openerp.com>
Date: Thu, 7 Apr 2011 13:41:45 +0200
Subject: [PATCH 083/331] [MERGE] improvement project-issue

bzr revid: tfr@openerp.com-20110407114145-xvr27pjquxwk9ff0
---
 addons/analytic/analytic.py                   |  2 +-
 addons/document/document.py                   | 20 +++-
 .../email_template/email_template_mailbox.py  |  1 +
 addons/email_template/email_template_view.xml |  2 +-
 .../marketing_campaign/marketing_campaign.py  | 95 +++++++++++++++----
 .../marketing_campaign_view.xml               |  1 +
 addons/project/project.py                     |  5 +
 addons/project_issue/project_issue.py         | 39 +++++---
 addons/project_issue/project_issue_view.xml   | 37 ++++----
 .../report/project_issue_report.py            |  7 +-
 .../report/project_issue_report_view.xml      |  4 +-
 .../project_issue_sheet.py                    | 30 +++++-
 .../project_issue_sheet_view.xml              | 18 +++-
 13 files changed, 191 insertions(+), 70 deletions(-)

diff --git a/addons/analytic/analytic.py b/addons/analytic/analytic.py
index ee458ca0076..39ffeb70eed 100644
--- a/addons/analytic/analytic.py
+++ b/addons/analytic/analytic.py
@@ -205,7 +205,7 @@ class account_analytic_account(osv.osv):
     def check_recursion(self, cr, uid, ids, parent=None):
         return super(account_analytic_account, self)._check_recursion(cr, uid, ids, parent=parent)
 
-    _order = 'date_start desc,parent_id desc,code'
+    _order = 'name asc'
     _constraints = [
         (check_recursion, 'Error! You can not create recursive analytic accounts.', ['parent_id']),
     ]
diff --git a/addons/document/document.py b/addons/document/document.py
index 1a553b23ed1..27a6c3d3c19 100644
--- a/addons/document/document.py
+++ b/addons/document/document.py
@@ -279,10 +279,22 @@ class document_file(osv.osv):
         else:
             if vals.get('file_size'):
                 del vals['file_size']
-        if not self._check_duplication(cr, uid, vals):
-            raise osv.except_osv(_('ValidateError'), _('File name must be unique!'))
-        result = super(document_file, self).create(cr, uid, vals, context)
-        cr.commit() # ?
+        result = self._check_duplication(cr, uid, vals)
+        if not result:
+            domain = [
+                ('res_id', '=', vals['res_id']),
+                ('res_model', '=', vals['res_model']),
+                ('datas_fname', '=', vals['datas_fname']),
+            ]
+            attach_ids = self.search(cr, uid, domain, context=context)
+            super(document_file, self).write(cr, uid, attach_ids, 
+                                             {'datas' : vals['datas']},
+                                             context=context)
+            result = attach_ids[0]
+        else:
+            #raise osv.except_osv(_('ValidateError'), _('File name must be unique!'))
+            result = super(document_file, self).create(cr, uid, vals, context)
+            cr.commit() # ?
         return result
 
     def __get_partner_id(self, cr, uid, res_model, res_id, context=None):
diff --git a/addons/email_template/email_template_mailbox.py b/addons/email_template/email_template_mailbox.py
index 49d61bf05df..4486cb5451e 100644
--- a/addons/email_template/email_template_mailbox.py
+++ b/addons/email_template/email_template_mailbox.py
@@ -92,6 +92,7 @@ class email_template_mailbox(osv.osv):
                         self.unlink(cr, uid, [id], context=context)
                         # Remove attachments for this mail
                         attachment_pool.unlink(cr, uid, values['attachments_ids'], context=context)
+                        return result
                     else:
                         self.write(cr, uid, id, {'folder':'sent', 'state':'na', 'date_mail':time.strftime("%Y-%m-%d %H:%M:%S")}, context)
                         self.historise(cr, uid, [id], "Email sent successfully", context)
diff --git a/addons/email_template/email_template_view.xml b/addons/email_template/email_template_view.xml
index 5da74772c44..7d2a5f7ad5c 100644
--- a/addons/email_template/email_template_view.xml
+++ b/addons/email_template/email_template_view.xml
@@ -201,7 +201,7 @@
         </record>
 
         <menuitem name="Email Templates" id="menu_email_template_all"
-            parent="menu_email_template_configuration" action="action_email_template_tree_all" />
+            parent="menu_email_template" action="action_email_template_tree_all" />
 
         <!-- Email Template menu in Tools -->
         <menuitem name="Email Templates" id="menu_email_template_all_tools"
diff --git a/addons/marketing_campaign/marketing_campaign.py b/addons/marketing_campaign/marketing_campaign.py
index 52a29d361e1..15c86f5298e 100644
--- a/addons/marketing_campaign/marketing_campaign.py
+++ b/addons/marketing_campaign/marketing_campaign.py
@@ -93,7 +93,17 @@ class marketing_campaign(osv.osv):
 this campaign to be run"),
         'partner_field_id': fields.many2one('ir.model.fields', 'Partner Field',
                                             domain="[('model_id', '=', object_id), ('ttype', '=', 'many2one'), ('relation', '=', 'res.partner')]",
-                                            help="The generated workitems will be linked to the partner related to the record. If the record is the partner itself leave this field empty."),
+                                            help="The generated workitems will be linked to the partner related to the record. "\
+                                                  "If the record is the partner itself leave this field empty. "\
+                                                  "This is useful for reporting purposes, via the Campaign Analysis or Campaign Follow-up views."),
+        'unique_field_id': fields.many2one('ir.model.fields', 'Unique Field',
+                                            domain="[('model_id', '=', object_id), ('ttype', 'in', ['char','int','many2one','text','selection'])]",
+                                            help='If set, this field will help segments that work in "no duplicates" mode to avoid '\
+                                                 'selecting similar records twice. Similar records are records that have the same value for '\
+                                                 'this unique field. For example by choosing the "email_from" field for CRM Leads you would prevent '\
+                                                 'sending the same campaign to the same email address again. If not set, the "no duplicates" segments '\
+                                                 "will only avoid selecting the same record again if it entered the campaign previously. "\
+                                                 "Only easily comparable fields like textfields, integers, selections or single relationships may be used."),
         'mode': fields.selection([('test', 'Test Directly'),
                                 ('test_realtime', 'Test in Realtime'),
                                 ('manual', 'With Manual Confirmation'),
@@ -209,11 +219,36 @@ Normal - the campaign runs normally and automatically sends all emails and repor
     def copy(self, cr, uid, id, default=None, context=None):
         raise osv.except_osv(_("Operation not supported"), _("Sorry, campaign duplication is not supported at the moment."))
 
+    def _find_duplicate_workitems(self, cr, uid, record, campaign_rec, context=None):
+        """Finds possible duplicates workitems for a record in this campaign, based on a uniqueness
+           field.
+
+           :param record: browse_record to find duplicates workitems for.
+           :param campaign_rec: browse_record of campaign
+        """
+        Workitems = self.pool.get('marketing.campaign.workitem')
+        duplicate_workitem_domain = [('res_id','=', record.id),
+                                     ('campaign_id','=', campaign_rec.id)]
+        unique_field = campaign_rec.unique_field_id
+        if unique_field:
+            unique_value = getattr(record, unique_field.name, None)
+            if unique_value:
+                if unique_field.ttype == 'many2one':
+                    unique_value = unique_value.id
+                similar_res_ids = self.pool.get(campaign_rec.object_id.model).search(cr, uid,
+                                    [(unique_field.name, '=', unique_value)], context=context)
+                if similar_res_ids:
+                    duplicate_workitem_domain = [('res_id','in', similar_res_ids),
+                                                 ('campaign_id','=', campaign_rec.id)]
+        return Workitems.search(cr, uid, duplicate_workitem_domain, context=context)
+
+
 marketing_campaign()
 
 class marketing_campaign_segment(osv.osv):
     _name = "marketing.campaign.segment"
     _description = "Campaign Segment"
+    _order = "name"
 
     def _get_next_sync(self, cr, uid, ids, fn, args, context=None):
         # next auto sync date is same for all segments
@@ -226,13 +261,19 @@ class marketing_campaign_segment(osv.osv):
         'campaign_id': fields.many2one('marketing.campaign', 'Campaign', required=True, select=1, ondelete="cascade"),
         'object_id': fields.related('campaign_id','object_id', type='many2one', relation='ir.model', string='Resource'),
         'ir_filter_id': fields.many2one('ir.filters', 'Filter', ondelete="restrict",
-                            help="Filter to select the matching resource records that belong to this segment. New filters can be created and saved using the advanced search on the list view of the Resource. If no filter is set, all records are selected without filtering. The synchronization mode may also add a criterion to the filter."),
+                            help="Filter to select the matching resource records that belong to this segment. "\
+                                 "New filters can be created and saved using the advanced search on the list view of the Resource. "\
+                                 "If no filter is set, all records are selected without filtering. "\
+                                 "The synchronization mode may also add a criterion to the filter."),
         'sync_last_date': fields.datetime('Last Synchronization', help="Date on which this segment was synchronized last time (automatically or manually)"),
         'sync_mode': fields.selection([('create_date', 'Only records created after last sync'),
                                       ('write_date', 'Only records modified after last sync (no duplicates)'),
                                       ('all', 'All records (no duplicates)')],
                                       'Synchronization mode',
-                                      help="Determines an additional criterion to add to the filter when selecting new records to inject in the campaign."),
+                                      help="Determines an additional criterion to add to the filter when selecting new records to inject in the campaign. "\
+                                           '"No duplicates" prevents selecting records which have already entered the campaign previously.'\
+                                           'If the campaign has a "unique field" set, "no duplicates" will also prevent selecting records which have '\
+                                           'the same value for the unique field as other records that already entered the campaign.'),
         'state': fields.selection([('draft', 'Draft'),
                                    ('running', 'Running'),
                                    ('done', 'Done'),
@@ -301,6 +342,7 @@ class marketing_campaign_segment(osv.osv):
 
     def process_segment(self, cr, uid, segment_ids=None, context=None):
         Workitems = self.pool.get('marketing.campaign.workitem')
+        Campaigns = self.pool.get('marketing.campaign')
         if not segment_ids:
             segment_ids = self.search(cr, uid, [('state', '=', 'running')], context=context)
 
@@ -323,21 +365,20 @@ class marketing_campaign_segment(osv.osv):
             object_ids = model_obj.search(cr, uid, criteria, context=context)
 
             # XXX TODO: rewrite this loop more efficiently without doing 1 search per record!
-            for o_ids in model_obj.browse(cr, uid, object_ids, context=context):
-                # avoid duplicated workitem for the same resource
+            for record in model_obj.browse(cr, uid, object_ids, context=context):
+                # avoid duplicate workitem for the same resource
                 if segment.sync_mode in ('write_date','all'):
-                    wi_ids = Workitems.search(cr, uid, [('res_id','=',o_ids.id),('segment_id','=',segment.id)], context=context)
-                    if wi_ids:
+                    if Campaigns._find_duplicate_workitems(cr, uid, record, segment.campaign_id, context=context):
                         continue
 
                 wi_vals = {
                     'segment_id': segment.id,
                     'date': action_date,
                     'state': 'todo',
-                    'res_id': o_ids.id
+                    'res_id': record.id
                 }
 
-                partner = self.pool.get('marketing.campaign')._get_partner_for(segment.campaign_id, o_ids)
+                partner = self.pool.get('marketing.campaign')._get_partner_for(segment.campaign_id, record)
                 if partner:
                     wi_vals['partner_id'] = partner.id
 
@@ -353,6 +394,7 @@ marketing_campaign_segment()
 
 class marketing_campaign_activity(osv.osv):
     _name = "marketing.campaign.activity"
+    _order = "name"
     _description = "Campaign Activity"
 
     _action_types = [
@@ -454,10 +496,11 @@ class marketing_campaign_activity(osv.osv):
         action_context = dict(context,
                               active_id=workitem.res_id,
                               active_ids=[workitem.res_id],
-                              active_model=workitem.object_id.model)
+                              active_model=workitem.object_id.model,
+                              workitem=workitem)
         res = server_obj.run(cr, uid, [activity.server_action_id.id],
                              context=action_context)
-        # server action return False if the action is perfomed
+        # server action return False if the action is performed
         # except client_action, other and python code
         return res == False and True or res
 
@@ -557,6 +600,8 @@ class marketing_campaign_workitem(osv.osv):
                 continue
 
             proxy = self.pool.get(wi.object_id.model)
+            if not proxy.exists(cr, uid, [wi.res_id]):
+                continue
             ng = proxy.name_get(cr, uid, [wi.res_id], context=context)
             if ng:
                 res[wi.id] = ng[0][1]
@@ -567,8 +612,14 @@ class marketing_campaign_workitem(osv.osv):
         if not len(args):
             return []
 
-        condition = []
-        final_ids = []
+        condition_name = None
+        for domain_item in args:
+            # we only use the first domain criterion and ignore all the rest including operators
+            if isinstance(domain_item, (list,tuple)) and len(domain_item) == 3 and domain_item[0] == 'res_name':
+                condition_name = [None, domain_item[1], domain_item[2]]
+                break
+
+        assert condition_name, "Invalid search domain for marketing_campaign_workitem.res_name. It should use 'res_name'"
 
         cr.execute("""select w.id, w.res_id, m.model  \
                                 from marketing_campaign_workitem w \
@@ -577,15 +628,17 @@ class marketing_campaign_workitem(osv.osv):
                                     left join ir_model m on (m.id=c.object_id)
                                     """)
         res = cr.fetchall()
+        workitem_map = {}
+        matching_workitems = []
         for id, res_id, model in res:
+            workitem_map.setdefault(model,{}).setdefault(res_id,set()).add(id)
+        for model, id_map in workitem_map.iteritems():
             model_pool = self.pool.get(model)
-            for arg in args:
-                if arg[1] == 'ilike':
-                    condition.append((model_pool._rec_name, 'ilike', arg[2]))
-            res_ids = model_pool.search(cr, uid, condition, context=context)
-            if res_id in res_ids:
-                final_ids.append(id)
-        return [('id', 'in', final_ids)]
+            condition_name[0] = model_pool._rec_name
+            condition = [('id', 'in', id_map.keys()), condition_name]
+            for res_id in model_pool.search(cr, uid, condition, context=context):
+                matching_workitems.extend(id_map[res_id])
+        return [('id', 'in', list(set(matching_workitems)))]
 
     _columns = {
         'segment_id': fields.many2one('marketing.campaign.segment', 'Segment', readonly=True),
@@ -723,7 +776,7 @@ class marketing_campaign_workitem(osv.osv):
                 # manual states are not processed automatically
                 continue
             while True:
-                domain = [('state', '=', 'todo'), ('date', '!=', False)]
+                domain = [('campaign_id', '=', camp.id), ('state', '=', 'todo'), ('date', '!=', False)]
                 if camp.mode in ('test_realtime', 'active'):
                     domain += [('date','<=', time.strftime('%Y-%m-%d %H:%M:%S'))]
 
diff --git a/addons/marketing_campaign/marketing_campaign_view.xml b/addons/marketing_campaign/marketing_campaign_view.xml
index ce3936337ff..65c2397a3f7 100644
--- a/addons/marketing_campaign/marketing_campaign_view.xml
+++ b/addons/marketing_campaign/marketing_campaign_view.xml
@@ -26,6 +26,7 @@
                         <separator string="Resource" colspan="2" />
                         <field name="object_id"/>
                         <field name="partner_field_id"/>
+                        <field name="unique_field_id"/>
                     </group>
                     <group colspan="2" col="2">
                         <separator string="Cost" colspan="2" />
diff --git a/addons/project/project.py b/addons/project/project.py
index 14ee94e76a1..134364d8b1a 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -26,6 +26,10 @@ from datetime import datetime, date
 from tools.translate import _
 from osv import fields, osv
 
+class project_project(osv.osv):
+    _name = 'project.project'
+    
+project_project()    
 
 class project_task_type(osv.osv):
     _name = 'project.task.type'
@@ -35,6 +39,7 @@ class project_task_type(osv.osv):
         'name': fields.char('Stage Name', required=True, size=64, translate=True),
         'description': fields.text('Description'),
         'sequence': fields.integer('Sequence'),
+        'project_ids': fields.many2many('project.project', 'project_task_type_rel', 'type_id', 'project_id', 'Projects'),
     }
 
     _defaults = {
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index aaaff37305e..a8a32847243 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -43,9 +43,9 @@ project_issue_version()
 class project_issue(crm.crm_case, osv.osv):
     _name = "project.issue"
     _description = "Project Issue"
-    _order = "priority, id desc"
+    _order = "priority, create_date desc"
     _inherit = ['mailgate.thread']
-
+    
     def case_open(self, cr, uid, ids, *args):
         """
         @param self: The object pointer
@@ -56,7 +56,7 @@ class project_issue(crm.crm_case, osv.osv):
         """
 
         res = super(project_issue, self).case_open(cr, uid, ids, *args)
-        self.write(cr, uid, ids, {'date_open': time.strftime('%Y-%m-%d %H:%M:%S')})
+        self.write(cr, uid, ids, {'date_open': time.strftime('%Y-%m-%d %H:%M:%S'), 'assigned_to' : uid})
         for (id, name) in self.name_get(cr, uid, ids):
             message = _("Issue '%s' has been opened.") % name
             self.log(cr, uid, id, message)
@@ -175,7 +175,7 @@ class project_issue(crm.crm_case, osv.osv):
         'section_id': fields.many2one('crm.case.section', 'Sales Team', \
                         select=True, help='Sales team to which Case belongs to.\
                              Define Responsible user and Email account for mail gateway.'),
-        'user_id': fields.many2one('res.users', 'Responsible'),
+        'user_id': fields.related('project_id', 'user_id', type='many2one', relation='res.users', store=True, select=1, string='Responsible'),
         'partner_id': fields.many2one('res.partner', 'Partner'),
         'partner_address_id': fields.many2one('res.partner.address', 'Partner Contact', \
                                  domain="[('partner_id','=',partner_id)]"),
@@ -200,19 +200,19 @@ class project_issue(crm.crm_case, osv.osv):
         'partner_name': fields.char("Employee's Name", size=64),
         'partner_mobile': fields.char('Mobile', size=32),
         'partner_phone': fields.char('Phone', size=32),
-        'type_id': fields.many2one ('project.task.type', 'Resolution'),
+        'type_id': fields.many2one ('project.task.type', 'Resolution', domain="[('project_ids', '=', project_id)]"),
         'project_id':fields.many2one('project.project', 'Project'),
         'duration': fields.float('Duration'),
         'task_id': fields.many2one('project.task', 'Task', domain="[('project_id','=',project_id)]"),
         'day_open': fields.function(_compute_day, string='Days to Open', \
-                                method=True, multi='day_open', type="float", store=True),
+                                method=True, multi='compute_day', type="float", store=True),
         'day_close': fields.function(_compute_day, string='Days to Close', \
-                                method=True, multi='day_close', type="float", store=True),
-        'assigned_to': fields.related('task_id', 'user_id', string = 'Assigned to', type="many2one", relation="res.users", store=True, help='This is the current user to whom the related task have been assigned'),
+                                method=True, multi='compute_day', type="float", store=True),
+        'assigned_to': fields.many2one('res.users', 'Assigned to', required=False, select=1),
         'working_hours_open': fields.function(_compute_day, string='Working Hours to Open the Issue', \
-                                method=True, multi='working_days_open', type="float", store=True),
+                                method=True, multi='compute_day', type="float", store=True),
         'working_hours_close': fields.function(_compute_day, string='Working Hours to Close the Issue', \
-                                method=True, multi='working_days_close', type="float", store=True),
+                                method=True, multi='compute_day', type="float", store=True),
         'message_ids': fields.one2many('mailgate.message', 'res_id', 'Messages', domain=[('model','=',_name)]),
         'date_action_last': fields.datetime('Last Action', readonly=1),
         'date_action_next': fields.datetime('Next Action', readonly=1),
@@ -230,17 +230,30 @@ class project_issue(crm.crm_case, osv.osv):
             return user.context_project_id.id
         return False
 
+    def on_change_project(self, cr, uid, ids, project_id, context=None):
+        result = {}
+
+        if project_id:
+            project = self.pool.get('project.project').browse(cr, uid, project_id, context=context)
+            if project.user_id:
+                result['value'] = {'user_id' : project.user_id.id}
+
+        return result
+
+
     _defaults = {
         'active': 1,
-        'user_id': crm.crm_case._get_default_user,
+        #'user_id': crm.crm_case._get_default_user,
         'partner_id': crm.crm_case._get_default_partner,
         'partner_address_id': crm.crm_case._get_default_partner_address,
-        'email_from': crm.crm_case. _get_default_email,
+        'email_from': crm.crm_case._get_default_email,
         'state': 'draft',
-        'section_id': crm.crm_case. _get_section,
+        'section_id': crm.crm_case._get_section,
         'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'crm.helpdesk', context=c),
         'priority': crm.AVAILABLE_PRIORITIES[2][0],
         'project_id':_get_project,
+        'categ_id' : lambda *a: False,
+        #'assigned_to' : lambda obj, cr, uid, context: uid,
     }
 
     def convert_issue_task(self, cr, uid, ids, context=None):
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 36c0e4ba82f..2224527e9d2 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -52,13 +52,14 @@
             <field name="arch" type="xml">
                 <form string="Issue Tracker Form">
                     <group colspan="4" col="6">
-                    <field name="name"/>
-                    <field name="project_id" required="True"/>
-                    <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'project.issue')]"/>
-                    <field name="user_id"/>
-                    <field name="assigned_to" />
+                        <field name="name"/>
+                        <field name="project_id" required="True" on_change="on_change_project(project_id)"/>
+                        <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'project.issue')]"/>
+                        <field name="user_id" invisible="1" />
+                        <field name="assigned_to"/>
+                        <field name="version_id" colspan="2" widget="selection"/>
                         <group colspan="2" col="4">
-                            <field name="type_id" readonly="1"/>
+                            <field name="type_id" string="Resolution" />
                             <button name="prev_type" string="Previous" type="object" icon="gtk-go-back" help="Change to Previous Stage"/>
                             <button name="next_type" string="Next" type="object" icon="gtk-go-forward" help="Change to Next Stage"/>
                         </group>
@@ -73,7 +74,6 @@
                             </group>
                             <group col="3" colspan="2">
                             <separator colspan="3" string="Status"/>
-                            <field name="version_id" colspan="3" widget="selection"/>
                             <field name="priority" colspan="3"/>
                             <field name="task_id" on_change="onchange_task_id(task_id)"/>
                             <button string="Convert To Task" name="convert_issue_task" icon="gtk-index" type="object"
@@ -184,12 +184,11 @@
                     <field name="partner_id" groups="base.group_extended"/>
                     <field name="project_id" />
                     <field name="priority" string="Priority"/>
-                    <field name="type_id" widget="selection" readonly="1"/>
+                    <field name="type_id" widget="selection" readonly="1" string="Resolution" />
                     <button name="prev_type" string="Previous" type="object" icon="gtk-go-back" help="Change to Previous Stage"/>
                     <button name="next_type" string="Next" type="object" icon="gtk-go-forward" help="Change to Next Stage"/>
                     <field name="version_id" widget="selection"/>
-                    <field name="user_id"/>
-                    <field name="assigned_to" attrs="{'readonly':[('task_id','=',False)]}"/>
+                    <field name="assigned_to"/>
                     <field name="progress" widget="progressbar" attrs="{'invisible':[('task_id','=',False)]}"/>
                     <field name="state"/>
                     <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" icon="gtk-cancel"/>
@@ -218,8 +217,8 @@
                         <separator orientation="vertical"/>
                         <field name="name"/>
                         <field name="partner_id" groups="base.group_extended"/>
-                        <field name="user_id">
-                            <filter domain="[('user_id','=',False)]"  help="Unassigned Issues" icon="terp-personal-" separator="1"/>
+                        <field name="assigned_to">
+                            <filter domain="[('assigned_to','=',False)]"  help="Unassigned Issues" icon="terp-personal-" separator="1"/>
                         </field>
                         <field name="project_id"/>
                     </group>
@@ -233,7 +232,7 @@
                     <newline/>
                     <group expand="0" string="Group By..."  groups="base.group_extended">
                         <filter string="Responsible" icon="terp-personal"
-                            domain="[]" context="{'group_by':'user_id'}" />
+                            domain="[]" context="{'group_by':'assigned_to'}" />
                         <filter string="Partner" icon="terp-partner" domain="[]"
                             context="{'group_by':'partner_id'}" />
                         <separator orientation="vertical"/>
@@ -264,7 +263,7 @@
             <field name="type">calendar</field>
             <field name="priority" eval="2"/>
             <field name="arch" type="xml">
-                <calendar string="Issues" date_start="date" color="user_id" date_delay="duration">
+                <calendar string="Issues" date_start="date" color="assigned_to" date_delay="duration">
                     <field name="name"/>
                     <field name="partner_id"/>
                 </calendar>
@@ -285,11 +284,11 @@
                     <field name="name" string="Feature description"/>
                     <field name="partner_id" groups="base.group_extended"/>
                     <field name="priority" string="Priority"/>
-                                <field name="type_id" widget="selection" readonly="1"/>
-                                <button name="prev_type" string="Previous" type="object" icon="gtk-go-back" help="Change to Previous Stage"/>
-                                <button name="next_type" string="Next" type="object" icon="gtk-go-forward" help="Change to Next Stage"/>
+                    <field name="type_id" widget="selection" readonly="1"/>
+                    <button name="prev_type" string="Previous" type="object" icon="gtk-go-back" help="Change to Previous Stage"/>
+                    <button name="next_type" string="Next" type="object" icon="gtk-go-forward" help="Change to Next Stage"/>
                     <field name="version_id"/>
-                    <field name="user_id"/>
+                    <field name="assigned_to"/>
                     <field name="state"/>
                     <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" icon="gtk-cancel"/>
                     <button name="case_close" string="Done" states="open,draft,pending" type="object" icon="gtk-jump-to"/>
@@ -312,7 +311,7 @@
                     <separator orientation="vertical"/>
                     <group>
                         <field name="name" select='1' string="Feature description"/>
-                        <field name="user_id" select="1"/>
+                        <field name="assigned_to" select="1"/>
                         <field name="state" select="1">
                             <filter icon="terp-check" domain="[('state','in',('open','draft'))]" help="Current Features" name="current_feature"/>
                             <filter icon="terp-camera_test" domain="[('state','=','open')]" help="Open Features"/>
diff --git a/addons/project_issue/report/project_issue_report.py b/addons/project_issue/report/project_issue_report.py
index b66963569e7..29542f32912 100644
--- a/addons/project_issue/report/project_issue_report.py
+++ b/addons/project_issue/report/project_issue_report.py
@@ -1,7 +1,7 @@
 
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -16,7 +16,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -101,10 +101,11 @@ class project_issue_report(osv.osv):
                     c.task_id,
                     date_trunc('day',c.create_date) as create_date,
                     extract('epoch' from (c.date_open-c.create_date))/(3600*24) as  delay_open,
-                    extract('epoch' from (c.date_closed-c.create_date))/(3600*24) as  delay_close,
+                    extract('epoch' from (c.date_closed-c.date_open))/(3600*24) as  delay_close,
                     (SELECT count(id) FROM mailgate_message WHERE model='project.issue' AND res_id=c.id) AS email
                 FROM
                     project_issue c
+                WHERE c.categ_id IN (select id from crm_case_categ where object_id in (select id from ir_model where model = 'project.issue'))
             )""")
 
 project_issue_report()
diff --git a/addons/project_issue/report/project_issue_report_view.xml b/addons/project_issue/report/project_issue_report_view.xml
index 4ca0fbf2279..015a7750548 100644
--- a/addons/project_issue/report/project_issue_report_view.xml
+++ b/addons/project_issue/report/project_issue_report_view.xml
@@ -28,8 +28,8 @@
                     <field name="nbr" string="#Project Issues" sum='#Number of Project Issues'/>
                     <field name="delay_open" avg='Avg Opening Delay'/>
                     <field name="delay_close" avg='Avg Closing Delay'/>
-                    <field name="working_hours_open" sum='Open Working Hours'/>
-                    <field name="working_hours_close" sum='Close Working hours'/>
+                    <field name="working_hours_open" avg='Open Working Hours'/>
+                    <field name="working_hours_close" avg='Close Working hours'/>
                     <field name="email" sum='# Emails'/>
                   </tree>
             </field>
diff --git a/addons/project_issue_sheet/project_issue_sheet.py b/addons/project_issue_sheet/project_issue_sheet.py
index f96ce9a4ac5..e9396f9d030 100644
--- a/addons/project_issue_sheet/project_issue_sheet.py
+++ b/addons/project_issue_sheet/project_issue_sheet.py
@@ -27,8 +27,36 @@ class project_issue(osv.osv):
     _description = 'project issue'
     _columns = {
         'timesheet_ids': fields.one2many('hr.analytic.timesheet', 'issue_id', 'Timesheets'),
-        'analytic_account_id': fields.related('project_id', 'analytic_account_id', type='many2one', relation='account.analytic.account',string='Analytic Account')
+        'analytic_account_id': fields.many2one('account.analytic.account', 'Analytic Account'), 
     }
+    
+    def on_change_project(self, cr, uid, ids, project_id, context=None):
+        if not project_id:
+            return {}
+
+        result = super(project_issue, self).on_change_project(cr, uid, ids, project_id, context=context)
+        
+        project = self.pool.get('project.project').browse(cr, uid, project_id, context=context)
+        if 'value' not in result:
+            result['value'] = {}
+
+        account = project.analytic_account_id
+        if account:
+            result['value']['analytic_account_id'] = account.id
+
+        return result
+
+    def on_change_account_id(self, cr, uid, ids, account_id, context=None):
+        if not account_id:
+            return {}
+
+        account = self.pool.get('account.analytic.account').browse(cr, uid, account_id, context=context)
+        result = {}
+
+        if account and account.state == 'pending':
+            result = {'warning' : {'title' : _('Analytic Account'), 'message' : _('The Analytic Account is in pending !')}}
+            
+        return result
 
 project_issue()
 
diff --git a/addons/project_issue_sheet/project_issue_sheet_view.xml b/addons/project_issue_sheet/project_issue_sheet_view.xml
index 2222ef12ea5..058fd67a946 100644
--- a/addons/project_issue_sheet/project_issue_sheet_view.xml
+++ b/addons/project_issue_sheet/project_issue_sheet_view.xml
@@ -7,14 +7,22 @@
             <field name="inherit_id" ref="project_issue.project_issue_form_view" />
             <field name="type">form</field>
             <field name="arch" type="xml">
+                <field name="project_id" position="attributes">
+                    <attribute name="on_change">on_change_project(project_id)</attribute>
+                </field>
+                <xpath expr="/form/notebook" position="before">
+                    <field name="analytic_account_id"
+                        domain="[('parent_id','!=',False),('partner_id', '=', partner_id),('type', '!=', 'view')]"
+                        on_change='on_change_account_id(analytic_account_id)'
+                        groups="base.group_extended" />
+                </xpath>
                 <notebook colspan="4">
                     <page string="Worklogs">
-                        <field name="analytic_account_id" invisible="1" domain="[('parent_id','!=',False)]" groups="base.group_extended"/>
-                        <field name="timesheet_ids" colspan="4" nolabel="1" context="{'default_user_id' : user_id, 'default_account_id' : analytic_account_id}">
+                        <field name="timesheet_ids" colspan="4" nolabel="1" context="{'default_user_id' : assigned_to, 'default_account_id' : analytic_account_id}">
                             <tree editable="top" string="Timesheet">
-                              <field name="name"/>
-                              <field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)" widget="float_time"/>
-                              <field name="account_id" invisible="0" domain="[('partner_id', '=', parent.partner_id)]" on_change="on_change_account_id(account_id)"/>
+                                <field name="name"/>
+                                <field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)" widget="float_time"/>
+                                <field name="account_id" invisible="0" domain="[('partner_id', '=', parent.partner_id)]" on_change="on_change_account_id(account_id)"/>
                                 <field name="date"/>
                                 <field name="user_id"/>
                                 <field invisible="1" name="journal_id"/>

From 787f38b5c5a85d45208d51b057a853433fa7a589 Mon Sep 17 00:00:00 2001
From: "Tejas (OpenERP)" <tta@openerp.com>
Date: Thu, 7 Apr 2011 17:22:20 +0530
Subject: [PATCH 085/331] FIX : Account Invoice Report, append active and limit
 1 with subquery

bzr revid: tta@openerp.com-20110407115220-f1qp273vl3gpa6ke
---
 addons/account/report/account_invoice_report.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/account/report/account_invoice_report.py b/addons/account/report/account_invoice_report.py
index 9c7cf014e4d..9e3f6565c24 100644
--- a/addons/account/report/account_invoice_report.py
+++ b/addons/account/report/account_invoice_report.py
@@ -88,8 +88,8 @@ class account_invoice_report(osv.osv):
                     ai.partner_id as partner_id,
                     ai.payment_term as payment_term,
                     ai.period_id as period_id,
-                    (case when u.uom_type not in ('reference') then
-                        (select name from product_uom where uom_type='reference' and category_id=u.category_id)
+                    (case when (u.uom_type not in ('reference'))  then
+                        (select name from product_uom where uom_type='reference' and product_uom.active and category_id=u.category_id limit 1 )
                     else
                         u.name
                     end) as uom_name,

From 3b4a87a7317545babf4c2d6d3838273f9cb478c6 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Thu, 7 Apr 2011 14:45:18 +0200
Subject: [PATCH 086/331] [IMP] wip

bzr revid: nicolas.vanhoren@openerp.com-20110407124518-sp9rn78cdvapngmx
---
 addons/base/static/src/js/views.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/base/static/src/js/views.js b/addons/base/static/src/js/views.js
index 39646472437..1707a4db54a 100644
--- a/addons/base/static/src/js/views.js
+++ b/addons/base/static/src/js/views.js
@@ -312,7 +312,6 @@ openerp.base.handle_action = function(session, action) {
             dialog.dialog({
                 title: action.name
             });
-            debugger;
             var viewmanager = new openerp.base.ViewManagerAction(session,element_id, action, false);
             viewmanager.start();
         }

From 70d622c151562d97ffaa3f4c061e9c79aace725a Mon Sep 17 00:00:00 2001
From: "vda (OpenERP)" <vda@tinyerp.com>
Date: Thu, 7 Apr 2011 18:36:23 +0530
Subject: [PATCH 087/331] [FIX] Specific Shape accordingly node will display.

bzr revid: vda@tinyerp.com-20110407130623-iw7nf7vv0dc4jiqk
---
 addons/base/static/src/xml/base.xml          |  2 +-
 addons/base_diagram/static/src/js/diagram.js | 50 ++++++++++++--------
 2 files changed, 30 insertions(+), 22 deletions(-)

diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml
index 8d8040fd48e..1ad8f56511e 100644
--- a/addons/base/static/src/xml/base.xml
+++ b/addons/base/static/src/xml/base.xml
@@ -169,7 +169,7 @@
 </t>
 <t t-name="DiagramView">
 	<h2 class="oe_view_title"><t t-esc="fields_view.arch.attrs.string"/></h2>
-	<div id="dia-canvas"></div>
+	<div id="dia-canvas" style="overflow: auto;"></div>
 </t>
 <t t-name="FormView">
     <h2 class="oe_view_title"><t t-esc="view.fields_view.arch.attrs.string"/></h2>
diff --git a/addons/base_diagram/static/src/js/diagram.js b/addons/base_diagram/static/src/js/diagram.js
index cc0f69b9eb5..af56c256ee7 100644
--- a/addons/base_diagram/static/src/js/diagram.js
+++ b/addons/base_diagram/static/src/js/diagram.js
@@ -97,19 +97,6 @@ openerp.base.DiagramView = openerp.base.Controller.extend({
 		}
 		this.$element.html(QWeb.render("DiagramView", {"fields_view": this.fields_view}));
 		
- 
-//		g.addEdge("strawberry", "cherry");
-//		g.addEdge("strawberry", "apple");
-//		g.addEdge("strawberry", "tomato");
-//		 
-//		g.addEdge("tomato", "apple");
-//		g.addEdge("tomato", "kiwi");
-//		 
-//		g.addEdge("cherry", "apple");
-//		g.addEdge("cherry", "kiwi");
-		 
-		
-		
 		if(this.id) {
 			this.rpc(
 			'/base_diagram/diagram/get_diagram_info',
@@ -138,27 +125,48 @@ openerp.base.DiagramView = openerp.base.Controller.extend({
 	draw_diagram: function(result) {
 		console.log('this>>>',this)
 		var g = new Graph();
-		
+//		var raphel = new 
 		this.in_transition_field = result['in_transition_field'];
 		this.out_transition_field = result['out_transition_field'];
 		var res_nodes = result['nodes'];
 		var res_connectors = result['conn'];
-//		for(nd in res_nodes) {
-//			var res_node = res_nodes[nd];
-//			console.log('nodes',res_node, res_node['shape'])
-//			var state;
-//		}
+		
+		var render = function(r, n) {
+			var set;
+			if (n.node.shape == 'ellipse') {
+				set = r.set().push(
+				r.ellipse(n.node.x - 30, n.node.y - 13, 40, 40).attr({
+					"fill": n.node.color,
+					r: "12px",
+					"stroke-width": n.distance == 0 ? "3px" : "1px"
+				})).push(r.text(n.node.x - 30, n.node.y - 10, (n.label || n.id)));
+			} else  {
+				set = r.set().push(
+                r.rect(n.node.x-30, n.node.y-13, 60, 44).attr({"fill": n.node.color, r : "12px", "stroke-width" : n.distance == 0 ? "3px" : "1px" })).push(
+                r.text(n.point[0], n.point[1] + 10, (n.label || n.id) + "\n(" + (n.distance == undefined ? "Infinity" : n.distance) + ")"));
+				
+			}
+            return set;
+        };
+		
+		for(nd in res_nodes) {
+			var res_node = res_nodes[nd];
+			g.addNode(res_node['name'],
+			{
+				node: res_node,
+				render: render
+			});
+		}
 		
 		for(cr in res_connectors) {
 			var res_connector = res_connectors[cr];
 			g.addEdge(res_connector['source'], res_connector['destination']);
-			
 		}
 		
 		var layouter = new Graph.Layout.Spring(g);
 		layouter.layout();
 		
-		var renderer = new Graph.Renderer.Raphael('dia-canvas', g, 800, 500);
+		var renderer = new Graph.Renderer.Raphael('dia-canvas', g, 800, 800);
 		renderer.draw();
 	},
 	

From 8aebdc308c7d66d358694db5cd622cf54dd0ddba Mon Sep 17 00:00:00 2001
From: Bogdan Stanciu <bogdanovidiu.stanciu@gmail.com>
Date: Thu, 7 Apr 2011 17:06:57 +0200
Subject: [PATCH 088/331] [FIX] for bug 753651 cannot select account for bank
 statement

lp bug: https://launchpad.net/bugs/753651 fixed

bzr revid: bogdanovidiu.stanciu@gmail.com-20110407150657-76j88ckl5y1pd1jd
---
 addons/account/account_bank_statement.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py
index 76ccad9e68a..7a885fb2cad 100644
--- a/addons/account/account_bank_statement.py
+++ b/addons/account/account_bank_statement.py
@@ -161,6 +161,7 @@ class account_bank_statement(osv.osv):
         'balance_start': _default_balance_start,
         'journal_id': _default_journal_id,
         'period_id': _get_period,
+        'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'account.bank.statement',context=c),
     }
 
     def onchange_date(self, cr, user, ids, date, context=None):

From 2b369e9ae257659e5bc207aef28f1ea5f37612c2 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Fri, 8 Apr 2011 06:12:43 +0000
Subject: [PATCH 089/331] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20110407055442-dotyi6bfnw93g9da
bzr revid: launchpad_translations_on_behalf_of_openerp-20110408061243-1m5svyo5s9ect6av
---
 bin/addons/base/i18n/ro.po | 22 ++++++++++++++--------
 debian/po/sq.po            | 15 +++++++++------
 2 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/bin/addons/base/i18n/ro.po b/bin/addons/base/i18n/ro.po
index 49f9173ec64..c3a1a92de81 100644
--- a/bin/addons/base/i18n/ro.po
+++ b/bin/addons/base/i18n/ro.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-03-24 12:16+0000\n"
+"PO-Revision-Date: 2011-04-07 04:09+0000\n"
 "Last-Translator: Dorin <dhongu@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: 2011-03-25 06:13+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-04-08 06:12+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
 #. module: base
 #: view:ir.filters:0
@@ -47,6 +47,8 @@ msgid ""
 "The second argument of the many2many field %s must be a SQL table !You used "
 "%s, which is not a valid SQL table name."
 msgstr ""
+"Al doilea parametru a câmpului many2many %s trebuie să fie o tabelă SQL ! %s "
+"utilizat nu este o tabelă SQL validă."
 
 #. module: base
 #: view:ir.values:0
@@ -117,6 +119,8 @@ msgid ""
 "You can not write in this document (%s) ! Be sure your user belongs to one "
 "of these groups: %s."
 msgstr ""
+"Nu puteți scrie în acest document (%s) ! Asigurați-vă că utilizatorul "
+"aparține grupului: %s."
 
 #. module: base
 #: help:ir.model.fields,domain:0
@@ -125,6 +129,8 @@ msgid ""
 "specified as a Python expression defining a list of triplets. For example: "
 "[('color','=','red')]"
 msgstr ""
+"Domeniu opțional pentru a restricționa valorile pentru câmpul de relație,  "
+"specificat ca o listă Python. De exemplu:   [('color','=','red')]"
 
 #. module: base
 #: field:res.partner,ref:0
@@ -437,7 +443,7 @@ msgstr "Planificare actualizare"
 #: code:addons/orm.py:838
 #, python-format
 msgid "Key/value '%s' not found in selection field '%s'"
-msgstr ""
+msgstr "Cheia/valoarea '%s' nu este găsită în selecția câmpului '%s'"
 
 #. module: base
 #: help:res.country,code:0
@@ -784,7 +790,7 @@ msgstr "Categorii subordonate"
 #. module: base
 #: model:ir.model,name:base.model_ir_config_parameter
 msgid "ir.config_parameter"
-msgstr ""
+msgstr "ir.config_parameter"
 
 #. module: base
 #: selection:base.language.export,format:0
@@ -868,7 +874,7 @@ msgstr "Tranzitii"
 #: code:addons/orm.py:4020
 #, python-format
 msgid "Record #%d of %s not found, cannot copy!"
-msgstr ""
+msgstr "Înregistrarea #%d a %s negăsită, nu se poate face copia!"
 
 #. module: base
 #: field:ir.module.module,contributors:0
@@ -2151,7 +2157,7 @@ msgstr ""
 #. module: base
 #: model:ir.model,name:base.model_ir_module_module_dependency
 msgid "Module dependency"
-msgstr "Dependinţele modulului"
+msgstr "Dependenţele modulului"
 
 #. module: base
 #: selection:publisher_warranty.contract.wizard,state:0
@@ -2194,7 +2200,7 @@ msgstr "Controale de acces"
 #: view:ir.module.module:0
 #: field:ir.module.module,dependencies_id:0
 msgid "Dependencies"
-msgstr "Dependinţe"
+msgstr "Dependențe"
 
 #. module: base
 #: field:multi_company.default,company_id:0
diff --git a/debian/po/sq.po b/debian/po/sq.po
index 5383cb02030..c5e4b570e53 100644
--- a/debian/po/sq.po
+++ b/debian/po/sq.po
@@ -8,20 +8,20 @@ msgstr ""
 "Project-Id-Version: openobject-server\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-24 22:41+0300\n"
-"PO-Revision-Date: 2011-03-28 14:50+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2011-04-07 15:59+0000\n"
+"Last-Translator: Arbri Cungu <Unknown>\n"
 "Language-Team: Albanian <sq@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: 2011-03-29 06:20+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-04-08 06:12+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
 #. Type: string
 #. Description
 #: ../openerp-server.templates:1001
 msgid "Dedicated system account for the Open ERP server:"
-msgstr ""
+msgstr "Llogari e dedikuar sistemi për serverin e Hapur ERP"
 
 #. Type: string
 #. Description
@@ -31,9 +31,12 @@ msgid ""
 "the system's security is not compromised by running it with superuser "
 "privileges."
 msgstr ""
+"Serveri i Hapur ERP duhet të përdorë llogarinë e dedikuar për veprimet e tij "
+"në mënyrë që siguria e sistemit nuk është në rrezik nga përdorimi i "
+"privilegjuar i super perdoruesve."
 
 #. Type: string
 #. Description
 #: ../openerp-server.templates:1001
 msgid "Please choose that account's username."
-msgstr ""
+msgstr "Ju lutemi zgjidhni emrin e llogarisë tuaj."

From a0507fe0db74f5e72100cc866dd53dbe3736b90b Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Fri, 8 Apr 2011 06:13:09 +0000
Subject: [PATCH 090/331] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20110408061309-vdc4fos4jns3upnx
---
 addons/analytic/i18n/nb.po            |  257 +++++
 addons/audittrail/i18n/nb.po          |    8 +-
 addons/base_contact/i18n/nb.po        |   10 +-
 addons/base_report_creator/i18n/nb.po |    2 +-
 addons/crm_claim/i18n/gl.po           |  778 +++++++++++++
 addons/document/i18n/gl.po            |  176 +--
 addons/email_template/i18n/nb.po      |    2 +-
 addons/hr_payroll/i18n/vi.po          | 1538 +++++++++++++++++++++++++
 addons/hr_timesheet/i18n/nb.po        |  702 +++++++++++
 addons/product/i18n/id.po             |   94 +-
 addons/product_margin/i18n/gl.po      |  305 +++++
 addons/purchase/i18n/nb.po            |   10 +-
 addons/warning/i18n/nb.po             |  235 ++++
 13 files changed, 3979 insertions(+), 138 deletions(-)
 create mode 100644 addons/analytic/i18n/nb.po
 create mode 100644 addons/crm_claim/i18n/gl.po
 create mode 100644 addons/hr_payroll/i18n/vi.po
 create mode 100644 addons/hr_timesheet/i18n/nb.po
 create mode 100644 addons/product_margin/i18n/gl.po
 create mode 100644 addons/warning/i18n/nb.po

diff --git a/addons/analytic/i18n/nb.po b/addons/analytic/i18n/nb.po
new file mode 100644
index 00000000000..ea64330892e
--- /dev/null
+++ b/addons/analytic/i18n/nb.po
@@ -0,0 +1,257 @@
+# Norwegian Bokmal translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2011-04-07 06:43+0000\n"
+"Last-Translator: Rolv Råen (adEgo) <Unknown>\n"
+"Language-Team: Norwegian Bokmal <nb@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: 2011-04-08 06:12+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
+
+#. module: analytic
+#: field:account.analytic.account,child_ids:0
+msgid "Child Accounts"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,name:0
+msgid "Account Name"
+msgstr "Kontonavn"
+
+#. module: analytic
+#: help:account.analytic.line,unit_amount:0
+msgid "Specifies the amount of quantity to count."
+msgstr ""
+
+#. module: analytic
+#: model:ir.module.module,description:analytic.module_meta_information
+msgid ""
+"Module for defining analytic accounting object.\n"
+"    "
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,state:0
+msgid "State"
+msgstr "Status"
+
+#. module: analytic
+#: field:account.analytic.account,user_id:0
+msgid "Account Manager"
+msgstr ""
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Draft"
+msgstr "Utkast"
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Closed"
+msgstr "Lukket"
+
+#. module: analytic
+#: field:account.analytic.account,debit:0
+msgid "Debit"
+msgstr "Debet"
+
+#. module: analytic
+#: help:account.analytic.account,state:0
+msgid ""
+"* When an account is created its in 'Draft' state.                           "
+"       \n"
+"* If any associated partner is there, it can be in 'Open' state.             "
+"                     \n"
+"* If any pending balance is there it can be in 'Pending'.                    "
+"               \n"
+"* And finally when all the transactions are over, it can be in 'Close' "
+"state.                                   \n"
+"* The project can be in either if the states 'Template' and 'Running'.\n"
+" If it is template then we can make projects based on the template projects. "
+"If its in 'Running' state it is a normal project.                            "
+"     \n"
+" If it is to be reviewed then the state is 'Pending'.\n"
+" When the project is completed the state is set to 'Done'."
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,type:0
+msgid "Account Type"
+msgstr "Kontotype"
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Template"
+msgstr "Mal"
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Pending"
+msgstr ""
+
+#. module: analytic
+#: model:ir.model,name:analytic.model_account_analytic_line
+msgid "Analytic Line"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,description:0
+#: field:account.analytic.line,name:0
+msgid "Description"
+msgstr "Beskrivelse"
+
+#. module: analytic
+#: selection:account.analytic.account,type:0
+msgid "Normal"
+msgstr "Normal"
+
+#. module: analytic
+#: field:account.analytic.account,company_id:0
+#: field:account.analytic.line,company_id:0
+msgid "Company"
+msgstr "Firma"
+
+#. module: analytic
+#: field:account.analytic.account,quantity_max:0
+msgid "Maximum Quantity"
+msgstr "Maksimum antall"
+
+#. module: analytic
+#: field:account.analytic.line,user_id:0
+msgid "User"
+msgstr "Bruker"
+
+#. module: analytic
+#: field:account.analytic.account,parent_id:0
+msgid "Parent Analytic Account"
+msgstr "Overordnet analytisk konto"
+
+#. module: analytic
+#: field:account.analytic.line,date:0
+msgid "Date"
+msgstr "Dato"
+
+#. module: analytic
+#: field:account.analytic.account,currency_id:0
+msgid "Account currency"
+msgstr "Konto valuta"
+
+#. module: analytic
+#: field:account.analytic.account,quantity:0
+#: field:account.analytic.line,unit_amount:0
+msgid "Quantity"
+msgstr "Antall"
+
+#. module: analytic
+#: help:account.analytic.line,amount:0
+msgid ""
+"Calculated by multiplying the quantity and the price given in the Product's "
+"cost price. Always expressed in the company main currency."
+msgstr ""
+"Beregnet ved å multiplisere antall og pris gitt av produktets kostpris. "
+"Alltid uttrykt i firmaets hovedvaluta."
+
+#. module: analytic
+#: help:account.analytic.account,quantity_max:0
+msgid "Sets the higher limit of quantity of hours."
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,credit:0
+msgid "Credit"
+msgstr "Kredit"
+
+#. module: analytic
+#: field:account.analytic.line,amount:0
+msgid "Amount"
+msgstr "Beløp"
+
+#. module: analytic
+#: field:account.analytic.account,contact_id:0
+msgid "Contact"
+msgstr "Kontakt"
+
+#. module: analytic
+#: constraint:account.analytic.account:0
+msgid ""
+"Error! The currency has to be the same as the currency of the selected "
+"company"
+msgstr "Feil! Valutaen må være lik valuaten til det valgte firmaet"
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Cancelled"
+msgstr "Annulert"
+
+#. module: analytic
+#: field:account.analytic.account,balance:0
+msgid "Balance"
+msgstr "Saldo"
+
+#. module: analytic
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr ""
+
+#. module: analytic
+#: help:account.analytic.account,type:0
+msgid ""
+"If you select the View Type, it means you won't allow to create journal "
+"entries using that account."
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,date:0
+msgid "Date End"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,code:0
+msgid "Account Code"
+msgstr "Kontokode"
+
+#. module: analytic
+#: field:account.analytic.account,complete_name:0
+msgid "Full Account Name"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.line,account_id:0
+#: model:ir.model,name:analytic.model_account_analytic_account
+#: model:ir.module.module,shortdesc:analytic.module_meta_information
+msgid "Analytic Account"
+msgstr "Analytisk konto"
+
+#. module: analytic
+#: selection:account.analytic.account,type:0
+msgid "View"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,partner_id:0
+msgid "Partner"
+msgstr "Partner"
+
+#. module: analytic
+#: field:account.analytic.account,date_start:0
+msgid "Date Start"
+msgstr "Startdato"
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Open"
+msgstr "Åpen"
+
+#. module: analytic
+#: field:account.analytic.account,line_ids:0
+msgid "Analytic Entries"
+msgstr ""
diff --git a/addons/audittrail/i18n/nb.po b/addons/audittrail/i18n/nb.po
index 8e334b2b3a1..39b671395d8 100644
--- a/addons/audittrail/i18n/nb.po
+++ b/addons/audittrail/i18n/nb.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-04-01 08:17+0000\n"
+"PO-Revision-Date: 2011-04-07 06:59+0000\n"
 "Last-Translator: Rolv Råen (adEgo) <Unknown>\n"
 "Language-Team: Norwegian Bokmal <nb@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: 2011-04-02 06:46+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-04-08 06:12+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
 #. module: audittrail
 #: model:ir.module.module,shortdesc:audittrail.module_meta_information
@@ -373,7 +373,7 @@ msgstr "Gammel tekstverdi"
 #. module: audittrail
 #: view:audittrail.view.log:0
 msgid "Cancel"
-msgstr "Kanseller"
+msgstr "Avbryt"
 
 #. module: audittrail
 #: model:ir.model,name:audittrail.model_audittrail_view_log
diff --git a/addons/base_contact/i18n/nb.po b/addons/base_contact/i18n/nb.po
index ad2b8e438fc..16b14a74d7d 100644
--- a/addons/base_contact/i18n/nb.po
+++ b/addons/base_contact/i18n/nb.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-04-07 03:46+0000\n"
-"Last-Translator: Rolv Råen <Unknown>\n"
+"PO-Revision-Date: 2011-04-07 06:43+0000\n"
+"Last-Translator: Rolv Råen (adEgo) <Unknown>\n"
 "Language-Team: Norwegian Bokmal <nb@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: 2011-04-07 05:54+0000\n"
+"X-Launchpad-Export-Date: 2011-04-08 06:12+0000\n"
 "X-Generator: Launchpad (build 12735)\n"
 
 #. module: base_contact
@@ -105,7 +105,7 @@ msgstr ""
 #: view:res.partner.contact:0
 #: field:res.partner.job,name:0
 msgid "Partner"
-msgstr "Klient"
+msgstr "Partner"
 
 #. module: base_contact
 #: model:process.node,note:base_contact.process_node_function0
@@ -120,7 +120,7 @@ msgstr "Partnere"
 #. module: base_contact
 #: field:res.partner.job,state:0
 msgid "State"
-msgstr "Bekreft"
+msgstr "Status"
 
 #. module: base_contact
 #: help:res.partner.contact,active:0
diff --git a/addons/base_report_creator/i18n/nb.po b/addons/base_report_creator/i18n/nb.po
index 8871365e952..b55725a5fc6 100644
--- a/addons/base_report_creator/i18n/nb.po
+++ b/addons/base_report_creator/i18n/nb.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-07 05:54+0000\n"
+"X-Launchpad-Export-Date: 2011-04-08 06:12+0000\n"
 "X-Generator: Launchpad (build 12735)\n"
 
 #. module: base_report_creator
diff --git a/addons/crm_claim/i18n/gl.po b/addons/crm_claim/i18n/gl.po
new file mode 100644
index 00000000000..3b6282c829e
--- /dev/null
+++ b/addons/crm_claim/i18n/gl.po
@@ -0,0 +1,778 @@
+# Galician translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-04-07 08:42+0000\n"
+"Last-Translator: Santi (Pexego) <santiago@pexego.es>\n"
+"Language-Team: Galician <gl@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: 2011-04-08 06:12+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
+
+#. module: crm_claim
+#: field:crm.claim.report,nbr:0
+msgid "# of Cases"
+msgstr "Nº de casos"
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: view:crm.claim.report:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Responsibilities"
+msgstr "Responsabilidades"
+
+#. module: crm_claim
+#: field:crm.claim,date_action_next:0
+msgid "Next Action Date"
+msgstr "Fecha da próxima acción"
+
+#. module: crm_claim
+#: field:crm.claim.report,probability:0
+msgid "Probability"
+msgstr "Probabilidade"
+
+#. module: crm_claim
+#: selection:crm.claim.report,month:0
+msgid "March"
+msgstr "Marzo"
+
+#. module: crm_claim
+#: field:crm.claim.report,delay_close:0
+msgid "Delay to close"
+msgstr "Demora peche"
+
+#. module: crm_claim
+#: field:crm.claim,resolution:0
+msgid "Resolution"
+msgstr "Resolución"
+
+#. module: crm_claim
+#: field:crm.claim,company_id:0
+#: view:crm.claim.report:0
+#: field:crm.claim.report,company_id:0
+msgid "Company"
+msgstr "Compañía"
+
+#. module: crm_claim
+#: field:crm.claim,email_cc:0
+msgid "Watchers Emails"
+msgstr "Destinatarios de correos electrónicos (CC)"
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+msgid "#Claim"
+msgstr "Nº reclamación"
+
+#. module: crm_claim
+#: model:ir.actions.act_window,help:crm_claim.crm_claim_stage_act
+msgid ""
+"You can create claim stages to categorize the status of every claim entered "
+"in the system. The stages define all the steps required for the resolution "
+"of a claim."
+msgstr ""
+"Pode crear etapas para clasificar os estados de cada reclamación introducida "
+"no sistema. As etapas definen tódolos pasos necesarios para a resolución "
+"dunha reclamación."
+
+#. module: crm_claim
+#: selection:crm.claim,priority:0
+#: selection:crm.claim.report,priority:0
+msgid "Highest"
+msgstr "A máis alta"
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+#: field:crm.claim.report,day:0
+msgid "Day"
+msgstr "Día"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Add Internal Note"
+msgstr "Engadir nota interna"
+
+#. module: crm_claim
+#: help:crm.claim,section_id:0
+msgid ""
+"Sales team to which Case belongs to.Define Responsible user and Email "
+"account for mail gateway."
+msgstr ""
+"Equipo de vendas ó cal pertence o caso. Define o usuario responsable e a "
+"conta de email para a pasarela de correo."
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Claim Description"
+msgstr "Descrición da reclamación"
+
+#. module: crm_claim
+#: field:crm.claim,message_ids:0
+msgid "Messages"
+msgstr "Mensaxes"
+
+#. module: crm_claim
+#: model:crm.case.categ,name:crm_claim.categ_claim1
+msgid "Factual Claims"
+msgstr "Reclamacións obxectivas"
+
+#. module: crm_claim
+#: selection:crm.claim,state:0
+#: selection:crm.claim.report,state:0
+msgid "Cancelled"
+msgstr "Anulado"
+
+#. module: crm_claim
+#: model:crm.case.resource.type,name:crm_claim.type_claim2
+msgid "Preventive"
+msgstr "Preventivo"
+
+#. module: crm_claim
+#: model:crm.case.stage,name:crm_claim.stage_claim2
+msgid "Fixed"
+msgstr "Fixo"
+
+#. module: crm_claim
+#: field:crm.claim,partner_address_id:0
+msgid "Partner Contact"
+msgstr "Contacto"
+
+#. module: crm_claim
+#: field:crm.claim.report,date_closed:0
+msgid "Close Date"
+msgstr "Data de peche"
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+msgid "   Month   "
+msgstr "   Mes   "
+
+#. module: crm_claim
+#: field:crm.claim,ref:0
+msgid "Reference"
+msgstr "Referencia"
+
+#. module: crm_claim
+#: field:crm.claim,action_next:0
+msgid "Next Action"
+msgstr "Seguinte acción"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Reset to Draft"
+msgstr "Cambiar a modo Borrador"
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: field:crm.claim,date_deadline:0
+#: field:crm.claim.report,date_deadline:0
+msgid "Deadline"
+msgstr "Data límite"
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: field:crm.claim,partner_id:0
+#: view:crm.claim.report:0
+#: field:crm.claim.report,partner_id:0
+msgid "Partner"
+msgstr "Socio"
+
+#. module: crm_claim
+#: selection:crm.claim,type_action:0
+#: selection:crm.claim.report,type_action:0
+msgid "Preventive Action"
+msgstr "Acción preventiva"
+
+#. module: crm_claim
+#: field:crm.claim.report,section_id:0
+msgid "Section"
+msgstr "Sección"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Root Causes"
+msgstr "Causas principais"
+
+#. module: crm_claim
+#: field:crm.claim,user_fault:0
+msgid "Trouble Responsible"
+msgstr "Responsable do problema"
+
+#. module: crm_claim
+#: field:crm.claim,priority:0
+#: view:crm.claim.report:0
+#: field:crm.claim.report,priority:0
+msgid "Priority"
+msgstr "Prioridade"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Send New Email"
+msgstr "Enviar novo email"
+
+#. module: crm_claim
+#: field:crm.claim.report,delay_expected:0
+msgid "Overpassed Deadline"
+msgstr "Data límite excedida"
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: view:crm.claim.report:0
+msgid "Type"
+msgstr "Tipo"
+
+#. module: crm_claim
+#: field:crm.claim,email_from:0
+msgid "Email"
+msgstr "E-mail"
+
+#. module: crm_claim
+#: selection:crm.claim,priority:0
+#: selection:crm.claim.report,priority:0
+msgid "Lowest"
+msgstr "A máis baixa"
+
+#. module: crm_claim
+#: field:crm.claim,create_date:0
+msgid "Creation Date"
+msgstr "Data de creación"
+
+#. module: crm_claim
+#: field:crm.claim,name:0
+msgid "Claim Subject"
+msgstr "Obxecto da reclamación"
+
+#. module: crm_claim
+#: model:ir.actions.act_window,help:crm_claim.action_report_crm_claim
+msgid ""
+"Have a general overview of all claims processed in the system by sorting "
+"them with specific criteria."
+msgstr ""
+"Obteña unha visión global de tódalas reclamacións procesadas no sistema "
+"ordenándoas con criterios específicos."
+
+#. module: crm_claim
+#: selection:crm.claim.report,month:0
+msgid "July"
+msgstr "Xullo"
+
+#. module: crm_claim
+#: model:ir.actions.act_window,name:crm_claim.crm_claim_stage_act
+msgid "Claim Stages"
+msgstr "Etapas das reclamacións"
+
+#. module: crm_claim
+#: model:ir.ui.menu,name:crm_claim.menu_crm_case_claim-act
+msgid "Categories"
+msgstr "Categorías"
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: field:crm.claim,stage_id:0
+#: view:crm.claim.report:0
+#: field:crm.claim.report,stage_id:0
+msgid "Stage"
+msgstr "Fase"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "History Information"
+msgstr "Información histórica"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Dates"
+msgstr "Datas"
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+msgid "    Month-1    "
+msgstr "    Mes-1    "
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Contact"
+msgstr "Contacto"
+
+#. module: crm_claim
+#: model:ir.ui.menu,name:crm_claim.menu_crm_claim_stage_act
+msgid "Stages"
+msgstr "Etapas"
+
+#. module: crm_claim
+#: model:ir.ui.menu,name:crm_claim.menu_report_crm_claim_tree
+msgid "Claims Analysis"
+msgstr "Análise das reclamacións"
+
+#. module: crm_claim
+#: help:crm.claim.report,delay_close:0
+msgid "Number of Days to close the case"
+msgstr "Número de días para pechar o caso"
+
+#. module: crm_claim
+#: model:ir.model,name:crm_claim.model_crm_claim_report
+msgid "CRM Claim Report"
+msgstr "Informe das reclamacións CRM"
+
+#. module: crm_claim
+#: model:crm.case.stage,name:crm_claim.stage_claim1
+msgid "Accepted as Claim"
+msgstr "Aceptado como reclamación"
+
+#. module: crm_claim
+#: model:crm.case.resource.type,name:crm_claim.type_claim1
+msgid "Corrective"
+msgstr "Correctivo"
+
+#. module: crm_claim
+#: selection:crm.claim.report,month:0
+msgid "September"
+msgstr "Setembro"
+
+#. module: crm_claim
+#: selection:crm.claim.report,month:0
+msgid "December"
+msgstr "Decembro"
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+#: field:crm.claim.report,month:0
+msgid "Month"
+msgstr "Mes"
+
+#. module: crm_claim
+#: field:crm.claim,type_action:0
+#: field:crm.claim.report,type_action:0
+msgid "Action Type"
+msgstr "Tipo de acción"
+
+#. module: crm_claim
+#: field:crm.claim,write_date:0
+msgid "Update Date"
+msgstr "Data de actualización"
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+msgid "Salesman"
+msgstr "Vendedor"
+
+#. module: crm_claim
+#: field:crm.claim,categ_id:0
+#: view:crm.claim.report:0
+#: field:crm.claim.report,categ_id:0
+msgid "Category"
+msgstr "Categoría"
+
+#. module: crm_claim
+#: model:crm.case.categ,name:crm_claim.categ_claim2
+msgid "Value Claims"
+msgstr "Valor reclamacións"
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+msgid "  Year  "
+msgstr "  Ano  "
+
+#. module: crm_claim
+#: help:crm.claim,email_cc:0
+msgid ""
+"These email addresses will be added to the CC field of all inbound and "
+"outbound emails for this record before being sent. Separate multiple email "
+"addresses with a comma"
+msgstr ""
+"Estes enderezos de correo engadiranse ó campo CC para tódolos correos "
+"entrantes e saíntes deste rexistro antes de ser enviados. Separe os "
+"diferentes enderezos de correo cunha coma."
+
+#. module: crm_claim
+#: selection:crm.claim,state:0
+#: view:crm.claim.report:0
+#: selection:crm.claim.report,state:0
+msgid "Draft"
+msgstr "Borrador"
+
+#. module: crm_claim
+#: selection:crm.claim,priority:0
+#: selection:crm.claim.report,priority:0
+msgid "Low"
+msgstr "Baixo"
+
+#. module: crm_claim
+#: field:crm.claim,date_closed:0
+#: selection:crm.claim,state:0
+#: selection:crm.claim.report,state:0
+msgid "Closed"
+msgstr "Pechado"
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: selection:crm.claim,state:0
+#: view:crm.claim.report:0
+#: selection:crm.claim.report,state:0
+msgid "Pending"
+msgstr "Pendente"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Communication & History"
+msgstr "Comunicación e historial"
+
+#. module: crm_claim
+#: selection:crm.claim.report,month:0
+msgid "August"
+msgstr "Agosto"
+
+#. module: crm_claim
+#: selection:crm.claim,priority:0
+#: selection:crm.claim.report,priority:0
+msgid "Normal"
+msgstr "Normal"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Global CC"
+msgstr "CC global"
+
+#. module: crm_claim
+#: model:ir.module.module,shortdesc:crm_claim.module_meta_information
+msgid "Customer & Supplier Relationship Management"
+msgstr "Xestión de relacións con clientes e provedores"
+
+#. module: crm_claim
+#: selection:crm.claim.report,month:0
+msgid "June"
+msgstr "Xuño"
+
+#. module: crm_claim
+#: field:crm.claim,partner_phone:0
+msgid "Phone"
+msgstr "Teléfono"
+
+#. module: crm_claim
+#: field:crm.claim.report,user_id:0
+msgid "User"
+msgstr "Usuario"
+
+#. module: crm_claim
+#: model:crm.case.stage,name:crm_claim.stage_claim5
+msgid "Awaiting Response"
+msgstr "Esperando resposta"
+
+#. module: crm_claim
+#: model:ir.actions.act_window,name:crm_claim.crm_claim_categ_action
+msgid "Claim Categories"
+msgstr "Categorías das reclamacións"
+
+#. module: crm_claim
+#: selection:crm.claim.report,month:0
+msgid "November"
+msgstr "Novembro"
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+msgid "Extended Filters..."
+msgstr "Filtros extendidos..."
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Closure"
+msgstr "Peche"
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+msgid "Search"
+msgstr "Buscar"
+
+#. module: crm_claim
+#: selection:crm.claim.report,month:0
+msgid "October"
+msgstr "Outubro"
+
+#. module: crm_claim
+#: model:ir.module.module,description:crm_claim.module_meta_information
+msgid ""
+"\n"
+"This modules allows you to track your customers/suppliers claims and "
+"flames.\n"
+"It is fully integrated with the email gateway so that you can create\n"
+"automatically new claims based on incoming emails.\n"
+"    "
+msgstr ""
+"\n"
+"Este módulo permítelle realizar un seguimento das reclamacións e urxencias "
+"dos seus clientes/provedores. Está totalmente integrado na pasarela de "
+"correo electrónico para que poida crear automaticamente as novas "
+"reclamacións a partir dos correos electrónicos entrantes.\n"
+"    "
+
+#. module: crm_claim
+#: selection:crm.claim.report,month:0
+msgid "January"
+msgstr "Xaneiro"
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: field:crm.claim,date:0
+msgid "Claim Date"
+msgstr "Data da reclamación"
+
+#. module: crm_claim
+#: help:crm.claim,email_from:0
+msgid "These people will receive email."
+msgstr "Estas persoas recibirán un e-mail."
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: view:crm.claim.report:0
+#: model:ir.actions.act_window,name:crm_claim.action_report_crm_claim
+#: model:ir.actions.act_window,name:crm_claim.crm_case_categ_claim0
+#: model:ir.ui.menu,name:crm_claim.menu_crm_case_claims
+msgid "Claims"
+msgstr "Reclamacións"
+
+#. module: crm_claim
+#: selection:crm.claim,type_action:0
+#: selection:crm.claim.report,type_action:0
+msgid "Corrective Action"
+msgstr "Acción correctiva"
+
+#. module: crm_claim
+#: model:crm.case.categ,name:crm_claim.categ_claim3
+msgid "Policy Claims"
+msgstr "Política de reclamacións"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "History"
+msgstr "Historia"
+
+#. module: crm_claim
+#: model:ir.model,name:crm_claim.model_crm_claim
+#: model:ir.ui.menu,name:crm_claim.menu_config_claim
+msgid "Claim"
+msgstr "Reclamación"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Attachments"
+msgstr "Anexos"
+
+#. module: crm_claim
+#: model:ir.model,name:crm_claim.model_crm_case_stage
+msgid "Stage of case"
+msgstr "Fase do caso"
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: field:crm.claim,state:0
+#: view:crm.claim.report:0
+#: field:crm.claim.report,state:0
+msgid "State"
+msgstr "Estado"
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: view:crm.claim.report:0
+msgid "Done"
+msgstr "Feito"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Claim Reporter"
+msgstr "Persoa que reportou a reclamación"
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: view:crm.claim.report:0
+msgid "Cancel"
+msgstr "Anular"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Close"
+msgstr "Pechar"
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: selection:crm.claim,state:0
+#: view:crm.claim.report:0
+#: selection:crm.claim.report,state:0
+msgid "Open"
+msgstr "Abrir"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "In Progress"
+msgstr "En curso"
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: field:crm.claim,user_id:0
+msgid "Responsible"
+msgstr "Responsable"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Current"
+msgstr "Actual"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Details"
+msgstr "Detalles"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Reply"
+msgstr "Resposta"
+
+#. module: crm_claim
+#: field:crm.claim,cause:0
+msgid "Root Cause"
+msgstr "Causa principal"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Claim/Action Description"
+msgstr "Descrición da reclamación/acción"
+
+#. module: crm_claim
+#: field:crm.claim,description:0
+msgid "Description"
+msgstr "Descrición"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Search Claims"
+msgstr "Buscar reclamacións"
+
+#. module: crm_claim
+#: field:crm.claim,section_id:0
+#: view:crm.claim.report:0
+msgid "Sales Team"
+msgstr "Equipo de vendas"
+
+#. module: crm_claim
+#: selection:crm.claim.report,month:0
+msgid "May"
+msgstr "Maio"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Resolution Actions"
+msgstr "Accións para resolución"
+
+#. module: crm_claim
+#: model:ir.actions.act_window,name:crm_claim.act_claim_partner
+#: model:ir.actions.act_window,name:crm_claim.act_claim_partner_address
+msgid "Report a Claim"
+msgstr "Introducir reclamación"
+
+#. module: crm_claim
+#: model:ir.actions.act_window,help:crm_claim.crm_case_categ_claim0
+msgid ""
+"Record and track your customers' claims. Claims may be linked to a sales "
+"order or a lot. You can send emails with attachments and keep the full "
+"history for a claim (emails sent, intervention type and so on). Claims may "
+"automatically be linked to an email address using the mail gateway module."
+msgstr ""
+"Rexistre e faga o seguimento das reclamacións dos seus clientes. Pódense "
+"vincular as reclamacións a un pedido de venda ou a  un lote. Pode enviar "
+"correos electrónicos con arquivos adxuntos e manter o historial completo "
+"dunha reclamación (correos electrónicos enviados, tipo de intervención, "
+"etc.). Pódense vincular as reclamacións automaticamente a un enderezo de "
+"correo electrónico utilizando o módulo pasarela de correo."
+
+#. module: crm_claim
+#: field:crm.claim.report,email:0
+msgid "# Emails"
+msgstr "Nº de emails"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Follow Up"
+msgstr "Seguimento"
+
+#. module: crm_claim
+#: help:crm.claim,state:0
+msgid ""
+"The state is set to 'Draft', when a case is created.                         "
+"         \n"
+"If the case is in progress the state is set to 'Open'.                       "
+"           \n"
+"When the case is over, the state is set to 'Done'.                           "
+"       \n"
+"If the case needs to be reviewed then the state is set to 'Pending'."
+msgstr ""
+"O estado configúrase como \"Borrador\", cando se crea un caso. Se o caso "
+"está en curso, o estado configúrase como \"Aberto\". Cando se pecha o caso, "
+"o estado configúrase como \"Realizado\". Se cómpre revisar o caso, o estado "
+"configúrase como \"Pendente\"."
+
+#. module: crm_claim
+#: selection:crm.claim.report,month:0
+msgid "February"
+msgstr "Febreiro"
+
+#. module: crm_claim
+#: model:crm.case.stage,name:crm_claim.stage_claim3
+msgid "Won't fix"
+msgstr "No se corrixirá"
+
+#. module: crm_claim
+#: selection:crm.claim.report,month:0
+msgid "April"
+msgstr "Abril"
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+msgid "My Case(s)"
+msgstr "O(s) meu(s) caso(s)"
+
+#. module: crm_claim
+#: field:crm.claim,id:0
+msgid "ID"
+msgstr "ID"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Actions"
+msgstr "Accións"
+
+#. module: crm_claim
+#: selection:crm.claim,priority:0
+#: selection:crm.claim.report,priority:0
+msgid "High"
+msgstr "Alto"
+
+#. module: crm_claim
+#: model:ir.actions.act_window,help:crm_claim.crm_claim_categ_action
+msgid ""
+"Create claim categories to better manage and classify your claims. Some "
+"example of claims can be: preventive action, corrective action."
+msgstr ""
+"Cree categorías de reclamacións para xestionar e clasificar mellor as súas "
+"reclamacións. Algúns exemplos de reclamacións son: acción preventiva, acción "
+"correctiva."
+
+#. module: crm_claim
+#: field:crm.claim.report,create_date:0
+msgid "Create Date"
+msgstr "Crear data"
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+#: field:crm.claim.report,name:0
+msgid "Year"
+msgstr "Ano"
diff --git a/addons/document/i18n/gl.po b/addons/document/i18n/gl.po
index e3344e345bc..86a4e404b16 100644
--- a/addons/document/i18n/gl.po
+++ b/addons/document/i18n/gl.po
@@ -8,19 +8,19 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-04-05 11:43+0000\n"
-"Last-Translator: Santi (Pexego) <santiago@pexego.es>\n"
+"PO-Revision-Date: 2011-04-08 05:56+0000\n"
+"Last-Translator: Miguel Anxo Bouzada <mbouzada@gmail.com>\n"
 "Language-Team: Galician <gl@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: 2011-04-06 06:02+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-04-08 06:12+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
 msgid "Parent Directory"
-msgstr "Directorio Pai"
+msgstr "Cartafol superior"
 
 #. module: document
 #: model:ir.model,name:document.model_document_configuration
@@ -30,7 +30,7 @@ msgstr "Configuración automática de directorios"
 #. module: document
 #: field:document.directory,resource_field:0
 msgid "Name field"
-msgstr "Campo Nome"
+msgstr "Campo nome"
 
 #. module: document
 #: view:board.board:0
@@ -82,18 +82,18 @@ msgstr "Recursos"
 #: field:document.directory,file_ids:0
 #: view:report.document.user:0
 msgid "Files"
-msgstr "Arquivos"
+msgstr "Ficheiros"
 
 #. module: document
 #: view:report.files.partner:0
 msgid "Files per Month"
-msgstr "Arquivos por mes"
+msgstr "Ficheiros por mes"
 
 #. module: document
 #: selection:report.document.user,month:0
 #: selection:report.files.partner,month:0
 msgid "March"
-msgstr "Marzo"
+msgstr "marzo"
 
 #. module: document
 #: view:document.configuration:0
@@ -128,9 +128,9 @@ msgid ""
 "You can use 'dir_id' for current dir, 'res_id', 'res_model' as a reference "
 "to the current record, in dynamic folders"
 msgstr ""
-"Expresión Python utilizada para avaliar o campo. Pode utilizar 'dir_id' para "
-"o directorio actual, 'res_id', 'res_model' como referencia ó rexistro actual "
-"en directorios dinámicos."
+"Expresión Python utilizada para avaliar o campo. Pode utilizar «dir_id» para "
+"o directorio actual, «res_id», «res_model» como referencia ao rexistro "
+"actual en directorios dinámicos."
 
 #. module: document
 #: view:report.document.user:0
@@ -161,8 +161,8 @@ msgid ""
 "If true, all attachments that match this resource will  be located. If "
 "false, only ones that have this as parent."
 msgstr ""
-"Se está marcada, atoparanse tódolos arquivos adxuntos que coincidan con este "
-"recurso. Se está desmarcada, atoparanse só aqueles que teñan este pai."
+"Se está marcada, atoparanse todos os ficheiros adxuntos que coincidan con "
+"este recurso. Se está desmarcada, atoparanse só aqueles que teñan este pai."
 
 #. module: document
 #: view:document.directory:0
@@ -180,7 +180,7 @@ msgstr "Pedido de venda"
 #. module: document
 #: model:ir.model,name:document.model_report_document_user
 msgid "Files details by Users"
-msgstr "Arquivos detallados por usuarios"
+msgstr "Ficheiros detallados por usuarios"
 
 #. module: document
 #: field:document.configuration,project:0
@@ -202,7 +202,7 @@ msgstr "Configuración automática dos directorios para produtos."
 #. module: document
 #: field:document.directory,resource_find_all:0
 msgid "Find all resources"
-msgstr "Atopar tódolos recursos"
+msgstr "Atopar todos os recursos"
 
 #. module: document
 #: selection:document.directory,type:0
@@ -217,7 +217,7 @@ msgstr "Sufixo"
 #. module: document
 #: field:report.document.user,change_date:0
 msgid "Modified Date"
-msgstr "Data modificada"
+msgstr "Data de modificación"
 
 #. module: document
 #: view:document.configuration:0
@@ -234,7 +234,7 @@ msgstr "Socio"
 #. module: document
 #: view:board.board:0
 msgid "Files by Users"
-msgstr "Arquivos por usuarios"
+msgstr "Ficheiros por usuarios"
 
 #. module: document
 #: field:process.node,directory_id:0
@@ -249,7 +249,7 @@ msgstr "Directorio do documento"
 #: code:addons/document/document_directory.py:276
 #, python-format
 msgid "ValidateError"
-msgstr "Erro de validación"
+msgstr "Produciuse un erro de validación"
 
 #. module: document
 #: model:ir.model,name:document.model_ir_actions_report_xml
@@ -286,7 +286,7 @@ msgstr "Configurar directorio de recursos"
 #: field:report.document.user,file_size:0
 #: field:report.files.partner,file_size:0
 msgid "File Size"
-msgstr "Tamaño do arquivo"
+msgstr "Tamaño do ficheiro:"
 
 #. module: document
 #: field:document.directory.content.type,name:0
@@ -316,12 +316,12 @@ msgstr ""
 msgid ""
 "Use a domain if you want to apply an automatic filter on visible resources."
 msgstr ""
-"Use un dominio, se desexa aplicar un filtro automático nos recursos visibles."
+"Use un dominio, se desexa aplicar un filtro automático nos recursos visíbeis."
 
 #. module: document
 #: model:ir.actions.act_window,name:document.action_view_files_by_partner
 msgid "Files Per Partner"
-msgstr "Arquivos por empresa"
+msgstr "Ficheiros por empresa"
 
 #. module: document
 #: field:document.directory,dctx_ids:0
@@ -331,7 +331,7 @@ msgstr "Campos de contexto"
 #. module: document
 #: field:ir.attachment,store_fname:0
 msgid "Stored Filename"
-msgstr "Nome do arquivo gardado"
+msgstr "Nome do ficheiro gardado"
 
 #. module: document
 #: field:document.directory,ressource_type_id:0
@@ -353,7 +353,7 @@ msgstr "Informe"
 #: selection:report.document.user,month:0
 #: selection:report.files.partner,month:0
 msgid "July"
-msgstr "Xullo"
+msgstr "xullo"
 
 #. module: document
 #: model:ir.actions.act_window,name:document.open_board_document_manager
@@ -374,7 +374,7 @@ msgstr "Creado"
 #. module: document
 #: field:document.directory,content_ids:0
 msgid "Virtual Files"
-msgstr "Arquivos virtuais"
+msgstr "Ficheiros virtuais"
 
 #. module: document
 #: view:ir.attachment:0
@@ -390,7 +390,7 @@ msgstr "Erro de escritura no documento!"
 #. module: document
 #: view:document.directory:0
 msgid "Generated Files"
-msgstr "Arquivos xerados"
+msgstr "Ficheiros xerados"
 
 #. module: document
 #: field:document.directory.content,directory_id:0
@@ -406,7 +406,7 @@ msgstr "Directorio"
 #. module: document
 #: view:board.board:0
 msgid "Files by Partner"
-msgstr "Arquivos por empresa"
+msgstr "Ficheiros por empresa"
 
 #. module: document
 #: field:document.directory,write_uid:0
@@ -441,30 +441,30 @@ msgstr "Data de modificación"
 #. module: document
 #: model:ir.model,name:document.model_report_document_file
 msgid "Files details by Directory"
-msgstr "Arquivos detallados por directorio"
+msgstr "Ficheiros detallados por directorio"
 
 #. module: document
 #: view:report.document.user:0
 msgid "All users files"
-msgstr "Arquivos de tódolos usuarios"
+msgstr "Ficheiros de todos os usuarios"
 
 #. module: document
 #: view:board.board:0
 #: model:ir.actions.act_window,name:document.action_view_size_month
 #: view:report.document.file:0
 msgid "File Size by Month"
-msgstr "Tamaño de arquivo por mes"
+msgstr "Tamaño de ficheiro por mes"
 
 #. module: document
 #: selection:report.document.user,month:0
 #: selection:report.files.partner,month:0
 msgid "December"
-msgstr "Decembro"
+msgstr "decembro"
 
 #. module: document
 #: field:document.configuration,config_logo:0
 msgid "Image"
-msgstr "Imaxe"
+msgstr "imaxe"
 
 #. module: document
 #: selection:document.directory,type:0
@@ -480,7 +480,7 @@ msgstr "Fillos"
 #: view:document.directory:0
 msgid "Define words in the context, for all child directories and files"
 msgstr ""
-"Define palabras no contexto para tódolos directorios e arquivos fillos"
+"Define palabras no contexto para todos os directorios e ficheiros fillo"
 
 #. module: document
 #: model:ir.module.module,description:document.module_meta_information
@@ -502,15 +502,22 @@ msgid ""
 "database,\n"
 "      but in the servers rootpad like /server/bin/filestore.\n"
 msgstr ""
-"Este é un completo xestor de documentos:* Autenticación de usuario* "
-"Indexación de documentos. Os documentos .pptx e .docx non están soportados "
-"baixo windows.* Taboleiro de documentos que abrangue:* Novos arquivos "
-"(lista)* Arquivos por tipo de recurso (gráfico)* Arquivos por empresa "
-"(gráfico)* Arquivos por mes (gráfico) ATENCIÓN:- Cando instale este módulo "
-"nunha compañía en produción que xa teña arquivos PDF gardados na base de "
-"datos, perderaos todos.- Despois de instalar este módulo, os arquivos PDF xa "
-"non se gardarán na base de datos, senón no directorio raíz do servidor como "
-"/server/bin/filestore.\n"
+"Este é un completo xestor de documentos:\n"
+"    * Autenticación de usuario\n"
+"    * Indexación de documentos. Os documentos .pptx e .docx non están "
+"admitidos na plataforma windows.\n"
+"    * Taboleiro de documentos que abrangue:\n"
+"        * Novos arquivos (lista)\n"
+"        * Arquivos por tipo de recurso (gráfico\n"
+"        * Ficheiros por empresa (gráfico)\n"
+"       * Ficheiros por mes (gráfico)\n"
+"    ATENCIÓN:\n"
+"    - Cando instale este módulo nunha compañía en produción que xa teña "
+"ficheiros PDF gardados na base de\n"
+"      datos, perderaos todos.\n"
+"    - Despois de instalar este módulo, os ficheiros PDF xa non se gardarán "
+"na base de datos,\n"
+"      senón no directorio raíz do servidor como /server/bin/filestore.\n"
 
 #. module: document
 #: help:document.storage,online:0
@@ -518,7 +525,7 @@ msgid ""
 "If not checked, media is currently offline and its contents not available"
 msgstr ""
 "Se non se marca, o medio de almacenamento está actualmente fóra de liña e o "
-"seu contido non está dispoñible."
+"seu contido non está dispoñíbel."
 
 #. module: document
 #: view:document.directory:0
@@ -529,7 +536,7 @@ msgstr ""
 #: field:report.document.user,user_id:0
 #: field:report.document.wall,user_id:0
 msgid "Owner"
-msgstr "Proprietario"
+msgstr "Propietario"
 
 #. module: document
 #: view:document.directory:0
@@ -555,8 +562,8 @@ msgid ""
 "name.\n"
 "If set, the directory will have to be a resource one."
 msgstr ""
-"Marque este campo se desexa que o nome do arquivo conteña o nome do "
-"rexistro. Se está marcado, o directorio tén que ser un recurso."
+"Marque este campo se desexa que o nome do ficheiro conteña o nome do "
+"rexistro. Se está marcado, o directorio ten que ser un recurso."
 
 #. module: document
 #: model:ir.actions.act_window,name:document.action_config_auto_directory
@@ -589,13 +596,13 @@ msgid ""
 "Check this if you want to use the same tree structure as the object selected "
 "in the system."
 msgstr ""
-"Marque esta opción se desexa utilizar a mesma estrutura de árbore coma "
+"Marque esta opción se desexa utilizar a mesma estrutura de árbore como "
 "obxecto seleccionado no sistema."
 
 #. module: document
 #: view:document.directory:0
 msgid "Security"
-msgstr "Seguridade"
+msgstr "Seguranza"
 
 #. module: document
 #: help:document.directory,ressource_id:0
@@ -603,7 +610,7 @@ msgid ""
 "Along with Parent Model, this ID attaches this folder to a specific record "
 "of Parent Model."
 msgstr ""
-"Xunto ó modelo pai, este ID anexa este directorio a un rexistro específico "
+"Xunto ao modelo pai, este ID anexa este directorio a un rexistro específico "
 "do modelo pai."
 
 #. module: document
@@ -621,7 +628,7 @@ msgstr "O directorio non pode ser o seu propio pai!"
 #: selection:report.document.user,month:0
 #: selection:report.files.partner,month:0
 msgid "June"
-msgstr "Xuño"
+msgstr "xuño"
 
 #. module: document
 #: field:report.document.user,user:0
@@ -644,7 +651,7 @@ msgstr "Activo"
 #: selection:report.document.user,month:0
 #: selection:report.files.partner,month:0
 msgid "November"
-msgstr "Novembro"
+msgstr "novembro"
 
 #. module: document
 #: view:ir.attachment:0
@@ -661,7 +668,7 @@ msgid ""
 "parent model."
 msgstr ""
 "Se introduce aquí un obxecto, este modelo de directorio aparecerá baixo "
-"todos estes obxectos. Estes directorios \"anéxanse\" ó modelo ou rexistro "
+"todos estes obxectos. Estes directorios «anéxanse» ao modelo ou rexistro "
 "específico, como anexos. Se selecciona un modelo pai, non poña un directorio "
 "pai."
 
@@ -674,7 +681,7 @@ msgstr "Definición"
 #: selection:report.document.user,month:0
 #: selection:report.files.partner,month:0
 msgid "October"
-msgstr "Outubro"
+msgstr "outubro"
 
 #. module: document
 #: view:document.directory:0
@@ -720,7 +727,7 @@ msgstr "Panel de control"
 #. module: document
 #: model:ir.actions.act_window,name:document.action_view_user_graph
 msgid "Files By Users"
-msgstr "Arquivos por usuarios"
+msgstr "Ficheiros por usuarios"
 
 #. module: document
 #: field:document.storage,readonly:0
@@ -748,13 +755,13 @@ msgstr "Autor"
 #: model:ir.actions.act_window,name:document.action_view_files_by_month_graph
 #: view:report.document.user:0
 msgid "Files by Month"
-msgstr "Arquivos por mes"
+msgstr "Ficheiros por mes"
 
 #. module: document
 #: selection:report.document.user,month:0
 #: selection:report.files.partner,month:0
 msgid "September"
-msgstr "Setembro"
+msgstr "setembro"
 
 #. module: document
 #: field:document.directory.content,prefix:0
@@ -764,12 +771,12 @@ msgstr "Prefixo"
 #. module: document
 #: field:report.document.wall,last:0
 msgid "Last Posted Time"
-msgstr "Hora do último arquivo engadido"
+msgstr "Hora do último ficheiro engadido"
 
 #. module: document
 #: field:report.document.user,datas_fname:0
 msgid "File Name"
-msgstr "Nome do arquivo"
+msgstr "Nome do ficheiro"
 
 #. module: document
 #: view:document.configuration:0
@@ -796,12 +803,12 @@ msgstr "Muro da vergoña"
 #. module: document
 #: help:document.storage,path:0
 msgid "For file storage, the root path of the storage"
-msgstr "Para o almacenamento de arquivos, a ruta raíz onde se almacenan."
+msgstr "Para o almacenamento de ficheiros, a ruta raíz onde se almacenan."
 
 #. module: document
 #: model:ir.model,name:document.model_report_files_partner
 msgid "Files details by Partners"
-msgstr "Arquivos detallados por empresas"
+msgstr "Ficheiros detallados por empresas"
 
 #. module: document
 #: field:document.directory.dctx,field:0
@@ -821,7 +828,7 @@ msgstr "Modelo pai"
 #. module: document
 #: view:report.document.user:0
 msgid "Files by users"
-msgstr "Arquivos por usuarios"
+msgstr "Ficheiros por usuarios"
 
 #. module: document
 #: field:report.document.file,month:0
@@ -851,17 +858,17 @@ msgstr "Estrutura árbore"
 #: selection:report.document.user,month:0
 #: selection:report.files.partner,month:0
 msgid "May"
-msgstr "Maio"
+msgstr "maio"
 
 #. module: document
 #: model:ir.actions.act_window,name:document.action_view_all_document_tree1
 msgid "All Users files"
-msgstr "Arquivos de tódolos usuarios"
+msgstr "Ficheiros de todos os usuarios"
 
 #. module: document
 #: model:ir.model,name:document.model_report_document_wall
 msgid "Users that did not inserted documents since one month"
-msgstr "Usuarios que non insertaron documentos desde hai un mes"
+msgstr "Usuarios que non inseriron documentos desde hai un mes"
 
 #. module: document
 #: model:ir.actions.act_window,help:document.action_document_file_form
@@ -869,13 +876,14 @@ msgid ""
 "The Documents repository gives you access to all attachments, such as mails, "
 "project documents, invoices etc."
 msgstr ""
-"O repositorio de documentación proporciónalle o acceso a tódolos anexos "
-"tales coma os correos, os proxectos, as facturas, etc."
+"O repositorio de documentación proporciónalle o acceso a todos os anexos "
+"tales como os correos, os proxectos, as facturas, etc."
 
 #. module: document
 #: view:document.directory:0
 msgid "For each entry here, virtual files will appear in this folder."
-msgstr "Para cada entrada, os arquivos virtuais aparecerán neste directorio."
+msgstr ""
+"Para cada entrada, os ficheiros virtuais aparecerán neste directorio."
 
 #. module: document
 #: model:ir.model,name:document.model_ir_attachment
@@ -885,13 +893,13 @@ msgstr "ir.adxunto"
 #. module: document
 #: view:board.board:0
 msgid "New Files"
-msgstr "Novos arquivos"
+msgstr "Novos ficheiros"
 
 #. module: document
 #: selection:report.document.user,month:0
 #: selection:report.files.partner,month:0
 msgid "January"
-msgstr "Xaneiro"
+msgstr "xaneiro"
 
 #. module: document
 #: view:document.directory:0
@@ -901,7 +909,7 @@ msgstr "Estático"
 #. module: document
 #: view:report.files.partner:0
 msgid "Files By Partner"
-msgstr "Arquivos por empresa"
+msgstr "Ficheiros por empresa"
 
 #. module: document
 #: help:document.directory.dctx,field:0
@@ -909,7 +917,7 @@ msgid ""
 "The name of the field. Note that the prefix \"dctx_\" will be prepended to "
 "what is typed here."
 msgstr ""
-"O nome do arquivo. Teña en conta que o prefixo \"dctx_\" anteporase ó que "
+"O nome do ficheiro. Teña en conta que o prefixo «dctx_» anteporase ao que "
 "escriba aquí."
 
 #. module: document
@@ -940,16 +948,16 @@ msgid ""
 "defined in the parent directory."
 msgstr ""
 "Cada directorio pode ser de tipo estático ou pódese asociar a outro recurso. "
-"Un directorio estático, coma nos sistemas operativos, é o clásico directorio "
-"que pode conter un conxunto de arquivos. Os directorios asociados a recursos "
-"do sistema automaticamente posúen subdirectorios para cada recurso definido "
-"no directorio pai."
+"Un directorio estático, como nos sistemas operativos, é o clásico directorio "
+"que pode conter un conxunto de ficheiros. Os directorios asociados a "
+"recursos do sistema automaticamente posúen subdirectorios para cada recurso "
+"definido no directorio pai."
 
 #. module: document
 #: selection:report.document.user,month:0
 #: selection:report.files.partner,month:0
 msgid "February"
-msgstr "Febreiro"
+msgstr "febreiro"
 
 #. module: document
 #: model:ir.actions.act_window,name:document.open_board_document_manager1
@@ -982,14 +990,14 @@ msgstr "Se está marcado, o medio de almacenamento é só de lectura."
 #: selection:report.document.user,month:0
 #: selection:report.files.partner,month:0
 msgid "April"
-msgstr "Abril"
+msgstr "abril"
 
 #. module: document
 #: field:report.document.file,nbr:0
 #: field:report.document.user,nbr:0
 #: field:report.files.partner,nbr:0
 msgid "# of Files"
-msgstr "Núm. de arquivos"
+msgstr "Núm. de ficheiros"
 
 #. module: document
 #: view:document.directory:0
@@ -997,8 +1005,8 @@ msgid ""
 "Only members of these groups will have access to this directory and its "
 "files."
 msgstr ""
-"Só os membros destes grupos terán acceso a este directorio e ós seus "
-"arquivos."
+"Só os membros destes grupos terán acceso a este directorio e aos seus "
+"ficheiros."
 
 #. module: document
 #: view:document.directory:0
@@ -1006,13 +1014,13 @@ msgid ""
 "These groups, however, do NOT apply to children directories, which must "
 "define their own groups."
 msgstr ""
-"Porén, estes grupos non se aplican ós directorios fillos, que deben definir "
+"Porén, estes grupos non se aplican aos directorios fillos, que deben definir "
 "os seus propios grupos."
 
 #. module: document
 #: field:document.directory.content.type,mimetype:0
 msgid "Mime Type"
-msgstr "Tipo Mime"
+msgstr "Tipo MIME"
 
 #. module: document
 #: field:document.directory.content,sequence:0
@@ -1029,7 +1037,7 @@ msgstr "Nome do Contido"
 #: code:addons/document/document.py:222
 #, python-format
 msgid "File name must be unique!"
-msgstr "O nome de arquivo debe ser único!"
+msgstr "O nome do ficheiro debe ser único!"
 
 #. module: document
 #: selection:document.storage,type:0
@@ -1052,7 +1060,7 @@ msgstr "Estrutura de directorios"
 #: model:ir.actions.act_window,name:document.action_view_document_by_resourcetype_graph
 #: view:report.document.user:0
 msgid "Files by Resource Type"
-msgstr "Arquivos por tipo de rexistro"
+msgstr "Ficheiros por tipo de rexistro"
 
 #. module: document
 #: field:report.document.user,name:0
diff --git a/addons/email_template/i18n/nb.po b/addons/email_template/i18n/nb.po
index 1ae166893ec..7677c676896 100644
--- a/addons/email_template/i18n/nb.po
+++ b/addons/email_template/i18n/nb.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-07 05:54+0000\n"
+"X-Launchpad-Export-Date: 2011-04-08 06:12+0000\n"
 "X-Generator: Launchpad (build 12735)\n"
 
 #. module: email_template
diff --git a/addons/hr_payroll/i18n/vi.po b/addons/hr_payroll/i18n/vi.po
new file mode 100644
index 00000000000..46491f07a5a
--- /dev/null
+++ b/addons/hr_payroll/i18n/vi.po
@@ -0,0 +1,1538 @@
+# Vietnamese translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-04-07 16:15+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Vietnamese <vi@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: 2011-04-08 06:12+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
+
+#. module: hr_payroll
+#: rml:employees.salary:0
+msgid "E-mail Address"
+msgstr "E-mail Address"
+
+#. module: hr_payroll
+#: view:hr.allounce.deduction.categoty:0
+msgid "Based"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payroll.register,net:0
+#: field:hr.payslip,net:0
+msgid "Net Salary"
+msgstr "Net Salary"
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Recompute Sheet"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:employees.salary:0
+msgid "Employees Salary Details"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:employees.salary:0
+msgid "Allowances with Basic:"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:employees.salary:0
+#: rml:salary.structure:0
+msgid "Department"
+msgstr "Phòng/Ban"
+
+#. module: hr_payroll
+#: rml:employees.salary:0
+msgid "Deductions:"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.allounce.deduction.categoty,gratuity:0
+msgid "Use for Gratuity ?"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip,working_days:0
+msgid "Working Days"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.payslip.line,type:0
+msgid "Loan"
+msgstr "Khoản vay"
+
+#. module: hr_payroll
+#: rml:hr.payroll.register.sheet:0
+msgid "Salary Payment Register"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.employee,slip_ids:0
+#: view:hr.payroll.register:0
+#: field:hr.payroll.register,line_ids:0
+msgid "Payslips"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.actions.report.xml,name:hr_payroll.year_salary_report
+msgid "Year Salary Report"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.payroll.register,state:0
+#: selection:hr.payslip,state:0
+msgid "Paid Salary"
+msgstr ""
+
+#. module: hr_payroll
+#: report:payslip.pdf:0
+msgid "("
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payroll.register,company_id:0
+#: field:hr.payslip,company_id:0
+#: wizard_field:payroll.analysis,init,company_id:0
+msgid "Company"
+msgstr "Công ty"
+
+#. module: hr_payroll
+#: rml:payroll.advice:0
+msgid "The Manager"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Letter Details"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:hr.payroll.register.sheet:0
+msgid ","
+msgstr ","
+
+#. module: hr_payroll
+#: view:hr.payroll.advice:0
+#: view:hr.payroll.register:0
+#: view:hr.payslip:0
+msgid "Set to Draft"
+msgstr ""
+
+#. module: hr_payroll
+#: code:addons/hr_payroll/hr_payroll.py:180
+#: code:addons/hr_payroll/hr_payroll.py:195
+#: code:addons/hr_payroll/hr_payroll.py:285
+#: code:addons/hr_payroll/hr_payroll.py:835
+#: code:addons/hr_payroll/hr_payroll.py:1111
+#: code:addons/hr_payroll/hr_payroll.py:1126
+#: code:addons/hr_payroll/hr_payroll.py:1410
+#, python-format
+msgid "Variable Error: %s "
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.passport:0
+msgid "Expire"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.holidays.status,type:0
+msgid "Half-Pay Holiday"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.allounce.deduction.categoty,type:0
+#: rml:hr.payroll.register.sheet:0
+#: field:hr.payslip,other_pay:0
+msgid "Others"
+msgstr "Khác"
+
+#. module: hr_payroll
+#: field:hr.payslip.line,slip_id:0
+#: model:ir.model,name:hr_payroll.model_hr_payslip
+#: rml:payslip.pdf:0
+msgid "Pay Slip"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:salary.structure:0
+msgid "Contract Detail:"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip,igross:0
+#: field:hr.payslip,inet:0
+msgid "Calculaton Field"
+msgstr ""
+
+#. module: hr_payroll
+#: help:hr.payroll.advice,bank_id:0
+#: help:hr.payroll.register,bank_id:0
+msgid "Select the Bank Address from whcih the salary is going to be paid"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.advice:0
+#: field:hr.payroll.advice.line,advice_id:0
+msgid "Bank Advice"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.payroll.advice,state:0
+#: selection:hr.payroll.register,state:0
+#: selection:hr.payslip,state:0
+msgid "Reject"
+msgstr "Từ chối"
+
+#. module: hr_payroll
+#: selection:hr.payslip.line,type:0
+msgid "Leaves"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip,register_id:0
+msgid "Register"
+msgstr "Đăng ký"
+
+#. module: hr_payroll
+#: constraint:hr.employee:0
+msgid ""
+"Error ! You cannot select a department for which the employee is the manager."
+msgstr ""
+
+#. module: hr_payroll
+#: rml:payslip.pdf:0
+msgid "Total Deductions"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.allounce.deduction.categoty.line,value:0
+msgid "Value"
+msgstr "Giá trị"
+
+#. module: hr_payroll
+#: rml:payroll.advice:0
+msgid "Name of the Employee"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.contibution.register:0
+msgid "Register Lines"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Salary Computation"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payroll.advice.line,amount:0
+#: rml:payroll.advice:0
+msgid "Amount"
+msgstr "Số tiền"
+
+#. module: hr_payroll
+#: code:addons/hr_payroll/hr_payroll.py:1225
+#, python-format
+msgid "Please check configuration of %s, payroll head is missing"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:company.contribution,amount_type:0
+msgid "Percentage"
+msgstr ""
+
+#. module: hr_payroll
+#: view:company.contribution:0
+#: view:hr.allounce.deduction.categoty:0
+msgid "Other Information"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.passport,country_id:0
+msgid "Country of Issue"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.contibution.register.line,emp_deduction:0
+msgid "Employee Deduction"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.payslip.line,type:0
+msgid "Other Deduction"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.holidays.status,type:0
+msgid "Paid Holiday"
+msgstr ""
+
+#. module: hr_payroll
+#: view:company.contribution:0
+#: view:hr.allounce.deduction.categoty:0
+#: view:hr.passport:0
+#: view:hr.payslip:0
+msgid "Group By..."
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.passport,date_expire:0
+msgid "Passport Expire Date"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.holidays.status,type:0
+msgid "Un-Paid Holiday"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.passport:0
+msgid "Valid From"
+msgstr ""
+
+#. module: hr_payroll
+#: help:hr.payslip,igross:0
+#: help:hr.payslip,inet:0
+msgid ""
+"Calculation field used for internal calculation, do not place this on form"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:payslip.pdf:0
+msgid "Amount (in words) :"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.holidays.status,type:0
+msgid "Payment"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip,line_ids:0
+#: view:hr.payslip.line:0
+#: model:ir.model,name:hr_payroll.model_hr_payslip_line
+msgid "Payslip Line"
+msgstr ""
+
+#. module: hr_payroll
+#: report:payslip.pdf:0
+msgid "Identification No"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.allounce.deduction.categoty,base:0
+msgid "Based on"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.payroll.register,state:0
+#: selection:hr.payslip,state:0
+msgid "Wating for Verification"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.module.module,shortdesc:hr_payroll.module_meta_information
+msgid "Human Resource Payroll"
+msgstr ""
+
+#. module: hr_payroll
+#: report:payroll.advice:0
+msgid "Total:"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Posted"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.module.module,description:hr_payroll.module_meta_information
+msgid ""
+"Generic Payroll system\n"
+"    * Employee Details\n"
+"    * Employee Contracts\n"
+"    * Passport based Contract\n"
+"    * Allowances / Deductions\n"
+"    * Allow to configure Basic / Grows / Net Salary\n"
+"    * Employee Payslip\n"
+"    * Monthly Payroll Register\n"
+"    * Integrated with Holiday Management\n"
+"    "
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.model,name:hr_payroll.model_hr_holidays_status
+msgid "Leave Type"
+msgstr ""
+
+#. module: hr_payroll
+#: report:hr.payroll.register.sheet:0
+msgid "Date :"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.line,total:0
+msgid "Sub Total"
+msgstr ""
+
+#. module: hr_payroll
+#: report:payslip.pdf:0
+msgid "Payments -"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.contract,visa_no:0
+msgid "Visa No"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.allounce.deduction.categoty.line,from:0
+msgid "From"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payroll.advice.line,bysal:0
+msgid "By Salary"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:salary.structure:0
+msgid "End Date"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.actions.report.xml,name:hr_payroll.salary_payslip
+msgid "Employee PaySlip"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip,leaves:0
+msgid "Leave Deductions"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:hr.payroll.register.sheet:0
+#: rml:payroll.advice:0
+msgid "Authorised Signature"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.payslip.line,amount_type:0
+msgid "Function Value"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.model,name:hr_payroll.model_hr_contibution_register_line
+msgid "Contribution Register Line"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:salary.structure:0
+msgid "Notes:"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.allounce.deduction.categoty,based_on:0
+#: field:hr.payroll.advice,state:0
+#: field:hr.payroll.register,state:0
+#: field:hr.payslip,state:0
+msgid "State"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Paymeny Lines"
+msgstr ""
+
+#. module: hr_payroll
+#: report:payslip.pdf:0
+msgid "Other Lines"
+msgstr ""
+
+#. module: hr_payroll
+#: view:company.contribution:0
+#: view:hr.allounce.deduction.categoty:0
+#: view:hr.payroll.structure:0
+#: view:hr.payslip:0
+#: view:hr.payslip.line:0
+msgid "Function Arguments"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_company_contribution_tree
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_company_contribution_tree
+msgid "Company Contributions"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.passport,employee_id:0
+#: field:hr.payroll.advice.line,employee_id:0
+#: field:hr.payslip,employee_id:0
+#: field:hr.payslip.line,employee_id:0
+msgid "Employee"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.line,base:0
+msgid "Formula"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.model,name:hr_payroll.model_hr_payroll_advice_line
+msgid "Bank Advice Lines"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.allounce.deduction.categoty,type:0
+#: field:hr.payslip.line,type:0
+#: wizard_field:payroll.analysis,init,type:0
+#: rml:salary.structure:0
+msgid "Type"
+msgstr ""
+
+#. module: hr_payroll
+#: report:payslip.pdf:0
+msgid "Email"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:hr.payroll.register.sheet:0
+msgid "#"
+msgstr ""
+
+#. module: hr_payroll
+#: code:addons/hr_payroll/hr_payroll.py:469
+#: code:addons/hr_payroll/hr_payroll.py:1225
+#, python-format
+msgid "Error !"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.register:0
+#: view:hr.payslip:0
+msgid "Verify Sheet"
+msgstr ""
+
+#. module: hr_payroll
+#: help:hr.contract,working_days_per_week:0
+msgid "No of Working days / week for an employee"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.payroll.register,state:0
+#: selection:hr.payslip,state:0
+msgid "New Slip"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip,basic:0
+msgid "Net Basic"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payroll.register,grows:0
+#: field:hr.payslip,grows:0
+msgid "Gross Salary"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:payslip.pdf:0
+msgid "Total Earnings"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_payroll_employees_detail
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_payroll_employees_detail
+msgid "Employee Salary Statement"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.payslip.line,type:0
+msgid "Other Payment"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:payslip.pdf:0
+msgid "Deductions"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:payroll.advice:0
+msgid "C/D"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.contract,permit_no:0
+msgid "Work Permit No"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payroll.advice,line_ids:0
+msgid "Employee Salary"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payroll.advice,chaque_nos:0
+msgid "Chaque Nos"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.contibution.register,monthly_total_by_emp:0
+msgid "Total By Employee"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.allounce.deduction.categoty.line,amount_type:0
+#: selection:hr.payslip.line,amount_type:0
+msgid "Fixed Amount"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.allounce.deduction.categoty.line,to:0
+msgid "To"
+msgstr ""
+
+#. module: hr_payroll
+#: code:addons/hr_payroll/hr_payroll.py:180
+#: code:addons/hr_payroll/hr_payroll.py:195
+#: code:addons/hr_payroll/hr_payroll.py:285
+#: code:addons/hr_payroll/hr_payroll.py:835
+#: code:addons/hr_payroll/hr_payroll.py:1111
+#: code:addons/hr_payroll/hr_payroll.py:1126
+#: code:addons/hr_payroll/hr_payroll.py:1410
+#, python-format
+msgid "Variable Error !"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.model,name:hr_payroll.model_hr_payroll_employees_detail
+msgid "hr.payroll.employees.detail"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.register:0
+#: view:hr.payslip:0
+msgid "Pay Salary"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payroll.advice.line,name:0
+msgid "Bank Account A/C"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.contibution.register:0
+msgid "Contribution Lines"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:hr.payroll.register.sheet:0
+#: rml:payslip.pdf:0
+msgid "For the month of"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.allounce.deduction.categoty,type:0
+#: field:hr.payroll.register,deduction:0
+#: rml:hr.payroll.register.sheet:0
+#: field:hr.payslip,deduction:0
+#: selection:hr.payslip.line,type:0
+msgid "Deduction"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.model,name:hr_payroll.model_hr_payroll_advice
+msgid "Bank Advice Note"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.register:0
+#: view:hr.payslip:0
+msgid "Payslip"
+msgstr ""
+
+#. module: hr_payroll
+#: constraint:hr.contract:0
+msgid "Error! contract start-date must be lower then contract end-date."
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.payslip.line,type:0
+msgid "Loan Installment"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.register:0
+#: view:hr.payslip:0
+msgid "Complete HR Checking"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:payroll.advice:0
+msgid "Yours Sincerely"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:payroll.advice:0
+msgid "SI. No."
+msgstr ""
+
+#. module: hr_payroll
+#: rml:payslip.pdf:0
+msgid "Net Amount"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:salary.structure:0
+msgid "Salary Structure:"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.actions.report.xml,name:hr_payroll.year_employees_detail
+#: model:ir.actions.wizard,name:hr_payroll.wizard_print_employees_detail
+#: model:ir.ui.menu,name:hr_payroll.menu_wizard_print_employees_detail
+msgid "Employees Salary Detail"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.model,name:hr_payroll.model_hr_payslip_line_line
+msgid "Function Line"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.advice:0
+#: selection:hr.payroll.advice,state:0
+#: selection:hr.payroll.register,state:0
+#: selection:hr.payslip,state:0
+msgid "Confirm Sheet"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:employees.salary:0
+msgid "Others:"
+msgstr ""
+
+#. module: hr_payroll
+#: view:company.contribution:0
+#: selection:company.contribution,amount_type:0
+msgid "Function Calculation"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip,worked_days:0
+msgid "Worked Day"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.contibution.register,monthly_total_by_comp:0
+msgid "Total By Company"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payroll.advice.line,flag:0
+msgid "D/C"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.passport:0
+msgid "Country & Address"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:employees.salary:0
+msgid "Employee Code"
+msgstr ""
+
+#. module: hr_payroll
+#: report:payslip.pdf:0
+msgid "Basic Salary – Leaves"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.allounce.deduction.categoty.line,amount_type:0
+#: field:hr.payslip.line,amount_type:0
+#: rml:salary.structure:0
+msgid "Amount Type"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.allounce.deduction.categoty.line,category_id:0
+#: field:hr.payslip.line,category_id:0
+#: rml:salary.structure:0
+msgid "Category"
+msgstr ""
+
+#. module: hr_payroll
+#: view:company.contribution:0
+#: view:hr.allounce.deduction.categoty:0
+#: field:hr.payslip.line,company_contrib:0
+#: model:ir.model,name:hr_payroll.model_company_contribution
+msgid "Company Contribution"
+msgstr ""
+
+#. module: hr_payroll
+#: field:company.contribution,category_id:0
+msgid "Heads"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.actions.report.xml,name:hr_payroll.year_payroll_register
+msgid "Print Statement"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Draft"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:payslip.pdf:0
+msgid "Earnings"
+msgstr ""
+
+#. module: hr_payroll
+#: report:hr.payroll.register.sheet:0
+#: report:salary.structure:0
+msgid "Basic"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_passport_tree
+#: model:ir.ui.menu,name:hr_payroll.menu_action_hr_passport_tree
+msgid "All Passports"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_payroll_year_salary
+#: model:ir.ui.menu,name:hr_payroll.menu_wizard_print_year_salary
+msgid "Salary Register"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:employees.salary:0
+#: rml:hr.payroll.register.sheet:0
+#: rml:payslip.pdf:0
+msgid "Employee Name"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.model,name:hr_payroll.model_hr_passport
+msgid "Passport Detail"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.allounce.deduction.categoty.line,amount_type:0
+#: selection:hr.payslip.line,amount_type:0
+msgid "Percentage (%)"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payroll.advice,register_id:0
+#: view:hr.payroll.register:0
+#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payroll_register_form
+#: model:ir.model,name:hr_payroll.model_hr_payroll_register
+#: model:ir.ui.menu,name:hr_payroll.hr_menu_payroll_register
+msgid "Payroll Register"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:employees.salary:0
+#: rml:hr.payroll.register.sheet:0
+#: rml:payroll.advice:0
+#: rml:salary.structure:0
+#: rml:year.salary:0
+msgid "For"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.employee:0
+#: field:hr.passport,contracts_ids:0
+msgid "Contracts"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.employee.grade:0
+msgid "Employee Function"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Paid"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Approve Sheet"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip,paid:0
+msgid "Paid ? "
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.holidays.status:0
+msgid "Validation"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:employees.salary:0
+msgid "Title"
+msgstr ""
+
+#. module: hr_payroll
+#: view:company.contribution:0
+msgid "Search Company Contribution"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.allounce.deduction.categoty,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.advice:0
+#: view:hr.payslip:0
+#: field:hr.payslip,move_payment_ids:0
+msgid "Payment Lines"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Compute Sheet"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payroll.register,active:0
+msgid "Active"
+msgstr ""
+
+#. module: hr_payroll
+#: help:hr.allounce.deduction.categoty,condition:0
+msgid "Applied this head for calculation if condition is true"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:year.salary:0
+msgid "Yearly Salary Details"
+msgstr ""
+
+#. module: hr_payroll
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.allounce.deduction.categoty,condition:0
+msgid "Condition"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.payroll.register,state:0
+#: selection:hr.payslip,state:0
+msgid "Wating for HR Verification"
+msgstr ""
+
+#. module: hr_payroll
+#: report:payroll.advice:0
+msgid "Payment Advice:"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.register:0
+msgid "Compute"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:employees.salary:0
+#: field:hr.payslip,deg_id:0
+#: rml:payslip.pdf:0
+#: rml:salary.structure:0
+msgid "Designation"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:hr.payroll.register.sheet:0
+msgid "HR Manager"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.allounce.deduction.categoty,based_on:0
+#: field:hr.payslip,basic_before_leaves:0
+#: rml:payslip.pdf:0
+msgid "Basic Salary"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.allounce.deduction.categoty,code:0
+msgid "Category Code"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.register:0
+msgid "Salary Information"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.model,name:hr_payroll.model_hr_allounce_deduction_categoty
+#: model:ir.model,name:hr_payroll.model_hr_allounce_deduction_categoty_line
+msgid "Allowance Deduction Categoty"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Companies"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:payslip.pdf:0
+msgid "Authorized Signature"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.employee:0
+msgid "Contract"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.payroll.advice,state:0
+msgid "Draft Sheet"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:wizard.year.salary,init,salary_on:0
+msgid "Next Month Date"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payroll.advice,date:0
+#: field:hr.payroll.register,date:0
+#: rml:hr.payroll.register.sheet:0
+#: field:hr.payslip,date:0
+msgid "Date"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.contract,visa_expire:0
+msgid "Visa Expire Date"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.passport:0
+msgid "Search Passport"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:employees.salary:0
+#: rml:salary.structure:0
+msgid "Phone No."
+msgstr ""
+
+#. module: hr_payroll
+#: field:company.contribution,contribute_per:0
+#: field:company.contribution.line,contribution_id:0
+#: view:hr.allounce.deduction.categoty:0
+#: view:hr.contibution.register:0
+#: view:hr.contibution.register.line:0
+msgid "Contribution"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.allounce.deduction.categoty,state:0
+msgid "Label"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.structure:0
+#: view:hr.payslip:0
+#: view:hr.payslip.line:0
+msgid "Company contribution"
+msgstr ""
+
+#. module: hr_payroll
+#: report:employees.salary:0
+#: report:salary.structure:0
+msgid "Other No."
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.holidays.status,code:0
+#: field:hr.payslip.line,code:0
+#: rml:salary.structure:0
+msgid "Code"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_bank_advice_tree
+#: model:ir.ui.menu,name:hr_payroll.hr_menu_payment_advice
+#: rml:payroll.advice:0
+msgid "Payment Advice"
+msgstr ""
+
+#. module: hr_payroll
+#: report:hr.payroll.register.sheet:0
+msgid "Number :"
+msgstr ""
+
+#. module: hr_payroll
+#: help:hr.allounce.deduction.categoty,base:0
+msgid ""
+"This will use to computer the % fields values, in general its on basic, but "
+"You can use all heads code field in small letter as a variable name i.e. "
+"hra, ma, lta, etc...., also you can use, static varible basic"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Computation Overview"
+msgstr ""
+
+#. module: hr_payroll
+#: wizard_field:wizard.year.salary,init,salary_on:0
+msgid "Salary On"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payroll.advice,number:0
+#: field:hr.payroll.register,number:0
+#: rml:hr.payroll.register.sheet:0
+#: field:hr.payslip,number:0
+msgid "Number"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.employee:0
+#: field:hr.employee,line_ids:0
+#: view:hr.employee.grade:0
+#: field:hr.employee.grade,line_ids:0
+#: rml:salary.structure:0
+msgid "Salary Structure"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.contibution.register,register_line_ids:0
+msgid "Register Line"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.register:0
+#: view:hr.payslip:0
+#: wizard_button:payroll.analysis,init,end:0
+#: wizard_button:wizard.employees.detail,init,end:0
+#: wizard_button:wizard.year.salary,init,end:0
+msgid "Cancel"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.employees.detail:0
+#: view:hr.payroll.year.salary:0
+msgid "Close"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.line,amount:0
+#: rml:salary.structure:0
+msgid "Amount / Percentage"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:hr.payroll.register.sheet:0
+msgid "Allowances"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:wizard.year.salary,init,salary_on:0
+msgid "Current Month Date"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.employee:0
+#: rml:salary.structure:0
+msgid "Salary"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.passport,name:0
+msgid "Passport No"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.contract,passport_id:0
+#: field:hr.employee,passport_id:0
+#: view:hr.passport:0
+msgid "Passport"
+msgstr ""
+
+#. module: hr_payroll
+#: report:hr.payroll.register.sheet:0
+msgid "Total Salary"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:payroll.advice:0
+msgid "for period"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.expense.expense,category_id:0
+#: field:hr.holidays.status,head_id:0
+msgid "Payroll Head"
+msgstr ""
+
+#. module: hr_payroll
+#: field:company.contribution,register_id:0
+#: model:ir.actions.act_window,name:hr_payroll.action_contibution_register_form
+#: model:ir.model,name:hr_payroll.model_hr_contibution_register
+#: model:ir.ui.menu,name:hr_payroll.menu_action_hr_contibution_register_form
+msgid "Contribution Register"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:salary.structure:0
+msgid "E-mail"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.allounce.deduction.categoty:0
+#: model:ir.actions.act_window,name:hr_payroll.hr_allounce_deduction_tree
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_allounce_deduction_tree
+msgid "Salary Heads"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.employees.detail:0
+#: view:hr.payroll.year.salary:0
+msgid "Print Report"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.allounce.deduction.categoty:0
+#: field:hr.allounce.deduction.categoty,line_ids:0
+msgid "Calculations"
+msgstr ""
+
+#. module: hr_payroll
+#: help:company.contribution,contribute_per:0
+msgid ""
+"Define Company contribution ratio 1.00=100% contribution, If Employee "
+"Contribute 5% then company will and here 0.50 defined then company will "
+"contribute 50% on employee 5% contribution"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Other Informations"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.contibution.register:0
+msgid "Month"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.passport:0
+msgid "Issue"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.allounce.deduction.categoty:0
+msgid "Dynamic Computation"
+msgstr ""
+
+#. module: hr_payroll
+#: report:payslip.pdf:0
+msgid "Basic Salary without Leave:"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.employee.grade,function_id:0
+#: field:hr.payslip.line,function_id:0
+msgid "Function"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "States"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:payroll.advice:0
+msgid "Dear Sir/Madam,"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.model,name:hr_payroll.model_hr_allounce_deduction_categoty
+msgid "Allowance Deduction Heads"
+msgstr ""
+
+#. module: hr_payroll
+#: report:hr.payroll.register.sheet:0
+msgid "Gross Sal."
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payroll.advice,note:0
+msgid "Description"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:salary.structure:0
+msgid "Start Date"
+msgstr ""
+
+#. module: hr_payroll
+#: report:payslip.pdf:0
+msgid "Deduction -"
+msgstr ""
+
+#. module: hr_payroll
+#: report:payslip.pdf:0
+msgid ")"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.contibution.register:0
+msgid "Contribution Registers"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_payroll_reporting
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_root_payroll
+msgid "Payroll"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.model,name:hr_payroll.model_hr_contract_wage_type
+msgid "Wage Type"
+msgstr ""
+
+#. module: hr_payroll
+#: report:hr.payroll.register.sheet:0
+msgid "Net Sal."
+msgstr ""
+
+#. module: hr_payroll
+#: sql_constraint:hr.passport:0
+msgid "The Passport No must be unique !"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.allounce.deduction.categoty,name:0
+msgid "Category Name"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.model,name:hr_payroll.model_hr_payroll_year_salary
+msgid "hr.payroll.year.salary"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:employees.salary:0
+#: rml:payslip.pdf:0
+#: rml:salary.structure:0
+msgid "Address"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.line.line,slipline_id:0
+msgid "Slip Line"
+msgstr ""
+
+#. module: hr_payroll
+#: report:payslip.pdf:0
+msgid "Number of Leaves"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:employees.salary:0
+#: rml:salary.structure:0
+msgid "Bank"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Cancel Sheet"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.payslip.line,type:0
+msgid "Advance"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:salary.structure:0
+msgid "Special Allowances and Deductions For Employee:"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.allounce.deduction.categoty.line,name:0
+#: field:hr.payroll.advice,name:0
+#: field:hr.payroll.register,name:0
+#: field:hr.payslip,name:0
+#: field:hr.payslip.line,name:0
+#: rml:salary.structure:0
+#: rml:year.salary:0
+msgid "Name"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip,leaves:0
+msgid "Leaved Deduction"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.passport:0
+msgid "Country"
+msgstr ""
+
+#. module: hr_payroll
+#: wizard_field:wizard.employees.detail,init,employee_ids:0
+#: wizard_field:wizard.year.salary,init,employee_ids:0
+msgid "Employees"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.employee,property_bank_account:0
+#: rml:payroll.advice:0
+msgid "Bank Account"
+msgstr ""
+
+#. module: hr_payroll
+#: help:company.contribution,register_id:0
+msgid "Contribution register based on company"
+msgstr ""
+
+#. module: hr_payroll
+#: help:hr.allounce.deduction.categoty,sequence:0
+msgid "Use to arrange calculation sequence"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip,total_pay:0
+msgid "Total Payment"
+msgstr ""
+
+#. module: hr_payroll
+#: report:payslip.pdf:0
+msgid "Leave Deductions Line:"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.payroll.register,state:0
+#: selection:hr.payslip,state:0
+msgid "Wating for Account Verification"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.contibution.register.line,comp_deduction:0
+msgid "Company Deduction"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.holidays.status:0
+msgid "Payroll Configurtion"
+msgstr ""
+
+#. module: hr_payroll
+#: code:addons/hr_payroll/hr_payroll.py:469
+#, python-format
+msgid "Please define bank account for the %s employee"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.passport,date_issue:0
+msgid "Passport Issue Date"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.allounce.deduction.categoty,type:0
+#: field:hr.payroll.register,allounce:0
+#: field:hr.payslip,allounce:0
+#: selection:hr.payslip.line,type:0
+msgid "Allowance"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip,holiday_days:0
+msgid "No of Leaves"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.employee,otherid:0
+msgid "Other Id"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:payslip.pdf:0
+msgid "Bank Details"
+msgstr ""
+
+#. module: hr_payroll
+#: report:payslip.pdf:0
+msgid "Slip ID"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.allounce.deduction.categoty,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payslip_form
+#: model:ir.ui.menu,name:hr_payroll.menu_department_tree
+msgid "Employee Payslip"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Letter Content"
+msgstr ""
+
+#. module: hr_payroll
+#: wizard_view:wizard.employees.detail,init:0
+#: wizard_view:wizard.year.salary,init:0
+msgid "Year Salary"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.register:0
+msgid "Allowance / Deduction"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.actions.report.xml,name:hr_payroll.payroll_advice
+msgid "Bank Payment Advice"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Search Payslips"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:employees.salary:0
+#: rml:payroll.advice:0
+#: rml:year.salary:0
+msgid "Total"
+msgstr ""
+
+#. module: hr_payroll
+#: view:company.contribution:0
+#: view:hr.allounce.deduction.categoty:0
+#: field:hr.allounce.deduction.categoty,contribute_ids:0
+msgid "Contributions"
+msgstr ""
diff --git a/addons/hr_timesheet/i18n/nb.po b/addons/hr_timesheet/i18n/nb.po
new file mode 100644
index 00000000000..218e714fa2b
--- /dev/null
+++ b/addons/hr_timesheet/i18n/nb.po
@@ -0,0 +1,702 @@
+# Norwegian Bokmal translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-04-07 07:02+0000\n"
+"Last-Translator: Rolv Råen (adEgo) <Unknown>\n"
+"Language-Team: Norwegian Bokmal <nb@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: 2011-04-08 06:12+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
+
+#. module: hr_timesheet
+#: model:product.template,name:hr_timesheet.product_consultant_product_template
+msgid "Service on Timesheet"
+msgstr ""
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/report/user_timesheet.py:42
+#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#, python-format
+msgid "Wed"
+msgstr "Ons"
+
+#. module: hr_timesheet
+#: view:hr.sign.out.project:0
+msgid "(Keep empty for current_time)"
+msgstr "(La stå blank for å benytte nåværende tid)"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:132
+#, python-format
+msgid "No employee defined for your user !"
+msgstr "Ingen ansatt definert for brukeren din !"
+
+#. module: hr_timesheet
+#: view:hr.analytic.timesheet:0
+msgid "Group By..."
+msgstr "Grupper etter..."
+
+#. module: hr_timesheet
+#: model:ir.actions.act_window,help:hr_timesheet.action_hr_timesheet_sign_in
+msgid ""
+"Employees can encode their time spent on the different projects. A project "
+"is an analytic account and the time spent on a project generate costs on the "
+"analytic account. This feature allows to record at the same time the "
+"attendance and the timesheet."
+msgstr ""
+
+#. module: hr_timesheet
+#: view:hr.analytic.timesheet:0
+msgid "Today"
+msgstr "Idag"
+
+#. module: hr_timesheet
+#: field:hr.employee,journal_id:0
+msgid "Analytic Journal"
+msgstr "Analytisk Journal"
+
+#. module: hr_timesheet
+#: view:hr.sign.out.project:0
+msgid "Stop Working"
+msgstr ""
+
+#. module: hr_timesheet
+#: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_employee
+#: model:ir.ui.menu,name:hr_timesheet.menu_hr_timesheet_employee
+msgid "Employee Timesheet"
+msgstr ""
+
+#. module: hr_timesheet
+#: view:account.analytic.account:0
+msgid "Work done stats"
+msgstr ""
+
+#. module: hr_timesheet
+#: view:hr.analytic.timesheet:0
+#: model:ir.ui.menu,name:hr_timesheet.menu_hr_reporting_timesheet
+msgid "Timesheet"
+msgstr "Timeliste"
+
+#. module: hr_timesheet
+#: selection:hr.analytical.timesheet.employee,month:0
+#: selection:hr.analytical.timesheet.users,month:0
+msgid "janvier"
+msgstr ""
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/report/user_timesheet.py:42
+#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#, python-format
+msgid "Mon"
+msgstr "Man"
+
+#. module: hr_timesheet
+#: view:hr.sign.in.project:0
+msgid "Sign in"
+msgstr "Logg på"
+
+#. module: hr_timesheet
+#: view:hr.sign.in.project:0
+msgid ""
+"Employees can encode their time spent on the different projects they are "
+"assigned on. A  project is an analytic account and the time spent on a "
+"project generates costs on the analytic account. This feature allows to "
+"record at the same time the attendance and the timesheet."
+msgstr ""
+
+#. module: hr_timesheet
+#: field:hr.sign.out.project,analytic_amount:0
+msgid "Minimum Analytic Amount"
+msgstr ""
+
+#. module: hr_timesheet
+#: view:hr.analytical.timesheet.employee:0
+msgid "Monthly Employee Timesheet"
+msgstr ""
+
+#. module: hr_timesheet
+#: view:hr.sign.out.project:0
+msgid "Work done in the last period"
+msgstr "Arbeid utført i forrige periode"
+
+#. module: hr_timesheet
+#: constraint:hr.employee:0
+msgid ""
+"Error ! You cannot select a department for which the employee is the manager."
+msgstr ""
+
+#. module: hr_timesheet
+#: field:hr.sign.in.project,state:0
+#: field:hr.sign.out.project,state:0
+msgid "Current state"
+msgstr ""
+
+#. module: hr_timesheet
+#: field:hr.sign.in.project,name:0
+#: field:hr.sign.out.project,name:0
+msgid "Employees name"
+msgstr ""
+
+#. module: hr_timesheet
+#: model:ir.model,name:hr_timesheet.model_hr_analytical_timesheet_users
+msgid "Print Employees Timesheet"
+msgstr "Skriv ut ansattes timelister"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/hr_timesheet.py:174
+#: code:addons/hr_timesheet/hr_timesheet.py:176
+#, python-format
+msgid "Warning !"
+msgstr "Advarsel !"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:77
+#: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:132
+#, python-format
+msgid "UserError"
+msgstr "BrukerFeil"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:77
+#, python-format
+msgid "No cost unit defined for this employee !"
+msgstr "Ingen kostenhet angitt for denne brukeren !"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/report/user_timesheet.py:42
+#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#, python-format
+msgid "Tue"
+msgstr "Tir"
+
+#. module: hr_timesheet
+#: field:hr.sign.out.project,account_id:0
+msgid "Analytic Account"
+msgstr "Analytisk konto"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/wizard/hr_timesheet_print_employee.py:42
+#, python-format
+msgid "Warning"
+msgstr "Advarsel"
+
+#. module: hr_timesheet
+#: model:ir.module.module,shortdesc:hr_timesheet.module_meta_information
+msgid "Human Resources (Timesheet encoding)"
+msgstr ""
+
+#. module: hr_timesheet
+#: view:hr.sign.in.project:0
+#: view:hr.sign.out.project:0
+msgid "Sign In/Out By Project"
+msgstr ""
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/report/user_timesheet.py:42
+#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#, python-format
+msgid "Sat"
+msgstr "Lør"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/report/user_timesheet.py:42
+#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#, python-format
+msgid "Sun"
+msgstr "Søn"
+
+#. module: hr_timesheet
+#: view:hr.analytical.timesheet.employee:0
+#: view:hr.analytical.timesheet.users:0
+msgid "Print"
+msgstr "Skriv ut"
+
+#. module: hr_timesheet
+#: view:hr.analytic.timesheet:0
+msgid "Timesheet Lines"
+msgstr ""
+
+#. module: hr_timesheet
+#: selection:hr.analytical.timesheet.employee,month:0
+#: selection:hr.analytical.timesheet.users,month:0
+msgid "juillet"
+msgstr ""
+
+#. module: hr_timesheet
+#: view:hr.analytical.timesheet.users:0
+msgid "Monthly Employees Timesheet"
+msgstr ""
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/report/user_timesheet.py:39
+#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#, python-format
+msgid "July"
+msgstr "Juli"
+
+#. module: hr_timesheet
+#: field:hr.sign.in.project,date:0
+#: field:hr.sign.out.project,date_start:0
+msgid "Starting Date"
+msgstr "Startdato"
+
+#. module: hr_timesheet
+#: view:hr.employee:0
+msgid "Categories"
+msgstr "Kategorier"
+
+#. module: hr_timesheet
+#: selection:hr.analytical.timesheet.employee,month:0
+#: selection:hr.analytical.timesheet.users,month:0
+msgid "novembre"
+msgstr ""
+
+#. module: hr_timesheet
+#: model:ir.actions.act_window,help:hr_timesheet.act_hr_timesheet_line_evry1_all_form
+msgid ""
+"Through Working Hours you can register your working hours by project every "
+"day."
+msgstr ""
+
+#. module: hr_timesheet
+#: model:ir.module.module,description:hr_timesheet.module_meta_information
+msgid ""
+"\n"
+"This module implements a timesheet system. Each employee can encode and\n"
+"track their time spent on the different projects. A project is an\n"
+"analytic account and the time spent on a project generates costs on\n"
+"the analytic account.\n"
+"\n"
+"Lots of reporting on time and employee tracking are provided.\n"
+"\n"
+"It is completely integrated with the cost accounting module. It allows you\n"
+"to set up a management by affair.\n"
+"    "
+msgstr ""
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/report/user_timesheet.py:39
+#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#, python-format
+msgid "March"
+msgstr "Mars"
+
+#. module: hr_timesheet
+#: view:hr.analytic.timesheet:0
+msgid "Total cost"
+msgstr ""
+
+#. module: hr_timesheet
+#: selection:hr.analytical.timesheet.employee,month:0
+#: selection:hr.analytical.timesheet.users,month:0
+msgid "décembre"
+msgstr ""
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/report/user_timesheet.py:39
+#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#, python-format
+msgid "September"
+msgstr "September"
+
+#. module: hr_timesheet
+#: model:ir.model,name:hr_timesheet.model_hr_analytic_timesheet
+msgid "Timesheet Line"
+msgstr "Timelistelinje"
+
+#. module: hr_timesheet
+#: field:hr.analytical.timesheet.users,employee_ids:0
+msgid "employees"
+msgstr "ansatte"
+
+#. module: hr_timesheet
+#: view:account.analytic.account:0
+msgid "Stats by month"
+msgstr "Statistikk pr. måned"
+
+#. module: hr_timesheet
+#: view:account.analytic.account:0
+#: field:hr.analytical.timesheet.employee,month:0
+#: field:hr.analytical.timesheet.users,month:0
+msgid "Month"
+msgstr "Måned"
+
+#. module: hr_timesheet
+#: field:hr.sign.out.project,info:0
+msgid "Work Description"
+msgstr "Arbeidsbeskrivelse"
+
+#. module: hr_timesheet
+#: view:account.analytic.account:0
+msgid "To be invoiced"
+msgstr ""
+
+#. module: hr_timesheet
+#: model:ir.actions.report.xml,name:hr_timesheet.report_user_timesheet
+msgid "Employee timesheet"
+msgstr ""
+
+#. module: hr_timesheet
+#: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_sign_in
+#: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_sign_out
+msgid "Sign in / Sign out by project"
+msgstr ""
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/report/user_timesheet.py:42
+#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#, python-format
+msgid "Fri"
+msgstr "Fre"
+
+#. module: hr_timesheet
+#: view:hr.sign.in.project:0
+msgid "Sign in / Sign out"
+msgstr "Logg inn / Logg ut"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/hr_timesheet.py:174
+#, python-format
+msgid ""
+"Analytic journal is not defined for employee %s \n"
+"Define an employee for the selected user and assign an analytic journal!"
+msgstr ""
+
+#. module: hr_timesheet
+#: view:hr.sign.in.project:0
+msgid "(Keep empty for current time)"
+msgstr ""
+
+#. module: hr_timesheet
+#: view:hr.employee:0
+msgid "Timesheets"
+msgstr "Timelister"
+
+#. module: hr_timesheet
+#: help:hr.employee,product_id:0
+msgid "Specifies employee's designation as a product with type 'service'."
+msgstr ""
+
+#. module: hr_timesheet
+#: selection:hr.analytical.timesheet.employee,month:0
+#: selection:hr.analytical.timesheet.users,month:0
+msgid "août"
+msgstr ""
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/report/user_timesheet.py:39
+#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#, python-format
+msgid "August"
+msgstr "August"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/report/user_timesheet.py:39
+#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#, python-format
+msgid "June"
+msgstr "Juni"
+
+#. module: hr_timesheet
+#: view:hr.analytical.timesheet.employee:0
+msgid "Print My Timesheet"
+msgstr "Skriv ut min timeliste"
+
+#. module: hr_timesheet
+#: selection:hr.analytical.timesheet.employee,month:0
+#: selection:hr.analytical.timesheet.users,month:0
+msgid "mars"
+msgstr "mars"
+
+#. module: hr_timesheet
+#: view:hr.analytic.timesheet:0
+msgid "Date"
+msgstr "Dato"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/report/user_timesheet.py:39
+#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#, python-format
+msgid "November"
+msgstr "November"
+
+#. module: hr_timesheet
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
+msgstr ""
+
+#. module: hr_timesheet
+#: field:hr.sign.out.project,date:0
+msgid "Closing Date"
+msgstr ""
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/report/user_timesheet.py:39
+#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#, python-format
+msgid "October"
+msgstr "Oktober"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/report/user_timesheet.py:39
+#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#, python-format
+msgid "January"
+msgstr "Januar"
+
+#. module: hr_timesheet
+#: view:account.analytic.account:0
+msgid "Key dates"
+msgstr ""
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/report/user_timesheet.py:42
+#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#, python-format
+msgid "Thu"
+msgstr "Tor"
+
+#. module: hr_timesheet
+#: view:account.analytic.account:0
+msgid "Analysis stats"
+msgstr ""
+
+#. module: hr_timesheet
+#: model:ir.model,name:hr_timesheet.model_hr_analytical_timesheet_employee
+msgid "Print Employee Timesheet & Print My Timesheet"
+msgstr ""
+
+#. module: hr_timesheet
+#: field:hr.sign.in.project,emp_id:0
+#: field:hr.sign.out.project,emp_id:0
+msgid "Employee ID"
+msgstr "Ansatt-ID"
+
+#. module: hr_timesheet
+#: view:hr.sign.out.project:0
+msgid "General Information"
+msgstr "Generell informasjon"
+
+#. module: hr_timesheet
+#: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_my
+msgid "My Timesheet"
+msgstr "Min timeliste"
+
+#. module: hr_timesheet
+#: view:account.analytic.account:0
+msgid "Analysis summary"
+msgstr ""
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/report/user_timesheet.py:39
+#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#, python-format
+msgid "December"
+msgstr "Desember"
+
+#. module: hr_timesheet
+#: view:hr.analytical.timesheet.employee:0
+#: view:hr.analytical.timesheet.users:0
+#: view:hr.sign.in.project:0
+#: view:hr.sign.out.project:0
+msgid "Cancel"
+msgstr "Avbryt"
+
+#. module: hr_timesheet
+#: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_users
+#: model:ir.actions.report.xml,name:hr_timesheet.report_users_timesheet
+#: model:ir.actions.wizard,name:hr_timesheet.wizard_hr_timesheet_users
+#: model:ir.ui.menu,name:hr_timesheet.menu_hr_timesheet_users
+msgid "Employees Timesheet"
+msgstr ""
+
+#. module: hr_timesheet
+#: selection:hr.analytical.timesheet.employee,month:0
+#: selection:hr.analytical.timesheet.users,month:0
+msgid "février"
+msgstr ""
+
+#. module: hr_timesheet
+#: view:hr.analytic.timesheet:0
+msgid "Information"
+msgstr "Informasjon"
+
+#. module: hr_timesheet
+#: field:hr.analytical.timesheet.employee,employee_id:0
+#: model:ir.model,name:hr_timesheet.model_hr_employee
+msgid "Employee"
+msgstr "Ansatt"
+
+#. module: hr_timesheet
+#: selection:hr.analytical.timesheet.employee,month:0
+#: selection:hr.analytical.timesheet.users,month:0
+msgid "avril"
+msgstr ""
+
+#. module: hr_timesheet
+#: field:hr.sign.in.project,server_date:0
+#: field:hr.sign.out.project,server_date:0
+msgid "Current Date"
+msgstr "Dagens dato"
+
+#. module: hr_timesheet
+#: view:hr.analytic.timesheet:0
+msgid "Anlytic account"
+msgstr "Analytisk konto"
+
+#. module: hr_timesheet
+#: view:hr.analytical.timesheet.employee:0
+msgid "This wizard will print monthly timesheet"
+msgstr ""
+
+#. module: hr_timesheet
+#: view:hr.analytic.timesheet:0
+#: field:hr.employee,product_id:0
+msgid "Product"
+msgstr "Produkt"
+
+#. module: hr_timesheet
+#: view:hr.analytic.timesheet:0
+msgid "Invoicing"
+msgstr "Fakturering"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/report/user_timesheet.py:39
+#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#, python-format
+msgid "May"
+msgstr "Mai"
+
+#. module: hr_timesheet
+#: view:hr.analytic.timesheet:0
+msgid "Total time"
+msgstr "Totaltid"
+
+#. module: hr_timesheet
+#: selection:hr.analytical.timesheet.employee,month:0
+#: selection:hr.analytical.timesheet.users,month:0
+msgid "juin"
+msgstr ""
+
+#. module: hr_timesheet
+#: view:hr.sign.in.project:0
+msgid "(local time on the server side)"
+msgstr ""
+
+#. module: hr_timesheet
+#: model:ir.actions.act_window,name:hr_timesheet.act_hr_timesheet_line_evry1_all_form
+#: model:ir.ui.menu,name:hr_timesheet.menu_hr_working_hours
+msgid "Working Hours"
+msgstr "Arbeidstid"
+
+#. module: hr_timesheet
+#: model:ir.model,name:hr_timesheet.model_hr_sign_in_project
+msgid "Sign In By Project"
+msgstr ""
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/report/user_timesheet.py:39
+#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#, python-format
+msgid "February"
+msgstr "Februar"
+
+#. module: hr_timesheet
+#: field:hr.analytic.timesheet,line_id:0
+msgid "Analytic line"
+msgstr "Analytisk linje"
+
+#. module: hr_timesheet
+#: model:ir.model,name:hr_timesheet.model_hr_sign_out_project
+msgid "Sign Out By Project"
+msgstr ""
+
+#. module: hr_timesheet
+#: view:hr.analytical.timesheet.users:0
+msgid "Employees"
+msgstr "Ansatte"
+
+#. module: hr_timesheet
+#: selection:hr.analytical.timesheet.employee,month:0
+#: selection:hr.analytical.timesheet.users,month:0
+msgid "octobre"
+msgstr ""
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/report/user_timesheet.py:39
+#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#, python-format
+msgid "April"
+msgstr "April"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/hr_timesheet.py:176
+#, python-format
+msgid ""
+"No analytic account defined on the project.\n"
+"Please set one or we can not automatically fill the timesheet."
+msgstr ""
+
+#. module: hr_timesheet
+#: selection:hr.analytical.timesheet.employee,month:0
+#: selection:hr.analytical.timesheet.users,month:0
+msgid "mai"
+msgstr ""
+
+#. module: hr_timesheet
+#: view:account.analytic.account:0
+#: view:hr.analytic.timesheet:0
+msgid "Users"
+msgstr "Brukere"
+
+#. module: hr_timesheet
+#: view:hr.sign.in.project:0
+msgid "Start Working"
+msgstr "Begynn arbeid"
+
+#. module: hr_timesheet
+#: view:account.analytic.account:0
+msgid "Stats by user"
+msgstr "Statistikk pr. bruker"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/wizard/hr_timesheet_print_employee.py:42
+#, python-format
+msgid "No employee defined for this user"
+msgstr "Ingen ansatt er angitt for denne brukeren"
+
+#. module: hr_timesheet
+#: field:hr.analytical.timesheet.employee,year:0
+#: field:hr.analytical.timesheet.users,year:0
+msgid "Year"
+msgstr "År"
+
+#. module: hr_timesheet
+#: view:hr.analytic.timesheet:0
+msgid "Accounting"
+msgstr ""
+
+#. module: hr_timesheet
+#: field:hr.analytic.timesheet,partner_id:0
+msgid "Partner Id"
+msgstr ""
+
+#. module: hr_timesheet
+#: view:hr.sign.out.project:0
+msgid "Change Work"
+msgstr ""
+
+#. module: hr_timesheet
+#: selection:hr.analytical.timesheet.employee,month:0
+#: selection:hr.analytical.timesheet.users,month:0
+msgid "septembre"
+msgstr ""
diff --git a/addons/product/i18n/id.po b/addons/product/i18n/id.po
index bcba8ffda75..c0b29d8ef80 100644
--- a/addons/product/i18n/id.po
+++ b/addons/product/i18n/id.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-04-04 04:29+0000\n"
+"PO-Revision-Date: 2011-04-08 06:05+0000\n"
 "Last-Translator: moelyana <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: 2011-04-05 06:06+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-04-08 06:13+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
@@ -1097,7 +1097,7 @@ msgstr ""
 #. module: product
 #: field:product.pricelist.item,price_surcharge:0
 msgid "Price Surcharge"
-msgstr ""
+msgstr "Harga Surecharge"
 
 #. module: product
 #: model:product.template,name:product.product_product_mb1_product_template
@@ -1107,7 +1107,7 @@ msgstr ""
 #. module: product
 #: field:product.product,packaging:0
 msgid "Logistical Units"
-msgstr ""
+msgstr "Unit Logistik"
 
 #. module: product
 #: field:product.category,complete_name:0
@@ -1126,7 +1126,7 @@ msgstr "Nama"
 #. module: product
 #: view:product.product:0
 msgid "Stockable"
-msgstr ""
+msgstr "Bisa Distok"
 
 #. module: product
 #: model:product.template,name:product.product_product_woodlintelm0_product_template
@@ -1150,7 +1150,7 @@ msgstr ""
 #. module: product
 #: model:product.uom,name:product.product_uom_kgm
 msgid "kg"
-msgstr ""
+msgstr "Kg"
 
 #. module: product
 #: model:product.uom,name:product.product_uom_meter
@@ -1300,7 +1300,7 @@ msgstr "Produk"
 #. module: product
 #: help:product.packaging,rows:0
 msgid "The number of layers on a pallet or box"
-msgstr ""
+msgstr "Nomor dari lapisan pallet atau box"
 
 #. module: product
 #: help:product.pricelist.item,base:0
@@ -1311,7 +1311,7 @@ msgstr "Mode untuk menghitung harga untuk peraturan ini."
 #: view:product.packaging:0
 #: view:product.product:0
 msgid "Pallet Dimension"
-msgstr ""
+msgstr "Dimensi Pallet"
 
 #. module: product
 #: code:addons/product/product.py:603
@@ -1377,12 +1377,12 @@ msgstr ""
 #. module: product
 #: selection:product.template,procure_method:0
 msgid "Make to Stock"
-msgstr ""
+msgstr "Buat Stok"
 
 #. module: product
 #: field:product.pricelist.item,price_version_id:0
 msgid "Price List Version"
-msgstr ""
+msgstr "Versi Daftar Harga"
 
 #. module: product
 #: help:product.pricelist.item,sequence:0
@@ -1391,11 +1391,14 @@ msgid ""
 "gives highest priority to lowest sequence and stops as soon as a matching "
 "item is found."
 msgstr ""
+"Memberikan urutan di mana item daftar harga akan diperiksa. Evaluasi ini "
+"memberikan prioritas tertinggi untuk urutan terendah dan berhenti segera "
+"setelah barang yang cocok ditemukan."
 
 #. module: product
 #: selection:product.template,type:0
 msgid "Consumable"
-msgstr ""
+msgstr "Dapat dikonsumsi"
 
 #. module: product
 #: help:product.price.type,currency_id:0
@@ -1405,33 +1408,33 @@ msgstr ""
 #. module: product
 #: help:product.template,weight:0
 msgid "The gross weight in Kg."
-msgstr ""
+msgstr "Berat kotor dalam kg"
 
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
 msgid "Procurement"
-msgstr ""
+msgstr "procurement"
 
 #. module: product
 #: field:product.uom,category_id:0
 msgid "UoM Category"
-msgstr ""
+msgstr "Kategori UoM"
 
 #. module: product
 #: field:product.template,loc_rack:0
 msgid "Rack"
-msgstr ""
+msgstr "Rak"
 
 #. module: product
 #: field:product.template,uom_po_id:0
 msgid "Purchase Unit of Measure"
-msgstr ""
+msgstr "Unit ukur pembelian"
 
 #. module: product
 #: field:product.template,supply_method:0
 msgid "Supply method"
-msgstr ""
+msgstr "Metode supply"
 
 #. module: product
 #: model:ir.actions.act_window,help:product.product_category_action
@@ -1440,11 +1443,14 @@ msgid ""
 "category to get the list of all products linked to this category or to a "
 "child of this category."
 msgstr ""
+"Berikut adalah daftar semua produk Anda diklasifikasikan berdasarkan "
+"kategori. Anda dapat mengklik kategori untuk mendapatkan daftar semua produk "
+"yang terkait dengan kategori ini atau untuk turunan dari kategori ini."
 
 #. module: product
 #: view:product.product:0
 msgid "Group by..."
-msgstr ""
+msgstr "Dikelompokan berdasarkan ...."
 
 #. module: product
 #: model:product.template,name:product.product_product_cpu_gen_product_template
@@ -1458,11 +1464,13 @@ msgid ""
 "Conversion from Product UoM m to Default UoM PCE is not possible as they "
 "both belong to different Category!."
 msgstr ""
+"Konversi dari m UoM Produk ke Default UoM PCE tidak mungkin karena mereka "
+"berdua berasal Kategori berbeda!."
 
 #. module: product
 #: field:product.pricelist.version,date_start:0
 msgid "Start Date"
-msgstr ""
+msgstr "Tanggal Mulai"
 
 #. module: product
 #: help:product.template,produce_delay:0
@@ -1472,6 +1480,10 @@ msgid ""
 "the level of this product. Different lead times will be summed for all "
 "levels and purchase orders."
 msgstr ""
+"Keterlambatan rata-rata di hari untuk menghasilkan produk ini. Ini hanya "
+"untuk urutan produksi dan, jika RUU multi-level material, itu hanya untuk "
+"tingkat produk ini. Lead time yang berbeda akan dijumlahkan untuk semua "
+"tingkatan dan pesanan pembelian."
 
 #. module: product
 #: help:product.product,qty_available:0
@@ -1479,6 +1491,8 @@ msgid ""
 "Current quantities of products in selected locations or all internal if none "
 "have been selected."
 msgstr ""
+"Saat Ini jumlah produk di lokasi yang dipilih atau semua internal jika tidak "
+"satupun yang telah dipilih."
 
 #. module: product
 #: model:product.template,name:product.product_product_pc1_product_template
@@ -1491,37 +1505,41 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the pricelist "
 "without removing it."
 msgstr ""
+"Jika field aktif diset ke False, itu akan memungkinkan Anda untuk "
+"menyembunyikan daftar harga tanpa menghapusnya."
 
 #. module: product
 #: field:product.product,qty_available:0
 msgid "Real Stock"
-msgstr ""
+msgstr "Stok Real"
 
 #. module: product
 #: model:product.uom,name:product.product_uom_cm
 msgid "cm"
-msgstr ""
+msgstr "cm"
 
 #. module: product
 #: model:ir.model,name:product.model_product_uom
 msgid "Product Unit of Measure"
-msgstr ""
+msgstr "Ukuran unit produk"
 
 #. module: product
 #: constraint:product.template:0
 msgid ""
 "Error: The default UOM and the purchase UOM must be in the same category."
 msgstr ""
+"Ada  Kesalahan ! Acuan dasar UoM dan Pembelian UoM harus ada dalam kategori "
+"yang sama."
 
 #. module: product
 #: field:product.uom,rounding:0
 msgid "Rounding Precision"
-msgstr ""
+msgstr "Ketepatan Pembulatan"
 
 #. module: product
 #: view:product.uom:0
 msgid "Unit of Measure Properties"
-msgstr ""
+msgstr "Properti UoM"
 
 #. module: product
 #: model:product.template,name:product.product_product_shelf1_product_template
@@ -1531,12 +1549,12 @@ msgstr ""
 #. module: product
 #: selection:product.template,supply_method:0
 msgid "Buy"
-msgstr ""
+msgstr "Beli"
 
 #. module: product
 #: view:product.uom.categ:0
 msgid "Units of Measure categories"
-msgstr ""
+msgstr "Kategori UoM"
 
 #. module: product
 #: help:product.packaging,weight_ul:0
@@ -1546,7 +1564,7 @@ msgstr ""
 #. module: product
 #: selection:product.uom,uom_type:0
 msgid "Smaller than the reference UoM"
-msgstr ""
+msgstr "Lebih kecil dari referensi UoM"
 
 #. module: product
 #: field:product.price.type,active:0
@@ -1555,38 +1573,38 @@ msgstr ""
 #: field:product.product,active:0
 #: field:product.uom,active:0
 msgid "Active"
-msgstr ""
+msgstr "Aktif"
 
 #. module: product
 #: field:product.product,price_margin:0
 msgid "Variant Price Margin"
-msgstr ""
+msgstr "Varian Margin Harga"
 
 #. module: product
 #: sql_constraint:product.uom:0
 msgid "The conversion ratio for a unit of measure cannot be 0!"
-msgstr ""
+msgstr "Rasio dari konversi untuk UoM tidak boleh 0!"
 
 #. module: product
 #: help:product.packaging,ean:0
 msgid "The EAN code of the package unit."
-msgstr ""
+msgstr "Kode EAN untuk unit paket"
 
 #. module: product
 #: field:product.packaging,weight_ul:0
 msgid "Empty Package Weight"
-msgstr ""
+msgstr "Berat paket kosong"
 
 #. module: product
 #: field:product.price.type,field:0
 msgid "Product Field"
-msgstr ""
+msgstr "Kolom produk"
 
 #. module: product
 #: model:ir.actions.act_window,name:product.product_pricelist_type_action
 #: model:ir.ui.menu,name:product.menu_product_pricelist_type_action2
 msgid "Pricelists Types"
-msgstr ""
+msgstr "Jenis Daftar Harga"
 
 #. module: product
 #: help:product.uom,factor:0
@@ -2302,17 +2320,17 @@ msgstr ""
 #. module: product
 #: field:product.template,list_price:0
 msgid "Sale Price"
-msgstr ""
+msgstr "Harga Jual"
 
 #. module: product
 #: field:product.category,type:0
 msgid "Category Type"
-msgstr ""
+msgstr "Jenis Kategori"
 
 #. module: product
 #: model:product.category,name:product.cat2
 msgid "Private"
-msgstr ""
+msgstr "Pribadi"
 
 #. module: product
 #: help:product.template,uos_coeff:0
diff --git a/addons/product_margin/i18n/gl.po b/addons/product_margin/i18n/gl.po
new file mode 100644
index 00000000000..9e4e9d481fb
--- /dev/null
+++ b/addons/product_margin/i18n/gl.po
@@ -0,0 +1,305 @@
+# Galician translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-04-07 09:09+0000\n"
+"Last-Translator: Santi (Pexego) <santiago@pexego.es>\n"
+"Language-Team: Galician <gl@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: 2011-04-08 06:13+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
+
+#. module: product_margin
+#: view:product.product:0
+#: field:product.product,turnover:0
+msgid "Turnover"
+msgstr "Volume de negocio"
+
+#. module: product_margin
+#: field:product.product,expected_margin_rate:0
+msgid "Expected Margin (%)"
+msgstr "Marxe prevista (%)"
+
+#. module: product_margin
+#: field:product.margin,from_date:0
+msgid "From"
+msgstr "Desde"
+
+#. module: product_margin
+#: help:product.product,sale_expected:0
+msgid ""
+"Sum of Multification of Sale Catalog price and quantity of Customer Invoices"
+msgstr ""
+"Suma da multiplicación do prezo do catálogo de venda e cantidade das "
+"facturas do cliente"
+
+#. module: product_margin
+#: help:product.product,total_margin:0
+msgid "Turnorder - Standard price"
+msgstr "Volume de negocio - Prezo estándar"
+
+#. module: product_margin
+#: field:product.margin,to_date:0
+msgid "To"
+msgstr "Ata"
+
+#. module: product_margin
+#: field:product.product,date_to:0
+msgid "To Date"
+msgstr "Ata a data"
+
+#. module: product_margin
+#: field:product.product,date_from:0
+msgid "From Date"
+msgstr "Desde a data"
+
+#. module: product_margin
+#: selection:product.margin,invoice_state:0
+#: selection:product.product,invoice_state:0
+msgid "Draft, Open and Paid"
+msgstr "Borrador, aberto e pagado"
+
+#. module: product_margin
+#: field:product.product,purchase_avg_price:0
+#: field:product.product,sale_avg_price:0
+msgid "Avg. Unit Price"
+msgstr "Media prezo unidade"
+
+#. module: product_margin
+#: model:ir.module.module,shortdesc:product_margin.module_meta_information
+msgid "Margins in Product"
+msgstr "Marxes en produtos"
+
+#. module: product_margin
+#: model:ir.model,name:product_margin.model_product_product
+msgid "Product"
+msgstr "Produto"
+
+#. module: product_margin
+#: view:product.product:0
+msgid "Catalog Price"
+msgstr "Prezo catálogo"
+
+#. module: product_margin
+#: selection:product.margin,invoice_state:0
+#: selection:product.product,invoice_state:0
+msgid "Paid"
+msgstr "Pagado"
+
+#. module: product_margin
+#: help:product.product,sales_gap:0
+msgid "Expected Sale - Turn Over"
+msgstr "Venda prevista - Volume de negocio"
+
+#. module: product_margin
+#: model:ir.module.module,description:product_margin.module_meta_information
+msgid ""
+"\n"
+"Adds a reporting menu in products that computes sales, purchases, margins\n"
+"and other interesting indicators based on invoices. The wizard to launch\n"
+"the report has several options to help you get the data you need.\n"
+msgstr ""
+"\n"
+"Engade un menú de informes ós produtos, que calcula as vendas, as compras, "
+"as marxes e outros indicadores interesantes en base ás facturas. O asistente "
+"ofrécelle varias opcións para axudarlle a obter os datos que precisa.\n"
+
+#. module: product_margin
+#: view:product.product:0
+msgid "Standard Price"
+msgstr "Prezo estándar"
+
+#. module: product_margin
+#: field:product.product,sale_expected:0
+msgid "Expected Sale"
+msgstr "Venda prevista"
+
+#. module: product_margin
+#: help:product.product,normal_cost:0
+msgid "Sum of Multification of Cost price and quantity of Supplier Invoices"
+msgstr ""
+"Suma da multiplicación do prezo de custo e da cantidade das facturas do "
+"provedor"
+
+#. module: product_margin
+#: help:product.product,expected_margin:0
+msgid "Expected Sale - Normal Cost"
+msgstr "Venda prevista - Custo normal"
+
+#. module: product_margin
+#: view:product.product:0
+msgid "Analysis Criteria"
+msgstr "Criterios de análise"
+
+#. module: product_margin
+#: view:product.product:0
+#: field:product.product,total_cost:0
+msgid "Total Cost"
+msgstr "Custo total"
+
+#. module: product_margin
+#: field:product.product,expected_margin:0
+msgid "Expected Margin"
+msgstr "Marxe prevista"
+
+#. module: product_margin
+#: view:product.product:0
+msgid "#Purchased"
+msgstr "Núm. mercados"
+
+#. module: product_margin
+#: help:product.product,turnover:0
+msgid ""
+"Sum of Multification of Invoice price and quantity of Customer Invoices"
+msgstr ""
+"Suma da multiplicación do prezo da factura e da cantidade de facturas do "
+"cliente"
+
+#. module: product_margin
+#: help:product.product,expected_margin_rate:0
+msgid "Expected margin * 100 / Expected Sale"
+msgstr "Marxe prevista * 100 / Venda prevista"
+
+#. module: product_margin
+#: help:product.product,sale_avg_price:0
+msgid "Avg. Price in Customer Invoices)"
+msgstr "Prezo medio en facturas de cliente)"
+
+#. module: product_margin
+#: help:product.product,total_cost:0
+msgid ""
+"Sum of Multification of Invoice price and quantity of Supplier Invoices "
+msgstr ""
+"Suma da multiplicación do prezo da factura e da cantidade de facturas do "
+"provedor "
+
+#. module: product_margin
+#: field:product.margin,invoice_state:0
+#: field:product.product,invoice_state:0
+msgid "Invoice State"
+msgstr "Estado da factura"
+
+#. module: product_margin
+#: help:product.product,purchase_gap:0
+msgid "Normal Cost - Total Cost"
+msgstr "Custo normal - Custo total"
+
+#. module: product_margin
+#: field:product.product,total_margin:0
+msgid "Total Margin"
+msgstr "Marxe total"
+
+#. module: product_margin
+#: view:product.product:0
+#: field:product.product,sales_gap:0
+msgid "Sales Gap"
+msgstr "Diferenza vendas"
+
+#. module: product_margin
+#: field:product.product,normal_cost:0
+msgid "Normal Cost"
+msgstr "Custo normal"
+
+#. module: product_margin
+#: view:product.product:0
+msgid "Purchases"
+msgstr "Compras"
+
+#. module: product_margin
+#: help:product.product,purchase_avg_price:0
+msgid "Avg. Price in Supplier Invoices "
+msgstr "Prezo medio en facturas de provedor "
+
+#. module: product_margin
+#: help:product.product,purchase_num_invoiced:0
+msgid "Sum of Quantity in Supplier Invoices"
+msgstr "Suma da cantidade en facturas provedor"
+
+#. module: product_margin
+#: view:product.margin:0
+msgid "Properties categories"
+msgstr "Categorías das propiedades"
+
+#. module: product_margin
+#: help:product.product,total_margin_rate:0
+msgid "Total margin * 100 / Turnover"
+msgstr "Marxe total * 100 / Volume de negocio"
+
+#. module: product_margin
+#: field:product.product,purchase_num_invoiced:0
+#: field:product.product,sale_num_invoiced:0
+msgid "# Invoiced"
+msgstr "Nº facturado"
+
+#. module: product_margin
+#: selection:product.margin,invoice_state:0
+#: selection:product.product,invoice_state:0
+msgid "Open and Paid"
+msgstr "Aberto e pechado"
+
+#. module: product_margin
+#: view:product.product:0
+msgid "Sales"
+msgstr "Vendas"
+
+#. module: product_margin
+#: code:addons/product_margin/wizard/product_margin.py:73
+#: model:ir.actions.act_window,name:product_margin.product_margin_act_window
+#: model:ir.ui.menu,name:product_margin.menu_action_product_margin
+#: view:product.product:0
+#, python-format
+msgid "Product Margins"
+msgstr "Marxes de produto"
+
+#. module: product_margin
+#: view:product.margin:0
+msgid "General Information"
+msgstr "Información xeral"
+
+#. module: product_margin
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr "Erro: Código EAN non válido"
+
+#. module: product_margin
+#: field:product.product,purchase_gap:0
+msgid "Purchase Gap"
+msgstr "Diferenza compra"
+
+#. module: product_margin
+#: field:product.product,total_margin_rate:0
+msgid "Total Margin (%)"
+msgstr "Total marxe (%)"
+
+#. module: product_margin
+#: view:product.margin:0
+msgid "Open Margins"
+msgstr "Abrir marxes"
+
+#. module: product_margin
+#: view:product.margin:0
+msgid "Cancel"
+msgstr "Anular"
+
+#. module: product_margin
+#: view:product.product:0
+msgid "Margins"
+msgstr "Marxes"
+
+#. module: product_margin
+#: help:product.product,sale_num_invoiced:0
+msgid "Sum of Quantity in Customer Invoices"
+msgstr "Suma da cantidade en facturas de cliente"
+
+#. module: product_margin
+#: model:ir.model,name:product_margin.model_product_margin
+msgid "Product Margin"
+msgstr "Marxe produto"
diff --git a/addons/purchase/i18n/nb.po b/addons/purchase/i18n/nb.po
index e3e7910414f..e4b0a135436 100644
--- a/addons/purchase/i18n/nb.po
+++ b/addons/purchase/i18n/nb.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-04-02 03:51+0000\n"
+"PO-Revision-Date: 2011-04-07 06:55+0000\n"
 "Last-Translator: Rolv Råen (adEgo) <Unknown>\n"
 "Language-Team: Norwegian Bokmal <nb@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: 2011-04-03 06:05+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-04-08 06:13+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -428,13 +428,13 @@ msgstr ""
 #. module: purchase
 #: field:purchase.order.line,account_analytic_id:0
 msgid "Analytic Account"
-msgstr "Kontodimensjon"
+msgstr "Analytisk konto"
 
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,nbr:0
 msgid "# of Lines"
-msgstr ""
+msgstr "# linjer"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:685
diff --git a/addons/warning/i18n/nb.po b/addons/warning/i18n/nb.po
new file mode 100644
index 00000000000..7a4372d9591
--- /dev/null
+++ b/addons/warning/i18n/nb.po
@@ -0,0 +1,235 @@
+# Norwegian Bokmal translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:16+0000\n"
+"PO-Revision-Date: 2011-04-07 07:27+0000\n"
+"Last-Translator: Rolv Råen (adEgo) <Unknown>\n"
+"Language-Team: Norwegian Bokmal <nb@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: 2011-04-08 06:13+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
+
+#. module: warning
+#: model:ir.model,name:warning.model_purchase_order_line
+#: field:product.product,purchase_line_warn:0
+msgid "Purchase Order Line"
+msgstr "Innkjøpsordrelinje"
+
+#. module: warning
+#: field:product.product,sale_line_warn_msg:0
+msgid "Message for Sale Order Line"
+msgstr "Melding for salgsordrelinje"
+
+#. module: warning
+#: field:product.product,purchase_line_warn_msg:0
+msgid "Message for Purchase Order Line"
+msgstr "Melding for innkjøpsordelinje"
+
+#. module: warning
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr ""
+
+#. module: warning
+#: model:ir.model,name:warning.model_stock_picking
+msgid "Picking List"
+msgstr "Plukkliste"
+
+#. module: warning
+#: field:product.product,sale_line_warn:0
+msgid "Sale Order Line"
+msgstr "Salgsordrelinje"
+
+#. module: warning
+#: view:product.product:0
+msgid "Warning when Purchasing this Product"
+msgstr "Advarsel ved kjøp av dette produktet"
+
+#. module: warning
+#: model:ir.model,name:warning.model_product_product
+msgid "Product"
+msgstr "Produkt"
+
+#. module: warning
+#: sql_constraint:purchase.order:0
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique !"
+msgstr "Ordrereferanse må være unik !"
+
+#. module: warning
+#: view:product.product:0
+#: view:res.partner:0
+msgid "Warnings"
+msgstr "Advarsler"
+
+#. module: warning
+#: selection:product.product,purchase_line_warn:0
+#: selection:product.product,sale_line_warn:0
+#: selection:res.partner,invoice_warn:0
+#: selection:res.partner,picking_warn:0
+#: selection:res.partner,purchase_warn:0
+#: selection:res.partner,sale_warn:0
+msgid "Warning"
+msgstr "Advarsel"
+
+#. module: warning
+#: selection:product.product,purchase_line_warn:0
+#: selection:product.product,sale_line_warn:0
+#: selection:res.partner,invoice_warn:0
+#: selection:res.partner,picking_warn:0
+#: selection:res.partner,purchase_warn:0
+#: selection:res.partner,sale_warn:0
+msgid "Blocking Message"
+msgstr ""
+
+#. module: warning
+#: view:res.partner:0
+msgid "Warning on the Invoice"
+msgstr "Advarsel på faktuaren"
+
+#. module: warning
+#: selection:product.product,purchase_line_warn:0
+#: selection:product.product,sale_line_warn:0
+#: selection:res.partner,invoice_warn:0
+#: selection:res.partner,picking_warn:0
+#: selection:res.partner,purchase_warn:0
+#: selection:res.partner,sale_warn:0
+msgid "No Message"
+msgstr "Ingen melding"
+
+#. module: warning
+#: model:ir.model,name:warning.model_account_invoice
+#: field:res.partner,invoice_warn:0
+msgid "Invoice"
+msgstr "Faktura"
+
+#. module: warning
+#: model:ir.module.module,shortdesc:warning.module_meta_information
+msgid "Module for Warnings form onchange Event"
+msgstr ""
+
+#. module: warning
+#: view:product.product:0
+msgid "Warning when Selling this Product"
+msgstr "Advarsel ved salg av dette produktet"
+
+#. module: warning
+#: field:res.partner,sale_warn:0
+msgid "Sale Order"
+msgstr "Salgsordre"
+
+#. module: warning
+#: field:res.partner,picking_warn:0
+msgid "Stock Picking"
+msgstr ""
+
+#. module: warning
+#: model:ir.model,name:warning.model_purchase_order
+#: field:res.partner,purchase_warn:0
+msgid "Purchase Order"
+msgstr "Innkjøpsordre"
+
+#. module: warning
+#: field:res.partner,sale_warn_msg:0
+msgid "Message for Sale Order"
+msgstr "Melding for salgsordre"
+
+#. module: warning
+#: field:res.partner,purchase_warn_msg:0
+msgid "Message for Purchase Order"
+msgstr "Melding for innkjøpsordre"
+
+#. module: warning
+#: code:addons/warning/warning.py:32
+#: help:product.product,purchase_line_warn:0
+#: help:product.product,sale_line_warn:0
+#: help:res.partner,invoice_warn:0
+#: help:res.partner,picking_warn:0
+#: help:res.partner,purchase_warn:0
+#: help:res.partner,sale_warn:0
+#, python-format
+msgid ""
+"Selecting the \"Warning\" option will notify user with the message, "
+"Selecting \"Blocking Message\" will throw an exception with the message and "
+"block the flow. The Message has to be written in the next field."
+msgstr ""
+
+#. module: warning
+#: code:addons/warning/warning.py:67
+#: code:addons/warning/warning.py:96
+#: code:addons/warning/warning.py:132
+#: code:addons/warning/warning.py:163
+#: code:addons/warning/warning.py:213
+#: code:addons/warning/warning.py:246
+#, python-format
+msgid "Alert for %s !"
+msgstr ""
+
+#. module: warning
+#: field:res.partner,invoice_warn_msg:0
+msgid "Message for Invoice"
+msgstr "Melding for faktura"
+
+#. module: warning
+#: model:ir.module.module,description:warning.module_meta_information
+msgid "Module for Warnings form onchange Event."
+msgstr ""
+
+#. module: warning
+#: view:res.partner:0
+msgid "Warning on the Picking"
+msgstr ""
+
+#. module: warning
+#: view:res.partner:0
+msgid "Warning on the Purchase Order"
+msgstr "Advarsel på innkjøpsordren"
+
+#. module: warning
+#: code:addons/warning/warning.py:68
+#: code:addons/warning/warning.py:97
+#: code:addons/warning/warning.py:134
+#: code:addons/warning/warning.py:164
+#: code:addons/warning/warning.py:214
+#: code:addons/warning/warning.py:247
+#, python-format
+msgid "Warning for %s"
+msgstr "Advarsel for %s"
+
+#. module: warning
+#: view:res.partner:0
+msgid "Warning on the Sale Order"
+msgstr "Advarsel på salgsordren"
+
+#. module: warning
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr "Feil: Ugyldig ean kode"
+
+#. module: warning
+#: field:res.partner,picking_warn_msg:0
+msgid "Message for Stock Picking"
+msgstr ""
+
+#. module: warning
+#: model:ir.model,name:warning.model_res_partner
+msgid "Partner"
+msgstr "Partner"
+
+#. module: warning
+#: model:ir.model,name:warning.model_sale_order
+msgid "Sales Order"
+msgstr "Salgsordre"
+
+#. module: warning
+#: model:ir.model,name:warning.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "Salgsordrelinje"

From 4bdebd3573bc449920c49ec762d67c64783ca953 Mon Sep 17 00:00:00 2001
From: "RME (OpenERP)" <rme@tinyerp.com>
Date: Fri, 8 Apr 2011 12:04:40 +0530
Subject: [PATCH 091/331] [FIX] crm : opportunity list view should having
 'lost' button

bzr revid: rme@tinyerp.com-20110408063440-v81v2xxodtswkzfx
---
 addons/crm/crm_opportunity_view.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index 9b87c64483e..0bb90ad6ac8 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -252,6 +252,9 @@
                         <button name="case_close" string="Won"
                             states="open,draft,pending" type="object"
                             icon="gtk-apply" />
+                        <button name="case_cancel" string="Lost"
+                            states="open,draft,pending" type="object"
+                            icon="gtk-cancel" />
                     </tree>
                 </field>
             </record>

From 3fcd4d61121a01d6ac255c0872bd3a6edaa78616 Mon Sep 17 00:00:00 2001
From: "P. Christeas" <p_christ@hol.gr>
Date: Fri, 8 Apr 2011 13:20:58 +0300
Subject: [PATCH 092/331] bin: non-scripts must be -x, scripts +x

This should solve the corresponding rpmlint errors. Python files with a
shebang must be executable. Non-standalone python shall not have a shebang.
(cherry picked from commit d44bd2dcc03a75864cae7c93020537ac573999fe)

bzr revid: p_christ@hol.gr-20110408102058-mt1xaka350dwm32x
---
 bin/release.py     | 1 -
 bin/tools/graph.py | 0
 bin/tools/which.py | 0
 3 files changed, 1 deletion(-)
 mode change 100644 => 100755 bin/tools/graph.py
 mode change 100644 => 100755 bin/tools/which.py

diff --git a/bin/release.py b/bin/release.py
index e4757fcaf62..4230a2a387c 100644
--- a/bin/release.py
+++ b/bin/release.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # -*- encoding: utf-8 -*-
 ##############################################################################
 #
diff --git a/bin/tools/graph.py b/bin/tools/graph.py
old mode 100644
new mode 100755
diff --git a/bin/tools/which.py b/bin/tools/which.py
old mode 100644
new mode 100755

From 6da197456fb232f669faa436439524254e6093b6 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Fri, 8 Apr 2011 12:37:36 +0200
Subject: [PATCH 093/331] [FIX] warnings & stuff, unbreak unlink notification
 on dataset

bzr revid: xmo@openerp.com-20110408103736-i8kju5dippuw9af4
---
 addons/base/static/src/base.html   |  2 +-
 addons/base/static/src/js/data.js  |  8 ++++----
 addons/base/static/src/js/form.js  | 17 ++++++++++-------
 addons/base/static/src/js/list.js  |  2 --
 addons/base/static/src/js/views.js | 26 +++++++++++++-------------
 5 files changed, 28 insertions(+), 27 deletions(-)

diff --git a/addons/base/static/src/base.html b/addons/base/static/src/base.html
index f8c700946f3..3c8f76a6e23 100644
--- a/addons/base/static/src/base.html
+++ b/addons/base/static/src/base.html
@@ -3,7 +3,7 @@
 <head>
     <meta http-equiv="content-type" content="text/html; charset=utf-8" />
     <title>OpenERP</title>
-    <link rel="shortcut icon" href="/base/static/openerp/img/favicon.ico" type="image/x-icon"/>
+    <link rel="shortcut icon" href="/base/static/src/img/favicon.ico" type="image/x-icon"/>
 
     <script type="text/javascript" src="/base/static/lib/LABjs/LAB.js"></script>
     <script type="text/javascript" src="/base/static/lib/underscore/underscore.js"></script>
diff --git a/addons/base/static/src/js/data.js b/addons/base/static/src/js/data.js
index 1e96dde23fc..8f5d6168e75 100644
--- a/addons/base/static/src/js/data.js
+++ b/addons/base/static/src/js/data.js
@@ -99,7 +99,7 @@ openerp.base.DataSet =  openerp.base.Controller.extend( /** @lends openerp.base.
             context: this.context
         }, callback);
     },
-    unlink: function() {
+    unlink: function(ids) {
         this.notification['default']("Unlink", ids);
     },
     call: function (method, ids, args, callback) {
@@ -111,7 +111,7 @@ openerp.base.DataSet =  openerp.base.Controller.extend( /** @lends openerp.base.
             ids: ids,
             args: args
         }, callback);
-    },
+    }
 });
 
 openerp.base.DataSetStatic =  openerp.base.DataSet.extend({
@@ -123,7 +123,7 @@ openerp.base.DataSetStatic =  openerp.base.DataSet.extend({
     },
     read_slice: function (fields, offset, limit, callback) {
         this.read_ids(this.ids.slice(offset, offset + limit));
-    },
+    }
 });
 
 openerp.base.DataSetSearch =  openerp.base.DataSet.extend({
@@ -163,7 +163,7 @@ openerp.base.DataSetSearch =  openerp.base.DataSet.extend({
             }
             callback(records);
         });
-    },
+    }
 });
 
 openerp.base.DataSetRelational =  openerp.base.DataSet.extend( /** @lends openerp.base.DataSet# */{
diff --git a/addons/base/static/src/js/form.js b/addons/base/static/src/js/form.js
index ff04f55314b..c5b45f5c870 100644
--- a/addons/base/static/src/js/form.js
+++ b/addons/base/static/src/js/form.js
@@ -140,7 +140,7 @@ openerp.base.FormView =  openerp.base.Controller.extend( /** @lends openerp.base
                 var ajax = {
                     url: '/base/dataset/call',
                     async: false
-                }
+                };
                 return this.rpc(ajax, {
                     model: this.dataset.model,
                     method: method,
@@ -212,7 +212,7 @@ openerp.base.FormView =  openerp.base.Controller.extend( /** @lends openerp.base
         if (invalid) {
             this.on_invalid();
         } else {
-            this.log("About to save", values)
+            this.log("About to save", values);
             this.dataset.write(this.datarecord.id, values, this.on_saved);
         }
     },
@@ -244,8 +244,13 @@ openerp.base.FormView =  openerp.base.Controller.extend( /** @lends openerp.base
         }
     },
     do_search: function (domains, contexts, groupbys) {
+        this.notification['default']("Searching form");
     },
     on_action: function (action) {
+        this.notification['default']('Executing action ' + action);
+    },
+    do_cancel: function () {
+        this.notification['default']("Cancelling form");
     }
 });
 
@@ -698,7 +703,7 @@ openerp.base.form.FieldMany2One = openerp.base.form.Field.extend({
     },
     set_value: function(value) {
         this._super.apply(this, arguments);
-        var show_value = ''
+        var show_value = '';
         if (value != null && value !== false) {
             show_value = value[1];
             this.value = value[0];
@@ -713,17 +718,15 @@ openerp.base.form.FieldOne2ManyDatasSet = openerp.base.DataSetStatic.extend({
     write: function (id, data, callback) {
         this._super(id, data, callback);
     },
-    write: function (id, data, callback) {
-        this._super(id, data, callback);
-    },
     unlink: function() {
+        this.notification['default']('Unlinking o2m ' + this.ids);
     }
 });
 
 openerp.base.form.FieldOne2ManyViewManager = openerp.base.ViewManager.extend({
     init: function(session, element_id, dataset, views) {
         this._super(session, element_id, dataset, views);
-    },
+    }
 });
 
 openerp.base.form.FieldOne2Many = openerp.base.form.Field.extend({
diff --git a/addons/base/static/src/js/list.js b/addons/base/static/src/js/list.js
index 533ff0d9deb..da52bd75138 100644
--- a/addons/base/static/src/js/list.js
+++ b/addons/base/static/src/js/list.js
@@ -83,7 +83,6 @@ openerp.base.ListView = openerp.base.Controller.extend(
      * @returns {Promise} promise to the end of view rendering (list views are asynchronously filled for improved responsiveness)
      */
     do_fill_table: function(records) {
-        console.log("listview do_fill",records)
         this.rows = records;
 
         var $table = this.$element.find('table');
@@ -148,7 +147,6 @@ openerp.base.ListView = openerp.base.Controller.extend(
     },
     do_search: function (domains, contexts, groupbys) {
         var self = this;
-        console.log("listview do_search",domains)
         this.rpc('/base/session/eval_domain_and_context', {
             domains: domains,
             contexts: contexts,
diff --git a/addons/base/static/src/js/views.js b/addons/base/static/src/js/views.js
index 6adc0fc3d38..2b7d0abde45 100644
--- a/addons/base/static/src/js/views.js
+++ b/addons/base/static/src/js/views.js
@@ -141,7 +141,6 @@ openerp.base.ViewManagerAction = openerp.base.ViewManager.extend({
             this.sidebar = new openerp.base.Sidebar(null, this);
     },
     start: function() {
-        var self = this;
         var inital_view_loaded = this._super();
 
         // init sidebar
@@ -173,29 +172,30 @@ openerp.base.ViewManagerAction = openerp.base.ViewManager.extend({
             this.sidebar.stop();
         }
         this._super();
-    },
+    }
 });
 
 openerp.base.BaseWidget = openerp.base.Controller.extend({
     /**
-     * The name of the QWeb template that will be used for rendering. Must be redifined
-     * in subclasses or the render() method can not be used.
+     * The name of the QWeb template that will be used for rendering. Must be
+     * redefined in subclasses or the render() method can not be used.
      * 
      * @type string
      */
     template: null,
     /**
-     * The prefix used to generate an id automatically. Should be redifined in subclasses.
-     * If it is not defined, a default identifier will be used.
+     * The prefix used to generate an id automatically. Should be redefined in
+     * subclasses. If it is not defined, a default identifier will be used.
      * 
      * @type string
      */
     identifier_prefix: 'generic-identifier',
     /**
-     * Base class for widgets. Handle rendering (based on a QWeb template), identifier
-     * generation, parenting and destruction of the widget.
-     * Contructor. Also initialize the identifier.
-     * 
+     * Base class for widgets. Handle rendering (based on a QWeb template),
+     * identifier generation, parenting and destruction of the widget.
+     * Also initialize the identifier.
+     *
+     * @constructs
      * @params {openerp.base.search.BaseWidget} parent The parent widget.
      */
     init: function (parent, session) {
@@ -242,8 +242,8 @@ openerp.base.BaseWidget = openerp.base.Controller.extend({
         this._super();
     },
     /**
-     * Set the parent of this component, also unregister the previous parent if there
-     * was one.
+     * Set the parent of this component, also un-register the previous parent
+     * if there was one.
      * 
      * @param {openerp.base.BaseWidget} parent The new parent.
      */
@@ -289,7 +289,7 @@ openerp.base.Sidebar = openerp.base.BaseWidget.extend({
         this.$element.html(QWeb.render("ViewManager.sidebar.internal", _.extend({_:_}, this)));
         var self = this;
         this.$element.find("a").click(function(e) {
-            $this = jQuery(this);
+            var $this = jQuery(this);
             var i = $this.attr("data-i");
             var j = $this.attr("data-i");
             var action = self.sections[i].elements[j];

From da9ef6e6ed7d710efb389cf35bbb3dc472c5c234 Mon Sep 17 00:00:00 2001
From: "noz (OpenERP)" <noz@tinyerp.com>
Date: Fri, 8 Apr 2011 16:28:06 +0530
Subject: [PATCH 094/331] [FIX] Minor starting for web chat.

bzr revid: noz@tinyerp.com-20110408105806-cofc88534c7fab19
---
 addons/web_chat/controllers/main.py | 42 ++++++++++++++++++-----------
 1 file changed, 26 insertions(+), 16 deletions(-)

diff --git a/addons/web_chat/controllers/main.py b/addons/web_chat/controllers/main.py
index d8d33bac445..24409ebce65 100644
--- a/addons/web_chat/controllers/main.py
+++ b/addons/web_chat/controllers/main.py
@@ -2,7 +2,7 @@
 import sys, time
 
 import simplejson
-
+import random
 import openerpweb
 
 #----------------------------------------------------------
@@ -17,13 +17,17 @@ class PollServerMessageQueue(object):
         # should contains: {
         #   'user1234' : { s:1, m:"status message", timestamp: last_contact_timestamp }
         # }
-    def userlist():
-        # return user list
-        pass
+    def userlist(self, req):
+        userlist = [
+                    {"u": "Guest130205108745.47", "s": {"s": 1, "m": ""}, "g": "Users"},
+                    {"u": "Guest130209838956.76", "s": {"s": 1, "m": ""}, "g": "Users"},
+                ]
+
+        return userlist
 
     def write(self, m_type,  m_sender, m_recipent, m_message, m_group):
         # appends messages to l
-        # when status message uupdate users
+        # when status message update users
         pass
     def read(self, recpient, timestamp):
         # return matching message
@@ -38,6 +42,7 @@ class PollServer(openerpweb.Controller):
 
     @openerpweb.httprequest
     def login(self, req, **kw):
+                
         """
         --> POST http://ajaxim.com/wp-content/plugins/im/ajaxim.php/login
             Form Data
@@ -56,21 +61,26 @@ class PollServer(openerpweb.Controller):
                 ]
             }
         """
-        mq = req.applicationsession.setdefault("web_chat",PollServerMessageQueue())
-        print "chat login",kw
-        # r = 'loggued in'
+        mq = req.applicationsession.setdefault("web_chat", PollServerMessageQueue())
+        
+        #r = 'loggued in'
         #u = generate random.randint(0,2**32)
         #s = cherrypy cookie id
         #f = mq.userlist()
-        return  """
+        
+#        username = 'Guest'+ str(random.randint(0, 2**32))
+#        
+#        if not req.applicationsession.get('users'):
+#            req.applicationsession['users'] = [{'u': username, 's':{'s':1, 'm':''}, 'g':'Users'}]
+#        else:
+#            req.applicationsession['users'].append({'u': username, 's':{'s':1, 'm':''}, 'g':'Users'})
+        
+        return """
             {
                 "r":"logged in",
                 "u":"Guest130213866190.85",
                 "s":"f9e1811536f19ad5b9e00376f9ff1532",
-                "f":[
-                    {"u":"Guest130205108745.47","s":{"s":1,"m":""},"g":"Users"},
-                    {"u":"Guest130209838956.76","s":{"s":1,"m":""},"g":"Users"},
-                ]
+                "f":""" + str(mq.userlist(req)) + """
             }
         """
 
@@ -98,7 +108,7 @@ class PollServer(openerpweb.Controller):
             jsonp1302140441577([{"t":"s","s":"Guest130214038974.31","r":"","m":"0:"}]);
 
             receive message:
-            jsonp1302140191599([{"t":"m","s":"Guest130214008855.5","r":"Guest130214013134.26","m":"fuck"}]);
+            jsonp1302140191599([{"t":"m","s":"Guest130214008855.5","r":"Guest130214013134.26","m":"xxxxxx"}]);
 
             ('t' => $msg->type, 's' => $msg->from, 'r' => $msg->to, 'm' => $msg->message )
             mag type s or m
@@ -114,10 +124,10 @@ class PollServer(openerpweb.Controller):
                 # sleep 2
         # else
             # return emptylist
-        print "chat poll",kw
+            
         time.sleep(2)
         # it's http://localhost:8002/web_chat/pollserver/poll?method=long?callback=jsonp1302147330483&_1302147330483=
-        return '%s([{"t":"m","s":"Guest130214008855.5","r":"Guest130214013134.26","m":"fuck"}]);'%kw.get('callback','')
+        return '%s([{"t":"m","s":"Guest130214008855.5","r":"Guest130214013134.26","m":"xxxxxx"}]);'%kw.get('callback','')
         return None
 
     @openerpweb.jsonrequest

From 9e44cd5bfe1e1fe30d0e1f98799fd7dc7a6dad6e Mon Sep 17 00:00:00 2001
From: "P. Christeas" <p_christ@hol.gr>
Date: Fri, 8 Apr 2011 14:23:24 +0300
Subject: [PATCH 095/331] all: Fix execute permission and shebang at files

Non-standalone python scripts shall not have a shebang. Others will need
to be executable.
(cherry picked from commit 6ec513d17cafcdd235b4805363d3cd6daa494f2f)

bzr revid: p_christ@hol.gr-20110408112324-nc781po7efhjye21
---
 addons/account/report/account_tax_code.py              |  1 -
 addons/account/wizard/account_change_currency.py       |  1 -
 .../plugin/openerp_report_designer/bin/OOo_run.sh      |  0
 addons/document/odt2txt.py                             |  0
 addons/document/test_cindex.py                         |  0
 addons/document_ftp/ftpserver/ftpserver.py             |  0
 addons/document_webdav/test_davclient.py               |  0
 addons/email_template/html2text.py                     | 10 +++++-----
 addons/fetchmail/__init__.py                           |  1 -
 addons/fetchmail/__openerp__.py                        |  1 -
 addons/hr_payroll/report/__init__.py                   |  1 -
 .../hr_payroll/report/report_emp_salary_structure.py   |  8 --------
 addons/hr_payroll/report/report_employees_detail.py    |  2 --
 addons/hr_payroll/report/report_payroll_advice.py      |  3 +--
 addons/hr_payroll/report/report_payroll_register.py    |  3 +--
 addons/hr_payroll/report/report_payslip.py             |  1 -
 addons/hr_payroll/report/report_year_salary.py         |  2 --
 addons/l10n_ch/readme.txt                              |  0
 addons/l10n_de/i18n/pt_BR.po                           |  0
 addons/l10n_de/i18n/zh_CN.po                           |  0
 addons/l10n_de/i18n/zh_TW.po                           |  0
 .../scripts/openerp_mailgate/openerp_mailgate.py       |  0
 addons/sale_layout/i18n/fr.po                          |  0
 .../plugin/openerp_plugin/defaults/preferences/tiny.js |  0
 addons/wiki/web/widgets/rss/feedparser.py              |  0
 25 files changed, 7 insertions(+), 27 deletions(-)
 mode change 100644 => 100755 addons/base_report_designer/plugin/openerp_report_designer/bin/OOo_run.sh
 mode change 100644 => 100755 addons/document/odt2txt.py
 mode change 100644 => 100755 addons/document/test_cindex.py
 mode change 100644 => 100755 addons/document_ftp/ftpserver/ftpserver.py
 mode change 100644 => 100755 addons/document_webdav/test_davclient.py
 mode change 100644 => 100755 addons/email_template/html2text.py
 mode change 100755 => 100644 addons/l10n_ch/readme.txt
 mode change 100755 => 100644 addons/l10n_de/i18n/pt_BR.po
 mode change 100755 => 100644 addons/l10n_de/i18n/zh_CN.po
 mode change 100755 => 100644 addons/l10n_de/i18n/zh_TW.po
 mode change 100644 => 100755 addons/mail_gateway/scripts/openerp_mailgate/openerp_mailgate.py
 mode change 100755 => 100644 addons/sale_layout/i18n/fr.po
 mode change 100755 => 100644 addons/thunderbird/plugin/openerp_plugin/defaults/preferences/tiny.js
 mode change 100644 => 100755 addons/wiki/web/widgets/rss/feedparser.py

diff --git a/addons/account/report/account_tax_code.py b/addons/account/report/account_tax_code.py
index 86d3128cfe7..56895987b45 100644
--- a/addons/account/report/account_tax_code.py
+++ b/addons/account/report/account_tax_code.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ##############################################################################
 #
diff --git a/addons/account/wizard/account_change_currency.py b/addons/account/wizard/account_change_currency.py
index d915a1cd34b..4a4209dc757 100644
--- a/addons/account/wizard/account_change_currency.py
+++ b/addons/account/wizard/account_change_currency.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # -*- encoding: utf-8 -*-
 ##############################################################################
 #
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/OOo_run.sh b/addons/base_report_designer/plugin/openerp_report_designer/bin/OOo_run.sh
old mode 100644
new mode 100755
diff --git a/addons/document/odt2txt.py b/addons/document/odt2txt.py
old mode 100644
new mode 100755
diff --git a/addons/document/test_cindex.py b/addons/document/test_cindex.py
old mode 100644
new mode 100755
diff --git a/addons/document_ftp/ftpserver/ftpserver.py b/addons/document_ftp/ftpserver/ftpserver.py
old mode 100644
new mode 100755
diff --git a/addons/document_webdav/test_davclient.py b/addons/document_webdav/test_davclient.py
old mode 100644
new mode 100755
diff --git a/addons/email_template/html2text.py b/addons/email_template/html2text.py
old mode 100644
new mode 100755
index af7848fee2d..2479843777a
--- a/addons/email_template/html2text.py
+++ b/addons/email_template/html2text.py
@@ -444,11 +444,11 @@ if __name__ == "__main__":
             encoding = 'utf8'
             if len(sys.argv) > 2:
                 encoding = sys.argv[2]
-	    f = open(arg, 'r')
-	    try:
-		    data = f.read().decode(encoding)
-	    finally:
-		    f.close()
+            f = open(arg, 'r')
+            try:
+                    data = f.read().decode(encoding)
+            finally:
+                    f.close()
     else:
         data = sys.stdin.read().decode('utf8')
     wrapwrite(html2text(data, baseurl))
diff --git a/addons/fetchmail/__init__.py b/addons/fetchmail/__init__.py
index d58bfd1d81b..f9c384ce103 100644
--- a/addons/fetchmail/__init__.py
+++ b/addons/fetchmail/__init__.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 #-*- coding:utf-8 -*-
 ##############################################################################
 #
diff --git a/addons/fetchmail/__openerp__.py b/addons/fetchmail/__openerp__.py
index 6d72f6ea917..29029d2cc0e 100644
--- a/addons/fetchmail/__openerp__.py
+++ b/addons/fetchmail/__openerp__.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 #-*- coding:utf-8 -*-
 ##############################################################################
 #
diff --git a/addons/hr_payroll/report/__init__.py b/addons/hr_payroll/report/__init__.py
index 3113f281326..f7e464d3129 100644
--- a/addons/hr_payroll/report/__init__.py
+++ b/addons/hr_payroll/report/__init__.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 #-*- coding:utf-8 -*-
 
 ##############################################################################
diff --git a/addons/hr_payroll/report/report_emp_salary_structure.py b/addons/hr_payroll/report/report_emp_salary_structure.py
index 0da09d16562..28fdb6dec45 100644
--- a/addons/hr_payroll/report/report_emp_salary_structure.py
+++ b/addons/hr_payroll/report/report_emp_salary_structure.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 #-*- coding:utf-8 -*-
 
 ##############################################################################
@@ -89,10 +88,3 @@ class salary_structure_report(report_sxw.rml_parse):
 report_sxw.report_sxw('report.salary.structure', 'hr.employee', 'hr_payroll/report/report_emp_salary_structure.rml', parser=salary_structure_report)
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
-
-
-
-
-
-
diff --git a/addons/hr_payroll/report/report_employees_detail.py b/addons/hr_payroll/report/report_employees_detail.py
index 0e1451e469c..522e36e742f 100644
--- a/addons/hr_payroll/report/report_employees_detail.py
+++ b/addons/hr_payroll/report/report_employees_detail.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 #-*- coding:utf-8 -*-
 
 ##############################################################################
@@ -249,4 +248,3 @@ class employees_salary_report(report_sxw.rml_parse):
 report_sxw.report_sxw('report.employees.salary', 'hr.payslip', 'hr_payroll/report/report_employees_detail.rml', parser=employees_salary_report,header='internal landscape')
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/hr_payroll/report/report_payroll_advice.py b/addons/hr_payroll/report/report_payroll_advice.py
index 5ac20d91d71..7d8c6fd953c 100644
--- a/addons/hr_payroll/report/report_payroll_advice.py
+++ b/addons/hr_payroll/report/report_payroll_advice.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 #-*- coding:utf-8 -*-
 
 ##############################################################################
@@ -78,4 +77,4 @@ class payroll_advice_report(report_sxw.rml_parse):
 report_sxw.report_sxw('report.payroll.advice', 'hr.payroll.advice', 'hr_payroll/report/report_payroll_advice.rml', parser=payroll_advice_report)
 
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_payroll/report/report_payroll_register.py b/addons/hr_payroll/report/report_payroll_register.py
index 9410a4eedb2..96dde962074 100644
--- a/addons/hr_payroll/report/report_payroll_register.py
+++ b/addons/hr_payroll/report/report_payroll_register.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 #-*- coding:utf-8 -*-
 
 ##############################################################################
@@ -106,4 +105,4 @@ report_sxw.report_sxw(
     parser=report_payroll_register
 )
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_payroll/report/report_payslip.py b/addons/hr_payroll/report/report_payslip.py
index d5cd6532251..78e6ee2ff64 100644
--- a/addons/hr_payroll/report/report_payslip.py
+++ b/addons/hr_payroll/report/report_payslip.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 #-*- coding:utf-8 -*-
 
 ##############################################################################
diff --git a/addons/hr_payroll/report/report_year_salary.py b/addons/hr_payroll/report/report_year_salary.py
index bc7ac8fc93a..4c5a506d2d3 100644
--- a/addons/hr_payroll/report/report_year_salary.py
+++ b/addons/hr_payroll/report/report_year_salary.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 #-*- coding:utf-8 -*-
 
 ##############################################################################
@@ -119,4 +118,3 @@ class year_salary_report(report_sxw.rml_parse):
 report_sxw.report_sxw('report.year.salary', 'hr.payslip', 'hr_payroll/report/report_year_report.rml', parser=year_salary_report,header='internal landscape')
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/l10n_ch/readme.txt b/addons/l10n_ch/readme.txt
old mode 100755
new mode 100644
diff --git a/addons/l10n_de/i18n/pt_BR.po b/addons/l10n_de/i18n/pt_BR.po
old mode 100755
new mode 100644
diff --git a/addons/l10n_de/i18n/zh_CN.po b/addons/l10n_de/i18n/zh_CN.po
old mode 100755
new mode 100644
diff --git a/addons/l10n_de/i18n/zh_TW.po b/addons/l10n_de/i18n/zh_TW.po
old mode 100755
new mode 100644
diff --git a/addons/mail_gateway/scripts/openerp_mailgate/openerp_mailgate.py b/addons/mail_gateway/scripts/openerp_mailgate/openerp_mailgate.py
old mode 100644
new mode 100755
diff --git a/addons/sale_layout/i18n/fr.po b/addons/sale_layout/i18n/fr.po
old mode 100755
new mode 100644
diff --git a/addons/thunderbird/plugin/openerp_plugin/defaults/preferences/tiny.js b/addons/thunderbird/plugin/openerp_plugin/defaults/preferences/tiny.js
old mode 100755
new mode 100644
diff --git a/addons/wiki/web/widgets/rss/feedparser.py b/addons/wiki/web/widgets/rss/feedparser.py
old mode 100644
new mode 100755

From 9262c3c00dfdad634a8f2829abe2d14b6540e63a Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Fri, 8 Apr 2011 14:40:20 +0200
Subject: [PATCH 096/331] [FIX] fuckup with deferred for rendering of list
 (when beyond one section), also only remove old body after new list has
 rendered otherwise we get an empty list flash even for lists with a bunch of
 elements

bzr revid: xmo@openerp.com-20110408124020-25dprn6gu19y02m6
---
 addons/base/static/src/js/list.js | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/addons/base/static/src/js/list.js b/addons/base/static/src/js/list.js
index 4b1eeaaf993..4fc3ef07720 100644
--- a/addons/base/static/src/js/list.js
+++ b/addons/base/static/src/js/list.js
@@ -89,7 +89,7 @@ openerp.base.ListView = openerp.base.Controller.extend(
 
         var $table = this.$element.find('table');
         // remove all data lines
-        $table.find('tbody').remove();
+        var $old_body = $table.find('tbody');
 
         // add new content
         var columns = this.columns,
@@ -102,8 +102,8 @@ openerp.base.ListView = openerp.base.Controller.extend(
             body = 0,
             $body = $('<tbody>').appendTo($table);
 
+        var rendered = $.Deferred();
         var render_body = function () {
-            var rendered = $.Deferred();
             setTimeout(function () {
                 $body.append(
                     QWeb.render("ListView.rows", {
@@ -118,9 +118,12 @@ openerp.base.ListView = openerp.base.Controller.extend(
                     rendered.resolve();
                 }
             }, 0);
-            return rendered.promise();
         };
-        return render_body();
+        render_body();
+
+        return rendered.promise().then(function () {
+            $old_body.remove();
+        });
     },
     on_select_row: function (event) {
         var $target = $(event.currentTarget);

From f7ee4987fcb5aa0e2f4bf6c0dada0d3c64289df7 Mon Sep 17 00:00:00 2001
From: "Rucha (Open ERP)" <rpa@tinyerp.com>
Date: Fri, 8 Apr 2011 19:02:12 +0530
Subject: [PATCH 097/331] [FIX]: stock: Fixed wrong qty in stock move(posted
 inventory) when confirming inventory for the products which have earlier
 moves with production lot and we use the same prodlot

lp bug: https://launchpad.net/bugs/747379 fixed

bzr revid: rpa@tinyerp.com-20110408133212-zh6k36mgfexh6j0i
---
 addons/stock/product.py | 17 ++++++++++-------
 addons/stock/stock.py   |  2 +-
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/addons/stock/product.py b/addons/stock/product.py
index 27b7590cf5d..2a819ea89b2 100644
--- a/addons/stock/product.py
+++ b/addons/stock/product.py
@@ -248,6 +248,7 @@ class product_product(osv.osv):
             date_str = "date<=%s"
             date_values = [to_date]
 
+        prodlot_id = context.get('prodlot_id', False)
 
     # TODO: perhaps merge in one query.
         if date_values:
@@ -257,10 +258,11 @@ class product_product(osv.osv):
             cr.execute(
                 'select sum(product_qty), product_id, product_uom '\
                 'from stock_move '\
-                'where location_id NOT IN %s'\
-                'and location_dest_id IN %s'\
-                'and product_id IN %s'\
-                'and state IN %s' + (date_str and 'and '+date_str+' ' or '') +''\
+                'where location_id NOT IN %s '\
+                'and location_dest_id IN %s '\
+                'and product_id IN %s '\
+                '' + (prodlot_id and ('and prodlot_id = ' + str(prodlot_id)) or '') + ' '\
+                'and state IN %s ' + (date_str and 'and '+date_str+' ' or '') +' '\
                 'group by product_id,product_uom',tuple(where))
             results = cr.fetchall()
         if 'out' in what:
@@ -268,10 +270,11 @@ class product_product(osv.osv):
             cr.execute(
                 'select sum(product_qty), product_id, product_uom '\
                 'from stock_move '\
-                'where location_id IN %s'\
+                'where location_id IN %s '\
                 'and location_dest_id NOT IN %s '\
-                'and product_id  IN %s'\
-                'and state in %s' + (date_str and 'and '+date_str+' ' or '') + ''\
+                'and product_id  IN %s '\
+                '' + (prodlot_id and ('and prodlot_id = ' + str(prodlot_id)) or '') + ' '\
+                'and state in %s ' + (date_str and 'and '+date_str+' ' or '') + ' '\
                 'group by product_id,product_uom',tuple(where))
             results2 = cr.fetchall()
         uom_obj = self.pool.get('product.uom')
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index af1b783709e..aeb82269357 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -2556,7 +2556,7 @@ class stock_inventory(osv.osv):
             move_ids = []
             for line in inv.inventory_line_id:
                 pid = line.product_id.id
-                product_context.update(uom=line.product_uom.id,date=inv.date)
+                product_context.update(uom=line.product_uom.id, date=inv.date, prodlot_id=line.prod_lot_id.id)
                 amount = location_obj._product_get(cr, uid, line.location_id.id, [pid], product_context)[pid]
 
                 change = line.product_qty - amount

From 4a5f76f7e66dce8e4c06a12a3e381946cf9fff54 Mon Sep 17 00:00:00 2001
From: "Jay Vora (OpenERP)" <jvo@tinyerp.com>
Date: Fri, 8 Apr 2011 19:31:30 +0530
Subject: [PATCH 098/331] [FIX] Product : Correcter pricelist calculation if
 base price set to 0

lp bug: https://launchpad.net/bugs/710521 fixed

bzr revid: jvo@tinyerp.com-20110408140130-uc06lphwpp5xnd04
---
 addons/product/pricelist.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/product/pricelist.py b/addons/product/pricelist.py
index de8fd701492..ad04b056210 100644
--- a/addons/product/pricelist.py
+++ b/addons/product/pricelist.py
@@ -264,7 +264,7 @@ class product_pricelist(osv.osv):
                                     product_obj.price_get(cr, uid, [product_id],
                                         price_type.field,context=context)[product_id], round=False, context=context)
 
-                        if price:
+                        if price is not False:
                             price_limit = price
 
                             price = price * (1.0+(res['price_discount'] or 0.0))

From b02cbab49f7b1b67e2b989c72b232838ecd29f90 Mon Sep 17 00:00:00 2001
From: "Tidiane Sy (Baamtu)" <tsy@baamtu.com>
Date: Fri, 8 Apr 2011 16:23:10 +0200
Subject: [PATCH 099/331] [IMP] add CFA currency and rate

bzr revid: tsy@baamtu.com-20110408142310-mas92mtjb4jupv8m
---
 openerp/addons/base/base_data.xml | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/openerp/addons/base/base_data.xml b/openerp/addons/base/base_data.xml
index 89a9d254e6b..9a1cf95afd7 100644
--- a/openerp/addons/base/base_data.xml
+++ b/openerp/addons/base/base_data.xml
@@ -1033,7 +1033,7 @@
             <field name="currency_id" ref="EUR"/>
             <field eval="time.strftime('%Y-01-01')" name="name"/>
         </record>
-
+	
         <!-- Basic Company  -->
         <record id="main_company" model="res.company">
             <field name="name">OpenERP S.A.</field>
@@ -1617,5 +1617,18 @@
             <field name="currency_id" ref="MUR"/>
             <field eval="time.strftime('%Y-01-01')" name="name"/>
         </record>
+	
+	<record id="CFA" model="res.currency">
+		<field name="name">CFA</field>
+		<field name="symbol">CFA</field>
+		<field name="rounding">1</field>
+		<field name="accuracy">4</field>
+		<field name="company_id" ref="main_company"/>
+	</record>
+	<record id="rateCFA" model="res.currency.rate">
+           <field name="rate">655.957</field>
+           <field name="currency_id" ref="CFA"/>
+           <field eval="time.strftime('%Y-01-01')" name="name"/>
+       </record>
     </data>
 </openerp>

From 29ed9f9be3053e62aae0fb12275500a8368d68b9 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Fri, 8 Apr 2011 17:25:08 +0200
Subject: [PATCH 100/331] [IMP] Action wip - popup is working.

bzr revid: nicolas.vanhoren@openerp.com-20110408152508-5mes2key0yzq9avq
---
 addons/base/controllers/main.py     | 43 +++++++++++++++++++++++++++
 addons/base/static/src/js/views.js  | 46 +++++++++++++++++++----------
 addons/base/static/src/xml/base.xml |  2 +-
 3 files changed, 75 insertions(+), 16 deletions(-)

diff --git a/addons/base/controllers/main.py b/addons/base/controllers/main.py
index a7782a508fe..ce2fdd531e8 100644
--- a/addons/base/controllers/main.py
+++ b/addons/base/controllers/main.py
@@ -9,6 +9,8 @@ import openerpweb
 import openerpweb.ast
 import openerpweb.nonliterals
 
+import cherrypy
+
 # Should move to openerpweb.Xml2Json
 class Xml2Json:
     # xml2json-direct
@@ -168,6 +170,47 @@ class Session(openerpweb.Controller):
             'domain': domain,
             'group_by': group_by_sequence
         }
+
+    @openerpweb.jsonrequest
+    def save_session_action(self, req, the_action):
+        """
+        This method store an action object in the session object and returns an integer
+        identifying that action. The method get_session_action() can be used to get
+        back the action.
+        
+        :param the_action: The action to save in the session.
+        :type the_action: anything
+        :return: A key identifying the saved action.
+        :rtype: integer
+        """
+        saved_actions = cherrypy.session.get('saved_actions')
+        if not saved_actions:
+            saved_actions = {"next":0, "actions":{}}
+            cherrypy.session['saved_actions'] = saved_actions
+        # we don't allow more than 10 stored actions
+        if len(saved_actions["actions"]) >= 10:
+            del saved_actions["actions"][min(saved_actions["actions"].keys())]
+        key = saved_actions["next"]
+        saved_actions["actions"][key] = the_action
+        saved_actions["next"] = key + 1
+        return key
+
+    @openerpweb.jsonrequest
+    def get_session_action(self, req, key):
+        """
+        Gets back a previously saved action. This method can return None if the action
+        was saved since too much time (this case should be handled in a smart way).
+        
+        :param key: The key given by save_session_action()
+        :type key: integer
+        :return: The saved action or None.
+        :rtype: anything
+        """
+        saved_actions = cherrypy.session.get('saved_actions')
+        if not saved_actions:
+            return None
+        return saved_actions["actions"].get(key)
+        
         
 def load_actions_from_ir_values(req, key, key2, models, meta, context):
     Values = req.session.model('ir.values')
diff --git a/addons/base/static/src/js/views.js b/addons/base/static/src/js/views.js
index 1707a4db54a..2828b832afd 100644
--- a/addons/base/static/src/js/views.js
+++ b/addons/base/static/src/js/views.js
@@ -159,10 +159,13 @@ openerp.base.ViewManagerAction = openerp.base.ViewManager.extend({
                 search_defaults[match[1]] = value;
             }
         });
-        var searchview_loaded = this.setup_search_view(view_id,search_defaults);
+        var searchview_loaded = null;
+        if (view_id) {
+            searchview_loaded = this.setup_search_view(view_id,search_defaults);
+        }
 
         // schedule auto_search
-        if (this.action['auto_search']) {
+        if (searchview_loaded != null && this.action['auto_search']) {
             $.when(searchview_loaded, inital_view_loaded)
                 .then(this.searchview.do_search);
         }
@@ -291,9 +294,10 @@ openerp.base.Sidebar = openerp.base.BaseWidget.extend({
         this.$element.find("a").click(function(e) {
             $this = jQuery(this);
             var i = $this.attr("data-i");
-            var j = $this.attr("data-i");
+            var j = $this.attr("data-j");
             var action = self.sections[i].elements[j];
-            openerp.base.handle_action(self.view_manager.session, action);
+            (new openerp.base.ExternalActionManager(self.view_manager.session, null))
+                .handle_action(action);
             e.stopPropagation();
             e.preventDefault();
         });
@@ -304,19 +308,31 @@ openerp.base.Sidebar = openerp.base.BaseWidget.extend({
     }
 });
 
-openerp.base.handle_action = function(session, action) {
-    if(action.type=="ir.actions.act_window") {
-        if(action.target=="new") {
-            var element_id = _.uniqueId("act_window_dialog");
-            var dialog = $('<div id="'+element_id+'"></div>');
-            dialog.dialog({
-                title: action.name
-            });
-            var viewmanager = new openerp.base.ViewManagerAction(session,element_id, action, false);
-            viewmanager.start();
+openerp.base.ExternalActionManager = openerp.base.Controller.extend({
+    handle_action: function(action) {
+        if(action.type=="ir.actions.act_window") {
+            if(action.target=="new") {
+                var element_id = _.uniqueId("act_window_dialog");
+                var dialog = $('<div id="'+element_id+'"></div>');
+                dialog.dialog({
+                    title: action.name
+                });
+                var viewmanager = new openerp.base.ViewManagerAction(this.session
+                        ,element_id, action, false);
+                viewmanager.start();
+            } else if (action.target == "current") {
+                this.rpc("/base/session/save_session_action", {the_action:action}, function(key) {
+                    debugger;
+                    var url = window.location.href;
+                    //window.open();
+                });
+            }
         }
+        // TODO: show an error like "not implemented" here
+        // since we don't currently have any way to handle errors do you have any better idea
+        // than using todos?
     }
-};
+});
 
 openerp.base.views.add('calendar', 'openerp.base.CalendarView');
 openerp.base.CalendarView = openerp.base.Controller.extend({
diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml
index 0b3fb9b050a..e96c639769f 100644
--- a/addons/base/static/src/xml/base.xml
+++ b/addons/base/static/src/xml/base.xml
@@ -492,7 +492,7 @@
             <t t-set="j" t-value="0"/>
             <t t-foreach="section.elements" t-as="element">
                 <li><a t-att-data-i="i" t-att-data-j="j" href="#"><t t-esc="element.name"/></a></li>
-                <t t-set="j+1" t-value="0"/>
+                <t t-set="j" t-value="j+1"/>
             </t>
         </ul>
         </t>

From 77354e54921e1fafdd9d480537b422d0e2c27a26 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Sat, 9 Apr 2011 04:59:39 +0000
Subject: [PATCH 101/331] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20110409045939-c79i91qgcjnua4c9
---
 bin/addons/base/i18n/af.po       |    4 +-
 bin/addons/base/i18n/am.po       |    4 +-
 bin/addons/base/i18n/ar.po       |    4 +-
 bin/addons/base/i18n/bg.po       |  799 +++----
 bin/addons/base/i18n/bs.po       |    4 +-
 bin/addons/base/i18n/ca.po       |   14 +-
 bin/addons/base/i18n/cs.po       |    4 +-
 bin/addons/base/i18n/da.po       |    4 +-
 bin/addons/base/i18n/de.po       |   10 +-
 bin/addons/base/i18n/el.po       |    4 +-
 bin/addons/base/i18n/en_GB.po    |    4 +-
 bin/addons/base/i18n/es.po       |   12 +-
 bin/addons/base/i18n/es_CL.po    |    4 +-
 bin/addons/base/i18n/es_EC.po    |    4 +-
 bin/addons/base/i18n/et.po       |   71 +-
 bin/addons/base/i18n/eu.po       |    4 +-
 bin/addons/base/i18n/fa.po       |    4 +-
 bin/addons/base/i18n/fa_AF.po    |    4 +-
 bin/addons/base/i18n/fi.po       |    4 +-
 bin/addons/base/i18n/fr.po       |   12 +-
 bin/addons/base/i18n/gl.po       |    4 +-
 bin/addons/base/i18n/he.po       |    4 +-
 bin/addons/base/i18n/hr.po       |    6 +-
 bin/addons/base/i18n/hu.po       |    4 +-
 bin/addons/base/i18n/id.po       |    4 +-
 bin/addons/base/i18n/is.po       |    4 +-
 bin/addons/base/i18n/it.po       |    6 +-
 bin/addons/base/i18n/ja.po       |    4 +-
 bin/addons/base/i18n/ko.po       |  142 +-
 bin/addons/base/i18n/lt.po       |    6 +-
 bin/addons/base/i18n/lv.po       |    4 +-
 bin/addons/base/i18n/mn.po       |    4 +-
 bin/addons/base/i18n/nb.po       | 3407 ++++++++++++++++++++----------
 bin/addons/base/i18n/nl.po       |    6 +-
 bin/addons/base/i18n/nl_BE.po    |    4 +-
 bin/addons/base/i18n/pl.po       |    8 +-
 bin/addons/base/i18n/pt.po       |    4 +-
 bin/addons/base/i18n/pt_BR.po    |  413 ++--
 bin/addons/base/i18n/ro.po       |   20 +-
 bin/addons/base/i18n/ru.po       |    6 +-
 bin/addons/base/i18n/sk.po       |    4 +-
 bin/addons/base/i18n/sl.po       |    4 +-
 bin/addons/base/i18n/sq.po       |    4 +-
 bin/addons/base/i18n/sr.po       |    4 +-
 bin/addons/base/i18n/sr@latin.po |    4 +-
 bin/addons/base/i18n/sv.po       |    4 +-
 bin/addons/base/i18n/th.po       |    4 +-
 bin/addons/base/i18n/tlh.po      |    4 +-
 bin/addons/base/i18n/tr.po       |    4 +-
 bin/addons/base/i18n/uk.po       |    4 +-
 bin/addons/base/i18n/ur.po       |    4 +-
 bin/addons/base/i18n/vi.po       |   16 +-
 bin/addons/base/i18n/zh_CN.po    |    4 +-
 bin/addons/base/i18n/zh_TW.po    |    4 +-
 debian/po/bg.po                  |    4 +-
 debian/po/ca.po                  |    4 +-
 debian/po/cs.po                  |    4 +-
 debian/po/de.po                  |    4 +-
 debian/po/el.po                  |    4 +-
 debian/po/en_GB.po               |    4 +-
 debian/po/es.po                  |    4 +-
 debian/po/es_CL.po               |    4 +-
 debian/po/es_EC.po               |    4 +-
 debian/po/fa.po                  |    4 +-
 debian/po/fi.po                  |    4 +-
 debian/po/fr.po                  |    4 +-
 debian/po/gl.po                  |    4 +-
 debian/po/he.po                  |    4 +-
 debian/po/hr.po                  |    4 +-
 debian/po/hu.po                  |    4 +-
 debian/po/it.po                  |    4 +-
 debian/po/ja.po                  |    4 +-
 debian/po/ko.po                  |    4 +-
 debian/po/lv.po                  |    4 +-
 debian/po/mn.po                  |    4 +-
 debian/po/nb.po                  |    4 +-
 debian/po/nl.po                  |    4 +-
 debian/po/pl.po                  |    4 +-
 debian/po/pt.po                  |    4 +-
 debian/po/pt_BR.po               |    8 +-
 debian/po/ro.po                  |    4 +-
 debian/po/ru.po                  |    4 +-
 debian/po/sk.po                  |    4 +-
 debian/po/sq.po                  |   11 +-
 debian/po/sr.po                  |    4 +-
 debian/po/sv.po                  |    4 +-
 debian/po/tr.po                  |    4 +-
 debian/po/uk.po                  |    4 +-
 debian/po/vi.po                  |    4 +-
 debian/po/zh_CN.po               |    4 +-
 debian/po/zh_TW.po               |    4 +-
 91 files changed, 3305 insertions(+), 1956 deletions(-)

diff --git a/bin/addons/base/i18n/af.po b/bin/addons/base/i18n/af.po
index 71d76f01aca..290fd5f2304 100644
--- a/bin/addons/base/i18n/af.po
+++ b/bin/addons/base/i18n/af.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-02-16 04:49+0000\n"
-"X-Generator: Launchpad (build 12351)\n"
+"X-Launchpad-Export-Date: 2011-04-09 04:49+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/bin/addons/base/i18n/am.po b/bin/addons/base/i18n/am.po
index 284ab652f88..4b094993afb 100644
--- a/bin/addons/base/i18n/am.po
+++ b/bin/addons/base/i18n/am.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-02-16 04:50+0000\n"
-"X-Generator: Launchpad (build 12351)\n"
+"X-Launchpad-Export-Date: 2011-04-09 04:49+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/bin/addons/base/i18n/ar.po b/bin/addons/base/i18n/ar.po
index 368d9b30e4a..8baa0e9c4ab 100644
--- a/bin/addons/base/i18n/ar.po
+++ b/bin/addons/base/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-02-16 04:50+0000\n"
-"X-Generator: Launchpad (build 12351)\n"
+"X-Launchpad-Export-Date: 2011-04-09 04:49+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/bin/addons/base/i18n/bg.po b/bin/addons/base/i18n/bg.po
index 8f1cf6cf4b3..3c0c2397239 100644
--- a/bin/addons/base/i18n/bg.po
+++ b/bin/addons/base/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-02-16 04:50+0000\n"
-"X-Generator: Launchpad (build 12351)\n"
+"X-Launchpad-Export-Date: 2011-04-09 04:50+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
 #. module: base
 #: view:ir.filters:0
@@ -33,12 +33,12 @@ msgstr "Св. Елена"
 #. module: base
 #: view:ir.actions.report.xml:0
 msgid "Other Configuration"
-msgstr ""
+msgstr "Други настройки"
 
 #. module: base
 #: selection:ir.property,type:0
 msgid "DateTime"
-msgstr ""
+msgstr "Дата час"
 
 #. module: base
 #: code:addons/fields.py:534
@@ -47,6 +47,8 @@ msgid ""
 "The second argument of the many2many field %s must be a SQL table !You used "
 "%s, which is not a valid SQL table name."
 msgstr ""
+"Вторият аргумент на many2many полето %s трябва да е SQL таблица ! Вие "
+"използвате %s, което не е валидно SQL име на таблица."
 
 #. module: base
 #: view:ir.values:0
@@ -93,7 +95,7 @@ msgstr "Не може да бъде търсен"
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (VE) / Español (VE)"
-msgstr ""
+msgstr "Испански (VE) / Español (VE)"
 
 #. module: base
 #: field:ir.actions.server,wkf_model_id:0
@@ -103,7 +105,7 @@ msgstr "Последователност от действия Вкл."
 #. module: base
 #: field:ir.actions.act_window,display_menu_tip:0
 msgid "Display Menu Tips"
-msgstr ""
+msgstr "Показване подсказки на менютата"
 
 #. module: base
 #: view:ir.module.module:0
@@ -117,6 +119,8 @@ msgid ""
 "You can not write in this document (%s) ! Be sure your user belongs to one "
 "of these groups: %s."
 msgstr ""
+"Не можете да пишете в този документ (%s)! Уверете се, че принадлежите на "
+"някоя от следните групи: %s."
 
 #. module: base
 #: help:ir.model.fields,domain:0
@@ -129,7 +133,7 @@ msgstr ""
 #. module: base
 #: field:res.partner,ref:0
 msgid "Reference"
-msgstr ""
+msgstr "Означение"
 
 #. module: base
 #: field:ir.actions.act_window,target:0
@@ -140,7 +144,7 @@ msgstr "Прозорец цел"
 #: code:addons/base/res/res_user.py:507
 #, python-format
 msgid "Warning!"
-msgstr ""
+msgstr "Предупреждение!"
 
 #. module: base
 #: code:addons/base/ir/ir_model.py:304
@@ -154,7 +158,7 @@ msgstr ""
 #: code:addons/osv.py:133
 #, python-format
 msgid "Constraint Error"
-msgstr ""
+msgstr "Ограничение за грешка"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_ui_view_custom
@@ -171,12 +175,12 @@ msgstr "Швейцария"
 #: code:addons/orm.py:3653
 #, python-format
 msgid "created."
-msgstr ""
+msgstr "създаден."
 
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_woodsuppliers0
 msgid "Wood Suppliers"
-msgstr ""
+msgstr "Доставчици на дървен материал"
 
 #. module: base
 #: code:addons/base/module/module.py:303
@@ -208,13 +212,14 @@ msgstr ""
 #. module: base
 #: view:res.partner:0
 msgid "Search Partner"
-msgstr "Търсене на партньор"
+msgstr "Търсене на контрагент"
 
 #. module: base
 #: code:addons/base/res/res_user.py:132
 #, python-format
 msgid "\"smtp_server\" needs to be set to send mails to users"
 msgstr ""
+"\"smtp_server\" необходимо е да установите поща за изпращане за потребителите"
 
 #. module: base
 #: code:addons/base/module/wizard/base_export_language.py:60
@@ -235,7 +240,7 @@ msgstr "Брой на модулите"
 #. module: base
 #: help:multi_company.default,company_dest_id:0
 msgid "Company to store the current record"
-msgstr ""
+msgstr "Компания, към която да се съхрани текущия запис"
 
 #. module: base
 #: field:res.partner.bank.type.field,size:0
@@ -260,7 +265,7 @@ msgstr ""
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The name of the language must be unique !"
-msgstr ""
+msgstr "Името на езика трябва да буде уникално!"
 
 #. module: base
 #: selection:res.request,state:0
@@ -276,7 +281,7 @@ msgstr "Име на помощник"
 #: code:addons/orm.py:2160
 #, python-format
 msgid "Invalid group_by"
-msgstr ""
+msgstr "Невалидно групиране по"
 
 #. module: base
 #: field:res.partner,credit_limit:0
@@ -291,7 +296,7 @@ msgstr "Обнови дата"
 #. module: base
 #: view:ir.attachment:0
 msgid "Owner"
-msgstr ""
+msgstr "Собственик"
 
 #. module: base
 #: field:ir.actions.act_window,src_model:0
@@ -312,7 +317,7 @@ msgstr "ir.ui.view_sc"
 #: field:res.widget.user,widget_id:0
 #: field:res.widget.wizard,widgets_list:0
 msgid "Widget"
-msgstr ""
+msgstr "Добавка"
 
 #. module: base
 #: view:ir.model.access:0
@@ -398,7 +403,7 @@ msgstr ""
 #: code:addons/orm.py:904
 #, python-format
 msgid "The read method is not implemented on this object !"
-msgstr ""
+msgstr "Метода за четене не е дефиниран за този обект !"
 
 #. module: base
 #: help:res.lang,iso_code:0
@@ -409,7 +414,7 @@ msgstr ""
 #. module: base
 #: view:base.module.upgrade:0
 msgid "Your system will be updated."
-msgstr ""
+msgstr "Системата ви ще бъде обновена"
 
 #. module: base
 #: field:ir.actions.todo,note:0
@@ -436,7 +441,7 @@ msgstr "Планирай обновяване"
 #: code:addons/orm.py:838
 #, python-format
 msgid "Key/value '%s' not found in selection field '%s'"
-msgstr ""
+msgstr "Ключ/стойност '%s' не го откривам в избраното поле '%s'"
 
 #. module: base
 #: help:res.country,code:0
@@ -460,7 +465,7 @@ msgstr "Продажби и поръчки"
 #. module: base
 #: view:ir.translation:0
 msgid "Untranslated"
-msgstr ""
+msgstr "Непреведени"
 
 #. module: base
 #: help:ir.actions.act_window,context:0
@@ -478,7 +483,7 @@ msgstr "Помощници"
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_miscellaneoussuppliers0
 msgid "Miscellaneous Suppliers"
-msgstr ""
+msgstr "Разни доставчици"
 
 #. module: base
 #: code:addons/base/ir/ir_model.py:255
@@ -494,7 +499,7 @@ msgstr "Изберете прозорец за действие, доклад, 
 #. module: base
 #: view:res.config.users:0
 msgid "New User"
-msgstr ""
+msgstr "Нов потребител"
 
 #. module: base
 #: view:base.language.export:0
@@ -525,7 +530,7 @@ msgstr "Йордания"
 #. module: base
 #: view:ir.module.module:0
 msgid "Certified"
-msgstr ""
+msgstr "Сертифициран"
 
 #. module: base
 #: model:res.country,name:base.er
@@ -536,12 +541,12 @@ msgstr "Еритрея"
 #: view:res.config:0
 #: view:res.config.installer:0
 msgid "description"
-msgstr ""
+msgstr "описание"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_base_action_rule
 msgid "Automated Actions"
-msgstr ""
+msgstr "Автоматизирани действия"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_actions_actions
@@ -551,7 +556,7 @@ msgstr "ir.actions.actions"
 #. module: base
 #: view:partner.wizard.ean.check:0
 msgid "Want to check Ean ? "
-msgstr ""
+msgstr "Желаете ли да проверите EAN? "
 
 #. module: base
 #: field:ir.values,key2:0
@@ -565,11 +570,14 @@ msgid ""
 "Launchpad.net, our open source project management facility. We use their "
 "online interface to synchronize all translations efforts."
 msgstr ""
+"OpenERP преводи (ядро, модули, клиенти) се управляват през Launchpad.net, "
+"our open source project management facility. We use their online interface "
+"to synchronize all translations efforts."
 
 #. module: base
 #: field:res.partner,title:0
 msgid "Partner Form"
-msgstr ""
+msgstr "Форма за контрагент"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -602,27 +610,27 @@ msgstr "Последователност"
 #. module: base
 #: model:ir.model,name:base.model_base_language_import
 msgid "Language Import"
-msgstr ""
+msgstr "Импортиране на език"
 
 #. module: base
 #: model:ir.model,name:base.model_res_config_users
 msgid "res.config.users"
-msgstr ""
+msgstr "res.config.users"
 
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Albanian / Shqip"
-msgstr ""
+msgstr "Албански / Shqip"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_crm_config_opportunity
 msgid "Opportunities"
-msgstr ""
+msgstr "Възможности"
 
 #. module: base
 #: model:ir.model,name:base.model_base_language_export
 msgid "base.language.export"
-msgstr ""
+msgstr "base.language.export"
 
 #. module: base
 #: model:res.country,name:base.pg
@@ -633,6 +641,7 @@ msgstr "Папуа Нова Гвинея"
 #: help:ir.actions.report.xml,report_type:0
 msgid "Report Type, e.g. pdf, html, raw, sxw, odt, html2html, mako2html, ..."
 msgstr ""
+"Тип на справка, напр. pdf, html, raw, sxw, odt, html2html, mako2html, ..."
 
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_4
@@ -652,7 +661,7 @@ msgstr "Мои партньори"
 #. module: base
 #: view:ir.actions.report.xml:0
 msgid "XML Report"
-msgstr ""
+msgstr "XML отчет"
 
 #. module: base
 #: model:res.country,name:base.es
@@ -674,7 +683,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:base.action_view_base_module_upgrade
 #: model:ir.model,name:base.model_base_module_upgrade
 msgid "Module Upgrade"
-msgstr ""
+msgstr "Ъпгрейд на модул"
 
 #. module: base
 #: view:res.config.users:0
@@ -682,11 +691,13 @@ msgid ""
 "Groups are used to define access rights on objects and the visibility of "
 "screens and menus"
 msgstr ""
+"Групите се използват за да се дефинират права за достъп до обекти, екрани и "
+"менюта"
 
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (UY) / Español (UY)"
-msgstr ""
+msgstr "Испански (UY) / Español (UY)"
 
 #. module: base
 #: field:res.partner,mobile:0
@@ -718,7 +729,7 @@ msgstr "Работни дни"
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "Other OSI Approved Licence"
-msgstr ""
+msgstr "Друг OSI одобрен лиценз"
 
 #. module: base
 #: help:res.config.users,context_lang:0
@@ -727,12 +738,13 @@ msgid ""
 "Sets the language for the user's user interface, when UI translations are "
 "available"
 msgstr ""
+"Изберете език за потребителския интерфейс, когато има съответните преводи"
 
 #. module: base
 #: code:addons/orm.py:1043
 #, python-format
 msgid "The unlink method is not implemented on this object !"
-msgstr ""
+msgstr "Метода unlink  не е реализиран за този обект !"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.act_menu_create
@@ -770,7 +782,7 @@ msgstr "Подкатегории"
 #. module: base
 #: model:ir.model,name:base.model_ir_config_parameter
 msgid "ir.config_parameter"
-msgstr ""
+msgstr "ir.config_parameter"
 
 #. module: base
 #: selection:base.language.export,format:0
@@ -805,6 +817,8 @@ msgid ""
 "Language with code \"%s\" is not defined in your system !\n"
 "Define it through the Administration menu."
 msgstr ""
+"Език с код \"%s\" не е дефиниран във вашата система!\n"
+"Дефинирайте го през меню Администрация."
 
 #. module: base
 #: model:res.country,name:base.gu
@@ -814,13 +828,13 @@ msgstr "Гуам (САЩ)"
 #. module: base
 #: model:ir.ui.menu,name:base.menu_hr_project
 msgid "Human Resources Dashboard"
-msgstr ""
+msgstr "Табло Човешки ресурси"
 
 #. module: base
 #: code:addons/base/res/res_user.py:507
 #, python-format
 msgid "Setting empty passwords is not allowed for security reasons!"
-msgstr ""
+msgstr "Използване на празни пароли не е разрешено по причини за сигурност!"
 
 #. module: base
 #: selection:ir.actions.server,state:0
@@ -859,7 +873,7 @@ msgstr ""
 #. module: base
 #: field:ir.module.module,contributors:0
 msgid "Contributors"
-msgstr ""
+msgstr "Сътрудници"
 
 #. module: base
 #: selection:ir.property,type:0
@@ -870,7 +884,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:base.action_publisher_warranty_contract_form
 #: model:ir.ui.menu,name:base.menu_publisher_warranty_contract
 msgid "Contracts"
-msgstr ""
+msgstr "Договори"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -885,7 +899,7 @@ msgstr "Уганда"
 #. module: base
 #: field:ir.model.access,perm_unlink:0
 msgid "Delete Access"
-msgstr ""
+msgstr "Изтриване на достъп"
 
 #. module: base
 #: model:res.country,name:base.ne
@@ -895,7 +909,7 @@ msgstr "Нигер"
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Chinese (HK)"
-msgstr ""
+msgstr "Китайски (HK)"
 
 #. module: base
 #: model:res.country,name:base.ba
@@ -909,11 +923,14 @@ msgid ""
 "Lauchpad's web interface (Rosetta). If you need to perform mass translation, "
 "Launchpad also allows uploading full .po files at once"
 msgstr ""
+"За да подобрите или разширите официалните преводи, вие трябва да използвате "
+"директно Lauchpad's web interface (Rosetta). Ако превеждате големи обеми, "
+"Launchpad също предлага и качване на пълен .po файл наведнъж."
 
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (GT) / Español (GT)"
-msgstr ""
+msgstr "Испански (GT) / Español (GT)"
 
 #. module: base
 #: view:res.lang:0
@@ -945,7 +962,7 @@ msgstr "URL на действие"
 #. module: base
 #: field:base.module.import,module_name:0
 msgid "Module Name"
-msgstr ""
+msgstr "Име на модула"
 
 #. module: base
 #: model:res.country,name:base.mh
@@ -956,7 +973,7 @@ msgstr "Маршалови острови"
 #: code:addons/base/ir/ir_model.py:328
 #, python-format
 msgid "Changing the model of a field is forbidden!"
-msgstr ""
+msgstr "Промяна на модела на полете е забранена!"
 
 #. module: base
 #: model:res.country,name:base.ht
@@ -989,7 +1006,7 @@ msgstr ""
 #: code:addons/base/res/res_user.py:206
 #, python-format
 msgid "Operation Canceled"
-msgstr ""
+msgstr "Отказана операция"
 
 #. module: base
 #: help:base.language.export,lang:0
@@ -999,17 +1016,17 @@ msgstr "За да експортирате нов език, не избирай
 #. module: base
 #: view:res.request:0
 msgid "Request Date"
-msgstr ""
+msgstr "Дата на заявка"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_hr_dasboard
 msgid "Dashboard"
-msgstr ""
+msgstr "Табло"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_purchase_root
 msgid "Purchases"
-msgstr ""
+msgstr "Покупки"
 
 #. module: base
 #: model:res.country,name:base.md
@@ -1043,7 +1060,7 @@ msgstr "ir.exports"
 #: code:addons/base/module/wizard/base_update_translations.py:38
 #, python-format
 msgid "No language with code \"%s\" exists"
-msgstr ""
+msgstr "Не съществува език с код \"%s\""
 
 #. module: base
 #: code:addons/base/publisher_warranty/publisher_warranty.py:163
@@ -1065,7 +1082,7 @@ msgstr ""
 #. module: base
 #: view:res.lang:0
 msgid "%Y - Year with century."
-msgstr ""
+msgstr "%Y - Годината с века."
 
 #. module: base
 #: report:ir.module.reference.graph:0
@@ -1084,12 +1101,12 @@ msgstr ""
 #: code:addons/orm.py:1744
 #, python-format
 msgid "The search method is not implemented on this object !"
-msgstr ""
+msgstr "Методът ТЪРСЕНЕ не е реализиран в този обект!"
 
 #. module: base
 #: view:wizard.ir.model.menu.create:0
 msgid "Create _Menu"
-msgstr ""
+msgstr "Създаване  _Меню"
 
 #. module: base
 #: field:res.payterm,name:0
@@ -1113,12 +1130,12 @@ msgstr "ir.exports.line"
 msgid ""
 "If you check this box, your customized translations will be overwritten and "
 "replaced by the official ones."
-msgstr ""
+msgstr "Вашите преводи ще бъдат препокрити от официалните."
 
 #. module: base
 #: field:ir.actions.report.xml,report_rml:0
 msgid "Main report file path"
-msgstr ""
+msgstr "Път към файла за Главен отчет"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.ir_action_report_xml
@@ -1166,6 +1183,8 @@ msgid ""
 "Access all the fields related to the current object using expressions, i.e. "
 "object.partner_id.name "
 msgstr ""
+"Достъп до всичките полета, свързани с текущия обект с помоща на изрази. i.e. "
+"object.partner_id.name "
 
 #. module: base
 #: model:ir.model,name:base.model_res_country_state
@@ -1175,7 +1194,7 @@ msgstr "Провинция"
 #. module: base
 #: selection:ir.property,type:0
 msgid "Float"
-msgstr ""
+msgstr "Плаваща запетая"
 
 #. module: base
 #: model:ir.model,name:base.model_res_request_link
@@ -1192,7 +1211,7 @@ msgstr "Информация за помощник"
 #: model:ir.actions.act_window,name:base.action_wizard_lang_export
 #: model:ir.ui.menu,name:base.menu_wizard_lang_export
 msgid "Export Translation"
-msgstr ""
+msgstr "Експортиране на превод"
 
 #. module: base
 #: help:res.log,secondary:0
@@ -1242,7 +1261,7 @@ msgstr "wizard.ir.model.menu.create.line"
 #. module: base
 #: field:ir.attachment,res_id:0
 msgid "Attached ID"
-msgstr ""
+msgstr "Прикачен ID"
 
 #. module: base
 #: view:ir.sequence:0
@@ -1306,7 +1325,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:base.res_widget_act_window
 #: model:ir.ui.menu,name:base.menu_res_widget_act_window
 msgid "Homepage Widgets"
-msgstr ""
+msgstr "Притурки на началната страница"
 
 #. module: base
 #: help:ir.actions.server,message:0
@@ -1320,12 +1339,12 @@ msgstr ""
 #. module: base
 #: field:ir.attachment,res_model:0
 msgid "Attached Model"
-msgstr ""
+msgstr "Прикачен модел"
 
 #. module: base
 #: view:ir.rule:0
 msgid "Domain Setup"
-msgstr ""
+msgstr "Настойка на Домейн"
 
 #. module: base
 #: field:ir.actions.server,trigger_name:0
@@ -1375,7 +1394,7 @@ msgstr "Малави"
 #: code:addons/base/res/res_user.py:413
 #, python-format
 msgid "%s (copy)"
-msgstr ""
+msgstr "%s (копие)"
 
 #. module: base
 #: field:res.partner.address,type:0
@@ -1385,7 +1404,7 @@ msgstr "Вид на адреса"
 #. module: base
 #: view:ir.ui.menu:0
 msgid "Full Path"
-msgstr ""
+msgstr "Пълен път"
 
 #. module: base
 #: view:res.request:0
@@ -1406,7 +1425,7 @@ msgstr ""
 #. module: base
 #: view:ir.ui.view:0
 msgid "Advanced"
-msgstr ""
+msgstr "Разширени"
 
 #. module: base
 #: model:res.country,name:base.fi
@@ -1433,12 +1452,12 @@ msgstr ""
 #. module: base
 #: view:ir.actions.server:0
 msgid "Create / Write / Copy"
-msgstr ""
+msgstr "Създаване / Писане / Копиране"
 
 #. module: base
 #: view:base.language.export:0
 msgid "https://help.launchpad.net/Translations"
-msgstr ""
+msgstr "https://help.launchpad.net/Translations"
 
 #. module: base
 #: field:ir.actions.act_window,view_mode:0
@@ -1451,17 +1470,19 @@ msgid ""
 "When using CSV format, please also check that the first line of your file is "
 "one of the following:"
 msgstr ""
+"Когато се използва CSV формат, трябва да се провери първият ред на файла да "
+"има следния вид:"
 
 #. module: base
 #: code:addons/fields.py:114
 #, python-format
 msgid "Not implemented search_memory method !"
-msgstr ""
+msgstr "Методът search_memory не е реализиран!"
 
 #. module: base
 #: view:res.log:0
 msgid "Logs"
-msgstr ""
+msgstr "Логове"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -1471,7 +1492,7 @@ msgstr "Испански / Español"
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Korean (KP) / 한국어 (KP)"
-msgstr ""
+msgstr "Корейски (KP) / 한국어 (KP)"
 
 #. module: base
 #: view:base.module.update:0
@@ -1479,6 +1500,8 @@ msgid ""
 "This wizard will scan all module repositories on the server side to detect "
 "newly added modules as well as any change to existing modules."
 msgstr ""
+"Този помощник ще сканира всички хранилища за модули на сървъра за нови и/или "
+"актуализирани модули."
 
 #. module: base
 #: field:res.company,logo:0
@@ -1534,12 +1557,12 @@ msgstr "Брой обновени модули"
 #: code:addons/fields.py:100
 #, python-format
 msgid "Not implemented set_memory method !"
-msgstr ""
+msgstr "Методът set_memory не е реализиран!"
 
 #. module: base
 #: view:workflow.activity:0
 msgid "Workflow Activity"
-msgstr ""
+msgstr "Активност на работния поток"
 
 #. module: base
 #: view:ir.rule:0
@@ -1554,6 +1577,9 @@ 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."
 msgstr ""
+"Изгледите позволяват да се персонализира всеки екран на Open ЕРП. Могат се "
+"да добавят нови полета, да местят полета, да се преименуват и да се трият "
+"ненужните."
 
 #. module: base
 #: field:ir.actions.act_window,groups_id:0
@@ -1579,7 +1605,7 @@ msgstr "Групи"
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (CL) / Español (CL)"
-msgstr ""
+msgstr "Испански (CL) / Español (CL)"
 
 #. module: base
 #: view:res.config.users:0
@@ -1588,6 +1614,10 @@ msgid ""
 "access to selected functionalities within the system. Click on 'Done' if you "
 "do not wish to add more users at this stage, you can always do this later."
 msgstr ""
+"Като създавате нови потребители и ги правите членове на съответните групи ще "
+"им позволите достъп до избраните функционалностти на системата.  Натиснете "
+"\"Готово\" ако не желаете да добавяте повече потребители на този етап. Вие "
+"можете да направите това по-късно."
 
 #. module: base
 #: model:res.country,name:base.bz
@@ -1616,11 +1646,12 @@ msgstr ""
 #, python-format
 msgid "A document was modified since you last viewed it (%s:%d)"
 msgstr ""
+"Документът е променян на (%s:%d) след като сте го гледали за последне път"
 
 #. module: base
 #: view:workflow:0
 msgid "Workflow Editor"
-msgstr ""
+msgstr "Редактор на работен поток"
 
 #. module: base
 #: selection:ir.module.module,state:0
@@ -1654,7 +1685,7 @@ msgstr "Поле"
 #. module: base
 #: view:ir.rule:0
 msgid "Groups (no group = global)"
-msgstr ""
+msgstr "Групи (без прупа = глобална)"
 
 #. module: base
 #: model:res.country,name:base.fo
@@ -1666,7 +1697,7 @@ msgstr "Фарьорски острови"
 #: selection:res.config.view,view:0
 #: selection:res.users,view:0
 msgid "Simplified"
-msgstr ""
+msgstr "Опростен"
 
 #. module: base
 #: model:res.country,name:base.st
@@ -1681,7 +1712,7 @@ msgstr "Фактура"
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Portugese (BR) / Português (BR)"
-msgstr ""
+msgstr "Португалски (BR) / Português (BR)"
 
 #. module: base
 #: model:res.country,name:base.bb
@@ -1767,7 +1798,7 @@ msgstr "Зимбабве"
 #. module: base
 #: view:base.module.update:0
 msgid "Please be patient, as this operation may take a few seconds..."
-msgstr ""
+msgstr "Моля, за търпение. Може да отнеме няколко секунди..."
 
 #. module: base
 #: help:ir.values,action_id:0
@@ -1778,7 +1809,7 @@ msgstr ""
 #. module: base
 #: field:ir.actions.server,email:0
 msgid "Email Address"
-msgstr "Адрес за е-поща"
+msgstr "Имейл адрес"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -1814,7 +1845,7 @@ msgstr "Свързване на полета"
 #. module: base
 #: view:base.language.export:0
 msgid "Export Translations"
-msgstr ""
+msgstr "Експортиране на преводи"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_custom
@@ -1846,7 +1877,7 @@ msgstr "Литва"
 #: model:ir.model,name:base.model_partner_clear_ids
 #: view:partner.clear.ids:0
 msgid "Clear IDs"
-msgstr ""
+msgstr "Изчисти IDs"
 
 #. module: base
 #: help:ir.cron,model:0
@@ -1859,12 +1890,12 @@ msgstr ""
 #: code:addons/orm.py:1040
 #, python-format
 msgid "The perm_read method is not implemented on this object !"
-msgstr ""
+msgstr "Методът perm_read не е реализиран за този обект!"
 
 #. module: base
 #: view:res.lang:0
 msgid "%y - Year without century [00,99]."
-msgstr ""
+msgstr "%y - Годината без века [00,99]."
 
 #. module: base
 #: model:res.country,name:base.si
@@ -1880,12 +1911,12 @@ msgstr "Пакистан"
 #: code:addons/orm.py:1350
 #, python-format
 msgid "Invalid Object Architecture!"
-msgstr ""
+msgstr "Невалидна архитектура на обект"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_email_gateway_form
 msgid "Messages"
-msgstr ""
+msgstr "Съобщения"
 
 #. module: base
 #: code:addons/base/ir/ir_model.py:303
@@ -1897,7 +1928,7 @@ msgstr ""
 #: code:addons/base/module/wizard/base_update_translations.py:38
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "Грешка!"
 
 #. module: base
 #: view:res.lang:0
@@ -1912,7 +1943,7 @@ msgstr "Повтарящи се действия"
 #. module: base
 #: help:multi_company.default,company_id:0
 msgid "Company where the user is connected"
-msgstr ""
+msgstr "Фирма, с която е свързан потребителят"
 
 #. module: base
 #: field:publisher_warranty.contract,date_stop:0
@@ -1931,6 +1962,8 @@ msgid ""
 "One of the records you are trying to modify has already been deleted "
 "(Document type: %s)."
 msgstr ""
+"Един от записите, които се опитвате да промените е вече изтрит (Документ "
+"тип: %s)"
 
 #. module: base
 #: model:ir.actions.act_window,help:base.action_country
@@ -1953,12 +1986,12 @@ msgstr "Остров Норфолк"
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Korean (KR) / 한국어 (KR)"
-msgstr ""
+msgstr "Корейски (KR) / 한국어 (KR)"
 
 #. module: base
 #: help:ir.model.fields,model:0
 msgid "The technical name of the model this field belongs to"
-msgstr ""
+msgstr "Техническото име на модела, към който принадлежи това поле"
 
 #. module: base
 #: field:ir.actions.server,action_id:0
@@ -2005,7 +2038,7 @@ msgstr "res.partner.event"
 #. module: base
 #: model:res.widget,title:base.facebook_widget
 msgid "Facebook"
-msgstr ""
+msgstr "Фейсбук"
 
 #. module: base
 #: model:res.country,name:base.am
@@ -2016,12 +2049,12 @@ msgstr "Армения"
 #: model:ir.actions.act_window,name:base.ir_property_form
 #: model:ir.ui.menu,name:base.menu_ir_property_form_all
 msgid "Configuration Parameters"
-msgstr ""
+msgstr "Праметри за настройка"
 
 #. module: base
 #: constraint:ir.cron:0
 msgid "Invalid arguments"
-msgstr ""
+msgstr "Невалидни аргументи"
 
 #. module: base
 #: model:res.country,name:base.se
@@ -2061,7 +2094,7 @@ msgstr "Тип на банкова сметка"
 #: field:res.config.users,config_logo:0
 #: field:res.config.view,config_logo:0
 msgid "Image"
-msgstr ""
+msgstr "Изображение"
 
 #. module: base
 #: view:ir.actions.server:0
@@ -2071,7 +2104,7 @@ msgstr "Настройка на повтарящо се действие"
 #. module: base
 #: selection:publisher_warranty.contract,state:0
 msgid "Canceled"
-msgstr ""
+msgstr "Отменени"
 
 #. module: base
 #: model:res.country,name:base.at
@@ -2083,7 +2116,7 @@ msgstr "Австрия"
 #: selection:base.module.import,state:0
 #: selection:base.module.update,state:0
 msgid "done"
-msgstr ""
+msgstr "готово"
 
 #. module: base
 #: selection:ir.actions.act_window.view,view_mode:0
@@ -2096,7 +2129,7 @@ msgstr "Календар"
 #. module: base
 #: field:res.partner.address,partner_id:0
 msgid "Partner Name"
-msgstr ""
+msgstr "Име на контрагент"
 
 #. module: base
 #: field:workflow.activity,signal_send:0
@@ -2106,7 +2139,7 @@ msgstr "Сигнал (subflow.*)"
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_17
 msgid "HR sector"
-msgstr ""
+msgstr "Сектор Чов. Рес."
 
 #. module: base
 #: code:addons/orm.py:3817
@@ -2132,7 +2165,7 @@ msgstr "Чернова"
 #: selection:res.config.view,view:0
 #: selection:res.users,view:0
 msgid "Extended"
-msgstr ""
+msgstr "Разширен"
 
 #. module: base
 #: model:ir.actions.act_window,help:base.action_partner_title_contact
@@ -2200,11 +2233,13 @@ msgid ""
 "Please double-check that the file encoding is set to UTF-8 (sometimes called "
 "Unicode) when the translator exports it."
 msgstr ""
+"Моля, проверете дали файлът е настроен на кодиране UTF-8 (понякога наричан "
+"Unicode) при експорт."
 
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (DO) / Español (DO)"
-msgstr ""
+msgstr "Испански (DO) / Español (DO)"
 
 #. module: base
 #: model:ir.model,name:base.model_workflow_activity
@@ -2231,7 +2266,7 @@ msgstr "Уругвай"
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Finnish / Suomi"
-msgstr ""
+msgstr "Фински / Suomi"
 
 #. module: base
 #: field:ir.rule,perm_write:0
@@ -2261,7 +2296,7 @@ msgstr "Свързване на полета"
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Portugese / Português"
-msgstr ""
+msgstr "Португалски / Português"
 
 #. module: base
 #: model:res.partner.title,name:base.res_partner_title_sir
@@ -2272,7 +2307,7 @@ msgstr "Сър"
 #: code:addons/orm.py:1622
 #, python-format
 msgid "There is no view of type '%s' defined for the structure!"
-msgstr ""
+msgstr "Няма изглед от тип  '%s' дефиниран за тази структура!"
 
 #. module: base
 #: field:ir.default,ref_id:0
@@ -2283,7 +2318,7 @@ msgstr "ID отпратка"
 #: model:ir.actions.server,name:base.action_start_configurator
 #: model:ir.ui.menu,name:base.menu_view_base_module_configuration
 msgid "Start Configuration"
-msgstr ""
+msgstr "Започни настройване"
 
 #. module: base
 #: model:res.country,name:base.mt
@@ -2336,7 +2371,7 @@ msgstr ""
 #. module: base
 #: view:base.language.import:0
 msgid "_Import"
-msgstr ""
+msgstr "_Импортиране"
 
 #. module: base
 #: view:res.partner.canal:0
@@ -2393,13 +2428,13 @@ msgstr "Отляво надясно"
 #: model:ir.model,name:base.model_ir_filters
 #: model:ir.ui.menu,name:base.menu_ir_filters
 msgid "Filters"
-msgstr ""
+msgstr "Филтри"
 
 #. module: base
 #: code:addons/orm.py:758
 #, python-format
 msgid "Please check that all your lines have %d columns."
-msgstr ""
+msgstr "Моля проверете дали всичките ви редове имат %d колони."
 
 #. module: base
 #: model:ir.actions.act_window,name:base.ir_cron_act
@@ -2419,12 +2454,14 @@ msgstr "Заглавие"
 #: help:ir.property,res_id:0
 msgid "If not set, acts as a default value for new resources"
 msgstr ""
+"Ако не е указано друго, използвай като стойност по подразбиране за нови "
+"ресурси"
 
 #. module: base
 #: code:addons/orm.py:3448
 #, python-format
 msgid "Recursivity Detected."
-msgstr ""
+msgstr "Устанена е рекурсия"
 
 #. module: base
 #: code:addons/base/module/module.py:262
@@ -2439,6 +2476,9 @@ msgid ""
 "loading a new language it becomes available as default interface language "
 "for users and partners."
 msgstr ""
+"Този помощник ще ви помогне да добавите нови езици към вашата Open ERP "
+"система. След зареждане новият език ще бъде наличен по подразбиране като "
+"език на интерфейса за потребители и контрагенти."
 
 #. module: base
 #: view:ir.model:0
@@ -2457,7 +2497,7 @@ msgstr ""
 #. module: base
 #: model:ir.model,name:base.model_maintenance_contract
 msgid "maintenance.contract"
-msgstr ""
+msgstr "maintenance.contract"
 
 #. module: base
 #: model:res.country,name:base.ru
@@ -2493,18 +2533,18 @@ msgstr "Правила на записа"
 #. module: base
 #: view:ir.property:0
 msgid "Field Information"
-msgstr ""
+msgstr "Информация за поле"
 
 #. module: base
 #: view:ir.actions.todo:0
 msgid "Search Actions"
-msgstr ""
+msgstr "Действия търсене"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_view_partner_wizard_ean_check
 #: view:partner.wizard.ean.check:0
 msgid "Ean check"
-msgstr ""
+msgstr "Проверка на EAN"
 
 #. module: base
 #: field:res.partner,vat:0
@@ -2529,7 +2569,7 @@ msgstr "%x - Подходящо представяне на датата."
 #. module: base
 #: view:res.lang:0
 msgid "%d - Day of the month [01,31]."
-msgstr ""
+msgstr "%d - Ден от месеца [01,31]."
 
 #. module: base
 #: model:res.country,name:base.tj
@@ -2544,7 +2584,7 @@ msgstr "GPL версия 2 или по-нова"
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_sir
 msgid "M."
-msgstr ""
+msgstr "M."
 
 #. module: base
 #: code:addons/base/module/module.py:429
@@ -2563,6 +2603,8 @@ msgid ""
 "Operation prohibited by access rules, or performed on an already deleted "
 "document (Operation: read, Document type: %s)."
 msgstr ""
+"Операцията е забранена от правила за достъп или изпълнена върху вече изтрит "
+"документ (Operation: read, Document type: %s)."
 
 #. module: base
 #: model:res.country,name:base.nr
@@ -2573,7 +2615,7 @@ msgstr "Науру"
 #: code:addons/base/module/module.py:200
 #, python-format
 msgid "The certificate ID of the module must be unique !"
-msgstr ""
+msgstr "Сертифицираният ID на модула трябва да бъде уникален!"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_property
@@ -2650,7 +2692,7 @@ msgstr "EAN13"
 #: code:addons/orm.py:1622
 #, python-format
 msgid "Invalid Architecture!"
-msgstr ""
+msgstr "Невалидна архитектура!"
 
 #. module: base
 #: model:res.country,name:base.pt
@@ -2662,6 +2704,7 @@ msgstr "Португалия"
 msgid ""
 "You cannot have multiple records with the same id for the same module !"
 msgstr ""
+"Не можете да имате множество записи с еднакви ID за един и същ модул!"
 
 #. module: base
 #: field:ir.module.module,certificate:0
@@ -2677,12 +2720,12 @@ msgstr "6.  %d, %m         ==> 05, 12"
 #: field:res.config.users,date:0
 #: field:res.users,date:0
 msgid "Last Connection"
-msgstr ""
+msgstr "Последна конекция"
 
 #. module: base
 #: field:ir.actions.act_window,help:0
 msgid "Action description"
-msgstr ""
+msgstr "Описание на действие"
 
 #. module: base
 #: help:res.partner,customer:0
@@ -2755,12 +2798,12 @@ msgstr "Основно поле"
 #. module: base
 #: view:publisher_warranty.contract:0
 msgid "Validate"
-msgstr ""
+msgstr "Потвърждаване"
 
 #. module: base
 #: field:ir.actions.todo,restart:0
 msgid "Restart"
-msgstr ""
+msgstr "Рестартиране"
 
 #. module: base
 #: field:ir.actions.report.xml,report_sxw_content:0
@@ -2806,7 +2849,7 @@ msgstr "Задължителен"
 #. module: base
 #: view:res.users:0
 msgid "Default Filters"
-msgstr ""
+msgstr "Филтри по подразбиране"
 
 #. module: base
 #: field:res.request.history,name:0
@@ -2816,7 +2859,7 @@ msgstr "Обобщение"
 #. module: base
 #: field:multi_company.default,expression:0
 msgid "Expression"
-msgstr ""
+msgstr "Израз"
 
 #. module: base
 #: help:ir.actions.server,subject:0
@@ -2852,12 +2895,12 @@ msgstr "Модул в .zip формат"
 #. module: base
 #: field:ir.ui.view,xml_id:0
 msgid "XML ID"
-msgstr ""
+msgstr "XML ID"
 
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_16
 msgid "Telecom sector"
-msgstr ""
+msgstr "Телекомуникационен сектор"
 
 #. module: base
 #: field:workflow.transition,trigger_model:0
@@ -2867,7 +2910,7 @@ msgstr "Задействащ обект"
 #. module: base
 #: view:res.users:0
 msgid "Current Activity"
-msgstr ""
+msgstr "Настояща активност"
 
 #. module: base
 #: view:workflow.activity:0
@@ -2883,7 +2926,7 @@ msgstr "Суринам"
 #. module: base
 #: model:ir.ui.menu,name:base.marketing_menu
 msgid "Marketing"
-msgstr ""
+msgstr "Маркетинг"
 
 #. module: base
 #: view:res.partner.bank:0
@@ -2894,7 +2937,7 @@ msgstr "Банкова сметка"
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (HN) / Español (HN)"
-msgstr ""
+msgstr "Испански (HN) / Español (HN)"
 
 #. module: base
 #: view:ir.sequence.type:0
@@ -2904,7 +2947,7 @@ msgstr "Вид последователност"
 #. module: base
 #: view:ir.ui.view.custom:0
 msgid "Customized Architecture"
-msgstr ""
+msgstr "Персонализирана архитектура"
 
 #. module: base
 #: field:ir.module.module,license:0
@@ -2914,12 +2957,12 @@ msgstr "Лиценз"
 #. module: base
 #: field:ir.attachment,url:0
 msgid "Url"
-msgstr ""
+msgstr "Url"
 
 #. module: base
 #: selection:ir.actions.todo,restart:0
 msgid "Always"
-msgstr ""
+msgstr "Винаги"
 
 #. module: base
 #: selection:ir.translation,type:0
@@ -2938,11 +2981,13 @@ msgid ""
 "The selected language has been successfully installed. You must change the "
 "preferences of the user and open a new menu to view the changes."
 msgstr ""
+"Избраният език е успешно инсталиран. Трябва да промените настраойките на "
+"потребителя и да отворите ново меню за да видите промените."
 
 #. module: base
 #: sql_constraint:ir.config_parameter:0
 msgid "Key must be unique."
-msgstr ""
+msgstr "Ключът трябва да бъде уникален."
 
 #. module: base
 #: view:ir.actions.act_window:0
@@ -2991,11 +3036,14 @@ msgid ""
 "\n"
 "Click 'Continue' and enjoy your OpenERP experience..."
 msgstr ""
+"Вашата база данни е напълно настроена.\n"
+"\n"
+"Натиснете 'Продължи' и се насладете на работата с OPEN ERP..."
 
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Hebrew / עִבְרִי"
-msgstr ""
+msgstr "Иврид / עִבְרִי"
 
 #. module: base
 #: model:res.country,name:base.bo
@@ -3039,12 +3087,12 @@ msgstr ""
 #. module: base
 #: view:base.module.upgrade:0
 msgid "The selected modules have been updated / installed !"
-msgstr ""
+msgstr "Избраните модули бяха обновени / инсталирани!"
 
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (PR) / Español (PR)"
-msgstr ""
+msgstr "Испански (PR) / Español (PR)"
 
 #. module: base
 #: model:res.country,name:base.gt
@@ -3062,12 +3110,12 @@ msgstr "Последователности от действия"
 #. module: base
 #: field:ir.translation,xml_id:0
 msgid "XML Id"
-msgstr ""
+msgstr "XML Id"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_config_user_form
 msgid "Create Users"
-msgstr ""
+msgstr "Създаване на потребител"
 
 #. module: base
 #: model:ir.model,name:base.model_res_partner_title
@@ -3082,7 +3130,7 @@ msgstr "tree_but_action, client_print_multi"
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_retailers0
 msgid "Retailers"
-msgstr ""
+msgstr "Търговци на дребно"
 
 #. module: base
 #: help:ir.cron,priority:0
@@ -3118,33 +3166,33 @@ msgstr "Кения"
 #. module: base
 #: view:res.partner.event:0
 msgid "Event"
-msgstr ""
+msgstr "Събитие"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_custom_reports
 msgid "Custom Reports"
-msgstr ""
+msgstr "Персонализирани справки"
 
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Abkhazian / аҧсуа"
-msgstr ""
+msgstr "Абхазки / аҧсуа"
 
 #. module: base
 #: view:base.module.configuration:0
 msgid "System Configuration Done"
-msgstr ""
+msgstr "Настройката на системата е направена"
 
 #. module: base
 #: code:addons/orm.py:929
 #, python-format
 msgid "Error occurred while validating the field(s) %s: %s"
-msgstr ""
+msgstr "Грешка при проверка на полета (s) %s: %s"
 
 #. module: base
 #: view:ir.property:0
 msgid "Generic"
-msgstr ""
+msgstr "Общ"
 
 #. module: base
 #: model:res.country,name:base.sm
@@ -3175,17 +3223,17 @@ msgstr "Бенин"
 #: code:addons/base/publisher_warranty/publisher_warranty.py:281
 #, python-format
 msgid "That contract is already registered in the system."
-msgstr ""
+msgstr "Договорът е вече регистриран в системата"
 
 #. module: base
 #: help:ir.sequence,suffix:0
 msgid "Suffix value of the record for the sequence"
-msgstr ""
+msgstr "Стойност на суфикса на записа за тази последователност"
 
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (PY) / Español (PY)"
-msgstr ""
+msgstr "Испански (PY) / Español (PY)"
 
 #. module: base
 #: field:ir.config_parameter,key:0
@@ -3209,6 +3257,8 @@ msgid ""
 "You can not create this document (%s) ! Be sure your user belongs to one of "
 "these groups: %s."
 msgstr ""
+"Не можете да създадете този документ (%s) ! Уверете се, че принадлежите към "
+"някоя от следните групи: %s."
 
 #. module: base
 #: model:res.country,name:base.mu
@@ -3219,7 +3269,7 @@ msgstr "Мавриций"
 #: view:ir.model.access:0
 #: view:ir.rule:0
 msgid "Full Access"
-msgstr ""
+msgstr "Пълен достъп"
 
 #. module: base
 #: view:ir.actions.act_window:0
@@ -3250,13 +3300,13 @@ msgstr "Инсталиран"
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Ukrainian / українська"
-msgstr ""
+msgstr "Украински / українська"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_translation
 #: model:ir.ui.menu,name:base.menu_action_translation
 msgid "Translation Terms"
-msgstr ""
+msgstr "Термини в превода"
 
 #. module: base
 #: model:res.country,name:base.sn
@@ -3281,12 +3331,12 @@ msgstr "Бразилия"
 #. module: base
 #: view:res.lang:0
 msgid "%M - Minute [00,59]."
-msgstr ""
+msgstr "%M - Минута [00,59]."
 
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "Affero GPL-3"
-msgstr ""
+msgstr "Affero GPL-3"
 
 #. module: base
 #: field:ir.sequence,number_next:0
@@ -3301,7 +3351,7 @@ msgstr ""
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (PA) / Español (PA)"
-msgstr ""
+msgstr "Испански (PA) / Español (PA)"
 
 #. module: base
 #: view:res.currency:0
@@ -3333,7 +3383,7 @@ msgstr ""
 #. module: base
 #: view:base.module.upgrade:0
 msgid "System update completed"
-msgstr ""
+msgstr "Обновяването на системата прикючи"
 
 #. module: base
 #: selection:res.request,state:0
@@ -3376,6 +3426,8 @@ msgstr ""
 #, python-format
 msgid "Cannot rename column to %s, because that column already exists!"
 msgstr ""
+"Не може да се преименува колоната на %s, защото такава колона вече "
+"съществува!"
 
 #. module: base
 #: view:ir.attachment:0
@@ -3429,7 +3481,7 @@ msgstr "Мексико"
 #. module: base
 #: model:ir.ui.menu,name:base.menu_base_config_plugins
 msgid "Plugins"
-msgstr ""
+msgstr "Добавки"
 
 #. module: base
 #: field:res.company,child_ids:0
@@ -3450,7 +3502,7 @@ msgstr "Никарагуа"
 #: code:addons/orm.py:1046
 #, python-format
 msgid "The write method is not implemented on this object !"
-msgstr ""
+msgstr "Методът запис не е дефиниран за този обект !"
 
 #. module: base
 #: view:res.partner.event:0
@@ -3461,7 +3513,7 @@ msgstr "Главно описание"
 #: model:ir.actions.act_window,name:base.action_config_simple_view_form
 #: view:res.config.view:0
 msgid "Configure Your Interface"
-msgstr ""
+msgstr "Настройка на интерфейс"
 
 #. module: base
 #: field:ir.values,meta:0
@@ -3471,7 +3523,7 @@ msgstr "Мета данни"
 #. module: base
 #: sql_constraint:ir.ui.view_sc:0
 msgid "Shortcut for this menu already exists!"
-msgstr ""
+msgstr "Кратък път към това меню вече съществува!"
 
 #. module: base
 #: model:res.country,name:base.ve
@@ -3500,7 +3552,7 @@ msgstr ""
 #. module: base
 #: field:res.partner,parent_id:0
 msgid "Parent Partner"
-msgstr "Главен партньор"
+msgstr "Главен контрагент"
 
 #. module: base
 #: view:ir.module.module:0
@@ -3520,7 +3572,7 @@ msgstr "Казахстан"
 #. module: base
 #: view:res.lang:0
 msgid "%w - Weekday number [0(Sunday),6]."
-msgstr ""
+msgstr "%w - Номер на ден от седмицата [0(Неделя),6]."
 
 #. module: base
 #: model:ir.actions.act_window,help:base.action_partner_form
@@ -3594,6 +3646,8 @@ msgid ""
 "The user's timezone, used to perform timezone conversions between the server "
 "and the client."
 msgstr ""
+"Часовата зона на потребителя се използва за да се прави конверсия между "
+"сървър и клиент."
 
 #. module: base
 #: field:ir.module.module,demo:0
@@ -3608,7 +3662,7 @@ msgstr "английски (Великобритания)"
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Japanese / 日本語"
-msgstr ""
+msgstr "Японски / 日本語"
 
 #. module: base
 #: help:workflow.transition,act_from:0
@@ -3647,7 +3701,7 @@ msgstr "английски (CA)"
 #. module: base
 #: model:ir.model,name:base.model_publisher_warranty_contract
 msgid "publisher_warranty.contract"
-msgstr ""
+msgstr "publisher_warranty.contract"
 
 #. module: base
 #: model:res.country,name:base.et
@@ -3683,17 +3737,17 @@ msgstr "Групиране по"
 #: view:res.config:0
 #: view:res.config.installer:0
 msgid "title"
-msgstr ""
+msgstr "заглавие"
 
 #. module: base
 #: model:ir.model,name:base.model_base_language_install
 msgid "Install Language"
-msgstr ""
+msgstr "Инсталиране на език"
 
 #. module: base
 #: view:ir.translation:0
 msgid "Translation"
-msgstr ""
+msgstr "Превод"
 
 #. module: base
 #: selection:res.request,state:0
@@ -3718,7 +3772,7 @@ msgstr "Запис на идентификатор"
 #. module: base
 #: model:ir.ui.menu,name:base.menu_product
 msgid "Products"
-msgstr ""
+msgstr "Продукти"
 
 #. module: base
 #: field:ir.actions.act_window,domain:0
@@ -3734,7 +3788,7 @@ msgstr "СМС конфигурация"
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (BO) / Español (BO)"
-msgstr ""
+msgstr "Испански (BO) / Español (BO)"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.ir_access_act
@@ -3774,7 +3828,7 @@ msgstr "Инициализирай дата"
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Gujarati / ગુજરાતી"
-msgstr ""
+msgstr "Гуджарати / ગુજરાતી"
 
 #. module: base
 #: code:addons/base/module/module.py:257
@@ -3799,6 +3853,7 @@ msgstr "Начало на процес"
 #, python-format
 msgid "module base cannot be loaded! (hint: verify addons-path)"
 msgstr ""
+"Модулът base не може да бъде зареден! (подксазка: проверете пътя към Addons)"
 
 #. module: base
 #: view:res.partner.bank:0
@@ -3832,7 +3887,7 @@ msgstr "Гваделупа (Франция)"
 #: code:addons/base/res/res_lang.py:161
 #, python-format
 msgid "User Error"
-msgstr ""
+msgstr "Потребителска грешка"
 
 #. module: base
 #: help:workflow.transition,signal:0
@@ -3845,7 +3900,7 @@ msgstr ""
 #. module: base
 #: help:multi_company.default,object_id:0
 msgid "Object affected by this rule"
-msgstr ""
+msgstr "Обекти повлияни от това правило"
 
 #. module: base
 #: report:ir.module.reference.graph:0
@@ -3860,12 +3915,12 @@ msgstr "Име на меню"
 #. module: base
 #: view:ir.module.module:0
 msgid "Author Website"
-msgstr ""
+msgstr "Уебсайт на автора"
 
 #. module: base
 #: view:ir.attachment:0
 msgid "Month"
-msgstr ""
+msgstr "Месец"
 
 #. module: base
 #: model:res.country,name:base.my
@@ -3876,7 +3931,7 @@ msgstr "Малайзия"
 #: view:base.language.install:0
 #: model:ir.actions.act_window,name:base.action_view_base_language_install
 msgid "Load Official Translation"
-msgstr ""
+msgstr "Зареждане на официален превод"
 
 #. module: base
 #: model:ir.model,name:base.model_res_request_history
@@ -3904,7 +3959,7 @@ msgstr ""
 #. module: base
 #: view:res.lang:0
 msgid "%S - Seconds [00,61]."
-msgstr ""
+msgstr "%S - Секунди [00,61]."
 
 #. module: base
 #: model:res.country,name:base.cv
@@ -3914,7 +3969,7 @@ msgstr "Кабо Верде"
 #. module: base
 #: view:base.module.import:0
 msgid "Select module package to import (.zip file):"
-msgstr ""
+msgstr "Изберете пакета на модула за инсталация (.zip file):"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.act_res_partner_event
@@ -3933,13 +3988,14 @@ msgstr "ir.actions.url"
 #. module: base
 #: model:res.widget,title:base.currency_converter_widget
 msgid "Currency Converter"
-msgstr ""
+msgstr "Конвертор на валути"
 
 #. module: base
 #: code:addons/orm.py:156
 #, python-format
 msgid "Wrong ID for the browse record, got %r, expected an integer."
 msgstr ""
+"Грешен идентификатор на разглеждания запис, получено %r, очаквано цяло число"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_partner_addess_tree
@@ -3955,12 +4011,12 @@ msgstr "Брой добавени модули"
 #. module: base
 #: view:res.currency:0
 msgid "Price Accuracy"
-msgstr ""
+msgstr "Прецизност на цените"
 
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Latvian / latviešu valoda"
-msgstr ""
+msgstr "Латвийски / latviešu valoda"
 
 #. module: base
 #: view:res.config:0
@@ -3977,7 +4033,7 @@ msgstr "Френски / Français"
 #: code:addons/orm.py:1049
 #, python-format
 msgid "The create method is not implemented on this object !"
-msgstr ""
+msgstr "Метода create не е реализиран за този обект !"
 
 #. module: base
 #: field:workflow.triggers,workitem_id:0
@@ -3987,7 +4043,7 @@ msgstr "Задача"
 #. module: base
 #: view:ir.actions.todo:0
 msgid "Set as Todo"
-msgstr ""
+msgstr "Определи като \"Да се направи\""
 
 #. module: base
 #: field:ir.actions.act_window.view,act_window_id:0
@@ -4013,12 +4069,12 @@ msgstr "ir.cron"
 #. module: base
 #: view:ir.rule:0
 msgid "Combination of rules"
-msgstr ""
+msgstr "Комбинация от правила"
 
 #. module: base
 #: view:ir.sequence:0
 msgid "Current Year without Century: %(y)s"
-msgstr ""
+msgstr "Текущата година без века: %(y)s"
 
 #. module: base
 #: field:ir.actions.server,trigger_obj_id:0
@@ -4028,7 +4084,7 @@ msgstr "Тригера включен"
 #. module: base
 #: sql_constraint:ir.rule:0
 msgid "Rule must have at least one checked access right !"
-msgstr ""
+msgstr "Правилото трябва да има поне една отметка за право на достъп!"
 
 #. module: base
 #: model:res.country,name:base.fj
@@ -4065,7 +4121,7 @@ msgstr "Менюта"
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Serbian (Latin) / srpski"
-msgstr ""
+msgstr "Сръбски (Latin) / srpski"
 
 #. module: base
 #: model:res.country,name:base.il
@@ -4120,7 +4176,7 @@ msgstr "Подпоследователност"
 #. module: base
 #: model:ir.model,name:base.model_res_config
 msgid "res.config"
-msgstr ""
+msgstr "res.config"
 
 #. module: base
 #: field:workflow.transition,signal:0
@@ -4138,7 +4194,7 @@ msgstr "Банки"
 #. module: base
 #: view:res.log:0
 msgid "Unread"
-msgstr ""
+msgstr "Само непрочетени"
 
 #. module: base
 #: field:ir.cron,doall:0
@@ -4171,7 +4227,7 @@ msgstr "Обединено кралство"
 #: view:res.config.users:0
 #: view:res.config.view:0
 msgid "res_config_contents"
-msgstr ""
+msgstr "res_config_contents"
 
 #. module: base
 #: help:res.partner.category,active:0
@@ -4204,7 +4260,7 @@ msgstr "Добави автообновяване на изгледа"
 #. module: base
 #: help:res.partner,employee:0
 msgid "Check this box if the partner is an Employee."
-msgstr ""
+msgstr "Отметнете ако контрагентът е служител."
 
 #. module: base
 #: field:ir.actions.report.xml,report_rml_content:0
@@ -4235,6 +4291,8 @@ msgid ""
 "You cannot perform this operation. New Record Creation is not allowed for "
 "this object as this object is for reporting purpose."
 msgstr ""
+"Тази операция не може да бъде извършена. Не е разрешено създаването на нов "
+"запис за този обект, защото е само с цел спавка."
 
 #. module: base
 #: view:base.language.import:0
@@ -4279,7 +4337,7 @@ msgstr ""
 #. module: base
 #: model:ir.ui.menu,name:base.menu_main_pm
 msgid "Project"
-msgstr ""
+msgstr "Проект"
 
 #. module: base
 #: field:ir.ui.menu,web_icon_hover_data:0
@@ -4289,28 +4347,28 @@ msgstr ""
 #. module: base
 #: view:base.module.import:0
 msgid "Module file successfully imported!"
-msgstr ""
+msgstr "Модулът е успешно импортиран!"
 
 #. module: base
 #: selection:ir.actions.todo,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Отказани"
 
 #. module: base
 #: view:res.config.users:0
 msgid "Create User"
-msgstr ""
+msgstr "Създаване на потребител"
 
 #. module: base
 #: view:partner.clear.ids:0
 msgid "Want to Clear Ids ? "
-msgstr ""
+msgstr "Изкате да изчистите ID-тата ? "
 
 #. module: base
 #: field:publisher_warranty.contract,name:0
 #: field:publisher_warranty.contract.wizard,name:0
 msgid "Serial Key"
-msgstr ""
+msgstr "Сериен ключ"
 
 #. module: base
 #: selection:res.request,priority:0
@@ -4320,7 +4378,7 @@ msgstr "Нисък"
 #. module: base
 #: model:ir.ui.menu,name:base.menu_audit
 msgid "Audit"
-msgstr ""
+msgstr "Одит"
 
 #. module: base
 #: model:res.country,name:base.lc
@@ -4342,7 +4400,7 @@ msgstr ""
 #. module: base
 #: field:res.partner,employee:0
 msgid "Employee"
-msgstr ""
+msgstr "Служител"
 
 #. module: base
 #: field:ir.model.access,perm_create:0
@@ -4357,7 +4415,7 @@ msgstr "Област"
 #. module: base
 #: field:ir.actions.server,copy_object:0
 msgid "Copy Of"
-msgstr ""
+msgstr "Копие на"
 
 #. module: base
 #: field:ir.model,osv_memory:0
@@ -4367,7 +4425,7 @@ msgstr ""
 #. module: base
 #: view:partner.clear.ids:0
 msgid "Clear Ids"
-msgstr ""
+msgstr "Изисти Id-та"
 
 #. module: base
 #: model:res.country,name:base.io
@@ -4379,7 +4437,7 @@ msgstr "Британска индоокеанска територия"
 #: field:res.config.view,view:0
 #: field:res.users,view:0
 msgid "Interface"
-msgstr ""
+msgstr "Интерфейс"
 
 #. module: base
 #: view:ir.actions.server:0
@@ -4389,7 +4447,7 @@ msgstr "Свързване на полета"
 #. module: base
 #: view:publisher_warranty.contract:0
 msgid "Refresh Validation Dates"
-msgstr ""
+msgstr "Опресни датите на валидиране"
 
 #. module: base
 #: view:ir.model:0
@@ -4440,12 +4498,12 @@ msgstr "Подпис"
 #: code:addons/fields.py:664
 #, python-format
 msgid "Not Implemented"
-msgstr ""
+msgstr "Не е внедрено"
 
 #. module: base
 #: model:ir.model,name:base.model_res_widget_user
 msgid "res.widget.user"
-msgstr ""
+msgstr "res.widget.user"
 
 #. module: base
 #: field:res.partner.category,complete_name:0
@@ -4455,7 +4513,7 @@ msgstr "Пълно име"
 #. module: base
 #: view:base.module.configuration:0
 msgid "_Ok"
-msgstr ""
+msgstr "_Ok"
 
 #. module: base
 #: help:ir.filters,user_id:0
@@ -4466,7 +4524,7 @@ msgstr ""
 #: code:addons/base/module/module.py:198
 #, python-format
 msgid "The name of the module must be unique !"
-msgstr ""
+msgstr "Името на модула трябва да бъде уникално!"
 
 #. module: base
 #: model:res.country,name:base.mz
@@ -4476,7 +4534,7 @@ msgstr "Мозамбик"
 #. module: base
 #: model:ir.ui.menu,name:base.menu_project_long_term
 msgid "Long Term Planning"
-msgstr ""
+msgstr "Дългосрочно планиране"
 
 #. module: base
 #: field:ir.actions.server,message:0
@@ -4495,7 +4553,7 @@ msgstr "Върху множество документи"
 #: view:res.partner:0
 #: field:res.partner,user_id:0
 msgid "Salesman"
-msgstr ""
+msgstr "Търговец"
 
 #. module: base
 #: field:res.partner,address:0
@@ -4513,7 +4571,7 @@ msgstr ""
 #. module: base
 #: view:res.widget.wizard:0
 msgid "Add"
-msgstr ""
+msgstr "Добави"
 
 #. module: base
 #: view:base.module.upgrade:0
@@ -4525,7 +4583,7 @@ msgstr "Приложи планираните обновявания"
 #. module: base
 #: view:res.widget:0
 msgid "Widgets"
-msgstr ""
+msgstr "Добавки"
 
 #. module: base
 #: model:res.country,name:base.cz
@@ -4535,7 +4593,7 @@ msgstr "Чехия"
 #. module: base
 #: view:res.widget.wizard:0
 msgid "Widget Wizard"
-msgstr ""
+msgstr "Помощник за добавките"
 
 #. module: base
 #: model:ir.actions.act_window,help:base.act_ir_actions_todo_form
@@ -4552,17 +4610,19 @@ msgid ""
 "Please use the change password wizard (in User Preferences or User menu) to "
 "change your own password."
 msgstr ""
+"Моля, използвайте помощникът за промята на потребителска парола (в "
+"Потребителски настройки или от меню Потребител) за да си смените пароалата."
 
 #. module: base
 #: code:addons/orm.py:1350
 #, python-format
 msgid "Insufficient fields for Calendar View!"
-msgstr ""
+msgstr "Недостатъчни полета за Календарен изглед!"
 
 #. module: base
 #: selection:ir.property,type:0
 msgid "Integer"
-msgstr ""
+msgstr "Цяло число"
 
 #. module: base
 #: help:ir.actions.report.xml,report_rml:0
@@ -4575,7 +4635,7 @@ msgstr ""
 #: help:res.config.users,company_id:0
 #: help:res.users,company_id:0
 msgid "The company this user is currently working for."
-msgstr ""
+msgstr "Фирмата, за която този потребител работи понастоящем."
 
 #. module: base
 #: model:ir.model,name:base.model_wizard_ir_model_menu_create
@@ -4631,12 +4691,12 @@ msgstr "Затвори"
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (MX) / Español (MX)"
-msgstr ""
+msgstr "Испански (MX) / Español (MX)"
 
 #. module: base
 #: view:res.log:0
 msgid "My Logs"
-msgstr ""
+msgstr "Моите логове"
 
 #. module: base
 #: model:res.country,name:base.bt
@@ -4646,7 +4706,7 @@ msgstr "Бутан"
 #. module: base
 #: help:ir.sequence,number_next:0
 msgid "Next number of this sequence"
-msgstr ""
+msgstr "Следващ номер от този порядък"
 
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_11
@@ -4687,12 +4747,12 @@ msgstr "res.config.view"
 #: view:res.log:0
 #: field:res.log,read:0
 msgid "Read"
-msgstr ""
+msgstr "Прочитане"
 
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The name of the country must be unique !"
-msgstr ""
+msgstr "Името на държавата трябва да бъде уникално!"
 
 #. module: base
 #: model:ir.actions.act_window,help:base.action_country_state
@@ -4732,7 +4792,7 @@ msgstr "Полета"
 #. module: base
 #: model:ir.actions.act_window,name:base.action_partner_employee_form
 msgid "Employees"
-msgstr ""
+msgstr "Служители"
 
 #. module: base
 #: help:res.log,read:0
@@ -4773,7 +4833,7 @@ msgstr "acc_number"
 #: model:ir.actions.act_window,name:base.action_partner_address_form
 #: model:ir.ui.menu,name:base.menu_partner_address_form
 msgid "Addresses"
-msgstr ""
+msgstr "Адреси"
 
 #. module: base
 #: model:res.country,name:base.mm
@@ -4851,7 +4911,7 @@ msgstr "Допълнително поле"
 #. module: base
 #: field:ir.module.module,web:0
 msgid "Has a web component"
-msgstr ""
+msgstr "Има уеб компонент"
 
 #. module: base
 #: model:res.country,name:base.cc
@@ -4888,11 +4948,14 @@ msgid ""
 "\n"
 "This addon is already installed on your system"
 msgstr ""
+"\n"
+"\n"
+"Тази добавка е вече инсталирана на вашата система"
 
 #. module: base
 #: help:ir.cron,interval_number:0
 msgid "Repeat every x."
-msgstr ""
+msgstr "Повторение всеки x."
 
 #. module: base
 #: wizard_view:server.action.create,step_1:0
@@ -4908,7 +4971,7 @@ msgstr "1cm 28cm 20cm 28cm"
 #. module: base
 #: field:ir.module.module,maintainer:0
 msgid "Maintainer"
-msgstr ""
+msgstr "Поддържащ"
 
 #. module: base
 #: field:ir.sequence,suffix:0
@@ -4938,7 +5001,7 @@ msgstr "Поле на Обекта"
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (PE) / Español (PE)"
-msgstr ""
+msgstr "Испански (PE) / Español (PE)"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -4952,17 +5015,19 @@ msgid ""
 "If specified, this action will be opened at logon for this user, in addition "
 "to the standard menu."
 msgstr ""
+"Ако е оказано, това действи ще бъде отворено при вход на този потребител в "
+"добавка на стандартното меню."
 
 #. module: base
 #: view:ir.values:0
 msgid "Client Actions"
-msgstr ""
+msgstr "Действия на клиент"
 
 #. module: base
 #: code:addons/orm.py:1806
 #, python-format
 msgid "The exists method is not implemented on this object !"
-msgstr ""
+msgstr "Съществуващият метод не е вграден в този обект!"
 
 #. module: base
 #: code:addons/base/module/module.py:336
@@ -4987,7 +5052,7 @@ msgstr "Свързване на събития с действие"
 #. module: base
 #: model:ir.model,name:base.model_base_update_translations
 msgid "base.update.translations"
-msgstr ""
+msgstr "base.update.translations"
 
 #. module: base
 #: field:ir.module.category,parent_id:0
@@ -5070,7 +5135,7 @@ msgstr ""
 #. module: base
 #: selection:ir.property,type:0
 msgid "Many2One"
-msgstr ""
+msgstr "Много кън един"
 
 #. module: base
 #: model:res.country,name:base.ng
@@ -5086,7 +5151,7 @@ msgstr ""
 #. module: base
 #: model:ir.actions.act_window,name:base.action_partner_sms_send
 msgid "SMS Send"
-msgstr ""
+msgstr "Изпращане на SMS"
 
 #. module: base
 #: field:res.company,user_ids:0
@@ -5096,7 +5161,7 @@ msgstr "Одобрени потребители"
 #. module: base
 #: field:ir.ui.menu,web_icon_data:0
 msgid "Web Icon Image"
-msgstr ""
+msgstr "Уеб икона"
 
 #. module: base
 #: view:ir.values:0
@@ -5150,7 +5215,7 @@ msgstr "2.  %a ,%A         ==> Пет, Петък"
 #. module: base
 #: field:res.widget,content:0
 msgid "Content"
-msgstr ""
+msgstr "Съдържание"
 
 #. module: base
 #: help:ir.rule,global:0
@@ -5191,7 +5256,7 @@ msgstr "Доминика"
 #: sql_constraint:publisher_warranty.contract:0
 msgid ""
 "Your publisher warranty contract is already subscribed in the system !"
-msgstr ""
+msgstr "Вече ви е вписан гаранционния в договор в системата"
 
 #. module: base
 #: help:ir.cron,nextcall:0
@@ -5202,7 +5267,7 @@ msgstr ""
 #: help:res.config.users,view:0
 #: help:res.users,view:0
 msgid "Choose between the simplified interface and the extended one"
-msgstr ""
+msgstr "Изберете между опростен и разширен интерфейс"
 
 #. module: base
 #: model:res.country,name:base.np
@@ -5355,12 +5420,12 @@ msgstr "_Затвори"
 #. module: base
 #: field:multi_company.default,company_dest_id:0
 msgid "Default Company"
-msgstr ""
+msgstr "Фирма подразбиране"
 
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (EC) / Español (EC)"
-msgstr ""
+msgstr "Испански (EC) / Español (EC)"
 
 #. module: base
 #: help:ir.ui.view,xml_id:0
@@ -5371,7 +5436,7 @@ msgstr ""
 #: model:ir.model,name:base.model_base_module_import
 #: model:ir.ui.menu,name:base.menu_view_base_module_import
 msgid "Import Module"
-msgstr ""
+msgstr "Импортиране на модул"
 
 #. module: base
 #: model:res.country,name:base.as
@@ -5420,7 +5485,7 @@ msgstr "Повтаряне"
 #: code:addons/orm.py:3532
 #, python-format
 msgid "UserError"
-msgstr ""
+msgstr "Потребителска грешка"
 
 #. module: base
 #: model:res.country,name:base.ae
@@ -5475,7 +5540,7 @@ msgstr "AccessError"
 #. module: base
 #: view:res.request:0
 msgid "Waiting"
-msgstr ""
+msgstr "Изчакване"
 
 #. module: base
 #: code:addons/__init__.py:834
@@ -5492,12 +5557,12 @@ msgstr "8.  %I:%M:%S %p  ==> 06:25:20 PM"
 #: code:addons/orm.py:1803
 #, python-format
 msgid "The copy method is not implemented on this object !"
-msgstr ""
+msgstr "Метода copy не е реализиран за този обект !"
 
 #. module: base
 #: field:res.log,create_date:0
 msgid "Creation Date"
-msgstr ""
+msgstr "Дата на създаване"
 
 #. module: base
 #: view:ir.translation:0
@@ -5513,7 +5578,7 @@ msgstr "Брой на остъпката"
 #. module: base
 #: view:ir.actions.report.xml:0
 msgid "Report"
-msgstr ""
+msgstr "Справка"
 
 #. module: base
 #: model:res.country,name:base.ua
@@ -5534,7 +5599,7 @@ msgstr "Категория на модула"
 #. module: base
 #: view:partner.wizard.ean.check:0
 msgid "Ignore"
-msgstr ""
+msgstr "Пренебрегване"
 
 #. module: base
 #: report:ir.module.reference.graph:0
@@ -5544,7 +5609,7 @@ msgstr "Съответстващо упътване"
 #. module: base
 #: view:ir.ui.view:0
 msgid "Architecture"
-msgstr ""
+msgstr "Архитектура"
 
 #. module: base
 #: model:res.country,name:base.ml
@@ -5629,7 +5694,7 @@ msgstr "Потребителски клавишни комбинации"
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Vietnamese / Tiếng Việt"
-msgstr ""
+msgstr "Виетнамски / Tiếng Việt"
 
 #. module: base
 #: model:res.country,name:base.dz
@@ -5700,7 +5765,7 @@ msgstr ""
 #: code:addons/fields.py:103
 #, python-format
 msgid "Not implemented get_memory method !"
-msgstr ""
+msgstr "Методът get_memory не е реализиран !"
 
 #. module: base
 #: view:ir.actions.server:0
@@ -5747,17 +5812,17 @@ msgstr "Неутрална зона"
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Hindi / हिंदी"
-msgstr ""
+msgstr "Хинди / हिंदी"
 
 #. module: base
 #: view:ir.model:0
 msgid "Custom"
-msgstr ""
+msgstr "Персонализиран"
 
 #. module: base
 #: view:res.request:0
 msgid "Current"
-msgstr ""
+msgstr "Текущ"
 
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_9
@@ -5799,7 +5864,7 @@ msgstr ""
 #. module: base
 #: selection:publisher_warranty.contract.wizard,state:0
 msgid "Finished"
-msgstr ""
+msgstr "Завършен"
 
 #. module: base
 #: model:res.country,name:base.de
@@ -5883,12 +5948,12 @@ msgstr ""
 #. module: base
 #: field:base.language.import,name:0
 msgid "Language Name"
-msgstr ""
+msgstr "Име на език"
 
 #. module: base
 #: selection:ir.property,type:0
 msgid "Boolean"
-msgstr ""
+msgstr "Булев тип"
 
 #. module: base
 #: view:ir.model:0
@@ -5909,7 +5974,7 @@ msgstr "Описание на полетата"
 #: view:res.partner.address:0
 #: view:workflow.activity:0
 msgid "Group By..."
-msgstr ""
+msgstr "Групиране по..."
 
 #. module: base
 #: view:ir.model.fields:0
@@ -6037,7 +6102,7 @@ msgstr ""
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (CO) / Español (CO)"
-msgstr ""
+msgstr "Испански (CO) / Español (CO)"
 
 #. module: base
 #: view:base.module.configuration:0
@@ -6054,7 +6119,7 @@ msgstr "Създай"
 #. module: base
 #: view:ir.sequence:0
 msgid "Current Year with Century: %(year)s"
-msgstr ""
+msgstr "Текущата година с века: %(year)s"
 
 #. module: base
 #: field:ir.exports,export_fields:0
@@ -6069,7 +6134,7 @@ msgstr "Франция"
 #. module: base
 #: model:ir.model,name:base.model_res_log
 msgid "res.log"
-msgstr ""
+msgstr "res.log"
 
 #. module: base
 #: help:ir.translation,module:0
@@ -6119,7 +6184,7 @@ msgstr "Вид"
 #: code:addons/orm.py:3775
 #, python-format
 msgid "This method does not exist anymore"
-msgstr ""
+msgstr "Методът повече не съществува"
 
 #. module: base
 #: field:res.bank,fax:0
@@ -6159,17 +6224,17 @@ msgstr "res.request"
 #. module: base
 #: view:ir.model:0
 msgid "In Memory"
-msgstr ""
+msgstr "В паметта"
 
 #. module: base
 #: view:ir.actions.todo:0
 msgid "Todo"
-msgstr ""
+msgstr "Да се направи"
 
 #. module: base
 #: field:ir.attachment,datas:0
 msgid "File Content"
-msgstr ""
+msgstr "Съдържание на файл"
 
 #. module: base
 #: model:res.country,name:base.pa
@@ -6191,7 +6256,7 @@ msgstr ""
 #: constraint:res.config.users:0
 #: constraint:res.users:0
 msgid "The chosen company is not in the allowed companies for this user"
-msgstr ""
+msgstr "Избраната фирма не е измежду разрешените фирми за този потребител"
 
 #. module: base
 #: model:res.country,name:base.gi
@@ -6201,7 +6266,7 @@ msgstr "Гибралтар"
 #. module: base
 #: field:ir.actions.report.xml,report_name:0
 msgid "Service Name"
-msgstr ""
+msgstr "Име на услуга"
 
 #. module: base
 #: model:res.country,name:base.pn
@@ -6224,7 +6289,7 @@ msgstr "Правила на записа"
 #: field:res.config.users,name:0
 #: field:res.users,name:0
 msgid "User Name"
-msgstr ""
+msgstr "Име на потребител"
 
 #. module: base
 #: view:ir.sequence:0
@@ -6263,7 +6328,7 @@ msgstr "Изглед при търсене"
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The code of the language must be unique !"
-msgstr ""
+msgstr "Кодът на езика трябва да бъде уникален!"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_attachment
@@ -6278,7 +6343,7 @@ msgstr "Прикачени файлове"
 #: model:ir.ui.menu,name:base.menu_sale_config_sales
 #: model:ir.ui.menu,name:base.menu_sales
 msgid "Sales"
-msgstr ""
+msgstr "Продажби"
 
 #. module: base
 #: field:ir.actions.server,child_ids:0
@@ -6306,7 +6371,7 @@ msgstr "Права за запис"
 #. module: base
 #: view:res.lang:0
 msgid "%m - Month number [01,12]."
-msgstr ""
+msgstr "%m - Месец номер [01,12]."
 
 #. module: base
 #: field:res.bank,city:0
@@ -6330,7 +6395,7 @@ msgstr "Италия"
 #: view:ir.actions.todo:0
 #: selection:ir.actions.todo,state:0
 msgid "To Do"
-msgstr ""
+msgstr "Трябва да се направи"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -6342,7 +6407,7 @@ msgstr "естонски / Eesti keel"
 #: field:res.partner,email:0
 #: field:res.users,email:0
 msgid "E-mail"
-msgstr ""
+msgstr "Имейл"
 
 #. module: base
 #: selection:ir.module.module,license:0
@@ -6364,7 +6429,7 @@ msgstr "Английски (Съединени Щати)"
 #: view:ir.model.data:0
 #: model:ir.ui.menu,name:base.ir_model_data_menu
 msgid "Object Identifiers"
-msgstr ""
+msgstr "Идентификатори на обект"
 
 #. module: base
 #: model:ir.actions.act_window,help:base.action_partner_title_partner
@@ -6403,7 +6468,7 @@ msgstr "Инсталирана версия"
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Mongolian / монгол"
-msgstr ""
+msgstr "Монголски / монгол"
 
 #. module: base
 #: model:res.country,name:base.mr
@@ -6418,7 +6483,7 @@ msgstr "ir.translation"
 #. module: base
 #: view:base.module.update:0
 msgid "Module update result"
-msgstr ""
+msgstr "Резултат от ъпдейт на модул"
 
 #. module: base
 #: view:workflow.activity:0
@@ -6435,12 +6500,12 @@ msgstr "Пощенски адрес"
 #. module: base
 #: field:res.company,parent_id:0
 msgid "Parent Company"
-msgstr "Родителска компания"
+msgstr "Фирма майка"
 
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (CR) / Español (CR)"
-msgstr ""
+msgstr "Испански (CR) / Español (CR)"
 
 #. module: base
 #: field:res.currency.rate,rate:0
@@ -6465,7 +6530,7 @@ msgstr "Стойност по подразбиране"
 #. module: base
 #: model:ir.ui.menu,name:base.menu_tools
 msgid "Tools"
-msgstr ""
+msgstr "Инструменти"
 
 #. module: base
 #: model:res.country,name:base.kn
@@ -6525,7 +6590,7 @@ msgstr "Икона"
 #. module: base
 #: help:ir.model.fields,model_id:0
 msgid "The model this field belongs to"
-msgstr ""
+msgstr "Модел към, който това поле принадлежи"
 
 #. module: base
 #: model:res.country,name:base.mq
@@ -6604,13 +6669,13 @@ msgstr "Проблем в конфигурацията 'Record Id' в Дейст
 #: code:addons/orm.py:2316
 #, python-format
 msgid "ValidateError"
-msgstr ""
+msgstr "Грешка при валидиране"
 
 #. module: base
 #: view:base.module.import:0
 #: view:base.module.update:0
 msgid "Open Modules"
-msgstr ""
+msgstr "Отваряне на модули"
 
 #. module: base
 #: model:ir.actions.act_window,help:base.action_res_bank_form
@@ -6644,7 +6709,7 @@ msgstr "Лаос"
 #: field:res.config.users,user_email:0
 #: field:res.users,user_email:0
 msgid "Email"
-msgstr "Ел. поща"
+msgstr "Имейл"
 
 #. module: base
 #: field:res.config.users,action_id:0
@@ -6659,6 +6724,8 @@ msgid ""
 "The sum of the data (2nd field) is null.\n"
 "We can't draw a pie chart !"
 msgstr ""
+"Сумата на данните (2то поле) е нищо (null)\n"
+"Не може да начертае кръгова диаграма."
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_lunch_reporting
@@ -6670,7 +6737,7 @@ msgstr ""
 #: model:ir.ui.menu,name:base.next_id_73
 #: model:ir.ui.menu,name:base.reporting_menu
 msgid "Reporting"
-msgstr ""
+msgstr "Отчитане"
 
 #. module: base
 #: model:res.country,name:base.tg
@@ -6696,7 +6763,7 @@ msgstr ""
 #. module: base
 #: view:ir.model.data:0
 msgid "Updatable"
-msgstr ""
+msgstr "Обновим"
 
 #. module: base
 #: view:res.lang:0
@@ -6711,7 +6778,7 @@ msgstr "Каскадно"
 #. module: base
 #: field:workflow.transition,group_id:0
 msgid "Group Required"
-msgstr ""
+msgstr "Изисква се група"
 
 #. module: base
 #: view:ir.actions.configuration.wizard:0
@@ -6738,7 +6805,7 @@ msgstr ""
 #. module: base
 #: view:base.module.upgrade:0
 msgid "Start update"
-msgstr ""
+msgstr "Започване на обновяване"
 
 #. module: base
 #: code:addons/base/publisher_warranty/publisher_warranty.py:144
@@ -6781,7 +6848,7 @@ msgstr "ir.ui.view"
 #. module: base
 #: constraint:res.partner:0
 msgid "Error ! You can not create recursive associated members."
-msgstr ""
+msgstr "Грешка ! Не може да създадете рекурсивно свързани членове"
 
 #. module: base
 #: help:res.lang,code:0
@@ -6796,7 +6863,7 @@ msgstr "OpenERP партньори"
 #. module: base
 #: model:ir.ui.menu,name:base.menu_hr_manager
 msgid "HR Manager Dashboard"
-msgstr ""
+msgstr "Табло мениджър ЧР"
 
 #. module: base
 #: code:addons/base/module/module.py:253
@@ -6808,7 +6875,7 @@ msgstr ""
 #. module: base
 #: view:ir.module.module:0
 msgid "Search modules"
-msgstr ""
+msgstr "Търси в модули"
 
 #. module: base
 #: model:res.country,name:base.by
@@ -6848,13 +6915,13 @@ msgstr "Улица2"
 #. module: base
 #: model:ir.actions.act_window,name:base.action_view_base_module_update
 msgid "Module Update"
-msgstr ""
+msgstr "Обновяване на модул"
 
 #. module: base
 #: code:addons/base/module/wizard/base_module_upgrade.py:95
 #, python-format
 msgid "Following modules are not installed or unknown: %s"
-msgstr ""
+msgstr "Следните модули са непознати или не са инсталирани: %s"
 
 #. module: base
 #: view:ir.cron:0
@@ -6883,7 +6950,7 @@ msgstr "Отвори прозорец"
 #. module: base
 #: field:ir.actions.act_window,auto_search:0
 msgid "Auto Search"
-msgstr ""
+msgstr "Автоматично търсене"
 
 #. module: base
 #: field:ir.actions.act_window,filter:0
@@ -6893,7 +6960,7 @@ msgstr "Филтър"
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_madam
 msgid "Ms."
-msgstr ""
+msgstr "Г-жа"
 
 #. module: base
 #: model:res.country,name:base.ch
@@ -6923,13 +6990,15 @@ msgstr "Toчност на закръгляване"
 #. module: base
 #: view:base.language.install:0
 msgid "Load"
-msgstr ""
+msgstr "Зареждане"
 
 #. module: base
 #: help:res.config.users,name:0
 #: help:res.users,name:0
 msgid "The new user's real name, used for searching and most listings"
 msgstr ""
+"Истинското име на нов потребител, използвано в последствие за търсене в "
+"повечето списъци"
 
 #. module: base
 #: code:addons/osv.py:154
@@ -6947,7 +7016,7 @@ msgstr ""
 #: code:addons/base/ir/ir_model.py:223
 #, python-format
 msgid "Size of the field can never be less than 1 !"
-msgstr ""
+msgstr "Рамерът на полето никога не може да бъде по-малко от 1!"
 
 #. module: base
 #: model:res.country,name:base.so
@@ -6957,7 +7026,7 @@ msgstr "Сомалия"
 #. module: base
 #: selection:publisher_warranty.contract,state:0
 msgid "Terminated"
-msgstr ""
+msgstr "Прекратен"
 
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_13
@@ -6986,17 +7055,17 @@ msgstr "Аргументи"
 #: code:addons/orm.py:716
 #, python-format
 msgid "Database ID doesn't exist: %s : %s"
-msgstr ""
+msgstr "База данни ID не съществува: %s : %s"
 
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL Version 2"
-msgstr ""
+msgstr "GPL Версия 2"
 
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL Version 3"
-msgstr ""
+msgstr "GPL Version 3"
 
 #. module: base
 #: code:addons/orm.py:836
@@ -7007,13 +7076,13 @@ msgstr ""
 #. module: base
 #: view:partner.wizard.ean.check:0
 msgid "Correct EAN13"
-msgstr ""
+msgstr "Коректен EAN13"
 
 #. module: base
 #: code:addons/orm.py:2317
 #, python-format
 msgid "The value \"%s\" for the field \"%s\" is not in the selection"
-msgstr ""
+msgstr "Стойността \"%s\" за поле \"%s\" не е в селекцията"
 
 #. module: base
 #: field:res.partner,customer:0
@@ -7026,7 +7095,7 @@ msgstr "Клиент"
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (NI) / Español (NI)"
-msgstr ""
+msgstr "Испански (NI) / Español (NI)"
 
 #. module: base
 #: field:ir.module.module,shortdesc:0
@@ -7047,7 +7116,7 @@ msgstr "Час 00->24: %(h24)"
 #. module: base
 #: field:ir.cron,nextcall:0
 msgid "Next Execution Date"
-msgstr ""
+msgstr "Дата на следващо изпълнение"
 
 #. module: base
 #: help:multi_company.default,field_id:0
@@ -7089,7 +7158,7 @@ msgstr "Тунис"
 #. module: base
 #: model:ir.ui.menu,name:base.menu_mrp_root
 msgid "Manufacturing"
-msgstr ""
+msgstr "Производство"
 
 #. module: base
 #: model:res.country,name:base.km
@@ -7111,7 +7180,7 @@ msgstr "Прекъсни инсталацията"
 #. module: base
 #: field:ir.model.fields,selection:0
 msgid "Selection Options"
-msgstr ""
+msgstr "Опции за селекция"
 
 #. module: base
 #: field:res.partner.category,parent_right:0
@@ -7126,7 +7195,7 @@ msgstr "Легенда на форматите за дата и време"
 #. module: base
 #: selection:ir.actions.server,state:0
 msgid "Copy Object"
-msgstr ""
+msgstr "Копиране на обекта"
 
 #. module: base
 #: code:addons/base/res/res_user.py:581
@@ -7134,6 +7203,8 @@ msgstr ""
 msgid ""
 "Group(s) cannot be deleted, because some user(s) still belong to them: %s !"
 msgstr ""
+"Групата(s) не може да бъде изтрита, защото има потребители, които и "
+"принадлежат(s) все още: %s !"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_country_state
@@ -7204,7 +7275,7 @@ msgstr "Минута: %(min)s"
 #: model:ir.actions.act_window,name:base.action_wizard_update_translations
 #: model:ir.ui.menu,name:base.menu_wizard_update_translations
 msgid "Synchronize Translations"
-msgstr ""
+msgstr "Синхронизиране на преводи"
 
 #. module: base
 #: model:ir.ui.menu,name:base.next_id_10
@@ -7217,6 +7288,8 @@ msgid ""
 "Number of time the function is called,\n"
 "a negative number indicates no limit"
 msgstr ""
+"Брой пъти за извикване на функция,\n"
+"отрицателно число означава без лимит"
 
 #. module: base
 #: code:addons/base/ir/ir_model.py:331
@@ -7235,12 +7308,12 @@ msgstr "Потребителска справка"
 #: code:addons/base/res/res_user.py:580
 #, python-format
 msgid "Warning !"
-msgstr ""
+msgstr "Предупреждение !"
 
 #. module: base
 #: model:res.widget,title:base.google_maps_widget
 msgid "Google Maps"
-msgstr ""
+msgstr "Google Maps"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_base_config
@@ -7329,7 +7402,7 @@ msgstr "Състояние"
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Galician / Galego"
-msgstr ""
+msgstr "Галски / Galego"
 
 #. module: base
 #: model:res.country,name:base.no
@@ -7350,7 +7423,7 @@ msgstr "Зареждане на официален превод"
 #. module: base
 #: view:res.currency:0
 msgid "Miscelleanous"
-msgstr ""
+msgstr "Разни"
 
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_10
@@ -7381,12 +7454,12 @@ msgstr "workflow.triggers"
 #: code:addons/base/ir/ir_model.py:62
 #, python-format
 msgid "Invalid search criterions"
-msgstr ""
+msgstr "Невалидни критерии за търсене"
 
 #. module: base
 #: view:ir.attachment:0
 msgid "Created"
-msgstr ""
+msgstr "Създаден"
 
 #. module: base
 #: help:ir.actions.wizard,multi:0
@@ -7448,7 +7521,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:base.action_view_base_import_language
 #: model:ir.ui.menu,name:base.menu_view_base_import_language
 msgid "Import Translation"
-msgstr ""
+msgstr "Импортиране на превод"
 
 #. module: base
 #: field:res.partner.bank.type,field_ids:0
@@ -7466,7 +7539,7 @@ msgstr "Категория"
 #: selection:ir.attachment,type:0
 #: selection:ir.property,type:0
 msgid "Binary"
-msgstr ""
+msgstr "двоичен"
 
 #. module: base
 #: field:ir.actions.server,sms:0
@@ -7482,7 +7555,7 @@ msgstr "Коста Рика"
 #. module: base
 #: view:workflow.activity:0
 msgid "Conditions"
-msgstr ""
+msgstr "Условия"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_partner_other_form
@@ -7499,7 +7572,7 @@ msgstr "Валути"
 #. module: base
 #: sql_constraint:res.groups:0
 msgid "The name of the group must be unique !"
-msgstr ""
+msgstr "Името на групата трябва да бъде уникално!"
 
 #. module: base
 #: view:ir.sequence:0
@@ -7546,12 +7619,12 @@ msgstr "10. %S ==> 20"
 #: code:addons/fields.py:106
 #, python-format
 msgid "undefined get method !"
-msgstr ""
+msgstr "непознат метод get!"
 
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Norwegian Bokmål / Norsk bokmål"
-msgstr ""
+msgstr "Норвежки Bokmål / Norsk bokmål"
 
 #. module: base
 #: help:res.config.users,new_password:0
@@ -7574,7 +7647,7 @@ msgstr "Естония"
 #. module: base
 #: model:ir.ui.menu,name:base.dashboard
 msgid "Dashboards"
-msgstr ""
+msgstr "Табла"
 
 #. module: base
 #: help:ir.attachment,type:0
@@ -7585,7 +7658,7 @@ msgstr ""
 #: field:res.config.users,new_password:0
 #: field:res.users,new_password:0
 msgid "Change password"
-msgstr ""
+msgstr "Променя на паролата"
 
 #. module: base
 #: model:res.country,name:base.nl
@@ -7625,7 +7698,7 @@ msgstr ""
 #: model:ir.ui.menu,name:base.menu_emails
 #: model:ir.ui.menu,name:base.menu_mail_gateway
 msgid "Emails"
-msgstr ""
+msgstr "Имейли"
 
 #. module: base
 #: model:res.country,name:base.cd
@@ -7702,7 +7775,7 @@ msgstr "Python код за изпълнение"
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The code of the country must be unique !"
-msgstr ""
+msgstr "Kодът на държавата трябва да бъде уникален!"
 
 #. module: base
 #: selection:ir.module.module.dependency,state:0
@@ -7723,7 +7796,7 @@ msgstr "Тригер"
 #. module: base
 #: model:ir.model,name:base.model_base_module_update
 msgid "Update Module"
-msgstr ""
+msgstr "Обновяване на модул"
 
 #. module: base
 #: view:ir.model.fields:0
@@ -7783,7 +7856,7 @@ msgstr "Доставчици"
 #. module: base
 #: view:publisher_warranty.contract.wizard:0
 msgid "Register"
-msgstr ""
+msgstr "Регистриране"
 
 #. module: base
 #: field:res.request,ref_doc2:0
@@ -7861,12 +7934,12 @@ msgstr "От"
 #. module: base
 #: view:res.users:0
 msgid "Preferences"
-msgstr ""
+msgstr "Предпочитания"
 
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_consumers0
 msgid "Consumers"
-msgstr ""
+msgstr "Потребители"
 
 #. module: base
 #: view:res.config:0
@@ -7892,7 +7965,7 @@ msgstr ""
 #. module: base
 #: view:ir.actions.report.xml:0
 msgid "Miscellaneous"
-msgstr ""
+msgstr "Разни"
 
 #. module: base
 #: model:res.country,name:base.cn
@@ -8024,7 +8097,7 @@ msgstr ""
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Slovak / Slovenský jazyk"
-msgstr ""
+msgstr "Словашки / Slovenský jazyk"
 
 #. module: base
 #: field:base.language.export,state:0
@@ -8036,7 +8109,7 @@ msgstr "неизвестен"
 #. module: base
 #: field:res.currency,symbol:0
 msgid "Symbol"
-msgstr ""
+msgstr "Символ"
 
 #. module: base
 #: help:res.config.users,login:0
@@ -8047,7 +8120,7 @@ msgstr ""
 #. module: base
 #: view:base.update.translations:0
 msgid "Synchronize Translation"
-msgstr ""
+msgstr "Синхронизиране на превод"
 
 #. module: base
 #: field:ir.ui.view_sc,res_id:0
@@ -8067,7 +8140,7 @@ msgstr "Ирак"
 #. module: base
 #: model:ir.ui.menu,name:base.menu_association
 msgid "Association"
-msgstr ""
+msgstr "Асоциация"
 
 #. module: base
 #: model:res.country,name:base.cl
@@ -8079,7 +8152,7 @@ msgstr "Чили"
 #: model:ir.ui.menu,name:base.menu_config_address_book
 #: model:ir.ui.menu,name:base.menu_procurement_management_supplier
 msgid "Address Book"
-msgstr ""
+msgstr "Адресна книга"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_sequence_type
@@ -8094,7 +8167,7 @@ msgstr "CSV Файл"
 #. module: base
 #: field:res.company,account_no:0
 msgid "Account No."
-msgstr ""
+msgstr "Сметка No."
 
 #. module: base
 #: code:addons/base/res/res_lang.py:157
@@ -8206,7 +8279,7 @@ msgstr ""
 #. module: base
 #: selection:ir.ui.view,type:0
 msgid "Diagram"
-msgstr ""
+msgstr "Диаграма"
 
 #. module: base
 #: help:multi_company.default,name:0
@@ -8217,7 +8290,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:base.grant_menu_access
 #: model:ir.ui.menu,name:base.menu_grant_menu_access
 msgid "Menu Items"
-msgstr ""
+msgstr "Елементи в менюто"
 
 #. module: base
 #: constraint:ir.rule:0
@@ -8228,7 +8301,7 @@ msgstr ""
 #: model:ir.ui.menu,name:base.menu_event_association
 #: model:ir.ui.menu,name:base.menu_event_main
 msgid "Events Organisation"
-msgstr ""
+msgstr "Организация на събития"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.ir_sequence_actions
@@ -8335,7 +8408,7 @@ msgstr "датски / Dansk"
 #. module: base
 #: selection:ir.model.fields,select_level:0
 msgid "Advanced Search (deprecated)"
-msgstr ""
+msgstr "Разширено търсене (deprecated)"
 
 #. module: base
 #: model:res.country,name:base.cx
@@ -8350,7 +8423,7 @@ msgstr "Конфигурация на други действия"
 #. module: base
 #: view:res.config.installer:0
 msgid "Install Modules"
-msgstr ""
+msgstr "Инсталиране на модули"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.res_partner_canal-act
@@ -8363,7 +8436,7 @@ msgstr "Канали"
 #. module: base
 #: view:ir.ui.view:0
 msgid "Extra Info"
-msgstr ""
+msgstr "Допълнителна информация"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.act_values_form_action
@@ -8379,7 +8452,7 @@ msgstr "Инсталирай"
 #. module: base
 #: model:ir.model,name:base.model_partner_wizard_ean_check
 msgid "Ean Check"
-msgstr ""
+msgstr "Проверка на EAN"
 
 #. module: base
 #: sql_constraint:res.config.users:0
@@ -8401,7 +8474,7 @@ msgstr "Изпрати"
 #: field:res.config.users,menu_tips:0
 #: field:res.users,menu_tips:0
 msgid "Menu Tips"
-msgstr ""
+msgstr "Подсказки на менютата"
 
 #. module: base
 #: field:ir.translation,src:0
@@ -8441,14 +8514,14 @@ msgstr "Започни настройката"
 #. module: base
 #: view:base.language.export:0
 msgid "_Export"
-msgstr ""
+msgstr "_Експортиране"
 
 #. module: base
 #: field:base.language.install,state:0
 #: field:base.module.import,state:0
 #: field:base.module.update,state:0
 msgid "state"
-msgstr ""
+msgstr "състояние"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -8463,7 +8536,7 @@ msgstr "Доминиканска република"
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Serbian (Cyrillic) / српски"
-msgstr ""
+msgstr "Сръбски (Cyrillic) / српски"
 
 #. module: base
 #: code:addons/orm.py:2161
@@ -8495,13 +8568,13 @@ msgstr "Зависимо поле"
 #. module: base
 #: view:res.partner.event:0
 msgid "Event Logs"
-msgstr ""
+msgstr "Логове на събития"
 
 #. module: base
 #: code:addons/base/module/wizard/base_module_configuration.py:37
 #, python-format
 msgid "System Configuration done"
-msgstr ""
+msgstr "Сисемната настройка е готова"
 
 #. module: base
 #: field:workflow.triggers,instance_id:0
@@ -8550,14 +8623,14 @@ msgstr ""
 #: code:addons/base/ir/ir_ui_menu.py:285
 #, python-format
 msgid "Error ! You can not create recursive Menu."
-msgstr ""
+msgstr "Грешка! Не можете да създавате рекурсивни менюта."
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_publisher_warranty_contract_add_wizard
 #: model:ir.ui.menu,name:base.menu_publisher_warranty_contract_add
 #: view:publisher_warranty.contract.wizard:0
 msgid "Register a Contract"
-msgstr ""
+msgstr "Регистриране на договор"
 
 #. module: base
 #: view:ir.rule:0
@@ -8615,12 +8688,12 @@ msgstr ""
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Romanian / română"
-msgstr ""
+msgstr "Румънци / română"
 
 #. module: base
 #: view:res.log:0
 msgid "System Logs"
-msgstr ""
+msgstr "Системни логове"
 
 #. module: base
 #: selection:workflow.activity,join_mode:0
@@ -8736,7 +8809,7 @@ msgstr ""
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Persian / فارس"
-msgstr ""
+msgstr "Фарси / فارس"
 
 #. module: base
 #: view:ir.actions.act_window:0
@@ -8755,6 +8828,8 @@ msgid ""
 "Supported file formats: *.csv (Comma-separated values) or *.po (GetText "
 "Portable Objects)"
 msgstr ""
+"Поддържани файлови формати: *.csv (Comma-separated values) или *.po (GetText "
+"Portable Objects)"
 
 #. module: base
 #: code:addons/base/ir/ir_model.py:487
@@ -8763,11 +8838,13 @@ msgid ""
 "You can not delete this document (%s) ! Be sure your user belongs to one of "
 "these groups: %s."
 msgstr ""
+"Не може да бъде изтрит този документ (%s)! Уверете се, че като потребител "
+"принадлежите на някоя от следните групи: %s."
 
 #. module: base
 #: model:ir.model,name:base.model_base_module_configuration
 msgid "base.module.configuration"
-msgstr ""
+msgstr "base.module.configuration"
 
 #. module: base
 #: field:base.language.export,name:0
@@ -8836,7 +8913,7 @@ msgstr "Фирма"
 #. module: base
 #: view:res.users:0
 msgid "Email & Signature"
-msgstr ""
+msgstr "Имейл и подпис"
 
 #. module: base
 #: view:publisher_warranty.contract:0
@@ -8851,12 +8928,12 @@ msgstr ""
 #. module: base
 #: model:ir.ui.menu,name:base.menu_aftersale
 msgid "After-Sale Services"
-msgstr ""
+msgstr "След гаранционно обслужване."
 
 #. module: base
 #: view:ir.actions.todo:0
 msgid "Launch"
-msgstr ""
+msgstr "Стартиране"
 
 #. module: base
 #: field:ir.actions.act_window,limit:0
@@ -8907,7 +8984,7 @@ msgstr "Вирджински острови (Великобритания)"
 #: view:ir.property:0
 #: model:ir.ui.menu,name:base.next_id_15
 msgid "Parameters"
-msgstr ""
+msgstr "Параметри"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -9014,7 +9091,7 @@ msgstr "Име на категория"
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_15
 msgid "IT sector"
-msgstr ""
+msgstr "Сектор ИТ"
 
 #. module: base
 #: view:ir.actions.act_window:0
@@ -9029,7 +9106,7 @@ msgstr "%X - Правилно представяне на времето."
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (SV) / Español (SV)"
-msgstr ""
+msgstr "Испански (SV) / Español (SV)"
 
 #. module: base
 #: help:res.lang,grouping:0
@@ -9108,7 +9185,7 @@ msgstr "Режим на разделяне"
 #. module: base
 #: view:base.module.upgrade:0
 msgid "Note that this operation might take a few minutes."
-msgstr ""
+msgstr "Имайте в предвид, че тази операция може да отнеме няколко минути."
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_localisation
@@ -9123,7 +9200,7 @@ msgstr "Действие за стартиране"
 #. module: base
 #: view:ir.cron:0
 msgid "Execution"
-msgstr ""
+msgstr "Изпълнение"
 
 #. module: base
 #: field:ir.actions.server,condition:0
@@ -9161,7 +9238,7 @@ msgstr ""
 #. module: base
 #: view:res.lang:0
 msgid "%j - Day of the year [001,366]."
-msgstr ""
+msgstr "%j - Ден от годината [001,366]."
 
 #. module: base
 #: field:ir.actions.server,mobile:0
@@ -9180,7 +9257,7 @@ msgstr "Категории на партньора"
 #. module: base
 #: view:base.module.upgrade:0
 msgid "System Update"
-msgstr ""
+msgstr "Системна актуализация"
 
 #. module: base
 #: selection:ir.translation,type:0
@@ -9233,7 +9310,7 @@ msgstr ""
 #. module: base
 #: model:ir.actions.act_window,name:base.action_res_widget_wizard
 msgid "Homepage Widgets Management"
-msgstr ""
+msgstr "Управление на притурките на началната страница"
 
 #. module: base
 #: field:workflow,osv:0
@@ -9256,12 +9333,12 @@ msgstr "Функция"
 #. module: base
 #: view:res.widget:0
 msgid "Search Widget"
-msgstr ""
+msgstr "Търси добавка"
 
 #. module: base
 #: selection:ir.actions.todo,restart:0
 msgid "Never"
-msgstr ""
+msgstr "Никога"
 
 #. module: base
 #: selection:res.partner.address,type:0
@@ -9304,7 +9381,7 @@ msgstr "Създай обект"
 #: view:ir.filters:0
 #: field:res.log,context:0
 msgid "Context"
-msgstr ""
+msgstr "Съдържание"
 
 #. module: base
 #: field:res.bank,bic:0
diff --git a/bin/addons/base/i18n/bs.po b/bin/addons/base/i18n/bs.po
index 6de94b82f8f..c85db96d9d0 100644
--- a/bin/addons/base/i18n/bs.po
+++ b/bin/addons/base/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-02-16 04:50+0000\n"
-"X-Generator: Launchpad (build 12351)\n"
+"X-Launchpad-Export-Date: 2011-04-09 04:49+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/bin/addons/base/i18n/ca.po b/bin/addons/base/i18n/ca.po
index 6074d5f6059..50d6366292c 100644
--- a/bin/addons/base/i18n/ca.po
+++ b/bin/addons/base/i18n/ca.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-02-16 04:51+0000\n"
-"X-Generator: Launchpad (build 12351)\n"
+"X-Launchpad-Export-Date: 2011-04-09 04:50+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
 #. module: base
 #: view:ir.filters:0
@@ -47,7 +47,7 @@ msgid ""
 "The second argument of the many2many field %s must be a SQL table !You used "
 "%s, which is not a valid SQL table name."
 msgstr ""
-"El segon argument del camp many2many %s ha de ser una taula SQL! Has "
+"El segon argument del camp many2many %s ha de ser una taula SQL! Heu "
 "utilitzat %s, que no és un nom de taula SQL vàlid."
 
 #. module: base
@@ -1683,7 +1683,7 @@ msgid ""
 "'calendar', etc. (Default: tree,form)"
 msgstr ""
 "Llista separada per comes de les maneres de vista permesos, com 'form' "
-"(formulari), 'tree' (llista), 'calendar' (calendari), etc (per defecte: "
+"(formulari), 'tree' (llista), 'calendar' (calendari), etc. (per defecte: "
 "tree, form)"
 
 #. module: base
@@ -2201,7 +2201,7 @@ msgid ""
 msgstr ""
 "S'ha indicat un \"order\" no vàlid. Una especificació \"order\" vàlida és "
 "una llista separada per comes de noms de camps vàlids (opcionalment seguits "
-"per asc / desc per indicar l'adreça)"
+"per asc / desc per indicar la direcció)"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_module_module_dependency
@@ -6040,8 +6040,8 @@ msgid ""
 "View type: set to 'tree' for a hierarchical tree view, or 'form' for other "
 "views"
 msgstr ""
-"Tipus de vista: 'tree' per a una vista d'arbre jeràrquica, o 'form' per a "
-"les altres vistes."
+"Tipus de vista: 'Arbre' per a una vista d'arbre jeràrquica, o 'Formulari' "
+"per a les altres vistes."
 
 #. module: base
 #: code:addons/base/res/res_config.py:421
diff --git a/bin/addons/base/i18n/cs.po b/bin/addons/base/i18n/cs.po
index 09ba35712b5..5ef4fd42337 100644
--- a/bin/addons/base/i18n/cs.po
+++ b/bin/addons/base/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-02-16 04:51+0000\n"
-"X-Generator: Launchpad (build 12351)\n"
+"X-Launchpad-Export-Date: 2011-04-09 04:50+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/bin/addons/base/i18n/da.po b/bin/addons/base/i18n/da.po
index df9927cfeb8..4f1a81e8101 100644
--- a/bin/addons/base/i18n/da.po
+++ b/bin/addons/base/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-02-16 04:51+0000\n"
-"X-Generator: Launchpad (build 12351)\n"
+"X-Launchpad-Export-Date: 2011-04-09 04:50+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/bin/addons/base/i18n/de.po b/bin/addons/base/i18n/de.po
index 8ad09db8a9a..6f16b160580 100644
--- a/bin/addons/base/i18n/de.po
+++ b/bin/addons/base/i18n/de.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-02-16 04:52+0000\n"
-"X-Generator: Launchpad (build 12351)\n"
+"X-Launchpad-Export-Date: 2011-04-09 04:51+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
 #. module: base
 #: view:ir.filters:0
@@ -1095,7 +1095,7 @@ msgid ""
 "which gives the correct address"
 msgstr ""
 "Stellt das Feld zur Verfügung, aus dem die EMail Adresse geholt wird, zB für "
-"eine Rechung (invoice), dann bringt ist `object.invoice_address_id.email` "
+"eine Rechnung (invoice), dann bringt ist `object.invoice_address_id.email` "
 "das Fehld mit der richtigen Adresse"
 
 #. module: base
@@ -3437,7 +3437,7 @@ msgid ""
 "the correct mobile number"
 msgstr ""
 "Stellt das Feld für die Mobiltelefon Nummer zur Verfügung. z.B. für "
-"Rechungen (invoice) wird das Feld `object.invoice_address_id.mobile` die "
+"Rechnungen (invoice) wird das Feld `object.invoice_address_id.mobile` die "
 "richtige Mobiltelefonnummer anzeigen."
 
 #. module: base
@@ -5293,7 +5293,7 @@ msgstr "Hong Kong"
 msgid "Easy to Refer action by name e.g. One Sales Order -> Many Invoices"
 msgstr ""
 "Einfache Bezugnahme von Aktionen mittels Namen. Ein Verkaufsauftrag -> Viele "
-"Rechungen."
+"Rechnungen."
 
 #. module: base
 #: model:ir.actions.act_window,help:base.action_partner_address_form
diff --git a/bin/addons/base/i18n/el.po b/bin/addons/base/i18n/el.po
index 1e229abf51b..119131b5c99 100644
--- a/bin/addons/base/i18n/el.po
+++ b/bin/addons/base/i18n/el.po
@@ -12,8 +12,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-02-16 04:52+0000\n"
-"X-Generator: Launchpad (build 12351)\n"
+"X-Launchpad-Export-Date: 2011-04-09 04:52+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
diff --git a/bin/addons/base/i18n/en_GB.po b/bin/addons/base/i18n/en_GB.po
index 8a31de5308f..5ccc7a440b8 100644
--- a/bin/addons/base/i18n/en_GB.po
+++ b/bin/addons/base/i18n/en_GB.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-02-16 04:58+0000\n"
-"X-Generator: Launchpad (build 12351)\n"
+"X-Launchpad-Export-Date: 2011-04-09 04:57+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/bin/addons/base/i18n/es.po b/bin/addons/base/i18n/es.po
index 09fb78d8a4b..844ecca994f 100644
--- a/bin/addons/base/i18n/es.po
+++ b/bin/addons/base/i18n/es.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-02-16 04:56+0000\n"
-"X-Generator: Launchpad (build 12351)\n"
+"X-Launchpad-Export-Date: 2011-04-09 04:55+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
 #. module: base
 #: view:ir.filters:0
@@ -1691,7 +1691,7 @@ msgid ""
 "'calendar', etc. (Default: tree,form)"
 msgstr ""
 "Lista separada por comas de los modos de vista permitidos, como 'form' "
-"(formulario), 'tree' (lista), 'calendar' (calendario), etc (por defecto: "
+"(formulario), 'tree' (lista), 'calendar' (calendario), etc. (por defecto: "
 "tree,form)"
 
 #. module: base
@@ -4869,7 +4869,7 @@ msgstr "res.config.vista"
 #: view:res.log:0
 #: field:res.log,read:0
 msgid "Read"
-msgstr "Lectura"
+msgstr "Leído"
 
 #. module: base
 #: sql_constraint:res.country:0
@@ -6054,8 +6054,8 @@ msgid ""
 "View type: set to 'tree' for a hierarchical tree view, or 'form' for other "
 "views"
 msgstr ""
-"Tipo de vista: 'tree' para una vista de árbol jerárquica, o 'form' para las "
-"otras vistas."
+"Tipo de vista: 'Árbol' para una vista de árbol jerárquica, o 'Formulario' "
+"para las otras vistas."
 
 #. module: base
 #: code:addons/base/res/res_config.py:421
diff --git a/bin/addons/base/i18n/es_CL.po b/bin/addons/base/i18n/es_CL.po
index d6581c0cd5f..79375bd3876 100644
--- a/bin/addons/base/i18n/es_CL.po
+++ b/bin/addons/base/i18n/es_CL.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-02-16 04:58+0000\n"
-"X-Generator: Launchpad (build 12351)\n"
+"X-Launchpad-Export-Date: 2011-04-09 04:57+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/bin/addons/base/i18n/es_EC.po b/bin/addons/base/i18n/es_EC.po
index a704ddfba1d..a46ebe723d3 100644
--- a/bin/addons/base/i18n/es_EC.po
+++ b/bin/addons/base/i18n/es_EC.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-02-16 04:59+0000\n"
-"X-Generator: Launchpad (build 12351)\n"
+"X-Launchpad-Export-Date: 2011-04-09 04:58+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/bin/addons/base/i18n/et.po b/bin/addons/base/i18n/et.po
index 4c06d246420..3590c222e88 100644
--- a/bin/addons/base/i18n/et.po
+++ b/bin/addons/base/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-02-16 04:51+0000\n"
-"X-Generator: Launchpad (build 12351)\n"
+"X-Launchpad-Export-Date: 2011-04-09 04:51+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
 #. module: base
 #: view:ir.filters:0
@@ -78,7 +78,7 @@ msgstr "Töövoog"
 #. module: base
 #: view:partner.sms.send:0
 msgid "SMS - Gateway: clickatell"
-msgstr "SMS - Värav: click"
+msgstr "SMS-lüüs"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -98,7 +98,7 @@ msgstr ""
 #. module: base
 #: field:ir.actions.server,wkf_model_id:0
 msgid "Workflow On"
-msgstr "Töövoog millel"
+msgstr "Töövoog sisse lülitatud"
 
 #. module: base
 #: field:ir.actions.act_window,display_menu_tip:0
@@ -129,7 +129,7 @@ msgstr ""
 #. module: base
 #: field:res.partner,ref:0
 msgid "Reference"
-msgstr ""
+msgstr "Viide"
 
 #. module: base
 #: field:ir.actions.act_window,target:0
@@ -140,7 +140,7 @@ msgstr "Sihtaken"
 #: code:addons/base/res/res_user.py:507
 #, python-format
 msgid "Warning!"
-msgstr ""
+msgstr "Hoiatus!"
 
 #. module: base
 #: code:addons/base/ir/ir_model.py:304
@@ -154,7 +154,7 @@ msgstr ""
 #: code:addons/osv.py:133
 #, python-format
 msgid "Constraint Error"
-msgstr ""
+msgstr "Piirangu viga"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_ui_view_custom
@@ -171,12 +171,12 @@ msgstr "Svaasimaa"
 #: code:addons/orm.py:3653
 #, python-format
 msgid "created."
-msgstr ""
+msgstr "loodud."
 
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_woodsuppliers0
 msgid "Wood Suppliers"
-msgstr ""
+msgstr "Puidu tarnijad"
 
 #. module: base
 #: code:addons/base/module/module.py:303
@@ -214,7 +214,7 @@ msgstr "Otsi partnerit"
 #: code:addons/base/res/res_user.py:132
 #, python-format
 msgid "\"smtp_server\" needs to be set to send mails to users"
-msgstr ""
+msgstr "\"smtp_server\" peab olema määratud, et saata e-posti kasutajatele"
 
 #. module: base
 #: code:addons/base/module/wizard/base_export_language.py:60
@@ -245,7 +245,7 @@ msgstr "Maks. suurus"
 #. module: base
 #: field:res.partner.address,name:0
 msgid "Contact Name"
-msgstr "Kontakti nimi"
+msgstr "Kontaktnimi"
 
 #. module: base
 #: code:addons/base/module/wizard/base_export_language.py:56
@@ -254,13 +254,13 @@ 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 ""
-"Salvest see dokument %s faili ja muuda seda spetsiaaltarkvaraga või "
+"Salvesta see dokument %s faili ja muuda seda spetsiaaltarkvaraga või "
 "tekstiredaktoriga. Faili kodeering on UTF-8."
 
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The name of the language must be unique !"
-msgstr ""
+msgstr "Keele nimi peab olema unikaalne"
 
 #. module: base
 #: selection:res.request,state:0
@@ -286,12 +286,12 @@ msgstr "Krediidilimiit"
 #. module: base
 #: field:ir.model.data,date_update:0
 msgid "Update Date"
-msgstr "Uuendamise kuupäev"
+msgstr ""
 
 #. module: base
 #: view:ir.attachment:0
 msgid "Owner"
-msgstr ""
+msgstr "Omanik"
 
 #. module: base
 #: field:ir.actions.act_window,src_model:0
@@ -312,7 +312,7 @@ msgstr "ir.ui.view_sc"
 #: field:res.widget.user,widget_id:0
 #: field:res.widget.wizard,widgets_list:0
 msgid "Widget"
-msgstr ""
+msgstr "Vidin"
 
 #. module: base
 #: view:ir.model.access:0
@@ -378,7 +378,7 @@ msgstr "Prantsuse Guyana"
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Greek / Ελληνικά"
-msgstr "Greeka / Ελληνικά"
+msgstr "Kreeka / Ελληνικά"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -398,12 +398,12 @@ msgstr ""
 #: code:addons/orm.py:904
 #, python-format
 msgid "The read method is not implemented on this object !"
-msgstr ""
+msgstr "Lugemise meetod pole toetatud sellel objektil!"
 
 #. module: base
 #: help:res.lang,iso_code:0
 msgid "This ISO code is the name of po files to use for translations"
-msgstr ""
+msgstr "See ISO kood on PO-faili nimi mida kasutatakse tõlgeteks"
 
 #. module: base
 #: view:base.module.upgrade:0
@@ -429,7 +429,7 @@ msgstr "Kolumbia"
 #. module: base
 #: view:ir.module.module:0
 msgid "Schedule Upgrade"
-msgstr "Planeeri uuendamisele"
+msgstr "Planeeri uuendus"
 
 #. module: base
 #: code:addons/orm.py:838
@@ -449,7 +449,7 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.pw
 msgid "Palau"
-msgstr "Palau"
+msgstr "Belau"
 
 #. module: base
 #: view:res.partner:0
@@ -459,7 +459,7 @@ msgstr "Müügid ja ostud"
 #. module: base
 #: view:ir.translation:0
 msgid "Untranslated"
-msgstr ""
+msgstr "Tõlkimata"
 
 #. module: base
 #: help:ir.actions.act_window,context:0
@@ -477,7 +477,7 @@ msgstr "Nõustajad"
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_miscellaneoussuppliers0
 msgid "Miscellaneous Suppliers"
-msgstr ""
+msgstr "Täiendavad pakkujad"
 
 #. module: base
 #: code:addons/base/ir/ir_model.py:255
@@ -493,7 +493,7 @@ msgstr "Vali toimingu aken, aruanne, nõustaja mis käivitada"
 #. module: base
 #: view:res.config.users:0
 msgid "New User"
-msgstr ""
+msgstr "Uus kasutaja"
 
 #. module: base
 #: view:base.language.export:0
@@ -524,7 +524,7 @@ msgstr "Jordaania"
 #. module: base
 #: view:ir.module.module:0
 msgid "Certified"
-msgstr ""
+msgstr "Sertifitseeritud"
 
 #. module: base
 #: model:res.country,name:base.er
@@ -535,7 +535,7 @@ msgstr "Eritrea"
 #: view:res.config:0
 #: view:res.config.installer:0
 msgid "description"
-msgstr ""
+msgstr "kirjeldus"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_base_action_rule
@@ -555,7 +555,7 @@ msgstr ""
 #. module: base
 #: field:ir.values,key2:0
 msgid "Event Type"
-msgstr "Sündmuse tüüp"
+msgstr "Sündmuse liik"
 
 #. module: base
 #: view:base.language.export:0
@@ -568,7 +568,7 @@ msgstr ""
 #. module: base
 #: field:res.partner,title:0
 msgid "Partner Form"
-msgstr ""
+msgstr "Partneri vorm"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -601,7 +601,7 @@ msgstr "Jadad"
 #. module: base
 #: model:ir.model,name:base.model_base_language_import
 msgid "Language Import"
-msgstr ""
+msgstr "Keele import"
 
 #. module: base
 #: model:ir.model,name:base.model_res_config_users
@@ -611,12 +611,12 @@ msgstr ""
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Albanian / Shqip"
-msgstr ""
+msgstr "Albaania / Shqip"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_crm_config_opportunity
 msgid "Opportunities"
-msgstr ""
+msgstr "Võimalused"
 
 #. module: base
 #: model:ir.model,name:base.model_base_language_export
@@ -626,17 +626,18 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.pg
 msgid "Papua New Guinea"
-msgstr "Papua Uus Guinea"
+msgstr "Paapua Uus-Guinea"
 
 #. module: base
 #: help:ir.actions.report.xml,report_type:0
 msgid "Report Type, e.g. pdf, html, raw, sxw, odt, html2html, mako2html, ..."
 msgstr ""
+"Aruande tüüp, näiteks pdf, html, raw, sxw, odt, html2html, mako2html, ..."
 
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_4
 msgid "Basic Partner"
-msgstr "Elementaarne klient"
+msgstr "Tavaline partner"
 
 #. module: base
 #: report:ir.module.reference.graph:0
@@ -651,7 +652,7 @@ msgstr "Minu partnerid"
 #. module: base
 #: view:ir.actions.report.xml:0
 msgid "XML Report"
-msgstr ""
+msgstr "XML aruanne"
 
 #. module: base
 #: model:res.country,name:base.es
@@ -673,7 +674,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:base.action_view_base_module_upgrade
 #: model:ir.model,name:base.model_base_module_upgrade
 msgid "Module Upgrade"
-msgstr ""
+msgstr "Mooduli uuendus"
 
 #. module: base
 #: view:res.config.users:0
diff --git a/bin/addons/base/i18n/eu.po b/bin/addons/base/i18n/eu.po
index 2ed8a74d1eb..3dbadd6a886 100644
--- a/bin/addons/base/i18n/eu.po
+++ b/bin/addons/base/i18n/eu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-02-16 04:50+0000\n"
-"X-Generator: Launchpad (build 12351)\n"
+"X-Launchpad-Export-Date: 2011-04-09 04:49+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/bin/addons/base/i18n/fa.po b/bin/addons/base/i18n/fa.po
index fb6603e327d..e4b5dd3395f 100644
--- a/bin/addons/base/i18n/fa.po
+++ b/bin/addons/base/i18n/fa.po
@@ -9,8 +9,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-02-16 04:54+0000\n"
-"X-Generator: Launchpad (build 12351)\n"
+"X-Launchpad-Export-Date: 2011-04-09 04:54+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 "X-Poedit-Country: IRAN, ISLAMIC REPUBLIC OF\n"
 "X-Poedit-Language: Persian\n"
 
diff --git a/bin/addons/base/i18n/fa_AF.po b/bin/addons/base/i18n/fa_AF.po
index e16edeb2999..83780362eca 100644
--- a/bin/addons/base/i18n/fa_AF.po
+++ b/bin/addons/base/i18n/fa_AF.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-03-05 04:52+0000\n"
-"X-Generator: Launchpad (build 12351)\n"
+"X-Launchpad-Export-Date: 2011-04-09 04:58+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/bin/addons/base/i18n/fi.po b/bin/addons/base/i18n/fi.po
index f503be3f4c8..32e145c153f 100644
--- a/bin/addons/base/i18n/fi.po
+++ b/bin/addons/base/i18n/fi.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-02-16 04:51+0000\n"
-"X-Generator: Launchpad (build 12351)\n"
+"X-Launchpad-Export-Date: 2011-04-09 04:51+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/bin/addons/base/i18n/fr.po b/bin/addons/base/i18n/fr.po
index 064f5b00010..11a14a34072 100644
--- a/bin/addons/base/i18n/fr.po
+++ b/bin/addons/base/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-02-16 04:52+0000\n"
-"X-Generator: Launchpad (build 12351)\n"
+"X-Launchpad-Export-Date: 2011-04-09 04:51+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
 #. module: base
 #: view:ir.filters:0
@@ -917,7 +917,7 @@ msgstr "Ouganda"
 #. module: base
 #: field:ir.model.access,perm_unlink:0
 msgid "Delete Access"
-msgstr "Supprimer l'accès"
+msgstr "Accès en suppression"
 
 #. module: base
 #: model:res.country,name:base.ne
@@ -3780,6 +3780,8 @@ msgid ""
 "For one2many fields, the field on the target model that implement the "
 "opposite many2one relationship"
 msgstr ""
+"Pour les champs one2many, le champ du modèle cible qui réalise la relation "
+"many2one correspondante"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_actions_act_window_view
@@ -5264,8 +5266,8 @@ msgstr "Nigéria"
 #, python-format
 msgid "For selection fields, the Selection Options must be given!"
 msgstr ""
-"Pour les champs de sélection, les valeurs pour la sélection doivent être "
-"renseignées !"
+"Pour les champs de type liste déroulante, les valeurs de la liste doivent "
+"être fournies !"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_partner_sms_send
diff --git a/bin/addons/base/i18n/gl.po b/bin/addons/base/i18n/gl.po
index 083b4b2ca91..8be8f25f964 100644
--- a/bin/addons/base/i18n/gl.po
+++ b/bin/addons/base/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-02-16 04:52+0000\n"
-"X-Generator: Launchpad (build 12351)\n"
+"X-Launchpad-Export-Date: 2011-04-09 04:51+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/bin/addons/base/i18n/he.po b/bin/addons/base/i18n/he.po
index d98869ddb97..47696150834 100644
--- a/bin/addons/base/i18n/he.po
+++ b/bin/addons/base/i18n/he.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-02-16 04:52+0000\n"
-"X-Generator: Launchpad (build 12351)\n"
+"X-Launchpad-Export-Date: 2011-04-09 04:52+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/bin/addons/base/i18n/hr.po b/bin/addons/base/i18n/hr.po
index d24adffc0b0..f5e875a42c1 100644
--- a/bin/addons/base/i18n/hr.po
+++ b/bin/addons/base/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-02-16 04:56+0000\n"
-"X-Generator: Launchpad (build 12351)\n"
+"X-Launchpad-Export-Date: 2011-04-09 04:55+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 "Language: hr\n"
 
 #. module: base
@@ -435,7 +435,7 @@ msgstr "Postavi za nadogradnju"
 #: code:addons/orm.py:838
 #, python-format
 msgid "Key/value '%s' not found in selection field '%s'"
-msgstr ""
+msgstr "Ključ/podatak '%s' nije nađen u selekciji polja '%s'"
 
 #. module: base
 #: help:res.country,code:0
diff --git a/bin/addons/base/i18n/hu.po b/bin/addons/base/i18n/hu.po
index 5a4532d093d..48d704160e7 100644
--- a/bin/addons/base/i18n/hu.po
+++ b/bin/addons/base/i18n/hu.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-03-04 04:44+0000\n"
-"X-Generator: Launchpad (build 12351)\n"
+"X-Launchpad-Export-Date: 2011-04-09 04:52+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/bin/addons/base/i18n/id.po b/bin/addons/base/i18n/id.po
index 92b79dd7f7a..784609da885 100644
--- a/bin/addons/base/i18n/id.po
+++ b/bin/addons/base/i18n/id.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-02-23 04:36+0000\n"
-"X-Generator: Launchpad (build 12351)\n"
+"X-Launchpad-Export-Date: 2011-04-09 04:52+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/bin/addons/base/i18n/is.po b/bin/addons/base/i18n/is.po
index b0e655cc1db..de51518f8d8 100644
--- a/bin/addons/base/i18n/is.po
+++ b/bin/addons/base/i18n/is.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-02-16 04:53+0000\n"
-"X-Generator: Launchpad (build 12351)\n"
+"X-Launchpad-Export-Date: 2011-04-09 04:52+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/bin/addons/base/i18n/it.po b/bin/addons/base/i18n/it.po
index 5e89132d6b2..4b658e70064 100644
--- a/bin/addons/base/i18n/it.po
+++ b/bin/addons/base/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-03-31 04:35+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-04-09 04:53+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
 #. module: base
 #: view:ir.filters:0
@@ -6446,7 +6446,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:base.action_rule
 #: model:ir.ui.menu,name:base.menu_action_rule
 msgid "Record Rules"
-msgstr "Registra Regole"
+msgstr "Regole di accesso"
 
 #. module: base
 #: field:res.config.users,name:0
diff --git a/bin/addons/base/i18n/ja.po b/bin/addons/base/i18n/ja.po
index 9b3978c44c5..0d71b875f72 100644
--- a/bin/addons/base/i18n/ja.po
+++ b/bin/addons/base/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-02-16 04:53+0000\n"
-"X-Generator: Launchpad (build 12351)\n"
+"X-Launchpad-Export-Date: 2011-04-09 04:53+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/bin/addons/base/i18n/ko.po b/bin/addons/base/i18n/ko.po
index a1b575f18be..ae16ee197a6 100644
--- a/bin/addons/base/i18n/ko.po
+++ b/bin/addons/base/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-02-16 04:53+0000\n"
-"X-Generator: Launchpad (build 12351)\n"
+"X-Launchpad-Export-Date: 2011-04-09 04:53+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
 #. module: base
 #: view:ir.filters:0
@@ -34,7 +34,7 @@ msgstr "세인트 헬레나"
 #. module: base
 #: view:ir.actions.report.xml:0
 msgid "Other Configuration"
-msgstr ""
+msgstr "기타 설정"
 
 #. module: base
 #: selection:ir.property,type:0
@@ -104,7 +104,7 @@ msgstr "워크플로우"
 #. module: base
 #: field:ir.actions.act_window,display_menu_tip:0
 msgid "Display Menu Tips"
-msgstr ""
+msgstr "메뉴 팁 나타내기"
 
 #. module: base
 #: view:ir.module.module:0
@@ -130,7 +130,7 @@ msgstr ""
 #. module: base
 #: field:res.partner,ref:0
 msgid "Reference"
-msgstr ""
+msgstr "참조"
 
 #. module: base
 #: field:ir.actions.act_window,target:0
@@ -141,7 +141,7 @@ msgstr "타겟 윈도우"
 #: code:addons/base/res/res_user.py:507
 #, python-format
 msgid "Warning!"
-msgstr ""
+msgstr "경고!"
 
 #. module: base
 #: code:addons/base/ir/ir_model.py:304
@@ -149,13 +149,13 @@ msgstr ""
 msgid ""
 "Properties of base fields cannot be altered in this manner! Please modify "
 "them through Python code, preferably through a custom addon!"
-msgstr ""
+msgstr "기본 필드의 속성은 이 방법으로 변경이 안됩니다. 가급적 커스텀 부가기능으로  파이썬 코드를 수정하세요"
 
 #. module: base
 #: code:addons/osv.py:133
 #, python-format
 msgid "Constraint Error"
-msgstr ""
+msgstr "제한에러"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_ui_view_custom
@@ -172,12 +172,12 @@ msgstr ""
 #: code:addons/orm.py:3653
 #, python-format
 msgid "created."
-msgstr ""
+msgstr "생성됨."
 
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_woodsuppliers0
 msgid "Wood Suppliers"
-msgstr ""
+msgstr "목재 공급자"
 
 #. module: base
 #: code:addons/base/module/module.py:303
@@ -186,6 +186,8 @@ msgid ""
 "Some installed modules depend on the module you plan to Uninstall :\n"
 " %s"
 msgstr ""
+"인스톨된 모듈이 언인스톨 하는 모듈에 의존합니다:\n"
+" %s"
 
 #. module: base
 #: field:ir.sequence,number_increment:0
@@ -206,7 +208,7 @@ msgstr ""
 #. module: base
 #: view:res.partner:0
 msgid "Search Partner"
-msgstr ""
+msgstr "거래처 검색"
 
 #. module: base
 #: code:addons/base/res/res_user.py:132
@@ -287,7 +289,7 @@ msgstr "날짜 갱신"
 #. module: base
 #: view:ir.attachment:0
 msgid "Owner"
-msgstr ""
+msgstr "소유자"
 
 #. module: base
 #: field:ir.actions.act_window,src_model:0
@@ -308,7 +310,7 @@ msgstr ""
 #: field:res.widget.user,widget_id:0
 #: field:res.widget.wizard,widgets_list:0
 msgid "Widget"
-msgstr ""
+msgstr "위젯"
 
 #. module: base
 #: view:ir.model.access:0
@@ -333,7 +335,7 @@ msgstr "액션 타입 선택"
 #. module: base
 #: model:res.country,name:base.tv
 msgid "Tuvalu"
-msgstr ""
+msgstr "투발루어"
 
 #. module: base
 #: selection:ir.model,state:0
@@ -354,7 +356,7 @@ msgstr "이메일"
 #. module: base
 #: model:res.country,name:base.an
 msgid "Netherlands Antilles"
-msgstr ""
+msgstr "네덜란드령 안틸레스"
 
 #. module: base
 #: code:addons/base/res/res_user.py:389
@@ -368,17 +370,17 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.gf
 msgid "French Guyana"
-msgstr ""
+msgstr "프랑스 가이아나"
 
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Greek / Ελληνικά"
-msgstr ""
+msgstr "그리스"
 
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Bosnian / bosanski jezik"
-msgstr ""
+msgstr "보스니아"
 
 #. module: base
 #: help:ir.actions.report.xml,attachment_use:0
@@ -396,12 +398,12 @@ 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
 #: view:base.module.upgrade:0
 msgid "Your system will be updated."
-msgstr ""
+msgstr "시스템이 업데이트 됩니다"
 
 #. module: base
 #: field:ir.actions.todo,note:0
@@ -417,7 +419,7 @@ msgstr "국가 이름"
 #. module: base
 #: model:res.country,name:base.co
 msgid "Colombia"
-msgstr ""
+msgstr "콜롬비아"
 
 #. module: base
 #: view:ir.module.module:0
@@ -428,7 +430,7 @@ msgstr "스케줄 업그레이드"
 #: code:addons/orm.py:838
 #, python-format
 msgid "Key/value '%s' not found in selection field '%s'"
-msgstr ""
+msgstr "'%s' 값이 '%s' 필드에 없습니다"
 
 #. module: base
 #: help:res.country,code:0
@@ -440,7 +442,7 @@ msgstr "두 문자로된 ISO 국가 코드"
 #. module: base
 #: model:res.country,name:base.pw
 msgid "Palau"
-msgstr ""
+msgstr "팔라우"
 
 #. module: base
 #: view:res.partner:0
@@ -450,13 +452,13 @@ msgstr "판매 및 구매"
 #. module: base
 #: view:ir.translation:0
 msgid "Untranslated"
-msgstr ""
+msgstr "번역되지 않음"
 
 #. module: base
 #: help:ir.actions.act_window,context:0
 msgid ""
 "Context dictionary as Python expression, empty by default (Default: {})"
-msgstr ""
+msgstr "파이썬 문법의 컨텍스트 사전, 디폴트: 비움 (Default:{})"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.ir_action_wizard
@@ -468,7 +470,7 @@ msgstr "위저드"
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_miscellaneoussuppliers0
 msgid "Miscellaneous Suppliers"
-msgstr ""
+msgstr "기타 공급처"
 
 #. module: base
 #: code:addons/base/ir/ir_model.py:255
@@ -484,7 +486,7 @@ msgstr "액션 창, 리포트, 실행할 위저드를 선택하십시오."
 #. module: base
 #: view:res.config.users:0
 msgid "New User"
-msgstr ""
+msgstr "새 사용자"
 
 #. module: base
 #: view:base.language.export:0
@@ -500,7 +502,7 @@ msgstr "모델 설명"
 #: help:ir.actions.act_window,src_model:0
 msgid ""
 "Optional model name of the objects on which this action should be visible"
-msgstr ""
+msgstr "이 액션이 노출되는 오브젝트의 모델이름 (옵션)"
 
 #. module: base
 #: field:workflow.transition,trigger_expr_id:0
@@ -510,28 +512,28 @@ msgstr "트리거 표현식"
 #. module: base
 #: model:res.country,name:base.jo
 msgid "Jordan"
-msgstr ""
+msgstr "요르단"
 
 #. module: base
 #: view:ir.module.module:0
 msgid "Certified"
-msgstr ""
+msgstr "인증됨"
 
 #. module: base
 #: model:res.country,name:base.er
 msgid "Eritrea"
-msgstr ""
+msgstr "에리트레아"
 
 #. module: base
 #: view:res.config:0
 #: view:res.config.installer:0
 msgid "description"
-msgstr ""
+msgstr "설명"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_base_action_rule
 msgid "Automated Actions"
-msgstr ""
+msgstr "자동화 액션"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_actions_actions
@@ -541,7 +543,7 @@ msgstr ""
 #. module: base
 #: view:partner.wizard.ean.check:0
 msgid "Want to check Ean ? "
-msgstr ""
+msgstr "Ean을 체크하시겠습니까? "
 
 #. module: base
 #: field:ir.values,key2:0
@@ -559,17 +561,17 @@ msgstr ""
 #. module: base
 #: field:res.partner,title:0
 msgid "Partner Form"
-msgstr ""
+msgstr "거래처 양식"
 
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Swedish / svenska"
-msgstr ""
+msgstr "스웨덴"
 
 #. module: base
 #: model:res.country,name:base.rs
 msgid "Serbia"
-msgstr ""
+msgstr "세르비아"
 
 #. module: base
 #: selection:ir.translation,type:0
@@ -592,7 +594,7 @@ msgstr "시퀀스"
 #. module: base
 #: model:ir.model,name:base.model_base_language_import
 msgid "Language Import"
-msgstr ""
+msgstr "언어 불러오기"
 
 #. module: base
 #: model:ir.model,name:base.model_res_config_users
@@ -607,7 +609,7 @@ msgstr ""
 #. module: base
 #: model:ir.ui.menu,name:base.menu_crm_config_opportunity
 msgid "Opportunities"
-msgstr ""
+msgstr "기회"
 
 #. module: base
 #: model:ir.model,name:base.model_base_language_export
@@ -617,12 +619,12 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.pg
 msgid "Papua New Guinea"
-msgstr ""
+msgstr "파푸아뉴기니"
 
 #. module: base
 #: help:ir.actions.report.xml,report_type:0
 msgid "Report Type, e.g. pdf, html, raw, sxw, odt, html2html, mako2html, ..."
-msgstr ""
+msgstr "보고서 유형, 예: pdf, html, raw, sxw, odt, html2html, mako2html, ..."
 
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_4
@@ -637,17 +639,17 @@ msgstr ""
 #. module: base
 #: view:res.partner:0
 msgid "My Partners"
-msgstr ""
+msgstr "내 거래처"
 
 #. module: base
 #: view:ir.actions.report.xml:0
 msgid "XML Report"
-msgstr ""
+msgstr "XML 보고서"
 
 #. module: base
 #: model:res.country,name:base.es
 msgid "Spain"
-msgstr ""
+msgstr "스페인"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_translation_export
@@ -658,20 +660,20 @@ msgstr "가져오기 / 내보내기"
 #: help:ir.actions.act_window,domain:0
 msgid ""
 "Optional domain filtering of the destination data, as a Python expression"
-msgstr ""
+msgstr "최종 데이타의 도메일 필터링 - 파이썬 문법 (선택)"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_view_base_module_upgrade
 #: model:ir.model,name:base.model_base_module_upgrade
 msgid "Module Upgrade"
-msgstr ""
+msgstr "모듈 업그레이드"
 
 #. module: base
 #: view:res.config.users:0
 msgid ""
 "Groups are used to define access rights on objects and the visibility of "
 "screens and menus"
-msgstr ""
+msgstr "그룹은 오브젝트의 접근권한 및 화면과 메뉴 노출 관리를 위해 사용됩니다"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -687,7 +689,7 @@ msgstr "모바일"
 #. module: base
 #: model:res.country,name:base.om
 msgid "Oman"
-msgstr ""
+msgstr "오만"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_payterm_form
@@ -698,7 +700,7 @@ msgstr "결제 조건"
 #. module: base
 #: model:res.country,name:base.nu
 msgid "Niue"
-msgstr ""
+msgstr "나우에섬"
 
 #. module: base
 #: selection:ir.cron,interval_type:0
@@ -708,7 +710,7 @@ msgstr "근로일"
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "Other OSI Approved Licence"
-msgstr ""
+msgstr "다른 OSI 인증 라이센스"
 
 #. module: base
 #: help:res.config.users,context_lang:0
@@ -716,7 +718,7 @@ msgstr ""
 msgid ""
 "Sets the language for the user's user interface, when UI translations are "
 "available"
-msgstr ""
+msgstr "UI 번역 가용시 사용자 인터페이스의 언어를 설정합니다"
 
 #. module: base
 #: code:addons/orm.py:1043
@@ -733,13 +735,13 @@ msgstr "메뉴 생성"
 #. module: base
 #: model:res.country,name:base.in
 msgid "India"
-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 "Request Reference Types"
-msgstr ""
+msgstr "번호 유형을 요청"
 
 #. module: base
 #: view:ir.values:0
@@ -795,22 +797,24 @@ msgid ""
 "Language with code \"%s\" is not defined in your system !\n"
 "Define it through the Administration menu."
 msgstr ""
+"'%s' 코드로 된 언어는 시스템에 정의 되어있지 않습니다!\n"
+"어드민 메뉴를 통해 정의하십시오"
 
 #. module: base
 #: model:res.country,name:base.gu
 msgid "Guam (USA)"
-msgstr ""
+msgstr "괌"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_hr_project
 msgid "Human Resources Dashboard"
-msgstr ""
+msgstr "인사관리 대시보드"
 
 #. module: base
 #: code:addons/base/res/res_user.py:507
 #, python-format
 msgid "Setting empty passwords is not allowed for security reasons!"
-msgstr ""
+msgstr "보안을 위해 패스워드는 반드시 입력해야 합니다!"
 
 #. module: base
 #: selection:ir.actions.server,state:0
@@ -826,7 +830,7 @@ msgstr "유효하지 않은 뷰 아키텍처를 위한 XML !"
 #. module: base
 #: model:res.country,name:base.ky
 msgid "Cayman Islands"
-msgstr ""
+msgstr "케이맨 제도"
 
 #. module: base
 #: model:res.country,name:base.kr
@@ -849,18 +853,18 @@ msgstr ""
 #. module: base
 #: field:ir.module.module,contributors:0
 msgid "Contributors"
-msgstr ""
+msgstr "도움을 주신 분들"
 
 #. module: base
 #: selection:ir.property,type:0
 msgid "Char"
-msgstr ""
+msgstr "Char"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_publisher_warranty_contract_form
 #: model:ir.ui.menu,name:base.menu_publisher_warranty_contract
 msgid "Contracts"
-msgstr ""
+msgstr "계약서"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -870,27 +874,27 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.ug
 msgid "Uganda"
-msgstr ""
+msgstr "우간다"
 
 #. module: base
 #: field:ir.model.access,perm_unlink:0
 msgid "Delete Access"
-msgstr ""
+msgstr "접근 삭제"
 
 #. module: base
 #: model:res.country,name:base.ne
 msgid "Niger"
-msgstr ""
+msgstr "나이제르"
 
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Chinese (HK)"
-msgstr ""
+msgstr "중국어 (홍콩)"
 
 #. module: base
 #: model:res.country,name:base.ba
 msgid "Bosnia-Herzegovina"
-msgstr ""
+msgstr "보스니아 헤르체고비나"
 
 #. module: base
 #: view:base.language.export:0
@@ -934,12 +938,12 @@ msgstr "액션 URL"
 #. module: base
 #: field:base.module.import,module_name:0
 msgid "Module Name"
-msgstr ""
+msgstr "모듈 이름"
 
 #. module: base
 #: model:res.country,name:base.mh
 msgid "Marshall Islands"
-msgstr ""
+msgstr "마셜 제도"
 
 #. module: base
 #: code:addons/base/ir/ir_model.py:328
@@ -950,13 +954,13 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.ht
 msgid "Haiti"
-msgstr ""
+msgstr "아이티"
 
 #. module: base
 #: view:ir.ui.view:0
 #: selection:ir.ui.view,type:0
 msgid "Search"
-msgstr ""
+msgstr "찾아보기"
 
 #. module: base
 #: code:addons/osv.py:136
diff --git a/bin/addons/base/i18n/lt.po b/bin/addons/base/i18n/lt.po
index 565e033923c..8cd0811d7cb 100644
--- a/bin/addons/base/i18n/lt.po
+++ b/bin/addons/base/i18n/lt.po
@@ -8,13 +8,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
 "PO-Revision-Date: 2011-01-16 11:33+0000\n"
-"Last-Translator: Paulius Sladkevičius - http://www.inovera.lt <Unknown>\n"
+"Last-Translator: Paulius Sladkevičius - inovera.lt <komsas@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: 2011-02-16 04:54+0000\n"
-"X-Generator: Launchpad (build 12351)\n"
+"X-Launchpad-Export-Date: 2011-04-09 04:53+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/bin/addons/base/i18n/lv.po b/bin/addons/base/i18n/lv.po
index a1a1886a1d1..661d9b0509e 100644
--- a/bin/addons/base/i18n/lv.po
+++ b/bin/addons/base/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-02-16 04:54+0000\n"
-"X-Generator: Launchpad (build 12351)\n"
+"X-Launchpad-Export-Date: 2011-04-09 04:53+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/bin/addons/base/i18n/mn.po b/bin/addons/base/i18n/mn.po
index 6a2a781c40d..eea96c609d7 100644
--- a/bin/addons/base/i18n/mn.po
+++ b/bin/addons/base/i18n/mn.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-02-16 04:54+0000\n"
-"X-Generator: Launchpad (build 12351)\n"
+"X-Launchpad-Export-Date: 2011-04-09 04:53+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/bin/addons/base/i18n/nb.po b/bin/addons/base/i18n/nb.po
index 5879b28eda1..5303a2e26cd 100644
--- a/bin/addons/base/i18n/nb.po
+++ b/bin/addons/base/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-02-16 04:54+0000\n"
-"X-Generator: Launchpad (build 12351)\n"
+"X-Launchpad-Export-Date: 2011-04-09 04:54+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
 #. module: base
 #: view:ir.filters:0
@@ -24,17 +24,17 @@ msgstr ""
 #: field:ir.rule,domain_force:0
 #: field:res.partner.title,domain:0
 msgid "Domain"
-msgstr ""
+msgstr "Domene"
 
 #. module: base
 #: model:res.country,name:base.sh
 msgid "Saint Helena"
-msgstr ""
+msgstr "St. Helena"
 
 #. module: base
 #: view:ir.actions.report.xml:0
 msgid "Other Configuration"
-msgstr ""
+msgstr "Annen konfigurasjon"
 
 #. module: base
 #: selection:ir.property,type:0
@@ -59,12 +59,12 @@ msgstr "Metadata"
 #: field:ir.ui.view,arch:0
 #: field:ir.ui.view.custom,arch:0
 msgid "View Architecture"
-msgstr ""
+msgstr "Utsnittsoppbygging"
 
 #. module: base
 #: field:base.language.import,code:0
 msgid "Code (eg:en__US)"
-msgstr ""
+msgstr "Kode (f.eks.:en__US)"
 
 #. module: base
 #: view:workflow:0
@@ -79,27 +79,27 @@ msgstr "Arbeidsflyt"
 #. module: base
 #: view:partner.sms.send:0
 msgid "SMS - Gateway: clickatell"
-msgstr ""
+msgstr "SMS - Gateway: Telenor"
 
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Hungarian / Magyar"
-msgstr ""
+msgstr "Ungarsk / Magyar"
 
 #. module: base
 #: selection:ir.model.fields,select_level:0
 msgid "Not Searchable"
-msgstr ""
+msgstr "Ikke søkbar"
 
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (VE) / Español (VE)"
-msgstr ""
+msgstr "Spansk (AR) / Español (AR)"
 
 #. module: base
 #: field:ir.actions.server,wkf_model_id:0
 msgid "Workflow On"
-msgstr ""
+msgstr "Arbeidsflyt På"
 
 #. module: base
 #: field:ir.actions.act_window,display_menu_tip:0
@@ -109,7 +109,7 @@ msgstr ""
 #. module: base
 #: view:ir.module.module:0
 msgid "Created Views"
-msgstr ""
+msgstr "Opprettede visninger"
 
 #. module: base
 #: code:addons/base/ir/ir_model.py:485
@@ -130,18 +130,18 @@ msgstr ""
 #. module: base
 #: field:res.partner,ref:0
 msgid "Reference"
-msgstr ""
+msgstr "Referanse"
 
 #. module: base
 #: field:ir.actions.act_window,target:0
 msgid "Target Window"
-msgstr ""
+msgstr "Målvindu"
 
 #. module: base
 #: code:addons/base/res/res_user.py:507
 #, python-format
 msgid "Warning!"
-msgstr ""
+msgstr "Advarsel !"
 
 #. module: base
 #: code:addons/base/ir/ir_model.py:304
@@ -160,7 +160,7 @@ msgstr ""
 #. module: base
 #: model:ir.model,name:base.model_ir_ui_view_custom
 msgid "ir.ui.view.custom"
-msgstr ""
+msgstr "ir.ui.view.custom"
 
 #. module: base
 #: model:res.country,name:base.sz
@@ -172,7 +172,7 @@ msgstr "Swaziland"
 #: code:addons/orm.py:3653
 #, python-format
 msgid "created."
-msgstr ""
+msgstr "opprettet."
 
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_woodsuppliers0
@@ -186,17 +186,19 @@ msgid ""
 "Some installed modules depend on the module you plan to Uninstall :\n"
 " %s"
 msgstr ""
+"Some installed modules depend on the module you plan to Uninstall :\n"
+" %s"
 
 #. module: base
 #: field:ir.sequence,number_increment:0
 msgid "Increment Number"
-msgstr ""
+msgstr "Inkrementnummer"
 
 #. module: base
 #: 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 "Firmastruktur"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -218,17 +220,17 @@ msgstr ""
 #: code:addons/base/module/wizard/base_export_language.py:60
 #, python-format
 msgid "new"
-msgstr ""
+msgstr "ny"
 
 #. module: base
 #: field:ir.actions.report.xml,multi:0
 msgid "On multiple doc."
-msgstr ""
+msgstr "Feil på linje %d: %s"
 
 #. module: base
 #: field:ir.module.category,module_nr:0
 msgid "Number of Modules"
-msgstr ""
+msgstr "Antall moduler"
 
 #. module: base
 #: help:multi_company.default,company_dest_id:0
@@ -238,12 +240,12 @@ msgstr ""
 #. module: base
 #: field:res.partner.bank.type.field,size:0
 msgid "Max. Size"
-msgstr ""
+msgstr "Maks størrelse"
 
 #. module: base
 #: field:res.partner.address,name:0
 msgid "Contact Name"
-msgstr ""
+msgstr "Kontaktnavn"
 
 #. module: base
 #: code:addons/base/module/wizard/base_export_language.py:56
@@ -252,6 +254,8 @@ 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 ""
+"Lagre dokument som %s fil og rediger derettet med tekst editor eller annen "
+"egnet applikasjon. Enkodingen på filen er UTF-8"
 
 #. module: base
 #: sql_constraint:res.lang:0
@@ -261,12 +265,12 @@ msgstr ""
 #. module: base
 #: selection:res.request,state:0
 msgid "active"
-msgstr ""
+msgstr "aktiv"
 
 #. module: base
 #: field:ir.actions.wizard,wiz_name:0
 msgid "Wizard Name"
-msgstr ""
+msgstr "Veivisernavn"
 
 #. module: base
 #: code:addons/orm.py:2160
@@ -277,84 +281,84 @@ msgstr ""
 #. module: base
 #: field:res.partner,credit_limit:0
 msgid "Credit Limit"
-msgstr ""
+msgstr "Kredittgrense"
 
 #. module: base
 #: field:ir.model.data,date_update:0
 msgid "Update Date"
-msgstr ""
+msgstr "Dato oppdatert"
 
 #. module: base
 #: view:ir.attachment:0
 msgid "Owner"
-msgstr ""
+msgstr "Eier"
 
 #. module: base
 #: field:ir.actions.act_window,src_model:0
 msgid "Source Object"
-msgstr ""
+msgstr "Kildeobjekt"
 
 #. module: base
 #: view:ir.actions.todo:0
 msgid "Config Wizard Steps"
-msgstr ""
+msgstr "Konfigurer trinn i veiviseren"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_ui_view_sc
 msgid "ir.ui.view_sc"
-msgstr ""
+msgstr "ir.ui.view_sc"
 
 #. module: base
 #: field:res.widget.user,widget_id:0
 #: field:res.widget.wizard,widgets_list:0
 msgid "Widget"
-msgstr ""
+msgstr "Widget"
 
 #. module: base
 #: view:ir.model.access:0
 #: field:ir.model.access,group_id:0
 #: view:res.config.users:0
 msgid "Group"
-msgstr ""
+msgstr "Gruppe"
 
 #. module: base
 #: field:ir.exports.line,name:0
 #: field:ir.translation,name:0
 #: field:res.partner.bank.type.field,name:0
 msgid "Field Name"
-msgstr ""
+msgstr "Feltnavn"
 
 #. module: base
 #: wizard_view:server.action.create,init:0
 #: wizard_field:server.action.create,init,type:0
 msgid "Select Action Type"
-msgstr ""
+msgstr "Velg handlingstype"
 
 #. module: base
 #: model:res.country,name:base.tv
 msgid "Tuvalu"
-msgstr ""
+msgstr "Tuvalu"
 
 #. module: base
 #: selection:ir.model,state:0
 msgid "Custom Object"
-msgstr ""
+msgstr "Egendefinert objekt"
 
 #. module: base
 #: field:res.lang,date_format:0
 msgid "Date Format"
-msgstr ""
+msgstr "Datoformat"
 
 #. module: base
 #: field:res.bank,email:0
 #: field:res.partner.address,email:0
 msgid "E-Mail"
-msgstr ""
+msgstr "E-post"
 
 #. module: base
 #: model:res.country,name:base.an
 msgid "Netherlands Antilles"
-msgstr ""
+msgstr "De nederlandske Antillene"
 
 #. module: base
 #: code:addons/base/res/res_user.py:389
@@ -363,11 +367,13 @@ msgid ""
 "You can not remove the admin user as it is used internally for resources "
 "created by OpenERP (updates, module installation, ...)"
 msgstr ""
+"Du kan ikke fjerne admin brukeren da den brukes internt for ressurser "
+"opprettet av OpenERP (oppdateringer, modul installasjoner, ...)"
 
 #. module: base
 #: model:res.country,name:base.gf
 msgid "French Guyana"
-msgstr ""
+msgstr "Fransk Guyana"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -377,7 +383,7 @@ msgstr ""
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Bosnian / bosanski jezik"
-msgstr ""
+msgstr "Bosnisk / bosanski jezik"
 
 #. module: base
 #: help:ir.actions.report.xml,attachment_use:0
@@ -385,6 +391,8 @@ msgid ""
 "If you check this, then the second time the user prints with same attachment "
 "name, it returns the previous report."
 msgstr ""
+"Hvis du krysser av denne, så vil den forrige rapporten returneres den andre "
+"gangen brukeren skriver ut med samme vedleggsnavnet."
 
 #. module: base
 #: code:addons/orm.py:904
@@ -400,28 +408,28 @@ msgstr ""
 #. module: base
 #: view:base.module.upgrade:0
 msgid "Your system will be updated."
-msgstr ""
+msgstr "Systemet ditt vil bli oppdatert."
 
 #. module: base
 #: field:ir.actions.todo,note:0
 #: selection:ir.property,type:0
 msgid "Text"
-msgstr ""
+msgstr "Tekst"
 
 #. module: base
 #: field:res.country,name:0
 msgid "Country Name"
-msgstr ""
+msgstr "Navn på land"
 
 #. module: base
 #: model:res.country,name:base.co
 msgid "Colombia"
-msgstr ""
+msgstr "Colombia"
 
 #. module: base
 #: view:ir.module.module:0
 msgid "Schedule Upgrade"
-msgstr ""
+msgstr "Planlegg oppgradering"
 
 #. module: base
 #: code:addons/orm.py:838
@@ -435,21 +443,23 @@ msgid ""
 "The ISO country code in two chars.\n"
 "You can use this field for quick search."
 msgstr ""
+"ISO landekode (to karakterer).\n"
+"Du kan bruke dette feltet for rask søking."
 
 #. module: base
 #: model:res.country,name:base.pw
 msgid "Palau"
-msgstr ""
+msgstr "Palau"
 
 #. module: base
 #: view:res.partner:0
 msgid "Sales & Purchases"
-msgstr ""
+msgstr "Salg & Innkjøp"
 
 #. module: base
 #: view:ir.translation:0
 msgid "Untranslated"
-msgstr ""
+msgstr "Ikke oversatt"
 
 #. module: base
 #: help:ir.actions.act_window,context:0
@@ -462,7 +472,7 @@ msgstr ""
 #: view:ir.actions.wizard:0
 #: model:ir.ui.menu,name:base.menu_ir_action_wizard
 msgid "Wizards"
-msgstr ""
+msgstr "Veivisere"
 
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_miscellaneoussuppliers0
@@ -473,27 +483,27 @@ msgstr ""
 #: code:addons/base/ir/ir_model.py:255
 #, python-format
 msgid "Custom fields must have a name that starts with 'x_' !"
-msgstr ""
+msgstr "Egendefinerte felter må ha et navn som starter med 'x_' !"
 
 #. module: base
 #: help:ir.actions.server,action_id:0
 msgid "Select the Action Window, Report, Wizard to be executed."
-msgstr ""
+msgstr "Velg handling, vindu, rapport, veileder som skal eksekveres."
 
 #. module: base
 #: view:res.config.users:0
 msgid "New User"
-msgstr ""
+msgstr "Ny bruker"
 
 #. module: base
 #: view:base.language.export:0
 msgid "Export done"
-msgstr ""
+msgstr "Eksport fullført"
 
 #. module: base
 #: view:ir.model:0
 msgid "Model Description"
-msgstr ""
+msgstr "Modellbeskrivelse"
 
 #. module: base
 #: help:ir.actions.act_window,src_model:0
@@ -504,12 +514,12 @@ msgstr ""
 #. module: base
 #: field:workflow.transition,trigger_expr_id:0
 msgid "Trigger Expression"
-msgstr ""
+msgstr "Utløseruttrykk"
 
 #. module: base
 #: model:res.country,name:base.jo
 msgid "Jordan"
-msgstr ""
+msgstr "Jordan"
 
 #. module: base
 #: view:ir.module.module:0
@@ -519,23 +529,23 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.er
 msgid "Eritrea"
-msgstr ""
+msgstr "Eritrea"
 
 #. module: base
 #: view:res.config:0
 #: view:res.config.installer:0
 msgid "description"
-msgstr ""
+msgstr "beskrivelse"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_base_action_rule
 msgid "Automated Actions"
-msgstr ""
+msgstr "Automatiserte handinger"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_actions_actions
 msgid "ir.actions.actions"
-msgstr ""
+msgstr "ir.actions.actions"
 
 #. module: base
 #: view:partner.wizard.ean.check:0
@@ -545,7 +555,7 @@ msgstr ""
 #. module: base
 #: field:ir.values,key2:0
 msgid "Event Type"
-msgstr ""
+msgstr "Arrangementstype"
 
 #. module: base
 #: view:base.language.export:0
@@ -554,6 +564,9 @@ msgid ""
 "Launchpad.net, our open source project management facility. We use their "
 "online interface to synchronize all translations efforts."
 msgstr ""
+"De offisielle oversettelses pakkene til OpenERP/OpenObject moduler er "
+"administret via launchpad. Vi bruker deres online grensesnitt for å "
+"synkronisere alle oversettelsesbidrag."
 
 #. module: base
 #: field:res.partner,title:0
@@ -563,22 +576,22 @@ msgstr ""
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Swedish / svenska"
-msgstr ""
+msgstr "Svensk"
 
 #. module: base
 #: model:res.country,name:base.rs
 msgid "Serbia"
-msgstr ""
+msgstr "Serbia"
 
 #. module: base
 #: selection:ir.translation,type:0
 msgid "Wizard View"
-msgstr ""
+msgstr "Veiviser visning"
 
 #. module: base
 #: model:res.country,name:base.kh
 msgid "Cambodia, Kingdom of"
-msgstr ""
+msgstr "Kambodsja, Kongeriket Kambodsja"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.ir_sequence_form
@@ -586,22 +599,22 @@ msgstr ""
 #: model:ir.ui.menu,name:base.menu_ir_sequence_form
 #: model:ir.ui.menu,name:base.next_id_5
 msgid "Sequences"
-msgstr ""
+msgstr "Sekvenser"
 
 #. module: base
 #: model:ir.model,name:base.model_base_language_import
 msgid "Language Import"
-msgstr ""
+msgstr "Importer språk"
 
 #. module: base
 #: model:ir.model,name:base.model_res_config_users
 msgid "res.config.users"
-msgstr ""
+msgstr "res.config.users"
 
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Albanian / Shqip"
-msgstr ""
+msgstr "Albansk / Shqipëri"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_crm_config_opportunity
@@ -611,12 +624,12 @@ msgstr ""
 #. module: base
 #: model:ir.model,name:base.model_base_language_export
 msgid "base.language.export"
-msgstr ""
+msgstr "base.language.export"
 
 #. module: base
 #: model:res.country,name:base.pg
 msgid "Papua New Guinea"
-msgstr ""
+msgstr "Papua Ny-Guinea"
 
 #. module: base
 #: help:ir.actions.report.xml,report_type:0
@@ -631,7 +644,7 @@ msgstr ""
 #. module: base
 #: report:ir.module.reference.graph:0
 msgid ","
-msgstr ""
+msgstr ","
 
 #. module: base
 #: view:res.partner:0
@@ -646,12 +659,12 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.es
 msgid "Spain"
-msgstr ""
+msgstr "Spania"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_translation_export
 msgid "Import / Export"
-msgstr ""
+msgstr "Import / Eksport"
 
 #. module: base
 #: help:ir.actions.act_window,domain:0
@@ -663,7 +676,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:base.action_view_base_module_upgrade
 #: model:ir.model,name:base.model_base_module_upgrade
 msgid "Module Upgrade"
-msgstr ""
+msgstr "Moduloppgradering"
 
 #. module: base
 #: view:res.config.users:0
@@ -671,43 +684,45 @@ msgid ""
 "Groups are used to define access rights on objects and the visibility of "
 "screens and menus"
 msgstr ""
+"Grupper blir benyttet til å definere tilgangsrettigheter til hvert enkelt "
+"skjermbilde og menyer"
 
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (UY) / Español (UY)"
-msgstr ""
+msgstr "Spanish (UY) / Español (UY)"
 
 #. module: base
 #: field:res.partner,mobile:0
 #: field:res.partner.address,mobile:0
 msgid "Mobile"
-msgstr ""
+msgstr "Mobil"
 
 #. module: base
 #: model:res.country,name:base.om
 msgid "Oman"
-msgstr ""
+msgstr "Oman"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_payterm_form
 #: model:ir.model,name:base.model_res_payterm
 msgid "Payment term"
-msgstr ""
+msgstr "Betalingsbetingelser"
 
 #. module: base
 #: model:res.country,name:base.nu
 msgid "Niue"
-msgstr ""
+msgstr "Niue"
 
 #. module: base
 #: selection:ir.cron,interval_type:0
 msgid "Work Days"
-msgstr ""
+msgstr "Arbeidsdager"
 
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "Other OSI Approved Licence"
-msgstr ""
+msgstr "Andre OSI godkjente lisenser"
 
 #. module: base
 #: help:res.config.users,context_lang:0
@@ -727,12 +742,12 @@ msgstr ""
 #: model:ir.actions.act_window,name:base.act_menu_create
 #: view:wizard.ir.model.menu.create:0
 msgid "Create Menu"
-msgstr ""
+msgstr "Opprett meny"
 
 #. module: base
 #: model:res.country,name:base.in
 msgid "India"
-msgstr ""
+msgstr "India"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.res_request_link-act
@@ -743,18 +758,18 @@ msgstr ""
 #. module: base
 #: view:ir.values:0
 msgid "client_action_multi, client_action_relate"
-msgstr ""
+msgstr "client_action_multi, client_action_relate"
 
 #. module: base
 #: model:res.country,name:base.ad
 msgid "Andorra, Principality of"
-msgstr ""
+msgstr "Andorra"
 
 #. module: base
 #: field:ir.module.category,child_ids:0
 #: field:res.partner.category,child_ids:0
 msgid "Child Categories"
-msgstr ""
+msgstr "Underordnede kategorier"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_config_parameter
@@ -764,12 +779,12 @@ msgstr ""
 #. module: base
 #: selection:base.language.export,format:0
 msgid "TGZ Archive"
-msgstr ""
+msgstr "TGZ arkiv"
 
 #. module: base
 #: view:res.lang:0
 msgid "%B - Full month name."
-msgstr ""
+msgstr "%B - Fullt navn på måned."
 
 #. module: base
 #: view:ir.attachment:0
@@ -785,7 +800,7 @@ msgstr ""
 #: view:res.partner:0
 #: view:res.partner.address:0
 msgid "Type"
-msgstr ""
+msgstr "Type"
 
 #. module: base
 #: code:addons/orm.py:210
@@ -798,7 +813,7 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.gu
 msgid "Guam (USA)"
-msgstr ""
+msgstr "Guam (USA)"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_hr_project
@@ -815,22 +830,22 @@ msgstr ""
 #: selection:ir.actions.server,state:0
 #: selection:workflow.activity,kind:0
 msgid "Dummy"
-msgstr ""
+msgstr "Dummy"
 
 #. module: base
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "Ugyldig XML for Visningsarkitektur"
 
 #. module: base
 #: model:res.country,name:base.ky
 msgid "Cayman Islands"
-msgstr ""
+msgstr "Caymanøyene"
 
 #. module: base
 #: model:res.country,name:base.kr
 msgid "South Korea"
-msgstr "Sør-Korea"
+msgstr "Sør Korea"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_workflow_transition_form
@@ -859,27 +874,27 @@ msgstr ""
 #: model:ir.actions.act_window,name:base.action_publisher_warranty_contract_form
 #: model:ir.ui.menu,name:base.menu_publisher_warranty_contract
 msgid "Contracts"
-msgstr ""
+msgstr "Kontrakter"
 
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (AR) / Español (AR)"
-msgstr ""
+msgstr "Spansk (AR) / Español (AR)"
 
 #. module: base
 #: model:res.country,name:base.ug
 msgid "Uganda"
-msgstr ""
+msgstr "Uganda"
 
 #. module: base
 #: field:ir.model.access,perm_unlink:0
 msgid "Delete Access"
-msgstr ""
+msgstr "Slett tilgang"
 
 #. module: base
 #: model:res.country,name:base.ne
 msgid "Niger"
-msgstr ""
+msgstr "Niger"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -889,7 +904,7 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.ba
 msgid "Bosnia-Herzegovina"
-msgstr ""
+msgstr "Bosnia-Herzegovina"
 
 #. module: base
 #: view:base.language.export:0
@@ -898,11 +913,14 @@ msgid ""
 "Lauchpad's web interface (Rosetta). If you need to perform mass translation, "
 "Launchpad also allows uploading full .po files at once"
 msgstr ""
+"For å forbedre betegnelsene i den offisielle oversettelsen av OpenERP bør du "
+"editere betegnelsene direkte i launchpad grensesnittet. Hvis du har gjort "
+"mange oversettelser i din egen modul så kan du publisere alle på en gang."
 
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (GT) / Español (GT)"
-msgstr ""
+msgstr "Spansk (AR) / Español (AR)"
 
 #. module: base
 #: view:res.lang:0
@@ -911,32 +929,35 @@ msgid ""
 "decimal number [00,53]. All days in a new year preceding the first Monday "
 "are considered to be in week 0."
 msgstr ""
+"%W - Ukenummer i året (Mandag som første dag i uken) som et desimtall "
+"[00,53]. Alle dager i et nytt år forut for den første mandagen blir ansett "
+"til å være i uke 0."
 
 #. module: base
 #: field:ir.module.module,website:0
 #: field:res.partner,website:0
 msgid "Website"
-msgstr ""
+msgstr "Nettside"
 
 #. module: base
 #: model:res.country,name:base.gs
 msgid "S. Georgia & S. Sandwich Isls."
-msgstr ""
+msgstr "Sør-Georgia og Sør-Sandwichøyene"
 
 #. module: base
 #: field:ir.actions.url,url:0
 msgid "Action URL"
-msgstr ""
+msgstr "URL til handling"
 
 #. module: base
 #: field:base.module.import,module_name:0
 msgid "Module Name"
-msgstr ""
+msgstr "Modulnavn"
 
 #. module: base
 #: model:res.country,name:base.mh
 msgid "Marshall Islands"
-msgstr ""
+msgstr "Marshalløyene, Republikken Marshalløyene"
 
 #. module: base
 #: code:addons/base/ir/ir_model.py:328
@@ -947,13 +968,13 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.ht
 msgid "Haiti"
-msgstr ""
+msgstr "Haiti"
 
 #. module: base
 #: view:ir.ui.view:0
 #: selection:ir.ui.view,type:0
 msgid "Search"
-msgstr ""
+msgstr "Søk"
 
 #. module: base
 #: code:addons/osv.py:136
@@ -980,12 +1001,12 @@ msgstr ""
 #. module: base
 #: help:base.language.export,lang:0
 msgid "To export a new language, do not select a language."
-msgstr ""
+msgstr "Ikke velg språk om du vil eksportere et nytt språk."
 
 #. module: base
 #: view:res.request:0
 msgid "Request Date"
-msgstr ""
+msgstr "Forespørsels dato"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_hr_dasboard
@@ -995,35 +1016,35 @@ msgstr ""
 #. module: base
 #: model:ir.ui.menu,name:base.menu_purchase_root
 msgid "Purchases"
-msgstr ""
+msgstr "Innkjøp"
 
 #. module: base
 #: model:res.country,name:base.md
 msgid "Moldavia"
-msgstr ""
+msgstr "Moldavia"
 
 #. module: base
 #: view:ir.module.module:0
 msgid "Features"
-msgstr ""
+msgstr "Funksjoner"
 
 #. module: base
 #: view:ir.module.module:0
 #: report:ir.module.reference.graph:0
 msgid "Version"
-msgstr ""
+msgstr "Versjon"
 
 #. module: base
 #: view:ir.model.access:0
 #: field:ir.model.access,perm_read:0
 #: view:ir.rule:0
 msgid "Read Access"
-msgstr ""
+msgstr "Lesetilgang"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_exports
 msgid "ir.exports"
-msgstr ""
+msgstr "ir.exports"
 
 #. module: base
 #: code:addons/base/module/wizard/base_update_translations.py:38
@@ -1044,16 +1065,19 @@ msgid ""
 "you select the invoice, then `object.invoice_address_id.email` is the field "
 "which gives the correct address"
 msgstr ""
+"Tilgjengeliggjør felt som benyttes for å hente epostadressene, f.eks. når du "
+"velger fakturaen så vil feltet  `object.invoice_address_id.email` gi den "
+"riktige addressen"
 
 #. module: base
 #: view:res.lang:0
 msgid "%Y - Year with century."
-msgstr ""
+msgstr "%Y - År med århundre."
 
 #. module: base
 #: report:ir.module.reference.graph:0
 msgid "-"
-msgstr ""
+msgstr "-"
 
 #. module: base
 #: view:publisher_warranty.contract.wizard:0
@@ -1072,24 +1096,24 @@ msgstr ""
 #. module: base
 #: view:wizard.ir.model.menu.create:0
 msgid "Create _Menu"
-msgstr ""
+msgstr "Opprett _meny"
 
 #. module: base
 #: field:res.payterm,name:0
 msgid "Payment Term (short name)"
-msgstr ""
+msgstr "Betalingsbetingelser (kortnavn)"
 
 #. module: base
 #: model:ir.model,name:base.model_res_bank
 #: view:res.bank:0
 #: field:res.partner.bank,bank:0
 msgid "Bank"
-msgstr ""
+msgstr "Bank"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_exports_line
 msgid "ir.exports.line"
-msgstr ""
+msgstr "ir.exports.line"
 
 #. module: base
 #: help:base.language.install,overwrite:0
@@ -1108,7 +1132,7 @@ msgstr ""
 #: field:ir.module.module,reports_by_module:0
 #: model:ir.ui.menu,name:base.menu_ir_action_report_xml
 msgid "Reports"
-msgstr ""
+msgstr "Rapporter"
 
 #. module: base
 #: help:ir.actions.act_window.view,multi:0
@@ -1117,11 +1141,13 @@ msgid ""
 "If set to true, the action will not be displayed on the right toolbar of a "
 "form view."
 msgstr ""
+"Hvis satt til sann, så vil ikke handlingen vises på den høyre verktøylinjen "
+"i skjemavisning."
 
 #. module: base
 #: field:workflow,on_create:0
 msgid "On Create"
-msgstr ""
+msgstr "Ved opprettelse"
 
 #. module: base
 #: code:addons/base/ir/ir_model.py:607
@@ -1130,13 +1156,16 @@ msgid ""
 "'%s' contains too many dots. XML ids should not contain dots ! These are "
 "used to refer to other modules data, as in module.reference_id"
 msgstr ""
+"\"%s\" inneholder for mange punktum. XML identer skal ikke inneholde punktum "
+"! Disse er forbeholdt å referere til data i andre moduler, f.eks. som i "
+"module.reference_id"
 
 #. module: base
 #: field:partner.sms.send,user:0
 #: field:res.config.users,login:0
 #: field:res.users,login:0
 msgid "Login"
-msgstr ""
+msgstr "Login"
 
 #. module: base
 #: view:ir.actions.server:0
@@ -1148,7 +1177,7 @@ msgstr ""
 #. module: base
 #: model:ir.model,name:base.model_res_country_state
 msgid "Country state"
-msgstr ""
+msgstr "Navn på stat"
 
 #. module: base
 #: selection:ir.property,type:0
@@ -1158,19 +1187,19 @@ msgstr ""
 #. module: base
 #: model:ir.model,name:base.model_res_request_link
 msgid "res.request.link"
-msgstr ""
+msgstr "res.request.link"
 
 #. module: base
 #: field:ir.actions.wizard,name:0
 msgid "Wizard Info"
-msgstr ""
+msgstr "Veiviser informasjon"
 
 #. module: base
 #: view:base.language.export:0
 #: model:ir.actions.act_window,name:base.action_wizard_lang_export
 #: model:ir.ui.menu,name:base.menu_wizard_lang_export
 msgid "Export Translation"
-msgstr ""
+msgstr "Eksporter oversettelse"
 
 #. module: base
 #: help:res.log,secondary:0
@@ -1182,7 +1211,7 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.tp
 msgid "East Timor"
-msgstr ""
+msgstr "Øst Timor"
 
 #. module: base
 #: model:res.company,follow_up_msg:base.main_company
@@ -1205,7 +1234,7 @@ msgstr ""
 #. module: base
 #: field:res.currency,accuracy:0
 msgid "Computational Accuracy"
-msgstr ""
+msgstr "Beregningspresisjon"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -1215,37 +1244,37 @@ msgstr ""
 #. module: base
 #: model:ir.model,name:base.model_wizard_ir_model_menu_create_line
 msgid "wizard.ir.model.menu.create.line"
-msgstr ""
+msgstr "wizard.ir.model.menu.create.line"
 
 #. module: base
 #: field:ir.attachment,res_id:0
 msgid "Attached ID"
-msgstr ""
+msgstr "Vedlagt ID"
 
 #. module: base
 #: view:ir.sequence:0
 msgid "Day: %(day)s"
-msgstr ""
+msgstr "Dag: %(day)s"
 
 #. module: base
 #: model:res.country,name:base.mv
 msgid "Maldives"
-msgstr ""
+msgstr "Maldivene"
 
 #. module: base
 #: help:ir.values,res_id:0
 msgid "Keep 0 if the action must appear on all resources."
-msgstr ""
+msgstr "Hold igjen 0 hvis handlingen skal omfatte alle ressurser."
 
 #. module: base
 #: model:ir.model,name:base.model_ir_rule
 msgid "ir.rule"
-msgstr ""
+msgstr "ir.rule"
 
 #. module: base
 #: selection:ir.cron,interval_type:0
 msgid "Days"
-msgstr ""
+msgstr "Dager"
 
 #. module: base
 #: help:ir.actions.server,condition:0
@@ -1253,25 +1282,27 @@ msgid ""
 "Condition that is to be tested before action is executed, e.g. "
 "object.list_price > object.cost_price"
 msgstr ""
+"Betingelse som skal testes før en handling blir utført, f.eks. "
+"object.list_price > object.cost_price"
 
 #. module: base
 #: code:addons/base/res/partner/partner.py:155
 #: code:addons/base/res/res_company.py:66
 #, python-format
 msgid " (copy)"
-msgstr ""
+msgstr " (kopi)"
 
 #. module: base
 #: view:res.lang:0
 msgid "7.  %H:%M:%S      ==> 18:25:20"
-msgstr ""
+msgstr "7.  %H:%M:%S      ==> 18:25:20"
 
 #. module: base
 #: view:res.partner:0
 #: view:res.partner.category:0
 #: field:res.partner.category,partner_ids:0
 msgid "Partners"
-msgstr ""
+msgstr "Partnere"
 
 #. module: base
 #: field:res.partner.category,parent_left:0
@@ -1290,59 +1321,61 @@ msgid ""
 "Specify the message. You can use the fields from the object. e.g. `Dear [[ "
 "object.partner_id.name ]]`"
 msgstr ""
+"Spesifiser meldingen. Du kan bruke feltene fra objektet. F.eks. Kjære [[ "
+"objetc.partner_id.name]]'"
 
 #. module: base
 #: field:ir.attachment,res_model:0
 msgid "Attached Model"
-msgstr ""
+msgstr "Tilknyttet modell"
 
 #. module: base
 #: view:ir.rule:0
 msgid "Domain Setup"
-msgstr ""
+msgstr "Domene oppsett"
 
 #. module: base
 #: field:ir.actions.server,trigger_name:0
 msgid "Trigger Name"
-msgstr ""
+msgstr "Utløsernavn"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_model_access
 msgid "ir.model.access"
-msgstr ""
+msgstr "ir.model.access"
 
 #. module: base
 #: field:ir.cron,priority:0
 #: field:res.request,priority:0
 #: field:res.request.link,priority:0
 msgid "Priority"
-msgstr ""
+msgstr "Prioritet"
 
 #. module: base
 #: field:workflow.transition,act_from:0
 msgid "Source Activity"
-msgstr ""
+msgstr "Aktivitetskilde"
 
 #. module: base
 #: view:ir.sequence:0
 msgid "Legend (for prefix, suffix)"
-msgstr ""
+msgstr "Legend (for prefix, suffix)"
 
 #. module: base
 #: selection:ir.server.object.lines,type:0
 msgid "Formula"
-msgstr ""
+msgstr "Formel"
 
 #. module: base
 #: code:addons/base/res/res_user.py:389
 #, python-format
 msgid "Can not remove root user!"
-msgstr ""
+msgstr "Kan ikke fjerne root brukereren!"
 
 #. module: base
 #: model:res.country,name:base.mw
 msgid "Malawi"
-msgstr ""
+msgstr "Malawi"
 
 #. module: base
 #: code:addons/base/res/res_user.py:51
@@ -1354,17 +1387,17 @@ msgstr ""
 #. module: base
 #: field:res.partner.address,type:0
 msgid "Address Type"
-msgstr ""
+msgstr "Adressetype"
 
 #. module: base
 #: view:ir.ui.menu:0
 msgid "Full Path"
-msgstr ""
+msgstr "Full sti"
 
 #. module: base
 #: view:res.request:0
 msgid "References"
-msgstr ""
+msgstr "Referanser"
 
 #. module: base
 #: view:res.lang:0
@@ -1373,6 +1406,9 @@ msgid ""
 "decimal number [00,53]. All days in a new year preceding the first Sunday "
 "are considered to be in week 0."
 msgstr ""
+"%U - Ukenummer i året (Søndag som den første dagen i uken) som et "
+"desimaltall [00,53]. Alle dager i det nye året forut for den første søndagen "
+"blir ansett for å være i uke 0."
 
 #. module: base
 #: view:ir.ui.view:0
@@ -1382,7 +1418,7 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.fi
 msgid "Finland"
-msgstr ""
+msgstr "Finland"
 
 #. module: base
 #: selection:ir.actions.act_window,view_type:0
@@ -1391,28 +1427,29 @@ msgstr ""
 #: selection:ir.ui.view,type:0
 #: selection:wizard.ir.model.menu.create.line,view_type:0
 msgid "Tree"
-msgstr ""
+msgstr "Tre"
 
 #. module: base
 #: help:res.config.users,password:0
 msgid ""
 "Keep empty if you don't want the user to be able to connect on the system."
 msgstr ""
+"Behold feltet blankt om du ikke vil at brukeren skal kunne logge på systemet."
 
 #. module: base
 #: view:ir.actions.server:0
 msgid "Create / Write / Copy"
-msgstr ""
+msgstr "Opprett / Skriv / Kopier"
 
 #. module: base
 #: view:base.language.export:0
 msgid "https://help.launchpad.net/Translations"
-msgstr ""
+msgstr "https://help.launchpad.net/Translations"
 
 #. module: base
 #: field:ir.actions.act_window,view_mode:0
 msgid "View Mode"
-msgstr ""
+msgstr "Visningsmodus"
 
 #. module: base
 #: view:base.language.import:0
@@ -1430,12 +1467,12 @@ msgstr ""
 #. module: base
 #: view:res.log:0
 msgid "Logs"
-msgstr ""
+msgstr "Logger"
 
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish / Español"
-msgstr ""
+msgstr "Spansk / Español"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -1452,7 +1489,7 @@ msgstr ""
 #. module: base
 #: field:res.company,logo:0
 msgid "Logo"
-msgstr ""
+msgstr "Logo"
 
 #. module: base
 #: view:res.partner.address:0
@@ -1462,18 +1499,18 @@ msgstr ""
 #. module: base
 #: view:ir.module.module:0
 msgid "Uninstall (beta)"
-msgstr ""
+msgstr "Avinstaller (beta)"
 
 #. module: base
 #: selection:ir.actions.act_window,target:0
 #: selection:ir.actions.url,target:0
 msgid "New Window"
-msgstr ""
+msgstr "Nytt vindu"
 
 #. module: base
 #: model:res.country,name:base.bs
 msgid "Bahamas"
-msgstr ""
+msgstr "Bahamas"
 
 #. module: base
 #: code:addons/base/res/partner/partner.py:250
@@ -1481,21 +1518,23 @@ msgstr ""
 msgid ""
 "Couldn't generate the next id because some partners have an alphabetic id !"
 msgstr ""
+"Kunne ikke opprette neste id på grunn av en eller flere partnere har en "
+"alfanumerisk id!"
 
 #. module: base
 #: view:ir.attachment:0
 msgid "Attachment"
-msgstr ""
+msgstr "Vedlegg"
 
 #. module: base
 #: model:res.country,name:base.ie
 msgid "Ireland"
-msgstr ""
+msgstr "Irland"
 
 #. module: base
 #: field:base.module.update,update:0
 msgid "Number of modules updated"
-msgstr ""
+msgstr "Antall moduler oppdatert"
 
 #. module: base
 #: code:addons/fields.py:100
@@ -1541,12 +1580,12 @@ msgstr ""
 #: view:res.users:0
 #: field:res.users,groups_id:0
 msgid "Groups"
-msgstr ""
+msgstr "Grupper"
 
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (CL) / Español (CL)"
-msgstr ""
+msgstr "Spanish (CL) / Español (CL)"
 
 #. module: base
 #: view:res.config.users:0
@@ -1559,17 +1598,17 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.bz
 msgid "Belize"
-msgstr ""
+msgstr "Belize"
 
 #. module: base
 #: model:res.country,name:base.ge
 msgid "Georgia"
-msgstr ""
+msgstr "Georgia"
 
 #. module: base
 #: model:res.country,name:base.pl
 msgid "Poland"
-msgstr ""
+msgstr "Polen"
 
 #. module: base
 #: help:ir.actions.act_window,view_mode:0
@@ -1593,12 +1632,12 @@ msgstr ""
 #: selection:ir.module.module,state:0
 #: selection:ir.module.module.dependency,state:0
 msgid "To be removed"
-msgstr ""
+msgstr "Å fjerne"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_sequence
 msgid "ir.sequence"
-msgstr ""
+msgstr "ir.sequence"
 
 #. module: base
 #: help:ir.actions.server,expression:0
@@ -1607,13 +1646,16 @@ msgid ""
 "order in Object, and you can have loop on the sales order line. Expression = "
 "`object.order_line`."
 msgstr ""
+"Skriv inn feltet/uttrykket som vil returnere listen. F.eks. velg salgsordren "
+"i Objekt, og du kan iterere over salgsordrelinjen(e). Uttrykk = "
+"'object.order_line'."
 
 #. module: base
 #: field:ir.property,fields_id:0
 #: selection:ir.translation,type:0
 #: field:multi_company.default,field_id:0
 msgid "Field"
-msgstr ""
+msgstr "Felt"
 
 #. module: base
 #: view:ir.rule:0
@@ -1623,39 +1665,39 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.fo
 msgid "Faroe Islands"
-msgstr ""
+msgstr "Færøyene"
 
 #. module: base
 #: selection:res.config.users,view:0
 #: selection:res.config.view,view:0
 #: selection:res.users,view:0
 msgid "Simplified"
-msgstr ""
+msgstr "Forenklet"
 
 #. module: base
 #: model:res.country,name:base.st
 msgid "Saint Tome (Sao Tome) and Principe"
-msgstr ""
+msgstr "Saint Tome (Sao Tome) and Principe"
 
 #. module: base
 #: selection:res.partner.address,type:0
 msgid "Invoice"
-msgstr ""
+msgstr "Faktura"
 
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Portugese (BR) / Português (BR)"
-msgstr ""
+msgstr "Portugese (BR) / Português (BR)"
 
 #. module: base
 #: model:res.country,name:base.bb
 msgid "Barbados"
-msgstr ""
+msgstr "Barbados"
 
 #. module: base
 #: model:res.country,name:base.mg
 msgid "Madagascar"
-msgstr ""
+msgstr "Madagaskar"
 
 #. module: base
 #: code:addons/base/ir/ir_model.py:96
@@ -1663,53 +1705,54 @@ msgstr ""
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
+"Objektnavnet må starte med x_ og kan ikke inneholde noen spesial karakterer !"
 
 #. module: base
 #: field:ir.actions.configuration.wizard,note:0
 msgid "Next Wizard"
-msgstr ""
+msgstr "Neste veileder"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_menu_admin
 #: view:ir.ui.menu:0
 #: field:ir.ui.menu,name:0
 msgid "Menu"
-msgstr ""
+msgstr "Meny"
 
 #. module: base
 #: field:res.currency,rate:0
 msgid "Current Rate"
-msgstr ""
+msgstr "Gjeldene rate"
 
 #. module: base
 #: field:ir.ui.view.custom,ref_id:0
 msgid "Original View"
-msgstr ""
+msgstr "Orginal visning"
 
 #. module: base
 #: view:ir.values:0
 msgid "Action To Launch"
-msgstr ""
+msgstr "Handling som skal utføres"
 
 #. module: base
 #: field:ir.actions.url,target:0
 msgid "Action Target"
-msgstr ""
+msgstr "Mål for handling"
 
 #. module: base
 #: model:res.country,name:base.ai
 msgid "Anguilla"
-msgstr ""
+msgstr "Anguilla"
 
 #. module: base
 #: field:ir.ui.view_sc,name:0
 msgid "Shortcut Name"
-msgstr ""
+msgstr "Navn på snarvei"
 
 #. module: base
 #: help:ir.actions.act_window,limit:0
 msgid "Default limit for the list view"
-msgstr ""
+msgstr "Standard grenseverdi for listevisningen"
 
 #. module: base
 #: help:ir.actions.server,write_id:0
@@ -1717,87 +1760,91 @@ 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 ""
+"Angi feltnavn som rad id'en refererer til for skrive operasjonen. Hvis den "
+"er tom, så vil det refereres til den aktive id'en til objektet."
 
 #. module: base
 #: model:res.country,name:base.zw
 msgid "Zimbabwe"
-msgstr ""
+msgstr "Zimbabwe"
 
 #. module: base
 #: view:base.module.update:0
 msgid "Please be patient, as this operation may take a few seconds..."
-msgstr ""
+msgstr "Vær tålmodig, denne operasjonen kan ta noen få sekunder..."
 
 #. module: base
 #: help:ir.values,action_id:0
 msgid "This field is not used, it only helps you to select the right action."
 msgstr ""
+"Dette feltet er ikke i bruk, det hjelper deg bare til å velge den riktige "
+"handlingen."
 
 #. module: base
 #: field:ir.actions.server,email:0
 msgid "Email Address"
-msgstr ""
+msgstr "Epostadresse"
 
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "French (BE) / Français (BE)"
-msgstr ""
+msgstr "Fransk / Français"
 
 #. module: base
 #: view:ir.actions.server:0
 #: field:workflow.activity,action_id:0
 msgid "Server Action"
-msgstr ""
+msgstr "Tjenerhandling"
 
 #. module: base
 #: model:res.country,name:base.tt
 msgid "Trinidad and Tobago"
-msgstr ""
+msgstr "Trinidad and Tobago"
 
 #. module: base
 #: model:res.country,name:base.lv
 msgid "Latvia"
-msgstr ""
+msgstr "Latvia"
 
 #. module: base
 #: view:ir.values:0
 msgid "Values"
-msgstr ""
+msgstr "Verdier"
 
 #. module: base
 #: view:ir.actions.server:0
 msgid "Field Mappings"
-msgstr ""
+msgstr "Feltoversikt"
 
 #. module: base
 #: view:base.language.export:0
 msgid "Export Translations"
-msgstr ""
+msgstr "Eksporter oversettelser"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_custom
 msgid "Customization"
-msgstr ""
+msgstr "Tilpasning"
 
 #. module: base
 #: model:res.country,name:base.py
 msgid "Paraguay"
-msgstr ""
+msgstr "Paraguay"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_actions_act_window_close
 msgid "ir.actions.act_window_close"
-msgstr ""
+msgstr "ir.actions.act_window_close"
 
 #. module: base
 #: field:ir.server.object.lines,col1:0
 msgid "Destination"
-msgstr ""
+msgstr "Destinasjon"
 
 #. module: base
 #: model:res.country,name:base.lt
 msgid "Lithuania"
-msgstr ""
+msgstr "Litauen"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_view_partner_clear_ids
@@ -1822,17 +1869,17 @@ msgstr ""
 #. module: base
 #: view:res.lang:0
 msgid "%y - Year without century [00,99]."
-msgstr ""
+msgstr "%y - År uten århundre [00,99]."
 
 #. module: base
 #: model:res.country,name:base.si
 msgid "Slovenia"
-msgstr ""
+msgstr "Slovenia"
 
 #. module: base
 #: model:res.country,name:base.pk
 msgid "Pakistan"
-msgstr ""
+msgstr "Pakistan"
 
 #. module: base
 #: code:addons/orm.py:1350
@@ -1843,7 +1890,7 @@ msgstr ""
 #. module: base
 #: model:ir.ui.menu,name:base.menu_email_gateway_form
 msgid "Messages"
-msgstr ""
+msgstr "Meldinger"
 
 #. module: base
 #: code:addons/base/ir/ir_model.py:303
@@ -1855,17 +1902,17 @@ msgstr ""
 #: code:addons/base/module/wizard/base_update_translations.py:38
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "Feil!"
 
 #. module: base
 #: view:res.lang:0
 msgid "%p - Equivalent of either AM or PM."
-msgstr ""
+msgstr "%p - Tilsvarende til enten AM eller PM."
 
 #. module: base
 #: view:ir.actions.server:0
 msgid "Iteration Actions"
-msgstr ""
+msgstr "Iterasjonshandlinger"
 
 #. module: base
 #: help:multi_company.default,company_id:0
@@ -1875,12 +1922,12 @@ msgstr ""
 #. module: base
 #: field:publisher_warranty.contract,date_stop:0
 msgid "Ending Date"
-msgstr ""
+msgstr "Slutter dato"
 
 #. module: base
 #: model:res.country,name:base.nz
 msgid "New Zealand"
-msgstr ""
+msgstr "New Zealand"
 
 #. module: base
 #: code:addons/orm.py:3366
@@ -1906,7 +1953,7 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.nf
 msgid "Norfolk Island"
-msgstr ""
+msgstr "Norfolk øyene"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -1922,43 +1969,43 @@ msgstr ""
 #: field:ir.actions.server,action_id:0
 #: selection:ir.actions.server,state:0
 msgid "Client Action"
-msgstr ""
+msgstr "Klienthandling"
 
 #. module: base
 #: model:res.country,name:base.bd
 msgid "Bangladesh"
-msgstr ""
+msgstr "Bangladesh"
 
 #. module: base
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr ""
+msgstr "Feil ! Du kan ikke lage rekursive firmaer."
 
 #. module: base
 #: selection:publisher_warranty.contract,state:0
 msgid "Valid"
-msgstr ""
+msgstr "Gyldig"
 
 #. module: base
 #: selection:ir.translation,type:0
 msgid "XSL"
-msgstr ""
+msgstr "XSL"
 
 #. module: base
 #: code:addons/base/module/module.py:322
 #, python-format
 msgid "Can not upgrade module '%s'. It is not installed."
-msgstr ""
+msgstr "Kan ikke oppgradere modulen '%s'. Den er ikke installert."
 
 #. module: base
 #: model:res.country,name:base.cu
 msgid "Cuba"
-msgstr ""
+msgstr "Cuba"
 
 #. module: base
 #: model:ir.model,name:base.model_res_partner_event
 msgid "res.partner.event"
-msgstr ""
+msgstr "res.partner.event"
 
 #. module: base
 #: model:res.widget,title:base.facebook_widget
@@ -1968,41 +2015,41 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.am
 msgid "Armenia"
-msgstr ""
+msgstr "Armenia"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.ir_property_form
 #: model:ir.ui.menu,name:base.menu_ir_property_form_all
 msgid "Configuration Parameters"
-msgstr ""
+msgstr "Konfigurasjonsparametere"
 
 #. module: base
 #: constraint:ir.cron:0
 msgid "Invalid arguments"
-msgstr ""
+msgstr "Ugyldige argumenter"
 
 #. module: base
 #: model:res.country,name:base.se
 msgid "Sweden"
-msgstr ""
+msgstr "Sverige"
 
 #. module: base
 #: selection:ir.actions.act_window.view,view_mode:0
 #: selection:ir.ui.view,type:0
 #: selection:wizard.ir.model.menu.create.line,view_type:0
 msgid "Gantt"
-msgstr ""
+msgstr "Gantt"
 
 #. module: base
 #: view:ir.property:0
 msgid "Property"
-msgstr ""
+msgstr "Egenskap"
 
 #. module: base
 #: model:ir.model,name:base.model_res_partner_bank_type
 #: view:res.partner.bank.type:0
 msgid "Bank Account Type"
-msgstr ""
+msgstr "Bankkontotype"
 
 #. module: base
 #: field:base.language.export,config_logo:0
@@ -2024,24 +2071,24 @@ msgstr ""
 #. module: base
 #: view:ir.actions.server:0
 msgid "Iteration Action Configuration"
-msgstr ""
+msgstr "Iterasjonhandling instillinger"
 
 #. module: base
 #: selection:publisher_warranty.contract,state:0
 msgid "Canceled"
-msgstr ""
+msgstr "Avbrutt"
 
 #. module: base
 #: model:res.country,name:base.at
 msgid "Austria"
-msgstr ""
+msgstr "Østerrike"
 
 #. module: base
 #: selection:base.language.install,state:0
 #: selection:base.module.import,state:0
 #: selection:base.module.update,state:0
 msgid "done"
-msgstr ""
+msgstr "ferdig"
 
 #. module: base
 #: selection:ir.actions.act_window.view,view_mode:0
@@ -2049,7 +2096,7 @@ msgstr ""
 #: selection:ir.ui.view,type:0
 #: selection:wizard.ir.model.menu.create.line,view_type:0
 msgid "Calendar"
-msgstr ""
+msgstr "Kalender"
 
 #. module: base
 #: field:res.partner.address,partner_id:0
@@ -2059,12 +2106,12 @@ msgstr ""
 #. module: base
 #: field:workflow.activity,signal_send:0
 msgid "Signal (subflow.*)"
-msgstr ""
+msgstr "Signal (subflow.*)"
 
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_17
 msgid "HR sector"
-msgstr ""
+msgstr "HR sektor"
 
 #. module: base
 #: code:addons/orm.py:3817
@@ -2078,19 +2125,19 @@ msgstr ""
 #. module: base
 #: model:ir.model,name:base.model_ir_module_module_dependency
 msgid "Module dependency"
-msgstr ""
+msgstr "Modulavhengighet"
 
 #. module: base
 #: selection:publisher_warranty.contract.wizard,state:0
 msgid "Draft"
-msgstr ""
+msgstr "Utkast"
 
 #. module: base
 #: selection:res.config.users,view:0
 #: selection:res.config.view,view:0
 #: selection:res.users,view:0
 msgid "Extended"
-msgstr ""
+msgstr "Utvidet"
 
 #. module: base
 #: model:ir.actions.act_window,help:base.action_partner_title_contact
@@ -2103,30 +2150,30 @@ msgstr ""
 #. module: base
 #: field:res.company,rml_footer1:0
 msgid "Report Footer 1"
-msgstr ""
+msgstr "Rapport bunntekst 1"
 
 #. module: base
 #: field:res.company,rml_footer2:0
 msgid "Report Footer 2"
-msgstr ""
+msgstr "Rapport bunntekst 2"
 
 #. module: base
 #: view:ir.model.access:0
 #: view:res.groups:0
 #: field:res.groups,model_access:0
 msgid "Access Controls"
-msgstr ""
+msgstr "Tilgangskontroller"
 
 #. module: base
 #: view:ir.module.module:0
 #: field:ir.module.module,dependencies_id:0
 msgid "Dependencies"
-msgstr ""
+msgstr "Avhengigheter"
 
 #. module: base
 #: field:multi_company.default,company_id:0
 msgid "Main Company"
-msgstr ""
+msgstr "Hovedfirma"
 
 #. module: base
 #: field:ir.ui.menu,web_icon_hover:0
@@ -2139,17 +2186,19 @@ msgid ""
 "If you use a formula type, use a python expression using the variable "
 "'object'."
 msgstr ""
+"Hvis du benytter en formeltype, benytt et python uttrykk med variablen "
+"'object'."
 
 #. module: base
 #: field:res.partner.address,birthdate:0
 msgid "Birthdate"
-msgstr ""
+msgstr "Fødselsdag"
 
 #. 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 "Kontakttitler"
 
 #. module: base
 #: view:base.language.import:0
@@ -2161,12 +2210,12 @@ msgstr ""
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (DO) / Español (DO)"
-msgstr ""
+msgstr "Spanish (DO) / Español (DO)"
 
 #. module: base
 #: model:ir.model,name:base.model_workflow_activity
 msgid "workflow.activity"
-msgstr ""
+msgstr "workflow.activity"
 
 #. module: base
 #: help:ir.ui.view_sc,res_id:0
@@ -2178,17 +2227,17 @@ msgstr ""
 #. module: base
 #: field:ir.model.fields,select_level:0
 msgid "Searchable"
-msgstr ""
+msgstr "Søkbar"
 
 #. module: base
 #: model:res.country,name:base.uy
 msgid "Uruguay"
-msgstr ""
+msgstr "Uruguay"
 
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Finnish / Suomi"
-msgstr ""
+msgstr "Finland / Suomi"
 
 #. module: base
 #: field:ir.rule,perm_write:0
@@ -2198,32 +2247,32 @@ msgstr ""
 #. module: base
 #: field:ir.sequence,prefix:0
 msgid "Prefix"
-msgstr ""
+msgstr "Prefix"
 
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "German / Deutsch"
-msgstr ""
+msgstr "Tysk / Deutsch"
 
 #. module: base
 #: help:ir.actions.server,trigger_name:0
 msgid "Select the Signal name that is to be used as the trigger."
-msgstr ""
+msgstr "Velg signalnavnet som skal benyttes som utløser."
 
 #. module: base
 #: view:ir.actions.server:0
 msgid "Fields Mapping"
-msgstr ""
+msgstr "Kobling av felter"
 
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Portugese / Português"
-msgstr ""
+msgstr "Portugisisk / português"
 
 #. module: base
 #: model:res.partner.title,name:base.res_partner_title_sir
 msgid "Sir"
-msgstr ""
+msgstr "Hr"
 
 #. module: base
 #: code:addons/orm.py:1622
@@ -2234,23 +2283,23 @@ msgstr ""
 #. module: base
 #: field:ir.default,ref_id:0
 msgid "ID Ref."
-msgstr ""
+msgstr "ID Ref."
 
 #. module: base
 #: model:ir.actions.server,name:base.action_start_configurator
 #: model:ir.ui.menu,name:base.menu_view_base_module_configuration
 msgid "Start Configuration"
-msgstr ""
+msgstr "Start konfigurasjon"
 
 #. module: base
 #: model:res.country,name:base.mt
 msgid "Malta"
-msgstr ""
+msgstr "Malta"
 
 #. module: base
 #: field:ir.actions.server,fields_lines:0
 msgid "Field Mappings."
-msgstr ""
+msgstr "Mapping av felter."
 
 #. module: base
 #: model:ir.model,name:base.model_ir_module_module
@@ -2261,7 +2310,7 @@ msgstr ""
 #: report:ir.module.reference.graph:0
 #: field:ir.translation,module:0
 msgid "Module"
-msgstr ""
+msgstr "Modul"
 
 #. module: base
 #: field:ir.attachment,description:0
@@ -2272,18 +2321,18 @@ msgstr ""
 #: field:res.partner.event,description:0
 #: view:res.request:0
 msgid "Description"
-msgstr ""
+msgstr "Beskrivelse"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_workflow_instance_form
 #: model:ir.ui.menu,name:base.menu_workflow_instance
 msgid "Instances"
-msgstr ""
+msgstr "Instanser"
 
 #. module: base
 #: model:res.country,name:base.aq
 msgid "Antarctica"
-msgstr ""
+msgstr "Antarktis"
 
 #. module: base
 #: field:ir.actions.report.xml,auto:0
@@ -2293,55 +2342,55 @@ msgstr ""
 #. module: base
 #: view:base.language.import:0
 msgid "_Import"
-msgstr ""
+msgstr "_Importer"
 
 #. module: base
 #: view:res.partner.canal:0
 msgid "Channel"
-msgstr ""
+msgstr "Kanal"
 
 #. module: base
 #: field:res.lang,grouping:0
 msgid "Separator Format"
-msgstr ""
+msgstr "Separatorformat"
 
 #. module: base
 #: selection:publisher_warranty.contract,state:0
 msgid "Unvalidated"
-msgstr ""
+msgstr "Ikke validert"
 
 #. module: base
 #: model:ir.ui.menu,name:base.next_id_9
 msgid "Database Structure"
-msgstr ""
+msgstr "Databasestruktur"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_partner_mass_mail
 #: model:ir.model,name:base.model_partner_wizard_spam
 #: view:partner.wizard.spam:0
 msgid "Mass Mailing"
-msgstr ""
+msgstr "Masse utsendelse av e-post"
 
 #. module: base
 #: model:res.country,name:base.yt
 msgid "Mayotte"
-msgstr ""
+msgstr "Mayotte"
 
 #. module: base
 #: code:addons/base/ir/ir_actions.py:597
 #, python-format
 msgid "Please specify an action to launch !"
-msgstr ""
+msgstr "Vær vennlig å velg en handling å uføre !"
 
 #. module: base
 #: view:res.payterm:0
 msgid "Payment Term"
-msgstr ""
+msgstr "Betalingsbetingelser"
 
 #. module: base
 #: selection:res.lang,direction:0
 msgid "Right-to-Left"
-msgstr ""
+msgstr "Høyre-til-venstre"
 
 #. module: base
 #: view:ir.actions.act_window:0
@@ -2350,7 +2399,7 @@ msgstr ""
 #: model:ir.model,name:base.model_ir_filters
 #: model:ir.ui.menu,name:base.menu_ir_filters
 msgid "Filters"
-msgstr ""
+msgstr "Filter"
 
 #. module: base
 #: code:addons/orm.py:758
@@ -2363,14 +2412,14 @@ msgstr ""
 #: view:ir.cron:0
 #: model:ir.ui.menu,name:base.menu_ir_cron_act
 msgid "Scheduled Actions"
-msgstr ""
+msgstr "Planlagte handlinger"
 
 #. module: base
 #: field:res.partner.address,title:0
 #: field:res.partner.title,name:0
 #: field:res.widget,title:0
 msgid "Title"
-msgstr ""
+msgstr "Tittel"
 
 #. module: base
 #: help:ir.property,res_id:0
@@ -2387,7 +2436,7 @@ msgstr ""
 #: code:addons/base/module/module.py:262
 #, python-format
 msgid "Recursion error in modules dependencies !"
-msgstr ""
+msgstr "Feil grunnet rekursjon i modulavhengigheter !"
 
 #. module: base
 #: view:base.language.install:0
@@ -2400,7 +2449,7 @@ msgstr ""
 #. module: base
 #: view:ir.model:0
 msgid "Create a Menu"
-msgstr ""
+msgstr "Opprett en meny"
 
 #. module: base
 #: help:res.partner,vat:0
@@ -2408,16 +2457,18 @@ msgid ""
 "Value Added Tax number. Check the box if the partner is subjected to the "
 "VAT. Used by the VAT legal statement."
 msgstr ""
+"MVA nummer. Kryss av boksen dersom partner er underlagt MVA. Benyttes fra "
+"MVA legal statement!"
 
 #. module: base
 #: model:ir.model,name:base.model_maintenance_contract
 msgid "maintenance.contract"
-msgstr ""
+msgstr "maintenance.contract"
 
 #. module: base
 #: model:res.country,name:base.ru
 msgid "Russian Federation"
-msgstr ""
+msgstr "Russland"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -2427,13 +2478,13 @@ msgstr ""
 #. module: base
 #: field:res.company,name:0
 msgid "Company Name"
-msgstr ""
+msgstr "Firmanavn"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_country
 #: model:ir.ui.menu,name:base.menu_country_partner
 msgid "Countries"
-msgstr ""
+msgstr "Land"
 
 #. module: base
 #: selection:ir.translation,type:0
@@ -2443,12 +2494,12 @@ msgstr ""
 #. module: base
 #: view:ir.rule:0
 msgid "Record rules"
-msgstr ""
+msgstr "Opprett regler"
 
 #. module: base
 #: view:ir.property:0
 msgid "Field Information"
-msgstr ""
+msgstr "Feltinformasjon"
 
 #. module: base
 #: view:ir.actions.todo:0
@@ -2464,37 +2515,37 @@ msgstr ""
 #. module: base
 #: field:res.partner,vat:0
 msgid "VAT"
-msgstr ""
+msgstr "MVA"
 
 #. module: base
 #: view:res.lang:0
 msgid "12. %w              ==> 5 ( Friday is the 6th day)"
-msgstr ""
+msgstr "12. %w              ==> 5 ( Fredag er den 6. dagen)"
 
 #. module: base
 #: constraint:res.partner.category:0
 msgid "Error ! You can not create recursive categories."
-msgstr ""
+msgstr "Feil ! Du kan ikke lage rekursive kategorier."
 
 #. module: base
 #: view:res.lang:0
 msgid "%x - Appropriate date representation."
-msgstr ""
+msgstr "%x - Passende datovisning."
 
 #. module: base
 #: view:res.lang:0
 msgid "%d - Day of the month [01,31]."
-msgstr ""
+msgstr "%d - Dag i månedenl [01,31]."
 
 #. module: base
 #: model:res.country,name:base.tj
 msgid "Tajikistan"
-msgstr ""
+msgstr "Tajikistan"
 
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL-2 or later version"
-msgstr ""
+msgstr "GPL-2 eller senere versjon"
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_sir
@@ -2508,6 +2559,8 @@ msgid ""
 "Can not create the module file:\n"
 " %s"
 msgstr ""
+"Can not create the module file:\n"
+" %s"
 
 #. module: base
 #: code:addons/orm.py:2973
@@ -2520,7 +2573,7 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.nr
 msgid "Nauru"
-msgstr ""
+msgstr "Nauru"
 
 #. module: base
 #: code:addons/base/module/module.py:200
@@ -2531,7 +2584,7 @@ msgstr ""
 #. module: base
 #: model:ir.model,name:base.model_ir_property
 msgid "ir.property"
-msgstr ""
+msgstr "Ukjent egenskap %s"
 
 #. module: base
 #: selection:ir.actions.act_window,view_type:0
@@ -2540,23 +2593,23 @@ msgstr ""
 #: selection:ir.ui.view,type:0
 #: selection:wizard.ir.model.menu.create.line,view_type:0
 msgid "Form"
-msgstr ""
+msgstr "Skjema"
 
 #. module: base
 #: model:res.country,name:base.me
 msgid "Montenegro"
-msgstr ""
+msgstr "Montenegro"
 
 #. module: base
 #: view:ir.cron:0
 msgid "Technical Data"
-msgstr ""
+msgstr "Tekniske data"
 
 #. module: base
 #: view:res.partner:0
 #: field:res.partner,category_id:0
 msgid "Categories"
-msgstr ""
+msgstr "Kategorier"
 
 #. module: base
 #: view:base.language.import:0
@@ -2571,33 +2624,33 @@ msgstr ""
 #: selection:ir.module.module,state:0
 #: selection:ir.module.module.dependency,state:0
 msgid "To be upgraded"
-msgstr ""
+msgstr "Skal oppgraderes"
 
 #. module: base
 #: model:res.country,name:base.ly
 msgid "Libya"
-msgstr ""
+msgstr "Libya"
 
 #. module: base
 #: model:res.country,name:base.cf
 msgid "Central African Republic"
-msgstr ""
+msgstr "Den sentralafrikanske republikk"
 
 #. module: base
 #: model:res.country,name:base.li
 msgid "Liechtenstein"
-msgstr ""
+msgstr "Liechtenstein"
 
 #. module: base
 #: model:ir.model,name:base.model_partner_sms_send
 #: view:partner.sms.send:0
 msgid "Send SMS"
-msgstr ""
+msgstr "Send SMS"
 
 #. module: base
 #: field:res.partner,ean13:0
 msgid "EAN13"
-msgstr ""
+msgstr "EAN13"
 
 #. module: base
 #: code:addons/orm.py:1622
@@ -2608,7 +2661,7 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.pt
 msgid "Portugal"
-msgstr ""
+msgstr "Portugal"
 
 #. module: base
 #: sql_constraint:ir.model.data:0
@@ -2619,18 +2672,18 @@ msgstr ""
 #. module: base
 #: field:ir.module.module,certificate:0
 msgid "Quality Certificate"
-msgstr ""
+msgstr "Kvalitestsertifikat"
 
 #. module: base
 #: view:res.lang:0
 msgid "6.  %d, %m         ==> 05, 12"
-msgstr ""
+msgstr "6.  %d, %m         ==> 05, 12"
 
 #. module: base
 #: field:res.config.users,date:0
 #: field:res.users,date:0
 msgid "Last Connection"
-msgstr ""
+msgstr "Sist tilkoblet"
 
 #. module: base
 #: field:ir.actions.act_window,help:0
@@ -2640,7 +2693,7 @@ msgstr ""
 #. module: base
 #: help:res.partner,customer:0
 msgid "Check this box if the partner is a customer."
-msgstr ""
+msgstr "Kryss av denne boksen dersom partneren er en kunde."
 
 #. module: base
 #: model:ir.actions.act_window,name:base.res_lang_act_window
@@ -2648,18 +2701,18 @@ msgstr ""
 #: model:ir.ui.menu,name:base.menu_res_lang_act_window
 #: view:res.lang:0
 msgid "Languages"
-msgstr ""
+msgstr "Språk"
 
 #. module: base
 #: selection:workflow.activity,join_mode:0
 #: selection:workflow.activity,split_mode:0
 msgid "Xor"
-msgstr ""
+msgstr "Xor"
 
 #. module: base
 #: model:res.country,name:base.ec
 msgid "Ecuador"
-msgstr ""
+msgstr "Equador"
 
 #. module: base
 #: code:addons/base/module/wizard/base_export_language.py:52
@@ -2669,6 +2722,9 @@ msgid ""
 "spreadsheet software. The file encoding is UTF-8. You have to translate the "
 "latest column before reimporting it."
 msgstr ""
+"Lagre dette dokumentet til en .CSV fil og åpne den med programvare for "
+"behandling av regneark. Enkodingen på denne filen er UTF-8. Du må oversette "
+"den siste kolonnen før du re-importere den."
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_partner_customer_form
@@ -2676,12 +2732,12 @@ msgstr ""
 #: model:ir.ui.menu,name:base.menu_partner_form
 #: view:res.partner:0
 msgid "Customers"
-msgstr ""
+msgstr "Kunder"
 
 #. module: base
 #: model:res.country,name:base.au
 msgid "Australia"
-msgstr ""
+msgstr "Australia"
 
 #. module: base
 #: help:res.partner,lang:0
@@ -2689,16 +2745,19 @@ 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 ""
+"Dersom the valgte språket er lastet i systemet, vil alle dokumenter relatert "
+"til denne partneren bli skrevet ut med dette språket. Hvis ikke benyttes "
+"engelsk som standard."
 
 #. module: base
 #: report:ir.module.reference.graph:0
 msgid "Menu :"
-msgstr ""
+msgstr "Meny :"
 
 #. module: base
 #: selection:ir.model.fields,state:0
 msgid "Base Field"
-msgstr ""
+msgstr "Basisfelt"
 
 #. module: base
 #: view:publisher_warranty.contract:0
@@ -2708,24 +2767,24 @@ msgstr ""
 #. module: base
 #: field:ir.actions.todo,restart:0
 msgid "Restart"
-msgstr ""
+msgstr "Omstart"
 
 #. 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 innhold"
 
 #. module: base
 #: view:ir.actions.wizard:0
 #: field:wizard.ir.model.menu.create.line,wizard_id:0
 msgid "Wizard"
-msgstr ""
+msgstr "Veiviser"
 
 #. module: base
 #: view:ir.cron:0
 msgid "Action to Trigger"
-msgstr ""
+msgstr "Handling å trigge"
 
 #. module: base
 #: code:addons/base/res/res_user.py:136
@@ -2736,20 +2795,20 @@ msgstr ""
 #. module: base
 #: selection:ir.translation,type:0
 msgid "Constraint"
-msgstr ""
+msgstr "Beskrankning"
 
 #. module: base
 #: selection:ir.values,key:0
 #: selection:res.partner.address,type:0
 msgid "Default"
-msgstr ""
+msgstr "Standard"
 
 #. module: base
 #: view:ir.model.fields:0
 #: field:ir.model.fields,required:0
 #: field:res.partner.bank.type.field,required:0
 msgid "Required"
-msgstr ""
+msgstr "Obligatorisk"
 
 #. module: base
 #: view:res.users:0
@@ -2759,7 +2818,7 @@ msgstr ""
 #. module: base
 #: field:res.request.history,name:0
 msgid "Summary"
-msgstr ""
+msgstr "Sammendrag"
 
 #. module: base
 #: field:multi_company.default,expression:0
@@ -2772,11 +2831,13 @@ msgid ""
 "Specify the subject. You can use fields from the object, e.g. `Hello [[ "
 "object.partner_id.name ]]`"
 msgstr ""
+"Spesifiser emnet. Du kan bruke felter fra objektet. F.eks 'Hei [[ "
+"object.partner_id.name ]]`"
 
 #. module: base
 #: view:res.company:0
 msgid "Header/Footer"
-msgstr ""
+msgstr "Topptekst/Bunntekst"
 
 #. module: base
 #: help:ir.actions.act_window,help:0
@@ -2788,12 +2849,12 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.va
 msgid "Holy See (Vatican City State)"
-msgstr ""
+msgstr "Pavestolen (Vatikanstaten)"
 
 #. module: base
 #: field:base.module.import,module_file:0
 msgid "Module .ZIP file"
-msgstr ""
+msgstr "Modul .ZIP fil"
 
 #. module: base
 #: field:ir.ui.view,xml_id:0
@@ -2808,7 +2869,7 @@ msgstr ""
 #. module: base
 #: field:workflow.transition,trigger_model:0
 msgid "Trigger Object"
-msgstr ""
+msgstr "Utløserobjekt"
 
 #. module: base
 #: view:res.users:0
@@ -2819,12 +2880,12 @@ msgstr ""
 #: view:workflow.activity:0
 #: field:workflow.activity,in_transitions:0
 msgid "Incoming Transitions"
-msgstr ""
+msgstr "Innkommende overganger"
 
 #. module: base
 #: model:res.country,name:base.sr
 msgid "Suriname"
-msgstr ""
+msgstr "Surinam"
 
 #. module: base
 #: model:ir.ui.menu,name:base.marketing_menu
@@ -2835,17 +2896,17 @@ msgstr ""
 #: view:res.partner.bank:0
 #: model:res.partner.bank.type,name:base.bank_normal
 msgid "Bank account"
-msgstr ""
+msgstr "Bankkonto"
 
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (HN) / Español (HN)"
-msgstr ""
+msgstr "Spanish (HN) / Español (HN)"
 
 #. module: base
 #: view:ir.sequence.type:0
 msgid "Sequence Type"
-msgstr ""
+msgstr "Sekvenstype"
 
 #. module: base
 #: view:ir.ui.view.custom:0
@@ -2855,7 +2916,7 @@ msgstr ""
 #. module: base
 #: field:ir.module.module,license:0
 msgid "License"
-msgstr ""
+msgstr "License"
 
 #. module: base
 #: field:ir.attachment,url:0
@@ -2865,18 +2926,18 @@ msgstr ""
 #. module: base
 #: selection:ir.actions.todo,restart:0
 msgid "Always"
-msgstr ""
+msgstr "Alltid"
 
 #. module: base
 #: selection:ir.translation,type:0
 msgid "SQL Constraint"
-msgstr ""
+msgstr "SQL beskrankning"
 
 #. module: base
 #: field:ir.actions.server,srcmodel_id:0
 #: field:ir.model.fields,model_id:0
 msgid "Model"
-msgstr ""
+msgstr "Modell"
 
 #. module: base
 #: view:base.language.install:0
@@ -2884,6 +2945,8 @@ msgid ""
 "The selected language has been successfully installed. You must change the "
 "preferences of the user and open a new menu to view the changes."
 msgstr ""
+"The valgte språk har blitt installert. Du må endre preferansene til brukeren "
+"og åpne en ny meny for å se endringene."
 
 #. module: base
 #: sql_constraint:ir.config_parameter:0
@@ -2893,31 +2956,31 @@ msgstr ""
 #. module: base
 #: view:ir.actions.act_window:0
 msgid "Open a Window"
-msgstr ""
+msgstr "Åpne et vindu"
 
 #. module: base
 #: model:res.country,name:base.gq
 msgid "Equatorial Guinea"
-msgstr ""
+msgstr "Ekvatorial-Guinea"
 
 #. module: base
 #: view:base.module.import:0
 #: model:ir.actions.act_window,name:base.action_view_base_module_import
 msgid "Module Import"
-msgstr ""
+msgstr "Importer modul"
 
 #. module: base
 #: field:res.bank,zip:0
 #: field:res.partner.address,zip:0
 #: field:res.partner.bank,zip:0
 msgid "Zip"
-msgstr ""
+msgstr "Postnummer"
 
 #. module: base
 #: view:ir.module.module:0
 #: field:ir.module.module,author:0
 msgid "Author"
-msgstr ""
+msgstr "Forfatter"
 
 #. module: base
 #: model:res.country,name:base.mk
@@ -2927,7 +2990,7 @@ msgstr ""
 #. module: base
 #: view:res.lang:0
 msgid "%c - Appropriate date and time representation."
-msgstr ""
+msgstr "%c - Hensiktsmessig representasjon av tid og dato."
 
 #. module: base
 #: code:addons/base/res/res_config.py:422
@@ -2946,17 +3009,17 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.bo
 msgid "Bolivia"
-msgstr ""
+msgstr "Bolivia"
 
 #. module: base
 #: model:res.country,name:base.gh
 msgid "Ghana"
-msgstr ""
+msgstr "Ghana"
 
 #. module: base
 #: field:res.lang,direction:0
 msgid "Direction"
-msgstr ""
+msgstr "Retning"
 
 #. module: base
 #: view:ir.actions.act_window:0
@@ -2967,34 +3030,35 @@ msgstr ""
 #: model:ir.ui.menu,name:base.menu_action_ui_view
 #: view:ir.ui.view:0
 msgid "Views"
-msgstr ""
+msgstr "Visninger"
 
 #. module: base
 #: view:res.groups:0
 #: field:res.groups,rule_groups:0
 msgid "Rules"
-msgstr ""
+msgstr "Regler"
 
 #. module: base
 #: code:addons/base/module/module.py:216
 #, python-format
 msgid "You try to remove a module that is installed or will be installed"
 msgstr ""
+"Du prøver å fjerne en modul som er installert eller vil bli installert"
 
 #. module: base
 #: view:base.module.upgrade:0
 msgid "The selected modules have been updated / installed !"
-msgstr ""
+msgstr "Modulene har blitt oppgradert / installert !"
 
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (PR) / Español (PR)"
-msgstr ""
+msgstr "Spanish (PR) / Español (PR)"
 
 #. module: base
 #: model:res.country,name:base.gt
 msgid "Guatemala"
-msgstr ""
+msgstr "Guatemala"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_workflow_form
@@ -3002,27 +3066,27 @@ msgstr ""
 #: model:ir.ui.menu,name:base.menu_workflow
 #: model:ir.ui.menu,name:base.menu_workflow_root
 msgid "Workflows"
-msgstr ""
+msgstr "Arbeidsflyt"
 
 #. module: base
 #: field:ir.translation,xml_id:0
 msgid "XML Id"
-msgstr ""
+msgstr "XML Identifikator"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_config_user_form
 msgid "Create Users"
-msgstr ""
+msgstr "Opprett brukere"
 
 #. module: base
 #: model:ir.model,name:base.model_res_partner_title
 msgid "res.partner.title"
-msgstr ""
+msgstr "res.partner.title"
 
 #. module: base
 #: view:ir.values:0
 msgid "tree_but_action, client_print_multi"
-msgstr ""
+msgstr "tree_but_action, client_print_multi"
 
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_retailers0
@@ -3035,28 +3099,30 @@ msgid ""
 "0=Very Urgent\n"
 "10=Not urgent"
 msgstr ""
+"0=Haster veldig\n"
+"10=Haster ikke"
 
 #. module: base
 #: view:res.config:0
 #: view:res.config.installer:0
 msgid "Skip"
-msgstr ""
+msgstr "Hopp over"
 
 #. module: base
 #: model:res.country,name:base.ls
 msgid "Lesotho"
-msgstr ""
+msgstr "Lesotho"
 
 #. module: base
 #: code:addons/base/ir/ir_model.py:114
 #, python-format
 msgid "You can not remove the model '%s' !"
-msgstr ""
+msgstr "Du kan ikke fjerne modellen '%s'!"
 
 #. module: base
 #: model:res.country,name:base.ke
 msgid "Kenya"
-msgstr ""
+msgstr "Kenya"
 
 #. module: base
 #: view:res.partner.event:0
@@ -3066,7 +3132,7 @@ msgstr ""
 #. module: base
 #: model:ir.ui.menu,name:base.menu_custom_reports
 msgid "Custom Reports"
-msgstr ""
+msgstr "Tilpassede rapporter"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -3087,32 +3153,32 @@ msgstr ""
 #. module: base
 #: view:ir.property:0
 msgid "Generic"
-msgstr ""
+msgstr "Generell"
 
 #. module: base
 #: model:res.country,name:base.sm
 msgid "San Marino"
-msgstr ""
+msgstr "San Marino"
 
 #. module: base
 #: model:res.country,name:base.bm
 msgid "Bermuda"
-msgstr ""
+msgstr "Bermuda"
 
 #. module: base
 #: model:res.country,name:base.pe
 msgid "Peru"
-msgstr ""
+msgstr "Peru"
 
 #. module: base
 #: selection:ir.model.fields,on_delete:0
 msgid "Set NULL"
-msgstr ""
+msgstr "Set NULL"
 
 #. module: base
 #: model:res.country,name:base.bj
 msgid "Benin"
-msgstr ""
+msgstr "Benin"
 
 #. module: base
 #: code:addons/base/publisher_warranty/publisher_warranty.py:281
@@ -3128,22 +3194,22 @@ msgstr ""
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (PY) / Español (PY)"
-msgstr ""
+msgstr "Spanish (PY) / Español (PY)"
 
 #. module: base
 #: field:ir.config_parameter,key:0
 msgid "Key"
-msgstr ""
+msgstr "Nøkkel"
 
 #. module: base
 #: field:res.company,rml_header:0
 msgid "RML Header"
-msgstr ""
+msgstr "RML overskrift"
 
 #. module: base
 #: field:partner.sms.send,app_id:0
 msgid "API ID"
-msgstr ""
+msgstr "API ID"
 
 #. module: base
 #: code:addons/base/ir/ir_model.py:486
@@ -3156,13 +3222,13 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.mu
 msgid "Mauritius"
-msgstr ""
+msgstr "Mauritius"
 
 #. module: base
 #: view:ir.model.access:0
 #: view:ir.rule:0
 msgid "Full Access"
-msgstr ""
+msgstr "Full tilgang"
 
 #. module: base
 #: view:ir.actions.act_window:0
@@ -3171,7 +3237,7 @@ msgstr ""
 #: view:ir.model.fields:0
 #: model:ir.ui.menu,name:base.menu_security
 msgid "Security"
-msgstr ""
+msgstr "Sikkerhet"
 
 #. module: base
 #: model:res.widget,title:base.openerp_favorites_twitter_widget
@@ -3181,14 +3247,14 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.za
 msgid "South Africa"
-msgstr ""
+msgstr "Sør-Afrika"
 
 #. module: base
 #: view:ir.module.module:0
 #: selection:ir.module.module,state:0
 #: selection:ir.module.module.dependency,state:0
 msgid "Installed"
-msgstr ""
+msgstr "Installert"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -3199,42 +3265,42 @@ msgstr ""
 #: model:ir.actions.act_window,name:base.action_translation
 #: model:ir.ui.menu,name:base.menu_action_translation
 msgid "Translation Terms"
-msgstr ""
+msgstr "Betegnelser i oversettelsen"
 
 #. module: base
 #: model:res.country,name:base.sn
 msgid "Senegal"
-msgstr ""
+msgstr "Senegal"
 
 #. module: base
 #: model:res.country,name:base.hu
 msgid "Hungary"
-msgstr ""
+msgstr "Ungarn"
 
 #. module: base
 #: model:ir.model,name:base.model_res_groups
 msgid "res.groups"
-msgstr ""
+msgstr "res.groups"
 
 #. module: base
 #: model:res.country,name:base.br
 msgid "Brazil"
-msgstr ""
+msgstr "Brasil"
 
 #. module: base
 #: view:res.lang:0
 msgid "%M - Minute [00,59]."
-msgstr ""
+msgstr "%M - Minutt [00,59]."
 
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "Affero GPL-3"
-msgstr ""
+msgstr "Affero GPL-3"
 
 #. module: base
 #: field:ir.sequence,number_next:0
 msgid "Next Number"
-msgstr ""
+msgstr "Neste nummer"
 
 #. module: base
 #: help:workflow.transition,condition:0
@@ -3244,23 +3310,23 @@ msgstr ""
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (PA) / Español (PA)"
-msgstr ""
+msgstr "Spanish (PA) / Español (PA)"
 
 #. module: base
 #: view:res.currency:0
 #: field:res.currency,rate_ids:0
 msgid "Rates"
-msgstr ""
+msgstr "Rater"
 
 #. module: base
 #: model:res.country,name:base.sy
 msgid "Syria"
-msgstr ""
+msgstr "Syria"
 
 #. module: base
 #: view:res.lang:0
 msgid "======================================================"
-msgstr ""
+msgstr "======================================================"
 
 #. module: base
 #: help:ir.actions.server,mobile:0
@@ -3269,16 +3335,19 @@ msgid ""
 "invoice, then `object.invoice_address_id.mobile` is the field which gives "
 "the correct mobile number"
 msgstr ""
+"Tilgjengeliggjør felter som benyttes til å hente mobil nummeret, f.eks. når "
+"du velger fakturaen så vil feltet `object.invoice_address_id.mobile` gi det "
+"korrekte mobil nummeret"
 
 #. module: base
 #: view:base.module.upgrade:0
 msgid "System update completed"
-msgstr ""
+msgstr "Systemoppgradering fullført"
 
 #. module: base
 #: selection:res.request,state:0
 msgid "draft"
-msgstr ""
+msgstr "utkast"
 
 #. module: base
 #: selection:ir.property,type:0
@@ -3288,23 +3357,23 @@ msgstr ""
 #: field:res.partner.event,date:0
 #: field:res.request,date_sent:0
 msgid "Date"
-msgstr ""
+msgstr "Dato"
 
 #. module: base
 #: field:ir.actions.report.xml,report_sxw:0
 msgid "SXW path"
-msgstr ""
+msgstr "SXW sti"
 
 #. module: base
 #: view:ir.attachment:0
 msgid "Data"
-msgstr ""
+msgstr "Data"
 
 #. module: base
 #: field:ir.ui.menu,parent_id:0
 #: field:wizard.ir.model.menu.create,menu_id:0
 msgid "Parent Menu"
-msgstr ""
+msgstr "Overordnet meny"
 
 #. module: base
 #: field:ir.rule,perm_unlink:0
@@ -3320,12 +3389,12 @@ msgstr ""
 #. module: base
 #: view:ir.attachment:0
 msgid "Attached To"
-msgstr ""
+msgstr "Knyttet til"
 
 #. module: base
 #: field:res.lang,decimal_point:0
 msgid "Decimal Separator"
-msgstr ""
+msgstr "Desimal separator"
 
 #. module: base
 #: model:ir.actions.act_window,help:base.action_res_groups
@@ -3343,12 +3412,12 @@ msgstr ""
 #: view:res.request:0
 #: field:res.request,history:0
 msgid "History"
-msgstr ""
+msgstr "Historikk"
 
 #. module: base
 #: field:ir.attachment,create_uid:0
 msgid "Creator"
-msgstr ""
+msgstr "Forfatter"
 
 #. module: base
 #: model:res.company,overdue_msg:base.main_company
@@ -3364,7 +3433,7 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.mx
 msgid "Mexico"
-msgstr ""
+msgstr "Mexico"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_base_config_plugins
@@ -3374,17 +3443,17 @@ msgstr ""
 #. module: base
 #: field:res.company,child_ids:0
 msgid "Child Companies"
-msgstr ""
+msgstr "Datterselskap"
 
 #. module: base
 #: model:ir.model,name:base.model_res_users
 msgid "res.users"
-msgstr ""
+msgstr "res.users"
 
 #. module: base
 #: model:res.country,name:base.ni
 msgid "Nicaragua"
-msgstr ""
+msgstr "Nicaragua"
 
 #. module: base
 #: code:addons/orm.py:1046
@@ -3395,18 +3464,18 @@ msgstr ""
 #. module: base
 #: view:res.partner.event:0
 msgid "General Description"
-msgstr ""
+msgstr "Generell beskrivelse"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_config_simple_view_form
 #: view:res.config.view:0
 msgid "Configure Your Interface"
-msgstr ""
+msgstr "Konfigurer grensesnittet ditt"
 
 #. module: base
 #: field:ir.values,meta:0
 msgid "Meta Datas"
-msgstr ""
+msgstr "Metadata"
 
 #. module: base
 #: sql_constraint:ir.ui.view_sc:0
@@ -3416,17 +3485,17 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.ve
 msgid "Venezuela"
-msgstr ""
+msgstr "Venezuela"
 
 #. module: base
 #: view:res.lang:0
 msgid "9.  %j              ==> 340"
-msgstr ""
+msgstr "9.  %j              ==> 340"
 
 #. module: base
 #: model:res.country,name:base.zm
 msgid "Zambia"
-msgstr ""
+msgstr "Zambia"
 
 #. module: base
 #: help:res.partner,user_id:0
@@ -3434,6 +3503,7 @@ msgid ""
 "The internal user that is in charge of communicating with this partner if "
 "any."
 msgstr ""
+"Den interne brukeren som er ansvarlig for å kommunisere med partneren."
 
 #. module: base
 #: field:res.partner,parent_id:0
@@ -3443,22 +3513,22 @@ msgstr ""
 #. module: base
 #: view:ir.module.module:0
 msgid "Cancel Upgrade"
-msgstr ""
+msgstr "Avbryt oppgradering"
 
 #. module: base
 #: model:res.country,name:base.ci
 msgid "Ivory Coast (Cote D'Ivoire)"
-msgstr ""
+msgstr "Elfenbenskysten"
 
 #. module: base
 #: model:res.country,name:base.kz
 msgid "Kazakhstan"
-msgstr ""
+msgstr "Kazakhstan"
 
 #. module: base
 #: view:res.lang:0
 msgid "%w - Weekday number [0(Sunday),6]."
-msgstr ""
+msgstr "%w - Ukedag [0(Søndag),6]."
 
 #. module: base
 #: model:ir.actions.act_window,help:base.action_partner_form
@@ -3498,7 +3568,7 @@ msgstr ""
 #: field:workflow,name:0
 #: field:workflow.activity,name:0
 msgid "Name"
-msgstr ""
+msgstr "Navn"
 
 #. module: base
 #: help:ir.actions.act_window,multi:0
@@ -3506,11 +3576,13 @@ msgid ""
 "If set to true, the action will not be displayed on the right toolbar of a "
 "form view"
 msgstr ""
+"Hvis satt til sann, så vil ikke handlingen vises på den høyre verktøylinjen "
+"i skjemavisning."
 
 #. module: base
 #: model:res.country,name:base.ms
 msgid "Montserrat"
-msgstr ""
+msgstr "Montserrat"
 
 #. module: base
 #: code:addons/base/ir/ir_model.py:205
@@ -3523,7 +3595,7 @@ msgstr ""
 #. module: base
 #: model:ir.ui.menu,name:base.menu_translation_app
 msgid "Application Terms"
-msgstr ""
+msgstr "Begrep i applikasjonen"
 
 #. module: base
 #: help:res.config.users,context_tz:0
@@ -3536,7 +3608,7 @@ msgstr ""
 #. module: base
 #: field:ir.module.module,demo:0
 msgid "Demo data"
-msgstr ""
+msgstr "Demodata"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -3570,12 +3642,12 @@ msgstr ""
 #. module: base
 #: model:ir.model,name:base.model_ir_actions_act_window_view
 msgid "ir.actions.act_window.view"
-msgstr ""
+msgstr "ir.actions.act_window_close"
 
 #. module: base
 #: report:ir.module.reference.graph:0
 msgid "Web"
-msgstr ""
+msgstr "Web"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -3590,23 +3662,23 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.et
 msgid "Ethiopia"
-msgstr ""
+msgstr "Etiopia"
 
 #. module: base
 #: help:res.country.state,code:0
 msgid "The state code in three chars.\n"
-msgstr ""
+msgstr "Koden til staten med tre karakterer.\n"
 
 #. module: base
 #: model:res.country,name:base.sj
 msgid "Svalbard and Jan Mayen Islands"
-msgstr ""
+msgstr "Svalbard og Jan Mayen øyene"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_actions_wizard
 #: selection:ir.ui.menu,action:0
 msgid "ir.actions.wizard"
-msgstr ""
+msgstr "ir.actions.wizard"
 
 #. module: base
 #: view:ir.actions.act_window:0
@@ -3615,99 +3687,99 @@ msgstr ""
 #: view:ir.filters:0
 #: view:res.request:0
 msgid "Group By"
-msgstr ""
+msgstr "Grupper etter"
 
 #. module: base
 #: view:res.config:0
 #: view:res.config.installer:0
 msgid "title"
-msgstr ""
+msgstr "tittel"
 
 #. module: base
 #: model:ir.model,name:base.model_base_language_install
 msgid "Install Language"
-msgstr ""
+msgstr "Installer språk"
 
 #. module: base
 #: view:ir.translation:0
 msgid "Translation"
-msgstr ""
+msgstr "Oversettelse"
 
 #. module: base
 #: selection:res.request,state:0
 msgid "closed"
-msgstr ""
+msgstr "lukket"
 
 #. module: base
 #: selection:base.language.export,state:0
 msgid "get"
-msgstr ""
+msgstr "hent"
 
 #. module: base
 #: help:ir.model.fields,on_delete:0
 msgid "On delete property for many2one fields"
-msgstr ""
+msgstr "On delete property for many2one fields"
 
 #. module: base
 #: field:ir.actions.server,write_id:0
 msgid "Write Id"
-msgstr ""
+msgstr "Write Id"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_product
 msgid "Products"
-msgstr ""
+msgstr "Produkter"
 
 #. module: base
 #: field:ir.actions.act_window,domain:0
 #: field:ir.filters,domain:0
 msgid "Domain Value"
-msgstr ""
+msgstr "Domeneverdi"
 
 #. module: base
 #: view:ir.actions.server:0
 msgid "SMS Configuration"
-msgstr ""
+msgstr "SMS konfigurasjon"
 
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (BO) / Español (BO)"
-msgstr ""
+msgstr "Spanish (BO) / Español (BO)"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.ir_access_act
 #: model:ir.ui.menu,name:base.menu_ir_access_act
 msgid "Access Controls List"
-msgstr ""
+msgstr "Liste over tilganger"
 
 #. module: base
 #: model:res.country,name:base.um
 msgid "USA Minor Outlying Islands"
-msgstr ""
+msgstr "USA Minor Outlying Islands"
 
 #. module: base
 #: field:res.partner.bank,state:0
 #: field:res.partner.bank.type.field,bank_type_id:0
 msgid "Bank Type"
-msgstr ""
+msgstr "Banktype"
 
 #. module: base
 #: code:addons/base/res/res_user.py:58
 #: code:addons/base/res/res_user.py:67
 #, python-format
 msgid "The name of the group can not start with \"-\""
-msgstr ""
+msgstr "Navnet på gruppen kan ikke starte med \"-\""
 
 #. module: base
 #: view:ir.ui.view_sc:0
 #: field:res.partner.title,shortcut:0
 msgid "Shortcut"
-msgstr ""
+msgstr "Snarvei"
 
 #. module: base
 #: field:ir.model.data,date_init:0
 msgid "Init Date"
-msgstr ""
+msgstr "Initiell dato"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -3730,7 +3802,7 @@ msgstr ""
 #: view:workflow.activity:0
 #: field:workflow.activity,flow_start:0
 msgid "Flow Start"
-msgstr ""
+msgstr "Flytstart"
 
 #. module: base
 #: code:addons/__init__.py:834
@@ -3741,28 +3813,28 @@ msgstr ""
 #. module: base
 #: view:res.partner.bank:0
 msgid "Bank Account Owner"
-msgstr ""
+msgstr "Bankkontoeier"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.act_values_form
 msgid "Client Actions Connections"
-msgstr ""
+msgstr "ir.actions.wizard"
 
 #. module: base
 #: field:ir.attachment,res_name:0
 #: field:ir.ui.view_sc,resource:0
 msgid "Resource Name"
-msgstr ""
+msgstr "Ressursnavn"
 
 #. module: base
 #: selection:ir.cron,interval_type:0
 msgid "Hours"
-msgstr ""
+msgstr "Timer"
 
 #. module: base
 #: model:res.country,name:base.gp
 msgid "Guadeloupe (French)"
-msgstr ""
+msgstr "Guadeloupe (Fransk)"
 
 #. module: base
 #: code:addons/base/res/res_lang.py:157
@@ -3770,7 +3842,7 @@ msgstr ""
 #: code:addons/base/res/res_lang.py:161
 #, python-format
 msgid "User Error"
-msgstr ""
+msgstr "Brukerfeil"
 
 #. module: base
 #: help:workflow.transition,signal:0
@@ -3788,12 +3860,12 @@ msgstr ""
 #. module: base
 #: report:ir.module.reference.graph:0
 msgid "Directory"
-msgstr ""
+msgstr "Katalogområde"
 
 #. module: base
 #: field:wizard.ir.model.menu.create,name:0
 msgid "Menu Name"
-msgstr ""
+msgstr "Menynavn"
 
 #. module: base
 #: view:ir.module.module:0
@@ -3803,34 +3875,34 @@ msgstr ""
 #. module: base
 #: view:ir.attachment:0
 msgid "Month"
-msgstr ""
+msgstr "Måned"
 
 #. module: base
 #: model:res.country,name:base.my
 msgid "Malaysia"
-msgstr ""
+msgstr "Malaysia"
 
 #. module: base
 #: view:base.language.install:0
 #: model:ir.actions.act_window,name:base.action_view_base_language_install
 msgid "Load Official Translation"
-msgstr ""
+msgstr "Last inn en offisiell oversettelse"
 
 #. module: base
 #: model:ir.model,name:base.model_res_request_history
 msgid "res.request.history"
-msgstr ""
+msgstr "res.request.history"
 
 #. module: base
 #: view:ir.actions.server:0
 msgid "Client Action Configuration"
-msgstr ""
+msgstr "Innstillinger for Klienthandling"
 
 #. module: base
 #: model:ir.model,name:base.model_res_partner_address
 #: view:res.partner.address:0
 msgid "Partner Addresses"
-msgstr ""
+msgstr "Partneradresser"
 
 #. module: base
 #: help:ir.model.fields,translate:0
@@ -3842,12 +3914,12 @@ msgstr ""
 #. module: base
 #: view:res.lang:0
 msgid "%S - Seconds [00,61]."
-msgstr ""
+msgstr "%S - Sekunder [00,61]."
 
 #. module: base
 #: model:res.country,name:base.cv
 msgid "Cape Verde"
-msgstr ""
+msgstr "Cape Verde"
 
 #. module: base
 #: view:base.module.import:0
@@ -3860,13 +3932,13 @@ msgstr ""
 #: field:res.partner.event,name:0
 #: model:res.widget,title:base.events_widget
 msgid "Events"
-msgstr ""
+msgstr "Hendelser"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_actions_url
 #: selection:ir.ui.menu,action:0
 msgid "ir.actions.url"
-msgstr ""
+msgstr "ir.actions.url"
 
 #. module: base
 #: model:res.widget,title:base.currency_converter_widget
@@ -3883,12 +3955,12 @@ msgstr ""
 #: model:ir.actions.act_window,name:base.action_partner_addess_tree
 #: view:res.partner:0
 msgid "Partner Contacts"
-msgstr ""
+msgstr "Partnerkontakter"
 
 #. module: base
 #: field:base.module.update,add:0
 msgid "Number of modules added"
-msgstr ""
+msgstr "Antall moduler lagt til"
 
 #. module: base
 #: view:res.currency:0
@@ -3898,7 +3970,7 @@ msgstr ""
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Latvian / latviešu valoda"
-msgstr ""
+msgstr "Latvisk / Latviešu valoda"
 
 #. module: base
 #: view:res.config:0
@@ -3909,7 +3981,7 @@ msgstr ""
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "French / Français"
-msgstr ""
+msgstr "Fransk / Français"
 
 #. module: base
 #: code:addons/orm.py:1049
@@ -3920,7 +3992,7 @@ msgstr ""
 #. module: base
 #: field:workflow.triggers,workitem_id:0
 msgid "Workitem"
-msgstr ""
+msgstr "Arbeidselement"
 
 #. module: base
 #: view:ir.actions.todo:0
@@ -3936,17 +4008,17 @@ msgstr ""
 #: selection:ir.values,key:0
 #: view:res.users:0
 msgid "Action"
-msgstr ""
+msgstr "Handling"
 
 #. module: base
 #: view:ir.actions.server:0
 msgid "Email Configuration"
-msgstr ""
+msgstr "E-post konfigurasjon"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_cron
 msgid "ir.cron"
-msgstr ""
+msgstr "ir.actions.actions"
 
 #. module: base
 #: view:ir.rule:0
@@ -3961,7 +4033,7 @@ msgstr ""
 #. module: base
 #: field:ir.actions.server,trigger_obj_id:0
 msgid "Trigger On"
-msgstr ""
+msgstr "Utløs ved"
 
 #. module: base
 #: sql_constraint:ir.rule:0
@@ -3971,34 +4043,34 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.fj
 msgid "Fiji"
-msgstr ""
+msgstr "Fiji"
 
 #. module: base
 #: field:ir.model.fields,size:0
 msgid "Size"
-msgstr ""
+msgstr "Størrelse"
 
 #. module: base
 #: model:res.country,name:base.sd
 msgid "Sudan"
-msgstr ""
+msgstr "Sudan"
 
 #. module: base
 #: model:res.country,name:base.fm
 msgid "Micronesia"
-msgstr ""
+msgstr "Mikronesia"
 
 #. module: base
 #: view:res.request.history:0
 msgid "Request History"
-msgstr ""
+msgstr "Forespørselshistorikk"
 
 #. module: base
 #: field:ir.actions.act_window,menus:0
 #: field:ir.module.module,menus_by_module:0
 #: view:res.groups:0
 msgid "Menus"
-msgstr ""
+msgstr "Menyer"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -4008,34 +4080,34 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.il
 msgid "Israel"
-msgstr ""
+msgstr "Israel"
 
 #. module: base
 #: model:ir.actions.wizard,name:base.wizard_server_action_create
 msgid "Create Action"
-msgstr ""
+msgstr "Opprett handling"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_model_model
 #: model:ir.model,name:base.model_ir_model
 #: model:ir.ui.menu,name:base.ir_model_model_menu
 msgid "Objects"
-msgstr ""
+msgstr "Objekter"
 
 #. module: base
 #: field:res.lang,time_format:0
 msgid "Time Format"
-msgstr ""
+msgstr "Tidsformat"
 
 #. module: base
 #: view:ir.module.module:0
 msgid "Defined Reports"
-msgstr ""
+msgstr "Definerte rapporter"
 
 #. module: base
 #: view:ir.actions.report.xml:0
 msgid "Report xml"
-msgstr ""
+msgstr "Rapport xml"
 
 #. module: base
 #: field:base.language.export,modules:0
@@ -4045,7 +4117,7 @@ msgstr ""
 #: model:ir.ui.menu,name:base.menu_management
 #: model:ir.ui.menu,name:base.menu_module_tree
 msgid "Modules"
-msgstr ""
+msgstr "Moduler"
 
 #. module: base
 #: view:workflow.activity:0
@@ -4053,17 +4125,17 @@ msgstr ""
 #: field:workflow.activity,subflow_id:0
 #: field:workflow.workitem,subflow_id:0
 msgid "Subflow"
-msgstr ""
+msgstr "Underordnet flyt"
 
 #. module: base
 #: model:ir.model,name:base.model_res_config
 msgid "res.config"
-msgstr ""
+msgstr "res.config"
 
 #. module: base
 #: field:workflow.transition,signal:0
 msgid "Signal (button Name)"
-msgstr ""
+msgstr "Signal (navn på knapp)"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_res_bank_form
@@ -4071,38 +4143,38 @@ msgstr ""
 #: view:res.bank:0
 #: field:res.partner,bank_ids:0
 msgid "Banks"
-msgstr ""
+msgstr "Banker"
 
 #. module: base
 #: view:res.log:0
 msgid "Unread"
-msgstr ""
+msgstr "Ulest"
 
 #. module: base
 #: field:ir.cron,doall:0
 msgid "Repeat Missed"
-msgstr ""
+msgstr "Repeter uteblitte"
 
 #. module: base
 #: help:ir.actions.server,state:0
 msgid "Type of the Action that is to be executed"
-msgstr ""
+msgstr "Type handling som skal utføres"
 
 #. module: base
 #: field:ir.server.object.lines,server_id:0
 msgid "Object Mapping"
-msgstr ""
+msgstr "Objektkobling"
 
 #. module: base
 #: help:res.currency,rate:0
 #: help:res.currency.rate,rate:0
 msgid "The rate of the currency to the currency of rate 1"
-msgstr ""
+msgstr "The rate of the currency to the currency of rate 1"
 
 #. module: base
 #: model:res.country,name:base.uk
 msgid "United Kingdom"
-msgstr ""
+msgstr "United Kingdom"
 
 #. module: base
 #: view:res.config:0
@@ -4115,55 +4187,57 @@ msgstr ""
 #: help:res.partner.category,active:0
 msgid "The active field allows you to hide the category without removing it."
 msgstr ""
+"Det aktive feltet gir deg mulighet til å skjule denne kategorien uten å "
+"fjerne det."
 
 #. module: base
 #: report:ir.module.reference.graph:0
 msgid "Object:"
-msgstr ""
+msgstr "Objekt:"
 
 #. module: base
 #: model:res.country,name:base.bw
 msgid "Botswana"
-msgstr ""
+msgstr "Botswana"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_partner_title_partner
 #: model:ir.ui.menu,name:base.menu_partner_title_partner
 #: view:res.partner.title:0
 msgid "Partner Titles"
-msgstr ""
+msgstr "Partner titler"
 
 #. module: base
 #: help:ir.actions.act_window,auto_refresh:0
 msgid "Add an auto-refresh on the view"
-msgstr ""
+msgstr "Legg til automatisk oppdatereing av denne visningen"
 
 #. module: base
 #: help:res.partner,employee:0
 msgid "Check this box if the partner is an Employee."
-msgstr ""
+msgstr "Kryss av denne boksen dersom partneren er en ansatt."
 
 #. module: base
 #: field:ir.actions.report.xml,report_rml_content:0
 #: field:ir.actions.report.xml,report_rml_content_data:0
 msgid "RML content"
-msgstr ""
+msgstr "RML innhold"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_workflow_workitem_form
 #: model:ir.ui.menu,name:base.menu_workflow_workitem
 msgid "Workitems"
-msgstr ""
+msgstr "Arbeidselementer"
 
 #. module: base
 #: field:base.language.export,advice:0
 msgid "Advice"
-msgstr ""
+msgstr "Anbefaling"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_attachment
 msgid "ir.attachment"
-msgstr ""
+msgstr "ir.attachment"
 
 #. module: base
 #: code:addons/orm.py:3533
@@ -4176,7 +4250,7 @@ msgstr ""
 #. module: base
 #: view:base.language.import:0
 msgid "- module,type,name,res_id,src,value"
-msgstr ""
+msgstr "- module,type,name,res_id,src,value"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -4189,6 +4263,8 @@ msgid ""
 "Provide the field name where the record id is stored after the create "
 "operations. If it is empty, you can not track the new record."
 msgstr ""
+"Angi feltnavnet hvor nøkkel på nøkkelen på raden blir lagret etter "
+"oppretting. Hvis den er tom kan du ikke spore den nye raden."
 
 #. module: base
 #: help:ir.model.fields,relation:0
@@ -4198,12 +4274,12 @@ msgstr ""
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Indonesian / Bahasa Indonesia"
-msgstr ""
+msgstr "Indonesisk / Bahasa Indonesia"
 
 #. module: base
 #: field:ir.ui.view,inherit_id:0
 msgid "Inherited View"
-msgstr ""
+msgstr "Inherited View"
 
 #. module: base
 #: view:ir.translation:0
@@ -4213,7 +4289,7 @@ msgstr ""
 #. module: base
 #: model:ir.ui.menu,name:base.menu_main_pm
 msgid "Project"
-msgstr ""
+msgstr "Prosjekt"
 
 #. module: base
 #: field:ir.ui.menu,web_icon_hover_data:0
@@ -4223,17 +4299,17 @@ msgstr ""
 #. module: base
 #: view:base.module.import:0
 msgid "Module file successfully imported!"
-msgstr ""
+msgstr "Modul ble importert uten feil !"
 
 #. module: base
 #: selection:ir.actions.todo,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Avbrutt"
 
 #. module: base
 #: view:res.config.users:0
 msgid "Create User"
-msgstr ""
+msgstr "Opprett bruker"
 
 #. module: base
 #: view:partner.clear.ids:0
@@ -4249,42 +4325,42 @@ msgstr ""
 #. module: base
 #: selection:res.request,priority:0
 msgid "Low"
-msgstr ""
+msgstr "Lav"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_audit
 msgid "Audit"
-msgstr ""
+msgstr "Audit"
 
 #. module: base
 #: model:res.country,name:base.lc
 msgid "Saint Lucia"
-msgstr ""
+msgstr "Saint Lucia"
 
 #. module: base
 #: view:publisher_warranty.contract:0
 msgid "Maintenance Contract"
-msgstr ""
+msgstr "Vedlikeholdskontrakt"
 
 #. module: base
 #: help:ir.actions.server,trigger_obj_id:0
 msgid "Select the object from the model on which the workflow will executed."
-msgstr ""
+msgstr "Velg objektet fra modellen som arbeidsflyten vil bli utført på."
 
 #. module: base
 #: field:res.partner,employee:0
 msgid "Employee"
-msgstr ""
+msgstr "Ansatt"
 
 #. module: base
 #: field:ir.model.access,perm_create:0
 msgid "Create Access"
-msgstr ""
+msgstr "Tilgang til å opprette"
 
 #. module: base
 #: field:res.partner.address,state_id:0
 msgid "Fed. State"
-msgstr ""
+msgstr "Stat (USA)"
 
 #. module: base
 #: field:ir.actions.server,copy_object:0
@@ -4304,19 +4380,19 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.io
 msgid "British Indian Ocean Territory"
-msgstr ""
+msgstr "British Indian Ocean Territory"
 
 #. module: base
 #: field:res.config.users,view:0
 #: field:res.config.view,view:0
 #: field:res.users,view:0
 msgid "Interface"
-msgstr ""
+msgstr "Grensesnitt"
 
 #. module: base
 #: view:ir.actions.server:0
 msgid "Field Mapping"
-msgstr ""
+msgstr "Feltmapping"
 
 #. module: base
 #: view:publisher_warranty.contract:0
@@ -4327,40 +4403,40 @@ msgstr ""
 #: view:ir.model:0
 #: field:ir.model.fields,ttype:0
 msgid "Field Type"
-msgstr ""
+msgstr "Felttype"
 
 #. module: base
 #: field:res.country.state,code:0
 msgid "State Code"
-msgstr ""
+msgstr "Statskode"
 
 #. module: base
 #: field:ir.model.fields,on_delete:0
 msgid "On delete"
-msgstr ""
+msgstr "Ved sletting"
 
 #. module: base
 #: selection:res.lang,direction:0
 msgid "Left-to-Right"
-msgstr ""
+msgstr "Venstre-til-høyre"
 
 #. module: base
 #: view:res.lang:0
 #: field:res.lang,translatable:0
 msgid "Translatable"
-msgstr ""
+msgstr "Oversettbar"
 
 #. module: base
 #: model:res.country,name:base.vn
 msgid "Vietnam"
-msgstr ""
+msgstr "Vietnam"
 
 #. module: base
 #: field:res.config.users,signature:0
 #: view:res.users:0
 #: field:res.users,signature:0
 msgid "Signature"
-msgstr ""
+msgstr "Signatur"
 
 #. module: base
 #: code:addons/fields.py:456
@@ -4372,22 +4448,22 @@ msgstr ""
 #: code:addons/fields.py:664
 #, python-format
 msgid "Not Implemented"
-msgstr ""
+msgstr "Ikke implementert"
 
 #. module: base
 #: model:ir.model,name:base.model_res_widget_user
 msgid "res.widget.user"
-msgstr ""
+msgstr "res.widget.user"
 
 #. module: base
 #: field:res.partner.category,complete_name:0
 msgid "Full Name"
-msgstr ""
+msgstr "Fullt navn"
 
 #. module: base
 #: view:base.module.configuration:0
 msgid "_Ok"
-msgstr ""
+msgstr "_Ok"
 
 #. module: base
 #: help:ir.filters,user_id:0
@@ -4403,7 +4479,7 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.mz
 msgid "Mozambique"
-msgstr ""
+msgstr "Mosambik"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_project_long_term
@@ -4416,24 +4492,24 @@ msgstr ""
 #: field:partner.wizard.spam,text:0
 #: field:res.log,name:0
 msgid "Message"
-msgstr ""
+msgstr "Melding"
 
 #. module: base
 #: field:ir.actions.act_window.view,multi:0
 msgid "On Multiple Doc."
-msgstr ""
+msgstr "On Multiple Doc."
 
 #. module: base
 #: view:res.partner:0
 #: field:res.partner,user_id:0
 msgid "Salesman"
-msgstr ""
+msgstr "Selger"
 
 #. module: base
 #: field:res.partner,address:0
 #: view:res.partner.address:0
 msgid "Contacts"
-msgstr ""
+msgstr "Kontakter"
 
 #. module: base
 #: code:addons/orm.py:3199
@@ -4445,29 +4521,29 @@ msgstr ""
 #. module: base
 #: view:res.widget.wizard:0
 msgid "Add"
-msgstr ""
+msgstr "Legg til"
 
 #. module: base
 #: view:base.module.upgrade:0
 #: model:ir.actions.act_window,name:base.action_view_base_module_upgrade_window
 #: model:ir.ui.menu,name:base.menu_view_base_module_upgrade
 msgid "Apply Scheduled Upgrades"
-msgstr ""
+msgstr "Utfør planlagte oppgraderinger"
 
 #. module: base
 #: view:res.widget:0
 msgid "Widgets"
-msgstr ""
+msgstr "Widgets"
 
 #. module: base
 #: model:res.country,name:base.cz
 msgid "Czech Republic"
-msgstr ""
+msgstr "Tsjekkia"
 
 #. module: base
 #: view:res.widget.wizard:0
 msgid "Widget Wizard"
-msgstr ""
+msgstr "Widget Wizard"
 
 #. module: base
 #: model:ir.actions.act_window,help:base.act_ir_actions_todo_form
@@ -4494,7 +4570,7 @@ msgstr ""
 #. module: base
 #: selection:ir.property,type:0
 msgid "Integer"
-msgstr ""
+msgstr "Integer"
 
 #. module: base
 #: help:ir.actions.report.xml,report_rml:0
@@ -4512,42 +4588,42 @@ msgstr ""
 #. module: base
 #: model:ir.model,name:base.model_wizard_ir_model_menu_create
 msgid "wizard.ir.model.menu.create"
-msgstr ""
+msgstr "wizard.ir.model.menu.create"
 
 #. module: base
 #: view:workflow.transition:0
 msgid "Transition"
-msgstr ""
+msgstr "Overgang"
 
 #. module: base
 #: field:res.groups,menu_access:0
 msgid "Access Menu"
-msgstr ""
+msgstr "Tilgangsmeny"
 
 #. module: base
 #: model:res.country,name:base.na
 msgid "Namibia"
-msgstr ""
+msgstr "Namibia"
 
 #. module: base
 #: model:res.country,name:base.mn
 msgid "Mongolia"
-msgstr ""
+msgstr "Mongolia"
 
 #. module: base
 #: view:ir.module.module:0
 msgid "Created Menus"
-msgstr ""
+msgstr "Opprettet menyer"
 
 #. module: base
 #: selection:ir.ui.view,type:0
 msgid "mdx"
-msgstr ""
+msgstr "mdx"
 
 #. module: base
 #: model:res.country,name:base.bi
 msgid "Burundi"
-msgstr ""
+msgstr "Burundi"
 
 #. module: base
 #: view:base.language.install:0
@@ -4558,12 +4634,12 @@ msgstr ""
 #: wizard_button:server.action.create,init,end:0
 #: wizard_button:server.action.create,step_1,end:0
 msgid "Close"
-msgstr ""
+msgstr "Lukk"
 
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (MX) / Español (MX)"
-msgstr ""
+msgstr "Spanish (MX) / Español (MX)"
 
 #. module: base
 #: view:res.log:0
@@ -4573,7 +4649,7 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.bt
 msgid "Bhutan"
-msgstr ""
+msgstr "Bhutan"
 
 #. module: base
 #: help:ir.sequence,number_next:0
@@ -4588,7 +4664,7 @@ msgstr ""
 #. module: base
 #: selection:ir.actions.url,target:0
 msgid "This Window"
-msgstr ""
+msgstr "Dette vinduet"
 
 #. module: base
 #: view:publisher_warranty.contract:0
@@ -4603,28 +4679,28 @@ msgstr ""
 #. module: base
 #: field:base.language.export,format:0
 msgid "File Format"
-msgstr ""
+msgstr "Filformat"
 
 #. module: base
 #: field:res.lang,iso_code:0
 msgid "ISO code"
-msgstr ""
+msgstr "ISO code"
 
 #. module: base
 #: model:ir.model,name:base.model_res_config_view
 msgid "res.config.view"
-msgstr ""
+msgstr "res.config.view"
 
 #. module: base
 #: view:res.log:0
 #: field:res.log,read:0
 msgid "Read"
-msgstr ""
+msgstr "Les"
 
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The name of the country must be unique !"
-msgstr ""
+msgstr "Navnet på landet må være unikt !"
 
 #. module: base
 #: model:ir.actions.act_window,help:base.action_country_state
@@ -4637,19 +4713,19 @@ msgstr ""
 #. module: base
 #: view:workflow.workitem:0
 msgid "Workflow Workitems"
-msgstr ""
+msgstr "Arbeidsflyt arbeidselementer"
 
 #. module: base
 #: model:res.country,name:base.vc
 msgid "Saint Vincent & Grenadines"
-msgstr ""
+msgstr "Saint Vincent og Grenadinene"
 
 #. module: base
 #: field:partner.sms.send,password:0
 #: field:res.config.users,password:0
 #: field:res.users,password:0
 msgid "Password"
-msgstr ""
+msgstr "Passord"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_model_fields
@@ -4659,12 +4735,12 @@ msgstr ""
 #: view:ir.model.fields:0
 #: model:ir.ui.menu,name:base.ir_model_model_fields
 msgid "Fields"
-msgstr ""
+msgstr "Felter"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_partner_employee_form
 msgid "Employees"
-msgstr ""
+msgstr "Ansatte"
 
 #. module: base
 #: help:res.log,read:0
@@ -4676,7 +4752,7 @@ msgstr ""
 #: field:res.company,rml_header2:0
 #: field:res.company,rml_header3:0
 msgid "RML Internal Header"
-msgstr ""
+msgstr "RML Internal Header"
 
 #. module: base
 #: field:ir.actions.act_window,search_view_id:0
@@ -4686,7 +4762,7 @@ msgstr ""
 #. module: base
 #: field:ir.module.module,installed_version:0
 msgid "Latest version"
-msgstr ""
+msgstr "Siste versjon"
 
 #. module: base
 #: model:ir.actions.act_window,help:base.res_partner_canal-act
@@ -4699,18 +4775,18 @@ msgstr ""
 #. module: base
 #: model:res.partner.bank.type.field,name:base.bank_normal_field
 msgid "acc_number"
-msgstr ""
+msgstr "acc_number"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_partner_address_form
 #: model:ir.ui.menu,name:base.menu_partner_address_form
 msgid "Addresses"
-msgstr ""
+msgstr "Adresser"
 
 #. module: base
 #: model:res.country,name:base.mm
 msgid "Myanmar"
-msgstr ""
+msgstr "Myanmar"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -4722,63 +4798,63 @@ msgstr ""
 #: field:res.partner.address,street:0
 #: field:res.partner.bank,street:0
 msgid "Street"
-msgstr ""
+msgstr "Gate"
 
 #. module: base
 #: model:res.country,name:base.yu
 msgid "Yugoslavia"
-msgstr ""
+msgstr "Jugoslavia"
 
 #. module: base
 #: field:ir.model.data,name:0
 msgid "XML Identifier"
-msgstr ""
+msgstr "XML Identifikator"
 
 #. module: base
 #: model:res.country,name:base.ca
 msgid "Canada"
-msgstr ""
+msgstr "Canada"
 
 #. module: base
 #: selection:ir.module.module.dependency,state:0
 msgid "Unknown"
-msgstr ""
+msgstr "Unknown"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_res_users_my
 msgid "Change My Preferences"
-msgstr ""
+msgstr "Endre mine preferanser"
 
 #. module: base
 #: code:addons/base/ir/ir_actions.py:164
 #, python-format
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Ugyldig navn på modell i handlingsdefinisjonen."
 
 #. module: base
 #: field:partner.sms.send,text:0
 msgid "SMS Message"
-msgstr ""
+msgstr "SMS melding"
 
 #. module: base
 #: model:res.country,name:base.cm
 msgid "Cameroon"
-msgstr ""
+msgstr "Kamerun"
 
 #. module: base
 #: model:res.country,name:base.bf
 msgid "Burkina Faso"
-msgstr ""
+msgstr "Burkina Faso"
 
 #. module: base
 #: selection:ir.actions.todo,state:0
 msgid "Skipped"
-msgstr ""
+msgstr "Hoppet over"
 
 #. module: base
 #: selection:ir.model.fields,state:0
 msgid "Custom Field"
-msgstr ""
+msgstr "Tilpasset felt"
 
 #. module: base
 #: field:ir.module.module,web:0
@@ -4788,7 +4864,7 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.cc
 msgid "Cocos (Keeling) Islands"
-msgstr ""
+msgstr "Cocos (Keeling) øyene"
 
 #. module: base
 #: selection:base.language.install,state:0
@@ -4800,17 +4876,17 @@ msgstr ""
 #. module: base
 #: view:res.lang:0
 msgid "11. %U or %W       ==> 48 (49th week)"
-msgstr ""
+msgstr "11. %U eler %W       ==> 48 (49. uke)"
 
 #. module: base
 #: model:ir.model,name:base.model_res_partner_bank_type_field
 msgid "Bank type fields"
-msgstr ""
+msgstr "Banktypefelter"
 
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Dutch / Nederlands"
-msgstr ""
+msgstr "Nederlandsk / Nederlands"
 
 #. module: base
 #: code:addons/base/res/res_config.py:384
@@ -4824,18 +4900,18 @@ msgstr ""
 #. module: base
 #: help:ir.cron,interval_number:0
 msgid "Repeat every x."
-msgstr ""
+msgstr "Gjennta hvert x."
 
 #. module: base
 #: wizard_view:server.action.create,step_1:0
 #: wizard_field:server.action.create,step_1,report:0
 msgid "Select Report"
-msgstr ""
+msgstr "Velg rapport"
 
 #. module: base
 #: report:ir.module.reference.graph:0
 msgid "1cm 28cm 20cm 28cm"
-msgstr ""
+msgstr "1cm 28cm 20cm 28cm"
 
 #. module: base
 #: field:ir.module.module,maintainer:0
@@ -4845,37 +4921,37 @@ msgstr ""
 #. module: base
 #: field:ir.sequence,suffix:0
 msgid "Suffix"
-msgstr ""
+msgstr "Suffiks"
 
 #. module: base
 #: model:res.country,name:base.mo
 msgid "Macau"
-msgstr ""
+msgstr "Macau"
 
 #. module: base
 #: model:ir.actions.report.xml,name:base.res_partner_address_report
 msgid "Labels"
-msgstr ""
+msgstr "Etiketter"
 
 #. module: base
 #: field:partner.wizard.spam,email_from:0
 msgid "Sender's email"
-msgstr ""
+msgstr "Senders e-post"
 
 #. module: base
 #: field:ir.default,field_name:0
 msgid "Object Field"
-msgstr ""
+msgstr "Objektfelt"
 
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (PE) / Español (PE)"
-msgstr ""
+msgstr "Spanish (PE) / Español (PE)"
 
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "French (CH) / Français (CH)"
-msgstr ""
+msgstr "French (CH) / Français (CH)"
 
 #. module: base
 #: help:res.config.users,action_id:0
@@ -4903,27 +4979,29 @@ msgid ""
 "You try to upgrade a module that depends on the module: %s.\n"
 "But this module is not available in your system."
 msgstr ""
+"You try to upgrade a module that depends on the module: %s.\n"
+"But this module is not available in your system."
 
 #. module: base
 #: field:workflow.transition,act_to:0
 msgid "Destination Activity"
-msgstr ""
+msgstr "Aktivitetsblokker"
 
 #. module: base
 #: view:ir.values:0
 msgid "Connect Events to Actions"
-msgstr ""
+msgstr "Koble arrangementr til handlinger"
 
 #. module: base
 #: model:ir.model,name:base.model_base_update_translations
 msgid "base.update.translations"
-msgstr ""
+msgstr "base.update.translations"
 
 #. module: base
 #: field:ir.module.category,parent_id:0
 #: field:res.partner.category,parent_id:0
 msgid "Parent Category"
-msgstr ""
+msgstr "Overordnet kategori"
 
 #. module: base
 #: selection:ir.property,type:0
@@ -4935,55 +5013,55 @@ msgstr ""
 #: selection:res.partner.title,domain:0
 #: view:res.users:0
 msgid "Contact"
-msgstr ""
+msgstr "Kontakt"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_ui_menu
 msgid "ir.ui.menu"
-msgstr ""
+msgstr "ir.ui.menu"
 
 #. module: base
 #: model:res.country,name:base.us
 msgid "United States"
-msgstr ""
+msgstr "USA"
 
 #. module: base
 #: view:ir.module.module:0
 msgid "Cancel Uninstall"
-msgstr ""
+msgstr "Avbryt installasjon"
 
 #. module: base
 #: view:res.bank:0
 #: view:res.partner:0
 #: view:res.partner.address:0
 msgid "Communication"
-msgstr ""
+msgstr "Kommunikasjon"
 
 #. module: base
 #: view:ir.actions.report.xml:0
 msgid "RML Report"
-msgstr ""
+msgstr "RML rapport"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_server_object_lines
 msgid "ir.server.object.lines"
-msgstr ""
+msgstr "ir.server.object.lines"
 
 #. module: base
 #: code:addons/base/module/module.py:531
 #, python-format
 msgid "Module %s: Invalid Quality Certificate"
-msgstr ""
+msgstr "Modul %s: Ugyldig kvalitetssertifikat"
 
 #. module: base
 #: model:res.country,name:base.kw
 msgid "Kuwait"
-msgstr ""
+msgstr "Kuwait"
 
 #. module: base
 #: field:workflow.workitem,inst_id:0
 msgid "Instance"
-msgstr ""
+msgstr "Instans"
 
 #. module: base
 #: help:ir.actions.report.xml,attachment:0
@@ -4992,6 +5070,9 @@ msgid ""
 "Keep empty to not save the printed reports. You can use a python expression "
 "with the object and time variables."
 msgstr ""
+"Dette er filnavnet til vedlegget som benyttes til å lagre resultatet av "
+"utskriften. Behold blankt for ikke å lagre utskrevne rapporter. Du kan "
+"benytte et python uttrykk på objektet og variabler for tid/dato."
 
 #. module: base
 #: selection:ir.property,type:0
@@ -5001,7 +5082,7 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.ng
 msgid "Nigeria"
-msgstr ""
+msgstr "Nigeria"
 
 #. module: base
 #: code:addons/base/ir/ir_model.py:250
@@ -5012,7 +5093,7 @@ msgstr ""
 #. module: base
 #: model:ir.actions.act_window,name:base.action_partner_sms_send
 msgid "SMS Send"
-msgstr ""
+msgstr "Send SMS"
 
 #. module: base
 #: field:res.company,user_ids:0
@@ -5027,22 +5108,22 @@ msgstr ""
 #. module: base
 #: view:ir.values:0
 msgid "Values for Event Type"
-msgstr ""
+msgstr "Klarte ikke kopiere verdier av ikke-støttet type %d."
 
 #. module: base
 #: selection:ir.model.fields,select_level:0
 msgid "Always Searchable"
-msgstr ""
+msgstr "Alltid søkbar"
 
 #. module: base
 #: model:res.country,name:base.hk
 msgid "Hong Kong"
-msgstr ""
+msgstr "Hong Kong"
 
 #. module: base
 #: help:ir.actions.server,name:0
 msgid "Easy to Refer action by name e.g. One Sales Order -> Many Invoices"
-msgstr ""
+msgstr "Easy to Refer action by name e.g. One Sales Order -> Many Invoices"
 
 #. module: base
 #: model:ir.actions.act_window,help:base.action_partner_address_form
@@ -5059,22 +5140,22 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.ph
 msgid "Philippines"
-msgstr ""
+msgstr "Filippinene"
 
 #. module: base
 #: model:res.country,name:base.ma
 msgid "Morocco"
-msgstr ""
+msgstr "Marokko"
 
 #. module: base
 #: view:res.lang:0
 msgid "2.  %a ,%A         ==> Fri, Friday"
-msgstr ""
+msgstr "2.  %a ,%A         ==> Fri, Friday"
 
 #. module: base
 #: field:res.widget,content:0
 msgid "Content"
-msgstr ""
+msgstr "Innhold"
 
 #. module: base
 #: help:ir.rule,global:0
@@ -5084,32 +5165,32 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.td
 msgid "Chad"
-msgstr ""
+msgstr "Tsjad / Republikken Tsjad"
 
 #. module: base
 #: model:ir.model,name:base.model_workflow_transition
 msgid "workflow.transition"
-msgstr ""
+msgstr "workflow.transition"
 
 #. module: base
 #: view:res.lang:0
 msgid "%a - Abbreviated weekday name."
-msgstr ""
+msgstr "%a - Forkortet navn på ukedag."
 
 #. module: base
 #: report:ir.module.reference.graph:0
 msgid "Introspection report on objects"
-msgstr ""
+msgstr "Introspektiv rapport på objekter"
 
 #. module: base
 #: model:res.country,name:base.pf
 msgid "Polynesia (French)"
-msgstr ""
+msgstr "Polynesia (Fransk)"
 
 #. module: base
 #: model:res.country,name:base.dm
 msgid "Dominica"
-msgstr ""
+msgstr "Dominica"
 
 #. module: base
 #: sql_constraint:publisher_warranty.contract:0
@@ -5131,7 +5212,7 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.np
 msgid "Nepal"
-msgstr ""
+msgstr "Nepal"
 
 #. module: base
 #: code:addons/orm.py:2307
@@ -5153,28 +5234,31 @@ msgid ""
 "groups. If this field is empty, OpenERP will compute visibility based on the "
 "related object's read access."
 msgstr ""
+"Hvis du har grupper så vil synligheten av denne menyen baseres på disse. "
+"Hvis dette feltet er tomt så vil OpenERP beregne synligheten basert på "
+"lesetilganger til relaterte objekter."
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_ui_view_custom
 #: model:ir.ui.menu,name:base.menu_action_ui_view_custom
 #: view:ir.ui.view.custom:0
 msgid "Customized Views"
-msgstr ""
+msgstr "Tilpassede visninger"
 
 #. module: base
 #: view:partner.sms.send:0
 msgid "Bulk SMS send"
-msgstr ""
+msgstr "Masseutsendelse av SMS"
 
 #. module: base
 #: view:ir.sequence:0
 msgid "Seconde: %(sec)s"
-msgstr ""
+msgstr "Sekund: %(sec)s"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_view_base_module_update
 msgid "Update Modules List"
-msgstr ""
+msgstr "Oppdater liste over moduler"
 
 #. module: base
 #: code:addons/base/module/module.py:255
@@ -5196,7 +5280,7 @@ msgstr ""
 #. module: base
 #: view:ir.actions.configuration.wizard:0
 msgid "Continue"
-msgstr ""
+msgstr "Fortsett"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -5217,28 +5301,28 @@ msgstr ""
 #. module: base
 #: field:ir.actions.report.xml,attachment_use:0
 msgid "Reload from Attachment"
-msgstr ""
+msgstr "Last på nytt fra vedlegg"
 
 #. module: base
 #: model:res.country,name:base.bv
 msgid "Bouvet Island"
-msgstr ""
+msgstr "Bouvet øyene"
 
 #. module: base
 #: field:ir.attachment,name:0
 msgid "Attachment Name"
-msgstr ""
+msgstr "Navn på vedlegg"
 
 #. module: base
 #: field:base.language.export,data:0
 #: field:base.language.import,data:0
 msgid "File"
-msgstr ""
+msgstr "Fil"
 
 #. module: base
 #: view:res.config.users:0
 msgid "Add User"
-msgstr ""
+msgstr "Legg til bruker"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_view_base_module_upgrade_install
@@ -5248,12 +5332,12 @@ msgstr ""
 #. module: base
 #: model:ir.model,name:base.model_ir_actions_configuration_wizard
 msgid "ir.actions.configuration.wizard"
-msgstr ""
+msgstr "ir.actions.configuration.wizard"
 
 #. module: base
 #: view:res.lang:0
 msgid "%b - Abbreviated month name."
-msgstr ""
+msgstr "%b - Navn på måned (forkortet)."
 
 #. module: base
 #: field:res.partner,supplier:0
@@ -5261,30 +5345,30 @@ msgstr ""
 #: field:res.partner.address,is_supplier_add:0
 #: model:res.partner.category,name:base.res_partner_category_8
 msgid "Supplier"
-msgstr ""
+msgstr "Leverandør"
 
 #. module: base
 #: view:ir.actions.server:0
 #: selection:ir.actions.server,state:0
 msgid "Multi Actions"
-msgstr ""
+msgstr "Flerhandlinger"
 
 #. module: base
 #: view:base.language.export:0
 #: view:base.language.import:0
 #: view:wizard.ir.model.menu.create:0
 msgid "_Close"
-msgstr ""
+msgstr "_Lukk"
 
 #. module: base
 #: field:multi_company.default,company_dest_id:0
 msgid "Default Company"
-msgstr ""
+msgstr "Standard firma"
 
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (EC) / Español (EC)"
-msgstr ""
+msgstr "Spanish (EC) / Español (EC)"
 
 #. module: base
 #: help:ir.ui.view,xml_id:0
@@ -5295,12 +5379,12 @@ msgstr ""
 #: model:ir.model,name:base.model_base_module_import
 #: model:ir.ui.menu,name:base.menu_view_base_module_import
 msgid "Import Module"
-msgstr ""
+msgstr "Importer modul"
 
 #. module: base
 #: model:res.country,name:base.as
 msgid "American Samoa"
-msgstr ""
+msgstr "Amerikansk Samoa"
 
 #. module: base
 #: help:ir.actions.act_window,res_model:0
@@ -5315,51 +5399,51 @@ msgstr ""
 #. module: base
 #: field:ir.model.fields,selectable:0
 msgid "Selectable"
-msgstr ""
+msgstr "Valgbar"
 
 #. module: base
 #: view:res.request.link:0
 msgid "Request Link"
-msgstr ""
+msgstr "res.request.link"
 
 #. module: base
 #: view:ir.attachment:0
 #: selection:ir.attachment,type:0
 #: field:ir.module.module,url:0
 msgid "URL"
-msgstr ""
+msgstr "URL"
 
 #. module: base
 #: help:res.country,name:0
 msgid "The full name of the country."
-msgstr ""
+msgstr "Fullt navn på land."
 
 #. module: base
 #: selection:ir.actions.server,state:0
 msgid "Iteration"
-msgstr ""
+msgstr "Iterasjon"
 
 #. module: base
 #: code:addons/orm.py:3448
 #: code:addons/orm.py:3532
 #, python-format
 msgid "UserError"
-msgstr ""
+msgstr "BrukerFeil"
 
 #. module: base
 #: model:res.country,name:base.ae
 msgid "United Arab Emirates"
-msgstr ""
+msgstr "De forente arabiske emirater"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_crm_case_job_req_main
 msgid "Recruitment"
-msgstr ""
+msgstr "Rekruttering"
 
 #. module: base
 #: model:res.country,name:base.re
 msgid "Reunion (French)"
-msgstr ""
+msgstr "Réunion (Frankrike)"
 
 #. module: base
 #: code:addons/base/ir/ir_model.py:321
@@ -5373,17 +5457,17 @@ msgstr ""
 #: view:ir.rule:0
 #: field:ir.rule,global:0
 msgid "Global"
-msgstr ""
+msgstr "Global"
 
 #. module: base
 #: model:res.country,name:base.mp
 msgid "Northern Mariana Islands"
-msgstr ""
+msgstr "Marianaøyene"
 
 #. module: base
 #: model:res.country,name:base.sb
 msgid "Solomon Islands"
-msgstr ""
+msgstr "Salomonøyene"
 
 #. module: base
 #: code:addons/base/ir/ir_model.py:490
@@ -5394,12 +5478,12 @@ msgstr ""
 #: code:addons/orm.py:3817
 #, python-format
 msgid "AccessError"
-msgstr ""
+msgstr "Tilgangsfeil"
 
 #. module: base
 #: view:res.request:0
 msgid "Waiting"
-msgstr ""
+msgstr "Venter"
 
 #. module: base
 #: code:addons/__init__.py:834
@@ -5410,7 +5494,7 @@ msgstr ""
 #. module: base
 #: view:res.lang:0
 msgid "8.  %I:%M:%S %p  ==> 06:25:20 PM"
-msgstr ""
+msgstr "8.  %I:%M:%S %p  ==> 06:25:20 PM"
 
 #. module: base
 #: code:addons/orm.py:1803
@@ -5421,49 +5505,49 @@ msgstr ""
 #. module: base
 #: field:res.log,create_date:0
 msgid "Creation Date"
-msgstr ""
+msgstr "Dato opprettet"
 
 #. module: base
 #: view:ir.translation:0
 #: model:ir.ui.menu,name:base.menu_translation
 msgid "Translations"
-msgstr ""
+msgstr "Oversettelser"
 
 #. module: base
 #: field:ir.sequence,padding:0
 msgid "Number padding"
-msgstr ""
+msgstr "Bunnfyll"
 
 #. module: base
 #: view:ir.actions.report.xml:0
 msgid "Report"
-msgstr ""
+msgstr "Rapport"
 
 #. module: base
 #: model:res.country,name:base.ua
 msgid "Ukraine"
-msgstr ""
+msgstr "Ukraina"
 
 #. module: base
 #: model:res.country,name:base.to
 msgid "Tonga"
-msgstr ""
+msgstr "Tonga"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_module_category
 #: view:ir.module.category:0
 msgid "Module Category"
-msgstr ""
+msgstr "Modulkategori"
 
 #. module: base
 #: view:partner.wizard.ean.check:0
 msgid "Ignore"
-msgstr ""
+msgstr "Ignorer"
 
 #. module: base
 #: report:ir.module.reference.graph:0
 msgid "Reference Guide"
-msgstr ""
+msgstr "Veiledning"
 
 #. module: base
 #: view:ir.ui.view:0
@@ -5473,7 +5557,7 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.ml
 msgid "Mali"
-msgstr ""
+msgstr "Mali"
 
 #. module: base
 #: help:res.config.users,email:0
@@ -5493,22 +5577,22 @@ msgstr ""
 #. module: base
 #: field:ir.cron,interval_number:0
 msgid "Interval Number"
-msgstr ""
+msgstr "Intervallnummer"
 
 #. module: base
 #: model:res.country,name:base.tk
 msgid "Tokelau"
-msgstr ""
+msgstr "Tokelau"
 
 #. module: base
 #: field:ir.actions.report.xml,report_xsl:0
 msgid "XSL path"
-msgstr ""
+msgstr "Stil til XSL"
 
 #. module: base
 #: model:res.country,name:base.bn
 msgid "Brunei Darussalam"
-msgstr ""
+msgstr "Brunei Darussalam"
 
 #. module: base
 #: view:ir.actions.act_window:0
@@ -5517,22 +5601,22 @@ msgstr ""
 #: field:ir.ui.view,type:0
 #: field:wizard.ir.model.menu.create.line,view_type:0
 msgid "View Type"
-msgstr ""
+msgstr "Visningstype"
 
 #. module: base
 #: model:ir.ui.menu,name:base.next_id_2
 msgid "User Interface"
-msgstr ""
+msgstr "Brukergrensesnitt"
 
 #. module: base
 #: field:ir.attachment,create_date:0
 msgid "Date Created"
-msgstr ""
+msgstr "Dato opprettet"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_actions_todo
 msgid "ir.actions.todo"
-msgstr ""
+msgstr "ir.actions.todo"
 
 #. module: base
 #: code:addons/base/res/res_config.py:94
@@ -5543,12 +5627,12 @@ msgstr ""
 #. module: base
 #: view:ir.actions.act_window:0
 msgid "General Settings"
-msgstr ""
+msgstr "Generelle innstillinger"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_administration_shortcut
 msgid "Custom Shortcuts"
-msgstr ""
+msgstr "Tilpassede snarveier"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -5558,12 +5642,12 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.dz
 msgid "Algeria"
-msgstr ""
+msgstr "Algerie"
 
 #. module: base
 #: model:res.country,name:base.be
 msgid "Belgium"
-msgstr ""
+msgstr "Belgia"
 
 #. module: base
 #: model:ir.model,name:base.model_osv_memory_autovacuum
@@ -5579,12 +5663,12 @@ msgstr ""
 #: field:res.partner,lang:0
 #: field:res.users,context_lang:0
 msgid "Language"
-msgstr ""
+msgstr "Språk"
 
 #. module: base
 #: model:res.country,name:base.gm
 msgid "Gambia"
-msgstr ""
+msgstr "Gambia"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_res_company_form
@@ -5596,12 +5680,12 @@ msgstr ""
 #: view:res.users:0
 #: field:res.users,company_ids:0
 msgid "Companies"
-msgstr ""
+msgstr "Firma"
 
 #. module: base
 #: view:res.lang:0
 msgid "%H - Hour (24-hour clock) [00,23]."
-msgstr ""
+msgstr "%H - Time (24-times klokke)  [00,23]."
 
 #. module: base
 #: model:ir.model,name:base.model_res_widget
@@ -5631,18 +5715,18 @@ msgstr ""
 #: field:ir.actions.server,code:0
 #: selection:ir.actions.server,state:0
 msgid "Python Code"
-msgstr ""
+msgstr "Python kode"
 
 #. module: base
 #: code:addons/base/module/wizard/base_module_import.py:67
 #, python-format
 msgid "Can not create the module file: %s !"
-msgstr ""
+msgstr "Kan ikke opprette modul filen: %s !"
 
 #. module: base
 #: model:ir.module.module,description:base.module_meta_information
 msgid "The kernel of OpenERP, needed for all installation."
-msgstr ""
+msgstr "Kjerne i OpenERP, nødvendig for all installasjoner"
 
 #. module: base
 #: view:base.language.install:0
@@ -5656,17 +5740,17 @@ msgstr ""
 #: view:publisher_warranty.contract.wizard:0
 #: view:res.widget.wizard:0
 msgid "Cancel"
-msgstr ""
+msgstr "Avbryt"
 
 #. module: base
 #: selection:base.language.export,format:0
 msgid "PO File"
-msgstr ""
+msgstr "PO fil"
 
 #. module: base
 #: model:res.country,name:base.nt
 msgid "Neutral Zone"
-msgstr ""
+msgstr "Nøytral sone"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -5676,7 +5760,7 @@ msgstr ""
 #. module: base
 #: view:ir.model:0
 msgid "Custom"
-msgstr ""
+msgstr "Tilpasset"
 
 #. module: base
 #: view:res.request:0
@@ -5697,43 +5781,43 @@ msgstr ""
 #: field:res.groups,users:0
 #: view:res.users:0
 msgid "Users"
-msgstr ""
+msgstr "Brukere"
 
 #. module: base
 #: field:ir.module.module,published_version:0
 msgid "Published Version"
-msgstr ""
+msgstr "Publisert versjon"
 
 #. module: base
 #: model:res.country,name:base.is
 msgid "Iceland"
-msgstr ""
+msgstr "Island"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.ir_action_window
 #: model:ir.ui.menu,name:base.menu_ir_action_window
 msgid "Window Actions"
-msgstr ""
+msgstr "Vinduhandlinger"
 
 #. module: base
 #: view:res.lang:0
 msgid "%I - Hour (12-hour clock) [01,12]."
-msgstr ""
+msgstr "%I - Time (12-times klokke) som et desimanummer [01,12]."
 
 #. module: base
 #: selection:publisher_warranty.contract.wizard,state:0
 msgid "Finished"
-msgstr ""
+msgstr "Ferdig"
 
 #. module: base
 #: model:res.country,name:base.de
 msgid "Germany"
-msgstr ""
+msgstr "Tyskland"
 
 #. module: base
 #: view:ir.sequence:0
 msgid "Week of the year: %(woy)s"
-msgstr ""
+msgstr "Uke i året: %(woy)s"
 
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_14
@@ -5743,12 +5827,12 @@ msgstr ""
 #. module: base
 #: report:ir.module.reference.graph:0
 msgid "Reports :"
-msgstr ""
+msgstr "Rapporter :"
 
 #. module: base
 #: model:res.country,name:base.gy
 msgid "Guyana"
-msgstr ""
+msgstr "Guyana"
 
 #. module: base
 #: help:ir.actions.act_window,view_type:0
@@ -5766,12 +5850,12 @@ msgstr ""
 #. module: base
 #: field:ir.actions.server,record_id:0
 msgid "Create Id"
-msgstr ""
+msgstr "Opprett ID"
 
 #. module: base
 #: model:res.country,name:base.hn
 msgid "Honduras"
-msgstr ""
+msgstr "Honduras"
 
 #. module: base
 #: help:res.config.users,menu_tips:0
@@ -5783,7 +5867,7 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.eg
 msgid "Egypt"
-msgstr ""
+msgstr "Egypt"
 
 #. module: base
 #: field:ir.rule,perm_read:0
@@ -5794,28 +5878,28 @@ msgstr ""
 #: help:ir.actions.server,model_id:0
 msgid ""
 "Select the object on which the action will work (read, write, create)."
-msgstr ""
+msgstr "Velg objektet som handlingen vil utføres på (les, skriv, opprett)."
 
 #. module: base
 #: code:addons/base/ir/ir_actions.py:629
 #, python-format
 msgid "Please specify server option --email-from !"
-msgstr ""
+msgstr "Vær vennlig å angi server parameteret --email-from !"
 
 #. module: base
 #: field:base.language.import,name:0
 msgid "Language Name"
-msgstr ""
+msgstr "Navn på språk"
 
 #. module: base
 #: selection:ir.property,type:0
 msgid "Boolean"
-msgstr ""
+msgstr "Bolsk"
 
 #. module: base
 #: view:ir.model:0
 msgid "Fields Description"
-msgstr ""
+msgstr "Bekrivelse på felter"
 
 #. module: base
 #: view:ir.attachment:0
@@ -5831,14 +5915,14 @@ msgstr ""
 #: view:res.partner.address:0
 #: view:workflow.activity:0
 msgid "Group By..."
-msgstr ""
+msgstr "Grupper etter..."
 
 #. module: base
 #: view:ir.model.fields:0
 #: field:ir.model.fields,readonly:0
 #: field:res.partner.bank.type.field,readonly:0
 msgid "Readonly"
-msgstr ""
+msgstr "Skrivebeskyttet"
 
 #. module: base
 #: field:ir.actions.act_window.view,view_id:0
@@ -5846,13 +5930,13 @@ msgstr ""
 #: selection:ir.translation,type:0
 #: field:wizard.ir.model.menu.create.line,view_id:0
 msgid "View"
-msgstr ""
+msgstr "Vis"
 
 #. module: base
 #: selection:ir.module.module,state:0
 #: selection:ir.module.module.dependency,state:0
 msgid "To be installed"
-msgstr ""
+msgstr "Å installere"
 
 #. module: base
 #: help:ir.actions.act_window,display_menu_tip:0
@@ -5866,7 +5950,7 @@ msgstr ""
 #: model:ir.module.module,shortdesc:base.module_meta_information
 #: field:res.currency,base:0
 msgid "Base"
-msgstr ""
+msgstr "Basis"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -5876,7 +5960,7 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.lr
 msgid "Liberia"
-msgstr ""
+msgstr "Liberia"
 
 #. module: base
 #: view:ir.attachment:0
@@ -5886,7 +5970,7 @@ msgstr ""
 #: field:res.partner,comment:0
 #: model:res.widget,title:base.note_widget
 msgid "Notes"
-msgstr ""
+msgstr "Notater"
 
 #. module: base
 #: field:ir.config_parameter,value:0
@@ -5902,7 +5986,7 @@ msgstr ""
 #: field:ir.values,value:0
 #: field:ir.values,value_unpickle:0
 msgid "Value"
-msgstr ""
+msgstr "Verdi"
 
 #. module: base
 #: field:ir.sequence,code:0
@@ -5911,27 +5995,27 @@ msgstr ""
 #: field:res.bank,code:0
 #: field:res.partner.bank.type,code:0
 msgid "Code"
-msgstr ""
+msgstr "Kode"
 
 #. module: base
 #: model:ir.model,name:base.model_res_config_installer
 msgid "res.config.installer"
-msgstr ""
+msgstr "res.config.installer"
 
 #. module: base
 #: model:res.country,name:base.mc
 msgid "Monaco"
-msgstr ""
+msgstr "Monaco"
 
 #. module: base
 #: selection:ir.cron,interval_type:0
 msgid "Minutes"
-msgstr ""
+msgstr "Minutter"
 
 #. module: base
 #: selection:ir.translation,type:0
 msgid "Help"
-msgstr ""
+msgstr "Hjelp"
 
 #. module: base
 #: help:res.config.users,menu_id:0
@@ -5943,7 +6027,7 @@ msgstr ""
 #. module: base
 #: selection:ir.actions.server,state:0
 msgid "Write Object"
-msgstr ""
+msgstr "Skriv objekt"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_fundrising
@@ -5954,12 +6038,12 @@ msgstr ""
 #: model:ir.actions.act_window,name:base.ir_sequence_type
 #: model:ir.ui.menu,name:base.menu_ir_sequence_type
 msgid "Sequence Codes"
-msgstr ""
+msgstr "Sekvenskoder"
 
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (CO) / Español (CO)"
-msgstr ""
+msgstr "Spanish (CO) / Español (CO)"
 
 #. module: base
 #: view:base.module.configuration:0
@@ -5971,7 +6055,7 @@ msgstr ""
 #. module: base
 #: wizard_button:server.action.create,step_1,create:0
 msgid "Create"
-msgstr ""
+msgstr "Opprett"
 
 #. module: base
 #: view:ir.sequence:0
@@ -5981,17 +6065,17 @@ msgstr ""
 #. module: base
 #: field:ir.exports,export_fields:0
 msgid "Export ID"
-msgstr ""
+msgstr "Eksport ID"
 
 #. module: base
 #: model:res.country,name:base.fr
 msgid "France"
-msgstr ""
+msgstr "Frankrike"
 
 #. module: base
 #: model:ir.model,name:base.model_res_log
 msgid "res.log"
-msgstr ""
+msgstr "res.log"
 
 #. module: base
 #: help:ir.translation,module:0
@@ -6003,39 +6087,39 @@ msgstr ""
 #: view:workflow.activity:0
 #: field:workflow.activity,flow_stop:0
 msgid "Flow Stop"
-msgstr ""
+msgstr "_Stopp"
 
 #. module: base
 #: selection:ir.cron,interval_type:0
 msgid "Weeks"
-msgstr ""
+msgstr "Uker"
 
 #. module: base
 #: model:res.country,name:base.af
 msgid "Afghanistan, Islamic State of"
-msgstr ""
+msgstr "Afghanistan"
 
 #. module: base
 #: code:addons/base/module/wizard/base_module_import.py:67
 #, python-format
 msgid "Error !"
-msgstr ""
+msgstr "Feil!"
 
 #. module: base
 #: model:res.partner.bank.type.field,name:base.bank_normal_field_contry
 msgid "country_id"
-msgstr ""
+msgstr "country_id"
 
 #. module: base
 #: field:ir.cron,interval_type:0
 msgid "Interval Unit"
-msgstr ""
+msgstr "Intervallenhet"
 
 #. module: base
 #: field:publisher_warranty.contract,kind:0
 #: field:workflow.activity,kind:0
 msgid "Kind"
-msgstr ""
+msgstr "Vennlig"
 
 #. module: base
 #: code:addons/orm.py:3775
@@ -6047,17 +6131,17 @@ msgstr ""
 #: field:res.bank,fax:0
 #: field:res.partner.address,fax:0
 msgid "Fax"
-msgstr ""
+msgstr "Fax"
 
 #. module: base
 #: field:res.lang,thousands_sep:0
 msgid "Thousands Separator"
-msgstr ""
+msgstr "Tusenskilletegn"
 
 #. module: base
 #: field:res.request,create_date:0
 msgid "Created Date"
-msgstr ""
+msgstr "Dato opprettet"
 
 #. module: base
 #: help:ir.actions.server,loop_action:0
@@ -6065,6 +6149,8 @@ msgid ""
 "Select the action that will be executed. Loop action will not be avaliable "
 "inside loop."
 msgstr ""
+"Velg handlingen som skal utføres. Iterative handlinger vil ikke være "
+"tilgjengelig i løkker."
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -6074,7 +6160,7 @@ msgstr ""
 #. module: base
 #: model:ir.model,name:base.model_res_request
 msgid "res.request"
-msgstr ""
+msgstr "res.request"
 
 #. module: base
 #: view:ir.model:0
@@ -6089,17 +6175,17 @@ msgstr ""
 #. module: base
 #: field:ir.attachment,datas:0
 msgid "File Content"
-msgstr ""
+msgstr "Filinnhold"
 
 #. module: base
 #: model:res.country,name:base.pa
 msgid "Panama"
-msgstr ""
+msgstr "Panama"
 
 #. module: base
 #: model:res.partner.title,name:base.res_partner_title_ltd
 msgid "Ltd"
-msgstr ""
+msgstr "AS"
 
 #. module: base
 #: help:workflow.transition,group_id:0
@@ -6116,7 +6202,7 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.gi
 msgid "Gibraltar"
-msgstr ""
+msgstr "Gibraltar"
 
 #. module: base
 #: field:ir.actions.report.xml,report_name:0
@@ -6126,37 +6212,37 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.pn
 msgid "Pitcairn Island"
-msgstr ""
+msgstr "Pitcairnøyene"
 
 #. 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)."
-msgstr ""
+msgstr "Vi anbefaler at du laster menyene på nytt (Ctrl+T Ctrl+R)."
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_rule
 #: model:ir.ui.menu,name:base.menu_action_rule
 msgid "Record Rules"
-msgstr ""
+msgstr "Lagre regler"
 
 #. module: base
 #: field:res.config.users,name:0
 #: field:res.users,name:0
 msgid "User Name"
-msgstr ""
+msgstr "Brukernavn"
 
 #. module: base
 #: view:ir.sequence:0
 msgid "Day of the year: %(doy)s"
-msgstr ""
+msgstr "Dag i året: %(day)s"
 
 #. module: base
 #: view:ir.model:0
 #: view:ir.model.fields:0
 #: view:workflow.activity:0
 msgid "Properties"
-msgstr ""
+msgstr "Egenskaper"
 
 #. module: base
 #: help:ir.sequence,padding:0
@@ -6168,12 +6254,12 @@ msgstr ""
 #. module: base
 #: view:res.lang:0
 msgid "%A - Full weekday name."
-msgstr ""
+msgstr "%A - Fullt navn på ukedag."
 
 #. module: base
 #: selection:ir.cron,interval_type:0
 msgid "Months"
-msgstr ""
+msgstr "Måneder"
 
 #. module: base
 #: field:ir.actions.act_window,search_view:0
@@ -6191,42 +6277,42 @@ msgstr ""
 #: view:ir.attachment:0
 #: model:ir.ui.menu,name:base.menu_action_attachment
 msgid "Attachments"
-msgstr ""
+msgstr "Vedlegg"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_base_partner
 #: model:ir.ui.menu,name:base.menu_sale_config_sales
 #: model:ir.ui.menu,name:base.menu_sales
 msgid "Sales"
-msgstr ""
+msgstr "Salg"
 
 #. module: base
 #: field:ir.actions.server,child_ids:0
 msgid "Other Actions"
-msgstr ""
+msgstr "Andre handlinger"
 
 #. module: base
 #: selection:ir.actions.todo,state:0
 #: view:res.config.users:0
 msgid "Done"
-msgstr ""
+msgstr "Fullført"
 
 #. module: base
 #: model:res.partner.title,name:base.res_partner_title_miss
 msgid "Miss"
-msgstr ""
+msgstr "Frøken"
 
 #. module: base
 #: view:ir.model.access:0
 #: field:ir.model.access,perm_write:0
 #: view:ir.rule:0
 msgid "Write Access"
-msgstr ""
+msgstr "Skrivetilgang"
 
 #. module: base
 #: view:res.lang:0
 msgid "%m - Month number [01,12]."
-msgstr ""
+msgstr "%m - Måned som et desimaltall [01,12]."
 
 #. module: base
 #: field:res.bank,city:0
@@ -6234,17 +6320,17 @@ msgstr ""
 #: field:res.partner.address,city:0
 #: field:res.partner.bank,city:0
 msgid "City"
-msgstr ""
+msgstr "By"
 
 #. module: base
 #: model:res.country,name:base.qa
 msgid "Qatar"
-msgstr ""
+msgstr "Qatar"
 
 #. module: base
 #: model:res.country,name:base.it
 msgid "Italy"
-msgstr ""
+msgstr "Italia"
 
 #. module: base
 #: view:ir.actions.todo:0
@@ -6255,24 +6341,24 @@ msgstr ""
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Estonian / Eesti keel"
-msgstr ""
+msgstr "Estisk / Eesti keel"
 
 #. module: base
 #: field:res.config.users,email:0
 #: field:res.partner,email:0
 #: field:res.users,email:0
 msgid "E-mail"
-msgstr ""
+msgstr "E-post"
 
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL-3 or later version"
-msgstr ""
+msgstr "GPL-3 eller senere versjon"
 
 #. module: base
 #: field:workflow.activity,action:0
 msgid "Python Action"
-msgstr ""
+msgstr "Python handlinger"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -6297,6 +6383,7 @@ msgstr ""
 #: view:base.language.export:0
 msgid "To browse official translations, you can start with these links:"
 msgstr ""
+"For å se gjennom offisielle oversettelser kan du besøke følgende lenke:"
 
 #. module: base
 #: code:addons/base/ir/ir_model.py:484
@@ -6313,12 +6400,12 @@ msgstr ""
 #: view:res.users:0
 #: field:res.users,address_id:0
 msgid "Address"
-msgstr ""
+msgstr "Adresse"
 
 #. module: base
 #: field:ir.module.module,latest_version:0
 msgid "Installed version"
-msgstr ""
+msgstr "Installert versjon"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -6328,12 +6415,12 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.mr
 msgid "Mauritania"
-msgstr ""
+msgstr "Mauritania"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_translation
 msgid "ir.translation"
-msgstr ""
+msgstr "ir.translation"
 
 #. module: base
 #: view:base.module.update:0
@@ -6344,7 +6431,7 @@ msgstr ""
 #: view:workflow.activity:0
 #: field:workflow.workitem,act_id:0
 msgid "Activity"
-msgstr ""
+msgstr "Aktivitet"
 
 #. module: base
 #: view:res.partner:0
@@ -6355,42 +6442,42 @@ msgstr ""
 #. module: base
 #: field:res.company,parent_id:0
 msgid "Parent Company"
-msgstr ""
+msgstr "Morselskap"
 
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (CR) / Español (CR)"
-msgstr ""
+msgstr "Spanish (CR) / Español (CR)"
 
 #. module: base
 #: field:res.currency.rate,rate:0
 msgid "Rate"
-msgstr ""
+msgstr "Sats"
 
 #. module: base
 #: model:res.country,name:base.cg
 msgid "Congo"
-msgstr ""
+msgstr "Kongo"
 
 #. module: base
 #: view:res.lang:0
 msgid "Examples"
-msgstr ""
+msgstr "Eksempler"
 
 #. module: base
 #: field:ir.default,value:0
 msgid "Default Value"
-msgstr ""
+msgstr "Standardverdi"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_tools
 msgid "Tools"
-msgstr ""
+msgstr "Verktøy"
 
 #. module: base
 #: model:res.country,name:base.kn
 msgid "Saint Kitts & Nevis Anguilla"
-msgstr ""
+msgstr "Saint Kitts og Nevis"
 
 #. module: base
 #: code:addons/base/res/res_currency.py:100
@@ -6413,7 +6500,7 @@ msgstr ""
 #: field:ir.model.fields,model:0
 #: field:ir.values,model:0
 msgid "Object Name"
-msgstr ""
+msgstr "Objektnavn"
 
 #. module: base
 #: help:ir.actions.server,srcmodel_id:0
@@ -6421,24 +6508,26 @@ msgid ""
 "Object in which you want to create / write the object. If it is empty then "
 "refer to the Object field."
 msgstr ""
+"Objekt hvorpå du vil opprette / lagre objeket. Hvis det er blankt refererer "
+"du til objektfeltet."
 
 #. module: base
 #: view:ir.module.module:0
 #: selection:ir.module.module,state:0
 #: selection:ir.module.module.dependency,state:0
 msgid "Not Installed"
-msgstr ""
+msgstr "Ikke installert"
 
 #. module: base
 #: view:workflow.activity:0
 #: field:workflow.activity,out_transitions:0
 msgid "Outgoing Transitions"
-msgstr ""
+msgstr "Utgående overganger"
 
 #. module: base
 #: field:ir.ui.menu,icon:0
 msgid "Icon"
-msgstr ""
+msgstr "Ikon"
 
 #. module: base
 #: help:ir.model.fields,model_id:0
@@ -6448,12 +6537,12 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.mq
 msgid "Martinique (French)"
-msgstr ""
+msgstr "Martinique (Fransk)"
 
 #. module: base
 #: view:ir.sequence.type:0
 msgid "Sequences Type"
-msgstr ""
+msgstr "Sekvenstype"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.res_request-act
@@ -6461,17 +6550,17 @@ msgstr ""
 #: model:ir.ui.menu,name:base.menu_resquest_ref
 #: view:res.request:0
 msgid "Requests"
-msgstr ""
+msgstr "Forespørsler"
 
 #. module: base
 #: model:res.country,name:base.ye
 msgid "Yemen"
-msgstr ""
+msgstr "Yemen"
 
 #. module: base
 #: selection:workflow.activity,split_mode:0
 msgid "Or"
-msgstr ""
+msgstr "Eller"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.res_log_act_window
@@ -6482,12 +6571,12 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.al
 msgid "Albania"
-msgstr ""
+msgstr "Albania"
 
 #. module: base
 #: model:res.country,name:base.ws
 msgid "Samoa"
-msgstr ""
+msgstr "Samoa"
 
 #. module: base
 #: code:addons/base/res/res_lang.py:161
@@ -6508,14 +6597,14 @@ msgstr ""
 #. module: base
 #: field:ir.ui.menu,child_id:0
 msgid "Child IDs"
-msgstr ""
+msgstr "Over barn"
 
 #. module: base
 #: code:addons/base/ir/ir_actions.py:713
 #: code:addons/base/ir/ir_actions.py:716
 #, python-format
 msgid "Problem in configuration `Record Id` in Server Action!"
-msgstr ""
+msgstr "Problem med konfigurasjon `Record Id` i Server Action!"
 
 #. module: base
 #: code:addons/orm.py:2306
@@ -6538,12 +6627,12 @@ msgstr ""
 #. module: base
 #: view:base.module.import:0
 msgid "Import module"
-msgstr ""
+msgstr "Importer modul"
 
 #. module: base
 #: field:ir.actions.server,loop_action:0
 msgid "Loop Action"
-msgstr ""
+msgstr "Løkkehandling"
 
 #. module: base
 #: help:ir.actions.report.xml,report_file:0
@@ -6555,20 +6644,20 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.la
 msgid "Laos"
-msgstr ""
+msgstr "Laos"
 
 #. module: base
 #: selection:ir.actions.server,state:0
 #: field:res.config.users,user_email:0
 #: field:res.users,user_email:0
 msgid "Email"
-msgstr ""
+msgstr "E-post"
 
 #. module: base
 #: field:res.config.users,action_id:0
 #: field:res.users,action_id:0
 msgid "Home Action"
-msgstr ""
+msgstr "Handlingsgruppe"
 
 #. module: base
 #: code:addons/custom.py:558
@@ -6588,22 +6677,22 @@ msgstr ""
 #: model:ir.ui.menu,name:base.next_id_73
 #: model:ir.ui.menu,name:base.reporting_menu
 msgid "Reporting"
-msgstr ""
+msgstr "Rapportering"
 
 #. module: base
 #: model:res.country,name:base.tg
 msgid "Togo"
-msgstr ""
+msgstr "Togo"
 
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "Other Proprietary"
-msgstr ""
+msgstr "Annen propertiær"
 
 #. module: base
 #: selection:workflow.activity,kind:0
 msgid "Stop All"
-msgstr ""
+msgstr "Stop alle"
 
 #. module: base
 #: code:addons/orm.py:412
@@ -6614,17 +6703,17 @@ msgstr ""
 #. module: base
 #: view:ir.model.data:0
 msgid "Updatable"
-msgstr ""
+msgstr "Oppdaterbar"
 
 #. module: base
 #: view:res.lang:0
 msgid "3.  %x ,%X         ==> 12/05/08, 18:25:20"
-msgstr ""
+msgstr "3.  %x ,%X         ==> 12/05/08, 18:25:20"
 
 #. module: base
 #: selection:ir.model.fields,on_delete:0
 msgid "Cascade"
-msgstr ""
+msgstr "Kaskade"
 
 #. module: base
 #: field:workflow.transition,group_id:0
@@ -6634,17 +6723,17 @@ msgstr ""
 #. module: base
 #: view:ir.actions.configuration.wizard:0
 msgid "Next Configuration Step"
-msgstr ""
+msgstr "Neste steg i konfigurasjonen"
 
 #. module: base
 #: field:res.groups,comment:0
 msgid "Comment"
-msgstr ""
+msgstr "Kommentar"
 
 #. module: base
 #: model:res.country,name:base.ro
 msgid "Romania"
-msgstr ""
+msgstr "Romania"
 
 #. module: base
 #: help:ir.cron,doall:0
@@ -6656,7 +6745,7 @@ msgstr ""
 #. module: base
 #: view:base.module.upgrade:0
 msgid "Start update"
-msgstr ""
+msgstr "Start oppdatering"
 
 #. module: base
 #: code:addons/base/publisher_warranty/publisher_warranty.py:144
@@ -6667,24 +6756,24 @@ msgstr ""
 #. module: base
 #: field:res.country.state,name:0
 msgid "State Name"
-msgstr ""
+msgstr "Navn på stat"
 
 #. module: base
 #: field:workflow.activity,join_mode:0
 msgid "Join Mode"
-msgstr ""
+msgstr "Koblingstype"
 
 #. module: base
 #: field:res.config.users,context_tz:0
 #: field:res.users,context_tz:0
 msgid "Timezone"
-msgstr ""
+msgstr "Tidssone"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_actions_report_xml
 #: selection:ir.ui.menu,action:0
 msgid "ir.actions.report.xml"
-msgstr ""
+msgstr "ir.actions.report.xml"
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_miss
@@ -6694,7 +6783,7 @@ msgstr ""
 #. module: base
 #: model:ir.model,name:base.model_ir_ui_view
 msgid "ir.ui.view"
-msgstr ""
+msgstr "ir.ui.view"
 
 #. module: base
 #: constraint:res.partner:0
@@ -6709,7 +6798,7 @@ msgstr ""
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_2
 msgid "OpenERP Partners"
-msgstr ""
+msgstr "OpenERP partnere"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_hr_manager
@@ -6731,7 +6820,7 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.by
 msgid "Belarus"
-msgstr ""
+msgstr "Hviterussland"
 
 #. module: base
 #: field:ir.actions.act_window,name:0
@@ -6741,7 +6830,7 @@ msgstr ""
 #: field:ir.actions.url,name:0
 #: field:ir.filters,name:0
 msgid "Action Name"
-msgstr ""
+msgstr "Handlingsnavn"
 
 #. module: base
 #: model:ir.actions.act_window,help:base.action_res_users
@@ -6755,18 +6844,18 @@ msgstr ""
 #. module: base
 #: selection:res.request,priority:0
 msgid "Normal"
-msgstr ""
+msgstr "Normal"
 
 #. module: base
 #: field:res.bank,street2:0
 #: field:res.partner.address,street2:0
 msgid "Street2"
-msgstr ""
+msgstr "Gate2"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_view_base_module_update
 msgid "Module Update"
-msgstr ""
+msgstr "Moduloppdatering"
 
 #. module: base
 #: code:addons/base/module/wizard/base_module_upgrade.py:95
@@ -6786,17 +6875,17 @@ msgstr ""
 #: view:res.users:0
 #: field:res.widget.user,user_id:0
 msgid "User"
-msgstr ""
+msgstr "Bruker"
 
 #. module: base
 #: model:res.country,name:base.pr
 msgid "Puerto Rico"
-msgstr ""
+msgstr "Puerto Rico"
 
 #. module: base
 #: view:ir.actions.act_window:0
 msgid "Open Window"
-msgstr ""
+msgstr "Åpne vindu"
 
 #. module: base
 #: field:ir.actions.act_window,auto_search:0
@@ -6806,7 +6895,7 @@ msgstr ""
 #. module: base
 #: field:ir.actions.act_window,filter:0
 msgid "Filter"
-msgstr ""
+msgstr "Filter"
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_madam
@@ -6816,27 +6905,27 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.ch
 msgid "Switzerland"
-msgstr ""
+msgstr "Sveits"
 
 #. module: base
 #: model:res.country,name:base.gd
 msgid "Grenada"
-msgstr ""
+msgstr "Grenada"
 
 #. module: base
 #: model:res.country,name:base.wf
 msgid "Wallis and Futuna Islands"
-msgstr ""
+msgstr "Wallis og Futuna øyene"
 
 #. module: base
 #: selection:server.action.create,init,type:0
 msgid "Open Report"
-msgstr ""
+msgstr "Åpne rapport"
 
 #. module: base
 #: field:res.currency,rounding:0
 msgid "Rounding factor"
-msgstr ""
+msgstr "Avrundingsfaktor"
 
 #. module: base
 #: view:base.language.install:0
@@ -6859,7 +6948,7 @@ msgstr ""
 #. module: base
 #: model:ir.model,name:base.model_ir_wizard_screen
 msgid "ir.wizard.screen"
-msgstr ""
+msgstr "ir.wizard.screen"
 
 #. module: base
 #: code:addons/base/ir/ir_model.py:223
@@ -6870,7 +6959,7 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.so
 msgid "Somalia"
-msgstr ""
+msgstr "Somalia"
 
 #. module: base
 #: selection:publisher_warranty.contract,state:0
@@ -6880,25 +6969,25 @@ msgstr ""
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_13
 msgid "Important customers"
-msgstr ""
+msgstr "Viktige kunder"
 
 #. module: base
 #: view:res.lang:0
 msgid "Update Terms"
-msgstr ""
+msgstr "Oppdater betegnelser"
 
 #. module: base
 #: field:partner.sms.send,mobile_to:0
 #: field:res.request,act_to:0
 #: field:res.request.history,act_to:0
 msgid "To"
-msgstr ""
+msgstr "Til"
 
 #. module: base
 #: view:ir.cron:0
 #: field:ir.cron,args:0
 msgid "Arguments"
-msgstr ""
+msgstr "Argumenter"
 
 #. module: base
 #: code:addons/orm.py:716
@@ -6909,12 +6998,12 @@ msgstr ""
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL Version 2"
-msgstr ""
+msgstr "GPL versjon 2"
 
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL Version 3"
-msgstr ""
+msgstr "GPL versjon 3"
 
 #. module: base
 #: code:addons/orm.py:836
@@ -6939,33 +7028,33 @@ msgstr ""
 #: field:res.partner.address,is_customer_add:0
 #: model:res.partner.category,name:base.res_partner_category_0
 msgid "Customer"
-msgstr ""
+msgstr "Kunde"
 
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (NI) / Español (NI)"
-msgstr ""
+msgstr "Spanish (NI) / Español (NI)"
 
 #. module: base
 #: field:ir.module.module,shortdesc:0
 msgid "Short Description"
-msgstr ""
+msgstr "Kort beskrivelse"
 
 #. module: base
 #: field:ir.actions.act_window,context:0
 #: field:ir.filters,context:0
 msgid "Context Value"
-msgstr ""
+msgstr "Kontekstverdi"
 
 #. module: base
 #: view:ir.sequence:0
 msgid "Hour 00->24: %(h24)s"
-msgstr ""
+msgstr "Timer 00->24: %(h24)s"
 
 #. module: base
 #: field:ir.cron,nextcall:0
 msgid "Next Execution Date"
-msgstr ""
+msgstr "Neste dato for eksekvering"
 
 #. module: base
 #: help:multi_company.default,field_id:0
@@ -6975,12 +7064,12 @@ msgstr ""
 #. module: base
 #: field:res.request.history,date_sent:0
 msgid "Date sent"
-msgstr ""
+msgstr "Dato sendt"
 
 #. module: base
 #: view:ir.sequence:0
 msgid "Month: %(month)s"
-msgstr ""
+msgstr "Måned: %(month)s"
 
 #. module: base
 #: field:ir.actions.act_window.view,sequence:0
@@ -6997,34 +7086,34 @@ msgstr ""
 #: field:res.widget.user,sequence:0
 #: field:wizard.ir.model.menu.create.line,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "Sekvens"
 
 #. module: base
 #: model:res.country,name:base.tn
 msgid "Tunisia"
-msgstr ""
+msgstr "Tunisia"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_mrp_root
 msgid "Manufacturing"
-msgstr ""
+msgstr "Produksjon"
 
 #. module: base
 #: model:res.country,name:base.km
 msgid "Comoros"
-msgstr ""
+msgstr "Komorene / Den islamske forbundsrepublikk Komorene"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_server_action
 #: view:ir.actions.server:0
 #: model:ir.ui.menu,name:base.menu_server_action
 msgid "Server Actions"
-msgstr ""
+msgstr "Handlinger på server"
 
 #. module: base
 #: view:ir.module.module:0
 msgid "Cancel Install"
-msgstr ""
+msgstr "Avbryt installasjon"
 
 #. module: base
 #: field:ir.model.fields,selection:0
@@ -7039,12 +7128,12 @@ msgstr ""
 #. module: base
 #: view:res.lang:0
 msgid "Legends for Date and Time Formats"
-msgstr ""
+msgstr "Tegnforklaring for dato- og tidsangivelse"
 
 #. module: base
 #: selection:ir.actions.server,state:0
 msgid "Copy Object"
-msgstr ""
+msgstr "Kopier objekt"
 
 #. module: base
 #: code:addons/base/res/res_user.py:581
@@ -7063,12 +7152,12 @@ msgstr ""
 #: view:ir.model:0
 #: view:res.groups:0
 msgid "Access Rules"
-msgstr ""
+msgstr "Tilgangsregler"
 
 #. module: base
 #: field:ir.default,ref_table:0
 msgid "Table Ref."
-msgstr ""
+msgstr "Tabell ref."
 
 #. module: base
 #: field:ir.actions.act_window,res_model:0
@@ -7096,7 +7185,7 @@ msgstr ""
 #: field:res.request.link,object:0
 #: field:workflow.triggers,model:0
 msgid "Object"
-msgstr ""
+msgstr "Objekt"
 
 #. module: base
 #: code:addons/osv.py:151
@@ -7110,24 +7199,24 @@ msgstr ""
 #. module: base
 #: model:ir.model,name:base.model_ir_default
 msgid "ir.default"
-msgstr ""
+msgstr "ir.default"
 
 #. module: base
 #: view:ir.sequence:0
 msgid "Minute: %(min)s"
-msgstr ""
+msgstr "Minutt: %(min)s"
 
 #. module: base
 #: view:base.update.translations:0
 #: model:ir.actions.act_window,name:base.action_wizard_update_translations
 #: model:ir.ui.menu,name:base.menu_wizard_update_translations
 msgid "Synchronize Translations"
-msgstr ""
+msgstr "Synkroniser oversettelser"
 
 #. module: base
 #: model:ir.ui.menu,name:base.next_id_10
 msgid "Scheduler"
-msgstr ""
+msgstr "Planlegger"
 
 #. module: base
 #: help:ir.cron,numbercall:0
@@ -7135,6 +7224,8 @@ msgid ""
 "Number of time the function is called,\n"
 "a negative number indicates no limit"
 msgstr ""
+"Antall ganger denne funksjonen blir kalt,\n"
+"et negativt nummer indikerer at denne funksjonen alltid vil blir kalt"
 
 #. module: base
 #: code:addons/base/ir/ir_model.py:331
@@ -7147,13 +7238,13 @@ msgstr ""
 #. module: base
 #: field:ir.ui.view_sc,user_id:0
 msgid "User Ref."
-msgstr ""
+msgstr "Bruker ref."
 
 #. module: base
 #: code:addons/base/res/res_user.py:580
 #, python-format
 msgid "Warning !"
-msgstr ""
+msgstr "Advarsel !"
 
 #. module: base
 #: model:res.widget,title:base.google_maps_widget
@@ -7169,27 +7260,27 @@ msgstr ""
 #: model:ir.ui.menu,name:base.menu_marketing_config_root
 #: view:res.company:0
 msgid "Configuration"
-msgstr ""
+msgstr "Konfigurasjon"
 
 #. module: base
 #: model:ir.model,name:base.model_publisher_warranty_contract_wizard
 msgid "publisher_warranty.contract.wizard"
-msgstr ""
+msgstr "publisher_warranty.contract.wizard"
 
 #. module: base
 #: field:ir.actions.server,expression:0
 msgid "Loop Expression"
-msgstr ""
+msgstr "Løkkeuttrykk"
 
 #. module: base
 #: field:publisher_warranty.contract,date_start:0
 msgid "Starting Date"
-msgstr ""
+msgstr "Startdato"
 
 #. module: base
 #: help:res.partner,website:0
 msgid "Website of Partner"
-msgstr ""
+msgstr "Partners webside"
 
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_5
@@ -7205,28 +7296,28 @@ msgstr ""
 #: selection:res.partner.title,domain:0
 #: model:res.request.link,name:base.req_link_partner
 msgid "Partner"
-msgstr ""
+msgstr "Partner"
 
 #. module: base
 #: model:res.country,name:base.tr
 msgid "Turkey"
-msgstr ""
+msgstr "Tyrkia"
 
 #. module: base
 #: model:res.country,name:base.fk
 msgid "Falkland Islands"
-msgstr ""
+msgstr "Falklandsøyene"
 
 #. module: base
 #: model:res.country,name:base.lb
 msgid "Lebanon"
-msgstr ""
+msgstr "Libanon"
 
 #. module: base
 #: view:ir.actions.report.xml:0
 #: field:ir.actions.report.xml,report_type:0
 msgid "Report Type"
-msgstr ""
+msgstr "Rapporttype"
 
 #. module: base
 #: field:ir.actions.todo,state:0
@@ -7242,28 +7333,28 @@ msgstr ""
 #: field:workflow.instance,state:0
 #: field:workflow.workitem,state:0
 msgid "State"
-msgstr ""
+msgstr "Bekreft"
 
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Galician / Galego"
-msgstr ""
+msgstr "Galicisk / Galego"
 
 #. module: base
 #: model:res.country,name:base.no
 msgid "Norway"
-msgstr ""
+msgstr "Norge"
 
 #. module: base
 #: view:res.lang:0
 msgid "4.  %b, %B         ==> Dec, December"
-msgstr ""
+msgstr "4.  %b, %B         ==> Dec, December"
 
 #. module: base
 #: view:base.language.install:0
 #: model:ir.ui.menu,name:base.menu_view_base_language_install
 msgid "Load an Official Translation"
-msgstr ""
+msgstr "Last inn en offisiell oversettelse"
 
 #. module: base
 #: view:res.currency:0
@@ -7278,12 +7369,12 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.kg
 msgid "Kyrgyz Republic (Kyrgyzstan)"
-msgstr ""
+msgstr "Kirgisistan, Republikken Kirgisistan"
 
 #. module: base
 #: selection:res.request,state:0
 msgid "waiting"
-msgstr ""
+msgstr "venter"
 
 #. module: base
 #: field:ir.actions.report.xml,report_file:0
@@ -7293,7 +7384,7 @@ msgstr ""
 #. module: base
 #: model:ir.model,name:base.model_workflow_triggers
 msgid "workflow.triggers"
-msgstr ""
+msgstr "workflow.triggers"
 
 #. module: base
 #: code:addons/base/ir/ir_model.py:62
@@ -7304,7 +7395,7 @@ msgstr ""
 #. module: base
 #: view:ir.attachment:0
 msgid "Created"
-msgstr ""
+msgstr "Opprettet"
 
 #. module: base
 #: help:ir.actions.wizard,multi:0
@@ -7312,31 +7403,33 @@ msgid ""
 "If set to true, the wizard will not be displayed on the right toolbar of a "
 "form view."
 msgstr ""
+"Hvis satt til sann, så vil ikke veiviseren blir vist på den høyre "
+"verktøylinjen i skjemavisning."
 
 #. module: base
 #: view:base.language.import:0
 msgid "- type,name,res_id,src,value"
-msgstr ""
+msgstr "- type,name,res_id,src,value"
 
 #. module: base
 #: model:res.country,name:base.hm
 msgid "Heard and McDonald Islands"
-msgstr ""
+msgstr "Heard- og McDonaldøyene"
 
 #. module: base
 #: field:ir.actions.act_window,view_id:0
 msgid "View Ref."
-msgstr ""
+msgstr "Visnings ref:"
 
 #. module: base
 #: selection:ir.translation,type:0
 msgid "Selection"
-msgstr ""
+msgstr "Valg"
 
 #. module: base
 #: field:res.company,rml_header1:0
 msgid "Report Header"
-msgstr ""
+msgstr "Topptekst i rapport"
 
 #. module: base
 #: field:ir.actions.act_window,type:0
@@ -7349,7 +7442,7 @@ msgstr ""
 #: field:ir.actions.url,type:0
 #: field:ir.actions.wizard,type:0
 msgid "Action Type"
-msgstr ""
+msgstr "Handlingstype"
 
 #. module: base
 #: code:addons/base/module/module.py:268
@@ -7364,68 +7457,68 @@ msgstr ""
 #: model:ir.actions.act_window,name:base.action_view_base_import_language
 #: model:ir.ui.menu,name:base.menu_view_base_import_language
 msgid "Import Translation"
-msgstr ""
+msgstr "Importer oversettelse"
 
 #. module: base
 #: field:res.partner.bank.type,field_ids:0
 msgid "Type fields"
-msgstr ""
+msgstr "Felttyper"
 
 #. module: base
 #: view:ir.module.module:0
 #: field:ir.module.module,category_id:0
 msgid "Category"
-msgstr ""
+msgstr "Kategori"
 
 #. module: base
 #: view:ir.attachment:0
 #: selection:ir.attachment,type:0
 #: selection:ir.property,type:0
 msgid "Binary"
-msgstr ""
+msgstr "Binær"
 
 #. module: base
 #: field:ir.actions.server,sms:0
 #: selection:ir.actions.server,state:0
 msgid "SMS"
-msgstr ""
+msgstr "SMS"
 
 #. module: base
 #: model:res.country,name:base.cr
 msgid "Costa Rica"
-msgstr ""
+msgstr "Costa Rica"
 
 #. module: base
 #: view:workflow.activity:0
 msgid "Conditions"
-msgstr ""
+msgstr "Vilkår"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_partner_other_form
 msgid "Other Partners"
-msgstr ""
+msgstr "Andre partnere"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_currency_form
 #: model:ir.ui.menu,name:base.menu_action_currency_form
 #: view:res.currency:0
 msgid "Currencies"
-msgstr ""
+msgstr "Valuta"
 
 #. module: base
 #: sql_constraint:res.groups:0
 msgid "The name of the group must be unique !"
-msgstr ""
+msgstr "Navnet på gruppen må være unikt !"
 
 #. module: base
 #: view:ir.sequence:0
 msgid "Hour 00->12: %(h12)s"
-msgstr ""
+msgstr "Time 00->12: %(h12)s"
 
 #. module: base
 #: help:res.partner.address,active:0
 msgid "Uncheck the active field to hide the contact."
-msgstr ""
+msgstr "Fjern avkrysningen fra aktivt felt for å skjule kontakt."
 
 #. module: base
 #: model:ir.model,name:base.model_res_widget_wizard
@@ -7435,17 +7528,17 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.dk
 msgid "Denmark"
-msgstr ""
+msgstr "Danmark"
 
 #. module: base
 #: field:res.country,code:0
 msgid "Country Code"
-msgstr ""
+msgstr "Landekode"
 
 #. module: base
 #: model:ir.model,name:base.model_workflow_instance
 msgid "workflow.instance"
-msgstr ""
+msgstr "workflow.instance"
 
 #. module: base
 #: code:addons/orm.py:278
@@ -7456,7 +7549,7 @@ msgstr ""
 #. module: base
 #: view:res.lang:0
 msgid "10. %S              ==> 20"
-msgstr ""
+msgstr "10. %S              ==> 20"
 
 #. module: base
 #: code:addons/fields.py:106
@@ -7480,12 +7573,12 @@ msgstr ""
 #. module: base
 #: model:res.partner.title,name:base.res_partner_title_madam
 msgid "Madam"
-msgstr ""
+msgstr "Fru"
 
 #. module: base
 #: model:res.country,name:base.ee
 msgid "Estonia"
-msgstr ""
+msgstr "Estland"
 
 #. module: base
 #: model:ir.ui.menu,name:base.dashboard
@@ -7501,27 +7594,27 @@ msgstr ""
 #: field:res.config.users,new_password:0
 #: field:res.users,new_password:0
 msgid "Change password"
-msgstr ""
+msgstr "Endre passord"
 
 #. module: base
 #: model:res.country,name:base.nl
 msgid "Netherlands"
-msgstr ""
+msgstr "Nederland"
 
 #. module: base
 #: model:ir.ui.menu,name:base.next_id_4
 msgid "Low Level Objects"
-msgstr ""
+msgstr "Lavnivå objekter"
 
 #. module: base
 #: view:res.company:0
 msgid "Your Logo - Use a size of about 450x150 pixels."
-msgstr ""
+msgstr "Din egen logo - Bruk en logo med størrelse på ca 450x150 pixler"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_values
 msgid "ir.values"
-msgstr ""
+msgstr "ir.values"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -7546,7 +7639,7 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.cd
 msgid "Congo, The Democratic Republic of the"
-msgstr ""
+msgstr "Kongo"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -7558,23 +7651,23 @@ msgstr ""
 #: field:res.request,body:0
 #: field:res.request.history,req_id:0
 msgid "Request"
-msgstr ""
+msgstr "Forespørsel"
 
 #. module: base
 #: model:res.country,name:base.jp
 msgid "Japan"
-msgstr ""
+msgstr "Japan"
 
 #. module: base
 #: field:ir.cron,numbercall:0
 msgid "Number of Calls"
-msgstr ""
+msgstr "Antall samtaler"
 
 #. module: base
 #: view:base.module.upgrade:0
 #: field:base.module.upgrade,module_info:0
 msgid "Modules to update"
-msgstr ""
+msgstr "Moduler å oppdatere"
 
 #. module: base
 #: help:ir.actions.server,sequence:0
@@ -7582,26 +7675,28 @@ msgid ""
 "Important when you deal with multiple actions, the execution order will be "
 "decided based on this, low number is higher priority."
 msgstr ""
+"Viktig ved flere handlinger. Rekkefølgen på avvikling baseres på dette. Lavt "
+"nummer betyr høyere prioritet."
 
 #. module: base
 #: field:ir.actions.report.xml,header:0
 msgid "Add RML header"
-msgstr ""
+msgstr "topptekst for kolonne i tabell"
 
 #. module: base
 #: model:res.country,name:base.gr
 msgid "Greece"
-msgstr ""
+msgstr "Hellas"
 
 #. module: base
 #: field:res.request,trigger_date:0
 msgid "Trigger Date"
-msgstr ""
+msgstr "Trigger dato"
 
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Croatian / hrvatski jezik"
-msgstr ""
+msgstr "Kroatisk / hrvatski jezik"
 
 #. module: base
 #: field:base.language.install,overwrite:0
@@ -7611,7 +7706,7 @@ msgstr ""
 #. module: base
 #: help:ir.actions.server,code:0
 msgid "Python code to be executed"
-msgstr ""
+msgstr "Python kode som skal eksekveres"
 
 #. module: base
 #: sql_constraint:res.country:0
@@ -7621,45 +7716,45 @@ msgstr ""
 #. module: base
 #: selection:ir.module.module.dependency,state:0
 msgid "Uninstallable"
-msgstr ""
+msgstr "ikke installerbar"
 
 #. module: base
 #: view:res.partner.category:0
 msgid "Partner Category"
-msgstr ""
+msgstr "Gullpartner"
 
 #. module: base
 #: view:ir.actions.server:0
 #: selection:ir.actions.server,state:0
 msgid "Trigger"
-msgstr ""
+msgstr "Trigger"
 
 #. module: base
 #: model:ir.model,name:base.model_base_module_update
 msgid "Update Module"
-msgstr ""
+msgstr "Oppdater modul"
 
 #. module: base
 #: view:ir.model.fields:0
 #: field:ir.model.fields,translate:0
 msgid "Translate"
-msgstr ""
+msgstr "Oversett"
 
 #. module: base
 #: field:res.request.history,body:0
 msgid "Body"
-msgstr ""
+msgstr "Innhold"
 
 #. module: base
 #: view:partner.wizard.spam:0
 msgid "Send Email"
-msgstr ""
+msgstr "Send epost"
 
 #. module: base
 #: field:res.config.users,menu_id:0
 #: field:res.users,menu_id:0
 msgid "Menu Action"
-msgstr ""
+msgstr "Menyvalg"
 
 #. module: base
 #: help:ir.model.fields,selection:0
@@ -7672,7 +7767,7 @@ msgstr ""
 #. module: base
 #: selection:base.language.export,state:0
 msgid "choose"
-msgstr ""
+msgstr "velg"
 
 #. module: base
 #: help:ir.model,osv_memory:0
@@ -7685,14 +7780,14 @@ msgstr ""
 #: field:res.partner,child_ids:0
 #: field:res.request,ref_partner_id:0
 msgid "Partner Ref."
-msgstr ""
+msgstr "Partner ref."
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_partner_supplier_form
 #: model:ir.ui.menu,name:base.menu_procurement_management_supplier_name
 #: view:res.partner:0
 msgid "Suppliers"
-msgstr ""
+msgstr "Leverandører"
 
 #. module: base
 #: view:publisher_warranty.contract.wizard:0
@@ -7702,54 +7797,54 @@ msgstr ""
 #. module: base
 #: field:res.request,ref_doc2:0
 msgid "Document Ref 2"
-msgstr ""
+msgstr "Dokumentref. 2"
 
 #. module: base
 #: field:res.request,ref_doc1:0
 msgid "Document Ref 1"
-msgstr ""
+msgstr "Dokumentref. 1"
 
 #. module: base
 #: model:res.country,name:base.ga
 msgid "Gabon"
-msgstr ""
+msgstr "Gabon"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_model_data
 msgid "ir.model.data"
-msgstr ""
+msgstr "ir.model.data"
 
 #. module: base
 #: view:ir.model:0
 #: view:ir.rule:0
 #: view:res.groups:0
 msgid "Access Rights"
-msgstr ""
+msgstr "Tilgangsrettigheter"
 
 #. module: base
 #: model:res.country,name:base.gl
 msgid "Greenland"
-msgstr ""
+msgstr "Grønnland"
 
 #. module: base
 #: field:res.partner.bank,acc_number:0
 msgid "Account Number"
-msgstr ""
+msgstr "Kontonummer"
 
 #. module: base
 #: view:res.lang:0
 msgid "1.  %c              ==> Fri Dec  5 18:25:20 2008"
-msgstr ""
+msgstr "1.  %c              ==> Fri Dec  5 18:25:20 2008"
 
 #. module: base
 #: model:res.country,name:base.nc
 msgid "New Caledonia (French)"
-msgstr ""
+msgstr "Ny-Caledonia"
 
 #. module: base
 #: model:res.country,name:base.cy
 msgid "Cyprus"
-msgstr ""
+msgstr "Kypros"
 
 #. module: base
 #: view:base.module.import:0
@@ -7764,18 +7859,18 @@ msgstr ""
 #: field:partner.wizard.spam,subject:0
 #: field:res.request,name:0
 msgid "Subject"
-msgstr ""
+msgstr "Emne"
 
 #. module: base
 #: field:res.request,act_from:0
 #: field:res.request.history,act_from:0
 msgid "From"
-msgstr ""
+msgstr "Fra"
 
 #. module: base
 #: view:res.users:0
 msgid "Preferences"
-msgstr ""
+msgstr "Oppsett"
 
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_consumers0
@@ -7786,7 +7881,7 @@ msgstr ""
 #: view:res.config:0
 #: wizard_button:server.action.create,init,step_1:0
 msgid "Next"
-msgstr ""
+msgstr "Neste"
 
 #. module: base
 #: help:ir.cron,function:0
@@ -7811,7 +7906,7 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.cn
 msgid "China"
-msgstr ""
+msgstr "Kina"
 
 #. module: base
 #: code:addons/base/res/res_user.py:516
@@ -7824,12 +7919,12 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.eh
 msgid "Western Sahara"
-msgstr ""
+msgstr "Vest-Sahara"
 
 #. module: base
 #: model:ir.model,name:base.model_workflow
 msgid "workflow"
-msgstr ""
+msgstr "arbeidsflyt"
 
 #. module: base
 #: model:ir.actions.act_window,help:base.action_res_company_form
@@ -7841,7 +7936,7 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.id
 msgid "Indonesia"
-msgstr ""
+msgstr "Indonesia"
 
 #. module: base
 #: view:base.update.translations:0
@@ -7850,6 +7945,9 @@ msgid ""
 "you can then add translations manually or perform a complete export (as a "
 "template for a new language example)."
 msgstr ""
+"Denne veiviseren vil oppdage nye betegnelser i applikasjonen slik at du kan "
+"oppdatere dem manuelt eller foreta en komplett eksport (som en mal for et "
+"nytt språk f.eks)."
 
 #. module: base
 #: help:multi_company.default,expression:0
@@ -7861,7 +7959,7 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.bg
 msgid "Bulgaria"
-msgstr ""
+msgstr "Bulgaria"
 
 #. module: base
 #: view:publisher_warranty.contract.wizard:0
@@ -7871,12 +7969,12 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.ao
 msgid "Angola"
-msgstr ""
+msgstr "Angola"
 
 #. module: base
 #: model:res.country,name:base.tf
 msgid "French Southern Territories"
-msgstr ""
+msgstr "Franske Sørlige Terrotorier"
 
 #. module: base
 #: model:ir.model,name:base.model_res_currency
@@ -7886,38 +7984,38 @@ msgstr ""
 #: field:res.currency,name:0
 #: field:res.currency.rate,currency_id:0
 msgid "Currency"
-msgstr ""
+msgstr "Valuta"
 
 #. module: base
 #: field:res.partner.canal,name:0
 msgid "Channel Name"
-msgstr ""
+msgstr "Kanalnavn"
 
 #. module: base
 #: view:res.lang:0
 msgid "5.  %y, %Y         ==> 08, 2008"
-msgstr ""
+msgstr "5.  %y, %Y         ==> 08, 2008"
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_ltd
 msgid "ltd"
-msgstr ""
+msgstr "AS"
 
 #. module: base
 #: field:ir.values,res_id:0
 #: field:res.log,res_id:0
 msgid "Object ID"
-msgstr ""
+msgstr "Objekt-ID"
 
 #. module: base
 #: view:res.company:0
 msgid "Landscape"
-msgstr ""
+msgstr "Landskap/Liggende"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_administration
 msgid "Administration"
-msgstr ""
+msgstr "Administrasjon"
 
 #. module: base
 #: view:base.module.update:0
@@ -7927,7 +8025,7 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.ir
 msgid "Iran"
-msgstr ""
+msgstr "Iran"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.res_widget_user_act_window
@@ -7945,7 +8043,7 @@ msgstr ""
 #: field:ir.ui.menu,icon_pict:0
 #: field:publisher_warranty.contract.wizard,state:0
 msgid "unknown"
-msgstr ""
+msgstr "ukjent"
 
 #. module: base
 #: field:res.currency,symbol:0
@@ -7966,17 +8064,17 @@ msgstr ""
 #. module: base
 #: field:ir.ui.view_sc,res_id:0
 msgid "Resource Ref."
-msgstr ""
+msgstr "Ressures ref."
 
 #. module: base
 #: model:res.country,name:base.ki
 msgid "Kiribati"
-msgstr ""
+msgstr "Kiribati"
 
 #. module: base
 #: model:res.country,name:base.iq
 msgid "Iraq"
-msgstr ""
+msgstr "Irak"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_association
@@ -7986,7 +8084,7 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.cl
 msgid "Chile"
-msgstr ""
+msgstr "Chile"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_address_book
@@ -7998,17 +8096,17 @@ msgstr ""
 #. module: base
 #: model:ir.model,name:base.model_ir_sequence_type
 msgid "ir.sequence.type"
-msgstr ""
+msgstr "ir.sequence.type"
 
 #. module: base
 #: selection:base.language.export,format:0
 msgid "CSV File"
-msgstr ""
+msgstr "CSV fil"
 
 #. module: base
 #: field:res.company,account_no:0
 msgid "Account No."
-msgstr ""
+msgstr "Kontonummer"
 
 #. module: base
 #: code:addons/base/res/res_lang.py:157
@@ -8019,32 +8117,32 @@ msgstr ""
 #. module: base
 #: selection:ir.model,state:0
 msgid "Base Object"
-msgstr ""
+msgstr "redundant objekt"
 
 #. module: base
 #: report:ir.module.reference.graph:0
 msgid "Dependencies :"
-msgstr ""
+msgstr "Avhengigheter :"
 
 #. module: base
 #: field:ir.model.fields,field_description:0
 msgid "Field Label"
-msgstr ""
+msgstr "Feltbetegnelse"
 
 #. module: base
 #: model:res.country,name:base.dj
 msgid "Djibouti"
-msgstr ""
+msgstr "Djibouti"
 
 #. module: base
 #: field:ir.translation,value:0
 msgid "Translation Value"
-msgstr ""
+msgstr "Oversettelses verdi"
 
 #. module: base
 #: model:res.country,name:base.ag
 msgid "Antigua and Barbuda"
-msgstr ""
+msgstr "Antigua og Barbuda"
 
 #. module: base
 #: code:addons/orm.py:3166
@@ -8057,7 +8155,7 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.zr
 msgid "Zaire"
-msgstr ""
+msgstr "Zaire"
 
 #. module: base
 #: field:ir.model.data,res_id:0
@@ -8065,13 +8163,13 @@ msgstr ""
 #: field:workflow.instance,res_id:0
 #: field:workflow.triggers,res_id:0
 msgid "Resource ID"
-msgstr ""
+msgstr "Ressurs ID"
 
 #. module: base
 #: view:ir.cron:0
 #: field:ir.model,info:0
 msgid "Information"
-msgstr ""
+msgstr "Informasjon"
 
 #. module: base
 #: view:res.widget.user:0
@@ -8081,22 +8179,22 @@ msgstr ""
 #. module: base
 #: view:base.module.update:0
 msgid "Update Module List"
-msgstr ""
+msgstr "Oppdater liste over moduler"
 
 #. module: base
 #: selection:res.partner.address,type:0
 msgid "Other"
-msgstr ""
+msgstr "Andre"
 
 #. module: base
 #: view:res.request:0
 msgid "Reply"
-msgstr ""
+msgstr "Svar"
 
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Turkish / Türkçe"
-msgstr ""
+msgstr "Tyrkisk / Türkçe"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_workflow_activity_form
@@ -8104,12 +8202,12 @@ msgstr ""
 #: view:workflow:0
 #: field:workflow,activities:0
 msgid "Activities"
-msgstr ""
+msgstr "Aktiviteter"
 
 #. module: base
 #: field:ir.actions.act_window,auto_refresh:0
 msgid "Auto-Refresh"
-msgstr ""
+msgstr "Oppdater automatisk"
 
 #. module: base
 #: code:addons/base/ir/ir_model.py:62
@@ -8151,32 +8249,32 @@ msgstr ""
 #: model:ir.ui.menu,name:base.next_id_6
 #: view:workflow.activity:0
 msgid "Actions"
-msgstr ""
+msgstr "Handinger"
 
 #. module: base
 #: selection:res.request,priority:0
 msgid "High"
-msgstr ""
+msgstr "Høy"
 
 #. module: base
 #: field:ir.exports.line,export_id:0
 msgid "Export"
-msgstr ""
+msgstr "Eksport"
 
 #. module: base
 #: model:res.country,name:base.hr
 msgid "Croatia"
-msgstr ""
+msgstr "Kroatia"
 
 #. module: base
 #: help:res.bank,bic:0
 msgid "Bank Identifier Code"
-msgstr ""
+msgstr "Bank ID"
 
 #. module: base
 #: model:res.country,name:base.tm
 msgid "Turkmenistan"
-msgstr ""
+msgstr "Turkmenistan"
 
 #. module: base
 #: code:addons/base/ir/ir_actions.py:597
@@ -8208,17 +8306,17 @@ msgstr ""
 #: code:addons/orm.py:3199
 #, python-format
 msgid "Error"
-msgstr ""
+msgstr "Feil"
 
 #. module: base
 #: model:res.country,name:base.pm
 msgid "Saint Pierre and Miquelon"
-msgstr ""
+msgstr "Saint Pierre og Miquelon"
 
 #. module: base
 #: help:ir.actions.report.xml,header:0
 msgid "Add or not the coporate RML header"
-msgstr ""
+msgstr "Legg til, eller ikke RML toppteksten til selskapet"
 
 #. module: base
 #: help:workflow.transition,act_to:0
@@ -8229,42 +8327,42 @@ msgstr ""
 #: view:base.module.update:0
 #: view:base.update.translations:0
 msgid "Update"
-msgstr ""
+msgstr "Oppdater"
 
 #. module: base
 #: model:ir.actions.report.xml,name:base.ir_module_reference_print
 msgid "Technical guide"
-msgstr ""
+msgstr "Teknisk veiledning"
 
 #. module: base
 #: model:res.country,name:base.tz
 msgid "Tanzania"
-msgstr ""
+msgstr "Tanzania"
 
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Danish / Dansk"
-msgstr ""
+msgstr "Dansk"
 
 #. module: base
 #: selection:ir.model.fields,select_level:0
 msgid "Advanced Search (deprecated)"
-msgstr ""
+msgstr "Avansert søk"
 
 #. module: base
 #: model:res.country,name:base.cx
 msgid "Christmas Island"
-msgstr ""
+msgstr "Juleøyene"
 
 #. module: base
 #: view:ir.actions.server:0
 msgid "Other Actions Configuration"
-msgstr ""
+msgstr "Annen handlingskonfigurasjon"
 
 #. module: base
 #: view:res.config.installer:0
 msgid "Install Modules"
-msgstr ""
+msgstr "Installer moduler"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.res_partner_canal-act
@@ -8272,7 +8370,7 @@ msgstr ""
 #: model:ir.ui.menu,name:base.menu_res_partner_canal-act
 #: view:res.partner.canal:0
 msgid "Channels"
-msgstr ""
+msgstr "Kanaler"
 
 #. module: base
 #: view:ir.ui.view:0
@@ -8288,7 +8386,7 @@ msgstr ""
 #. module: base
 #: view:ir.module.module:0
 msgid "Schedule for Installation"
-msgstr ""
+msgstr "Planlegg installasjon"
 
 #. module: base
 #: model:ir.model,name:base.model_partner_wizard_ean_check
@@ -8299,7 +8397,7 @@ msgstr ""
 #: sql_constraint:res.config.users:0
 #: sql_constraint:res.users:0
 msgid "You can not have two users with the same login !"
-msgstr ""
+msgstr "Du kan ikke ha to brukere med samme login !"
 
 #. module: base
 #: model:ir.model,name:base.model_multi_company_default
@@ -8309,7 +8407,7 @@ msgstr ""
 #. module: base
 #: view:res.request:0
 msgid "Send"
-msgstr ""
+msgstr "Send"
 
 #. module: base
 #: field:res.config.users,menu_tips:0
@@ -8320,22 +8418,22 @@ msgstr ""
 #. module: base
 #: field:ir.translation,src:0
 msgid "Source"
-msgstr ""
+msgstr "Kilde"
 
 #. module: base
 #: help:res.partner.address,partner_id:0
 msgid "Keep empty for a private address, not related to partner."
-msgstr ""
+msgstr "Behold blank for en private adresse ikke relatert til en partner"
 
 #. module: base
 #: model:res.country,name:base.vu
 msgid "Vanuatu"
-msgstr ""
+msgstr "Vanuatu"
 
 #. module: base
 #: view:res.company:0
 msgid "Internal Header/Footer"
-msgstr ""
+msgstr "Intern topptekst/bunntekst"
 
 #. module: base
 #: code:addons/base/module/wizard/base_export_language.py:59
@@ -8344,33 +8442,35 @@ msgid ""
 "Save this document to a .tgz file. This archive containt UTF-8 %s files and "
 "may be uploaded to launchpad."
 msgstr ""
+"Lagre dette dokumentet til en .tgz fil. Arkivet inneholder UTF-8 %s filer og "
+"kan lastes opp til launchpad."
 
 #. module: base
 #: view:base.module.upgrade:0
 msgid "Start configuration"
-msgstr ""
+msgstr "Start konfigurasjon"
 
 #. module: base
 #: view:base.language.export:0
 msgid "_Export"
-msgstr ""
+msgstr "_Eksporter"
 
 #. module: base
 #: field:base.language.install,state:0
 #: field:base.module.import,state:0
 #: field:base.module.update,state:0
 msgid "state"
-msgstr ""
+msgstr "status"
 
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Catalan / Català"
-msgstr ""
+msgstr "Catalan / Català"
 
 #. module: base
 #: model:res.country,name:base.do
 msgid "Dominican Republic"
-msgstr ""
+msgstr "Den dominikanske republikk"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -8388,7 +8488,7 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.sa
 msgid "Saudi Arabia"
-msgstr ""
+msgstr "Saudi Arabia"
 
 #. module: base
 #: help:res.partner,supplier:0
@@ -8396,11 +8496,14 @@ msgid ""
 "Check this box if the partner is a supplier. If it's not checked, purchase "
 "people will not see it when encoding a purchase order."
 msgstr ""
+"Kryss av denne boksen dersom partneren er en leverandør. Hvis den ikke er "
+"avkrysset så vil innkjøpsavdelingen ikke se den ved utarbeidelse av "
+"innkjøpsordre."
 
 #. module: base
 #: field:ir.model.fields,relation_field:0
 msgid "Relation Field"
-msgstr ""
+msgstr "Relasjonsfelt"
 
 #. module: base
 #: view:res.partner.event:0
@@ -8416,23 +8519,23 @@ msgstr ""
 #. module: base
 #: field:workflow.triggers,instance_id:0
 msgid "Destination Instance"
-msgstr ""
+msgstr "workflow.instance"
 
 #. module: base
 #: field:ir.actions.act_window,multi:0
 #: field:ir.actions.wizard,multi:0
 msgid "Action on Multiple Doc."
-msgstr ""
+msgstr "Handling på flere dok."
 
 #. module: base
 #: view:base.language.export:0
 msgid "https://translations.launchpad.net/openobject"
-msgstr ""
+msgstr "https://translations.launchpad.net/openobject"
 
 #. module: base
 #: field:ir.actions.report.xml,report_xml:0
 msgid "XML path"
-msgstr ""
+msgstr "Sti til XML"
 
 #. module: base
 #: selection:ir.actions.todo,restart:0
@@ -8442,31 +8545,31 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.gn
 msgid "Guinea"
-msgstr ""
+msgstr "Guinea"
 
 #. module: base
 #: model:res.country,name:base.lu
 msgid "Luxembourg"
-msgstr ""
+msgstr "Luxembourg"
 
 #. 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 "Type handling eller knapp på klientsiden som vil trigge handlingen."
 
 #. module: base
 #: code:addons/base/ir/ir_ui_menu.py:285
 #, python-format
 msgid "Error ! You can not create recursive Menu."
-msgstr ""
+msgstr "Feil ! Du kan ikke lage rekursive menyer."
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_publisher_warranty_contract_add_wizard
 #: model:ir.ui.menu,name:base.menu_publisher_warranty_contract_add
 #: view:publisher_warranty.contract.wizard:0
 msgid "Register a Contract"
-msgstr ""
+msgstr "Registrer en kontrakt"
 
 #. module: base
 #: view:ir.rule:0
@@ -8484,14 +8587,14 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.sv
 msgid "El Salvador"
-msgstr ""
+msgstr "El Salvador"
 
 #. module: base
 #: field:res.bank,phone:0
 #: field:res.partner,phone:0
 #: field:res.partner.address,phone:0
 msgid "Phone"
-msgstr ""
+msgstr "Telefon"
 
 #. module: base
 #: field:ir.cron,active:0
@@ -8509,12 +8612,12 @@ msgstr ""
 #: view:workflow.instance:0
 #: view:workflow.workitem:0
 msgid "Active"
-msgstr ""
+msgstr "Aktiv"
 
 #. module: base
 #: model:res.country,name:base.th
 msgid "Thailand"
-msgstr ""
+msgstr "Thailand"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_crm_config_lead
@@ -8535,29 +8638,29 @@ msgstr ""
 #: selection:workflow.activity,join_mode:0
 #: selection:workflow.activity,split_mode:0
 msgid "And"
-msgstr ""
+msgstr "Og"
 
 #. module: base
 #: field:ir.model.fields,relation:0
 msgid "Object Relation"
-msgstr ""
+msgstr "Objektrelasjon"
 
 #. module: base
 #: view:ir.rule:0
 #: view:res.partner:0
 msgid "General"
-msgstr ""
+msgstr "Generell"
 
 #. module: base
 #: model:res.country,name:base.uz
 msgid "Uzbekistan"
-msgstr ""
+msgstr "Uzbekistan"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_actions_act_window
 #: selection:ir.ui.menu,action:0
 msgid "ir.actions.act_window"
-msgstr ""
+msgstr "ir.actions.act_window"
 
 #. module: base
 #: field:ir.rule,perm_create:0
@@ -8567,17 +8670,17 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.vi
 msgid "Virgin Islands (USA)"
-msgstr ""
+msgstr "Jomfruøyene"
 
 #. module: base
 #: model:res.country,name:base.tw
 msgid "Taiwan"
-msgstr ""
+msgstr "Taiwan"
 
 #. module: base
 #: model:ir.model,name:base.model_res_currency_rate
 msgid "Currency Rate"
-msgstr ""
+msgstr "Valutakurs"
 
 #. module: base
 #: model:ir.actions.act_window,help:base.grant_menu_access
@@ -8592,7 +8695,7 @@ msgstr ""
 #. module: base
 #: field:ir.ui.view,field_parent:0
 msgid "Child Field"
-msgstr ""
+msgstr "Underordnet felt"
 
 #. module: base
 #: field:ir.actions.act_window,usage:0
@@ -8602,40 +8705,40 @@ msgstr ""
 #: field:ir.actions.server,usage:0
 #: field:ir.actions.wizard,usage:0
 msgid "Action Usage"
-msgstr ""
+msgstr "Anvendelse av handling"
 
 #. module: base
 #: model:ir.model,name:base.model_workflow_workitem
 msgid "workflow.workitem"
-msgstr ""
+msgstr "workflow.workitem"
 
 #. module: base
 #: selection:ir.module.module,state:0
 msgid "Not Installable"
-msgstr ""
+msgstr "Ikke tilgjengelig for installasjon"
 
 #. module: base
 #: report:ir.module.reference.graph:0
 msgid "View :"
-msgstr ""
+msgstr "Vis :"
 
 #. module: base
 #: field:ir.model.fields,view_load:0
 msgid "View Auto-Load"
-msgstr ""
+msgstr "Modell for ikonvisning"
 
 #. module: base
 #: code:addons/base/ir/ir_model.py:232
 #, python-format
 msgid "You cannot remove the field '%s' !"
-msgstr ""
+msgstr "Du kan ikke fjerne feltet '%s' !"
 
 #. module: base
 #: field:ir.exports,resource:0
 #: view:ir.property:0
 #: field:ir.property,res_id:0
 msgid "Resource"
-msgstr ""
+msgstr "Ressurs"
 
 #. module: base
 #: field:ir.ui.menu,web_icon:0
@@ -8676,24 +8779,24 @@ msgstr ""
 #. module: base
 #: model:ir.model,name:base.model_base_module_configuration
 msgid "base.module.configuration"
-msgstr ""
+msgstr "base.module.configuration"
 
 #. module: base
 #: field:base.language.export,name:0
 #: field:ir.attachment,datas_fname:0
 msgid "Filename"
-msgstr ""
+msgstr "Filnavn"
 
 #. module: base
 #: field:ir.model,access_ids:0
 #: view:ir.model.access:0
 msgid "Access"
-msgstr ""
+msgstr "Tilgang"
 
 #. module: base
 #: model:res.country,name:base.sk
 msgid "Slovak Republic"
-msgstr ""
+msgstr "Slovakia"
 
 #. module: base
 #: model:ir.ui.menu,name:base.publisher_warranty
@@ -8703,27 +8806,27 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.aw
 msgid "Aruba"
-msgstr ""
+msgstr "Aruba"
 
 #. module: base
 #: model:res.country,name:base.ar
 msgid "Argentina"
-msgstr ""
+msgstr "Argentina"
 
 #. module: base
 #: field:res.groups,name:0
 msgid "Group Name"
-msgstr ""
+msgstr "Gruppenavn"
 
 #. module: base
 #: model:res.country,name:base.bh
 msgid "Bahrain"
-msgstr ""
+msgstr "Bahrain"
 
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_12
 msgid "Segmentation"
-msgstr ""
+msgstr "Segmentering"
 
 #. module: base
 #: view:ir.attachment:0
@@ -8740,12 +8843,12 @@ msgstr ""
 #: view:res.users:0
 #: field:res.users,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Firma"
 
 #. module: base
 #: view:res.users:0
 msgid "Email & Signature"
-msgstr ""
+msgstr "Epost & Signatur"
 
 #. module: base
 #: view:publisher_warranty.contract:0
@@ -8770,17 +8873,17 @@ msgstr ""
 #. module: base
 #: field:ir.actions.act_window,limit:0
 msgid "Limit"
-msgstr ""
+msgstr "Grense"
 
 #. module: base
 #: help:ir.actions.server,wkf_model_id:0
 msgid "Workflow to be executed on this model."
-msgstr ""
+msgstr "Arbeidsflyt som skal utføres på denne modellen."
 
 #. module: base
 #: model:res.country,name:base.jm
 msgid "Jamaica"
-msgstr ""
+msgstr "Jamaica"
 
 #. module: base
 #: model:ir.actions.act_window,help:base.action_partner_category_form
@@ -8794,13 +8897,13 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.az
 msgid "Azerbaijan"
-msgstr ""
+msgstr "Aserbajdsjan"
 
 #. module: base
 #: code:addons/base/res/partner/partner.py:250
 #, python-format
 msgid "Warning"
-msgstr ""
+msgstr "Advarsel"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -8810,13 +8913,13 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.vg
 msgid "Virgin Islands (British)"
-msgstr ""
+msgstr "Jomfruøyene"
 
 #. module: base
 #: view:ir.property:0
 #: model:ir.ui.menu,name:base.next_id_15
 msgid "Parameters"
-msgstr ""
+msgstr "Parametere"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -8826,7 +8929,7 @@ msgstr ""
 #. module: base
 #: view:ir.actions.server:0
 msgid "Trigger Configuration"
-msgstr ""
+msgstr "Trigger konfigurasjon"
 
 #. module: base
 #: model:ir.actions.act_window,help:base.action_partner_supplier_form
@@ -8840,22 +8943,22 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.rw
 msgid "Rwanda"
-msgstr ""
+msgstr "Rwanda"
 
 #. module: base
 #: view:ir.sequence:0
 msgid "Day of the week (0:Monday): %(weekday)s"
-msgstr ""
+msgstr "Dag i uken (0:Mandag): %(weekday)s"
 
 #. module: base
 #: model:res.country,name:base.ck
 msgid "Cook Islands"
-msgstr ""
+msgstr "Cookøyene"
 
 #. module: base
 #: field:ir.model.data,noupdate:0
 msgid "Non Updatable"
-msgstr ""
+msgstr "Ikke oppdaterbar"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -8865,17 +8968,17 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.sg
 msgid "Singapore"
-msgstr ""
+msgstr "Singapore"
 
 #. module: base
 #: selection:ir.actions.act_window,target:0
 msgid "Current Window"
-msgstr ""
+msgstr "Aktivt vindu"
 
 #. module: base
 #: view:ir.values:0
 msgid "Action Source"
-msgstr ""
+msgstr "Handlingskilde"
 
 #. module: base
 #: view:res.config.view:0
@@ -8895,18 +8998,18 @@ msgstr ""
 #: field:res.partner.address,country_id:0
 #: field:res.partner.bank,country_id:0
 msgid "Country"
-msgstr ""
+msgstr "Land"
 
 #. module: base
 #: field:ir.model.fields,complete_name:0
 #: field:ir.ui.menu,complete_name:0
 msgid "Complete Name"
-msgstr ""
+msgstr "Fullt navn"
 
 #. module: base
 #: field:ir.values,object:0
 msgid "Is Object"
-msgstr ""
+msgstr "Er objekt"
 
 #. module: base
 #: view:ir.rule:0
@@ -8918,7 +9021,7 @@ msgstr ""
 #. module: base
 #: field:res.partner.category,name:0
 msgid "Category Name"
-msgstr ""
+msgstr "Kategorinavn"
 
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_15
@@ -8928,17 +9031,17 @@ msgstr ""
 #. module: base
 #: view:ir.actions.act_window:0
 msgid "Select Groups"
-msgstr ""
+msgstr "Velg grupper"
 
 #. module: base
 #: view:res.lang:0
 msgid "%X - Appropriate time representation."
-msgstr ""
+msgstr "%X - Hensiktsmessig tidsrepresentasjon"
 
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (SV) / Español (SV)"
-msgstr ""
+msgstr "Spansk (AR) / Español (AR)"
 
 #. module: base
 #: help:res.lang,grouping:0
@@ -8948,11 +9051,15 @@ msgid ""
 "1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
 "106,500. Provided ',' as the thousand separator in each case."
 msgstr ""
+"The Separator Format should be like [,n] where 0 < n :starting from Unit "
+"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
+"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
+"106,500. Provided ',' as the thousand separator in each case."
 
 #. module: base
 #: view:res.company:0
 msgid "Portrait"
-msgstr ""
+msgstr "Portrett/Stående"
 
 #. module: base
 #: code:addons/base/ir/ir_model.py:317
@@ -8963,7 +9070,7 @@ msgstr ""
 #. module: base
 #: selection:ir.translation,type:0
 msgid "Wizard Button"
-msgstr ""
+msgstr "Veiviserknapp"
 
 #. module: base
 #: selection:ir.translation,type:0
@@ -8975,13 +9082,13 @@ msgstr ""
 #: selection:ir.ui.view,type:0
 #: selection:wizard.ir.model.menu.create.line,view_type:0
 msgid "Graph"
-msgstr ""
+msgstr "Diagram"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_actions_server
 #: selection:ir.ui.menu,action:0
 msgid "ir.actions.server"
-msgstr ""
+msgstr "ir.actions.server"
 
 #. module: base
 #: field:ir.actions.configuration.wizard,progress:0
@@ -8990,14 +9097,14 @@ msgstr ""
 #: field:res.config.users,progress:0
 #: field:res.config.view,progress:0
 msgid "Configuration Progress"
-msgstr ""
+msgstr "Konfigurasjonsprosess"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.act_ir_actions_todo_form
 #: model:ir.ui.menu,name:base.menu_ir_actions_todo_form
 #: model:ir.ui.menu,name:base.next_id_11
 msgid "Configuration Wizards"
-msgstr ""
+msgstr "Konfigurasjonsveileder"
 
 #. module: base
 #: field:res.lang,code:0
@@ -9007,22 +9114,22 @@ msgstr ""
 #. module: base
 #: field:workflow.activity,split_mode:0
 msgid "Split Mode"
-msgstr ""
+msgstr "Split-metode"
 
 #. module: base
 #: view:base.module.upgrade:0
 msgid "Note that this operation might take a few minutes."
-msgstr ""
+msgstr "Denne operasjonen kan ta noen minutter."
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_localisation
 msgid "Localisation"
-msgstr ""
+msgstr "Lokalisering"
 
 #. module: base
 #: view:ir.actions.server:0
 msgid "Action to Launch"
-msgstr ""
+msgstr "Handling å utføre"
 
 #. module: base
 #: view:ir.cron:0
@@ -9033,27 +9140,28 @@ msgstr ""
 #: field:ir.actions.server,condition:0
 #: field:workflow.transition,condition:0
 msgid "Condition"
-msgstr ""
+msgstr "Betingelse"
 
 #. module: base
 #: help:ir.values,model_id:0
 msgid "This field is not used, it only helps you to select a good model."
 msgstr ""
+"Dette feltet benyttes ikke, det hjelper deg bare til å velge en god modell."
 
 #. module: base
 #: field:ir.ui.view,name:0
 msgid "View Name"
-msgstr ""
+msgstr "Visningsnavn"
 
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Italian / Italiano"
-msgstr ""
+msgstr "Italisensk / Italiano"
 
 #. module: base
 #: field:ir.actions.report.xml,attachment:0
 msgid "Save As Attachment Prefix"
-msgstr ""
+msgstr "Save As Attachment Prefix"
 
 #. module: base
 #: view:ir.actions.server:0
@@ -9065,12 +9173,12 @@ msgstr ""
 #. module: base
 #: view:res.lang:0
 msgid "%j - Day of the year [001,366]."
-msgstr ""
+msgstr "%j - Dag i året som et desimaltall [001,366]."
 
 #. module: base
 #: field:ir.actions.server,mobile:0
 msgid "Mobile No"
-msgstr ""
+msgstr "Mobilnr"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_partner_by_category
@@ -9079,17 +9187,17 @@ msgstr ""
 #: model:ir.ui.menu,name:base.menu_partner_category_form
 #: view:res.partner.category:0
 msgid "Partner Categories"
-msgstr ""
+msgstr "Partner kategorier"
 
 #. module: base
 #: view:base.module.upgrade:0
 msgid "System Update"
-msgstr ""
+msgstr "Systemoppdatering"
 
 #. module: base
 #: selection:ir.translation,type:0
 msgid "Wizard Field"
-msgstr ""
+msgstr "Veiviserfelt"
 
 #. module: base
 #: help:ir.sequence,prefix:0
@@ -9099,34 +9207,34 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.sc
 msgid "Seychelles"
-msgstr ""
+msgstr "Seychellene"
 
 #. module: base
 #: model:ir.model,name:base.model_res_partner_bank
 #: view:res.partner.bank:0
 msgid "Bank Accounts"
-msgstr ""
+msgstr "Bankkonti"
 
 #. module: base
 #: model:res.country,name:base.sl
 msgid "Sierra Leone"
-msgstr ""
+msgstr "Sierra Leone"
 
 #. module: base
 #: view:res.company:0
 #: view:res.partner:0
 msgid "General Information"
-msgstr ""
+msgstr "Generell informasjon"
 
 #. module: base
 #: model:res.country,name:base.tc
 msgid "Turks and Caicos Islands"
-msgstr ""
+msgstr "Turks and Caicos Islands"
 
 #. module: base
 #: field:res.partner.bank,owner_name:0
 msgid "Account Owner"
-msgstr ""
+msgstr "Kontoeier"
 
 #. module: base
 #: code:addons/base/res/res_user.py:256
@@ -9143,7 +9251,7 @@ msgstr ""
 #: field:workflow,osv:0
 #: field:workflow.instance,res_type:0
 msgid "Resource Object"
-msgstr ""
+msgstr "Ressursobjekt"
 
 #. module: base
 #: help:ir.sequence,number_increment:0
@@ -9155,54 +9263,54 @@ msgstr ""
 #: field:res.partner.address,function:0
 #: selection:workflow.activity,kind:0
 msgid "Function"
-msgstr ""
+msgstr "Funksjon"
 
 #. module: base
 #: view:res.widget:0
 msgid "Search Widget"
-msgstr ""
+msgstr "Søke widget"
 
 #. module: base
 #: selection:ir.actions.todo,restart:0
 msgid "Never"
-msgstr ""
+msgstr "Aldri"
 
 #. module: base
 #: selection:res.partner.address,type:0
 msgid "Delivery"
-msgstr ""
+msgstr "Leveranse"
 
 #. module: base
 #: model:res.partner.title,name:base.res_partner_title_pvt_ltd
 #: model:res.partner.title,shortcut:base.res_partner_title_pvt_ltd
 msgid "Corp."
-msgstr ""
+msgstr "Selskap"
 
 #. module: base
 #: model:res.country,name:base.gw
 msgid "Guinea Bissau"
-msgstr ""
+msgstr "Guinea Bissau"
 
 #. module: base
 #: view:workflow.instance:0
 msgid "Workflow Instances"
-msgstr ""
+msgstr "Arbeidsflytinstanser"
 
 #. module: base
 #: code:addons/base/res/partner/partner.py:261
 #, python-format
 msgid "Partners: "
-msgstr ""
+msgstr "Partnere: "
 
 #. module: base
 #: model:res.country,name:base.kp
 msgid "North Korea"
-msgstr ""
+msgstr "Nord-Korea"
 
 #. module: base
 #: selection:ir.actions.server,state:0
 msgid "Create Object"
-msgstr ""
+msgstr "Opprett Objekt"
 
 #. module: base
 #: view:ir.filters:0
@@ -9213,12 +9321,12 @@ msgstr ""
 #. module: base
 #: field:res.bank,bic:0
 msgid "BIC/Swift code"
-msgstr ""
+msgstr "BIC/Swift kode"
 
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_1
 msgid "Prospect"
-msgstr ""
+msgstr "Prospect"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -9228,7 +9336,7 @@ msgstr ""
 #. module: base
 #: field:ir.exports,name:0
 msgid "Export Name"
-msgstr ""
+msgstr "Eksportnavn"
 
 #. module: base
 #: help:res.partner.address,type:0
@@ -9236,11 +9344,13 @@ msgid ""
 "Used to select automatically the right address according to the context in "
 "sales and purchases documents."
 msgstr ""
+"Brukes til å automatisk velge den rikitige adressen i kontekst av salgs- "
+"eller innkjøpsdokumenter."
 
 #. module: base
 #: model:res.country,name:base.lk
 msgid "Sri Lanka"
-msgstr ""
+msgstr "Sri Lanka"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -9249,3 +9359,1050 @@ msgstr ""
 
 #~ msgid "Yearly"
 #~ msgstr "Årlig"
+
+#, python-format
+#~ msgid "You can not create this kind of document! (%s)"
+#~ msgstr "Du kan ikke opprette denne type dokument! (%s)"
+
+#~ msgid "Outgoing transitions"
+#~ msgstr "Utgående overganger"
+
+#~ msgid ""
+#~ "Choose between the \"Simplified Interface\" or the extended one.\n"
+#~ "If you are testing or using OpenERP for the first time, we suggest you to "
+#~ "use\n"
+#~ "the simplified interface, which has less options and fields but is easier "
+#~ "to\n"
+#~ "understand. You will be able to switch to the extended view later.\n"
+#~ "            "
+#~ msgstr ""
+#~ "Choose between the \"Simplified Interface\" or the extended one.\n"
+#~ "If you are testing or using OpenERP for the first time, we suggest you to "
+#~ "use\n"
+#~ "the simplified interface, which has less options and fields but is easier "
+#~ "to\n"
+#~ "understand. You will be able to switch to the extended view later.\n"
+#~ "            "
+
+#~ msgid "Operand"
+#~ msgstr "Operator"
+
+#~ msgid "ir.actions.report.custom"
+#~ msgstr "ir.actions.report.custom"
+
+#~ msgid "STOCK_CANCEL"
+#~ msgstr "STOCK_CANCEL"
+
+#~ msgid "Sorted By"
+#~ msgstr "Sortert etter"
+
+#~ msgid "STOCK_NO"
+#~ msgstr "STOCK_NO"
+
+#~ msgid "STOCK_GOTO_TOP"
+#~ msgstr "STOCK_GOTO_TOP"
+
+#~ msgid "STOCK_DELETE"
+#~ msgstr "STOCK_DELETE"
+
+#, python-format
+#~ msgid "Password mismatch !"
+#~ msgstr "Passord stemmer ikke!"
+
+#, python-format
+#~ msgid "This url '%s' must provide an html file with links to zip modules"
+#~ msgstr ""
+#~ "Denne url '%s' må lenke til en html file med kobling videre til zip moduler"
+
+#~ msgid "STOCK_GOTO_FIRST"
+#~ msgstr "STOCK_GOTO_FIRST"
+
+#~ msgid "The rule is satisfied if at least one test is True"
+#~ msgstr "Denne regelen er oppfylt dersom minst en test er Sann"
+
+#~ msgid "Get Max"
+#~ msgstr "Hent maks"
+
+#~ msgid "Uninstalled modules"
+#~ msgstr "Ikke installerte moduler"
+
+#~ msgid "Configure"
+#~ msgstr "Konfigurer"
+
+#~ msgid "STOCK_MEDIA_REWIND"
+#~ msgstr "STOCK_MEDIA_REWIND"
+
+#~ msgid "Report Ref."
+#~ msgstr "Rapportref."
+
+#~ msgid "STOCK_CUT"
+#~ msgstr "STOCK_CUT"
+
+#~ msgid "Configure simple view"
+#~ msgstr "Konfigurer simpel visning"
+
+#~ msgid "Bar Chart"
+#~ msgstr "Stolpediagram"
+
+#~ msgid "STOCK_DIALOG_ERROR"
+#~ msgstr "STOCK_DIALOG_ERROR"
+
+#~ msgid "STOCK_INDEX"
+#~ msgstr "STOCK_INDEX"
+
+#~ msgid "STOCK_DIALOG_QUESTION"
+#~ msgstr "STOCK_DIALOG_QUESTION"
+
+#~ msgid "You may have to reinstall some language pack."
+#~ msgstr "Du må kanskje reinstallere enkelte språkpakker."
+
+#~ msgid "maintenance contract modules"
+#~ msgstr "kontraktvedlikeholdsmoduler"
+
+#~ msgid "Factor"
+#~ msgstr "Faktor"
+
+#~ msgid "STOCK_FILE"
+#~ msgstr "STOCK_FILE"
+
+#~ msgid "Objects Security Grid"
+#~ msgstr "Rutenett for objektsikkerhet"
+
+#~ msgid "STOCK_GO_DOWN"
+#~ msgstr "STOCK_GO_DOWN"
+
+#~ msgid "STOCK_OK"
+#~ msgstr "STOCK_OK"
+
+#~ msgid "Sequence Name"
+#~ msgstr "Sekvensnavn"
+
+#~ msgid "Alignment"
+#~ msgstr "Justering"
+
+#~ msgid ">="
+#~ msgstr ">="
+
+#~ msgid "Planned Cost"
+#~ msgstr "Planlagt kost"
+
+#~ msgid "ir.model.config"
+#~ msgstr "ir.model.config"
+
+#~ msgid "Tests"
+#~ msgstr "Tester"
+
+#~ msgid "Repository"
+#~ msgstr "Oppbevaringssted"
+
+#~ msgid "STOCK_JUSTIFY_FILL"
+#~ msgstr "STOCK_JUSTIFY_FILL"
+
+#~ msgid "RML"
+#~ msgstr "RML"
+
+#~ msgid "Partners by Categories"
+#~ msgstr "Partnere per kategori"
+
+#, python-format
+#~ msgid "Pie charts need exactly two fields"
+#~ msgstr "Kakediagram krever nøyaktig to felt"
+
+#~ msgid "Frequency"
+#~ msgstr "Regelmessighet"
+
+#~ msgid "Relation"
+#~ msgstr "Relasjon"
+
+#~ msgid "STOCK_MISSING_IMAGE"
+#~ msgstr "STOCK_MISSING_IMAGE"
+
+#~ msgid "STOCK_REMOVE"
+#~ msgstr "STOCK_REMOVE"
+
+#~ msgid "raw"
+#~ msgstr "rå"
+
+#~ msgid "Please give your module .ZIP file to import."
+#~ msgstr "Vennligst velg modul.ZIP filen å importere."
+
+#~ msgid "Covered Modules"
+#~ msgstr "Offisielle moduler"
+
+#~ msgid "STOCK_COPY"
+#~ msgstr "STOCK_COPY"
+
+#~ msgid "Check new modules"
+#~ msgstr "Sjekk nye moduler"
+
+#~ msgid "Simple domain setup"
+#~ msgstr "Simplelt domene oppsett"
+
+#, python-format
+#~ msgid "You can not read this document! (%s)"
+#~ msgstr "Du kan ikke lese dette dokumentet! (%s)"
+
+#~ msgid "STOCK_FIND_AND_REPLACE"
+#~ msgstr "STOCK_FIND_AND_REPLACE"
+
+#~ msgid "Fixed Width"
+#~ msgstr "Fast bredde"
+
+#~ msgid "terp-calendar"
+#~ msgstr "terp-calendar"
+
+#~ msgid "STOCK_YES"
+#~ msgstr "STOCK_YES"
+
+#~ msgid "Report Custom"
+#~ msgstr "Tilpasset rapport"
+
+#~ msgid "STOCK_JUSTIFY_LEFT"
+#~ msgstr "STOCK_JUSTIFY_LEFT"
+
+#~ msgid "End of Request"
+#~ msgstr "Slutt på forespørsel"
+
+#~ msgid "Could you check your contract information ?"
+#~ msgstr "Kan du sjekke kontrakt informasjonen ?"
+
+#~ msgid "STOCK_CLEAR"
+#~ msgstr "STOCK_CLEAR"
+
+#~ msgid "STOCK_PROPERTIES"
+#~ msgstr "STOCK_PROPERTIES"
+
+#~ msgid "Commercial Prospect"
+#~ msgstr "Kommersiell mulighet"
+
+#~ msgid "STOCK_SELECT_COLOR"
+#~ msgstr "STOCK_SELECT_COLOR"
+
+#~ msgid "ir.report.custom.fields"
+#~ msgstr "ir.report.custom.fields"
+
+#~ msgid "STOCK_REDO"
+#~ msgstr "STOCK_REDO"
+
+#~ msgid "Make the rule global, otherwise it needs to be put on a group"
+#~ msgstr "Definer regel som global - i motsatt fall må den tilordnes en gruppe"
+
+#, python-format
+#~ msgid "Make sure you have no users linked with the group(s)!"
+#~ msgstr "Verifiser at gruppen(e) ikke inneholder noen brukere !"
+
+#~ msgid "Confirmation"
+#~ msgstr "Bekreftelse"
+
+#, python-format
+#~ msgid "Enter at least one field !"
+#~ msgstr "Fyllt ut minimum et felt!"
+
+#, python-format
+#~ msgid "You can not write in this document! (%s)"
+#~ msgstr "Du kan ikke skrive i dette dokumentet! (%s)"
+
+#~ msgid "left"
+#~ msgstr "venstre"
+
+#~ msgid "STOCK_PRINT_PREVIEW"
+#~ msgstr "STOCK_PRINT_PREVIEW"
+
+#~ msgid "STOCK_MEDIA_PLAY"
+#~ msgstr "STOCK_MEDIA_PLAY"
+
+#~ msgid "Operator"
+#~ msgstr "Operatør"
+
+#~ msgid "Installation Done"
+#~ msgstr "Installasjon fullført"
+
+#~ msgid "STOCK_OPEN"
+#~ msgstr "STOCK_OPEN"
+
+#~ msgid "right"
+#~ msgstr "høyre"
+
+#, python-format
+#~ msgid "You can not delete this document! (%s)"
+#~ msgstr "Du kan ikke slette dette dokumentet! (%s)"
+
+#~ msgid "Daily"
+#~ msgstr "Daglig"
+
+#~ msgid "terp-project"
+#~ msgstr "Slett prosjekt"
+
+#~ msgid "STOCK_JUSTIFY_CENTER"
+#~ msgstr "STOCK_JUSTIFY_CENTER"
+
+#~ msgid "Choose Your Mode"
+#~ msgstr "Velg modus"
+
+#~ msgid "Background Color"
+#~ msgstr "Bakgrunnsfarge"
+
+#~ msgid "res.partner.som"
+#~ msgstr "res.partner.som"
+
+#~ msgid "Document Link"
+#~ msgstr "Dokumentlenke"
+
+#~ msgid "Start Upgrade"
+#~ msgstr "Start oppgradering"
+
+#~ msgid "Export language"
+#~ msgstr "Eksportér språk"
+
+#~ msgid "You can also import .po files."
+#~ msgstr "Du kan også importere .po filer"
+
+#, python-format
+#~ msgid "Unable to find a valid contract"
+#~ msgstr "Kan ikke finne en gyldig kontrakt"
+
+#~ msgid "STOCK_JUSTIFY_RIGHT"
+#~ msgstr "STOCK_JUSTIFY_RIGHT"
+
+#~ msgid "Function of the contact"
+#~ msgstr "Kontaktens funksjon"
+
+#~ msgid "Modules to be installed, upgraded or removed"
+#~ msgstr "Moduler som skal installeres, oppgraderes eller fjernes"
+
+#~ msgid "Report Footer"
+#~ msgstr "Bunntekst på rapport"
+
+#~ msgid "Import language"
+#~ msgstr "Importer språk"
+
+#~ msgid "STOCK_SAVE"
+#~ msgstr "STOCK_SAVE"
+
+#~ msgid "terp-account"
+#~ msgstr "Bankkonto"
+
+#~ msgid "Categories of Modules"
+#~ msgstr "Modulkategorier"
+
+#~ msgid "Not Started"
+#~ msgstr "Ikke påbegynt"
+
+#~ msgid "Roles"
+#~ msgstr "Roller"
+
+#~ msgid ""
+#~ "Regexp to search module on the repository webpage:\n"
+#~ "- The first parenthesis must match the name of the module.\n"
+#~ "- The second parenthesis must match the whole version number.\n"
+#~ "- The last parenthesis must match the extension of the module."
+#~ msgstr ""
+#~ "Regulært uttrykk for å søke etter modulen i på websiden det sentrale "
+#~ "lagringsstedet:\n"
+#~ "- Den første parantesen må matche navnet på modulen.\n"
+#~ "- Den andre parantesen må matche hele versjonsnummeret.\n"
+#~ "- Den siste parantesen må matche filtypen til modulen,"
+
+#~ msgid "Connect Actions To Client Events"
+#~ msgstr "Koble handlinger til klient hendelser."
+
+#~ msgid "STOCK_QUIT"
+#~ msgstr "STOCK_QUIT"
+
+#~ msgid "terp-purchase"
+#~ msgstr "terp-purchase"
+
+#~ msgid "Repositories"
+#~ msgstr "Oppbevaringssted"
+
+#~ msgid "Unvalid"
+#~ msgstr "Ikke gyldig"
+
+#~ msgid "Children"
+#~ msgstr "Underordnede"
+
+#~ msgid "Subscribed"
+#~ msgstr "Abonnert"
+
+#~ msgid "Partner Address"
+#~ msgstr "Adresse"
+
+#~ msgid "STOCK_SAVE_AS"
+#~ msgstr "STOCK_SAVE_AS"
+
+#~ msgid "STOCK_UNDELETE"
+#~ msgstr "STOCK_UNDELETE"
+
+#~ msgid "wizard.module.update_translations"
+#~ msgstr "wizard.module.update_translations"
+
+#~ msgid "STOCK_PASTE"
+#~ msgstr "STOCK_PASTE"
+
+#~ msgid "Configuration Wizard"
+#~ msgstr "Konfigurasjonsveileder"
+
+#~ msgid "Accepted Links in Requests"
+#~ msgstr "Aksepterte lenker i forespørsel"
+
+#~ msgid "Grant Access To Menus"
+#~ msgstr "Gi tilgang til menyer"
+
+#~ 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 ""
+#~ "Velg det forenklede grensesnittet dersom du tester OpenERP for første gang. "
+#~ "Mindre brukte valg og felter blir automatisk skjult. Du kan forandre på "
+#~ "dette senere gjennom Administrasjons menyen."
+
+#~ msgid "State of Mind"
+#~ msgstr "Beslutningsfase"
+
+#~ msgid "The rule is satisfied if all test are True (AND)"
+#~ msgstr "Regelen er oppfyllt hvis alle tester er True (AND)"
+
+#~ msgid "STOCK_CONNECT"
+#~ msgstr "STOCK_CONNECT"
+
+#~ msgid "Next Call Date"
+#~ msgstr "Dato for neste telefonsamtale"
+
+#~ msgid "Scan for new modules"
+#~ msgstr "Søk etter nye moduler"
+
+#~ msgid "Module Repository"
+#~ msgstr "Modulbrønn"
+
+#, python-format
+#~ msgid "Using a relation field which uses an unknown object"
+#~ msgstr "Benytter et relasjonsfelt som benytter et ukjent objekt"
+
+#~ msgid "Field child2"
+#~ msgstr "Underordnet felt2"
+
+#~ msgid "Field child3"
+#~ msgstr "Underordnet felt3"
+
+#~ msgid "Field child0"
+#~ msgstr "Underordnet felt0"
+
+#~ msgid "Field child1"
+#~ msgstr "Underordnet felt1"
+
+#~ msgid "Field Selection"
+#~ msgstr "Feltutvalg"
+
+#~ msgid "Maintenance contract added !"
+#~ msgstr "Vedlikeholdskontrakt opprettet!"
+
+#~ msgid "Report Xml"
+#~ msgstr "XML Rapport"
+
+#~ msgid "Calculate Average"
+#~ msgstr "Beregn gjennomsnitt"
+
+#~ msgid "Planned Revenue"
+#~ msgstr "Planlagt omsetning"
+
+#~ msgid "Role"
+#~ msgstr "Rolle"
+
+#~ msgid "Test"
+#~ msgstr "Test"
+
+#~ msgid "STOCK_DIALOG_WARNING"
+#~ msgstr "STOCK_DIALOG_WARNING"
+
+#~ msgid "STOCK_ZOOM_IN"
+#~ msgstr "STOCK_ZOOM_IN"
+
+#~ msgid "STOCK_ITALIC"
+#~ msgstr "STOCK_ITALIC"
+
+#~ msgid "Accumulate"
+#~ msgstr "Akkumuler"
+
+#, python-format
+#~ msgid "Tree can only be used in tabular reports"
+#~ msgstr "Tre kan bare benyttes i tabellariske rapporter"
+
+#~ msgid "Font color"
+#~ msgstr "Farge på skrifttype"
+
+#~ msgid "STOCK_SORT_DESCENDING"
+#~ msgstr "STOCK_SORT_DESCENDING"
+
+#~ msgid "Roles Structure"
+#~ msgstr "Rollestruktur"
+
+#~ msgid "STOCK_MEDIA_STOP"
+#~ msgstr "STOCK_MEDIA_STOP"
+
+#~ msgid "STOCK_DND_MULTIPLE"
+#~ msgstr "STOCK_DND_MULTIPLE"
+
+#~ msgid "STOCK_DIALOG_AUTHENTICATION"
+#~ msgstr "STOCK_DIALOG_AUTHENTICATION"
+
+#~ msgid "STOCK_ZOOM_OUT"
+#~ msgstr "STOCK_ZOOM_OUT"
+
+#~ msgid "terp-mrp"
+#~ msgstr "terp-mrp"
+
+#~ msgid "Export Data"
+#~ msgstr "Eksporter data"
+
+#~ msgid "html"
+#~ msgstr "html-område"
+
+#~ msgid "terp-tools"
+#~ msgstr "terp-tools"
+
+#~ msgid "STOCK_UNDO"
+#~ msgstr "STOCK_UNDO"
+
+#~ msgid "terp-sale"
+#~ msgstr "terp-sale"
+
+#~ msgid "STOCK_ADD"
+#~ msgstr "STOCK_ADD"
+
+#~ msgid "Modules to download"
+#~ msgstr "Moduler å laste ned"
+
+#~ msgid "ir.rule.group"
+#~ msgstr "ir.rule.group"
+
+#~ msgid "Manually Created"
+#~ msgstr "Manuelt opprettet"
+
+#~ msgid "Calculate Count"
+#~ msgstr "Kalkuler telling"
+
+#~ msgid "Partner State of Mind"
+#~ msgstr "Partner State of Mind"
+
+#~ msgid "STOCK_INDENT"
+#~ msgstr "STOCK_INDENT"
+
+#~ msgid "Macedonia"
+#~ msgstr "Makedonia"
+
+#~ msgid "a4"
+#~ msgstr "a4"
+
+#~ msgid "Multiple rules on same objects are joined using operator OR"
+#~ msgstr "Flere regler på samme objekt kobles med operatoren OR"
+
+#~ msgid "STOCK_MEDIA_NEXT"
+#~ msgstr "STOCK_MEDIA_NEXT"
+
+#~ msgid "Internal Name"
+#~ msgstr "Internt navn"
+
+#~ msgid "STOCK_EDIT"
+#~ msgstr "STOCK_EDIT"
+
+#~ msgid "STOCK_MEDIA_FORWARD"
+#~ msgstr "STOCK_MEDIA_FORWARD"
+
+#~ msgid "User ID"
+#~ msgstr "Bruker ID"
+
+#~ msgid "condition"
+#~ msgstr "betingelse"
+
+#~ msgid "STOCK_NEW"
+#~ msgstr "STOCK_NEW"
+
+#~ msgid "Report Fields"
+#~ msgstr "Rapportfelter"
+
+#~ msgid "STOCK_ABOUT"
+#~ msgstr "STOCK_ABOUT"
+
+#~ msgid "STOCK_UNDERLINE"
+#~ msgstr "STOCK_UNDERLINE"
+
+#~ msgid "STOCK_CLOSE"
+#~ msgstr "STOCK_CLOSE"
+
+#~ msgid "STOCK_ZOOM_100"
+#~ msgstr "STOCK_ZOOM_100"
+
+#~ msgid "STOCK_BOLD"
+#~ msgstr "STOCK_BOLD"
+
+#~ msgid "terp-graph"
+#~ msgstr "terp-graph"
+
+#~ msgid "Partner Events"
+#~ msgstr "Hendelser"
+
+#~ msgid "iCal id"
+#~ msgstr "iCal id"
+
+#~ msgid "Partner Functions"
+#~ msgstr "Partner funksjoner"
+
+#~ msgid "Pie Chart"
+#~ msgstr "Kakediagram"
+
+#~ msgid "Default Properties"
+#~ msgstr "Standard egenskaper"
+
+#~ msgid "Print orientation"
+#~ msgstr "Papirretning"
+
+#~ msgid "Full"
+#~ msgstr "Full"
+
+#~ msgid "terp-stock"
+#~ msgstr "Standard ID"
+
+#, python-format
+#~ msgid "Please specify the Partner Email address !"
+#~ msgstr "Vær vennlig å angi partnerens e-post adresse !"
+
+#~ msgid "STOCK_MEDIA_RECORD"
+#~ msgstr "STOCK_MEDIA_RECORD"
+
+#~ msgid "STOCK_UNINDENT"
+#~ msgstr "STOCK_UNINDENT"
+
+#~ msgid "Partial"
+#~ msgstr "Delvis"
+
+#~ msgid "STOCK_DIALOG_INFO"
+#~ msgstr "STOCK_DIALOG_INFO"
+
+#~ msgid "Get file"
+#~ msgstr "Hent fil"
+
+#~ msgid ""
+#~ "This function will check for new modules in the 'addons' path and on module "
+#~ "repositories:"
+#~ msgstr ""
+#~ "Denne funksjonen vil lete etter nye modulen i stien 'addons' og i det "
+#~ "sentrale lagringsstedet for modulene."
+
+#~ msgid "STOCK_GO_BACK"
+#~ msgstr "STOCK_GO_BACK"
+
+#~ msgid "Customers Partners"
+#~ msgstr "Kunder"
+
+#~ msgid "STOCK_SPELL_CHECK"
+#~ msgstr "STOCK_SPELL_CHECK"
+
+#~ msgid "Roles are used to defined available actions, provided by workflows."
+#~ msgstr ""
+#~ "Roller blir benyttet til å tilordne tilgjengelige handlinger for "
+#~ "arbeidsflyter."
+
+#~ msgid "STOCK_HARDDISK"
+#~ msgstr "STOCK_HARDDISK"
+
+#~ msgid "STOCK_APPLY"
+#~ msgstr "STOCK_APPLY"
+
+#~ msgid "Your Maintenance Contracts"
+#~ msgstr "Dine vedlikeholdskontrakter"
+
+#~ msgid ""
+#~ "Please note that you will have to logout and relog if you change your "
+#~ "password."
+#~ msgstr "Bemerk at du må logge ut og inn hvis du endrer passordet ditt."
+
+#~ msgid "STOCK_CDROM"
+#~ msgstr "STOCK_CDROM"
+
+#~ msgid "Type of Event"
+#~ msgstr "Type handling"
+
+#~ msgid "Set"
+#~ msgstr "Justering satt"
+
+#~ msgid "Manual"
+#~ msgstr "Manuell"
+
+#~ msgid "Line Plot"
+#~ msgstr "Linjebryting"
+
+#~ msgid "STOCK_GO_UP"
+#~ msgstr "STOCK_GO_UP"
+
+#~ msgid "pdf"
+#~ msgstr "pdf"
+
+#~ msgid "Unsubscribed"
+#~ msgstr "Avsluttede abbonement"
+
+#~ msgid "Preview"
+#~ msgstr "Forhåndsvis"
+
+#~ msgid "Skip Step"
+#~ msgstr "Hopp over"
+
+#~ msgid "Active Partner Events"
+#~ msgstr "Aktive partnere hendelser"
+
+#~ msgid "Force Domain"
+#~ msgstr "Fastsett område"
+
+#~ msgid "Validated"
+#~ msgstr "Validert"
+
+#~ msgid "<>"
+#~ msgstr "<>"
+
+#~ msgid "<="
+#~ msgstr "<="
+
+#~ msgid "Probability (0.50)"
+#~ msgstr "Sannsynlighet (0.50)"
+
+#~ msgid "Workflow Definitions"
+#~ msgstr "Arbeidsflytdefinisjoner"
+
+#~ msgid "STOCK_MEDIA_PAUSE"
+#~ msgstr "STOCK_MEDIA_PAUSE"
+
+#~ msgid "All Properties"
+#~ msgstr "Alle egenskaper"
+
+#~ msgid "STOCK_HOME"
+#~ msgstr "STOCK_HOME"
+
+#, python-format
+#~ msgid "This error occurs on database %s"
+#~ msgstr "Denne feilen inntreffer i database %s"
+
+#~ msgid "STOCK_DISCONNECT"
+#~ msgstr "STOCK_DISCONNECT"
+
+#~ msgid "Resynchronise Terms"
+#~ msgstr "Resynkroniser begrep"
+
+#, python-format
+#~ msgid "Field %d should be a figure"
+#~ msgstr "Felt %d skal være et tall"
+
+#~ msgid "STOCK_PREFERENCES"
+#~ msgstr "STOCK_PREFERENCES"
+
+#~ msgid "STOCK_GOTO_LAST"
+#~ msgstr "STOCK_GOTO_LAST"
+
+#~ msgid "Start installation"
+#~ msgstr "Start installasjon"
+
+#~ msgid "res.company"
+#~ msgstr "res.company"
+
+#~ msgid "Configure Simple View"
+#~ msgstr "Konfigurer forenklet visning"
+
+#~ msgid "sxw"
+#~ msgstr "sxw"
+
+#~ msgid "Automatic XSL:RML"
+#~ msgstr "Automatisk XSL:RML"
+
+#~ msgid "Manual domain setup"
+#~ msgstr "Manuelt oppsett av område"
+
+#~ msgid "Partner Relation"
+#~ msgstr "Partnerrelasjon"
+
+#~ msgid "Monthly"
+#~ msgstr "Månedlig"
+
+#~ msgid "States of mind"
+#~ msgstr "Tilstander"
+
+#~ msgid "STOCK_SORT_ASCENDING"
+#~ msgstr "STOCK_SORT_ASCENDING"
+
+#~ msgid "Parent"
+#~ msgstr "Overordnet"
+
+#~ msgid "Export translation file"
+#~ msgstr "Eksporter oversettelsesfil"
+
+#~ msgid "Tabular"
+#~ msgstr "Tabellarisk"
+
+#~ msgid "Start On"
+#~ msgstr "Start På"
+
+#~ msgid "odt"
+#~ msgstr "odt"
+
+#~ msgid "terp-administration"
+#~ msgstr "terp-administration"
+
+#~ msgid "All terms"
+#~ msgstr "Alle begrep"
+
+#~ msgid "Link"
+#~ msgstr "Link"
+
+#~ msgid "Report Ref"
+#~ msgstr "Rapport ref."
+
+#~ msgid "terp-hr"
+#~ msgstr "terp-hr"
+
+#~ msgid "STOCK_DND"
+#~ msgstr "STOCK_DND"
+
+#~ msgid "Dutch (Belgium) / Nederlands (Belgïe)"
+#~ msgstr "Nederlansk (Belgisk) / Nederlands (Belgïe)"
+
+#~ msgid "Repository list"
+#~ msgstr "Liste over lagringssteder"
+
+#~ msgid "STOCK_FLOPPY"
+#~ msgstr "STOCK_FLOPPY"
+
+#, python-format
+#~ msgid "Your can't submit bug reports due to uncovered modules: %s"
+#~ msgstr "Du kan ikke sende feilrapporter på grunn av uoffisielle moduler: %s"
+
+#~ msgid "Status"
+#~ msgstr "Status"
+
+#~ msgid "ir.report.custom"
+#~ msgstr "ir.report.custom"
+
+#~ msgid "STOCK_ZOOM_FIT"
+#~ msgstr "STOCK_ZOOM_FIT"
+
+#~ msgid "Language file loaded."
+#~ msgstr "Språkfil lastet."
+
+#~ msgid "Company Architecture"
+#~ msgstr "Firmanavn"
+
+#~ msgid "STOCK_GOTO_BOTTOM"
+#~ msgstr "STOCK_GOTO_BOTTOM"
+
+#~ msgid "STOCK_GO_FORWARD"
+#~ msgstr "STOCK_GO_FORWARD"
+
+#~ msgid ""
+#~ "Access all the fields related to the current object using expression in "
+#~ "double brackets, i.e. [[ object.partner_id.name ]]"
+#~ msgstr ""
+#~ "Access all the fields related to the current object using expression in "
+#~ "double brackets, i.e. [[ object.partner_id.name ]]"
+
+#~ msgid "STOCK_SELECT_FONT"
+#~ msgstr "STOCK_SELECT_FONT"
+
+#~ msgid "<"
+#~ msgstr "<"
+
+#~ msgid "Html from html"
+#~ msgstr "Html fra html"
+
+#~ msgid "Workflow Items"
+#~ msgstr "Arbeidsflytelementer"
+
+#~ msgid "Function Name"
+#~ msgstr "Funksjonsnavn"
+
+#~ msgid "_Cancel"
+#~ msgstr "_Avbryt"
+
+#~ msgid "terp-report"
+#~ msgstr "terp-report"
+
+#~ msgid ""
+#~ "Would your payment have been carried out after this mail was sent, please "
+#~ "consider the present one as void. Do not hesitate to contact our accounting "
+#~ "department"
+#~ msgstr ""
+#~ "Vi kan ikke se å ha mottatt innbetaling på forfalte fakturaer. Dersom dette "
+#~ "ikke stemmer eller at betaling har skjedd de seneste dagne, ber vi dere "
+#~ "selvsagt se bort fra denne henvendelsen."
+
+#~ msgid "Incoming transitions"
+#~ msgstr "Inngående overganger"
+
+#, python-format
+#~ msgid "Password empty !"
+#~ msgstr "Blankt passord !"
+
+#~ msgid "At Once"
+#~ msgstr "Med en gang"
+
+#~ msgid "STOCK_HELP"
+#~ msgstr "STOCK_HELP"
+
+#~ msgid "child_of"
+#~ msgstr "child_of"
+
+#~ msgid "Module import"
+#~ msgstr "Modulimport"
+
+#~ msgid "Suppliers Partners"
+#~ msgstr "Leverandører"
+
+#~ msgid "terp-crm"
+#~ msgstr "terp-crm"
+
+#~ msgid "STOCK_STRIKETHROUGH"
+#~ msgstr "STOCK_STRIKETHROUGH"
+
+#~ msgid "(year)="
+#~ msgstr "(year)="
+
+#~ msgid "terp-partner"
+#~ msgstr "terp-partner"
+
+#~ msgid "RML path"
+#~ msgstr "Sti til RML"
+
+#~ msgid "Next Configuration Wizard"
+#~ msgstr "Neste konfigurasjonsveileder"
+
+#~ msgid "Import New Language"
+#~ msgstr "Importer nytt språk"
+
+#~ msgid "="
+#~ msgstr "="
+
+#, python-format
+#~ msgid "Second field should be figures"
+#~ msgstr "Andre felt skal være numerisk"
+
+#~ msgid "Access Controls Grid"
+#~ msgstr "Tilgangskontroll rutenett"
+
+#~ msgid "STOCK_REFRESH"
+#~ msgstr "STOCK_REFRESH"
+
+#~ msgid "STOCK_STOP"
+#~ msgstr "STOCK_STOP"
+
+#~ msgid "STOCK_CONVERT"
+#~ msgstr "STOCK_CONVERT"
+
+#~ msgid "STOCK_EXECUTE"
+#~ msgstr "STOCK_EXECUTE"
+
+#, python-format
+#~ msgid ""
+#~ "Model %s Does not Exist !\" % vals['relation']))\n"
+#~ "\n"
+#~ "            if self.pool.get(vals['model']):\n"
+#~ "                self.pool.get(vals['model']).__init__(self.pool, cr)\n"
+#~ "                #Added context to _auto_init for special treatment to custom "
+#~ "field for select_level\n"
+#~ "                ctx = context.copy()\n"
+#~ "                "
+#~ "ctx.update({'field_name':vals['name'],'field_state':'manual','select':vals.ge"
+#~ "t('select_level','0"
+#~ msgstr ""
+#~ "Model %s Does not Exist !\" % vals['relation']))\n"
+#~ "\n"
+#~ "            if self.pool.get(vals['model']):\n"
+#~ "                self.pool.get(vals['model']).__init__(self.pool, cr)\n"
+#~ "                #Added context to _auto_init for special treatment to custom "
+#~ "field for select_level\n"
+#~ "                ctx = context.copy()\n"
+#~ "                "
+#~ "ctx.update({'field_name':vals['name'],'field_state':'manual','select':vals.ge"
+#~ "t('select_level','0"
+
+#~ msgid "STOCK_COLOR_PICKER"
+#~ msgstr "STOCK_COLOR_PICKER"
+
+#, python-format
+#~ msgid "Bar charts need at least two fields"
+#~ msgstr "Stolpediagram trenger minimum to felter"
+
+#~ msgid "Titles"
+#~ msgstr "Titler"
+
+#~ msgid ""
+#~ "Create your users.\n"
+#~ "You will be able to assign groups to users. Groups define the access rights "
+#~ "of each users on the different objects of the system.\n"
+#~ "            "
+#~ msgstr ""
+#~ "Opprett dine brukere.\n"
+#~ "Du vil få mulighet til å tilordne\n"
+#~ "            "
+
+#~ msgid ">"
+#~ msgstr ">"
+
+#~ msgid "Delete Permission"
+#~ msgstr "Fjern tilgang"
+
+#~ msgid "STOCK_PRINT"
+#~ msgstr "STOCK_PRINT"
+
+#~ msgid "If you don't force the domain, it will use the simple domain setup"
+#~ msgstr ""
+#~ "Hvis du ikke krever domenet, så vil det forenklet domeneoppsett benyttes"
+
+#~ msgid "Print format"
+#~ msgstr "Utskriftsformat"
+
+#~ msgid "STOCK_JUMP_TO"
+#~ msgstr "STOCK_JUMP_TO"
+
+#~ msgid "End Date"
+#~ msgstr "Sluttdato"
+
+#~ msgid "Contract ID"
+#~ msgstr "Kontrakt ID"
+
+#~ msgid "States"
+#~ msgstr "Stater"
+
+#~ msgid "STOCK_FIND"
+#~ msgstr "STOCK_FIND"
+
+#~ msgid "Add Maintenance Contract"
+#~ msgstr "Legg til vedlikeholdskontrakt"
+
+#~ msgid "STOCK_MEDIA_PREVIOUS"
+#~ msgstr "STOCK_MEDIA_PREVIOUS"
+
+#~ msgid "The VAT doesn't seem to be correct."
+#~ msgstr "MVA ser ikke ut til å være riktig."
+
+#~ msgid "Calculate Sum"
+#~ msgstr "Kalkuler sum"
+
+#~ msgid "STOCK_NETWORK"
+#~ msgstr "STOCK_NETWORK"
+
+#~ msgid "Subscribe Report"
+#~ msgstr "Abboner på rapport"
+
+#~ msgid "STOCK_DIRECTORY"
+#~ msgstr "STOCK_DIRECTORY"
+
+#~ msgid "STOCK_REVERT_TO_SAVED"
+#~ msgstr "STOCK_REVERT_TO_SAVED"
+
+#~ msgid "a5"
+#~ msgstr "a5"
+
+#~ msgid "Image Preview"
+#~ msgstr "Forhåndsvisning av bilde"
+
+#~ msgid "Unsubscribe Report"
+#~ msgstr "Avslutt abbonement på rapport"
+
+#~ msgid "Choose a language to install:"
+#~ msgstr "Velg et språk å installere"
diff --git a/bin/addons/base/i18n/nl.po b/bin/addons/base/i18n/nl.po
index e40c79706ce..00e24675f38 100644
--- a/bin/addons/base/i18n/nl.po
+++ b/bin/addons/base/i18n/nl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-02-16 04:51+0000\n"
-"X-Generator: Launchpad (build 12351)\n"
+"X-Launchpad-Export-Date: 2011-04-09 04:50+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
 #. module: base
 #: view:ir.filters:0
@@ -2905,7 +2905,7 @@ msgstr "Verplicht"
 #. module: base
 #: view:res.users:0
 msgid "Default Filters"
-msgstr "Stadaard filters"
+msgstr "Standaard filters"
 
 #. module: base
 #: field:res.request.history,name:0
diff --git a/bin/addons/base/i18n/nl_BE.po b/bin/addons/base/i18n/nl_BE.po
index d280272048e..6a43a00cb10 100644
--- a/bin/addons/base/i18n/nl_BE.po
+++ b/bin/addons/base/i18n/nl_BE.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-02-16 04:58+0000\n"
-"X-Generator: Launchpad (build 12351)\n"
+"X-Launchpad-Export-Date: 2011-04-09 04:57+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/bin/addons/base/i18n/pl.po b/bin/addons/base/i18n/pl.po
index 089aa4160ee..4ae7b3209e4 100644
--- a/bin/addons/base/i18n/pl.po
+++ b/bin/addons/base/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-02-16 04:55+0000\n"
-"X-Generator: Launchpad (build 12351)\n"
+"X-Launchpad-Export-Date: 2011-04-09 04:54+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
 #. module: base
 #: view:ir.filters:0
@@ -528,7 +528,7 @@ msgstr "Jordania"
 #. module: base
 #: view:ir.module.module:0
 msgid "Certified"
-msgstr "Certyfikowany"
+msgstr "Certyfikowane"
 
 #. module: base
 #: model:res.country,name:base.er
@@ -3305,7 +3305,7 @@ msgstr "Afryka Południowa"
 #: selection:ir.module.module,state:0
 #: selection:ir.module.module.dependency,state:0
 msgid "Installed"
-msgstr "Zainstalowano"
+msgstr "Zainstalowane"
 
 #. module: base
 #: selection:base.language.install,lang:0
diff --git a/bin/addons/base/i18n/pt.po b/bin/addons/base/i18n/pt.po
index 8725cb11d64..516ea0a3a7b 100644
--- a/bin/addons/base/i18n/pt.po
+++ b/bin/addons/base/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-03-17 04:37+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-04-09 04:54+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/bin/addons/base/i18n/pt_BR.po b/bin/addons/base/i18n/pt_BR.po
index 59226b122be..a0e7a8e3d8c 100644
--- a/bin/addons/base/i18n/pt_BR.po
+++ b/bin/addons/base/i18n/pt_BR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-02-16 04:58+0000\n"
-"X-Generator: Launchpad (build 12351)\n"
+"X-Launchpad-Export-Date: 2011-04-09 04:57+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
 #. module: base
 #: view:ir.filters:0
@@ -153,6 +153,9 @@ msgid ""
 "Properties of base fields cannot be altered in this manner! Please modify "
 "them through Python code, preferably through a custom addon!"
 msgstr ""
+"As propriedades dos campos base não podem ser alterados desta maneira! Por "
+"favor, faça a modificação através de código Python e, preferencialmente, via "
+"um addon customizado."
 
 #. module: base
 #: code:addons/osv.py:133
@@ -764,7 +767,7 @@ msgstr "Índia"
 #: model:ir.actions.act_window,name:base.res_request_link-act
 #: model:ir.ui.menu,name:base.menu_res_request_link_act
 msgid "Request Reference Types"
-msgstr "Tipos de Solicitação de Referência"
+msgstr "Tipos de Referência das Mensagens"
 
 #. module: base
 #: view:ir.values:0
@@ -837,7 +840,7 @@ msgstr "Painel de Recursos Humanps"
 #: code:addons/base/res/res_user.py:507
 #, python-format
 msgid "Setting empty passwords is not allowed for security reasons!"
-msgstr ""
+msgstr "Senhas vazias não são permitidas por questões de segurança!"
 
 #. module: base
 #: selection:ir.actions.server,state:0
@@ -976,7 +979,7 @@ msgstr "Ilhas Marshall"
 #: code:addons/base/ir/ir_model.py:328
 #, python-format
 msgid "Changing the model of a field is forbidden!"
-msgstr ""
+msgstr "Alteração de modelo de campo é proibido!"
 
 #. module: base
 #: model:res.country,name:base.ht
@@ -1025,7 +1028,7 @@ msgstr "Para exportar um novo idioma, não selecione um idioma."
 #. module: base
 #: view:res.request:0
 msgid "Request Date"
-msgstr "Data de Requisição"
+msgstr "Data da Mensagem"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_hr_dasboard
@@ -1349,7 +1352,7 @@ msgstr "Parceiros"
 #. module: base
 #: field:res.partner.category,parent_left:0
 msgid "Left parent"
-msgstr ""
+msgstr "Parentese esquerdo"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.res_widget_act_window
@@ -2025,7 +2028,7 @@ msgstr "Coreâno (KR) / 한국어 (KR)"
 #. module: base
 #: help:ir.model.fields,model:0
 msgid "The technical name of the model this field belongs to"
-msgstr ""
+msgstr "O nome técnico do modelo deste campo pertence a"
 
 #. module: base
 #: field:ir.actions.server,action_id:0
@@ -2183,6 +2186,9 @@ msgid ""
 "separated list of valid field names (optionally followed by asc/desc for the "
 "direction)"
 msgstr ""
+"A ordem especificada é inválida. Uma ordem válida é uma lista de nomes de "
+"campos separada por vírgula (opcionalmente seguida por ASC/DESC para "
+"crescente ou descrescente)"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_module_module_dependency
@@ -2441,7 +2447,7 @@ msgstr "Email em Massa"
 #. module: base
 #: model:res.country,name:base.yt
 msgid "Mayotte"
-msgstr ""
+msgstr "Maiote"
 
 #. module: base
 #: code:addons/base/ir/ir_actions.py:597
@@ -2543,7 +2549,7 @@ msgstr "Rússia"
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Urdu / اردو"
-msgstr ""
+msgstr "Urdu / اردو"
 
 #. module: base
 #: field:res.company,name:0
@@ -2759,7 +2765,7 @@ msgstr "6.  %d, %m         ==> 05, 12"
 #: field:res.config.users,date:0
 #: field:res.users,date:0
 msgid "Last Connection"
-msgstr "Última conecção"
+msgstr "Última Conexão"
 
 #. module: base
 #: field:ir.actions.act_window,help:0
@@ -3153,7 +3159,7 @@ msgstr "Workflows"
 #. module: base
 #: field:ir.translation,xml_id:0
 msgid "XML Id"
-msgstr ""
+msgstr "Id XML"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_config_user_form
@@ -3384,7 +3390,7 @@ msgstr "Affero GPL-3"
 #. module: base
 #: field:ir.sequence,number_next:0
 msgid "Next Number"
-msgstr "Próximo numero"
+msgstr "Próximo Número"
 
 #. module: base
 #: help:workflow.transition,condition:0
@@ -3519,6 +3525,12 @@ msgid ""
 "Would your payment have been carried out after this mail was sent, please "
 "consider the present one as void."
 msgstr ""
+"Por favor, repare que as seguintes cobranças estão em aberto. Se o pagamento "
+"já foi realizado, pedimos gentilmente que nos envie o comprovante. Se o "
+"pagamento realmente estiver em aberto, entre em contato para conversarmos.   "
+"                       \n"
+"Se o pagamento foi realizado após a postagem desta correspondência, favor "
+"desconsiderar esta mensagem."
 
 #. module: base
 #: model:res.country,name:base.mx
@@ -3690,6 +3702,8 @@ msgid ""
 "The Selection Options expression is not a valid Pythonic expression.Please "
 "provide an expression in the [('key','Label'), ...] format."
 msgstr ""
+"A expressão em Opções de Seleção não é uma expressão Python válida. Favor "
+"entrar com uma expressão no formato [('chave','Descrição'),...]"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_translation_app
@@ -3719,7 +3733,7 @@ msgstr "Inglês (GB)"
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Japanese / 日本語"
-msgstr ""
+msgstr "Japanese / 日本語"
 
 #. module: base
 #: help:workflow.transition,act_from:0
@@ -3762,7 +3776,7 @@ msgstr "Inglês (CA)"
 #. module: base
 #: model:ir.model,name:base.model_publisher_warranty_contract
 msgid "publisher_warranty.contract"
-msgstr ""
+msgstr "publisher_warranty.contract"
 
 #. module: base
 #: model:res.country,name:base.et
@@ -3849,7 +3863,7 @@ msgstr "Configuração SMS"
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (BO) / Español (BO)"
-msgstr ""
+msgstr "Spanish (BO) / Español (BO)"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.ir_access_act
@@ -3889,7 +3903,7 @@ msgstr "Data Inicial"
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Gujarati / ગુજરાતી"
-msgstr ""
+msgstr "Gujarati / ગુજરાતી"
 
 #. module: base
 #: code:addons/base/module/module.py:257
@@ -4084,7 +4098,7 @@ msgstr "Precisão do preço"
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Latvian / latviešu valoda"
-msgstr ""
+msgstr "Latvian / latviešu valoda"
 
 #. module: base
 #: view:res.config:0
@@ -4189,7 +4203,7 @@ msgstr "Menus"
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Serbian (Latin) / srpski"
-msgstr ""
+msgstr "Serbian (Latin) / srpski"
 
 #. module: base
 #: model:res.country,name:base.il
@@ -4244,7 +4258,7 @@ msgstr "Subfluxo"
 #. module: base
 #: model:ir.model,name:base.model_res_config
 msgid "res.config"
-msgstr ""
+msgstr "res.config"
 
 #. module: base
 #: field:workflow.transition,signal:0
@@ -4295,7 +4309,7 @@ msgstr "Reino Unido"
 #: view:res.config.users:0
 #: view:res.config.view:0
 msgid "res_config_contents"
-msgstr ""
+msgstr "res_config_contents"
 
 #. module: base
 #: help:res.partner.category,active:0
@@ -4364,7 +4378,7 @@ msgstr ""
 #. module: base
 #: view:base.language.import:0
 msgid "- module,type,name,res_id,src,value"
-msgstr ""
+msgstr "- módulo,tipo,nome,rec_id,src,valor"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -4408,7 +4422,7 @@ msgstr "Projeto"
 #. module: base
 #: field:ir.ui.menu,web_icon_hover_data:0
 msgid "Web Icon Image (hover)"
-msgstr ""
+msgstr "Imagem do Ícone Web (hover)"
 
 #. module: base
 #: view:base.module.import:0
@@ -4567,7 +4581,7 @@ msgstr "Não implementado"
 #. module: base
 #: model:ir.model,name:base.model_res_widget_user
 msgid "res.widget.user"
-msgstr ""
+msgstr "res.widget.user"
 
 #. module: base
 #: field:res.partner.category,complete_name:0
@@ -4975,7 +4989,7 @@ msgstr "Camarões"
 #. module: base
 #: model:res.country,name:base.bf
 msgid "Burkina Faso"
-msgstr ""
+msgstr "Burquina Fasso"
 
 #. module: base
 #: selection:ir.actions.todo,state:0
@@ -5080,7 +5094,7 @@ msgstr "Campo de objeto"
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (PE) / Español (PE)"
-msgstr ""
+msgstr "Spanish (PE) / Español (PE)"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -5131,7 +5145,7 @@ msgstr "Ligar eventos a ações"
 #. module: base
 #: model:ir.model,name:base.model_base_update_translations
 msgid "base.update.translations"
-msgstr ""
+msgstr "base.update.translations"
 
 #. module: base
 #: field:ir.module.category,parent_id:0
@@ -5442,7 +5456,7 @@ msgstr "Continuar"
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Thai / ภาษาไทย"
-msgstr ""
+msgstr "Thai / ภาษาไทย"
 
 #. module: base
 #: code:addons/orm.py:158
@@ -5525,7 +5539,7 @@ msgstr "Empresa Padrão"
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (EC) / Español (EC)"
-msgstr ""
+msgstr "Spanish (EC) / Español (EC)"
 
 #. module: base
 #: help:ir.ui.view,xml_id:0
@@ -5561,7 +5575,7 @@ msgstr "Selecionável"
 #. module: base
 #: view:res.request.link:0
 msgid "Request Link"
-msgstr "Link"
+msgstr "Link da Mensagem"
 
 #. module: base
 #: view:ir.attachment:0
@@ -5674,7 +5688,7 @@ msgstr "Traduções"
 #. module: base
 #: field:ir.sequence,padding:0
 msgid "Number padding"
-msgstr "Preencher número"
+msgstr "Preenchimento do número"
 
 #. module: base
 #: view:ir.actions.report.xml:0
@@ -5734,7 +5748,7 @@ msgstr ""
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Flemish (BE) / Vlaams (BE)"
-msgstr ""
+msgstr "Flemish (BE) / Vlaams (BE)"
 
 #. module: base
 #: field:ir.cron,interval_number:0
@@ -5799,7 +5813,7 @@ msgstr "Atalhos Customizados"
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Vietnamese / Tiếng Việt"
-msgstr ""
+msgstr "Vietnamese / Tiếng Việt"
 
 #. module: base
 #: model:res.country,name:base.dz
@@ -5814,7 +5828,7 @@ msgstr "Bélgica"
 #. module: base
 #: model:ir.model,name:base.model_osv_memory_autovacuum
 msgid "osv_memory.autovacuum"
-msgstr ""
+msgstr "osv_memory.autovacuum"
 
 #. module: base
 #: field:base.language.export,lang:0
@@ -5852,7 +5866,7 @@ msgstr "%H - Hora (Relógio 24 horas) [00,23]."
 #. module: base
 #: model:ir.model,name:base.model_res_widget
 msgid "res.widget"
-msgstr ""
+msgstr "res.widget"
 
 #. module: base
 #: code:addons/base/ir/ir_model.py:258
@@ -5917,7 +5931,7 @@ msgstr "Zona Neutra"
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Hindi / हिंदी"
-msgstr ""
+msgstr "Hindi / हिंदी"
 
 #. module: base
 #: view:ir.model:0
@@ -6122,7 +6136,7 @@ msgstr "Base"
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Telugu / తెలుగు"
-msgstr ""
+msgstr "Telugu / తెలుగు"
 
 #. module: base
 #: model:res.country,name:base.lr
@@ -6167,7 +6181,7 @@ msgstr "Código"
 #. module: base
 #: model:ir.model,name:base.model_res_config_installer
 msgid "res.config.installer"
-msgstr ""
+msgstr "res.config.installer"
 
 #. module: base
 #: model:res.country,name:base.mc
@@ -6211,7 +6225,7 @@ msgstr "Códigos seqüenciais"
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (CO) / Español (CO)"
-msgstr ""
+msgstr "Spanish (CO) / Español (CO)"
 
 #. module: base
 #: view:base.module.configuration:0
@@ -6231,7 +6245,7 @@ msgstr "Criar"
 #. module: base
 #: view:ir.sequence:0
 msgid "Current Year with Century: %(year)s"
-msgstr ""
+msgstr "Ano atual (4 digitos): %(year)s"
 
 #. module: base
 #: field:ir.exports,export_fields:0
@@ -6392,6 +6406,8 @@ msgstr "Ilhas Pitcairn"
 msgid ""
 "We suggest to reload the menu tab to see the new menus (Ctrl+T then Ctrl+R)."
 msgstr ""
+"Sugerimos a recarga do menu para a visualização dos novos menus (Ctrl+T, "
+"depois Ctrl+R)."
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_rule
@@ -6423,6 +6439,8 @@ msgid ""
 "OpenERP will automatically adds some '0' on the left of the 'Next Number' to "
 "get the required padding size."
 msgstr ""
+"O OpenERP irá adicionar automaticamente alguns '0' à esquerda do 'Próximo "
+"Número' para chegar ao preenchimento requerido."
 
 #. module: base
 #: view:res.lang:0
@@ -6442,7 +6460,7 @@ msgstr "Visão de Busca"
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The code of the language must be unique !"
-msgstr ""
+msgstr "O código do idioma deve ser único!"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_attachment
@@ -6485,7 +6503,7 @@ msgstr "Acesso de gravação"
 #. module: base
 #: view:res.lang:0
 msgid "%m - Month number [01,12]."
-msgstr ""
+msgstr "%m - Número do mês [01,12]."
 
 #. module: base
 #: field:res.bank,city:0
@@ -6521,7 +6539,7 @@ msgstr "Estonian / Eesti keel"
 #: field:res.partner,email:0
 #: field:res.users,email:0
 msgid "E-mail"
-msgstr ""
+msgstr "E-mail"
 
 #. module: base
 #: selection:ir.module.module,license:0
@@ -6543,7 +6561,7 @@ msgstr "Inglês (EUA)"
 #: view:ir.model.data:0
 #: model:ir.ui.menu,name:base.ir_model_data_menu
 msgid "Object Identifiers"
-msgstr ""
+msgstr "Identificadores de Objeto"
 
 #. module: base
 #: model:ir.actions.act_window,help:base.action_partner_title_partner
@@ -6551,11 +6569,15 @@ msgid ""
 "Manage the partner titles you want to have available in your system. The "
 "partner titles is the legal status of the company: Private Limited, SA, etc."
 msgstr ""
+"Gerencia o nome de formação dos parceiros que você deseja que estejam "
+"disponíveis no sistema. Um nome de formação é o tipo legal da empresa: "
+"Limitada (Ltda), S.A., etc."
 
 #. module: base
 #: view:base.language.export:0
 msgid "To browse official translations, you can start with these links:"
 msgstr ""
+"Para consultar as traduções oficiais, você pode começar nestes links:"
 
 #. module: base
 #: code:addons/base/ir/ir_model.py:484
@@ -6564,6 +6586,8 @@ msgid ""
 "You can not read this document (%s) ! Be sure your user belongs to one of "
 "these groups: %s."
 msgstr ""
+"Você não pode ler este documento (%s)! Certifique-se de que seu usuário "
+"pertence a um destes grupos: %s."
 
 #. module: base
 #: view:res.bank:0
@@ -6582,7 +6606,7 @@ msgstr "Versão instalada"
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Mongolian / монгол"
-msgstr ""
+msgstr "Mongolian / монгол"
 
 #. module: base
 #: model:res.country,name:base.mr
@@ -6597,7 +6621,7 @@ msgstr "ir.translation"
 #. module: base
 #: view:base.module.update:0
 msgid "Module update result"
-msgstr ""
+msgstr "Resultado da atualização de módulo"
 
 #. module: base
 #: view:workflow.activity:0
@@ -6619,7 +6643,7 @@ msgstr "Empresa Superior(Pai)"
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (CR) / Español (CR)"
-msgstr ""
+msgstr "Spanish (CR) / Español (CR)"
 
 #. module: base
 #: field:res.currency.rate,rate:0
@@ -6644,7 +6668,7 @@ msgstr "Valor Padrão"
 #. module: base
 #: model:ir.ui.menu,name:base.menu_tools
 msgid "Tools"
-msgstr ""
+msgstr "Ferramentas"
 
 #. module: base
 #: model:res.country,name:base.kn
@@ -6659,6 +6683,9 @@ msgid ""
 "for the currency: %s \n"
 "at the date: %s"
 msgstr ""
+"Nenhuma taxa encontrada \n"
+"para a moeda: %s \n"
+"na data: %s"
 
 #. module: base
 #: model:ir.actions.act_window,help:base.action_ui_view_custom
@@ -6666,6 +6693,8 @@ msgid ""
 "Customized views are used when users reorganize the content of their "
 "dashboard views (via web client)"
 msgstr ""
+"Exibições personalizadas são usadas quando o usuário reorganiza o conteúdo "
+"da exibição em painéis (via cliente web)"
 
 #. module: base
 #: field:ir.model,name:0
@@ -6703,7 +6732,7 @@ msgstr "Ícone"
 #. module: base
 #: help:ir.model.fields,model_id:0
 msgid "The model this field belongs to"
-msgstr ""
+msgstr "O modelo pertence a este campo"
 
 #. module: base
 #: model:res.country,name:base.mq
@@ -6713,7 +6742,7 @@ msgstr "Martinica(França)"
 #. module: base
 #: view:ir.sequence.type:0
 msgid "Sequences Type"
-msgstr ""
+msgstr "Tipo de Sequências"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.res_request-act
@@ -6737,7 +6766,7 @@ msgstr "Ou"
 #: 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 ""
+msgstr "Logs do Cliente"
 
 #. module: base
 #: model:res.country,name:base.al
@@ -6756,6 +6785,8 @@ msgid ""
 "You cannot delete the language which is Active !\n"
 "Please de-activate the language first."
 msgstr ""
+"Você não pode excluir um idioma que está Ativo!\n"
+"Favor desativar o idioma primeiramente."
 
 #. module: base
 #: view:base.language.install:0
@@ -6764,6 +6795,8 @@ msgid ""
 "Please be patient, this operation may take a few minutes (depending on the "
 "number of modules currently installed)..."
 msgstr ""
+"Por favor seja paciente. Esta operação pode demorar poucos minutos "
+"(dependendo do número de módulos instalados atualmente)..."
 
 #. module: base
 #: field:ir.ui.menu,child_id:0
@@ -6788,12 +6821,14 @@ msgstr "ErroDeValidação"
 #: view:base.module.import:0
 #: view:base.module.update:0
 msgid "Open Modules"
-msgstr ""
+msgstr "Módulos Abertos"
 
 #. module: base
 #: model:ir.actions.act_window,help:base.action_res_bank_form
 msgid "Manage bank records you want to be used in the system."
 msgstr ""
+"Gerencia os registros de bancos que você quiser que sejam usados pelo "
+"sistema."
 
 #. module: base
 #: view:base.module.import:0
@@ -6811,6 +6846,8 @@ msgid ""
 "The path to the main report file (depending on Report Type) or NULL if the "
 "content is in another field"
 msgstr ""
+"Caminho (diretório) para o arquivo de relatório principal (dependendo do "
+"Tipo de Relatório) ou NULL se o conteúdo estiver em outro campo"
 
 #. module: base
 #: model:res.country,name:base.la
@@ -6837,6 +6874,8 @@ msgid ""
 "The sum of the data (2nd field) is null.\n"
 "We can't draw a pie chart !"
 msgstr ""
+"A soma dos dados (segundo campo) é nula.\n"
+"Não posso montar o gráfico de pizza !"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_lunch_reporting
@@ -6858,7 +6897,7 @@ msgstr "Togo"
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "Other Proprietary"
-msgstr ""
+msgstr "Outro Proprietário"
 
 #. module: base
 #: selection:workflow.activity,kind:0
@@ -6869,12 +6908,12 @@ msgstr "Parar todos"
 #: code:addons/orm.py:412
 #, python-format
 msgid "The read_group method is not implemented on this object !"
-msgstr ""
+msgstr "O método read_group não está implementado neste objeto!"
 
 #. module: base
 #: view:ir.model.data:0
 msgid "Updatable"
-msgstr ""
+msgstr "Atualizável"
 
 #. module: base
 #: view:res.lang:0
@@ -6889,7 +6928,7 @@ msgstr "Cascata"
 #. module: base
 #: field:workflow.transition,group_id:0
 msgid "Group Required"
-msgstr ""
+msgstr "O Grupo é Obrigatório"
 
 #. module: base
 #: view:ir.actions.configuration.wizard:0
@@ -6912,17 +6951,19 @@ msgid ""
 "Enable this if you want to execute missed occurences as soon as the server "
 "restarts."
 msgstr ""
+"Ative isto se você quiser executar ocorrências faltantes assim que o "
+"servidor reiniciar."
 
 #. module: base
 #: view:base.module.upgrade:0
 msgid "Start update"
-msgstr ""
+msgstr "Iniciar atualização"
 
 #. module: base
 #: code:addons/base/publisher_warranty/publisher_warranty.py:144
 #, python-format
 msgid "Contract validation error"
-msgstr ""
+msgstr "Erro de validação de Contrato"
 
 #. module: base
 #: field:res.country.state,name:0
@@ -6949,7 +6990,7 @@ msgstr "ir.actions.report.xml"
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_miss
 msgid "Mss"
-msgstr ""
+msgstr "Sra"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_ui_view
@@ -6959,7 +7000,7 @@ msgstr "ir.ui.view"
 #. module: base
 #: constraint:res.partner:0
 msgid "Error ! You can not create recursive associated members."
-msgstr ""
+msgstr "Erro ! Você não pode criar membros recursivos associados."
 
 #. module: base
 #: help:res.lang,code:0
@@ -6975,7 +7016,7 @@ msgstr "Parceiros OpenERP"
 #. module: base
 #: model:ir.ui.menu,name:base.menu_hr_manager
 msgid "HR Manager Dashboard"
-msgstr ""
+msgstr "Painel do Gerente de RH"
 
 #. module: base
 #: code:addons/base/module/module.py:253
@@ -6983,6 +7024,8 @@ msgstr ""
 msgid ""
 "Unable to install module \"%s\" because an external dependency is not met: %s"
 msgstr ""
+"O módulo \"%s\" não pode ser instalado porque uma dependência externa não "
+"foi encontrada: %s"
 
 #. module: base
 #: view:ir.module.module:0
@@ -7012,6 +7055,10 @@ msgid ""
 "not connect to the system. You can assign them groups in order to give them "
 "specific access to the applications they need to use in the system."
 msgstr ""
+"Crie e gerencie os usuários que irão conectar no sistema. Usuários podem ser "
+"desativados se não puderem/devessem se conectar no sistema por um período de "
+"tempo. Você pode atribuir grupos para permitir acesso específico a "
+"aplicações que eles precisam usar no sistema."
 
 #. module: base
 #: selection:res.request,priority:0
@@ -7027,13 +7074,13 @@ msgstr "Complemento"
 #. module: base
 #: model:ir.actions.act_window,name:base.action_view_base_module_update
 msgid "Module Update"
-msgstr ""
+msgstr "Atualização de Módulo"
 
 #. module: base
 #: code:addons/base/module/wizard/base_module_upgrade.py:95
 #, python-format
 msgid "Following modules are not installed or unknown: %s"
-msgstr ""
+msgstr "Os seguintes módulos não estão instalados ou são desconhecidos: %s"
 
 #. module: base
 #: view:ir.cron:0
@@ -7062,7 +7109,7 @@ msgstr "Abrir Janela"
 #. module: base
 #: field:ir.actions.act_window,auto_search:0
 msgid "Auto Search"
-msgstr ""
+msgstr "Persquisa Automática"
 
 #. module: base
 #: field:ir.actions.act_window,filter:0
@@ -7072,7 +7119,7 @@ msgstr "Filtro"
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_madam
 msgid "Ms."
-msgstr ""
+msgstr "Sra."
 
 #. module: base
 #: model:res.country,name:base.ch
@@ -7102,7 +7149,7 @@ msgstr "Arredondamento"
 #. module: base
 #: view:base.language.install:0
 msgid "Load"
-msgstr ""
+msgstr "Carregar"
 
 #. module: base
 #: help:res.config.users,name:0
@@ -7115,18 +7162,18 @@ msgstr ""
 #: code:addons/osv.py:156
 #, python-format
 msgid "Integrity Error"
-msgstr ""
+msgstr "Erro de Integridade"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_wizard_screen
 msgid "ir.wizard.screen"
-msgstr ""
+msgstr "ir.wizard.screen"
 
 #. module: base
 #: code:addons/base/ir/ir_model.py:223
 #, python-format
 msgid "Size of the field can never be less than 1 !"
-msgstr ""
+msgstr "Tamanho de campo nunca pode ser menor que 1!"
 
 #. module: base
 #: model:res.country,name:base.so
@@ -7136,7 +7183,7 @@ msgstr "Somália"
 #. module: base
 #: selection:publisher_warranty.contract,state:0
 msgid "Terminated"
-msgstr ""
+msgstr "Terminado"
 
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_13
@@ -7146,7 +7193,7 @@ msgstr "Clientes importantes"
 #. module: base
 #: view:res.lang:0
 msgid "Update Terms"
-msgstr ""
+msgstr "Atualizar Termos"
 
 #. module: base
 #: field:partner.sms.send,mobile_to:0
@@ -7165,7 +7212,7 @@ msgstr "Argumentos"
 #: code:addons/orm.py:716
 #, python-format
 msgid "Database ID doesn't exist: %s : %s"
-msgstr ""
+msgstr "ID do Banco de Dados não existe: %s : %s"
 
 #. module: base
 #: selection:ir.module.module,license:0
@@ -7181,18 +7228,18 @@ msgstr "GPL Versão 3"
 #: code:addons/orm.py:836
 #, python-format
 msgid "key '%s' not found in selection field '%s'"
-msgstr ""
+msgstr "chave '%s' não encontrado no campo de seleção '%s'"
 
 #. module: base
 #: view:partner.wizard.ean.check:0
 msgid "Correct EAN13"
-msgstr ""
+msgstr "EAN13 Correto"
 
 #. module: base
 #: code:addons/orm.py:2317
 #, python-format
 msgid "The value \"%s\" for the field \"%s\" is not in the selection"
-msgstr ""
+msgstr "O valor \"%s\" para o campo \"%s\" não está na seleção"
 
 #. module: base
 #: field:res.partner,customer:0
@@ -7205,7 +7252,7 @@ msgstr "Cliente"
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (NI) / Español (NI)"
-msgstr ""
+msgstr "Spanish (NI) / Español (NI)"
 
 #. module: base
 #: field:ir.module.module,shortdesc:0
@@ -7226,7 +7273,7 @@ msgstr "Hora 00->24: %(h24)s"
 #. module: base
 #: field:ir.cron,nextcall:0
 msgid "Next Execution Date"
-msgstr ""
+msgstr "Próxima Data de Execução"
 
 #. module: base
 #: help:multi_company.default,field_id:0
@@ -7268,7 +7315,7 @@ msgstr "Tunísia"
 #. module: base
 #: model:ir.ui.menu,name:base.menu_mrp_root
 msgid "Manufacturing"
-msgstr ""
+msgstr "Manufatura"
 
 #. module: base
 #: model:res.country,name:base.km
@@ -7290,7 +7337,7 @@ msgstr "Cancelar Instalação"
 #. module: base
 #: field:ir.model.fields,selection:0
 msgid "Selection Options"
-msgstr ""
+msgstr "Opções de Seleção"
 
 #. module: base
 #: field:res.partner.category,parent_right:0
@@ -7313,6 +7360,8 @@ msgstr "Copiar Objeto"
 msgid ""
 "Group(s) cannot be deleted, because some user(s) still belong to them: %s !"
 msgstr ""
+"O(s) grupo(s) não pode(m) ser excluído(s) porque algum usuário pertence a "
+"ele(s): %s!"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_country_state
@@ -7367,6 +7416,9 @@ msgid ""
 "\n"
 "[object with reference: %s - %s]"
 msgstr ""
+"\n"
+"\n"
+"[objeto com referência: %s - %s]"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_default
@@ -7396,6 +7448,8 @@ msgid ""
 "Number of time the function is called,\n"
 "a negative number indicates no limit"
 msgstr ""
+"Número de vezes que a função é chamada,\n"
+"um número negativo indica que não há limite"
 
 #. module: base
 #: code:addons/base/ir/ir_model.py:331
@@ -7404,6 +7458,8 @@ msgid ""
 "Changing the type of a column is not yet supported. Please drop it and "
 "create it again!"
 msgstr ""
+"A alteração do tipo de uma coluna não é suportada ainda. Por favor, remova e "
+"crie a coluna novamente!"
 
 #. module: base
 #: field:ir.ui.view_sc,user_id:0
@@ -7419,7 +7475,7 @@ msgstr "Aviso !"
 #. module: base
 #: model:res.widget,title:base.google_maps_widget
 msgid "Google Maps"
-msgstr ""
+msgstr "Google Maps"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_base_config
@@ -7435,7 +7491,7 @@ msgstr "Configuração"
 #. module: base
 #: model:ir.model,name:base.model_publisher_warranty_contract_wizard
 msgid "publisher_warranty.contract.wizard"
-msgstr ""
+msgstr "publisher_warranty.contract.wizard"
 
 #. module: base
 #: field:ir.actions.server,expression:0
@@ -7508,7 +7564,7 @@ msgstr "Estado"
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Galician / Galego"
-msgstr ""
+msgstr "Galician / Galego"
 
 #. module: base
 #: model:res.country,name:base.no
@@ -7529,7 +7585,7 @@ msgstr "Carregar uma tradução oficial"
 #. module: base
 #: view:res.currency:0
 msgid "Miscelleanous"
-msgstr ""
+msgstr "Diversos"
 
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_10
@@ -7549,7 +7605,7 @@ msgstr "Aguardando"
 #. module: base
 #: field:ir.actions.report.xml,report_file:0
 msgid "Report file"
-msgstr ""
+msgstr "Arquivo de relatório"
 
 #. module: base
 #: model:ir.model,name:base.model_workflow_triggers
@@ -7560,7 +7616,7 @@ msgstr "workflow.triggers"
 #: code:addons/base/ir/ir_model.py:62
 #, python-format
 msgid "Invalid search criterions"
-msgstr ""
+msgstr "Critério de pesquisa inválido"
 
 #. module: base
 #: view:ir.attachment:0
@@ -7620,13 +7676,15 @@ msgid ""
 "You try to install module '%s' that depends on module '%s'.\n"
 "But the latter module is not available in your system."
 msgstr ""
+"Você está tentando instalar o módulo '%s' que depende do módulo '%s'.\n"
+"Mas este último não está disponível no seu sistema."
 
 #. module: base
 #: view:base.language.import:0
 #: model:ir.actions.act_window,name:base.action_view_base_import_language
 #: model:ir.ui.menu,name:base.menu_view_base_import_language
 msgid "Import Translation"
-msgstr ""
+msgstr "Importar Tradução"
 
 #. module: base
 #: field:res.partner.bank.type,field_ids:0
@@ -7644,7 +7702,7 @@ msgstr "Categoria"
 #: selection:ir.attachment,type:0
 #: selection:ir.property,type:0
 msgid "Binary"
-msgstr ""
+msgstr "Binário"
 
 #. module: base
 #: field:ir.actions.server,sms:0
@@ -7660,7 +7718,7 @@ msgstr "Costa Rica"
 #. module: base
 #: view:workflow.activity:0
 msgid "Conditions"
-msgstr ""
+msgstr "Condições"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_partner_other_form
@@ -7677,7 +7735,7 @@ msgstr "Moedas"
 #. module: base
 #: sql_constraint:res.groups:0
 msgid "The name of the group must be unique !"
-msgstr ""
+msgstr "O nome do grupo deve ser único!"
 
 #. module: base
 #: view:ir.sequence:0
@@ -7692,7 +7750,7 @@ msgstr "Desmarque o campo Ativo para esconder o contato."
 #. module: base
 #: model:ir.model,name:base.model_res_widget_wizard
 msgid "Add a widget for User"
-msgstr ""
+msgstr "Adiciona um widget para o Usuário"
 
 #. module: base
 #: model:res.country,name:base.dk
@@ -7713,7 +7771,7 @@ msgstr "workflow.instance"
 #: code:addons/orm.py:278
 #, python-format
 msgid "Unknown attribute %s in %s "
-msgstr ""
+msgstr "O atributo %s é desconhecido em %s "
 
 #. module: base
 #: view:res.lang:0
@@ -7724,12 +7782,12 @@ msgstr "10. %S ==> 20"
 #: code:addons/fields.py:106
 #, python-format
 msgid "undefined get method !"
-msgstr ""
+msgstr "Método get não definido!"
 
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Norwegian Bokmål / Norsk bokmål"
-msgstr ""
+msgstr "Norwegian Bokmål / Norsk bokmål"
 
 #. module: base
 #: help:res.config.users,new_password:0
@@ -7738,6 +7796,8 @@ msgid ""
 "Only specify a value if you want to change the user password. This user will "
 "have to logout and login again!"
 msgstr ""
+"Especifique um conteúdo apenas se você quiser trocar a senha do usuário. "
+"Este usuário precisará sair e entrar novamente!"
 
 #. module: base
 #: model:res.partner.title,name:base.res_partner_title_madam
@@ -7752,18 +7812,18 @@ msgstr "Estônia"
 #. module: base
 #: model:ir.ui.menu,name:base.dashboard
 msgid "Dashboards"
-msgstr ""
+msgstr "Painéis"
 
 #. module: base
 #: help:ir.attachment,type:0
 msgid "Binary File or external URL"
-msgstr ""
+msgstr "Arquivo Binário ou URL externa"
 
 #. module: base
 #: field:res.config.users,new_password:0
 #: field:res.users,new_password:0
 msgid "Change password"
-msgstr ""
+msgstr "Alterar senha"
 
 #. module: base
 #: model:res.country,name:base.nl
@@ -7788,7 +7848,7 @@ msgstr "ir.values"
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Occitan (FR, post 1500) / Occitan"
-msgstr ""
+msgstr "Occitan (FR, post 1500) / Occitan"
 
 #. module: base
 #: model:ir.actions.act_window,help:base.open_module_tree
@@ -7798,12 +7858,17 @@ msgid ""
 "button \"Schedule for Installation\" from the form view, then click on "
 "\"Apply Scheduled Upgrades\" to migrate your system."
 msgstr ""
+"Você pode instalar novos módulos para ativar novas funcionalidades, novos "
+"menus, relatórios ou dados na sua instância do OpenERP. Para instalar algum "
+"módulo, clique na opção \"Agendar para Instalação\" na visualização em "
+"formulário, então clique em \"Aplicar Atualizações Agendadas\" para executar "
+"a instalação."
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_emails
 #: model:ir.ui.menu,name:base.menu_mail_gateway
 msgid "Emails"
-msgstr ""
+msgstr "Emails"
 
 #. module: base
 #: model:res.country,name:base.cd
@@ -7813,7 +7878,7 @@ msgstr "República Democrática do Congo"
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Malayalam / മലയാളം"
-msgstr ""
+msgstr "Malayalam / മലയാളം"
 
 #. module: base
 #: view:res.request:0
@@ -7871,7 +7936,7 @@ msgstr "Croatian / hrvatski jezik"
 #. module: base
 #: field:base.language.install,overwrite:0
 msgid "Overwrite Existing Terms"
-msgstr ""
+msgstr "Sobrescrever Termos Existentes"
 
 #. module: base
 #: help:ir.actions.server,code:0
@@ -7881,7 +7946,7 @@ msgstr "Código python a ser executado"
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The code of the country must be unique !"
-msgstr ""
+msgstr "O código do país deve ser único!"
 
 #. module: base
 #: selection:ir.module.module.dependency,state:0
@@ -7902,7 +7967,7 @@ msgstr "Gatilho"
 #. module: base
 #: model:ir.model,name:base.model_base_module_update
 msgid "Update Module"
-msgstr ""
+msgstr "Atualizar Módulo"
 
 #. module: base
 #: view:ir.model.fields:0
@@ -7933,6 +7998,9 @@ msgid ""
 "defining a list of (key, label) pairs. For example: "
 "[('blue','Blue'),('yellow','Yellow')]"
 msgstr ""
+"Lista de opções para um campo de seleção, especificada em expressão Python "
+"definindo uma lista de pares no formato (chave, descrição). Por exemplo: "
+"[('azul','Azul'),('amarelo','Amarelo')]"
 
 #. module: base
 #: selection:base.language.export,state:0
@@ -7945,6 +8013,8 @@ msgid ""
 "Indicates whether this object model lives in memory only, i.e. is not "
 "persisted (osv.osv_memory)"
 msgstr ""
+"Indica se este modelo de objeto reside apenas na memória, ou seja, não é "
+"persistido (osv.osv_memory)"
 
 #. module: base
 #: field:res.partner,child_ids:0
@@ -7962,7 +8032,7 @@ msgstr "Fornecedores"
 #. module: base
 #: view:publisher_warranty.contract.wizard:0
 msgid "Register"
-msgstr ""
+msgstr "Registrar"
 
 #. module: base
 #: field:res.request,ref_doc2:0
@@ -8023,6 +8093,9 @@ msgid ""
 "loading a new language it becomes available as default interface language "
 "for users and partners."
 msgstr ""
+"Este assistente ajuda você a adicionar um novo idioma ao sistema OpenERP. "
+"Após carregar o novo idioma, ele se torna disponível como idioma padrão da "
+"interface para usuários e parceiros."
 
 #. module: base
 #: field:ir.actions.server,subject:0
@@ -8045,7 +8118,7 @@ msgstr "Preferências"
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_consumers0
 msgid "Consumers"
-msgstr ""
+msgstr "Consumidores"
 
 #. module: base
 #: view:res.config:0
@@ -8059,6 +8132,7 @@ msgid ""
 "Name of the method to be called on the object when this scheduler is "
 "executed."
 msgstr ""
+"Nome do método a ser chamado no objeto quando este agendamento for executado."
 
 #. module: base
 #: code:addons/base/ir/ir_model.py:219
@@ -8067,11 +8141,13 @@ msgid ""
 "The Selection Options expression is must be in the [('key','Label'), ...] "
 "format!"
 msgstr ""
+"A expressão de Opções de Seleção deve estar no formato "
+"[('chave','Descrição'),...]!"
 
 #. module: base
 #: view:ir.actions.report.xml:0
 msgid "Miscellaneous"
-msgstr ""
+msgstr "Diversos"
 
 #. module: base
 #: model:res.country,name:base.cn
@@ -8102,6 +8178,8 @@ msgid ""
 "Create and manage the companies that will be managed by OpenERP from here. "
 "Shops or subsidiaries can be created and maintained from here."
 msgstr ""
+"Crie e gerencie as empresas que você quer controlar com o OpenERP aqui. "
+"Lojas ou subsidiárias podem ser criadas e gerenciadas aqui também."
 
 #. module: base
 #: model:res.country,name:base.id
@@ -8134,7 +8212,7 @@ msgstr "Bulgária"
 #. module: base
 #: view:publisher_warranty.contract.wizard:0
 msgid "Publisher warranty contract successfully registered!"
-msgstr ""
+msgstr "O contrato de garantia do distribuidor foi registrado com sucesso!"
 
 #. module: base
 #: model:res.country,name:base.ao
@@ -8169,7 +8247,7 @@ msgstr "5.  %y, %Y  ==> 08, 2008"
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_ltd
 msgid "ltd"
-msgstr ""
+msgstr "ltda"
 
 #. module: base
 #: field:ir.values,res_id:0
@@ -8190,7 +8268,7 @@ msgstr "Administração"
 #. module: base
 #: view:base.module.update:0
 msgid "Click on Update below to start the process..."
-msgstr ""
+msgstr "Clique no Atualizar abaixo para iniciar o processo..."
 
 #. module: base
 #: model:res.country,name:base.ir
@@ -8201,12 +8279,12 @@ msgstr "Irã"
 #: model:ir.actions.act_window,name:base.res_widget_user_act_window
 #: model:ir.ui.menu,name:base.menu_res_widget_user_act_window
 msgid "Widgets per User"
-msgstr ""
+msgstr "Widgets por Usuário"
 
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Slovak / Slovenský jazyk"
-msgstr ""
+msgstr "Slovak / Slovenský jazyk"
 
 #. module: base
 #: field:base.language.export,state:0
@@ -8218,18 +8296,18 @@ msgstr "desconhecido"
 #. module: base
 #: field:res.currency,symbol:0
 msgid "Symbol"
-msgstr ""
+msgstr "Símbolo"
 
 #. module: base
 #: help:res.config.users,login:0
 #: help:res.users,login:0
 msgid "Used to log into the system"
-msgstr ""
+msgstr "Usado para entrar no sistema"
 
 #. module: base
 #: view:base.update.translations:0
 msgid "Synchronize Translation"
-msgstr ""
+msgstr "Sincronizar Tradução"
 
 #. module: base
 #: field:ir.ui.view_sc,res_id:0
@@ -8249,7 +8327,7 @@ msgstr "Iraque"
 #. module: base
 #: model:ir.ui.menu,name:base.menu_association
 msgid "Association"
-msgstr ""
+msgstr "Associação"
 
 #. module: base
 #: model:res.country,name:base.cl
@@ -8282,7 +8360,7 @@ msgstr "Conta No."
 #: code:addons/base/res/res_lang.py:157
 #, python-format
 msgid "Base Language 'en_US' can not be deleted !"
-msgstr ""
+msgstr "O idioma base 'en_US' não pode ser excluído!"
 
 #. module: base
 #: selection:ir.model,state:0
@@ -8321,6 +8399,8 @@ msgid ""
 "Operation prohibited by access rules, or performed on an already deleted "
 "document (Operation: %s, Document type: %s)."
 msgstr ""
+"Operação proibida por regras de acesso ou executada em um documento já "
+"excluído (Operação: %s, Tipo de documento: %s)."
 
 #. module: base
 #: model:res.country,name:base.zr
@@ -8344,12 +8424,12 @@ msgstr "Informação"
 #. module: base
 #: view:res.widget.user:0
 msgid "User Widgets"
-msgstr ""
+msgstr "Widgets de Usuário"
 
 #. module: base
 #: view:base.module.update:0
 msgid "Update Module List"
-msgstr ""
+msgstr "Atualizar Lista de Módulos"
 
 #. module: base
 #: selection:res.partner.address,type:0
@@ -8384,6 +8464,7 @@ msgstr "Auto-atualizar"
 #, python-format
 msgid "The osv_memory field can only be compared with = and != operator."
 msgstr ""
+"O campo osv_memory pode ser comparado com os operadores = e != apenas."
 
 #. module: base
 #: selection:ir.ui.view,type:0
@@ -8393,24 +8474,24 @@ msgstr "Diagrama"
 #. module: base
 #: help:multi_company.default,name:0
 msgid "Name it to easily find a record"
-msgstr ""
+msgstr "Coloque um nome para encontrar facilmente um registro"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.grant_menu_access
 #: model:ir.ui.menu,name:base.menu_grant_menu_access
 msgid "Menu Items"
-msgstr ""
+msgstr "Ítens de Menu"
 
 #. module: base
 #: constraint:ir.rule:0
 msgid "Rules are not supported for osv_memory objects !"
-msgstr ""
+msgstr "Regras não são suportadas em objetos osv_memory!"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_event_association
 #: model:ir.ui.menu,name:base.menu_event_main
 msgid "Events Organisation"
-msgstr ""
+msgstr "Organização de Eventos"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.ir_sequence_actions
@@ -8512,12 +8593,12 @@ msgstr "Tanzânia"
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Danish / Dansk"
-msgstr ""
+msgstr "Danish / Dansk"
 
 #. module: base
 #: selection:ir.model.fields,select_level:0
 msgid "Advanced Search (deprecated)"
-msgstr ""
+msgstr "Pesquisa Avançada (obsoleta)"
 
 #. module: base
 #: model:res.country,name:base.cx
@@ -8545,7 +8626,7 @@ msgstr "Canais"
 #. module: base
 #: view:ir.ui.view:0
 msgid "Extra Info"
-msgstr ""
+msgstr "Info. Extra"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.act_values_form_action
@@ -8561,7 +8642,7 @@ msgstr "Agendar para instalação"
 #. module: base
 #: model:ir.model,name:base.model_partner_wizard_ean_check
 msgid "Ean Check"
-msgstr ""
+msgstr "Conferência de EAN"
 
 #. module: base
 #: sql_constraint:res.config.users:0
@@ -8583,7 +8664,7 @@ msgstr "Enviar"
 #: field:res.config.users,menu_tips:0
 #: field:res.users,menu_tips:0
 msgid "Menu Tips"
-msgstr ""
+msgstr "Dicas de Menu"
 
 #. module: base
 #: field:ir.translation,src:0
@@ -8624,14 +8705,14 @@ msgstr "Iniciar configuração"
 #. module: base
 #: view:base.language.export:0
 msgid "_Export"
-msgstr ""
+msgstr "_Exportar"
 
 #. module: base
 #: field:base.language.install,state:0
 #: field:base.module.import,state:0
 #: field:base.module.update,state:0
 msgid "state"
-msgstr ""
+msgstr "status"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -8646,7 +8727,7 @@ msgstr "República Dominicana"
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Serbian (Cyrillic) / српски"
-msgstr ""
+msgstr "Serbian (Cyrillic) / српски"
 
 #. module: base
 #: code:addons/orm.py:2161
@@ -8655,6 +8736,8 @@ msgid ""
 "Invalid group_by specification: \"%s\".\n"
 "A group_by specification must be a list of valid fields."
 msgstr ""
+"Especificação de group_by inválida: \"%s\".\n"
+"Uma definição de group_by precisa ser uma lista de campos válidos."
 
 #. module: base
 #: model:res.country,name:base.sa
@@ -8684,7 +8767,7 @@ msgstr "Logs de Evento"
 #: code:addons/base/module/wizard/base_module_configuration.py:37
 #, python-format
 msgid "System Configuration done"
-msgstr ""
+msgstr "Configuração do Sistema pronta"
 
 #. module: base
 #: field:workflow.triggers,instance_id:0
@@ -8739,7 +8822,7 @@ msgstr "Erro ! Você não pode criar menu recursivo."
 #: model:ir.ui.menu,name:base.menu_publisher_warranty_contract_add
 #: view:publisher_warranty.contract.wizard:0
 msgid "Register a Contract"
-msgstr ""
+msgstr "Registrar um Contrato"
 
 #. module: base
 #: view:ir.rule:0
@@ -8755,6 +8838,8 @@ msgstr ""
 #, python-format
 msgid "Please check your publisher warranty contract name and validity."
 msgstr ""
+"Por favor, confira o nome do seu contrato de garantia do distribuidor e a "
+"validade."
 
 #. module: base
 #: model:res.country,name:base.sv
@@ -8799,7 +8884,7 @@ msgstr ""
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Romanian / română"
-msgstr ""
+msgstr "Romanian / română"
 
 #. module: base
 #: view:res.log:0
@@ -8837,7 +8922,7 @@ msgstr "ir.actions.act_window"
 #. module: base
 #: field:ir.rule,perm_create:0
 msgid "Apply For Create"
-msgstr ""
+msgstr "Aplicar Para Criação"
 
 #. module: base
 #: model:res.country,name:base.vi
@@ -8863,6 +8948,11 @@ msgid ""
 "be assigned to specific groups in order to make them accessible to some "
 "users within the system."
 msgstr ""
+"Gerencie e personalize os itens disponíveis e mostrados no menu do seu "
+"sistema OpenERP. Você pode excluir um item clicando no box que fica no "
+"início de cada linha e depois clicar no botão que aparece. Itens podem ser "
+"atribuídos a grupos específicos para que fiquem disponíveis apenas para "
+"alguns usuários do sistema."
 
 #. module: base
 #: field:ir.ui.view,field_parent:0
@@ -8903,7 +8993,7 @@ msgstr "Auto-carregar Visão"
 #: code:addons/base/ir/ir_model.py:232
 #, python-format
 msgid "You cannot remove the field '%s' !"
-msgstr ""
+msgstr "Você não pode remover o campo '%s'!"
 
 #. module: base
 #: field:ir.exports,resource:0
@@ -8915,23 +9005,23 @@ msgstr "Recurso"
 #. module: base
 #: field:ir.ui.menu,web_icon:0
 msgid "Web Icon File"
-msgstr ""
+msgstr "Arquivo do Ícone Web"
 
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Persian / فارس"
-msgstr ""
+msgstr "Persian / فارس"
 
 #. module: base
 #: view:ir.actions.act_window:0
 msgid "View Ordering"
-msgstr ""
+msgstr "Ordenação da Exibição"
 
 #. module: base
 #: code:addons/base/module/wizard/base_module_upgrade.py:95
 #, python-format
 msgid "Unmet dependency !"
-msgstr ""
+msgstr "Dependência não atendida!"
 
 #. module: base
 #: view:base.language.import:0
@@ -8939,6 +9029,8 @@ msgid ""
 "Supported file formats: *.csv (Comma-separated values) or *.po (GetText "
 "Portable Objects)"
 msgstr ""
+"Formatos de arquivo suportado: *.csv (Separado por Vírgula) ou *.po (GetText "
+"Portable Objects)"
 
 #. module: base
 #: code:addons/base/ir/ir_model.py:487
@@ -8947,11 +9039,13 @@ msgid ""
 "You can not delete this document (%s) ! Be sure your user belongs to one of "
 "these groups: %s."
 msgstr ""
+"Você não pode excluir este documento (%s)! Certifique-se de que seu usuário "
+"pertence a um destes grupos: %s."
 
 #. module: base
 #: model:ir.model,name:base.model_base_module_configuration
 msgid "base.module.configuration"
-msgstr ""
+msgstr "base.module.configuration"
 
 #. module: base
 #: field:base.language.export,name:0
@@ -8973,7 +9067,7 @@ msgstr "República da Eslováquia"
 #. module: base
 #: model:ir.ui.menu,name:base.publisher_warranty
 msgid "Publisher Warranty"
-msgstr ""
+msgstr "Garantia do Distribuidor"
 
 #. module: base
 #: model:res.country,name:base.aw
@@ -9025,17 +9119,17 @@ msgstr "Email & Assinatura"
 #. module: base
 #: view:publisher_warranty.contract:0
 msgid "Publisher Warranty Contract"
-msgstr ""
+msgstr "Contrato de Garantia do Distribuidor"
 
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Bulgarian / български език"
-msgstr ""
+msgstr "Bulgarian / български език"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_aftersale
 msgid "After-Sale Services"
-msgstr ""
+msgstr "Serviços pós-venda"
 
 #. module: base
 #: view:ir.actions.todo:0
@@ -9167,6 +9261,9 @@ msgid ""
 "simplified interface, which has less features but is easier. You can always "
 "switch later from the user preferences."
 msgstr ""
+"Se você estiver usando o OpenERP pela primeira vez, recomendamos que "
+"selecione a interface simplificada, que tem menos opções mas é mais fácil. "
+"Você poderá sempre mudar isso nas preferências de usuário."
 
 #. module: base
 #: model:ir.model,name:base.model_res_country
@@ -9208,7 +9305,7 @@ msgstr "Nome de Categoria"
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_15
 msgid "IT sector"
-msgstr ""
+msgstr "Setor de TI"
 
 #. module: base
 #: view:ir.actions.act_window:0
@@ -9223,7 +9320,7 @@ msgstr "%X - Tempo de representação adequado."
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (SV) / Español (SV)"
-msgstr ""
+msgstr "Spanish (SV) / Español (SV)"
 
 #. module: base
 #: help:res.lang,grouping:0
@@ -9248,7 +9345,7 @@ msgstr "Retrato"
 #: code:addons/base/ir/ir_model.py:317
 #, python-format
 msgid "Can only rename one column at a time!"
-msgstr ""
+msgstr "Renomeie uma coluna de cada vez!"
 
 #. module: base
 #: selection:ir.translation,type:0
@@ -9258,7 +9355,7 @@ msgstr "Butão do assistente"
 #. module: base
 #: selection:ir.translation,type:0
 msgid "Report/Template"
-msgstr ""
+msgstr "Relatório/Modelo"
 
 #. module: base
 #: selection:ir.actions.act_window.view,view_mode:0
@@ -9280,7 +9377,7 @@ msgstr "ir.actions.server"
 #: field:res.config.users,progress:0
 #: field:res.config.view,progress:0
 msgid "Configuration Progress"
-msgstr "Progresso da configuração"
+msgstr "Progresso da Configuração"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.act_ir_actions_todo_form
@@ -9302,7 +9399,7 @@ msgstr "Modo de separação"
 #. module: base
 #: view:base.module.upgrade:0
 msgid "Note that this operation might take a few minutes."
-msgstr ""
+msgstr "Repare que esta operação pode durar alguns minutos."
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_localisation
@@ -9317,7 +9414,7 @@ msgstr "Ação de Lançamento"
 #. module: base
 #: view:ir.cron:0
 msgid "Execution"
-msgstr ""
+msgstr "Execução"
 
 #. module: base
 #: field:ir.actions.server,condition:0
@@ -9351,11 +9448,13 @@ msgid ""
 "Only one client action will be executed, last client action will be "
 "considered in case of multiple client actions."
 msgstr ""
+"Apenas uma ação de cliente será executada. A última ação de cliente será "
+"considerada em caso de múltiplas ações de cliente."
 
 #. module: base
 #: view:res.lang:0
 msgid "%j - Day of the year [001,366]."
-msgstr ""
+msgstr "%j - Dia do ano [001-366]."
 
 #. module: base
 #: field:ir.actions.server,mobile:0
@@ -9374,7 +9473,7 @@ msgstr "Categorias de Parceiros"
 #. module: base
 #: view:base.module.upgrade:0
 msgid "System Update"
-msgstr ""
+msgstr "Atualização do Sistema"
 
 #. module: base
 #: selection:ir.translation,type:0
@@ -9384,7 +9483,7 @@ msgstr "Campo do Assistente"
 #. module: base
 #: help:ir.sequence,prefix:0
 msgid "Prefix value of the record for the sequence"
-msgstr ""
+msgstr "Prefixo de registro para a sequência"
 
 #. module: base
 #: model:res.country,name:base.sc
@@ -9422,12 +9521,12 @@ msgstr "Titular da Conta"
 #: code:addons/base/res/res_user.py:256
 #, python-format
 msgid "Company Switch Warning"
-msgstr ""
+msgstr "Aviso de Mudança de Empresa"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_res_widget_wizard
 msgid "Homepage Widgets Management"
-msgstr ""
+msgstr "Homepage para Gerenciamento de Widgets"
 
 #. module: base
 #: field:workflow,osv:0
@@ -9438,7 +9537,7 @@ msgstr "Recurso do objeto"
 #. module: base
 #: help:ir.sequence,number_increment:0
 msgid "The next number of the sequence will be incremented by this number"
-msgstr ""
+msgstr "O próximo número da sequência será incrementada com este número"
 
 #. module: base
 #: field:ir.cron,function:0
@@ -9450,7 +9549,7 @@ msgstr "Função"
 #. module: base
 #: view:res.widget:0
 msgid "Search Widget"
-msgstr ""
+msgstr "Pesquisar Widget"
 
 #. module: base
 #: selection:ir.actions.todo,restart:0
diff --git a/bin/addons/base/i18n/ro.po b/bin/addons/base/i18n/ro.po
index eaa521b990c..c4573a3822b 100644
--- a/bin/addons/base/i18n/ro.po
+++ b/bin/addons/base/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-03-25 04:39+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-04-09 04:54+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
 #. module: base
 #: view:ir.filters:0
@@ -47,6 +47,8 @@ msgid ""
 "The second argument of the many2many field %s must be a SQL table !You used "
 "%s, which is not a valid SQL table name."
 msgstr ""
+"Al doilea parametru a câmpului many2many %s trebuie să fie o tabelă SQL ! %s "
+"utilizat nu este o tabelă SQL validă."
 
 #. module: base
 #: view:ir.values:0
@@ -117,6 +119,8 @@ msgid ""
 "You can not write in this document (%s) ! Be sure your user belongs to one "
 "of these groups: %s."
 msgstr ""
+"Nu puteți scrie în acest document (%s) ! Asigurați-vă că utilizatorul "
+"aparține grupului: %s."
 
 #. module: base
 #: help:ir.model.fields,domain:0
@@ -125,6 +129,8 @@ msgid ""
 "specified as a Python expression defining a list of triplets. For example: "
 "[('color','=','red')]"
 msgstr ""
+"Domeniu opțional pentru a restricționa valorile pentru câmpul de relație,  "
+"specificat ca o listă Python. De exemplu:   [('color','=','red')]"
 
 #. module: base
 #: field:res.partner,ref:0
@@ -437,7 +443,7 @@ msgstr "Planificare actualizare"
 #: code:addons/orm.py:838
 #, python-format
 msgid "Key/value '%s' not found in selection field '%s'"
-msgstr ""
+msgstr "Cheia/valoarea '%s' nu este găsită în selecția câmpului '%s'"
 
 #. module: base
 #: help:res.country,code:0
@@ -784,7 +790,7 @@ msgstr "Categorii subordonate"
 #. module: base
 #: model:ir.model,name:base.model_ir_config_parameter
 msgid "ir.config_parameter"
-msgstr ""
+msgstr "ir.config_parameter"
 
 #. module: base
 #: selection:base.language.export,format:0
@@ -868,7 +874,7 @@ msgstr "Tranzitii"
 #: code:addons/orm.py:4020
 #, python-format
 msgid "Record #%d of %s not found, cannot copy!"
-msgstr ""
+msgstr "Înregistrarea #%d a %s negăsită, nu se poate face copia!"
 
 #. module: base
 #: field:ir.module.module,contributors:0
@@ -2151,7 +2157,7 @@ msgstr ""
 #. module: base
 #: model:ir.model,name:base.model_ir_module_module_dependency
 msgid "Module dependency"
-msgstr "Dependinţele modulului"
+msgstr "Dependenţele modulului"
 
 #. module: base
 #: selection:publisher_warranty.contract.wizard,state:0
@@ -2194,7 +2200,7 @@ msgstr "Controale de acces"
 #: view:ir.module.module:0
 #: field:ir.module.module,dependencies_id:0
 msgid "Dependencies"
-msgstr "Dependinţe"
+msgstr "Dependențe"
 
 #. module: base
 #: field:multi_company.default,company_id:0
diff --git a/bin/addons/base/i18n/ru.po b/bin/addons/base/i18n/ru.po
index b31a7c3ebb6..48d62b57ca6 100644
--- a/bin/addons/base/i18n/ru.po
+++ b/bin/addons/base/i18n/ru.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-03-10 04:44+0000\n"
-"X-Generator: Launchpad (build 12351)\n"
+"X-Launchpad-Export-Date: 2011-04-09 04:55+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
 #. module: base
 #: view:ir.filters:0
@@ -1655,7 +1655,7 @@ msgstr "Для удаления"
 #. module: base
 #: model:ir.model,name:base.model_ir_sequence
 msgid "ir.sequence"
-msgstr "Последовательность"
+msgstr "ir.sequence"
 
 #. module: base
 #: help:ir.actions.server,expression:0
diff --git a/bin/addons/base/i18n/sk.po b/bin/addons/base/i18n/sk.po
index b3a4fed2510..947f18ea4d3 100644
--- a/bin/addons/base/i18n/sk.po
+++ b/bin/addons/base/i18n/sk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-02-16 04:56+0000\n"
-"X-Generator: Launchpad (build 12351)\n"
+"X-Launchpad-Export-Date: 2011-04-09 04:55+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/bin/addons/base/i18n/sl.po b/bin/addons/base/i18n/sl.po
index c47b6e51de7..b90532f954b 100644
--- a/bin/addons/base/i18n/sl.po
+++ b/bin/addons/base/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-02-16 04:56+0000\n"
-"X-Generator: Launchpad (build 12351)\n"
+"X-Launchpad-Export-Date: 2011-04-09 04:55+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/bin/addons/base/i18n/sq.po b/bin/addons/base/i18n/sq.po
index 2204d6ec1c7..5163adbf424 100644
--- a/bin/addons/base/i18n/sq.po
+++ b/bin/addons/base/i18n/sq.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-02-16 04:49+0000\n"
-"X-Generator: Launchpad (build 12351)\n"
+"X-Launchpad-Export-Date: 2011-04-09 04:49+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/bin/addons/base/i18n/sr.po b/bin/addons/base/i18n/sr.po
index 363801d83d3..892fa6f8f8c 100644
--- a/bin/addons/base/i18n/sr.po
+++ b/bin/addons/base/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-02-16 04:55+0000\n"
-"X-Generator: Launchpad (build 12351)\n"
+"X-Launchpad-Export-Date: 2011-04-09 04:55+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/bin/addons/base/i18n/sr@latin.po b/bin/addons/base/i18n/sr@latin.po
index 57fa91e9750..3b9f7fb9118 100644
--- a/bin/addons/base/i18n/sr@latin.po
+++ b/bin/addons/base/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-02-16 04:59+0000\n"
-"X-Generator: Launchpad (build 12351)\n"
+"X-Launchpad-Export-Date: 2011-04-09 04:58+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/bin/addons/base/i18n/sv.po b/bin/addons/base/i18n/sv.po
index e27ec11c80c..40170e9079d 100644
--- a/bin/addons/base/i18n/sv.po
+++ b/bin/addons/base/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-02-16 04:56+0000\n"
-"X-Generator: Launchpad (build 12351)\n"
+"X-Launchpad-Export-Date: 2011-04-09 04:56+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/bin/addons/base/i18n/th.po b/bin/addons/base/i18n/th.po
index 81a8b413bb8..8a477dd3aff 100644
--- a/bin/addons/base/i18n/th.po
+++ b/bin/addons/base/i18n/th.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-02-16 04:57+0000\n"
-"X-Generator: Launchpad (build 12351)\n"
+"X-Launchpad-Export-Date: 2011-04-09 04:56+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/bin/addons/base/i18n/tlh.po b/bin/addons/base/i18n/tlh.po
index f980ef5c33c..94ce3d0d2a2 100644
--- a/bin/addons/base/i18n/tlh.po
+++ b/bin/addons/base/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-02-16 04:57+0000\n"
-"X-Generator: Launchpad (build 12351)\n"
+"X-Launchpad-Export-Date: 2011-04-09 04:56+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/bin/addons/base/i18n/tr.po b/bin/addons/base/i18n/tr.po
index 00f56cd972a..d2966e4cf56 100644
--- a/bin/addons/base/i18n/tr.po
+++ b/bin/addons/base/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-02-16 04:57+0000\n"
-"X-Generator: Launchpad (build 12351)\n"
+"X-Launchpad-Export-Date: 2011-04-09 04:56+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/bin/addons/base/i18n/uk.po b/bin/addons/base/i18n/uk.po
index 21228faf03a..2c8dc3201e2 100644
--- a/bin/addons/base/i18n/uk.po
+++ b/bin/addons/base/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-02-16 04:57+0000\n"
-"X-Generator: Launchpad (build 12351)\n"
+"X-Launchpad-Export-Date: 2011-04-09 04:56+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/bin/addons/base/i18n/ur.po b/bin/addons/base/i18n/ur.po
index e17e43cac57..265444a22c9 100644
--- a/bin/addons/base/i18n/ur.po
+++ b/bin/addons/base/i18n/ur.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-02-16 04:57+0000\n"
-"X-Generator: Launchpad (build 12351)\n"
+"X-Launchpad-Export-Date: 2011-04-09 04:56+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/bin/addons/base/i18n/vi.po b/bin/addons/base/i18n/vi.po
index 1f3f9a8fb85..a1a0f9c96c5 100644
--- a/bin/addons/base/i18n/vi.po
+++ b/bin/addons/base/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-02-16 04:57+0000\n"
-"X-Generator: Launchpad (build 12351)\n"
+"X-Launchpad-Export-Date: 2011-04-09 04:57+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
 #. module: base
 #: view:ir.filters:0
@@ -141,7 +141,7 @@ msgstr "Cửa sổ đích"
 #: code:addons/base/res/res_user.py:507
 #, python-format
 msgid "Warning!"
-msgstr ""
+msgstr "Cảnh báo!"
 
 #. module: base
 #: code:addons/base/ir/ir_model.py:304
@@ -268,7 +268,7 @@ msgstr "có hiệu lực"
 #. module: base
 #: field:ir.actions.wizard,wiz_name:0
 msgid "Wizard Name"
-msgstr ""
+msgstr "Tên Trình hướng dẫn"
 
 #. module: base
 #: code:addons/orm.py:2160
@@ -299,7 +299,7 @@ msgstr "Đối tượng Nguồn"
 #. module: base
 #: view:ir.actions.todo:0
 msgid "Config Wizard Steps"
-msgstr ""
+msgstr "Các bước của Trình hướng dẫn Cấu hình"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_ui_view_sc
@@ -381,7 +381,7 @@ msgstr "Tiếng Hy Lạp"
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Bosnian / bosanski jezik"
-msgstr ""
+msgstr "Tiếng Bosnia"
 
 #. module: base
 #: help:ir.actions.report.xml,attachment_use:0
@@ -494,7 +494,7 @@ msgstr "Người dùng mới"
 #. module: base
 #: view:base.language.export:0
 msgid "Export done"
-msgstr ""
+msgstr "Trích xuất hoàn tất"
 
 #. module: base
 #: view:ir.model:0
@@ -615,7 +615,7 @@ msgstr ""
 #. module: base
 #: model:ir.ui.menu,name:base.menu_crm_config_opportunity
 msgid "Opportunities"
-msgstr ""
+msgstr "Các cơ hội"
 
 #. module: base
 #: model:ir.model,name:base.model_base_language_export
diff --git a/bin/addons/base/i18n/zh_CN.po b/bin/addons/base/i18n/zh_CN.po
index 4d14cf24207..e2a22c6c33b 100644
--- a/bin/addons/base/i18n/zh_CN.po
+++ b/bin/addons/base/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-02-16 04:59+0000\n"
-"X-Generator: Launchpad (build 12351)\n"
+"X-Launchpad-Export-Date: 2011-04-09 04:58+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/bin/addons/base/i18n/zh_TW.po b/bin/addons/base/i18n/zh_TW.po
index 5ad3c4f7145..c947f2027cb 100644
--- a/bin/addons/base/i18n/zh_TW.po
+++ b/bin/addons/base/i18n/zh_TW.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-02-16 04:58+0000\n"
-"X-Generator: Launchpad (build 12351)\n"
+"X-Launchpad-Export-Date: 2011-04-09 04:58+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/debian/po/bg.po b/debian/po/bg.po
index 31dca8470b1..4114098bf1f 100644
--- a/debian/po/bg.po
+++ b/debian/po/bg.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-02-16 04:59+0000\n"
-"X-Generator: Launchpad (build 12351)\n"
+"X-Launchpad-Export-Date: 2011-04-09 04:58+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/ca.po b/debian/po/ca.po
index 46b36a52944..d6620325be2 100644
--- a/debian/po/ca.po
+++ b/debian/po/ca.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-02-16 04:59+0000\n"
-"X-Generator: Launchpad (build 12351)\n"
+"X-Launchpad-Export-Date: 2011-04-09 04:58+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/cs.po b/debian/po/cs.po
index 05e61f1eec0..828da50ac8c 100644
--- a/debian/po/cs.po
+++ b/debian/po/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-02-16 04:59+0000\n"
-"X-Generator: Launchpad (build 12351)\n"
+"X-Launchpad-Export-Date: 2011-04-09 04:59+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/de.po b/debian/po/de.po
index 8692ca59226..0913e1f9390 100644
--- a/debian/po/de.po
+++ b/debian/po/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-02-16 04:59+0000\n"
-"X-Generator: Launchpad (build 12351)\n"
+"X-Launchpad-Export-Date: 2011-04-09 04:59+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/el.po b/debian/po/el.po
index c49fc00b5d4..cf0a0ce7d49 100644
--- a/debian/po/el.po
+++ b/debian/po/el.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-02-16 04:59+0000\n"
-"X-Generator: Launchpad (build 12351)\n"
+"X-Launchpad-Export-Date: 2011-04-09 04:59+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/en_GB.po b/debian/po/en_GB.po
index da69df4666f..d18900928f6 100644
--- a/debian/po/en_GB.po
+++ b/debian/po/en_GB.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-02-16 05:00+0000\n"
-"X-Generator: Launchpad (build 12351)\n"
+"X-Launchpad-Export-Date: 2011-04-09 04:59+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/es.po b/debian/po/es.po
index 9c90f89530f..a2b756e0b56 100644
--- a/debian/po/es.po
+++ b/debian/po/es.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-02-16 05:00+0000\n"
-"X-Generator: Launchpad (build 12351)\n"
+"X-Launchpad-Export-Date: 2011-04-09 04:59+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/es_CL.po b/debian/po/es_CL.po
index 6f341a4db4d..534d217c24c 100644
--- a/debian/po/es_CL.po
+++ b/debian/po/es_CL.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-02-16 05:00+0000\n"
-"X-Generator: Launchpad (build 12351)\n"
+"X-Launchpad-Export-Date: 2011-04-09 04:59+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/es_EC.po b/debian/po/es_EC.po
index e3e5f08debc..56a5a0679e4 100644
--- a/debian/po/es_EC.po
+++ b/debian/po/es_EC.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-02-16 05:00+0000\n"
-"X-Generator: Launchpad (build 12351)\n"
+"X-Launchpad-Export-Date: 2011-04-09 04:59+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/fa.po b/debian/po/fa.po
index 586d23831c1..71e215d85a1 100644
--- a/debian/po/fa.po
+++ b/debian/po/fa.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-02-16 04:59+0000\n"
-"X-Generator: Launchpad (build 12351)\n"
+"X-Launchpad-Export-Date: 2011-04-09 04:59+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/fi.po b/debian/po/fi.po
index a7bb529de62..0b21344078d 100644
--- a/debian/po/fi.po
+++ b/debian/po/fi.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-02-16 04:59+0000\n"
-"X-Generator: Launchpad (build 12351)\n"
+"X-Launchpad-Export-Date: 2011-04-09 04:59+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/fr.po b/debian/po/fr.po
index 5f3a9d3f534..d886baf38c0 100644
--- a/debian/po/fr.po
+++ b/debian/po/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-02-16 04:59+0000\n"
-"X-Generator: Launchpad (build 12351)\n"
+"X-Launchpad-Export-Date: 2011-04-09 04:59+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/gl.po b/debian/po/gl.po
index d9449cedb41..c77faee2a0d 100644
--- a/debian/po/gl.po
+++ b/debian/po/gl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-02-16 04:59+0000\n"
-"X-Generator: Launchpad (build 12351)\n"
+"X-Launchpad-Export-Date: 2011-04-09 04:59+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/he.po b/debian/po/he.po
index d9e2a045591..0980a8f64a8 100644
--- a/debian/po/he.po
+++ b/debian/po/he.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-02-23 06:17+0000\n"
-"X-Generator: Launchpad (build 12351)\n"
+"X-Launchpad-Export-Date: 2011-04-09 04:59+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/hr.po b/debian/po/hr.po
index 588085b8566..97fccea596f 100644
--- a/debian/po/hr.po
+++ b/debian/po/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-02-16 05:00+0000\n"
-"X-Generator: Launchpad (build 12351)\n"
+"X-Launchpad-Export-Date: 2011-04-09 04:59+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/hu.po b/debian/po/hu.po
index bc707ddeb1a..2749b521ed7 100644
--- a/debian/po/hu.po
+++ b/debian/po/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-02-16 04:59+0000\n"
-"X-Generator: Launchpad (build 12351)\n"
+"X-Launchpad-Export-Date: 2011-04-09 04:59+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/it.po b/debian/po/it.po
index 02acddd4646..c8b7cddb483 100644
--- a/debian/po/it.po
+++ b/debian/po/it.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-02-16 04:59+0000\n"
-"X-Generator: Launchpad (build 12351)\n"
+"X-Launchpad-Export-Date: 2011-04-09 04:59+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/ja.po b/debian/po/ja.po
index e198f032b12..4cc67c42c40 100644
--- a/debian/po/ja.po
+++ b/debian/po/ja.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-02-16 04:59+0000\n"
-"X-Generator: Launchpad (build 12351)\n"
+"X-Launchpad-Export-Date: 2011-04-09 04:59+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/ko.po b/debian/po/ko.po
index 54f1823c68d..99b7c4820a6 100644
--- a/debian/po/ko.po
+++ b/debian/po/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-02-16 04:59+0000\n"
-"X-Generator: Launchpad (build 12351)\n"
+"X-Launchpad-Export-Date: 2011-04-09 04:59+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/lv.po b/debian/po/lv.po
index b116aecddaa..f3be1623204 100644
--- a/debian/po/lv.po
+++ b/debian/po/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-02-16 04:59+0000\n"
-"X-Generator: Launchpad (build 12351)\n"
+"X-Launchpad-Export-Date: 2011-04-09 04:59+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/mn.po b/debian/po/mn.po
index 957dd721bcc..15422904083 100644
--- a/debian/po/mn.po
+++ b/debian/po/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-02-16 04:59+0000\n"
-"X-Generator: Launchpad (build 12351)\n"
+"X-Launchpad-Export-Date: 2011-04-09 04:59+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/nb.po b/debian/po/nb.po
index 499159ecf3a..2cd4488244c 100644
--- a/debian/po/nb.po
+++ b/debian/po/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-02-16 04:59+0000\n"
-"X-Generator: Launchpad (build 12351)\n"
+"X-Launchpad-Export-Date: 2011-04-09 04:59+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/nl.po b/debian/po/nl.po
index 4964fc3d95c..bdc691b1ecc 100644
--- a/debian/po/nl.po
+++ b/debian/po/nl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-02-16 04:59+0000\n"
-"X-Generator: Launchpad (build 12351)\n"
+"X-Launchpad-Export-Date: 2011-04-09 04:59+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/pl.po b/debian/po/pl.po
index ecf02080926..5276332e671 100644
--- a/debian/po/pl.po
+++ b/debian/po/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-02-16 04:59+0000\n"
-"X-Generator: Launchpad (build 12351)\n"
+"X-Launchpad-Export-Date: 2011-04-09 04:59+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/pt.po b/debian/po/pt.po
index 5afe5a0006d..f0753a5dc23 100644
--- a/debian/po/pt.po
+++ b/debian/po/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-02-16 05:00+0000\n"
-"X-Generator: Launchpad (build 12351)\n"
+"X-Launchpad-Export-Date: 2011-04-09 04:59+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/pt_BR.po b/debian/po/pt_BR.po
index d9dab2f9c2b..b57bfa26a26 100644
--- a/debian/po/pt_BR.po
+++ b/debian/po/pt_BR.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-server\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-24 22:41+0300\n"
-"PO-Revision-Date: 2011-02-23 22:44+0000\n"
-"Last-Translator: Emerson <Unknown>\n"
+"PO-Revision-Date: 2010-11-07 07:06+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@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: 2011-03-01 06:00+0000\n"
-"X-Generator: Launchpad (build 12351)\n"
+"X-Launchpad-Export-Date: 2011-04-09 04:59+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/ro.po b/debian/po/ro.po
index 02176b2b3ee..f0b3e852908 100644
--- a/debian/po/ro.po
+++ b/debian/po/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-02-16 05:00+0000\n"
-"X-Generator: Launchpad (build 12351)\n"
+"X-Launchpad-Export-Date: 2011-04-09 04:59+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/ru.po b/debian/po/ru.po
index 317b73bf725..2206e7bcb5b 100644
--- a/debian/po/ru.po
+++ b/debian/po/ru.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-02-16 05:00+0000\n"
-"X-Generator: Launchpad (build 12351)\n"
+"X-Launchpad-Export-Date: 2011-04-09 04:59+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/sk.po b/debian/po/sk.po
index 7c7130a74d6..6d392a41dc5 100644
--- a/debian/po/sk.po
+++ b/debian/po/sk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-02-16 05:00+0000\n"
-"X-Generator: Launchpad (build 12351)\n"
+"X-Launchpad-Export-Date: 2011-04-09 04:59+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/sq.po b/debian/po/sq.po
index 5383cb02030..a579e919dcb 100644
--- a/debian/po/sq.po
+++ b/debian/po/sq.po
@@ -14,14 +14,14 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-03-29 06:20+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-04-09 04:58+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
 #. Type: string
 #. Description
 #: ../openerp-server.templates:1001
 msgid "Dedicated system account for the Open ERP server:"
-msgstr ""
+msgstr "Llogari e dedikuar sistemi për serverin e Hapur ERP"
 
 #. Type: string
 #. Description
@@ -31,9 +31,12 @@ msgid ""
 "the system's security is not compromised by running it with superuser "
 "privileges."
 msgstr ""
+"Serveri i Hapur ERP duhet të përdorë llogarinë e dedikuar për veprimet e tij "
+"në mënyrë që siguria e sistemit nuk është në rrezik nga përdorimi i "
+"privilegjuar i super perdoruesve."
 
 #. Type: string
 #. Description
 #: ../openerp-server.templates:1001
 msgid "Please choose that account's username."
-msgstr ""
+msgstr "Ju lutemi zgjidhni emrin e llogarisë tuaj."
diff --git a/debian/po/sr.po b/debian/po/sr.po
index da3deca9eb5..f8a410e4c8c 100644
--- a/debian/po/sr.po
+++ b/debian/po/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-02-16 05:00+0000\n"
-"X-Generator: Launchpad (build 12351)\n"
+"X-Launchpad-Export-Date: 2011-04-09 04:59+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/sv.po b/debian/po/sv.po
index bfece85c5ef..9484bde189a 100644
--- a/debian/po/sv.po
+++ b/debian/po/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-02-16 05:00+0000\n"
-"X-Generator: Launchpad (build 12351)\n"
+"X-Launchpad-Export-Date: 2011-04-09 04:59+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 "X-Poedit-Language: Swedish\n"
 
 #. Type: string
diff --git a/debian/po/tr.po b/debian/po/tr.po
index 638cf450f31..61c0d2ae9dd 100644
--- a/debian/po/tr.po
+++ b/debian/po/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-02-16 05:00+0000\n"
-"X-Generator: Launchpad (build 12351)\n"
+"X-Launchpad-Export-Date: 2011-04-09 04:59+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/uk.po b/debian/po/uk.po
index 6bd5c022410..62c139cdbad 100644
--- a/debian/po/uk.po
+++ b/debian/po/uk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-02-16 05:00+0000\n"
-"X-Generator: Launchpad (build 12351)\n"
+"X-Launchpad-Export-Date: 2011-04-09 04:59+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/vi.po b/debian/po/vi.po
index 800b6e227b1..7b05a26b1c2 100644
--- a/debian/po/vi.po
+++ b/debian/po/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-02-16 05:00+0000\n"
-"X-Generator: Launchpad (build 12351)\n"
+"X-Launchpad-Export-Date: 2011-04-09 04:59+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/zh_CN.po b/debian/po/zh_CN.po
index 10f98e94af5..e9facd90e03 100644
--- a/debian/po/zh_CN.po
+++ b/debian/po/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-02-16 05:00+0000\n"
-"X-Generator: Launchpad (build 12351)\n"
+"X-Launchpad-Export-Date: 2011-04-09 04:59+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/zh_TW.po b/debian/po/zh_TW.po
index c5f769dcba6..b176cd4c2a7 100644
--- a/debian/po/zh_TW.po
+++ b/debian/po/zh_TW.po
@@ -12,8 +12,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-02-16 05:00+0000\n"
-"X-Generator: Launchpad (build 12351)\n"
+"X-Launchpad-Export-Date: 2011-04-09 04:59+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 "X-Poedit-Country: TAIWAN\n"
 "X-Poedit-Language: Chinese\n"
 "X-Poedit-SourceCharset: utf-8\n"

From b19baeb6a57811839be7afd56cf9621d9d73f560 Mon Sep 17 00:00:00 2001
From: "noz (OpenERP)" <noz@tinyerp.com>
Date: Sat, 9 Apr 2011 23:20:50 +0530
Subject: [PATCH 102/331] [IMP] More implementation on poll, send etc... (Dont
 test anything, still need to modify more)

bzr revid: noz@tinyerp.com-20110409175050-qf4hf3krdrxhzjdh
---
 addons/web_chat/controllers/main.py        | 96 +++++++++++++++++-----
 addons/web_chat/static/lib/AjaxIM/js/im.js |  2 +-
 2 files changed, 75 insertions(+), 23 deletions(-)

diff --git a/addons/web_chat/controllers/main.py b/addons/web_chat/controllers/main.py
index 24409ebce65..456fd0f5340 100644
--- a/addons/web_chat/controllers/main.py
+++ b/addons/web_chat/controllers/main.py
@@ -11,27 +11,32 @@ import openerpweb
 class PollServerMessageQueue(object):
     def __init__(self):
         # message queue
-        self.l = []
+        self.messages = []
         # online users
         self.users = {}
         # should contains: {
         #   'user1234' : { s:1, m:"status message", timestamp: last_contact_timestamp }
         # }
     def userlist(self, req):
-        userlist = [
-                    {"u": "Guest130205108745.47", "s": {"s": 1, "m": ""}, "g": "Users"},
-                    {"u": "Guest130209838956.76", "s": {"s": 1, "m": ""}, "g": "Users"},
-                ]
+        userlist = [users for users in req.applicationsession['users']]
+        
+#        userlist = [
+#                    {"u": "Guest130205108745.47", "s": {"s": 1, "m": ""}, "g": "Users"},
+#                    {"u": "Guest130209838956.76", "s": {"s": 1, "m": ""}, "g": "Users"},
+#                ]
 
         return userlist
 
-    def write(self, m_type,  m_sender, m_recipent, m_message, m_group):
-        # appends messages to l
+    def write(self, m_type,  m_from, m_to, m_message, m_group):
+        self.messages.append({'type': m_type, 'from': m_from, 'to': m_to, 'message': m_message, 'group': m_group})
         # when status message update users
         pass
-    def read(self, recpient, timestamp):
-        # return matching message
-        pass
+    
+    def read(self, recipient, timestamp):
+        for msg in self.messages:
+            if msg['to'] == recipient:
+                return self.messages
+            
     def gc():
         # remove message older than 300s from self.l
         # remove dead users from self.users
@@ -63,7 +68,7 @@ class PollServer(openerpweb.Controller):
         """
         mq = req.applicationsession.setdefault("web_chat", PollServerMessageQueue())
         
-        #r = 'loggued in'
+        #r = 'logged in'
         #u = generate random.randint(0,2**32)
         #s = cherrypy cookie id
         #f = mq.userlist()
@@ -74,11 +79,17 @@ class PollServer(openerpweb.Controller):
 #            req.applicationsession['users'] = [{'u': username, 's':{'s':1, 'm':''}, 'g':'Users'}]
 #        else:
 #            req.applicationsession['users'].append({'u': username, 's':{'s':1, 'm':''}, 'g':'Users'})
+        req.applicationsession['users'] = [{'u': 'Guest1', 's':{'s':1, 'm':'111'}, 'g':'Users'},
+                                           {'u': 'Guest2', 's':{'s':1, 'm':'222'}, 'g':'Users'},
+                                           {'u': 'Guest3', 's':{'s':1, 'm':'333'}, 'g':'Users'}]
+        
+        # Temporary Guest1 is my current user
+        req.applicationsession['current_user'] = 'Guest1'
         
         return """
             {
                 "r":"logged in",
-                "u":"Guest130213866190.85",
+                "u":'Guest1',
                 "s":"f9e1811536f19ad5b9e00376f9ff1532",
                 "f":""" + str(mq.userlist(req)) + """
             }
@@ -93,6 +104,11 @@ class PollServer(openerpweb.Controller):
 
     @openerpweb.httprequest
     def poll(self, req, **kw):
+        
+        mq = req.applicationsession.setdefault("web_chat", PollServerMessageQueue())
+        print "================ poll ======= ", kw
+        # Long Polling
+        method = kw.get('method')
         """
         --> GET http://im.ajaxim.com/poll?callback=jsonp1302138663582&_1302138663582=
         <-- 200 OK
@@ -114,8 +130,16 @@ class PollServer(openerpweb.Controller):
             mag type s or m
             echo '<script type="text/javascript">parent.AjaxIM.incoming('. json_encode($this->_pollParseMessages($messages)) .  ');</script>'
 
-
         """
+        
+        for i in range(60):
+            received_msg = mq.read('Guest2', i);
+            if received_msg:
+                msg = self._pollParseMessages(received_msg)
+                print "============ msg...", msg
+            else:
+                time.sleep(2)
+            
         # for i in range(60):
             #r = mq.read(username,timestamp)
             # if messages
@@ -125,13 +149,20 @@ class PollServer(openerpweb.Controller):
         # else
             # return emptylist
             
-        time.sleep(2)
+        
         # it's http://localhost:8002/web_chat/pollserver/poll?method=long?callback=jsonp1302147330483&_1302147330483=
         return '%s([{"t":"m","s":"Guest130214008855.5","r":"Guest130214013134.26","m":"xxxxxx"}]);'%kw.get('callback','')
         return None
-
-    @openerpweb.jsonrequest
+        
+    @openerpweb.httprequest
     def send(self, req, **kw):
+        print "========= send ========", kw
+        
+        to = kw.get('to')
+        message = kw.get('message')
+        
+        mq = req.applicationsession.setdefault("web_chat", PollServerMessageQueue())
+        
         """
         --> GET http://im.ajaxim.com/send?callback=jsonp1302139980022&to=Guest130205108745.47&message=test&_1302139980022=
             callback: jsonp1302139980022
@@ -148,12 +179,22 @@ class PollServer(openerpweb.Controller):
             return array('r' => 'error', 'e' => 'send error');
 
         """
-        print "chat send",kw
-        # mq.write()
-        return {"action": actions}
+        
+        if not req.applicationsession['current_user']:
+            return dict(r='error', e='no session found')
+        
+        if not to:
+            return dict(r='error', e='no_recipient')
+        
+        if message:
+            mq.write(m_type="text",  m_from=req.applicationsession['current_user'], m_to=to, m_message=message, m_group="Users")
+        
+        return {'r': 'sent'}
 
-    @openerpweb.jsonrequest
+    @openerpweb.httprequest
     def status(self, req, **kw):
+        mq = req.applicationsession.setdefault("web_chat", PollServerMessageQueue())
+        
         """
         --> GET status call
            const Offline = 0;
@@ -168,8 +209,19 @@ class PollServer(openerpweb.Controller):
             return array('r' => 'error', 'e' => 'no session found');
             return array('r' => 'error', 'e' => 'status error');
         """
-        print "chat status",kw
+        print "======== chat status ========",kw
         # mq.write()
-        return {"action": actions}
+        return {"action": ""}
+    
+    def _pollParseMessages(self, messages):
+        msg_arr = []
+        print "=========== messages...", messages
+        for msg in messages:
+            print "=========== msg..", msg
+            msg_arr.append({'t': msg['type'], 's': msg['from'], 'r': msg['to'], 'm': msg['message']})
+        return msg_arr
+    
+    def _sanitize(self, message):
+        return message.replace('>', '&gt;').replace('<', '&lt;').replace('&', '&amp;');
 
 
diff --git a/addons/web_chat/static/lib/AjaxIM/js/im.js b/addons/web_chat/static/lib/AjaxIM/js/im.js
index fbf6a1552f3..ef80481a246 100644
--- a/addons/web_chat/static/lib/AjaxIM/js/im.js
+++ b/addons/web_chat/static/lib/AjaxIM/js/im.js
@@ -1 +1 @@
-// = im.js =
//
// **Copyright &copy; 2005 &ndash; 2010 Joshua Gross**\\
// //MIT Licensed//
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
// in the Software without restriction, including without limitation the rights
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
// copies of the Software, and to permit persons to whom the Software is
// furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in
// all copies or substantial portions of the Software.
// 
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
//
// This is the main library for Ajax IM. It encompasses the UI controls,
// and connecting with the server. It does //not// handle registration or
// account management.

(function($, _instance) {
    AjaxIM = function(options, actions) {
        if(this instanceof AjaxIM) {
            var self = this;
            
            // === {{{ defaults }}} ===
            //
            // These are the available settings for Ajax IM, and the associated
            // defaults:
            //
            // * {{{pollType}}} determines the way in which the client will talk to
            // the server.
            // ** {{{comet}}} will use http streaming, wherein a connection to the server will be held open indefinitely, and the server will push down new events (messages, status updates) as they occur.
            // ** {{{long}}} will hold open a connection with the server for as long as possible, or until a new event is received. Upon the server sending an event or closing the connection, the client will automatically&mdash;and immediately&mdash;reconnect.
            // ** {{{short}}} will open a connection, and the server (if this method is supported) will //immediately// provide a response as to whether or not there are any new events. Once a response is received, the client will wait 5 seconds, and then reconnect.
            // * {{{pollServer}}} is the default URL to which all actions refer. It is
            // possible to specify certain action URLs separately (as is used with the
            // NodeJS server).
            // * {{{cookieName}}} is the name of the session cookie used by the server.
            // If this is not set properly, the IM engine will not be able to automatically
            // reinitialize sessions.
            // * {{{theme}}} is the name of the theme folder that defines the HTML and
            // CSS of the IM bar and chat boxes. Usually, themes are deposited in the
            // provided "themes" folder and specified by that path, e.g. {{{themes/default}}}.
            // Theme files within the theme folder must be named {{{theme.html}}} and
            // {{{theme.css}}}.
            // * {{{storageMethod}}} defines the way in which data (chat sessions) are
            // temporarily stored client-side. By default, {{{"flash"}}} is used because
            // it is the most widely supported method. However,
            // [[http://eric.garside.name/docs.html?p=jstore#js-engines|other storage engines]]
            // are available, with their respective up- and down-sides
            // outlined, on the jStore website.
            // * {{{storeSession}}} (**not implemented**) sets the number of days to
            // retain stored chat session data before it should be deleted.
            // * {{{checkResume}}} is a flag that sets whether or not the client should
            // make a call to the server before resuming the session (such as on a page
            // reload). This will ensure that the session has not expired. If set to {{{false}}},
            // a call to the server will not be made, and the session will be assumed to
            // be active.
            var defaults = {
                pollType: 'long',
                pollServer: './ajaxim.php',
                cookieName: 'ajaxim_session',
                theme: 'themes/default',
                storageMethod: 'auto',
                flashStorage: 'js/jStore.Flash.html',
                storeSession: 5, // number of days to store chat data (0 for current session only)
                checkResume: true
            };

            // === {{{AjaxIM.}}}**{{{settings}}}** ===
            //
            // These are the settings for the IM. If particular options are not specified,
            // the defaults (see above) will be used. //These options will be defined
            // upon calling the initialization function, and not set directly.//
            this.settings = $.extend(defaults, options);

            // === {{{AjaxIM.}}}**{{{actions}}}** ===
            //
            // Each individual action that the IM engine can execute is predefined here.
            // By default, it merely appends the action onto the end of the {{{pollServer}}} url,
            // however, it is possible to define actions individually. //The alternative actions
            // will be defined upon calling the initialization function, and not set directly.//
            //
            // Should you define an action at a different URL, Ajax IM will determine whether
            // or not this URL is within the current domain. If it is within a subdomain of
            // the current domain, it will set the document.domain variable for you,
            // to match a broader hostname scope; the action will continue to use {{{$.post}}}
            // (the default AJAX method for Ajax IM).
            //
            // On the other hand, should you choose a URL outside the current domain
            // Ajax IM will switch to {{{$.getJSON}}} (a get request) to avoid
            // cross-domain scripting issues. This means that a server on a different
            // port or at a different address will need to be able to handle GET
            // requests rather than POST requests (such as how the Node.JS Ajax IM
            // server works).
            this.actions = $.extend({
                login: this.settings.pollServer + '/login',
                logout: this.settings.pollServer + '/logout',
                register: this.settings.pollServer + '/register',
                poll: this.settings.pollServer + '/poll?method=' + this.settings.pollType,
                send: this.settings.pollServer + '/send',
                status: this.settings.pollServer + '/status',
                resume: this.settings.pollServer + '/resume'
            }, actions);

            var httpRx = new RegExp('^http://', 'i'),
                slashslashRx = new RegExp('^//', 'i'),
                queryStrRx = new RegExp('[?](.+)$'),
                subdomainRx = new RegExp('((http[s]?:)?//)?(.+?)[.]' + window.location.host, 'i');
            $.each(this.actions, function(name, action) {
                if(name == 'poll') {
                    if(self.settings.pollType != 'comet')
                        action += (queryStrRx.test(action[1]) ? '&' : '?') + 'callback=?';
                        
                    action = ['jsonp', action];
                } else {
                    action = ['ajax', action];
                    if(subdomainRx.test(action[1])) {
                        document.domain = '.' + window.location.host;
                    } else if((http = httpRx.test(action[1])) || slashslashRx.test(action[1])) {
                        if(!(new RegExp('//' + window.location.host + '/', 'i')).test(action[1])) {
                            action[1] += (queryStrRx.test(action[1]) ? '&' : '?') + 'callback=?';
                            action = ['jsonp', action[1]];
                        }
                    }
                }
                
                self.actions[name] = action;
            });
            
            // We load the theme dynamically based on the passed
            // settings. If the theme is set to false, we assume
            // that the user is going to load it himself.
            this.themeLoaded = false;
            if(this.settings.theme) {
                $('<div></div>').appendTo('body').load(this.settings.theme + '/theme.html #imjs-bar, .imjs-tooltip',
                    function() {
                        self.themeLoaded = true;
                        setup.apply(self);
                    }
                );
                if(typeof document.createStyleSheet == 'function')
                    document.createStyleSheet(this.settings.theme + '/theme.css');
                else
                    $('body').append('<link rel="stylesheet" href="' +
                        this.settings.theme + '/theme.css" />');
            } else {
                this.themeLoaded = true;
                setup.apply(this);
            }
            
            // Client-side storage for keeping track of
            // conversation states, active tabs, etc.
            // The default is flash storage, however, other
            // options are available via the jStore library.
            if(this.settings.storageMethod) {
                this.storageBrowserKey = 'unknown';
                this.storeKey = '';
                
                $.each($.browser, function(k, v) {
                    if(k == 'version') return true;
                    else if(v == true) {
                        self.storageBrowserKey = k;
                        return false;
                    }
                });
            
                if(this.settings.storageMethod == 'auto') {
                    $.each(['ie', 'html5', 'local', 'flash'], function() {
                        if($.jStore.Availability[this]()) {
                            self.settings.storageMethod = this;
                            return false;
                        }
                    });
                }
            
                $.extend($.jStore.defaults, {
                    project: 'im.js',
                    engine: this.settings.storageMethod,
                    flash: this.settings.flashStorage
                });
                    
                this.storageReady = false;
                
                if(this.settings.storageMethod == 'flash') {                    
                    $.jStore.ready(function(engine) {
                        $.jStore.flashReady(function() {
                            self.storageReady = true;
                            setup.apply(self);
                        });
                    })
                } else {
                    $.jStore.ready(function(engine) {
                        self.storageReady = true;
                        setup.apply(self);
                    });
                }
                
                $.jStore.load();
            } else {
                this.storageReady = true;
                setup.apply(this);
            }

            // Allow a chatbox to me minimized
            $('.imjs-chatbox').live('click', function(e) {
                e.preventDefault();
                return false;
            });
            
            $('.imjs-chatbox .imjs-minimize').live('click', function() {
                $(this).parents('.imjs-chatbox').data('tab').click();
            });
            
            // Allow a chatbox to be closed
            $('.imjs-chatbox .imjs-close').live('click', function() {
                var chatbox = $(this).parents('.imjs-chatbox');
                chatbox.data('tab')
                    .data('state', 'closed').css('display', 'none');
                    
                if(self.settings.storageMethod && self.storageReady) {
                    delete self.chatstore[chatbox.data('username')];
                    if(self.storageReady) {
                        $.jStore.store(
                            self.storageBrowserKey + '-' +
                            self.username + '-chats',
                            self.chatstore);
                    }
                }
            });
            
            // Setup message sending for all chatboxes
            $('.imjs-chatbox .imjs-input').live('keydown', function(event) {               
                var obj = $(this);
                if(event.keyCode == 13 && !($.browser.msie && $.browser.version < 8)) {
                    self.send(obj.parents('.imjs-chatbox').data('username'), obj.val());
                }
            }).live('keyup', function(event) {
                if(event.keyCode == 13) {
                    if($.browser.msie && $.browser.version < 8) {
                        var obj = $(this);
                        self.send(obj.parents('.imjs-chatbox').data('username'), obj.val());
                    }

                    var obj = $(this);
                    obj.val('');
                    obj.height(obj.data('height'));
                }
            }).live('keypress', function(e) {
                var obj = $(this);
                if(!($.browser.msie && $.browser.opera)) obj.height(0);
                if(this.scrollHeight > obj.height() || this.scrollHeight < obj.height()) {
                    obj.height(this.scrollHeight);
                }
            });
            
            $('.imjs-msglog').live('click', function() {
                var chatbox = $(this).parents('.imjs-chatbox');
                chatbox.find('.imjs-input').focus();
            });
            
            // Create a chatbox when a buddylist item is clicked
            $('.imjs-friend').live('click', function() {
                var chatbox = self._createChatbox($(this).data('friend'));
                
                if(chatbox.data('tab').data('state') != 'active')
                    chatbox.data('tab').click();
                    
                chatbox.find('.imjs-input').focus();
            });
            
            // Setup and hide the scrollers
            $('.imjs-scroll').css('display', 'none');
            $('#imjs-scroll-left').live('click', function() {
                var hiddenTab = $('#imjs-bar li.imjs-tab:visible').slice(-1)
                    .next('#imjs-bar li.imjs-tab:hidden')
                    .filter(function() {
                        return $(this).data('state') != 'closed'
                    })
                    .not('.imjs-default').slice(-1).css('display', '');
                    
                if(hiddenTab.length) {
                    $('#imjs-bar li.imjs-tab:visible').eq(0).css('display', 'none');
                    $(this).html(parseInt($(this).html()) - 1);
                    $('#imjs-scroll-right').html(parseInt($('#imjs-scroll-right').html()) + 1);
                }

                return false;
            });
            $('#imjs-scroll-right').live('click', function() {
                var hiddenTab = $('#imjs-bar li.imjs-tab:visible').eq(0)
                    .prev('#imjs-bar li.imjs-tab:hidden')
                    .filter(function() {
                        return $(this).data('state') != 'closed'
                    })
                    .not('.imjs-default').slice(-1).css('display', '');
                    
                if(hiddenTab.length) {
                    $('#imjs-bar li.imjs-tab:visible').slice(-1).css('display', 'none');
                    $(this).html(parseInt($(this).html()) - 1);
                    $('#imjs-scroll-left').html(parseInt($('#imjs-scroll-left').html()) + 1);
                }
                
                return false;
            });
            
            // Initialize the chatbox hash
            this.chats = {};
            
            // Try to resume any existing session
            this.resume();
            
            $(window).resize(function() {
                self.bar._scrollers();
            });
        } else
            return AjaxIM.init(options);
    };
    
    // We predefine all public functions here...
    // If they are called before everything (theme, storage engine) has loaded,
    // then they get put into a "prequeue" and run when everything *does*
    // finally load.
    //
    // This ensures that nothing loads without all of the principal components
    // being pre-loaded. If that were to occur (without this prequeue), things
    // would surely break.
    var prequeue = [];
    var empty = function() {
        var func = this;
        return function() { prequeue.push([func, arguments]) };
    };
    $.extend(AjaxIM.prototype, {
        settings: {},
        friends: {},
        chats: {},
        
        storage: empty.apply('storage'),
        login: empty.apply('login'),
        logout: empty.apply('logout'),
        resume: empty.apply('resume'),
        form: empty.apply('form'),
        poll: empty.apply('poll'),
        incoming: empty.apply('incoming'),
        send: empty.apply('send'),
        status: empty.apply('status'),
        statuses: {},
        bar: {
            initialize: empty.apply('bar.initialize'),
            activateTab: empty.apply('bar.activateTab'),
            closeTab: empty.apply('bar.closeTab'),
            addTab: empty.apply('bar.addTab'),
            notification: empty.apply('bar.notification'),
            _scrollers: empty.apply('bar._scrollers')
        }
    });
    
    setup = (function() {
    var self = this;
    if(!this.storageReady || !this.themeLoaded) return;
    
    $(self).trigger('loadComplete');
    $(window).resize();
    
    $.extend(AjaxIM.prototype, {        
        // == Cookies ==
        //
        // The "cookies" functions can be used to set, get, and erase JSON-based cookies.
        // These functions are primarily used to manage and read the server-set cookie
        // that handles the user's chat session ID.
        cookies: {
            // === {{{AjaxIM.}}}**{{{cookies.set(name, value, days)}}}** ===
            //
            // Sets a cookie, stringifying the JSON value upon storing it.
            //
            // ==== Parameters ====
            // * {{{name}}} is the cookie name.\\
            // * {{{value}}} is the cookie data that you would like to store.\\
            // * {{{days}}} is the number of days that the cookie will be stored for.
            set: function(name, value, days) {
                if (days) {
                    var date = new Date();
                    date.setTime(date.getTime() + (days * 24 * 60 * 60 * 1000));
                    var expires = "; expires=" + date.toGMTString();
                } else var expires = "";
                document.cookie = name + "=" + $.compactJSON(value) + expires + "; path=/";
            },
            
            // === {{{AjaxIM.}}}**{{{cookies.get(name)}}}** ===
            //
            // Gets a cookie, decoding the JSON value before returning the data.
            //
            // ==== Parameters ====
            // * {{{name}}} is the cookie name that you would like to retrieve.
            get: function(name) {
                var nameEQ = name + "=";
                var ca = document.cookie.split(';');
                for(var i = 0; i < ca.length; i++) {
                    var c = ca[i];
                    while (c.charAt(0) == ' ') c = c.substring(1, c.length);
                    if (c.indexOf(nameEQ) == 0) {
                      var cval = decodeURIComponent(c.substring(nameEQ.length, c.length));
                      return $.secureEvalJSON(cval);
                    }
                }
                return null;
            },
            
            // === {{{AjaxIM.}}}**{{{cookies.erase(name)}}}** ===
            //
            // Deletes a cookie.
            //
            // {{{name}}} is the existing cookie that you would like to delete.
            erase: function(name) {
                self.cookies.set(name, '', -1);
            }
        },

        // == Main ==
        
        // === {{{AjaxIM.}}}**{{{storage()}}}** ===
        //
        // Retrieves chat session data from whatever storage engine is enabled
        // (provided that one is enabled at all). If a page reloads, this function
        // is called to restore the user's chat state (existing conversations, active tab).
        // This function is called //automatically//, upon initialization of the IM engine.
        storage: function() {
            if(!self.storeKey.length) return;
            
            try {
                var chatstore = $.jStore.store(self.storeKey + 'chats') || {};
            } catch(e) {
                $.jStore.remove(self.storeKey + 'chats');
                var chatstore = {};
            }

            if(this.chatstore) {            
                $.each(this.chatstore, function(username, convo) {
                    if(username in chatstore)
                        chatstore[username] = $.merge(chatstore[username], self.chatstore[username]);
                    else
                        chatstore[username] = self.chatstore[username];
                });
                                
                this.chatstore = chatstore;
                $.jStore.store(self.storeKey + 'chats', chatstore);
            } else {
                this.chatstore = chatstore;
            }
            
            $.each(this.chatstore, function(username, convo) {
                if(!convo.length) return;
                
                var chatbox = self._createChatbox(username, true);
                chatbox.data('lastDateStamp', null).css('display', 'none');
                
                // Remove the automatic date stamp
                chatbox.find('.imjs-msglog').empty();
                
                // Restore all messages, date stamps, and errors
                $.each(convo, function() {
                    switch(this[0]) {
                        case 'error':
                            self._addError(chatbox, decodeURIComponent(this[2]), this[3]);
                        break;
                        
                        case 'datestamp':
                            self._addDateStamp(chatbox, this[3]);
                        break;
                        
                        case 'a':
                        case 'b':
                            self._addMessage(this[0], chatbox, this[1],
                                decodeURIComponent(this[2]), this[3]);
                        break;
                    }
                });
                
                $(self).trigger('chatRestored', [username, chatbox]);
            });
            
            var activeTab = $.jStore.store(self.storeKey + 'activeTab') || [];
            if(activeTab.length && (activeTab = activeTab[0]) && activeTab in this.chats) {
                this.chats[activeTab].data('tab').click();
                var msglog = this.chats[activeTab].find('.imjs-msglog');
                msglog[0].scrollTop = msglog[0].scrollHeight;
            }
        },
        
        // === {{{AjaxIM.}}}**{{{login(username, password)}}}** ===
        //
        // Authenticates a user and initializes the IM engine. If the user is
        // already logged in, [s]he is logged out, the session is cleared, and
        // the new user is logged in.
        //
        // Returns the user's properly formatted username, session ID, and online
        // friends in JSON, if successful; e.g.:\\
        // {{{ {u: 'username', s: 'longsessionid', f: [{u: 'friend', s: 1, g: 'group'}]} }}}
        //
        // If unsuccessful, {{{false}}} is returned.
        //
        // ==== Parameters ====
        // * {{{username}}} is the user's username.\\
        // * {{{password}}} is the user's password. This password will be MD5 hashed
        // before it is sent to the server.
        login: function(username, password) {
            if(!username) username = '';
            if(!password) password = '';
            
            if(this.username)
                return true; // Already logged in!
        
            // hash password before sending it to the server
            password = $.md5(password);

            // authenticate
            AjaxIM.request(
                this.actions.login,
                {'username': username, 'password': password},
                function(auth) {
                    if(auth.r == 'logged in') {
                        self.username = ('u' in auth ? auth.u : username);
                        
                        if(self.settings.storageMethod)
                            self.storeKey = [self.storageBrowserKey, self.username, ''].join('-');
                            
                        var existing = self.cookies.get(self.settings.cookieName);
                        self.storage();
                        
                        // Begin the session
                        $.each(auth.f, function() {
                            self.friends[this.u] = {status: [this.s, ''], group: this.g};
                        });
                        self._session(self.friends);
                        self._storeFriends();
                        
                        $(self).trigger('loginSuccessful', [auth]);
                        
                        return auth;
                    } else {
                        $(self).trigger('loginError', [auth]);
                    }
                    
                    return false;
                }
            );
        },
        
        // === {{{AjaxIM.}}}**{{{logout()}}}** ===
        //
        // Logs the user out and removes his/her session cookie. As well, it
        // will close all existing chat windows, clear the storage engine, and
        // remove the IM bar.
        logout: function() {
            AjaxIM.request(
                this.actions.logout,
                {},
                function(done) {
                    if(done) {
                        self.cookies.erase(self.settings.cookieName);
                        self._clearSession();
                        $(self).trigger('logoutSuccessful');
                        return true;
                    } else {
                        $(self).trigger('logoutError');
                        return false;
                    }
                }
            );
        },
        
        // === {{{AjaxIM.}}}**{{{resume()}}}** ===
        //
        // Resumes an existing session based on a session ID stored in the
        // server-set cookie. This function is called //automatically// upon IM
        // engine (re-)initialization, so the user does not need to re-login
        // should a session already exist.
        resume: function() {
            var session = this.cookies.get(this.settings.cookieName);
            
            if(session && session.sid) {
                this.username = session.user;
                
                this.storeKey = [this.storageBrowserKey, this.username, ''].join('-');
                
                var friends = $.jStore.store(this.storeKey + 'friends') || [];
                if(self.settings.checkResume) {
                    AjaxIM.request(
                        this.actions.resume,
                        {},
                        function(response) {
                            if(response.r == 'connected') {
                                self._session(friends);
                                self.storage();
                            } else {
                                var username = this.username;
                                self._clearSession();
                                $(self).trigger('sessionNotResumed', [username]);
                            }
                        }
                    );
                } else {
                    self._session(friends);
                    self.storage();
                }
            } else {
                $(self).trigger('noSession');
            }
        },
        
        // === //private// {{{AjaxIM.}}}**{{{_session(friends)}}}** ===
        //
        // Restores session data (username, friends) and begins polling the server.
        // Called only by {{{AjaxIM.resume()}}}.
        //
        // ==== Parameters ====
        // * {{{friends}}} is a list of "friend" objects, e.g.:\\
        // {{{[{u: 'friend', s: 1, g: 'group'}, ...]}}}
        // ** {{{u}}} being the friend's username.
        // ** {{{s}}} being one of the available status codes (see {{{AjaxIM.statuses}}}), depending on the friend's current status.
        // ** {{{g}}} being the group that the friend is in.
        _session: function(friends) {
            $('#imjs-friends-panel .imjs-header span').html(this.username);
            $('#imjs-friends').removeClass('imjs-not-connected');
            
            $.each(friends, function(friend, info) {
                self.addFriend.apply(self, [friend, info.status, info.group]);
            });
            self._storeFriends();
            
            $(self).trigger('sessionResumed', [this.username]);
            
            setTimeout(function() { self.poll(); }, 0);
        },
        
        // === //private// {{{AjaxIM.}}}**{{{_clearSession()}}}** ===
        //
        // Clears all session data from the last known user.
        _clearSession: function() {                    
            if(self.settings.storageMethod && self.storageReady) {
                $.jStore.remove(self.storeKey + 'chats');
                $.jStore.remove(self.storeKey + 'friends');
                $.jStore.remove(self.storeKey + 'activeTab');
            }
            
            self.chats = {};
            $('.imjs-tab').not('.imjs-tab.imjs-default').remove();
            
            self.cookies.erase('ajaxim_session');
            delete self.username;
        },
        
        // === {{{AjaxIM.}}}**{{{form(element)}}}** ===
        //
        // Loads a login and registration form into the specified element
        // or, if no element is supplied, to the location on the page from
        // which this function was called.
        form: function(element) {
            $(element).load(this.settings.theme + '/theme.html #imjs-lr', function() {
                $('#imjs-lr .error').hide();
                
                if(self.username) {
                    $('#imjs-register, #imjs-login fieldset').hide();
                    $('#imjs-logged-in')
                        .show()
                        .html($('#imjs-logged-in').html().replace('{username}', self.username));
                } else {
                    $('#imjs-logged-in').hide();
                }

                // Handle logout success                
                $(self).bind('logoutSuccessful', function() {
                    $('#imjs-login fieldset').slideDown();
                    $('#imjs-register').slideDown();
                    
                    $('#imjs-logged-in')
                        .html($('#imjs-logged-in strong').html('{username}'))
                        .slideUp();
                });
                $('#imjs-logged-in a').click(function() {
                    self.logout();
                    return false;
                });

                // Handle login error or success
                $(self).bind('loginError', function() {
                    $('#imjs-login .error').html(AjaxIM.i18n.authInvalid).slideDown('fast');
                    $('#imjs-login input')
                        .addClass('imjs-lr-error')
                        .blur(function() { $(this).removeClass('imjs-lr-error'); });
                }).bind('loginSuccessful', function() {
                    $('#imjs-login fieldset').slideUp();
                    $('#imjs-register').slideUp();
                    
                    $('#imjs-logged-in')
                        .html($('#imjs-logged-in').html().replace('{username}', self.username))
                        .slideDown();
                });
                var login = function() {
                    self.login($('#imjs-login-username').val(), $('#imjs-login-password').val());
                    return false;
                };
                $('#imjs-login').submit(login);
                $('#imjs-login-submit').click(login);
                
                var regIssues = false;
                var regError = function(error, fields) {
                    $('#imjs-register .error')
                        .append(AjaxIM.i18n['register' + error] + ' ')
                        .slideDown();
                    $(fields)
                        .addClass('imjs-lr-error')
                        .blur(function() { $(this).removeClass('imjs-lr-error'); });
                    regIssues = true;
                };
                
                var register = function() {
                    $('#imjs-register .error').empty();
                    
                    regIssues = false;
                    
                    var username = $('#imjs-register-username').val();
                    var password = $('#imjs-register-password').val();
                    
                    if(password.length < 4)
                        regError('PasswordLength', '#imjs-register-password');
                
                    if(password != $('#imjs-register-cpassword').val())
                        regError('PasswordMatch', '#imjs-register-password, #imjs-register-cpassword');
                    
                    if(username.length <= 2 ||
                        !$('#imjs-register-username').val().match(/^[A-Za-z0-9_.]+$/))
                        regError('UsernameLength', '#imjs-register-username');
                    
                    if(!regIssues) {
                        AjaxIM.request(
                            self.actions.register,
                            {username: username, password: password},
                            function(response) {
                                if(response.r == 'registered') {
                                    self.login(username, password);
                                } else if(response.r == 'error') {
                                    switch(response.e) {
                                        case 'unknown':
                                            regError('Unknown', '');
                                        break;
                                        
                                        case 'invalid password':
                                            regError('PasswordLength', '#imjs-register-password');
                                        break;
                                        
                                        case 'invalid username':
                                            regError('UsernameLength', '#imjs-register-username');
                                        break;
                                        
                                        case 'username taken':
                                            regError('UsernameTaken', '#imjs-register-username');
                                        break;
                                    }
                                }
                            },
                            function(error) {
                                regError('Unknown', '');
                            }
                        );
                    }
                    
                    return false;
                };
                $('#imjs-register').submit(register);
                $('#imjs-register-submit').click(register);
            });
        },
        
        // === {{{AjaxIM.}}}**{{{poll()}}}** ===
        //
        // Queries the server for new messages. If a 'long' or 'short' poll
        // type is used, jQuery's {{{$.post}}} or {{{$.getJSON}}} will be
        // used. If 'comet' is used, the server connection will be deferred
        // to the comet set of functions.
        poll: function() {
            if(/^(short|long)$/.test(this.settings.pollType)) {
                AjaxIM.request(
                    this.actions.poll,
                    {},
                    function(response) {
                        if(!response['e']) {
                            if(response.length)
                                self._parseMessages(response);
                                
                            setTimeout(function() { self.poll(); }, 0);                            
                        } else {
                            switch(response.e) {
                                case 'no session found':
                                    self._notConnected();
                                break;
                            }
                            
                            $(self).trigger('pollFailed', [response.e]);
                        }
                    },
                    function(error) {
                        self._notConnected();
                        $(self).trigger('pollFailed', ['not connected']);
                        // try reconnecting?
                    }
                );
            } else if(this.settings.pollType == 'comet') {
                this.comet.connect();
            }
        },
        
        // === //private// {{{AjaxIM.}}}**{{{_parseMessages(messages)}}}** ===
        //
        // Handles an incoming message array:\\
        // {{{[{t: 'type', s: 'sender', r: 'recipient', m: 'message'}, ...]}}}
        //
        // * {{{t}}} (message type) is one of:
        // ** {{{m}}} &mdash; a standard message
        // ** {{{s}}} &mdash; a user's status update
        // ** {{{b}}} &mdash; a broadcasted message (sent to many users simultaneously)
        // * {{{s}}} is the sender of the message.
        // * {{{r}}} is the intended recipient of the message. Most of the time, this will
        // simply be the logged in user, however, a broadcasted message may not specify
        // a recipient or may specify a different recipient. Also provides future
        // compatability for chatrooms.
        // * {{{m}}} is the actual message. For something such as a status update, this can
        // be a JSON object or parsable string; e.g. {{{"2:I'm away."}}}
        //
        // ==== Parameters ====
        // * {{{messages}}} is the message array
        _parseMessages: function(messages) {
            if($.isArray(messages)) {
                $.each(messages, function() {
                    $(self).trigger('parseMessage', [this]);
                    
                    switch(this.t) {
                        case 'm':
                            self.incoming(this.s, this.m);
                        break;
                        
                        case 's':
                            var status = this.m.split(':');
                            if(this['g'])
                                self.addFriend(this.s, status, this.g);
                            self._friendUpdate(this.s, status[0], status.slice(1).join(':'));
                            self._storeFriends();
                        break;
    
                        case 'b':
                        break;
                        
                        default:
                        break;
                    }
                });
            }
        },
        
        // === {{{AjaxIM.}}}**{{{incoming(from, message)}}}** ===
        //
        // Handles a new message from another user. If a chatbox for that
        // user does not yet exist, one is created. If it does exist, but
        // is minimized, the user is notified but the chatbox is not brought
        // to the front. This function also stores the message, if a storage
        // method is set.
        //
        // ==== Parameters ====
        // * {{{from}}} is the username of the sender.
        // * {{{message}}} is the body.
        incoming: function(from, message) {
            // check if IM exists, otherwise create new window
            // TODO: If friend is not on the buddylist,
            // should add them to a temp list?
            var chatbox = this._createChatbox(from);
            
            if(!$('#imjs-bar .imjs-selected').length) {
                chatbox.data('tab').click();
            } else if(chatbox.data('tab').data('state') != 'active') {
                this.bar.notification(chatbox.data('tab'));
            }
            
            var time = this._addMessage('b', chatbox, from, message);
            this._storeMessage('b', chatbox, from, message, time);
        },
        
        // === {{{AjaxIM.}}}**{{{addFriend(username, group)}}}** ===
        //
        // Inserts a new friend into the friends list. If the group specified
        // doesn't exist, it is created. If the friend is already in this group,
        // they aren't added again, however, the friend item is returned.
        //
        // ==== Parameters ====
        // * {{{username}}} is the username of the new friend.
        // * {{{status}}} is the current status of the friend.
        // * {{{group}}} is the user group to which the friend should be added.
        addFriend: function(username, status, group) {
            var status_name = 'available';
            $.each(this.statuses,
                function(key, val) { if(status[0] == val) { status_name = key; return false; } });

            var group_id = 'imjs-group-' + $.md5(group);
            
            if(!(group_item = $('#' + group_id)).length) {
                var group_item = $('.imjs-friend-group.imjs-default').clone()
                        .removeClass('imjs-default')
                        .attr('id', group_id)
                        .data('group', group)
                        .appendTo('#imjs-friends-list');
                        
                var group_header = group_item.find('.imjs-friend-group-header');
                group_header.html(group_header.html().replace('{group}', group));
            }
            
            var user_id = 'imjs-friend-' + $.md5(username + group);
            
            if(!$('#' + user_id).length) {
                var user_item = group_item.find('ul li.imjs-default').clone()
                        .removeClass('imjs-default')
                        .addClass('imjs-' + status_name)
                        .attr('id', user_id)
                        .data('friend', username)
                        .appendTo(group_item.find('ul'));
                if(status[0] == 0) user_item.hide();
                user_item.html(user_item.html().replace('{username}', username));
            }
                        
            this.friends[username] = {'status': status, group: group};
            
            this._updateFriendCount();
            
            return this.friends[username];
        },
        
        // === //private// {{{AjaxIM.}}}**{{{_updateFriendCount()}}}** ===
        //
        // Counts the number of online friends and updates the friends count
        // in the friend tab.
        _updateFriendCount: function() {
            var friendsLength = 0;
            for(var f in this.friends) {
                if(this.friends[f].status[0] != 0)
                    friendsLength++;
            }
            $('#imjs-friends .imjs-tab-text span span').html(friendsLength);
        },
        
        // === //private// {{{AjaxIM.}}}**{{{_storeFriends()}}}** ===
        //
        // If a storage method is enabled, the current state of the
        // user's friends list is stored.
        _storeFriends: function() {
            if(this.settings.storageMethod && this.storageReady)
                $.jStore.store(this.storeKey + 'friends', this.friends);
        },
        
        // === //private// {{{AjaxIM.}}}**{{{_createChatbox(username)}}}** ===
        //
        // Builds a chatbox based on the default chatbox HTML and CSS defined
        // in the current theme. Should a chatbox for this user already exist,
        // a new one is not created. Instead, it is either given focus (should
        // no other windows already have focus), or a notification is issued.
        //
        // As well, if the chatbox does not exist, an associated tab will be
        // created.
        //
        // ==== Parameters ====
        // * {{{username}}} is the name of the user for whom the chatbox is intended
        // for.
        // * {{{no_stamp}}} sets whther or not to add a date stamp to the chatbox
        // upon creation.
        //
        // //Note:// New chatboxes are given an automatically generated ID in the
        // format of {{{#imjs-[md5 of username]}}}.
        _createChatbox: function(username, no_stamp) {
            var chatbox_id = 'imjs-' + $.md5(username);
            if(!(chatbox = $('#' + chatbox_id)).size()) {
                // add a tab
                var tab = this.bar.addTab(username, '#' + chatbox_id);
                var chatbox = tab.find('.imjs-chatbox');
                chatbox.attr('id', chatbox_id);

                chatbox.data('tab', tab);
                
                // remove default items from the message log
                var message_log = chatbox.find('.imjs-msglog').empty();
                
                // setup the chatbox header
                var cb_header = chatbox.find('.imjs-header');
                cb_header.html(cb_header.html().replace('{username}', username));
                
                if(!no_stamp) {
                    // add a date stamp
                    var time = this._addDateStamp(chatbox);
                    this._storeNonMessage('datestamp', username, null, time);
                }
                
                // associate the username with the object and vice-versa
                this.chats[username] = chatbox;
                chatbox.data('username', username);
                
                // did this chatbox fall down?
                this.bar._scrollers();
                
                if(username in this.friends) {
                    status = this.friends[username].status;
                    var status_name = 'available';
                    $.each(this.statuses,
                        function(key, val) { if(status[0] == val) { status_name = key; return false; } });
                    tab.addClass('imjs-' + status_name);
                }
                
                // store inputbox height
                //var input = chatbox.find('.imjs-input');
                //input.data('height', input.height());
            } else if(chatbox.data('tab').data('state') == 'closed') {
                chatbox.find('.imjs-msglog > *').addClass('imjs-msg-old');
                
                var tab = chatbox.data('tab');
                if(tab.css('display') == 'none')
                    tab.css('display', '').removeClass('imjs-selected')
                        .appendTo('#imjs-bar');
                
                if(!no_stamp) {
                    // possibly add a date stamp
                    var time = this._addDateStamp(chatbox);
                    this._storeNonMessage('datestamp', username, null, time);
                }
                    
                if(!$('#imjs-bar .imjs-selected').length) {
                    tab.click();
                } else {
                    this.bar.notification(tab);
                }
            }
            
            return chatbox;
        },
        
        // === //private// {{{AjaxIM.}}}**{{{_addDateStamp(chatbox)}}}** //
        //
        // Adds a date/time notifier to a chatbox. These are generally
        // inserted upon creation of a chatbox, or upon the date changing
        // since the last time a date stamp was added. If a date stamp for
        // the current date already exists, a new one will not be added.
        //
        // ==== Parameters ====
        // * {{{chatbox}}} refers to the jQuery-selected chatbox DOM element.
        // * {{{time}}} is the date/time the date stamp will show. It is specified
        // in milliseconds since the Unix Epoch. This is //only// defined when
        // date stamps are being restored from storage; if not specified, the
        // current computer time will be used.
        _addDateStamp: function(chatbox, time) {
            var message_log = $(chatbox).find('.imjs-msglog');
            if(!time)
               time = (new Date()).getTime();
 
            var date_stamp = $('.imjs-tab.imjs-default .imjs-chatbox .imjs-msglog .imjs-date').clone();
            var date_stamp_time = date_stamp.find('.imjs-msg-time');
            if(date_stamp_time.length)
                date_stamp_time.html(AjaxIM.dateFormat(time, date_stamp_time.html()));
            
            var date_stamp_date = date_stamp.find('.imjs-date-date');
            var formatted_date = AjaxIM.dateFormat(time, date_stamp_date.html());
            if(chatbox.data('lastDateStamp') != formatted_date) {
                if(date_stamp_date.length)
                    date_stamp_date.html(AjaxIM.dateFormat(time, date_stamp_date.html()));
            
                chatbox.data('lastDateStamp', formatted_date);
                date_stamp.appendTo(message_log);
            } else {
                //$('<div></div>').appendTo(message_log);
            }
            
            return time;
        },
        
        // === //private// {{{AjaxIM.}}}**{{{_addError(chatbox, error)}}}** //
        //
        // Adds an error to a chatbox. These are generally inserted after
        // a user sends a message unsuccessfully. If an error message
        // was already added, another one will be added anyway.
        //
        // ==== Parameters ====
        // * {{{chatbox}}} refers to the jQuery-selected chatbox DOM element.
        // * {{{error}}} is the error message string.
        // * {{{time}}} is the date/time the error occurred. It is specified in
        // milliseconds since the Unix Epoch. This is //only// defined when
        // errors are being restored from storage; if not specified, the current
        // computer time will be used.
        _addError: function(chatbox, error, time) {
            var message_log = $(chatbox).find('.imjs-msglog');
 
            var error_item =
                $('.imjs-tab.imjs-default .imjs-chatbox .imjs-msglog .imjs-error').clone();
                
            var error_item_time = error_item.find('.imjs-msg-time');
            if(error_item_time.length) {
                if(!time)
                    time = (new Date()).getTime();
                error_item_time.html(AjaxIM.dateFormat(time, error_item_time.html()));
            }

            error_item.find('.imjs-error-error').html(error);
            error_item.appendTo(message_log);
            
            message_log[0].scrollTop = message_log[0].scrollHeight;
        },
        
        // === //private// {{{AjaxIM.}}}**{{{_addMessage(ab, chatbox, username, message, time)}}}** //
        //
        // Adds a message to a chatbox. Depending on the {{{ab}}} value,
        // the color of the username may change as a way of visually
        // identifying users (however, this depends on the theme's CSS).
        // A timestamp is added to the message, and the chatbox is scrolled
        // to the bottom, such that the new message is visible.
        //
        // Messages will be automatically tag-escaped, so as to prevent
        // any potential cross-site scripting problems. Additionally,
        // URLs will be automatically linked.
        //
        // ==== Parameters ====
        // * {{{ab}}} refers to whether the user is "a" or "b" in a conversation.
        // For the general case, "you" are "a" and "they" are "b".
        // * {{{chatbox}}} refers to the jQuery-selected chatbox DOM element.
        // * {{{username}}} is the username of the user who sent the message.
        // * {{{time}}} is the time the message was sent in milliseconds since
        // the Unix Epoch. This is //only// defined when messages are being 
        // restored from storage. For new messages, the current computer
        // time is automatically used.
        _addMessage: function(ab, chatbox, username, message, time) {
            var last_message = chatbox.find('.imjs-msglog > *:last-child');
            if(last_message.hasClass('imjs-msg-' + ab)) {
                // Last message was from the same person, so let's just add another imjs-msg-*-msg
                var message_container = (last_message.hasClass('imjs-msg-' + ab + '-container') ?
                    last_message :
                    last_message.find('.imjs-msg-' + ab + '-container'));
                    
                var single_message =
                    $('.imjs-tab.imjs-default .imjs-chatbox .imjs-msglog .imjs-msg-' + ab + '-msg')
                    .clone().appendTo(message_container);
                
                single_message.html(single_message.html().replace('{username}', username));
            } else if(!last_message.length || !last_message.hasClass('imjs-msg-' + ab)) {
                var message_group = $('.imjs-tab.imjs-default .imjs-chatbox .imjs-msg-' + ab)
                    .clone().appendTo(chatbox.find('.imjs-msglog'));
                message_group.html(message_group.html().replace('{username}', username));
                
                var single_message = message_group.find('.imjs-msg-' + ab + '-msg');
            }
            
            // clean up the message
            message = message.replace(/</g, '&lt;').replace(/>/g, '&gt;')
                        .replace(/(^|.*)\*([^*]+)\*(.*|$)/, '$1<strong>$2</strong>$3');
            
            // autolink URLs
            message = message.replace(
                new RegExp('([A-Za-z][A-Za-z0-9+.-]{1,120}:[A-Za-z0-9/]' +
                '(([A-Za-z0-9$_.+!*,;/?:@&~=-])|%[A-Fa-f0-9]{2}){1,333}' +
                '(#([a-zA-Z0-9][a-zA-Z0-9$_.+!*,;/?:@&~=%-]{0,1000}))?)', 'g'),
                '<a href="$1" target="_blank">$1</a>');
            
            // insert the message
            single_message.html(single_message.html().replace('{message}', message));
            
            // set the message time
            var msgtime = single_message.find('.imjs-msg-time');
            if(!time)
                time = new Date();
        
            if(typeof time != 'string')
                time = AjaxIM.dateFormat(time, msgtime.html());
            
            msgtime.html(time);
            
            var msglog = chatbox.find('.imjs-msglog');
            msglog[0].scrollTop = msglog[0].scrollHeight;
            
            return time;
        },
        
        // === //private// {{{AjaxIM.}}}**{{{_storeNonMessage(type, username, data, time)}}}** ===
        //
        // **Redundant?**\\
        // Similar to {{{AjaxIM._storeMessage}}}, but stores items that aren't messages,
        // such as datestamps and errors.
        //
        // ==== Parameters ====
        // * {{{type}}} is the type of non-message (error, datestamp).
        // * {{{username}}} is the username of the user being chatted with.
        // * {{{data}}} is the (optional) data of the non-message to be stored.
        // * {{{time}}} is the time of the message.
        _storeNonMessage: function(type, username, data, time) {
            // If storage is on & ready, store the non-message
            if(this.settings.storageMethod) {
                if(!this.chatstore) this.chatstore = {};                 
                if(!(username in this.chatstore)) this.chatstore[username] = [];
                
                // If the chat store gets too long, it becomes slow to load.
                if(this.chatstore[username].length > 300)
                    this.chatstore[username].shift();
                
                // For some reason, if we don't encode and decode the message, it *will* break
                // (at least) the Flash storage engine's retrieval. Gah!
                this.chatstore[username].push(
                    [type, username, encodeURIComponent(data), time]);
                
                if(this.storageReady) $.jStore.store(self.storeKey + 'chats', this.chatstore);
            }
        },
        
        // === //private// {{{AjaxIM.}}}**{{{_storeMessage(ab, chatbox, username, message, time)}}}** ===
        //
        // Taking the same arguments as {{{AjaxIM._addMessage}}}, {{{_storeMessage}}} pushes a message
        // into the storage hash, if storage is enabled.
        //
        // Messages are added to a message array, by username. The entire chat hash is stored as
        // a {{{'chats'}}} object in whatever storage engine is enabled.
        _storeMessage: function(ab, chatbox, username, message, time) {
            // If storage is on & ready, store the message
            if(this.settings.storageMethod) {
                if(!this.chatstore) this.chatstore = {}; 
                
                message = message.replace(/</g, '&lt;').replace(/>/g, '&gt;');
                
                if(!(username in this.chatstore)) {
                    this.chatstore[username] = [];
                } else if(this.chatstore[username].length > 300) {
                    // If the chat store gets too long, it becomes slow to load.
                    this.chatstore[username].shift();
                }
                
                // For some reason, if we don't encode and decode the message, it *will* break
                // (at least) the Flash storage engine's retrieval. Gah!
                this.chatstore[chatbox.data('username')].push(
                    [ab, username, encodeURIComponent(message), time]);
                
                if(this.storageReady) $.jStore.store(this.storeKey + 'chats', this.chatstore);
            }
        },
        
        // === //private// {{{AjaxIM.}}}**{{{_friendUpdate(friend, status, statusMessage)}}}** ===
        //
        // Called when a friend's status is updated. This function will update all locations
        // where a status icon is displayed (chat tab, friends list), as well as insert
        // a notification, should a chatbox be open.
        //
        // ==== Parameters ====
        // * {{{friend}}} is the username of the friend.
        // * {{{status}}} is the new status code. See {{{AjaxIM.statuses}}} for a list of available
        // codes. //Note: If an invalid status is specified, no action will be taken.//
        // * {{{statusMessage}}} is a message that was, optionally, specified by the user. It will be
        // used should "you" send the user an IM while they are away, or if their status is viewed
        // in another way (such as via the friends list [**not yet implemented**]).
        _friendUpdate: function(friend, status, statusMessage) {
            // add friend to buddylist, update their status, etc.           
            var status_name = 'available';
            $.each(this.statuses,
                function(key, val) { if(status == val) { status_name = key; return false; } });

            if(this.chats[friend]) {
                var tab = this.chats[friend].data('tab');
                var tab_class = 'imjs-tab';
                if(tab.data('state') == 'active') tab_class += ' imjs-selected';
                tab_class += ' imjs-' + status_name;
                
                tab.attr('class', tab_class);
                
                // display the status in the chatbox
                var date_stamp =
                    $('.imjs-tab.imjs-default .imjs-chatbox .imjs-msglog .imjs-date').clone();
                    
                var date_stamp_time = date_stamp.find('.imjs-msg-time');
                if(date_stamp_time.length)
                    date_stamp_time.html(AjaxIM.dateFormat(date_stamp_time.html()));
                
                var date_stamp_date = date_stamp.find('.imjs-date-date').html(
                    AjaxIM.i18n[
                        'chat' + status_name[0].toUpperCase() + status_name.slice(1)
                    ].replace(/%s/g, friend));
                
                var msglog = this.chats[friend].find('.imjs-msglog');
                date_stamp.appendTo(msglog);
                msglog[0].scrollTop = msglog[0].scrollHeight;
            }
            
            if(this.friends[friend]) {
                var friend_id = 'imjs-friend-' + $.md5(friend + this.friends[friend].group);
                $('#' + friend_id).attr('class', 'imjs-friend imjs-' + status_name);
                
                if(status == 0) {
                    $('#' + friend_id + ':visible').slideUp();
                    $('#' + friend_id + ':hidden').hide();
                } else if(!$('#' + friend_id + ':visible').length) {
                    $('#' + friend_id).slideDown();
                }
                
                this.friends[friend].status = [status, statusMessage];
                this._updateFriendCount();
            }
        },
        
        // === //private// {{{AjaxIM.}}}**{{{_notConnected()}}}** ===
        //
        // Puts the user into a visible state of disconnection. Sets the
        // friends list to "not connected" and empties it; disallows new messages
        // to be sent.
        _notConnected: function() {
            $('#imjs-friends').addClass('imjs-not-connected').unbind('click', this.activateTab);
        },
        
        // === {{{AjaxIM.}}}**{{{send(to, message)}}}** ===
        //
        // Sends a message to another user. The message will be added
        // to the chatbox before it is actually sent, however, if an
        // error occurs during sending, that will be indicated immediately
        // afterward.
        //
        // After sending the message, one of three status codes should be
        // returned as a JSON object, e.g. {{{{r: 'code'}}}}:
        // * {{{ok}}} &mdash; Message was sent successfully.
        // * {{{offline}}} &mdash; The user is offline or unavailable to
        // receive messages.
        // * {{{error}}} &mdash; a problem occurred, unrelated to the user
        // being unavailable.
        //
        // ==== Parameters ====
        // * {{{to}}} is the username of the recipient.
        // * {{{message}}} is the content to be sent.
        send: function(to, message) {         
            if(!message) return;
               
            if(this.chats[to]) { // REMOVE ME?
                // possibly add a datestamp
                var time = self._addDateStamp(this.chats[to]);
                this._storeNonMessage('datestamp', to, null, time);
                
                time = this._addMessage('a', this.chats[to], this.username, message);                
                this._storeMessage('a', this.chats[to], this.username, message, time);
            }
            
            $(self).trigger('sendingMessage', [to, message]);
            
            AjaxIM.request(
                this.actions.send,
                {'to': to, 'message': message},
                function(result) {
                    switch(result.r) {
                        case 'ok':
                            $(self).trigger('sendMessageSuccessful', [to, message]);
                        break;
                        
                        case 'offline':
                            $(self).trigger('sendMessageFailed', ['offline', to, message]);
                        break;
                        
                        case 'error':
                        default:
                            if(result.e == 'no session found') {
                                self._notConnected();
                                self._addError(self.chats[to], AjaxIM.i18n.notConnected);
                                self._storeNonMessage('error', to,
                                    AjaxIM.i18n.notConnected, (new Date()).getTime());
                            }
                            
                            $(self).trigger('sendMessageFailed', [result.e, to, message]);
                        break;
                    }
                },
                function(error) {
                    self._notConnected();
                    self._addError(self.chats[to], AjaxIM.i18n.notConnected);
                    self._storeNonMessage('error', to,
                        AjaxIM.i18n.notConnected, (new Date()).getTime());
                        
                    $(self).trigger('sendMessageFailed', ['not connected', to, message]);
                }
            );
        },
        
        // === {{{AjaxIM.}}}**{{{status(s, message)}}}** ===
        //
        // Sets the user's status and status message. It is possible to not
        // set a status message by setting it to an empty string. The status
        // will be sent to the server, where upon the server will broadcast
        // the update to all individuals with "you" on their friends list.
        //
        // ==== Parameters ====
        // * {{{s}}} is the status code, as defined by {{{AjaxIM.statuses}}}.
        // * {{{message}}} is the custom status message.
        status: function(s, message) {
            // update status icon(s)
            if(!this.statuses[s])
                return;
                
            $('#imjs-friends').attr('class', 'imjs-' + s);
            
            $(self).trigger('changingStatus', [s, message]);
            
            AjaxIM.request(
                this.actions.status,
                {'status': this.statuses[s], 'message': message},
                function(result) {
                    switch(result.r) {
                        case 'ok':
                            $(self).trigger('changeStatusSuccessful', [s, message]);
                        break;
                        
                        case 'error':
                        default:
                            $(self).trigger('changeStatusFailed', [result.e, s, message]);
                        break;
                    }
                },
                function(error) {
                    $(self).trigger('changeStatusFailed', ['not connected', s, message]);
                }
            );
        },
        
        // === {{{AjaxIM.}}}**{{{statuses}}}** ===
        //
        // These are the available status codes and their associated identities:
        // * {{{offline}}} (0) &mdash; Only used when signing out/when another
        // user has signed out, as once this status is set, the user is removed
        // from the server and friends will be unable to contact the user.
        // * {{{available}}} (1) &mdash; The user is online and ready to be messaged.
        // * {{{away}}} (2) &mdash; The user is online but is not available. Others
        // may still contact this user, however, the user may not respond. Anyone
        // contacting an away user will receive a notice stating that the user is away,
        // and (if one is set) their custom status message.
        // * {{{invisible}}} (3; **not yet implemented**) &mdash; The user is online,
        // but other users are made unaware, and the user will be represented
        // as being offline. It is still possible to contact this user, and for this
        // user to contact others; no status message or notice will be sent to others
        // messaging this user.
        statuses: {offline: 0, available: 1, away: 2, invisible: 3},
        
        // == Footer bar ==
        //
        // The footer bar is the bar that sits at the bottom of the page, in a fixed
        // position. It contains a tab for the friends list, and tabs for any open
        // chat boxes. It is also possible to add custom tabs for other functionality.
        bar: {
            // === {{{AjaxIM.}}}**{{{bar.initialize()}}}** ===
            //
            // Setup the footer bar and enable tab actions. This function
            // uses {{{jQuery.live}}} to set hooks on any bar tabs created
            // in the future.
            initialize: function() {
                // Set up your standard tab actions
                $('.imjs-tab')
                    .live('click', this.activateTab);
                    
                $('.imjs-tab .imjs-close')
                    .live('click', this.closeTab);
            
                // Set up the friends list actions
                var self = this;
                $(document).click(function(e) {
                    if(e.target.id == 'imjs-friends' ||
                        $(e.target).parents('#imjs-friends').length) {    
                        return;
                    }
                    
                    if($('#imjs-friends').data('state') == 'active')
                        self.activateTab.call($('#imjs-friends'));
                });
                $('#imjs-friends')
                    .data('state', 'minimized')
                    .click(function(e) {
                        if(!$(this).hasClass('imjs-not-connected') &&
                            e.target.id != 'imjs-friends-panel' &&
                            !$(e.target).parents('#imjs-friends-panel').length)
                            self.activateTab.call(this);
                    })
                    .mouseenter(function() {
                        if($(this).hasClass('imjs-not-connected')) {
                            $('.imjs-tooltip').css('display', 'block');
                            $('.imjs-tooltip p').html(AjaxIM.i18n.notConnectedTip);

                            var tip_left = $(this).offset().left -
                                $('.imjs-tooltip').outerWidth() +
                                ($(this).outerWidth() / 2);
                            var tip_top = $(this).offset().top -
                                $('.imjs-tooltip').outerHeight(true);

                            $('.imjs-tooltip').css({
                                    left: tip_left,
                                    top: tip_top
                                });
                        }
                    })
                    .mouseleave(function() {
                        if($(this).hasClass('imjs-not-connected')) {
                            $('.imjs-tooltip').css('display', '');
                        }
                    });
                $('#imjs-friends-panel')
                    .data('tab', $('#imjs-friends'))
                    .css('display', 'none');
            },
            
            // === {{{AjaxIM.}}}**{{{bar.activateTab()}}}** ===
            //
            // Activate a tab by setting it to the 'active' state and
            // showing any related chatbox. If a chatbox is available
            // for this tab, also focus the input box.
            //
            // //Note:// {{{this}}}, here, refers to the tab DOM element.
            activateTab: function() {
                var chatbox = $(this).find('.imjs-chatbox') || false;

                if($(this).data('state') != 'active') {
                    if($(this).attr('id') != 'imjs-friends') {
                        $('#imjs-bar > li')
                            .not($(this))
                            .not('#imjs-friends')
                            .removeClass('imjs-selected')
                            .each(function() {
                                if($(this).data('state') != 'closed') {
                                    $(this).data('state', 'minimized');
                                    var chatbox = $(this).find('.imjs-chatbox');
                                    if(chatbox.length)
                                        chatbox.css('display', 'none');
                                }
                            });
                    }
                    
                    if(chatbox && chatbox.css('display') == 'none')
                        chatbox.css('display', '');
                    
                    // set the tab to active...
                    var tab = $(this).addClass('imjs-selected').data('state', 'active');
                    
                    // ...and hide and reset the notification icon
                    tab.find('.imjs-notification').css('display', 'none')
                        .data('count', 0);
                    
                    if(self.settings.storageMethod && self.storageReady &&
                        chatbox && (username = chatbox.data('username'))) { 
                        $.jStore.store(self.storeKey + 'activeTab', [username]);
                    }
                    
                    $(self).trigger('tabToggled', ['activated', tab]);
                } else {
                    var tab = $(this).removeClass('imjs-selected').data('state', 'minimized');
                    
                    if(chatbox && chatbox.css('display') != 'none')
                        chatbox.css('display', 'none');
                    
                    if(self.settings.storageMethod && self.storageReady) { 
                        $.jStore.store(self.storeKey + 'activeTab', ['*']);
                    }
                    
                    $(self).trigger('tabToggled', ['minimized', tab]);
                }
                
                if(chatbox) {
                    if(!(input = chatbox.find('.imjs-input')).data('height')) {
                        // store the height for resizing later
                        input.data('height', input.height());
                    }
                    
                    try {
                        var msglog = chatbox.find('.imjs-msglog');
                        msglog[0].scrollTop = msglog[0].scrollHeight;
                    } catch(e) {}
                    
                    try { chatbox.find('.imjs-input').focus(); } catch(e) {}
                }
            },
            
            // === {{{AjaxIM.}}}**{{{bar.closeTab()}}}** ===
            //
            // Close a tab and hide any related chatbox, such that
            // the chatbox can not be reopened without reinitializing
            // the tab.
            //
            // //Note:// {{{this}}}, here, refers to the tab DOM element.
            closeTab: function() {
                var tab = $(this).parents('.imjs-tab');
                tab.css('display', 'none').data('state', 'closed');

                if(self.settings.storageMethod && self.storageReady) {
                    delete self.chatstore[tab.find('.imjs-chatbox').data('username')];
                    if(self.storageReady) $.jStore.store(self.storeKey + 'chats', self.chatstore);
                }

                $(self).trigger('tabToggled', ['closed', tab]);

                self.bar._scrollers();

                return false;
            },
            
            // === {{{AjaxIM.}}}**{{{bar.addTab(label, action, closable)}}}** ===
            //
            // Adds a tab to the tab bar, with the label {{{label}}}. When
            // clicked, it will call a callback function, {{{action}}}. If
            // {{{action}}} is a string, it is assumed that the string is
            // referring to a chatbox ID.
            //
            // ==== Parameters ====
            // * {{{label}}} is the text that will be displayed on the tab.\\
            // * {{{action}}} is the callback function, if it is a non-chatbox
            // tab, or a string if it //is// a chatbox tab.\\
            // * {{{closable}}} is a boolean value that determines whether or not
            // it is possible for a user to close this tab.
            //
            // //Note:// New tabs are given an automatically generated ID
            // in the format of {{{#imjs-tab-[md5 of label]}}}.
            addTab: function(label, action, closable) {
                var tab = $('.imjs-tab.imjs-default').clone().insertAfter('#imjs-scroll-right');
                tab.removeClass('imjs-default')
                    .attr('id', 'imjs-tab-' + $.md5(label))
                    .html(tab.html().replace('{label}', label))
                    .data('state', 'minimized');
                    
                var notification = tab.find('.imjs-notification');
                notification.css('display', 'none')
                    .data('count', 0)
                    .data('default-text', notification.html())
                    .html(notification.html().replace('{count}', '0'));
                
                if(closable === false)
                    tab.find('.imjs-close').eq(0).remove();
                
                if(typeof action == 'string') {
                    //tab.data('chatbox', action);
                } else {
                    tab.find('.imjs-chatbox').remove();
                    tab.click(action);
                }
                
                return tab;
            },
            
            // === {{{AjaxIM.}}}**{{{bar.notification(tab)}}}** ===
            //
            // Displays a notification on a tab. Generally, this is called when
            // a tab is minimized to let the user know that there is an update
            // for them. The way the notification is displayed depends on the
            // theme CSS.
            //
            // ==== Parameters ====
            // * {{{tab}}} is the jQuery-selected tab DOM element.
            notification: function(tab) {
                var notify = tab.find('.imjs-notification');
                var notify_count = notify.data('count') + 1;
                
                notify.data('count', notify_count)
                    .html(notify.data('default-text').replace('{count}', notify_count))
                    .css('display', '');
            },
            
            // === //private// {{{AjaxIM.}}}**{{{bar._scrollers()}}}** ===
            //
            // Document me!
            _scrollers: function() {
                var needScrollers = false;
                $('.imjs-tab').filter(function() {
                    return $(this).data('state') != 'closed'
                }).css('display', '');
                
                $.each(self.chats, function(username, chatbox) {
                    var tab = chatbox.data('tab');
                    if(tab.data('state') == 'closed') return true;
                    
                    if(tab.position().top > $('#imjs-bar').height()) {
                        $('.imjs-scroll').css('display', '');
                        tab.css('display', 'none');
                        needScrollers = true;
                    } else {
                        tab.css('display', '');
                    }
                });
                
                if(!needScrollers) {
                    $('.imjs-scroll').css('display', 'none');
                }
                
                if($('#imjs-scroll-left').css('display') != 'none' &&
                    $('#imjs-scroll-left').position().top > $('#imjs-bar').height()) {
                    $('#imjs-bar li.imjs-tab:visible').slice(-1).css('display', 'none');
                }
                
                var hiddenLeft = $('#imjs-bar li.imjs-tab:visible').slice(-1)
                    .nextAll('#imjs-bar li.imjs-tab:hidden')
                    .not('.imjs-default')
                    .filter(function() {
                        return $(this).data('state') != 'closed'
                    }).length;
                    
                var hiddenRight = $('#imjs-bar li.imjs-tab:visible').eq(0)
                    .prevAll('#imjs-bar li.imjs-tab:hidden')
                    .not('.imjs-default')
                    .filter(function() {
                        return $(this).data('state') != 'closed'
                    }).length;
                    
                $('#imjs-scroll-left').html(hiddenLeft);
                $('#imjs-scroll-right').html(hiddenRight);
            }
        },
        
        // == Comet ==
        //
        // Comet, or HTTP streaming, holds open a connection between the client and
        // the server indefinitely. As the server receives new messages or events,
        // they are passed down to the client in a {{{&lt;script&gt;}}}
        // tag which calls the {{{AjaxIM.incoming()}}} function. The connection is
        // opened using either an {{{iframe}}} (in Opera or Internet Explorer) or
        // an {{{XMLHTTPRequest}}} object. Due to the extra flexibility necessary
        // with the {{{XMLHTTPRequest}}} object, jQuery's {{{$.ajax}}} is not used.
        comet: {
            type: '',
            obj: null,
        
            onbeforeunload: null,
            onreadystatechange: null,
            
            iframe: function() {                
                if(/loaded|complete/i.test(this.obj.readyState))
                    throw new Error("IM server not available!");
            },

            // === {{{AjaxIM.}}}**{{{comet.connect()}}}** ===
            //
            // Creates and initializes the object and connection between the server
            // and the client. For Internet Explorer and Opera, we use an
            // {{{&lt;iframe&gt;}}} element; for all other browsers, we create an
            // {{{XMLHTTPRequest}}} object. The server connects to the URI defined
            // as the "poll" action. This function is called automatically, when
            // the IM engine is initialized and the {{{AjaxIM.poll()}}} function
            // is called.
            connect: function() {
                var self = _instance;
                
                if($.browser.opera || $.browser.msie) {
                    var iframe = $('<iframe></iframe>');
                    with(iframe) {
                        css({
                            position: 'absolute',
                            visibility: 'visible',
                            display: 'block',
                            left: '-10000px',
                            top: '-10000px',
                            width: '1px',
                            height: '1px'
                        });
                        
                        attr('src', self.actions.poll[1]);
                        appendTo('body');
                        
                        bind('readystatechange',
                            self.comet.onreadystatechange = function() { self.comet.iframe() });
                        bind('beforeunload',
                            self.comet.onbeforeunload = function() { self.comet.disconnect() });
                    }
                    
                    self.comet.type = 'iframe';
                    self.comet.obj = iframe;
                } else {
                    var xhr = new XMLHttpRequest;
                    var length = 1029;
                    var code = /^\s*<script[^>]*>parent\.(.+);<\/script><br\s*\/>$/;
                    
                    xhr.open('get', self.actions.poll[1], true);
                    xhr.onreadystatechange = function(){
                        if(xhr.readyState > 2) {
                            if(xhr.status == 200) {
                                responseText = xhr.responseText.substring(length);
                                length = xhr.responseText.length;
                                if(responseText != ' ') 
                                    eval(responseText.replace(code, "$1"));
                            }
                            // We need an "else" here. If the state changes to
                            // "loaded", the user needs to know they're
                            // disconnected.
                        }
                    };
                    
                    self.comet.type = 'xhr';
                    self.comet.obj = xhr;
                    
                    addEventListener('beforeunload',
                        self.comet.beforeunload = function() { self.comet.disconnect(); }, false);
                    setTimeout(function() { xhr.send(null) }, 10);
                }
            },

            // === {{{AjaxIM.}}}**{{{comet.disconnect()}}}** ===
            //
            // Disconnect from the server and destroy the connection object. This
            // function is called before the page unloads, so that we plug up and
            // potential leaks and free memory.
            disconnect: function() {
                var self = _instance.comet;
                
                if(!this.type || !this.obj)
                    return;
                
                if(this.type == 'iframe') {
                    detachEvent('onreadystatechange', this.onreadystatechange);
                    detachEvent('onbeforeunload', this.onbeforeunload);
                    this.obj.src = '.';
                    $(this.obj).remove();
                } else {
                    removeEventListener('beforeunload', this.onbeforeunload, false);
                    this.obj.onreadystatechange = function(){};
                    this.obj.abort();
                }
                
                delete this.obj;
            }
        }
    })
        
    self.bar.initialize();
    
    if(prequeue.length) {
        $.each(prequeue, function() {
            var func = this[0].split('.');
            if(func.length > 1)
                self[func[0]][func[1]].apply(self, this[1]);
            else
                self[func[0]].apply(self, this[1]);
        });
    }
    });
    
    // == Static functions and variables ==
    //
    // The following functions and variables are available outside of an initialized
    // {{{AjaxIM}}} object.
    
    // === {{{AjaxIM.}}}**{{{client}}}** ===
    //
    // Once {{{AjaxIM.init()}}} is called, this will be set to the active AjaxIM
    // object. Only one AjaxIM object instance can exist at a time. This variable
    // can and should be accessed directly.
    AjaxIM.client = null;
    
    // === {{{AjaxIM.}}}**{{{init(options, actions)}}}** ===
    //
    // Initialize the AjaxIM client object and engine. Here, you can define your
    // options and actions as outlined at the top of this documentation.
    //
    // ==== Parameters ====
    // * {{{options}}} is the hash of custom settings to initialize Ajax IM with.
    // * {{{actions}}} is the hash of any custom action URLs.
    AjaxIM.init = function(options, actions) {
        if(!_instance) {
            _instance = new AjaxIM(options, actions);
            AjaxIM.client = _instance;
        }
        
        return _instance;
    }
    
    
    // === {{{AjaxIM.}}}**{{{request(url, data, successFunc, failureFunc)}}}** ===
    //
    // Wrapper around {{{$.jsonp}}}, the JSON-P library for jQuery, and {{{$.ajax}}},
    // jQuery's ajax library. Allows either function to be called, automatically,
    // depending on the request's URL array (see {{{AjaxIM.actions}}}).
    //
    // ==== Parameters ====
    // {{{url}}} is the URL of the request.
    // {{{data}}} are any arguments that go along with the request.
    // {{{success}}} is a callback function called when a request has completed
    // without issue.
    // {{{_ignore_}}} is simply to provide compatability with {{{$.post}}}.
    // {{{failure}}} is a callback function called when a request hasn't not
    // completed successfully.
    AjaxIM.request = function(url, data, successFunc, failureFunc) {
        if(typeof failureFunc != 'function');
            failureFunc = function(){};

        $[url[0]]({
            'url': url[1],
            'data': data,
            dataType: (url[0] == 'ajax' ? 'json' : 'jsonp'),
            type: 'POST',
            cache: false,
            timeout: 60000,
            callback: 'jsonp' + (new Date()).getTime(),
            success: function(json, textStatus) {
                successFunc(json);
            },
            error: function(xOptions, error) {
                failureFunc(error);
            }
        });
        
        // This prevents Firefox from spinning indefinitely
        // while it waits for a response. Why? Fuck if I know.
        if(url[0] == 'jsonp' && $.browser.mozilla) {
            $.jsonp({
                'url': 'about:',
                timeout: 0
            });
        }
    };
    
    // === {{{AjaxIM.}}}**{{{incoming(data)}}}** ===
    //
    // Never call this directly. It is used as a connecting function between
    // client and server for Comet.
    //
    // //Note:// There are two {{{AjaxIM.incoming()}}} functions. This one is a
    // static function called outside of the initialized AjaxIM object; the other
    // is only called within the initalized AjaxIM object.
    AjaxIM.incoming = function(data) {
        if(!_instance)
            return false;
        
        if(data.length)
            _instance._parseMessages(data);
    }
    
    // === {{{AjaxIM.}}}**{{{loaded}}}** ===
    //
    // If Ajax IM has been loaded with the im.load.js file, this function will be
    // called when the library is finally loaded and ready for use. Similar to
    // jQuery's $(document).ready(), but for Ajax IM.
    AjaxIM.loaded = function() {
        if(typeof AjaxIMLoadedFunction == 'function') {
            AjaxIMLoadedFunction();
            delete AjaxIMLoadedFunction; // clean up the global namespace
        }
    };
    
    // === {{{AjaxIM.}}}**{{{dateFormat([date,] [mask,] utc)}}}** ===
    //
    // Date Format 1.2.3\\
    // &copy; 2007-2009 Steven Levithan ([[http://blog.stevenlevithan.com/archives/date-time-format|stevenlevithan.com]])\\
    // MIT license
    //
    // Includes enhancements by Scott Trenda
    // and Kris Kowal ([[http://cixar.com/~kris.kowal/|cixar.com/~kris.kowal/]])
    //
    // Accepts a date, a mask, or a date and a mask and returns a formatted version
    // of the given date.
    //
    // ==== Parameters ====
    // * {{{date}}} is a {{{Date()}}} object. If not specified, the date defaults to the
    // current date/time.
    // * {{{mask}}} is a string that defines the formatting of the date. Formatting
    // options can be found in the
    // [[http://blog.stevenlevithan.com/archives/date-time-format|Date Format]]
    // documentation. If not specified, the mask defaults to {{{dateFormat.masks.default}}}.
    
    AjaxIM.dateFormat = function () {
        var token = /d{1,4}|m{1,4}|yy(?:yy)?|([HhMsTt])\1?|[LloSZ]|"[^"]*"|'[^']*'/g,
            timezone = new RegExp('\b(?:[PMCEA][SDP]T|(?:Pacific|Mountain|Central|Eastern|Atlantic) ' +
                                  '(?:Standard|Daylight|Prevailing) Time|(?:GMT|UTC)(?:[-+]\d{4})?)\b',
                                  'g'),
            timezoneClip = /[^-+\dA-Z]/g,
            pad = function (val, len) {
                val = String(val);
                len = len || 2;
                while (val.length < len) val = "0" + val;
                return val;
            };
    
        // Regexes and supporting functions are cached through closure
        return function (date, mask, utc) {
            var dF = AjaxIM.dateFormat;
    
            // You can't provide utc if you skip other args (use the "UTC:" mask prefix)
            if (arguments.length == 1 && Object.prototype.toString.call(date) ==
                  "[object String]" && !/\d/.test(date)) {
                mask = date;
                date = undefined;
            }
    
            // Passing date through Date applies Date.parse, if necessary
            date = date ? new Date(date) : new Date;
            if (isNaN(date)) throw SyntaxError("invalid date");
    
            mask = String(dF.masks[mask] || mask || dF.masks["default"]);
    
            // Allow setting the utc argument via the mask
            if (mask.slice(0, 4) == "UTC:") {
                mask = mask.slice(4);
                utc = true;
            }
    
            var _ = utc ? "getUTC" : "get",
                d = date[_ + "Date"](),
                D = date[_ + "Day"](),
                m = date[_ + "Month"](),
                y = date[_ + "FullYear"](),
                H = date[_ + "Hours"](),
                M = date[_ + "Minutes"](),
                s = date[_ + "Seconds"](),
                L = date[_ + "Milliseconds"](),
                o = utc ? 0 : date.getTimezoneOffset(),
                flags = {
                    d:    d,
                    dd:   pad(d),
                    ddd:  AjaxIM.i18n.dayNames[D],
                    dddd: AjaxIM.i18n.dayNames[D + 7],
                    m:    m + 1,
                    mm:   pad(m + 1),
                    mmm:  AjaxIM.i18n.monthNames[m],
                    mmmm: AjaxIM.i18n.monthNames[m + 12],
                    yy:   String(y).slice(2),
                    yyyy: y,
                    h:    H % 12 || 12,
                    hh:   pad(H % 12 || 12),
                    H:    H,
                    HH:   pad(H),
                    M:    M,
                    MM:   pad(M),
                    s:    s,
                    ss:   pad(s),
                    l:    pad(L, 3),
                    L:    pad(L > 99 ? Math.round(L / 10) : L),
                    t:    H < 12 ? "a"  : "p",
                    tt:   H < 12 ? "am" : "pm",
                    T:    H < 12 ? "A"  : "P",
                    TT:   H < 12 ? "AM" : "PM",
                    Z:    utc ? "UTC" :
                            (String(date).match(timezone) || [""])
                            .pop().replace(timezoneClip, ""),
                    o:    (o > 0 ? "-" : "+") +
                            pad(Math.floor(Math.abs(o) / 60) * 100 + Math.abs(o) % 60, 4),
                    S:    ["th", "st", "nd", "rd"][d % 10 > 3 ?
                            0 :
                            (d % 100 - d % 10 != 10) * d % 10]
                };
    
            return mask.replace(token, function ($0) {
                return $0 in flags ? flags[$0] : $0.slice(1, $0.length - 1);
            });
        };
    }();
    
    // Some common format strings
    AjaxIM.dateFormat.masks = {
        "default":      "ddd mmm dd yyyy HH:MM:ss",
        shortDate:      "m/d/yy",
        mediumDate:     "mmm d, yyyy",
        longDate:       "mmmm d, yyyy",
        fullDate:       "dddd, mmmm d, yyyy",
        shortTime:      "h:MM TT",
        mediumTime:     "h:MM:ss TT",
        longTime:       "h:MM:ss TT Z",
        isoDate:        "yyyy-mm-dd",
        isoTime:        "HH:MM:ss",
        isoDateTime:    "yyyy-mm-dd'T'HH:MM:ss",
        isoUtcDateTime: "UTC:yyyy-mm-dd'T'HH:MM:ss'Z'"
    };

    // === {{{AjaxIM.}}}**{{{i18n}}}** ===
    //
    // Text strings used by Ajax IM. Should you want to translate Ajax IM into
    // another language, merely change these strings.
    // 
    // {{{%s}}} denotes text that will be automatically replaced when the string is
    // used.
    AjaxIM.i18n = {
        dayNames: [
            "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat",
            "Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"
        ],
        monthNames: [
            "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec",
            "January", "February", "March", "April", "May", "June", "July", "August", "September",
            "October", "November", "December"
        ],
        
        chatOffline: '%s signed off.',
        chatAvailable: '%s became available.',
        chatAway: '%s went away.',
        
        notConnected: 'You are currently not connected or the server is not available. ' +
                      'Please ensure that you are signed in and try again.',
        notConnectedTip: 'You are currently not connected.',
        
        authInvalid: 'Invalid username or password.',
        
        registerPasswordLength: 'Passwords must be more than 4 characters in length.',
        registerUsernameLength: 'Usernames must be more than 2 characters in length and ' +
                        ' contain only A-Z, a-z, 0-9, underscores (_) and periods (.).',
        registerPasswordMatch: 'Entered passwords do not match.',
        registerUsernameTaken: 'The chosen username is already in use; please choose another.',
        registerUnknown: 'An unknown error occurred. Please try again.'
    }
})(jQuery, false);
\ No newline at end of file
+// = im.js =
//
// **Copyright &copy; 2005 &ndash; 2010 Joshua Gross**\\
// //MIT Licensed//
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
// in the Software without restriction, including without limitation the rights
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
// copies of the Software, and to permit persons to whom the Software is
// furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in
// all copies or substantial portions of the Software.
// 
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
//
// This is the main library for Ajax IM. It encompasses the UI controls,
// and connecting with the server. It does //not// handle registration or
// account management.

(function($, _instance) {
    AjaxIM = function(options, actions) {
        if(this instanceof AjaxIM) {
            var self = this;
            
            // === {{{ defaults }}} ===
            //
            // These are the available settings for Ajax IM, and the associated
            // defaults:
            //
            // * {{{pollType}}} determines the way in which the client will talk to
            // the server.
            // ** {{{comet}}} will use http streaming, wherein a connection to the server will be held open indefinitely, and the server will push down new events (messages, status updates) as they occur.
            // ** {{{long}}} will hold open a connection with the server for as long as possible, or until a new event is received. Upon the server sending an event or closing the connection, the client will automatically&mdash;and immediately&mdash;reconnect.
            // ** {{{short}}} will open a connection, and the server (if this method is supported) will //immediately// provide a response as to whether or not there are any new events. Once a response is received, the client will wait 5 seconds, and then reconnect.
            // * {{{pollServer}}} is the default URL to which all actions refer. It is
            // possible to specify certain action URLs separately (as is used with the
            // NodeJS server).
            // * {{{cookieName}}} is the name of the session cookie used by the server.
            // If this is not set properly, the IM engine will not be able to automatically
            // reinitialize sessions.
            // * {{{theme}}} is the name of the theme folder that defines the HTML and
            // CSS of the IM bar and chat boxes. Usually, themes are deposited in the
            // provided "themes" folder and specified by that path, e.g. {{{themes/default}}}.
            // Theme files within the theme folder must be named {{{theme.html}}} and
            // {{{theme.css}}}.
            // * {{{storageMethod}}} defines the way in which data (chat sessions) are
            // temporarily stored client-side. By default, {{{"flash"}}} is used because
            // it is the most widely supported method. However,
            // [[http://eric.garside.name/docs.html?p=jstore#js-engines|other storage engines]]
            // are available, with their respective up- and down-sides
            // outlined, on the jStore website.
            // * {{{storeSession}}} (**not implemented**) sets the number of days to
            // retain stored chat session data before it should be deleted.
            // * {{{checkResume}}} is a flag that sets whether or not the client should
            // make a call to the server before resuming the session (such as on a page
            // reload). This will ensure that the session has not expired. If set to {{{false}}},
            // a call to the server will not be made, and the session will be assumed to
            // be active.
            var defaults = {
                pollType: 'long',
                pollServer: './ajaxim.php',
                cookieName: 'ajaxim_session',
                theme: 'themes/default',
                storageMethod: 'auto',
                flashStorage: 'js/jStore.Flash.html',
                storeSession: 5, // number of days to store chat data (0 for current session only)
                checkResume: true
            };

            // === {{{AjaxIM.}}}**{{{settings}}}** ===
            //
            // These are the settings for the IM. If particular options are not specified,
            // the defaults (see above) will be used. //These options will be defined
            // upon calling the initialization function, and not set directly.//
            this.settings = $.extend(defaults, options);

            // === {{{AjaxIM.}}}**{{{actions}}}** ===
            //
            // Each individual action that the IM engine can execute is predefined here.
            // By default, it merely appends the action onto the end of the {{{pollServer}}} url,
            // however, it is possible to define actions individually. //The alternative actions
            // will be defined upon calling the initialization function, and not set directly.//
            //
            // Should you define an action at a different URL, Ajax IM will determine whether
            // or not this URL is within the current domain. If it is within a subdomain of
            // the current domain, it will set the document.domain variable for you,
            // to match a broader hostname scope; the action will continue to use {{{$.post}}}
            // (the default AJAX method for Ajax IM).
            //
            // On the other hand, should you choose a URL outside the current domain
            // Ajax IM will switch to {{{$.getJSON}}} (a get request) to avoid
            // cross-domain scripting issues. This means that a server on a different
            // port or at a different address will need to be able to handle GET
            // requests rather than POST requests (such as how the Node.JS Ajax IM
            // server works).
            this.actions = $.extend({
                login: this.settings.pollServer + '/login',
                logout: this.settings.pollServer + '/logout',
                register: this.settings.pollServer + '/register',
                poll: this.settings.pollServer + '/poll?method=' + this.settings.pollType,
                send: this.settings.pollServer + '/send',
                status: this.settings.pollServer + '/status',
                resume: this.settings.pollServer + '/resume'
            }, actions);

            var httpRx = new RegExp('^http://', 'i'),
                slashslashRx = new RegExp('^//', 'i'),
                queryStrRx = new RegExp('[?](.+)$'),
                subdomainRx = new RegExp('((http[s]?:)?//)?(.+?)[.]' + window.location.host, 'i');
            $.each(this.actions, function(name, action) {
                if(name == 'poll' || name == 'send') {
                    if(self.settings.pollType != 'comet')
                        action += (queryStrRx.test(action[1]) ? '&' : '?') + 'callback=?';
                        
                    action = ['jsonp', action];
                } else {
                    action = ['ajax', action];
                    if(subdomainRx.test(action[1])) {
                        document.domain = '.' + window.location.host;
                    } else if((http = httpRx.test(action[1])) || slashslashRx.test(action[1])) {
                        if(!(new RegExp('//' + window.location.host + '/', 'i')).test(action[1])) {
                            action[1] += (queryStrRx.test(action[1]) ? '&' : '?') + 'callback=?';
                            action = ['jsonp', action[1]];
                        }
                    }
                }
                
                self.actions[name] = action;
            });
            
            // We load the theme dynamically based on the passed
            // settings. If the theme is set to false, we assume
            // that the user is going to load it himself.
            this.themeLoaded = false;
            if(this.settings.theme) {
                $('<div></div>').appendTo('body').load(this.settings.theme + '/theme.html #imjs-bar, .imjs-tooltip',
                    function() {
                        self.themeLoaded = true;
                        setup.apply(self);
                    }
                );
                if(typeof document.createStyleSheet == 'function')
                    document.createStyleSheet(this.settings.theme + '/theme.css');
                else
                    $('body').append('<link rel="stylesheet" href="' +
                        this.settings.theme + '/theme.css" />');
            } else {
                this.themeLoaded = true;
                setup.apply(this);
            }
            
            // Client-side storage for keeping track of
            // conversation states, active tabs, etc.
            // The default is flash storage, however, other
            // options are available via the jStore library.
            if(this.settings.storageMethod) {
                this.storageBrowserKey = 'unknown';
                this.storeKey = '';
                
                $.each($.browser, function(k, v) {
                    if(k == 'version') return true;
                    else if(v == true) {
                        self.storageBrowserKey = k;
                        return false;
                    }
                });
            
                if(this.settings.storageMethod == 'auto') {
                    $.each(['ie', 'html5', 'local', 'flash'], function() {
                        if($.jStore.Availability[this]()) {
                            self.settings.storageMethod = this;
                            return false;
                        }
                    });
                }
            
                $.extend($.jStore.defaults, {
                    project: 'im.js',
                    engine: this.settings.storageMethod,
                    flash: this.settings.flashStorage
                });
                    
                this.storageReady = false;
                
                if(this.settings.storageMethod == 'flash') {                    
                    $.jStore.ready(function(engine) {
                        $.jStore.flashReady(function() {
                            self.storageReady = true;
                            setup.apply(self);
                        });
                    })
                } else {
                    $.jStore.ready(function(engine) {
                        self.storageReady = true;
                        setup.apply(self);
                    });
                }
                
                $.jStore.load();
            } else {
                this.storageReady = true;
                setup.apply(this);
            }

            // Allow a chatbox to me minimized
            $('.imjs-chatbox').live('click', function(e) {
                e.preventDefault();
                return false;
            });
            
            $('.imjs-chatbox .imjs-minimize').live('click', function() {
                $(this).parents('.imjs-chatbox').data('tab').click();
            });
            
            // Allow a chatbox to be closed
            $('.imjs-chatbox .imjs-close').live('click', function() {
                var chatbox = $(this).parents('.imjs-chatbox');
                chatbox.data('tab')
                    .data('state', 'closed').css('display', 'none');
                    
                if(self.settings.storageMethod && self.storageReady) {
                    delete self.chatstore[chatbox.data('username')];
                    if(self.storageReady) {
                        $.jStore.store(
                            self.storageBrowserKey + '-' +
                            self.username + '-chats',
                            self.chatstore);
                    }
                }
            });
            
            // Setup message sending for all chatboxes
            $('.imjs-chatbox .imjs-input').live('keydown', function(event) {               
                var obj = $(this);
                if(event.keyCode == 13 && !($.browser.msie && $.browser.version < 8)) {
                    self.send(obj.parents('.imjs-chatbox').data('username'), obj.val());
                }
            }).live('keyup', function(event) {
                if(event.keyCode == 13) {
                    if($.browser.msie && $.browser.version < 8) {
                        var obj = $(this);
                        self.send(obj.parents('.imjs-chatbox').data('username'), obj.val());
                    }

                    var obj = $(this);
                    obj.val('');
                    obj.height(obj.data('height'));
                }
            }).live('keypress', function(e) {
                var obj = $(this);
                if(!($.browser.msie && $.browser.opera)) obj.height(0);
                if(this.scrollHeight > obj.height() || this.scrollHeight < obj.height()) {
                    obj.height(this.scrollHeight);
                }
            });
            
            $('.imjs-msglog').live('click', function() {
                var chatbox = $(this).parents('.imjs-chatbox');
                chatbox.find('.imjs-input').focus();
            });
            
            // Create a chatbox when a buddylist item is clicked
            $('.imjs-friend').live('click', function() {
                var chatbox = self._createChatbox($(this).data('friend'));
                
                if(chatbox.data('tab').data('state') != 'active')
                    chatbox.data('tab').click();
                    
                chatbox.find('.imjs-input').focus();
            });
            
            // Setup and hide the scrollers
            $('.imjs-scroll').css('display', 'none');
            $('#imjs-scroll-left').live('click', function() {
                var hiddenTab = $('#imjs-bar li.imjs-tab:visible').slice(-1)
                    .next('#imjs-bar li.imjs-tab:hidden')
                    .filter(function() {
                        return $(this).data('state') != 'closed'
                    })
                    .not('.imjs-default').slice(-1).css('display', '');
                    
                if(hiddenTab.length) {
                    $('#imjs-bar li.imjs-tab:visible').eq(0).css('display', 'none');
                    $(this).html(parseInt($(this).html()) - 1);
                    $('#imjs-scroll-right').html(parseInt($('#imjs-scroll-right').html()) + 1);
                }

                return false;
            });
            $('#imjs-scroll-right').live('click', function() {
                var hiddenTab = $('#imjs-bar li.imjs-tab:visible').eq(0)
                    .prev('#imjs-bar li.imjs-tab:hidden')
                    .filter(function() {
                        return $(this).data('state') != 'closed'
                    })
                    .not('.imjs-default').slice(-1).css('display', '');
                    
                if(hiddenTab.length) {
                    $('#imjs-bar li.imjs-tab:visible').slice(-1).css('display', 'none');
                    $(this).html(parseInt($(this).html()) - 1);
                    $('#imjs-scroll-left').html(parseInt($('#imjs-scroll-left').html()) + 1);
                }
                
                return false;
            });
            
            // Initialize the chatbox hash
            this.chats = {};
            
            // Try to resume any existing session
            this.resume();
            
            $(window).resize(function() {
                self.bar._scrollers();
            });
        } else
            return AjaxIM.init(options);
    };
    
    // We predefine all public functions here...
    // If they are called before everything (theme, storage engine) has loaded,
    // then they get put into a "prequeue" and run when everything *does*
    // finally load.
    //
    // This ensures that nothing loads without all of the principal components
    // being pre-loaded. If that were to occur (without this prequeue), things
    // would surely break.
    var prequeue = [];
    var empty = function() {
        var func = this;
        return function() { prequeue.push([func, arguments]) };
    };
    $.extend(AjaxIM.prototype, {
        settings: {},
        friends: {},
        chats: {},
        
        storage: empty.apply('storage'),
        login: empty.apply('login'),
        logout: empty.apply('logout'),
        resume: empty.apply('resume'),
        form: empty.apply('form'),
        poll: empty.apply('poll'),
        incoming: empty.apply('incoming'),
        send: empty.apply('send'),
        status: empty.apply('status'),
        statuses: {},
        bar: {
            initialize: empty.apply('bar.initialize'),
            activateTab: empty.apply('bar.activateTab'),
            closeTab: empty.apply('bar.closeTab'),
            addTab: empty.apply('bar.addTab'),
            notification: empty.apply('bar.notification'),
            _scrollers: empty.apply('bar._scrollers')
        }
    });
    
    setup = (function() {
    var self = this;
    if(!this.storageReady || !this.themeLoaded) return;
    
    $(self).trigger('loadComplete');
    $(window).resize();
    
    $.extend(AjaxIM.prototype, {        
        // == Cookies ==
        //
        // The "cookies" functions can be used to set, get, and erase JSON-based cookies.
        // These functions are primarily used to manage and read the server-set cookie
        // that handles the user's chat session ID.
        cookies: {
            // === {{{AjaxIM.}}}**{{{cookies.set(name, value, days)}}}** ===
            //
            // Sets a cookie, stringifying the JSON value upon storing it.
            //
            // ==== Parameters ====
            // * {{{name}}} is the cookie name.\\
            // * {{{value}}} is the cookie data that you would like to store.\\
            // * {{{days}}} is the number of days that the cookie will be stored for.
            set: function(name, value, days) {
                if (days) {
                    var date = new Date();
                    date.setTime(date.getTime() + (days * 24 * 60 * 60 * 1000));
                    var expires = "; expires=" + date.toGMTString();
                } else var expires = "";
                document.cookie = name + "=" + $.compactJSON(value) + expires + "; path=/";
            },
            
            // === {{{AjaxIM.}}}**{{{cookies.get(name)}}}** ===
            //
            // Gets a cookie, decoding the JSON value before returning the data.
            //
            // ==== Parameters ====
            // * {{{name}}} is the cookie name that you would like to retrieve.
            get: function(name) {
                var nameEQ = name + "=";
                var ca = document.cookie.split(';');
                for(var i = 0; i < ca.length; i++) {
                    var c = ca[i];
                    while (c.charAt(0) == ' ') c = c.substring(1, c.length);
                    if (c.indexOf(nameEQ) == 0) {
                      var cval = decodeURIComponent(c.substring(nameEQ.length, c.length));
                      return $.secureEvalJSON(cval);
                    }
                }
                return null;
            },
            
            // === {{{AjaxIM.}}}**{{{cookies.erase(name)}}}** ===
            //
            // Deletes a cookie.
            //
            // {{{name}}} is the existing cookie that you would like to delete.
            erase: function(name) {
                self.cookies.set(name, '', -1);
            }
        },

        // == Main ==
        
        // === {{{AjaxIM.}}}**{{{storage()}}}** ===
        //
        // Retrieves chat session data from whatever storage engine is enabled
        // (provided that one is enabled at all). If a page reloads, this function
        // is called to restore the user's chat state (existing conversations, active tab).
        // This function is called //automatically//, upon initialization of the IM engine.
        storage: function() {
            if(!self.storeKey.length) return;
            
            try {
                var chatstore = $.jStore.store(self.storeKey + 'chats') || {};
            } catch(e) {
                $.jStore.remove(self.storeKey + 'chats');
                var chatstore = {};
            }

            if(this.chatstore) {            
                $.each(this.chatstore, function(username, convo) {
                    if(username in chatstore)
                        chatstore[username] = $.merge(chatstore[username], self.chatstore[username]);
                    else
                        chatstore[username] = self.chatstore[username];
                });
                                
                this.chatstore = chatstore;
                $.jStore.store(self.storeKey + 'chats', chatstore);
            } else {
                this.chatstore = chatstore;
            }
            
            $.each(this.chatstore, function(username, convo) {
                if(!convo.length) return;
                
                var chatbox = self._createChatbox(username, true);
                chatbox.data('lastDateStamp', null).css('display', 'none');
                
                // Remove the automatic date stamp
                chatbox.find('.imjs-msglog').empty();
                
                // Restore all messages, date stamps, and errors
                $.each(convo, function() {
                    switch(this[0]) {
                        case 'error':
                            self._addError(chatbox, decodeURIComponent(this[2]), this[3]);
                        break;
                        
                        case 'datestamp':
                            self._addDateStamp(chatbox, this[3]);
                        break;
                        
                        case 'a':
                        case 'b':
                            self._addMessage(this[0], chatbox, this[1],
                                decodeURIComponent(this[2]), this[3]);
                        break;
                    }
                });
                
                $(self).trigger('chatRestored', [username, chatbox]);
            });
            
            var activeTab = $.jStore.store(self.storeKey + 'activeTab') || [];
            if(activeTab.length && (activeTab = activeTab[0]) && activeTab in this.chats) {
                this.chats[activeTab].data('tab').click();
                var msglog = this.chats[activeTab].find('.imjs-msglog');
                msglog[0].scrollTop = msglog[0].scrollHeight;
            }
        },
        
        // === {{{AjaxIM.}}}**{{{login(username, password)}}}** ===
        //
        // Authenticates a user and initializes the IM engine. If the user is
        // already logged in, [s]he is logged out, the session is cleared, and
        // the new user is logged in.
        //
        // Returns the user's properly formatted username, session ID, and online
        // friends in JSON, if successful; e.g.:\\
        // {{{ {u: 'username', s: 'longsessionid', f: [{u: 'friend', s: 1, g: 'group'}]} }}}
        //
        // If unsuccessful, {{{false}}} is returned.
        //
        // ==== Parameters ====
        // * {{{username}}} is the user's username.\\
        // * {{{password}}} is the user's password. This password will be MD5 hashed
        // before it is sent to the server.
        login: function(username, password) {
            if(!username) username = '';
            if(!password) password = '';
            
            if(this.username)
                return true; // Already logged in!
        
            // hash password before sending it to the server
            password = $.md5(password);

            // authenticate
            AjaxIM.request(
                this.actions.login,
                {'username': username, 'password': password},
                function(auth) {
                    if(auth.r == 'logged in') {
                        self.username = ('u' in auth ? auth.u : username);
                        
                        if(self.settings.storageMethod)
                            self.storeKey = [self.storageBrowserKey, self.username, ''].join('-');
                            
                        var existing = self.cookies.get(self.settings.cookieName);
                        self.storage();
                        
                        // Begin the session
                        $.each(auth.f, function() {
                            self.friends[this.u] = {status: [this.s, ''], group: this.g};
                        });
                        self._session(self.friends);
                        self._storeFriends();
                        
                        $(self).trigger('loginSuccessful', [auth]);
                        
                        return auth;
                    } else {
                        $(self).trigger('loginError', [auth]);
                    }
                    
                    return false;
                }
            );
        },
        
        // === {{{AjaxIM.}}}**{{{logout()}}}** ===
        //
        // Logs the user out and removes his/her session cookie. As well, it
        // will close all existing chat windows, clear the storage engine, and
        // remove the IM bar.
        logout: function() {
            AjaxIM.request(
                this.actions.logout,
                {},
                function(done) {
                    if(done) {
                        self.cookies.erase(self.settings.cookieName);
                        self._clearSession();
                        $(self).trigger('logoutSuccessful');
                        return true;
                    } else {
                        $(self).trigger('logoutError');
                        return false;
                    }
                }
            );
        },
        
        // === {{{AjaxIM.}}}**{{{resume()}}}** ===
        //
        // Resumes an existing session based on a session ID stored in the
        // server-set cookie. This function is called //automatically// upon IM
        // engine (re-)initialization, so the user does not need to re-login
        // should a session already exist.
        resume: function() {
            var session = this.cookies.get(this.settings.cookieName);
            
            if(session && session.sid) {
                this.username = session.user;
                
                this.storeKey = [this.storageBrowserKey, this.username, ''].join('-');
                
                var friends = $.jStore.store(this.storeKey + 'friends') || [];
                if(self.settings.checkResume) {
                    AjaxIM.request(
                        this.actions.resume,
                        {},
                        function(response) {
                            if(response.r == 'connected') {
                                self._session(friends);
                                self.storage();
                            } else {
                                var username = this.username;
                                self._clearSession();
                                $(self).trigger('sessionNotResumed', [username]);
                            }
                        }
                    );
                } else {
                    self._session(friends);
                    self.storage();
                }
            } else {
                $(self).trigger('noSession');
            }
        },
        
        // === //private// {{{AjaxIM.}}}**{{{_session(friends)}}}** ===
        //
        // Restores session data (username, friends) and begins polling the server.
        // Called only by {{{AjaxIM.resume()}}}.
        //
        // ==== Parameters ====
        // * {{{friends}}} is a list of "friend" objects, e.g.:\\
        // {{{[{u: 'friend', s: 1, g: 'group'}, ...]}}}
        // ** {{{u}}} being the friend's username.
        // ** {{{s}}} being one of the available status codes (see {{{AjaxIM.statuses}}}), depending on the friend's current status.
        // ** {{{g}}} being the group that the friend is in.
        _session: function(friends) {
            $('#imjs-friends-panel .imjs-header span').html(this.username);
            $('#imjs-friends').removeClass('imjs-not-connected');
            
            $.each(friends, function(friend, info) {
                self.addFriend.apply(self, [friend, info.status, info.group]);
            });
            self._storeFriends();
            
            $(self).trigger('sessionResumed', [this.username]);
            
            setTimeout(function() { self.poll(); }, 0);
        },
        
        // === //private// {{{AjaxIM.}}}**{{{_clearSession()}}}** ===
        //
        // Clears all session data from the last known user.
        _clearSession: function() {                    
            if(self.settings.storageMethod && self.storageReady) {
                $.jStore.remove(self.storeKey + 'chats');
                $.jStore.remove(self.storeKey + 'friends');
                $.jStore.remove(self.storeKey + 'activeTab');
            }
            
            self.chats = {};
            $('.imjs-tab').not('.imjs-tab.imjs-default').remove();
            
            self.cookies.erase('ajaxim_session');
            delete self.username;
        },
        
        // === {{{AjaxIM.}}}**{{{form(element)}}}** ===
        //
        // Loads a login and registration form into the specified element
        // or, if no element is supplied, to the location on the page from
        // which this function was called.
        form: function(element) {
            $(element).load(this.settings.theme + '/theme.html #imjs-lr', function() {
                $('#imjs-lr .error').hide();
                
                if(self.username) {
                    $('#imjs-register, #imjs-login fieldset').hide();
                    $('#imjs-logged-in')
                        .show()
                        .html($('#imjs-logged-in').html().replace('{username}', self.username));
                } else {
                    $('#imjs-logged-in').hide();
                }

                // Handle logout success                
                $(self).bind('logoutSuccessful', function() {
                    $('#imjs-login fieldset').slideDown();
                    $('#imjs-register').slideDown();
                    
                    $('#imjs-logged-in')
                        .html($('#imjs-logged-in strong').html('{username}'))
                        .slideUp();
                });
                $('#imjs-logged-in a').click(function() {
                    self.logout();
                    return false;
                });

                // Handle login error or success
                $(self).bind('loginError', function() {
                    $('#imjs-login .error').html(AjaxIM.i18n.authInvalid).slideDown('fast');
                    $('#imjs-login input')
                        .addClass('imjs-lr-error')
                        .blur(function() { $(this).removeClass('imjs-lr-error'); });
                }).bind('loginSuccessful', function() {
                    $('#imjs-login fieldset').slideUp();
                    $('#imjs-register').slideUp();
                    
                    $('#imjs-logged-in')
                        .html($('#imjs-logged-in').html().replace('{username}', self.username))
                        .slideDown();
                });
                var login = function() {
                    self.login($('#imjs-login-username').val(), $('#imjs-login-password').val());
                    return false;
                };
                $('#imjs-login').submit(login);
                $('#imjs-login-submit').click(login);
                
                var regIssues = false;
                var regError = function(error, fields) {
                    $('#imjs-register .error')
                        .append(AjaxIM.i18n['register' + error] + ' ')
                        .slideDown();
                    $(fields)
                        .addClass('imjs-lr-error')
                        .blur(function() { $(this).removeClass('imjs-lr-error'); });
                    regIssues = true;
                };
                
                var register = function() {
                    $('#imjs-register .error').empty();
                    
                    regIssues = false;
                    
                    var username = $('#imjs-register-username').val();
                    var password = $('#imjs-register-password').val();
                    
                    if(password.length < 4)
                        regError('PasswordLength', '#imjs-register-password');
                
                    if(password != $('#imjs-register-cpassword').val())
                        regError('PasswordMatch', '#imjs-register-password, #imjs-register-cpassword');
                    
                    if(username.length <= 2 ||
                        !$('#imjs-register-username').val().match(/^[A-Za-z0-9_.]+$/))
                        regError('UsernameLength', '#imjs-register-username');
                    
                    if(!regIssues) {
                        AjaxIM.request(
                            self.actions.register,
                            {username: username, password: password},
                            function(response) {
                                if(response.r == 'registered') {
                                    self.login(username, password);
                                } else if(response.r == 'error') {
                                    switch(response.e) {
                                        case 'unknown':
                                            regError('Unknown', '');
                                        break;
                                        
                                        case 'invalid password':
                                            regError('PasswordLength', '#imjs-register-password');
                                        break;
                                        
                                        case 'invalid username':
                                            regError('UsernameLength', '#imjs-register-username');
                                        break;
                                        
                                        case 'username taken':
                                            regError('UsernameTaken', '#imjs-register-username');
                                        break;
                                    }
                                }
                            },
                            function(error) {
                                regError('Unknown', '');
                            }
                        );
                    }
                    
                    return false;
                };
                $('#imjs-register').submit(register);
                $('#imjs-register-submit').click(register);
            });
        },
        
        // === {{{AjaxIM.}}}**{{{poll()}}}** ===
        //
        // Queries the server for new messages. If a 'long' or 'short' poll
        // type is used, jQuery's {{{$.post}}} or {{{$.getJSON}}} will be
        // used. If 'comet' is used, the server connection will be deferred
        // to the comet set of functions.
        poll: function() {
            if(/^(short|long)$/.test(this.settings.pollType)) {
                AjaxIM.request(
                    this.actions.poll,
                    {},
                    function(response) {
                        if(!response['e']) {
                            if(response.length)
                                self._parseMessages(response);
                                
                            setTimeout(function() { self.poll(); }, 0);                            
                        } else {
                            switch(response.e) {
                                case 'no session found':
                                    self._notConnected();
                                break;
                            }
                            
                            $(self).trigger('pollFailed', [response.e]);
                        }
                    },
                    function(error) {
                        self._notConnected();
                        $(self).trigger('pollFailed', ['not connected']);
                        // try reconnecting?
                    }
                );
            } else if(this.settings.pollType == 'comet') {
                this.comet.connect();
            }
        },
        
        // === //private// {{{AjaxIM.}}}**{{{_parseMessages(messages)}}}** ===
        //
        // Handles an incoming message array:\\
        // {{{[{t: 'type', s: 'sender', r: 'recipient', m: 'message'}, ...]}}}
        //
        // * {{{t}}} (message type) is one of:
        // ** {{{m}}} &mdash; a standard message
        // ** {{{s}}} &mdash; a user's status update
        // ** {{{b}}} &mdash; a broadcasted message (sent to many users simultaneously)
        // * {{{s}}} is the sender of the message.
        // * {{{r}}} is the intended recipient of the message. Most of the time, this will
        // simply be the logged in user, however, a broadcasted message may not specify
        // a recipient or may specify a different recipient. Also provides future
        // compatability for chatrooms.
        // * {{{m}}} is the actual message. For something such as a status update, this can
        // be a JSON object or parsable string; e.g. {{{"2:I'm away."}}}
        //
        // ==== Parameters ====
        // * {{{messages}}} is the message array
        _parseMessages: function(messages) {
            if($.isArray(messages)) {
                $.each(messages, function() {
                    $(self).trigger('parseMessage', [this]);
                    
                    switch(this.t) {
                        case 'm':
                            self.incoming(this.s, this.m);
                        break;
                        
                        case 's':
                            var status = this.m.split(':');
                            if(this['g'])
                                self.addFriend(this.s, status, this.g);
                            self._friendUpdate(this.s, status[0], status.slice(1).join(':'));
                            self._storeFriends();
                        break;
    
                        case 'b':
                        break;
                        
                        default:
                        break;
                    }
                });
            }
        },
        
        // === {{{AjaxIM.}}}**{{{incoming(from, message)}}}** ===
        //
        // Handles a new message from another user. If a chatbox for that
        // user does not yet exist, one is created. If it does exist, but
        // is minimized, the user is notified but the chatbox is not brought
        // to the front. This function also stores the message, if a storage
        // method is set.
        //
        // ==== Parameters ====
        // * {{{from}}} is the username of the sender.
        // * {{{message}}} is the body.
        incoming: function(from, message) {
            // check if IM exists, otherwise create new window
            // TODO: If friend is not on the buddylist,
            // should add them to a temp list?
            var chatbox = this._createChatbox(from);
            
            if(!$('#imjs-bar .imjs-selected').length) {
                chatbox.data('tab').click();
            } else if(chatbox.data('tab').data('state') != 'active') {
                this.bar.notification(chatbox.data('tab'));
            }
            
            var time = this._addMessage('b', chatbox, from, message);
            this._storeMessage('b', chatbox, from, message, time);
        },
        
        // === {{{AjaxIM.}}}**{{{addFriend(username, group)}}}** ===
        //
        // Inserts a new friend into the friends list. If the group specified
        // doesn't exist, it is created. If the friend is already in this group,
        // they aren't added again, however, the friend item is returned.
        //
        // ==== Parameters ====
        // * {{{username}}} is the username of the new friend.
        // * {{{status}}} is the current status of the friend.
        // * {{{group}}} is the user group to which the friend should be added.
        addFriend: function(username, status, group) {
            var status_name = 'available';
            $.each(this.statuses,
                function(key, val) { if(status[0] == val) { status_name = key; return false; } });

            var group_id = 'imjs-group-' + $.md5(group);
            
            if(!(group_item = $('#' + group_id)).length) {
                var group_item = $('.imjs-friend-group.imjs-default').clone()
                        .removeClass('imjs-default')
                        .attr('id', group_id)
                        .data('group', group)
                        .appendTo('#imjs-friends-list');
                        
                var group_header = group_item.find('.imjs-friend-group-header');
                group_header.html(group_header.html().replace('{group}', group));
            }
            
            var user_id = 'imjs-friend-' + $.md5(username + group);
            
            if(!$('#' + user_id).length) {
                var user_item = group_item.find('ul li.imjs-default').clone()
                        .removeClass('imjs-default')
                        .addClass('imjs-' + status_name)
                        .attr('id', user_id)
                        .data('friend', username)
                        .appendTo(group_item.find('ul'));
                if(status[0] == 0) user_item.hide();
                user_item.html(user_item.html().replace('{username}', username));
            }
                        
            this.friends[username] = {'status': status, group: group};
            
            this._updateFriendCount();
            
            return this.friends[username];
        },
        
        // === //private// {{{AjaxIM.}}}**{{{_updateFriendCount()}}}** ===
        //
        // Counts the number of online friends and updates the friends count
        // in the friend tab.
        _updateFriendCount: function() {
            var friendsLength = 0;
            for(var f in this.friends) {
                if(this.friends[f].status[0] != 0)
                    friendsLength++;
            }
            $('#imjs-friends .imjs-tab-text span span').html(friendsLength);
        },
        
        // === //private// {{{AjaxIM.}}}**{{{_storeFriends()}}}** ===
        //
        // If a storage method is enabled, the current state of the
        // user's friends list is stored.
        _storeFriends: function() {
            if(this.settings.storageMethod && this.storageReady)
                $.jStore.store(this.storeKey + 'friends', this.friends);
        },
        
        // === //private// {{{AjaxIM.}}}**{{{_createChatbox(username)}}}** ===
        //
        // Builds a chatbox based on the default chatbox HTML and CSS defined
        // in the current theme. Should a chatbox for this user already exist,
        // a new one is not created. Instead, it is either given focus (should
        // no other windows already have focus), or a notification is issued.
        //
        // As well, if the chatbox does not exist, an associated tab will be
        // created.
        //
        // ==== Parameters ====
        // * {{{username}}} is the name of the user for whom the chatbox is intended
        // for.
        // * {{{no_stamp}}} sets whther or not to add a date stamp to the chatbox
        // upon creation.
        //
        // //Note:// New chatboxes are given an automatically generated ID in the
        // format of {{{#imjs-[md5 of username]}}}.
        _createChatbox: function(username, no_stamp) {
            var chatbox_id = 'imjs-' + $.md5(username);
            if(!(chatbox = $('#' + chatbox_id)).size()) {
                // add a tab
                var tab = this.bar.addTab(username, '#' + chatbox_id);
                var chatbox = tab.find('.imjs-chatbox');
                chatbox.attr('id', chatbox_id);

                chatbox.data('tab', tab);
                
                // remove default items from the message log
                var message_log = chatbox.find('.imjs-msglog').empty();
                
                // setup the chatbox header
                var cb_header = chatbox.find('.imjs-header');
                cb_header.html(cb_header.html().replace('{username}', username));
                
                if(!no_stamp) {
                    // add a date stamp
                    var time = this._addDateStamp(chatbox);
                    this._storeNonMessage('datestamp', username, null, time);
                }
                
                // associate the username with the object and vice-versa
                this.chats[username] = chatbox;
                chatbox.data('username', username);
                
                // did this chatbox fall down?
                this.bar._scrollers();
                
                if(username in this.friends) {
                    status = this.friends[username].status;
                    var status_name = 'available';
                    $.each(this.statuses,
                        function(key, val) { if(status[0] == val) { status_name = key; return false; } });
                    tab.addClass('imjs-' + status_name);
                }
                
                // store inputbox height
                //var input = chatbox.find('.imjs-input');
                //input.data('height', input.height());
            } else if(chatbox.data('tab').data('state') == 'closed') {
                chatbox.find('.imjs-msglog > *').addClass('imjs-msg-old');
                
                var tab = chatbox.data('tab');
                if(tab.css('display') == 'none')
                    tab.css('display', '').removeClass('imjs-selected')
                        .appendTo('#imjs-bar');
                
                if(!no_stamp) {
                    // possibly add a date stamp
                    var time = this._addDateStamp(chatbox);
                    this._storeNonMessage('datestamp', username, null, time);
                }
                    
                if(!$('#imjs-bar .imjs-selected').length) {
                    tab.click();
                } else {
                    this.bar.notification(tab);
                }
            }
            
            return chatbox;
        },
        
        // === //private// {{{AjaxIM.}}}**{{{_addDateStamp(chatbox)}}}** //
        //
        // Adds a date/time notifier to a chatbox. These are generally
        // inserted upon creation of a chatbox, or upon the date changing
        // since the last time a date stamp was added. If a date stamp for
        // the current date already exists, a new one will not be added.
        //
        // ==== Parameters ====
        // * {{{chatbox}}} refers to the jQuery-selected chatbox DOM element.
        // * {{{time}}} is the date/time the date stamp will show. It is specified
        // in milliseconds since the Unix Epoch. This is //only// defined when
        // date stamps are being restored from storage; if not specified, the
        // current computer time will be used.
        _addDateStamp: function(chatbox, time) {
            var message_log = $(chatbox).find('.imjs-msglog');
            if(!time)
               time = (new Date()).getTime();
 
            var date_stamp = $('.imjs-tab.imjs-default .imjs-chatbox .imjs-msglog .imjs-date').clone();
            var date_stamp_time = date_stamp.find('.imjs-msg-time');
            if(date_stamp_time.length)
                date_stamp_time.html(AjaxIM.dateFormat(time, date_stamp_time.html()));
            
            var date_stamp_date = date_stamp.find('.imjs-date-date');
            var formatted_date = AjaxIM.dateFormat(time, date_stamp_date.html());
            if(chatbox.data('lastDateStamp') != formatted_date) {
                if(date_stamp_date.length)
                    date_stamp_date.html(AjaxIM.dateFormat(time, date_stamp_date.html()));
            
                chatbox.data('lastDateStamp', formatted_date);
                date_stamp.appendTo(message_log);
            } else {
                //$('<div></div>').appendTo(message_log);
            }
            
            return time;
        },
        
        // === //private// {{{AjaxIM.}}}**{{{_addError(chatbox, error)}}}** //
        //
        // Adds an error to a chatbox. These are generally inserted after
        // a user sends a message unsuccessfully. If an error message
        // was already added, another one will be added anyway.
        //
        // ==== Parameters ====
        // * {{{chatbox}}} refers to the jQuery-selected chatbox DOM element.
        // * {{{error}}} is the error message string.
        // * {{{time}}} is the date/time the error occurred. It is specified in
        // milliseconds since the Unix Epoch. This is //only// defined when
        // errors are being restored from storage; if not specified, the current
        // computer time will be used.
        _addError: function(chatbox, error, time) {
            var message_log = $(chatbox).find('.imjs-msglog');
 
            var error_item =
                $('.imjs-tab.imjs-default .imjs-chatbox .imjs-msglog .imjs-error').clone();
                
            var error_item_time = error_item.find('.imjs-msg-time');
            if(error_item_time.length) {
                if(!time)
                    time = (new Date()).getTime();
                error_item_time.html(AjaxIM.dateFormat(time, error_item_time.html()));
            }

            error_item.find('.imjs-error-error').html(error);
            error_item.appendTo(message_log);
            
            message_log[0].scrollTop = message_log[0].scrollHeight;
        },
        
        // === //private// {{{AjaxIM.}}}**{{{_addMessage(ab, chatbox, username, message, time)}}}** //
        //
        // Adds a message to a chatbox. Depending on the {{{ab}}} value,
        // the color of the username may change as a way of visually
        // identifying users (however, this depends on the theme's CSS).
        // A timestamp is added to the message, and the chatbox is scrolled
        // to the bottom, such that the new message is visible.
        //
        // Messages will be automatically tag-escaped, so as to prevent
        // any potential cross-site scripting problems. Additionally,
        // URLs will be automatically linked.
        //
        // ==== Parameters ====
        // * {{{ab}}} refers to whether the user is "a" or "b" in a conversation.
        // For the general case, "you" are "a" and "they" are "b".
        // * {{{chatbox}}} refers to the jQuery-selected chatbox DOM element.
        // * {{{username}}} is the username of the user who sent the message.
        // * {{{time}}} is the time the message was sent in milliseconds since
        // the Unix Epoch. This is //only// defined when messages are being 
        // restored from storage. For new messages, the current computer
        // time is automatically used.
        _addMessage: function(ab, chatbox, username, message, time) {
            var last_message = chatbox.find('.imjs-msglog > *:last-child');
            if(last_message.hasClass('imjs-msg-' + ab)) {
                // Last message was from the same person, so let's just add another imjs-msg-*-msg
                var message_container = (last_message.hasClass('imjs-msg-' + ab + '-container') ?
                    last_message :
                    last_message.find('.imjs-msg-' + ab + '-container'));
                    
                var single_message =
                    $('.imjs-tab.imjs-default .imjs-chatbox .imjs-msglog .imjs-msg-' + ab + '-msg')
                    .clone().appendTo(message_container);
                
                single_message.html(single_message.html().replace('{username}', username));
            } else if(!last_message.length || !last_message.hasClass('imjs-msg-' + ab)) {
                var message_group = $('.imjs-tab.imjs-default .imjs-chatbox .imjs-msg-' + ab)
                    .clone().appendTo(chatbox.find('.imjs-msglog'));
                message_group.html(message_group.html().replace('{username}', username));
                
                var single_message = message_group.find('.imjs-msg-' + ab + '-msg');
            }
            
            // clean up the message
            message = message.replace(/</g, '&lt;').replace(/>/g, '&gt;')
                        .replace(/(^|.*)\*([^*]+)\*(.*|$)/, '$1<strong>$2</strong>$3');
            
            // autolink URLs
            message = message.replace(
                new RegExp('([A-Za-z][A-Za-z0-9+.-]{1,120}:[A-Za-z0-9/]' +
                '(([A-Za-z0-9$_.+!*,;/?:@&~=-])|%[A-Fa-f0-9]{2}){1,333}' +
                '(#([a-zA-Z0-9][a-zA-Z0-9$_.+!*,;/?:@&~=%-]{0,1000}))?)', 'g'),
                '<a href="$1" target="_blank">$1</a>');
            
            // insert the message
            single_message.html(single_message.html().replace('{message}', message));
            
            // set the message time
            var msgtime = single_message.find('.imjs-msg-time');
            if(!time)
                time = new Date();
        
            if(typeof time != 'string')
                time = AjaxIM.dateFormat(time, msgtime.html());
            
            msgtime.html(time);
            
            var msglog = chatbox.find('.imjs-msglog');
            msglog[0].scrollTop = msglog[0].scrollHeight;
            
            return time;
        },
        
        // === //private// {{{AjaxIM.}}}**{{{_storeNonMessage(type, username, data, time)}}}** ===
        //
        // **Redundant?**\\
        // Similar to {{{AjaxIM._storeMessage}}}, but stores items that aren't messages,
        // such as datestamps and errors.
        //
        // ==== Parameters ====
        // * {{{type}}} is the type of non-message (error, datestamp).
        // * {{{username}}} is the username of the user being chatted with.
        // * {{{data}}} is the (optional) data of the non-message to be stored.
        // * {{{time}}} is the time of the message.
        _storeNonMessage: function(type, username, data, time) {
            // If storage is on & ready, store the non-message
            if(this.settings.storageMethod) {
                if(!this.chatstore) this.chatstore = {};                 
                if(!(username in this.chatstore)) this.chatstore[username] = [];
                
                // If the chat store gets too long, it becomes slow to load.
                if(this.chatstore[username].length > 300)
                    this.chatstore[username].shift();
                
                // For some reason, if we don't encode and decode the message, it *will* break
                // (at least) the Flash storage engine's retrieval. Gah!
                this.chatstore[username].push(
                    [type, username, encodeURIComponent(data), time]);
                
                if(this.storageReady) $.jStore.store(self.storeKey + 'chats', this.chatstore);
            }
        },
        
        // === //private// {{{AjaxIM.}}}**{{{_storeMessage(ab, chatbox, username, message, time)}}}** ===
        //
        // Taking the same arguments as {{{AjaxIM._addMessage}}}, {{{_storeMessage}}} pushes a message
        // into the storage hash, if storage is enabled.
        //
        // Messages are added to a message array, by username. The entire chat hash is stored as
        // a {{{'chats'}}} object in whatever storage engine is enabled.
        _storeMessage: function(ab, chatbox, username, message, time) {
            // If storage is on & ready, store the message
            if(this.settings.storageMethod) {
                if(!this.chatstore) this.chatstore = {}; 
                
                message = message.replace(/</g, '&lt;').replace(/>/g, '&gt;');
                
                if(!(username in this.chatstore)) {
                    this.chatstore[username] = [];
                } else if(this.chatstore[username].length > 300) {
                    // If the chat store gets too long, it becomes slow to load.
                    this.chatstore[username].shift();
                }
                
                // For some reason, if we don't encode and decode the message, it *will* break
                // (at least) the Flash storage engine's retrieval. Gah!
                this.chatstore[chatbox.data('username')].push(
                    [ab, username, encodeURIComponent(message), time]);
                
                if(this.storageReady) $.jStore.store(this.storeKey + 'chats', this.chatstore);
            }
        },
        
        // === //private// {{{AjaxIM.}}}**{{{_friendUpdate(friend, status, statusMessage)}}}** ===
        //
        // Called when a friend's status is updated. This function will update all locations
        // where a status icon is displayed (chat tab, friends list), as well as insert
        // a notification, should a chatbox be open.
        //
        // ==== Parameters ====
        // * {{{friend}}} is the username of the friend.
        // * {{{status}}} is the new status code. See {{{AjaxIM.statuses}}} for a list of available
        // codes. //Note: If an invalid status is specified, no action will be taken.//
        // * {{{statusMessage}}} is a message that was, optionally, specified by the user. It will be
        // used should "you" send the user an IM while they are away, or if their status is viewed
        // in another way (such as via the friends list [**not yet implemented**]).
        _friendUpdate: function(friend, status, statusMessage) {
            // add friend to buddylist, update their status, etc.           
            var status_name = 'available';
            $.each(this.statuses,
                function(key, val) { if(status == val) { status_name = key; return false; } });

            if(this.chats[friend]) {
                var tab = this.chats[friend].data('tab');
                var tab_class = 'imjs-tab';
                if(tab.data('state') == 'active') tab_class += ' imjs-selected';
                tab_class += ' imjs-' + status_name;
                
                tab.attr('class', tab_class);
                
                // display the status in the chatbox
                var date_stamp =
                    $('.imjs-tab.imjs-default .imjs-chatbox .imjs-msglog .imjs-date').clone();
                    
                var date_stamp_time = date_stamp.find('.imjs-msg-time');
                if(date_stamp_time.length)
                    date_stamp_time.html(AjaxIM.dateFormat(date_stamp_time.html()));
                
                var date_stamp_date = date_stamp.find('.imjs-date-date').html(
                    AjaxIM.i18n[
                        'chat' + status_name[0].toUpperCase() + status_name.slice(1)
                    ].replace(/%s/g, friend));
                
                var msglog = this.chats[friend].find('.imjs-msglog');
                date_stamp.appendTo(msglog);
                msglog[0].scrollTop = msglog[0].scrollHeight;
            }
            
            if(this.friends[friend]) {
                var friend_id = 'imjs-friend-' + $.md5(friend + this.friends[friend].group);
                $('#' + friend_id).attr('class', 'imjs-friend imjs-' + status_name);
                
                if(status == 0) {
                    $('#' + friend_id + ':visible').slideUp();
                    $('#' + friend_id + ':hidden').hide();
                } else if(!$('#' + friend_id + ':visible').length) {
                    $('#' + friend_id).slideDown();
                }
                
                this.friends[friend].status = [status, statusMessage];
                this._updateFriendCount();
            }
        },
        
        // === //private// {{{AjaxIM.}}}**{{{_notConnected()}}}** ===
        //
        // Puts the user into a visible state of disconnection. Sets the
        // friends list to "not connected" and empties it; disallows new messages
        // to be sent.
        _notConnected: function() {
            $('#imjs-friends').addClass('imjs-not-connected').unbind('click', this.activateTab);
        },
        
        // === {{{AjaxIM.}}}**{{{send(to, message)}}}** ===
        //
        // Sends a message to another user. The message will be added
        // to the chatbox before it is actually sent, however, if an
        // error occurs during sending, that will be indicated immediately
        // afterward.
        //
        // After sending the message, one of three status codes should be
        // returned as a JSON object, e.g. {{{{r: 'code'}}}}:
        // * {{{ok}}} &mdash; Message was sent successfully.
        // * {{{offline}}} &mdash; The user is offline or unavailable to
        // receive messages.
        // * {{{error}}} &mdash; a problem occurred, unrelated to the user
        // being unavailable.
        //
        // ==== Parameters ====
        // * {{{to}}} is the username of the recipient.
        // * {{{message}}} is the content to be sent.
        send: function(to, message) {         
            if(!message) return;
               
            if(this.chats[to]) { // REMOVE ME?
                // possibly add a datestamp
                var time = self._addDateStamp(this.chats[to]);
                this._storeNonMessage('datestamp', to, null, time);
                
                time = this._addMessage('a', this.chats[to], this.username, message);                
                this._storeMessage('a', this.chats[to], this.username, message, time);
            }
            
            $(self).trigger('sendingMessage', [to, message]);
            
            AjaxIM.request(
                this.actions.send,
                {'to': to, 'message': message},
                function(result) {
                    switch(result.r) {
                        case 'ok':
                            $(self).trigger('sendMessageSuccessful', [to, message]);
                        break;
                        
                        case 'offline':
                            $(self).trigger('sendMessageFailed', ['offline', to, message]);
                        break;
                        
                        case 'error':
                        default:
                            if(result.e == 'no session found') {
                                self._notConnected();
                                self._addError(self.chats[to], AjaxIM.i18n.notConnected);
                                self._storeNonMessage('error', to,
                                    AjaxIM.i18n.notConnected, (new Date()).getTime());
                            }
                            
                            $(self).trigger('sendMessageFailed', [result.e, to, message]);
                        break;
                    }
                },
                function(error) {
                    self._notConnected();
                    self._addError(self.chats[to], AjaxIM.i18n.notConnected);
                    self._storeNonMessage('error', to,
                        AjaxIM.i18n.notConnected, (new Date()).getTime());
                        
                    $(self).trigger('sendMessageFailed', ['not connected', to, message]);
                }
            );
        },
        
        // === {{{AjaxIM.}}}**{{{status(s, message)}}}** ===
        //
        // Sets the user's status and status message. It is possible to not
        // set a status message by setting it to an empty string. The status
        // will be sent to the server, where upon the server will broadcast
        // the update to all individuals with "you" on their friends list.
        //
        // ==== Parameters ====
        // * {{{s}}} is the status code, as defined by {{{AjaxIM.statuses}}}.
        // * {{{message}}} is the custom status message.
        status: function(s, message) {
            // update status icon(s)
            if(!this.statuses[s])
                return;
                
            $('#imjs-friends').attr('class', 'imjs-' + s);
            
            $(self).trigger('changingStatus', [s, message]);
            
            AjaxIM.request(
                this.actions.status,
                {'status': this.statuses[s], 'message': message},
                function(result) {
                    switch(result.r) {
                        case 'ok':
                            $(self).trigger('changeStatusSuccessful', [s, message]);
                        break;
                        
                        case 'error':
                        default:
                            $(self).trigger('changeStatusFailed', [result.e, s, message]);
                        break;
                    }
                },
                function(error) {
                    $(self).trigger('changeStatusFailed', ['not connected', s, message]);
                }
            );
        },
        
        // === {{{AjaxIM.}}}**{{{statuses}}}** ===
        //
        // These are the available status codes and their associated identities:
        // * {{{offline}}} (0) &mdash; Only used when signing out/when another
        // user has signed out, as once this status is set, the user is removed
        // from the server and friends will be unable to contact the user.
        // * {{{available}}} (1) &mdash; The user is online and ready to be messaged.
        // * {{{away}}} (2) &mdash; The user is online but is not available. Others
        // may still contact this user, however, the user may not respond. Anyone
        // contacting an away user will receive a notice stating that the user is away,
        // and (if one is set) their custom status message.
        // * {{{invisible}}} (3; **not yet implemented**) &mdash; The user is online,
        // but other users are made unaware, and the user will be represented
        // as being offline. It is still possible to contact this user, and for this
        // user to contact others; no status message or notice will be sent to others
        // messaging this user.
        statuses: {offline: 0, available: 1, away: 2, invisible: 3},
        
        // == Footer bar ==
        //
        // The footer bar is the bar that sits at the bottom of the page, in a fixed
        // position. It contains a tab for the friends list, and tabs for any open
        // chat boxes. It is also possible to add custom tabs for other functionality.
        bar: {
            // === {{{AjaxIM.}}}**{{{bar.initialize()}}}** ===
            //
            // Setup the footer bar and enable tab actions. This function
            // uses {{{jQuery.live}}} to set hooks on any bar tabs created
            // in the future.
            initialize: function() {
                // Set up your standard tab actions
                $('.imjs-tab')
                    .live('click', this.activateTab);
                    
                $('.imjs-tab .imjs-close')
                    .live('click', this.closeTab);
            
                // Set up the friends list actions
                var self = this;
                $(document).click(function(e) {
                    if(e.target.id == 'imjs-friends' ||
                        $(e.target).parents('#imjs-friends').length) {    
                        return;
                    }
                    
                    if($('#imjs-friends').data('state') == 'active')
                        self.activateTab.call($('#imjs-friends'));
                });
                $('#imjs-friends')
                    .data('state', 'minimized')
                    .click(function(e) {
                        if(!$(this).hasClass('imjs-not-connected') &&
                            e.target.id != 'imjs-friends-panel' &&
                            !$(e.target).parents('#imjs-friends-panel').length)
                            self.activateTab.call(this);
                    })
                    .mouseenter(function() {
                        if($(this).hasClass('imjs-not-connected')) {
                            $('.imjs-tooltip').css('display', 'block');
                            $('.imjs-tooltip p').html(AjaxIM.i18n.notConnectedTip);

                            var tip_left = $(this).offset().left -
                                $('.imjs-tooltip').outerWidth() +
                                ($(this).outerWidth() / 2);
                            var tip_top = $(this).offset().top -
                                $('.imjs-tooltip').outerHeight(true);

                            $('.imjs-tooltip').css({
                                    left: tip_left,
                                    top: tip_top
                                });
                        }
                    })
                    .mouseleave(function() {
                        if($(this).hasClass('imjs-not-connected')) {
                            $('.imjs-tooltip').css('display', '');
                        }
                    });
                $('#imjs-friends-panel')
                    .data('tab', $('#imjs-friends'))
                    .css('display', 'none');
            },
            
            // === {{{AjaxIM.}}}**{{{bar.activateTab()}}}** ===
            //
            // Activate a tab by setting it to the 'active' state and
            // showing any related chatbox. If a chatbox is available
            // for this tab, also focus the input box.
            //
            // //Note:// {{{this}}}, here, refers to the tab DOM element.
            activateTab: function() {
                var chatbox = $(this).find('.imjs-chatbox') || false;

                if($(this).data('state') != 'active') {
                    if($(this).attr('id') != 'imjs-friends') {
                        $('#imjs-bar > li')
                            .not($(this))
                            .not('#imjs-friends')
                            .removeClass('imjs-selected')
                            .each(function() {
                                if($(this).data('state') != 'closed') {
                                    $(this).data('state', 'minimized');
                                    var chatbox = $(this).find('.imjs-chatbox');
                                    if(chatbox.length)
                                        chatbox.css('display', 'none');
                                }
                            });
                    }
                    
                    if(chatbox && chatbox.css('display') == 'none')
                        chatbox.css('display', '');
                    
                    // set the tab to active...
                    var tab = $(this).addClass('imjs-selected').data('state', 'active');
                    
                    // ...and hide and reset the notification icon
                    tab.find('.imjs-notification').css('display', 'none')
                        .data('count', 0);
                    
                    if(self.settings.storageMethod && self.storageReady &&
                        chatbox && (username = chatbox.data('username'))) { 
                        $.jStore.store(self.storeKey + 'activeTab', [username]);
                    }
                    
                    $(self).trigger('tabToggled', ['activated', tab]);
                } else {
                    var tab = $(this).removeClass('imjs-selected').data('state', 'minimized');
                    
                    if(chatbox && chatbox.css('display') != 'none')
                        chatbox.css('display', 'none');
                    
                    if(self.settings.storageMethod && self.storageReady) { 
                        $.jStore.store(self.storeKey + 'activeTab', ['*']);
                    }
                    
                    $(self).trigger('tabToggled', ['minimized', tab]);
                }
                
                if(chatbox) {
                    if(!(input = chatbox.find('.imjs-input')).data('height')) {
                        // store the height for resizing later
                        input.data('height', input.height());
                    }
                    
                    try {
                        var msglog = chatbox.find('.imjs-msglog');
                        msglog[0].scrollTop = msglog[0].scrollHeight;
                    } catch(e) {}
                    
                    try { chatbox.find('.imjs-input').focus(); } catch(e) {}
                }
            },
            
            // === {{{AjaxIM.}}}**{{{bar.closeTab()}}}** ===
            //
            // Close a tab and hide any related chatbox, such that
            // the chatbox can not be reopened without reinitializing
            // the tab.
            //
            // //Note:// {{{this}}}, here, refers to the tab DOM element.
            closeTab: function() {
                var tab = $(this).parents('.imjs-tab');
                tab.css('display', 'none').data('state', 'closed');

                if(self.settings.storageMethod && self.storageReady) {
                    delete self.chatstore[tab.find('.imjs-chatbox').data('username')];
                    if(self.storageReady) $.jStore.store(self.storeKey + 'chats', self.chatstore);
                }

                $(self).trigger('tabToggled', ['closed', tab]);

                self.bar._scrollers();

                return false;
            },
            
            // === {{{AjaxIM.}}}**{{{bar.addTab(label, action, closable)}}}** ===
            //
            // Adds a tab to the tab bar, with the label {{{label}}}. When
            // clicked, it will call a callback function, {{{action}}}. If
            // {{{action}}} is a string, it is assumed that the string is
            // referring to a chatbox ID.
            //
            // ==== Parameters ====
            // * {{{label}}} is the text that will be displayed on the tab.\\
            // * {{{action}}} is the callback function, if it is a non-chatbox
            // tab, or a string if it //is// a chatbox tab.\\
            // * {{{closable}}} is a boolean value that determines whether or not
            // it is possible for a user to close this tab.
            //
            // //Note:// New tabs are given an automatically generated ID
            // in the format of {{{#imjs-tab-[md5 of label]}}}.
            addTab: function(label, action, closable) {
                var tab = $('.imjs-tab.imjs-default').clone().insertAfter('#imjs-scroll-right');
                tab.removeClass('imjs-default')
                    .attr('id', 'imjs-tab-' + $.md5(label))
                    .html(tab.html().replace('{label}', label))
                    .data('state', 'minimized');
                    
                var notification = tab.find('.imjs-notification');
                notification.css('display', 'none')
                    .data('count', 0)
                    .data('default-text', notification.html())
                    .html(notification.html().replace('{count}', '0'));
                
                if(closable === false)
                    tab.find('.imjs-close').eq(0).remove();
                
                if(typeof action == 'string') {
                    //tab.data('chatbox', action);
                } else {
                    tab.find('.imjs-chatbox').remove();
                    tab.click(action);
                }
                
                return tab;
            },
            
            // === {{{AjaxIM.}}}**{{{bar.notification(tab)}}}** ===
            //
            // Displays a notification on a tab. Generally, this is called when
            // a tab is minimized to let the user know that there is an update
            // for them. The way the notification is displayed depends on the
            // theme CSS.
            //
            // ==== Parameters ====
            // * {{{tab}}} is the jQuery-selected tab DOM element.
            notification: function(tab) {
                var notify = tab.find('.imjs-notification');
                var notify_count = notify.data('count') + 1;
                
                notify.data('count', notify_count)
                    .html(notify.data('default-text').replace('{count}', notify_count))
                    .css('display', '');
            },
            
            // === //private// {{{AjaxIM.}}}**{{{bar._scrollers()}}}** ===
            //
            // Document me!
            _scrollers: function() {
                var needScrollers = false;
                $('.imjs-tab').filter(function() {
                    return $(this).data('state') != 'closed'
                }).css('display', '');
                
                $.each(self.chats, function(username, chatbox) {
                    var tab = chatbox.data('tab');
                    if(tab.data('state') == 'closed') return true;
                    
                    if(tab.position().top > $('#imjs-bar').height()) {
                        $('.imjs-scroll').css('display', '');
                        tab.css('display', 'none');
                        needScrollers = true;
                    } else {
                        tab.css('display', '');
                    }
                });
                
                if(!needScrollers) {
                    $('.imjs-scroll').css('display', 'none');
                }
                
                if($('#imjs-scroll-left').css('display') != 'none' &&
                    $('#imjs-scroll-left').position().top > $('#imjs-bar').height()) {
                    $('#imjs-bar li.imjs-tab:visible').slice(-1).css('display', 'none');
                }
                
                var hiddenLeft = $('#imjs-bar li.imjs-tab:visible').slice(-1)
                    .nextAll('#imjs-bar li.imjs-tab:hidden')
                    .not('.imjs-default')
                    .filter(function() {
                        return $(this).data('state') != 'closed'
                    }).length;
                    
                var hiddenRight = $('#imjs-bar li.imjs-tab:visible').eq(0)
                    .prevAll('#imjs-bar li.imjs-tab:hidden')
                    .not('.imjs-default')
                    .filter(function() {
                        return $(this).data('state') != 'closed'
                    }).length;
                    
                $('#imjs-scroll-left').html(hiddenLeft);
                $('#imjs-scroll-right').html(hiddenRight);
            }
        },
        
        // == Comet ==
        //
        // Comet, or HTTP streaming, holds open a connection between the client and
        // the server indefinitely. As the server receives new messages or events,
        // they are passed down to the client in a {{{&lt;script&gt;}}}
        // tag which calls the {{{AjaxIM.incoming()}}} function. The connection is
        // opened using either an {{{iframe}}} (in Opera or Internet Explorer) or
        // an {{{XMLHTTPRequest}}} object. Due to the extra flexibility necessary
        // with the {{{XMLHTTPRequest}}} object, jQuery's {{{$.ajax}}} is not used.
        comet: {
            type: '',
            obj: null,
        
            onbeforeunload: null,
            onreadystatechange: null,
            
            iframe: function() {                
                if(/loaded|complete/i.test(this.obj.readyState))
                    throw new Error("IM server not available!");
            },

            // === {{{AjaxIM.}}}**{{{comet.connect()}}}** ===
            //
            // Creates and initializes the object and connection between the server
            // and the client. For Internet Explorer and Opera, we use an
            // {{{&lt;iframe&gt;}}} element; for all other browsers, we create an
            // {{{XMLHTTPRequest}}} object. The server connects to the URI defined
            // as the "poll" action. This function is called automatically, when
            // the IM engine is initialized and the {{{AjaxIM.poll()}}} function
            // is called.
            connect: function() {
                var self = _instance;
                
                if($.browser.opera || $.browser.msie) {
                    var iframe = $('<iframe></iframe>');
                    with(iframe) {
                        css({
                            position: 'absolute',
                            visibility: 'visible',
                            display: 'block',
                            left: '-10000px',
                            top: '-10000px',
                            width: '1px',
                            height: '1px'
                        });
                        
                        attr('src', self.actions.poll[1]);
                        appendTo('body');
                        
                        bind('readystatechange',
                            self.comet.onreadystatechange = function() { self.comet.iframe() });
                        bind('beforeunload',
                            self.comet.onbeforeunload = function() { self.comet.disconnect() });
                    }
                    
                    self.comet.type = 'iframe';
                    self.comet.obj = iframe;
                } else {
                    var xhr = new XMLHttpRequest;
                    var length = 1029;
                    var code = /^\s*<script[^>]*>parent\.(.+);<\/script><br\s*\/>$/;
                    
                    xhr.open('get', self.actions.poll[1], true);
                    xhr.onreadystatechange = function(){
                        if(xhr.readyState > 2) {
                            if(xhr.status == 200) {
                                responseText = xhr.responseText.substring(length);
                                length = xhr.responseText.length;
                                if(responseText != ' ') 
                                    eval(responseText.replace(code, "$1"));
                            }
                            // We need an "else" here. If the state changes to
                            // "loaded", the user needs to know they're
                            // disconnected.
                        }
                    };
                    
                    self.comet.type = 'xhr';
                    self.comet.obj = xhr;
                    
                    addEventListener('beforeunload',
                        self.comet.beforeunload = function() { self.comet.disconnect(); }, false);
                    setTimeout(function() { xhr.send(null) }, 10);
                }
            },

            // === {{{AjaxIM.}}}**{{{comet.disconnect()}}}** ===
            //
            // Disconnect from the server and destroy the connection object. This
            // function is called before the page unloads, so that we plug up and
            // potential leaks and free memory.
            disconnect: function() {
                var self = _instance.comet;
                
                if(!this.type || !this.obj)
                    return;
                
                if(this.type == 'iframe') {
                    detachEvent('onreadystatechange', this.onreadystatechange);
                    detachEvent('onbeforeunload', this.onbeforeunload);
                    this.obj.src = '.';
                    $(this.obj).remove();
                } else {
                    removeEventListener('beforeunload', this.onbeforeunload, false);
                    this.obj.onreadystatechange = function(){};
                    this.obj.abort();
                }
                
                delete this.obj;
            }
        }
    })
        
    self.bar.initialize();
    
    if(prequeue.length) {
        $.each(prequeue, function() {
            var func = this[0].split('.');
            if(func.length > 1)
                self[func[0]][func[1]].apply(self, this[1]);
            else
                self[func[0]].apply(self, this[1]);
        });
    }
    });
    
    // == Static functions and variables ==
    //
    // The following functions and variables are available outside of an initialized
    // {{{AjaxIM}}} object.
    
    // === {{{AjaxIM.}}}**{{{client}}}** ===
    //
    // Once {{{AjaxIM.init()}}} is called, this will be set to the active AjaxIM
    // object. Only one AjaxIM object instance can exist at a time. This variable
    // can and should be accessed directly.
    AjaxIM.client = null;
    
    // === {{{AjaxIM.}}}**{{{init(options, actions)}}}** ===
    //
    // Initialize the AjaxIM client object and engine. Here, you can define your
    // options and actions as outlined at the top of this documentation.
    //
    // ==== Parameters ====
    // * {{{options}}} is the hash of custom settings to initialize Ajax IM with.
    // * {{{actions}}} is the hash of any custom action URLs.
    AjaxIM.init = function(options, actions) {
        if(!_instance) {
            _instance = new AjaxIM(options, actions);
            AjaxIM.client = _instance;
        }
        
        return _instance;
    }
    
    
    // === {{{AjaxIM.}}}**{{{request(url, data, successFunc, failureFunc)}}}** ===
    //
    // Wrapper around {{{$.jsonp}}}, the JSON-P library for jQuery, and {{{$.ajax}}},
    // jQuery's ajax library. Allows either function to be called, automatically,
    // depending on the request's URL array (see {{{AjaxIM.actions}}}).
    //
    // ==== Parameters ====
    // {{{url}}} is the URL of the request.
    // {{{data}}} are any arguments that go along with the request.
    // {{{success}}} is a callback function called when a request has completed
    // without issue.
    // {{{_ignore_}}} is simply to provide compatability with {{{$.post}}}.
    // {{{failure}}} is a callback function called when a request hasn't not
    // completed successfully.
    AjaxIM.request = function(url, data, successFunc, failureFunc) {
        if(typeof failureFunc != 'function');
            failureFunc = function(){};

        $[url[0]]({
            'url': url[1],
            'data': data,
            dataType: (url[0] == 'ajax' ? 'json' : 'jsonp'),
            type: 'POST',
            cache: false,
            timeout: 60000,
            callback: 'jsonp' + (new Date()).getTime(),
            success: function(json, textStatus) {
                successFunc(json);
            },
            error: function(xOptions, error) {
                failureFunc(error);
            }
        });
        
        // This prevents Firefox from spinning indefinitely
        // while it waits for a response. Why? Fuck if I know.
        if(url[0] == 'jsonp' && $.browser.mozilla) {
            $.jsonp({
                'url': 'about:',
                timeout: 0
            });
        }
    };
    
    // === {{{AjaxIM.}}}**{{{incoming(data)}}}** ===
    //
    // Never call this directly. It is used as a connecting function between
    // client and server for Comet.
    //
    // //Note:// There are two {{{AjaxIM.incoming()}}} functions. This one is a
    // static function called outside of the initialized AjaxIM object; the other
    // is only called within the initalized AjaxIM object.
    AjaxIM.incoming = function(data) {
        if(!_instance)
            return false;
        
        if(data.length)
            _instance._parseMessages(data);
    }
    
    // === {{{AjaxIM.}}}**{{{loaded}}}** ===
    //
    // If Ajax IM has been loaded with the im.load.js file, this function will be
    // called when the library is finally loaded and ready for use. Similar to
    // jQuery's $(document).ready(), but for Ajax IM.
    AjaxIM.loaded = function() {
        if(typeof AjaxIMLoadedFunction == 'function') {
            AjaxIMLoadedFunction();
            delete AjaxIMLoadedFunction; // clean up the global namespace
        }
    };
    
    // === {{{AjaxIM.}}}**{{{dateFormat([date,] [mask,] utc)}}}** ===
    //
    // Date Format 1.2.3\\
    // &copy; 2007-2009 Steven Levithan ([[http://blog.stevenlevithan.com/archives/date-time-format|stevenlevithan.com]])\\
    // MIT license
    //
    // Includes enhancements by Scott Trenda
    // and Kris Kowal ([[http://cixar.com/~kris.kowal/|cixar.com/~kris.kowal/]])
    //
    // Accepts a date, a mask, or a date and a mask and returns a formatted version
    // of the given date.
    //
    // ==== Parameters ====
    // * {{{date}}} is a {{{Date()}}} object. If not specified, the date defaults to the
    // current date/time.
    // * {{{mask}}} is a string that defines the formatting of the date. Formatting
    // options can be found in the
    // [[http://blog.stevenlevithan.com/archives/date-time-format|Date Format]]
    // documentation. If not specified, the mask defaults to {{{dateFormat.masks.default}}}.
    
    AjaxIM.dateFormat = function () {
        var token = /d{1,4}|m{1,4}|yy(?:yy)?|([HhMsTt])\1?|[LloSZ]|"[^"]*"|'[^']*'/g,
            timezone = new RegExp('\b(?:[PMCEA][SDP]T|(?:Pacific|Mountain|Central|Eastern|Atlantic) ' +
                                  '(?:Standard|Daylight|Prevailing) Time|(?:GMT|UTC)(?:[-+]\d{4})?)\b',
                                  'g'),
            timezoneClip = /[^-+\dA-Z]/g,
            pad = function (val, len) {
                val = String(val);
                len = len || 2;
                while (val.length < len) val = "0" + val;
                return val;
            };
    
        // Regexes and supporting functions are cached through closure
        return function (date, mask, utc) {
            var dF = AjaxIM.dateFormat;
    
            // You can't provide utc if you skip other args (use the "UTC:" mask prefix)
            if (arguments.length == 1 && Object.prototype.toString.call(date) ==
                  "[object String]" && !/\d/.test(date)) {
                mask = date;
                date = undefined;
            }
    
            // Passing date through Date applies Date.parse, if necessary
            date = date ? new Date(date) : new Date;
            if (isNaN(date)) throw SyntaxError("invalid date");
    
            mask = String(dF.masks[mask] || mask || dF.masks["default"]);
    
            // Allow setting the utc argument via the mask
            if (mask.slice(0, 4) == "UTC:") {
                mask = mask.slice(4);
                utc = true;
            }
    
            var _ = utc ? "getUTC" : "get",
                d = date[_ + "Date"](),
                D = date[_ + "Day"](),
                m = date[_ + "Month"](),
                y = date[_ + "FullYear"](),
                H = date[_ + "Hours"](),
                M = date[_ + "Minutes"](),
                s = date[_ + "Seconds"](),
                L = date[_ + "Milliseconds"](),
                o = utc ? 0 : date.getTimezoneOffset(),
                flags = {
                    d:    d,
                    dd:   pad(d),
                    ddd:  AjaxIM.i18n.dayNames[D],
                    dddd: AjaxIM.i18n.dayNames[D + 7],
                    m:    m + 1,
                    mm:   pad(m + 1),
                    mmm:  AjaxIM.i18n.monthNames[m],
                    mmmm: AjaxIM.i18n.monthNames[m + 12],
                    yy:   String(y).slice(2),
                    yyyy: y,
                    h:    H % 12 || 12,
                    hh:   pad(H % 12 || 12),
                    H:    H,
                    HH:   pad(H),
                    M:    M,
                    MM:   pad(M),
                    s:    s,
                    ss:   pad(s),
                    l:    pad(L, 3),
                    L:    pad(L > 99 ? Math.round(L / 10) : L),
                    t:    H < 12 ? "a"  : "p",
                    tt:   H < 12 ? "am" : "pm",
                    T:    H < 12 ? "A"  : "P",
                    TT:   H < 12 ? "AM" : "PM",
                    Z:    utc ? "UTC" :
                            (String(date).match(timezone) || [""])
                            .pop().replace(timezoneClip, ""),
                    o:    (o > 0 ? "-" : "+") +
                            pad(Math.floor(Math.abs(o) / 60) * 100 + Math.abs(o) % 60, 4),
                    S:    ["th", "st", "nd", "rd"][d % 10 > 3 ?
                            0 :
                            (d % 100 - d % 10 != 10) * d % 10]
                };
    
            return mask.replace(token, function ($0) {
                return $0 in flags ? flags[$0] : $0.slice(1, $0.length - 1);
            });
        };
    }();
    
    // Some common format strings
    AjaxIM.dateFormat.masks = {
        "default":      "ddd mmm dd yyyy HH:MM:ss",
        shortDate:      "m/d/yy",
        mediumDate:     "mmm d, yyyy",
        longDate:       "mmmm d, yyyy",
        fullDate:       "dddd, mmmm d, yyyy",
        shortTime:      "h:MM TT",
        mediumTime:     "h:MM:ss TT",
        longTime:       "h:MM:ss TT Z",
        isoDate:        "yyyy-mm-dd",
        isoTime:        "HH:MM:ss",
        isoDateTime:    "yyyy-mm-dd'T'HH:MM:ss",
        isoUtcDateTime: "UTC:yyyy-mm-dd'T'HH:MM:ss'Z'"
    };

    // === {{{AjaxIM.}}}**{{{i18n}}}** ===
    //
    // Text strings used by Ajax IM. Should you want to translate Ajax IM into
    // another language, merely change these strings.
    // 
    // {{{%s}}} denotes text that will be automatically replaced when the string is
    // used.
    AjaxIM.i18n = {
        dayNames: [
            "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat",
            "Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"
        ],
        monthNames: [
            "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec",
            "January", "February", "March", "April", "May", "June", "July", "August", "September",
            "October", "November", "December"
        ],
        
        chatOffline: '%s signed off.',
        chatAvailable: '%s became available.',
        chatAway: '%s went away.',
        
        notConnected: 'You are currently not connected or the server is not available. ' +
                      'Please ensure that you are signed in and try again.',
        notConnectedTip: 'You are currently not connected.',
        
        authInvalid: 'Invalid username or password.',
        
        registerPasswordLength: 'Passwords must be more than 4 characters in length.',
        registerUsernameLength: 'Usernames must be more than 2 characters in length and ' +
                        ' contain only A-Z, a-z, 0-9, underscores (_) and periods (.).',
        registerPasswordMatch: 'Entered passwords do not match.',
        registerUsernameTaken: 'The chosen username is already in use; please choose another.',
        registerUnknown: 'An unknown error occurred. Please try again.'
    }
})(jQuery, false);
\ No newline at end of file

From 24a68e40614ba23728e33864991bcb759e75d53d Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Sun, 10 Apr 2011 01:07:27 +0200
Subject: [PATCH 103/331] minor logging improvement

bzr revid: al@openerp.com-20110409230727-dl78pjg6wvoo7g3e
---
 addons/base/static/src/js/base.js   |   4 +
 addons/base/static/src/js/chrome.js | 114 ++++++++++++++++++----------
 2 files changed, 80 insertions(+), 38 deletions(-)

diff --git a/addons/base/static/src/js/base.js b/addons/base/static/src/js/base.js
index 8f9921ceeae..675476879cf 100644
--- a/addons/base/static/src/js/base.js
+++ b/addons/base/static/src/js/base.js
@@ -76,6 +76,10 @@
 
     /** @lends openerp */
     var openerp = this.openerp =  {
+        /**
+         * Debug flag turns on logging
+         */
+        debug: true,
         // element_ids registry linked to all controllers on the page
         // TODO rename to elements, or keep gtk naming?
         screen: {},
diff --git a/addons/base/static/src/js/chrome.js b/addons/base/static/src/js/chrome.js
index cdfa1f4d192..67d829c2e54 100644
--- a/addons/base/static/src/js/chrome.js
+++ b/addons/base/static/src/js/chrome.js
@@ -193,8 +193,6 @@ openerp.base.BasicController = Class.extend( /** @lends openerp.base.BasicContro
         // try to call deferred methods on this return value.
         return $.Deferred().done().promise();
     },
-    on_ready: function() {
-    },
     stop: function() {
     },
     log: function() {
@@ -206,20 +204,60 @@ openerp.base.BasicController = Class.extend( /** @lends openerp.base.BasicContro
         this.on_log.apply(this,args);
     },
     on_log: function() {
-        if(true || window.openerp.debug || (window.location.search.indexOf('?debug') !== -1)) {
+        if(window.openerp.debug || (window.location.search.indexOf('?debug') !== -1)) {
+            var notify = false;
+            var body = false;
             if(window.console) {
                 console.log(arguments);
             } else {
-                $.each(arguments, function(i,v) {
-                    v = v==null ? "null" : v;
-                    $('<pre></pre>').text(v.toString()).appendTo($('body'));
-                });
+                body = true;
+            }
+            var a = Array.prototype.slice.call(arguments, 0);
+            for(var i = 0; i < a.length; i++) {
+                var v = a[i]==null ? "null" : a[i].toString();
+                if(i==0) {
+                    notify = v.match(/^not/);
+                    body = v.match(/^bod/);
+                }
+                if(body) {
+                    $('<pre></pre>').text(v).appendTo($('body'));
+                }
+                if(notify && this.notification) {
+                    this.notification.notify("Logging:",v);
+                }
             }
         }
 
     }
 });
 
+openerp.base.Notification =  openerp.base.BasicController.extend({
+    init: function(element_id) {
+        this._super(element_id);
+        this.$element.notify({
+            speed: 500,
+            expires: 1500
+        });
+    },
+    notify: function(title, text) {
+        this.$element.notify('create', {
+            title: title,
+            text: text
+        });
+    },
+    // TODO remove to avoid default as attribute
+    'default': function(title, text) {
+        this.notify(title,text);
+    },
+    // TODO change into warn to avoid alert
+    alert: function(title, text) {
+        this.$element.notify('create', 'oe_notification_alert', {
+            title: title,
+            text: text
+        });
+    }
+});
+
 openerp.base.Session = openerp.base.BasicController.extend( /** @lends openerp.base.Session# */{
     /**
      * @constructs
@@ -447,17 +485,40 @@ openerp.base.Session = openerp.base.BasicController.extend( /** @lends openerp.b
 });
 
 openerp.base.Controller = openerp.base.BasicController.extend( /** @lends openerp.base.Controller# */{
+    /**
+     * Controller manifest used to declare standard controller attributes
+     */
+    controller_manifest: {
+        register: [ "FormView.widget.char" ],
+        template: "",
+        elementpost: false,
+    },
     /**
      * @constructs
      * @extends openerp.base.BasicController
      */
-    init: function(session, element_id) {
+    init: function(parent_or_session, element_id) {
         this._super(element_id);
-        this.session = session;
+        // TODO migrate for backward compat
+        if(parent_or_session) {
+            if(parent_or_session.session) {
+                this.parent = parent_or_session;
+            } else {
+                this.session = parent_or_session;
+            }
+
+        }
     },
-    on_log: function() {
-        if(this.session)
-            this.session.log.apply(this.session,arguments);
+    /**
+     * Controller registry, 
+     */
+    controller_registry: {
+    },
+    /**
+     * Add a new child controller
+     */
+    controller_add: function(key,element_id) {
+        var obj = "";
     },
     /**
      * Performs a JSON-RPC call
@@ -495,10 +556,6 @@ openerp.base.CrashManager = openerp.base.Controller.extend({
     }
 });
 
-openerp.base.Database = openerp.base.Controller.extend({
-// Non Session Controller to manage databases
-});
-
 openerp.base.Loading =  openerp.base.Controller.extend({
     init: function(session, element_id) {
         this._super(session, element_id);
@@ -518,26 +575,7 @@ openerp.base.Loading =  openerp.base.Controller.extend({
     }
 });
 
-openerp.base.Notification =  openerp.base.Controller.extend({
-    init: function(session, element_id) {
-        this._super(session, element_id);
-        this.$element.notify({
-            speed: 500,
-            expires: 1500
-        });
-    },
-    'default': function(title, text) {
-        this.$element.notify('create', {
-            title: title,
-            text: text
-        });
-    },
-    alert: function(title, text) {
-        this.$element.notify('create', 'oe_notification_alert', {
-            title: title,
-            text: text
-        });
-    }
+openerp.base.Database = openerp.base.Controller.extend({
 });
 
 openerp.base.Login =  openerp.base.Controller.extend({
@@ -630,7 +668,6 @@ openerp.base.Menu =  openerp.base.Controller.extend({
         });
 
         this.$element.add(this.$secondary_menu).find("a").click(this.on_menu_click);
-        this.on_ready();
     },
     on_menu_click: function(ev, id) {
         id = id || 0;
@@ -703,7 +740,7 @@ openerp.base.WebClient = openerp.base.Controller.extend({
         this.crashmanager =  new openerp.base.CrashManager(this.session);
 
         // Do you autorize this ?
-        openerp.base.Controller.prototype.notification = new openerp.base.Notification(this.session, "oe_notification");
+        openerp.base.Controller.prototype.notification = new openerp.base.Notification("oe_notification");
 
         this.header = new openerp.base.Header(this.session, "oe_header");
         this.login = new openerp.base.Login(this.session, "oe_login");
@@ -739,6 +776,7 @@ openerp.base.webclient = function(element_id) {
     client.start();
     return client;
 };
+
 };
 
 // vim:et fdc=0 fdl=0 foldnestmax=3 fdm=syntax:

From a2c60d598c1faa09edaa0d53f362e21732fab6ab Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Sun, 10 Apr 2011 02:12:22 +0200
Subject: [PATCH 104/331] controller rework based on niv widget and xmo
 registry part1

bzr revid: al@openerp.com-20110410001222-pxar6n4szuy1zvzv
---
 addons/base/static/src/js/chrome.js | 190 +++++++++++++++++++++++++---
 addons/base/static/src/js/views.js  |  92 --------------
 2 files changed, 170 insertions(+), 112 deletions(-)

diff --git a/addons/base/static/src/js/chrome.js b/addons/base/static/src/js/chrome.js
index 67d829c2e54..b26dccffb2e 100644
--- a/addons/base/static/src/js/chrome.js
+++ b/addons/base/static/src/js/chrome.js
@@ -484,30 +484,17 @@ openerp.base.Session = openerp.base.BasicController.extend( /** @lends openerp.b
     }
 });
 
+// A controller takes an already existing element
+// new()
+// start()
 openerp.base.Controller = openerp.base.BasicController.extend( /** @lends openerp.base.Controller# */{
     /**
      * Controller manifest used to declare standard controller attributes
      */
     controller_manifest: {
-        register: [ "FormView.widget.char" ],
+        register: null,
         template: "",
-        elementpost: false,
-    },
-    /**
-     * @constructs
-     * @extends openerp.base.BasicController
-     */
-    init: function(parent_or_session, element_id) {
-        this._super(element_id);
-        // TODO migrate for backward compat
-        if(parent_or_session) {
-            if(parent_or_session.session) {
-                this.parent = parent_or_session;
-            } else {
-                this.session = parent_or_session;
-            }
-
-        }
+        element_post_prefix: false,
     },
     /**
      * Controller registry, 
@@ -517,8 +504,69 @@ openerp.base.Controller = openerp.base.BasicController.extend( /** @lends opener
     /**
      * Add a new child controller
      */
-    controller_add: function(key,element_id) {
-        var obj = "";
+    controller_get: function(key) {
+        return this.controller_registry[key];
+        // OR should contrustct it ? setting parent correctly ?
+        // function construct(constructor, args) {
+        //     function F() {
+        //         return constructor.apply(this, args);
+        //     }
+        //     F.prototype = constructor.prototype;
+        //     return new F();
+        // }
+        // var obj = this.controller_registry[key];
+        // if(obj) {
+        //     return construct(obj, Array.prototype.slice.call(arguments, 1));
+        // }
+    },
+    controller_new: function(key) {
+        var self;
+        // OR should contrustct it ? setting parent correctly ?
+        function construct(constructor, args) {
+            function F() {
+                return constructor.apply(this, args);
+            }
+            F.prototype = constructor.prototype;
+            return new F();
+        }
+        var obj = this.controller_registry[key];
+        if(obj) {
+            // TODO Prepend parent
+            return construct(obj, Array.prototype.slice.call(arguments, 1));
+        }
+    },
+    /**
+     * @constructs
+     * @extends openerp.base.BasicController
+     */
+    init: function(parent_or_session, element_id) {
+        this._super(element_id);
+        this.controller_parent = null;
+        this.controller_children = [];
+        if(parent_or_session) {
+            if(parent_or_session.session) {
+                this.parent = parent_or_session;
+                this.session = this.parent.session;
+                if(this.parent.children) {
+                    this.parent.children.push(this);
+                }
+            } else {
+                // TODO remove Backward compatilbility
+                this.session = parent_or_session;
+            }
+        }
+        // Apply manifest options
+        if(this.controller_manifest) {
+            var register = this.controller_manifest.register;
+            // TODO accept a simple string
+            if(register) {
+                for(var i=0; i<register.length; i++) {
+                    this.controller_registry[register[i]] = this;
+                }
+            }
+            // TODO if post prefix
+            //this.element_id = _.uniqueId(_.toArray(arguments).join('_'));
+        };
     },
     /**
      * Performs a JSON-RPC call
@@ -535,6 +583,105 @@ openerp.base.Controller = openerp.base.BasicController.extend( /** @lends opener
     }
 });
 
+// A widget is a controller that doesnt take an element_id
+// it render its own html that you should insert into the dom
+// and bind it a start()
+//
+// new()
+// render() and insert it place it where you want
+// start()
+openerp.base.BaseWidget = openerp.base.Controller.extend({
+    /**
+     * The name of the QWeb template that will be used for rendering. Must be
+     * redefined in subclasses or the render() method can not be used.
+     * 
+     * @type string
+     */
+    template: null,
+    /**
+     * The prefix used to generate an id automatically. Should be redefined in
+     * subclasses. If it is not defined, a default identifier will be used.
+     * 
+     * @type string
+     */
+    identifier_prefix: 'generic-identifier',
+    /**
+     * Base class for widgets. Handle rendering (based on a QWeb template),
+     * identifier generation, parenting and destruction of the widget.
+     * Also initialize the identifier.
+     *
+     * @constructs
+     * @params {openerp.base.search.BaseWidget} parent The parent widget.
+     */
+    init: function (parent, session) {
+        this._super(session);
+        this.children = [];
+        this.parent = null;
+        this.set_parent(parent);
+        this.make_id(this.identifier_prefix);
+    },
+    /**
+     * Sets and returns a globally unique identifier for the widget.
+     *
+     * If a prefix is appended, the identifier will be appended to it.
+     *
+     * @params sections prefix sections, empty/falsy sections will be removed
+     */
+    make_id: function () {
+        this.element_id = _.uniqueId(_.toArray(arguments).join('_'));
+        return this.element_id;
+    },
+    /**
+     * "Starts" the widgets. Called at the end of the rendering, this allows
+     * to get a jQuery object referring to the DOM ($element attribute).
+     */
+    start: function () {
+        this._super();
+        var tmp = document.getElementById(this.element_id);
+        this.$element = tmp ? $(tmp) : null;
+    },
+    /**
+     * "Stops" the widgets. Called when the view destroys itself, this
+     * lets the widgets clean up after themselves.
+     */
+    stop: function () {
+        var tmp_children = this.children;
+        this.children = [];
+        _.each(tmp_children, function(x) {
+            x.stop();
+        });
+        if(this.$element != null) {
+            this.$element.remove();
+        }
+        this.set_parent(null);
+        this._super();
+    },
+    /**
+     * Set the parent of this component, also un-register the previous parent
+     * if there was one.
+     * 
+     * @param {openerp.base.BaseWidget} parent The new parent.
+     */
+    set_parent: function(parent) {
+        if(this.parent) {
+            this.parent.children = _.without(this.parent.children, this);
+        }
+        this.parent = parent;
+        if(this.parent) {
+            parent.children.push(this);
+        }
+    },
+    /**
+     * Render the widget. This.template must be defined.
+     * The content of the current object is passed as context to the template.
+     * 
+     * @param {object} additional Additional context arguments to pass to the template.
+     */
+    render: function (additional) {
+        return QWeb.render(this.template, _.extend({}, this, additional != null ? additional : {}));
+    }
+});
+
 openerp.base.CrashManager = openerp.base.Controller.extend({
     init: function(session, element_id) {
         this._super(session, element_id);
@@ -557,6 +704,9 @@ openerp.base.CrashManager = openerp.base.Controller.extend({
 });
 
 openerp.base.Loading =  openerp.base.Controller.extend({
+    controller_manifest: {
+        register: ["Loading"],
+    },
     init: function(session, element_id) {
         this._super(session, element_id);
         this.count = 0;
diff --git a/addons/base/static/src/js/views.js b/addons/base/static/src/js/views.js
index 747a35dedbc..1e3851c218f 100644
--- a/addons/base/static/src/js/views.js
+++ b/addons/base/static/src/js/views.js
@@ -178,98 +178,6 @@ openerp.base.ViewManagerAction = openerp.base.ViewManager.extend({
     }
 });
 
-openerp.base.BaseWidget = openerp.base.Controller.extend({
-    /**
-     * The name of the QWeb template that will be used for rendering. Must be
-     * redefined in subclasses or the render() method can not be used.
-     * 
-     * @type string
-     */
-    template: null,
-    /**
-     * The prefix used to generate an id automatically. Should be redefined in
-     * subclasses. If it is not defined, a default identifier will be used.
-     * 
-     * @type string
-     */
-    identifier_prefix: 'generic-identifier',
-    /**
-     * Base class for widgets. Handle rendering (based on a QWeb template),
-     * identifier generation, parenting and destruction of the widget.
-     * Also initialize the identifier.
-     *
-     * @constructs
-     * @params {openerp.base.search.BaseWidget} parent The parent widget.
-     */
-    init: function (parent, session) {
-        this._super(session);
-        this.children = [];
-        this.parent = null;
-        this.set_parent(parent);
-        this.make_id(this.identifier_prefix);
-    },
-    /**
-     * Sets and returns a globally unique identifier for the widget.
-     *
-     * If a prefix is appended, the identifier will be appended to it.
-     *
-     * @params sections prefix sections, empty/falsy sections will be removed
-     */
-    make_id: function () {
-        this.element_id = _.uniqueId(_.toArray(arguments).join('_'));
-        return this.element_id;
-    },
-    /**
-     * "Starts" the widgets. Called at the end of the rendering, this allows
-     * to get a jQuery object referring to the DOM ($element attribute).
-     */
-    start: function () {
-        this._super();
-        var tmp = document.getElementById(this.element_id);
-        this.$element = tmp ? $(tmp) : null;
-    },
-    /**
-     * "Stops" the widgets. Called when the view destroys itself, this
-     * lets the widgets clean up after themselves.
-     */
-    stop: function () {
-        var tmp_children = this.children;
-        this.children = [];
-        _.each(tmp_children, function(x) {
-            x.stop();
-        });
-        if(this.$element != null) {
-            this.$element.remove();
-        }
-        this.set_parent(null);
-        this._super();
-    },
-    /**
-     * Set the parent of this component, also un-register the previous parent
-     * if there was one.
-     * 
-     * @param {openerp.base.BaseWidget} parent The new parent.
-     */
-    set_parent: function(parent) {
-        if(this.parent) {
-            this.parent.children = _.without(this.parent.children, this);
-        }
-        this.parent = parent;
-        if(this.parent) {
-            parent.children.push(this);
-        }
-    },
-    /**
-     * Render the widget. This.template must be defined.
-     * The content of the current object is passed as context to the template.
-     * 
-     * @param {object} additional Additional context arguments to pass to the template.
-     */
-    render: function (additional) {
-        return QWeb.render(this.template, _.extend({}, this, additional != null ? additional : {}));
-    }
-});
-
 openerp.base.Sidebar = openerp.base.BaseWidget.extend({
     template: "ViewManager.sidebar",
     init: function(parent, view_manager) {

From c05b34c4094952b43624bcc83e5e11ca540e3440 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Mon, 11 Apr 2011 04:54:09 +0000
Subject: [PATCH 105/331] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20110408044528-x2b0tjohjf1dqbic
bzr revid: launchpad_translations_on_behalf_of_openerp-20110409050011-j1zonbxqthg6cnbv
bzr revid: launchpad_translations_on_behalf_of_openerp-20110410044959-wu9z8ma8je0netjq
bzr revid: launchpad_translations_on_behalf_of_openerp-20110411045409-41dld74ls1lcxfwl
---
 addons/analytic/i18n/nb.po         |  257 +++++
 addons/anonymization/i18n/ca.po    |  226 ++++
 addons/base_synchro/i18n/ca.po     |  289 ++++++
 addons/crm/i18n/zh_CN.po           |  912 +++++++++--------
 addons/crm_caldav/i18n/zh_CN.po    |   49 +
 addons/crm_claim/i18n/gl.po        |  778 ++++++++++++++
 addons/crm_claim/i18n/zh_CN.po     |  749 ++++++++++++++
 addons/crm_helpdesk/i18n/zh_CN.po  |  697 +++++++++++++
 addons/crm_profiling/i18n/zh_CN.po |   55 +-
 addons/document_webdav/i18n/ca.po  |  206 ++++
 addons/fetchmail/i18n/ca.po        |  317 ++++++
 addons/hr_payroll/i18n/vi.po       | 1538 ++++++++++++++++++++++++++++
 addons/hr_timesheet/i18n/nb.po     |  702 +++++++++++++
 addons/product/i18n/ro.po          |    2 +-
 addons/product_margin/i18n/gl.po   |  305 ++++++
 addons/project/i18n/nb.po          |    8 +-
 addons/warning/i18n/nb.po          |  235 +++++
 addons/web_livechat/i18n/zh_CN.po  |   39 +
 addons/web_uservoice/i18n/zh_CN.po |   29 +
 19 files changed, 6928 insertions(+), 465 deletions(-)
 create mode 100644 addons/analytic/i18n/nb.po
 create mode 100644 addons/anonymization/i18n/ca.po
 create mode 100644 addons/base_synchro/i18n/ca.po
 create mode 100644 addons/crm_caldav/i18n/zh_CN.po
 create mode 100644 addons/crm_claim/i18n/gl.po
 create mode 100644 addons/crm_claim/i18n/zh_CN.po
 create mode 100644 addons/crm_helpdesk/i18n/zh_CN.po
 create mode 100644 addons/document_webdav/i18n/ca.po
 create mode 100644 addons/fetchmail/i18n/ca.po
 create mode 100644 addons/hr_payroll/i18n/vi.po
 create mode 100644 addons/hr_timesheet/i18n/nb.po
 create mode 100644 addons/product_margin/i18n/gl.po
 create mode 100644 addons/warning/i18n/nb.po
 create mode 100644 addons/web_livechat/i18n/zh_CN.po
 create mode 100644 addons/web_uservoice/i18n/zh_CN.po

diff --git a/addons/analytic/i18n/nb.po b/addons/analytic/i18n/nb.po
new file mode 100644
index 00000000000..c8dc9e5efa9
--- /dev/null
+++ b/addons/analytic/i18n/nb.po
@@ -0,0 +1,257 @@
+# Norwegian Bokmal translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2011-04-07 06:36+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Bokmal <nb@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: 2011-04-08 04:45+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
+
+#. module: analytic
+#: field:account.analytic.account,child_ids:0
+msgid "Child Accounts"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,name:0
+msgid "Account Name"
+msgstr "Kontonavn"
+
+#. module: analytic
+#: help:account.analytic.line,unit_amount:0
+msgid "Specifies the amount of quantity to count."
+msgstr ""
+
+#. module: analytic
+#: model:ir.module.module,description:analytic.module_meta_information
+msgid ""
+"Module for defining analytic accounting object.\n"
+"    "
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,state:0
+msgid "State"
+msgstr "Status"
+
+#. module: analytic
+#: field:account.analytic.account,user_id:0
+msgid "Account Manager"
+msgstr ""
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Draft"
+msgstr "Utkast"
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Closed"
+msgstr "Lukket"
+
+#. module: analytic
+#: field:account.analytic.account,debit:0
+msgid "Debit"
+msgstr "Debet"
+
+#. module: analytic
+#: help:account.analytic.account,state:0
+msgid ""
+"* When an account is created its in 'Draft' state.                           "
+"       \n"
+"* If any associated partner is there, it can be in 'Open' state.             "
+"                     \n"
+"* If any pending balance is there it can be in 'Pending'.                    "
+"               \n"
+"* And finally when all the transactions are over, it can be in 'Close' "
+"state.                                   \n"
+"* The project can be in either if the states 'Template' and 'Running'.\n"
+" If it is template then we can make projects based on the template projects. "
+"If its in 'Running' state it is a normal project.                            "
+"     \n"
+" If it is to be reviewed then the state is 'Pending'.\n"
+" When the project is completed the state is set to 'Done'."
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,type:0
+msgid "Account Type"
+msgstr "Kontotype"
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Template"
+msgstr "Mal"
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Pending"
+msgstr ""
+
+#. module: analytic
+#: model:ir.model,name:analytic.model_account_analytic_line
+msgid "Analytic Line"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,description:0
+#: field:account.analytic.line,name:0
+msgid "Description"
+msgstr "Beskrivelse"
+
+#. module: analytic
+#: selection:account.analytic.account,type:0
+msgid "Normal"
+msgstr "Normal"
+
+#. module: analytic
+#: field:account.analytic.account,company_id:0
+#: field:account.analytic.line,company_id:0
+msgid "Company"
+msgstr "Firma"
+
+#. module: analytic
+#: field:account.analytic.account,quantity_max:0
+msgid "Maximum Quantity"
+msgstr "Maksimum antall"
+
+#. module: analytic
+#: field:account.analytic.line,user_id:0
+msgid "User"
+msgstr "Bruker"
+
+#. module: analytic
+#: field:account.analytic.account,parent_id:0
+msgid "Parent Analytic Account"
+msgstr "Overordnet analytisk konto"
+
+#. module: analytic
+#: field:account.analytic.line,date:0
+msgid "Date"
+msgstr "Dato"
+
+#. module: analytic
+#: field:account.analytic.account,currency_id:0
+msgid "Account currency"
+msgstr "Konto valuta"
+
+#. module: analytic
+#: field:account.analytic.account,quantity:0
+#: field:account.analytic.line,unit_amount:0
+msgid "Quantity"
+msgstr "Antall"
+
+#. module: analytic
+#: help:account.analytic.line,amount:0
+msgid ""
+"Calculated by multiplying the quantity and the price given in the Product's "
+"cost price. Always expressed in the company main currency."
+msgstr ""
+"Beregnet ved å multiplisere antall og pris gitt av produktets kostpris. "
+"Alltid uttrykt i firmaets hovedvaluta."
+
+#. module: analytic
+#: help:account.analytic.account,quantity_max:0
+msgid "Sets the higher limit of quantity of hours."
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,credit:0
+msgid "Credit"
+msgstr "Kredit"
+
+#. module: analytic
+#: field:account.analytic.line,amount:0
+msgid "Amount"
+msgstr "Beløp"
+
+#. module: analytic
+#: field:account.analytic.account,contact_id:0
+msgid "Contact"
+msgstr "Kontakt"
+
+#. module: analytic
+#: constraint:account.analytic.account:0
+msgid ""
+"Error! The currency has to be the same as the currency of the selected "
+"company"
+msgstr "Feil! Valutaen må være lik valuaten til det valgte firmaet"
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Cancelled"
+msgstr "Annulert"
+
+#. module: analytic
+#: field:account.analytic.account,balance:0
+msgid "Balance"
+msgstr "Saldo"
+
+#. module: analytic
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr ""
+
+#. module: analytic
+#: help:account.analytic.account,type:0
+msgid ""
+"If you select the View Type, it means you won't allow to create journal "
+"entries using that account."
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,date:0
+msgid "Date End"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,code:0
+msgid "Account Code"
+msgstr "Kontokode"
+
+#. module: analytic
+#: field:account.analytic.account,complete_name:0
+msgid "Full Account Name"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.line,account_id:0
+#: model:ir.model,name:analytic.model_account_analytic_account
+#: model:ir.module.module,shortdesc:analytic.module_meta_information
+msgid "Analytic Account"
+msgstr "Analytisk konto"
+
+#. module: analytic
+#: selection:account.analytic.account,type:0
+msgid "View"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,partner_id:0
+msgid "Partner"
+msgstr "Partner"
+
+#. module: analytic
+#: field:account.analytic.account,date_start:0
+msgid "Date Start"
+msgstr "Startdato"
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Open"
+msgstr "Åpen"
+
+#. module: analytic
+#: field:account.analytic.account,line_ids:0
+msgid "Analytic Entries"
+msgstr ""
diff --git a/addons/anonymization/i18n/ca.po b/addons/anonymization/i18n/ca.po
new file mode 100644
index 00000000000..5ea0c6cc031
--- /dev/null
+++ b/addons/anonymization/i18n/ca.po
@@ -0,0 +1,226 @@
+# Catalan translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2011-04-09 18:26+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Catalan <ca@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: 2011-04-10 04:49+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
+
+#. module: anonymization
+#: model:ir.model,name:anonymization.model_ir_model_fields_anonymize_wizard
+msgid "ir.model.fields.anonymize.wizard"
+msgstr ""
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization,field_name:0
+msgid "Field Name"
+msgstr ""
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization,field_id:0
+msgid "Field"
+msgstr ""
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization.history,state:0
+#: field:ir.model.fields.anonymize.wizard,state:0
+msgid "State"
+msgstr ""
+
+#. module: anonymization
+#: field:ir.model.fields.anonymize.wizard,file_import:0
+msgid "Import"
+msgstr ""
+
+#. module: anonymization
+#: model:ir.model,name:anonymization.model_ir_model_fields_anonymization
+msgid "ir.model.fields.anonymization"
+msgstr ""
+
+#. module: anonymization
+#: model:ir.module.module,shortdesc:anonymization.module_meta_information
+msgid "Database anonymization module"
+msgstr ""
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization.history,direction:0
+msgid "Direction"
+msgstr ""
+
+#. module: anonymization
+#: model:ir.actions.act_window,name:anonymization.action_ir_model_fields_anonymization_tree
+#: view:ir.model.fields.anonymization:0
+#: model:ir.ui.menu,name:anonymization.menu_administration_anonymization_fields
+msgid "Anonymized Fields"
+msgstr ""
+
+#. module: anonymization
+#: model:ir.ui.menu,name:anonymization.menu_administration_anonymization
+msgid "Database anonymization"
+msgstr ""
+
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:55
+#: sql_constraint:ir.model.fields.anonymization:0
+#, python-format
+msgid "You cannot have two records having the same model and the same field"
+msgstr ""
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization,state:0
+#: selection:ir.model.fields.anonymize.wizard,state:0
+msgid "Anonymized"
+msgstr ""
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization,state:0
+msgid "unknown"
+msgstr ""
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization,model_id:0
+msgid "Object"
+msgstr ""
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization.history,filepath:0
+msgid "File path"
+msgstr ""
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization.history,date:0
+msgid "Date"
+msgstr ""
+
+#. module: anonymization
+#: field:ir.model.fields.anonymize.wizard,file_export:0
+msgid "Export"
+msgstr ""
+
+#. module: anonymization
+#: view:ir.model.fields.anonymize.wizard:0
+msgid "Reverse the Database Anonymization"
+msgstr ""
+
+#. module: anonymization
+#: view:ir.model.fields.anonymize.wizard:0
+msgid "Database Anonymization"
+msgstr ""
+
+#. module: anonymization
+#: model:ir.ui.menu,name:anonymization.menu_administration_anonymization_wizard
+msgid "Anonymize database"
+msgstr ""
+
+#. module: anonymization
+#: view:ir.model.fields.anonymization.history:0
+#: field:ir.model.fields.anonymization.history,field_ids:0
+msgid "Fields"
+msgstr ""
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization,state:0
+#: selection:ir.model.fields.anonymize.wizard,state:0
+msgid "Clear"
+msgstr ""
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization.history,direction:0
+msgid "clear -> anonymized"
+msgstr ""
+
+#. module: anonymization
+#: view:ir.model.fields.anonymize.wizard:0
+#: field:ir.model.fields.anonymize.wizard,summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: anonymization
+#: view:ir.model.fields.anonymization:0
+msgid "Anonymized Field"
+msgstr ""
+
+#. module: anonymization
+#: model:ir.module.module,description:anonymization.module_meta_information
+msgid ""
+"\n"
+"This module allows you to anonymize a database.\n"
+"    "
+msgstr ""
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymize.wizard,state:0
+msgid "Unstable"
+msgstr ""
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization.history,state:0
+msgid "Exception occured"
+msgstr ""
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization,state:0
+#: selection:ir.model.fields.anonymize.wizard,state:0
+msgid "Not Existing"
+msgstr ""
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization,model_name:0
+msgid "Object Name"
+msgstr ""
+
+#. module: anonymization
+#: model:ir.actions.act_window,name:anonymization.action_ir_model_fields_anonymization_history_tree
+#: view:ir.model.fields.anonymization.history:0
+#: model:ir.ui.menu,name:anonymization.menu_administration_anonymization_history
+msgid "Anonymization History"
+msgstr ""
+
+#. module: anonymization
+#: model:ir.model,name:anonymization.model_ir_model_fields_anonymization_history
+msgid "ir.model.fields.anonymization.history"
+msgstr ""
+
+#. module: anonymization
+#: model:ir.actions.act_window,name:anonymization.action_ir_model_fields_anonymize_wizard
+#: view:ir.model.fields.anonymize.wizard:0
+msgid "Anonymize Database"
+msgstr ""
+
+#. module: anonymization
+#: field:ir.model.fields.anonymize.wizard,name:0
+msgid "File Name"
+msgstr ""
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization.history,direction:0
+msgid "anonymized -> clear"
+msgstr ""
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization.history,state:0
+msgid "Started"
+msgstr ""
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization.history,state:0
+msgid "Done"
+msgstr ""
+
+#. module: anonymization
+#: view:ir.model.fields.anonymization.history:0
+#: field:ir.model.fields.anonymization.history,msg:0
+#: field:ir.model.fields.anonymize.wizard,msg:0
+msgid "Message"
+msgstr ""
diff --git a/addons/base_synchro/i18n/ca.po b/addons/base_synchro/i18n/ca.po
new file mode 100644
index 00000000000..63b8bd5664e
--- /dev/null
+++ b/addons/base_synchro/i18n/ca.po
@@ -0,0 +1,289 @@
+# Catalan translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2011-04-10 21:15+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Catalan <ca@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: 2011-04-11 04:54+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
+
+#. module: base_synchro
+#: model:ir.actions.act_window,name:base_synchro.action_view_base_synchro
+msgid "Base Synchronization"
+msgstr ""
+
+#. module: base_synchro
+#: field:base.synchro.server,server_db:0
+msgid "Server Database"
+msgstr ""
+
+#. module: base_synchro
+#: view:base.synchro.server:0
+#: model:ir.model,name:base_synchro.model_base_synchro_server
+msgid "Synchronized server"
+msgstr ""
+
+#. module: base_synchro
+#: field:base.synchro.obj.avoid,name:0
+msgid "Field Name"
+msgstr ""
+
+#. module: base_synchro
+#: field:base.synchro.obj,synchronize_date:0
+msgid "Latest Synchronization"
+msgstr ""
+
+#. module: base_synchro
+#: field:base.synchro,user_id:0
+msgid "Send Result To"
+msgstr ""
+
+#. module: base_synchro
+#: model:ir.model,name:base_synchro.model_base_synchro_obj_avoid
+msgid "Fields to not synchronize"
+msgstr ""
+
+#. module: base_synchro
+#: view:base.synchro:0
+msgid "_Close"
+msgstr ""
+
+#. module: base_synchro
+#: view:base.synchro:0
+msgid "Transfer Data To Server"
+msgstr ""
+
+#. module: base_synchro
+#: model:ir.model,name:base_synchro.model_base_synchro_obj
+msgid "Register Class"
+msgstr ""
+
+#. module: base_synchro
+#: view:base.synchro.obj:0
+#: model:ir.actions.act_window,name:base_synchro.action_transfer_tree
+#: model:ir.ui.menu,name:base_synchro.transfer_menu_id
+msgid "Synchronized objects"
+msgstr ""
+
+#. module: base_synchro
+#: field:base.synchro.server,obj_ids:0
+msgid "Models"
+msgstr ""
+
+#. module: base_synchro
+#: field:base.synchro.obj.avoid,obj_id:0
+#: view:base.synchro.obj.line:0
+#: field:base.synchro.obj.line,obj_id:0
+msgid "Object"
+msgstr ""
+
+#. module: base_synchro
+#: field:base.synchro.server,login:0
+msgid "User Name"
+msgstr ""
+
+#. module: base_synchro
+#: view:base.synchro.obj:0
+#: view:base.synchro.obj.line:0
+msgid "Group By"
+msgstr ""
+
+#. module: base_synchro
+#: selection:base.synchro.obj,action:0
+msgid "Upload"
+msgstr ""
+
+#. module: base_synchro
+#: view:base.synchro.obj:0
+msgid "Latest synchronization"
+msgstr ""
+
+#. module: base_synchro
+#: model:ir.module.module,description:base_synchro.module_meta_information
+msgid "Synchronization with all objects."
+msgstr ""
+
+#. module: base_synchro
+#: view:base.synchro.obj.line:0
+#: field:base.synchro.obj.line,name:0
+msgid "Date"
+msgstr ""
+
+#. module: base_synchro
+#: field:base.synchro.server,password:0
+msgid "Password"
+msgstr ""
+
+#. module: base_synchro
+#: field:base.synchro.obj,avoid_ids:0
+msgid "Fields Not Sync."
+msgstr ""
+
+#. module: base_synchro
+#: selection:base.synchro.obj,action:0
+msgid "Both"
+msgstr ""
+
+#. module: base_synchro
+#: field:base.synchro.obj,name:0
+msgid "Name"
+msgstr ""
+
+#. module: base_synchro
+#: view:base.synchro.obj:0
+msgid "Fields"
+msgstr ""
+
+#. module: base_synchro
+#: view:base.synchro.obj.line:0
+msgid "Transfered Ids Details"
+msgstr ""
+
+#. module: base_synchro
+#: field:base.synchro.obj,action:0
+msgid "Synchronisation direction"
+msgstr ""
+
+#. module: base_synchro
+#: field:base.synchro.obj,server_id:0
+msgid "Server"
+msgstr ""
+
+#. module: base_synchro
+#: model:ir.actions.act_window,name:base_synchro.action_base_synchro_obj_line_tree
+#: model:ir.model,name:base_synchro.model_base_synchro_obj_line
+#: model:ir.ui.menu,name:base_synchro.menu_action_base_synchro_obj_line_tree
+msgid "Synchronized instances"
+msgstr ""
+
+#. module: base_synchro
+#: field:base.synchro.obj,active:0
+msgid "Active"
+msgstr ""
+
+#. module: base_synchro
+#: view:base.synchro.obj:0
+#: field:base.synchro.obj,model_id:0
+msgid "Object to synchronize"
+msgstr ""
+
+#. module: base_synchro
+#: model:ir.module.module,shortdesc:base_synchro.module_meta_information
+msgid "Base Synchro"
+msgstr ""
+
+#. module: base_synchro
+#: model:ir.actions.act_window,name:base_synchro.action_base_synchro_server_tree
+#: model:ir.ui.menu,name:base_synchro.synchro_server_tree_menu_id
+msgid "Servers to be synchronized"
+msgstr ""
+
+#. module: base_synchro
+#: view:base.synchro.obj:0
+msgid "Transfer Details"
+msgstr ""
+
+#. module: base_synchro
+#: field:base.synchro.obj.line,remote_id:0
+msgid "Remote Id"
+msgstr ""
+
+#. module: base_synchro
+#: field:base.synchro.obj,line_id:0
+msgid "Ids Affected"
+msgstr ""
+
+#. module: base_synchro
+#: model:ir.ui.menu,name:base_synchro.next_id_63
+msgid "History"
+msgstr ""
+
+#. module: base_synchro
+#: model:ir.ui.menu,name:base_synchro.next_id_62
+#: model:ir.ui.menu,name:base_synchro.synch_config
+msgid "Synchronization"
+msgstr ""
+
+#. module: base_synchro
+#: field:base.synchro.obj,domain:0
+msgid "Domain"
+msgstr ""
+
+#. module: base_synchro
+#: view:base.synchro:0
+msgid "_Synchronize"
+msgstr ""
+
+#. module: base_synchro
+#: view:base.synchro:0
+msgid "OK"
+msgstr ""
+
+#. module: base_synchro
+#: field:base.synchro.server,name:0
+msgid "Server name"
+msgstr ""
+
+#. module: base_synchro
+#: field:base.synchro.obj,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: base_synchro
+#: view:base.synchro:0
+msgid ""
+"The synchronisation has been started.You will receive a request when it's "
+"done."
+msgstr ""
+
+#. module: base_synchro
+#: field:base.synchro.server,server_port:0
+msgid "Server Port"
+msgstr ""
+
+#. module: base_synchro
+#: model:ir.ui.menu,name:base_synchro.menu_action_view_base_synchro
+msgid "Synchronize objects"
+msgstr ""
+
+#. module: base_synchro
+#: view:base.synchro:0
+msgid "Synchronization Complited!"
+msgstr ""
+
+#. module: base_synchro
+#: model:ir.model,name:base_synchro.model_base_synchro
+msgid "base.synchro"
+msgstr ""
+
+#. module: base_synchro
+#: field:base.synchro.obj.line,local_id:0
+msgid "Local Id"
+msgstr ""
+
+#. module: base_synchro
+#: model:ir.actions.act_window,name:base_synchro.actions_regclass_tree
+#: model:ir.actions.act_window,name:base_synchro.actions_transfer_line_form
+msgid "Filters"
+msgstr ""
+
+#. module: base_synchro
+#: selection:base.synchro.obj,action:0
+msgid "Download"
+msgstr ""
+
+#. module: base_synchro
+#: field:base.synchro,server_url:0
+#: field:base.synchro.server,server_url:0
+msgid "Server URL"
+msgstr ""
diff --git a/addons/crm/i18n/zh_CN.po b/addons/crm/i18n/zh_CN.po
index 5ad7b92e95f..2659bb040b9 100644
--- a/addons/crm/i18n/zh_CN.po
+++ b/addons/crm/i18n/zh_CN.po
@@ -7,31 +7,31 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-01-13 14:37+0000\n"
-"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
+"PO-Revision-Date: 2011-04-10 15:13+0000\n"
+"Last-Translator: Black Jack <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: 2011-03-18 04:45+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-04-11 04:53+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
 msgid "# Leads"
-msgstr ""
+msgstr "线索"
 
 #. module: crm
 #: view:crm.lead:0
 #: selection:crm.lead,type:0
 #: selection:crm.lead.report,type:0
 msgid "Lead"
-msgstr ""
+msgstr "线索"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor3
 msgid "Need Services"
-msgstr ""
+msgstr "需要的服务"
 
 #. module: crm
 #: selection:crm.meeting,rrule_type:0
@@ -46,12 +46,12 @@ msgstr "安排一个电话访问"
 #. module: crm
 #: model:ir.model,name:crm.model_crm_case_stage
 msgid "Stage of case"
-msgstr "业务个案阶段"
+msgstr "业务阶段"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Visibility"
-msgstr "可见性"
+msgstr "可见等级"
 
 #. module: crm
 #: field:crm.lead,title:0
@@ -61,13 +61,13 @@ msgstr "标题"
 #. module: crm
 #: field:crm.meeting,show_as:0
 msgid "Show as"
-msgstr ""
+msgstr "显示为"
 
 #. module: crm
 #: field:crm.meeting,day:0
 #: selection:crm.meeting,select1:0
 msgid "Date of month"
-msgstr "月中的天数"
+msgstr "月的天数"
 
 #. module: crm
 #: view:crm.lead:0
@@ -78,7 +78,7 @@ msgstr "今日"
 #. module: crm
 #: view:crm.merge.opportunity:0
 msgid "Select Opportunities"
-msgstr ""
+msgstr "选择商机"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -86,7 +86,7 @@ msgstr ""
 #: view:crm.phonecall2phonecall:0
 #: view:crm.send.mail:0
 msgid " "
-msgstr ""
+msgstr " "
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -97,13 +97,13 @@ msgstr "延迟关闭"
 #. module: crm
 #: view:crm.lead:0
 msgid "Previous Stage"
-msgstr ""
+msgstr "前一阶段"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_add_note.py:26
 #, python-format
 msgid "Can not add note!"
-msgstr ""
+msgstr "添加备注不成功!"
 
 #. module: crm
 #: field:crm.case.stage,name:0
@@ -121,24 +121,24 @@ msgstr "日"
 #. module: crm
 #: sql_constraint:crm.case.section:0
 msgid "The code of the sales team must be unique !"
-msgstr "销售团队代码必须唯一！"
+msgstr "销售团队编码必须唯一！"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_lead_to_opportunity.py:93
 #, python-format
 msgid "Lead '%s' has been converted to an opportunity."
-msgstr ""
+msgstr "线索'%s'已转化商机"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:228
 #, python-format
 msgid "The lead '%s' has been closed."
-msgstr ""
+msgstr "线索 '%s' 已关闭."
 
 #. module: crm
 #: selection:crm.meeting,freq:0
 msgid "No Repeat"
-msgstr ""
+msgstr "不重复"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_lead_to_opportunity.py:133
@@ -152,7 +152,7 @@ msgstr "警告！"
 #. module: crm
 #: selection:crm.meeting,rrule_type:0
 msgid "Yearly"
-msgstr ""
+msgstr "按年"
 
 #. module: crm
 #: field:crm.segmentation.line,name:0
@@ -172,7 +172,7 @@ msgstr "营销活动"
 #. module: crm
 #: selection:crm.lead2opportunity.partner,action:0
 msgid "Do not create a partner"
-msgstr ""
+msgstr "不能创建这业务伙伴"
 
 #. module: crm
 #: view:crm.lead:0
@@ -184,7 +184,7 @@ msgstr "搜索商机"
 #, python-format
 msgid ""
 "Opportunity must have Partner assigned before merging with other Opportunity."
-msgstr ""
+msgstr "必须要为商机选择一个业务伙伴才能进行商机合并."
 
 #. module: crm
 #: code:addons/crm/wizard/crm_merge_opportunities.py:46
@@ -198,7 +198,7 @@ msgstr "警告!"
 #: model:ir.actions.act_window,name:crm.action_report_crm_opportunity
 #: model:ir.ui.menu,name:crm.menu_report_crm_opportunities_tree
 msgid "Opportunities Analysis"
-msgstr ""
+msgstr "商机分析"
 
 #. module: crm
 #: field:crm.lead,partner_id:0
@@ -225,7 +225,7 @@ msgstr "业务伙伴"
 #: field:crm.meeting,organizer:0
 #: field:crm.meeting,organizer_id:0
 msgid "Organizer"
-msgstr ""
+msgstr "组织者"
 
 #. module: crm
 #: view:crm.phonecall:0
@@ -233,12 +233,12 @@ msgstr ""
 #: model:ir.actions.act_window,name:crm.phonecall_to_phonecall_act
 #: view:res.partner:0
 msgid "Schedule Other Call"
-msgstr ""
+msgstr "安排其它电话访问"
 
 #. module: crm
 #: help:crm.meeting,edit_all:0
 msgid "Edit all Occurrences  of recurrent Meeting."
-msgstr ""
+msgstr "编辑经常性的会议"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_opportunity_to_phonecall.py:134
@@ -249,18 +249,18 @@ msgstr ""
 #: view:res.partner:0
 #, python-format
 msgid "Phone Call"
-msgstr "电话呼叫"
+msgstr "电话访问"
 
 #. module: crm
 #: field:crm.lead,optout:0
 msgid "Opt-Out"
-msgstr ""
+msgstr "退订"
 
 #. module: crm
 #: code:addons/crm/crm_opportunity.py:108
 #, python-format
 msgid "The opportunity '%s' has been marked as lost."
-msgstr ""
+msgstr "商机 '%s' 已丢失."
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.action_report_crm_lead
@@ -269,17 +269,17 @@ msgid ""
 "for treatment delays, number of responses given and emails sent. You can "
 "sort out your leads analysis by different groups to get accurate grained "
 "analysis."
-msgstr ""
+msgstr "线索分析允许你检查业务关系管理的关息，检查耽搁的处理，回复的邮件l数量。你能整理出对不同群体的线索分析去获得更准确的细粒度分析。"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Send New Email"
-msgstr "发送新Email"
+msgstr "发送新的电子邮件"
 
 #. module: crm
 #: field:crm.segmentation,segmentation_line:0
 msgid "Criteria"
-msgstr "标准"
+msgstr "规则"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -289,19 +289,19 @@ msgstr "排除的答案:"
 #. module: crm
 #: field:crm.case.stage,section_ids:0
 msgid "Sections"
-msgstr "划分的业务个案"
+msgstr "分类"
 
 #. module: crm
 #: view:crm.merge.opportunity:0
 msgid "_Merge"
-msgstr ""
+msgstr "合并(_M)"
 
 #. module: crm
 #: view:crm.lead.report:0
 #: model:ir.actions.act_window,name:crm.action_report_crm_lead
 #: model:ir.ui.menu,name:crm.menu_report_crm_leads_tree
 msgid "Leads Analysis"
-msgstr ""
+msgstr "线索分析"
 
 #. module: crm
 #: view:crm.lead2opportunity.action:0
@@ -309,37 +309,37 @@ msgid ""
 "If you select Merge with existing Opportunity, the lead details(with the "
 "communication history) will be merged with existing Opportunity of Selected "
 "partner."
-msgstr ""
+msgstr "如果你选择将现有的商机，线索细节（沟通的历史记录）合并那将是和选定的合作伙伴合并现有的商机"
 
 #. module: crm
 #: selection:crm.meeting,class:0
 msgid "Public"
-msgstr ""
+msgstr "公开"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_resource_type_act
 #: model:ir.ui.menu,name:crm.menu_crm_case_resource_type_act
 msgid "Campaigns"
-msgstr ""
+msgstr "营销活动"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_lead_categ_action
 #: model:ir.ui.menu,name:crm.menu_crm_case_phonecall-act
 #: model:ir.ui.menu,name:crm.menu_crm_lead_categ
 msgid "Categories"
-msgstr "分类"
+msgstr "类型"
 
 #. module: crm
 #: selection:crm.meeting,end_type:0
 msgid "Forever"
-msgstr ""
+msgstr "永远"
 
 #. module: crm
 #: help:crm.lead,optout:0
 msgid ""
 "If opt-out is checked, this contact has refused to receive emails or "
 "unsubscribed to a campaign."
-msgstr ""
+msgstr "如果选择退订，这联系人将不再向其发送邮件或取消订阅营销活动。"
 
 #. module: crm
 #: model:process.transition,name:crm.process_transition_leadpartner0
@@ -368,23 +368,23 @@ msgstr "联系方式"
 #. module: crm
 #: view:crm.installer:0
 msgid "Enhance your core CRM Application with additional functionalities."
-msgstr ""
+msgstr "增强你的业务关系应用和增加功能。"
 
 #. module: crm
 #: field:crm.case.stage,on_change:0
 msgid "Change Probability Automatically"
-msgstr ""
+msgstr "自动修改概率"
 
 #. module: crm
 #: field:base.action.rule,regex_history:0
 msgid "Regular Expression on Case History"
-msgstr "业务个案日志的正则表达式"
+msgstr "业务日志的规则表达式"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:209
 #, python-format
 msgid "The lead '%s' has been opened."
-msgstr ""
+msgstr "这线索'%s'已经开启"
 
 #. module: crm
 #: model:process.transition,name:crm.process_transition_opportunitymeeting0
@@ -395,28 +395,28 @@ msgstr "商机会议"
 #: help:crm.lead.report,delay_close:0
 #: help:crm.phonecall.report,delay_close:0
 msgid "Number of Days to close the case"
-msgstr ""
+msgstr "到期天数"
 
 #. module: crm
 #: model:process.node,note:crm.process_node_opportunities0
 msgid "When a real project/opportunity is detected"
-msgstr "当发现一个明确的项目/ 商机"
+msgstr "当发现一个明确的项目/商机"
 
 #. module: crm
 #: field:crm.installer,crm_fundraising:0
 msgid "Fundraising"
-msgstr ""
+msgstr "集资"
 
 #. module: crm
 #: view:res.partner:0
 #: field:res.partner,opportunity_ids:0
 msgid "Leads and Opportunities"
-msgstr ""
+msgstr "线索与商机"
 
 #. module: crm
 #: view:crm.send.mail:0
 msgid "_Send"
-msgstr ""
+msgstr "发送(_S)"
 
 #. module: crm
 #: view:crm.lead:0
@@ -426,12 +426,12 @@ msgstr "沟通"
 #. module: crm
 #: field:crm.case.section,change_responsible:0
 msgid "Change Responsible"
-msgstr ""
+msgstr "修改负责人"
 
 #. module: crm
 #: field:crm.merge.opportunity,state:0
 msgid "Set State To"
-msgstr ""
+msgstr "设状态为"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_categ_phone_outgoing0
@@ -442,22 +442,24 @@ msgid ""
 "customer. You can also import a .CSV file with a list of calls to be done by "
 "your sales team."
 msgstr ""
+"你销售团队电话访问所有要完成的的呼出列表，一个业务员可以在电话访问窗体记录有关信息。这些信息将保存在相关业务伙伴的窗体跟踪每个与客户的沟通。你可以用.cs"
+"c文件导入你销售团队将要完成的电话访问列表。"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead2opportunity_action
 msgid "Convert/Merge Opportunity"
-msgstr ""
+msgstr "转换/合并 商机"
 
 #. module: crm
 #: field:crm.lead,write_date:0
 msgid "Update Date"
-msgstr ""
+msgstr "更新日期"
 
 #. module: crm
 #: view:crm.lead2opportunity.action:0
 #: field:crm.lead2opportunity.action,name:0
 msgid "Select Action"
-msgstr ""
+msgstr "选择动作"
 
 #. module: crm
 #: field:base.action.rule,trg_categ_id:0
@@ -470,22 +472,22 @@ msgstr ""
 #: field:crm.phonecall.report,categ_id:0
 #: field:crm.phonecall2phonecall,categ_id:0
 msgid "Category"
-msgstr "分类"
+msgstr "类型"
 
 #. module: crm
 #: view:crm.lead.report:0
 msgid "#Opportunities"
-msgstr ""
+msgstr "#商机"
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_oppor2
 msgid "Campaign 1"
-msgstr ""
+msgstr "营销活动 1"
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_oppor1
 msgid "Campaign 2"
-msgstr ""
+msgstr "营销活动 2"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -495,32 +497,32 @@ msgstr "隐私"
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Opportunity Analysis"
-msgstr ""
+msgstr "商机分析"
 
 #. module: crm
 #: help:crm.meeting,location:0
 msgid "Location of Event"
-msgstr ""
+msgstr "地点"
 
 #. module: crm
 #: field:crm.meeting,rrule:0
 msgid "Recurrent Rule"
-msgstr "周期性规则"
+msgstr "循环性规则"
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead1
 msgid "Version 4.2"
-msgstr ""
+msgstr "4.2版本"
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead2
 msgid "Version 4.4"
-msgstr ""
+msgstr "4.4版本"
 
 #. module: crm
 #: help:crm.installer,fetchmail:0
 msgid "Allows you to receive E-Mails from POP/IMAP server."
-msgstr ""
+msgstr "允许你通过POP/IMAP协议接收邮件"
 
 #. module: crm
 #: model:process.transition,note:crm.process_transition_opportunitymeeting0
@@ -549,7 +551,7 @@ msgstr "建立商机"
 #. module: crm
 #: view:crm.installer:0
 msgid "Configure"
-msgstr ""
+msgstr "设置"
 
 #. module: crm
 #: code:addons/crm/crm.py:378
@@ -580,17 +582,17 @@ msgstr "未运行"
 #: view:crm.send.mail:0
 #: model:ir.actions.act_window,name:crm.action_crm_reply_mail
 msgid "Reply to last Mail"
-msgstr ""
+msgstr "最后回复邮件"
 
 #. module: crm
 #: field:crm.lead,email:0
 msgid "E-Mail"
-msgstr ""
+msgstr "电子邮件"
 
 #. module: crm
 #: field:crm.installer,wiki_sale_faq:0
 msgid "Sale FAQ"
-msgstr ""
+msgstr "销售FAQ"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_send_mail_attachment
@@ -607,19 +609,19 @@ msgstr "10月"
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Included Answers :"
-msgstr "包括回答:"
+msgstr "包括答案:"
 
 #. module: crm
 #: help:crm.meeting,email_from:0
 #: help:crm.phonecall,email_from:0
 msgid "These people will receive email."
-msgstr "这些人将受到电子邮件。"
+msgstr "这些人将收到电子邮件。"
 
 #. module: crm
 #: view:crm.meeting:0
 #: field:crm.meeting,name:0
 msgid "Summary"
-msgstr ""
+msgstr "摘要"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -631,7 +633,7 @@ msgstr "满意度计算"
 msgid ""
 "Thick this box if you want that on escalation, the responsible of this sale "
 "team automatically becomes responsible of the lead/opportunity escaladed"
-msgstr ""
+msgstr "弹出窗体，如果你希望提升这负责的销售团队自动提升负责的线索/商机。"
 
 #. module: crm
 #: help:crm.installer,outlook:0
@@ -639,29 +641,29 @@ msgstr ""
 msgid ""
 "Allows you to link your e-mail to OpenERP's documents. You can attach it to "
 "any existing one in OpenERP or create a new one."
-msgstr ""
+msgstr "允许你链接你的电子邮件到系统的文档模块。你可以添加到任意一个现存的文档中或新增一个。"
 
 #. module: crm
 #: view:crm.case.categ:0
 msgid "Case Category"
-msgstr "业务个案分类"
+msgstr "业务类型"
 
 #. module: crm
 #: help:crm.segmentation,som_interval_default:0
 msgid ""
 "Default state of mind for period preceeding the 'Max Interval' computation. "
 "This is the starting state of mind by default if the partner has no event."
-msgstr "前期的默认满意度以'最大间隔'计算. 如果业务伙伴没有事件这是默认的开始满意度"
+msgstr "默认的开始满意度以'最大间隔'计算. 如果业务伙伴没有事件这是默认的开始满意度"
 
 #. module: crm
 #: selection:crm.meeting,end_type:0
 msgid "End date"
-msgstr ""
+msgstr "结束日期"
 
 #. module: crm
 #: constraint:base.action.rule:0
 msgid "Error: The mail is not well formated"
-msgstr ""
+msgstr "错误:邮件没有正确的格式"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -671,14 +673,14 @@ msgstr "特征选项"
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "#Phone calls"
-msgstr ""
+msgstr "电话访问"
 
 #. module: crm
 #: help:crm.segmentation,categ_id:0
 msgid ""
 "The partner category that will be added to partners that match the "
 "segmentation criterions after computation."
-msgstr "这业务伙伴分类将加入到符合的业务伙伴细分准则"
+msgstr "这业务伙伴类型将加到计算匹配业务伙伴的业务伙伴细分规则中"
 
 #. module: crm
 #: view:crm.lead:0
@@ -691,13 +693,13 @@ msgid ""
 "The channels represent the different communication                         "
 "modes available with the customer. With each commercial opportunity, you can "
 "indicate                         the canall which is this opportunity source."
-msgstr ""
+msgstr "途径表示与客户联系用到的不同沟通方式，每一个商机你可以标示商机来源的管道。"
 
 #. module: crm
 #: code:addons/crm/crm_meeting.py:93
 #, python-format
 msgid "The meeting '%s' has been confirmed."
-msgstr ""
+msgstr "这会议'%s'已确认"
 
 #. module: crm
 #: field:crm.case.section,user_id:0
@@ -708,31 +710,31 @@ msgstr "负责用户"
 #: code:addons/crm/wizard/crm_phonecall_to_partner.py:53
 #, python-format
 msgid "A partner is already defined on this phonecall."
-msgstr "在这电话呼叫中一个业务伙伴已定义"
+msgstr "业务伙伴已定义在这电话访问中"
 
 #. module: crm
 #: help:crm.case.section,reply_to:0
 msgid ""
 "The email address put in the 'Reply-To' of all emails sent by OpenERP about "
 "cases in this sales team"
-msgstr ""
+msgstr "'回复到'电子邮件地址填入该业务的团队在系统里设定的发送所有邮件的地址"
 
 #. module: crm
 #: view:res.users:0
 msgid "Current Activity"
-msgstr ""
+msgstr "当前活动"
 
 #. module: crm
 #: help:crm.meeting,exrule:0
 msgid ""
 "Defines a rule or repeating pattern of time to exclude from the recurring "
 "rule."
-msgstr ""
+msgstr "定义一个规则或时间重复模式以排除循环性规则"
 
 #. module: crm
 #: field:crm.case.section,resource_calendar_id:0
 msgid "Working Time"
-msgstr ""
+msgstr "工作时间"
 
 #. module: crm
 #: view:crm.segmentation.line:0
@@ -743,31 +745,31 @@ msgstr "业务伙伴细分明细"
 #: view:crm.lead:0
 #: view:crm.meeting:0
 msgid "Details"
-msgstr ""
+msgstr "详细信息"
 
 #. module: crm
 #: help:crm.installer,crm_caldav:0
 msgid ""
 "Helps you to synchronize the meetings with other calendar clients and "
 "mobiles."
-msgstr ""
+msgstr "协助你同步会议到其它的日程客户端"
 
 #. module: crm
 #: selection:crm.meeting,freq:0
 msgid "Years"
-msgstr ""
+msgstr "年"
 
 #. module: crm
 #: help:crm.installer,crm_claim:0
 msgid ""
 "Manages the suppliers and customers claims, including your corrective or "
 "preventive actions."
-msgstr ""
+msgstr "管理供应商和客户的索赔，包括纠正或预防措施。"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Leads Form"
-msgstr "营销线索表"
+msgstr "线索表单"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -778,7 +780,7 @@ msgstr "业务伙伴细分"
 #. module: crm
 #: field:crm.lead.report,probable_revenue:0
 msgid "Probable Revenue"
-msgstr ""
+msgstr "可能收入"
 
 #. module: crm
 #: help:crm.segmentation,name:0
@@ -794,13 +796,13 @@ msgstr "概率(%)"
 #. module: crm
 #: view:crm.lead:0
 msgid "Leads Generation"
-msgstr ""
+msgstr "产生线索"
 
 #. module: crm
 #: view:board.board:0
 #: model:ir.ui.menu,name:crm.menu_board_statistics_dash
 msgid "Statistics Dashboard"
-msgstr ""
+msgstr "统计控制台"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_lead_to_opportunity.py:86
@@ -825,7 +827,7 @@ msgstr "电视"
 #. module: crm
 #: field:crm.installer,crm_caldav:0
 msgid "Calendar Synchronizing"
-msgstr ""
+msgstr "同步日程"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -835,7 +837,7 @@ msgstr "停止处理"
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Search Phonecalls"
-msgstr "查询电话呼叫"
+msgstr "查询电话访问"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner:0
@@ -852,18 +854,18 @@ msgstr "每个期间的天数"
 #. module: crm
 #: field:crm.meeting,byday:0
 msgid "By day"
-msgstr ""
+msgstr "按天"
 
 #. module: crm
 #: field:base.action.rule,act_section_id:0
 msgid "Set Team to"
-msgstr ""
+msgstr "设定团队"
 
 #. module: crm
 #: view:calendar.attendee:0
 #: field:calendar.attendee,categ_id:0
 msgid "Event Type"
-msgstr ""
+msgstr "事件类型"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_installer
@@ -879,7 +881,7 @@ msgstr "唯一的"
 #: code:addons/crm/crm_opportunity.py:91
 #, python-format
 msgid "The opportunity '%s' has been won."
-msgstr ""
+msgstr "这个商机 '%s'已获得"
 
 #. module: crm
 #: help:crm.meeting,alarm_id:0
@@ -920,12 +922,29 @@ msgid ""
 "    * My Cases (list)\n"
 "    * Jobs Tracking (graph)\n"
 msgstr ""
+"系统的CRM模块能使用户智能高效地管理线索、商机、会议、电话访问等。\n"
+"它管理关键任务如：沟通、识别、优先等级、分配任务、决定和通知。\n"
+"\n"
+"系统确保能成功跟踪用户、客户和供应商的所有业务，它能听自动发提醒，提升请求、触发根据企业其定义规则下的特定方法和大量其他动作。\n"
+"\n"
+"系统最牛的事是无需用户做什么特别的事它能根据请求的追踪到正确目标发邮件。系统将根据信息自动路由转交给合适的责任者，并确保以后所有邮件都按照这个路径发到正确"
+"的地方。\n"
+"\n"
+"这CRM模块有一邮件网关作为邮件和系统的同步接口\n"
+"\n"
+"CRM控制台包括i：\n"
+"    *我的线索（列表）\n"
+"    *线索阶段（图）\n"
+"    *我的会议（列表）\n"
+"    *销售渠道阶段（图）\n"
+"    *我的业务（列表）\n"
+"    *工作任务（图）\n"
 
 #. module: crm
 #: field:crm.lead.report,create_date:0
 #: field:crm.phonecall.report,create_date:0
 msgid "Create Date"
-msgstr ""
+msgstr "建立日期"
 
 #. module: crm
 #: field:crm.lead,ref2:0
@@ -941,24 +960,24 @@ msgstr "销售采购"
 #: view:crm.case.stage:0
 #: field:crm.case.stage,requirements:0
 msgid "Requirements"
-msgstr ""
+msgstr "必备条件"
 
 #. module: crm
 #: help:crm.meeting,exdate:0
 msgid ""
 "This property defines the list of date/time exceptions for a recurring "
 "calendar component."
-msgstr ""
+msgstr "这属性定义循环日程的日期/时间异常列表。"
 
 #. module: crm
 #: view:crm.phonecall2opportunity:0
 msgid "Convert To Opportunity "
-msgstr ""
+msgstr "转换为商机 "
 
 #. module: crm
 #: help:crm.case.stage,sequence:0
 msgid "Gives the sequence order when displaying a list of case stages."
-msgstr "在显示业务个案阶段列表时提供序列顺序"
+msgstr "提供在显示业务列表时的次序"
 
 #. module: crm
 #: view:crm.lead:0
@@ -967,33 +986,33 @@ msgstr "在显示业务个案阶段列表时提供序列顺序"
 #: model:ir.ui.menu,name:crm.menu_crm_case_opp
 #: model:process.node,name:crm.process_node_opportunities0
 msgid "Opportunities"
-msgstr "商机"
+msgstr "商机列表"
 
 #. module: crm
 #: field:crm.segmentation,categ_id:0
 msgid "Partner Category"
-msgstr "业务伙伴分类"
+msgstr "业务伙伴类型"
 
 #. module: crm
 #: view:crm.add.note:0
 #: model:ir.actions.act_window,name:crm.action_crm_add_note
 msgid "Add Note"
-msgstr ""
+msgstr "添加备注"
 
 #. module: crm
 #: field:crm.lead,is_supplier_add:0
 msgid "Supplier"
-msgstr ""
+msgstr "供应商"
 
 #. module: crm
 #: help:crm.send.mail,reply_to:0
 msgid "Reply-to of the Sales team defined on this case"
-msgstr ""
+msgstr "在这业务销售团队定义的“回复到”"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Mark Won"
-msgstr ""
+msgstr "获得标记"
 
 #. module: crm
 #: selection:crm.segmentation.line,expr_name:0
@@ -1003,7 +1022,7 @@ msgstr "采购金额"
 #. module: crm
 #: view:crm.lead:0
 msgid "Mark Lost"
-msgstr ""
+msgstr "失去标记"
 
 #. module: crm
 #: selection:crm.lead.report,month:0
@@ -1016,17 +1035,17 @@ msgstr "3月"
 #: code:addons/crm/crm_lead.py:230
 #, python-format
 msgid "The opportunity '%s' has been closed."
-msgstr ""
+msgstr "商机 '%s' 已关闭."
 
 #. module: crm
 #: field:crm.lead,day_open:0
 msgid "Days to Open"
-msgstr ""
+msgstr "开启天数"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Show time as"
-msgstr ""
+msgstr "显示时间为"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:264
@@ -1049,19 +1068,19 @@ msgstr "手机"
 #. module: crm
 #: field:crm.meeting,end_type:0
 msgid "Way to end reccurency"
-msgstr ""
+msgstr "结束循环的方式"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_merge_opportunities.py:53
 #, python-format
 msgid ""
 "There are no other 'Open' or 'Pending' Opportunities for the partner '%s'."
-msgstr ""
+msgstr "业务伙伴‘%s’有没有其他‘开启’或‘待处理’商机"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Next Stage"
-msgstr ""
+msgstr "下一阶段"
 
 #. module: crm
 #: view:board.board:0
@@ -1076,7 +1095,7 @@ msgstr "参考"
 #. module: crm
 #: field:crm.lead,optin:0
 msgid "Opt-In"
-msgstr ""
+msgstr "订阅"
 
 #. module: crm
 #: code:addons/crm/crm_opportunity.py:208
@@ -1097,7 +1116,7 @@ msgstr "会议"
 #. module: crm
 #: view:crm.meeting:0
 msgid "Choose day where repeat the meeting"
-msgstr ""
+msgstr "为重复的会议选择日期"
 
 #. module: crm
 #: field:crm.lead,date_action_next:0
@@ -1110,7 +1129,7 @@ msgstr "下一动作"
 #. module: crm
 #: field:crm.meeting,end_date:0
 msgid "Repeat Until"
-msgstr ""
+msgstr "重复直到"
 
 #. module: crm
 #: field:crm.meeting,date_deadline:0
@@ -1122,13 +1141,13 @@ msgstr "截止日期"
 msgid ""
 "If the active field is set to          true, it will allow you to hide the "
 "event alarm information without removing it."
-msgstr ""
+msgstr "如果有效字段设为true，他将允许你忽略在外面将其删除。"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:57
 #, python-format
 msgid "Closed/Cancelled Phone Call Could not convert into Opportunity"
-msgstr ""
+msgstr "关闭、取消的电话访问不能转换为商机"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -1147,51 +1166,51 @@ msgstr "负责人"
 #. module: crm
 #: view:res.partner:0
 msgid "Previous"
-msgstr ""
+msgstr "前一个"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Statistics"
-msgstr ""
+msgstr "统计"
 
 #. module: crm
 #: view:crm.meeting:0
 #: field:crm.send.mail,email_from:0
 msgid "From"
-msgstr ""
+msgstr "来自"
 
 #. module: crm
 #: view:crm.lead2opportunity.action:0
 #: view:res.partner:0
 msgid "Next"
-msgstr ""
+msgstr "下一个"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Stage:"
-msgstr ""
+msgstr "阶段："
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead5
 #: model:crm.case.stage,name:crm.stage_opportunity5
 #: view:crm.lead:0
 msgid "Won"
-msgstr ""
+msgstr "获得"
 
 #. module: crm
 #: field:crm.lead.report,delay_expected:0
 msgid "Overpassed Deadline"
-msgstr ""
+msgstr "超越截止日期"
 
 #. module: crm
 #: model:crm.case.section,name:crm.section_sales_department
 msgid "Sales Department"
-msgstr ""
+msgstr "销售部"
 
 #. module: crm
 #: field:crm.send.mail,html:0
 msgid "HTML formatting?"
-msgstr ""
+msgstr "HTML格式?"
 
 #. module: crm
 #: field:crm.case.stage,type:0
@@ -1222,7 +1241,7 @@ msgstr "最低"
 #: view:crm.send.mail:0
 #: field:crm.send.mail.attachment,binary:0
 msgid "Attachment"
-msgstr ""
+msgstr "附件"
 
 #. module: crm
 #: selection:crm.lead.report,month:0
@@ -1244,12 +1263,12 @@ msgstr "创建日期"
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor5
 msgid "Need a Website Design"
-msgstr ""
+msgstr "需要网站设计"
 
 #. module: crm
 #: field:crm.meeting,recurrent_uid:0
 msgid "Recurrent ID"
-msgstr ""
+msgstr "循环ID"
 
 #. module: crm
 #: view:crm.lead:0
@@ -1262,7 +1281,7 @@ msgstr "主题"
 #. module: crm
 #: field:crm.meeting,tu:0
 msgid "Tue"
-msgstr ""
+msgstr "周二"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:300
@@ -1278,37 +1297,37 @@ msgstr "阶段"
 #. module: crm
 #: view:crm.lead:0
 msgid "History Information"
-msgstr ""
+msgstr "日志信息"
 
 #. module: crm
 #: field:base.action.rule,act_mail_to_partner:0
 msgid "Mail to Partner"
-msgstr ""
+msgstr "向业务伙伴发邮件"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Mailings"
-msgstr ""
+msgstr "邮件"
 
 #. module: crm
 #: field:crm.meeting,class:0
 msgid "Mark as"
-msgstr ""
+msgstr "标记为"
 
 #. module: crm
 #: field:crm.meeting,count:0
 msgid "Repeat"
-msgstr ""
+msgstr "重复"
 
 #. module: crm
 #: help:crm.meeting,rrule_type:0
 msgid "Let the event automatically repeat at that interval"
-msgstr ""
+msgstr "让事件在该时间间隔自动重复"
 
 #. module: crm
 #: view:base.action.rule:0
 msgid "Condition Case Fields"
-msgstr ""
+msgstr "业务状态字段"
 
 #. module: crm
 #: view:crm.case.section:0
@@ -1335,7 +1354,7 @@ msgstr "预期收益"
 msgid ""
 "Create specific phone call categories to better define the type of calls "
 "tracked in the system."
-msgstr ""
+msgstr "在系统中创建指定的电话访问类型以方便定义电话访问跟踪类型"
 
 #. module: crm
 #: selection:crm.lead.report,month:0
@@ -1353,23 +1372,23 @@ msgstr "处理的最大业务伙伴ID"
 #: model:ir.actions.act_window,name:crm.action_report_crm_phonecall
 #: model:ir.ui.menu,name:crm.menu_report_crm_phonecalls_tree
 msgid "Phone Calls Analysis"
-msgstr ""
+msgstr "电话访问分析"
 
 #. module: crm
 #: field:crm.lead.report,opening_date:0
 #: field:crm.phonecall.report,opening_date:0
 msgid "Opening Date"
-msgstr ""
+msgstr "开启日期"
 
 #. module: crm
 #: help:crm.phonecall,duration:0
 msgid "Duration in Minutes"
-msgstr ""
+msgstr "持续时间（分钟）"
 
 #. module: crm
 #: help:crm.installer,crm_helpdesk:0
 msgid "Manages a Helpdesk service."
-msgstr ""
+msgstr "管理一个服务台服务"
 
 #. module: crm
 #: field:crm.partner2opportunity,name:0
@@ -1381,23 +1400,23 @@ msgstr "商机名称"
 msgid ""
 "If the active field is set to true, it will allow you to hide the sales team "
 "without removing it."
-msgstr ""
+msgstr "如果有效字段设为true，它将允许你忽略销售团队在外面删除它。"
 
 #. module: crm
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
 msgid "  Year  "
-msgstr ""
+msgstr "  年  "
 
 #. module: crm
 #: field:crm.meeting,edit_all:0
 msgid "Edit All"
-msgstr ""
+msgstr "编辑所有"
 
 #. module: crm
 #: field:crm.meeting,fr:0
 msgid "Fri"
-msgstr ""
+msgstr "周五"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead
@@ -1407,12 +1426,12 @@ msgstr ""
 #. module: crm
 #: field:crm.meeting,write_date:0
 msgid "Write Date"
-msgstr ""
+msgstr "写日期"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "End of recurrency"
-msgstr ""
+msgstr "结束循环"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -1435,7 +1454,7 @@ msgstr "勾选此项, 如果你要使用此标签上的细分规则. 如果不
 #: model:ir.actions.act_window,name:crm.action_crm_phonecall2partner
 #: view:res.partner:0
 msgid "Create a Partner"
-msgstr ""
+msgstr "创建业务伙伴"
 
 #. module: crm
 #: field:crm.segmentation,state:0
@@ -1445,19 +1464,19 @@ msgstr "执行状态"
 #. module: crm
 #: selection:crm.meeting,week_list:0
 msgid "Monday"
-msgstr ""
+msgstr "周一"
 
 #. module: crm
 #: field:crm.lead,day_close:0
 msgid "Days to Close"
-msgstr ""
+msgstr "结束日期"
 
 #. module: crm
 #: field:crm.add.note,attachment_ids:0
 #: field:crm.case.section,complete_name:0
 #: field:crm.send.mail,attachment_ids:0
 msgid "unknown"
-msgstr ""
+msgstr "未知"
 
 #. module: crm
 #: field:crm.lead,id:0
@@ -1469,7 +1488,7 @@ msgstr "ID"
 #. module: crm
 #: model:ir.model,name:crm.model_crm_partner2opportunity
 msgid "Partner To Opportunity"
-msgstr ""
+msgstr "业务伙伴的商机"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -1488,7 +1507,7 @@ msgstr "日期"
 #: view:crm.meeting:0
 #: view:crm.phonecall.report:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "扩展过滤器..."
 
 #. module: crm
 #: field:crm.phonecall2opportunity,name:0
@@ -1498,17 +1517,17 @@ msgstr "商机综述"
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Search"
-msgstr ""
+msgstr "查找"
 
 #. module: crm
 #: view:board.board:0
 msgid "Opportunities by Categories"
-msgstr ""
+msgstr "商机类型"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Choose day in the month where repeat the meeting"
-msgstr ""
+msgstr "在本月为循环的会议选择日期"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -1527,17 +1546,17 @@ msgid ""
 "Create specific partner categories which you can assign to your partners to "
 "better manage your interactions with them. The segmentation tool is able to "
 "assign categories to partners according to criteria you set."
-msgstr ""
+msgstr "创建指定的业务伙伴类型，细分规则可以根据你设定的规则去指定业务伙伴的类型，以便你可以为更好管理他们和他们互动。"
 
 #. module: crm
 #: field:crm.case.section,code:0
 msgid "Code"
-msgstr ""
+msgstr "编码"
 
 #. module: crm
 #: field:crm.case.section,child_ids:0
 msgid "Child Teams"
-msgstr ""
+msgstr "子"
 
 #. module: crm
 #: view:crm.lead:0
@@ -1555,12 +1574,12 @@ msgstr "状态"
 #. module: crm
 #: field:crm.meeting,freq:0
 msgid "Frequency"
-msgstr ""
+msgstr "频率"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "References"
-msgstr "参照"
+msgstr "参考"
 
 #. module: crm
 #: code:addons/crm/crm.py:392
@@ -1584,19 +1603,19 @@ msgstr ""
 #. module: crm
 #: model:ir.model,name:crm.model_crm_merge_opportunity
 msgid "Merge two Opportunities"
-msgstr ""
+msgstr "合并两个商机"
 
 #. module: crm
 #: selection:crm.meeting,end_type:0
 msgid "Fix amout of times"
-msgstr ""
+msgstr "修改的时间"
 
 #. module: crm
 #: view:crm.lead:0
 #: view:crm.meeting:0
 #: view:crm.phonecall:0
 msgid "Current"
-msgstr ""
+msgstr "当前的"
 
 #. module: crm
 #: field:crm.meeting,exrule:0
@@ -1606,27 +1625,27 @@ msgstr "例外规则"
 #. module: crm
 #: help:base.action.rule,act_mail_to_partner:0
 msgid "Check this if you want the rule to send an email to the partner."
-msgstr "勾选此项, 如果你想规定发Email给业务伙伴"
+msgstr "勾选此项, 如果你想规定发邮件l给业务伙伴"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_phonecall_categ_action
 msgid "Phonecall Categories"
-msgstr ""
+msgstr "电话访问类型"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Invite People"
-msgstr ""
+msgstr "邀请他人"
 
 #. module: crm
 #: constraint:crm.case.section:0
 msgid "Error ! You cannot create recursive Sales team."
-msgstr ""
+msgstr "错误！你不能创建递归的销售团队"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Search Meetings"
-msgstr "查询会议"
+msgstr "查找会议"
 
 #. module: crm
 #: selection:crm.segmentation.line,expr_name:0
@@ -1637,7 +1656,7 @@ msgstr "销售金额"
 #: code:addons/crm/wizard/crm_send_email.py:141
 #, python-format
 msgid "Unable to send mail. Please check SMTP is configured properly."
-msgstr ""
+msgstr "无法发送邮件。请检查SMTP是否设置正确。"
 
 #. module: crm
 #: selection:crm.segmentation.line,expr_operator:0
@@ -1647,7 +1666,7 @@ msgstr "="
 #. module: crm
 #: selection:crm.meeting,state:0
 msgid "Unconfirmed"
-msgstr ""
+msgstr "未确认"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.action_report_crm_opportunity
@@ -1658,6 +1677,7 @@ msgid ""
 "mainly used by the sales manager in order to do the periodic review with the "
 "teams of the sales pipeline."
 msgstr ""
+"商机分析给你随时访问商机的信息如：预期收入、计划成本、错过的最后时限或者每个商机的互动次数。这个报表主要给销售经理定期审查这团队里的业务员。"
 
 #. module: crm
 #: field:crm.case.categ,name:0
@@ -1672,7 +1692,7 @@ msgstr "名称"
 #: field:crm.meeting,alarm_id:0
 #: field:crm.meeting,base_calendar_alarm_id:0
 msgid "Alarm"
-msgstr "报警"
+msgstr "警告"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_lead_stage_act
@@ -1680,41 +1700,41 @@ msgid ""
 "Add specific stages to leads and opportunities allowing your sales to better "
 "organise their sales pipeline. Stages will allow them to easily track how a "
 "specific lead or opportunity is positioned in the sales cycle."
-msgstr ""
+msgstr "为你的销售的线索和商机增加特定的阶段以便更好组织你的销售渠道。阶段使你更轻松跟踪指定的线索或在销售周期中的商机。"
 
 #. module: crm
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
 msgid "My Case(s)"
-msgstr ""
+msgstr "我的业务"
 
 #. module: crm
 #: field:crm.lead,birthdate:0
 msgid "Birthdate"
-msgstr ""
+msgstr "生日"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "The"
-msgstr ""
+msgstr "这"
 
 #. module: crm
 #: field:crm.send.mail.attachment,wizard_id:0
 msgid "Wizard"
-msgstr ""
+msgstr "向导"
 
 #. module: crm
 #: help:crm.lead,section_id:0
 msgid ""
 "Sales team to which this case belongs to. Defines responsible user and e-"
 "mail address for the mail gateway."
-msgstr ""
+msgstr "设定这业务销售团队的负责人和邮件地址"
 
 #. module: crm
 #: view:crm.lead:0
 #: view:crm.phonecall:0
 msgid "Creation"
-msgstr ""
+msgstr "创建时间"
 
 #. module: crm
 #: selection:crm.lead,priority:0
@@ -1732,7 +1752,7 @@ msgstr "把潜在客户转成业务伙伴"
 #. module: crm
 #: view:crm.phonecall2opportunity:0
 msgid "_Convert"
-msgstr ""
+msgstr "转换(_C)"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.action_view_attendee_form
@@ -1740,12 +1760,12 @@ msgid ""
 "With Meeting Invitations you can create and manage the meeting invitations "
 "sent/to be sent to your colleagues/partners. You can not only invite OpenERP "
 "users, but also external parties, such as a customer."
-msgstr ""
+msgstr "与会邀请你可以创建和管理会议邀请发送给你的同事、业务伙伴。你不仅能邀请系统的用户还可以邀请外部人士如客户。"
 
 #. module: crm
 #: selection:crm.meeting,week_list:0
 msgid "Saturday"
-msgstr ""
+msgstr "周六"
 
 #. module: crm
 #: selection:crm.meeting,byday:0
@@ -1755,22 +1775,22 @@ msgstr ""
 #. module: crm
 #: view:crm.phonecall2phonecall:0
 msgid "_Schedule"
-msgstr ""
+msgstr "时间表(S)"
 
 #. module: crm
 #: field:crm.lead.report,delay_close:0
 msgid "Delay to Close"
-msgstr ""
+msgstr "延迟关闭"
 
 #. module: crm
 #: field:crm.meeting,we:0
 msgid "Wed"
-msgstr ""
+msgstr "周三"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor6
 msgid "Potential Reseller"
-msgstr ""
+msgstr "潜在分销商"
 
 #. module: crm
 #: field:crm.lead.report,planned_revenue:0
@@ -1784,32 +1804,32 @@ msgstr "计划收入"
 #: view:crm.phonecall:0
 #: view:crm.phonecall.report:0
 msgid "Group By..."
-msgstr ""
+msgstr "分组于"
 
 #. module: crm
 #: help:crm.lead,partner_id:0
 msgid "Optional linked partner, usually after conversion of the lead"
-msgstr ""
+msgstr "可选联系业务伙伴，通常在线索转换后"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Invitation details"
-msgstr ""
+msgstr "邀请详情"
 
 #. module: crm
 #: field:crm.case.section,parent_id:0
 msgid "Parent Team"
-msgstr ""
+msgstr "父团队"
 
 #. module: crm
 #: field:crm.lead,date_action:0
 msgid "Next Action Date"
-msgstr ""
+msgstr "下一动作日期"
 
 #. module: crm
 #: selection:crm.segmentation,state:0
 msgid "Running"
-msgstr "正在运行"
+msgstr "运行中"
 
 #. module: crm
 #: selection:crm.meeting,freq:0
@@ -1825,12 +1845,12 @@ msgstr ""
 #: code:addons/crm/crm_lead.py:213
 #, python-format
 msgid "The case '%s' has been opened."
-msgstr ""
+msgstr "这业务'%s'已开启"
 
 #. module: crm
 #: view:crm.installer:0
 msgid "title"
-msgstr ""
+msgstr "标题"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_phone1
@@ -1844,28 +1864,28 @@ msgstr "来电"
 msgid ""
 "This percentage depicts the default/average probability of the Case for this "
 "stage to be a success"
-msgstr ""
+msgstr "这默认百分比描述业务在这阶段的平均的成功概率"
 
 #. module: crm
 #: view:crm.phonecall.report:0
 #: model:ir.actions.act_window,name:crm.act_crm_opportunity_crm_phonecall_new
 msgid "Phone calls"
-msgstr ""
+msgstr "电话访问"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Communication  History"
-msgstr ""
+msgstr "沟通日志"
 
 #. module: crm
 #: selection:crm.meeting,show_as:0
 msgid "Free"
-msgstr ""
+msgstr "自由"
 
 #. module: crm
 #: view:crm.installer:0
 msgid "Synchronization"
-msgstr ""
+msgstr "同步"
 
 #. module: crm
 #: field:crm.case.section,allow_unlink:0
@@ -1875,7 +1895,7 @@ msgstr "允许删除"
 #. module: crm
 #: field:crm.meeting,mo:0
 msgid "Mon"
-msgstr ""
+msgstr "周一"
 
 #. module: crm
 #: selection:crm.lead,priority:0
@@ -1893,18 +1913,19 @@ msgid ""
 "with a partner. From the phone call form, you can trigger a request for "
 "another call, a meeting or an opportunity."
 msgstr ""
+"来电管理可以让你记录你的来电，每通电话访问你将出现在业务伙伴界面追溯每个与业务伙伴的联系。从电话访问你可以触发其它的电话访问、会议或商机。"
 
 #. module: crm
 #: help:crm.meeting,recurrency:0
 msgid "Recurrent Meeting"
-msgstr ""
+msgstr "循环性会议"
 
 #. module: crm
 #: view:crm.case.section:0
 #: view:crm.lead:0
 #: field:crm.lead,description:0
 msgid "Notes"
-msgstr ""
+msgstr "备注"
 
 #. module: crm
 #: selection:crm.meeting,freq:0
@@ -1920,13 +1941,13 @@ msgstr "值"
 #: view:crm.lead:0
 #: view:crm.lead.report:0
 msgid "Opportunity by Categories"
-msgstr ""
+msgstr "商机类型"
 
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead,partner_name:0
 msgid "Customer Name"
-msgstr ""
+msgstr "客户名称"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_categ_meet
@@ -1935,12 +1956,12 @@ msgid ""
 "with other applications such as the employee holidays or the business "
 "opportunities. You can also synchronize meetings with your mobile phone "
 "using the caldav interface."
-msgstr ""
+msgstr "会议日程是在销售团队间共享并与其它应用充分集成。如雇员假期或商机。你还可以通过caldav接口同步你的手机和会议"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall2opportunity
 msgid "Phonecall To Opportunity"
-msgstr ""
+msgstr "电话访问转换到商机"
 
 #. module: crm
 #: field:crm.case.section,reply_to:0
@@ -1950,29 +1971,29 @@ msgstr "回复到"
 #. module: crm
 #: view:crm.case.section:0
 msgid "Select stages for this Sales Team"
-msgstr ""
+msgstr "为销售团队选择阶段"
 
 #. module: crm
 #: view:board.board:0
 msgid "Opportunities by Stage"
-msgstr ""
+msgstr "商机的阶段"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Recurrency Option"
-msgstr ""
+msgstr "循环选择"
 
 #. module: crm
 #: model:process.transition,note:crm.process_transition_leadpartner0
 msgid "Prospect is converting to business partner"
-msgstr "潜在客户转为业务伙伴"
+msgstr "潜在客户转换为业务伙伴"
 
 #. module: crm
 #: view:crm.lead2opportunity:0
 #: view:crm.partner2opportunity:0
 #: model:ir.actions.act_window,name:crm.phonecall2opportunity_act
 msgid "Convert To Opportunity"
-msgstr "转为商机"
+msgstr "转换为商机"
 
 #. module: crm
 #: view:crm.phonecall:0
@@ -1998,12 +2019,12 @@ msgstr "额外信息"
 #: model:ir.actions.act_window,name:crm.action_merge_opportunities
 #: model:ir.actions.act_window,name:crm.merge_opportunity_act
 msgid "Merge Opportunities"
-msgstr ""
+msgstr "合并商机"
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead5
 msgid "Google Adwords"
-msgstr ""
+msgstr "google"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall
@@ -2013,12 +2034,12 @@ msgstr ""
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead3
 msgid "Mail Campaign 2"
-msgstr ""
+msgstr "邮件营销活动 2"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Create"
-msgstr ""
+msgstr "创建"
 
 #. module: crm
 #: view:crm.lead:0
@@ -2040,7 +2061,7 @@ msgstr "发送"
 #: view:crm.phonecall.report:0
 #: field:crm.phonecall.report,priority:0
 msgid "Priority"
-msgstr "优先级"
+msgstr "优先级(0=紧急)"
 
 #. module: crm
 #: field:crm.segmentation,sales_purchase_active:0
@@ -2050,7 +2071,7 @@ msgstr "使用这销售采购规则"
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead2opportunity_partner
 msgid "Lead To Opportunity Partner"
-msgstr ""
+msgstr "线索转换为业务伙伴或商机"
 
 #. module: crm
 #: field:crm.meeting,location:0
@@ -2060,12 +2081,12 @@ msgstr "地点"
 #. module: crm
 #: view:crm.lead:0
 msgid "Reply"
-msgstr ""
+msgstr "回复"
 
 #. module: crm
 #: selection:crm.meeting,freq:0
 msgid "Weeks"
-msgstr ""
+msgstr "周"
 
 #. module: crm
 #: model:process.node,note:crm.process_node_meeting0
@@ -2083,7 +2104,7 @@ msgstr "错误！"
 msgid ""
 "Create different meeting categories to better organize and classify your "
 "meetings."
-msgstr ""
+msgstr "创建不同类型的会议以便更好组织和把会议分类"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_segmentation_line
@@ -2104,23 +2125,23 @@ msgstr "Caldav 服务的URL"
 #. module: crm
 #: view:crm.lead:0
 msgid "Expected Revenues"
-msgstr ""
+msgstr "预期收入"
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead6
 msgid "Google Adwords 2"
-msgstr ""
+msgstr "google 2"
 
 #. module: crm
 #: help:crm.lead,type:0
 #: help:crm.lead.report,type:0
 msgid "Type is used to separate Leads and Opportunities"
-msgstr ""
+msgstr "类型用于区分线索和商机"
 
 #. module: crm
 #: view:crm.phonecall2partner:0
 msgid "Are you sure you want to create a partner based on this Phonecall ?"
-msgstr ""
+msgstr "你确定你基于这电话访问创建的业务伙伴？"
 
 #. module: crm
 #: selection:crm.lead.report,month:0
@@ -2138,23 +2159,25 @@ msgid ""
 "The opportunities and sales order displayed, will automatically be filtered "
 "according to his team."
 msgstr ""
+"定义销售团队组织你不同的业务员或者销售部门成立一个独立的团队。每个团队工作在自己的商机‘销售单，如每个用户能设置默认的团队的客户偏好。商机和销售订单将根据"
+"他的团队自动过滤。"
 
 #. module: crm
 #: help:crm.meeting,count:0
 msgid "Repeat x times"
-msgstr ""
+msgstr "重复 x 时间"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_section_act
 #: model:ir.model,name:crm.model_crm_case_section
 #: model:ir.ui.menu,name:crm.menu_crm_case_section_act
 msgid "Sales Teams"
-msgstr ""
+msgstr "销售团队"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead2partner
 msgid "Lead to Partner"
-msgstr ""
+msgstr "线索转换为业务伙伴"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -2166,7 +2189,7 @@ msgstr "细分"
 #. module: crm
 #: view:crm.lead:0
 msgid "Team"
-msgstr ""
+msgstr "团队"
 
 #. module: crm
 #: field:crm.installer,outlook:0
@@ -2183,7 +2206,7 @@ msgstr "不保留"
 #. module: crm
 #: field:crm.lead.report,probability:0
 msgid "Probability"
-msgstr ""
+msgstr "概率"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -2200,7 +2223,7 @@ msgstr "月份"
 #: model:ir.ui.menu,name:crm.menu_crm_case_categ0_act_leads
 #: model:process.node,name:crm.process_node_leads0
 msgid "Leads"
-msgstr "营销线索"
+msgstr "线索"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
@@ -2215,6 +2238,9 @@ msgid ""
 "email gateway: new emails may create leads, each of them automatically gets "
 "the history of the conversation with the prospect."
 msgstr ""
+"线索允许你管理和跟踪对对你产品或服务有兴趣的潜在业务伙伴的初次接触。通常线索是你销售周期的第一步。一旦合适，线索转换为商机，同时创建与相关业务伙伴的进一步"
+"详细跟踪链接活动。你可以导入潜在业务伙伴的数据，跟踪你的商业活动或整合系统线索和与你的联系。线索能连接到邮件网关：新的邮件可能创造线索，它能自动获得与潜在"
+"业务伙伴的每个联系日志。"
 
 #. module: crm
 #: selection:crm.lead2opportunity.partner,action:0
@@ -2227,28 +2253,28 @@ msgstr "创建新的业务伙伴"
 #: view:crm.meeting:0
 #: view:res.partner:0
 msgid "Start Date"
-msgstr ""
+msgstr "开启日期"
 
 #. module: crm
 #: selection:crm.phonecall,state:0
 #: view:crm.phonecall.report:0
 msgid "Todo"
-msgstr ""
+msgstr "待办"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Delegate"
-msgstr ""
+msgstr "委派"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Decline"
-msgstr ""
+msgstr "拒绝"
 
 #. module: crm
 #: help:crm.lead,optin:0
 msgid "If opt-in is checked, this contact has accepted to receive emails."
-msgstr ""
+msgstr "如果选择订阅，这联系人同意接收邮件。"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -2265,7 +2291,7 @@ msgstr "备注"
 #. module: crm
 #: constraint:res.users:0
 msgid "The chosen company is not in the allowed companies for this user"
-msgstr ""
+msgstr "选择的公司不属于此用户允许访问的公司。"
 
 #. module: crm
 #: selection:crm.lead,priority:0
@@ -2292,7 +2318,7 @@ msgstr "已关闭"
 #. module: crm
 #: view:crm.installer:0
 msgid "Plug-In"
-msgstr ""
+msgstr "插件"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_meet2
@@ -2312,7 +2338,7 @@ msgstr "内部会议"
 #: selection:crm.send.mail,state:0
 #, python-format
 msgid "Pending"
-msgstr "悬而未决"
+msgstr "待处理"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_meet1
@@ -2323,7 +2349,7 @@ msgstr "客户会议"
 #: view:crm.lead:0
 #: field:crm.lead,email_cc:0
 msgid "Global CC"
-msgstr ""
+msgstr "完整抄送"
 
 #. module: crm
 #: view:crm.phonecall:0
@@ -2331,13 +2357,13 @@ msgstr ""
 #: model:ir.ui.menu,name:crm.menu_crm_case_phone
 #: view:res.partner:0
 msgid "Phone Calls"
-msgstr "电话呼叫"
+msgstr "电话访问"
 
 #. module: crm
 #: help:crm.lead.report,delay_open:0
 #: help:crm.phonecall.report,delay_open:0
 msgid "Number of Days to open the case"
-msgstr ""
+msgstr "业务开启的天数"
 
 #. module: crm
 #: field:crm.lead,phone:0
@@ -2358,13 +2384,13 @@ msgstr "有效"
 #: code:addons/crm/crm_lead.py:306
 #, python-format
 msgid "The stage of opportunity '%s' has been changed to '%s'."
-msgstr ""
+msgstr "这商机的阶段’%s'已改为'%s'。"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:282
 #, python-format
 msgid "Changed Stage to: %s"
-msgstr ""
+msgstr "修改阶段为'%s'"
 
 #. module: crm
 #: selection:crm.segmentation.line,operator:0
@@ -2379,7 +2405,7 @@ msgstr ">"
 #. module: crm
 #: view:crm.meeting:0
 msgid "Uncertain"
-msgstr ""
+msgstr "不确定"
 
 #. module: crm
 #: field:crm.send.mail,email_cc:0
@@ -2395,19 +2421,19 @@ msgstr "发送邮件"
 #. module: crm
 #: selection:crm.meeting,freq:0
 msgid "Months"
-msgstr "月份"
+msgstr "月"
 
 #. module: crm
 #: help:crm.installer,wiki_sale_faq:0
 msgid ""
 "Helps you manage wiki pages for Frequently Asked Questions on Sales "
 "Application."
-msgstr ""
+msgstr "帮助你管理销售应用程序问题与解答的wiki网页"
 
 #. module: crm
 #: help:crm.installer,crm_fundraising:0
 msgid "This may help associations in their fundraising process and tracking."
-msgstr ""
+msgstr "这可能会帮助组织集资的处理和跟踪"
 
 #. module: crm
 #: field:crm.lead2opportunity.partner,action:0
@@ -2431,12 +2457,12 @@ msgstr "下降因子(0.0>1.0)"
 #: view:crm.lead:0
 #: view:crm.send.mail:0
 msgid "Attachments"
-msgstr ""
+msgstr "附件"
 
 #. module: crm
 #: selection:crm.meeting,rrule_type:0
 msgid "Weekly"
-msgstr ""
+msgstr "按周"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_send_email.py:72
@@ -2444,12 +2470,12 @@ msgstr ""
 #: code:addons/crm/wizard/crm_send_email.py:270
 #, python-format
 msgid "Can not send mail!"
-msgstr ""
+msgstr "发送邮件失败!"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Misc"
-msgstr ""
+msgstr "杂项"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor8
@@ -2467,7 +2493,7 @@ msgstr "完成"
 #. module: crm
 #: help:crm.meeting,interval:0
 msgid "Repeat every (Days/Week/Month/Year)"
-msgstr ""
+msgstr "重复间隔（日/周/年）"
 
 #. module: crm
 #: field:crm.segmentation,som_interval_max:0
@@ -2477,7 +2503,7 @@ msgstr "最大间隔"
 #. module: crm
 #: view:crm.opportunity2phonecall:0
 msgid "_Schedule Call"
-msgstr ""
+msgstr "_计划的电话访问"
 
 #. module: crm
 #: code:addons/crm/crm.py:326
@@ -2492,64 +2518,64 @@ msgstr ""
 #: view:res.partner:0
 #, python-format
 msgid "Open"
-msgstr "待处理"
+msgstr "开启"
 
 #. module: crm
 #: selection:crm.meeting,week_list:0
 msgid "Tuesday"
-msgstr ""
+msgstr "周二"
 
 #. module: crm
 #: field:crm.lead,city:0
 msgid "City"
-msgstr ""
+msgstr "城市"
 
 #. module: crm
 #: selection:crm.meeting,show_as:0
 msgid "Busy"
-msgstr ""
+msgstr "忙碌"
 
 #. module: crm
 #: field:crm.meeting,interval:0
 msgid "Repeat every"
-msgstr ""
+msgstr "重复间隔"
 
 #. module: crm
 #: field:crm.installer,crm_helpdesk:0
 msgid "Helpdesk"
-msgstr "帮助平台"
+msgstr "服务台"
 
 #. module: crm
 #: field:crm.meeting,recurrency:0
 msgid "Recurrent"
-msgstr ""
+msgstr "循环"
 
 #. module: crm
 #: code:addons/crm/crm.py:397
 #, python-format
 msgid "The case '%s' has been cancelled."
-msgstr ""
+msgstr "这业务'%s'已取消"
 
 #. module: crm
 #: field:crm.installer,sale_crm:0
 msgid "Opportunity to Quotation"
-msgstr ""
+msgstr "商机转换为报价"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_send_mail
 msgid "Send new email"
-msgstr ""
+msgstr "发送新的邮件"
 
 #. module: crm
 #: view:board.board:0
 #: model:ir.actions.act_window,name:crm.act_my_oppor
 msgid "My Open Opportunities"
-msgstr ""
+msgstr "我开启的商机"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.open_board_statistical_dash
 msgid "CRM - Statistics Dashboard"
-msgstr ""
+msgstr "客户关系管理 - 统计控制台"
 
 #. module: crm
 #: help:crm.meeting,rrule:0
@@ -2558,34 +2584,36 @@ msgid ""
 "e.g.: Every other month on the last Sunday of the month for 10 occurrences:  "
 "      FREQ=MONTHLY;INTERVAL=2;COUNT=10;BYDAY=-1SU"
 msgstr ""
+"为循环事件定义一个规则或重复模式。\n"
+"如：在每隔一个月在这个月的最后一个星期天出现10次； FREQ=MONTHLY;INTERVAL=2;COUNT=10;BYDAY=-1SU"
 
 #. module: crm
 #: field:crm.lead,job_id:0
 msgid "Main Job"
-msgstr ""
+msgstr "主业"
 
 #. module: crm
 #: field:base.action.rule,trg_max_history:0
 msgid "Maximum Communication History"
-msgstr "最多的沟通日志"
+msgstr "最大的沟通日志"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner:0
 #: view:crm.lead2partner:0
 msgid "Are you sure you want to create a partner based on this lead ?"
-msgstr "你确定要根据这营销线索创建这业务伙伴？"
+msgstr "你确定要根据这条线索创建这业务伙伴？"
 
 #. module: crm
 #: view:crm.meeting:0
 #: field:crm.meeting,categ_id:0
 msgid "Meeting Type"
-msgstr ""
+msgstr "会议类型"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_lead_to_opportunity.py:312
 #, python-format
 msgid "Merge with Existing Opportunity"
-msgstr ""
+msgstr "合并现有的商机"
 
 #. module: crm
 #: help:crm.lead,state:0
@@ -2599,80 +2627,80 @@ msgid ""
 "       \n"
 "If the case needs to be reviewed then the state is set to 'Pending'."
 msgstr ""
-"当一个业务个案创建时状态设为'草稿'\n"
-"如果业务个案正在处理状态设为'待处理'\n"
-"当业务个案结束状态设为'完成'\n"
-"如果业务个案需要审查状态设为'悬而未决'"
+"当一个业务创建时状态设为'草稿'\n"
+"如果业务正在处理状态设为'开启'\n"
+"当业务结束状态设为'完成'\n"
+"如果业务需要审查状态设为'待定'"
 
 #. module: crm
 #: view:crm.meeting:0
 #: view:res.partner:0
 msgid "End Date"
-msgstr ""
+msgstr "结束日期"
 
 #. module: crm
 #: selection:crm.meeting,byday:0
 msgid "Third"
-msgstr ""
+msgstr "其三"
 
 #. module: crm
 #: help:crm.segmentation,som_interval_max:0
 msgid ""
 "The computation is made on all events that occured during this interval, the "
 "past X periods."
-msgstr "此计算是基于在在此期间发生的所有事件, 过去的X期间"
+msgstr "这计算是基于在过去 X 期间发生的所有事件。"
 
 #. module: crm
 #: view:board.board:0
 msgid "My Win/Lost Ratio for the Last Year"
-msgstr ""
+msgstr "在过去一年我获得/丢失的比例"
 
 #. module: crm
 #: field:crm.installer,thunderbird:0
 msgid "Thunderbird"
-msgstr ""
+msgstr "雷鸟邮件客户端"
 
 #. module: crm
 #: view:crm.lead.report:0
 msgid "# of Emails"
-msgstr ""
+msgstr "邮件"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Search Leads"
-msgstr "查询营销线索"
+msgstr "查询线索"
 
 #. module: crm
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
 #: field:crm.phonecall.report,delay_open:0
 msgid "Delay to open"
-msgstr ""
+msgstr "延迟开启"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Recurrency period"
-msgstr ""
+msgstr "循环周期"
 
 #. module: crm
 #: field:crm.meeting,week_list:0
 msgid "Weekday"
-msgstr ""
+msgstr "工作日"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Referrer"
-msgstr ""
+msgstr "参考"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead2opportunity
 msgid "Lead To Opportunity"
-msgstr ""
+msgstr "线索转换为商机"
 
 #. module: crm
 #: model:ir.model,name:crm.model_calendar_attendee
 msgid "Attendee information"
-msgstr ""
+msgstr "附件信息"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -2687,19 +2715,19 @@ msgstr "继续处理"
 #. module: crm
 #: view:crm.installer:0
 msgid "Configure Your CRM Application"
-msgstr ""
+msgstr "设置你的客户关系模块"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall2partner
 msgid "Phonecall to Partner"
-msgstr ""
+msgstr "电话访问业务伙伴"
 
 #. module: crm
 #: help:crm.lead,partner_name:0
 msgid ""
 "The name of the future partner that will be created while converting the "
 "into opportunity"
-msgstr ""
+msgstr "当转换为商机时创建未来业务伙伴名称"
 
 #. module: crm
 #: field:crm.opportunity2phonecall,user_id:0
@@ -2711,7 +2739,7 @@ msgstr "分配到"
 #: field:crm.add.note,state:0
 #: field:crm.send.mail,state:0
 msgid "Set New State To"
-msgstr ""
+msgstr "设定新状态"
 
 #. module: crm
 #: field:crm.lead,date_action_last:0
@@ -2730,42 +2758,42 @@ msgstr "持续时间"
 #. module: crm
 #: field:crm.send.mail,reply_to:0
 msgid "Reply To"
-msgstr ""
+msgstr "回复"
 
 #. module: crm
 #: view:board.board:0
 #: model:ir.actions.act_window,name:crm.open_board_crm
 #: model:ir.ui.menu,name:crm.menu_board_crm
 msgid "Sales Dashboard"
-msgstr ""
+msgstr "销售控制台"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_lead_to_partner.py:56
 #, python-format
 msgid "A partner is already defined on this lead."
-msgstr "此营销线索已定义业务伙伴"
+msgstr "这线索已定义业务伙伴"
 
 #. module: crm
 #: field:crm.lead.report,nbr:0
 #: field:crm.phonecall.report,nbr:0
 msgid "# of Cases"
-msgstr "# 业务个案"
+msgstr "# 业务"
 
 #. module: crm
 #: help:crm.meeting,section_id:0
 #: help:crm.phonecall,section_id:0
 msgid "Sales team to which Case belongs to."
-msgstr ""
+msgstr "销售团队属于那个业务"
 
 #. module: crm
 #: selection:crm.meeting,week_list:0
 msgid "Sunday"
-msgstr ""
+msgstr "周日"
 
 #. module: crm
 #: selection:crm.meeting,byday:0
 msgid "Fourth"
-msgstr ""
+msgstr "4"
 
 #. module: crm
 #: selection:crm.add.note,state:0
@@ -2778,12 +2806,12 @@ msgstr "未更改"
 #: model:ir.actions.act_window,name:crm.crm_segmentation_tree-act
 #: model:ir.ui.menu,name:crm.menu_crm_segmentation-act
 msgid "Partners Segmentation"
-msgstr ""
+msgstr "业务伙伴细分"
 
 #. module: crm
 #: field:crm.lead,fax:0
 msgid "Fax"
-msgstr ""
+msgstr "传真"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
@@ -2800,11 +2828,15 @@ msgid ""
 "opportunities, convert them into quotations, manage related documents, track "
 "all customer related activities, and much more."
 msgstr ""
+"对于商机你可以管理和与你的销售渠道创建的特定客户或者跟进潜在销售相关的销售单保持联系，信息如：预期收入，商机的阶段，预计结束日期，大量的沟通日志，通过邮件"
+"网关商机能和邮件相连：新的邮件可能能创建新的商机，他们能自动获得和客户交流的日志。\n"
+"\n"
+"你和你的团队可以为会议和从电话访问来的商机做计划，把它们转换成报价，管理相关文档，跟踪所有相关客户的活动等。。"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Assignment"
-msgstr ""
+msgstr "分配"
 
 #. module: crm
 #: field:crm.lead,company_id:0
@@ -2819,12 +2851,12 @@ msgstr "公司"
 #. module: crm
 #: selection:crm.meeting,week_list:0
 msgid "Friday"
-msgstr ""
+msgstr "周五"
 
 #. module: crm
 #: field:crm.meeting,allday:0
 msgid "All Day"
-msgstr ""
+msgstr "整天"
 
 #. module: crm
 #: field:crm.segmentation.line,operator:0
@@ -2835,51 +2867,51 @@ msgstr "强制的/ 可选的"
 #: model:ir.actions.act_window,name:crm.action_view_attendee_form
 #: model:ir.ui.menu,name:crm.menu_attendee_invitations
 msgid "Meeting Invitations"
-msgstr ""
+msgstr "会议邀请"
 
 #. module: crm
 #: field:crm.case.categ,object_id:0
 msgid "Object Name"
-msgstr ""
+msgstr "对象名"
 
 #. module: crm
 #: help:crm.lead,email_from:0
 msgid "E-mail address of the contact"
-msgstr ""
+msgstr "这联系的邮件地址"
 
 #. module: crm
 #: field:crm.lead,referred:0
 msgid "Referred By"
-msgstr ""
+msgstr "参考来自"
 
 #. module: crm
 #: view:crm.lead:0
 #: model:ir.model,name:crm.model_crm_add_note
 msgid "Add Internal Note"
-msgstr ""
+msgstr "添加内部备注"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:304
 #, python-format
 msgid "The stage of lead '%s' has been changed to '%s'."
-msgstr ""
+msgstr "这线索的阶段从 '%s' 改为 '%s'"
 
 #. module: crm
 #: selection:crm.meeting,byday:0
 msgid "Last"
-msgstr ""
+msgstr "最后"
 
 #. module: crm
 #: field:crm.lead,message_ids:0
 #: field:crm.meeting,message_ids:0
 #: field:crm.phonecall,message_ids:0
 msgid "Messages"
-msgstr ""
+msgstr "消息"
 
 #. module: crm
 #: help:crm.case.stage,on_change:0
 msgid "Change Probability on next and previous stages."
-msgstr ""
+msgstr "在下一和前一阶段修改可能性"
 
 #. module: crm
 #: code:addons/crm/crm.py:455
@@ -2894,7 +2926,7 @@ msgstr "错误!"
 #: field:crm.opportunity2phonecall,name:0
 #: field:crm.phonecall2phonecall,name:0
 msgid "Call summary"
-msgstr ""
+msgstr "电话访问摘要"
 
 #. module: crm
 #: selection:crm.add.note,state:0
@@ -2911,29 +2943,29 @@ msgstr "已取消"
 #. module: crm
 #: field:crm.add.note,body:0
 msgid "Note Body"
-msgstr ""
+msgstr "备注内容"
 
 #. module: crm
 #: view:board.board:0
 msgid "My Planned Revenues by Stage"
-msgstr ""
+msgstr "这阶段我的计划收入"
 
 #. module: crm
 #: field:crm.lead.report,date_closed:0
 #: field:crm.phonecall.report,date_closed:0
 msgid "Close Date"
-msgstr ""
+msgstr "结束日期"
 
 #. module: crm
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
 msgid "   Month   "
-msgstr ""
+msgstr "   月   "
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Links"
-msgstr ""
+msgstr "链接"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_lead_categ_action
@@ -2942,14 +2974,14 @@ msgid ""
 "classify and analyse your leads and opportunities. Such categories could for "
 "instance reflect your product structure or the different types of sales you "
 "do."
-msgstr ""
+msgstr "创建具体合适你公司营销活动的类型以便更好地分类和分析线索和商机。例如这类型能反映你的产品结构或对不同类型的销售该怎么做。"
 
 #. module: crm
 #: help:crm.segmentation,som_interval_decrease:0
 msgid ""
 "If the partner has not purchased (or bought) during a period, decrease the "
 "state of mind by this factor. It's a multiplication"
-msgstr ""
+msgstr "如果业务伙伴在一段时间都没有买卖，减少满意度这是一个乘法。"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.action_report_crm_phonecall
@@ -2958,34 +2990,34 @@ msgid ""
 "on their phone calls. You can group or filter the information according to "
 "several criteria and drill down the information, by adding more groups in "
 "the report."
-msgstr ""
+msgstr "在这报表中，你能分析你的销售团队在电话访问上的业绩。你能根据几个标准和向下钻取数据组织或过滤信息。它能在报表中加入更多的组。"
 
 #. module: crm
 #: view:crm.case.section:0
 msgid "Mailgateway"
-msgstr ""
+msgstr "邮件网关"
 
 #. module: crm
 #: help:crm.lead,user_id:0
 msgid "By Default Salesman is Administrator when create New User"
-msgstr ""
+msgstr "当管理员创建新用户时默认是业务员"
 
 #. module: crm
 #: view:crm.lead.report:0
 msgid "# Mails"
-msgstr ""
+msgstr "邮件"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:57
 #, python-format
 msgid "Warning"
-msgstr ""
+msgstr "警告"
 
 #. module: crm
 #: field:crm.phonecall,name:0
 #: view:res.partner:0
 msgid "Call Summary"
-msgstr "呼叫概要"
+msgstr "电话访问摘要"
 
 #. module: crm
 #: field:crm.segmentation.line,expr_operator:0
@@ -2995,17 +3027,17 @@ msgstr "运算符"
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall2phonecall
 msgid "Phonecall To Phonecall"
-msgstr ""
+msgstr "电话访问到电话访问"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Schedule/Log Call"
-msgstr ""
+msgstr "计划/电话访问的记录"
 
 #. module: crm
 #: field:crm.installer,fetchmail:0
 msgid "Fetch Emails"
-msgstr ""
+msgstr "取邮件"
 
 #. module: crm
 #: selection:crm.meeting,state:0
@@ -3017,27 +3049,27 @@ msgstr "已确认"
 msgid ""
 "These addresses will receive a copy of this email. To modify the permanent "
 "CC list, edit the global CC field of this case"
-msgstr ""
+msgstr "这些地址讲收到这邮件的副本。要永久修改这些抄送地址列表编辑这业务的全局抄送字段。"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Confirm"
-msgstr ""
+msgstr "确定"
 
 #. module: crm
 #: field:crm.meeting,su:0
 msgid "Sun"
-msgstr ""
+msgstr "周日"
 
 #. module: crm
 #: field:crm.phonecall.report,section_id:0
 msgid "Section"
-msgstr "划分的业务个案"
+msgstr "分类"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Total of Planned Revenue"
-msgstr ""
+msgstr "计划收入合计"
 
 #. module: crm
 #: code:addons/crm/crm.py:375
@@ -3045,7 +3077,7 @@ msgstr ""
 msgid ""
 "You can not escalate, You are already at the top level regarding your sales-"
 "team category."
-msgstr ""
+msgstr "你不能再提升了，因为你已经在你的销售团队类型的最高级"
 
 #. module: crm
 #: selection:crm.segmentation.line,operator:0
@@ -3055,12 +3087,12 @@ msgstr "可选表达式"
 #. module: crm
 #: selection:crm.meeting,select1:0
 msgid "Day of month"
-msgstr ""
+msgstr "日"
 
 #. module: crm
 #: field:crm.lead2opportunity,probability:0
 msgid "Success Rate (%)"
-msgstr ""
+msgstr "成功率(%)"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead1
@@ -3071,7 +3103,7 @@ msgstr "新建"
 #. module: crm
 #: view:crm.meeting:0
 msgid "Mail TO"
-msgstr ""
+msgstr "发邮件到"
 
 #. module: crm
 #: view:crm.lead:0
@@ -3079,7 +3111,7 @@ msgstr ""
 #: field:crm.meeting,email_from:0
 #: field:crm.phonecall,email_from:0
 msgid "Email"
-msgstr "Email"
+msgstr "电子邮件"
 
 #. module: crm
 #: view:crm.lead:0
@@ -3088,19 +3120,19 @@ msgstr "Email"
 #: field:crm.lead.report,channel_id:0
 #: field:crm.phonecall,canal_id:0
 msgid "Channel"
-msgstr "渠道"
+msgstr "途径"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.opportunity2phonecall_act
 msgid "Schedule Call"
-msgstr ""
+msgstr "计划的电话访问"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_lead_to_opportunity.py:133
 #: code:addons/crm/wizard/crm_lead_to_opportunity.py:258
 #, python-format
 msgid "Closed/Cancelled Leads Could not convert into Opportunity"
-msgstr ""
+msgstr "已结束/已取消的线索不能转换为商机"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -3115,43 +3147,45 @@ msgid ""
 "If checked, remove the category from partners that doesn't match "
 "segmentation criterions"
 msgstr ""
+"检测如果这业务伙伴在类型的细分规则下是受限制。\n"
+"如果要选定，请删除在业务伙伴类型细分规则中不匹配的规则"
 
 #. module: crm
 #: field:crm.meeting,exdate:0
 msgid "Exception Date/Times"
-msgstr "异常日期/ 时间"
+msgstr "例外的日期/ 时间"
 
 #. module: crm
 #: selection:crm.meeting,class:0
 msgid "Confidential"
-msgstr ""
+msgstr "机密"
 
 #. module: crm
 #: help:crm.meeting,date_deadline:0
 msgid ""
 "Deadline Date is automatically                         computed from Start "
 "Date + Duration"
-msgstr ""
+msgstr "截止日期是自动计算的：开始日期 +  持续时间"
 
 #. module: crm
 #: field:crm.lead,state_id:0
 msgid "Fed. State"
-msgstr ""
+msgstr "省/州"
 
 #. module: crm
 #: model:process.transition,note:crm.process_transition_leadopportunity0
 msgid "Creating business opportunities from Leads"
-msgstr "从营销线索创建商机"
+msgstr "从线索创建商机"
 
 #. module: crm
 #: help:crm.send.mail,html:0
 msgid "Select this if you want to send email with HTML formatting."
-msgstr ""
+msgstr "如果你想发送HTML格式的邮件，选此"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor4
 msgid "Need Information"
-msgstr ""
+msgstr "需要信息"
 
 #. module: crm
 #: model:process.transition,name:crm.process_transition_leadopportunity0
@@ -3162,12 +3196,12 @@ msgstr "探查商机"
 #: view:crm.installer:0
 #: model:ir.actions.act_window,name:crm.action_crm_installer
 msgid "CRM Application Configuration"
-msgstr ""
+msgstr "业务关系管理模块设置"
 
 #. module: crm
 #: field:base.action.rule,act_categ_id:0
 msgid "Set Category to"
-msgstr ""
+msgstr "设类型为"
 
 #. module: crm
 #: view:crm.case.section:0
@@ -3177,7 +3211,7 @@ msgstr "设置"
 #. module: crm
 #: field:crm.meeting,th:0
 msgid "Thu"
-msgstr ""
+msgstr "周四"
 
 #. module: crm
 #: view:crm.add.note:0
@@ -3194,33 +3228,33 @@ msgstr "取消(_C)"
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
 msgid "    Month-1    "
-msgstr ""
+msgstr "    上月    "
 
 #. module: crm
 #: help:crm.installer,sale_crm:0
 msgid "This module relates sale from opportunity cases in the CRM."
-msgstr ""
+msgstr "这模块涉及在业务关系管理中业务的销售商机"
 
 #. module: crm
 #: selection:crm.meeting,rrule_type:0
 msgid "Daily"
-msgstr ""
+msgstr "每天"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead2
 #: model:crm.case.stage,name:crm.stage_opportunity2
 msgid "Qualification"
-msgstr ""
+msgstr "资格条件"
 
 #. module: crm
 #: view:crm.case.stage:0
 msgid "Stage Definition"
-msgstr ""
+msgstr "阶段定义"
 
 #. module: crm
 #: selection:crm.meeting,byday:0
 msgid "First"
-msgstr ""
+msgstr "首页"
 
 #. module: crm
 #: selection:crm.lead.report,month:0
@@ -3232,7 +3266,7 @@ msgstr "12月"
 #. module: crm
 #: field:crm.installer,config_logo:0
 msgid "Image"
-msgstr ""
+msgstr "图像"
 
 #. module: crm
 #: view:base.action.rule:0
@@ -3250,16 +3284,20 @@ msgid ""
 "bought goods to another supplier.                  \n"
 "Use this functionality for recurring businesses."
 msgstr ""
+"在一个期间两个周期间这细分的业务伙伴销售或采购的平均天数。\n"
+"它主要用来检查业务伙伴有没有业务或者多长时间有。\n"
+"所以因此我们假定他的满意度下降因此向其它供应商采购。\n"
+"对经常的业务使用这功能。"
 
 #. module: crm
 #: view:crm.send.mail:0
 msgid "_Send Reply"
-msgstr ""
+msgstr "_发送回复"
 
 #. module: crm
 #: field:crm.meeting,vtimezone:0
 msgid "Timezone"
-msgstr ""
+msgstr "时区"
 
 #. module: crm
 #: field:crm.lead2opportunity.partner,msg:0
@@ -3271,7 +3309,7 @@ msgstr "消息"
 #. module: crm
 #: field:crm.meeting,sa:0
 msgid "Sat"
-msgstr ""
+msgstr "周六"
 
 #. module: crm
 #: view:crm.lead:0
@@ -3279,32 +3317,32 @@ msgstr ""
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
 msgid "Salesman"
-msgstr "销售员"
+msgstr "业务员"
 
 #. module: crm
 #: field:crm.lead,date_deadline:0
 msgid "Expected Closing"
-msgstr ""
+msgstr "预期结束"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_opportunity2phonecall
 msgid "Opportunity to Phonecall"
-msgstr ""
+msgstr "商机转换为电话访问"
 
 #. module: crm
 #: help:crm.case.section,allow_unlink:0
 msgid "Allows to delete non draft cases"
-msgstr "允许删除不是草稿的业务个案"
+msgstr "允许删除不是草稿的业务"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Schedule Meeting"
-msgstr "会议时间表"
+msgstr "会议计划"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Partner Name"
-msgstr ""
+msgstr "业务伙伴名称"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_phone2
@@ -3317,13 +3355,13 @@ msgstr "致电"
 #: field:crm.lead,date_open:0
 #: field:crm.phonecall,date_open:0
 msgid "Opened"
-msgstr ""
+msgstr "已开启"
 
 #. module: crm
 #: view:crm.case.section:0
 #: field:crm.case.section,member_ids:0
 msgid "Team Members"
-msgstr ""
+msgstr "团队成员"
 
 #. module: crm
 #: view:crm.lead:0
@@ -3332,17 +3370,17 @@ msgstr ""
 #: view:crm.phonecall:0
 #: view:res.partner:0
 msgid "Contacts"
-msgstr ""
+msgstr "联系人列表"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor1
 msgid "Interest in Computer"
-msgstr ""
+msgstr "计算兴趣"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Invitation Detail"
-msgstr ""
+msgstr "邀请内容"
 
 #. module: crm
 #: field:crm.segmentation,som_interval_default:0
@@ -3355,12 +3393,12 @@ msgid ""
 "These email addresses will be added to the CC field of all inbound and "
 "outbound emails for this record before being sent. Separate multiple email "
 "addresses with a comma"
-msgstr ""
+msgstr "这些邮件地址将添加到之前发送记录的发送和接收邮件的抄送字段，分隔多个邮件地址有逗号。"
 
 #. module: crm
 #: constraint:res.partner:0
 msgid "Error ! You can not create recursive associated members."
-msgstr ""
+msgstr "错误！您不能创建递归的相关成员。"
 
 #. module: crm
 #: field:crm.partner2opportunity,probability:0
@@ -3384,7 +3422,7 @@ msgstr "草稿"
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_section_act_tree
 msgid "Cases by Sales Team"
-msgstr ""
+msgstr "该业务的销售团队"
 
 #. module: crm
 #: field:crm.meeting,attendee_ids:0
@@ -3403,33 +3441,33 @@ msgstr "会议"
 #. module: crm
 #: model:ir.model,name:crm.model_crm_case_categ
 msgid "Category of Case"
-msgstr ""
+msgstr "业务类型"
 
 #. module: crm
 #: view:crm.lead:0
 #: view:crm.phonecall:0
 msgid "7 Days"
-msgstr ""
+msgstr "7天"
 
 #. module: crm
 #: view:board.board:0
 msgid "Planned Revenue by Stage and User"
-msgstr ""
+msgstr "阶段的计划收入和用户"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Communication & History"
-msgstr ""
+msgstr "沟通&日志"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead_report
 msgid "CRM Lead Report"
-msgstr ""
+msgstr "客户关系管理线索报表"
 
 #. module: crm
 #: field:crm.installer,progress:0
 msgid "Configuration Progress"
-msgstr ""
+msgstr "设置进度"
 
 #. module: crm
 #: selection:crm.lead,priority:0
@@ -3442,13 +3480,13 @@ msgstr "普通"
 #. module: crm
 #: field:crm.lead,street2:0
 msgid "Street2"
-msgstr ""
+msgstr "街道 2"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_meeting_categ_action
 #: model:ir.ui.menu,name:crm.menu_crm_case_meeting-act
 msgid "Meeting Categories"
-msgstr ""
+msgstr "会议类型"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner:0
@@ -3460,7 +3498,7 @@ msgstr "你可能要核实这个业务伙伴是否已不存在"
 #. module: crm
 #: field:crm.lead.report,delay_open:0
 msgid "Delay to Open"
-msgstr ""
+msgstr "延迟开启"
 
 #. module: crm
 #: field:crm.lead.report,user_id:0
@@ -3484,12 +3522,12 @@ msgstr "没建立你的公司地址邮箱ID!"
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Opportunities By Stage"
-msgstr ""
+msgstr "商机的阶段"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_categ_phone_create_partner
 msgid "Schedule Phone Call"
-msgstr "电话呼叫时间表"
+msgstr "计划的电话访问"
 
 #. module: crm
 #: selection:crm.lead.report,month:0
@@ -3505,7 +3543,7 @@ msgid ""
 "pipeline by maintaining them to their sales opportunities. It will allow "
 "them to easily track how is positioned a specific opportunity in the sales "
 "cycle."
-msgstr ""
+msgstr "创建具体的阶段这将有助你的销售通过组织好销售渠道维护这销售商机。它将使你在销售周期轻松地跟踪和定位一个具体的商机。"
 
 #. module: crm
 #: model:process.process,name:crm.process_process_contractprocess0
@@ -3515,7 +3553,7 @@ msgstr "合同"
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead4
 msgid "Twitter Ads"
-msgstr ""
+msgstr "Twitter地址"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_add_note.py:26
@@ -3529,23 +3567,23 @@ msgstr "错误"
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Planned Revenues"
-msgstr ""
+msgstr "计划收入"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor7
 msgid "Need Consulting"
-msgstr ""
+msgstr "需要咨询"
 
 #. module: crm
 #: constraint:crm.segmentation:0
 msgid "Error ! You can not create recursive profiles."
-msgstr ""
+msgstr "错误! 你不能创建递归的特征。"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:232
 #, python-format
 msgid "The case '%s' has been closed."
-msgstr ""
+msgstr "这业务'%s'已结束"
 
 #. module: crm
 #: field:crm.lead,partner_address_id:0
@@ -3557,18 +3595,18 @@ msgstr "业务伙伴联系方式"
 #. module: crm
 #: field:crm.meeting,recurrent_id:0
 msgid "Recurrent ID date"
-msgstr ""
+msgstr "循环日期"
 
 #. module: crm
 #: sql_constraint:res.users:0
 msgid "You can not have two users with the same login !"
-msgstr ""
+msgstr "你不能同时登录两个用户！"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_merge_opportunities.py:100
 #, python-format
 msgid "Merged into Opportunity: %s"
-msgstr ""
+msgstr "合并商机: %s"
 
 #. module: crm
 #: code:addons/crm/crm.py:347
@@ -3576,34 +3614,34 @@ msgstr ""
 #: view:res.partner:0
 #, python-format
 msgid "Close"
-msgstr "关闭"
+msgstr "结束"
 
 #. module: crm
 #: view:crm.lead:0
 #: view:crm.phonecall:0
 #: view:res.partner:0
 msgid "Categorization"
-msgstr ""
+msgstr "归类"
 
 #. module: crm
 #: model:ir.model,name:crm.model_base_action_rule
 msgid "Action Rules"
-msgstr ""
+msgstr "动作规则"
 
 #. module: crm
 #: field:crm.meeting,rrule_type:0
 msgid "Recurrency"
-msgstr ""
+msgstr "循环"
 
 #. module: crm
 #: field:crm.meeting,phonecall_id:0
 msgid "Phonecall"
-msgstr ""
+msgstr "电话访问"
 
 #. module: crm
 #: selection:crm.meeting,week_list:0
 msgid "Thursday"
-msgstr ""
+msgstr "周四"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -3614,17 +3652,17 @@ msgstr "到"
 #. module: crm
 #: selection:crm.meeting,class:0
 msgid "Private"
-msgstr ""
+msgstr "私有的"
 
 #. module: crm
 #: field:crm.lead,function:0
 msgid "Function"
-msgstr ""
+msgstr "职务"
 
 #. module: crm
 #: view:crm.add.note:0
 msgid "_Add"
-msgstr ""
+msgstr "添加"
 
 #. module: crm
 #: selection:crm.segmentation.line,expr_name:0
@@ -3660,7 +3698,7 @@ msgstr "说明"
 #: field:res.partner,section_id:0
 #: field:res.users,context_section_id:0
 msgid "Sales Team"
-msgstr ""
+msgstr "销售团队"
 
 #. module: crm
 #: selection:crm.lead.report,month:0
@@ -3672,39 +3710,39 @@ msgstr "5月"
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor2
 msgid "Interest in Accessories"
-msgstr ""
+msgstr "感兴趣"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:211
 #, python-format
 msgid "The opportunity '%s' has been opened."
-msgstr ""
+msgstr "这商机 \"%s\" 已开启"
 
 #. module: crm
 #: field:crm.lead.report,email:0
 msgid "# Emails"
-msgstr ""
+msgstr "电子邮件"
 
 #. module: crm
 #: field:crm.lead,street:0
 msgid "Street"
-msgstr ""
+msgstr "街道"
 
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Opportunities by User and Team"
-msgstr ""
+msgstr "用户和团队的商机"
 
 #. module: crm
 #: field:crm.case.section,working_hours:0
 msgid "Working Hours"
-msgstr ""
+msgstr "工作时间"
 
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead,is_customer_add:0
 msgid "Customer"
-msgstr ""
+msgstr "客户"
 
 #. module: crm
 #: selection:crm.lead.report,month:0
@@ -3725,14 +3763,14 @@ msgstr "安排一个会议"
 #: model:crm.case.stage,name:crm.stage_opportunity6
 #: view:crm.lead:0
 msgid "Lost"
-msgstr ""
+msgstr "丢失"
 
 #. module: crm
 #: field:crm.lead,country_id:0
 #: view:crm.lead.report:0
 #: field:crm.lead.report,country_id:0
 msgid "Country"
-msgstr ""
+msgstr "国家"
 
 #. module: crm
 #: view:crm.lead:0
@@ -3740,12 +3778,12 @@ msgstr ""
 #: view:crm.phonecall:0
 #: view:res.partner:0
 msgid "Convert to Opportunity"
-msgstr "转换到商机"
+msgstr "转换为商机"
 
 #. module: crm
 #: selection:crm.meeting,week_list:0
 msgid "Wednesday"
-msgstr ""
+msgstr "周三"
 
 #. module: crm
 #: selection:crm.lead.report,month:0
@@ -3757,33 +3795,33 @@ msgstr "4月"
 #. module: crm
 #: field:crm.case.resource.type,name:0
 msgid "Campaign Name"
-msgstr ""
+msgstr "营销活动名称"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall_report
 msgid "Phone calls by user and section"
-msgstr ""
+msgstr "用户和业务分类的电话访问"
 
 #. module: crm
 #: selection:crm.lead2opportunity.action,name:0
 msgid "Merge with existing Opportunity"
-msgstr ""
+msgstr "合并现有的商机"
 
 #. module: crm
 #: field:crm.meeting,select1:0
 msgid "Option"
-msgstr ""
+msgstr "选项"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead4
 #: model:crm.case.stage,name:crm.stage_opportunity4
 msgid "Negotiation"
-msgstr ""
+msgstr "协商"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Exp.Closing"
-msgstr ""
+msgstr "结束中"
 
 #. module: crm
 #: field:crm.case.stage,sequence:0
@@ -3794,12 +3832,12 @@ msgstr "序列"
 #. module: crm
 #: field:crm.send.mail,body:0
 msgid "Message Body"
-msgstr ""
+msgstr "消息正文"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Accept"
-msgstr ""
+msgstr "同意"
 
 #. module: crm
 #: field:crm.segmentation.line,expr_name:0
@@ -3809,18 +3847,18 @@ msgstr "控制变量"
 #. module: crm
 #: selection:crm.meeting,byday:0
 msgid "Second"
-msgstr ""
+msgstr "第二人称"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead3
 #: model:crm.case.stage,name:crm.stage_opportunity3
 msgid "Proposition"
-msgstr ""
+msgstr "建议"
 
 #. module: crm
 #: field:res.partner,phonecall_ids:0
 msgid "Phonecalls"
-msgstr ""
+msgstr "电话访问列表"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -3828,7 +3866,7 @@ msgstr ""
 #: view:crm.phonecall.report:0
 #: field:crm.phonecall.report,name:0
 msgid "Year"
-msgstr "年份"
+msgstr "年"
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead8
diff --git a/addons/crm_caldav/i18n/zh_CN.po b/addons/crm_caldav/i18n/zh_CN.po
new file mode 100644
index 00000000000..b3f0b638dca
--- /dev/null
+++ b/addons/crm_caldav/i18n/zh_CN.po
@@ -0,0 +1,49 @@
+# Chinese (Simplified) translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-04-10 17:34+0000\n"
+"Last-Translator: Black Jack <Unknown>\n"
+"Language-Team: Chinese (Simplified) <zh_CN@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: 2011-04-11 04:54+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
+
+#. module: crm_caldav
+#: model:ir.actions.act_window,name:crm_caldav.action_caldav_browse
+msgid "Caldav Browse"
+msgstr "Caldav翻阅"
+
+#. module: crm_caldav
+#: model:ir.model,name:crm_caldav.model_crm_meeting
+msgid "Meeting"
+msgstr "会议"
+
+#. module: crm_caldav
+#: model:ir.module.module,shortdesc:crm_caldav.module_meta_information
+msgid "Extended Module to Add CalDav feature on Meeting"
+msgstr "扩展模块增加会议的Caldav功能"
+
+#. module: crm_caldav
+#: model:ir.module.module,description:crm_caldav.module_meta_information
+msgid ""
+"\n"
+"    New Features in Meeting:\n"
+"        *  Share meeting with other calendar clients like sunbird\n"
+msgstr ""
+"\n"
+"    会议的新功能\n"
+"     *通过连接Mozilla Sunbird与使用日程表的客户共享会议\n"
+
+#. module: crm_caldav
+#: model:ir.ui.menu,name:crm_caldav.menu_caldav_browse
+msgid "Synchronyze this calendar"
+msgstr "同步calendar"
diff --git a/addons/crm_claim/i18n/gl.po b/addons/crm_claim/i18n/gl.po
new file mode 100644
index 00000000000..e3a05b59c69
--- /dev/null
+++ b/addons/crm_claim/i18n/gl.po
@@ -0,0 +1,778 @@
+# Galician translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-04-07 07:21+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Galician <gl@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: 2011-04-08 04:45+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
+
+#. module: crm_claim
+#: field:crm.claim.report,nbr:0
+msgid "# of Cases"
+msgstr "Nº de casos"
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: view:crm.claim.report:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Responsibilities"
+msgstr "Responsabilidades"
+
+#. module: crm_claim
+#: field:crm.claim,date_action_next:0
+msgid "Next Action Date"
+msgstr "Fecha da próxima acción"
+
+#. module: crm_claim
+#: field:crm.claim.report,probability:0
+msgid "Probability"
+msgstr "Probabilidade"
+
+#. module: crm_claim
+#: selection:crm.claim.report,month:0
+msgid "March"
+msgstr "Marzo"
+
+#. module: crm_claim
+#: field:crm.claim.report,delay_close:0
+msgid "Delay to close"
+msgstr "Demora peche"
+
+#. module: crm_claim
+#: field:crm.claim,resolution:0
+msgid "Resolution"
+msgstr "Resolución"
+
+#. module: crm_claim
+#: field:crm.claim,company_id:0
+#: view:crm.claim.report:0
+#: field:crm.claim.report,company_id:0
+msgid "Company"
+msgstr "Compañía"
+
+#. module: crm_claim
+#: field:crm.claim,email_cc:0
+msgid "Watchers Emails"
+msgstr "Destinatarios de correos electrónicos (CC)"
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+msgid "#Claim"
+msgstr "Nº reclamación"
+
+#. module: crm_claim
+#: model:ir.actions.act_window,help:crm_claim.crm_claim_stage_act
+msgid ""
+"You can create claim stages to categorize the status of every claim entered "
+"in the system. The stages define all the steps required for the resolution "
+"of a claim."
+msgstr ""
+"Pode crear etapas para clasificar os estados de cada reclamación introducida "
+"no sistema. As etapas definen tódolos pasos necesarios para a resolución "
+"dunha reclamación."
+
+#. module: crm_claim
+#: selection:crm.claim,priority:0
+#: selection:crm.claim.report,priority:0
+msgid "Highest"
+msgstr "A máis alta"
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+#: field:crm.claim.report,day:0
+msgid "Day"
+msgstr "Día"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Add Internal Note"
+msgstr "Engadir nota interna"
+
+#. module: crm_claim
+#: help:crm.claim,section_id:0
+msgid ""
+"Sales team to which Case belongs to.Define Responsible user and Email "
+"account for mail gateway."
+msgstr ""
+"Equipo de vendas ó cal pertence o caso. Define o usuario responsable e a "
+"conta de email para a pasarela de correo."
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Claim Description"
+msgstr "Descrición da reclamación"
+
+#. module: crm_claim
+#: field:crm.claim,message_ids:0
+msgid "Messages"
+msgstr "Mensaxes"
+
+#. module: crm_claim
+#: model:crm.case.categ,name:crm_claim.categ_claim1
+msgid "Factual Claims"
+msgstr "Reclamacións obxectivas"
+
+#. module: crm_claim
+#: selection:crm.claim,state:0
+#: selection:crm.claim.report,state:0
+msgid "Cancelled"
+msgstr "Anulado"
+
+#. module: crm_claim
+#: model:crm.case.resource.type,name:crm_claim.type_claim2
+msgid "Preventive"
+msgstr "Preventivo"
+
+#. module: crm_claim
+#: model:crm.case.stage,name:crm_claim.stage_claim2
+msgid "Fixed"
+msgstr "Fixo"
+
+#. module: crm_claim
+#: field:crm.claim,partner_address_id:0
+msgid "Partner Contact"
+msgstr "Contacto"
+
+#. module: crm_claim
+#: field:crm.claim.report,date_closed:0
+msgid "Close Date"
+msgstr "Data de peche"
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+msgid "   Month   "
+msgstr "   Mes   "
+
+#. module: crm_claim
+#: field:crm.claim,ref:0
+msgid "Reference"
+msgstr "Referencia"
+
+#. module: crm_claim
+#: field:crm.claim,action_next:0
+msgid "Next Action"
+msgstr "Seguinte acción"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Reset to Draft"
+msgstr "Cambiar a modo Borrador"
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: field:crm.claim,date_deadline:0
+#: field:crm.claim.report,date_deadline:0
+msgid "Deadline"
+msgstr "Data límite"
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: field:crm.claim,partner_id:0
+#: view:crm.claim.report:0
+#: field:crm.claim.report,partner_id:0
+msgid "Partner"
+msgstr "Socio"
+
+#. module: crm_claim
+#: selection:crm.claim,type_action:0
+#: selection:crm.claim.report,type_action:0
+msgid "Preventive Action"
+msgstr "Acción preventiva"
+
+#. module: crm_claim
+#: field:crm.claim.report,section_id:0
+msgid "Section"
+msgstr "Sección"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Root Causes"
+msgstr "Causas principais"
+
+#. module: crm_claim
+#: field:crm.claim,user_fault:0
+msgid "Trouble Responsible"
+msgstr "Responsable do problema"
+
+#. module: crm_claim
+#: field:crm.claim,priority:0
+#: view:crm.claim.report:0
+#: field:crm.claim.report,priority:0
+msgid "Priority"
+msgstr "Prioridade"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Send New Email"
+msgstr "Enviar novo email"
+
+#. module: crm_claim
+#: field:crm.claim.report,delay_expected:0
+msgid "Overpassed Deadline"
+msgstr "Data límite excedida"
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: view:crm.claim.report:0
+msgid "Type"
+msgstr "Tipo"
+
+#. module: crm_claim
+#: field:crm.claim,email_from:0
+msgid "Email"
+msgstr "E-mail"
+
+#. module: crm_claim
+#: selection:crm.claim,priority:0
+#: selection:crm.claim.report,priority:0
+msgid "Lowest"
+msgstr "A máis baixa"
+
+#. module: crm_claim
+#: field:crm.claim,create_date:0
+msgid "Creation Date"
+msgstr "Data de creación"
+
+#. module: crm_claim
+#: field:crm.claim,name:0
+msgid "Claim Subject"
+msgstr "Obxecto da reclamación"
+
+#. module: crm_claim
+#: model:ir.actions.act_window,help:crm_claim.action_report_crm_claim
+msgid ""
+"Have a general overview of all claims processed in the system by sorting "
+"them with specific criteria."
+msgstr ""
+"Obteña unha visión global de tódalas reclamacións procesadas no sistema "
+"ordenándoas con criterios específicos."
+
+#. module: crm_claim
+#: selection:crm.claim.report,month:0
+msgid "July"
+msgstr "Xullo"
+
+#. module: crm_claim
+#: model:ir.actions.act_window,name:crm_claim.crm_claim_stage_act
+msgid "Claim Stages"
+msgstr "Etapas das reclamacións"
+
+#. module: crm_claim
+#: model:ir.ui.menu,name:crm_claim.menu_crm_case_claim-act
+msgid "Categories"
+msgstr "Categorías"
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: field:crm.claim,stage_id:0
+#: view:crm.claim.report:0
+#: field:crm.claim.report,stage_id:0
+msgid "Stage"
+msgstr "Fase"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "History Information"
+msgstr "Información histórica"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Dates"
+msgstr "Datas"
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+msgid "    Month-1    "
+msgstr "    Mes-1    "
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Contact"
+msgstr "Contacto"
+
+#. module: crm_claim
+#: model:ir.ui.menu,name:crm_claim.menu_crm_claim_stage_act
+msgid "Stages"
+msgstr "Etapas"
+
+#. module: crm_claim
+#: model:ir.ui.menu,name:crm_claim.menu_report_crm_claim_tree
+msgid "Claims Analysis"
+msgstr "Análise das reclamacións"
+
+#. module: crm_claim
+#: help:crm.claim.report,delay_close:0
+msgid "Number of Days to close the case"
+msgstr "Número de días para pechar o caso"
+
+#. module: crm_claim
+#: model:ir.model,name:crm_claim.model_crm_claim_report
+msgid "CRM Claim Report"
+msgstr "Informe das reclamacións CRM"
+
+#. module: crm_claim
+#: model:crm.case.stage,name:crm_claim.stage_claim1
+msgid "Accepted as Claim"
+msgstr "Aceptado como reclamación"
+
+#. module: crm_claim
+#: model:crm.case.resource.type,name:crm_claim.type_claim1
+msgid "Corrective"
+msgstr "Correctivo"
+
+#. module: crm_claim
+#: selection:crm.claim.report,month:0
+msgid "September"
+msgstr "Setembro"
+
+#. module: crm_claim
+#: selection:crm.claim.report,month:0
+msgid "December"
+msgstr "Decembro"
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+#: field:crm.claim.report,month:0
+msgid "Month"
+msgstr "Mes"
+
+#. module: crm_claim
+#: field:crm.claim,type_action:0
+#: field:crm.claim.report,type_action:0
+msgid "Action Type"
+msgstr "Tipo de acción"
+
+#. module: crm_claim
+#: field:crm.claim,write_date:0
+msgid "Update Date"
+msgstr "Data de actualización"
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+msgid "Salesman"
+msgstr "Vendedor"
+
+#. module: crm_claim
+#: field:crm.claim,categ_id:0
+#: view:crm.claim.report:0
+#: field:crm.claim.report,categ_id:0
+msgid "Category"
+msgstr "Categoría"
+
+#. module: crm_claim
+#: model:crm.case.categ,name:crm_claim.categ_claim2
+msgid "Value Claims"
+msgstr "Valor reclamacións"
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+msgid "  Year  "
+msgstr "  Ano  "
+
+#. module: crm_claim
+#: help:crm.claim,email_cc:0
+msgid ""
+"These email addresses will be added to the CC field of all inbound and "
+"outbound emails for this record before being sent. Separate multiple email "
+"addresses with a comma"
+msgstr ""
+"Estes enderezos de correo engadiranse ó campo CC para tódolos correos "
+"entrantes e saíntes deste rexistro antes de ser enviados. Separe os "
+"diferentes enderezos de correo cunha coma."
+
+#. module: crm_claim
+#: selection:crm.claim,state:0
+#: view:crm.claim.report:0
+#: selection:crm.claim.report,state:0
+msgid "Draft"
+msgstr "Borrador"
+
+#. module: crm_claim
+#: selection:crm.claim,priority:0
+#: selection:crm.claim.report,priority:0
+msgid "Low"
+msgstr "Baixo"
+
+#. module: crm_claim
+#: field:crm.claim,date_closed:0
+#: selection:crm.claim,state:0
+#: selection:crm.claim.report,state:0
+msgid "Closed"
+msgstr "Pechado"
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: selection:crm.claim,state:0
+#: view:crm.claim.report:0
+#: selection:crm.claim.report,state:0
+msgid "Pending"
+msgstr "Pendente"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Communication & History"
+msgstr "Comunicación e historial"
+
+#. module: crm_claim
+#: selection:crm.claim.report,month:0
+msgid "August"
+msgstr "Agosto"
+
+#. module: crm_claim
+#: selection:crm.claim,priority:0
+#: selection:crm.claim.report,priority:0
+msgid "Normal"
+msgstr "Normal"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Global CC"
+msgstr "CC global"
+
+#. module: crm_claim
+#: model:ir.module.module,shortdesc:crm_claim.module_meta_information
+msgid "Customer & Supplier Relationship Management"
+msgstr "Xestión de relacións con clientes e provedores"
+
+#. module: crm_claim
+#: selection:crm.claim.report,month:0
+msgid "June"
+msgstr "Xuño"
+
+#. module: crm_claim
+#: field:crm.claim,partner_phone:0
+msgid "Phone"
+msgstr "Teléfono"
+
+#. module: crm_claim
+#: field:crm.claim.report,user_id:0
+msgid "User"
+msgstr "Usuario"
+
+#. module: crm_claim
+#: model:crm.case.stage,name:crm_claim.stage_claim5
+msgid "Awaiting Response"
+msgstr "Esperando resposta"
+
+#. module: crm_claim
+#: model:ir.actions.act_window,name:crm_claim.crm_claim_categ_action
+msgid "Claim Categories"
+msgstr "Categorías das reclamacións"
+
+#. module: crm_claim
+#: selection:crm.claim.report,month:0
+msgid "November"
+msgstr "Novembro"
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+msgid "Extended Filters..."
+msgstr "Filtros extendidos..."
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Closure"
+msgstr "Peche"
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+msgid "Search"
+msgstr "Buscar"
+
+#. module: crm_claim
+#: selection:crm.claim.report,month:0
+msgid "October"
+msgstr "Outubro"
+
+#. module: crm_claim
+#: model:ir.module.module,description:crm_claim.module_meta_information
+msgid ""
+"\n"
+"This modules allows you to track your customers/suppliers claims and "
+"flames.\n"
+"It is fully integrated with the email gateway so that you can create\n"
+"automatically new claims based on incoming emails.\n"
+"    "
+msgstr ""
+"\n"
+"Este módulo permítelle realizar un seguimento das reclamacións e urxencias "
+"dos seus clientes/provedores. Está totalmente integrado na pasarela de "
+"correo electrónico para que poida crear automaticamente as novas "
+"reclamacións a partir dos correos electrónicos entrantes.\n"
+"    "
+
+#. module: crm_claim
+#: selection:crm.claim.report,month:0
+msgid "January"
+msgstr "Xaneiro"
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: field:crm.claim,date:0
+msgid "Claim Date"
+msgstr "Data da reclamación"
+
+#. module: crm_claim
+#: help:crm.claim,email_from:0
+msgid "These people will receive email."
+msgstr "Estas persoas recibirán un e-mail."
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: view:crm.claim.report:0
+#: model:ir.actions.act_window,name:crm_claim.action_report_crm_claim
+#: model:ir.actions.act_window,name:crm_claim.crm_case_categ_claim0
+#: model:ir.ui.menu,name:crm_claim.menu_crm_case_claims
+msgid "Claims"
+msgstr "Reclamacións"
+
+#. module: crm_claim
+#: selection:crm.claim,type_action:0
+#: selection:crm.claim.report,type_action:0
+msgid "Corrective Action"
+msgstr "Acción correctiva"
+
+#. module: crm_claim
+#: model:crm.case.categ,name:crm_claim.categ_claim3
+msgid "Policy Claims"
+msgstr "Política de reclamacións"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "History"
+msgstr "Historia"
+
+#. module: crm_claim
+#: model:ir.model,name:crm_claim.model_crm_claim
+#: model:ir.ui.menu,name:crm_claim.menu_config_claim
+msgid "Claim"
+msgstr "Reclamación"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Attachments"
+msgstr "Anexos"
+
+#. module: crm_claim
+#: model:ir.model,name:crm_claim.model_crm_case_stage
+msgid "Stage of case"
+msgstr "Fase do caso"
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: field:crm.claim,state:0
+#: view:crm.claim.report:0
+#: field:crm.claim.report,state:0
+msgid "State"
+msgstr "Estado"
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: view:crm.claim.report:0
+msgid "Done"
+msgstr "Feito"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Claim Reporter"
+msgstr "Persoa que reportou a reclamación"
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: view:crm.claim.report:0
+msgid "Cancel"
+msgstr "Anular"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Close"
+msgstr "Pechar"
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: selection:crm.claim,state:0
+#: view:crm.claim.report:0
+#: selection:crm.claim.report,state:0
+msgid "Open"
+msgstr "Abrir"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "In Progress"
+msgstr "En curso"
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: field:crm.claim,user_id:0
+msgid "Responsible"
+msgstr "Responsable"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Current"
+msgstr "Actual"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Details"
+msgstr "Detalles"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Reply"
+msgstr "Resposta"
+
+#. module: crm_claim
+#: field:crm.claim,cause:0
+msgid "Root Cause"
+msgstr "Causa principal"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Claim/Action Description"
+msgstr "Descrición da reclamación/acción"
+
+#. module: crm_claim
+#: field:crm.claim,description:0
+msgid "Description"
+msgstr "Descrición"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Search Claims"
+msgstr "Buscar reclamacións"
+
+#. module: crm_claim
+#: field:crm.claim,section_id:0
+#: view:crm.claim.report:0
+msgid "Sales Team"
+msgstr "Equipo de vendas"
+
+#. module: crm_claim
+#: selection:crm.claim.report,month:0
+msgid "May"
+msgstr "Maio"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Resolution Actions"
+msgstr "Accións para resolución"
+
+#. module: crm_claim
+#: model:ir.actions.act_window,name:crm_claim.act_claim_partner
+#: model:ir.actions.act_window,name:crm_claim.act_claim_partner_address
+msgid "Report a Claim"
+msgstr "Introducir reclamación"
+
+#. module: crm_claim
+#: model:ir.actions.act_window,help:crm_claim.crm_case_categ_claim0
+msgid ""
+"Record and track your customers' claims. Claims may be linked to a sales "
+"order or a lot. You can send emails with attachments and keep the full "
+"history for a claim (emails sent, intervention type and so on). Claims may "
+"automatically be linked to an email address using the mail gateway module."
+msgstr ""
+"Rexistre e faga o seguimento das reclamacións dos seus clientes. Pódense "
+"vincular as reclamacións a un pedido de venda ou a  un lote. Pode enviar "
+"correos electrónicos con arquivos adxuntos e manter o historial completo "
+"dunha reclamación (correos electrónicos enviados, tipo de intervención, "
+"etc.). Pódense vincular as reclamacións automaticamente a un enderezo de "
+"correo electrónico utilizando o módulo pasarela de correo."
+
+#. module: crm_claim
+#: field:crm.claim.report,email:0
+msgid "# Emails"
+msgstr "Nº de emails"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Follow Up"
+msgstr "Seguimento"
+
+#. module: crm_claim
+#: help:crm.claim,state:0
+msgid ""
+"The state is set to 'Draft', when a case is created.                         "
+"         \n"
+"If the case is in progress the state is set to 'Open'.                       "
+"           \n"
+"When the case is over, the state is set to 'Done'.                           "
+"       \n"
+"If the case needs to be reviewed then the state is set to 'Pending'."
+msgstr ""
+"O estado configúrase como \"Borrador\", cando se crea un caso. Se o caso "
+"está en curso, o estado configúrase como \"Aberto\". Cando se pecha o caso, "
+"o estado configúrase como \"Realizado\". Se cómpre revisar o caso, o estado "
+"configúrase como \"Pendente\"."
+
+#. module: crm_claim
+#: selection:crm.claim.report,month:0
+msgid "February"
+msgstr "Febreiro"
+
+#. module: crm_claim
+#: model:crm.case.stage,name:crm_claim.stage_claim3
+msgid "Won't fix"
+msgstr "No se corrixirá"
+
+#. module: crm_claim
+#: selection:crm.claim.report,month:0
+msgid "April"
+msgstr "Abril"
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+msgid "My Case(s)"
+msgstr "O(s) meu(s) caso(s)"
+
+#. module: crm_claim
+#: field:crm.claim,id:0
+msgid "ID"
+msgstr "ID"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Actions"
+msgstr "Accións"
+
+#. module: crm_claim
+#: selection:crm.claim,priority:0
+#: selection:crm.claim.report,priority:0
+msgid "High"
+msgstr "Alto"
+
+#. module: crm_claim
+#: model:ir.actions.act_window,help:crm_claim.crm_claim_categ_action
+msgid ""
+"Create claim categories to better manage and classify your claims. Some "
+"example of claims can be: preventive action, corrective action."
+msgstr ""
+"Cree categorías de reclamacións para xestionar e clasificar mellor as súas "
+"reclamacións. Algúns exemplos de reclamacións son: acción preventiva, acción "
+"correctiva."
+
+#. module: crm_claim
+#: field:crm.claim.report,create_date:0
+msgid "Create Date"
+msgstr "Crear data"
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+#: field:crm.claim.report,name:0
+msgid "Year"
+msgstr "Ano"
diff --git a/addons/crm_claim/i18n/zh_CN.po b/addons/crm_claim/i18n/zh_CN.po
new file mode 100644
index 00000000000..7667ba03a12
--- /dev/null
+++ b/addons/crm_claim/i18n/zh_CN.po
@@ -0,0 +1,749 @@
+# Chinese (Simplified) translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-04-11 04:47+0000\n"
+"Last-Translator: Black Jack <Unknown>\n"
+"Language-Team: Chinese (Simplified) <zh_CN@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: 2011-04-11 04:54+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
+
+#. module: crm_claim
+#: field:crm.claim.report,nbr:0
+msgid "# of Cases"
+msgstr "# 业务"
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: view:crm.claim.report:0
+msgid "Group By..."
+msgstr "分组..."
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Responsibilities"
+msgstr "责任人"
+
+#. module: crm_claim
+#: field:crm.claim,date_action_next:0
+msgid "Next Action Date"
+msgstr "下一动作日期"
+
+#. module: crm_claim
+#: field:crm.claim.report,probability:0
+msgid "Probability"
+msgstr "概率"
+
+#. module: crm_claim
+#: selection:crm.claim.report,month:0
+msgid "March"
+msgstr "3月"
+
+#. module: crm_claim
+#: field:crm.claim.report,delay_close:0
+msgid "Delay to close"
+msgstr "延迟关闭"
+
+#. module: crm_claim
+#: field:crm.claim,resolution:0
+msgid "Resolution"
+msgstr "解决方案"
+
+#. module: crm_claim
+#: field:crm.claim,company_id:0
+#: view:crm.claim.report:0
+#: field:crm.claim.report,company_id:0
+msgid "Company"
+msgstr "公司"
+
+#. module: crm_claim
+#: field:crm.claim,email_cc:0
+msgid "Watchers Emails"
+msgstr "关注者的电子邮件"
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+msgid "#Claim"
+msgstr "#索赔"
+
+#. module: crm_claim
+#: model:ir.actions.act_window,help:crm_claim.crm_claim_stage_act
+msgid ""
+"You can create claim stages to categorize the status of every claim entered "
+"in the system. The stages define all the steps required for the resolution "
+"of a claim."
+msgstr "你能创建索赔阶段的类型把每个索赔的状况输入到系统。阶段定义所有索赔请求的解决步骤。"
+
+#. module: crm_claim
+#: selection:crm.claim,priority:0
+#: selection:crm.claim.report,priority:0
+msgid "Highest"
+msgstr "最高"
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+#: field:crm.claim.report,day:0
+msgid "Day"
+msgstr "日"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Add Internal Note"
+msgstr "添加内部备注"
+
+#. module: crm_claim
+#: help:crm.claim,section_id:0
+msgid ""
+"Sales team to which Case belongs to.Define Responsible user and Email "
+"account for mail gateway."
+msgstr "业务的销售团队定义负责用户和邮件网关的邮件地址。"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Claim Description"
+msgstr "索陪说明"
+
+#. module: crm_claim
+#: field:crm.claim,message_ids:0
+msgid "Messages"
+msgstr "消息"
+
+#. module: crm_claim
+#: model:crm.case.categ,name:crm_claim.categ_claim1
+msgid "Factual Claims"
+msgstr "实际索赔"
+
+#. module: crm_claim
+#: selection:crm.claim,state:0
+#: selection:crm.claim.report,state:0
+msgid "Cancelled"
+msgstr "已取消"
+
+#. module: crm_claim
+#: model:crm.case.resource.type,name:crm_claim.type_claim2
+msgid "Preventive"
+msgstr "预防"
+
+#. module: crm_claim
+#: model:crm.case.stage,name:crm_claim.stage_claim2
+msgid "Fixed"
+msgstr "固定的"
+
+#. module: crm_claim
+#: field:crm.claim,partner_address_id:0
+msgid "Partner Contact"
+msgstr "业务伙伴联系方式"
+
+#. module: crm_claim
+#: field:crm.claim.report,date_closed:0
+msgid "Close Date"
+msgstr "结束日期"
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+msgid "   Month   "
+msgstr "   月   "
+
+#. module: crm_claim
+#: field:crm.claim,ref:0
+msgid "Reference"
+msgstr "参考"
+
+#. module: crm_claim
+#: field:crm.claim,action_next:0
+msgid "Next Action"
+msgstr "下一动作"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Reset to Draft"
+msgstr "重置为草稿"
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: field:crm.claim,date_deadline:0
+#: field:crm.claim.report,date_deadline:0
+msgid "Deadline"
+msgstr "截止日期"
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: field:crm.claim,partner_id:0
+#: view:crm.claim.report:0
+#: field:crm.claim.report,partner_id:0
+msgid "Partner"
+msgstr "业务伙伴"
+
+#. module: crm_claim
+#: selection:crm.claim,type_action:0
+#: selection:crm.claim.report,type_action:0
+msgid "Preventive Action"
+msgstr "预防性动作"
+
+#. module: crm_claim
+#: field:crm.claim.report,section_id:0
+msgid "Section"
+msgstr "分类"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Root Causes"
+msgstr "根本原因"
+
+#. module: crm_claim
+#: field:crm.claim,user_fault:0
+msgid "Trouble Responsible"
+msgstr "故障责任"
+
+#. module: crm_claim
+#: field:crm.claim,priority:0
+#: view:crm.claim.report:0
+#: field:crm.claim.report,priority:0
+msgid "Priority"
+msgstr "优先级"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Send New Email"
+msgstr "发送新的电子邮件"
+
+#. module: crm_claim
+#: field:crm.claim.report,delay_expected:0
+msgid "Overpassed Deadline"
+msgstr "超越截止日期"
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: view:crm.claim.report:0
+msgid "Type"
+msgstr "类型："
+
+#. module: crm_claim
+#: field:crm.claim,email_from:0
+msgid "Email"
+msgstr "电子邮件"
+
+#. module: crm_claim
+#: selection:crm.claim,priority:0
+#: selection:crm.claim.report,priority:0
+msgid "Lowest"
+msgstr "最低"
+
+#. module: crm_claim
+#: field:crm.claim,create_date:0
+msgid "Creation Date"
+msgstr ""
+
+#. module: crm_claim
+#: field:crm.claim,name:0
+msgid "Claim Subject"
+msgstr ""
+
+#. module: crm_claim
+#: model:ir.actions.act_window,help:crm_claim.action_report_crm_claim
+msgid ""
+"Have a general overview of all claims processed in the system by sorting "
+"them with specific criteria."
+msgstr ""
+
+#. module: crm_claim
+#: selection:crm.claim.report,month:0
+msgid "July"
+msgstr ""
+
+#. module: crm_claim
+#: model:ir.actions.act_window,name:crm_claim.crm_claim_stage_act
+msgid "Claim Stages"
+msgstr ""
+
+#. module: crm_claim
+#: model:ir.ui.menu,name:crm_claim.menu_crm_case_claim-act
+msgid "Categories"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: field:crm.claim,stage_id:0
+#: view:crm.claim.report:0
+#: field:crm.claim.report,stage_id:0
+msgid "Stage"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "History Information"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Dates"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+msgid "    Month-1    "
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Contact"
+msgstr ""
+
+#. module: crm_claim
+#: model:ir.ui.menu,name:crm_claim.menu_crm_claim_stage_act
+msgid "Stages"
+msgstr ""
+
+#. module: crm_claim
+#: model:ir.ui.menu,name:crm_claim.menu_report_crm_claim_tree
+msgid "Claims Analysis"
+msgstr ""
+
+#. module: crm_claim
+#: help:crm.claim.report,delay_close:0
+msgid "Number of Days to close the case"
+msgstr ""
+
+#. module: crm_claim
+#: model:ir.model,name:crm_claim.model_crm_claim_report
+msgid "CRM Claim Report"
+msgstr ""
+
+#. module: crm_claim
+#: model:crm.case.stage,name:crm_claim.stage_claim1
+msgid "Accepted as Claim"
+msgstr ""
+
+#. module: crm_claim
+#: model:crm.case.resource.type,name:crm_claim.type_claim1
+msgid "Corrective"
+msgstr ""
+
+#. module: crm_claim
+#: selection:crm.claim.report,month:0
+msgid "September"
+msgstr ""
+
+#. module: crm_claim
+#: selection:crm.claim.report,month:0
+msgid "December"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+#: field:crm.claim.report,month:0
+msgid "Month"
+msgstr ""
+
+#. module: crm_claim
+#: field:crm.claim,type_action:0
+#: field:crm.claim.report,type_action:0
+msgid "Action Type"
+msgstr ""
+
+#. module: crm_claim
+#: field:crm.claim,write_date:0
+msgid "Update Date"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+msgid "Salesman"
+msgstr ""
+
+#. module: crm_claim
+#: field:crm.claim,categ_id:0
+#: view:crm.claim.report:0
+#: field:crm.claim.report,categ_id:0
+msgid "Category"
+msgstr ""
+
+#. module: crm_claim
+#: model:crm.case.categ,name:crm_claim.categ_claim2
+msgid "Value Claims"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+msgid "  Year  "
+msgstr ""
+
+#. module: crm_claim
+#: help:crm.claim,email_cc:0
+msgid ""
+"These email addresses will be added to the CC field of all inbound and "
+"outbound emails for this record before being sent. Separate multiple email "
+"addresses with a comma"
+msgstr ""
+
+#. module: crm_claim
+#: selection:crm.claim,state:0
+#: view:crm.claim.report:0
+#: selection:crm.claim.report,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: crm_claim
+#: selection:crm.claim,priority:0
+#: selection:crm.claim.report,priority:0
+msgid "Low"
+msgstr ""
+
+#. module: crm_claim
+#: field:crm.claim,date_closed:0
+#: selection:crm.claim,state:0
+#: selection:crm.claim.report,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: selection:crm.claim,state:0
+#: view:crm.claim.report:0
+#: selection:crm.claim.report,state:0
+msgid "Pending"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Communication & History"
+msgstr ""
+
+#. module: crm_claim
+#: selection:crm.claim.report,month:0
+msgid "August"
+msgstr ""
+
+#. module: crm_claim
+#: selection:crm.claim,priority:0
+#: selection:crm.claim.report,priority:0
+msgid "Normal"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Global CC"
+msgstr ""
+
+#. module: crm_claim
+#: model:ir.module.module,shortdesc:crm_claim.module_meta_information
+msgid "Customer & Supplier Relationship Management"
+msgstr ""
+
+#. module: crm_claim
+#: selection:crm.claim.report,month:0
+msgid "June"
+msgstr ""
+
+#. module: crm_claim
+#: field:crm.claim,partner_phone:0
+msgid "Phone"
+msgstr ""
+
+#. module: crm_claim
+#: field:crm.claim.report,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: crm_claim
+#: model:crm.case.stage,name:crm_claim.stage_claim5
+msgid "Awaiting Response"
+msgstr ""
+
+#. module: crm_claim
+#: model:ir.actions.act_window,name:crm_claim.crm_claim_categ_action
+msgid "Claim Categories"
+msgstr ""
+
+#. module: crm_claim
+#: selection:crm.claim.report,month:0
+msgid "November"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Closure"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+msgid "Search"
+msgstr ""
+
+#. module: crm_claim
+#: selection:crm.claim.report,month:0
+msgid "October"
+msgstr ""
+
+#. module: crm_claim
+#: model:ir.module.module,description:crm_claim.module_meta_information
+msgid ""
+"\n"
+"This modules allows you to track your customers/suppliers claims and "
+"flames.\n"
+"It is fully integrated with the email gateway so that you can create\n"
+"automatically new claims based on incoming emails.\n"
+"    "
+msgstr ""
+
+#. module: crm_claim
+#: selection:crm.claim.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: field:crm.claim,date:0
+msgid "Claim Date"
+msgstr ""
+
+#. module: crm_claim
+#: help:crm.claim,email_from:0
+msgid "These people will receive email."
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: view:crm.claim.report:0
+#: model:ir.actions.act_window,name:crm_claim.action_report_crm_claim
+#: model:ir.actions.act_window,name:crm_claim.crm_case_categ_claim0
+#: model:ir.ui.menu,name:crm_claim.menu_crm_case_claims
+msgid "Claims"
+msgstr ""
+
+#. module: crm_claim
+#: selection:crm.claim,type_action:0
+#: selection:crm.claim.report,type_action:0
+msgid "Corrective Action"
+msgstr ""
+
+#. module: crm_claim
+#: model:crm.case.categ,name:crm_claim.categ_claim3
+msgid "Policy Claims"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "History"
+msgstr ""
+
+#. module: crm_claim
+#: model:ir.model,name:crm_claim.model_crm_claim
+#: model:ir.ui.menu,name:crm_claim.menu_config_claim
+msgid "Claim"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Attachments"
+msgstr ""
+
+#. module: crm_claim
+#: model:ir.model,name:crm_claim.model_crm_case_stage
+msgid "Stage of case"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: field:crm.claim,state:0
+#: view:crm.claim.report:0
+#: field:crm.claim.report,state:0
+msgid "State"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: view:crm.claim.report:0
+msgid "Done"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Claim Reporter"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: view:crm.claim.report:0
+msgid "Cancel"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Close"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: selection:crm.claim,state:0
+#: view:crm.claim.report:0
+#: selection:crm.claim.report,state:0
+msgid "Open"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "In Progress"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: field:crm.claim,user_id:0
+msgid "Responsible"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Current"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Details"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Reply"
+msgstr ""
+
+#. module: crm_claim
+#: field:crm.claim,cause:0
+msgid "Root Cause"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Claim/Action Description"
+msgstr ""
+
+#. module: crm_claim
+#: field:crm.claim,description:0
+msgid "Description"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Search Claims"
+msgstr ""
+
+#. module: crm_claim
+#: field:crm.claim,section_id:0
+#: view:crm.claim.report:0
+msgid "Sales Team"
+msgstr ""
+
+#. module: crm_claim
+#: selection:crm.claim.report,month:0
+msgid "May"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Resolution Actions"
+msgstr ""
+
+#. module: crm_claim
+#: model:ir.actions.act_window,name:crm_claim.act_claim_partner
+#: model:ir.actions.act_window,name:crm_claim.act_claim_partner_address
+msgid "Report a Claim"
+msgstr ""
+
+#. module: crm_claim
+#: model:ir.actions.act_window,help:crm_claim.crm_case_categ_claim0
+msgid ""
+"Record and track your customers' claims. Claims may be linked to a sales "
+"order or a lot. You can send emails with attachments and keep the full "
+"history for a claim (emails sent, intervention type and so on). Claims may "
+"automatically be linked to an email address using the mail gateway module."
+msgstr ""
+
+#. module: crm_claim
+#: field:crm.claim.report,email:0
+msgid "# Emails"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Follow Up"
+msgstr ""
+
+#. module: crm_claim
+#: help:crm.claim,state:0
+msgid ""
+"The state is set to 'Draft', when a case is created.                         "
+"         \n"
+"If the case is in progress the state is set to 'Open'.                       "
+"           \n"
+"When the case is over, the state is set to 'Done'.                           "
+"       \n"
+"If the case needs to be reviewed then the state is set to 'Pending'."
+msgstr ""
+
+#. module: crm_claim
+#: selection:crm.claim.report,month:0
+msgid "February"
+msgstr ""
+
+#. module: crm_claim
+#: model:crm.case.stage,name:crm_claim.stage_claim3
+msgid "Won't fix"
+msgstr ""
+
+#. module: crm_claim
+#: selection:crm.claim.report,month:0
+msgid "April"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+msgid "My Case(s)"
+msgstr ""
+
+#. module: crm_claim
+#: field:crm.claim,id:0
+msgid "ID"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Actions"
+msgstr ""
+
+#. module: crm_claim
+#: selection:crm.claim,priority:0
+#: selection:crm.claim.report,priority:0
+msgid "High"
+msgstr ""
+
+#. module: crm_claim
+#: model:ir.actions.act_window,help:crm_claim.crm_claim_categ_action
+msgid ""
+"Create claim categories to better manage and classify your claims. Some "
+"example of claims can be: preventive action, corrective action."
+msgstr ""
+
+#. module: crm_claim
+#: field:crm.claim.report,create_date:0
+msgid "Create Date"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+#: field:crm.claim.report,name:0
+msgid "Year"
+msgstr ""
diff --git a/addons/crm_helpdesk/i18n/zh_CN.po b/addons/crm_helpdesk/i18n/zh_CN.po
new file mode 100644
index 00000000000..64b2efba789
--- /dev/null
+++ b/addons/crm_helpdesk/i18n/zh_CN.po
@@ -0,0 +1,697 @@
+# Chinese (Simplified) translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-04-10 17:19+0000\n"
+"Last-Translator: Black Jack <Unknown>\n"
+"Language-Team: Chinese (Simplified) <zh_CN@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: 2011-04-11 04:54+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk.report,delay_close:0
+msgid "Delay to Close"
+msgstr "延迟关闭"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk.report,nbr:0
+msgid "# of Cases"
+msgstr "# 业务"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: view:crm.helpdesk.report:0
+msgid "Group By..."
+msgstr "分组..."
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Today"
+msgstr "今日"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "March"
+msgstr "3月"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,company_id:0
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,company_id:0
+msgid "Company"
+msgstr "公司"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,email_cc:0
+msgid "Watchers Emails"
+msgstr "关注者的电子邮件"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk,priority:0
+#: selection:crm.helpdesk.report,priority:0
+msgid "Highest"
+msgstr "最高"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,day:0
+msgid "Day"
+msgstr "日"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Add Internal Note"
+msgstr "添加内部备注"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Notes"
+msgstr "备注"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,message_ids:0
+msgid "Messages"
+msgstr "消息"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk,state:0
+#: selection:crm.helpdesk.report,state:0
+msgid "Cancelled"
+msgstr "已取消"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,partner_address_id:0
+msgid "Partner Contact"
+msgstr "业务伙伴联系方式"
+
+#. module: crm_helpdesk
+#: model:ir.ui.menu,name:crm_helpdesk.menu_report_crm_helpdesks_tree
+msgid "Helpdesk Analysis"
+msgstr "服务台分析"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,date_closed:0
+msgid "Close Date"
+msgstr "结束日期"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "   Month   "
+msgstr "   月   "
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,ref:0
+msgid "Reference"
+msgstr "参考"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,date_action_next:0
+msgid "Next Action"
+msgstr "下一动作"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Helpdesk Supports"
+msgstr "服务台支持"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Extra Info"
+msgstr "额外信息"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: field:crm.helpdesk,partner_id:0
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,partner_id:0
+msgid "Partner"
+msgstr "业务伙伴"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Estimates"
+msgstr "估计"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk.report,section_id:0
+msgid "Section"
+msgstr "分类"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: field:crm.helpdesk,priority:0
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,priority:0
+msgid "Priority"
+msgstr "优先级"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Send New Email"
+msgstr "发送新的电子邮件"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Won"
+msgstr "获得"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk.report,delay_expected:0
+msgid "Overpassed Deadline"
+msgstr "超越截止日期"
+
+#. module: crm_helpdesk
+#: model:ir.model,name:crm_helpdesk.model_crm_helpdesk_report
+msgid "Helpdesk report after Sales Services"
+msgstr "售后服务服务台报表"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,email_from:0
+msgid "Email"
+msgstr "电子邮件"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,canal_id:0
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,canal_id:0
+msgid "Channel"
+msgstr "途径"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk,priority:0
+#: selection:crm.helpdesk.report,priority:0
+msgid "Lowest"
+msgstr "最低"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "# Mails"
+msgstr "邮件"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,create_date:0
+#: field:crm.helpdesk.report,create_date:0
+msgid "Creation Date"
+msgstr "创建日期"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Reset to Draft"
+msgstr "重置为草稿"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: selection:crm.helpdesk,state:0
+#: selection:crm.helpdesk.report,state:0
+msgid "Pending"
+msgstr "待处理"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: field:crm.helpdesk,date_deadline:0
+#: field:crm.helpdesk.report,date_deadline:0
+msgid "Deadline"
+msgstr "截止日期"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "July"
+msgstr "7月"
+
+#. module: crm_helpdesk
+#: model:ir.actions.act_window,name:crm_helpdesk.crm_helpdesk_categ_action
+msgid "Helpdesk Categories"
+msgstr "服务台类型"
+
+#. module: crm_helpdesk
+#: model:ir.ui.menu,name:crm_helpdesk.menu_crm_case_helpdesk-act
+msgid "Categories"
+msgstr "类型"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "History Information"
+msgstr "日志信息"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Dates"
+msgstr "日期"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "    Month-1    "
+msgstr "    上月    "
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "#Helpdesk"
+msgstr "服务台"
+
+#. module: crm_helpdesk
+#: help:crm.helpdesk,email_cc:0
+msgid ""
+"These email addresses will be added to the CC field of all inbound and "
+"outbound emails for this record before being sent. Separate multiple email "
+"addresses with a comma"
+msgstr "这些邮件地址将添加到之前发送记录的发送和接收邮件的抄送字段，分隔多个邮件地址有逗号。"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "References"
+msgstr "参考"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "September"
+msgstr "9月"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Communication"
+msgstr "沟通"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,month:0
+msgid "Month"
+msgstr "月份"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Escalate"
+msgstr "提升"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,write_date:0
+msgid "Update Date"
+msgstr "更新日期"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Query"
+msgstr "查询"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Salesman"
+msgstr "业务员"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,ref2:0
+msgid "Reference 2"
+msgstr "参考2"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,categ_id:0
+#: field:crm.helpdesk.report,categ_id:0
+msgid "Category"
+msgstr "类型"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "  Year  "
+msgstr "  年  "
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Helpdesk Support"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,planned_cost:0
+#: field:crm.helpdesk.report,planned_cost:0
+msgid "Planned Costs"
+msgstr "计划成本"
+
+#. module: crm_helpdesk
+#: model:ir.module.module,description:crm_helpdesk.module_meta_information
+msgid "Helpdesk Management"
+msgstr "服务台管理"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Search Helpdesk"
+msgstr "查询服务台"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk,state:0
+#: selection:crm.helpdesk.report,state:0
+msgid "Draft"
+msgstr "草稿"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk,priority:0
+#: selection:crm.helpdesk.report,priority:0
+msgid "Low"
+msgstr "低"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,date_closed:0
+#: selection:crm.helpdesk,state:0
+#: selection:crm.helpdesk.report,state:0
+msgid "Closed"
+msgstr "已结束"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "7 Days"
+msgstr "7天"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Communication & History"
+msgstr "沟通&日志"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "August"
+msgstr "8月"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk,priority:0
+#: selection:crm.helpdesk.report,priority:0
+msgid "Normal"
+msgstr "普通"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Global CC"
+msgstr "完整抄送"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "June"
+msgstr "6月"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,planned_revenue:0
+msgid "Planned Revenue"
+msgstr "计划收入"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk.report,user_id:0
+msgid "User"
+msgstr "用户"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,active:0
+msgid "Active"
+msgstr "有效"
+
+#. module: crm_helpdesk
+#: model:ir.module.module,shortdesc:crm_helpdesk.module_meta_information
+msgid "CRM Helpdesk"
+msgstr "客户关系管理 服务台"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Extended Filters..."
+msgstr "扩展过滤..."
+
+#. module: crm_helpdesk
+#: model:ir.actions.act_window,name:crm_helpdesk.crm_case_helpdesk_act111
+msgid "Helpdesk Requests"
+msgstr "服务台请求"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Search"
+msgstr "查找"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "October"
+msgstr "10月"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "January"
+msgstr "1月"
+
+#. module: crm_helpdesk
+#: help:crm.helpdesk,email_from:0
+msgid "These people will receive email."
+msgstr "这些人将收到电子邮件。"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: field:crm.helpdesk,date:0
+msgid "Date"
+msgstr "日期"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "November"
+msgstr "11月"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "History"
+msgstr "日志"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Attachments"
+msgstr "附件"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Misc"
+msgstr "杂项"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: field:crm.helpdesk,state:0
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,state:0
+msgid "State"
+msgstr "州/省"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "General"
+msgstr "通用"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Send Reminder"
+msgstr "发送提醒"
+
+#. module: crm_helpdesk
+#: help:crm.helpdesk,section_id:0
+msgid ""
+"Sales team to which Case belongs to.                                 Define "
+"Responsible user and Email account for mail gateway."
+msgstr "销售团队属于这业务.定义负责用户和电子邮件帐户和网关"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Done"
+msgstr "完成"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "December"
+msgstr "12月"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Cancel"
+msgstr "取消"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Close"
+msgstr "结束"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: selection:crm.helpdesk,state:0
+#: selection:crm.helpdesk.report,state:0
+msgid "Open"
+msgstr "开启"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Helpdesk Support Tree"
+msgstr "服务台支持树"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Categorization"
+msgstr "归类"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+#: model:ir.actions.act_window,name:crm_helpdesk.action_report_crm_helpdesk
+#: model:ir.model,name:crm_helpdesk.model_crm_helpdesk
+#: model:ir.ui.menu,name:crm_helpdesk.menu_config_helpdesk
+msgid "Helpdesk"
+msgstr "服务台"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: field:crm.helpdesk,user_id:0
+msgid "Responsible"
+msgstr "负责人"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Current"
+msgstr "当前的"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Details"
+msgstr "明细行"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Reply"
+msgstr "回复"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,description:0
+msgid "Description"
+msgstr "说明"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "May"
+msgstr "5月"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,probability:0
+msgid "Probability (%)"
+msgstr "概率(%)"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk.report,email:0
+msgid "# Emails"
+msgstr "电子邮件"
+
+#. module: crm_helpdesk
+#: model:ir.actions.act_window,help:crm_helpdesk.action_report_crm_helpdesk
+msgid ""
+"Have a general overview of all support requests by sorting them with "
+"specific criteria such as the processing time, number of requests answered, "
+"emails sent and costs."
+msgstr "所有的支持请求都有分类,具体标准都有大致的描述如: 处理时间,请求回复的次数,邮件的发送成本."
+
+#. module: crm_helpdesk
+#: help:crm.helpdesk,canal_id:0
+msgid ""
+"The channels represent the different communication  modes available with the "
+"customer."
+msgstr "途径代表与客户沟通的不同方式"
+
+#. module: crm_helpdesk
+#: help:crm.helpdesk,state:0
+msgid ""
+"The state is set to 'Draft', when a case is created.                         "
+"         \n"
+"If the case is in progress the state is set to 'Open'.                       "
+"           \n"
+"When the case is over, the state is set to 'Done'.                           "
+"       \n"
+"If the case needs to be reviewed then the state is set to 'Pending'."
+msgstr ""
+"当一个业务创建时状态设为'草稿'\n"
+"如果业务正在处理状态设为'开启'\n"
+"当业务结束状态设为'完成'\n"
+"如果业务需要审查状态设为'待定'"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "February"
+msgstr "2月"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,name:0
+msgid "Name"
+msgstr "名称"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Lost"
+msgstr "丢失"
+
+#. module: crm_helpdesk
+#: model:ir.ui.menu,name:crm_helpdesk.menu_help_support_main
+msgid "Helpdesk and Support"
+msgstr "服务台和支持"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "April"
+msgstr "4月"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "My Case(s)"
+msgstr "我的业务"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,id:0
+msgid "ID"
+msgstr ""
+
+#. module: crm_helpdesk
+#: model:ir.actions.act_window,help:crm_helpdesk.crm_helpdesk_categ_action
+msgid ""
+"Create and manage helpdesk categories to better manage and classify your "
+"support requests."
+msgstr "创建和管理服务台类型去更好管理和分类你的支持的请求"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk,priority:0
+#: selection:crm.helpdesk.report,priority:0
+msgid "High"
+msgstr "高"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: field:crm.helpdesk,section_id:0
+#: view:crm.helpdesk.report:0
+msgid "Sales Team"
+msgstr "销售团队"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,date_action_last:0
+msgid "Last Action"
+msgstr "最近动作"
+
+#. module: crm_helpdesk
+#: model:ir.actions.act_window,help:crm_helpdesk.crm_case_helpdesk_act111
+msgid ""
+"Helpdesk and Support allow you to track your interventions. Select a "
+"customer, add notes and categorize interventions with partners if necessary. "
+"You can also assign a priority level. Use the OpenERP Issues system to "
+"manage your support activities. Issues can be connected to the email "
+"gateway: new emails may create issues, each of them automatically gets the "
+"history of the conversation with the customer."
+msgstr ""
+"服务台和支持使你可以去跟踪你的介入.如果需要选择一个客户增加备注和类型介入这业务伙伴.你可以分配一优先级用系统问题模块来管理的的支持活动.问题能链接邮件网"
+"关.新的邮件可能创建新的问题,它们能自动写入与客户沟通的日志."
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,name:0
+msgid "Year"
+msgstr "年"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,duration:0
+msgid "Duration"
+msgstr "持续时间"
diff --git a/addons/crm_profiling/i18n/zh_CN.po b/addons/crm_profiling/i18n/zh_CN.po
index f675cfc6ac9..bd41fa82d37 100644
--- a/addons/crm_profiling/i18n/zh_CN.po
+++ b/addons/crm_profiling/i18n/zh_CN.po
@@ -7,19 +7,19 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2010-08-03 03:23+0000\n"
-"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
+"PO-Revision-Date: 2011-04-10 18:32+0000\n"
+"Last-Translator: Black Jack <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: 2011-01-15 05:42+0000\n"
-"X-Generator: Launchpad (build 12177)\n"
+"X-Launchpad-Export-Date: 2011-04-11 04:53+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
 msgid "Questions List"
-msgstr ""
+msgstr "问题列表"
 
 #. module: crm_profiling
 #: model:ir.module.module,description:crm_profiling.module_meta_information
@@ -41,6 +41,15 @@ msgid ""
 "since it's the same which has been renamed.\n"
 "    "
 msgstr ""
+"\n"
+"    这模块允许用户去细分业务伙伴。\n"
+"它使用先前和修改好的细分模块的客户概括标准，以问卷调查的方式，你能组合新的问卷调查给业务伙伴。\n"
+"\n"
+"它已经合并到客户关系管理中\n"
+"菜单在客户关系管理\\设置\\细分\n"
+"\n"
+"* 备注：这模块不兼容细分模块因为它们是同名的。\n"
+"    "
 
 #. module: crm_profiling
 #: model:ir.actions.act_window,help:crm_profiling.open_questionnaires
@@ -49,7 +58,7 @@ msgid ""
 "in the sales cycle by helping them to ask the right questions. The "
 "segmentation tool allows you to automatically assign a partner to a category "
 "according to his answers to the different questionnaires."
-msgstr ""
+msgstr "你能创建特定主题的问卷调查去指导你的团队在销售周期向客户询问合适的问题。这细分工具能根据不同问题的答案自动划分业务伙伴到不同的类型。"
 
 #. module: crm_profiling
 #: field:crm_profiling.answer,question_id:0
@@ -61,12 +70,12 @@ msgstr "问题"
 #. module: crm_profiling
 #: wizard_button:open_questionnaire,init,open:0
 msgid "Open Questionnaire"
-msgstr "待处理调查问卷"
+msgstr "开启的问卷调查"
 
 #. module: crm_profiling
 #: constraint:res.partner:0
 msgid "Error ! You can not create recursive associated members."
-msgstr ""
+msgstr "错误！您不能创建递归的相关成员。"
 
 #. module: crm_profiling
 #: view:crm.segmentation:0
@@ -82,17 +91,17 @@ msgstr "答案"
 #. module: crm_profiling
 #: model:ir.model,name:crm_profiling.model_crm_segmentation
 msgid "Partner Segmentation"
-msgstr ""
+msgstr "业务伙伴细分"
 
 #. module: crm_profiling
 #: view:res.partner:0
 msgid "Profiling"
-msgstr "配置中"
+msgstr "概况"
 
 #. module: crm_profiling
 #: model:ir.module.module,shortdesc:crm_profiling.module_meta_information
 msgid "Crm Profiling management - To Perform Segmentation within Partners"
-msgstr ""
+msgstr "客户关系管理 客户概况管理 - 进行业务伙伴的细分"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
@@ -115,19 +124,19 @@ msgstr "答案"
 #. module: crm_profiling
 #: wizard_field:open_questionnaire,init,questionnaire_name:0
 msgid "Questionnaire name"
-msgstr "调查问卷名称"
+msgstr "问卷调查名称"
 
 #. module: crm_profiling
 #: view:res.partner:0
 msgid "Use a questionnaire"
-msgstr "使用的调查问卷"
+msgstr "使用一问卷调查"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
 #: model:ir.actions.act_window,name:crm_profiling.open_questionnaires
 #: model:ir.ui.menu,name:crm_profiling.menu_segm_questionnaire
 msgid "Questionnaires"
-msgstr "调查问卷"
+msgstr "问卷调查"
 
 #. module: crm_profiling
 #: help:crm.segmentation,profiling_active:0
@@ -135,17 +144,17 @@ msgid ""
 "Check                             this box if you want to use this tab as "
 "part of the                              segmentation rule. If not checked, "
 "the criteria beneath will be ignored"
-msgstr ""
+msgstr "选中这选项，如果你想使用这标签作为细分规则的一部分。如果不选中，这规则将被忽略"
 
 #. module: crm_profiling
 #: constraint:crm.segmentation:0
 msgid "Error ! You can not create recursive profiles."
-msgstr "错误! 你不能创建递归的配置"
+msgstr "错误! 你不能创建递归的客户概况。"
 
 #. module: crm_profiling
 #: field:crm.segmentation,profiling_active:0
 msgid "Use The Profiling Rules"
-msgstr "使用这配置规则"
+msgstr "使用这客户概况规则"
 
 #. module: crm_profiling
 #: view:crm_profiling.question:0
@@ -156,12 +165,12 @@ msgstr "可用答案"
 #. module: crm_profiling
 #: field:crm.segmentation,answer_yes:0
 msgid "Included Answers"
-msgstr "包括答案"
+msgstr "包括的答案"
 
 #. module: crm_profiling
 #: field:crm.segmentation,child_ids:0
 msgid "Child Profiles"
-msgstr "子配置"
+msgstr "子客户概况"
 
 #. module: crm_profiling
 #: view:crm_profiling.question:0
@@ -174,7 +183,7 @@ msgstr "问题"
 #. module: crm_profiling
 #: field:crm.segmentation,parent_id:0
 msgid "Parent Profile"
-msgstr "上级配置"
+msgstr "上级客户概况"
 
 #. module: crm_profiling
 #: wizard_button:open_questionnaire,init,end:0
@@ -185,7 +194,7 @@ msgstr "取消"
 #. module: crm_profiling
 #: model:ir.model,name:crm_profiling.model_res_partner
 msgid "Partner"
-msgstr ""
+msgstr "业务伙伴"
 
 #. module: crm_profiling
 #: code:addons/crm_profiling/crm_profiling.py:178
@@ -194,12 +203,12 @@ msgstr ""
 #: wizard_view:open_questionnaire,init:0
 #, python-format
 msgid "Questionnaire"
-msgstr "调查问卷"
+msgstr "问卷调查"
 
 #. module: crm_profiling
 #: model:ir.actions.wizard,name:crm_profiling.wizard_open_questionnaire
 msgid "Using a questionnaire"
-msgstr "使用一调查问卷"
+msgstr "使用一问卷调查"
 
 #. module: crm_profiling
 #: wizard_button:open_questionnaire,open,compute:0
diff --git a/addons/document_webdav/i18n/ca.po b/addons/document_webdav/i18n/ca.po
new file mode 100644
index 00000000000..83590b5c383
--- /dev/null
+++ b/addons/document_webdav/i18n/ca.po
@@ -0,0 +1,206 @@
+# Catalan translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-04-10 16:26+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Catalan <ca@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: 2011-04-11 04:53+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
+
+#. module: document_webdav
+#: field:document.webdav.dir.property,create_date:0
+#: field:document.webdav.file.property,create_date:0
+msgid "Date Created"
+msgstr ""
+
+#. module: document_webdav
+#: constraint:document.directory:0
+msgid "Error! You can not create recursive Directories."
+msgstr ""
+
+#. module: document_webdav
+#: view:document.webdav.dir.property:0
+#: view:document.webdav.file.property:0
+msgid "Search Document properties"
+msgstr ""
+
+#. module: document_webdav
+#: view:document.webdav.dir.property:0
+#: field:document.webdav.dir.property,namespace:0
+#: view:document.webdav.file.property:0
+#: field:document.webdav.file.property,namespace:0
+msgid "Namespace"
+msgstr ""
+
+#. module: document_webdav
+#: field:document.directory,dav_prop_ids:0
+msgid "DAV properties"
+msgstr ""
+
+#. module: document_webdav
+#: model:ir.model,name:document_webdav.model_document_webdav_file_property
+msgid "document.webdav.file.property"
+msgstr ""
+
+#. module: document_webdav
+#: view:document.webdav.dir.property:0
+#: view:document.webdav.file.property:0
+msgid "Group By..."
+msgstr ""
+
+#. module: document_webdav
+#: view:document.directory:0
+msgid "These properties will be added to WebDAV requests"
+msgstr ""
+
+#. module: document_webdav
+#: model:ir.ui.menu,name:document_webdav.menu_file_props
+msgid "DAV properties for documents"
+msgstr ""
+
+#. module: document_webdav
+#: code:addons/document_webdav/webdav.py:37
+#, python-format
+msgid "PyWebDAV Import Error!"
+msgstr ""
+
+#. module: document_webdav
+#: view:document.webdav.file.property:0
+#: field:document.webdav.file.property,file_id:0
+msgid "Document"
+msgstr ""
+
+#. module: document_webdav
+#: model:ir.module.module,description:document_webdav.module_meta_information
+msgid ""
+" With this module, the WebDAV server for the documents is activated.\n"
+"        You can then use any compatible browser to remotely see the "
+"attachments of OpenObject.\n"
+"\n"
+"        After installation, the webDAV server can be controlled by a "
+"[webdav] section in the server's config.\n"
+"        Server Configuration Parameter:\n"
+"        [webdav]\n"
+"        ; enable = True ; Serve webdav over the http(s) servers\n"
+"        ; vdir = webdav ; the directory that webdav will be served at\n"
+"          ; this default val means that webdav will be\n"
+"          ; on \"http://localhost:8069/webdav/\n"
+"        ; verbose = True ; Turn on the verbose messages of webdav\n"
+"        ; debug = True ; Turn on the debugging messages of webdav\n"
+"          ; since the messages are routed to the python logging, with\n"
+"          ; levels \"debug\" and \"debug_rpc\" respectively, you can leave\n"
+"          ; these options on\n"
+msgstr ""
+
+#. module: document_webdav
+#: sql_constraint:document.directory:0
+msgid "Directory cannot be parent of itself!"
+msgstr ""
+
+#. module: document_webdav
+#: view:document.directory:0
+msgid "Dynamic context"
+msgstr ""
+
+#. module: document_webdav
+#: view:document.directory:0
+msgid "WebDAV properties"
+msgstr ""
+
+#. module: document_webdav
+#: sql_constraint:document.directory:0
+msgid "The directory name must be unique !"
+msgstr ""
+
+#. module: document_webdav
+#: code:addons/document_webdav/webdav.py:37
+#, python-format
+msgid ""
+"Please install PyWebDAV from "
+"http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
+"0.9.4.tar.gz&can=2&q=/"
+msgstr ""
+
+#. module: document_webdav
+#: model:ir.ui.menu,name:document_webdav.menu_dir_props
+msgid "DAV properties for folders"
+msgstr ""
+
+#. module: document_webdav
+#: view:document.directory:0
+#: view:document.webdav.dir.property:0
+#: view:document.webdav.file.property:0
+msgid "Properties"
+msgstr ""
+
+#. module: document_webdav
+#: field:document.webdav.dir.property,name:0
+#: field:document.webdav.file.property,name:0
+msgid "Name"
+msgstr ""
+
+#. module: document_webdav
+#: model:ir.model,name:document_webdav.model_document_webdav_dir_property
+msgid "document.webdav.dir.property"
+msgstr ""
+
+#. module: document_webdav
+#: field:document.webdav.dir.property,value:0
+#: field:document.webdav.file.property,value:0
+msgid "Value"
+msgstr ""
+
+#. module: document_webdav
+#: field:document.webdav.dir.property,dir_id:0
+#: model:ir.model,name:document_webdav.model_document_directory
+msgid "Directory"
+msgstr ""
+
+#. module: document_webdav
+#: field:document.webdav.dir.property,write_uid:0
+#: field:document.webdav.file.property,write_uid:0
+msgid "Last Modification User"
+msgstr ""
+
+#. module: document_webdav
+#: view:document.webdav.dir.property:0
+msgid "Dir"
+msgstr ""
+
+#. module: document_webdav
+#: field:document.webdav.dir.property,write_date:0
+#: field:document.webdav.file.property,write_date:0
+msgid "Date Modified"
+msgstr ""
+
+#. module: document_webdav
+#: field:document.webdav.dir.property,create_uid:0
+#: field:document.webdav.file.property,create_uid:0
+msgid "Creator"
+msgstr ""
+
+#. module: document_webdav
+#: model:ir.module.module,shortdesc:document_webdav.module_meta_information
+msgid "WebDAV server for Document Management"
+msgstr ""
+
+#. module: document_webdav
+#: sql_constraint:document.directory:0
+msgid "Directory must have a parent or a storage"
+msgstr ""
+
+#. module: document_webdav
+#: field:document.webdav.dir.property,do_subst:0
+#: field:document.webdav.file.property,do_subst:0
+msgid "Substitute"
+msgstr ""
diff --git a/addons/fetchmail/i18n/ca.po b/addons/fetchmail/i18n/ca.po
new file mode 100644
index 00000000000..04bef6e3258
--- /dev/null
+++ b/addons/fetchmail/i18n/ca.po
@@ -0,0 +1,317 @@
+# Catalan translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-04-10 14:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Catalan <ca@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: 2011-04-11 04:54+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
+
+#. module: fetchmail
+#: constraint:email.server:0
+msgid ""
+"Warning! Record for selected Model can not be created\n"
+"Please choose valid Model"
+msgstr ""
+"Atenció! No es poden crear registres per al model seleccionat\n"
+"Seleccioneu un model vàlid"
+
+#. module: fetchmail
+#: selection:email.server,state:0
+msgid "Confirmed"
+msgstr "Confirmat"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Confirm"
+msgstr "Confirma"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Group By..."
+msgstr "Agrupa per..."
+
+#. module: fetchmail
+#: view:email.server:0
+#: field:email.server,state:0
+msgid "State"
+msgstr "Estat"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "POP"
+msgstr "POP"
+
+#. module: fetchmail
+#: selection:email.server,state:0
+msgid "Not Confirmed"
+msgstr "No confirmat"
+
+#. module: fetchmail
+#: field:email.server,user:0
+msgid "User Name"
+msgstr "Nom de l'usuari"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Type"
+msgstr "Tipus"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "POP/IMAP Servers"
+msgstr "Servidores POP/IMAP"
+
+#. module: fetchmail
+#: model:ir.module.module,shortdesc:fetchmail.module_meta_information
+msgid "Fetchmail Server"
+msgstr "Servidor Fetchmail"
+
+#. module: fetchmail
+#: view:email.server:0
+#: field:email.server,note:0
+msgid "Description"
+msgstr "Descripció"
+
+#. module: fetchmail
+#: help:email.server,object_id:0
+msgid ""
+"OpenObject Model. Generates a record of this model.\n"
+"Select Object with message_new attrbutes."
+msgstr ""
+"Model OpenObject. Genera un registre d'aquest model.\n"
+"Seleccioneu un objecte amb atributs message_new (nou missatge)."
+
+#. module: fetchmail
+#: field:email.server,attach:0
+msgid "Add Attachments ?"
+msgstr "Afegeix adjunts?"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "# of emails"
+msgstr "nombre d'emails"
+
+#. module: fetchmail
+#: model:ir.actions.act_window,name:fetchmail.act_server_history
+msgid "Email History"
+msgstr "Historial d'emails"
+
+#. module: fetchmail
+#: field:email.server,user_id:0
+msgid "User"
+msgstr "Usuari"
+
+#. module: fetchmail
+#: field:email.server,date:0
+msgid "Date"
+msgstr "Data"
+
+#. module: fetchmail
+#: selection:email.server,state:0
+msgid "Waiting for Verification"
+msgstr "Esperant verificació"
+
+#. module: fetchmail
+#: field:email.server,password:0
+msgid "Password"
+msgstr "Contrasenya"
+
+#. module: fetchmail
+#: view:mailgate.message:0
+msgid "Emails"
+msgstr "Emails"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Search Email Servers"
+msgstr "Buscar servidores de correo"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Server & Login"
+msgstr "Servidor i connexió"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Auto Reply?"
+msgstr "¿Auto responder?"
+
+#. module: fetchmail
+#: field:email.server,name:0
+msgid "Name"
+msgstr "Nom"
+
+#. module: fetchmail
+#: model:ir.model,name:fetchmail.model_mailgate_message
+msgid "Mailgateway Message"
+msgstr "Missatge passarel·la de correu"
+
+#. module: fetchmail
+#: model:ir.actions.act_window,name:fetchmail.action_email_server_tree
+msgid "POP Servers"
+msgstr "Servidores POP"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Set to Draft"
+msgstr "Canvia a esborrany"
+
+#. module: fetchmail
+#: field:email.server,message_ids:0
+#: model:ir.actions.act_window,name:fetchmail.action_view_mail_message_emails
+msgid "Messages"
+msgstr "Missatges"
+
+#. module: fetchmail
+#: model:ir.ui.menu,name:fetchmail.menu_action_fetchmail_server_tree
+msgid "Fetchmail Services"
+msgstr "Servicios Fetchmail"
+
+#. module: fetchmail
+#: field:email.server,server:0
+msgid "Server"
+msgstr "Servidor"
+
+#. module: fetchmail
+#: field:email.server,active:0
+msgid "Active"
+msgstr "Actiu"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Process Parameter"
+msgstr "Paràmetre procés"
+
+#. module: fetchmail
+#: field:email.server,is_ssl:0
+msgid "SSL ?"
+msgstr "SSL"
+
+#. module: fetchmail
+#: selection:email.server,type:0
+#: selection:mailgate.message,server_type:0
+msgid "IMAP Server"
+msgstr "Servidor IMAP"
+
+#. module: fetchmail
+#: field:email.server,object_id:0
+msgid "Model"
+msgstr "Model"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "IMAP"
+msgstr "IMAP"
+
+#. module: fetchmail
+#: view:email.server:0
+#: model:ir.model,name:fetchmail.model_email_server
+msgid "POP/IMAP Server"
+msgstr "Servidor POP/IMAP"
+
+#. module: fetchmail
+#: constraint:email.server:0
+msgid "Warning! Can't have duplicate server configuration!"
+msgstr "¡Aviso! No puede tener la configuración del servidor duplicada."
+
+#. module: fetchmail
+#: field:email.server,type:0
+#: field:mailgate.message,server_type:0
+msgid "Server Type"
+msgstr "Tipus de servidor"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Login Information"
+msgstr "Informació de connexió"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Server Information"
+msgstr "Informació del servidor"
+
+#. module: fetchmail
+#: help:email.server,attach:0
+msgid "Fetches mail with attachments if true."
+msgstr "Si está marcado, obtiene correo con documentos adjuntos."
+
+#. module: fetchmail
+#: selection:email.server,type:0
+#: selection:mailgate.message,server_type:0
+msgid "POP Server"
+msgstr "Servidor POP"
+
+#. module: fetchmail
+#: field:email.server,port:0
+msgid "Port"
+msgstr "Port"
+
+#. module: fetchmail
+#: model:ir.module.module,description:fetchmail.module_meta_information
+msgid ""
+"Fetchmail: \n"
+"    * Fetch email from Pop / IMAP server\n"
+"    * Support SSL\n"
+"    * Integrated with all Modules\n"
+"    * Automatic Email Receive\n"
+"    * Email based Records (Add, Update)\n"
+"    "
+msgstr ""
+"Fetchmail: \n"
+"    * Recuperar email des de servidor POP / IMAP\n"
+"    * Compatibilitat amb SSL\n"
+"    * Integració amb tots els mòduls\n"
+"    * Recepció automàtica d'emails\n"
+"    * Registres basats en email (afegir, actualitzar)\n"
+"    "
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "SSL"
+msgstr "SSL"
+
+#. module: fetchmail
+#: help:email.server,action_id:0
+msgid ""
+"An Email Server Action. It will be run whenever an e-mail is fetched from "
+"server."
+msgstr ""
+"Una acció de servidor de correu. S'executarà sempre que s'obtingui un email "
+"des del servidor."
+
+#. module: fetchmail
+#: help:email.server,priority:0
+msgid "Priority between 0 to 10, select define the order of Processing"
+msgstr "Prioritat entre 0 i 10, defineix l'ordre de procés."
+
+#. module: fetchmail
+#: field:email.server,action_id:0
+msgid "Email Server Action"
+msgstr "Acción d'email del servidor"
+
+#. module: fetchmail
+#: field:email.server,priority:0
+msgid "Server Priority"
+msgstr "Prioridad servidor"
+
+#. module: fetchmail
+#: view:mailgate.message:0
+#: field:mailgate.message,server_id:0
+msgid "Mail Server"
+msgstr "Servidor de correu"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Fetch Emails"
+msgstr "Recupera emails"
diff --git a/addons/hr_payroll/i18n/vi.po b/addons/hr_payroll/i18n/vi.po
new file mode 100644
index 00000000000..86ca6bf8ef1
--- /dev/null
+++ b/addons/hr_payroll/i18n/vi.po
@@ -0,0 +1,1538 @@
+# Vietnamese translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-04-07 16:44+0000\n"
+"Last-Translator: Phong Nguyen-Thanh <Unknown>\n"
+"Language-Team: Vietnamese <vi@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: 2011-04-08 04:45+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
+
+#. module: hr_payroll
+#: rml:employees.salary:0
+msgid "E-mail Address"
+msgstr "E-mail Address"
+
+#. module: hr_payroll
+#: view:hr.allounce.deduction.categoty:0
+msgid "Based"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payroll.register,net:0
+#: field:hr.payslip,net:0
+msgid "Net Salary"
+msgstr "Net Salary"
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Recompute Sheet"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:employees.salary:0
+msgid "Employees Salary Details"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:employees.salary:0
+msgid "Allowances with Basic:"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:employees.salary:0
+#: rml:salary.structure:0
+msgid "Department"
+msgstr "Phòng/Ban"
+
+#. module: hr_payroll
+#: rml:employees.salary:0
+msgid "Deductions:"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.allounce.deduction.categoty,gratuity:0
+msgid "Use for Gratuity ?"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip,working_days:0
+msgid "Working Days"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.payslip.line,type:0
+msgid "Loan"
+msgstr "Khoản vay"
+
+#. module: hr_payroll
+#: rml:hr.payroll.register.sheet:0
+msgid "Salary Payment Register"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.employee,slip_ids:0
+#: view:hr.payroll.register:0
+#: field:hr.payroll.register,line_ids:0
+msgid "Payslips"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.actions.report.xml,name:hr_payroll.year_salary_report
+msgid "Year Salary Report"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.payroll.register,state:0
+#: selection:hr.payslip,state:0
+msgid "Paid Salary"
+msgstr ""
+
+#. module: hr_payroll
+#: report:payslip.pdf:0
+msgid "("
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payroll.register,company_id:0
+#: field:hr.payslip,company_id:0
+#: wizard_field:payroll.analysis,init,company_id:0
+msgid "Company"
+msgstr "Công ty"
+
+#. module: hr_payroll
+#: rml:payroll.advice:0
+msgid "The Manager"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Letter Details"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:hr.payroll.register.sheet:0
+msgid ","
+msgstr ","
+
+#. module: hr_payroll
+#: view:hr.payroll.advice:0
+#: view:hr.payroll.register:0
+#: view:hr.payslip:0
+msgid "Set to Draft"
+msgstr ""
+
+#. module: hr_payroll
+#: code:addons/hr_payroll/hr_payroll.py:180
+#: code:addons/hr_payroll/hr_payroll.py:195
+#: code:addons/hr_payroll/hr_payroll.py:285
+#: code:addons/hr_payroll/hr_payroll.py:835
+#: code:addons/hr_payroll/hr_payroll.py:1111
+#: code:addons/hr_payroll/hr_payroll.py:1126
+#: code:addons/hr_payroll/hr_payroll.py:1410
+#, python-format
+msgid "Variable Error: %s "
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.passport:0
+msgid "Expire"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.holidays.status,type:0
+msgid "Half-Pay Holiday"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.allounce.deduction.categoty,type:0
+#: rml:hr.payroll.register.sheet:0
+#: field:hr.payslip,other_pay:0
+msgid "Others"
+msgstr "Khác"
+
+#. module: hr_payroll
+#: field:hr.payslip.line,slip_id:0
+#: model:ir.model,name:hr_payroll.model_hr_payslip
+#: rml:payslip.pdf:0
+msgid "Pay Slip"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:salary.structure:0
+msgid "Contract Detail:"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip,igross:0
+#: field:hr.payslip,inet:0
+msgid "Calculaton Field"
+msgstr ""
+
+#. module: hr_payroll
+#: help:hr.payroll.advice,bank_id:0
+#: help:hr.payroll.register,bank_id:0
+msgid "Select the Bank Address from whcih the salary is going to be paid"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.advice:0
+#: field:hr.payroll.advice.line,advice_id:0
+msgid "Bank Advice"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.payroll.advice,state:0
+#: selection:hr.payroll.register,state:0
+#: selection:hr.payslip,state:0
+msgid "Reject"
+msgstr "Từ chối"
+
+#. module: hr_payroll
+#: selection:hr.payslip.line,type:0
+msgid "Leaves"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip,register_id:0
+msgid "Register"
+msgstr "Đăng ký"
+
+#. module: hr_payroll
+#: constraint:hr.employee:0
+msgid ""
+"Error ! You cannot select a department for which the employee is the manager."
+msgstr ""
+
+#. module: hr_payroll
+#: rml:payslip.pdf:0
+msgid "Total Deductions"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.allounce.deduction.categoty.line,value:0
+msgid "Value"
+msgstr "Giá trị"
+
+#. module: hr_payroll
+#: rml:payroll.advice:0
+msgid "Name of the Employee"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.contibution.register:0
+msgid "Register Lines"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Salary Computation"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payroll.advice.line,amount:0
+#: rml:payroll.advice:0
+msgid "Amount"
+msgstr "Số tiền"
+
+#. module: hr_payroll
+#: code:addons/hr_payroll/hr_payroll.py:1225
+#, python-format
+msgid "Please check configuration of %s, payroll head is missing"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:company.contribution,amount_type:0
+msgid "Percentage"
+msgstr ""
+
+#. module: hr_payroll
+#: view:company.contribution:0
+#: view:hr.allounce.deduction.categoty:0
+msgid "Other Information"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.passport,country_id:0
+msgid "Country of Issue"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.contibution.register.line,emp_deduction:0
+msgid "Employee Deduction"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.payslip.line,type:0
+msgid "Other Deduction"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.holidays.status,type:0
+msgid "Paid Holiday"
+msgstr ""
+
+#. module: hr_payroll
+#: view:company.contribution:0
+#: view:hr.allounce.deduction.categoty:0
+#: view:hr.passport:0
+#: view:hr.payslip:0
+msgid "Group By..."
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.passport,date_expire:0
+msgid "Passport Expire Date"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.holidays.status,type:0
+msgid "Un-Paid Holiday"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.passport:0
+msgid "Valid From"
+msgstr ""
+
+#. module: hr_payroll
+#: help:hr.payslip,igross:0
+#: help:hr.payslip,inet:0
+msgid ""
+"Calculation field used for internal calculation, do not place this on form"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:payslip.pdf:0
+msgid "Amount (in words) :"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.holidays.status,type:0
+msgid "Payment"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip,line_ids:0
+#: view:hr.payslip.line:0
+#: model:ir.model,name:hr_payroll.model_hr_payslip_line
+msgid "Payslip Line"
+msgstr ""
+
+#. module: hr_payroll
+#: report:payslip.pdf:0
+msgid "Identification No"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.allounce.deduction.categoty,base:0
+msgid "Based on"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.payroll.register,state:0
+#: selection:hr.payslip,state:0
+msgid "Wating for Verification"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.module.module,shortdesc:hr_payroll.module_meta_information
+msgid "Human Resource Payroll"
+msgstr ""
+
+#. module: hr_payroll
+#: report:payroll.advice:0
+msgid "Total:"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Posted"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.module.module,description:hr_payroll.module_meta_information
+msgid ""
+"Generic Payroll system\n"
+"    * Employee Details\n"
+"    * Employee Contracts\n"
+"    * Passport based Contract\n"
+"    * Allowances / Deductions\n"
+"    * Allow to configure Basic / Grows / Net Salary\n"
+"    * Employee Payslip\n"
+"    * Monthly Payroll Register\n"
+"    * Integrated with Holiday Management\n"
+"    "
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.model,name:hr_payroll.model_hr_holidays_status
+msgid "Leave Type"
+msgstr ""
+
+#. module: hr_payroll
+#: report:hr.payroll.register.sheet:0
+msgid "Date :"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.line,total:0
+msgid "Sub Total"
+msgstr ""
+
+#. module: hr_payroll
+#: report:payslip.pdf:0
+msgid "Payments -"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.contract,visa_no:0
+msgid "Visa No"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.allounce.deduction.categoty.line,from:0
+msgid "From"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payroll.advice.line,bysal:0
+msgid "By Salary"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:salary.structure:0
+msgid "End Date"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.actions.report.xml,name:hr_payroll.salary_payslip
+msgid "Employee PaySlip"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip,leaves:0
+msgid "Leave Deductions"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:hr.payroll.register.sheet:0
+#: rml:payroll.advice:0
+msgid "Authorised Signature"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.payslip.line,amount_type:0
+msgid "Function Value"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.model,name:hr_payroll.model_hr_contibution_register_line
+msgid "Contribution Register Line"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:salary.structure:0
+msgid "Notes:"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.allounce.deduction.categoty,based_on:0
+#: field:hr.payroll.advice,state:0
+#: field:hr.payroll.register,state:0
+#: field:hr.payslip,state:0
+msgid "State"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Paymeny Lines"
+msgstr ""
+
+#. module: hr_payroll
+#: report:payslip.pdf:0
+msgid "Other Lines"
+msgstr ""
+
+#. module: hr_payroll
+#: view:company.contribution:0
+#: view:hr.allounce.deduction.categoty:0
+#: view:hr.payroll.structure:0
+#: view:hr.payslip:0
+#: view:hr.payslip.line:0
+msgid "Function Arguments"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_company_contribution_tree
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_company_contribution_tree
+msgid "Company Contributions"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.passport,employee_id:0
+#: field:hr.payroll.advice.line,employee_id:0
+#: field:hr.payslip,employee_id:0
+#: field:hr.payslip.line,employee_id:0
+msgid "Employee"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.line,base:0
+msgid "Formula"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.model,name:hr_payroll.model_hr_payroll_advice_line
+msgid "Bank Advice Lines"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.allounce.deduction.categoty,type:0
+#: field:hr.payslip.line,type:0
+#: wizard_field:payroll.analysis,init,type:0
+#: rml:salary.structure:0
+msgid "Type"
+msgstr ""
+
+#. module: hr_payroll
+#: report:payslip.pdf:0
+msgid "Email"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:hr.payroll.register.sheet:0
+msgid "#"
+msgstr ""
+
+#. module: hr_payroll
+#: code:addons/hr_payroll/hr_payroll.py:469
+#: code:addons/hr_payroll/hr_payroll.py:1225
+#, python-format
+msgid "Error !"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.register:0
+#: view:hr.payslip:0
+msgid "Verify Sheet"
+msgstr ""
+
+#. module: hr_payroll
+#: help:hr.contract,working_days_per_week:0
+msgid "No of Working days / week for an employee"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.payroll.register,state:0
+#: selection:hr.payslip,state:0
+msgid "New Slip"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip,basic:0
+msgid "Net Basic"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payroll.register,grows:0
+#: field:hr.payslip,grows:0
+msgid "Gross Salary"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:payslip.pdf:0
+msgid "Total Earnings"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_payroll_employees_detail
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_payroll_employees_detail
+msgid "Employee Salary Statement"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.payslip.line,type:0
+msgid "Other Payment"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:payslip.pdf:0
+msgid "Deductions"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:payroll.advice:0
+msgid "C/D"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.contract,permit_no:0
+msgid "Work Permit No"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payroll.advice,line_ids:0
+msgid "Employee Salary"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payroll.advice,chaque_nos:0
+msgid "Chaque Nos"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.contibution.register,monthly_total_by_emp:0
+msgid "Total By Employee"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.allounce.deduction.categoty.line,amount_type:0
+#: selection:hr.payslip.line,amount_type:0
+msgid "Fixed Amount"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.allounce.deduction.categoty.line,to:0
+msgid "To"
+msgstr ""
+
+#. module: hr_payroll
+#: code:addons/hr_payroll/hr_payroll.py:180
+#: code:addons/hr_payroll/hr_payroll.py:195
+#: code:addons/hr_payroll/hr_payroll.py:285
+#: code:addons/hr_payroll/hr_payroll.py:835
+#: code:addons/hr_payroll/hr_payroll.py:1111
+#: code:addons/hr_payroll/hr_payroll.py:1126
+#: code:addons/hr_payroll/hr_payroll.py:1410
+#, python-format
+msgid "Variable Error !"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.model,name:hr_payroll.model_hr_payroll_employees_detail
+msgid "hr.payroll.employees.detail"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.register:0
+#: view:hr.payslip:0
+msgid "Pay Salary"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payroll.advice.line,name:0
+msgid "Bank Account A/C"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.contibution.register:0
+msgid "Contribution Lines"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:hr.payroll.register.sheet:0
+#: rml:payslip.pdf:0
+msgid "For the month of"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.allounce.deduction.categoty,type:0
+#: field:hr.payroll.register,deduction:0
+#: rml:hr.payroll.register.sheet:0
+#: field:hr.payslip,deduction:0
+#: selection:hr.payslip.line,type:0
+msgid "Deduction"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.model,name:hr_payroll.model_hr_payroll_advice
+msgid "Bank Advice Note"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.register:0
+#: view:hr.payslip:0
+msgid "Payslip"
+msgstr ""
+
+#. module: hr_payroll
+#: constraint:hr.contract:0
+msgid "Error! contract start-date must be lower then contract end-date."
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.payslip.line,type:0
+msgid "Loan Installment"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.register:0
+#: view:hr.payslip:0
+msgid "Complete HR Checking"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:payroll.advice:0
+msgid "Yours Sincerely"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:payroll.advice:0
+msgid "SI. No."
+msgstr ""
+
+#. module: hr_payroll
+#: rml:payslip.pdf:0
+msgid "Net Amount"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:salary.structure:0
+msgid "Salary Structure:"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.actions.report.xml,name:hr_payroll.year_employees_detail
+#: model:ir.actions.wizard,name:hr_payroll.wizard_print_employees_detail
+#: model:ir.ui.menu,name:hr_payroll.menu_wizard_print_employees_detail
+msgid "Employees Salary Detail"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.model,name:hr_payroll.model_hr_payslip_line_line
+msgid "Function Line"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.advice:0
+#: selection:hr.payroll.advice,state:0
+#: selection:hr.payroll.register,state:0
+#: selection:hr.payslip,state:0
+msgid "Confirm Sheet"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:employees.salary:0
+msgid "Others:"
+msgstr ""
+
+#. module: hr_payroll
+#: view:company.contribution:0
+#: selection:company.contribution,amount_type:0
+msgid "Function Calculation"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip,worked_days:0
+msgid "Worked Day"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.contibution.register,monthly_total_by_comp:0
+msgid "Total By Company"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payroll.advice.line,flag:0
+msgid "D/C"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.passport:0
+msgid "Country & Address"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:employees.salary:0
+msgid "Employee Code"
+msgstr ""
+
+#. module: hr_payroll
+#: report:payslip.pdf:0
+msgid "Basic Salary – Leaves"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.allounce.deduction.categoty.line,amount_type:0
+#: field:hr.payslip.line,amount_type:0
+#: rml:salary.structure:0
+msgid "Amount Type"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.allounce.deduction.categoty.line,category_id:0
+#: field:hr.payslip.line,category_id:0
+#: rml:salary.structure:0
+msgid "Category"
+msgstr ""
+
+#. module: hr_payroll
+#: view:company.contribution:0
+#: view:hr.allounce.deduction.categoty:0
+#: field:hr.payslip.line,company_contrib:0
+#: model:ir.model,name:hr_payroll.model_company_contribution
+msgid "Company Contribution"
+msgstr ""
+
+#. module: hr_payroll
+#: field:company.contribution,category_id:0
+msgid "Heads"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.actions.report.xml,name:hr_payroll.year_payroll_register
+msgid "Print Statement"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Draft"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:payslip.pdf:0
+msgid "Earnings"
+msgstr ""
+
+#. module: hr_payroll
+#: report:hr.payroll.register.sheet:0
+#: report:salary.structure:0
+msgid "Basic"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_passport_tree
+#: model:ir.ui.menu,name:hr_payroll.menu_action_hr_passport_tree
+msgid "All Passports"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_payroll_year_salary
+#: model:ir.ui.menu,name:hr_payroll.menu_wizard_print_year_salary
+msgid "Salary Register"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:employees.salary:0
+#: rml:hr.payroll.register.sheet:0
+#: rml:payslip.pdf:0
+msgid "Employee Name"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.model,name:hr_payroll.model_hr_passport
+msgid "Passport Detail"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.allounce.deduction.categoty.line,amount_type:0
+#: selection:hr.payslip.line,amount_type:0
+msgid "Percentage (%)"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payroll.advice,register_id:0
+#: view:hr.payroll.register:0
+#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payroll_register_form
+#: model:ir.model,name:hr_payroll.model_hr_payroll_register
+#: model:ir.ui.menu,name:hr_payroll.hr_menu_payroll_register
+msgid "Payroll Register"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:employees.salary:0
+#: rml:hr.payroll.register.sheet:0
+#: rml:payroll.advice:0
+#: rml:salary.structure:0
+#: rml:year.salary:0
+msgid "For"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.employee:0
+#: field:hr.passport,contracts_ids:0
+msgid "Contracts"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.employee.grade:0
+msgid "Employee Function"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Paid"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Approve Sheet"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip,paid:0
+msgid "Paid ? "
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.holidays.status:0
+msgid "Validation"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:employees.salary:0
+msgid "Title"
+msgstr ""
+
+#. module: hr_payroll
+#: view:company.contribution:0
+msgid "Search Company Contribution"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.allounce.deduction.categoty,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.advice:0
+#: view:hr.payslip:0
+#: field:hr.payslip,move_payment_ids:0
+msgid "Payment Lines"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Compute Sheet"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payroll.register,active:0
+msgid "Active"
+msgstr ""
+
+#. module: hr_payroll
+#: help:hr.allounce.deduction.categoty,condition:0
+msgid "Applied this head for calculation if condition is true"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:year.salary:0
+msgid "Yearly Salary Details"
+msgstr ""
+
+#. module: hr_payroll
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.allounce.deduction.categoty,condition:0
+msgid "Condition"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.payroll.register,state:0
+#: selection:hr.payslip,state:0
+msgid "Wating for HR Verification"
+msgstr ""
+
+#. module: hr_payroll
+#: report:payroll.advice:0
+msgid "Payment Advice:"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.register:0
+msgid "Compute"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:employees.salary:0
+#: field:hr.payslip,deg_id:0
+#: rml:payslip.pdf:0
+#: rml:salary.structure:0
+msgid "Designation"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:hr.payroll.register.sheet:0
+msgid "HR Manager"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.allounce.deduction.categoty,based_on:0
+#: field:hr.payslip,basic_before_leaves:0
+#: rml:payslip.pdf:0
+msgid "Basic Salary"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.allounce.deduction.categoty,code:0
+msgid "Category Code"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.register:0
+msgid "Salary Information"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.model,name:hr_payroll.model_hr_allounce_deduction_categoty
+#: model:ir.model,name:hr_payroll.model_hr_allounce_deduction_categoty_line
+msgid "Allowance Deduction Categoty"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Companies"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:payslip.pdf:0
+msgid "Authorized Signature"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.employee:0
+msgid "Contract"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.payroll.advice,state:0
+msgid "Draft Sheet"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:wizard.year.salary,init,salary_on:0
+msgid "Next Month Date"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payroll.advice,date:0
+#: field:hr.payroll.register,date:0
+#: rml:hr.payroll.register.sheet:0
+#: field:hr.payslip,date:0
+msgid "Date"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.contract,visa_expire:0
+msgid "Visa Expire Date"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.passport:0
+msgid "Search Passport"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:employees.salary:0
+#: rml:salary.structure:0
+msgid "Phone No."
+msgstr ""
+
+#. module: hr_payroll
+#: field:company.contribution,contribute_per:0
+#: field:company.contribution.line,contribution_id:0
+#: view:hr.allounce.deduction.categoty:0
+#: view:hr.contibution.register:0
+#: view:hr.contibution.register.line:0
+msgid "Contribution"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.allounce.deduction.categoty,state:0
+msgid "Label"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.structure:0
+#: view:hr.payslip:0
+#: view:hr.payslip.line:0
+msgid "Company contribution"
+msgstr ""
+
+#. module: hr_payroll
+#: report:employees.salary:0
+#: report:salary.structure:0
+msgid "Other No."
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.holidays.status,code:0
+#: field:hr.payslip.line,code:0
+#: rml:salary.structure:0
+msgid "Code"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_bank_advice_tree
+#: model:ir.ui.menu,name:hr_payroll.hr_menu_payment_advice
+#: rml:payroll.advice:0
+msgid "Payment Advice"
+msgstr ""
+
+#. module: hr_payroll
+#: report:hr.payroll.register.sheet:0
+msgid "Number :"
+msgstr ""
+
+#. module: hr_payroll
+#: help:hr.allounce.deduction.categoty,base:0
+msgid ""
+"This will use to computer the % fields values, in general its on basic, but "
+"You can use all heads code field in small letter as a variable name i.e. "
+"hra, ma, lta, etc...., also you can use, static varible basic"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Computation Overview"
+msgstr ""
+
+#. module: hr_payroll
+#: wizard_field:wizard.year.salary,init,salary_on:0
+msgid "Salary On"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payroll.advice,number:0
+#: field:hr.payroll.register,number:0
+#: rml:hr.payroll.register.sheet:0
+#: field:hr.payslip,number:0
+msgid "Number"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.employee:0
+#: field:hr.employee,line_ids:0
+#: view:hr.employee.grade:0
+#: field:hr.employee.grade,line_ids:0
+#: rml:salary.structure:0
+msgid "Salary Structure"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.contibution.register,register_line_ids:0
+msgid "Register Line"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.register:0
+#: view:hr.payslip:0
+#: wizard_button:payroll.analysis,init,end:0
+#: wizard_button:wizard.employees.detail,init,end:0
+#: wizard_button:wizard.year.salary,init,end:0
+msgid "Cancel"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.employees.detail:0
+#: view:hr.payroll.year.salary:0
+msgid "Close"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.line,amount:0
+#: rml:salary.structure:0
+msgid "Amount / Percentage"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:hr.payroll.register.sheet:0
+msgid "Allowances"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:wizard.year.salary,init,salary_on:0
+msgid "Current Month Date"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.employee:0
+#: rml:salary.structure:0
+msgid "Salary"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.passport,name:0
+msgid "Passport No"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.contract,passport_id:0
+#: field:hr.employee,passport_id:0
+#: view:hr.passport:0
+msgid "Passport"
+msgstr ""
+
+#. module: hr_payroll
+#: report:hr.payroll.register.sheet:0
+msgid "Total Salary"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:payroll.advice:0
+msgid "for period"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.expense.expense,category_id:0
+#: field:hr.holidays.status,head_id:0
+msgid "Payroll Head"
+msgstr ""
+
+#. module: hr_payroll
+#: field:company.contribution,register_id:0
+#: model:ir.actions.act_window,name:hr_payroll.action_contibution_register_form
+#: model:ir.model,name:hr_payroll.model_hr_contibution_register
+#: model:ir.ui.menu,name:hr_payroll.menu_action_hr_contibution_register_form
+msgid "Contribution Register"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:salary.structure:0
+msgid "E-mail"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.allounce.deduction.categoty:0
+#: model:ir.actions.act_window,name:hr_payroll.hr_allounce_deduction_tree
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_allounce_deduction_tree
+msgid "Salary Heads"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.employees.detail:0
+#: view:hr.payroll.year.salary:0
+msgid "Print Report"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.allounce.deduction.categoty:0
+#: field:hr.allounce.deduction.categoty,line_ids:0
+msgid "Calculations"
+msgstr ""
+
+#. module: hr_payroll
+#: help:company.contribution,contribute_per:0
+msgid ""
+"Define Company contribution ratio 1.00=100% contribution, If Employee "
+"Contribute 5% then company will and here 0.50 defined then company will "
+"contribute 50% on employee 5% contribution"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Other Informations"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.contibution.register:0
+msgid "Month"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.passport:0
+msgid "Issue"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.allounce.deduction.categoty:0
+msgid "Dynamic Computation"
+msgstr ""
+
+#. module: hr_payroll
+#: report:payslip.pdf:0
+msgid "Basic Salary without Leave:"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.employee.grade,function_id:0
+#: field:hr.payslip.line,function_id:0
+msgid "Function"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "States"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:payroll.advice:0
+msgid "Dear Sir/Madam,"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.model,name:hr_payroll.model_hr_allounce_deduction_categoty
+msgid "Allowance Deduction Heads"
+msgstr ""
+
+#. module: hr_payroll
+#: report:hr.payroll.register.sheet:0
+msgid "Gross Sal."
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payroll.advice,note:0
+msgid "Description"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:salary.structure:0
+msgid "Start Date"
+msgstr ""
+
+#. module: hr_payroll
+#: report:payslip.pdf:0
+msgid "Deduction -"
+msgstr ""
+
+#. module: hr_payroll
+#: report:payslip.pdf:0
+msgid ")"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.contibution.register:0
+msgid "Contribution Registers"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_payroll_reporting
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_root_payroll
+msgid "Payroll"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.model,name:hr_payroll.model_hr_contract_wage_type
+msgid "Wage Type"
+msgstr ""
+
+#. module: hr_payroll
+#: report:hr.payroll.register.sheet:0
+msgid "Net Sal."
+msgstr ""
+
+#. module: hr_payroll
+#: sql_constraint:hr.passport:0
+msgid "The Passport No must be unique !"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.allounce.deduction.categoty,name:0
+msgid "Category Name"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.model,name:hr_payroll.model_hr_payroll_year_salary
+msgid "hr.payroll.year.salary"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:employees.salary:0
+#: rml:payslip.pdf:0
+#: rml:salary.structure:0
+msgid "Address"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.line.line,slipline_id:0
+msgid "Slip Line"
+msgstr ""
+
+#. module: hr_payroll
+#: report:payslip.pdf:0
+msgid "Number of Leaves"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:employees.salary:0
+#: rml:salary.structure:0
+msgid "Bank"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Cancel Sheet"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.payslip.line,type:0
+msgid "Advance"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:salary.structure:0
+msgid "Special Allowances and Deductions For Employee:"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.allounce.deduction.categoty.line,name:0
+#: field:hr.payroll.advice,name:0
+#: field:hr.payroll.register,name:0
+#: field:hr.payslip,name:0
+#: field:hr.payslip.line,name:0
+#: rml:salary.structure:0
+#: rml:year.salary:0
+msgid "Name"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip,leaves:0
+msgid "Leaved Deduction"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.passport:0
+msgid "Country"
+msgstr ""
+
+#. module: hr_payroll
+#: wizard_field:wizard.employees.detail,init,employee_ids:0
+#: wizard_field:wizard.year.salary,init,employee_ids:0
+msgid "Employees"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.employee,property_bank_account:0
+#: rml:payroll.advice:0
+msgid "Bank Account"
+msgstr ""
+
+#. module: hr_payroll
+#: help:company.contribution,register_id:0
+msgid "Contribution register based on company"
+msgstr ""
+
+#. module: hr_payroll
+#: help:hr.allounce.deduction.categoty,sequence:0
+msgid "Use to arrange calculation sequence"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip,total_pay:0
+msgid "Total Payment"
+msgstr ""
+
+#. module: hr_payroll
+#: report:payslip.pdf:0
+msgid "Leave Deductions Line:"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.payroll.register,state:0
+#: selection:hr.payslip,state:0
+msgid "Wating for Account Verification"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.contibution.register.line,comp_deduction:0
+msgid "Company Deduction"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.holidays.status:0
+msgid "Payroll Configurtion"
+msgstr ""
+
+#. module: hr_payroll
+#: code:addons/hr_payroll/hr_payroll.py:469
+#, python-format
+msgid "Please define bank account for the %s employee"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.passport,date_issue:0
+msgid "Passport Issue Date"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.allounce.deduction.categoty,type:0
+#: field:hr.payroll.register,allounce:0
+#: field:hr.payslip,allounce:0
+#: selection:hr.payslip.line,type:0
+msgid "Allowance"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip,holiday_days:0
+msgid "No of Leaves"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.employee,otherid:0
+msgid "Other Id"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:payslip.pdf:0
+msgid "Bank Details"
+msgstr ""
+
+#. module: hr_payroll
+#: report:payslip.pdf:0
+msgid "Slip ID"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.allounce.deduction.categoty,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payslip_form
+#: model:ir.ui.menu,name:hr_payroll.menu_department_tree
+msgid "Employee Payslip"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Letter Content"
+msgstr ""
+
+#. module: hr_payroll
+#: wizard_view:wizard.employees.detail,init:0
+#: wizard_view:wizard.year.salary,init:0
+msgid "Year Salary"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.register:0
+msgid "Allowance / Deduction"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.actions.report.xml,name:hr_payroll.payroll_advice
+msgid "Bank Payment Advice"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Search Payslips"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:employees.salary:0
+#: rml:payroll.advice:0
+#: rml:year.salary:0
+msgid "Total"
+msgstr ""
+
+#. module: hr_payroll
+#: view:company.contribution:0
+#: view:hr.allounce.deduction.categoty:0
+#: field:hr.allounce.deduction.categoty,contribute_ids:0
+msgid "Contributions"
+msgstr ""
diff --git a/addons/hr_timesheet/i18n/nb.po b/addons/hr_timesheet/i18n/nb.po
new file mode 100644
index 00000000000..c17f2492caa
--- /dev/null
+++ b/addons/hr_timesheet/i18n/nb.po
@@ -0,0 +1,702 @@
+# Norwegian Bokmal translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-04-07 06:53+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Bokmal <nb@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: 2011-04-08 04:45+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
+
+#. module: hr_timesheet
+#: model:product.template,name:hr_timesheet.product_consultant_product_template
+msgid "Service on Timesheet"
+msgstr ""
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/report/user_timesheet.py:42
+#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#, python-format
+msgid "Wed"
+msgstr "Ons"
+
+#. module: hr_timesheet
+#: view:hr.sign.out.project:0
+msgid "(Keep empty for current_time)"
+msgstr "(La stå blank for å benytte nåværende tid)"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:132
+#, python-format
+msgid "No employee defined for your user !"
+msgstr "Ingen ansatt definert for brukeren din !"
+
+#. module: hr_timesheet
+#: view:hr.analytic.timesheet:0
+msgid "Group By..."
+msgstr "Grupper etter..."
+
+#. module: hr_timesheet
+#: model:ir.actions.act_window,help:hr_timesheet.action_hr_timesheet_sign_in
+msgid ""
+"Employees can encode their time spent on the different projects. A project "
+"is an analytic account and the time spent on a project generate costs on the "
+"analytic account. This feature allows to record at the same time the "
+"attendance and the timesheet."
+msgstr ""
+
+#. module: hr_timesheet
+#: view:hr.analytic.timesheet:0
+msgid "Today"
+msgstr "Idag"
+
+#. module: hr_timesheet
+#: field:hr.employee,journal_id:0
+msgid "Analytic Journal"
+msgstr "Analytisk Journal"
+
+#. module: hr_timesheet
+#: view:hr.sign.out.project:0
+msgid "Stop Working"
+msgstr ""
+
+#. module: hr_timesheet
+#: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_employee
+#: model:ir.ui.menu,name:hr_timesheet.menu_hr_timesheet_employee
+msgid "Employee Timesheet"
+msgstr ""
+
+#. module: hr_timesheet
+#: view:account.analytic.account:0
+msgid "Work done stats"
+msgstr ""
+
+#. module: hr_timesheet
+#: view:hr.analytic.timesheet:0
+#: model:ir.ui.menu,name:hr_timesheet.menu_hr_reporting_timesheet
+msgid "Timesheet"
+msgstr "Timeliste"
+
+#. module: hr_timesheet
+#: selection:hr.analytical.timesheet.employee,month:0
+#: selection:hr.analytical.timesheet.users,month:0
+msgid "janvier"
+msgstr ""
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/report/user_timesheet.py:42
+#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#, python-format
+msgid "Mon"
+msgstr "Man"
+
+#. module: hr_timesheet
+#: view:hr.sign.in.project:0
+msgid "Sign in"
+msgstr "Logg på"
+
+#. module: hr_timesheet
+#: view:hr.sign.in.project:0
+msgid ""
+"Employees can encode their time spent on the different projects they are "
+"assigned on. A  project is an analytic account and the time spent on a "
+"project generates costs on the analytic account. This feature allows to "
+"record at the same time the attendance and the timesheet."
+msgstr ""
+
+#. module: hr_timesheet
+#: field:hr.sign.out.project,analytic_amount:0
+msgid "Minimum Analytic Amount"
+msgstr ""
+
+#. module: hr_timesheet
+#: view:hr.analytical.timesheet.employee:0
+msgid "Monthly Employee Timesheet"
+msgstr ""
+
+#. module: hr_timesheet
+#: view:hr.sign.out.project:0
+msgid "Work done in the last period"
+msgstr "Arbeid utført i forrige periode"
+
+#. module: hr_timesheet
+#: constraint:hr.employee:0
+msgid ""
+"Error ! You cannot select a department for which the employee is the manager."
+msgstr ""
+
+#. module: hr_timesheet
+#: field:hr.sign.in.project,state:0
+#: field:hr.sign.out.project,state:0
+msgid "Current state"
+msgstr ""
+
+#. module: hr_timesheet
+#: field:hr.sign.in.project,name:0
+#: field:hr.sign.out.project,name:0
+msgid "Employees name"
+msgstr ""
+
+#. module: hr_timesheet
+#: model:ir.model,name:hr_timesheet.model_hr_analytical_timesheet_users
+msgid "Print Employees Timesheet"
+msgstr "Skriv ut ansattes timelister"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/hr_timesheet.py:174
+#: code:addons/hr_timesheet/hr_timesheet.py:176
+#, python-format
+msgid "Warning !"
+msgstr "Advarsel !"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:77
+#: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:132
+#, python-format
+msgid "UserError"
+msgstr "BrukerFeil"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:77
+#, python-format
+msgid "No cost unit defined for this employee !"
+msgstr "Ingen kostenhet angitt for denne brukeren !"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/report/user_timesheet.py:42
+#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#, python-format
+msgid "Tue"
+msgstr "Tir"
+
+#. module: hr_timesheet
+#: field:hr.sign.out.project,account_id:0
+msgid "Analytic Account"
+msgstr "Analytisk konto"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/wizard/hr_timesheet_print_employee.py:42
+#, python-format
+msgid "Warning"
+msgstr "Advarsel"
+
+#. module: hr_timesheet
+#: model:ir.module.module,shortdesc:hr_timesheet.module_meta_information
+msgid "Human Resources (Timesheet encoding)"
+msgstr ""
+
+#. module: hr_timesheet
+#: view:hr.sign.in.project:0
+#: view:hr.sign.out.project:0
+msgid "Sign In/Out By Project"
+msgstr ""
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/report/user_timesheet.py:42
+#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#, python-format
+msgid "Sat"
+msgstr "Lør"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/report/user_timesheet.py:42
+#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#, python-format
+msgid "Sun"
+msgstr "Søn"
+
+#. module: hr_timesheet
+#: view:hr.analytical.timesheet.employee:0
+#: view:hr.analytical.timesheet.users:0
+msgid "Print"
+msgstr "Skriv ut"
+
+#. module: hr_timesheet
+#: view:hr.analytic.timesheet:0
+msgid "Timesheet Lines"
+msgstr ""
+
+#. module: hr_timesheet
+#: selection:hr.analytical.timesheet.employee,month:0
+#: selection:hr.analytical.timesheet.users,month:0
+msgid "juillet"
+msgstr ""
+
+#. module: hr_timesheet
+#: view:hr.analytical.timesheet.users:0
+msgid "Monthly Employees Timesheet"
+msgstr ""
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/report/user_timesheet.py:39
+#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#, python-format
+msgid "July"
+msgstr "Juli"
+
+#. module: hr_timesheet
+#: field:hr.sign.in.project,date:0
+#: field:hr.sign.out.project,date_start:0
+msgid "Starting Date"
+msgstr "Startdato"
+
+#. module: hr_timesheet
+#: view:hr.employee:0
+msgid "Categories"
+msgstr "Kategorier"
+
+#. module: hr_timesheet
+#: selection:hr.analytical.timesheet.employee,month:0
+#: selection:hr.analytical.timesheet.users,month:0
+msgid "novembre"
+msgstr ""
+
+#. module: hr_timesheet
+#: model:ir.actions.act_window,help:hr_timesheet.act_hr_timesheet_line_evry1_all_form
+msgid ""
+"Through Working Hours you can register your working hours by project every "
+"day."
+msgstr ""
+
+#. module: hr_timesheet
+#: model:ir.module.module,description:hr_timesheet.module_meta_information
+msgid ""
+"\n"
+"This module implements a timesheet system. Each employee can encode and\n"
+"track their time spent on the different projects. A project is an\n"
+"analytic account and the time spent on a project generates costs on\n"
+"the analytic account.\n"
+"\n"
+"Lots of reporting on time and employee tracking are provided.\n"
+"\n"
+"It is completely integrated with the cost accounting module. It allows you\n"
+"to set up a management by affair.\n"
+"    "
+msgstr ""
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/report/user_timesheet.py:39
+#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#, python-format
+msgid "March"
+msgstr "Mars"
+
+#. module: hr_timesheet
+#: view:hr.analytic.timesheet:0
+msgid "Total cost"
+msgstr ""
+
+#. module: hr_timesheet
+#: selection:hr.analytical.timesheet.employee,month:0
+#: selection:hr.analytical.timesheet.users,month:0
+msgid "décembre"
+msgstr ""
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/report/user_timesheet.py:39
+#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#, python-format
+msgid "September"
+msgstr "September"
+
+#. module: hr_timesheet
+#: model:ir.model,name:hr_timesheet.model_hr_analytic_timesheet
+msgid "Timesheet Line"
+msgstr "Timelistelinje"
+
+#. module: hr_timesheet
+#: field:hr.analytical.timesheet.users,employee_ids:0
+msgid "employees"
+msgstr "ansatte"
+
+#. module: hr_timesheet
+#: view:account.analytic.account:0
+msgid "Stats by month"
+msgstr "Statistikk pr. måned"
+
+#. module: hr_timesheet
+#: view:account.analytic.account:0
+#: field:hr.analytical.timesheet.employee,month:0
+#: field:hr.analytical.timesheet.users,month:0
+msgid "Month"
+msgstr "Måned"
+
+#. module: hr_timesheet
+#: field:hr.sign.out.project,info:0
+msgid "Work Description"
+msgstr "Arbeidsbeskrivelse"
+
+#. module: hr_timesheet
+#: view:account.analytic.account:0
+msgid "To be invoiced"
+msgstr ""
+
+#. module: hr_timesheet
+#: model:ir.actions.report.xml,name:hr_timesheet.report_user_timesheet
+msgid "Employee timesheet"
+msgstr ""
+
+#. module: hr_timesheet
+#: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_sign_in
+#: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_sign_out
+msgid "Sign in / Sign out by project"
+msgstr ""
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/report/user_timesheet.py:42
+#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#, python-format
+msgid "Fri"
+msgstr "Fre"
+
+#. module: hr_timesheet
+#: view:hr.sign.in.project:0
+msgid "Sign in / Sign out"
+msgstr "Logg inn / Logg ut"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/hr_timesheet.py:174
+#, python-format
+msgid ""
+"Analytic journal is not defined for employee %s \n"
+"Define an employee for the selected user and assign an analytic journal!"
+msgstr ""
+
+#. module: hr_timesheet
+#: view:hr.sign.in.project:0
+msgid "(Keep empty for current time)"
+msgstr ""
+
+#. module: hr_timesheet
+#: view:hr.employee:0
+msgid "Timesheets"
+msgstr "Timelister"
+
+#. module: hr_timesheet
+#: help:hr.employee,product_id:0
+msgid "Specifies employee's designation as a product with type 'service'."
+msgstr ""
+
+#. module: hr_timesheet
+#: selection:hr.analytical.timesheet.employee,month:0
+#: selection:hr.analytical.timesheet.users,month:0
+msgid "août"
+msgstr ""
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/report/user_timesheet.py:39
+#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#, python-format
+msgid "August"
+msgstr "August"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/report/user_timesheet.py:39
+#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#, python-format
+msgid "June"
+msgstr "Juni"
+
+#. module: hr_timesheet
+#: view:hr.analytical.timesheet.employee:0
+msgid "Print My Timesheet"
+msgstr "Skriv ut min timeliste"
+
+#. module: hr_timesheet
+#: selection:hr.analytical.timesheet.employee,month:0
+#: selection:hr.analytical.timesheet.users,month:0
+msgid "mars"
+msgstr "mars"
+
+#. module: hr_timesheet
+#: view:hr.analytic.timesheet:0
+msgid "Date"
+msgstr "Dato"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/report/user_timesheet.py:39
+#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#, python-format
+msgid "November"
+msgstr "November"
+
+#. module: hr_timesheet
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
+msgstr ""
+
+#. module: hr_timesheet
+#: field:hr.sign.out.project,date:0
+msgid "Closing Date"
+msgstr ""
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/report/user_timesheet.py:39
+#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#, python-format
+msgid "October"
+msgstr "Oktober"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/report/user_timesheet.py:39
+#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#, python-format
+msgid "January"
+msgstr "Januar"
+
+#. module: hr_timesheet
+#: view:account.analytic.account:0
+msgid "Key dates"
+msgstr ""
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/report/user_timesheet.py:42
+#: code:addons/hr_timesheet/report/users_timesheet.py:76
+#, python-format
+msgid "Thu"
+msgstr "Tor"
+
+#. module: hr_timesheet
+#: view:account.analytic.account:0
+msgid "Analysis stats"
+msgstr ""
+
+#. module: hr_timesheet
+#: model:ir.model,name:hr_timesheet.model_hr_analytical_timesheet_employee
+msgid "Print Employee Timesheet & Print My Timesheet"
+msgstr ""
+
+#. module: hr_timesheet
+#: field:hr.sign.in.project,emp_id:0
+#: field:hr.sign.out.project,emp_id:0
+msgid "Employee ID"
+msgstr "Ansatt-ID"
+
+#. module: hr_timesheet
+#: view:hr.sign.out.project:0
+msgid "General Information"
+msgstr "Generell informasjon"
+
+#. module: hr_timesheet
+#: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_my
+msgid "My Timesheet"
+msgstr "Min timeliste"
+
+#. module: hr_timesheet
+#: view:account.analytic.account:0
+msgid "Analysis summary"
+msgstr ""
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/report/user_timesheet.py:39
+#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#, python-format
+msgid "December"
+msgstr "Desember"
+
+#. module: hr_timesheet
+#: view:hr.analytical.timesheet.employee:0
+#: view:hr.analytical.timesheet.users:0
+#: view:hr.sign.in.project:0
+#: view:hr.sign.out.project:0
+msgid "Cancel"
+msgstr "Avbryt"
+
+#. module: hr_timesheet
+#: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_users
+#: model:ir.actions.report.xml,name:hr_timesheet.report_users_timesheet
+#: model:ir.actions.wizard,name:hr_timesheet.wizard_hr_timesheet_users
+#: model:ir.ui.menu,name:hr_timesheet.menu_hr_timesheet_users
+msgid "Employees Timesheet"
+msgstr ""
+
+#. module: hr_timesheet
+#: selection:hr.analytical.timesheet.employee,month:0
+#: selection:hr.analytical.timesheet.users,month:0
+msgid "février"
+msgstr ""
+
+#. module: hr_timesheet
+#: view:hr.analytic.timesheet:0
+msgid "Information"
+msgstr "Informasjon"
+
+#. module: hr_timesheet
+#: field:hr.analytical.timesheet.employee,employee_id:0
+#: model:ir.model,name:hr_timesheet.model_hr_employee
+msgid "Employee"
+msgstr "Ansatt"
+
+#. module: hr_timesheet
+#: selection:hr.analytical.timesheet.employee,month:0
+#: selection:hr.analytical.timesheet.users,month:0
+msgid "avril"
+msgstr ""
+
+#. module: hr_timesheet
+#: field:hr.sign.in.project,server_date:0
+#: field:hr.sign.out.project,server_date:0
+msgid "Current Date"
+msgstr "Dagens dato"
+
+#. module: hr_timesheet
+#: view:hr.analytic.timesheet:0
+msgid "Anlytic account"
+msgstr "Analytisk konto"
+
+#. module: hr_timesheet
+#: view:hr.analytical.timesheet.employee:0
+msgid "This wizard will print monthly timesheet"
+msgstr ""
+
+#. module: hr_timesheet
+#: view:hr.analytic.timesheet:0
+#: field:hr.employee,product_id:0
+msgid "Product"
+msgstr "Produkt"
+
+#. module: hr_timesheet
+#: view:hr.analytic.timesheet:0
+msgid "Invoicing"
+msgstr "Fakturering"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/report/user_timesheet.py:39
+#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#, python-format
+msgid "May"
+msgstr "Mai"
+
+#. module: hr_timesheet
+#: view:hr.analytic.timesheet:0
+msgid "Total time"
+msgstr "Totaltid"
+
+#. module: hr_timesheet
+#: selection:hr.analytical.timesheet.employee,month:0
+#: selection:hr.analytical.timesheet.users,month:0
+msgid "juin"
+msgstr ""
+
+#. module: hr_timesheet
+#: view:hr.sign.in.project:0
+msgid "(local time on the server side)"
+msgstr ""
+
+#. module: hr_timesheet
+#: model:ir.actions.act_window,name:hr_timesheet.act_hr_timesheet_line_evry1_all_form
+#: model:ir.ui.menu,name:hr_timesheet.menu_hr_working_hours
+msgid "Working Hours"
+msgstr "Arbeidstid"
+
+#. module: hr_timesheet
+#: model:ir.model,name:hr_timesheet.model_hr_sign_in_project
+msgid "Sign In By Project"
+msgstr ""
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/report/user_timesheet.py:39
+#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#, python-format
+msgid "February"
+msgstr "Februar"
+
+#. module: hr_timesheet
+#: field:hr.analytic.timesheet,line_id:0
+msgid "Analytic line"
+msgstr "Analytisk linje"
+
+#. module: hr_timesheet
+#: model:ir.model,name:hr_timesheet.model_hr_sign_out_project
+msgid "Sign Out By Project"
+msgstr ""
+
+#. module: hr_timesheet
+#: view:hr.analytical.timesheet.users:0
+msgid "Employees"
+msgstr "Ansatte"
+
+#. module: hr_timesheet
+#: selection:hr.analytical.timesheet.employee,month:0
+#: selection:hr.analytical.timesheet.users,month:0
+msgid "octobre"
+msgstr ""
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/report/user_timesheet.py:39
+#: code:addons/hr_timesheet/report/users_timesheet.py:72
+#, python-format
+msgid "April"
+msgstr "April"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/hr_timesheet.py:176
+#, python-format
+msgid ""
+"No analytic account defined on the project.\n"
+"Please set one or we can not automatically fill the timesheet."
+msgstr ""
+
+#. module: hr_timesheet
+#: selection:hr.analytical.timesheet.employee,month:0
+#: selection:hr.analytical.timesheet.users,month:0
+msgid "mai"
+msgstr ""
+
+#. module: hr_timesheet
+#: view:account.analytic.account:0
+#: view:hr.analytic.timesheet:0
+msgid "Users"
+msgstr "Brukere"
+
+#. module: hr_timesheet
+#: view:hr.sign.in.project:0
+msgid "Start Working"
+msgstr "Begynn arbeid"
+
+#. module: hr_timesheet
+#: view:account.analytic.account:0
+msgid "Stats by user"
+msgstr "Statistikk pr. bruker"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/wizard/hr_timesheet_print_employee.py:42
+#, python-format
+msgid "No employee defined for this user"
+msgstr "Ingen ansatt er angitt for denne brukeren"
+
+#. module: hr_timesheet
+#: field:hr.analytical.timesheet.employee,year:0
+#: field:hr.analytical.timesheet.users,year:0
+msgid "Year"
+msgstr "År"
+
+#. module: hr_timesheet
+#: view:hr.analytic.timesheet:0
+msgid "Accounting"
+msgstr ""
+
+#. module: hr_timesheet
+#: field:hr.analytic.timesheet,partner_id:0
+msgid "Partner Id"
+msgstr ""
+
+#. module: hr_timesheet
+#: view:hr.sign.out.project:0
+msgid "Change Work"
+msgstr ""
+
+#. module: hr_timesheet
+#: selection:hr.analytical.timesheet.employee,month:0
+#: selection:hr.analytical.timesheet.users,month:0
+msgid "septembre"
+msgstr ""
diff --git a/addons/product/i18n/ro.po b/addons/product/i18n/ro.po
index b0e9742b03b..d0fa6617a42 100644
--- a/addons/product/i18n/ro.po
+++ b/addons/product/i18n/ro.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-07 04:37+0000\n"
+"X-Launchpad-Export-Date: 2011-04-08 04:45+0000\n"
 "X-Generator: Launchpad (build 12735)\n"
 
 #. module: product
diff --git a/addons/product_margin/i18n/gl.po b/addons/product_margin/i18n/gl.po
new file mode 100644
index 00000000000..3826f599bdc
--- /dev/null
+++ b/addons/product_margin/i18n/gl.po
@@ -0,0 +1,305 @@
+# Galician translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-04-07 08:52+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Galician <gl@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: 2011-04-08 04:45+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
+
+#. module: product_margin
+#: view:product.product:0
+#: field:product.product,turnover:0
+msgid "Turnover"
+msgstr "Volume de negocio"
+
+#. module: product_margin
+#: field:product.product,expected_margin_rate:0
+msgid "Expected Margin (%)"
+msgstr "Marxe prevista (%)"
+
+#. module: product_margin
+#: field:product.margin,from_date:0
+msgid "From"
+msgstr "Desde"
+
+#. module: product_margin
+#: help:product.product,sale_expected:0
+msgid ""
+"Sum of Multification of Sale Catalog price and quantity of Customer Invoices"
+msgstr ""
+"Suma da multiplicación do prezo do catálogo de venda e cantidade das "
+"facturas do cliente"
+
+#. module: product_margin
+#: help:product.product,total_margin:0
+msgid "Turnorder - Standard price"
+msgstr "Volume de negocio - Prezo estándar"
+
+#. module: product_margin
+#: field:product.margin,to_date:0
+msgid "To"
+msgstr "Ata"
+
+#. module: product_margin
+#: field:product.product,date_to:0
+msgid "To Date"
+msgstr "Ata a data"
+
+#. module: product_margin
+#: field:product.product,date_from:0
+msgid "From Date"
+msgstr "Desde a data"
+
+#. module: product_margin
+#: selection:product.margin,invoice_state:0
+#: selection:product.product,invoice_state:0
+msgid "Draft, Open and Paid"
+msgstr "Borrador, aberto e pagado"
+
+#. module: product_margin
+#: field:product.product,purchase_avg_price:0
+#: field:product.product,sale_avg_price:0
+msgid "Avg. Unit Price"
+msgstr "Media prezo unidade"
+
+#. module: product_margin
+#: model:ir.module.module,shortdesc:product_margin.module_meta_information
+msgid "Margins in Product"
+msgstr "Marxes en produtos"
+
+#. module: product_margin
+#: model:ir.model,name:product_margin.model_product_product
+msgid "Product"
+msgstr "Produto"
+
+#. module: product_margin
+#: view:product.product:0
+msgid "Catalog Price"
+msgstr "Prezo catálogo"
+
+#. module: product_margin
+#: selection:product.margin,invoice_state:0
+#: selection:product.product,invoice_state:0
+msgid "Paid"
+msgstr "Pagado"
+
+#. module: product_margin
+#: help:product.product,sales_gap:0
+msgid "Expected Sale - Turn Over"
+msgstr "Venda prevista - Volume de negocio"
+
+#. module: product_margin
+#: model:ir.module.module,description:product_margin.module_meta_information
+msgid ""
+"\n"
+"Adds a reporting menu in products that computes sales, purchases, margins\n"
+"and other interesting indicators based on invoices. The wizard to launch\n"
+"the report has several options to help you get the data you need.\n"
+msgstr ""
+"\n"
+"Engade un menú de informes ós produtos, que calcula as vendas, as compras, "
+"as marxes e outros indicadores interesantes en base ás facturas. O asistente "
+"ofrécelle varias opcións para axudarlle a obter os datos que precisa.\n"
+
+#. module: product_margin
+#: view:product.product:0
+msgid "Standard Price"
+msgstr "Prezo estándar"
+
+#. module: product_margin
+#: field:product.product,sale_expected:0
+msgid "Expected Sale"
+msgstr "Venda prevista"
+
+#. module: product_margin
+#: help:product.product,normal_cost:0
+msgid "Sum of Multification of Cost price and quantity of Supplier Invoices"
+msgstr ""
+"Suma da multiplicación do prezo de custo e da cantidade das facturas do "
+"provedor"
+
+#. module: product_margin
+#: help:product.product,expected_margin:0
+msgid "Expected Sale - Normal Cost"
+msgstr "Venda prevista - Custo normal"
+
+#. module: product_margin
+#: view:product.product:0
+msgid "Analysis Criteria"
+msgstr "Criterios de análise"
+
+#. module: product_margin
+#: view:product.product:0
+#: field:product.product,total_cost:0
+msgid "Total Cost"
+msgstr "Custo total"
+
+#. module: product_margin
+#: field:product.product,expected_margin:0
+msgid "Expected Margin"
+msgstr "Marxe prevista"
+
+#. module: product_margin
+#: view:product.product:0
+msgid "#Purchased"
+msgstr "Núm. mercados"
+
+#. module: product_margin
+#: help:product.product,turnover:0
+msgid ""
+"Sum of Multification of Invoice price and quantity of Customer Invoices"
+msgstr ""
+"Suma da multiplicación do prezo da factura e da cantidade de facturas do "
+"cliente"
+
+#. module: product_margin
+#: help:product.product,expected_margin_rate:0
+msgid "Expected margin * 100 / Expected Sale"
+msgstr "Marxe prevista * 100 / Venda prevista"
+
+#. module: product_margin
+#: help:product.product,sale_avg_price:0
+msgid "Avg. Price in Customer Invoices)"
+msgstr "Prezo medio en facturas de cliente)"
+
+#. module: product_margin
+#: help:product.product,total_cost:0
+msgid ""
+"Sum of Multification of Invoice price and quantity of Supplier Invoices "
+msgstr ""
+"Suma da multiplicación do prezo da factura e da cantidade de facturas do "
+"provedor "
+
+#. module: product_margin
+#: field:product.margin,invoice_state:0
+#: field:product.product,invoice_state:0
+msgid "Invoice State"
+msgstr "Estado da factura"
+
+#. module: product_margin
+#: help:product.product,purchase_gap:0
+msgid "Normal Cost - Total Cost"
+msgstr "Custo normal - Custo total"
+
+#. module: product_margin
+#: field:product.product,total_margin:0
+msgid "Total Margin"
+msgstr "Marxe total"
+
+#. module: product_margin
+#: view:product.product:0
+#: field:product.product,sales_gap:0
+msgid "Sales Gap"
+msgstr "Diferenza vendas"
+
+#. module: product_margin
+#: field:product.product,normal_cost:0
+msgid "Normal Cost"
+msgstr "Custo normal"
+
+#. module: product_margin
+#: view:product.product:0
+msgid "Purchases"
+msgstr "Compras"
+
+#. module: product_margin
+#: help:product.product,purchase_avg_price:0
+msgid "Avg. Price in Supplier Invoices "
+msgstr "Prezo medio en facturas de provedor "
+
+#. module: product_margin
+#: help:product.product,purchase_num_invoiced:0
+msgid "Sum of Quantity in Supplier Invoices"
+msgstr "Suma da cantidade en facturas provedor"
+
+#. module: product_margin
+#: view:product.margin:0
+msgid "Properties categories"
+msgstr "Categorías das propiedades"
+
+#. module: product_margin
+#: help:product.product,total_margin_rate:0
+msgid "Total margin * 100 / Turnover"
+msgstr "Marxe total * 100 / Volume de negocio"
+
+#. module: product_margin
+#: field:product.product,purchase_num_invoiced:0
+#: field:product.product,sale_num_invoiced:0
+msgid "# Invoiced"
+msgstr "Nº facturado"
+
+#. module: product_margin
+#: selection:product.margin,invoice_state:0
+#: selection:product.product,invoice_state:0
+msgid "Open and Paid"
+msgstr "Aberto e pechado"
+
+#. module: product_margin
+#: view:product.product:0
+msgid "Sales"
+msgstr "Vendas"
+
+#. module: product_margin
+#: code:addons/product_margin/wizard/product_margin.py:73
+#: model:ir.actions.act_window,name:product_margin.product_margin_act_window
+#: model:ir.ui.menu,name:product_margin.menu_action_product_margin
+#: view:product.product:0
+#, python-format
+msgid "Product Margins"
+msgstr "Marxes de produto"
+
+#. module: product_margin
+#: view:product.margin:0
+msgid "General Information"
+msgstr "Información xeral"
+
+#. module: product_margin
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr "Erro: Código EAN non válido"
+
+#. module: product_margin
+#: field:product.product,purchase_gap:0
+msgid "Purchase Gap"
+msgstr "Diferenza compra"
+
+#. module: product_margin
+#: field:product.product,total_margin_rate:0
+msgid "Total Margin (%)"
+msgstr "Total marxe (%)"
+
+#. module: product_margin
+#: view:product.margin:0
+msgid "Open Margins"
+msgstr "Abrir marxes"
+
+#. module: product_margin
+#: view:product.margin:0
+msgid "Cancel"
+msgstr "Anular"
+
+#. module: product_margin
+#: view:product.product:0
+msgid "Margins"
+msgstr "Marxes"
+
+#. module: product_margin
+#: help:product.product,sale_num_invoiced:0
+msgid "Sum of Quantity in Customer Invoices"
+msgstr "Suma da cantidade en facturas de cliente"
+
+#. module: product_margin
+#: model:ir.model,name:product_margin.model_product_margin
+msgid "Product Margin"
+msgstr "Marxe produto"
diff --git a/addons/project/i18n/nb.po b/addons/project/i18n/nb.po
index 0b2bbcc78cf..be530dd028f 100644
--- a/addons/project/i18n/nb.po
+++ b/addons/project/i18n/nb.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-04-05 22:52+0000\n"
-"Last-Translator: Rolv Råen <Unknown>\n"
+"PO-Revision-Date: 2011-04-07 06:42+0000\n"
+"Last-Translator: Rolv Råen (adEgo) <Unknown>\n"
 "Language-Team: Norwegian Bokmal <nb@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: 2011-04-07 04:37+0000\n"
+"X-Launchpad-Export-Date: 2011-04-08 04:45+0000\n"
 "X-Generator: Launchpad (build 12735)\n"
 
 #. module: project
@@ -446,7 +446,7 @@ msgstr "Task '%s' lukket"
 #: model:ir.model,name:project.model_account_analytic_account
 #: field:project.project,analytic_account_id:0
 msgid "Analytic Account"
-msgstr "Kontodimensjon"
+msgstr "Analytisk konto"
 
 #. module: project
 #: field:project.task.work,user_id:0
diff --git a/addons/warning/i18n/nb.po b/addons/warning/i18n/nb.po
new file mode 100644
index 00000000000..a7b1bb332e8
--- /dev/null
+++ b/addons/warning/i18n/nb.po
@@ -0,0 +1,235 @@
+# Norwegian Bokmal translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:16+0000\n"
+"PO-Revision-Date: 2011-04-07 07:25+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Bokmal <nb@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: 2011-04-08 04:45+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
+
+#. module: warning
+#: model:ir.model,name:warning.model_purchase_order_line
+#: field:product.product,purchase_line_warn:0
+msgid "Purchase Order Line"
+msgstr "Innkjøpsordrelinje"
+
+#. module: warning
+#: field:product.product,sale_line_warn_msg:0
+msgid "Message for Sale Order Line"
+msgstr "Melding for salgsordrelinje"
+
+#. module: warning
+#: field:product.product,purchase_line_warn_msg:0
+msgid "Message for Purchase Order Line"
+msgstr "Melding for innkjøpsordelinje"
+
+#. module: warning
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr ""
+
+#. module: warning
+#: model:ir.model,name:warning.model_stock_picking
+msgid "Picking List"
+msgstr "Plukkliste"
+
+#. module: warning
+#: field:product.product,sale_line_warn:0
+msgid "Sale Order Line"
+msgstr "Salgsordrelinje"
+
+#. module: warning
+#: view:product.product:0
+msgid "Warning when Purchasing this Product"
+msgstr "Advarsel ved kjøp av dette produktet"
+
+#. module: warning
+#: model:ir.model,name:warning.model_product_product
+msgid "Product"
+msgstr "Produkt"
+
+#. module: warning
+#: sql_constraint:purchase.order:0
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique !"
+msgstr "Ordrereferanse må være unik !"
+
+#. module: warning
+#: view:product.product:0
+#: view:res.partner:0
+msgid "Warnings"
+msgstr "Advarsler"
+
+#. module: warning
+#: selection:product.product,purchase_line_warn:0
+#: selection:product.product,sale_line_warn:0
+#: selection:res.partner,invoice_warn:0
+#: selection:res.partner,picking_warn:0
+#: selection:res.partner,purchase_warn:0
+#: selection:res.partner,sale_warn:0
+msgid "Warning"
+msgstr "Advarsel"
+
+#. module: warning
+#: selection:product.product,purchase_line_warn:0
+#: selection:product.product,sale_line_warn:0
+#: selection:res.partner,invoice_warn:0
+#: selection:res.partner,picking_warn:0
+#: selection:res.partner,purchase_warn:0
+#: selection:res.partner,sale_warn:0
+msgid "Blocking Message"
+msgstr ""
+
+#. module: warning
+#: view:res.partner:0
+msgid "Warning on the Invoice"
+msgstr "Advarsel på faktuaren"
+
+#. module: warning
+#: selection:product.product,purchase_line_warn:0
+#: selection:product.product,sale_line_warn:0
+#: selection:res.partner,invoice_warn:0
+#: selection:res.partner,picking_warn:0
+#: selection:res.partner,purchase_warn:0
+#: selection:res.partner,sale_warn:0
+msgid "No Message"
+msgstr "Ingen melding"
+
+#. module: warning
+#: model:ir.model,name:warning.model_account_invoice
+#: field:res.partner,invoice_warn:0
+msgid "Invoice"
+msgstr "Faktura"
+
+#. module: warning
+#: model:ir.module.module,shortdesc:warning.module_meta_information
+msgid "Module for Warnings form onchange Event"
+msgstr ""
+
+#. module: warning
+#: view:product.product:0
+msgid "Warning when Selling this Product"
+msgstr "Advarsel ved salg av dette produktet"
+
+#. module: warning
+#: field:res.partner,sale_warn:0
+msgid "Sale Order"
+msgstr "Salgsordre"
+
+#. module: warning
+#: field:res.partner,picking_warn:0
+msgid "Stock Picking"
+msgstr ""
+
+#. module: warning
+#: model:ir.model,name:warning.model_purchase_order
+#: field:res.partner,purchase_warn:0
+msgid "Purchase Order"
+msgstr "Innkjøpsordre"
+
+#. module: warning
+#: field:res.partner,sale_warn_msg:0
+msgid "Message for Sale Order"
+msgstr "Melding for salgsordre"
+
+#. module: warning
+#: field:res.partner,purchase_warn_msg:0
+msgid "Message for Purchase Order"
+msgstr "Melding for innkjøpsordre"
+
+#. module: warning
+#: code:addons/warning/warning.py:32
+#: help:product.product,purchase_line_warn:0
+#: help:product.product,sale_line_warn:0
+#: help:res.partner,invoice_warn:0
+#: help:res.partner,picking_warn:0
+#: help:res.partner,purchase_warn:0
+#: help:res.partner,sale_warn:0
+#, python-format
+msgid ""
+"Selecting the \"Warning\" option will notify user with the message, "
+"Selecting \"Blocking Message\" will throw an exception with the message and "
+"block the flow. The Message has to be written in the next field."
+msgstr ""
+
+#. module: warning
+#: code:addons/warning/warning.py:67
+#: code:addons/warning/warning.py:96
+#: code:addons/warning/warning.py:132
+#: code:addons/warning/warning.py:163
+#: code:addons/warning/warning.py:213
+#: code:addons/warning/warning.py:246
+#, python-format
+msgid "Alert for %s !"
+msgstr ""
+
+#. module: warning
+#: field:res.partner,invoice_warn_msg:0
+msgid "Message for Invoice"
+msgstr "Melding for faktura"
+
+#. module: warning
+#: model:ir.module.module,description:warning.module_meta_information
+msgid "Module for Warnings form onchange Event."
+msgstr ""
+
+#. module: warning
+#: view:res.partner:0
+msgid "Warning on the Picking"
+msgstr ""
+
+#. module: warning
+#: view:res.partner:0
+msgid "Warning on the Purchase Order"
+msgstr "Advarsel på innkjøpsordren"
+
+#. module: warning
+#: code:addons/warning/warning.py:68
+#: code:addons/warning/warning.py:97
+#: code:addons/warning/warning.py:134
+#: code:addons/warning/warning.py:164
+#: code:addons/warning/warning.py:214
+#: code:addons/warning/warning.py:247
+#, python-format
+msgid "Warning for %s"
+msgstr "Advarsel for %s"
+
+#. module: warning
+#: view:res.partner:0
+msgid "Warning on the Sale Order"
+msgstr "Advarsel på salgsordren"
+
+#. module: warning
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr "Feil: Ugyldig ean kode"
+
+#. module: warning
+#: field:res.partner,picking_warn_msg:0
+msgid "Message for Stock Picking"
+msgstr ""
+
+#. module: warning
+#: model:ir.model,name:warning.model_res_partner
+msgid "Partner"
+msgstr "Partner"
+
+#. module: warning
+#: model:ir.model,name:warning.model_sale_order
+msgid "Sales Order"
+msgstr "Salgsordre"
+
+#. module: warning
+#: model:ir.model,name:warning.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "Salgsordrelinje"
diff --git a/addons/web_livechat/i18n/zh_CN.po b/addons/web_livechat/i18n/zh_CN.po
new file mode 100644
index 00000000000..273f0f0369f
--- /dev/null
+++ b/addons/web_livechat/i18n/zh_CN.po
@@ -0,0 +1,39 @@
+# Chinese (Simplified) translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:16+0000\n"
+"PO-Revision-Date: 2011-04-08 07:20+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (Simplified) <zh_CN@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: 2011-04-09 05:00+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
+
+#. module: web_livechat
+#: sql_constraint:publisher_warranty.contract:0
+msgid ""
+"Your publisher warranty contract is already subscribed in the system !"
+msgstr ""
+
+#. module: web_livechat
+#: model:ir.module.module,shortdesc:web_livechat.module_meta_information
+msgid "Live Chat Support"
+msgstr ""
+
+#. module: web_livechat
+#: model:ir.model,name:web_livechat.model_publisher_warranty_contract
+msgid "publisher_warranty.contract"
+msgstr ""
+
+#. module: web_livechat
+#: model:ir.module.module,description:web_livechat.module_meta_information
+msgid "Enable live chat support for whom have a maintenance contract"
+msgstr ""
diff --git a/addons/web_uservoice/i18n/zh_CN.po b/addons/web_uservoice/i18n/zh_CN.po
new file mode 100644
index 00000000000..bd1d4d4a45d
--- /dev/null
+++ b/addons/web_uservoice/i18n/zh_CN.po
@@ -0,0 +1,29 @@
+# Chinese (Simplified) translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-12 16:15+0000\n"
+"PO-Revision-Date: 2011-04-08 07:13+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (Simplified) <zh_CN@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: 2011-04-09 05:00+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
+
+#. module: web_uservoice
+#: model:ir.module.module,shortdesc:web_uservoice.module_meta_information
+msgid "Add uservoice button in header"
+msgstr ""
+
+#. module: web_uservoice
+#: code:addons/web_uservoice/web/editors.py:72
+#, python-format
+msgid "feedback"
+msgstr ""

From 43a6970d7a71cc89b70aa0bb5f74d541239cf2ea Mon Sep 17 00:00:00 2001
From: "noz (OpenERP)" <noz@tinyerp.com>
Date: Mon, 11 Apr 2011 10:53:53 +0530
Subject: [PATCH 106/331] [FIX] httprequest, jsonrequest conflicts testing.

bzr revid: noz@tinyerp.com-20110411052353-45ftq6rb57zhxtdo
---
 addons/web_chat/controllers/main.py | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/addons/web_chat/controllers/main.py b/addons/web_chat/controllers/main.py
index 456fd0f5340..2beccdcda0c 100644
--- a/addons/web_chat/controllers/main.py
+++ b/addons/web_chat/controllers/main.py
@@ -133,10 +133,10 @@ class PollServer(openerpweb.Controller):
         """
         
         for i in range(60):
-            received_msg = mq.read('Guest2', i);
+            received_msg = mq.read('Guest1', i);
             if received_msg:
                 msg = self._pollParseMessages(received_msg)
-                print "============ msg...", msg
+                time.sleep(2)
             else:
                 time.sleep(2)
             
@@ -149,12 +149,11 @@ class PollServer(openerpweb.Controller):
         # else
             # return emptylist
             
-        
-        # it's http://localhost:8002/web_chat/pollserver/poll?method=long?callback=jsonp1302147330483&_1302147330483=
+#        print "==============poll receive...", kw.get('callback')
+#        # it's http://localhost:8002/web_chat/pollserver/poll?method=long?callback=jsonp1302147330483&_1302147330483=
         return '%s([{"t":"m","s":"Guest130214008855.5","r":"Guest130214013134.26","m":"xxxxxx"}]);'%kw.get('callback','')
-        return None
         
-    @openerpweb.httprequest
+    @openerpweb.jsonrequest
     def send(self, req, **kw):
         print "========= send ========", kw
         
@@ -187,9 +186,10 @@ class PollServer(openerpweb.Controller):
             return dict(r='error', e='no_recipient')
         
         if message:
-            mq.write(m_type="text",  m_from=req.applicationsession['current_user'], m_to=to, m_message=message, m_group="Users")
-        
-        return {'r': 'sent'}
+            mq.write(m_type="m",  m_from=req.applicationsession['current_user'], m_to=to, m_message=message, m_group="Users")        
+            return {'r': 'sent'}
+        else:
+            return {'r': 'error', 'e': 'send error'}
 
     @openerpweb.httprequest
     def status(self, req, **kw):
@@ -215,9 +215,7 @@ class PollServer(openerpweb.Controller):
     
     def _pollParseMessages(self, messages):
         msg_arr = []
-        print "=========== messages...", messages
         for msg in messages:
-            print "=========== msg..", msg
             msg_arr.append({'t': msg['type'], 's': msg['from'], 'r': msg['to'], 'm': msg['message']})
         return msg_arr
     

From 326fc1420b16e575a8f27264cf1a086c0348caf5 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Mon, 11 Apr 2011 05:43:15 +0000
Subject: [PATCH 107/331] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20110411054240-glbtpl72fmw06spz
bzr revid: launchpad_translations_on_behalf_of_openerp-20110409061637-9s5h5adu95tabmbp
bzr revid: launchpad_translations_on_behalf_of_openerp-20110410060107-yhr6iuxpvirpqo8l
bzr revid: launchpad_translations_on_behalf_of_openerp-20110411054315-0ka0kjfhsys3iuf4
---
 addons/account/i18n/it.po              |  12 +-
 addons/anonymization/i18n/ca.po        | 226 ++++++++
 addons/base_synchro/i18n/ca.po         | 289 ++++++++++
 addons/crm_caldav/i18n/zh_CN.po        |  49 ++
 addons/crm_claim/i18n/zh_CN.po         | 752 +++++++++++++++++++++++++
 addons/crm_helpdesk/i18n/zh_CN.po      | 697 +++++++++++++++++++++++
 addons/document/i18n/gl.po             |   2 +-
 addons/document_webdav/i18n/ca.po      | 206 +++++++
 addons/fetchmail/i18n/ca.po            | 317 +++++++++++
 addons/fetchmail/i18n/es.po            |  10 +-
 addons/hr_recruitment/i18n/ca.po       |  10 +-
 addons/hr_timesheet_invoice/i18n/it.po |  29 +-
 addons/idea/i18n/mn.po                 |  10 +-
 addons/product/i18n/id.po              |   2 +-
 addons/thunderbird/i18n/bg.po          |  18 +-
 addons/web_livechat/i18n/zh_CN.po      |  39 ++
 addons/web_uservoice/i18n/zh_CN.po     |  29 +
 bin/addons/base/i18n/nl.po             |  10 +-
 18 files changed, 2658 insertions(+), 49 deletions(-)
 create mode 100644 addons/anonymization/i18n/ca.po
 create mode 100644 addons/base_synchro/i18n/ca.po
 create mode 100644 addons/crm_caldav/i18n/zh_CN.po
 create mode 100644 addons/crm_claim/i18n/zh_CN.po
 create mode 100644 addons/crm_helpdesk/i18n/zh_CN.po
 create mode 100644 addons/document_webdav/i18n/ca.po
 create mode 100644 addons/fetchmail/i18n/ca.po
 create mode 100644 addons/web_livechat/i18n/zh_CN.po
 create mode 100644 addons/web_uservoice/i18n/zh_CN.po

diff --git a/addons/account/i18n/it.po b/addons/account/i18n/it.po
index 7ff6b4158a4..90907b4f03e 100644
--- a/addons/account/i18n/it.po
+++ b/addons/account/i18n/it.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-03-24 08:57+0000\n"
-"Last-Translator: Marco Pattaro <Unknown>\n"
+"PO-Revision-Date: 2011-04-10 12:46+0000\n"
+"Last-Translator: Vincenzo Marino <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: 2011-03-25 06:14+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-04-11 05:43+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -1421,7 +1421,7 @@ msgstr "Salta lo stato 'bozza' per registrazioni manuali"
 #: view:account.invoice.report:0
 #: field:account.invoice.report,price_total:0
 msgid "Total Without Tax"
-msgstr "Totale senza impste"
+msgstr "Totale senza imposte"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_move_journal_line
@@ -5175,6 +5175,8 @@ msgid ""
 "According value related accounts will be display on respective reports "
 "(Balance Sheet Profit & Loss Account)"
 msgstr ""
+"I valori di raccordo dei conti saranno mostrati nei rispettivi rapporti "
+"(Conto Economico)"
 
 #. module: account
 #: field:account.report.general.ledger,sortby:0
diff --git a/addons/anonymization/i18n/ca.po b/addons/anonymization/i18n/ca.po
new file mode 100644
index 00000000000..d00ac5a62fb
--- /dev/null
+++ b/addons/anonymization/i18n/ca.po
@@ -0,0 +1,226 @@
+# Catalan translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2011-04-09 18:26+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Catalan <ca@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: 2011-04-10 06:00+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
+
+#. module: anonymization
+#: model:ir.model,name:anonymization.model_ir_model_fields_anonymize_wizard
+msgid "ir.model.fields.anonymize.wizard"
+msgstr ""
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization,field_name:0
+msgid "Field Name"
+msgstr ""
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization,field_id:0
+msgid "Field"
+msgstr ""
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization.history,state:0
+#: field:ir.model.fields.anonymize.wizard,state:0
+msgid "State"
+msgstr ""
+
+#. module: anonymization
+#: field:ir.model.fields.anonymize.wizard,file_import:0
+msgid "Import"
+msgstr ""
+
+#. module: anonymization
+#: model:ir.model,name:anonymization.model_ir_model_fields_anonymization
+msgid "ir.model.fields.anonymization"
+msgstr ""
+
+#. module: anonymization
+#: model:ir.module.module,shortdesc:anonymization.module_meta_information
+msgid "Database anonymization module"
+msgstr ""
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization.history,direction:0
+msgid "Direction"
+msgstr ""
+
+#. module: anonymization
+#: model:ir.actions.act_window,name:anonymization.action_ir_model_fields_anonymization_tree
+#: view:ir.model.fields.anonymization:0
+#: model:ir.ui.menu,name:anonymization.menu_administration_anonymization_fields
+msgid "Anonymized Fields"
+msgstr ""
+
+#. module: anonymization
+#: model:ir.ui.menu,name:anonymization.menu_administration_anonymization
+msgid "Database anonymization"
+msgstr ""
+
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:55
+#: sql_constraint:ir.model.fields.anonymization:0
+#, python-format
+msgid "You cannot have two records having the same model and the same field"
+msgstr ""
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization,state:0
+#: selection:ir.model.fields.anonymize.wizard,state:0
+msgid "Anonymized"
+msgstr ""
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization,state:0
+msgid "unknown"
+msgstr ""
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization,model_id:0
+msgid "Object"
+msgstr ""
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization.history,filepath:0
+msgid "File path"
+msgstr ""
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization.history,date:0
+msgid "Date"
+msgstr ""
+
+#. module: anonymization
+#: field:ir.model.fields.anonymize.wizard,file_export:0
+msgid "Export"
+msgstr ""
+
+#. module: anonymization
+#: view:ir.model.fields.anonymize.wizard:0
+msgid "Reverse the Database Anonymization"
+msgstr ""
+
+#. module: anonymization
+#: view:ir.model.fields.anonymize.wizard:0
+msgid "Database Anonymization"
+msgstr ""
+
+#. module: anonymization
+#: model:ir.ui.menu,name:anonymization.menu_administration_anonymization_wizard
+msgid "Anonymize database"
+msgstr ""
+
+#. module: anonymization
+#: view:ir.model.fields.anonymization.history:0
+#: field:ir.model.fields.anonymization.history,field_ids:0
+msgid "Fields"
+msgstr ""
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization,state:0
+#: selection:ir.model.fields.anonymize.wizard,state:0
+msgid "Clear"
+msgstr ""
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization.history,direction:0
+msgid "clear -> anonymized"
+msgstr ""
+
+#. module: anonymization
+#: view:ir.model.fields.anonymize.wizard:0
+#: field:ir.model.fields.anonymize.wizard,summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: anonymization
+#: view:ir.model.fields.anonymization:0
+msgid "Anonymized Field"
+msgstr ""
+
+#. module: anonymization
+#: model:ir.module.module,description:anonymization.module_meta_information
+msgid ""
+"\n"
+"This module allows you to anonymize a database.\n"
+"    "
+msgstr ""
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymize.wizard,state:0
+msgid "Unstable"
+msgstr ""
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization.history,state:0
+msgid "Exception occured"
+msgstr ""
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization,state:0
+#: selection:ir.model.fields.anonymize.wizard,state:0
+msgid "Not Existing"
+msgstr ""
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization,model_name:0
+msgid "Object Name"
+msgstr ""
+
+#. module: anonymization
+#: model:ir.actions.act_window,name:anonymization.action_ir_model_fields_anonymization_history_tree
+#: view:ir.model.fields.anonymization.history:0
+#: model:ir.ui.menu,name:anonymization.menu_administration_anonymization_history
+msgid "Anonymization History"
+msgstr ""
+
+#. module: anonymization
+#: model:ir.model,name:anonymization.model_ir_model_fields_anonymization_history
+msgid "ir.model.fields.anonymization.history"
+msgstr ""
+
+#. module: anonymization
+#: model:ir.actions.act_window,name:anonymization.action_ir_model_fields_anonymize_wizard
+#: view:ir.model.fields.anonymize.wizard:0
+msgid "Anonymize Database"
+msgstr ""
+
+#. module: anonymization
+#: field:ir.model.fields.anonymize.wizard,name:0
+msgid "File Name"
+msgstr ""
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization.history,direction:0
+msgid "anonymized -> clear"
+msgstr ""
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization.history,state:0
+msgid "Started"
+msgstr ""
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization.history,state:0
+msgid "Done"
+msgstr ""
+
+#. module: anonymization
+#: view:ir.model.fields.anonymization.history:0
+#: field:ir.model.fields.anonymization.history,msg:0
+#: field:ir.model.fields.anonymize.wizard,msg:0
+msgid "Message"
+msgstr ""
diff --git a/addons/base_synchro/i18n/ca.po b/addons/base_synchro/i18n/ca.po
new file mode 100644
index 00000000000..38ab24622ec
--- /dev/null
+++ b/addons/base_synchro/i18n/ca.po
@@ -0,0 +1,289 @@
+# Catalan translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2011-04-10 21:15+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Catalan <ca@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: 2011-04-11 05:43+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
+
+#. module: base_synchro
+#: model:ir.actions.act_window,name:base_synchro.action_view_base_synchro
+msgid "Base Synchronization"
+msgstr ""
+
+#. module: base_synchro
+#: field:base.synchro.server,server_db:0
+msgid "Server Database"
+msgstr ""
+
+#. module: base_synchro
+#: view:base.synchro.server:0
+#: model:ir.model,name:base_synchro.model_base_synchro_server
+msgid "Synchronized server"
+msgstr ""
+
+#. module: base_synchro
+#: field:base.synchro.obj.avoid,name:0
+msgid "Field Name"
+msgstr ""
+
+#. module: base_synchro
+#: field:base.synchro.obj,synchronize_date:0
+msgid "Latest Synchronization"
+msgstr ""
+
+#. module: base_synchro
+#: field:base.synchro,user_id:0
+msgid "Send Result To"
+msgstr ""
+
+#. module: base_synchro
+#: model:ir.model,name:base_synchro.model_base_synchro_obj_avoid
+msgid "Fields to not synchronize"
+msgstr ""
+
+#. module: base_synchro
+#: view:base.synchro:0
+msgid "_Close"
+msgstr ""
+
+#. module: base_synchro
+#: view:base.synchro:0
+msgid "Transfer Data To Server"
+msgstr ""
+
+#. module: base_synchro
+#: model:ir.model,name:base_synchro.model_base_synchro_obj
+msgid "Register Class"
+msgstr ""
+
+#. module: base_synchro
+#: view:base.synchro.obj:0
+#: model:ir.actions.act_window,name:base_synchro.action_transfer_tree
+#: model:ir.ui.menu,name:base_synchro.transfer_menu_id
+msgid "Synchronized objects"
+msgstr ""
+
+#. module: base_synchro
+#: field:base.synchro.server,obj_ids:0
+msgid "Models"
+msgstr ""
+
+#. module: base_synchro
+#: field:base.synchro.obj.avoid,obj_id:0
+#: view:base.synchro.obj.line:0
+#: field:base.synchro.obj.line,obj_id:0
+msgid "Object"
+msgstr ""
+
+#. module: base_synchro
+#: field:base.synchro.server,login:0
+msgid "User Name"
+msgstr ""
+
+#. module: base_synchro
+#: view:base.synchro.obj:0
+#: view:base.synchro.obj.line:0
+msgid "Group By"
+msgstr ""
+
+#. module: base_synchro
+#: selection:base.synchro.obj,action:0
+msgid "Upload"
+msgstr ""
+
+#. module: base_synchro
+#: view:base.synchro.obj:0
+msgid "Latest synchronization"
+msgstr ""
+
+#. module: base_synchro
+#: model:ir.module.module,description:base_synchro.module_meta_information
+msgid "Synchronization with all objects."
+msgstr ""
+
+#. module: base_synchro
+#: view:base.synchro.obj.line:0
+#: field:base.synchro.obj.line,name:0
+msgid "Date"
+msgstr ""
+
+#. module: base_synchro
+#: field:base.synchro.server,password:0
+msgid "Password"
+msgstr ""
+
+#. module: base_synchro
+#: field:base.synchro.obj,avoid_ids:0
+msgid "Fields Not Sync."
+msgstr ""
+
+#. module: base_synchro
+#: selection:base.synchro.obj,action:0
+msgid "Both"
+msgstr ""
+
+#. module: base_synchro
+#: field:base.synchro.obj,name:0
+msgid "Name"
+msgstr ""
+
+#. module: base_synchro
+#: view:base.synchro.obj:0
+msgid "Fields"
+msgstr ""
+
+#. module: base_synchro
+#: view:base.synchro.obj.line:0
+msgid "Transfered Ids Details"
+msgstr ""
+
+#. module: base_synchro
+#: field:base.synchro.obj,action:0
+msgid "Synchronisation direction"
+msgstr ""
+
+#. module: base_synchro
+#: field:base.synchro.obj,server_id:0
+msgid "Server"
+msgstr ""
+
+#. module: base_synchro
+#: model:ir.actions.act_window,name:base_synchro.action_base_synchro_obj_line_tree
+#: model:ir.model,name:base_synchro.model_base_synchro_obj_line
+#: model:ir.ui.menu,name:base_synchro.menu_action_base_synchro_obj_line_tree
+msgid "Synchronized instances"
+msgstr ""
+
+#. module: base_synchro
+#: field:base.synchro.obj,active:0
+msgid "Active"
+msgstr ""
+
+#. module: base_synchro
+#: view:base.synchro.obj:0
+#: field:base.synchro.obj,model_id:0
+msgid "Object to synchronize"
+msgstr ""
+
+#. module: base_synchro
+#: model:ir.module.module,shortdesc:base_synchro.module_meta_information
+msgid "Base Synchro"
+msgstr ""
+
+#. module: base_synchro
+#: model:ir.actions.act_window,name:base_synchro.action_base_synchro_server_tree
+#: model:ir.ui.menu,name:base_synchro.synchro_server_tree_menu_id
+msgid "Servers to be synchronized"
+msgstr ""
+
+#. module: base_synchro
+#: view:base.synchro.obj:0
+msgid "Transfer Details"
+msgstr ""
+
+#. module: base_synchro
+#: field:base.synchro.obj.line,remote_id:0
+msgid "Remote Id"
+msgstr ""
+
+#. module: base_synchro
+#: field:base.synchro.obj,line_id:0
+msgid "Ids Affected"
+msgstr ""
+
+#. module: base_synchro
+#: model:ir.ui.menu,name:base_synchro.next_id_63
+msgid "History"
+msgstr ""
+
+#. module: base_synchro
+#: model:ir.ui.menu,name:base_synchro.next_id_62
+#: model:ir.ui.menu,name:base_synchro.synch_config
+msgid "Synchronization"
+msgstr ""
+
+#. module: base_synchro
+#: field:base.synchro.obj,domain:0
+msgid "Domain"
+msgstr ""
+
+#. module: base_synchro
+#: view:base.synchro:0
+msgid "_Synchronize"
+msgstr ""
+
+#. module: base_synchro
+#: view:base.synchro:0
+msgid "OK"
+msgstr ""
+
+#. module: base_synchro
+#: field:base.synchro.server,name:0
+msgid "Server name"
+msgstr ""
+
+#. module: base_synchro
+#: field:base.synchro.obj,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: base_synchro
+#: view:base.synchro:0
+msgid ""
+"The synchronisation has been started.You will receive a request when it's "
+"done."
+msgstr ""
+
+#. module: base_synchro
+#: field:base.synchro.server,server_port:0
+msgid "Server Port"
+msgstr ""
+
+#. module: base_synchro
+#: model:ir.ui.menu,name:base_synchro.menu_action_view_base_synchro
+msgid "Synchronize objects"
+msgstr ""
+
+#. module: base_synchro
+#: view:base.synchro:0
+msgid "Synchronization Complited!"
+msgstr ""
+
+#. module: base_synchro
+#: model:ir.model,name:base_synchro.model_base_synchro
+msgid "base.synchro"
+msgstr ""
+
+#. module: base_synchro
+#: field:base.synchro.obj.line,local_id:0
+msgid "Local Id"
+msgstr ""
+
+#. module: base_synchro
+#: model:ir.actions.act_window,name:base_synchro.actions_regclass_tree
+#: model:ir.actions.act_window,name:base_synchro.actions_transfer_line_form
+msgid "Filters"
+msgstr ""
+
+#. module: base_synchro
+#: selection:base.synchro.obj,action:0
+msgid "Download"
+msgstr ""
+
+#. module: base_synchro
+#: field:base.synchro,server_url:0
+#: field:base.synchro.server,server_url:0
+msgid "Server URL"
+msgstr ""
diff --git a/addons/crm_caldav/i18n/zh_CN.po b/addons/crm_caldav/i18n/zh_CN.po
new file mode 100644
index 00000000000..61fd5befc80
--- /dev/null
+++ b/addons/crm_caldav/i18n/zh_CN.po
@@ -0,0 +1,49 @@
+# Chinese (Simplified) translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-04-10 17:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (Simplified) <zh_CN@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: 2011-04-11 05:43+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
+
+#. module: crm_caldav
+#: model:ir.actions.act_window,name:crm_caldav.action_caldav_browse
+msgid "Caldav Browse"
+msgstr "Caldav翻阅"
+
+#. module: crm_caldav
+#: model:ir.model,name:crm_caldav.model_crm_meeting
+msgid "Meeting"
+msgstr "会议"
+
+#. module: crm_caldav
+#: model:ir.module.module,shortdesc:crm_caldav.module_meta_information
+msgid "Extended Module to Add CalDav feature on Meeting"
+msgstr "扩展模块增加会议的Caldav功能"
+
+#. module: crm_caldav
+#: model:ir.module.module,description:crm_caldav.module_meta_information
+msgid ""
+"\n"
+"    New Features in Meeting:\n"
+"        *  Share meeting with other calendar clients like sunbird\n"
+msgstr ""
+"\n"
+"    会议的新功能\n"
+"     *通过连接Mozilla Sunbird与使用日程表的客户共享会议\n"
+
+#. module: crm_caldav
+#: model:ir.ui.menu,name:crm_caldav.menu_caldav_browse
+msgid "Synchronyze this calendar"
+msgstr "同步calendar"
diff --git a/addons/crm_claim/i18n/zh_CN.po b/addons/crm_claim/i18n/zh_CN.po
new file mode 100644
index 00000000000..804f986154b
--- /dev/null
+++ b/addons/crm_claim/i18n/zh_CN.po
@@ -0,0 +1,752 @@
+# Chinese (Simplified) translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-04-11 03:42+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (Simplified) <zh_CN@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: 2011-04-11 05:43+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
+
+#. module: crm_claim
+#: field:crm.claim.report,nbr:0
+msgid "# of Cases"
+msgstr "# 业务"
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: view:crm.claim.report:0
+msgid "Group By..."
+msgstr "分组..."
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Responsibilities"
+msgstr "责任人"
+
+#. module: crm_claim
+#: field:crm.claim,date_action_next:0
+msgid "Next Action Date"
+msgstr "下一动作日期"
+
+#. module: crm_claim
+#: field:crm.claim.report,probability:0
+msgid "Probability"
+msgstr "概率"
+
+#. module: crm_claim
+#: selection:crm.claim.report,month:0
+msgid "March"
+msgstr "3月"
+
+#. module: crm_claim
+#: field:crm.claim.report,delay_close:0
+msgid "Delay to close"
+msgstr "延迟关闭"
+
+#. module: crm_claim
+#: field:crm.claim,resolution:0
+msgid "Resolution"
+msgstr "解决方案"
+
+#. module: crm_claim
+#: field:crm.claim,company_id:0
+#: view:crm.claim.report:0
+#: field:crm.claim.report,company_id:0
+msgid "Company"
+msgstr "公司"
+
+#. module: crm_claim
+#: field:crm.claim,email_cc:0
+msgid "Watchers Emails"
+msgstr "关注者的电子邮件"
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+msgid "#Claim"
+msgstr "#索赔"
+
+#. module: crm_claim
+#: model:ir.actions.act_window,help:crm_claim.crm_claim_stage_act
+msgid ""
+"You can create claim stages to categorize the status of every claim entered "
+"in the system. The stages define all the steps required for the resolution "
+"of a claim."
+msgstr "你能创建索赔阶段的类型把每个索赔的状况输入到系统。阶段定义所有索赔请求的解决步骤。"
+
+#. module: crm_claim
+#: selection:crm.claim,priority:0
+#: selection:crm.claim.report,priority:0
+msgid "Highest"
+msgstr "最高"
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+#: field:crm.claim.report,day:0
+msgid "Day"
+msgstr "日"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Add Internal Note"
+msgstr "添加内部备注"
+
+#. module: crm_claim
+#: help:crm.claim,section_id:0
+msgid ""
+"Sales team to which Case belongs to.Define Responsible user and Email "
+"account for mail gateway."
+msgstr "业务的销售团队定义负责用户和邮件网关的邮件地址。"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Claim Description"
+msgstr "索陪说明"
+
+#. module: crm_claim
+#: field:crm.claim,message_ids:0
+msgid "Messages"
+msgstr "消息"
+
+#. module: crm_claim
+#: model:crm.case.categ,name:crm_claim.categ_claim1
+msgid "Factual Claims"
+msgstr "实际索赔"
+
+#. module: crm_claim
+#: selection:crm.claim,state:0
+#: selection:crm.claim.report,state:0
+msgid "Cancelled"
+msgstr "已取消"
+
+#. module: crm_claim
+#: model:crm.case.resource.type,name:crm_claim.type_claim2
+msgid "Preventive"
+msgstr "预防"
+
+#. module: crm_claim
+#: model:crm.case.stage,name:crm_claim.stage_claim2
+msgid "Fixed"
+msgstr "固定的"
+
+#. module: crm_claim
+#: field:crm.claim,partner_address_id:0
+msgid "Partner Contact"
+msgstr "业务伙伴联系方式"
+
+#. module: crm_claim
+#: field:crm.claim.report,date_closed:0
+msgid "Close Date"
+msgstr "结束日期"
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+msgid "   Month   "
+msgstr "   月   "
+
+#. module: crm_claim
+#: field:crm.claim,ref:0
+msgid "Reference"
+msgstr "参考"
+
+#. module: crm_claim
+#: field:crm.claim,action_next:0
+msgid "Next Action"
+msgstr "下一动作"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Reset to Draft"
+msgstr "重置为草稿"
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: field:crm.claim,date_deadline:0
+#: field:crm.claim.report,date_deadline:0
+msgid "Deadline"
+msgstr "截止日期"
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: field:crm.claim,partner_id:0
+#: view:crm.claim.report:0
+#: field:crm.claim.report,partner_id:0
+msgid "Partner"
+msgstr "业务伙伴"
+
+#. module: crm_claim
+#: selection:crm.claim,type_action:0
+#: selection:crm.claim.report,type_action:0
+msgid "Preventive Action"
+msgstr "预防性动作"
+
+#. module: crm_claim
+#: field:crm.claim.report,section_id:0
+msgid "Section"
+msgstr "分类"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Root Causes"
+msgstr "根本原因"
+
+#. module: crm_claim
+#: field:crm.claim,user_fault:0
+msgid "Trouble Responsible"
+msgstr "故障责任"
+
+#. module: crm_claim
+#: field:crm.claim,priority:0
+#: view:crm.claim.report:0
+#: field:crm.claim.report,priority:0
+msgid "Priority"
+msgstr "优先级"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Send New Email"
+msgstr "发送新的电子邮件"
+
+#. module: crm_claim
+#: field:crm.claim.report,delay_expected:0
+msgid "Overpassed Deadline"
+msgstr "超越截止日期"
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: view:crm.claim.report:0
+msgid "Type"
+msgstr "类型："
+
+#. module: crm_claim
+#: field:crm.claim,email_from:0
+msgid "Email"
+msgstr "电子邮件"
+
+#. module: crm_claim
+#: selection:crm.claim,priority:0
+#: selection:crm.claim.report,priority:0
+msgid "Lowest"
+msgstr "最低"
+
+#. module: crm_claim
+#: field:crm.claim,create_date:0
+msgid "Creation Date"
+msgstr "创建日期"
+
+#. module: crm_claim
+#: field:crm.claim,name:0
+msgid "Claim Subject"
+msgstr "索赔主题"
+
+#. module: crm_claim
+#: model:ir.actions.act_window,help:crm_claim.action_report_crm_claim
+msgid ""
+"Have a general overview of all claims processed in the system by sorting "
+"them with specific criteria."
+msgstr "所有索赔都有一个一般描述在系统里还对它们按具体的标准分类。"
+
+#. module: crm_claim
+#: selection:crm.claim.report,month:0
+msgid "July"
+msgstr "7月"
+
+#. module: crm_claim
+#: model:ir.actions.act_window,name:crm_claim.crm_claim_stage_act
+msgid "Claim Stages"
+msgstr "索赔阶段"
+
+#. module: crm_claim
+#: model:ir.ui.menu,name:crm_claim.menu_crm_case_claim-act
+msgid "Categories"
+msgstr "类型"
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: field:crm.claim,stage_id:0
+#: view:crm.claim.report:0
+#: field:crm.claim.report,stage_id:0
+msgid "Stage"
+msgstr "阶段"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "History Information"
+msgstr "日志信息"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Dates"
+msgstr "日期"
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+msgid "    Month-1    "
+msgstr "    上月    "
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Contact"
+msgstr "联系方式"
+
+#. module: crm_claim
+#: model:ir.ui.menu,name:crm_claim.menu_crm_claim_stage_act
+msgid "Stages"
+msgstr "阶段"
+
+#. module: crm_claim
+#: model:ir.ui.menu,name:crm_claim.menu_report_crm_claim_tree
+msgid "Claims Analysis"
+msgstr "索赔分析"
+
+#. module: crm_claim
+#: help:crm.claim.report,delay_close:0
+msgid "Number of Days to close the case"
+msgstr "到期天数"
+
+#. module: crm_claim
+#: model:ir.model,name:crm_claim.model_crm_claim_report
+msgid "CRM Claim Report"
+msgstr "客户关系管理索赔报表"
+
+#. module: crm_claim
+#: model:crm.case.stage,name:crm_claim.stage_claim1
+msgid "Accepted as Claim"
+msgstr "作为索赔接受"
+
+#. module: crm_claim
+#: model:crm.case.resource.type,name:crm_claim.type_claim1
+msgid "Corrective"
+msgstr "纠正"
+
+#. module: crm_claim
+#: selection:crm.claim.report,month:0
+msgid "September"
+msgstr "9月"
+
+#. module: crm_claim
+#: selection:crm.claim.report,month:0
+msgid "December"
+msgstr "12月"
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+#: field:crm.claim.report,month:0
+msgid "Month"
+msgstr "月"
+
+#. module: crm_claim
+#: field:crm.claim,type_action:0
+#: field:crm.claim.report,type_action:0
+msgid "Action Type"
+msgstr "动作类型"
+
+#. module: crm_claim
+#: field:crm.claim,write_date:0
+msgid "Update Date"
+msgstr "更新日期"
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+msgid "Salesman"
+msgstr "业务员"
+
+#. module: crm_claim
+#: field:crm.claim,categ_id:0
+#: view:crm.claim.report:0
+#: field:crm.claim.report,categ_id:0
+msgid "Category"
+msgstr "类型"
+
+#. module: crm_claim
+#: model:crm.case.categ,name:crm_claim.categ_claim2
+msgid "Value Claims"
+msgstr "索赔金额"
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+msgid "  Year  "
+msgstr "  年  "
+
+#. module: crm_claim
+#: help:crm.claim,email_cc:0
+msgid ""
+"These email addresses will be added to the CC field of all inbound and "
+"outbound emails for this record before being sent. Separate multiple email "
+"addresses with a comma"
+msgstr "这些邮件地址将添加到之前发送记录的发送和接收邮件的抄送字段，分隔多个邮件地址有逗号。"
+
+#. module: crm_claim
+#: selection:crm.claim,state:0
+#: view:crm.claim.report:0
+#: selection:crm.claim.report,state:0
+msgid "Draft"
+msgstr "草稿"
+
+#. module: crm_claim
+#: selection:crm.claim,priority:0
+#: selection:crm.claim.report,priority:0
+msgid "Low"
+msgstr "低"
+
+#. module: crm_claim
+#: field:crm.claim,date_closed:0
+#: selection:crm.claim,state:0
+#: selection:crm.claim.report,state:0
+msgid "Closed"
+msgstr "已结束"
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: selection:crm.claim,state:0
+#: view:crm.claim.report:0
+#: selection:crm.claim.report,state:0
+msgid "Pending"
+msgstr "待定中"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Communication & History"
+msgstr "沟通&日志"
+
+#. module: crm_claim
+#: selection:crm.claim.report,month:0
+msgid "August"
+msgstr "8月"
+
+#. module: crm_claim
+#: selection:crm.claim,priority:0
+#: selection:crm.claim.report,priority:0
+msgid "Normal"
+msgstr "普通"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Global CC"
+msgstr "完整抄送"
+
+#. module: crm_claim
+#: model:ir.module.module,shortdesc:crm_claim.module_meta_information
+msgid "Customer & Supplier Relationship Management"
+msgstr "客户&供应商关系管理"
+
+#. module: crm_claim
+#: selection:crm.claim.report,month:0
+msgid "June"
+msgstr "6月"
+
+#. module: crm_claim
+#: field:crm.claim,partner_phone:0
+msgid "Phone"
+msgstr "电话"
+
+#. module: crm_claim
+#: field:crm.claim.report,user_id:0
+msgid "User"
+msgstr "用户"
+
+#. module: crm_claim
+#: model:crm.case.stage,name:crm_claim.stage_claim5
+msgid "Awaiting Response"
+msgstr "等待回复"
+
+#. module: crm_claim
+#: model:ir.actions.act_window,name:crm_claim.crm_claim_categ_action
+msgid "Claim Categories"
+msgstr "索赔类型"
+
+#. module: crm_claim
+#: selection:crm.claim.report,month:0
+msgid "November"
+msgstr "11月"
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+msgid "Extended Filters..."
+msgstr "扩展过滤..."
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Closure"
+msgstr "关闭"
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+msgid "Search"
+msgstr "查找"
+
+#. module: crm_claim
+#: selection:crm.claim.report,month:0
+msgid "October"
+msgstr "10月"
+
+#. module: crm_claim
+#: model:ir.module.module,description:crm_claim.module_meta_information
+msgid ""
+"\n"
+"This modules allows you to track your customers/suppliers claims and "
+"flames.\n"
+"It is fully integrated with the email gateway so that you can create\n"
+"automatically new claims based on incoming emails.\n"
+"    "
+msgstr ""
+"\n"
+"这模块能跟踪你客户和供应商索赔和不满，它是全面整合在电子邮件的网关中，所以你能基于收到的邮件自动创建新的索赔\n"
+"    "
+
+#. module: crm_claim
+#: selection:crm.claim.report,month:0
+msgid "January"
+msgstr "1月"
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: field:crm.claim,date:0
+msgid "Claim Date"
+msgstr "索赔日期"
+
+#. module: crm_claim
+#: help:crm.claim,email_from:0
+msgid "These people will receive email."
+msgstr "这些人将收到电子邮件。"
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: view:crm.claim.report:0
+#: model:ir.actions.act_window,name:crm_claim.action_report_crm_claim
+#: model:ir.actions.act_window,name:crm_claim.crm_case_categ_claim0
+#: model:ir.ui.menu,name:crm_claim.menu_crm_case_claims
+msgid "Claims"
+msgstr "索赔"
+
+#. module: crm_claim
+#: selection:crm.claim,type_action:0
+#: selection:crm.claim.report,type_action:0
+msgid "Corrective Action"
+msgstr "纠正的动作"
+
+#. module: crm_claim
+#: model:crm.case.categ,name:crm_claim.categ_claim3
+msgid "Policy Claims"
+msgstr "保险单索赔"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "History"
+msgstr "日志"
+
+#. module: crm_claim
+#: model:ir.model,name:crm_claim.model_crm_claim
+#: model:ir.ui.menu,name:crm_claim.menu_config_claim
+msgid "Claim"
+msgstr "索赔"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Attachments"
+msgstr "附件"
+
+#. module: crm_claim
+#: model:ir.model,name:crm_claim.model_crm_case_stage
+msgid "Stage of case"
+msgstr "业务阶段"
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: field:crm.claim,state:0
+#: view:crm.claim.report:0
+#: field:crm.claim.report,state:0
+msgid "State"
+msgstr "州/省"
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: view:crm.claim.report:0
+msgid "Done"
+msgstr "完成"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Claim Reporter"
+msgstr "索赔记者"
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: view:crm.claim.report:0
+msgid "Cancel"
+msgstr "取消"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Close"
+msgstr "结束"
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: selection:crm.claim,state:0
+#: view:crm.claim.report:0
+#: selection:crm.claim.report,state:0
+msgid "Open"
+msgstr "开启"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "In Progress"
+msgstr "进行中"
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: field:crm.claim,user_id:0
+msgid "Responsible"
+msgstr "负责人"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Current"
+msgstr "当前的"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Details"
+msgstr "明细行"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Reply"
+msgstr "回复"
+
+#. module: crm_claim
+#: field:crm.claim,cause:0
+msgid "Root Cause"
+msgstr "根本原因"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Claim/Action Description"
+msgstr "索赔/动作说明"
+
+#. module: crm_claim
+#: field:crm.claim,description:0
+msgid "Description"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Search Claims"
+msgstr ""
+
+#. module: crm_claim
+#: field:crm.claim,section_id:0
+#: view:crm.claim.report:0
+msgid "Sales Team"
+msgstr ""
+
+#. module: crm_claim
+#: selection:crm.claim.report,month:0
+msgid "May"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Resolution Actions"
+msgstr ""
+
+#. module: crm_claim
+#: model:ir.actions.act_window,name:crm_claim.act_claim_partner
+#: model:ir.actions.act_window,name:crm_claim.act_claim_partner_address
+msgid "Report a Claim"
+msgstr ""
+
+#. module: crm_claim
+#: model:ir.actions.act_window,help:crm_claim.crm_case_categ_claim0
+msgid ""
+"Record and track your customers' claims. Claims may be linked to a sales "
+"order or a lot. You can send emails with attachments and keep the full "
+"history for a claim (emails sent, intervention type and so on). Claims may "
+"automatically be linked to an email address using the mail gateway module."
+msgstr ""
+
+#. module: crm_claim
+#: field:crm.claim.report,email:0
+msgid "# Emails"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Follow Up"
+msgstr ""
+
+#. module: crm_claim
+#: help:crm.claim,state:0
+msgid ""
+"The state is set to 'Draft', when a case is created.                         "
+"         \n"
+"If the case is in progress the state is set to 'Open'.                       "
+"           \n"
+"When the case is over, the state is set to 'Done'.                           "
+"       \n"
+"If the case needs to be reviewed then the state is set to 'Pending'."
+msgstr ""
+
+#. module: crm_claim
+#: selection:crm.claim.report,month:0
+msgid "February"
+msgstr ""
+
+#. module: crm_claim
+#: model:crm.case.stage,name:crm_claim.stage_claim3
+msgid "Won't fix"
+msgstr ""
+
+#. module: crm_claim
+#: selection:crm.claim.report,month:0
+msgid "April"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+msgid "My Case(s)"
+msgstr ""
+
+#. module: crm_claim
+#: field:crm.claim,id:0
+msgid "ID"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Actions"
+msgstr ""
+
+#. module: crm_claim
+#: selection:crm.claim,priority:0
+#: selection:crm.claim.report,priority:0
+msgid "High"
+msgstr ""
+
+#. module: crm_claim
+#: model:ir.actions.act_window,help:crm_claim.crm_claim_categ_action
+msgid ""
+"Create claim categories to better manage and classify your claims. Some "
+"example of claims can be: preventive action, corrective action."
+msgstr ""
+
+#. module: crm_claim
+#: field:crm.claim.report,create_date:0
+msgid "Create Date"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+#: field:crm.claim.report,name:0
+msgid "Year"
+msgstr ""
diff --git a/addons/crm_helpdesk/i18n/zh_CN.po b/addons/crm_helpdesk/i18n/zh_CN.po
new file mode 100644
index 00000000000..1fa48f7ef09
--- /dev/null
+++ b/addons/crm_helpdesk/i18n/zh_CN.po
@@ -0,0 +1,697 @@
+# Chinese (Simplified) translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-04-10 16:23+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (Simplified) <zh_CN@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: 2011-04-11 05:43+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk.report,delay_close:0
+msgid "Delay to Close"
+msgstr "延迟关闭"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk.report,nbr:0
+msgid "# of Cases"
+msgstr "# 业务"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: view:crm.helpdesk.report:0
+msgid "Group By..."
+msgstr "分组..."
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Today"
+msgstr "今日"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "March"
+msgstr "3月"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,company_id:0
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,company_id:0
+msgid "Company"
+msgstr "公司"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,email_cc:0
+msgid "Watchers Emails"
+msgstr "关注者的电子邮件"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk,priority:0
+#: selection:crm.helpdesk.report,priority:0
+msgid "Highest"
+msgstr "最高"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,day:0
+msgid "Day"
+msgstr "日"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Add Internal Note"
+msgstr "添加内部备注"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Notes"
+msgstr "备注"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,message_ids:0
+msgid "Messages"
+msgstr "消息"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk,state:0
+#: selection:crm.helpdesk.report,state:0
+msgid "Cancelled"
+msgstr "已取消"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,partner_address_id:0
+msgid "Partner Contact"
+msgstr "业务伙伴联系方式"
+
+#. module: crm_helpdesk
+#: model:ir.ui.menu,name:crm_helpdesk.menu_report_crm_helpdesks_tree
+msgid "Helpdesk Analysis"
+msgstr "服务台分析"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,date_closed:0
+msgid "Close Date"
+msgstr "结束日期"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "   Month   "
+msgstr "   月   "
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,ref:0
+msgid "Reference"
+msgstr "参考"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,date_action_next:0
+msgid "Next Action"
+msgstr "下一动作"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Helpdesk Supports"
+msgstr "服务台支持"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Extra Info"
+msgstr "额外信息"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: field:crm.helpdesk,partner_id:0
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,partner_id:0
+msgid "Partner"
+msgstr "业务伙伴"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Estimates"
+msgstr "估计"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk.report,section_id:0
+msgid "Section"
+msgstr "分类"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: field:crm.helpdesk,priority:0
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,priority:0
+msgid "Priority"
+msgstr "优先级"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Send New Email"
+msgstr "发送新的电子邮件"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Won"
+msgstr "获得"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk.report,delay_expected:0
+msgid "Overpassed Deadline"
+msgstr "超越截止日期"
+
+#. module: crm_helpdesk
+#: model:ir.model,name:crm_helpdesk.model_crm_helpdesk_report
+msgid "Helpdesk report after Sales Services"
+msgstr "售后服务服务台报表"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,email_from:0
+msgid "Email"
+msgstr "电子邮件"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,canal_id:0
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,canal_id:0
+msgid "Channel"
+msgstr "途径"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk,priority:0
+#: selection:crm.helpdesk.report,priority:0
+msgid "Lowest"
+msgstr "最低"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "# Mails"
+msgstr "邮件"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,create_date:0
+#: field:crm.helpdesk.report,create_date:0
+msgid "Creation Date"
+msgstr "创建日期"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Reset to Draft"
+msgstr "重置为草稿"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: selection:crm.helpdesk,state:0
+#: selection:crm.helpdesk.report,state:0
+msgid "Pending"
+msgstr "待处理"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: field:crm.helpdesk,date_deadline:0
+#: field:crm.helpdesk.report,date_deadline:0
+msgid "Deadline"
+msgstr "截止日期"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "July"
+msgstr "7月"
+
+#. module: crm_helpdesk
+#: model:ir.actions.act_window,name:crm_helpdesk.crm_helpdesk_categ_action
+msgid "Helpdesk Categories"
+msgstr "服务台类型"
+
+#. module: crm_helpdesk
+#: model:ir.ui.menu,name:crm_helpdesk.menu_crm_case_helpdesk-act
+msgid "Categories"
+msgstr "类型"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "History Information"
+msgstr "日志信息"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Dates"
+msgstr "日期"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "    Month-1    "
+msgstr "    上月    "
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "#Helpdesk"
+msgstr "服务台"
+
+#. module: crm_helpdesk
+#: help:crm.helpdesk,email_cc:0
+msgid ""
+"These email addresses will be added to the CC field of all inbound and "
+"outbound emails for this record before being sent. Separate multiple email "
+"addresses with a comma"
+msgstr "这些邮件地址将添加到之前发送记录的发送和接收邮件的抄送字段，分隔多个邮件地址有逗号。"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "References"
+msgstr "参考"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "September"
+msgstr "9月"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Communication"
+msgstr "沟通"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,month:0
+msgid "Month"
+msgstr "月份"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Escalate"
+msgstr "提升"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,write_date:0
+msgid "Update Date"
+msgstr "更新日期"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Query"
+msgstr "查询"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Salesman"
+msgstr "业务员"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,ref2:0
+msgid "Reference 2"
+msgstr "参考2"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,categ_id:0
+#: field:crm.helpdesk.report,categ_id:0
+msgid "Category"
+msgstr "类型"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "  Year  "
+msgstr "  年  "
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Helpdesk Support"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,planned_cost:0
+#: field:crm.helpdesk.report,planned_cost:0
+msgid "Planned Costs"
+msgstr "计划成本"
+
+#. module: crm_helpdesk
+#: model:ir.module.module,description:crm_helpdesk.module_meta_information
+msgid "Helpdesk Management"
+msgstr "服务台管理"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Search Helpdesk"
+msgstr "查询服务台"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk,state:0
+#: selection:crm.helpdesk.report,state:0
+msgid "Draft"
+msgstr "草稿"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk,priority:0
+#: selection:crm.helpdesk.report,priority:0
+msgid "Low"
+msgstr "低"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,date_closed:0
+#: selection:crm.helpdesk,state:0
+#: selection:crm.helpdesk.report,state:0
+msgid "Closed"
+msgstr "已结束"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "7 Days"
+msgstr "7天"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Communication & History"
+msgstr "沟通&日志"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "August"
+msgstr "8月"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk,priority:0
+#: selection:crm.helpdesk.report,priority:0
+msgid "Normal"
+msgstr "普通"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Global CC"
+msgstr "完整抄送"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "June"
+msgstr "6月"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,planned_revenue:0
+msgid "Planned Revenue"
+msgstr "计划收入"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk.report,user_id:0
+msgid "User"
+msgstr "用户"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,active:0
+msgid "Active"
+msgstr "有效"
+
+#. module: crm_helpdesk
+#: model:ir.module.module,shortdesc:crm_helpdesk.module_meta_information
+msgid "CRM Helpdesk"
+msgstr "客户关系管理 服务台"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Extended Filters..."
+msgstr "扩展过滤..."
+
+#. module: crm_helpdesk
+#: model:ir.actions.act_window,name:crm_helpdesk.crm_case_helpdesk_act111
+msgid "Helpdesk Requests"
+msgstr "服务台请求"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Search"
+msgstr "查找"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "October"
+msgstr "10月"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "January"
+msgstr "1月"
+
+#. module: crm_helpdesk
+#: help:crm.helpdesk,email_from:0
+msgid "These people will receive email."
+msgstr "这些人将收到电子邮件。"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: field:crm.helpdesk,date:0
+msgid "Date"
+msgstr "日期"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "November"
+msgstr "11月"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "History"
+msgstr "日志"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Attachments"
+msgstr "附件"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Misc"
+msgstr "杂项"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: field:crm.helpdesk,state:0
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,state:0
+msgid "State"
+msgstr "州/省"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "General"
+msgstr "通用"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Send Reminder"
+msgstr "发送提醒"
+
+#. module: crm_helpdesk
+#: help:crm.helpdesk,section_id:0
+msgid ""
+"Sales team to which Case belongs to.                                 Define "
+"Responsible user and Email account for mail gateway."
+msgstr "销售团队属于这业务.定义负责用户和电子邮件帐户和网关"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Done"
+msgstr "完成"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "December"
+msgstr "12月"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Cancel"
+msgstr "取消"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Close"
+msgstr "结束"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: selection:crm.helpdesk,state:0
+#: selection:crm.helpdesk.report,state:0
+msgid "Open"
+msgstr "开启"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Helpdesk Support Tree"
+msgstr "服务台支持树"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Categorization"
+msgstr "归类"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+#: model:ir.actions.act_window,name:crm_helpdesk.action_report_crm_helpdesk
+#: model:ir.model,name:crm_helpdesk.model_crm_helpdesk
+#: model:ir.ui.menu,name:crm_helpdesk.menu_config_helpdesk
+msgid "Helpdesk"
+msgstr "服务台"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: field:crm.helpdesk,user_id:0
+msgid "Responsible"
+msgstr "负责人"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Current"
+msgstr "当前的"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Details"
+msgstr "明细行"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Reply"
+msgstr "回复"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,description:0
+msgid "Description"
+msgstr "说明"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "May"
+msgstr "5月"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,probability:0
+msgid "Probability (%)"
+msgstr "概率(%)"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk.report,email:0
+msgid "# Emails"
+msgstr "电子邮件"
+
+#. module: crm_helpdesk
+#: model:ir.actions.act_window,help:crm_helpdesk.action_report_crm_helpdesk
+msgid ""
+"Have a general overview of all support requests by sorting them with "
+"specific criteria such as the processing time, number of requests answered, "
+"emails sent and costs."
+msgstr "所有的支持请求都有分类,具体标准都有大致的描述如: 处理时间,请求回复的次数,邮件的发送成本."
+
+#. module: crm_helpdesk
+#: help:crm.helpdesk,canal_id:0
+msgid ""
+"The channels represent the different communication  modes available with the "
+"customer."
+msgstr "途径代表与客户沟通的不同方式"
+
+#. module: crm_helpdesk
+#: help:crm.helpdesk,state:0
+msgid ""
+"The state is set to 'Draft', when a case is created.                         "
+"         \n"
+"If the case is in progress the state is set to 'Open'.                       "
+"           \n"
+"When the case is over, the state is set to 'Done'.                           "
+"       \n"
+"If the case needs to be reviewed then the state is set to 'Pending'."
+msgstr ""
+"当一个业务创建时状态设为'草稿'\n"
+"如果业务正在处理状态设为'开启'\n"
+"当业务结束状态设为'完成'\n"
+"如果业务需要审查状态设为'待定'"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "February"
+msgstr "2月"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,name:0
+msgid "Name"
+msgstr "名称"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Lost"
+msgstr "丢失"
+
+#. module: crm_helpdesk
+#: model:ir.ui.menu,name:crm_helpdesk.menu_help_support_main
+msgid "Helpdesk and Support"
+msgstr "服务台和支持"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "April"
+msgstr "4月"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "My Case(s)"
+msgstr "我的业务"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,id:0
+msgid "ID"
+msgstr ""
+
+#. module: crm_helpdesk
+#: model:ir.actions.act_window,help:crm_helpdesk.crm_helpdesk_categ_action
+msgid ""
+"Create and manage helpdesk categories to better manage and classify your "
+"support requests."
+msgstr "创建和管理服务台类型去更好管理和分类你的支持的请求"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk,priority:0
+#: selection:crm.helpdesk.report,priority:0
+msgid "High"
+msgstr "高"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: field:crm.helpdesk,section_id:0
+#: view:crm.helpdesk.report:0
+msgid "Sales Team"
+msgstr "销售团队"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,date_action_last:0
+msgid "Last Action"
+msgstr "最近动作"
+
+#. module: crm_helpdesk
+#: model:ir.actions.act_window,help:crm_helpdesk.crm_case_helpdesk_act111
+msgid ""
+"Helpdesk and Support allow you to track your interventions. Select a "
+"customer, add notes and categorize interventions with partners if necessary. "
+"You can also assign a priority level. Use the OpenERP Issues system to "
+"manage your support activities. Issues can be connected to the email "
+"gateway: new emails may create issues, each of them automatically gets the "
+"history of the conversation with the customer."
+msgstr ""
+"服务台和支持使你可以去跟踪你的介入.如果需要选择一个客户增加备注和类型介入这业务伙伴.你可以分配一优先级用系统问题模块来管理的的支持活动.问题能链接邮件网"
+"关.新的邮件可能创建新的问题,它们能自动写入与客户沟通的日志."
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,name:0
+msgid "Year"
+msgstr "年"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,duration:0
+msgid "Duration"
+msgstr "持续时间"
diff --git a/addons/document/i18n/gl.po b/addons/document/i18n/gl.po
index 86a4e404b16..79cec54a03c 100644
--- a/addons/document/i18n/gl.po
+++ b/addons/document/i18n/gl.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-08 06:12+0000\n"
+"X-Launchpad-Export-Date: 2011-04-09 06:16+0000\n"
 "X-Generator: Launchpad (build 12735)\n"
 
 #. module: document
diff --git a/addons/document_webdav/i18n/ca.po b/addons/document_webdav/i18n/ca.po
new file mode 100644
index 00000000000..0d5c5598849
--- /dev/null
+++ b/addons/document_webdav/i18n/ca.po
@@ -0,0 +1,206 @@
+# Catalan translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-04-10 16:26+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Catalan <ca@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: 2011-04-11 05:43+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
+
+#. module: document_webdav
+#: field:document.webdav.dir.property,create_date:0
+#: field:document.webdav.file.property,create_date:0
+msgid "Date Created"
+msgstr ""
+
+#. module: document_webdav
+#: constraint:document.directory:0
+msgid "Error! You can not create recursive Directories."
+msgstr ""
+
+#. module: document_webdav
+#: view:document.webdav.dir.property:0
+#: view:document.webdav.file.property:0
+msgid "Search Document properties"
+msgstr ""
+
+#. module: document_webdav
+#: view:document.webdav.dir.property:0
+#: field:document.webdav.dir.property,namespace:0
+#: view:document.webdav.file.property:0
+#: field:document.webdav.file.property,namespace:0
+msgid "Namespace"
+msgstr ""
+
+#. module: document_webdav
+#: field:document.directory,dav_prop_ids:0
+msgid "DAV properties"
+msgstr ""
+
+#. module: document_webdav
+#: model:ir.model,name:document_webdav.model_document_webdav_file_property
+msgid "document.webdav.file.property"
+msgstr ""
+
+#. module: document_webdav
+#: view:document.webdav.dir.property:0
+#: view:document.webdav.file.property:0
+msgid "Group By..."
+msgstr ""
+
+#. module: document_webdav
+#: view:document.directory:0
+msgid "These properties will be added to WebDAV requests"
+msgstr ""
+
+#. module: document_webdav
+#: model:ir.ui.menu,name:document_webdav.menu_file_props
+msgid "DAV properties for documents"
+msgstr ""
+
+#. module: document_webdav
+#: code:addons/document_webdav/webdav.py:37
+#, python-format
+msgid "PyWebDAV Import Error!"
+msgstr ""
+
+#. module: document_webdav
+#: view:document.webdav.file.property:0
+#: field:document.webdav.file.property,file_id:0
+msgid "Document"
+msgstr ""
+
+#. module: document_webdav
+#: model:ir.module.module,description:document_webdav.module_meta_information
+msgid ""
+" With this module, the WebDAV server for the documents is activated.\n"
+"        You can then use any compatible browser to remotely see the "
+"attachments of OpenObject.\n"
+"\n"
+"        After installation, the webDAV server can be controlled by a "
+"[webdav] section in the server's config.\n"
+"        Server Configuration Parameter:\n"
+"        [webdav]\n"
+"        ; enable = True ; Serve webdav over the http(s) servers\n"
+"        ; vdir = webdav ; the directory that webdav will be served at\n"
+"          ; this default val means that webdav will be\n"
+"          ; on \"http://localhost:8069/webdav/\n"
+"        ; verbose = True ; Turn on the verbose messages of webdav\n"
+"        ; debug = True ; Turn on the debugging messages of webdav\n"
+"          ; since the messages are routed to the python logging, with\n"
+"          ; levels \"debug\" and \"debug_rpc\" respectively, you can leave\n"
+"          ; these options on\n"
+msgstr ""
+
+#. module: document_webdav
+#: sql_constraint:document.directory:0
+msgid "Directory cannot be parent of itself!"
+msgstr ""
+
+#. module: document_webdav
+#: view:document.directory:0
+msgid "Dynamic context"
+msgstr ""
+
+#. module: document_webdav
+#: view:document.directory:0
+msgid "WebDAV properties"
+msgstr ""
+
+#. module: document_webdav
+#: sql_constraint:document.directory:0
+msgid "The directory name must be unique !"
+msgstr ""
+
+#. module: document_webdav
+#: code:addons/document_webdav/webdav.py:37
+#, python-format
+msgid ""
+"Please install PyWebDAV from "
+"http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
+"0.9.4.tar.gz&can=2&q=/"
+msgstr ""
+
+#. module: document_webdav
+#: model:ir.ui.menu,name:document_webdav.menu_dir_props
+msgid "DAV properties for folders"
+msgstr ""
+
+#. module: document_webdav
+#: view:document.directory:0
+#: view:document.webdav.dir.property:0
+#: view:document.webdav.file.property:0
+msgid "Properties"
+msgstr ""
+
+#. module: document_webdav
+#: field:document.webdav.dir.property,name:0
+#: field:document.webdav.file.property,name:0
+msgid "Name"
+msgstr ""
+
+#. module: document_webdav
+#: model:ir.model,name:document_webdav.model_document_webdav_dir_property
+msgid "document.webdav.dir.property"
+msgstr ""
+
+#. module: document_webdav
+#: field:document.webdav.dir.property,value:0
+#: field:document.webdav.file.property,value:0
+msgid "Value"
+msgstr ""
+
+#. module: document_webdav
+#: field:document.webdav.dir.property,dir_id:0
+#: model:ir.model,name:document_webdav.model_document_directory
+msgid "Directory"
+msgstr ""
+
+#. module: document_webdav
+#: field:document.webdav.dir.property,write_uid:0
+#: field:document.webdav.file.property,write_uid:0
+msgid "Last Modification User"
+msgstr ""
+
+#. module: document_webdav
+#: view:document.webdav.dir.property:0
+msgid "Dir"
+msgstr ""
+
+#. module: document_webdav
+#: field:document.webdav.dir.property,write_date:0
+#: field:document.webdav.file.property,write_date:0
+msgid "Date Modified"
+msgstr ""
+
+#. module: document_webdav
+#: field:document.webdav.dir.property,create_uid:0
+#: field:document.webdav.file.property,create_uid:0
+msgid "Creator"
+msgstr ""
+
+#. module: document_webdav
+#: model:ir.module.module,shortdesc:document_webdav.module_meta_information
+msgid "WebDAV server for Document Management"
+msgstr ""
+
+#. module: document_webdav
+#: sql_constraint:document.directory:0
+msgid "Directory must have a parent or a storage"
+msgstr ""
+
+#. module: document_webdav
+#: field:document.webdav.dir.property,do_subst:0
+#: field:document.webdav.file.property,do_subst:0
+msgid "Substitute"
+msgstr ""
diff --git a/addons/fetchmail/i18n/ca.po b/addons/fetchmail/i18n/ca.po
new file mode 100644
index 00000000000..80dc00c19a2
--- /dev/null
+++ b/addons/fetchmail/i18n/ca.po
@@ -0,0 +1,317 @@
+# Catalan translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-04-10 14:58+0000\n"
+"Last-Translator: jmartin (Zikzakmedia) <jmartin@zikzakmedia.com>\n"
+"Language-Team: Catalan <ca@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: 2011-04-11 05:43+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
+
+#. module: fetchmail
+#: constraint:email.server:0
+msgid ""
+"Warning! Record for selected Model can not be created\n"
+"Please choose valid Model"
+msgstr ""
+"Atenció! No es poden crear registres per al model seleccionat\n"
+"Seleccioneu un model vàlid"
+
+#. module: fetchmail
+#: selection:email.server,state:0
+msgid "Confirmed"
+msgstr "Confirmat"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Confirm"
+msgstr "Confirma"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Group By..."
+msgstr "Agrupa per..."
+
+#. module: fetchmail
+#: view:email.server:0
+#: field:email.server,state:0
+msgid "State"
+msgstr "Estat"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "POP"
+msgstr "POP"
+
+#. module: fetchmail
+#: selection:email.server,state:0
+msgid "Not Confirmed"
+msgstr "No confirmat"
+
+#. module: fetchmail
+#: field:email.server,user:0
+msgid "User Name"
+msgstr "Nom de l'usuari"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Type"
+msgstr "Tipus"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "POP/IMAP Servers"
+msgstr "Servidores POP/IMAP"
+
+#. module: fetchmail
+#: model:ir.module.module,shortdesc:fetchmail.module_meta_information
+msgid "Fetchmail Server"
+msgstr "Servidor Fetchmail"
+
+#. module: fetchmail
+#: view:email.server:0
+#: field:email.server,note:0
+msgid "Description"
+msgstr "Descripció"
+
+#. module: fetchmail
+#: help:email.server,object_id:0
+msgid ""
+"OpenObject Model. Generates a record of this model.\n"
+"Select Object with message_new attrbutes."
+msgstr ""
+"Model OpenObject. Genera un registre d'aquest model.\n"
+"Seleccioneu un objecte amb atributs message_new (nou missatge)."
+
+#. module: fetchmail
+#: field:email.server,attach:0
+msgid "Add Attachments ?"
+msgstr "Afegeix adjunts?"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "# of emails"
+msgstr "nombre d'emails"
+
+#. module: fetchmail
+#: model:ir.actions.act_window,name:fetchmail.act_server_history
+msgid "Email History"
+msgstr "Historial d'emails"
+
+#. module: fetchmail
+#: field:email.server,user_id:0
+msgid "User"
+msgstr "Usuari"
+
+#. module: fetchmail
+#: field:email.server,date:0
+msgid "Date"
+msgstr "Data"
+
+#. module: fetchmail
+#: selection:email.server,state:0
+msgid "Waiting for Verification"
+msgstr "Esperant verificació"
+
+#. module: fetchmail
+#: field:email.server,password:0
+msgid "Password"
+msgstr "Contrasenya"
+
+#. module: fetchmail
+#: view:mailgate.message:0
+msgid "Emails"
+msgstr "Emails"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Search Email Servers"
+msgstr "Buscar servidores de correo"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Server & Login"
+msgstr "Servidor i connexió"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Auto Reply?"
+msgstr "¿Auto responder?"
+
+#. module: fetchmail
+#: field:email.server,name:0
+msgid "Name"
+msgstr "Nom"
+
+#. module: fetchmail
+#: model:ir.model,name:fetchmail.model_mailgate_message
+msgid "Mailgateway Message"
+msgstr "Missatge passarel·la de correu"
+
+#. module: fetchmail
+#: model:ir.actions.act_window,name:fetchmail.action_email_server_tree
+msgid "POP Servers"
+msgstr "Servidores POP"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Set to Draft"
+msgstr "Canvia a esborrany"
+
+#. module: fetchmail
+#: field:email.server,message_ids:0
+#: model:ir.actions.act_window,name:fetchmail.action_view_mail_message_emails
+msgid "Messages"
+msgstr "Missatges"
+
+#. module: fetchmail
+#: model:ir.ui.menu,name:fetchmail.menu_action_fetchmail_server_tree
+msgid "Fetchmail Services"
+msgstr "Servicios Fetchmail"
+
+#. module: fetchmail
+#: field:email.server,server:0
+msgid "Server"
+msgstr "Servidor"
+
+#. module: fetchmail
+#: field:email.server,active:0
+msgid "Active"
+msgstr "Actiu"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Process Parameter"
+msgstr "Paràmetre procés"
+
+#. module: fetchmail
+#: field:email.server,is_ssl:0
+msgid "SSL ?"
+msgstr "SSL"
+
+#. module: fetchmail
+#: selection:email.server,type:0
+#: selection:mailgate.message,server_type:0
+msgid "IMAP Server"
+msgstr "Servidor IMAP"
+
+#. module: fetchmail
+#: field:email.server,object_id:0
+msgid "Model"
+msgstr "Model"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "IMAP"
+msgstr "IMAP"
+
+#. module: fetchmail
+#: view:email.server:0
+#: model:ir.model,name:fetchmail.model_email_server
+msgid "POP/IMAP Server"
+msgstr "Servidor POP/IMAP"
+
+#. module: fetchmail
+#: constraint:email.server:0
+msgid "Warning! Can't have duplicate server configuration!"
+msgstr "¡Aviso! No puede tener la configuración del servidor duplicada."
+
+#. module: fetchmail
+#: field:email.server,type:0
+#: field:mailgate.message,server_type:0
+msgid "Server Type"
+msgstr "Tipus de servidor"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Login Information"
+msgstr "Informació de connexió"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Server Information"
+msgstr "Informació del servidor"
+
+#. module: fetchmail
+#: help:email.server,attach:0
+msgid "Fetches mail with attachments if true."
+msgstr "Si está marcado, obtiene correo con documentos adjuntos."
+
+#. module: fetchmail
+#: selection:email.server,type:0
+#: selection:mailgate.message,server_type:0
+msgid "POP Server"
+msgstr "Servidor POP"
+
+#. module: fetchmail
+#: field:email.server,port:0
+msgid "Port"
+msgstr "Port"
+
+#. module: fetchmail
+#: model:ir.module.module,description:fetchmail.module_meta_information
+msgid ""
+"Fetchmail: \n"
+"    * Fetch email from Pop / IMAP server\n"
+"    * Support SSL\n"
+"    * Integrated with all Modules\n"
+"    * Automatic Email Receive\n"
+"    * Email based Records (Add, Update)\n"
+"    "
+msgstr ""
+"Fetchmail: \n"
+"    * Recuperar email des de servidor POP / IMAP\n"
+"    * Compatibilitat amb SSL\n"
+"    * Integració amb tots els mòduls\n"
+"    * Recepció automàtica d'emails\n"
+"    * Registres basats en email (afegir, actualitzar)\n"
+"    "
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "SSL"
+msgstr "SSL"
+
+#. module: fetchmail
+#: help:email.server,action_id:0
+msgid ""
+"An Email Server Action. It will be run whenever an e-mail is fetched from "
+"server."
+msgstr ""
+"Una acció de servidor de correu. S'executarà sempre que s'obtingui un email "
+"des del servidor."
+
+#. module: fetchmail
+#: help:email.server,priority:0
+msgid "Priority between 0 to 10, select define the order of Processing"
+msgstr "Prioritat entre 0 i 10, defineix l'ordre de procés."
+
+#. module: fetchmail
+#: field:email.server,action_id:0
+msgid "Email Server Action"
+msgstr "Acción d'email del servidor"
+
+#. module: fetchmail
+#: field:email.server,priority:0
+msgid "Server Priority"
+msgstr "Prioridad servidor"
+
+#. module: fetchmail
+#: view:mailgate.message:0
+#: field:mailgate.message,server_id:0
+msgid "Mail Server"
+msgstr "Servidor de correu"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Fetch Emails"
+msgstr "Recupera emails"
diff --git a/addons/fetchmail/i18n/es.po b/addons/fetchmail/i18n/es.po
index 9f7567addd2..e9db1c36778 100644
--- a/addons/fetchmail/i18n/es.po
+++ b/addons/fetchmail/i18n/es.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-01-19 12:00+0000\n"
-"Last-Translator: Raimon Esteve (Zikzakmedia) <resteve@zikzakmedia.com>\n"
+"PO-Revision-Date: 2011-04-10 14:47+0000\n"
+"Last-Translator: jmartin (Zikzakmedia) <jmartin@zikzakmedia.com>\n"
 "Language-Team: Spanish <es@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: 2011-01-25 06:40+0000\n"
-"X-Generator: Launchpad (build 12177)\n"
+"X-Launchpad-Export-Date: 2011-04-11 05:43+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
 #. module: fetchmail
 #: constraint:email.server:0
@@ -100,7 +100,7 @@ msgstr "¿Añadir adjuntos?"
 #. module: fetchmail
 #: view:email.server:0
 msgid "# of emails"
-msgstr "# de correos"
+msgstr "número de emails"
 
 #. module: fetchmail
 #: model:ir.actions.act_window,name:fetchmail.act_server_history
diff --git a/addons/hr_recruitment/i18n/ca.po b/addons/hr_recruitment/i18n/ca.po
index d8671d7eb20..235db7b449a 100644
--- a/addons/hr_recruitment/i18n/ca.po
+++ b/addons/hr_recruitment/i18n/ca.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-03-31 21:56+0000\n"
-"Last-Translator: Esther Xaus (Zikzakmedia) <Unknown>\n"
+"PO-Revision-Date: 2011-04-10 14:51+0000\n"
+"Last-Translator: jmartin (Zikzakmedia) <jmartin@zikzakmedia.com>\n"
 "Language-Team: Catalan <ca@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: 2011-04-01 06:05+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-04-11 05:43+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
 #. module: hr_recruitment
 #: help:hr.applicant,active:0
@@ -134,7 +134,7 @@ msgstr "Anotacions"
 #. module: hr_recruitment
 #: field:hr.applicant,message_ids:0
 msgid "Messages"
-msgstr "Mensatges"
+msgstr "Missatges"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
diff --git a/addons/hr_timesheet_invoice/i18n/it.po b/addons/hr_timesheet_invoice/i18n/it.po
index c0f44f89b84..ef21949b979 100644
--- a/addons/hr_timesheet_invoice/i18n/it.po
+++ b/addons/hr_timesheet_invoice/i18n/it.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-01-19 12:00+0000\n"
-"Last-Translator: Nicola Riolini - Micronaet <Unknown>\n"
+"PO-Revision-Date: 2011-04-10 12:36+0000\n"
+"Last-Translator: Carlo - didotech.com <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: 2011-01-25 06:44+0000\n"
-"X-Generator: Launchpad (build 12177)\n"
+"X-Launchpad-Export-Date: 2011-04-11 05:43+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -145,7 +145,7 @@ msgstr "Importo Fatturato"
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
 msgid "Uninvoiced line with billing rate"
-msgstr ""
+msgstr "Linee non fatturate con tasso di fatturazione"
 
 #. module: hr_timesheet_invoice
 #: field:report_timesheet.invoice,account_id:0
@@ -165,7 +165,7 @@ msgstr "Importo"
 #. module: hr_timesheet_invoice
 #: view:account.analytic.account:0
 msgid "Reactivate Account"
-msgstr ""
+msgstr "Riattiva il Conto"
 
 #. module: hr_timesheet_invoice
 #: help:hr.timesheet.invoice.create,name:0
@@ -190,7 +190,7 @@ msgstr "Contabilità Analitica da Chiudere"
 #. module: hr_timesheet_invoice
 #: view:board.board:0
 msgid "Uninvoice Lines With Billing Rate"
-msgstr ""
+msgstr "Linee non fatturate con tasso di fatturazione"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -524,7 +524,7 @@ msgstr "Timesheet non assegnati a utenti"
 #. module: hr_timesheet_invoice
 #: field:report.timesheet.line,invoice_id:0
 msgid "Invoiced"
-msgstr ""
+msgstr "Fatturati"
 
 #. module: hr_timesheet_invoice
 #: field:report.analytic.account.close,quantity_max:0
@@ -734,17 +734,17 @@ msgstr "Quantità"
 #. module: hr_timesheet_invoice
 #: report:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
 msgid "Date/Code"
-msgstr ""
+msgstr "Data/codice"
 
 #. module: hr_timesheet_invoice
 #: field:report.timesheet.line,general_account_id:0
 msgid "General Account"
-msgstr ""
+msgstr "Contabilità Generale"
 
 #. module: hr_timesheet_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_analytic_profit
 msgid "Print Timesheet Profit"
-msgstr ""
+msgstr "Stampa il profitto del timesheet"
 
 #. module: hr_timesheet_invoice
 #: field:account.analytic.account,to_invoice:0
@@ -804,7 +804,7 @@ msgstr "Annulla"
 #. module: hr_timesheet_invoice
 #: view:account.analytic.account:0
 msgid "Close"
-msgstr ""
+msgstr "Chiudi"
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,help:hr_timesheet_invoice.action_hr_timesheet_invoice_factor_form
@@ -832,7 +832,7 @@ msgstr "Necessario saldo prodotto"
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.invoice.create:0
 msgid "Billing Data"
-msgstr ""
+msgstr "Data fatturazione"
 
 #. module: hr_timesheet_invoice
 #: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:77
@@ -945,6 +945,9 @@ msgid ""
 "This list shows you every task you can invoice to the customer. Select the "
 "lines and click the Action button to generate the invoices automatically."
 msgstr ""
+"Questo lista vi mostra ogni attività fatturabile al cliente. Selezionare le "
+"linee d'azione e fare clic sul pulsante per generare automaticamente le "
+"fatture."
 
 #. module: hr_timesheet_invoice
 #: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit.py:58
diff --git a/addons/idea/i18n/mn.po b/addons/idea/i18n/mn.po
index 4f1e1ae51b1..97a53e7d9ce 100644
--- a/addons/idea/i18n/mn.po
+++ b/addons/idea/i18n/mn.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-01-19 12:00+0000\n"
-"Last-Translator: badralb <Unknown>\n"
+"PO-Revision-Date: 2011-04-11 04:22+0000\n"
+"Last-Translator: Uurtsaikh <Unknown>\n"
 "Language-Team: Mongolian <mn@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: 2011-01-25 06:45+0000\n"
-"X-Generator: Launchpad (build 12177)\n"
+"X-Launchpad-Export-Date: 2011-04-11 05:43+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
 #. module: idea
 #: help:idea.category,visibility:0
@@ -76,7 +76,7 @@ msgstr ""
 #. module: idea
 #: model:ir.module.module,shortdesc:idea.module_meta_information
 msgid "Idea Manager"
-msgstr ""
+msgstr "Саналын удирдлага"
 
 #. module: idea
 #: selection:report.vote,month:0
diff --git a/addons/product/i18n/id.po b/addons/product/i18n/id.po
index c0b29d8ef80..3852f3732da 100644
--- a/addons/product/i18n/id.po
+++ b/addons/product/i18n/id.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-08 06:13+0000\n"
+"X-Launchpad-Export-Date: 2011-04-09 06:16+0000\n"
 "X-Generator: Launchpad (build 12735)\n"
 
 #. module: product
diff --git a/addons/thunderbird/i18n/bg.po b/addons/thunderbird/i18n/bg.po
index 6d3cd5eedf6..f447ab7cd77 100644
--- a/addons/thunderbird/i18n/bg.po
+++ b/addons/thunderbird/i18n/bg.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2011-03-30 12:16+0000\n"
+"PO-Revision-Date: 2011-04-09 08:47+0000\n"
 "Last-Translator: Dimitar Markov <dimitar.markov@gmail.com>\n"
 "Language-Team: Bulgarian <bg@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: 2011-03-31 06:35+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-04-10 06:01+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
 #. module: thunderbird
 #: field:thunderbird.installer,plugin_file:0
@@ -94,17 +94,17 @@ msgstr ""
 #: field:thunderbird.installer,name:0
 #: field:thunderbird.installer,pdf_name:0
 msgid "File name"
-msgstr ""
+msgstr "Име на файл"
 
 #. module: thunderbird
 #: view:thunderbird.installer:0
 msgid "Installation and Configuration Steps"
-msgstr ""
+msgstr "Стъпки за инсталиране и настройка"
 
 #. module: thunderbird
 #: field:thunderbird.installer,progress:0
 msgid "Configuration Progress"
-msgstr ""
+msgstr "Прогрес на конфигурация"
 
 #. module: thunderbird
 #: model:ir.actions.act_window,name:thunderbird.action_thunderbird_installer
@@ -121,17 +121,17 @@ msgstr ""
 #. module: thunderbird
 #: view:thunderbird.installer:0
 msgid "Configure"
-msgstr ""
+msgstr "Настройване"
 
 #. module: thunderbird
 #: view:thunderbird.installer:0
 msgid "Skip"
-msgstr ""
+msgstr "Пропусни"
 
 #. module: thunderbird
 #: field:thunderbird.installer,config_logo:0
 msgid "Image"
-msgstr ""
+msgstr "Изображение"
 
 #. module: thunderbird
 #: model:ir.module.module,description:thunderbird.module_meta_information
diff --git a/addons/web_livechat/i18n/zh_CN.po b/addons/web_livechat/i18n/zh_CN.po
new file mode 100644
index 00000000000..6ca859f8b0b
--- /dev/null
+++ b/addons/web_livechat/i18n/zh_CN.po
@@ -0,0 +1,39 @@
+# Chinese (Simplified) translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:16+0000\n"
+"PO-Revision-Date: 2011-04-08 07:20+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (Simplified) <zh_CN@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: 2011-04-09 06:16+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
+
+#. module: web_livechat
+#: sql_constraint:publisher_warranty.contract:0
+msgid ""
+"Your publisher warranty contract is already subscribed in the system !"
+msgstr ""
+
+#. module: web_livechat
+#: model:ir.module.module,shortdesc:web_livechat.module_meta_information
+msgid "Live Chat Support"
+msgstr ""
+
+#. module: web_livechat
+#: model:ir.model,name:web_livechat.model_publisher_warranty_contract
+msgid "publisher_warranty.contract"
+msgstr ""
+
+#. module: web_livechat
+#: model:ir.module.module,description:web_livechat.module_meta_information
+msgid "Enable live chat support for whom have a maintenance contract"
+msgstr ""
diff --git a/addons/web_uservoice/i18n/zh_CN.po b/addons/web_uservoice/i18n/zh_CN.po
new file mode 100644
index 00000000000..788b3f5045a
--- /dev/null
+++ b/addons/web_uservoice/i18n/zh_CN.po
@@ -0,0 +1,29 @@
+# Chinese (Simplified) translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-12 16:15+0000\n"
+"PO-Revision-Date: 2011-04-08 07:13+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (Simplified) <zh_CN@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: 2011-04-09 06:16+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
+
+#. module: web_uservoice
+#: model:ir.module.module,shortdesc:web_uservoice.module_meta_information
+msgid "Add uservoice button in header"
+msgstr ""
+
+#. module: web_uservoice
+#: code:addons/web_uservoice/web/editors.py:72
+#, python-format
+msgid "feedback"
+msgstr ""
diff --git a/bin/addons/base/i18n/nl.po b/bin/addons/base/i18n/nl.po
index bd0584512ac..6b2b0d22eb7 100644
--- a/bin/addons/base/i18n/nl.po
+++ b/bin/addons/base/i18n/nl.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-02-21 08:40+0000\n"
-"Last-Translator: Niels Huylebroeck <Unknown>\n"
+"PO-Revision-Date: 2011-04-10 19:20+0000\n"
+"Last-Translator: Mustufa Rangwala (Open ERP) <mra@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: 2011-02-22 14:26+0000\n"
-"X-Generator: Launchpad (build 12351)\n"
+"X-Launchpad-Export-Date: 2011-04-11 05:42+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
 #. module: base
 #: view:ir.filters:0
@@ -918,7 +918,7 @@ msgstr "Toegang verwijderen"
 #. module: base
 #: model:res.country,name:base.ne
 msgid "Niger"
-msgstr "Nigeria"
+msgstr "Niger"
 
 #. module: base
 #: selection:base.language.install,lang:0

From 75bf28388b9c2904576aedc43b61620665ee9cd0 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 11 Apr 2011 08:25:41 +0200
Subject: [PATCH 108/331] [IMP] improvements to View.normalize_attrs

bzr revid: xmo@openerp.com-20110411062541-mjib0mm8wk7ujlyy
---
 addons/base/controllers/main.py | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/addons/base/controllers/main.py b/addons/base/controllers/main.py
index 96782c1cec4..efc960168c4 100644
--- a/addons/base/controllers/main.py
+++ b/addons/base/controllers/main.py
@@ -424,19 +424,16 @@ class View(openerpweb.Controller):
         :param dict context: evaluation context
         """
         # If @attrs is normalized in json by server, the eval should be replaced by simplejson.loads
-        attrs = eval(elem.attrib.get('attrs', '{}'))
+        attrs = openerpweb.ast.literal_eval(elem.get('attrs', '{}'))
         if 'states' in elem.attrib:
-            if 'invisible' not in attrs:
-                attrs['invisible'] = []
-                # This should be done by the server
-            attrs['invisible'].append(('state', 'not in', elem.attrib['states'].split(',')))
-            del(elem.attrib['states'])
+            attrs.setdefault('invisible', [])\
+                .append(('state', 'not in', elem.attrib.pop('states').split(',')))
         if attrs:
-            elem.attrib['attrs'] = simplejson.dumps(attrs)
+            elem.set('attrs', simplejson.dumps(attrs))
         for a in ['invisible', 'readonly', 'required']:
             if a in elem.attrib:
                 # In the XML we trust
-                avalue = bool(eval(elem.attrib.get(a, 'False'),
+                avalue = bool(eval(elem.get(a, 'False'),
                                    {'context': context or {}}))
                 if not avalue:
                     del elem.attrib[a]

From 5a901eef839cf82dae9886c2e5d7929234e9d86d Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 11 Apr 2011 08:27:25 +0200
Subject: [PATCH 109/331] [FIX] dataset tests

bzr revid: xmo@openerp.com-20110411062725-7eh31m9vtuasmsjz
---
 addons/base/test/test_dataset.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/base/test/test_dataset.py b/addons/base/test/test_dataset.py
index 80d1e52561b..27d2169bf1b 100644
--- a/addons/base/test/test_dataset.py
+++ b/addons/base/test/test_dataset.py
@@ -14,13 +14,13 @@ class TestDataSetController(unittest2.TestCase):
         self.search.return_value = []
         self.read.return_value = []
 
-        self.assertFalse(self.dataset.do_find(self.request, 'fake.model'))
+        self.assertFalse(self.dataset.do_search_read(self.request, 'fake.model'))
         self.read.assert_called_once_with([], False)
 
     def test_regular_find(self):
         self.search.return_value = [1, 2, 3]
 
-        self.dataset.do_find(self.request, 'fake.model')
+        self.dataset.do_search_read(self.request, 'fake.model')
         self.read.assert_called_once_with([1, 2, 3], False)
 
     def test_ids_shortcut(self):
@@ -32,7 +32,7 @@ class TestDataSetController(unittest2.TestCase):
         ]
 
         self.assertEqual(
-            self.dataset.do_find(self.request, 'fake.model', ['id']),
+            self.dataset.do_search_read(self.request, 'fake.model', ['id']),
             [{'id': 1}, {'id': 2}, {'id': 3}])
         self.assertFalse(self.read.called)
 
@@ -46,7 +46,7 @@ class TestDataSetController(unittest2.TestCase):
         result = self.dataset.do_get(
             self.request, 'fake.model', [3, 2, 1])
         self.read.assert_called_once_with(
-            [3, 2, 1])
+            [3, 2, 1], False)
         self.assertFalse(self.search.called)
 
         self.assertEqual(

From 669b109bde7786c406b6141f2954677f52668852 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 11 Apr 2011 08:30:54 +0200
Subject: [PATCH 110/331] [FIX] docstring for DataSet.do_search_read: missing
 'fields' param

bzr revid: xmo@openerp.com-20110411063054-jybr8z734xy3qndp
---
 addons/base/controllers/main.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/addons/base/controllers/main.py b/addons/base/controllers/main.py
index efc960168c4..c8614c0f5cb 100644
--- a/addons/base/controllers/main.py
+++ b/addons/base/controllers/main.py
@@ -363,6 +363,9 @@ class DataSet(openerpweb.Controller):
         :type model: str
         :param ids: a list of identifiers
         :type ids: list
+        :param fields: a list of fields to fetch, ``False`` or empty to fetch
+                       all fields in the model
+        :type fields: list | False
         :returns: a list of records, in the same order as the list of ids
         :rtype: list
         """

From 53ea40d8e99e3a8a1505edea9695605f839bc4a7 Mon Sep 17 00:00:00 2001
From: "ARA (OpenERP)" <ara@tinyerp.com>
Date: Mon, 11 Apr 2011 12:30:35 +0530
Subject: [PATCH 111/331] [FIX] hr_timesheet:an employee shouldn't be able to
 see all timesheet line

lp bug: https://launchpad.net/bugs/755659 fixed

bzr revid: ara@tinyerp.com-20110411070035-rmd3l2a1g3zdfomt
---
 addons/hr_timesheet/__openerp__.py                   |  1 +
 .../hr_timesheet/security/hr_timesheet_security.xml  | 12 ++++++++++++
 addons/hr_timesheet/security/ir.model.access.csv     |  1 +
 3 files changed, 14 insertions(+)
 create mode 100644 addons/hr_timesheet/security/hr_timesheet_security.xml

diff --git a/addons/hr_timesheet/__openerp__.py b/addons/hr_timesheet/__openerp__.py
index 345f9c92df7..e58d09c296d 100644
--- a/addons/hr_timesheet/__openerp__.py
+++ b/addons/hr_timesheet/__openerp__.py
@@ -44,6 +44,7 @@ to set up a management by affair.
     'init_xml': ['hr_timesheet_data.xml'],
     'update_xml': [
         'security/ir.model.access.csv',
+        'security/hr_timesheet_security.xml',
         'hr_timesheet_view.xml',
         'hr_timesheet_report.xml',
         'hr_timesheet_wizard.xml',
diff --git a/addons/hr_timesheet/security/hr_timesheet_security.xml b/addons/hr_timesheet/security/hr_timesheet_security.xml
new file mode 100644
index 00000000000..6b341e50f4b
--- /dev/null
+++ b/addons/hr_timesheet/security/hr_timesheet_security.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data noupdate="True">
+
+        <record id="property_rule_timesheet_employee" model="ir.rule">
+            <field name="name">HR Analytic Timesheet</field>
+            <field model="ir.model" name="model_id" ref="model_hr_analytic_timesheet"/>
+            <field name="domain_force">[('user_id', '=', user.id)]</field>
+        </record>
+
+    </data>
+</openerp>
\ No newline at end of file
diff --git a/addons/hr_timesheet/security/ir.model.access.csv b/addons/hr_timesheet/security/ir.model.access.csv
index 6e932d4e8f8..ea34aa4ddc4 100644
--- a/addons/hr_timesheet/security/ir.model.access.csv
+++ b/addons/hr_timesheet/security/ir.model.access.csv
@@ -9,3 +9,4 @@
 "access_account_fiscalyear_hr_user","account.account.fiscalyear.user","account.model_account_fiscalyear","base.group_hr_user",1,1,1,1
 "hr.access_account_journal_view_hruser","account.journal.view hruser","account.model_account_journal_view","base.group_hr_user",1,0,0,0
 "hr.access_account_journal_column_hruser","account.journal.column hruser","account.model_account_journal_column","base.group_hr_user",1,0,0,0
+"access_hr_analytic_timesheet_user","hr.analytic.timesheet.user","model_hr_analytic_timesheet","base.group_user",1,0,0,0
\ No newline at end of file

From f21bb336d3aca07eb135c891dfcaf20818fcebd4 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 11 Apr 2011 09:58:46 +0200
Subject: [PATCH 112/331] [FIX] dataset search, 'context' is popped from kwargs
 into the request object, and should be taken from there for RPC calls

bzr revid: xmo@openerp.com-20110411075846-9qxzabjav0y1l47n
---
 addons/base/controllers/main.py  | 5 ++---
 addons/base/test/test_dataset.py | 5 +++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/base/controllers/main.py b/addons/base/controllers/main.py
index c8614c0f5cb..28806083d61 100644
--- a/addons/base/controllers/main.py
+++ b/addons/base/controllers/main.py
@@ -334,18 +334,17 @@ class DataSet(openerpweb.Controller):
         :param int offset: from which index should the results start being returned
         :param int limit: the maximum number of records to return
         :param list domain: the search domain for the query
-        :param dict context: the context in which the search should be executed
         :param list sort: sorting directives
         :returns: a list of result records
         :rtype: list
         """
         Model = request.session.model(model)
         ids = Model.search(domain or [], offset or 0, limit or False,
-                           sort or False, context or False)
+                           sort or False, request.context)
         if fields and fields == ['id']:
             # shortcut read if we only want the ids
             return map(lambda id: {'id': id}, ids)
-        return Model.read(ids, fields or False)
+        return Model.read(ids, fields or False, request.context)
 
     @openerpweb.jsonrequest
     def get(self, request, model, ids, fields=False):
diff --git a/addons/base/test/test_dataset.py b/addons/base/test/test_dataset.py
index 27d2169bf1b..702c63b0899 100644
--- a/addons/base/test/test_dataset.py
+++ b/addons/base/test/test_dataset.py
@@ -15,13 +15,14 @@ class TestDataSetController(unittest2.TestCase):
         self.read.return_value = []
 
         self.assertFalse(self.dataset.do_search_read(self.request, 'fake.model'))
-        self.read.assert_called_once_with([], False)
+        self.read.assert_called_once_with([], False, self.request.context)
 
     def test_regular_find(self):
         self.search.return_value = [1, 2, 3]
 
         self.dataset.do_search_read(self.request, 'fake.model')
-        self.read.assert_called_once_with([1, 2, 3], False)
+        self.read.assert_called_once_with([1, 2, 3], False,
+                                          self.request.context)
 
     def test_ids_shortcut(self):
         self.search.return_value = [1, 2, 3]

From bc82a989f2449165f28955e7a11f944dbdf2e036 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Mon, 11 Apr 2011 10:30:32 +0200
Subject: [PATCH 113/331] [IMP] Renamed Notification methods 'default' ->
 notify  ,  'alert' -> warn

bzr revid: fme@openerp.com-20110411083032-zc87gltpnw2z7s0r
---
 addons/base/static/src/js/chrome.js |  9 ++-------
 addons/base/static/src/js/data.js   |  2 +-
 addons/base/static/src/js/form.js   | 12 ++++++------
 addons/base/static/src/js/search.js |  2 +-
 4 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/addons/base/static/src/js/chrome.js b/addons/base/static/src/js/chrome.js
index b26dccffb2e..920973e640a 100644
--- a/addons/base/static/src/js/chrome.js
+++ b/addons/base/static/src/js/chrome.js
@@ -245,12 +245,7 @@ openerp.base.Notification =  openerp.base.BasicController.extend({
             text: text
         });
     },
-    // TODO remove to avoid default as attribute
-    'default': function(title, text) {
-        this.notify(title,text);
-    },
-    // TODO change into warn to avoid alert
-    alert: function(title, text) {
+    warn: function(title, text) {
         this.$element.notify('create', 'oe_notification_alert', {
             title: title,
             text: text
@@ -907,7 +902,7 @@ openerp.base.WebClient = openerp.base.Controller.extend({
         this.header.start();
         this.login.start();
         this.menu.start();
-        this.notification['default']("OpenERP Client", "The openerp client has been initialized.");
+        this.notification.notify("OpenERP Client", "The openerp client has been initialized.");
     },
     on_logged: function() {
         this.action =  new openerp.base.ActionManager(this.session, "oe_app");
diff --git a/addons/base/static/src/js/data.js b/addons/base/static/src/js/data.js
index 8f5d6168e75..c16bf8eb81b 100644
--- a/addons/base/static/src/js/data.js
+++ b/addons/base/static/src/js/data.js
@@ -100,7 +100,7 @@ openerp.base.DataSet =  openerp.base.Controller.extend( /** @lends openerp.base.
         }, callback);
     },
     unlink: function(ids) {
-        this.notification['default']("Unlink", ids);
+        this.notification.notify("Unlink", ids);
     },
     call: function (method, ids, args, callback) {
         ids = ids || [];
diff --git a/addons/base/static/src/js/form.js b/addons/base/static/src/js/form.js
index bf42fc4fd7f..e31f03510d8 100644
--- a/addons/base/static/src/js/form.js
+++ b/addons/base/static/src/js/form.js
@@ -234,24 +234,24 @@ openerp.base.FormView =  openerp.base.Controller.extend( /** @lends openerp.base
             }
         });
         msg += "</ul>";
-        this.notification.alert("The following fields are invalid :", msg);
+        this.notification.warn("The following fields are invalid :", msg);
     },
     on_saved: function(r) {
         if (!r.result) {
             this.log("Record was not saved");
         } else {
             // Check response for exceptions, display error
-            this.notification['default']("Record saved", "The record #" + this.datarecord.id + " has been saved.");
+            this.notification.notify("Record saved", "The record #" + this.datarecord.id + " has been saved.");
         }
     },
     do_search: function (domains, contexts, groupbys) {
-        this.notification['default']("Searching form");
+        this.notification.notify("Searching form");
     },
     on_action: function (action) {
-        this.notification['default']('Executing action ' + action);
+        this.notification.notify('Executing action ' + action);
     },
     do_cancel: function () {
-        this.notification['default']("Cancelling form");
+        this.notification.notify("Cancelling form");
     }
 });
 
@@ -720,7 +720,7 @@ openerp.base.form.FieldOne2ManyDatasSet = openerp.base.DataSetStatic.extend({
         this._super(id, data, callback);
     },
     unlink: function() {
-        this.notification['default']('Unlinking o2m ' + this.ids);
+        this.notification.notify('Unlinking o2m ' + this.ids);
     }
 });
 
diff --git a/addons/base/static/src/js/search.js b/addons/base/static/src/js/search.js
index ef10992d75f..21d1408f087 100644
--- a/addons/base/static/src/js/search.js
+++ b/addons/base/static/src/js/search.js
@@ -215,7 +215,7 @@ openerp.base.SearchView = openerp.base.Controller.extend({
      * @param {Array} errors a never-empty array of error objects
      */
     on_invalid: function (errors) {
-        this.notification['default']("Invalid Search", "triggered from search view");
+        this.notification.notify("Invalid Search", "triggered from search view");
     },
     do_clear: function (e) {
         if (e && e.preventDefault) { e.preventDefault(); }

From d99bacbd60615ab9e1a6e18e437d13fc2e949821 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 11 Apr 2011 10:42:59 +0200
Subject: [PATCH 114/331] [TEST] add test for normalize_attrs of states

bzr revid: xmo@openerp.com-20110411084259-gpkw2nzpw8ctuhy5
---
 addons/base/test/test_view.py | 53 ++++++++++++++++++++++-------------
 1 file changed, 34 insertions(+), 19 deletions(-)

diff --git a/addons/base/test/test_view.py b/addons/base/test/test_view.py
index e5c6162dae0..f20f9e12f61 100644
--- a/addons/base/test/test_view.py
+++ b/addons/base/test/test_view.py
@@ -2,33 +2,16 @@ import xml.etree.ElementTree
 import mock
 
 import unittest2
+import simplejson
 
 import base.controllers.main
 import openerpweb.nonliterals
 import openerpweb.openerpweb
 
 #noinspection PyCompatibility
-class ViewTest(unittest2.TestCase):
+class DomainsAndContextsTest(unittest2.TestCase):
     def setUp(self):
         self.view = base.controllers.main.View()
-    def test_identity(self):
-        base_view = """
-            <form string="Title">
-                <group>
-                    <field name="some_field"/>
-                    <field name="some_other_field"/>
-                </group>
-                <field name="stuff"/>
-            </form>
-        """
-
-        pristine = xml.etree.ElementTree.fromstring(base_view)
-        transformed = self.view.transform_view(base_view, None)
-
-        self.assertEqual(
-             xml.etree.ElementTree.tostring(transformed),
-             xml.etree.ElementTree.tostring(pristine)
-        )
 
     def test_convert_literal_domain(self):
         e = xml.etree.ElementTree.Element(
@@ -115,3 +98,35 @@ class ViewTest(unittest2.TestCase):
             openerpweb.nonliterals.Context(
                 session, key=e.get('context').key).get_context_string(),
             context_string)
+
+class AttrsNormalizationTest(unittest2.TestCase):
+    def setUp(self):
+        self.view = base.controllers.main.View()
+
+    def test_identity(self):
+        base_view = """
+            <form string="Title">
+                <group>
+                    <field name="some_field"/>
+                    <field name="some_other_field"/>
+                </group>
+                <field name="stuff"/>
+            </form>
+        """
+
+        pristine = xml.etree.ElementTree.fromstring(base_view)
+        transformed = self.view.transform_view(base_view, None)
+
+        self.assertEqual(
+             xml.etree.ElementTree.tostring(transformed),
+             xml.etree.ElementTree.tostring(pristine)
+        )
+    def test_transform_states(self):
+        element = xml.etree.ElementTree.Element(
+            'field', states="open,closed")
+        self.view.normalize_attrs(element, {})
+
+        self.assertIsNone(element.get('states'))
+        self.assertEqual(
+            simplejson.loads(element.get('attrs')),
+            {'invisible': [['state', 'not in', ['open', 'closed']]]})

From 047b10f0ff2c55270a084b3e2eff7455997f9950 Mon Sep 17 00:00:00 2001
From: Thibault Francois <tfr@openerp.com>
Date: Mon, 11 Apr 2011 10:51:20 +0200
Subject: [PATCH 115/331] [FIX] mass convert oldest lead

bzr revid: tfr@openerp.com-20110411085120-xdjn8z046ak9enen
---
 addons/crm/wizard/crm_lead_to_opportunity.py | 7 +++----
 addons/crm/wizard/crm_lead_to_partner.py     | 1 -
 addons/crm/wizard/crm_merge_opportunities.py | 6 +++++-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/addons/crm/wizard/crm_lead_to_opportunity.py b/addons/crm/wizard/crm_lead_to_opportunity.py
index ea6145f3719..33ec426d7d6 100644
--- a/addons/crm/wizard/crm_lead_to_opportunity.py
+++ b/addons/crm/wizard/crm_lead_to_opportunity.py
@@ -48,11 +48,10 @@ class crm_lead2opportunity_partner(osv.osv_memory):
         """
         lead_obj = self.pool.get('crm.lead')
 
-
         res = super(crm_lead2opportunity_partner, self).default_get(cr, uid, fields, context=context)
         opportunities = res.get('opportunity_ids') or []
-
         partner_id = False
+        email = False
         for lead in lead_obj.browse(cr, uid, opportunities, context=context):
             partner_id = lead.partner_id and lead.partner_id.id or False
             email = re.findall(r'([^ ,<@]+@[^> ,]+)', lead.email_from or '')
@@ -150,7 +149,7 @@ class crm_lead2opportunity_partner(osv.osv_memory):
         subject = "lead %s converted into opportunity" % lead.name
         body = "Info \n Id : %s \n Subject: %s \n Partner: %s \n Description : %s " % (lead.id, lead.name, lead.partner_id.name, lead.description)  
         try :
-            tools.email_send(email_from, email_to, subject, body)
+            tools.email_send(email_from, [email_to], subject, body)
         except:
             pass
 
@@ -211,7 +210,7 @@ class crm_lead2opportunity_partner(osv.osv_memory):
             if data.name == 'merge' and (len(data.opportunity_ids) > 1 or not context.get('mass_convert') ):
                 merge_obj = self.pool.get('crm.merge.opportunity')
                 self.write(cr, uid, ids, {'opportunity_ids' : [(6,0, [data.opportunity_ids[0].id])]}, context=context)
-                context.update({'lead_ids' : record_id})
+                context.update({'lead_ids' : record_id, "convert" : True})
                 return merge_obj.merge(cr, uid, data.opportunity_ids, context=context)
 
         return {
diff --git a/addons/crm/wizard/crm_lead_to_partner.py b/addons/crm/wizard/crm_lead_to_partner.py
index 71b454f18c3..ae9943cb6db 100644
--- a/addons/crm/wizard/crm_lead_to_partner.py
+++ b/addons/crm/wizard/crm_lead_to_partner.py
@@ -73,7 +73,6 @@ class crm_lead2partner(osv.osv_memory):
 
         data = list(context and context.get('active_ids', []) or [])
         res = super(crm_lead2partner, self).default_get(cr, uid, fields, context=context)
-
         for lead in lead_obj.browse(cr, uid, data, context=context):
             partner_ids = []
             # Find partner address matches the email_from of the lead
diff --git a/addons/crm/wizard/crm_merge_opportunities.py b/addons/crm/wizard/crm_merge_opportunities.py
index ba066e65c78..8cf1d14ce17 100644
--- a/addons/crm/wizard/crm_merge_opportunities.py
+++ b/addons/crm/wizard/crm_merge_opportunities.py
@@ -61,7 +61,11 @@ class crm_merge_opportunity(osv.osv_memory):
 
 
     def find_oldest(self, cr, uid, op_ids, context=None):
+        if not context:
+            context = {}
         ids = [op_id.id for op_id in op_ids]
+        if context.get('convert'):
+            ids = list(set(ids) - set(context.get('lead_ids', False)) )
         lead_obj = self.pool.get('crm.lead')
         op_id = lead_obj.search(cr, uid, [('id', 'in', ids)], order='create_date' , context=context)
         opps = lead_obj.browse(cr, uid, [op_id[0]], context=context)
@@ -74,7 +78,7 @@ class crm_merge_opportunity(osv.osv_memory):
         opp_obj = self.pool.get('crm.lead')
         message_obj = self.pool.get('mailgate.message')
 
-        lead_ids = context and context.pop('lead_ids', []) or []
+        lead_ids = context and context.get('lead_ids', []) or []
 
         if len(op_ids) <= 1:
             raise osv.except_osv(_('Warning !'),_('Please select more than one opportunities.'))

From 3b7d2dd1c3090b793f14adbc63d034732c1c409c Mon Sep 17 00:00:00 2001
From: "noz (OpenERP)" <noz@tinyerp.com>
Date: Mon, 11 Apr 2011 14:38:02 +0530
Subject: [PATCH 116/331] [FIX] Fixed dynamic return for poll method.

bzr revid: noz@tinyerp.com-20110411090802-zzrsexmojj6w9zan
---
 addons/web_chat/controllers/main.py | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/addons/web_chat/controllers/main.py b/addons/web_chat/controllers/main.py
index 2beccdcda0c..ff5b95d6579 100644
--- a/addons/web_chat/controllers/main.py
+++ b/addons/web_chat/controllers/main.py
@@ -132,13 +132,16 @@ class PollServer(openerpweb.Controller):
 
         """
         
-        for i in range(60):
+        msg = []
+        
+        for i in range(5):
             received_msg = mq.read('Guest1', i);
             if received_msg:
                 msg = self._pollParseMessages(received_msg)
-                time.sleep(2)
+                time.sleep(1)
             else:
-                time.sleep(2)
+                msg = []
+                time.sleep(1)
             
         # for i in range(60):
             #r = mq.read(username,timestamp)
@@ -148,12 +151,14 @@ class PollServer(openerpweb.Controller):
                 # sleep 2
         # else
             # return emptylist
-            
-#        print "==============poll receive...", kw.get('callback')
+
+        msg = '[{"t":"m","s":"Guest130214008855.5","r":"Guest130214013134.26","m":"xxxxxx"}]'
+
 #        # it's http://localhost:8002/web_chat/pollserver/poll?method=long?callback=jsonp1302147330483&_1302147330483=
-        return '%s([{"t":"m","s":"Guest130214008855.5","r":"Guest130214013134.26","m":"xxxxxx"}]);'%kw.get('callback','')
         
-    @openerpweb.jsonrequest
+        return '%s'%kw.get('callback', '') + '(' + msg + ');'
+        
+    @openerpweb.httprequest
     def send(self, req, **kw):
         print "========= send ========", kw
         

From c2865075b16014ace644d6f0cb17e1ccc2cc4dcf Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Mon, 11 Apr 2011 11:26:46 +0200
Subject: [PATCH 117/331] web_chat im.js eol 0x0d to 0x0a

bzr revid: al@openerp.com-20110411092646-dykbpwndmn5gawf1
---
 addons/web_chat/static/lib/AjaxIM/js/im.js | 2102 +++++++++++++++++++-
 1 file changed, 2101 insertions(+), 1 deletion(-)

diff --git a/addons/web_chat/static/lib/AjaxIM/js/im.js b/addons/web_chat/static/lib/AjaxIM/js/im.js
index ef80481a246..42c3f743204 100644
--- a/addons/web_chat/static/lib/AjaxIM/js/im.js
+++ b/addons/web_chat/static/lib/AjaxIM/js/im.js
@@ -1 +1,2101 @@
-// = im.js =
//
// **Copyright &copy; 2005 &ndash; 2010 Joshua Gross**\\
// //MIT Licensed//
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
// in the Software without restriction, including without limitation the rights
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
// copies of the Software, and to permit persons to whom the Software is
// furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in
// all copies or substantial portions of the Software.
// 
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
//
// This is the main library for Ajax IM. It encompasses the UI controls,
// and connecting with the server. It does //not// handle registration or
// account management.

(function($, _instance) {
    AjaxIM = function(options, actions) {
        if(this instanceof AjaxIM) {
            var self = this;
            
            // === {{{ defaults }}} ===
            //
            // These are the available settings for Ajax IM, and the associated
            // defaults:
            //
            // * {{{pollType}}} determines the way in which the client will talk to
            // the server.
            // ** {{{comet}}} will use http streaming, wherein a connection to the server will be held open indefinitely, and the server will push down new events (messages, status updates) as they occur.
            // ** {{{long}}} will hold open a connection with the server for as long as possible, or until a new event is received. Upon the server sending an event or closing the connection, the client will automatically&mdash;and immediately&mdash;reconnect.
            // ** {{{short}}} will open a connection, and the server (if this method is supported) will //immediately// provide a response as to whether or not there are any new events. Once a response is received, the client will wait 5 seconds, and then reconnect.
            // * {{{pollServer}}} is the default URL to which all actions refer. It is
            // possible to specify certain action URLs separately (as is used with the
            // NodeJS server).
            // * {{{cookieName}}} is the name of the session cookie used by the server.
            // If this is not set properly, the IM engine will not be able to automatically
            // reinitialize sessions.
            // * {{{theme}}} is the name of the theme folder that defines the HTML and
            // CSS of the IM bar and chat boxes. Usually, themes are deposited in the
            // provided "themes" folder and specified by that path, e.g. {{{themes/default}}}.
            // Theme files within the theme folder must be named {{{theme.html}}} and
            // {{{theme.css}}}.
            // * {{{storageMethod}}} defines the way in which data (chat sessions) are
            // temporarily stored client-side. By default, {{{"flash"}}} is used because
            // it is the most widely supported method. However,
            // [[http://eric.garside.name/docs.html?p=jstore#js-engines|other storage engines]]
            // are available, with their respective up- and down-sides
            // outlined, on the jStore website.
            // * {{{storeSession}}} (**not implemented**) sets the number of days to
            // retain stored chat session data before it should be deleted.
            // * {{{checkResume}}} is a flag that sets whether or not the client should
            // make a call to the server before resuming the session (such as on a page
            // reload). This will ensure that the session has not expired. If set to {{{false}}},
            // a call to the server will not be made, and the session will be assumed to
            // be active.
            var defaults = {
                pollType: 'long',
                pollServer: './ajaxim.php',
                cookieName: 'ajaxim_session',
                theme: 'themes/default',
                storageMethod: 'auto',
                flashStorage: 'js/jStore.Flash.html',
                storeSession: 5, // number of days to store chat data (0 for current session only)
                checkResume: true
            };

            // === {{{AjaxIM.}}}**{{{settings}}}** ===
            //
            // These are the settings for the IM. If particular options are not specified,
            // the defaults (see above) will be used. //These options will be defined
            // upon calling the initialization function, and not set directly.//
            this.settings = $.extend(defaults, options);

            // === {{{AjaxIM.}}}**{{{actions}}}** ===
            //
            // Each individual action that the IM engine can execute is predefined here.
            // By default, it merely appends the action onto the end of the {{{pollServer}}} url,
            // however, it is possible to define actions individually. //The alternative actions
            // will be defined upon calling the initialization function, and not set directly.//
            //
            // Should you define an action at a different URL, Ajax IM will determine whether
            // or not this URL is within the current domain. If it is within a subdomain of
            // the current domain, it will set the document.domain variable for you,
            // to match a broader hostname scope; the action will continue to use {{{$.post}}}
            // (the default AJAX method for Ajax IM).
            //
            // On the other hand, should you choose a URL outside the current domain
            // Ajax IM will switch to {{{$.getJSON}}} (a get request) to avoid
            // cross-domain scripting issues. This means that a server on a different
            // port or at a different address will need to be able to handle GET
            // requests rather than POST requests (such as how the Node.JS Ajax IM
            // server works).
            this.actions = $.extend({
                login: this.settings.pollServer + '/login',
                logout: this.settings.pollServer + '/logout',
                register: this.settings.pollServer + '/register',
                poll: this.settings.pollServer + '/poll?method=' + this.settings.pollType,
                send: this.settings.pollServer + '/send',
                status: this.settings.pollServer + '/status',
                resume: this.settings.pollServer + '/resume'
            }, actions);

            var httpRx = new RegExp('^http://', 'i'),
                slashslashRx = new RegExp('^//', 'i'),
                queryStrRx = new RegExp('[?](.+)$'),
                subdomainRx = new RegExp('((http[s]?:)?//)?(.+?)[.]' + window.location.host, 'i');
            $.each(this.actions, function(name, action) {
                if(name == 'poll' || name == 'send') {
                    if(self.settings.pollType != 'comet')
                        action += (queryStrRx.test(action[1]) ? '&' : '?') + 'callback=?';
                        
                    action = ['jsonp', action];
                } else {
                    action = ['ajax', action];
                    if(subdomainRx.test(action[1])) {
                        document.domain = '.' + window.location.host;
                    } else if((http = httpRx.test(action[1])) || slashslashRx.test(action[1])) {
                        if(!(new RegExp('//' + window.location.host + '/', 'i')).test(action[1])) {
                            action[1] += (queryStrRx.test(action[1]) ? '&' : '?') + 'callback=?';
                            action = ['jsonp', action[1]];
                        }
                    }
                }
                
                self.actions[name] = action;
            });
            
            // We load the theme dynamically based on the passed
            // settings. If the theme is set to false, we assume
            // that the user is going to load it himself.
            this.themeLoaded = false;
            if(this.settings.theme) {
                $('<div></div>').appendTo('body').load(this.settings.theme + '/theme.html #imjs-bar, .imjs-tooltip',
                    function() {
                        self.themeLoaded = true;
                        setup.apply(self);
                    }
                );
                if(typeof document.createStyleSheet == 'function')
                    document.createStyleSheet(this.settings.theme + '/theme.css');
                else
                    $('body').append('<link rel="stylesheet" href="' +
                        this.settings.theme + '/theme.css" />');
            } else {
                this.themeLoaded = true;
                setup.apply(this);
            }
            
            // Client-side storage for keeping track of
            // conversation states, active tabs, etc.
            // The default is flash storage, however, other
            // options are available via the jStore library.
            if(this.settings.storageMethod) {
                this.storageBrowserKey = 'unknown';
                this.storeKey = '';
                
                $.each($.browser, function(k, v) {
                    if(k == 'version') return true;
                    else if(v == true) {
                        self.storageBrowserKey = k;
                        return false;
                    }
                });
            
                if(this.settings.storageMethod == 'auto') {
                    $.each(['ie', 'html5', 'local', 'flash'], function() {
                        if($.jStore.Availability[this]()) {
                            self.settings.storageMethod = this;
                            return false;
                        }
                    });
                }
            
                $.extend($.jStore.defaults, {
                    project: 'im.js',
                    engine: this.settings.storageMethod,
                    flash: this.settings.flashStorage
                });
                    
                this.storageReady = false;
                
                if(this.settings.storageMethod == 'flash') {                    
                    $.jStore.ready(function(engine) {
                        $.jStore.flashReady(function() {
                            self.storageReady = true;
                            setup.apply(self);
                        });
                    })
                } else {
                    $.jStore.ready(function(engine) {
                        self.storageReady = true;
                        setup.apply(self);
                    });
                }
                
                $.jStore.load();
            } else {
                this.storageReady = true;
                setup.apply(this);
            }

            // Allow a chatbox to me minimized
            $('.imjs-chatbox').live('click', function(e) {
                e.preventDefault();
                return false;
            });
            
            $('.imjs-chatbox .imjs-minimize').live('click', function() {
                $(this).parents('.imjs-chatbox').data('tab').click();
            });
            
            // Allow a chatbox to be closed
            $('.imjs-chatbox .imjs-close').live('click', function() {
                var chatbox = $(this).parents('.imjs-chatbox');
                chatbox.data('tab')
                    .data('state', 'closed').css('display', 'none');
                    
                if(self.settings.storageMethod && self.storageReady) {
                    delete self.chatstore[chatbox.data('username')];
                    if(self.storageReady) {
                        $.jStore.store(
                            self.storageBrowserKey + '-' +
                            self.username + '-chats',
                            self.chatstore);
                    }
                }
            });
            
            // Setup message sending for all chatboxes
            $('.imjs-chatbox .imjs-input').live('keydown', function(event) {               
                var obj = $(this);
                if(event.keyCode == 13 && !($.browser.msie && $.browser.version < 8)) {
                    self.send(obj.parents('.imjs-chatbox').data('username'), obj.val());
                }
            }).live('keyup', function(event) {
                if(event.keyCode == 13) {
                    if($.browser.msie && $.browser.version < 8) {
                        var obj = $(this);
                        self.send(obj.parents('.imjs-chatbox').data('username'), obj.val());
                    }

                    var obj = $(this);
                    obj.val('');
                    obj.height(obj.data('height'));
                }
            }).live('keypress', function(e) {
                var obj = $(this);
                if(!($.browser.msie && $.browser.opera)) obj.height(0);
                if(this.scrollHeight > obj.height() || this.scrollHeight < obj.height()) {
                    obj.height(this.scrollHeight);
                }
            });
            
            $('.imjs-msglog').live('click', function() {
                var chatbox = $(this).parents('.imjs-chatbox');
                chatbox.find('.imjs-input').focus();
            });
            
            // Create a chatbox when a buddylist item is clicked
            $('.imjs-friend').live('click', function() {
                var chatbox = self._createChatbox($(this).data('friend'));
                
                if(chatbox.data('tab').data('state') != 'active')
                    chatbox.data('tab').click();
                    
                chatbox.find('.imjs-input').focus();
            });
            
            // Setup and hide the scrollers
            $('.imjs-scroll').css('display', 'none');
            $('#imjs-scroll-left').live('click', function() {
                var hiddenTab = $('#imjs-bar li.imjs-tab:visible').slice(-1)
                    .next('#imjs-bar li.imjs-tab:hidden')
                    .filter(function() {
                        return $(this).data('state') != 'closed'
                    })
                    .not('.imjs-default').slice(-1).css('display', '');
                    
                if(hiddenTab.length) {
                    $('#imjs-bar li.imjs-tab:visible').eq(0).css('display', 'none');
                    $(this).html(parseInt($(this).html()) - 1);
                    $('#imjs-scroll-right').html(parseInt($('#imjs-scroll-right').html()) + 1);
                }

                return false;
            });
            $('#imjs-scroll-right').live('click', function() {
                var hiddenTab = $('#imjs-bar li.imjs-tab:visible').eq(0)
                    .prev('#imjs-bar li.imjs-tab:hidden')
                    .filter(function() {
                        return $(this).data('state') != 'closed'
                    })
                    .not('.imjs-default').slice(-1).css('display', '');
                    
                if(hiddenTab.length) {
                    $('#imjs-bar li.imjs-tab:visible').slice(-1).css('display', 'none');
                    $(this).html(parseInt($(this).html()) - 1);
                    $('#imjs-scroll-left').html(parseInt($('#imjs-scroll-left').html()) + 1);
                }
                
                return false;
            });
            
            // Initialize the chatbox hash
            this.chats = {};
            
            // Try to resume any existing session
            this.resume();
            
            $(window).resize(function() {
                self.bar._scrollers();
            });
        } else
            return AjaxIM.init(options);
    };
    
    // We predefine all public functions here...
    // If they are called before everything (theme, storage engine) has loaded,
    // then they get put into a "prequeue" and run when everything *does*
    // finally load.
    //
    // This ensures that nothing loads without all of the principal components
    // being pre-loaded. If that were to occur (without this prequeue), things
    // would surely break.
    var prequeue = [];
    var empty = function() {
        var func = this;
        return function() { prequeue.push([func, arguments]) };
    };
    $.extend(AjaxIM.prototype, {
        settings: {},
        friends: {},
        chats: {},
        
        storage: empty.apply('storage'),
        login: empty.apply('login'),
        logout: empty.apply('logout'),
        resume: empty.apply('resume'),
        form: empty.apply('form'),
        poll: empty.apply('poll'),
        incoming: empty.apply('incoming'),
        send: empty.apply('send'),
        status: empty.apply('status'),
        statuses: {},
        bar: {
            initialize: empty.apply('bar.initialize'),
            activateTab: empty.apply('bar.activateTab'),
            closeTab: empty.apply('bar.closeTab'),
            addTab: empty.apply('bar.addTab'),
            notification: empty.apply('bar.notification'),
            _scrollers: empty.apply('bar._scrollers')
        }
    });
    
    setup = (function() {
    var self = this;
    if(!this.storageReady || !this.themeLoaded) return;
    
    $(self).trigger('loadComplete');
    $(window).resize();
    
    $.extend(AjaxIM.prototype, {        
        // == Cookies ==
        //
        // The "cookies" functions can be used to set, get, and erase JSON-based cookies.
        // These functions are primarily used to manage and read the server-set cookie
        // that handles the user's chat session ID.
        cookies: {
            // === {{{AjaxIM.}}}**{{{cookies.set(name, value, days)}}}** ===
            //
            // Sets a cookie, stringifying the JSON value upon storing it.
            //
            // ==== Parameters ====
            // * {{{name}}} is the cookie name.\\
            // * {{{value}}} is the cookie data that you would like to store.\\
            // * {{{days}}} is the number of days that the cookie will be stored for.
            set: function(name, value, days) {
                if (days) {
                    var date = new Date();
                    date.setTime(date.getTime() + (days * 24 * 60 * 60 * 1000));
                    var expires = "; expires=" + date.toGMTString();
                } else var expires = "";
                document.cookie = name + "=" + $.compactJSON(value) + expires + "; path=/";
            },
            
            // === {{{AjaxIM.}}}**{{{cookies.get(name)}}}** ===
            //
            // Gets a cookie, decoding the JSON value before returning the data.
            //
            // ==== Parameters ====
            // * {{{name}}} is the cookie name that you would like to retrieve.
            get: function(name) {
                var nameEQ = name + "=";
                var ca = document.cookie.split(';');
                for(var i = 0; i < ca.length; i++) {
                    var c = ca[i];
                    while (c.charAt(0) == ' ') c = c.substring(1, c.length);
                    if (c.indexOf(nameEQ) == 0) {
                      var cval = decodeURIComponent(c.substring(nameEQ.length, c.length));
                      return $.secureEvalJSON(cval);
                    }
                }
                return null;
            },
            
            // === {{{AjaxIM.}}}**{{{cookies.erase(name)}}}** ===
            //
            // Deletes a cookie.
            //
            // {{{name}}} is the existing cookie that you would like to delete.
            erase: function(name) {
                self.cookies.set(name, '', -1);
            }
        },

        // == Main ==
        
        // === {{{AjaxIM.}}}**{{{storage()}}}** ===
        //
        // Retrieves chat session data from whatever storage engine is enabled
        // (provided that one is enabled at all). If a page reloads, this function
        // is called to restore the user's chat state (existing conversations, active tab).
        // This function is called //automatically//, upon initialization of the IM engine.
        storage: function() {
            if(!self.storeKey.length) return;
            
            try {
                var chatstore = $.jStore.store(self.storeKey + 'chats') || {};
            } catch(e) {
                $.jStore.remove(self.storeKey + 'chats');
                var chatstore = {};
            }

            if(this.chatstore) {            
                $.each(this.chatstore, function(username, convo) {
                    if(username in chatstore)
                        chatstore[username] = $.merge(chatstore[username], self.chatstore[username]);
                    else
                        chatstore[username] = self.chatstore[username];
                });
                                
                this.chatstore = chatstore;
                $.jStore.store(self.storeKey + 'chats', chatstore);
            } else {
                this.chatstore = chatstore;
            }
            
            $.each(this.chatstore, function(username, convo) {
                if(!convo.length) return;
                
                var chatbox = self._createChatbox(username, true);
                chatbox.data('lastDateStamp', null).css('display', 'none');
                
                // Remove the automatic date stamp
                chatbox.find('.imjs-msglog').empty();
                
                // Restore all messages, date stamps, and errors
                $.each(convo, function() {
                    switch(this[0]) {
                        case 'error':
                            self._addError(chatbox, decodeURIComponent(this[2]), this[3]);
                        break;
                        
                        case 'datestamp':
                            self._addDateStamp(chatbox, this[3]);
                        break;
                        
                        case 'a':
                        case 'b':
                            self._addMessage(this[0], chatbox, this[1],
                                decodeURIComponent(this[2]), this[3]);
                        break;
                    }
                });
                
                $(self).trigger('chatRestored', [username, chatbox]);
            });
            
            var activeTab = $.jStore.store(self.storeKey + 'activeTab') || [];
            if(activeTab.length && (activeTab = activeTab[0]) && activeTab in this.chats) {
                this.chats[activeTab].data('tab').click();
                var msglog = this.chats[activeTab].find('.imjs-msglog');
                msglog[0].scrollTop = msglog[0].scrollHeight;
            }
        },
        
        // === {{{AjaxIM.}}}**{{{login(username, password)}}}** ===
        //
        // Authenticates a user and initializes the IM engine. If the user is
        // already logged in, [s]he is logged out, the session is cleared, and
        // the new user is logged in.
        //
        // Returns the user's properly formatted username, session ID, and online
        // friends in JSON, if successful; e.g.:\\
        // {{{ {u: 'username', s: 'longsessionid', f: [{u: 'friend', s: 1, g: 'group'}]} }}}
        //
        // If unsuccessful, {{{false}}} is returned.
        //
        // ==== Parameters ====
        // * {{{username}}} is the user's username.\\
        // * {{{password}}} is the user's password. This password will be MD5 hashed
        // before it is sent to the server.
        login: function(username, password) {
            if(!username) username = '';
            if(!password) password = '';
            
            if(this.username)
                return true; // Already logged in!
        
            // hash password before sending it to the server
            password = $.md5(password);

            // authenticate
            AjaxIM.request(
                this.actions.login,
                {'username': username, 'password': password},
                function(auth) {
                    if(auth.r == 'logged in') {
                        self.username = ('u' in auth ? auth.u : username);
                        
                        if(self.settings.storageMethod)
                            self.storeKey = [self.storageBrowserKey, self.username, ''].join('-');
                            
                        var existing = self.cookies.get(self.settings.cookieName);
                        self.storage();
                        
                        // Begin the session
                        $.each(auth.f, function() {
                            self.friends[this.u] = {status: [this.s, ''], group: this.g};
                        });
                        self._session(self.friends);
                        self._storeFriends();
                        
                        $(self).trigger('loginSuccessful', [auth]);
                        
                        return auth;
                    } else {
                        $(self).trigger('loginError', [auth]);
                    }
                    
                    return false;
                }
            );
        },
        
        // === {{{AjaxIM.}}}**{{{logout()}}}** ===
        //
        // Logs the user out and removes his/her session cookie. As well, it
        // will close all existing chat windows, clear the storage engine, and
        // remove the IM bar.
        logout: function() {
            AjaxIM.request(
                this.actions.logout,
                {},
                function(done) {
                    if(done) {
                        self.cookies.erase(self.settings.cookieName);
                        self._clearSession();
                        $(self).trigger('logoutSuccessful');
                        return true;
                    } else {
                        $(self).trigger('logoutError');
                        return false;
                    }
                }
            );
        },
        
        // === {{{AjaxIM.}}}**{{{resume()}}}** ===
        //
        // Resumes an existing session based on a session ID stored in the
        // server-set cookie. This function is called //automatically// upon IM
        // engine (re-)initialization, so the user does not need to re-login
        // should a session already exist.
        resume: function() {
            var session = this.cookies.get(this.settings.cookieName);
            
            if(session && session.sid) {
                this.username = session.user;
                
                this.storeKey = [this.storageBrowserKey, this.username, ''].join('-');
                
                var friends = $.jStore.store(this.storeKey + 'friends') || [];
                if(self.settings.checkResume) {
                    AjaxIM.request(
                        this.actions.resume,
                        {},
                        function(response) {
                            if(response.r == 'connected') {
                                self._session(friends);
                                self.storage();
                            } else {
                                var username = this.username;
                                self._clearSession();
                                $(self).trigger('sessionNotResumed', [username]);
                            }
                        }
                    );
                } else {
                    self._session(friends);
                    self.storage();
                }
            } else {
                $(self).trigger('noSession');
            }
        },
        
        // === //private// {{{AjaxIM.}}}**{{{_session(friends)}}}** ===
        //
        // Restores session data (username, friends) and begins polling the server.
        // Called only by {{{AjaxIM.resume()}}}.
        //
        // ==== Parameters ====
        // * {{{friends}}} is a list of "friend" objects, e.g.:\\
        // {{{[{u: 'friend', s: 1, g: 'group'}, ...]}}}
        // ** {{{u}}} being the friend's username.
        // ** {{{s}}} being one of the available status codes (see {{{AjaxIM.statuses}}}), depending on the friend's current status.
        // ** {{{g}}} being the group that the friend is in.
        _session: function(friends) {
            $('#imjs-friends-panel .imjs-header span').html(this.username);
            $('#imjs-friends').removeClass('imjs-not-connected');
            
            $.each(friends, function(friend, info) {
                self.addFriend.apply(self, [friend, info.status, info.group]);
            });
            self._storeFriends();
            
            $(self).trigger('sessionResumed', [this.username]);
            
            setTimeout(function() { self.poll(); }, 0);
        },
        
        // === //private// {{{AjaxIM.}}}**{{{_clearSession()}}}** ===
        //
        // Clears all session data from the last known user.
        _clearSession: function() {                    
            if(self.settings.storageMethod && self.storageReady) {
                $.jStore.remove(self.storeKey + 'chats');
                $.jStore.remove(self.storeKey + 'friends');
                $.jStore.remove(self.storeKey + 'activeTab');
            }
            
            self.chats = {};
            $('.imjs-tab').not('.imjs-tab.imjs-default').remove();
            
            self.cookies.erase('ajaxim_session');
            delete self.username;
        },
        
        // === {{{AjaxIM.}}}**{{{form(element)}}}** ===
        //
        // Loads a login and registration form into the specified element
        // or, if no element is supplied, to the location on the page from
        // which this function was called.
        form: function(element) {
            $(element).load(this.settings.theme + '/theme.html #imjs-lr', function() {
                $('#imjs-lr .error').hide();
                
                if(self.username) {
                    $('#imjs-register, #imjs-login fieldset').hide();
                    $('#imjs-logged-in')
                        .show()
                        .html($('#imjs-logged-in').html().replace('{username}', self.username));
                } else {
                    $('#imjs-logged-in').hide();
                }

                // Handle logout success                
                $(self).bind('logoutSuccessful', function() {
                    $('#imjs-login fieldset').slideDown();
                    $('#imjs-register').slideDown();
                    
                    $('#imjs-logged-in')
                        .html($('#imjs-logged-in strong').html('{username}'))
                        .slideUp();
                });
                $('#imjs-logged-in a').click(function() {
                    self.logout();
                    return false;
                });

                // Handle login error or success
                $(self).bind('loginError', function() {
                    $('#imjs-login .error').html(AjaxIM.i18n.authInvalid).slideDown('fast');
                    $('#imjs-login input')
                        .addClass('imjs-lr-error')
                        .blur(function() { $(this).removeClass('imjs-lr-error'); });
                }).bind('loginSuccessful', function() {
                    $('#imjs-login fieldset').slideUp();
                    $('#imjs-register').slideUp();
                    
                    $('#imjs-logged-in')
                        .html($('#imjs-logged-in').html().replace('{username}', self.username))
                        .slideDown();
                });
                var login = function() {
                    self.login($('#imjs-login-username').val(), $('#imjs-login-password').val());
                    return false;
                };
                $('#imjs-login').submit(login);
                $('#imjs-login-submit').click(login);
                
                var regIssues = false;
                var regError = function(error, fields) {
                    $('#imjs-register .error')
                        .append(AjaxIM.i18n['register' + error] + ' ')
                        .slideDown();
                    $(fields)
                        .addClass('imjs-lr-error')
                        .blur(function() { $(this).removeClass('imjs-lr-error'); });
                    regIssues = true;
                };
                
                var register = function() {
                    $('#imjs-register .error').empty();
                    
                    regIssues = false;
                    
                    var username = $('#imjs-register-username').val();
                    var password = $('#imjs-register-password').val();
                    
                    if(password.length < 4)
                        regError('PasswordLength', '#imjs-register-password');
                
                    if(password != $('#imjs-register-cpassword').val())
                        regError('PasswordMatch', '#imjs-register-password, #imjs-register-cpassword');
                    
                    if(username.length <= 2 ||
                        !$('#imjs-register-username').val().match(/^[A-Za-z0-9_.]+$/))
                        regError('UsernameLength', '#imjs-register-username');
                    
                    if(!regIssues) {
                        AjaxIM.request(
                            self.actions.register,
                            {username: username, password: password},
                            function(response) {
                                if(response.r == 'registered') {
                                    self.login(username, password);
                                } else if(response.r == 'error') {
                                    switch(response.e) {
                                        case 'unknown':
                                            regError('Unknown', '');
                                        break;
                                        
                                        case 'invalid password':
                                            regError('PasswordLength', '#imjs-register-password');
                                        break;
                                        
                                        case 'invalid username':
                                            regError('UsernameLength', '#imjs-register-username');
                                        break;
                                        
                                        case 'username taken':
                                            regError('UsernameTaken', '#imjs-register-username');
                                        break;
                                    }
                                }
                            },
                            function(error) {
                                regError('Unknown', '');
                            }
                        );
                    }
                    
                    return false;
                };
                $('#imjs-register').submit(register);
                $('#imjs-register-submit').click(register);
            });
        },
        
        // === {{{AjaxIM.}}}**{{{poll()}}}** ===
        //
        // Queries the server for new messages. If a 'long' or 'short' poll
        // type is used, jQuery's {{{$.post}}} or {{{$.getJSON}}} will be
        // used. If 'comet' is used, the server connection will be deferred
        // to the comet set of functions.
        poll: function() {
            if(/^(short|long)$/.test(this.settings.pollType)) {
                AjaxIM.request(
                    this.actions.poll,
                    {},
                    function(response) {
                        if(!response['e']) {
                            if(response.length)
                                self._parseMessages(response);
                                
                            setTimeout(function() { self.poll(); }, 0);                            
                        } else {
                            switch(response.e) {
                                case 'no session found':
                                    self._notConnected();
                                break;
                            }
                            
                            $(self).trigger('pollFailed', [response.e]);
                        }
                    },
                    function(error) {
                        self._notConnected();
                        $(self).trigger('pollFailed', ['not connected']);
                        // try reconnecting?
                    }
                );
            } else if(this.settings.pollType == 'comet') {
                this.comet.connect();
            }
        },
        
        // === //private// {{{AjaxIM.}}}**{{{_parseMessages(messages)}}}** ===
        //
        // Handles an incoming message array:\\
        // {{{[{t: 'type', s: 'sender', r: 'recipient', m: 'message'}, ...]}}}
        //
        // * {{{t}}} (message type) is one of:
        // ** {{{m}}} &mdash; a standard message
        // ** {{{s}}} &mdash; a user's status update
        // ** {{{b}}} &mdash; a broadcasted message (sent to many users simultaneously)
        // * {{{s}}} is the sender of the message.
        // * {{{r}}} is the intended recipient of the message. Most of the time, this will
        // simply be the logged in user, however, a broadcasted message may not specify
        // a recipient or may specify a different recipient. Also provides future
        // compatability for chatrooms.
        // * {{{m}}} is the actual message. For something such as a status update, this can
        // be a JSON object or parsable string; e.g. {{{"2:I'm away."}}}
        //
        // ==== Parameters ====
        // * {{{messages}}} is the message array
        _parseMessages: function(messages) {
            if($.isArray(messages)) {
                $.each(messages, function() {
                    $(self).trigger('parseMessage', [this]);
                    
                    switch(this.t) {
                        case 'm':
                            self.incoming(this.s, this.m);
                        break;
                        
                        case 's':
                            var status = this.m.split(':');
                            if(this['g'])
                                self.addFriend(this.s, status, this.g);
                            self._friendUpdate(this.s, status[0], status.slice(1).join(':'));
                            self._storeFriends();
                        break;
    
                        case 'b':
                        break;
                        
                        default:
                        break;
                    }
                });
            }
        },
        
        // === {{{AjaxIM.}}}**{{{incoming(from, message)}}}** ===
        //
        // Handles a new message from another user. If a chatbox for that
        // user does not yet exist, one is created. If it does exist, but
        // is minimized, the user is notified but the chatbox is not brought
        // to the front. This function also stores the message, if a storage
        // method is set.
        //
        // ==== Parameters ====
        // * {{{from}}} is the username of the sender.
        // * {{{message}}} is the body.
        incoming: function(from, message) {
            // check if IM exists, otherwise create new window
            // TODO: If friend is not on the buddylist,
            // should add them to a temp list?
            var chatbox = this._createChatbox(from);
            
            if(!$('#imjs-bar .imjs-selected').length) {
                chatbox.data('tab').click();
            } else if(chatbox.data('tab').data('state') != 'active') {
                this.bar.notification(chatbox.data('tab'));
            }
            
            var time = this._addMessage('b', chatbox, from, message);
            this._storeMessage('b', chatbox, from, message, time);
        },
        
        // === {{{AjaxIM.}}}**{{{addFriend(username, group)}}}** ===
        //
        // Inserts a new friend into the friends list. If the group specified
        // doesn't exist, it is created. If the friend is already in this group,
        // they aren't added again, however, the friend item is returned.
        //
        // ==== Parameters ====
        // * {{{username}}} is the username of the new friend.
        // * {{{status}}} is the current status of the friend.
        // * {{{group}}} is the user group to which the friend should be added.
        addFriend: function(username, status, group) {
            var status_name = 'available';
            $.each(this.statuses,
                function(key, val) { if(status[0] == val) { status_name = key; return false; } });

            var group_id = 'imjs-group-' + $.md5(group);
            
            if(!(group_item = $('#' + group_id)).length) {
                var group_item = $('.imjs-friend-group.imjs-default').clone()
                        .removeClass('imjs-default')
                        .attr('id', group_id)
                        .data('group', group)
                        .appendTo('#imjs-friends-list');
                        
                var group_header = group_item.find('.imjs-friend-group-header');
                group_header.html(group_header.html().replace('{group}', group));
            }
            
            var user_id = 'imjs-friend-' + $.md5(username + group);
            
            if(!$('#' + user_id).length) {
                var user_item = group_item.find('ul li.imjs-default').clone()
                        .removeClass('imjs-default')
                        .addClass('imjs-' + status_name)
                        .attr('id', user_id)
                        .data('friend', username)
                        .appendTo(group_item.find('ul'));
                if(status[0] == 0) user_item.hide();
                user_item.html(user_item.html().replace('{username}', username));
            }
                        
            this.friends[username] = {'status': status, group: group};
            
            this._updateFriendCount();
            
            return this.friends[username];
        },
        
        // === //private// {{{AjaxIM.}}}**{{{_updateFriendCount()}}}** ===
        //
        // Counts the number of online friends and updates the friends count
        // in the friend tab.
        _updateFriendCount: function() {
            var friendsLength = 0;
            for(var f in this.friends) {
                if(this.friends[f].status[0] != 0)
                    friendsLength++;
            }
            $('#imjs-friends .imjs-tab-text span span').html(friendsLength);
        },
        
        // === //private// {{{AjaxIM.}}}**{{{_storeFriends()}}}** ===
        //
        // If a storage method is enabled, the current state of the
        // user's friends list is stored.
        _storeFriends: function() {
            if(this.settings.storageMethod && this.storageReady)
                $.jStore.store(this.storeKey + 'friends', this.friends);
        },
        
        // === //private// {{{AjaxIM.}}}**{{{_createChatbox(username)}}}** ===
        //
        // Builds a chatbox based on the default chatbox HTML and CSS defined
        // in the current theme. Should a chatbox for this user already exist,
        // a new one is not created. Instead, it is either given focus (should
        // no other windows already have focus), or a notification is issued.
        //
        // As well, if the chatbox does not exist, an associated tab will be
        // created.
        //
        // ==== Parameters ====
        // * {{{username}}} is the name of the user for whom the chatbox is intended
        // for.
        // * {{{no_stamp}}} sets whther or not to add a date stamp to the chatbox
        // upon creation.
        //
        // //Note:// New chatboxes are given an automatically generated ID in the
        // format of {{{#imjs-[md5 of username]}}}.
        _createChatbox: function(username, no_stamp) {
            var chatbox_id = 'imjs-' + $.md5(username);
            if(!(chatbox = $('#' + chatbox_id)).size()) {
                // add a tab
                var tab = this.bar.addTab(username, '#' + chatbox_id);
                var chatbox = tab.find('.imjs-chatbox');
                chatbox.attr('id', chatbox_id);

                chatbox.data('tab', tab);
                
                // remove default items from the message log
                var message_log = chatbox.find('.imjs-msglog').empty();
                
                // setup the chatbox header
                var cb_header = chatbox.find('.imjs-header');
                cb_header.html(cb_header.html().replace('{username}', username));
                
                if(!no_stamp) {
                    // add a date stamp
                    var time = this._addDateStamp(chatbox);
                    this._storeNonMessage('datestamp', username, null, time);
                }
                
                // associate the username with the object and vice-versa
                this.chats[username] = chatbox;
                chatbox.data('username', username);
                
                // did this chatbox fall down?
                this.bar._scrollers();
                
                if(username in this.friends) {
                    status = this.friends[username].status;
                    var status_name = 'available';
                    $.each(this.statuses,
                        function(key, val) { if(status[0] == val) { status_name = key; return false; } });
                    tab.addClass('imjs-' + status_name);
                }
                
                // store inputbox height
                //var input = chatbox.find('.imjs-input');
                //input.data('height', input.height());
            } else if(chatbox.data('tab').data('state') == 'closed') {
                chatbox.find('.imjs-msglog > *').addClass('imjs-msg-old');
                
                var tab = chatbox.data('tab');
                if(tab.css('display') == 'none')
                    tab.css('display', '').removeClass('imjs-selected')
                        .appendTo('#imjs-bar');
                
                if(!no_stamp) {
                    // possibly add a date stamp
                    var time = this._addDateStamp(chatbox);
                    this._storeNonMessage('datestamp', username, null, time);
                }
                    
                if(!$('#imjs-bar .imjs-selected').length) {
                    tab.click();
                } else {
                    this.bar.notification(tab);
                }
            }
            
            return chatbox;
        },
        
        // === //private// {{{AjaxIM.}}}**{{{_addDateStamp(chatbox)}}}** //
        //
        // Adds a date/time notifier to a chatbox. These are generally
        // inserted upon creation of a chatbox, or upon the date changing
        // since the last time a date stamp was added. If a date stamp for
        // the current date already exists, a new one will not be added.
        //
        // ==== Parameters ====
        // * {{{chatbox}}} refers to the jQuery-selected chatbox DOM element.
        // * {{{time}}} is the date/time the date stamp will show. It is specified
        // in milliseconds since the Unix Epoch. This is //only// defined when
        // date stamps are being restored from storage; if not specified, the
        // current computer time will be used.
        _addDateStamp: function(chatbox, time) {
            var message_log = $(chatbox).find('.imjs-msglog');
            if(!time)
               time = (new Date()).getTime();
 
            var date_stamp = $('.imjs-tab.imjs-default .imjs-chatbox .imjs-msglog .imjs-date').clone();
            var date_stamp_time = date_stamp.find('.imjs-msg-time');
            if(date_stamp_time.length)
                date_stamp_time.html(AjaxIM.dateFormat(time, date_stamp_time.html()));
            
            var date_stamp_date = date_stamp.find('.imjs-date-date');
            var formatted_date = AjaxIM.dateFormat(time, date_stamp_date.html());
            if(chatbox.data('lastDateStamp') != formatted_date) {
                if(date_stamp_date.length)
                    date_stamp_date.html(AjaxIM.dateFormat(time, date_stamp_date.html()));
            
                chatbox.data('lastDateStamp', formatted_date);
                date_stamp.appendTo(message_log);
            } else {
                //$('<div></div>').appendTo(message_log);
            }
            
            return time;
        },
        
        // === //private// {{{AjaxIM.}}}**{{{_addError(chatbox, error)}}}** //
        //
        // Adds an error to a chatbox. These are generally inserted after
        // a user sends a message unsuccessfully. If an error message
        // was already added, another one will be added anyway.
        //
        // ==== Parameters ====
        // * {{{chatbox}}} refers to the jQuery-selected chatbox DOM element.
        // * {{{error}}} is the error message string.
        // * {{{time}}} is the date/time the error occurred. It is specified in
        // milliseconds since the Unix Epoch. This is //only// defined when
        // errors are being restored from storage; if not specified, the current
        // computer time will be used.
        _addError: function(chatbox, error, time) {
            var message_log = $(chatbox).find('.imjs-msglog');
 
            var error_item =
                $('.imjs-tab.imjs-default .imjs-chatbox .imjs-msglog .imjs-error').clone();
                
            var error_item_time = error_item.find('.imjs-msg-time');
            if(error_item_time.length) {
                if(!time)
                    time = (new Date()).getTime();
                error_item_time.html(AjaxIM.dateFormat(time, error_item_time.html()));
            }

            error_item.find('.imjs-error-error').html(error);
            error_item.appendTo(message_log);
            
            message_log[0].scrollTop = message_log[0].scrollHeight;
        },
        
        // === //private// {{{AjaxIM.}}}**{{{_addMessage(ab, chatbox, username, message, time)}}}** //
        //
        // Adds a message to a chatbox. Depending on the {{{ab}}} value,
        // the color of the username may change as a way of visually
        // identifying users (however, this depends on the theme's CSS).
        // A timestamp is added to the message, and the chatbox is scrolled
        // to the bottom, such that the new message is visible.
        //
        // Messages will be automatically tag-escaped, so as to prevent
        // any potential cross-site scripting problems. Additionally,
        // URLs will be automatically linked.
        //
        // ==== Parameters ====
        // * {{{ab}}} refers to whether the user is "a" or "b" in a conversation.
        // For the general case, "you" are "a" and "they" are "b".
        // * {{{chatbox}}} refers to the jQuery-selected chatbox DOM element.
        // * {{{username}}} is the username of the user who sent the message.
        // * {{{time}}} is the time the message was sent in milliseconds since
        // the Unix Epoch. This is //only// defined when messages are being 
        // restored from storage. For new messages, the current computer
        // time is automatically used.
        _addMessage: function(ab, chatbox, username, message, time) {
            var last_message = chatbox.find('.imjs-msglog > *:last-child');
            if(last_message.hasClass('imjs-msg-' + ab)) {
                // Last message was from the same person, so let's just add another imjs-msg-*-msg
                var message_container = (last_message.hasClass('imjs-msg-' + ab + '-container') ?
                    last_message :
                    last_message.find('.imjs-msg-' + ab + '-container'));
                    
                var single_message =
                    $('.imjs-tab.imjs-default .imjs-chatbox .imjs-msglog .imjs-msg-' + ab + '-msg')
                    .clone().appendTo(message_container);
                
                single_message.html(single_message.html().replace('{username}', username));
            } else if(!last_message.length || !last_message.hasClass('imjs-msg-' + ab)) {
                var message_group = $('.imjs-tab.imjs-default .imjs-chatbox .imjs-msg-' + ab)
                    .clone().appendTo(chatbox.find('.imjs-msglog'));
                message_group.html(message_group.html().replace('{username}', username));
                
                var single_message = message_group.find('.imjs-msg-' + ab + '-msg');
            }
            
            // clean up the message
            message = message.replace(/</g, '&lt;').replace(/>/g, '&gt;')
                        .replace(/(^|.*)\*([^*]+)\*(.*|$)/, '$1<strong>$2</strong>$3');
            
            // autolink URLs
            message = message.replace(
                new RegExp('([A-Za-z][A-Za-z0-9+.-]{1,120}:[A-Za-z0-9/]' +
                '(([A-Za-z0-9$_.+!*,;/?:@&~=-])|%[A-Fa-f0-9]{2}){1,333}' +
                '(#([a-zA-Z0-9][a-zA-Z0-9$_.+!*,;/?:@&~=%-]{0,1000}))?)', 'g'),
                '<a href="$1" target="_blank">$1</a>');
            
            // insert the message
            single_message.html(single_message.html().replace('{message}', message));
            
            // set the message time
            var msgtime = single_message.find('.imjs-msg-time');
            if(!time)
                time = new Date();
        
            if(typeof time != 'string')
                time = AjaxIM.dateFormat(time, msgtime.html());
            
            msgtime.html(time);
            
            var msglog = chatbox.find('.imjs-msglog');
            msglog[0].scrollTop = msglog[0].scrollHeight;
            
            return time;
        },
        
        // === //private// {{{AjaxIM.}}}**{{{_storeNonMessage(type, username, data, time)}}}** ===
        //
        // **Redundant?**\\
        // Similar to {{{AjaxIM._storeMessage}}}, but stores items that aren't messages,
        // such as datestamps and errors.
        //
        // ==== Parameters ====
        // * {{{type}}} is the type of non-message (error, datestamp).
        // * {{{username}}} is the username of the user being chatted with.
        // * {{{data}}} is the (optional) data of the non-message to be stored.
        // * {{{time}}} is the time of the message.
        _storeNonMessage: function(type, username, data, time) {
            // If storage is on & ready, store the non-message
            if(this.settings.storageMethod) {
                if(!this.chatstore) this.chatstore = {};                 
                if(!(username in this.chatstore)) this.chatstore[username] = [];
                
                // If the chat store gets too long, it becomes slow to load.
                if(this.chatstore[username].length > 300)
                    this.chatstore[username].shift();
                
                // For some reason, if we don't encode and decode the message, it *will* break
                // (at least) the Flash storage engine's retrieval. Gah!
                this.chatstore[username].push(
                    [type, username, encodeURIComponent(data), time]);
                
                if(this.storageReady) $.jStore.store(self.storeKey + 'chats', this.chatstore);
            }
        },
        
        // === //private// {{{AjaxIM.}}}**{{{_storeMessage(ab, chatbox, username, message, time)}}}** ===
        //
        // Taking the same arguments as {{{AjaxIM._addMessage}}}, {{{_storeMessage}}} pushes a message
        // into the storage hash, if storage is enabled.
        //
        // Messages are added to a message array, by username. The entire chat hash is stored as
        // a {{{'chats'}}} object in whatever storage engine is enabled.
        _storeMessage: function(ab, chatbox, username, message, time) {
            // If storage is on & ready, store the message
            if(this.settings.storageMethod) {
                if(!this.chatstore) this.chatstore = {}; 
                
                message = message.replace(/</g, '&lt;').replace(/>/g, '&gt;');
                
                if(!(username in this.chatstore)) {
                    this.chatstore[username] = [];
                } else if(this.chatstore[username].length > 300) {
                    // If the chat store gets too long, it becomes slow to load.
                    this.chatstore[username].shift();
                }
                
                // For some reason, if we don't encode and decode the message, it *will* break
                // (at least) the Flash storage engine's retrieval. Gah!
                this.chatstore[chatbox.data('username')].push(
                    [ab, username, encodeURIComponent(message), time]);
                
                if(this.storageReady) $.jStore.store(this.storeKey + 'chats', this.chatstore);
            }
        },
        
        // === //private// {{{AjaxIM.}}}**{{{_friendUpdate(friend, status, statusMessage)}}}** ===
        //
        // Called when a friend's status is updated. This function will update all locations
        // where a status icon is displayed (chat tab, friends list), as well as insert
        // a notification, should a chatbox be open.
        //
        // ==== Parameters ====
        // * {{{friend}}} is the username of the friend.
        // * {{{status}}} is the new status code. See {{{AjaxIM.statuses}}} for a list of available
        // codes. //Note: If an invalid status is specified, no action will be taken.//
        // * {{{statusMessage}}} is a message that was, optionally, specified by the user. It will be
        // used should "you" send the user an IM while they are away, or if their status is viewed
        // in another way (such as via the friends list [**not yet implemented**]).
        _friendUpdate: function(friend, status, statusMessage) {
            // add friend to buddylist, update their status, etc.           
            var status_name = 'available';
            $.each(this.statuses,
                function(key, val) { if(status == val) { status_name = key; return false; } });

            if(this.chats[friend]) {
                var tab = this.chats[friend].data('tab');
                var tab_class = 'imjs-tab';
                if(tab.data('state') == 'active') tab_class += ' imjs-selected';
                tab_class += ' imjs-' + status_name;
                
                tab.attr('class', tab_class);
                
                // display the status in the chatbox
                var date_stamp =
                    $('.imjs-tab.imjs-default .imjs-chatbox .imjs-msglog .imjs-date').clone();
                    
                var date_stamp_time = date_stamp.find('.imjs-msg-time');
                if(date_stamp_time.length)
                    date_stamp_time.html(AjaxIM.dateFormat(date_stamp_time.html()));
                
                var date_stamp_date = date_stamp.find('.imjs-date-date').html(
                    AjaxIM.i18n[
                        'chat' + status_name[0].toUpperCase() + status_name.slice(1)
                    ].replace(/%s/g, friend));
                
                var msglog = this.chats[friend].find('.imjs-msglog');
                date_stamp.appendTo(msglog);
                msglog[0].scrollTop = msglog[0].scrollHeight;
            }
            
            if(this.friends[friend]) {
                var friend_id = 'imjs-friend-' + $.md5(friend + this.friends[friend].group);
                $('#' + friend_id).attr('class', 'imjs-friend imjs-' + status_name);
                
                if(status == 0) {
                    $('#' + friend_id + ':visible').slideUp();
                    $('#' + friend_id + ':hidden').hide();
                } else if(!$('#' + friend_id + ':visible').length) {
                    $('#' + friend_id).slideDown();
                }
                
                this.friends[friend].status = [status, statusMessage];
                this._updateFriendCount();
            }
        },
        
        // === //private// {{{AjaxIM.}}}**{{{_notConnected()}}}** ===
        //
        // Puts the user into a visible state of disconnection. Sets the
        // friends list to "not connected" and empties it; disallows new messages
        // to be sent.
        _notConnected: function() {
            $('#imjs-friends').addClass('imjs-not-connected').unbind('click', this.activateTab);
        },
        
        // === {{{AjaxIM.}}}**{{{send(to, message)}}}** ===
        //
        // Sends a message to another user. The message will be added
        // to the chatbox before it is actually sent, however, if an
        // error occurs during sending, that will be indicated immediately
        // afterward.
        //
        // After sending the message, one of three status codes should be
        // returned as a JSON object, e.g. {{{{r: 'code'}}}}:
        // * {{{ok}}} &mdash; Message was sent successfully.
        // * {{{offline}}} &mdash; The user is offline or unavailable to
        // receive messages.
        // * {{{error}}} &mdash; a problem occurred, unrelated to the user
        // being unavailable.
        //
        // ==== Parameters ====
        // * {{{to}}} is the username of the recipient.
        // * {{{message}}} is the content to be sent.
        send: function(to, message) {         
            if(!message) return;
               
            if(this.chats[to]) { // REMOVE ME?
                // possibly add a datestamp
                var time = self._addDateStamp(this.chats[to]);
                this._storeNonMessage('datestamp', to, null, time);
                
                time = this._addMessage('a', this.chats[to], this.username, message);                
                this._storeMessage('a', this.chats[to], this.username, message, time);
            }
            
            $(self).trigger('sendingMessage', [to, message]);
            
            AjaxIM.request(
                this.actions.send,
                {'to': to, 'message': message},
                function(result) {
                    switch(result.r) {
                        case 'ok':
                            $(self).trigger('sendMessageSuccessful', [to, message]);
                        break;
                        
                        case 'offline':
                            $(self).trigger('sendMessageFailed', ['offline', to, message]);
                        break;
                        
                        case 'error':
                        default:
                            if(result.e == 'no session found') {
                                self._notConnected();
                                self._addError(self.chats[to], AjaxIM.i18n.notConnected);
                                self._storeNonMessage('error', to,
                                    AjaxIM.i18n.notConnected, (new Date()).getTime());
                            }
                            
                            $(self).trigger('sendMessageFailed', [result.e, to, message]);
                        break;
                    }
                },
                function(error) {
                    self._notConnected();
                    self._addError(self.chats[to], AjaxIM.i18n.notConnected);
                    self._storeNonMessage('error', to,
                        AjaxIM.i18n.notConnected, (new Date()).getTime());
                        
                    $(self).trigger('sendMessageFailed', ['not connected', to, message]);
                }
            );
        },
        
        // === {{{AjaxIM.}}}**{{{status(s, message)}}}** ===
        //
        // Sets the user's status and status message. It is possible to not
        // set a status message by setting it to an empty string. The status
        // will be sent to the server, where upon the server will broadcast
        // the update to all individuals with "you" on their friends list.
        //
        // ==== Parameters ====
        // * {{{s}}} is the status code, as defined by {{{AjaxIM.statuses}}}.
        // * {{{message}}} is the custom status message.
        status: function(s, message) {
            // update status icon(s)
            if(!this.statuses[s])
                return;
                
            $('#imjs-friends').attr('class', 'imjs-' + s);
            
            $(self).trigger('changingStatus', [s, message]);
            
            AjaxIM.request(
                this.actions.status,
                {'status': this.statuses[s], 'message': message},
                function(result) {
                    switch(result.r) {
                        case 'ok':
                            $(self).trigger('changeStatusSuccessful', [s, message]);
                        break;
                        
                        case 'error':
                        default:
                            $(self).trigger('changeStatusFailed', [result.e, s, message]);
                        break;
                    }
                },
                function(error) {
                    $(self).trigger('changeStatusFailed', ['not connected', s, message]);
                }
            );
        },
        
        // === {{{AjaxIM.}}}**{{{statuses}}}** ===
        //
        // These are the available status codes and their associated identities:
        // * {{{offline}}} (0) &mdash; Only used when signing out/when another
        // user has signed out, as once this status is set, the user is removed
        // from the server and friends will be unable to contact the user.
        // * {{{available}}} (1) &mdash; The user is online and ready to be messaged.
        // * {{{away}}} (2) &mdash; The user is online but is not available. Others
        // may still contact this user, however, the user may not respond. Anyone
        // contacting an away user will receive a notice stating that the user is away,
        // and (if one is set) their custom status message.
        // * {{{invisible}}} (3; **not yet implemented**) &mdash; The user is online,
        // but other users are made unaware, and the user will be represented
        // as being offline. It is still possible to contact this user, and for this
        // user to contact others; no status message or notice will be sent to others
        // messaging this user.
        statuses: {offline: 0, available: 1, away: 2, invisible: 3},
        
        // == Footer bar ==
        //
        // The footer bar is the bar that sits at the bottom of the page, in a fixed
        // position. It contains a tab for the friends list, and tabs for any open
        // chat boxes. It is also possible to add custom tabs for other functionality.
        bar: {
            // === {{{AjaxIM.}}}**{{{bar.initialize()}}}** ===
            //
            // Setup the footer bar and enable tab actions. This function
            // uses {{{jQuery.live}}} to set hooks on any bar tabs created
            // in the future.
            initialize: function() {
                // Set up your standard tab actions
                $('.imjs-tab')
                    .live('click', this.activateTab);
                    
                $('.imjs-tab .imjs-close')
                    .live('click', this.closeTab);
            
                // Set up the friends list actions
                var self = this;
                $(document).click(function(e) {
                    if(e.target.id == 'imjs-friends' ||
                        $(e.target).parents('#imjs-friends').length) {    
                        return;
                    }
                    
                    if($('#imjs-friends').data('state') == 'active')
                        self.activateTab.call($('#imjs-friends'));
                });
                $('#imjs-friends')
                    .data('state', 'minimized')
                    .click(function(e) {
                        if(!$(this).hasClass('imjs-not-connected') &&
                            e.target.id != 'imjs-friends-panel' &&
                            !$(e.target).parents('#imjs-friends-panel').length)
                            self.activateTab.call(this);
                    })
                    .mouseenter(function() {
                        if($(this).hasClass('imjs-not-connected')) {
                            $('.imjs-tooltip').css('display', 'block');
                            $('.imjs-tooltip p').html(AjaxIM.i18n.notConnectedTip);

                            var tip_left = $(this).offset().left -
                                $('.imjs-tooltip').outerWidth() +
                                ($(this).outerWidth() / 2);
                            var tip_top = $(this).offset().top -
                                $('.imjs-tooltip').outerHeight(true);

                            $('.imjs-tooltip').css({
                                    left: tip_left,
                                    top: tip_top
                                });
                        }
                    })
                    .mouseleave(function() {
                        if($(this).hasClass('imjs-not-connected')) {
                            $('.imjs-tooltip').css('display', '');
                        }
                    });
                $('#imjs-friends-panel')
                    .data('tab', $('#imjs-friends'))
                    .css('display', 'none');
            },
            
            // === {{{AjaxIM.}}}**{{{bar.activateTab()}}}** ===
            //
            // Activate a tab by setting it to the 'active' state and
            // showing any related chatbox. If a chatbox is available
            // for this tab, also focus the input box.
            //
            // //Note:// {{{this}}}, here, refers to the tab DOM element.
            activateTab: function() {
                var chatbox = $(this).find('.imjs-chatbox') || false;

                if($(this).data('state') != 'active') {
                    if($(this).attr('id') != 'imjs-friends') {
                        $('#imjs-bar > li')
                            .not($(this))
                            .not('#imjs-friends')
                            .removeClass('imjs-selected')
                            .each(function() {
                                if($(this).data('state') != 'closed') {
                                    $(this).data('state', 'minimized');
                                    var chatbox = $(this).find('.imjs-chatbox');
                                    if(chatbox.length)
                                        chatbox.css('display', 'none');
                                }
                            });
                    }
                    
                    if(chatbox && chatbox.css('display') == 'none')
                        chatbox.css('display', '');
                    
                    // set the tab to active...
                    var tab = $(this).addClass('imjs-selected').data('state', 'active');
                    
                    // ...and hide and reset the notification icon
                    tab.find('.imjs-notification').css('display', 'none')
                        .data('count', 0);
                    
                    if(self.settings.storageMethod && self.storageReady &&
                        chatbox && (username = chatbox.data('username'))) { 
                        $.jStore.store(self.storeKey + 'activeTab', [username]);
                    }
                    
                    $(self).trigger('tabToggled', ['activated', tab]);
                } else {
                    var tab = $(this).removeClass('imjs-selected').data('state', 'minimized');
                    
                    if(chatbox && chatbox.css('display') != 'none')
                        chatbox.css('display', 'none');
                    
                    if(self.settings.storageMethod && self.storageReady) { 
                        $.jStore.store(self.storeKey + 'activeTab', ['*']);
                    }
                    
                    $(self).trigger('tabToggled', ['minimized', tab]);
                }
                
                if(chatbox) {
                    if(!(input = chatbox.find('.imjs-input')).data('height')) {
                        // store the height for resizing later
                        input.data('height', input.height());
                    }
                    
                    try {
                        var msglog = chatbox.find('.imjs-msglog');
                        msglog[0].scrollTop = msglog[0].scrollHeight;
                    } catch(e) {}
                    
                    try { chatbox.find('.imjs-input').focus(); } catch(e) {}
                }
            },
            
            // === {{{AjaxIM.}}}**{{{bar.closeTab()}}}** ===
            //
            // Close a tab and hide any related chatbox, such that
            // the chatbox can not be reopened without reinitializing
            // the tab.
            //
            // //Note:// {{{this}}}, here, refers to the tab DOM element.
            closeTab: function() {
                var tab = $(this).parents('.imjs-tab');
                tab.css('display', 'none').data('state', 'closed');

                if(self.settings.storageMethod && self.storageReady) {
                    delete self.chatstore[tab.find('.imjs-chatbox').data('username')];
                    if(self.storageReady) $.jStore.store(self.storeKey + 'chats', self.chatstore);
                }

                $(self).trigger('tabToggled', ['closed', tab]);

                self.bar._scrollers();

                return false;
            },
            
            // === {{{AjaxIM.}}}**{{{bar.addTab(label, action, closable)}}}** ===
            //
            // Adds a tab to the tab bar, with the label {{{label}}}. When
            // clicked, it will call a callback function, {{{action}}}. If
            // {{{action}}} is a string, it is assumed that the string is
            // referring to a chatbox ID.
            //
            // ==== Parameters ====
            // * {{{label}}} is the text that will be displayed on the tab.\\
            // * {{{action}}} is the callback function, if it is a non-chatbox
            // tab, or a string if it //is// a chatbox tab.\\
            // * {{{closable}}} is a boolean value that determines whether or not
            // it is possible for a user to close this tab.
            //
            // //Note:// New tabs are given an automatically generated ID
            // in the format of {{{#imjs-tab-[md5 of label]}}}.
            addTab: function(label, action, closable) {
                var tab = $('.imjs-tab.imjs-default').clone().insertAfter('#imjs-scroll-right');
                tab.removeClass('imjs-default')
                    .attr('id', 'imjs-tab-' + $.md5(label))
                    .html(tab.html().replace('{label}', label))
                    .data('state', 'minimized');
                    
                var notification = tab.find('.imjs-notification');
                notification.css('display', 'none')
                    .data('count', 0)
                    .data('default-text', notification.html())
                    .html(notification.html().replace('{count}', '0'));
                
                if(closable === false)
                    tab.find('.imjs-close').eq(0).remove();
                
                if(typeof action == 'string') {
                    //tab.data('chatbox', action);
                } else {
                    tab.find('.imjs-chatbox').remove();
                    tab.click(action);
                }
                
                return tab;
            },
            
            // === {{{AjaxIM.}}}**{{{bar.notification(tab)}}}** ===
            //
            // Displays a notification on a tab. Generally, this is called when
            // a tab is minimized to let the user know that there is an update
            // for them. The way the notification is displayed depends on the
            // theme CSS.
            //
            // ==== Parameters ====
            // * {{{tab}}} is the jQuery-selected tab DOM element.
            notification: function(tab) {
                var notify = tab.find('.imjs-notification');
                var notify_count = notify.data('count') + 1;
                
                notify.data('count', notify_count)
                    .html(notify.data('default-text').replace('{count}', notify_count))
                    .css('display', '');
            },
            
            // === //private// {{{AjaxIM.}}}**{{{bar._scrollers()}}}** ===
            //
            // Document me!
            _scrollers: function() {
                var needScrollers = false;
                $('.imjs-tab').filter(function() {
                    return $(this).data('state') != 'closed'
                }).css('display', '');
                
                $.each(self.chats, function(username, chatbox) {
                    var tab = chatbox.data('tab');
                    if(tab.data('state') == 'closed') return true;
                    
                    if(tab.position().top > $('#imjs-bar').height()) {
                        $('.imjs-scroll').css('display', '');
                        tab.css('display', 'none');
                        needScrollers = true;
                    } else {
                        tab.css('display', '');
                    }
                });
                
                if(!needScrollers) {
                    $('.imjs-scroll').css('display', 'none');
                }
                
                if($('#imjs-scroll-left').css('display') != 'none' &&
                    $('#imjs-scroll-left').position().top > $('#imjs-bar').height()) {
                    $('#imjs-bar li.imjs-tab:visible').slice(-1).css('display', 'none');
                }
                
                var hiddenLeft = $('#imjs-bar li.imjs-tab:visible').slice(-1)
                    .nextAll('#imjs-bar li.imjs-tab:hidden')
                    .not('.imjs-default')
                    .filter(function() {
                        return $(this).data('state') != 'closed'
                    }).length;
                    
                var hiddenRight = $('#imjs-bar li.imjs-tab:visible').eq(0)
                    .prevAll('#imjs-bar li.imjs-tab:hidden')
                    .not('.imjs-default')
                    .filter(function() {
                        return $(this).data('state') != 'closed'
                    }).length;
                    
                $('#imjs-scroll-left').html(hiddenLeft);
                $('#imjs-scroll-right').html(hiddenRight);
            }
        },
        
        // == Comet ==
        //
        // Comet, or HTTP streaming, holds open a connection between the client and
        // the server indefinitely. As the server receives new messages or events,
        // they are passed down to the client in a {{{&lt;script&gt;}}}
        // tag which calls the {{{AjaxIM.incoming()}}} function. The connection is
        // opened using either an {{{iframe}}} (in Opera or Internet Explorer) or
        // an {{{XMLHTTPRequest}}} object. Due to the extra flexibility necessary
        // with the {{{XMLHTTPRequest}}} object, jQuery's {{{$.ajax}}} is not used.
        comet: {
            type: '',
            obj: null,
        
            onbeforeunload: null,
            onreadystatechange: null,
            
            iframe: function() {                
                if(/loaded|complete/i.test(this.obj.readyState))
                    throw new Error("IM server not available!");
            },

            // === {{{AjaxIM.}}}**{{{comet.connect()}}}** ===
            //
            // Creates and initializes the object and connection between the server
            // and the client. For Internet Explorer and Opera, we use an
            // {{{&lt;iframe&gt;}}} element; for all other browsers, we create an
            // {{{XMLHTTPRequest}}} object. The server connects to the URI defined
            // as the "poll" action. This function is called automatically, when
            // the IM engine is initialized and the {{{AjaxIM.poll()}}} function
            // is called.
            connect: function() {
                var self = _instance;
                
                if($.browser.opera || $.browser.msie) {
                    var iframe = $('<iframe></iframe>');
                    with(iframe) {
                        css({
                            position: 'absolute',
                            visibility: 'visible',
                            display: 'block',
                            left: '-10000px',
                            top: '-10000px',
                            width: '1px',
                            height: '1px'
                        });
                        
                        attr('src', self.actions.poll[1]);
                        appendTo('body');
                        
                        bind('readystatechange',
                            self.comet.onreadystatechange = function() { self.comet.iframe() });
                        bind('beforeunload',
                            self.comet.onbeforeunload = function() { self.comet.disconnect() });
                    }
                    
                    self.comet.type = 'iframe';
                    self.comet.obj = iframe;
                } else {
                    var xhr = new XMLHttpRequest;
                    var length = 1029;
                    var code = /^\s*<script[^>]*>parent\.(.+);<\/script><br\s*\/>$/;
                    
                    xhr.open('get', self.actions.poll[1], true);
                    xhr.onreadystatechange = function(){
                        if(xhr.readyState > 2) {
                            if(xhr.status == 200) {
                                responseText = xhr.responseText.substring(length);
                                length = xhr.responseText.length;
                                if(responseText != ' ') 
                                    eval(responseText.replace(code, "$1"));
                            }
                            // We need an "else" here. If the state changes to
                            // "loaded", the user needs to know they're
                            // disconnected.
                        }
                    };
                    
                    self.comet.type = 'xhr';
                    self.comet.obj = xhr;
                    
                    addEventListener('beforeunload',
                        self.comet.beforeunload = function() { self.comet.disconnect(); }, false);
                    setTimeout(function() { xhr.send(null) }, 10);
                }
            },

            // === {{{AjaxIM.}}}**{{{comet.disconnect()}}}** ===
            //
            // Disconnect from the server and destroy the connection object. This
            // function is called before the page unloads, so that we plug up and
            // potential leaks and free memory.
            disconnect: function() {
                var self = _instance.comet;
                
                if(!this.type || !this.obj)
                    return;
                
                if(this.type == 'iframe') {
                    detachEvent('onreadystatechange', this.onreadystatechange);
                    detachEvent('onbeforeunload', this.onbeforeunload);
                    this.obj.src = '.';
                    $(this.obj).remove();
                } else {
                    removeEventListener('beforeunload', this.onbeforeunload, false);
                    this.obj.onreadystatechange = function(){};
                    this.obj.abort();
                }
                
                delete this.obj;
            }
        }
    })
        
    self.bar.initialize();
    
    if(prequeue.length) {
        $.each(prequeue, function() {
            var func = this[0].split('.');
            if(func.length > 1)
                self[func[0]][func[1]].apply(self, this[1]);
            else
                self[func[0]].apply(self, this[1]);
        });
    }
    });
    
    // == Static functions and variables ==
    //
    // The following functions and variables are available outside of an initialized
    // {{{AjaxIM}}} object.
    
    // === {{{AjaxIM.}}}**{{{client}}}** ===
    //
    // Once {{{AjaxIM.init()}}} is called, this will be set to the active AjaxIM
    // object. Only one AjaxIM object instance can exist at a time. This variable
    // can and should be accessed directly.
    AjaxIM.client = null;
    
    // === {{{AjaxIM.}}}**{{{init(options, actions)}}}** ===
    //
    // Initialize the AjaxIM client object and engine. Here, you can define your
    // options and actions as outlined at the top of this documentation.
    //
    // ==== Parameters ====
    // * {{{options}}} is the hash of custom settings to initialize Ajax IM with.
    // * {{{actions}}} is the hash of any custom action URLs.
    AjaxIM.init = function(options, actions) {
        if(!_instance) {
            _instance = new AjaxIM(options, actions);
            AjaxIM.client = _instance;
        }
        
        return _instance;
    }
    
    
    // === {{{AjaxIM.}}}**{{{request(url, data, successFunc, failureFunc)}}}** ===
    //
    // Wrapper around {{{$.jsonp}}}, the JSON-P library for jQuery, and {{{$.ajax}}},
    // jQuery's ajax library. Allows either function to be called, automatically,
    // depending on the request's URL array (see {{{AjaxIM.actions}}}).
    //
    // ==== Parameters ====
    // {{{url}}} is the URL of the request.
    // {{{data}}} are any arguments that go along with the request.
    // {{{success}}} is a callback function called when a request has completed
    // without issue.
    // {{{_ignore_}}} is simply to provide compatability with {{{$.post}}}.
    // {{{failure}}} is a callback function called when a request hasn't not
    // completed successfully.
    AjaxIM.request = function(url, data, successFunc, failureFunc) {
        if(typeof failureFunc != 'function');
            failureFunc = function(){};

        $[url[0]]({
            'url': url[1],
            'data': data,
            dataType: (url[0] == 'ajax' ? 'json' : 'jsonp'),
            type: 'POST',
            cache: false,
            timeout: 60000,
            callback: 'jsonp' + (new Date()).getTime(),
            success: function(json, textStatus) {
                successFunc(json);
            },
            error: function(xOptions, error) {
                failureFunc(error);
            }
        });
        
        // This prevents Firefox from spinning indefinitely
        // while it waits for a response. Why? Fuck if I know.
        if(url[0] == 'jsonp' && $.browser.mozilla) {
            $.jsonp({
                'url': 'about:',
                timeout: 0
            });
        }
    };
    
    // === {{{AjaxIM.}}}**{{{incoming(data)}}}** ===
    //
    // Never call this directly. It is used as a connecting function between
    // client and server for Comet.
    //
    // //Note:// There are two {{{AjaxIM.incoming()}}} functions. This one is a
    // static function called outside of the initialized AjaxIM object; the other
    // is only called within the initalized AjaxIM object.
    AjaxIM.incoming = function(data) {
        if(!_instance)
            return false;
        
        if(data.length)
            _instance._parseMessages(data);
    }
    
    // === {{{AjaxIM.}}}**{{{loaded}}}** ===
    //
    // If Ajax IM has been loaded with the im.load.js file, this function will be
    // called when the library is finally loaded and ready for use. Similar to
    // jQuery's $(document).ready(), but for Ajax IM.
    AjaxIM.loaded = function() {
        if(typeof AjaxIMLoadedFunction == 'function') {
            AjaxIMLoadedFunction();
            delete AjaxIMLoadedFunction; // clean up the global namespace
        }
    };
    
    // === {{{AjaxIM.}}}**{{{dateFormat([date,] [mask,] utc)}}}** ===
    //
    // Date Format 1.2.3\\
    // &copy; 2007-2009 Steven Levithan ([[http://blog.stevenlevithan.com/archives/date-time-format|stevenlevithan.com]])\\
    // MIT license
    //
    // Includes enhancements by Scott Trenda
    // and Kris Kowal ([[http://cixar.com/~kris.kowal/|cixar.com/~kris.kowal/]])
    //
    // Accepts a date, a mask, or a date and a mask and returns a formatted version
    // of the given date.
    //
    // ==== Parameters ====
    // * {{{date}}} is a {{{Date()}}} object. If not specified, the date defaults to the
    // current date/time.
    // * {{{mask}}} is a string that defines the formatting of the date. Formatting
    // options can be found in the
    // [[http://blog.stevenlevithan.com/archives/date-time-format|Date Format]]
    // documentation. If not specified, the mask defaults to {{{dateFormat.masks.default}}}.
    
    AjaxIM.dateFormat = function () {
        var token = /d{1,4}|m{1,4}|yy(?:yy)?|([HhMsTt])\1?|[LloSZ]|"[^"]*"|'[^']*'/g,
            timezone = new RegExp('\b(?:[PMCEA][SDP]T|(?:Pacific|Mountain|Central|Eastern|Atlantic) ' +
                                  '(?:Standard|Daylight|Prevailing) Time|(?:GMT|UTC)(?:[-+]\d{4})?)\b',
                                  'g'),
            timezoneClip = /[^-+\dA-Z]/g,
            pad = function (val, len) {
                val = String(val);
                len = len || 2;
                while (val.length < len) val = "0" + val;
                return val;
            };
    
        // Regexes and supporting functions are cached through closure
        return function (date, mask, utc) {
            var dF = AjaxIM.dateFormat;
    
            // You can't provide utc if you skip other args (use the "UTC:" mask prefix)
            if (arguments.length == 1 && Object.prototype.toString.call(date) ==
                  "[object String]" && !/\d/.test(date)) {
                mask = date;
                date = undefined;
            }
    
            // Passing date through Date applies Date.parse, if necessary
            date = date ? new Date(date) : new Date;
            if (isNaN(date)) throw SyntaxError("invalid date");
    
            mask = String(dF.masks[mask] || mask || dF.masks["default"]);
    
            // Allow setting the utc argument via the mask
            if (mask.slice(0, 4) == "UTC:") {
                mask = mask.slice(4);
                utc = true;
            }
    
            var _ = utc ? "getUTC" : "get",
                d = date[_ + "Date"](),
                D = date[_ + "Day"](),
                m = date[_ + "Month"](),
                y = date[_ + "FullYear"](),
                H = date[_ + "Hours"](),
                M = date[_ + "Minutes"](),
                s = date[_ + "Seconds"](),
                L = date[_ + "Milliseconds"](),
                o = utc ? 0 : date.getTimezoneOffset(),
                flags = {
                    d:    d,
                    dd:   pad(d),
                    ddd:  AjaxIM.i18n.dayNames[D],
                    dddd: AjaxIM.i18n.dayNames[D + 7],
                    m:    m + 1,
                    mm:   pad(m + 1),
                    mmm:  AjaxIM.i18n.monthNames[m],
                    mmmm: AjaxIM.i18n.monthNames[m + 12],
                    yy:   String(y).slice(2),
                    yyyy: y,
                    h:    H % 12 || 12,
                    hh:   pad(H % 12 || 12),
                    H:    H,
                    HH:   pad(H),
                    M:    M,
                    MM:   pad(M),
                    s:    s,
                    ss:   pad(s),
                    l:    pad(L, 3),
                    L:    pad(L > 99 ? Math.round(L / 10) : L),
                    t:    H < 12 ? "a"  : "p",
                    tt:   H < 12 ? "am" : "pm",
                    T:    H < 12 ? "A"  : "P",
                    TT:   H < 12 ? "AM" : "PM",
                    Z:    utc ? "UTC" :
                            (String(date).match(timezone) || [""])
                            .pop().replace(timezoneClip, ""),
                    o:    (o > 0 ? "-" : "+") +
                            pad(Math.floor(Math.abs(o) / 60) * 100 + Math.abs(o) % 60, 4),
                    S:    ["th", "st", "nd", "rd"][d % 10 > 3 ?
                            0 :
                            (d % 100 - d % 10 != 10) * d % 10]
                };
    
            return mask.replace(token, function ($0) {
                return $0 in flags ? flags[$0] : $0.slice(1, $0.length - 1);
            });
        };
    }();
    
    // Some common format strings
    AjaxIM.dateFormat.masks = {
        "default":      "ddd mmm dd yyyy HH:MM:ss",
        shortDate:      "m/d/yy",
        mediumDate:     "mmm d, yyyy",
        longDate:       "mmmm d, yyyy",
        fullDate:       "dddd, mmmm d, yyyy",
        shortTime:      "h:MM TT",
        mediumTime:     "h:MM:ss TT",
        longTime:       "h:MM:ss TT Z",
        isoDate:        "yyyy-mm-dd",
        isoTime:        "HH:MM:ss",
        isoDateTime:    "yyyy-mm-dd'T'HH:MM:ss",
        isoUtcDateTime: "UTC:yyyy-mm-dd'T'HH:MM:ss'Z'"
    };

    // === {{{AjaxIM.}}}**{{{i18n}}}** ===
    //
    // Text strings used by Ajax IM. Should you want to translate Ajax IM into
    // another language, merely change these strings.
    // 
    // {{{%s}}} denotes text that will be automatically replaced when the string is
    // used.
    AjaxIM.i18n = {
        dayNames: [
            "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat",
            "Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"
        ],
        monthNames: [
            "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec",
            "January", "February", "March", "April", "May", "June", "July", "August", "September",
            "October", "November", "December"
        ],
        
        chatOffline: '%s signed off.',
        chatAvailable: '%s became available.',
        chatAway: '%s went away.',
        
        notConnected: 'You are currently not connected or the server is not available. ' +
                      'Please ensure that you are signed in and try again.',
        notConnectedTip: 'You are currently not connected.',
        
        authInvalid: 'Invalid username or password.',
        
        registerPasswordLength: 'Passwords must be more than 4 characters in length.',
        registerUsernameLength: 'Usernames must be more than 2 characters in length and ' +
                        ' contain only A-Z, a-z, 0-9, underscores (_) and periods (.).',
        registerPasswordMatch: 'Entered passwords do not match.',
        registerUsernameTaken: 'The chosen username is already in use; please choose another.',
        registerUnknown: 'An unknown error occurred. Please try again.'
    }
})(jQuery, false);
\ No newline at end of file
+// = im.js =
+//
+// **Copyright &copy; 2005 &ndash; 2010 Joshua Gross**\\
+// //MIT Licensed//
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//
+// This is the main library for Ajax IM. It encompasses the UI controls,
+// and connecting with the server. It does //not// handle registration or
+// account management.
+
+(function($, _instance) {
+    AjaxIM = function(options, actions) {
+        if(this instanceof AjaxIM) {
+            var self = this;
+            
+            // === {{{ defaults }}} ===
+            //
+            // These are the available settings for Ajax IM, and the associated
+            // defaults:
+            //
+            // * {{{pollType}}} determines the way in which the client will talk to
+            // the server.
+            // ** {{{comet}}} will use http streaming, wherein a connection to the server will be held open indefinitely, and the server will push down new events (messages, status updates) as they occur.
+            // ** {{{long}}} will hold open a connection with the server for as long as possible, or until a new event is received. Upon the server sending an event or closing the connection, the client will automatically&mdash;and immediately&mdash;reconnect.
+            // ** {{{short}}} will open a connection, and the server (if this method is supported) will //immediately// provide a response as to whether or not there are any new events. Once a response is received, the client will wait 5 seconds, and then reconnect.
+            // * {{{pollServer}}} is the default URL to which all actions refer. It is
+            // possible to specify certain action URLs separately (as is used with the
+            // NodeJS server).
+            // * {{{cookieName}}} is the name of the session cookie used by the server.
+            // If this is not set properly, the IM engine will not be able to automatically
+            // reinitialize sessions.
+            // * {{{theme}}} is the name of the theme folder that defines the HTML and
+            // CSS of the IM bar and chat boxes. Usually, themes are deposited in the
+            // provided "themes" folder and specified by that path, e.g. {{{themes/default}}}.
+            // Theme files within the theme folder must be named {{{theme.html}}} and
+            // {{{theme.css}}}.
+            // * {{{storageMethod}}} defines the way in which data (chat sessions) are
+            // temporarily stored client-side. By default, {{{"flash"}}} is used because
+            // it is the most widely supported method. However,
+            // [[http://eric.garside.name/docs.html?p=jstore#js-engines|other storage engines]]
+            // are available, with their respective up- and down-sides
+            // outlined, on the jStore website.
+            // * {{{storeSession}}} (**not implemented**) sets the number of days to
+            // retain stored chat session data before it should be deleted.
+            // * {{{checkResume}}} is a flag that sets whether or not the client should
+            // make a call to the server before resuming the session (such as on a page
+            // reload). This will ensure that the session has not expired. If set to {{{false}}},
+            // a call to the server will not be made, and the session will be assumed to
+            // be active.
+            var defaults = {
+                pollType: 'long',
+                pollServer: './ajaxim.php',
+                cookieName: 'ajaxim_session',
+                theme: 'themes/default',
+                storageMethod: 'auto',
+                flashStorage: 'js/jStore.Flash.html',
+                storeSession: 5, // number of days to store chat data (0 for current session only)
+                checkResume: true
+            };
+
+            // === {{{AjaxIM.}}}**{{{settings}}}** ===
+            //
+            // These are the settings for the IM. If particular options are not specified,
+            // the defaults (see above) will be used. //These options will be defined
+            // upon calling the initialization function, and not set directly.//
+            this.settings = $.extend(defaults, options);
+
+            // === {{{AjaxIM.}}}**{{{actions}}}** ===
+            //
+            // Each individual action that the IM engine can execute is predefined here.
+            // By default, it merely appends the action onto the end of the {{{pollServer}}} url,
+            // however, it is possible to define actions individually. //The alternative actions
+            // will be defined upon calling the initialization function, and not set directly.//
+            //
+            // Should you define an action at a different URL, Ajax IM will determine whether
+            // or not this URL is within the current domain. If it is within a subdomain of
+            // the current domain, it will set the document.domain variable for you,
+            // to match a broader hostname scope; the action will continue to use {{{$.post}}}
+            // (the default AJAX method for Ajax IM).
+            //
+            // On the other hand, should you choose a URL outside the current domain
+            // Ajax IM will switch to {{{$.getJSON}}} (a get request) to avoid
+            // cross-domain scripting issues. This means that a server on a different
+            // port or at a different address will need to be able to handle GET
+            // requests rather than POST requests (such as how the Node.JS Ajax IM
+            // server works).
+            this.actions = $.extend({
+                login: this.settings.pollServer + '/login',
+                logout: this.settings.pollServer + '/logout',
+                register: this.settings.pollServer + '/register',
+                poll: this.settings.pollServer + '/poll?method=' + this.settings.pollType,
+                send: this.settings.pollServer + '/send',
+                status: this.settings.pollServer + '/status',
+                resume: this.settings.pollServer + '/resume'
+            }, actions);
+
+            var httpRx = new RegExp('^http://', 'i'),
+                slashslashRx = new RegExp('^//', 'i'),
+                queryStrRx = new RegExp('[?](.+)$'),
+                subdomainRx = new RegExp('((http[s]?:)?//)?(.+?)[.]' + window.location.host, 'i');
+            $.each(this.actions, function(name, action) {
+                if(name == 'poll') {
+                    if(self.settings.pollType != 'comet')
+                        action += (queryStrRx.test(action[1]) ? '&' : '?') + 'callback=?';
+                        
+                    action = ['jsonp', action];
+                } else {
+                    action = ['ajax', action];
+                    if(subdomainRx.test(action[1])) {
+                        document.domain = '.' + window.location.host;
+                    } else if((http = httpRx.test(action[1])) || slashslashRx.test(action[1])) {
+                        if(!(new RegExp('//' + window.location.host + '/', 'i')).test(action[1])) {
+                            action[1] += (queryStrRx.test(action[1]) ? '&' : '?') + 'callback=?';
+                            action = ['jsonp', action[1]];
+                        }
+                    }
+                }
+                
+                self.actions[name] = action;
+            });
+            
+            // We load the theme dynamically based on the passed
+            // settings. If the theme is set to false, we assume
+            // that the user is going to load it himself.
+            this.themeLoaded = false;
+            if(this.settings.theme) {
+                $('<div></div>').appendTo('body').load(this.settings.theme + '/theme.html #imjs-bar, .imjs-tooltip',
+                    function() {
+                        self.themeLoaded = true;
+                        setup.apply(self);
+                    }
+                );
+                if(typeof document.createStyleSheet == 'function')
+                    document.createStyleSheet(this.settings.theme + '/theme.css');
+                else
+                    $('body').append('<link rel="stylesheet" href="' +
+                        this.settings.theme + '/theme.css" />');
+            } else {
+                this.themeLoaded = true;
+                setup.apply(this);
+            }
+            
+            // Client-side storage for keeping track of
+            // conversation states, active tabs, etc.
+            // The default is flash storage, however, other
+            // options are available via the jStore library.
+            if(this.settings.storageMethod) {
+                this.storageBrowserKey = 'unknown';
+                this.storeKey = '';
+                
+                $.each($.browser, function(k, v) {
+                    if(k == 'version') return true;
+                    else if(v == true) {
+                        self.storageBrowserKey = k;
+                        return false;
+                    }
+                });
+            
+                if(this.settings.storageMethod == 'auto') {
+                    $.each(['ie', 'html5', 'local', 'flash'], function() {
+                        if($.jStore.Availability[this]()) {
+                            self.settings.storageMethod = this;
+                            return false;
+                        }
+                    });
+                }
+            
+                $.extend($.jStore.defaults, {
+                    project: 'im.js',
+                    engine: this.settings.storageMethod,
+                    flash: this.settings.flashStorage
+                });
+                    
+                this.storageReady = false;
+                
+                if(this.settings.storageMethod == 'flash') {                    
+                    $.jStore.ready(function(engine) {
+                        $.jStore.flashReady(function() {
+                            self.storageReady = true;
+                            setup.apply(self);
+                        });
+                    })
+                } else {
+                    $.jStore.ready(function(engine) {
+                        self.storageReady = true;
+                        setup.apply(self);
+                    });
+                }
+                
+                $.jStore.load();
+            } else {
+                this.storageReady = true;
+                setup.apply(this);
+            }
+
+            // Allow a chatbox to me minimized
+            $('.imjs-chatbox').live('click', function(e) {
+                e.preventDefault();
+                return false;
+            });
+            
+            $('.imjs-chatbox .imjs-minimize').live('click', function() {
+                $(this).parents('.imjs-chatbox').data('tab').click();
+            });
+            
+            // Allow a chatbox to be closed
+            $('.imjs-chatbox .imjs-close').live('click', function() {
+                var chatbox = $(this).parents('.imjs-chatbox');
+                chatbox.data('tab')
+                    .data('state', 'closed').css('display', 'none');
+                    
+                if(self.settings.storageMethod && self.storageReady) {
+                    delete self.chatstore[chatbox.data('username')];
+                    if(self.storageReady) {
+                        $.jStore.store(
+                            self.storageBrowserKey + '-' +
+                            self.username + '-chats',
+                            self.chatstore);
+                    }
+                }
+            });
+            
+            // Setup message sending for all chatboxes
+            $('.imjs-chatbox .imjs-input').live('keydown', function(event) {               
+                var obj = $(this);
+                if(event.keyCode == 13 && !($.browser.msie && $.browser.version < 8)) {
+                    self.send(obj.parents('.imjs-chatbox').data('username'), obj.val());
+                }
+            }).live('keyup', function(event) {
+                if(event.keyCode == 13) {
+                    if($.browser.msie && $.browser.version < 8) {
+                        var obj = $(this);
+                        self.send(obj.parents('.imjs-chatbox').data('username'), obj.val());
+                    }
+
+                    var obj = $(this);
+                    obj.val('');
+                    obj.height(obj.data('height'));
+                }
+            }).live('keypress', function(e) {
+                var obj = $(this);
+                if(!($.browser.msie && $.browser.opera)) obj.height(0);
+                if(this.scrollHeight > obj.height() || this.scrollHeight < obj.height()) {
+                    obj.height(this.scrollHeight);
+                }
+            });
+            
+            $('.imjs-msglog').live('click', function() {
+                var chatbox = $(this).parents('.imjs-chatbox');
+                chatbox.find('.imjs-input').focus();
+            });
+            
+            // Create a chatbox when a buddylist item is clicked
+            $('.imjs-friend').live('click', function() {
+                var chatbox = self._createChatbox($(this).data('friend'));
+                
+                if(chatbox.data('tab').data('state') != 'active')
+                    chatbox.data('tab').click();
+                    
+                chatbox.find('.imjs-input').focus();
+            });
+            
+            // Setup and hide the scrollers
+            $('.imjs-scroll').css('display', 'none');
+            $('#imjs-scroll-left').live('click', function() {
+                var hiddenTab = $('#imjs-bar li.imjs-tab:visible').slice(-1)
+                    .next('#imjs-bar li.imjs-tab:hidden')
+                    .filter(function() {
+                        return $(this).data('state') != 'closed'
+                    })
+                    .not('.imjs-default').slice(-1).css('display', '');
+                    
+                if(hiddenTab.length) {
+                    $('#imjs-bar li.imjs-tab:visible').eq(0).css('display', 'none');
+                    $(this).html(parseInt($(this).html()) - 1);
+                    $('#imjs-scroll-right').html(parseInt($('#imjs-scroll-right').html()) + 1);
+                }
+
+                return false;
+            });
+            $('#imjs-scroll-right').live('click', function() {
+                var hiddenTab = $('#imjs-bar li.imjs-tab:visible').eq(0)
+                    .prev('#imjs-bar li.imjs-tab:hidden')
+                    .filter(function() {
+                        return $(this).data('state') != 'closed'
+                    })
+                    .not('.imjs-default').slice(-1).css('display', '');
+                    
+                if(hiddenTab.length) {
+                    $('#imjs-bar li.imjs-tab:visible').slice(-1).css('display', 'none');
+                    $(this).html(parseInt($(this).html()) - 1);
+                    $('#imjs-scroll-left').html(parseInt($('#imjs-scroll-left').html()) + 1);
+                }
+                
+                return false;
+            });
+            
+            // Initialize the chatbox hash
+            this.chats = {};
+            
+            // Try to resume any existing session
+            this.resume();
+            
+            $(window).resize(function() {
+                self.bar._scrollers();
+            });
+        } else
+            return AjaxIM.init(options);
+    };
+    
+    // We predefine all public functions here...
+    // If they are called before everything (theme, storage engine) has loaded,
+    // then they get put into a "prequeue" and run when everything *does*
+    // finally load.
+    //
+    // This ensures that nothing loads without all of the principal components
+    // being pre-loaded. If that were to occur (without this prequeue), things
+    // would surely break.
+    var prequeue = [];
+    var empty = function() {
+        var func = this;
+        return function() { prequeue.push([func, arguments]) };
+    };
+    $.extend(AjaxIM.prototype, {
+        settings: {},
+        friends: {},
+        chats: {},
+        
+        storage: empty.apply('storage'),
+        login: empty.apply('login'),
+        logout: empty.apply('logout'),
+        resume: empty.apply('resume'),
+        form: empty.apply('form'),
+        poll: empty.apply('poll'),
+        incoming: empty.apply('incoming'),
+        send: empty.apply('send'),
+        status: empty.apply('status'),
+        statuses: {},
+        bar: {
+            initialize: empty.apply('bar.initialize'),
+            activateTab: empty.apply('bar.activateTab'),
+            closeTab: empty.apply('bar.closeTab'),
+            addTab: empty.apply('bar.addTab'),
+            notification: empty.apply('bar.notification'),
+            _scrollers: empty.apply('bar._scrollers')
+        }
+    });
+    
+    setup = (function() {
+    var self = this;
+    if(!this.storageReady || !this.themeLoaded) return;
+    
+    $(self).trigger('loadComplete');
+    $(window).resize();
+    
+    $.extend(AjaxIM.prototype, {        
+        // == Cookies ==
+        //
+        // The "cookies" functions can be used to set, get, and erase JSON-based cookies.
+        // These functions are primarily used to manage and read the server-set cookie
+        // that handles the user's chat session ID.
+        cookies: {
+            // === {{{AjaxIM.}}}**{{{cookies.set(name, value, days)}}}** ===
+            //
+            // Sets a cookie, stringifying the JSON value upon storing it.
+            //
+            // ==== Parameters ====
+            // * {{{name}}} is the cookie name.\\
+            // * {{{value}}} is the cookie data that you would like to store.\\
+            // * {{{days}}} is the number of days that the cookie will be stored for.
+            set: function(name, value, days) {
+                if (days) {
+                    var date = new Date();
+                    date.setTime(date.getTime() + (days * 24 * 60 * 60 * 1000));
+                    var expires = "; expires=" + date.toGMTString();
+                } else var expires = "";
+                document.cookie = name + "=" + $.compactJSON(value) + expires + "; path=/";
+            },
+            
+            // === {{{AjaxIM.}}}**{{{cookies.get(name)}}}** ===
+            //
+            // Gets a cookie, decoding the JSON value before returning the data.
+            //
+            // ==== Parameters ====
+            // * {{{name}}} is the cookie name that you would like to retrieve.
+            get: function(name) {
+                var nameEQ = name + "=";
+                var ca = document.cookie.split(';');
+                for(var i = 0; i < ca.length; i++) {
+                    var c = ca[i];
+                    while (c.charAt(0) == ' ') c = c.substring(1, c.length);
+                    if (c.indexOf(nameEQ) == 0) {
+                      var cval = decodeURIComponent(c.substring(nameEQ.length, c.length));
+                      return $.secureEvalJSON(cval);
+                    }
+                }
+                return null;
+            },
+            
+            // === {{{AjaxIM.}}}**{{{cookies.erase(name)}}}** ===
+            //
+            // Deletes a cookie.
+            //
+            // {{{name}}} is the existing cookie that you would like to delete.
+            erase: function(name) {
+                self.cookies.set(name, '', -1);
+            }
+        },
+
+        // == Main ==
+        
+        // === {{{AjaxIM.}}}**{{{storage()}}}** ===
+        //
+        // Retrieves chat session data from whatever storage engine is enabled
+        // (provided that one is enabled at all). If a page reloads, this function
+        // is called to restore the user's chat state (existing conversations, active tab).
+        // This function is called //automatically//, upon initialization of the IM engine.
+        storage: function() {
+            if(!self.storeKey.length) return;
+            
+            try {
+                var chatstore = $.jStore.store(self.storeKey + 'chats') || {};
+            } catch(e) {
+                $.jStore.remove(self.storeKey + 'chats');
+                var chatstore = {};
+            }
+
+            if(this.chatstore) {            
+                $.each(this.chatstore, function(username, convo) {
+                    if(username in chatstore)
+                        chatstore[username] = $.merge(chatstore[username], self.chatstore[username]);
+                    else
+                        chatstore[username] = self.chatstore[username];
+                });
+                                
+                this.chatstore = chatstore;
+                $.jStore.store(self.storeKey + 'chats', chatstore);
+            } else {
+                this.chatstore = chatstore;
+            }
+            
+            $.each(this.chatstore, function(username, convo) {
+                if(!convo.length) return;
+                
+                var chatbox = self._createChatbox(username, true);
+                chatbox.data('lastDateStamp', null).css('display', 'none');
+                
+                // Remove the automatic date stamp
+                chatbox.find('.imjs-msglog').empty();
+                
+                // Restore all messages, date stamps, and errors
+                $.each(convo, function() {
+                    switch(this[0]) {
+                        case 'error':
+                            self._addError(chatbox, decodeURIComponent(this[2]), this[3]);
+                        break;
+                        
+                        case 'datestamp':
+                            self._addDateStamp(chatbox, this[3]);
+                        break;
+                        
+                        case 'a':
+                        case 'b':
+                            self._addMessage(this[0], chatbox, this[1],
+                                decodeURIComponent(this[2]), this[3]);
+                        break;
+                    }
+                });
+                
+                $(self).trigger('chatRestored', [username, chatbox]);
+            });
+            
+            var activeTab = $.jStore.store(self.storeKey + 'activeTab') || [];
+            if(activeTab.length && (activeTab = activeTab[0]) && activeTab in this.chats) {
+                this.chats[activeTab].data('tab').click();
+                var msglog = this.chats[activeTab].find('.imjs-msglog');
+                msglog[0].scrollTop = msglog[0].scrollHeight;
+            }
+        },
+        
+        // === {{{AjaxIM.}}}**{{{login(username, password)}}}** ===
+        //
+        // Authenticates a user and initializes the IM engine. If the user is
+        // already logged in, [s]he is logged out, the session is cleared, and
+        // the new user is logged in.
+        //
+        // Returns the user's properly formatted username, session ID, and online
+        // friends in JSON, if successful; e.g.:\\
+        // {{{ {u: 'username', s: 'longsessionid', f: [{u: 'friend', s: 1, g: 'group'}]} }}}
+        //
+        // If unsuccessful, {{{false}}} is returned.
+        //
+        // ==== Parameters ====
+        // * {{{username}}} is the user's username.\\
+        // * {{{password}}} is the user's password. This password will be MD5 hashed
+        // before it is sent to the server.
+        login: function(username, password) {
+            if(!username) username = '';
+            if(!password) password = '';
+            
+            if(this.username)
+                return true; // Already logged in!
+        
+            // hash password before sending it to the server
+            password = $.md5(password);
+
+            // authenticate
+            AjaxIM.request(
+                this.actions.login,
+                {'username': username, 'password': password},
+                function(auth) {
+                    if(auth.r == 'logged in') {
+                        self.username = ('u' in auth ? auth.u : username);
+                        
+                        if(self.settings.storageMethod)
+                            self.storeKey = [self.storageBrowserKey, self.username, ''].join('-');
+                            
+                        var existing = self.cookies.get(self.settings.cookieName);
+                        self.storage();
+                        
+                        // Begin the session
+                        $.each(auth.f, function() {
+                            self.friends[this.u] = {status: [this.s, ''], group: this.g};
+                        });
+                        self._session(self.friends);
+                        self._storeFriends();
+                        
+                        $(self).trigger('loginSuccessful', [auth]);
+                        
+                        return auth;
+                    } else {
+                        $(self).trigger('loginError', [auth]);
+                    }
+                    
+                    return false;
+                }
+            );
+        },
+        
+        // === {{{AjaxIM.}}}**{{{logout()}}}** ===
+        //
+        // Logs the user out and removes his/her session cookie. As well, it
+        // will close all existing chat windows, clear the storage engine, and
+        // remove the IM bar.
+        logout: function() {
+            AjaxIM.request(
+                this.actions.logout,
+                {},
+                function(done) {
+                    if(done) {
+                        self.cookies.erase(self.settings.cookieName);
+                        self._clearSession();
+                        $(self).trigger('logoutSuccessful');
+                        return true;
+                    } else {
+                        $(self).trigger('logoutError');
+                        return false;
+                    }
+                }
+            );
+        },
+        
+        // === {{{AjaxIM.}}}**{{{resume()}}}** ===
+        //
+        // Resumes an existing session based on a session ID stored in the
+        // server-set cookie. This function is called //automatically// upon IM
+        // engine (re-)initialization, so the user does not need to re-login
+        // should a session already exist.
+        resume: function() {
+            var session = this.cookies.get(this.settings.cookieName);
+            
+            if(session && session.sid) {
+                this.username = session.user;
+                
+                this.storeKey = [this.storageBrowserKey, this.username, ''].join('-');
+                
+                var friends = $.jStore.store(this.storeKey + 'friends') || [];
+                if(self.settings.checkResume) {
+                    AjaxIM.request(
+                        this.actions.resume,
+                        {},
+                        function(response) {
+                            if(response.r == 'connected') {
+                                self._session(friends);
+                                self.storage();
+                            } else {
+                                var username = this.username;
+                                self._clearSession();
+                                $(self).trigger('sessionNotResumed', [username]);
+                            }
+                        }
+                    );
+                } else {
+                    self._session(friends);
+                    self.storage();
+                }
+            } else {
+                $(self).trigger('noSession');
+            }
+        },
+        
+        // === //private// {{{AjaxIM.}}}**{{{_session(friends)}}}** ===
+        //
+        // Restores session data (username, friends) and begins polling the server.
+        // Called only by {{{AjaxIM.resume()}}}.
+        //
+        // ==== Parameters ====
+        // * {{{friends}}} is a list of "friend" objects, e.g.:\\
+        // {{{[{u: 'friend', s: 1, g: 'group'}, ...]}}}
+        // ** {{{u}}} being the friend's username.
+        // ** {{{s}}} being one of the available status codes (see {{{AjaxIM.statuses}}}), depending on the friend's current status.
+        // ** {{{g}}} being the group that the friend is in.
+        _session: function(friends) {
+            $('#imjs-friends-panel .imjs-header span').html(this.username);
+            $('#imjs-friends').removeClass('imjs-not-connected');
+            
+            $.each(friends, function(friend, info) {
+                self.addFriend.apply(self, [friend, info.status, info.group]);
+            });
+            self._storeFriends();
+            
+            $(self).trigger('sessionResumed', [this.username]);
+            
+            setTimeout(function() { self.poll(); }, 0);
+        },
+        
+        // === //private// {{{AjaxIM.}}}**{{{_clearSession()}}}** ===
+        //
+        // Clears all session data from the last known user.
+        _clearSession: function() {                    
+            if(self.settings.storageMethod && self.storageReady) {
+                $.jStore.remove(self.storeKey + 'chats');
+                $.jStore.remove(self.storeKey + 'friends');
+                $.jStore.remove(self.storeKey + 'activeTab');
+            }
+            
+            self.chats = {};
+            $('.imjs-tab').not('.imjs-tab.imjs-default').remove();
+            
+            self.cookies.erase('ajaxim_session');
+            delete self.username;
+        },
+        
+        // === {{{AjaxIM.}}}**{{{form(element)}}}** ===
+        //
+        // Loads a login and registration form into the specified element
+        // or, if no element is supplied, to the location on the page from
+        // which this function was called.
+        form: function(element) {
+            $(element).load(this.settings.theme + '/theme.html #imjs-lr', function() {
+                $('#imjs-lr .error').hide();
+                
+                if(self.username) {
+                    $('#imjs-register, #imjs-login fieldset').hide();
+                    $('#imjs-logged-in')
+                        .show()
+                        .html($('#imjs-logged-in').html().replace('{username}', self.username));
+                } else {
+                    $('#imjs-logged-in').hide();
+                }
+
+                // Handle logout success                
+                $(self).bind('logoutSuccessful', function() {
+                    $('#imjs-login fieldset').slideDown();
+                    $('#imjs-register').slideDown();
+                    
+                    $('#imjs-logged-in')
+                        .html($('#imjs-logged-in strong').html('{username}'))
+                        .slideUp();
+                });
+                $('#imjs-logged-in a').click(function() {
+                    self.logout();
+                    return false;
+                });
+
+                // Handle login error or success
+                $(self).bind('loginError', function() {
+                    $('#imjs-login .error').html(AjaxIM.i18n.authInvalid).slideDown('fast');
+                    $('#imjs-login input')
+                        .addClass('imjs-lr-error')
+                        .blur(function() { $(this).removeClass('imjs-lr-error'); });
+                }).bind('loginSuccessful', function() {
+                    $('#imjs-login fieldset').slideUp();
+                    $('#imjs-register').slideUp();
+                    
+                    $('#imjs-logged-in')
+                        .html($('#imjs-logged-in').html().replace('{username}', self.username))
+                        .slideDown();
+                });
+                var login = function() {
+                    self.login($('#imjs-login-username').val(), $('#imjs-login-password').val());
+                    return false;
+                };
+                $('#imjs-login').submit(login);
+                $('#imjs-login-submit').click(login);
+                
+                var regIssues = false;
+                var regError = function(error, fields) {
+                    $('#imjs-register .error')
+                        .append(AjaxIM.i18n['register' + error] + ' ')
+                        .slideDown();
+                    $(fields)
+                        .addClass('imjs-lr-error')
+                        .blur(function() { $(this).removeClass('imjs-lr-error'); });
+                    regIssues = true;
+                };
+                
+                var register = function() {
+                    $('#imjs-register .error').empty();
+                    
+                    regIssues = false;
+                    
+                    var username = $('#imjs-register-username').val();
+                    var password = $('#imjs-register-password').val();
+                    
+                    if(password.length < 4)
+                        regError('PasswordLength', '#imjs-register-password');
+                
+                    if(password != $('#imjs-register-cpassword').val())
+                        regError('PasswordMatch', '#imjs-register-password, #imjs-register-cpassword');
+                    
+                    if(username.length <= 2 ||
+                        !$('#imjs-register-username').val().match(/^[A-Za-z0-9_.]+$/))
+                        regError('UsernameLength', '#imjs-register-username');
+                    
+                    if(!regIssues) {
+                        AjaxIM.request(
+                            self.actions.register,
+                            {username: username, password: password},
+                            function(response) {
+                                if(response.r == 'registered') {
+                                    self.login(username, password);
+                                } else if(response.r == 'error') {
+                                    switch(response.e) {
+                                        case 'unknown':
+                                            regError('Unknown', '');
+                                        break;
+                                        
+                                        case 'invalid password':
+                                            regError('PasswordLength', '#imjs-register-password');
+                                        break;
+                                        
+                                        case 'invalid username':
+                                            regError('UsernameLength', '#imjs-register-username');
+                                        break;
+                                        
+                                        case 'username taken':
+                                            regError('UsernameTaken', '#imjs-register-username');
+                                        break;
+                                    }
+                                }
+                            },
+                            function(error) {
+                                regError('Unknown', '');
+                            }
+                        );
+                    }
+                    
+                    return false;
+                };
+                $('#imjs-register').submit(register);
+                $('#imjs-register-submit').click(register);
+            });
+        },
+        
+        // === {{{AjaxIM.}}}**{{{poll()}}}** ===
+        //
+        // Queries the server for new messages. If a 'long' or 'short' poll
+        // type is used, jQuery's {{{$.post}}} or {{{$.getJSON}}} will be
+        // used. If 'comet' is used, the server connection will be deferred
+        // to the comet set of functions.
+        poll: function() {
+            if(/^(short|long)$/.test(this.settings.pollType)) {
+                AjaxIM.request(
+                    this.actions.poll,
+                    {},
+                    function(response) {
+                        if(!response['e']) {
+                            if(response.length)
+                                self._parseMessages(response);
+                                
+                            setTimeout(function() { self.poll(); }, 0);                            
+                        } else {
+                            switch(response.e) {
+                                case 'no session found':
+                                    self._notConnected();
+                                break;
+                            }
+                            
+                            $(self).trigger('pollFailed', [response.e]);
+                        }
+                    },
+                    function(error) {
+                        self._notConnected();
+                        $(self).trigger('pollFailed', ['not connected']);
+                        // try reconnecting?
+                    }
+                );
+            } else if(this.settings.pollType == 'comet') {
+                this.comet.connect();
+            }
+        },
+        
+        // === //private// {{{AjaxIM.}}}**{{{_parseMessages(messages)}}}** ===
+        //
+        // Handles an incoming message array:\\
+        // {{{[{t: 'type', s: 'sender', r: 'recipient', m: 'message'}, ...]}}}
+        //
+        // * {{{t}}} (message type) is one of:
+        // ** {{{m}}} &mdash; a standard message
+        // ** {{{s}}} &mdash; a user's status update
+        // ** {{{b}}} &mdash; a broadcasted message (sent to many users simultaneously)
+        // * {{{s}}} is the sender of the message.
+        // * {{{r}}} is the intended recipient of the message. Most of the time, this will
+        // simply be the logged in user, however, a broadcasted message may not specify
+        // a recipient or may specify a different recipient. Also provides future
+        // compatability for chatrooms.
+        // * {{{m}}} is the actual message. For something such as a status update, this can
+        // be a JSON object or parsable string; e.g. {{{"2:I'm away."}}}
+        //
+        // ==== Parameters ====
+        // * {{{messages}}} is the message array
+        _parseMessages: function(messages) {
+            if($.isArray(messages)) {
+                $.each(messages, function() {
+                    $(self).trigger('parseMessage', [this]);
+                    
+                    switch(this.t) {
+                        case 'm':
+                            self.incoming(this.s, this.m);
+                        break;
+                        
+                        case 's':
+                            var status = this.m.split(':');
+                            if(this['g'])
+                                self.addFriend(this.s, status, this.g);
+                            self._friendUpdate(this.s, status[0], status.slice(1).join(':'));
+                            self._storeFriends();
+                        break;
+    
+                        case 'b':
+                        break;
+                        
+                        default:
+                        break;
+                    }
+                });
+            }
+        },
+        
+        // === {{{AjaxIM.}}}**{{{incoming(from, message)}}}** ===
+        //
+        // Handles a new message from another user. If a chatbox for that
+        // user does not yet exist, one is created. If it does exist, but
+        // is minimized, the user is notified but the chatbox is not brought
+        // to the front. This function also stores the message, if a storage
+        // method is set.
+        //
+        // ==== Parameters ====
+        // * {{{from}}} is the username of the sender.
+        // * {{{message}}} is the body.
+        incoming: function(from, message) {
+            // check if IM exists, otherwise create new window
+            // TODO: If friend is not on the buddylist,
+            // should add them to a temp list?
+            var chatbox = this._createChatbox(from);
+            
+            if(!$('#imjs-bar .imjs-selected').length) {
+                chatbox.data('tab').click();
+            } else if(chatbox.data('tab').data('state') != 'active') {
+                this.bar.notification(chatbox.data('tab'));
+            }
+            
+            var time = this._addMessage('b', chatbox, from, message);
+            this._storeMessage('b', chatbox, from, message, time);
+        },
+        
+        // === {{{AjaxIM.}}}**{{{addFriend(username, group)}}}** ===
+        //
+        // Inserts a new friend into the friends list. If the group specified
+        // doesn't exist, it is created. If the friend is already in this group,
+        // they aren't added again, however, the friend item is returned.
+        //
+        // ==== Parameters ====
+        // * {{{username}}} is the username of the new friend.
+        // * {{{status}}} is the current status of the friend.
+        // * {{{group}}} is the user group to which the friend should be added.
+        addFriend: function(username, status, group) {
+            var status_name = 'available';
+            $.each(this.statuses,
+                function(key, val) { if(status[0] == val) { status_name = key; return false; } });
+
+            var group_id = 'imjs-group-' + $.md5(group);
+            
+            if(!(group_item = $('#' + group_id)).length) {
+                var group_item = $('.imjs-friend-group.imjs-default').clone()
+                        .removeClass('imjs-default')
+                        .attr('id', group_id)
+                        .data('group', group)
+                        .appendTo('#imjs-friends-list');
+                        
+                var group_header = group_item.find('.imjs-friend-group-header');
+                group_header.html(group_header.html().replace('{group}', group));
+            }
+            
+            var user_id = 'imjs-friend-' + $.md5(username + group);
+            
+            if(!$('#' + user_id).length) {
+                var user_item = group_item.find('ul li.imjs-default').clone()
+                        .removeClass('imjs-default')
+                        .addClass('imjs-' + status_name)
+                        .attr('id', user_id)
+                        .data('friend', username)
+                        .appendTo(group_item.find('ul'));
+                if(status[0] == 0) user_item.hide();
+                user_item.html(user_item.html().replace('{username}', username));
+            }
+                        
+            this.friends[username] = {'status': status, group: group};
+            
+            this._updateFriendCount();
+            
+            return this.friends[username];
+        },
+        
+        // === //private// {{{AjaxIM.}}}**{{{_updateFriendCount()}}}** ===
+        //
+        // Counts the number of online friends and updates the friends count
+        // in the friend tab.
+        _updateFriendCount: function() {
+            var friendsLength = 0;
+            for(var f in this.friends) {
+                if(this.friends[f].status[0] != 0)
+                    friendsLength++;
+            }
+            $('#imjs-friends .imjs-tab-text span span').html(friendsLength);
+        },
+        
+        // === //private// {{{AjaxIM.}}}**{{{_storeFriends()}}}** ===
+        //
+        // If a storage method is enabled, the current state of the
+        // user's friends list is stored.
+        _storeFriends: function() {
+            if(this.settings.storageMethod && this.storageReady)
+                $.jStore.store(this.storeKey + 'friends', this.friends);
+        },
+        
+        // === //private// {{{AjaxIM.}}}**{{{_createChatbox(username)}}}** ===
+        //
+        // Builds a chatbox based on the default chatbox HTML and CSS defined
+        // in the current theme. Should a chatbox for this user already exist,
+        // a new one is not created. Instead, it is either given focus (should
+        // no other windows already have focus), or a notification is issued.
+        //
+        // As well, if the chatbox does not exist, an associated tab will be
+        // created.
+        //
+        // ==== Parameters ====
+        // * {{{username}}} is the name of the user for whom the chatbox is intended
+        // for.
+        // * {{{no_stamp}}} sets whther or not to add a date stamp to the chatbox
+        // upon creation.
+        //
+        // //Note:// New chatboxes are given an automatically generated ID in the
+        // format of {{{#imjs-[md5 of username]}}}.
+        _createChatbox: function(username, no_stamp) {
+            var chatbox_id = 'imjs-' + $.md5(username);
+            if(!(chatbox = $('#' + chatbox_id)).size()) {
+                // add a tab
+                var tab = this.bar.addTab(username, '#' + chatbox_id);
+                var chatbox = tab.find('.imjs-chatbox');
+                chatbox.attr('id', chatbox_id);
+
+                chatbox.data('tab', tab);
+                
+                // remove default items from the message log
+                var message_log = chatbox.find('.imjs-msglog').empty();
+                
+                // setup the chatbox header
+                var cb_header = chatbox.find('.imjs-header');
+                cb_header.html(cb_header.html().replace('{username}', username));
+                
+                if(!no_stamp) {
+                    // add a date stamp
+                    var time = this._addDateStamp(chatbox);
+                    this._storeNonMessage('datestamp', username, null, time);
+                }
+                
+                // associate the username with the object and vice-versa
+                this.chats[username] = chatbox;
+                chatbox.data('username', username);
+                
+                // did this chatbox fall down?
+                this.bar._scrollers();
+                
+                if(username in this.friends) {
+                    status = this.friends[username].status;
+                    var status_name = 'available';
+                    $.each(this.statuses,
+                        function(key, val) { if(status[0] == val) { status_name = key; return false; } });
+                    tab.addClass('imjs-' + status_name);
+                }
+                
+                // store inputbox height
+                //var input = chatbox.find('.imjs-input');
+                //input.data('height', input.height());
+            } else if(chatbox.data('tab').data('state') == 'closed') {
+                chatbox.find('.imjs-msglog > *').addClass('imjs-msg-old');
+                
+                var tab = chatbox.data('tab');
+                if(tab.css('display') == 'none')
+                    tab.css('display', '').removeClass('imjs-selected')
+                        .appendTo('#imjs-bar');
+                
+                if(!no_stamp) {
+                    // possibly add a date stamp
+                    var time = this._addDateStamp(chatbox);
+                    this._storeNonMessage('datestamp', username, null, time);
+                }
+                    
+                if(!$('#imjs-bar .imjs-selected').length) {
+                    tab.click();
+                } else {
+                    this.bar.notification(tab);
+                }
+            }
+            
+            return chatbox;
+        },
+        
+        // === //private// {{{AjaxIM.}}}**{{{_addDateStamp(chatbox)}}}** //
+        //
+        // Adds a date/time notifier to a chatbox. These are generally
+        // inserted upon creation of a chatbox, or upon the date changing
+        // since the last time a date stamp was added. If a date stamp for
+        // the current date already exists, a new one will not be added.
+        //
+        // ==== Parameters ====
+        // * {{{chatbox}}} refers to the jQuery-selected chatbox DOM element.
+        // * {{{time}}} is the date/time the date stamp will show. It is specified
+        // in milliseconds since the Unix Epoch. This is //only// defined when
+        // date stamps are being restored from storage; if not specified, the
+        // current computer time will be used.
+        _addDateStamp: function(chatbox, time) {
+            var message_log = $(chatbox).find('.imjs-msglog');
+            if(!time)
+               time = (new Date()).getTime();
+ 
+            var date_stamp = $('.imjs-tab.imjs-default .imjs-chatbox .imjs-msglog .imjs-date').clone();
+            var date_stamp_time = date_stamp.find('.imjs-msg-time');
+            if(date_stamp_time.length)
+                date_stamp_time.html(AjaxIM.dateFormat(time, date_stamp_time.html()));
+            
+            var date_stamp_date = date_stamp.find('.imjs-date-date');
+            var formatted_date = AjaxIM.dateFormat(time, date_stamp_date.html());
+            if(chatbox.data('lastDateStamp') != formatted_date) {
+                if(date_stamp_date.length)
+                    date_stamp_date.html(AjaxIM.dateFormat(time, date_stamp_date.html()));
+            
+                chatbox.data('lastDateStamp', formatted_date);
+                date_stamp.appendTo(message_log);
+            } else {
+                //$('<div></div>').appendTo(message_log);
+            }
+            
+            return time;
+        },
+        
+        // === //private// {{{AjaxIM.}}}**{{{_addError(chatbox, error)}}}** //
+        //
+        // Adds an error to a chatbox. These are generally inserted after
+        // a user sends a message unsuccessfully. If an error message
+        // was already added, another one will be added anyway.
+        //
+        // ==== Parameters ====
+        // * {{{chatbox}}} refers to the jQuery-selected chatbox DOM element.
+        // * {{{error}}} is the error message string.
+        // * {{{time}}} is the date/time the error occurred. It is specified in
+        // milliseconds since the Unix Epoch. This is //only// defined when
+        // errors are being restored from storage; if not specified, the current
+        // computer time will be used.
+        _addError: function(chatbox, error, time) {
+            var message_log = $(chatbox).find('.imjs-msglog');
+ 
+            var error_item =
+                $('.imjs-tab.imjs-default .imjs-chatbox .imjs-msglog .imjs-error').clone();
+                
+            var error_item_time = error_item.find('.imjs-msg-time');
+            if(error_item_time.length) {
+                if(!time)
+                    time = (new Date()).getTime();
+                error_item_time.html(AjaxIM.dateFormat(time, error_item_time.html()));
+            }
+
+            error_item.find('.imjs-error-error').html(error);
+            error_item.appendTo(message_log);
+            
+            message_log[0].scrollTop = message_log[0].scrollHeight;
+        },
+        
+        // === //private// {{{AjaxIM.}}}**{{{_addMessage(ab, chatbox, username, message, time)}}}** //
+        //
+        // Adds a message to a chatbox. Depending on the {{{ab}}} value,
+        // the color of the username may change as a way of visually
+        // identifying users (however, this depends on the theme's CSS).
+        // A timestamp is added to the message, and the chatbox is scrolled
+        // to the bottom, such that the new message is visible.
+        //
+        // Messages will be automatically tag-escaped, so as to prevent
+        // any potential cross-site scripting problems. Additionally,
+        // URLs will be automatically linked.
+        //
+        // ==== Parameters ====
+        // * {{{ab}}} refers to whether the user is "a" or "b" in a conversation.
+        // For the general case, "you" are "a" and "they" are "b".
+        // * {{{chatbox}}} refers to the jQuery-selected chatbox DOM element.
+        // * {{{username}}} is the username of the user who sent the message.
+        // * {{{time}}} is the time the message was sent in milliseconds since
+        // the Unix Epoch. This is //only// defined when messages are being 
+        // restored from storage. For new messages, the current computer
+        // time is automatically used.
+        _addMessage: function(ab, chatbox, username, message, time) {
+            var last_message = chatbox.find('.imjs-msglog > *:last-child');
+            if(last_message.hasClass('imjs-msg-' + ab)) {
+                // Last message was from the same person, so let's just add another imjs-msg-*-msg
+                var message_container = (last_message.hasClass('imjs-msg-' + ab + '-container') ?
+                    last_message :
+                    last_message.find('.imjs-msg-' + ab + '-container'));
+                    
+                var single_message =
+                    $('.imjs-tab.imjs-default .imjs-chatbox .imjs-msglog .imjs-msg-' + ab + '-msg')
+                    .clone().appendTo(message_container);
+                
+                single_message.html(single_message.html().replace('{username}', username));
+            } else if(!last_message.length || !last_message.hasClass('imjs-msg-' + ab)) {
+                var message_group = $('.imjs-tab.imjs-default .imjs-chatbox .imjs-msg-' + ab)
+                    .clone().appendTo(chatbox.find('.imjs-msglog'));
+                message_group.html(message_group.html().replace('{username}', username));
+                
+                var single_message = message_group.find('.imjs-msg-' + ab + '-msg');
+            }
+            
+            // clean up the message
+            message = message.replace(/</g, '&lt;').replace(/>/g, '&gt;')
+                        .replace(/(^|.*)\*([^*]+)\*(.*|$)/, '$1<strong>$2</strong>$3');
+            
+            // autolink URLs
+            message = message.replace(
+                new RegExp('([A-Za-z][A-Za-z0-9+.-]{1,120}:[A-Za-z0-9/]' +
+                '(([A-Za-z0-9$_.+!*,;/?:@&~=-])|%[A-Fa-f0-9]{2}){1,333}' +
+                '(#([a-zA-Z0-9][a-zA-Z0-9$_.+!*,;/?:@&~=%-]{0,1000}))?)', 'g'),
+                '<a href="$1" target="_blank">$1</a>');
+            
+            // insert the message
+            single_message.html(single_message.html().replace('{message}', message));
+            
+            // set the message time
+            var msgtime = single_message.find('.imjs-msg-time');
+            if(!time)
+                time = new Date();
+        
+            if(typeof time != 'string')
+                time = AjaxIM.dateFormat(time, msgtime.html());
+            
+            msgtime.html(time);
+            
+            var msglog = chatbox.find('.imjs-msglog');
+            msglog[0].scrollTop = msglog[0].scrollHeight;
+            
+            return time;
+        },
+        
+        // === //private// {{{AjaxIM.}}}**{{{_storeNonMessage(type, username, data, time)}}}** ===
+        //
+        // **Redundant?**\\
+        // Similar to {{{AjaxIM._storeMessage}}}, but stores items that aren't messages,
+        // such as datestamps and errors.
+        //
+        // ==== Parameters ====
+        // * {{{type}}} is the type of non-message (error, datestamp).
+        // * {{{username}}} is the username of the user being chatted with.
+        // * {{{data}}} is the (optional) data of the non-message to be stored.
+        // * {{{time}}} is the time of the message.
+        _storeNonMessage: function(type, username, data, time) {
+            // If storage is on & ready, store the non-message
+            if(this.settings.storageMethod) {
+                if(!this.chatstore) this.chatstore = {};                 
+                if(!(username in this.chatstore)) this.chatstore[username] = [];
+                
+                // If the chat store gets too long, it becomes slow to load.
+                if(this.chatstore[username].length > 300)
+                    this.chatstore[username].shift();
+                
+                // For some reason, if we don't encode and decode the message, it *will* break
+                // (at least) the Flash storage engine's retrieval. Gah!
+                this.chatstore[username].push(
+                    [type, username, encodeURIComponent(data), time]);
+                
+                if(this.storageReady) $.jStore.store(self.storeKey + 'chats', this.chatstore);
+            }
+        },
+        
+        // === //private// {{{AjaxIM.}}}**{{{_storeMessage(ab, chatbox, username, message, time)}}}** ===
+        //
+        // Taking the same arguments as {{{AjaxIM._addMessage}}}, {{{_storeMessage}}} pushes a message
+        // into the storage hash, if storage is enabled.
+        //
+        // Messages are added to a message array, by username. The entire chat hash is stored as
+        // a {{{'chats'}}} object in whatever storage engine is enabled.
+        _storeMessage: function(ab, chatbox, username, message, time) {
+            // If storage is on & ready, store the message
+            if(this.settings.storageMethod) {
+                if(!this.chatstore) this.chatstore = {}; 
+                
+                message = message.replace(/</g, '&lt;').replace(/>/g, '&gt;');
+                
+                if(!(username in this.chatstore)) {
+                    this.chatstore[username] = [];
+                } else if(this.chatstore[username].length > 300) {
+                    // If the chat store gets too long, it becomes slow to load.
+                    this.chatstore[username].shift();
+                }
+                
+                // For some reason, if we don't encode and decode the message, it *will* break
+                // (at least) the Flash storage engine's retrieval. Gah!
+                this.chatstore[chatbox.data('username')].push(
+                    [ab, username, encodeURIComponent(message), time]);
+                
+                if(this.storageReady) $.jStore.store(this.storeKey + 'chats', this.chatstore);
+            }
+        },
+        
+        // === //private// {{{AjaxIM.}}}**{{{_friendUpdate(friend, status, statusMessage)}}}** ===
+        //
+        // Called when a friend's status is updated. This function will update all locations
+        // where a status icon is displayed (chat tab, friends list), as well as insert
+        // a notification, should a chatbox be open.
+        //
+        // ==== Parameters ====
+        // * {{{friend}}} is the username of the friend.
+        // * {{{status}}} is the new status code. See {{{AjaxIM.statuses}}} for a list of available
+        // codes. //Note: If an invalid status is specified, no action will be taken.//
+        // * {{{statusMessage}}} is a message that was, optionally, specified by the user. It will be
+        // used should "you" send the user an IM while they are away, or if their status is viewed
+        // in another way (such as via the friends list [**not yet implemented**]).
+        _friendUpdate: function(friend, status, statusMessage) {
+            // add friend to buddylist, update their status, etc.           
+            var status_name = 'available';
+            $.each(this.statuses,
+                function(key, val) { if(status == val) { status_name = key; return false; } });
+
+            if(this.chats[friend]) {
+                var tab = this.chats[friend].data('tab');
+                var tab_class = 'imjs-tab';
+                if(tab.data('state') == 'active') tab_class += ' imjs-selected';
+                tab_class += ' imjs-' + status_name;
+                
+                tab.attr('class', tab_class);
+                
+                // display the status in the chatbox
+                var date_stamp =
+                    $('.imjs-tab.imjs-default .imjs-chatbox .imjs-msglog .imjs-date').clone();
+                    
+                var date_stamp_time = date_stamp.find('.imjs-msg-time');
+                if(date_stamp_time.length)
+                    date_stamp_time.html(AjaxIM.dateFormat(date_stamp_time.html()));
+                
+                var date_stamp_date = date_stamp.find('.imjs-date-date').html(
+                    AjaxIM.i18n[
+                        'chat' + status_name[0].toUpperCase() + status_name.slice(1)
+                    ].replace(/%s/g, friend));
+                
+                var msglog = this.chats[friend].find('.imjs-msglog');
+                date_stamp.appendTo(msglog);
+                msglog[0].scrollTop = msglog[0].scrollHeight;
+            }
+            
+            if(this.friends[friend]) {
+                var friend_id = 'imjs-friend-' + $.md5(friend + this.friends[friend].group);
+                $('#' + friend_id).attr('class', 'imjs-friend imjs-' + status_name);
+                
+                if(status == 0) {
+                    $('#' + friend_id + ':visible').slideUp();
+                    $('#' + friend_id + ':hidden').hide();
+                } else if(!$('#' + friend_id + ':visible').length) {
+                    $('#' + friend_id).slideDown();
+                }
+                
+                this.friends[friend].status = [status, statusMessage];
+                this._updateFriendCount();
+            }
+        },
+        
+        // === //private// {{{AjaxIM.}}}**{{{_notConnected()}}}** ===
+        //
+        // Puts the user into a visible state of disconnection. Sets the
+        // friends list to "not connected" and empties it; disallows new messages
+        // to be sent.
+        _notConnected: function() {
+            $('#imjs-friends').addClass('imjs-not-connected').unbind('click', this.activateTab);
+        },
+        
+        // === {{{AjaxIM.}}}**{{{send(to, message)}}}** ===
+        //
+        // Sends a message to another user. The message will be added
+        // to the chatbox before it is actually sent, however, if an
+        // error occurs during sending, that will be indicated immediately
+        // afterward.
+        //
+        // After sending the message, one of three status codes should be
+        // returned as a JSON object, e.g. {{{{r: 'code'}}}}:
+        // * {{{ok}}} &mdash; Message was sent successfully.
+        // * {{{offline}}} &mdash; The user is offline or unavailable to
+        // receive messages.
+        // * {{{error}}} &mdash; a problem occurred, unrelated to the user
+        // being unavailable.
+        //
+        // ==== Parameters ====
+        // * {{{to}}} is the username of the recipient.
+        // * {{{message}}} is the content to be sent.
+        send: function(to, message) {         
+            if(!message) return;
+               
+            if(this.chats[to]) { // REMOVE ME?
+                // possibly add a datestamp
+                var time = self._addDateStamp(this.chats[to]);
+                this._storeNonMessage('datestamp', to, null, time);
+                
+                time = this._addMessage('a', this.chats[to], this.username, message);                
+                this._storeMessage('a', this.chats[to], this.username, message, time);
+            }
+            
+            $(self).trigger('sendingMessage', [to, message]);
+            
+            AjaxIM.request(
+                this.actions.send,
+                {'to': to, 'message': message},
+                function(result) {
+                    switch(result.r) {
+                        case 'ok':
+                            $(self).trigger('sendMessageSuccessful', [to, message]);
+                        break;
+                        
+                        case 'offline':
+                            $(self).trigger('sendMessageFailed', ['offline', to, message]);
+                        break;
+                        
+                        case 'error':
+                        default:
+                            if(result.e == 'no session found') {
+                                self._notConnected();
+                                self._addError(self.chats[to], AjaxIM.i18n.notConnected);
+                                self._storeNonMessage('error', to,
+                                    AjaxIM.i18n.notConnected, (new Date()).getTime());
+                            }
+                            
+                            $(self).trigger('sendMessageFailed', [result.e, to, message]);
+                        break;
+                    }
+                },
+                function(error) {
+                    self._notConnected();
+                    self._addError(self.chats[to], AjaxIM.i18n.notConnected);
+                    self._storeNonMessage('error', to,
+                        AjaxIM.i18n.notConnected, (new Date()).getTime());
+                        
+                    $(self).trigger('sendMessageFailed', ['not connected', to, message]);
+                }
+            );
+        },
+        
+        // === {{{AjaxIM.}}}**{{{status(s, message)}}}** ===
+        //
+        // Sets the user's status and status message. It is possible to not
+        // set a status message by setting it to an empty string. The status
+        // will be sent to the server, where upon the server will broadcast
+        // the update to all individuals with "you" on their friends list.
+        //
+        // ==== Parameters ====
+        // * {{{s}}} is the status code, as defined by {{{AjaxIM.statuses}}}.
+        // * {{{message}}} is the custom status message.
+        status: function(s, message) {
+            // update status icon(s)
+            if(!this.statuses[s])
+                return;
+                
+            $('#imjs-friends').attr('class', 'imjs-' + s);
+            
+            $(self).trigger('changingStatus', [s, message]);
+            
+            AjaxIM.request(
+                this.actions.status,
+                {'status': this.statuses[s], 'message': message},
+                function(result) {
+                    switch(result.r) {
+                        case 'ok':
+                            $(self).trigger('changeStatusSuccessful', [s, message]);
+                        break;
+                        
+                        case 'error':
+                        default:
+                            $(self).trigger('changeStatusFailed', [result.e, s, message]);
+                        break;
+                    }
+                },
+                function(error) {
+                    $(self).trigger('changeStatusFailed', ['not connected', s, message]);
+                }
+            );
+        },
+        
+        // === {{{AjaxIM.}}}**{{{statuses}}}** ===
+        //
+        // These are the available status codes and their associated identities:
+        // * {{{offline}}} (0) &mdash; Only used when signing out/when another
+        // user has signed out, as once this status is set, the user is removed
+        // from the server and friends will be unable to contact the user.
+        // * {{{available}}} (1) &mdash; The user is online and ready to be messaged.
+        // * {{{away}}} (2) &mdash; The user is online but is not available. Others
+        // may still contact this user, however, the user may not respond. Anyone
+        // contacting an away user will receive a notice stating that the user is away,
+        // and (if one is set) their custom status message.
+        // * {{{invisible}}} (3; **not yet implemented**) &mdash; The user is online,
+        // but other users are made unaware, and the user will be represented
+        // as being offline. It is still possible to contact this user, and for this
+        // user to contact others; no status message or notice will be sent to others
+        // messaging this user.
+        statuses: {offline: 0, available: 1, away: 2, invisible: 3},
+        
+        // == Footer bar ==
+        //
+        // The footer bar is the bar that sits at the bottom of the page, in a fixed
+        // position. It contains a tab for the friends list, and tabs for any open
+        // chat boxes. It is also possible to add custom tabs for other functionality.
+        bar: {
+            // === {{{AjaxIM.}}}**{{{bar.initialize()}}}** ===
+            //
+            // Setup the footer bar and enable tab actions. This function
+            // uses {{{jQuery.live}}} to set hooks on any bar tabs created
+            // in the future.
+            initialize: function() {
+                // Set up your standard tab actions
+                $('.imjs-tab')
+                    .live('click', this.activateTab);
+                    
+                $('.imjs-tab .imjs-close')
+                    .live('click', this.closeTab);
+            
+                // Set up the friends list actions
+                var self = this;
+                $(document).click(function(e) {
+                    if(e.target.id == 'imjs-friends' ||
+                        $(e.target).parents('#imjs-friends').length) {    
+                        return;
+                    }
+                    
+                    if($('#imjs-friends').data('state') == 'active')
+                        self.activateTab.call($('#imjs-friends'));
+                });
+                $('#imjs-friends')
+                    .data('state', 'minimized')
+                    .click(function(e) {
+                        if(!$(this).hasClass('imjs-not-connected') &&
+                            e.target.id != 'imjs-friends-panel' &&
+                            !$(e.target).parents('#imjs-friends-panel').length)
+                            self.activateTab.call(this);
+                    })
+                    .mouseenter(function() {
+                        if($(this).hasClass('imjs-not-connected')) {
+                            $('.imjs-tooltip').css('display', 'block');
+                            $('.imjs-tooltip p').html(AjaxIM.i18n.notConnectedTip);
+
+                            var tip_left = $(this).offset().left -
+                                $('.imjs-tooltip').outerWidth() +
+                                ($(this).outerWidth() / 2);
+                            var tip_top = $(this).offset().top -
+                                $('.imjs-tooltip').outerHeight(true);
+
+                            $('.imjs-tooltip').css({
+                                    left: tip_left,
+                                    top: tip_top
+                                });
+                        }
+                    })
+                    .mouseleave(function() {
+                        if($(this).hasClass('imjs-not-connected')) {
+                            $('.imjs-tooltip').css('display', '');
+                        }
+                    });
+                $('#imjs-friends-panel')
+                    .data('tab', $('#imjs-friends'))
+                    .css('display', 'none');
+            },
+            
+            // === {{{AjaxIM.}}}**{{{bar.activateTab()}}}** ===
+            //
+            // Activate a tab by setting it to the 'active' state and
+            // showing any related chatbox. If a chatbox is available
+            // for this tab, also focus the input box.
+            //
+            // //Note:// {{{this}}}, here, refers to the tab DOM element.
+            activateTab: function() {
+                var chatbox = $(this).find('.imjs-chatbox') || false;
+
+                if($(this).data('state') != 'active') {
+                    if($(this).attr('id') != 'imjs-friends') {
+                        $('#imjs-bar > li')
+                            .not($(this))
+                            .not('#imjs-friends')
+                            .removeClass('imjs-selected')
+                            .each(function() {
+                                if($(this).data('state') != 'closed') {
+                                    $(this).data('state', 'minimized');
+                                    var chatbox = $(this).find('.imjs-chatbox');
+                                    if(chatbox.length)
+                                        chatbox.css('display', 'none');
+                                }
+                            });
+                    }
+                    
+                    if(chatbox && chatbox.css('display') == 'none')
+                        chatbox.css('display', '');
+                    
+                    // set the tab to active...
+                    var tab = $(this).addClass('imjs-selected').data('state', 'active');
+                    
+                    // ...and hide and reset the notification icon
+                    tab.find('.imjs-notification').css('display', 'none')
+                        .data('count', 0);
+                    
+                    if(self.settings.storageMethod && self.storageReady &&
+                        chatbox && (username = chatbox.data('username'))) { 
+                        $.jStore.store(self.storeKey + 'activeTab', [username]);
+                    }
+                    
+                    $(self).trigger('tabToggled', ['activated', tab]);
+                } else {
+                    var tab = $(this).removeClass('imjs-selected').data('state', 'minimized');
+                    
+                    if(chatbox && chatbox.css('display') != 'none')
+                        chatbox.css('display', 'none');
+                    
+                    if(self.settings.storageMethod && self.storageReady) { 
+                        $.jStore.store(self.storeKey + 'activeTab', ['*']);
+                    }
+                    
+                    $(self).trigger('tabToggled', ['minimized', tab]);
+                }
+                
+                if(chatbox) {
+                    if(!(input = chatbox.find('.imjs-input')).data('height')) {
+                        // store the height for resizing later
+                        input.data('height', input.height());
+                    }
+                    
+                    try {
+                        var msglog = chatbox.find('.imjs-msglog');
+                        msglog[0].scrollTop = msglog[0].scrollHeight;
+                    } catch(e) {}
+                    
+                    try { chatbox.find('.imjs-input').focus(); } catch(e) {}
+                }
+            },
+            
+            // === {{{AjaxIM.}}}**{{{bar.closeTab()}}}** ===
+            //
+            // Close a tab and hide any related chatbox, such that
+            // the chatbox can not be reopened without reinitializing
+            // the tab.
+            //
+            // //Note:// {{{this}}}, here, refers to the tab DOM element.
+            closeTab: function() {
+                var tab = $(this).parents('.imjs-tab');
+                tab.css('display', 'none').data('state', 'closed');
+
+                if(self.settings.storageMethod && self.storageReady) {
+                    delete self.chatstore[tab.find('.imjs-chatbox').data('username')];
+                    if(self.storageReady) $.jStore.store(self.storeKey + 'chats', self.chatstore);
+                }
+
+                $(self).trigger('tabToggled', ['closed', tab]);
+
+                self.bar._scrollers();
+
+                return false;
+            },
+            
+            // === {{{AjaxIM.}}}**{{{bar.addTab(label, action, closable)}}}** ===
+            //
+            // Adds a tab to the tab bar, with the label {{{label}}}. When
+            // clicked, it will call a callback function, {{{action}}}. If
+            // {{{action}}} is a string, it is assumed that the string is
+            // referring to a chatbox ID.
+            //
+            // ==== Parameters ====
+            // * {{{label}}} is the text that will be displayed on the tab.\\
+            // * {{{action}}} is the callback function, if it is a non-chatbox
+            // tab, or a string if it //is// a chatbox tab.\\
+            // * {{{closable}}} is a boolean value that determines whether or not
+            // it is possible for a user to close this tab.
+            //
+            // //Note:// New tabs are given an automatically generated ID
+            // in the format of {{{#imjs-tab-[md5 of label]}}}.
+            addTab: function(label, action, closable) {
+                var tab = $('.imjs-tab.imjs-default').clone().insertAfter('#imjs-scroll-right');
+                tab.removeClass('imjs-default')
+                    .attr('id', 'imjs-tab-' + $.md5(label))
+                    .html(tab.html().replace('{label}', label))
+                    .data('state', 'minimized');
+                    
+                var notification = tab.find('.imjs-notification');
+                notification.css('display', 'none')
+                    .data('count', 0)
+                    .data('default-text', notification.html())
+                    .html(notification.html().replace('{count}', '0'));
+                
+                if(closable === false)
+                    tab.find('.imjs-close').eq(0).remove();
+                
+                if(typeof action == 'string') {
+                    //tab.data('chatbox', action);
+                } else {
+                    tab.find('.imjs-chatbox').remove();
+                    tab.click(action);
+                }
+                
+                return tab;
+            },
+            
+            // === {{{AjaxIM.}}}**{{{bar.notification(tab)}}}** ===
+            //
+            // Displays a notification on a tab. Generally, this is called when
+            // a tab is minimized to let the user know that there is an update
+            // for them. The way the notification is displayed depends on the
+            // theme CSS.
+            //
+            // ==== Parameters ====
+            // * {{{tab}}} is the jQuery-selected tab DOM element.
+            notification: function(tab) {
+                var notify = tab.find('.imjs-notification');
+                var notify_count = notify.data('count') + 1;
+                
+                notify.data('count', notify_count)
+                    .html(notify.data('default-text').replace('{count}', notify_count))
+                    .css('display', '');
+            },
+            
+            // === //private// {{{AjaxIM.}}}**{{{bar._scrollers()}}}** ===
+            //
+            // Document me!
+            _scrollers: function() {
+                var needScrollers = false;
+                $('.imjs-tab').filter(function() {
+                    return $(this).data('state') != 'closed'
+                }).css('display', '');
+                
+                $.each(self.chats, function(username, chatbox) {
+                    var tab = chatbox.data('tab');
+                    if(tab.data('state') == 'closed') return true;
+                    
+                    if(tab.position().top > $('#imjs-bar').height()) {
+                        $('.imjs-scroll').css('display', '');
+                        tab.css('display', 'none');
+                        needScrollers = true;
+                    } else {
+                        tab.css('display', '');
+                    }
+                });
+                
+                if(!needScrollers) {
+                    $('.imjs-scroll').css('display', 'none');
+                }
+                
+                if($('#imjs-scroll-left').css('display') != 'none' &&
+                    $('#imjs-scroll-left').position().top > $('#imjs-bar').height()) {
+                    $('#imjs-bar li.imjs-tab:visible').slice(-1).css('display', 'none');
+                }
+                
+                var hiddenLeft = $('#imjs-bar li.imjs-tab:visible').slice(-1)
+                    .nextAll('#imjs-bar li.imjs-tab:hidden')
+                    .not('.imjs-default')
+                    .filter(function() {
+                        return $(this).data('state') != 'closed'
+                    }).length;
+                    
+                var hiddenRight = $('#imjs-bar li.imjs-tab:visible').eq(0)
+                    .prevAll('#imjs-bar li.imjs-tab:hidden')
+                    .not('.imjs-default')
+                    .filter(function() {
+                        return $(this).data('state') != 'closed'
+                    }).length;
+                    
+                $('#imjs-scroll-left').html(hiddenLeft);
+                $('#imjs-scroll-right').html(hiddenRight);
+            }
+        },
+        
+        // == Comet ==
+        //
+        // Comet, or HTTP streaming, holds open a connection between the client and
+        // the server indefinitely. As the server receives new messages or events,
+        // they are passed down to the client in a {{{&lt;script&gt;}}}
+        // tag which calls the {{{AjaxIM.incoming()}}} function. The connection is
+        // opened using either an {{{iframe}}} (in Opera or Internet Explorer) or
+        // an {{{XMLHTTPRequest}}} object. Due to the extra flexibility necessary
+        // with the {{{XMLHTTPRequest}}} object, jQuery's {{{$.ajax}}} is not used.
+        comet: {
+            type: '',
+            obj: null,
+        
+            onbeforeunload: null,
+            onreadystatechange: null,
+            
+            iframe: function() {                
+                if(/loaded|complete/i.test(this.obj.readyState))
+                    throw new Error("IM server not available!");
+            },
+
+            // === {{{AjaxIM.}}}**{{{comet.connect()}}}** ===
+            //
+            // Creates and initializes the object and connection between the server
+            // and the client. For Internet Explorer and Opera, we use an
+            // {{{&lt;iframe&gt;}}} element; for all other browsers, we create an
+            // {{{XMLHTTPRequest}}} object. The server connects to the URI defined
+            // as the "poll" action. This function is called automatically, when
+            // the IM engine is initialized and the {{{AjaxIM.poll()}}} function
+            // is called.
+            connect: function() {
+                var self = _instance;
+                
+                if($.browser.opera || $.browser.msie) {
+                    var iframe = $('<iframe></iframe>');
+                    with(iframe) {
+                        css({
+                            position: 'absolute',
+                            visibility: 'visible',
+                            display: 'block',
+                            left: '-10000px',
+                            top: '-10000px',
+                            width: '1px',
+                            height: '1px'
+                        });
+                        
+                        attr('src', self.actions.poll[1]);
+                        appendTo('body');
+                        
+                        bind('readystatechange',
+                            self.comet.onreadystatechange = function() { self.comet.iframe() });
+                        bind('beforeunload',
+                            self.comet.onbeforeunload = function() { self.comet.disconnect() });
+                    }
+                    
+                    self.comet.type = 'iframe';
+                    self.comet.obj = iframe;
+                } else {
+                    var xhr = new XMLHttpRequest;
+                    var length = 1029;
+                    var code = /^\s*<script[^>]*>parent\.(.+);<\/script><br\s*\/>$/;
+                    
+                    xhr.open('get', self.actions.poll[1], true);
+                    xhr.onreadystatechange = function(){
+                        if(xhr.readyState > 2) {
+                            if(xhr.status == 200) {
+                                responseText = xhr.responseText.substring(length);
+                                length = xhr.responseText.length;
+                                if(responseText != ' ') 
+                                    eval(responseText.replace(code, "$1"));
+                            }
+                            // We need an "else" here. If the state changes to
+                            // "loaded", the user needs to know they're
+                            // disconnected.
+                        }
+                    };
+                    
+                    self.comet.type = 'xhr';
+                    self.comet.obj = xhr;
+                    
+                    addEventListener('beforeunload',
+                        self.comet.beforeunload = function() { self.comet.disconnect(); }, false);
+                    setTimeout(function() { xhr.send(null) }, 10);
+                }
+            },
+
+            // === {{{AjaxIM.}}}**{{{comet.disconnect()}}}** ===
+            //
+            // Disconnect from the server and destroy the connection object. This
+            // function is called before the page unloads, so that we plug up and
+            // potential leaks and free memory.
+            disconnect: function() {
+                var self = _instance.comet;
+                
+                if(!this.type || !this.obj)
+                    return;
+                
+                if(this.type == 'iframe') {
+                    detachEvent('onreadystatechange', this.onreadystatechange);
+                    detachEvent('onbeforeunload', this.onbeforeunload);
+                    this.obj.src = '.';
+                    $(this.obj).remove();
+                } else {
+                    removeEventListener('beforeunload', this.onbeforeunload, false);
+                    this.obj.onreadystatechange = function(){};
+                    this.obj.abort();
+                }
+                
+                delete this.obj;
+            }
+        }
+    })
+        
+    self.bar.initialize();
+    
+    if(prequeue.length) {
+        $.each(prequeue, function() {
+            var func = this[0].split('.');
+            if(func.length > 1)
+                self[func[0]][func[1]].apply(self, this[1]);
+            else
+                self[func[0]].apply(self, this[1]);
+        });
+    }
+    });
+    
+    // == Static functions and variables ==
+    //
+    // The following functions and variables are available outside of an initialized
+    // {{{AjaxIM}}} object.
+    
+    // === {{{AjaxIM.}}}**{{{client}}}** ===
+    //
+    // Once {{{AjaxIM.init()}}} is called, this will be set to the active AjaxIM
+    // object. Only one AjaxIM object instance can exist at a time. This variable
+    // can and should be accessed directly.
+    AjaxIM.client = null;
+    
+    // === {{{AjaxIM.}}}**{{{init(options, actions)}}}** ===
+    //
+    // Initialize the AjaxIM client object and engine. Here, you can define your
+    // options and actions as outlined at the top of this documentation.
+    //
+    // ==== Parameters ====
+    // * {{{options}}} is the hash of custom settings to initialize Ajax IM with.
+    // * {{{actions}}} is the hash of any custom action URLs.
+    AjaxIM.init = function(options, actions) {
+        if(!_instance) {
+            _instance = new AjaxIM(options, actions);
+            AjaxIM.client = _instance;
+        }
+        
+        return _instance;
+    }
+    
+    
+    // === {{{AjaxIM.}}}**{{{request(url, data, successFunc, failureFunc)}}}** ===
+    //
+    // Wrapper around {{{$.jsonp}}}, the JSON-P library for jQuery, and {{{$.ajax}}},
+    // jQuery's ajax library. Allows either function to be called, automatically,
+    // depending on the request's URL array (see {{{AjaxIM.actions}}}).
+    //
+    // ==== Parameters ====
+    // {{{url}}} is the URL of the request.
+    // {{{data}}} are any arguments that go along with the request.
+    // {{{success}}} is a callback function called when a request has completed
+    // without issue.
+    // {{{_ignore_}}} is simply to provide compatability with {{{$.post}}}.
+    // {{{failure}}} is a callback function called when a request hasn't not
+    // completed successfully.
+    AjaxIM.request = function(url, data, successFunc, failureFunc) {
+        if(typeof failureFunc != 'function');
+            failureFunc = function(){};
+
+        $[url[0]]({
+            'url': url[1],
+            'data': data,
+            dataType: (url[0] == 'ajax' ? 'json' : 'jsonp'),
+            type: 'POST',
+            cache: false,
+            timeout: 60000,
+            callback: 'jsonp' + (new Date()).getTime(),
+            success: function(json, textStatus) {
+                successFunc(json);
+            },
+            error: function(xOptions, error) {
+                failureFunc(error);
+            }
+        });
+        
+        // This prevents Firefox from spinning indefinitely
+        // while it waits for a response. Why? Fuck if I know.
+        if(url[0] == 'jsonp' && $.browser.mozilla) {
+            $.jsonp({
+                'url': 'about:',
+                timeout: 0
+            });
+        }
+    };
+    
+    // === {{{AjaxIM.}}}**{{{incoming(data)}}}** ===
+    //
+    // Never call this directly. It is used as a connecting function between
+    // client and server for Comet.
+    //
+    // //Note:// There are two {{{AjaxIM.incoming()}}} functions. This one is a
+    // static function called outside of the initialized AjaxIM object; the other
+    // is only called within the initalized AjaxIM object.
+    AjaxIM.incoming = function(data) {
+        if(!_instance)
+            return false;
+        
+        if(data.length)
+            _instance._parseMessages(data);
+    }
+    
+    // === {{{AjaxIM.}}}**{{{loaded}}}** ===
+    //
+    // If Ajax IM has been loaded with the im.load.js file, this function will be
+    // called when the library is finally loaded and ready for use. Similar to
+    // jQuery's $(document).ready(), but for Ajax IM.
+    AjaxIM.loaded = function() {
+        if(typeof AjaxIMLoadedFunction == 'function') {
+            AjaxIMLoadedFunction();
+            delete AjaxIMLoadedFunction; // clean up the global namespace
+        }
+    };
+    
+    // === {{{AjaxIM.}}}**{{{dateFormat([date,] [mask,] utc)}}}** ===
+    //
+    // Date Format 1.2.3\\
+    // &copy; 2007-2009 Steven Levithan ([[http://blog.stevenlevithan.com/archives/date-time-format|stevenlevithan.com]])\\
+    // MIT license
+    //
+    // Includes enhancements by Scott Trenda
+    // and Kris Kowal ([[http://cixar.com/~kris.kowal/|cixar.com/~kris.kowal/]])
+    //
+    // Accepts a date, a mask, or a date and a mask and returns a formatted version
+    // of the given date.
+    //
+    // ==== Parameters ====
+    // * {{{date}}} is a {{{Date()}}} object. If not specified, the date defaults to the
+    // current date/time.
+    // * {{{mask}}} is a string that defines the formatting of the date. Formatting
+    // options can be found in the
+    // [[http://blog.stevenlevithan.com/archives/date-time-format|Date Format]]
+    // documentation. If not specified, the mask defaults to {{{dateFormat.masks.default}}}.
+    
+    AjaxIM.dateFormat = function () {
+        var token = /d{1,4}|m{1,4}|yy(?:yy)?|([HhMsTt])\1?|[LloSZ]|"[^"]*"|'[^']*'/g,
+            timezone = new RegExp('\b(?:[PMCEA][SDP]T|(?:Pacific|Mountain|Central|Eastern|Atlantic) ' +
+                                  '(?:Standard|Daylight|Prevailing) Time|(?:GMT|UTC)(?:[-+]\d{4})?)\b',
+                                  'g'),
+            timezoneClip = /[^-+\dA-Z]/g,
+            pad = function (val, len) {
+                val = String(val);
+                len = len || 2;
+                while (val.length < len) val = "0" + val;
+                return val;
+            };
+    
+        // Regexes and supporting functions are cached through closure
+        return function (date, mask, utc) {
+            var dF = AjaxIM.dateFormat;
+    
+            // You can't provide utc if you skip other args (use the "UTC:" mask prefix)
+            if (arguments.length == 1 && Object.prototype.toString.call(date) ==
+                  "[object String]" && !/\d/.test(date)) {
+                mask = date;
+                date = undefined;
+            }
+    
+            // Passing date through Date applies Date.parse, if necessary
+            date = date ? new Date(date) : new Date;
+            if (isNaN(date)) throw SyntaxError("invalid date");
+    
+            mask = String(dF.masks[mask] || mask || dF.masks["default"]);
+    
+            // Allow setting the utc argument via the mask
+            if (mask.slice(0, 4) == "UTC:") {
+                mask = mask.slice(4);
+                utc = true;
+            }
+    
+            var _ = utc ? "getUTC" : "get",
+                d = date[_ + "Date"](),
+                D = date[_ + "Day"](),
+                m = date[_ + "Month"](),
+                y = date[_ + "FullYear"](),
+                H = date[_ + "Hours"](),
+                M = date[_ + "Minutes"](),
+                s = date[_ + "Seconds"](),
+                L = date[_ + "Milliseconds"](),
+                o = utc ? 0 : date.getTimezoneOffset(),
+                flags = {
+                    d:    d,
+                    dd:   pad(d),
+                    ddd:  AjaxIM.i18n.dayNames[D],
+                    dddd: AjaxIM.i18n.dayNames[D + 7],
+                    m:    m + 1,
+                    mm:   pad(m + 1),
+                    mmm:  AjaxIM.i18n.monthNames[m],
+                    mmmm: AjaxIM.i18n.monthNames[m + 12],
+                    yy:   String(y).slice(2),
+                    yyyy: y,
+                    h:    H % 12 || 12,
+                    hh:   pad(H % 12 || 12),
+                    H:    H,
+                    HH:   pad(H),
+                    M:    M,
+                    MM:   pad(M),
+                    s:    s,
+                    ss:   pad(s),
+                    l:    pad(L, 3),
+                    L:    pad(L > 99 ? Math.round(L / 10) : L),
+                    t:    H < 12 ? "a"  : "p",
+                    tt:   H < 12 ? "am" : "pm",
+                    T:    H < 12 ? "A"  : "P",
+                    TT:   H < 12 ? "AM" : "PM",
+                    Z:    utc ? "UTC" :
+                            (String(date).match(timezone) || [""])
+                            .pop().replace(timezoneClip, ""),
+                    o:    (o > 0 ? "-" : "+") +
+                            pad(Math.floor(Math.abs(o) / 60) * 100 + Math.abs(o) % 60, 4),
+                    S:    ["th", "st", "nd", "rd"][d % 10 > 3 ?
+                            0 :
+                            (d % 100 - d % 10 != 10) * d % 10]
+                };
+    
+            return mask.replace(token, function ($0) {
+                return $0 in flags ? flags[$0] : $0.slice(1, $0.length - 1);
+            });
+        };
+    }();
+    
+    // Some common format strings
+    AjaxIM.dateFormat.masks = {
+        "default":      "ddd mmm dd yyyy HH:MM:ss",
+        shortDate:      "m/d/yy",
+        mediumDate:     "mmm d, yyyy",
+        longDate:       "mmmm d, yyyy",
+        fullDate:       "dddd, mmmm d, yyyy",
+        shortTime:      "h:MM TT",
+        mediumTime:     "h:MM:ss TT",
+        longTime:       "h:MM:ss TT Z",
+        isoDate:        "yyyy-mm-dd",
+        isoTime:        "HH:MM:ss",
+        isoDateTime:    "yyyy-mm-dd'T'HH:MM:ss",
+        isoUtcDateTime: "UTC:yyyy-mm-dd'T'HH:MM:ss'Z'"
+    };
+
+    // === {{{AjaxIM.}}}**{{{i18n}}}** ===
+    //
+    // Text strings used by Ajax IM. Should you want to translate Ajax IM into
+    // another language, merely change these strings.
+    // 
+    // {{{%s}}} denotes text that will be automatically replaced when the string is
+    // used.
+    AjaxIM.i18n = {
+        dayNames: [
+            "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat",
+            "Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"
+        ],
+        monthNames: [
+            "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec",
+            "January", "February", "March", "April", "May", "June", "July", "August", "September",
+            "October", "November", "December"
+        ],
+        
+        chatOffline: '%s signed off.',
+        chatAvailable: '%s became available.',
+        chatAway: '%s went away.',
+        
+        notConnected: 'You are currently not connected or the server is not available. ' +
+                      'Please ensure that you are signed in and try again.',
+        notConnectedTip: 'You are currently not connected.',
+        
+        authInvalid: 'Invalid username or password.',
+        
+        registerPasswordLength: 'Passwords must be more than 4 characters in length.',
+        registerUsernameLength: 'Usernames must be more than 2 characters in length and ' +
+                        ' contain only A-Z, a-z, 0-9, underscores (_) and periods (.).',
+        registerPasswordMatch: 'Entered passwords do not match.',
+        registerUsernameTaken: 'The chosen username is already in use; please choose another.',
+        registerUnknown: 'An unknown error occurred. Please try again.'
+    }
+})(jQuery, false);

From c8e48449b32255e4f7803a1573982a42fbf3d491 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Mon, 11 Apr 2011 12:08:47 +0200
Subject: [PATCH 118/331] [FIX] orm.read_group: fix group_by for date[time]s,
 currently showing duplicate groups

bzr revid: odo@openerp.com-20110411100847-va4ok35jx3tohor6
---
 bin/osv/orm.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bin/osv/orm.py b/bin/osv/orm.py
index 7fc8744737b..91574e7fa6a 100644
--- a/bin/osv/orm.py
+++ b/bin/osv/orm.py
@@ -2175,6 +2175,7 @@ class orm(orm_template):
                 if fget[groupby]['type'] in ('date', 'datetime'):
                     flist = "to_char(%s,'yyyy-mm') as %s " % (qualified_groupby_field, groupby)
                     groupby = "to_char(%s,'yyyy-mm')" % (qualified_groupby_field)
+                    qualified_groupby_field = groupby
                 else:
                     flist = qualified_groupby_field
             else:

From 2fe8efd42835515d9d7a6cc8e16a2bb9db311ec0 Mon Sep 17 00:00:00 2001
From: "Jay Vora (OpenERP)" <jvo@tinyerp.com>
Date: Mon, 11 Apr 2011 15:59:52 +0530
Subject: [PATCH 119/331] [FIX] Stock : System should not create duplicate
 moves while processing with chained locations

lp bug: https://launchpad.net/bugs/722538 fixed

bzr revid: jvo@tinyerp.com-20110411102952-9lhk38kshrp8ha2p
---
 addons/stock/stock.py | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index af1b783709e..f7d296a426e 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -2108,11 +2108,11 @@ class stock_move(osv.osv):
 
         todo = []
         for move in self.browse(cr, uid, ids, context=context):
-            #print 'DONE MOVE', move.id, move.product_id.name, move.move_dest_id.id, move.state, move.move_dest_id and move.move_dest_id.state
             if move.state=="draft":
                 todo.append(move.id)
         if todo:
             self.action_confirm(cr, uid, todo, context=context)
+            todo = []
 
         for move in self.browse(cr, uid, ids, context=context):
             if move.state in ['done','cancel']:
@@ -2135,10 +2135,13 @@ class stock_move(osv.osv):
             prodlot_id = partial_datas and partial_datas.get('move%s_prodlot_id' % (move.id), False)
             if prodlot_id:
                 self.write(cr, uid, [move.id], {'prodlot_id': prodlot_id}, context=context)
-            if move.state not in ('confirmed','done'):
-                self.action_confirm(cr, uid, move_ids, context=context)
+            if move.state not in ('confirmed','done','assigned'):
+                todo.append(move.id)
 
-        self.write(cr, uid, move_ids, {'state': 'done', 'date_planned': time.strftime('%Y-%m-%d %H:%M:%S')}, context=context)
+        if todo:
+            self.action_confirm(cr, uid, todo, context=context)
+
+        self.write(cr, uid, move_ids, {'state': 'done', 'date': time.strftime('%Y-%m-%d %H:%M:%S')}, context=context)
         for id in move_ids:
              wf_service.trg_trigger(uid, 'stock.move', id, cr)
 

From 3412b89d95c1febe139e5184ba0295c85bf3a785 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 11 Apr 2011 12:31:18 +0200
Subject: [PATCH 120/331] [IMP] add a bunch of tests for transformation of
 invisible fields, make View.fields_view_get take a request so it can use the
 request context for its evaluations

bzr revid: xmo@openerp.com-20110411103118-msx5plh2lnz5obps
---
 addons/base/controllers/main.py          | 26 +++++++------
 addons/base/test/test_view.py            | 48 ++++++++++++++++++++++++
 addons/base_calendar/controllers/main.py |  3 +-
 3 files changed, 64 insertions(+), 13 deletions(-)

diff --git a/addons/base/controllers/main.py b/addons/base/controllers/main.py
index 28806083d61..a8dc58625fa 100644
--- a/addons/base/controllers/main.py
+++ b/addons/base/controllers/main.py
@@ -403,16 +403,20 @@ class DataSet(openerpweb.Controller):
         return {'result': r}
 
 class View(openerpweb.Controller):
-    def fields_view_get(self, session, model, view_id, view_type, transform=True, toolbar=False, submenu=False):
-        Model = session.model(model)
-        r = Model.fields_view_get(view_id, view_type, {}, toolbar, submenu)
+    def fields_view_get(self, request, model, view_id, view_type,
+                        transform=True, toolbar=False, submenu=False):
+        Model = request.session.model(model)
+        fvg = Model.fields_view_get(view_id, view_type, request.context,
+                                    toolbar, submenu)
         if transform:
-            context = {} # TODO: dict(ctx_sesssion, **ctx_action)
-            xml = self.transform_view(r['arch'], session, context)
+            evaluation_context = request.session.evaluation_context(
+                request.context or {})
+            xml = self.transform_view(
+                fvg['arch'], request.session, evaluation_context)
         else:
-            xml = ElementTree.fromstring(r['arch'])
-        r['arch'] = Xml2Json.convert_element(xml)
-        return r
+            xml = ElementTree.fromstring(fvg['arch'])
+        fvg['arch'] = Xml2Json.convert_element(xml)
+        return fvg
 
     def normalize_attrs(self, elem, context):
         """ Normalize @attrs, @invisible, @required, @readonly and @states, so
@@ -507,7 +511,7 @@ class FormView(View):
 
     @openerpweb.jsonrequest
     def load(self, req, model, view_id, toolbar=False):
-        fields_view = self.fields_view_get(req.session, model, view_id, 'form', toolbar=toolbar)
+        fields_view = self.fields_view_get(req, model, view_id, 'form', toolbar=toolbar)
         return {'fields_view': fields_view}
 
 class ListView(View):
@@ -515,7 +519,7 @@ class ListView(View):
 
     @openerpweb.jsonrequest
     def load(self, req, model, view_id, toolbar=False):
-        fields_view = self.fields_view_get(req.session, model, view_id, 'tree', toolbar=toolbar)
+        fields_view = self.fields_view_get(req, model, view_id, 'tree', toolbar=toolbar)
         return {'fields_view': fields_view}
 
 class SearchView(View):
@@ -523,7 +527,7 @@ class SearchView(View):
 
     @openerpweb.jsonrequest
     def load(self, req, model, view_id):
-        fields_view = self.fields_view_get(req.session, model, view_id, 'search')
+        fields_view = self.fields_view_get(req, model, view_id, 'search')
         return {'fields_view': fields_view}
 
 class Action(openerpweb.Controller):
diff --git a/addons/base/test/test_view.py b/addons/base/test/test_view.py
index f20f9e12f61..d8f65ccff99 100644
--- a/addons/base/test/test_view.py
+++ b/addons/base/test/test_view.py
@@ -1,3 +1,4 @@
+import copy
 import xml.etree.ElementTree
 import mock
 
@@ -8,6 +9,11 @@ import base.controllers.main
 import openerpweb.nonliterals
 import openerpweb.openerpweb
 
+def field_attrs(fields_view_get, fieldname):
+    (field,) =  filter(lambda f: f['attrs'].get('name') == fieldname,
+                       fields_view_get['arch']['children'])
+    return field['attrs']
+
 #noinspection PyCompatibility
 class DomainsAndContextsTest(unittest2.TestCase):
     def setUp(self):
@@ -130,3 +136,45 @@ class AttrsNormalizationTest(unittest2.TestCase):
         self.assertEqual(
             simplejson.loads(element.get('attrs')),
             {'invisible': [['state', 'not in', ['open', 'closed']]]})
+
+    def test_transform_invisible(self):
+        element = xml.etree.ElementTree.Element(
+            'field', invisible="context.get('invisible_country', False)")
+
+        empty_context = copy.deepcopy(element)
+        self.view.normalize_attrs(empty_context, {})
+        self.assertEqual(empty_context.get('invisible'), None)
+
+        full_context = copy.deepcopy(element)
+        self.view.normalize_attrs(full_context, {'invisible_country': True})
+        self.assertEqual(full_context.get('invisible'), '1')
+
+    def test_transform_invisible_list_column(self):
+        req = mock.Mock()
+        req.context =  {'set_editable':True, 'set_visible':True,
+                        'gtd_visible':True, 'user_invisible':True}
+        req.session.evaluation_context = \
+            openerpweb.openerpweb.OpenERPSession().evaluation_context
+        req.session.model('project.task').fields_view_get.return_value = {
+            'arch': '''
+            <tree colors="grey:state in ('cancelled','done');blue:state == 'pending';red:date_deadline and (date_deadline&lt;current_date) and (state in ('draft','pending','open'))" string="Tasks">
+                <field name="sequence" invisible="not context.get('seq_visible', False)"/>
+                <field name="user_id" invisible="context.get('user_invisible', False)"/>
+                <field name="delegated_user_id" invisible="context.get('show_delegated', True)"/>
+                <field name="total_hours" invisible="1"/>
+                <field name="date_deadline" invisible="context.get('deadline_visible',True)"/>
+                <field name="type_id" invisible="context.get('set_visible',False)"/>
+            </tree>
+        '''}
+        parsed_view = base.controllers.main.View().fields_view_get(
+            req, 'project.task', 42, 'tree')
+
+        self.assertTrue(field_attrs(parsed_view, 'sequence')['invisible'])
+        self.assertTrue(field_attrs(parsed_view, 'user_id')['invisible'])
+        self.assertTrue(
+            field_attrs(parsed_view, 'delegated_user_id')['invisible'])
+        self.assertTrue(field_attrs(parsed_view, 'total_hours')['invisible'])
+        self.assertTrue(
+            field_attrs(parsed_view, 'date_deadline')['invisible'])
+        self.assertTrue(field_attrs(parsed_view, 'type_id')['invisible'])
+
diff --git a/addons/base_calendar/controllers/main.py b/addons/base_calendar/controllers/main.py
index 41081bc7cae..a54d75c5b9b 100644
--- a/addons/base_calendar/controllers/main.py
+++ b/addons/base_calendar/controllers/main.py
@@ -57,7 +57,7 @@ class CalendarView(View):
     
     @openerpweb.jsonrequest
     def load(self, req, model, view_id):
-        fields_view = self.fields_view_get(req.session, model, view_id, 'calendar')
+        fields_view = self.fields_view_get(req, model, view_id, 'calendar')
         return {'fields_view':fields_view}
     
     def convert(self, event):
@@ -354,4 +354,3 @@ class CalendarView(View):
         title = title.strip()
         description = ', '.join(description).strip()
         return {'id': event['id'], 'start_date': str(DT.datetime(*starts[:6])), 'end_date': str(DT.datetime(*ends[:6])), 'text': title, 'title': description, 'color': self.colors[event[self.color_field]][-1]}
-        
\ No newline at end of file

From 911369822abb9779193137301326e61242b9daa7 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 11 Apr 2011 13:14:51 +0200
Subject: [PATCH 121/331] [ADD] processing of context['set_editable'] on list
 view

bzr revid: xmo@openerp.com-20110411111451-5j6ve9f1wjiuzjfx
---
 addons/base/controllers/main.py   | 49 +++++++++++++++++++++++++++++++
 addons/base/static/src/js/list.js | 11 ++++++-
 addons/base/test/test_view.py     | 27 +++++++++++++++++
 3 files changed, 86 insertions(+), 1 deletion(-)

diff --git a/addons/base/controllers/main.py b/addons/base/controllers/main.py
index a8dc58625fa..36e9b0feaee 100644
--- a/addons/base/controllers/main.py
+++ b/addons/base/controllers/main.py
@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 import glob, os
+import pprint
 from xml.etree import ElementTree
 from cStringIO import StringIO
 
@@ -522,6 +523,54 @@ class ListView(View):
         fields_view = self.fields_view_get(req, model, view_id, 'tree', toolbar=toolbar)
         return {'fields_view': fields_view}
 
+    def fields_view_get(self, request, model, view_id, view_type="tree",
+                        transform=True, toolbar=False, submenu=False):
+        """ Sets @editable on the view's arch if it isn't already set and
+        ``set_editable`` is present in the request context
+        """
+        view = super(ListView, self).fields_view_get(
+            request, model, view_id, view_type, transform, toolbar, submenu)
+
+        view_attributes = view['arch']['attrs']
+        if request.context.get('set_editable')\
+                and 'editable' not in view_attributes:
+            view_attributes['editable'] = 'bottom'
+        return view
+
+    @openerpweb.jsonrequest
+    def fill(self, request, model, id, domain,
+             offset=0, limit=False):
+        return self.do_fill(request, model, id, domain, offset, limit)
+
+    def do_fill(self, request, model, id, domain,
+                offset=0, limit=False):
+        """ Returns all information needed to fill a table:
+
+        * view with processed ``editable`` flag
+        * fields (columns) with processed ``invisible`` flag
+        * rows with processed ``attrs`` and ``colors``
+
+        .. note:: context is passed through ``request`` parameter
+
+        :param request: OpenERP request
+        :type request: openerpweb.openerpweb.JsonRequest
+        :type str model: OpenERP model for this list view
+        :type int id: view_id, or False if none provided
+        :param list domain: the search domain to search for
+        :param int offset: search offset, for pagination
+        :param int limit: search limit, for pagination
+        :returns: hell if I have any idea yet
+        """
+        view = self.fields_view_get(request, model, id)
+
+        rows = DataSet().do_search_read(request, model,
+                                        offset=offset, limit=limit,
+                                        domain=domain)
+        # rows pipe
+        #   process_attrs
+        #   process_colors
+        return rows
+
 class SearchView(View):
     _cp_path = "/base/searchview"
 
diff --git a/addons/base/static/src/js/list.js b/addons/base/static/src/js/list.js
index 4fc3ef07720..247b2d535d9 100644
--- a/addons/base/static/src/js/list.js
+++ b/addons/base/static/src/js/list.js
@@ -160,7 +160,16 @@ openerp.base.ListView = openerp.base.Controller.extend(
             // TODO: handle non-empty results.group_by with read_group
             self.dataset.context = results.context;
             self.dataset.domain = results.domain;
-            self.dataset.read_slice(self.dataset.fields, 0, self.limit, self.do_fill_table);
+            // TODO: need to do 5 billion tons of pre-processing, bypass
+            // DataSet for now
+            //self.dataset.read_slice(self.dataset.fields, 0, self.limit,
+            // self.do_fill_table);
+            self.rpc('/base/listview/fill', {
+                'model': self.dataset.model,
+                'id': self.view_id,
+                'context': results.context,
+                'domain': results.domain
+            }, self.do_fill_table);
         });
     },
     do_update: function () {
diff --git a/addons/base/test/test_view.py b/addons/base/test/test_view.py
index d8f65ccff99..141bbd5e0db 100644
--- a/addons/base/test/test_view.py
+++ b/addons/base/test/test_view.py
@@ -178,3 +178,30 @@ class AttrsNormalizationTest(unittest2.TestCase):
             field_attrs(parsed_view, 'date_deadline')['invisible'])
         self.assertTrue(field_attrs(parsed_view, 'type_id')['invisible'])
 
+class ListViewTest(unittest2.TestCase):
+    def setUp(self):
+        self.view = base.controllers.main.ListView()
+        self.request = mock.Mock()
+        self.request.context = {'set_editable': True}
+    def test_no_editable_editable_context(self):
+        self.request.session.model('fake').fields_view_get.return_value = \
+            {'arch': '<tree><field name="foo"/></tree>'}
+        view = self.view.fields_view_get(self.request, 'fake', False)
+
+        self.assertEqual(view['arch']['attrs']['editable'],
+                         'bottom')
+    def test_editable_top_editable_context(self):
+        self.request.session.model('fake').fields_view_get.return_value = \
+            {'arch': '<tree editable="top"><field name="foo"/></tree>'}
+        view = self.view.fields_view_get(self.request, 'fake', False)
+
+        self.assertEqual(view['arch']['attrs']['editable'],
+                         'top')
+
+    def test_editable_bottom_editable_context(self):
+        self.request.session.model('fake').fields_view_get.return_value = \
+            {'arch': '<tree editable="bottom"><field name="foo"/></tree>'}
+        view = self.view.fields_view_get(self.request, 'fake', False)
+
+        self.assertEqual(view['arch']['attrs']['editable'],
+                         'bottom')

From 8ca75e0b11eb712d549d91064358bb816aeef0ec Mon Sep 17 00:00:00 2001
From: "noz (OpenERP)" <noz@tinyerp.com>
Date: Mon, 11 Apr 2011 16:45:38 +0530
Subject: [PATCH 122/331] [FIX] Sent first chat message to self.

bzr revid: noz@tinyerp.com-20110411111538-yxvexkoyldb5xrid
---
 addons/web_chat/controllers/main.py        | 33 ++++++++--------------
 addons/web_chat/static/lib/AjaxIM/js/im.js |  4 +--
 2 files changed, 13 insertions(+), 24 deletions(-)

diff --git a/addons/web_chat/controllers/main.py b/addons/web_chat/controllers/main.py
index ff5b95d6579..adb32c3a7a3 100644
--- a/addons/web_chat/controllers/main.py
+++ b/addons/web_chat/controllers/main.py
@@ -67,6 +67,7 @@ class PollServer(openerpweb.Controller):
             }
         """
         mq = req.applicationsession.setdefault("web_chat", PollServerMessageQueue())
+        mq.messages = []
         
         #r = 'logged in'
         #u = generate random.randint(0,2**32)
@@ -106,9 +107,9 @@ class PollServer(openerpweb.Controller):
     def poll(self, req, **kw):
         
         mq = req.applicationsession.setdefault("web_chat", PollServerMessageQueue())
-        print "================ poll ======= ", kw
-        # Long Polling
-        method = kw.get('method')
+        
+        # Method: Long Poll
+        
         """
         --> GET http://im.ajaxim.com/poll?callback=jsonp1302138663582&_1302138663582=
         <-- 200 OK
@@ -132,7 +133,7 @@ class PollServer(openerpweb.Controller):
 
         """
         
-        msg = []
+        msg = '[]'
         
         for i in range(5):
             received_msg = mq.read('Guest1', i);
@@ -140,27 +141,14 @@ class PollServer(openerpweb.Controller):
                 msg = self._pollParseMessages(received_msg)
                 time.sleep(1)
             else:
-                msg = []
+                msg = '[]'
                 time.sleep(1)
-            
-        # for i in range(60):
-            #r = mq.read(username,timestamp)
-            # if messages
-                # return r
-            # if no message sleep 2s and retry
-                # sleep 2
-        # else
-            # return emptylist
 
-        msg = '[{"t":"m","s":"Guest130214008855.5","r":"Guest130214013134.26","m":"xxxxxx"}]'
-
-#        # it's http://localhost:8002/web_chat/pollserver/poll?method=long?callback=jsonp1302147330483&_1302147330483=
-        
-        return '%s'%kw.get('callback', '') + '(' + msg + ');'
+        # it's http://localhost:8002/web_chat/pollserver/poll?callback=jsonp1302147330483&_1302147330483=
+        return '%s'%kw.get('callback', '') + '(' + str(msg) + ');'
         
     @openerpweb.httprequest
     def send(self, req, **kw):
-        print "========= send ========", kw
         
         to = kw.get('to')
         message = kw.get('message')
@@ -192,7 +180,7 @@ class PollServer(openerpweb.Controller):
         
         if message:
             mq.write(m_type="m",  m_from=req.applicationsession['current_user'], m_to=to, m_message=message, m_group="Users")        
-            return {'r': 'sent'}
+            return '%s'%kw.get('callback', '') + '(' + simplejson.dumps({'r': 'sent'}) + ')'
         else:
             return {'r': 'error', 'e': 'send error'}
 
@@ -221,7 +209,8 @@ class PollServer(openerpweb.Controller):
     def _pollParseMessages(self, messages):
         msg_arr = []
         for msg in messages:
-            msg_arr.append({'t': msg['type'], 's': msg['from'], 'r': msg['to'], 'm': msg['message']})
+            msg_arr.append({"t": str(msg['type']), "s": str(msg['from']), "r": str(msg['to']), "m": str(msg['message'])})
+            
         return msg_arr
     
     def _sanitize(self, message):
diff --git a/addons/web_chat/static/lib/AjaxIM/js/im.js b/addons/web_chat/static/lib/AjaxIM/js/im.js
index 42c3f743204..9ab195fd6b6 100644
--- a/addons/web_chat/static/lib/AjaxIM/js/im.js
+++ b/addons/web_chat/static/lib/AjaxIM/js/im.js
@@ -105,7 +105,7 @@
                 login: this.settings.pollServer + '/login',
                 logout: this.settings.pollServer + '/logout',
                 register: this.settings.pollServer + '/register',
-                poll: this.settings.pollServer + '/poll?method=' + this.settings.pollType,
+                poll: this.settings.pollServer + '/poll',
                 send: this.settings.pollServer + '/send',
                 status: this.settings.pollServer + '/status',
                 resume: this.settings.pollServer + '/resume'
@@ -116,7 +116,7 @@
                 queryStrRx = new RegExp('[?](.+)$'),
                 subdomainRx = new RegExp('((http[s]?:)?//)?(.+?)[.]' + window.location.host, 'i');
             $.each(this.actions, function(name, action) {
-                if(name == 'poll') {
+                if(name == 'poll' || name == 'send') {
                     if(self.settings.pollType != 'comet')
                         action += (queryStrRx.test(action[1]) ? '&' : '?') + 'callback=?';
                         

From 86c1b252e69224c39851598d68acc5a6ead6b5c9 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Mon, 11 Apr 2011 13:35:16 +0200
Subject: [PATCH 123/331] [ADD] Added record creation. Refactored form view.

bzr revid: fme@openerp.com-20110411113516-s8ydhmknehgbwp2n
---
 addons/base/controllers/main.py   |   6 ++
 addons/base/static/src/js/data.js |   7 +-
 addons/base/static/src/js/form.js | 135 +++++++++++++++++-------------
 3 files changed, 89 insertions(+), 59 deletions(-)

diff --git a/addons/base/controllers/main.py b/addons/base/controllers/main.py
index 96782c1cec4..83dae67b2ba 100644
--- a/addons/base/controllers/main.py
+++ b/addons/base/controllers/main.py
@@ -382,6 +382,12 @@ class DataSet(openerpweb.Controller):
             value = r[0]
         return {'value': value}
 
+    @openerpweb.jsonrequest
+    def create(self, req, model, data, context={}):
+        m = req.session.model(model)
+        r = m.create(data, context)
+        return {'result': r}
+
     @openerpweb.jsonrequest
     def save(self, req, model, id, data, context={}):
         m = req.session.model(model)
diff --git a/addons/base/static/src/js/data.js b/addons/base/static/src/js/data.js
index c16bf8eb81b..7b1a930c88f 100644
--- a/addons/base/static/src/js/data.js
+++ b/addons/base/static/src/js/data.js
@@ -89,7 +89,12 @@ openerp.base.DataSet =  openerp.base.Controller.extend( /** @lends openerp.base.
             context: this.context
         }, callback);
     },
-    create: function() {
+    create: function(data, callback) {
+        return this.rpc('/base/dataset/create', {
+            model: this.model,
+            data: data,
+            context: this.context
+        }, callback);
     },
     write: function (id, data, callback) {
         return this.rpc('/base/dataset/save', {
diff --git a/addons/base/static/src/js/form.js b/addons/base/static/src/js/form.js
index e31f03510d8..3de0bbfd32a 100644
--- a/addons/base/static/src/js/form.js
+++ b/addons/base/static/src/js/form.js
@@ -27,6 +27,7 @@ openerp.base.FormView =  openerp.base.Controller.extend( /** @lends openerp.base
         this.fields = {};
         this.datarecord = {};
         this.ready = false;
+        this.show_invalid = true;
     },
     start: function() {
         //this.log('Starting FormView '+this.model+this.view_id)
@@ -69,16 +70,18 @@ openerp.base.FormView =  openerp.base.Controller.extend( /** @lends openerp.base
         if (record) {
             this.datarecord = record;
             for (var f in this.fields) {
-                this.fields[f].set_value(this.datarecord[f]);
+                this.fields[f].set_value(this.datarecord[f] || false);
+                this.fields[f].validate();
             }
             if (!record.id) {
+                this.show_invalid = false;
                 // Second pass in order to trigger the onchanges in case of new record
                 for (var f in record) {
-                    this.fields[f].on_ui_change();
+                    this.on_form_changed(this.fields[f]);
                 }
             }
             this.on_form_changed();
-            this.ready = true;
+            this.show_invalid = this.ready = true;
         } else {
             this.log("No record received");
         }
@@ -197,6 +200,7 @@ openerp.base.FormView =  openerp.base.Controller.extend( /** @lends openerp.base
         });
     },
     do_save: function() {
+        var self = this;
         if (!this.ready) {
             return false;
         }
@@ -206,6 +210,7 @@ openerp.base.FormView =  openerp.base.Controller.extend( /** @lends openerp.base
             f = this.fields[f];
             if (f.invalid) {
                 invalid = true;
+                f.update_dom();
             } else if (f.touched) {
                 values[f.name] = f.get_value();
             }
@@ -214,13 +219,19 @@ openerp.base.FormView =  openerp.base.Controller.extend( /** @lends openerp.base
             this.on_invalid();
         } else {
             this.log("About to save", values);
-            this.dataset.write(this.datarecord.id, values, this.on_saved);
+            if (!this.datarecord.id) {
+                this.dataset.create(values, function() {
+                    self.datarecord.id = arguments[0].result;
+                    self.on_saved.apply(self, arguments);
+                });
+            } else {
+                this.dataset.write(this.datarecord.id, values, this.on_saved);
+            }
         }
     },
     do_save_edit: function() {
-        if (this.do_save()) {
-            this.switch_readonly();
-        }
+        this.do_save();
+        //this.switch_readonly(); Use promises
     },
     switch_readonly: function() {
     },
@@ -499,6 +510,9 @@ openerp.base.form.Field = openerp.base.form.Widget.extend({
         this.invalid = false;
         this.update_dom();
     },
+    set_value_from_ui: function() {
+        this.value = undefined;
+    },
     get_value: function() {
         return this.value;
     },
@@ -506,10 +520,17 @@ openerp.base.form.Field = openerp.base.form.Widget.extend({
         this._super.apply(this, arguments);
         this.$element.toggleClass('disabled', this.readonly);
         this.$element.toggleClass('required', this.required);
-        this.$element.toggleClass('invalid', this.invalid);
+        if (this.view.show_invalid) {
+            this.$element.toggleClass('invalid', this.invalid);
+        }
     },
     on_ui_change: function() {
         this.touched = true;
+        this.set_value_from_ui();
+        this.validate();
+        this.view.on_form_changed(this);
+    },
+    validate: function() {
     }
 });
 
@@ -531,31 +552,41 @@ openerp.base.form.FieldChar = openerp.base.form.Field.extend({
         this._super.apply(this, arguments);
         this.$element.find('input').attr('disabled', this.readonly);
     },
-    on_ui_change: function() {
-        this._super.apply(this, arguments);
+    set_value_from_ui: function() {
         this.value = this.$element.find('input').val();
-        this.invalid = this.required && this.value == "";
-        this.view.on_form_changed(this);
+    },
+    validate: function() {
+        this.invalid = false;
+        if (this.value === false || this.value === "") {
+            this.invalid = this.required;
+        } else if (this.validation_regex) {
+            this.invalid = !this.validation_regex.test(this.value);
+        }
     }
 });
 
 openerp.base.form.FieldEmail = openerp.base.form.FieldChar.extend({
+    init: function(view, node) {
+        this._super(view, node);
+        this.validation_regex = /@/;
+    }
 });
 
 openerp.base.form.FieldUrl = openerp.base.form.FieldChar.extend({
 });
 
 openerp.base.form.FieldFloat = openerp.base.form.FieldChar.extend({
+    init: function(view, node) {
+        this._super(view, node);
+        this.validation_regex = /^\d+(\.\d+)?$/;
+    },
     set_value: function(value) {
         this._super.apply(this, arguments);
         var show_value = (value != null && value !== false) ? value.toFixed(2) : '';
-        this.$element.find('input').val(value);
+        this.$element.find('input').val(show_value);
     },
-    on_ui_change: function() {
-        this._super.apply(this, arguments);
+    set_value_from_ui: function() {
         this.value = this.$element.find('input').val().replace(/,/g, '.');
-        this.invalid = (this.required && this.value == "") || !this.value.match(/^\d+(\.\d+)?$/) ;
-        this.view.on_form_changed(this);
     }
 });
 
@@ -563,23 +594,13 @@ openerp.base.form.FieldDate = openerp.base.form.FieldChar.extend({
     init: function(view, node) {
         this._super(view, node);
         this.template = "FieldDate";
+        this.validation_regex = /^\d+-\d+-\d+$/;
     },
     start: function() {
         this._super.apply(this, arguments);
         this.$element.find('input').change(this.on_ui_change).datepicker({
             dateFormat: 'yy-mm-dd'
         });
-    },
-    set_value: function(value) {
-        this._super.apply(this, arguments);
-        var show_value = (value != null && value !== false) ? value : '';
-        this.$element.find('input').val(show_value);
-    },
-    on_ui_change: function() {
-        this._super.apply(this, arguments);
-        this.value = this.$element.find('input').val();
-        this.invalid = this.required && this.value == "";
-        this.view.on_form_changed(this);
     }
 });
 
@@ -587,6 +608,7 @@ openerp.base.form.FieldDatetime = openerp.base.form.FieldChar.extend({
     init: function(view, node) {
         this._super(view, node);
         this.template = "FieldDatetime";
+        this.validation_regex = /^\d+-\d+-\d+( \d+:\d+(:\d+)?)?$/;
     },
     start: function() {
         this._super.apply(this, arguments);
@@ -594,17 +616,6 @@ openerp.base.form.FieldDatetime = openerp.base.form.FieldChar.extend({
             dateFormat: 'yy-mm-dd',
             timeFormat: 'hh:mm:ss'
         });
-    },
-    set_value: function(value) {
-        this._super.apply(this, arguments);
-        var show_value = (value != null && value !== false) ? value : '';
-        this.$element.find('input').val(show_value);
-    },
-    on_ui_change: function() {
-        this._super.apply(this, arguments);
-        this.value = this.$element.find('input').val();
-        this.invalid = this.required && this.value == "";
-        this.view.on_form_changed(this);
     }
 });
 
@@ -612,6 +623,7 @@ openerp.base.form.FieldText = openerp.base.form.Field.extend({
     init: function(view, node) {
         this._super(view, node);
         this.template = "FieldText";
+        this.validation_regex = null;
     },
     start: function() {
         this._super.apply(this, arguments);
@@ -626,11 +638,16 @@ openerp.base.form.FieldText = openerp.base.form.Field.extend({
         this._super.apply(this, arguments);
         this.$element.find('textarea').attr('disabled', this.readonly);
     },
-    on_ui_change: function() {
-        this._super.apply(this, arguments);
+    set_value_from_ui: function() {
         this.value = this.$element.find('textarea').val();
-        this.invalid = this.required && this.value == "";
-        this.view.on_form_changed(this);
+    },
+    validate: function() {
+        this.invalid = false;
+        if (this.value === false || this.value === "") {
+            this.invalid = this.required;
+        } else if (this.validation_regex) {
+            this.invalid = !this.validation_regex.test(this.value);
+        }
     }
 });
 
@@ -652,15 +669,15 @@ openerp.base.form.FieldBoolean = openerp.base.form.Field.extend({
         this._super.apply(this, arguments);
         this.$element.find('input')[0].checked = value;
     },
+    set_value_from_ui: function() {
+        this.value = this.$element.find('input').is(':checked');
+    },
     update_dom: function() {
         this._super.apply(this, arguments);
-        this.$element.find('textarea').attr('disabled', this.readonly);
+        this.$element.find('input').attr('disabled', this.readonly);
     },
-    on_ui_change: function() {
-        this._super.apply(this, arguments);
-        this.value = this.$element.find('input').is(':checked');
+    validate: function() {
         this.invalid = this.required && !this.value;
-        this.view.on_form_changed(this);
     }
 });
 
@@ -685,15 +702,15 @@ openerp.base.form.FieldSelection = openerp.base.form.Field.extend({
             this.$element.find('select')[0].selectedIndex = 0;
         }
     },
+    set_value_from_ui: function() {
+        this.value = this.$element.find('select').val();
+    },
     update_dom: function() {
         this._super.apply(this, arguments);
         this.$element.find('select').attr('disabled', this.readonly);
     },
-    on_ui_change: function() {
-        this._super.apply(this, arguments);
-        this.value = this.$element.find('select').val();
-        this.invalid = this.required && this.value == "";
-        this.view.on_form_changed(this);
+    validate: function() {
+        this.invalid = this.required && this.value === "";
     }
 });
 
@@ -744,12 +761,14 @@ openerp.base.form.FieldOne2Many = openerp.base.form.Field.extend({
         this.viewmanager = new openerp.base.form.FieldOne2ManyViewManager(this.view.session, this.element_id, this.dataset, views);
         this.viewmanager.start();
     },
-    set_value_CASSEEEEEEEEEEEEEEEEE: function(value) {
+    set_value: function(value) {
         this.value = value;
-        this.log("o2m.set_value",value);
-        this.viewmanager.dataset.ids = value;
-        this.viewmanager.dataset.ids.count = value.length;
-        this.viewmanager.views.list.controller.do_update();
+        if (value != false) {
+            this.log("o2m.set_value",value);
+            this.viewmanager.dataset.ids = value;
+            this.viewmanager.dataset.count = value.length;
+            this.viewmanager.views.list.controller.do_update();
+        }
     },
     get_value: function(value) {
         return this.operations;

From bfacf53e04731b039c79e1c442e6843f6e12b629 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Mon, 11 Apr 2011 13:45:29 +0200
Subject: [PATCH 124/331] [IMP] Open new window.

bzr revid: nicolas.vanhoren@openerp.com-20110411114529-332vb6wtrocrwjm0
---
 .../static/lib/jquery.ba-bbq/jquery.ba-bbq.js | 1137 +++++++++++++++++
 .../lib/jquery.ba-bbq/jquery.ba-bbq.min.js    |   18 +
 addons/base/static/src/base.html              |    1 +
 addons/base/static/src/js/views.js            |    5 +-
 4 files changed, 1159 insertions(+), 2 deletions(-)
 create mode 100644 addons/base/static/lib/jquery.ba-bbq/jquery.ba-bbq.js
 create mode 100644 addons/base/static/lib/jquery.ba-bbq/jquery.ba-bbq.min.js

diff --git a/addons/base/static/lib/jquery.ba-bbq/jquery.ba-bbq.js b/addons/base/static/lib/jquery.ba-bbq/jquery.ba-bbq.js
new file mode 100644
index 00000000000..f251123acd7
--- /dev/null
+++ b/addons/base/static/lib/jquery.ba-bbq/jquery.ba-bbq.js
@@ -0,0 +1,1137 @@
+/*!
+ * jQuery BBQ: Back Button & Query Library - v1.2.1 - 2/17/2010
+ * http://benalman.com/projects/jquery-bbq-plugin/
+ * 
+ * Copyright (c) 2010 "Cowboy" Ben Alman
+ * Dual licensed under the MIT and GPL licenses.
+ * http://benalman.com/about/license/
+ */
+
+// Script: jQuery BBQ: Back Button & Query Library
+//
+// *Version: 1.2.1, Last updated: 2/17/2010*
+// 
+// Project Home - http://benalman.com/projects/jquery-bbq-plugin/
+// GitHub       - http://github.com/cowboy/jquery-bbq/
+// Source       - http://github.com/cowboy/jquery-bbq/raw/master/jquery.ba-bbq.js
+// (Minified)   - http://github.com/cowboy/jquery-bbq/raw/master/jquery.ba-bbq.min.js (4.0kb)
+// 
+// About: License
+// 
+// Copyright (c) 2010 "Cowboy" Ben Alman,
+// Dual licensed under the MIT and GPL licenses.
+// http://benalman.com/about/license/
+// 
+// About: Examples
+// 
+// These working examples, complete with fully commented code, illustrate a few
+// ways in which this plugin can be used.
+// 
+// Basic AJAX     - http://benalman.com/code/projects/jquery-bbq/examples/fragment-basic/
+// Advanced AJAX  - http://benalman.com/code/projects/jquery-bbq/examples/fragment-advanced/
+// jQuery UI Tabs - http://benalman.com/code/projects/jquery-bbq/examples/fragment-jquery-ui-tabs/
+// Deparam        - http://benalman.com/code/projects/jquery-bbq/examples/deparam/
+// 
+// About: Support and Testing
+// 
+// Information about what version or versions of jQuery this plugin has been
+// tested with, what browsers it has been tested in, and where the unit tests
+// reside (so you can test it yourself).
+// 
+// jQuery Versions - 1.3.2, 1.4.1, 1.4.2
+// Browsers Tested - Internet Explorer 6-8, Firefox 2-3.7, Safari 3-4,
+//                   Chrome 4-5, Opera 9.6-10.1.
+// Unit Tests      - http://benalman.com/code/projects/jquery-bbq/unit/
+// 
+// About: Release History
+// 
+// 1.2.1 - (2/17/2010) Actually fixed the stale window.location Safari bug from
+//         <jQuery hashchange event> in BBQ, which was the main reason for the
+//         previous release!
+// 1.2   - (2/16/2010) Integrated <jQuery hashchange event> v1.2, which fixes a
+//         Safari bug, the event can now be bound before DOM ready, and IE6/7
+//         page should no longer scroll when the event is first bound. Also
+//         added the <jQuery.param.fragment.noEscape> method, and reworked the
+//         <hashchange event (BBQ)> internal "add" method to be compatible with
+//         changes made to the jQuery 1.4.2 special events API.
+// 1.1.1 - (1/22/2010) Integrated <jQuery hashchange event> v1.1, which fixes an
+//         obscure IE8 EmulateIE7 meta tag compatibility mode bug.
+// 1.1   - (1/9/2010) Broke out the jQuery BBQ event.special <hashchange event>
+//         functionality into a separate plugin for users who want just the
+//         basic event & back button support, without all the extra awesomeness
+//         that BBQ provides. This plugin will be included as part of jQuery BBQ,
+//         but also be available separately. See <jQuery hashchange event>
+//         plugin for more information. Also added the <jQuery.bbq.removeState>
+//         method and added additional <jQuery.deparam> examples.
+// 1.0.3 - (12/2/2009) Fixed an issue in IE 6 where location.search and
+//         location.hash would report incorrectly if the hash contained the ?
+//         character. Also <jQuery.param.querystring> and <jQuery.param.fragment>
+//         will no longer parse params out of a URL that doesn't contain ? or #,
+//         respectively.
+// 1.0.2 - (10/10/2009) Fixed an issue in IE 6/7 where the hidden IFRAME caused
+//         a "This page contains both secure and nonsecure items." warning when
+//         used on an https:// page.
+// 1.0.1 - (10/7/2009) Fixed an issue in IE 8. Since both "IE7" and "IE8
+//         Compatibility View" modes erroneously report that the browser
+//         supports the native window.onhashchange event, a slightly more
+//         robust test needed to be added.
+// 1.0   - (10/2/2009) Initial release
+
+(function($,window){
+  '$:nomunge'; // Used by YUI compressor.
+  
+  // Some convenient shortcuts.
+  var undefined,
+    aps = Array.prototype.slice,
+    decode = decodeURIComponent,
+    
+    // Method / object references.
+    jq_param = $.param,
+    jq_param_fragment,
+    jq_deparam,
+    jq_deparam_fragment,
+    jq_bbq = $.bbq = $.bbq || {},
+    jq_bbq_pushState,
+    jq_bbq_getState,
+    jq_elemUrlAttr,
+    jq_event_special = $.event.special,
+    
+    // Reused strings.
+    str_hashchange = 'hashchange',
+    str_querystring = 'querystring',
+    str_fragment = 'fragment',
+    str_elemUrlAttr = 'elemUrlAttr',
+    str_location = 'location',
+    str_href = 'href',
+    str_src = 'src',
+    
+    // Reused RegExp.
+    re_trim_querystring = /^.*\?|#.*$/g,
+    re_trim_fragment = /^.*\#/,
+    re_no_escape,
+    
+    // Used by jQuery.elemUrlAttr.
+    elemUrlAttr_cache = {};
+  
+  // A few commonly used bits, broken out to help reduce minified file size.
+  
+  function is_string( arg ) {
+    return typeof arg === 'string';
+  };
+  
+  // Why write the same function twice? Let's curry! Mmmm, curry..
+  
+  function curry( func ) {
+    var args = aps.call( arguments, 1 );
+    
+    return function() {
+      return func.apply( this, args.concat( aps.call( arguments ) ) );
+    };
+  };
+  
+  // Get location.hash (or what you'd expect location.hash to be) sans any
+  // leading #. Thanks for making this necessary, Firefox!
+  function get_fragment( url ) {
+    return url.replace( /^[^#]*#?(.*)$/, '$1' );
+  };
+  
+  // Get location.search (or what you'd expect location.search to be) sans any
+  // leading #. Thanks for making this necessary, IE6!
+  function get_querystring( url ) {
+    return url.replace( /(?:^[^?#]*\?([^#]*).*$)?.*/, '$1' );
+  };
+  
+  // Section: Param (to string)
+  // 
+  // Method: jQuery.param.querystring
+  // 
+  // Retrieve the query string from a URL or if no arguments are passed, the
+  // current window.location.
+  // 
+  // Usage:
+  // 
+  // > jQuery.param.querystring( [ url ] );
+  // 
+  // Arguments:
+  // 
+  //  url - (String) A URL containing query string params to be parsed. If url
+  //    is not passed, the current window.location is used.
+  // 
+  // Returns:
+  // 
+  //  (String) The parsed query string, with any leading "?" removed.
+  //
+  
+  // Method: jQuery.param.querystring (build url)
+  // 
+  // Merge a URL, with or without pre-existing query string params, plus any
+  // object, params string or URL containing query string params into a new URL.
+  // 
+  // Usage:
+  // 
+  // > jQuery.param.querystring( url, params [, merge_mode ] );
+  // 
+  // Arguments:
+  // 
+  //  url - (String) A valid URL for params to be merged into. This URL may
+  //    contain a query string and/or fragment (hash).
+  //  params - (String) A params string or URL containing query string params to
+  //    be merged into url.
+  //  params - (Object) A params object to be merged into url.
+  //  merge_mode - (Number) Merge behavior defaults to 0 if merge_mode is not
+  //    specified, and is as-follows:
+  // 
+  //    * 0: params in the params argument will override any query string
+  //         params in url.
+  //    * 1: any query string params in url will override params in the params
+  //         argument.
+  //    * 2: params argument will completely replace any query string in url.
+  // 
+  // Returns:
+  // 
+  //  (String) Either a params string with urlencoded data or a URL with a
+  //    urlencoded query string in the format 'a=b&c=d&e=f'.
+  
+  // Method: jQuery.param.fragment
+  // 
+  // Retrieve the fragment (hash) from a URL or if no arguments are passed, the
+  // current window.location.
+  // 
+  // Usage:
+  // 
+  // > jQuery.param.fragment( [ url ] );
+  // 
+  // Arguments:
+  // 
+  //  url - (String) A URL containing fragment (hash) params to be parsed. If
+  //    url is not passed, the current window.location is used.
+  // 
+  // Returns:
+  // 
+  //  (String) The parsed fragment (hash) string, with any leading "#" removed.
+  
+  // Method: jQuery.param.fragment (build url)
+  // 
+  // Merge a URL, with or without pre-existing fragment (hash) params, plus any
+  // object, params string or URL containing fragment (hash) params into a new
+  // URL.
+  // 
+  // Usage:
+  // 
+  // > jQuery.param.fragment( url, params [, merge_mode ] );
+  // 
+  // Arguments:
+  // 
+  //  url - (String) A valid URL for params to be merged into. This URL may
+  //    contain a query string and/or fragment (hash).
+  //  params - (String) A params string or URL containing fragment (hash) params
+  //    to be merged into url.
+  //  params - (Object) A params object to be merged into url.
+  //  merge_mode - (Number) Merge behavior defaults to 0 if merge_mode is not
+  //    specified, and is as-follows:
+  // 
+  //    * 0: params in the params argument will override any fragment (hash)
+  //         params in url.
+  //    * 1: any fragment (hash) params in url will override params in the
+  //         params argument.
+  //    * 2: params argument will completely replace any query string in url.
+  // 
+  // Returns:
+  // 
+  //  (String) Either a params string with urlencoded data or a URL with a
+  //    urlencoded fragment (hash) in the format 'a=b&c=d&e=f'.
+  
+  function jq_param_sub( is_fragment, get_func, url, params, merge_mode ) {
+    var result,
+      qs,
+      matches,
+      url_params,
+      hash;
+    
+    if ( params !== undefined ) {
+      // Build URL by merging params into url string.
+      
+      // matches[1] = url part that precedes params, not including trailing ?/#
+      // matches[2] = params, not including leading ?/#
+      // matches[3] = if in 'querystring' mode, hash including leading #, otherwise ''
+      matches = url.match( is_fragment ? /^([^#]*)\#?(.*)$/ : /^([^#?]*)\??([^#]*)(#?.*)/ );
+      
+      // Get the hash if in 'querystring' mode, and it exists.
+      hash = matches[3] || '';
+      
+      if ( merge_mode === 2 && is_string( params ) ) {
+        // If merge_mode is 2 and params is a string, merge the fragment / query
+        // string into the URL wholesale, without converting it into an object.
+        qs = params.replace( is_fragment ? re_trim_fragment : re_trim_querystring, '' );
+        
+      } else {
+        // Convert relevant params in url to object.
+        url_params = jq_deparam( matches[2] );
+        
+        params = is_string( params )
+          
+          // Convert passed params string into object.
+          ? jq_deparam[ is_fragment ? str_fragment : str_querystring ]( params )
+          
+          // Passed params object.
+          : params;
+        
+        qs = merge_mode === 2 ? params                              // passed params replace url params
+          : merge_mode === 1  ? $.extend( {}, params, url_params )  // url params override passed params
+          : $.extend( {}, url_params, params );                     // passed params override url params
+        
+        // Convert params object to a string.
+        qs = jq_param( qs );
+        
+        // Unescape characters specified via $.param.noEscape. Since only hash-
+        // history users have requested this feature, it's only enabled for
+        // fragment-related params strings.
+        if ( is_fragment ) {
+          qs = qs.replace( re_no_escape, decode );
+        }
+      }
+      
+      // Build URL from the base url, querystring and hash. In 'querystring'
+      // mode, ? is only added if a query string exists. In 'fragment' mode, #
+      // is always added.
+      result = matches[1] + ( is_fragment ? '#' : qs || !matches[1] ? '?' : '' ) + qs + hash;
+      
+    } else {
+      // If URL was passed in, parse params from URL string, otherwise parse
+      // params from window.location.
+      result = get_func( url !== undefined ? url : window[ str_location ][ str_href ] );
+    }
+    
+    return result;
+  };
+  
+  jq_param[ str_querystring ]                  = curry( jq_param_sub, 0, get_querystring );
+  jq_param[ str_fragment ] = jq_param_fragment = curry( jq_param_sub, 1, get_fragment );
+  
+  // Method: jQuery.param.fragment.noEscape
+  // 
+  // Specify characters that will be left unescaped when fragments are created
+  // or merged using <jQuery.param.fragment>, or when the fragment is modified
+  // using <jQuery.bbq.pushState>. This option only applies to serialized data
+  // object fragments, and not set-as-string fragments. Does not affect the
+  // query string. Defaults to ",/" (comma, forward slash).
+  // 
+  // Note that this is considered a purely aesthetic option, and will help to
+  // create URLs that "look pretty" in the address bar or bookmarks, without
+  // affecting functionality in any way. That being said, be careful to not
+  // unescape characters that are used as delimiters or serve a special
+  // purpose, such as the "#?&=+" (octothorpe, question mark, ampersand,
+  // equals, plus) characters.
+  // 
+  // Usage:
+  // 
+  // > jQuery.param.fragment.noEscape( [ chars ] );
+  // 
+  // Arguments:
+  // 
+  //  chars - (String) The characters to not escape in the fragment. If
+  //    unspecified, defaults to empty string (escape all characters).
+  // 
+  // Returns:
+  // 
+  //  Nothing.
+  
+  jq_param_fragment.noEscape = function( chars ) {
+    chars = chars || '';
+    var arr = $.map( chars.split(''), encodeURIComponent );
+    re_no_escape = new RegExp( arr.join('|'), 'g' );
+  };
+  
+  // A sensible default. These are the characters people seem to complain about
+  // "uglifying up the URL" the most.
+  jq_param_fragment.noEscape( ',/' );
+  
+  // Section: Deparam (from string)
+  // 
+  // Method: jQuery.deparam
+  // 
+  // Deserialize a params string into an object, optionally coercing numbers,
+  // booleans, null and undefined values; this method is the counterpart to the
+  // internal jQuery.param method.
+  // 
+  // Usage:
+  // 
+  // > jQuery.deparam( params [, coerce ] );
+  // 
+  // Arguments:
+  // 
+  //  params - (String) A params string to be parsed.
+  //  coerce - (Boolean) If true, coerces any numbers or true, false, null, and
+  //    undefined to their actual value. Defaults to false if omitted.
+  // 
+  // Returns:
+  // 
+  //  (Object) An object representing the deserialized params string.
+  
+  $.deparam = jq_deparam = function( params, coerce ) {
+    var obj = {},
+      coerce_types = { 'true': !0, 'false': !1, 'null': null };
+    
+    // Iterate over all name=value pairs.
+    $.each( params.replace( /\+/g, ' ' ).split( '&' ), function(j,v){
+      var param = v.split( '=' ),
+        key = decode( param[0] ),
+        val,
+        cur = obj,
+        i = 0,
+        
+        // If key is more complex than 'foo', like 'a[]' or 'a[b][c]', split it
+        // into its component parts.
+        keys = key.split( '][' ),
+        keys_last = keys.length - 1;
+      
+      // If the first keys part contains [ and the last ends with ], then []
+      // are correctly balanced.
+      if ( /\[/.test( keys[0] ) && /\]$/.test( keys[ keys_last ] ) ) {
+        // Remove the trailing ] from the last keys part.
+        keys[ keys_last ] = keys[ keys_last ].replace( /\]$/, '' );
+        
+        // Split first keys part into two parts on the [ and add them back onto
+        // the beginning of the keys array.
+        keys = keys.shift().split('[').concat( keys );
+        
+        keys_last = keys.length - 1;
+      } else {
+        // Basic 'foo' style key.
+        keys_last = 0;
+      }
+      
+      // Are we dealing with a name=value pair, or just a name?
+      if ( param.length === 2 ) {
+        val = decode( param[1] );
+        
+        // Coerce values.
+        if ( coerce ) {
+          val = val && !isNaN(val)            ? +val              // number
+            : val === 'undefined'             ? undefined         // undefined
+            : coerce_types[val] !== undefined ? coerce_types[val] // true, false, null
+            : val;                                                // string
+        }
+        
+        if ( keys_last ) {
+          // Complex key, build deep object structure based on a few rules:
+          // * The 'cur' pointer starts at the object top-level.
+          // * [] = array push (n is set to array length), [n] = array if n is 
+          //   numeric, otherwise object.
+          // * If at the last keys part, set the value.
+          // * For each keys part, if the current level is undefined create an
+          //   object or array based on the type of the next keys part.
+          // * Move the 'cur' pointer to the next level.
+          // * Rinse & repeat.
+          for ( ; i <= keys_last; i++ ) {
+            key = keys[i] === '' ? cur.length : keys[i];
+            cur = cur[key] = i < keys_last
+              ? cur[key] || ( keys[i+1] && isNaN( keys[i+1] ) ? {} : [] )
+              : val;
+          }
+          
+        } else {
+          // Simple key, even simpler rules, since only scalars and shallow
+          // arrays are allowed.
+          
+          if ( $.isArray( obj[key] ) ) {
+            // val is already an array, so push on the next value.
+            obj[key].push( val );
+            
+          } else if ( obj[key] !== undefined ) {
+            // val isn't an array, but since a second value has been specified,
+            // convert val into an array.
+            obj[key] = [ obj[key], val ];
+            
+          } else {
+            // val is a scalar.
+            obj[key] = val;
+          }
+        }
+        
+      } else if ( key ) {
+        // No value was defined, so set something meaningful.
+        obj[key] = coerce
+          ? undefined
+          : '';
+      }
+    });
+    
+    return obj;
+  };
+  
+  // Method: jQuery.deparam.querystring
+  // 
+  // Parse the query string from a URL or the current window.location,
+  // deserializing it into an object, optionally coercing numbers, booleans,
+  // null and undefined values.
+  // 
+  // Usage:
+  // 
+  // > jQuery.deparam.querystring( [ url ] [, coerce ] );
+  // 
+  // Arguments:
+  // 
+  //  url - (String) An optional params string or URL containing query string
+  //    params to be parsed. If url is omitted, the current window.location
+  //    is used.
+  //  coerce - (Boolean) If true, coerces any numbers or true, false, null, and
+  //    undefined to their actual value. Defaults to false if omitted.
+  // 
+  // Returns:
+  // 
+  //  (Object) An object representing the deserialized params string.
+  
+  // Method: jQuery.deparam.fragment
+  // 
+  // Parse the fragment (hash) from a URL or the current window.location,
+  // deserializing it into an object, optionally coercing numbers, booleans,
+  // null and undefined values.
+  // 
+  // Usage:
+  // 
+  // > jQuery.deparam.fragment( [ url ] [, coerce ] );
+  // 
+  // Arguments:
+  // 
+  //  url - (String) An optional params string or URL containing fragment (hash)
+  //    params to be parsed. If url is omitted, the current window.location
+  //    is used.
+  //  coerce - (Boolean) If true, coerces any numbers or true, false, null, and
+  //    undefined to their actual value. Defaults to false if omitted.
+  // 
+  // Returns:
+  // 
+  //  (Object) An object representing the deserialized params string.
+  
+  function jq_deparam_sub( is_fragment, url_or_params, coerce ) {
+    if ( url_or_params === undefined || typeof url_or_params === 'boolean' ) {
+      // url_or_params not specified.
+      coerce = url_or_params;
+      url_or_params = jq_param[ is_fragment ? str_fragment : str_querystring ]();
+    } else {
+      url_or_params = is_string( url_or_params )
+        ? url_or_params.replace( is_fragment ? re_trim_fragment : re_trim_querystring, '' )
+        : url_or_params;
+    }
+    
+    return jq_deparam( url_or_params, coerce );
+  };
+  
+  jq_deparam[ str_querystring ]                    = curry( jq_deparam_sub, 0 );
+  jq_deparam[ str_fragment ] = jq_deparam_fragment = curry( jq_deparam_sub, 1 );
+  
+  // Section: Element manipulation
+  // 
+  // Method: jQuery.elemUrlAttr
+  // 
+  // Get the internal "Default URL attribute per tag" list, or augment the list
+  // with additional tag-attribute pairs, in case the defaults are insufficient.
+  // 
+  // In the <jQuery.fn.querystring> and <jQuery.fn.fragment> methods, this list
+  // is used to determine which attribute contains the URL to be modified, if
+  // an "attr" param is not specified.
+  // 
+  // Default Tag-Attribute List:
+  // 
+  //  a      - href
+  //  base   - href
+  //  iframe - src
+  //  img    - src
+  //  input  - src
+  //  form   - action
+  //  link   - href
+  //  script - src
+  // 
+  // Usage:
+  // 
+  // > jQuery.elemUrlAttr( [ tag_attr ] );
+  // 
+  // Arguments:
+  // 
+  //  tag_attr - (Object) An object containing a list of tag names and their
+  //    associated default attribute names in the format { tag: 'attr', ... } to
+  //    be merged into the internal tag-attribute list.
+  // 
+  // Returns:
+  // 
+  //  (Object) An object containing all stored tag-attribute values.
+  
+  // Only define function and set defaults if function doesn't already exist, as
+  // the urlInternal plugin will provide this method as well.
+  $[ str_elemUrlAttr ] || ($[ str_elemUrlAttr ] = function( obj ) {
+    return $.extend( elemUrlAttr_cache, obj );
+  })({
+    a: str_href,
+    base: str_href,
+    iframe: str_src,
+    img: str_src,
+    input: str_src,
+    form: 'action',
+    link: str_href,
+    script: str_src
+  });
+  
+  jq_elemUrlAttr = $[ str_elemUrlAttr ];
+  
+  // Method: jQuery.fn.querystring
+  // 
+  // Update URL attribute in one or more elements, merging the current URL (with
+  // or without pre-existing query string params) plus any params object or
+  // string into a new URL, which is then set into that attribute. Like
+  // <jQuery.param.querystring (build url)>, but for all elements in a jQuery
+  // collection.
+  // 
+  // Usage:
+  // 
+  // > jQuery('selector').querystring( [ attr, ] params [, merge_mode ] );
+  // 
+  // Arguments:
+  // 
+  //  attr - (String) Optional name of an attribute that will contain a URL to
+  //    merge params or url into. See <jQuery.elemUrlAttr> for a list of default
+  //    attributes.
+  //  params - (Object) A params object to be merged into the URL attribute.
+  //  params - (String) A URL containing query string params, or params string
+  //    to be merged into the URL attribute.
+  //  merge_mode - (Number) Merge behavior defaults to 0 if merge_mode is not
+  //    specified, and is as-follows:
+  //    
+  //    * 0: params in the params argument will override any params in attr URL.
+  //    * 1: any params in attr URL will override params in the params argument.
+  //    * 2: params argument will completely replace any query string in attr
+  //         URL.
+  // 
+  // Returns:
+  // 
+  //  (jQuery) The initial jQuery collection of elements, but with modified URL
+  //  attribute values.
+  
+  // Method: jQuery.fn.fragment
+  // 
+  // Update URL attribute in one or more elements, merging the current URL (with
+  // or without pre-existing fragment/hash params) plus any params object or
+  // string into a new URL, which is then set into that attribute. Like
+  // <jQuery.param.fragment (build url)>, but for all elements in a jQuery
+  // collection.
+  // 
+  // Usage:
+  // 
+  // > jQuery('selector').fragment( [ attr, ] params [, merge_mode ] );
+  // 
+  // Arguments:
+  // 
+  //  attr - (String) Optional name of an attribute that will contain a URL to
+  //    merge params into. See <jQuery.elemUrlAttr> for a list of default
+  //    attributes.
+  //  params - (Object) A params object to be merged into the URL attribute.
+  //  params - (String) A URL containing fragment (hash) params, or params
+  //    string to be merged into the URL attribute.
+  //  merge_mode - (Number) Merge behavior defaults to 0 if merge_mode is not
+  //    specified, and is as-follows:
+  //    
+  //    * 0: params in the params argument will override any params in attr URL.
+  //    * 1: any params in attr URL will override params in the params argument.
+  //    * 2: params argument will completely replace any fragment (hash) in attr
+  //         URL.
+  // 
+  // Returns:
+  // 
+  //  (jQuery) The initial jQuery collection of elements, but with modified URL
+  //  attribute values.
+  
+  function jq_fn_sub( mode, force_attr, params, merge_mode ) {
+    if ( !is_string( params ) && typeof params !== 'object' ) {
+      // force_attr not specified.
+      merge_mode = params;
+      params = force_attr;
+      force_attr = undefined;
+    }
+    
+    return this.each(function(){
+      var that = $(this),
+        
+        // Get attribute specified, or default specified via $.elemUrlAttr.
+        attr = force_attr || jq_elemUrlAttr()[ ( this.nodeName || '' ).toLowerCase() ] || '',
+        
+        // Get URL value.
+        url = attr && that.attr( attr ) || '';
+      
+      // Update attribute with new URL.
+      that.attr( attr, jq_param[ mode ]( url, params, merge_mode ) );
+    });
+    
+  };
+  
+  $.fn[ str_querystring ] = curry( jq_fn_sub, str_querystring );
+  $.fn[ str_fragment ]    = curry( jq_fn_sub, str_fragment );
+  
+  // Section: History, hashchange event
+  // 
+  // Method: jQuery.bbq.pushState
+  // 
+  // Adds a 'state' into the browser history at the current position, setting
+  // location.hash and triggering any bound <hashchange event> callbacks
+  // (provided the new state is different than the previous state).
+  // 
+  // If no arguments are passed, an empty state is created, which is just a
+  // shortcut for jQuery.bbq.pushState( {}, 2 ).
+  // 
+  // Usage:
+  // 
+  // > jQuery.bbq.pushState( [ params [, merge_mode ] ] );
+  // 
+  // Arguments:
+  // 
+  //  params - (String) A serialized params string or a hash string beginning
+  //    with # to merge into location.hash.
+  //  params - (Object) A params object to merge into location.hash.
+  //  merge_mode - (Number) Merge behavior defaults to 0 if merge_mode is not
+  //    specified (unless a hash string beginning with # is specified, in which
+  //    case merge behavior defaults to 2), and is as-follows:
+  // 
+  //    * 0: params in the params argument will override any params in the
+  //         current state.
+  //    * 1: any params in the current state will override params in the params
+  //         argument.
+  //    * 2: params argument will completely replace current state.
+  // 
+  // Returns:
+  // 
+  //  Nothing.
+  // 
+  // Additional Notes:
+  // 
+  //  * Setting an empty state may cause the browser to scroll.
+  //  * Unlike the fragment and querystring methods, if a hash string beginning
+  //    with # is specified as the params agrument, merge_mode defaults to 2.
+  
+  jq_bbq.pushState = jq_bbq_pushState = function( params, merge_mode ) {
+    if ( is_string( params ) && /^#/.test( params ) && merge_mode === undefined ) {
+      // Params string begins with # and merge_mode not specified, so completely
+      // overwrite window.location.hash.
+      merge_mode = 2;
+    }
+    
+    var has_args = params !== undefined,
+      // Merge params into window.location using $.param.fragment.
+      url = jq_param_fragment( window[ str_location ][ str_href ],
+        has_args ? params : {}, has_args ? merge_mode : 2 );
+    
+    // Set new window.location.href. If hash is empty, use just # to prevent
+    // browser from reloading the page. Note that Safari 3 & Chrome barf on
+    // location.hash = '#'.
+    window[ str_location ][ str_href ] = url + ( /#/.test( url ) ? '' : '#' );
+  };
+  
+  // Method: jQuery.bbq.getState
+  // 
+  // Retrieves the current 'state' from the browser history, parsing
+  // location.hash for a specific key or returning an object containing the
+  // entire state, optionally coercing numbers, booleans, null and undefined
+  // values.
+  // 
+  // Usage:
+  // 
+  // > jQuery.bbq.getState( [ key ] [, coerce ] );
+  // 
+  // Arguments:
+  // 
+  //  key - (String) An optional state key for which to return a value.
+  //  coerce - (Boolean) If true, coerces any numbers or true, false, null, and
+  //    undefined to their actual value. Defaults to false.
+  // 
+  // Returns:
+  // 
+  //  (Anything) If key is passed, returns the value corresponding with that key
+  //    in the location.hash 'state', or undefined. If not, an object
+  //    representing the entire 'state' is returned.
+  
+  jq_bbq.getState = jq_bbq_getState = function( key, coerce ) {
+    return key === undefined || typeof key === 'boolean'
+      ? jq_deparam_fragment( key ) // 'key' really means 'coerce' here
+      : jq_deparam_fragment( coerce )[ key ];
+  };
+  
+  // Method: jQuery.bbq.removeState
+  // 
+  // Remove one or more keys from the current browser history 'state', creating
+  // a new state, setting location.hash and triggering any bound
+  // <hashchange event> callbacks (provided the new state is different than
+  // the previous state).
+  // 
+  // If no arguments are passed, an empty state is created, which is just a
+  // shortcut for jQuery.bbq.pushState( {}, 2 ).
+  // 
+  // Usage:
+  // 
+  // > jQuery.bbq.removeState( [ key [, key ... ] ] );
+  // 
+  // Arguments:
+  // 
+  //  key - (String) One or more key values to remove from the current state,
+  //    passed as individual arguments.
+  //  key - (Array) A single array argument that contains a list of key values
+  //    to remove from the current state.
+  // 
+  // Returns:
+  // 
+  //  Nothing.
+  // 
+  // Additional Notes:
+  // 
+  //  * Setting an empty state may cause the browser to scroll.
+  
+  jq_bbq.removeState = function( arr ) {
+    var state = {};
+    
+    // If one or more arguments is passed..
+    if ( arr !== undefined ) {
+      
+      // Get the current state.
+      state = jq_bbq_getState();
+      
+      // For each passed key, delete the corresponding property from the current
+      // state.
+      $.each( $.isArray( arr ) ? arr : arguments, function(i,v){
+        delete state[ v ];
+      });
+    }
+    
+    // Set the state, completely overriding any existing state.
+    jq_bbq_pushState( state, 2 );
+  };
+  
+  // Event: hashchange event (BBQ)
+  // 
+  // Usage in jQuery 1.4 and newer:
+  // 
+  // In jQuery 1.4 and newer, the event object passed into any hashchange event
+  // callback is augmented with a copy of the location.hash fragment at the time
+  // the event was triggered as its event.fragment property. In addition, the
+  // event.getState method operates on this property (instead of location.hash)
+  // which allows this fragment-as-a-state to be referenced later, even after
+  // window.location may have changed.
+  // 
+  // Note that event.fragment and event.getState are not defined according to
+  // W3C (or any other) specification, but will still be available whether or
+  // not the hashchange event exists natively in the browser, because of the
+  // utility they provide.
+  // 
+  // The event.fragment property contains the output of <jQuery.param.fragment>
+  // and the event.getState method is equivalent to the <jQuery.bbq.getState>
+  // method.
+  // 
+  // > $(window).bind( 'hashchange', function( event ) {
+  // >   var hash_str = event.fragment,
+  // >     param_obj = event.getState(),
+  // >     param_val = event.getState( 'param_name' ),
+  // >     param_val_coerced = event.getState( 'param_name', true );
+  // >   ...
+  // > });
+  // 
+  // Usage in jQuery 1.3.2:
+  // 
+  // In jQuery 1.3.2, the event object cannot to be augmented as in jQuery 1.4+,
+  // so the fragment state isn't bound to the event object and must instead be
+  // parsed using the <jQuery.param.fragment> and <jQuery.bbq.getState> methods.
+  // 
+  // > $(window).bind( 'hashchange', function( event ) {
+  // >   var hash_str = $.param.fragment(),
+  // >     param_obj = $.bbq.getState(),
+  // >     param_val = $.bbq.getState( 'param_name' ),
+  // >     param_val_coerced = $.bbq.getState( 'param_name', true );
+  // >   ...
+  // > });
+  // 
+  // Additional Notes:
+  // 
+  // * Due to changes in the special events API, jQuery BBQ v1.2 or newer is
+  //   required to enable the augmented event object in jQuery 1.4.2 and newer.
+  // * See <jQuery hashchange event> for more detailed information.
+  
+  jq_event_special[ str_hashchange ] = $.extend( jq_event_special[ str_hashchange ], {
+    
+    // Augmenting the event object with the .fragment property and .getState
+    // method requires jQuery 1.4 or newer. Note: with 1.3.2, everything will
+    // work, but the event won't be augmented)
+    add: function( handleObj ) {
+      var old_handler;
+      
+      function new_handler(e) {
+        // e.fragment is set to the value of location.hash (with any leading #
+        // removed) at the time the event is triggered.
+        var hash = e[ str_fragment ] = jq_param_fragment();
+        
+        // e.getState() works just like $.bbq.getState(), but uses the
+        // e.fragment property stored on the event object.
+        e.getState = function( key, coerce ) {
+          return key === undefined || typeof key === 'boolean'
+            ? jq_deparam( hash, key ) // 'key' really means 'coerce' here
+            : jq_deparam( hash, coerce )[ key ];
+        };
+        
+        old_handler.apply( this, arguments );
+      };
+      
+      // This may seem a little complicated, but it normalizes the special event
+      // .add method between jQuery 1.4/1.4.1 and 1.4.2+
+      if ( $.isFunction( handleObj ) ) {
+        // 1.4, 1.4.1
+        old_handler = handleObj;
+        return new_handler;
+      } else {
+        // 1.4.2+
+        old_handler = handleObj.handler;
+        handleObj.handler = new_handler;
+      }
+    }
+    
+  });
+  
+})(jQuery,this);
+
+/*!
+ * jQuery hashchange event - v1.2 - 2/11/2010
+ * http://benalman.com/projects/jquery-hashchange-plugin/
+ * 
+ * Copyright (c) 2010 "Cowboy" Ben Alman
+ * Dual licensed under the MIT and GPL licenses.
+ * http://benalman.com/about/license/
+ */
+
+// Script: jQuery hashchange event
+//
+// *Version: 1.2, Last updated: 2/11/2010*
+// 
+// Project Home - http://benalman.com/projects/jquery-hashchange-plugin/
+// GitHub       - http://github.com/cowboy/jquery-hashchange/
+// Source       - http://github.com/cowboy/jquery-hashchange/raw/master/jquery.ba-hashchange.js
+// (Minified)   - http://github.com/cowboy/jquery-hashchange/raw/master/jquery.ba-hashchange.min.js (1.1kb)
+// 
+// About: License
+// 
+// Copyright (c) 2010 "Cowboy" Ben Alman,
+// Dual licensed under the MIT and GPL licenses.
+// http://benalman.com/about/license/
+// 
+// About: Examples
+// 
+// This working example, complete with fully commented code, illustrate one way
+// in which this plugin can be used.
+// 
+// hashchange event - http://benalman.com/code/projects/jquery-hashchange/examples/hashchange/
+// 
+// About: Support and Testing
+// 
+// Information about what version or versions of jQuery this plugin has been
+// tested with, what browsers it has been tested in, and where the unit tests
+// reside (so you can test it yourself).
+// 
+// jQuery Versions - 1.3.2, 1.4.1, 1.4.2
+// Browsers Tested - Internet Explorer 6-8, Firefox 2-3.7, Safari 3-4, Chrome, Opera 9.6-10.1.
+// Unit Tests      - http://benalman.com/code/projects/jquery-hashchange/unit/
+// 
+// About: Known issues
+// 
+// While this jQuery hashchange event implementation is quite stable and robust,
+// there are a few unfortunate browser bugs surrounding expected hashchange
+// event-based behaviors, independent of any JavaScript window.onhashchange
+// abstraction. See the following examples for more information:
+// 
+// Chrome: Back Button - http://benalman.com/code/projects/jquery-hashchange/examples/bug-chrome-back-button/
+// Firefox: Remote XMLHttpRequest - http://benalman.com/code/projects/jquery-hashchange/examples/bug-firefox-remote-xhr/
+// WebKit: Back Button in an Iframe - http://benalman.com/code/projects/jquery-hashchange/examples/bug-webkit-hash-iframe/
+// Safari: Back Button from a different domain - http://benalman.com/code/projects/jquery-hashchange/examples/bug-safari-back-from-diff-domain/
+// 
+// About: Release History
+// 
+// 1.2   - (2/11/2010) Fixed a bug where coming back to a page using this plugin
+//         from a page on another domain would cause an error in Safari 4. Also,
+//         IE6/7 Iframe is now inserted after the body (this actually works),
+//         which prevents the page from scrolling when the event is first bound.
+//         Event can also now be bound before DOM ready, but it won't be usable
+//         before then in IE6/7.
+// 1.1   - (1/21/2010) Incorporated document.documentMode test to fix IE8 bug
+//         where browser version is incorrectly reported as 8.0, despite
+//         inclusion of the X-UA-Compatible IE=EmulateIE7 meta tag.
+// 1.0   - (1/9/2010) Initial Release. Broke out the jQuery BBQ event.special
+//         window.onhashchange functionality into a separate plugin for users
+//         who want just the basic event & back button support, without all the
+//         extra awesomeness that BBQ provides. This plugin will be included as
+//         part of jQuery BBQ, but also be available separately.
+
+(function($,window,undefined){
+  '$:nomunge'; // Used by YUI compressor.
+  
+  // Method / object references.
+  var fake_onhashchange,
+    jq_event_special = $.event.special,
+    
+    // Reused strings.
+    str_location = 'location',
+    str_hashchange = 'hashchange',
+    str_href = 'href',
+    
+    // IE6/7 specifically need some special love when it comes to back-button
+    // support, so let's do a little browser sniffing..
+    browser = $.browser,
+    mode = document.documentMode,
+    is_old_ie = browser.msie && ( mode === undefined || mode < 8 ),
+    
+    // Does the browser support window.onhashchange? Test for IE version, since
+    // IE8 incorrectly reports this when in "IE7" or "IE8 Compatibility View"!
+    supports_onhashchange = 'on' + str_hashchange in window && !is_old_ie;
+  
+  // Get location.hash (or what you'd expect location.hash to be) sans any
+  // leading #. Thanks for making this necessary, Firefox!
+  function get_fragment( url ) {
+    url = url || window[ str_location ][ str_href ];
+    return url.replace( /^[^#]*#?(.*)$/, '$1' );
+  };
+  
+  // Property: jQuery.hashchangeDelay
+  // 
+  // The numeric interval (in milliseconds) at which the <hashchange event>
+  // polling loop executes. Defaults to 100.
+  
+  $[ str_hashchange + 'Delay' ] = 100;
+  
+  // Event: hashchange event
+  // 
+  // Fired when location.hash changes. In browsers that support it, the native
+  // window.onhashchange event is used (IE8, FF3.6), otherwise a polling loop is
+  // initialized, running every <jQuery.hashchangeDelay> milliseconds to see if
+  // the hash has changed. In IE 6 and 7, a hidden Iframe is created to allow
+  // the back button and hash-based history to work.
+  // 
+  // Usage:
+  // 
+  // > $(window).bind( 'hashchange', function(e) {
+  // >   var hash = location.hash;
+  // >   ...
+  // > });
+  // 
+  // Additional Notes:
+  // 
+  // * The polling loop and Iframe are not created until at least one callback
+  //   is actually bound to 'hashchange'.
+  // * If you need the bound callback(s) to execute immediately, in cases where
+  //   the page 'state' exists on page load (via bookmark or page refresh, for
+  //   example) use $(window).trigger( 'hashchange' );
+  // * The event can be bound before DOM ready, but since it won't be usable
+  //   before then in IE6/7 (due to the necessary Iframe), recommended usage is
+  //   to bind it inside a $(document).ready() callback.
+  
+  jq_event_special[ str_hashchange ] = $.extend( jq_event_special[ str_hashchange ], {
+    
+    // Called only when the first 'hashchange' event is bound to window.
+    setup: function() {
+      // If window.onhashchange is supported natively, there's nothing to do..
+      if ( supports_onhashchange ) { return false; }
+      
+      // Otherwise, we need to create our own. And we don't want to call this
+      // until the user binds to the event, just in case they never do, since it
+      // will create a polling loop and possibly even a hidden Iframe.
+      $( fake_onhashchange.start );
+    },
+    
+    // Called only when the last 'hashchange' event is unbound from window.
+    teardown: function() {
+      // If window.onhashchange is supported natively, there's nothing to do..
+      if ( supports_onhashchange ) { return false; }
+      
+      // Otherwise, we need to stop ours (if possible).
+      $( fake_onhashchange.stop );
+    }
+    
+  });
+  
+  // fake_onhashchange does all the work of triggering the window.onhashchange
+  // event for browsers that don't natively support it, including creating a
+  // polling loop to watch for hash changes and in IE 6/7 creating a hidden
+  // Iframe to enable back and forward.
+  fake_onhashchange = (function(){
+    var self = {},
+      timeout_id,
+      iframe,
+      set_history,
+      get_history;
+    
+    // Initialize. In IE 6/7, creates a hidden Iframe for history handling.
+    function init(){
+      // Most browsers don't need special methods here..
+      set_history = get_history = function(val){ return val; };
+      
+      // But IE6/7 do!
+      if ( is_old_ie ) {
+        
+        // Create hidden Iframe after the end of the body to prevent initial
+        // page load from scrolling unnecessarily.
+        iframe = $('<iframe src="javascript:0"/>').hide().insertAfter( 'body' )[0].contentWindow;
+        
+        // Get history by looking at the hidden Iframe's location.hash.
+        get_history = function() {
+          return get_fragment( iframe.document[ str_location ][ str_href ] );
+        };
+        
+        // Set a new history item by opening and then closing the Iframe
+        // document, *then* setting its location.hash.
+        set_history = function( hash, history_hash ) {
+          if ( hash !== history_hash ) {
+            var doc = iframe.document;
+            doc.open().close();
+            doc[ str_location ].hash = '#' + hash;
+          }
+        };
+        
+        // Set initial history.
+        set_history( get_fragment() );
+      }
+    };
+    
+    // Start the polling loop.
+    self.start = function() {
+      // Polling loop is already running!
+      if ( timeout_id ) { return; }
+      
+      // Remember the initial hash so it doesn't get triggered immediately.
+      var last_hash = get_fragment();
+      
+      // Initialize if not yet initialized.
+      set_history || init();
+      
+      // This polling loop checks every $.hashchangeDelay milliseconds to see if
+      // location.hash has changed, and triggers the 'hashchange' event on
+      // window when necessary.
+      (function loopy(){
+        var hash = get_fragment(),
+          history_hash = get_history( last_hash );
+        
+        if ( hash !== last_hash ) {
+          set_history( last_hash = hash, history_hash );
+          
+          $(window).trigger( str_hashchange );
+          
+        } else if ( history_hash !== last_hash ) {
+          window[ str_location ][ str_href ] = window[ str_location ][ str_href ].replace( /#.*/, '' ) + '#' + history_hash;
+        }
+        
+        timeout_id = setTimeout( loopy, $[ str_hashchange + 'Delay' ] );
+      })();
+    };
+    
+    // Stop the polling loop, but only if an IE6/7 Iframe wasn't created. In
+    // that case, even if there are no longer any bound event handlers, the
+    // polling loop is still necessary for back/next to work at all!
+    self.stop = function() {
+      if ( !iframe ) {
+        timeout_id && clearTimeout( timeout_id );
+        timeout_id = 0;
+      }
+    };
+    
+    return self;
+  })();
+  
+})(jQuery,this);
diff --git a/addons/base/static/lib/jquery.ba-bbq/jquery.ba-bbq.min.js b/addons/base/static/lib/jquery.ba-bbq/jquery.ba-bbq.min.js
new file mode 100644
index 00000000000..bcbf24834ac
--- /dev/null
+++ b/addons/base/static/lib/jquery.ba-bbq/jquery.ba-bbq.min.js
@@ -0,0 +1,18 @@
+/*
+ * jQuery BBQ: Back Button & Query Library - v1.2.1 - 2/17/2010
+ * http://benalman.com/projects/jquery-bbq-plugin/
+ * 
+ * Copyright (c) 2010 "Cowboy" Ben Alman
+ * Dual licensed under the MIT and GPL licenses.
+ * http://benalman.com/about/license/
+ */
+(function($,p){var i,m=Array.prototype.slice,r=decodeURIComponent,a=$.param,c,l,v,b=$.bbq=$.bbq||{},q,u,j,e=$.event.special,d="hashchange",A="querystring",D="fragment",y="elemUrlAttr",g="location",k="href",t="src",x=/^.*\?|#.*$/g,w=/^.*\#/,h,C={};function E(F){return typeof F==="string"}function B(G){var F=m.call(arguments,1);return function(){return G.apply(this,F.concat(m.call(arguments)))}}function n(F){return F.replace(/^[^#]*#?(.*)$/,"$1")}function o(F){return F.replace(/(?:^[^?#]*\?([^#]*).*$)?.*/,"$1")}function f(H,M,F,I,G){var O,L,K,N,J;if(I!==i){K=F.match(H?/^([^#]*)\#?(.*)$/:/^([^#?]*)\??([^#]*)(#?.*)/);J=K[3]||"";if(G===2&&E(I)){L=I.replace(H?w:x,"")}else{N=l(K[2]);I=E(I)?l[H?D:A](I):I;L=G===2?I:G===1?$.extend({},I,N):$.extend({},N,I);L=a(L);if(H){L=L.replace(h,r)}}O=K[1]+(H?"#":L||!K[1]?"?":"")+L+J}else{O=M(F!==i?F:p[g][k])}return O}a[A]=B(f,0,o);a[D]=c=B(f,1,n);c.noEscape=function(G){G=G||"";var F=$.map(G.split(""),encodeURIComponent);h=new RegExp(F.join("|"),"g")};c.noEscape(",/");$.deparam=l=function(I,F){var H={},G={"true":!0,"false":!1,"null":null};$.each(I.replace(/\+/g," ").split("&"),function(L,Q){var K=Q.split("="),P=r(K[0]),J,O=H,M=0,R=P.split("]["),N=R.length-1;if(/\[/.test(R[0])&&/\]$/.test(R[N])){R[N]=R[N].replace(/\]$/,"");R=R.shift().split("[").concat(R);N=R.length-1}else{N=0}if(K.length===2){J=r(K[1]);if(F){J=J&&!isNaN(J)?+J:J==="undefined"?i:G[J]!==i?G[J]:J}if(N){for(;M<=N;M++){P=R[M]===""?O.length:R[M];O=O[P]=M<N?O[P]||(R[M+1]&&isNaN(R[M+1])?{}:[]):J}}else{if($.isArray(H[P])){H[P].push(J)}else{if(H[P]!==i){H[P]=[H[P],J]}else{H[P]=J}}}}else{if(P){H[P]=F?i:""}}});return H};function z(H,F,G){if(F===i||typeof F==="boolean"){G=F;F=a[H?D:A]()}else{F=E(F)?F.replace(H?w:x,""):F}return l(F,G)}l[A]=B(z,0);l[D]=v=B(z,1);$[y]||($[y]=function(F){return $.extend(C,F)})({a:k,base:k,iframe:t,img:t,input:t,form:"action",link:k,script:t});j=$[y];function s(I,G,H,F){if(!E(H)&&typeof H!=="object"){F=H;H=G;G=i}return this.each(function(){var L=$(this),J=G||j()[(this.nodeName||"").toLowerCase()]||"",K=J&&L.attr(J)||"";L.attr(J,a[I](K,H,F))})}$.fn[A]=B(s,A);$.fn[D]=B(s,D);b.pushState=q=function(I,F){if(E(I)&&/^#/.test(I)&&F===i){F=2}var H=I!==i,G=c(p[g][k],H?I:{},H?F:2);p[g][k]=G+(/#/.test(G)?"":"#")};b.getState=u=function(F,G){return F===i||typeof F==="boolean"?v(F):v(G)[F]};b.removeState=function(F){var G={};if(F!==i){G=u();$.each($.isArray(F)?F:arguments,function(I,H){delete G[H]})}q(G,2)};e[d]=$.extend(e[d],{add:function(F){var H;function G(J){var I=J[D]=c();J.getState=function(K,L){return K===i||typeof K==="boolean"?l(I,K):l(I,L)[K]};H.apply(this,arguments)}if($.isFunction(F)){H=F;return G}else{H=F.handler;F.handler=G}}})})(jQuery,this);
+/*
+ * jQuery hashchange event - v1.2 - 2/11/2010
+ * http://benalman.com/projects/jquery-hashchange-plugin/
+ * 
+ * Copyright (c) 2010 "Cowboy" Ben Alman
+ * Dual licensed under the MIT and GPL licenses.
+ * http://benalman.com/about/license/
+ */
+(function($,i,b){var j,k=$.event.special,c="location",d="hashchange",l="href",f=$.browser,g=document.documentMode,h=f.msie&&(g===b||g<8),e="on"+d in i&&!h;function a(m){m=m||i[c][l];return m.replace(/^[^#]*#?(.*)$/,"$1")}$[d+"Delay"]=100;k[d]=$.extend(k[d],{setup:function(){if(e){return false}$(j.start)},teardown:function(){if(e){return false}$(j.stop)}});j=(function(){var m={},r,n,o,q;function p(){o=q=function(s){return s};if(h){n=$('<iframe src="javascript:0"/>').hide().insertAfter("body")[0].contentWindow;q=function(){return a(n.document[c][l])};o=function(u,s){if(u!==s){var t=n.document;t.open().close();t[c].hash="#"+u}};o(a())}}m.start=function(){if(r){return}var t=a();o||p();(function s(){var v=a(),u=q(t);if(v!==t){o(t=v,u);$(i).trigger(d)}else{if(u!==t){i[c][l]=i[c][l].replace(/#.*/,"")+"#"+u}}r=setTimeout(s,$[d+"Delay"])})()};m.stop=function(){if(!n){r&&clearTimeout(r);r=0}};return m})()})(jQuery,this);
\ No newline at end of file
diff --git a/addons/base/static/src/base.html b/addons/base/static/src/base.html
index 3c8f76a6e23..bd717d32f34 100644
--- a/addons/base/static/src/base.html
+++ b/addons/base/static/src/base.html
@@ -15,6 +15,7 @@
     <script type="text/javascript" src="/base/static/lib/jquery.ui.notify/js/jquery.notify.js"></script>
     <script type="text/javascript" src="/base/static/lib/jquery.superfish/js/hoverIntent.js"></script>
     <script type="text/javascript" src="/base/static/lib/jquery.superfish/js/superfish.js"></script>
+    <script type="text/javascript" src="/base/static/lib/jquery.ba-bbq/jquery.ba-bbq.js"></script>
     <script type="text/javascript" src="/base/static/src/js/base.js"></script>
     <script type="text/javascript" src="/base/static/src/js/chrome.js"></script>
     <script type="text/javascript" src="/base/static/src/js/data.js"></script>
diff --git a/addons/base/static/src/js/views.js b/addons/base/static/src/js/views.js
index 1e3851c218f..890f69448a5 100644
--- a/addons/base/static/src/js/views.js
+++ b/addons/base/static/src/js/views.js
@@ -228,8 +228,9 @@ openerp.base.ExternalActionManager = openerp.base.Controller.extend({
                 viewmanager.start();
             } else if (action.target == "current") {
                 this.rpc("/base/session/save_session_action", {the_action:action}, function(key) {
-                    var url = window.location.href;
-                    //window.open();
+                    var url = window.location.protocol + "//" + window.location.host +
+                            window.location.pathname + "?" + jQuery.param({s_action:""+key});
+                    window.open(url);
                 });
             }
         }

From 31ff2c17723f0eb0b34f6c050a2890fe7880b7a2 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Mon, 11 Apr 2011 13:48:10 +0200
Subject: [PATCH 125/331] add doctype to disable quirks mode

bzr revid: al@openerp.com-20110411114810-6vvo1jmu7rg5bo8z
---
 addons/web_chat/static/src/web_chat.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/web_chat/static/src/web_chat.html b/addons/web_chat/static/src/web_chat.html
index 5f11f01ee7b..a1070ab475a 100644
--- a/addons/web_chat/static/src/web_chat.html
+++ b/addons/web_chat/static/src/web_chat.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <script type="text/javascript" src="/web_chat/static/lib/AjaxIM/js/jquery-1.3.2.js"></script>

From b1f219c5025ff1f116e054a74292ba79a0832214 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Mon, 11 Apr 2011 13:55:07 +0200
Subject: [PATCH 126/331] [IMP] Update dataset and pager in case of new record

bzr revid: fme@openerp.com-20110411115507-p8x1jb11iok2xusr
---
 addons/base/static/src/js/form.js | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/addons/base/static/src/js/form.js b/addons/base/static/src/js/form.js
index 3de0bbfd32a..69185628ffb 100644
--- a/addons/base/static/src/js/form.js
+++ b/addons/base/static/src/js/form.js
@@ -85,7 +85,7 @@ openerp.base.FormView =  openerp.base.Controller.extend( /** @lends openerp.base
         } else {
             this.log("No record received");
         }
-        this.do_update_pager();
+        this.do_update_pager(record.id == null);
     },
     on_form_changed: function(widget) {
         if (widget && widget.node.attrs.on_change) {
@@ -115,11 +115,10 @@ openerp.base.FormView =  openerp.base.Controller.extend( /** @lends openerp.base
         }
         this.dataset.read_index(_.keys(this.fields_view.fields), this.on_record_loaded);
     },
-    do_update_pager: function() {
+    do_update_pager: function(hide_index) {
         var $pager = this.$element.find('div.oe_form_pager');
-        $pager.find("button[data-pager-action='first'], button[data-pager-action='previous']").attr('disabled', this.dataset.index == 0);
-        $pager.find("button[data-pager-action='next'], button[data-pager-action='last']").attr('disabled', this.dataset.index == this.dataset.ids.length - 1);
-        this.$element.find('span.oe_pager_index').html(this.dataset.index + 1);
+        var index = hide_index ? '-' : this.dataset.index + 1;
+        this.$element.find('span.oe_pager_index').html(index);
         this.$element.find('span.oe_pager_count').html(this.dataset.count);
     },
     do_onchange: function(widget, processed) {
@@ -222,6 +221,10 @@ openerp.base.FormView =  openerp.base.Controller.extend( /** @lends openerp.base
             if (!this.datarecord.id) {
                 this.dataset.create(values, function() {
                     self.datarecord.id = arguments[0].result;
+                    self.dataset.ids.push(self.datarecord.id);
+                    self.dataset.index = self.dataset.ids.length - 1;
+                    self.dataset.count++;
+                    self.do_update_pager();
                     self.on_saved.apply(self, arguments);
                 });
             } else {

From 5c774c82fb4c117b3a63595c3080cff8f7d067e5 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Mon, 11 Apr 2011 13:59:33 +0200
Subject: [PATCH 127/331] [IMP] Implemented working saved actions.

bzr revid: nicolas.vanhoren@openerp.com-20110411115933-xjmrhnsgrbhqlzfa
---
 addons/base/static/src/js/chrome.js | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/addons/base/static/src/js/chrome.js b/addons/base/static/src/js/chrome.js
index 920973e640a..f567def9a23 100644
--- a/addons/base/static/src/js/chrome.js
+++ b/addons/base/static/src/js/chrome.js
@@ -473,8 +473,10 @@ openerp.base.Session = openerp.base.BasicController.extend( /** @lends openerp.b
                 continue;
             openerp[mod] = {};
             // init module mod
-            openerp._openerp[mod](openerp);
-            self.module_loaded[mod] = true;
+            if(openerp._openerp[mod] != undefined) {
+                openerp._openerp[mod](openerp);
+                self.module_loaded[mod] = true;
+            }
         }
     }
 });
@@ -907,6 +909,17 @@ openerp.base.WebClient = openerp.base.Controller.extend({
     on_logged: function() {
         this.action =  new openerp.base.ActionManager(this.session, "oe_app");
         this.action.start();
+        
+        // if using saved actions, load the action and give it to action manager
+        debugger;
+        var parameters = jQuery.deparam(jQuery.param.querystring());
+        if(parameters["s_action"] != undefined) {
+            var key = parseInt(parameters["s_action"]);
+            var self = this;
+            this.rpc("/base/session/get_session_action", {key:key}, function(action) {
+                self.action.do_action(action);
+            });
+        }
     },
     on_menu_action: function(action) {
         this.action.do_action(action);

From cf1a395cbf4b5c132742515be741898fe8593c17 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Mon, 11 Apr 2011 14:09:08 +0200
Subject: [PATCH 128/331] [FIX] base: corrected symbol for CFA currency added
 in previous revision

bzr revid: odo@openerp.com-20110411120908-4my154j6429jjjaq
---
 openerp/addons/base/base_data.xml | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/openerp/addons/base/base_data.xml b/openerp/addons/base/base_data.xml
index 67083fd7bd2..bc13dacd7ba 100644
--- a/openerp/addons/base/base_data.xml
+++ b/openerp/addons/base/base_data.xml
@@ -1619,7 +1619,19 @@
         </record>
 
         <record id="CFA" model="res.currency">
-            <field name="name">CFA</field>
+            <!-- There are in fact 2 CFA currencies:
+                  - XAF for the Central African CFA franc
+                  - XOF for the West African CFA franc
+                As they are interchangeable, we probably only need one.
+                XOF appears to have "CFA" as symbol, while "XAF" is "FCFA",
+                so let's pick XOF as the ISO Code, to have a code-symbol match.
+                We can keep CFA as XML ID to show that we only have one currency,
+                there is no possible conflict, as no other currency currently
+                has CFA as ISO Code.
+                See http://en.wikipedia.org/wiki/CFA_franc
+                    http://en.wikipedia.org/wiki/ISO_4217
+            -->
+            <field name="name">XOF</field>
             <field name="symbol">CFA</field>
             <field name="rounding">1</field>
             <field name="accuracy">4</field>

From b6ff5848b0ec8f9f90fb5aee7d7b78eba674aeec Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Mon, 11 Apr 2011 14:32:07 +0200
Subject: [PATCH 129/331] [FIX] Use parent element id for form header

bzr revid: fme@openerp.com-20110411123207-q3ka2w9qg7z7n4jp
---
 addons/base/static/src/js/form.js   | 14 +++++++-------
 addons/base/static/src/xml/base.xml |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/addons/base/static/src/js/form.js b/addons/base/static/src/js/form.js
index 69185628ffb..0eec8c79ebb 100644
--- a/addons/base/static/src/js/form.js
+++ b/addons/base/static/src/js/form.js
@@ -49,10 +49,10 @@ openerp.base.FormView =  openerp.base.Controller.extend( /** @lends openerp.base
             self.on_pager_action(action);
         });
 
-        this.$element.find('div.oe_form_buttons button.oe_form_button_save').click(this.do_save);
-        this.$element.find('div.oe_form_buttons button.oe_form_button_save_edit').click(this.do_save_edit);
-        this.$element.find('div.oe_form_buttons button.oe_form_button_cancel').click(this.do_cancel);
-        this.$element.find('div.oe_form_buttons button.oe_form_button_new').click(this.on_button_new);
+        this.$element.find('#' + this.element_id + '_header button.oe_form_button_save').click(this.do_save);
+        this.$element.find('#' + this.element_id + '_header button.oe_form_button_save_edit').click(this.do_save_edit);
+        this.$element.find('#' + this.element_id + '_header button.oe_form_button_cancel').click(this.do_cancel);
+        this.$element.find('#' + this.element_id + '_header button.oe_form_button_new').click(this.on_button_new);
 
         // sidebar stuff
         if (this.view_manager.sidebar) {
@@ -116,10 +116,10 @@ openerp.base.FormView =  openerp.base.Controller.extend( /** @lends openerp.base
         this.dataset.read_index(_.keys(this.fields_view.fields), this.on_record_loaded);
     },
     do_update_pager: function(hide_index) {
-        var $pager = this.$element.find('div.oe_form_pager');
+        var $pager = this.$element.find('#' + this.element_id + '_header div.oe_form_pager').eq(0);
         var index = hide_index ? '-' : this.dataset.index + 1;
-        this.$element.find('span.oe_pager_index').html(index);
-        this.$element.find('span.oe_pager_count').html(this.dataset.count);
+        $pager.find('span.oe_pager_index').html(index);
+        $pager.find('span.oe_pager_count').html(this.dataset.count);
     },
     do_onchange: function(widget, processed) {
         processed = processed || [];
diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml
index caf463cf4e0..57f9c81559e 100644
--- a/addons/base/static/src/xml/base.xml
+++ b/addons/base/static/src/xml/base.xml
@@ -224,7 +224,7 @@
 </tr>
 <t t-name="FormView">
     <h2 class="oe_view_title"><t t-esc="view.fields_view.arch.attrs.string"/></h2>
-    <div class="oe_form_header">
+    <div class="oe_form_header" t-att-id="view.element_id + '_header'">
         <div class="oe_form_buttons">
             <!--<button type="button" class="oe_form_button_save">Save</button>-->
             <button type="button" class="oe_form_button_save_edit">Save &amp; Edit</button>

From 5fc7311f1a6bea35701d4aa7c2a68ee1f3ad1a2e Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 11 Apr 2011 14:54:50 +0200
Subject: [PATCH 130/331] [ADD] row-wise colors

bzr revid: xmo@openerp.com-20110411125450-3h0ay8fskd1s6nz5
---
 addons/base/controllers/main.py     | 34 +++++++++++++++++++++++++----
 addons/base/static/src/xml/base.xml | 13 +++++++----
 addons/base/test/test_view.py       | 33 ++++++++++++++++++++++++++++
 3 files changed, 72 insertions(+), 8 deletions(-)

diff --git a/addons/base/controllers/main.py b/addons/base/controllers/main.py
index 36e9b0feaee..4d75b063a35 100644
--- a/addons/base/controllers/main.py
+++ b/addons/base/controllers/main.py
@@ -566,10 +566,36 @@ class ListView(View):
         rows = DataSet().do_search_read(request, model,
                                         offset=offset, limit=limit,
                                         domain=domain)
-        # rows pipe
-        #   process_attrs
-        #   process_colors
-        return rows
+        eval_context = request.session.evaluation_context(
+            request.context)
+        return [
+            {'data': row,
+             'attrs': self.process_attrs(view, row, eval_context),
+             'color': self.process_colors(view, row, eval_context)}
+            for row in rows
+        ]
+
+    def process_attrs(self, view, row, context):
+        pass
+
+    def process_colors(self, view, row, context):
+        colors = view['arch']['attrs'].get('colors')
+
+        if not colors:
+            return None
+
+        color = [
+            pair.split(':')[0]
+            for pair in colors.split(';')
+            if eval(pair.split(':')[1], dict(context, **row))
+        ]
+
+        if not color:
+            return None
+        elif len(color) == 1:
+            return color[0]
+        return 'maroon'
+
 
 class SearchView(View):
     _cp_path = "/base/searchview"
diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml
index caf463cf4e0..8a71b8ebc7a 100644
--- a/addons/base/static/src/xml/base.xml
+++ b/addons/base/static/src/xml/base.xml
@@ -197,9 +197,14 @@
     </thead>
 </t>
 <t t-name="ListView.rows" t-foreach="rows" t-as="row">
-    <t t-call="ListView.row"/>
+    <t t-call="ListView.row">
+        <t t-set="style" t-value="null"/>
+        <t-if test="row.color">
+            <t t-set="style" t-value="'color: ' + row.color"/>
+        </t-if>
+    </t>
 </t>
-<tr t-name="ListView.row">
+<tr t-name="ListView.row" t-att-style="style">
     <th t-if="options.selectable" class="oe-record-selector">
         <input type="checkbox"/>
     </th>
@@ -208,8 +213,8 @@
         <td t-if="column.invisible !== '1'" t-att-title="column.help">
             <t t-set="is_button" t-value="column.tag === 'button'"/>
             <!-- TODO: get correct widget from form -->
-            <t t-if="!is_button and row[column.id]">
-                <t t-esc="row[column.id]"/>
+            <t t-if="!is_button and row['data'][column.id]">
+                <t t-esc="row['data'][column.id]"/>
             </t>
             <button type="button" t-att-title="column.help"
                     t-if="is_button">
diff --git a/addons/base/test/test_view.py b/addons/base/test/test_view.py
index 141bbd5e0db..0070ea11cf4 100644
--- a/addons/base/test/test_view.py
+++ b/addons/base/test/test_view.py
@@ -205,3 +205,36 @@ class ListViewTest(unittest2.TestCase):
 
         self.assertEqual(view['arch']['attrs']['editable'],
                          'bottom')
+
+    def test_color_nocolor(self):
+        self.assertEqual(
+            self.view.process_colors(
+                {'arch': {'attrs': {}, 'children': []}}, {}, {}),
+            None)
+    def test_color_literal(self):
+        self.assertEqual(
+            self.view.process_colors(
+                {'arch': {'attrs': {'colors': 'black:1'}}, 'children': []},
+                {}, {}),
+            'black')
+    def test_color_miss(self):
+        self.assertEqual(
+            self.view.process_colors(
+                {'arch': {'attrs': {'colors': "grey:state in ('cancelled','done');blue:state in ('pending')"}},
+                 'children': []
+                }, {'state': 'open'}, {}),
+            None)
+    def test_color_compute(self):
+        self.assertEqual(
+            self.view.process_colors(
+                {'arch': {'attrs': {'colors': "grey:state in ('cancelled','done');blue:state in ('pending')"}},
+                 'children': []
+                }, {'state': 'done'}, {}),
+            'grey')
+    def test_color_multiple(self):
+        self.assertEqual(
+            self.view.process_colors(
+                {'arch': {'attrs': {'colors': "grey:state in ('cancelled','done');blue:state in ('done')"}},
+                 'children': []
+                }, {'state': 'done'}, {}),
+            'maroon')

From 83bd3c83487872e27d111bb867e4923526731c69 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 11 Apr 2011 15:57:43 +0200
Subject: [PATCH 131/331] [REM] attrs processing placeholders, will be done in
 JS

bzr revid: xmo@openerp.com-20110411135743-i79ti6acxe7cf400
---
 addons/base/controllers/main.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/addons/base/controllers/main.py b/addons/base/controllers/main.py
index 4d75b063a35..d7ba2c46ace 100644
--- a/addons/base/controllers/main.py
+++ b/addons/base/controllers/main.py
@@ -570,14 +570,10 @@ class ListView(View):
             request.context)
         return [
             {'data': row,
-             'attrs': self.process_attrs(view, row, eval_context),
              'color': self.process_colors(view, row, eval_context)}
             for row in rows
         ]
 
-    def process_attrs(self, view, row, context):
-        pass
-
     def process_colors(self, view, row, context):
         colors = view['arch']['attrs'].get('colors')
 

From 9d3b604724298c2b078debc4591401853acd83af Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Mon, 11 Apr 2011 17:10:59 +0200
Subject: [PATCH 132/331] [FIX] Removed debugger keyword.

bzr revid: nicolas.vanhoren@openerp.com-20110411151059-q7gfmt0qjfmbv1kh
---
 addons/base/static/src/css/base.css | 19 +++++++++++++++++--
 addons/base/static/src/js/chrome.js |  1 -
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/addons/base/static/src/css/base.css b/addons/base/static/src/css/base.css
index 7b686f53fb4..4a3aea4bb52 100644
--- a/addons/base/static/src/css/base.css
+++ b/addons/base/static/src/css/base.css
@@ -311,7 +311,7 @@ body.openerp {
 
 /* Main Application */
 .openerp .application {
-    padding: 6px;
+    padding: 0px;
 }
 
 .openerp h2.oe_view_title {
@@ -481,8 +481,19 @@ body.openerp {
 
 /* Sidebar */
 .openerp .view-manager-main-table {
+    margin: 0;
     width:100%;
+    border-collapse:collapse;
 }
+
+.openerp .view-manager-main-table tbody {
+    vertical-align: top;
+}
+
+.openerp .view-manager-main-content {
+    padding: 6px;
+}
+
 .openerp .view-manager-main-sidebar {
     vertical-align: top;
     width:0;
@@ -493,6 +504,11 @@ body.openerp {
 .openerp .view-manager-main-sidebar .sidebar-main-div {
     padding:0;
     margin:0;
+    width:180px;
+    border-color: #1F1F1F;
+    border-style: solid;
+    border-width: 1px;
+    height:100%;
 }
 
 .openerp .view-manager-main-sidebar .sidebar-sub-div {
@@ -504,7 +520,6 @@ body.openerp {
     list-style-type: none;
     margin: 0;
     padding: 0;
-    width: 120px;
     border-bottom: solid 1px #1F1F1F;
 }
 
diff --git a/addons/base/static/src/js/chrome.js b/addons/base/static/src/js/chrome.js
index f567def9a23..ec6462cac30 100644
--- a/addons/base/static/src/js/chrome.js
+++ b/addons/base/static/src/js/chrome.js
@@ -911,7 +911,6 @@ openerp.base.WebClient = openerp.base.Controller.extend({
         this.action.start();
         
         // if using saved actions, load the action and give it to action manager
-        debugger;
         var parameters = jQuery.deparam(jQuery.param.querystring());
         if(parameters["s_action"] != undefined) {
             var key = parseInt(parameters["s_action"]);

From 25a65bfc999af9086940d8c4e8709f886f189cd4 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Mon, 11 Apr 2011 17:59:46 +0200
Subject: [PATCH 133/331] [ADD] form: basic support of buttons type=object

bzr revid: fme@openerp.com-20110411155946-oqk9qlaxxcdtv32r
---
 addons/base/static/src/js/form.js | 106 ++++++++++++++++++++++++++----
 1 file changed, 93 insertions(+), 13 deletions(-)

diff --git a/addons/base/static/src/js/form.js b/addons/base/static/src/js/form.js
index 0eec8c79ebb..ce6a203a52d 100644
--- a/addons/base/static/src/js/form.js
+++ b/addons/base/static/src/js/form.js
@@ -113,7 +113,7 @@ openerp.base.FormView =  openerp.base.Controller.extend( /** @lends openerp.base
                 this.dataset.index = this.dataset.ids.length - 1;
                 break;
         }
-        this.dataset.read_index(_.keys(this.fields_view.fields), this.on_record_loaded);
+        this.reload();
     },
     do_update_pager: function(hide_index) {
         var $pager = this.$element.find('#' + this.element_id + '_header div.oe_form_pager').eq(0);
@@ -198,7 +198,7 @@ openerp.base.FormView =  openerp.base.Controller.extend( /** @lends openerp.base
             self.on_record_loaded(result.result);
         });
     },
-    do_save: function() {
+    do_save: function(success) {
         var self = this;
         if (!this.ready) {
             return false;
@@ -216,20 +216,19 @@ openerp.base.FormView =  openerp.base.Controller.extend( /** @lends openerp.base
         }
         if (invalid) {
             this.on_invalid();
+            return false;
         } else {
             this.log("About to save", values);
             if (!this.datarecord.id) {
-                this.dataset.create(values, function() {
-                    self.datarecord.id = arguments[0].result;
-                    self.dataset.ids.push(self.datarecord.id);
-                    self.dataset.index = self.dataset.ids.length - 1;
-                    self.dataset.count++;
-                    self.do_update_pager();
-                    self.on_saved.apply(self, arguments);
+                this.dataset.create(values, function(r) {
+                    self.on_created(r, success);
                 });
             } else {
-                this.dataset.write(this.datarecord.id, values, this.on_saved);
+                this.dataset.write(this.datarecord.id, values, function(r) {
+                    self.on_saved(r, success);
+                });
             }
+            return true;
         }
     },
     do_save_edit: function() {
@@ -250,12 +249,29 @@ openerp.base.FormView =  openerp.base.Controller.extend( /** @lends openerp.base
         msg += "</ul>";
         this.notification.warn("The following fields are invalid :", msg);
     },
-    on_saved: function(r) {
+    on_saved: function(r, success) {
         if (!r.result) {
-            this.log("Record was not saved");
+            this.notification.warn("Record not saved", "Problem while saving record.");
         } else {
-            // Check response for exceptions, display error
             this.notification.notify("Record saved", "The record #" + this.datarecord.id + " has been saved.");
+            if (success) {
+                success(r);
+            }
+        }
+    },
+    on_created: function(r, success) {
+        if (!r.result) {
+            this.notification.warn("Record not created", "Problem while creating record.");
+        } else {
+            this.datarecord.id = arguments[0].result;
+            this.dataset.ids.push(this.datarecord.id);
+            this.dataset.index = this.dataset.ids.length - 1;
+            this.dataset.count++;
+            this.do_update_pager();
+            this.notification.notify("Record created", "The record has been created with id #" + this.datarecord.id);
+            if (success) {
+                success(r);
+            }
         }
     },
     do_search: function (domains, contexts, groupbys) {
@@ -266,6 +282,15 @@ openerp.base.FormView =  openerp.base.Controller.extend( /** @lends openerp.base
     },
     do_cancel: function () {
         this.notification.notify("Cancelling form");
+    },
+    reload: function() {
+        if (this.datarecord.id) {
+            this.dataset.read_index(_.keys(this.fields_view.fields), this.on_record_loaded);
+        } else {
+            this.dataset.default_get(_.keys(this.fields), function(result) {
+                self.on_record_loaded(result.result);
+            });
+        }
     }
 });
 
@@ -464,6 +489,61 @@ openerp.base.form.WidgetButton = openerp.base.form.Widget.extend({
     init: function(view, node) {
         this._super(view, node);
         this.template = "WidgetButton";
+    },
+    start: function() {
+        this._super.apply(this, arguments);
+        this.$element.click(this.on_click);
+    },
+    on_click: function(saved) {
+        var self = this;
+        if (saved !== true) {
+            this.view.do_save(function() {
+                self.on_click(true);
+            });
+        } else {
+            if (this.node.attrs.confirm) {
+                var dialog = $('<div>' + this.node.attrs.confirm + '</div>').dialog({
+                    title: 'Confirm',
+                    modal: true,
+                    buttons: {
+                        Ok: function() {
+                            self.on_confirmed();
+                            $(this).dialog("close");
+                        },
+                        Cancel: function() {
+                            $(this).dialog("close");
+                        }
+                    }
+                });
+            } else {
+                this.on_confirmed();
+            }
+        }
+    },
+    on_confirmed: function() {
+        var attrs = this.node.attrs;
+        if (attrs.special) {
+            return this.log("Should close the popup");
+        } else {
+            var type = attrs.type || 'workflow';
+            var context = _.extend({}, this.view.dataset.context, attrs.context || {});
+            switch(type) {
+                case 'object':
+                    return this.view.dataset.call(attrs.name, [this.view.datarecord.id], [context], this.on_button_object);
+                    break;
+                default:
+                    this.log(_.sprintf("Unsupported button type : %s", type));
+            }
+        }
+    },
+    on_button_object: function(r) {
+        if (r.result === false) {
+            this.log("Button object returns false");
+        } else if (r.result.constructor == Object) {
+            console.log("TODO: send action to action manager", r.result);
+        } else {
+            this.view.reload();
+        }
     }
 });
 

From 0d42418698a35de7890f8917b29ea274b5603492 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Mon, 11 Apr 2011 18:22:39 +0200
Subject: [PATCH 134/331] [IMP] Updated css for sidebar.

bzr revid: nicolas.vanhoren@openerp.com-20110411162239-70r6yom0hqnkbius
---
 addons/base/static/src/css/base.css           |  45 ++++++++++++++----
 .../base/static/src/img/sideheader-a-bg.png   | Bin 0 -> 126 bytes
 addons/base/static/src/js/views.js            |   6 +--
 addons/base/static/src/xml/base.xml           |   1 +
 4 files changed, 39 insertions(+), 13 deletions(-)
 create mode 100644 addons/base/static/src/img/sideheader-a-bg.png

diff --git a/addons/base/static/src/css/base.css b/addons/base/static/src/css/base.css
index 4a3aea4bb52..5c619aa4fb2 100644
--- a/addons/base/static/src/css/base.css
+++ b/addons/base/static/src/css/base.css
@@ -484,6 +484,7 @@ body.openerp {
     margin: 0;
     width:100%;
     border-collapse:collapse;
+    height:100%;
 }
 
 .openerp .view-manager-main-table tbody {
@@ -495,35 +496,59 @@ body.openerp {
 }
 
 .openerp .view-manager-main-sidebar {
-    vertical-align: top;
     width:0;
     padding:0;
     margin:0;
 }
 
-.openerp .view-manager-main-sidebar .sidebar-main-div {
+.openerp .sidebar-main-div {
     padding:0;
     margin:0;
     width:180px;
-    border-color: #1F1F1F;
-    border-style: solid;
-    border-width: 1px;
+    border-left-color: #D2CFCF;
+    border-left-style: solid;
+    border-left-width: 1px;
     height:100%;
+    font-family: Ubuntu, Helvetica, sans-serif;
+    font-size: 0.9em;
 }
 
-.openerp .view-manager-main-sidebar .sidebar-sub-div {
-    border: solid 1px #1F1F1F;
-    border-bottom-width: 0;
+.openerp .sidebar-main-div a {
+    color: #555;
+    text-decoration: none;
+}
+
+.openerp .sidebar-main-div a:hover {
+    color: black;
+}
+
+.openerp .view-manager-main-sidebar h2 {
+    margin:0;
+    font-family: Ubuntu, Helvetica, sans-serif;
+    font-size: 1.15em;
+    color: #8E8E8E;
+    text-shadow: white 0px 1px 0px;
+    padding-left: 10px;
+    padding-right: 21px;
+    height: 21px;
+    background: url(../img/sideheader-a-bg.png) repeat-x;
+    border-color: #D2CFCF;
+    border-style: solid;
+    border-top-width: 1px;
+    border-bottom-width: 1px;
+    border-left-width: 0;
+    border-right-width: 0;
 }
 
 .openerp .view-manager-main-sidebar ul {
     list-style-type: none;
     margin: 0;
     padding: 0;
-    border-bottom: solid 1px #1F1F1F;
+    display: block;
 }
 
 .openerp .view-manager-main-sidebar li {
-    padding: 3px;
+    display: block;
+    padding: 3px 3px 3px 10px;
 }
 
diff --git a/addons/base/static/src/img/sideheader-a-bg.png b/addons/base/static/src/img/sideheader-a-bg.png
new file mode 100644
index 0000000000000000000000000000000000000000..ca9b64b8b01911a235e855e01b2d7c50f1b89258
GIT binary patch
literal 126
zcmeAS@N?(olHy`uVBq!ia0vp^j6f{P!2~2Z41|M$lw^r(L`iUdT1k0gQ7VIDN`6wR
zf@f}GdTLN=VoGJ<$y6JlA_Y$u#}JO_<RAb4+Y6hWX>jFX{{Ndj{5$`Nf80lMa&j2{
XYg_(Ua%H77P%VR}tDnm{r-UW|lLRIi

literal 0
HcmV?d00001

diff --git a/addons/base/static/src/js/views.js b/addons/base/static/src/js/views.js
index 890f69448a5..12935c72132 100644
--- a/addons/base/static/src/js/views.js
+++ b/addons/base/static/src/js/views.js
@@ -188,10 +188,10 @@ openerp.base.Sidebar = openerp.base.BaseWidget.extend({
     set_toolbar: function(toolbar) {
         this.sections = [];
         var self = this;
-        _.each(["print", "action", "relate"], function(type) {
-            if (toolbar[type].length == 0)
+        _.each([["print", "Reports"], ["action", "Actions"], ["relate", "Links"]], function(type) {
+            if (toolbar[type[0]].length == 0)
                 return;
-            var section = {elements:toolbar[type]};
+            var section = {elements:toolbar[type[0]], label:type[1]};
             self.sections.push(section);
         });
         this.refresh();
diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml
index 57f9c81559e..47e4c705364 100644
--- a/addons/base/static/src/xml/base.xml
+++ b/addons/base/static/src/xml/base.xml
@@ -530,6 +530,7 @@
         <t t-set="i" t-value="0"/>
         <t t-foreach="sections" t-as="section">
         <t t-if="section.elements.length &gt; 0">
+        <h2><t t-esc="section.label"/></h2>
         <ul>
             <t t-set="j" t-value="0"/>
             <t t-foreach="section.elements" t-as="element">

From 25bbc891cfd04fec00438518ec0d89d95e4fb33f Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 11 Apr 2011 19:31:46 +0200
Subject: [PATCH 135/331] [TEST] add tests for
 openerp.base.form.Widget.eval_attrs (also rename to compute_domain)

bzr revid: xmo@openerp.com-20110411173146-mg8yjlgsakei34u0
---
 addons/base/static/src/js/form.js |  4 +--
 addons/base/static/test/form.js   | 54 +++++++++++++++++++++++++++++++
 addons/base/static/test/test.html |  2 ++
 3 files changed, 58 insertions(+), 2 deletions(-)
 create mode 100644 addons/base/static/test/form.js

diff --git a/addons/base/static/src/js/form.js b/addons/base/static/src/js/form.js
index bf42fc4fd7f..9c8bf87902a 100644
--- a/addons/base/static/src/js/form.js
+++ b/addons/base/static/src/js/form.js
@@ -283,10 +283,10 @@ openerp.base.form.Widget = openerp.base.Controller.extend({
     },
     process_attrs: function() {
         for (var a in this.attrs) {
-            this[a] = this.eval_attrs(this.attrs[a]);
+            this[a] = this.compute_domain(this.attrs[a]);
         }
     },
-    eval_attrs: function(expr) {
+    compute_domain: function(expr) {
         var stack = [];
         for (var i = 0; i < expr.length; i++) {
             var ex = expr[i];
diff --git a/addons/base/static/test/form.js b/addons/base/static/test/form.js
new file mode 100644
index 00000000000..9d61bf6d60a
--- /dev/null
+++ b/addons/base/static/test/form.js
@@ -0,0 +1,54 @@
+$(document).ready(function () {
+    var widget;
+    module("form.widget", {
+        setup: function () {
+            var openerp = window.openerp.init(true);
+            window.openerp.base.chrome(openerp);
+            // views loader stuff
+            window.openerp.base.data(openerp);
+            window.openerp.base.views(openerp);
+            window.openerp.base.form(openerp);
+            widget = new openerp.base.form.Widget({
+                'widgets': {},
+                'fields': {}
+            }, {
+                'attrs': {}
+            });
+        }
+    });
+    test("compute_domain", function () {
+        widget.view.fields = {
+            'a': {value: 3},
+            'group_method': {value: 'line'},
+            'select1': {value: 'day'},
+            'rrule_type': {value: 'monthly'}
+        };
+        ok(widget.compute_domain([['a', '=', 3]]));
+        ok(widget.compute_domain([['group_method','!=','count']]));
+        ok(widget.compute_domain([['select1','=','day'],
+                                  ['rrule_type','=','monthly']]));
+    });
+    test("compute_domain or", function () {
+        var base = {
+            'section_id': {value: null},
+            'user_id': {value: null},
+            'member_ids': {value: null}
+        };
+
+        var domain = ['|', ['section_id', '=', 42],
+                      '|', ['user_id','=',3],
+                           ['member_ids', 'in', [3]]];
+
+        widget.view.fields = _.extend(
+            {}, base, {'section_id': {value: 42}});
+        ok(widget.compute_domain(domain));
+
+        widget.view.fields =  _.extend(
+            {}, base, {'user_id': {value: 3}});
+        ok(widget.compute_domain(domain));
+
+        widget.view.fields =  _.extend(
+            {}, base, {'member_ids': {value: 3}});
+        ok(widget.compute_domain(domain));
+    });
+});
diff --git a/addons/base/static/test/test.html b/addons/base/static/test/test.html
index 776b03146ff..5fcf4f4c594 100644
--- a/addons/base/static/test/test.html
+++ b/addons/base/static/test/test.html
@@ -21,6 +21,7 @@
     <script src="/base/static/src/js/data.js"></script>
     <script src="/base/static/src/js/views.js"></script>
     <script src="/base/static/src/js/search.js"></script>
+    <script src="/base/static/src/js/form.js"></script>
     <script src="/base/static/src/js/list.js"></script>
     <script type="text/javascript">
         QWeb.add_template('/base/static/src/xml/base.xml');
@@ -36,5 +37,6 @@
     </body>
     <script type="text/javascript" src="/base/static/test/registry.js"></script>
     <script type="text/javascript" src="/base/static/test/search-date.js"></script>
+    <script type="text/javascript" src="/base/static/test/form.js"></script>
     <script type="text/javascript" src="/base/static/test/list.js"></script>
 </html>

From 215ee4fa5ff3f9ee43f3b96f49cffdd8212a084f Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 11 Apr 2011 19:36:43 +0200
Subject: [PATCH 136/331] [REF] move compute_domain outside of
 openep.base.form.Widget

bzr revid: xmo@openerp.com-20110411173643-84eqb3vc0drd9ge7
---
 addons/base/static/src/js/form.js | 121 +++++++++++++++---------------
 addons/base/static/test/form.js   |  38 ++++------
 2 files changed, 76 insertions(+), 83 deletions(-)

diff --git a/addons/base/static/src/js/form.js b/addons/base/static/src/js/form.js
index 9c8bf87902a..a5aa2364d97 100644
--- a/addons/base/static/src/js/form.js
+++ b/addons/base/static/src/js/form.js
@@ -258,6 +258,65 @@ openerp.base.FormView =  openerp.base.Controller.extend( /** @lends openerp.base
 /** @namespace */
 openerp.base.form = {};
 
+openerp.base.form.compute_domain = function(expr, fields) {
+    var stack = [];
+    for (var i = 0; i < expr.length; i++) {
+        var ex = expr[i];
+        if (ex.length == 1) {
+            stack.push(ex[0]);
+            continue;
+        }
+
+        var field = fields[ex[0]].value;
+        var op = ex[1];
+        var val = ex[2];
+
+        switch (op.toLowerCase()) {
+            case '=':
+            case '==':
+                stack.push(field == val);
+                break;
+            case '!=':
+            case '<>':
+                stack.push(field != val);
+                break;
+            case '<':
+                stack.push(field < val);
+                break;
+            case '>':
+                stack.push(field > val);
+                break;
+            case '<=':
+                stack.push(field <= val);
+                break;
+            case '>=':
+                stack.push(field >= val);
+                break;
+            case 'in':
+                stack.push(_.indexOf(val, field) > -1);
+                break;
+            case 'not in':
+                stack.push(_.indexOf(val, field) == -1);
+                break;
+            default:
+                this.log("Unsupported operator in attrs :", op);
+        }
+    }
+
+    for (var j = stack.length-1; j >- 1; j--) {
+        switch (stack[j]) {
+            case '|':
+                var result = stack[j + 1] || stack[j + 2];
+                stack.splice(j, 3, result);
+                break;
+            case '&':
+                var result = stack[j + 1] && stack[j + 2];
+                stack.splice(j, 3, result);
+                break;
+        }
+    }
+    return _.indexOf(stack, false) == -1;
+},
 openerp.base.form.Widget = openerp.base.Controller.extend({
     init: function(view, node) {
         this.view = view;
@@ -282,69 +341,11 @@ openerp.base.form.Widget = openerp.base.Controller.extend({
         this.$element = $('#' + this.element_id);
     },
     process_attrs: function() {
+        var compute_domain = openerp.base.form.compute_domain;
         for (var a in this.attrs) {
-            this[a] = this.compute_domain(this.attrs[a]);
+            this[a] = compute_domain(this.attrs[a], this.view.fields);
         }
     },
-    compute_domain: function(expr) {
-        var stack = [];
-        for (var i = 0; i < expr.length; i++) {
-            var ex = expr[i];
-            if (ex.length == 1) {
-                stack.push(ex[0]);
-                continue;
-            }
-
-            var field = this.view.fields[ex[0]].value;
-            var op = ex[1];
-            var val = ex[2];
-
-            switch (op.toLowerCase()) {
-                case '=':
-                case '==':
-                    stack.push(field == val);
-                    break;
-                case '!=':
-                case '<>':
-                    stack.push(field != val);
-                    break;
-                case '<':
-                    stack.push(field < val);
-                    break;
-                case '>':
-                    stack.push(field > val);
-                    break;
-                case '<=':
-                    stack.push(field <= val);
-                    break;
-                case '>=':
-                    stack.push(field >= val);
-                    break;
-                case 'in':
-                    stack.push(_.indexOf(val, field) > -1);
-                    break;
-                case 'not in':
-                    stack.push(_.indexOf(val, field) == -1);
-                    break;
-                default:
-                    this.log("Unsupported operator in attrs :", op);
-            }
-        }
-
-        for (var j = stack.length-1; j >- 1; j--) {
-            switch (stack[j]) {
-                case '|':
-                    var result = stack[j + 1] || stack[j + 2];
-                    stack.splice(j, 3, result);
-                    break;
-                case '&':
-                    var result = stack[j + 1] && stack[j + 2];
-                    stack.splice(j, 3, result);
-                    break;
-            }
-        }
-        return _.indexOf(stack, false) == -1;
-    },
     update_dom: function() {
         this.$element.toggle(!this.invisible);
     },
diff --git a/addons/base/static/test/form.js b/addons/base/static/test/form.js
index 9d61bf6d60a..0cad536bc73 100644
--- a/addons/base/static/test/form.js
+++ b/addons/base/static/test/form.js
@@ -1,32 +1,28 @@
 $(document).ready(function () {
-    var widget;
+    var openerp;
     module("form.widget", {
         setup: function () {
-            var openerp = window.openerp.init(true);
+            openerp = window.openerp.init(true);
             window.openerp.base.chrome(openerp);
             // views loader stuff
             window.openerp.base.data(openerp);
             window.openerp.base.views(openerp);
             window.openerp.base.form(openerp);
-            widget = new openerp.base.form.Widget({
-                'widgets': {},
-                'fields': {}
-            }, {
-                'attrs': {}
-            });
         }
     });
     test("compute_domain", function () {
-        widget.view.fields = {
+        var fields = {
             'a': {value: 3},
             'group_method': {value: 'line'},
             'select1': {value: 'day'},
             'rrule_type': {value: 'monthly'}
         };
-        ok(widget.compute_domain([['a', '=', 3]]));
-        ok(widget.compute_domain([['group_method','!=','count']]));
-        ok(widget.compute_domain([['select1','=','day'],
-                                  ['rrule_type','=','monthly']]));
+        ok(openerp.base.form.compute_domain(
+            [['a', '=', 3]], fields));
+        ok(openerp.base.form.compute_domain(
+            [['group_method','!=','count']], fields));
+        ok(openerp.base.form.compute_domain(
+            [['select1','=','day'], ['rrule_type','=','monthly']], fields));
     });
     test("compute_domain or", function () {
         var base = {
@@ -39,16 +35,12 @@ $(document).ready(function () {
                       '|', ['user_id','=',3],
                            ['member_ids', 'in', [3]]];
 
-        widget.view.fields = _.extend(
-            {}, base, {'section_id': {value: 42}});
-        ok(widget.compute_domain(domain));
+        ok(openerp.base.form.compute_domain(domain, _.extend(
+            {}, base, {'section_id': {value: 42}})));
+        ok(openerp.base.form.compute_domain(domain, _.extend(
+            {}, base, {'user_id': {value: 3}})));
 
-        widget.view.fields =  _.extend(
-            {}, base, {'user_id': {value: 3}});
-        ok(widget.compute_domain(domain));
-
-        widget.view.fields =  _.extend(
-            {}, base, {'member_ids': {value: 3}});
-        ok(widget.compute_domain(domain));
+        ok(openerp.base.form.compute_domain(domain, _.extend(
+            {}, base, {'member_ids': {value: 3}})));
     });
 });

From ae0a6c6cf187ef6ed115b299249a175e02e00ac3 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 11 Apr 2011 19:50:25 +0200
Subject: [PATCH 137/331] [IMP] compute domains in a single pass, add 'not'
 operator

bzr revid: xmo@openerp.com-20110411175025-trllxu05xt4ict84
---
 addons/base/static/src/js/form.js | 31 +++++++++++++++----------------
 addons/base/static/test/form.js   | 10 ++++++++++
 2 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/addons/base/static/src/js/form.js b/addons/base/static/src/js/form.js
index a5aa2364d97..d33c9f2ee7e 100644
--- a/addons/base/static/src/js/form.js
+++ b/addons/base/static/src/js/form.js
@@ -260,11 +260,23 @@ openerp.base.form = {};
 
 openerp.base.form.compute_domain = function(expr, fields) {
     var stack = [];
-    for (var i = 0; i < expr.length; i++) {
+    for (var i = expr.length - 1; i >= 0; i--) {
         var ex = expr[i];
         if (ex.length == 1) {
-            stack.push(ex[0]);
-            continue;
+            var top = stack.pop();
+            switch (ex[0]) {
+                case '|':
+                    stack.push(stack.pop() || top);
+                    continue;
+                case '&':
+                    stack.push(stack.pop() && top);
+                    continue;
+                case '!':
+                    stack.push(!top);
+                    continue;
+                default:
+                    throw new Error('Unknown domain operator ' + ex[0]);
+            }
         }
 
         var field = fields[ex[0]].value;
@@ -302,19 +314,6 @@ openerp.base.form.compute_domain = function(expr, fields) {
                 this.log("Unsupported operator in attrs :", op);
         }
     }
-
-    for (var j = stack.length-1; j >- 1; j--) {
-        switch (stack[j]) {
-            case '|':
-                var result = stack[j + 1] || stack[j + 2];
-                stack.splice(j, 3, result);
-                break;
-            case '&':
-                var result = stack[j + 1] && stack[j + 2];
-                stack.splice(j, 3, result);
-                break;
-        }
-    }
     return _.indexOf(stack, false) == -1;
 },
 openerp.base.form.Widget = openerp.base.Controller.extend({
diff --git a/addons/base/static/test/form.js b/addons/base/static/test/form.js
index 0cad536bc73..6ae1719f620 100644
--- a/addons/base/static/test/form.js
+++ b/addons/base/static/test/form.js
@@ -43,4 +43,14 @@ $(document).ready(function () {
         ok(openerp.base.form.compute_domain(domain, _.extend(
             {}, base, {'member_ids': {value: 3}})));
     });
+    test("compute_domain not", function () {
+        var fields = {
+            'a': {value: 5},
+            'group_method': {value: 'line'}
+        };
+        ok(openerp.base.form.compute_domain(
+            ['!', ['a', '=', 3]], fields));
+        ok(openerp.base.form.compute_domain(
+            ['!', ['group_method','=','count']], fields));
+    });
 });

From 556f36b5d5e62db9460d9f8fb7851b94954cbd24 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Mon, 11 Apr 2011 23:18:35 +0200
Subject: [PATCH 138/331] [FIX] ir.ui.menu: load web icons for all menus, not
 just top levels ones

This is useful for portal, where a subtree of the menus
is used as top-level menu for portal users.

bzr revid: odo@openerp.com-20110411211835-zw2kazf63ae4qrr1
---
 openerp/addons/base/ir/ir_ui_menu.py | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/openerp/addons/base/ir/ir_ui_menu.py b/openerp/addons/base/ir/ir_ui_menu.py
index 5bdef4feecc..ed9a5f48158 100644
--- a/openerp/addons/base/ir/ir_ui_menu.py
+++ b/openerp/addons/base/ir/ir_ui_menu.py
@@ -243,11 +243,10 @@ class ir_ui_menu(osv.osv):
                 'web_icon_data': False,
                 'web_icon_hover_data': False,
             }
-            if not menu.parent_id:
-                if menu.web_icon_hover:
-                    res[menu.id]['web_icon_hover_data'] = self.read_image(menu.web_icon_hover)
-                if menu.web_icon:
-                    res[menu.id]['web_icon_data'] = self.read_image(menu.web_icon)
+            if menu.web_icon_hover:
+                res[menu.id]['web_icon_hover_data'] = self.read_image(menu.web_icon_hover)
+            if menu.web_icon:
+                res[menu.id]['web_icon_data'] = self.read_image(menu.web_icon)
         return res
 
     _columns = {

From 6c697ac27e65a9a2783eb4eddee4956ba80b8072 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 12 Apr 2011 00:54:30 +0200
Subject: [PATCH 139/331] [IMP] Improved styles

bzr revid: fme@openerp.com-20110411225430-bdb1vfbl1tju8fe7
---
 addons/base/static/src/css/base.css | 39 ++++++++++++++++++++++++++++-
 addons/base/static/src/xml/base.xml | 10 +++++---
 2 files changed, 44 insertions(+), 5 deletions(-)

diff --git a/addons/base/static/src/css/base.css b/addons/base/static/src/css/base.css
index 5c619aa4fb2..cf78c0f3ae5 100644
--- a/addons/base/static/src/css/base.css
+++ b/addons/base/static/src/css/base.css
@@ -305,9 +305,29 @@ body.openerp {
 }
 
 /* Footer */
-.openerp .footer {
+.openerp div.oe_footer {
+    background: none repeat scroll 0 0 #CCCCCC;
+    overflow: hidden;
+    padding: 5px 0;
+    position: relative;
+    -moz-box-shadow: inset 0px 3px 5px rgba(0, 0, 0, 0.4);
+    -webkit-box-shadow: inset 0px 3px 5px rgba(0, 0, 0, 0.4);
+    box-shadow: inset 0px 3px 5px rgba(0, 0, 0, 0.4);
+}
+.openerp div.oe_footer p.oe_footer_powered {
+    left: 50%;
+    margin: 0;
+    padding: 0 15px;
+    color: #666666;
+    font-weight: bold;
+    font-size: 0.8em;
+    font-family: Ubuntu, Helvetica, sans-serif;
     text-align: center;
 }
+.openerp div.oe_footer p.oe_footer_powered a {
+    text-decoration: none;
+    color: #666666;
+}
 
 /* Main Application */
 .openerp .application {
@@ -426,6 +446,22 @@ body.openerp {
     float: right;
 }
 
+.openerp label.oe_form_label_help {
+    cursor: help;
+}
+.openerp label.oe_form_label, .openerp label.oe_form_label_help {
+    display: block;
+    text-align: right;
+}
+.openerp label.oe_form_label_help span {
+    font-size: 80%;
+    color: darkgreen;
+    vertical-align:top;
+    position: relative;
+    top: -4px;
+    padding: 0 2px;
+}
+
 /* Inputs */
 .openerp input[type="text"], .openerp input[type="password"], .openerp select, .openerp textarea {
     -moz-box-sizing: border-box;
@@ -438,6 +474,7 @@ body.openerp {
     -webkit-border-radius: 3px;
     border-radius: 3px;
     background: white;
+    min-width: 90px;
 }
 .openerp input[type="text"], .openerp input[type="password"], .openerp select, .openerp .button {
     height: 22px;
diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml
index 47e4c705364..9f5d45742f3 100644
--- a/addons/base/static/src/xml/base.xml
+++ b/addons/base/static/src/xml/base.xml
@@ -40,8 +40,8 @@
     </tr>
     <tr>
         <td colspan="2">
-            <div id="oe_footer" class="footer">
-                Powered by OpenERP.
+            <div id="oe_footer" class="oe_footer">
+                <p class="oe_footer_powered">Powered by <a href="http://www.openerp.com">openerp.com</a>.</p>
             </div>
         </td>
     </tr>
@@ -284,11 +284,13 @@
     </div>
 </t>
 <t t-name="WidgetLabel">
-    <label t-att-for="widget.element_id + '_field'" t-att-title="widget.help" style="display: block; text-align: right;"
+    <label t-att-for="widget.element_id + '_field'"
+           t-att-class="'oe_form_label' + (widget.help ? '_help' : '')"
+           t-att-title="widget.help"
            t-att-ondblclick="'console.log(\'' + widget.element_id + '\', openerp.screen.' + widget.element_id + ')'">
         <t t-esc="widget.string"/>
         <span t-if="widget.help">?</span>
-        :
+        <t t-if="widget.string">:</t>
     </label>
 </t>
 <t t-name="FieldChar">

From 66e8ba68c58f59172137397217ab59ab301dc141 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 12 Apr 2011 01:48:24 +0200
Subject: [PATCH 140/331] [IMP] Improved accordion but can't fix nested
 problems.

See Administration -> Customization -> Low Level Object

No support for third + level.

I think we should use something else because jQuery ui accordion is not meant to be nested

bzr revid: fme@openerp.com-20110411234824-hoioajas8opji2jk
---
 addons/base/static/src/css/base.css | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/addons/base/static/src/css/base.css b/addons/base/static/src/css/base.css
index cf78c0f3ae5..2f4aa0b3faf 100644
--- a/addons/base/static/src/css/base.css
+++ b/addons/base/static/src/css/base.css
@@ -172,7 +172,10 @@ body.openerp {
     padding: 0 0 2px;
     border: none;
     background: none;
-    padding-left: 20px;
+    padding-left: 10px;
+}
+.openerp .secondary_menu h3 span, .openerp .secondary_menu h4 span {
+    left: 0 !important;
 }
 .openerp .secondary_menu a {
     display: block;
@@ -201,6 +204,9 @@ body.openerp {
     text-shadow: #fff 0 1px 0;
     border: none !important;
 }
+.openerp div.submenu_accordion div.menu_content a span {
+    padding-left: 20px;
+}
 
 /* Header */
 .openerp .header {

From bc0b9fe4e713642fe893677abe8ec42303bea2dd Mon Sep 17 00:00:00 2001
From: "noz (OpenERP)" <noz@tinyerp.com>
Date: Tue, 12 Apr 2011 09:52:31 +0530
Subject: [PATCH 141/331] [FIX] Removed unnecessary files.

bzr revid: noz@tinyerp.com-20110412042231-ualx3l5s4po6wka7
---
 addons/web_chat/controllers/main.py       |  3 +-
 addons/web_chat/controllers/noz_ajaxim.py | 21 --------
 addons/web_chat/controllers/noz_im.py     | 22 --------
 addons/web_chat/controllers/noz_main.py   | 61 -----------------------
 addons/web_chat/static/src/web_chat.js    |  0
 5 files changed, 1 insertion(+), 106 deletions(-)
 delete mode 100644 addons/web_chat/controllers/noz_ajaxim.py
 delete mode 100644 addons/web_chat/controllers/noz_im.py
 delete mode 100644 addons/web_chat/controllers/noz_main.py
 delete mode 100644 addons/web_chat/static/src/web_chat.js

diff --git a/addons/web_chat/controllers/main.py b/addons/web_chat/controllers/main.py
index adb32c3a7a3..f1c1d392ea9 100644
--- a/addons/web_chat/controllers/main.py
+++ b/addons/web_chat/controllers/main.py
@@ -144,7 +144,6 @@ class PollServer(openerpweb.Controller):
                 msg = '[]'
                 time.sleep(1)
 
-        # it's http://localhost:8002/web_chat/pollserver/poll?callback=jsonp1302147330483&_1302147330483=
         return '%s'%kw.get('callback', '') + '(' + str(msg) + ');'
         
     @openerpweb.httprequest
@@ -210,7 +209,7 @@ class PollServer(openerpweb.Controller):
         msg_arr = []
         for msg in messages:
             msg_arr.append({"t": str(msg['type']), "s": str(msg['from']), "r": str(msg['to']), "m": str(msg['message'])})
-            
+        
         return msg_arr
     
     def _sanitize(self, message):
diff --git a/addons/web_chat/controllers/noz_ajaxim.py b/addons/web_chat/controllers/noz_ajaxim.py
deleted file mode 100644
index abcaded7d0d..00000000000
--- a/addons/web_chat/controllers/noz_ajaxim.py
+++ /dev/null
@@ -1,21 +0,0 @@
-
-import im
-from server import main # import the server library
-
-im = Webchat_IM()
-action = preg_replace('/^' . preg_quote($_SERVER['SCRIPT_NAME'], '/') . '\/(.+?)(\?.+)?$/', '\1', $_SERVER['REQUEST_URI']);
-
-if(substr(action, 0, 1) != '_' && method_exists(im, action))
-    if(action == 'poll') {
-        if($_GET['method'] == 'comet') {
-            im->poll('comet');
-        } else {
-            print $_GET['callback'] . '(' . json_encode(im->poll($_GET['method'])) . ')';
-        }
-    } else {
-        execute = call_user_func_array(array(im, action), $_POST);
-        if(execute)
-            print json_encode(execute !== false ? execute : array('e'=>'wrong args'));
-    }
-else
-    print json_encode(array('e'=>'no method'));
\ No newline at end of file
diff --git a/addons/web_chat/controllers/noz_im.py b/addons/web_chat/controllers/noz_im.py
deleted file mode 100644
index 392a56645fa..00000000000
--- a/addons/web_chat/controllers/noz_im.py
+++ /dev/null
@@ -1,22 +0,0 @@
-
-import openerpweb
-
-class IM(openerpweb.Controller):
-    def __init__(self):
-        super(IM, self).__init__()
-        return;
-    
-    def chat_login(self, username, password):
-        return dict()
-    
-    def chat_logout(self):
-        return dict()
-    
-    def send(self):
-        return dict()
-    
-    def status(self, status, message):
-        return dict()
-    
-    def poll(self, method):
-        return dict()
diff --git a/addons/web_chat/controllers/noz_main.py b/addons/web_chat/controllers/noz_main.py
deleted file mode 100644
index b48513eaf0c..00000000000
--- a/addons/web_chat/controllers/noz_main.py
+++ /dev/null
@@ -1,61 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import simplejson
-import openerpweb
-
-from web_chat.controllers import im
-
-__all__ = ['Webchat_IM']
-
-chat_config_options = {'IM_LIBRARY': 'main',               # The IM server library.
-                       'COOKIE_NAME': 'ajaxim_session',    # Session cookie used by Ajax IM
-                       'COOKIE_PERIOD': 365                # Cookie period, in days                       
-                       }
-
-nodejs_memcache_server = ['localhost:11211']
-
-class Webchat_IM(im.IM):
-    
-    _cp_path = "/webchat/webchatim"
-    
-    def __init__(self):
-        super(Webchat_IM, self).__init__()
-        
-        return;
-    
-    @openerpweb.jsonrequest
-    def index(self, req, username="admin", password="admin"):
-                
-        if req._login:
-            self.username = req._login
-            self.uid = req._uid
-            self.db = req._db
-            
-        return;
-    
-    @openerpweb.jsonrequest
-    def chat_login(self, req, username="admin", password="admin"):
-        # TODO: use db and uid for unique identification.
-        
-        self.auth = [['admin', 'a'], ['demo', 'demo']]
-        
-        self.user_pass = []
-        self.user_session = None
-        
-        if username and password:
-            self.user_pass = [username, password]
-        
-        if self.user_pass in self.auth:
-            self.user_session = username + '_' + str(req.session_id)
-        
-        data = {'username': username, 'user_id': username, 'user_session': self.user_session,
-                'friends': {'u': 'demo', 'g': 'Friends', 's': '1'}    # {'u': 'username', 'g': 'group', 's': 'status'}
-                }
-        
-        # Get the list of friends from memcache.            
-        
-        return dict(r='logged in', s=self.user_session, f=data['friends'])
-    
-    @openerpweb.jsonrequest
-    def chat_logout(self):
-        return dict(r='Logged out')
\ No newline at end of file
diff --git a/addons/web_chat/static/src/web_chat.js b/addons/web_chat/static/src/web_chat.js
deleted file mode 100644
index e69de29bb2d..00000000000

From 2e138b0d0d65e691bd324e3c9f072f5b9c3ef844 Mon Sep 17 00:00:00 2001
From: "Ujjvala Collins (OpenERP)" <uco@tinyerp.com>
Date: Tue, 12 Apr 2011 10:26:42 +0530
Subject: [PATCH 142/331] [FIX] : Fixed partner label report bug.

bzr revid: uco@tinyerp.com-20110412045642-d2gpgoyzmi00glio
---
 openerp/addons/base/res/partner/report/partner_address.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/openerp/addons/base/res/partner/report/partner_address.xml b/openerp/addons/base/res/partner/report/partner_address.xml
index a6865f88153..2a413f4e3c6 100644
--- a/openerp/addons/base/res/partner/report/partner_address.xml
+++ b/openerp/addons/base/res/partner/report/partner_address.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <addresses>
     <address type="fields" name="id">
-        <company-title type="field" name="title"/>
+        <company-title type="field" name="title.name"/>
         <company-name type="field" name="name"/>
         <contact type="zoom" name="address">
             <type type="field" name="type"/>
-            <title type="field" name="title"/>
+            <title type="field" name="title.name"/>
             <name type="field" name="name"/>
             <street type="field" name="street"/>
             <street2 type="field" name="street2"/>

From 44a0b9f3e7fa453c716957199d5262978d86d439 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Tue, 12 Apr 2011 06:07:15 +0000
Subject: [PATCH 143/331] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20110412060715-msjjx45cvs3v0178
---
 addons/account/i18n/pt.po               |   51 +-
 addons/base_action_rule/i18n/ca.po      |  502 +++++++
 addons/crm_claim/i18n/zh_CN.po          |   42 +-
 addons/crm_fundraising/i18n/zh_CN.po    |  768 ++++++++++
 addons/crm_partner_assign/i18n/zh_CN.po |  713 +++++++++
 addons/hr_holidays/i18n/ca.po           |   48 +-
 addons/idea/i18n/mn.po                  |    2 +-
 addons/l10n_ec/i18n/es_EC.po            |   56 +
 addons/procurement/i18n/es_EC.po        |  929 ++++++++++++
 addons/purchase/i18n/en_GB.po           | 1793 +++++++++++++++++++++++
 10 files changed, 4844 insertions(+), 60 deletions(-)
 create mode 100644 addons/base_action_rule/i18n/ca.po
 create mode 100644 addons/crm_fundraising/i18n/zh_CN.po
 create mode 100644 addons/crm_partner_assign/i18n/zh_CN.po
 create mode 100644 addons/l10n_ec/i18n/es_EC.po
 create mode 100644 addons/procurement/i18n/es_EC.po
 create mode 100644 addons/purchase/i18n/en_GB.po

diff --git a/addons/account/i18n/pt.po b/addons/account/i18n/pt.po
index 62daf8e8dc7..b9d529db049 100644
--- a/addons/account/i18n/pt.po
+++ b/addons/account/i18n/pt.po
@@ -7,15 +7,15 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-04-02 14:43+0000\n"
+"PO-Revision-Date: 2011-04-11 16:08+0000\n"
 "Last-Translator: António Anacleto (www.biztek.cv) "
 "<antonio.anacleto@biztek.cv>\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: 2011-04-03 06:05+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-04-12 06:06+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -6641,12 +6641,12 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
 msgid "Unreconciled Entries"
-msgstr ""
+msgstr "Movimentos Não Reconciliados"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_menu_Bank_process
 msgid "Statements Reconciliation"
-msgstr ""
+msgstr "Reconciliação de Extractos"
 
 #. module: account
 #: report:account.invoice:0
@@ -6656,7 +6656,7 @@ msgstr "Impostos:"
 #. module: account
 #: help:account.tax,amount:0
 msgid "For taxes of type percentage, enter % ratio between 0-1."
-msgstr ""
+msgstr "Para impostos do tipo percentagem, introduza o rácio %  entre 0-1."
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_subscription_form
@@ -6704,7 +6704,7 @@ msgstr "Período de duração (dias)"
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_invoice_partner_relation
 msgid "Monthly Turnover"
-msgstr ""
+msgstr "Retorno Mensal"
 
 #. module: account
 #: view:account.move:0
@@ -6736,6 +6736,8 @@ msgid ""
 "Can not find account chart for this company in invoice line account, Please "
 "Create account."
 msgstr ""
+"Não é possível encontrar plano de contas para esta empresa na conta de linha "
+"de factura, Favor criar a conta."
 
 #. module: account
 #: view:account.tax.template:0
@@ -6745,7 +6747,7 @@ msgstr "Modelo de Conta de Imposto"
 #. module: account
 #: view:account.journal.select:0
 msgid "Are you sure you want to open Journal Entries?"
-msgstr ""
+msgstr "Tem a certeza que quer abrir Movimentos de Diário?"
 
 #. module: account
 #: view:account.state.open:0
@@ -6774,7 +6776,7 @@ msgstr "Extracto"
 #. module: account
 #: help:account.journal,default_debit_account_id:0
 msgid "It acts as a default account for debit amount"
-msgstr ""
+msgstr "Actua como a conta por defeito para o montante a débito"
 
 #. module: account
 #: model:ir.module.module,description:account.module_meta_information
@@ -6863,7 +6865,7 @@ msgstr ""
 #. module: account
 #: field:account.bank.statement,closing_date:0
 msgid "Closed On"
-msgstr ""
+msgstr "Fechado"
 
 #. module: account
 #: model:ir.model,name:account.model_account_bank_statement_line
@@ -6906,7 +6908,7 @@ msgstr ""
 #: code:addons/account/account.py:938
 #, python-format
 msgid "You should have chosen periods that belongs to the same company"
-msgstr ""
+msgstr "Deveria ter escolhido períodos que pretensão à mesma empresa"
 
 #. module: account
 #: field:account.fiscalyear.close,report_name:0
@@ -7046,6 +7048,8 @@ msgid ""
 "Helps you generate reminder letters for unpaid invoices, including multiple "
 "levels of reminding and customized per-partner policies."
 msgstr ""
+"Ajuda a gerar cartas de aviso para facturas em divida, incluindo múltiplos "
+"níveis de aviso e politicas personalizadas por cliente."
 
 #. module: account
 #: selection:account.entries.report,move_line_state:0
@@ -7107,7 +7111,7 @@ msgstr "Diário de Vendas"
 #: code:addons/account/wizard/account_move_journal.py:104
 #, python-format
 msgid "Open Journal Items !"
-msgstr ""
+msgstr "Abrir Itens de Diário !"
 
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_tax
@@ -7256,7 +7260,7 @@ msgstr "Vendas por tipo de conta"
 #. module: account
 #: help:account.invoice,move_id:0
 msgid "Link to the automatically generated Journal Items."
-msgstr ""
+msgstr "Ligar aos movimentos de diário gerados automaticamente."
 
 #. module: account
 #: selection:account.installer,period:0
@@ -7281,7 +7285,7 @@ msgstr "  número de dias: 14"
 #. module: account
 #: view:analytic.entries.report:0
 msgid "    7 Days    "
-msgstr ""
+msgstr "    7 Dias    "
 
 #. module: account
 #: field:account.partner.reconcile.process,progress:0
@@ -7381,7 +7385,7 @@ msgstr "Estado da linha de movimento"
 #: model:ir.model,name:account.model_account_move_line_reconcile
 #: model:ir.model,name:account.model_account_move_line_reconcile_writeoff
 msgid "Account move line reconcile"
-msgstr ""
+msgstr "Reconciliação de linha de movimento de conta"
 
 #. module: account
 #: view:account.subscription.generate:0
@@ -7460,6 +7464,8 @@ msgid ""
 "Select Fiscal Year which you want to remove entries for its End of year "
 "entries journal"
 msgstr ""
+"Seleccionar o Ano Fiscal a partir do qual pretende eliminar os movimentos do "
+"diário de fecho de ano."
 
 #. module: account
 #: field:account.tax.template,type_tax_use:0
@@ -7486,7 +7492,7 @@ msgstr "A fatura '%s' está paga."
 #. module: account
 #: model:process.node,note:account.process_node_electronicfile0
 msgid "Automatic entry"
-msgstr ""
+msgstr "Movimento automatico"
 
 #. module: account
 #: constraint:account.tax.code.template:0
@@ -7561,13 +7567,13 @@ msgstr "Contas bancárias e de caixa"
 #: view:account.invoice.report:0
 #: field:account.invoice.report,residual:0
 msgid "Total Residual"
-msgstr ""
+msgstr "Total Residual"
 
 #. module: account
 #: model:process.node,note:account.process_node_invoiceinvoice0
 #: model:process.node,note:account.process_node_supplierinvoiceinvoice0
 msgid "Invoice's state is Open"
-msgstr ""
+msgstr "O estado da factura é \"Em Aberto\""
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_tax_code_tree
@@ -7576,11 +7582,16 @@ msgid ""
 "will see the taxes with codes related to your legal statement according to "
 "your country."
 msgstr ""
+"O plano de impostos é utilizado para gerar o seu extracto de impostos "
+"periódico. Será possível ver os impostos com códigos relacionados com o "
+"extracto legal de acordo com o pais em questão."
 
 #. module: account
 #: view:account.installer.modules:0
 msgid "Add extra Accounting functionalities to the ones already installed."
 msgstr ""
+"Adicionar funcionalidades contabilísticas extra ás que já se encontram "
+"instaladas."
 
 #. module: account
 #: report:account.analytic.account.cost_ledger:0
@@ -7610,7 +7621,7 @@ msgstr "Escolha o Ano Fiscal"
 #: code:addons/account/installer.py:495
 #, python-format
 msgid "Purchase Refund Journal"
-msgstr ""
+msgstr "Diário de retorno de compras"
 
 #. module: account
 #: help:account.tax.template,amount:0
@@ -7667,7 +7678,7 @@ msgstr "Net total:"
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_generic_reporting
 msgid "Generic Reporting"
-msgstr ""
+msgstr "Relatórios Genéricos"
 
 #. module: account
 #: field:account.move.line.reconcile.writeoff,journal_id:0
diff --git a/addons/base_action_rule/i18n/ca.po b/addons/base_action_rule/i18n/ca.po
new file mode 100644
index 00000000000..7844ee333df
--- /dev/null
+++ b/addons/base_action_rule/i18n/ca.po
@@ -0,0 +1,502 @@
+# Catalan translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2011-04-11 21:15+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Catalan <ca@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: 2011-04-12 06:07+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
+
+#. module: base_action_rule
+#: help:base.action.rule,act_mail_to_user:0
+msgid ""
+"Check this if you want the rule to send an email to the responsible person."
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,act_remind_partner:0
+msgid "Remind Partner"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,trg_partner_categ_id:0
+msgid "Partner Category"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,act_mail_to_watchers:0
+msgid "Mail to Watchers (CC)"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,trg_state_to:0
+msgid "Button Pressed"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,model_id:0
+msgid "Object"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,act_mail_to_email:0
+msgid "Mail to these Emails"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,act_state:0
+msgid "Set State to"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,act_email_from:0
+msgid "Email From"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Email Body"
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_range_type:0
+msgid "Days"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,last_run:0
+msgid "Last Run"
+msgstr ""
+
+#. module: base_action_rule
+#: code:addons/base_action_rule/base_action_rule.py:313
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,act_reply_to:0
+msgid "Reply-To"
+msgstr ""
+
+#. module: base_action_rule
+#: help:base.action.rule,act_email_cc:0
+msgid ""
+"These people will receive a copy of the future communication between partner "
+"and users by email"
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_range_type:0
+msgid "Minutes"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,name:0
+msgid "Rule Name"
+msgstr ""
+
+#. module: base_action_rule
+#: help:base.action.rule,act_remind_partner:0
+msgid ""
+"Check this if you want the rule to send a reminder by email to the partner."
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Conditions on Model Partner"
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_type:0
+msgid "Deadline"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,trg_partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(object_subject)s = Object subject"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Email Reminders"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Special Keywords to Be Used in The Body"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,trg_state_from:0
+msgid "State"
+msgstr ""
+
+#. module: base_action_rule
+#: model:ir.actions.act_window,help:base_action_rule.base_action_rule_act
+msgid ""
+"Use automated actions to automatically trigger actions for various screens. "
+"Example: a lead created by a specific user may be automatically set to a "
+"specific sales team, or an opportunity which still has status pending after "
+"14 days might trigger an automatic reminder email."
+msgstr ""
+
+#. module: base_action_rule
+#: help:base.action.rule,act_mail_to_email:0
+msgid "Email-id of the persons whom mail is to be sent"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+#: model:ir.module.module,shortdesc:base_action_rule.module_meta_information
+msgid "Action Rule"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Fields to Change"
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_type:0
+msgid "Creation Date"
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_type:0
+msgid "Last Action Date"
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_range_type:0
+msgid "Hours"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(object_id)s = Object ID"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Delay After Trigger Date"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,act_remind_attach:0
+msgid "Remind with Attachment"
+msgstr ""
+
+#. module: base_action_rule
+#: constraint:ir.cron:0
+msgid "Invalid arguments"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,act_user_id:0
+msgid "Set Responsible to"
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_type:0
+msgid "None"
+msgstr ""
+
+#. module: base_action_rule
+#: help:base.action.rule,act_email_to:0
+msgid ""
+"Use a python expression to specify the right field on which one than we will "
+"use for the 'To' field of the header"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(object_user_phone)s = Responsible phone"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid ""
+"The rule uses the AND operator. The model must match all non-empty fields so "
+"that the rule executes the action described in the 'Actions' tab."
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,trg_date_range_type:0
+msgid "Delay type"
+msgstr ""
+
+#. module: base_action_rule
+#: help:base.action.rule,regex_name:0
+msgid ""
+"Regular expression for matching name of the resource\n"
+"e.g.: 'urgent.*' will search for records having name starting with the "
+"string 'urgent'\n"
+"Note: This is case sensitive search."
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,act_method:0
+msgid "Call Object Method"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,act_email_to:0
+msgid "Email To"
+msgstr ""
+
+#. module: base_action_rule
+#: help:base.action.rule,act_mail_to_watchers:0
+msgid ""
+"Check this if you want the rule to mark CC(mail to any other person defined "
+"in actions)."
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(partner)s = Partner name"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Note"
+msgstr ""
+
+#. module: base_action_rule
+#: help:base.action.rule,act_email_from:0
+msgid ""
+"Use a python expression to specify the right field on which one than we will "
+"use for the 'From' field of the header"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,trg_date_range:0
+msgid "Delay after trigger date"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Conditions"
+msgstr ""
+
+#. module: base_action_rule
+#: help:base.action.rule,trg_date_range:0
+msgid ""
+"Delay After Trigger Date,specifies you can put a negative number. If you "
+"need a delay before the trigger date, like sending a reminder 15 minutes "
+"before a meeting."
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,active:0
+msgid "Active"
+msgstr ""
+
+#. module: base_action_rule
+#: code:addons/base_action_rule/base_action_rule.py:314
+#, python-format
+msgid "No E-Mail ID Found for your Company address!"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,act_remind_user:0
+msgid "Remind Responsible"
+msgstr ""
+
+#. module: base_action_rule
+#: model:ir.module.module,description:base_action_rule.module_meta_information
+msgid "This module allows to implement action rules for any object."
+msgstr ""
+
+#. module: base_action_rule
+#: help:base.action.rule,sequence:0
+msgid "Gives the sequence order when displaying a list of rules."
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_range_type:0
+msgid "Months"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,filter_id:0
+msgid "Filter"
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_type:0
+msgid "Date"
+msgstr ""
+
+#. module: base_action_rule
+#: help:base.action.rule,server_action_id:0
+msgid ""
+"Describes the action name.\n"
+"eg:on which object which action to be taken on basis of which condition"
+msgstr ""
+
+#. module: base_action_rule
+#: model:ir.model,name:base_action_rule.model_ir_cron
+msgid "ir.cron"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(object_description)s = Object description"
+msgstr ""
+
+#. module: base_action_rule
+#: constraint:base.action.rule:0
+msgid "Error: The mail is not well formated"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Email Actions"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Email Information"
+msgstr ""
+
+#. module: base_action_rule
+#: model:ir.model,name:base_action_rule.model_base_action_rule
+msgid "Action Rules"
+msgstr ""
+
+#. module: base_action_rule
+#: help:base.action.rule,act_mail_body:0
+msgid "Content of mail"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,trg_user_id:0
+msgid "Responsible"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(partner_email)s = Partner Email"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(object_date)s = Creation date"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(object_user_email)s = Responsible Email"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,act_mail_body:0
+msgid "Mail body"
+msgstr ""
+
+#. module: base_action_rule
+#: help:base.action.rule,act_remind_user:0
+msgid ""
+"Check this if you want the rule to send a reminder by email to the user."
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Server Action to be Triggered"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,act_mail_to_user:0
+msgid "Mail to Responsible"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,act_email_cc:0
+msgid "Add Watchers (Cc)"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Conditions on Model Fields"
+msgstr ""
+
+#. module: base_action_rule
+#: model:ir.actions.act_window,name:base_action_rule.base_action_rule_act
+#: model:ir.ui.menu,name:base_action_rule.menu_base_action_rule_form
+msgid "Automated Actions"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,server_action_id:0
+msgid "Server Action"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,regex_name:0
+msgid "Regex on Resource Name"
+msgstr ""
+
+#. module: base_action_rule
+#: help:base.action.rule,act_remind_attach:0
+msgid ""
+"Check this if you want that all documents attached to the object be attached "
+"to the reminder email sent."
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Conditions on Timing"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Actions"
+msgstr ""
+
+#. module: base_action_rule
+#: help:base.action.rule,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the rule "
+"without removing it."
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(object_user)s = Responsible name"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,create_date:0
+msgid "Create Date"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Conditions on States"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,trg_date_type:0
+msgid "Trigger Date"
+msgstr ""
diff --git a/addons/crm_claim/i18n/zh_CN.po b/addons/crm_claim/i18n/zh_CN.po
index 804f986154b..f58f3c7e765 100644
--- a/addons/crm_claim/i18n/zh_CN.po
+++ b/addons/crm_claim/i18n/zh_CN.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-11 05:43+0000\n"
+"X-Launchpad-Export-Date: 2011-04-12 06:07+0000\n"
 "X-Generator: Launchpad (build 12735)\n"
 
 #. module: crm_claim
@@ -637,34 +637,34 @@ msgstr "索赔/动作说明"
 #. module: crm_claim
 #: field:crm.claim,description:0
 msgid "Description"
-msgstr ""
+msgstr "说明"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Search Claims"
-msgstr ""
+msgstr "查找索赔"
 
 #. module: crm_claim
 #: field:crm.claim,section_id:0
 #: view:crm.claim.report:0
 msgid "Sales Team"
-msgstr ""
+msgstr "销售团队"
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
 msgid "May"
-msgstr ""
+msgstr "5月"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Resolution Actions"
-msgstr ""
+msgstr "决定采取的行动"
 
 #. module: crm_claim
 #: model:ir.actions.act_window,name:crm_claim.act_claim_partner
 #: model:ir.actions.act_window,name:crm_claim.act_claim_partner_address
 msgid "Report a Claim"
-msgstr ""
+msgstr "报告一个索赔"
 
 #. module: crm_claim
 #: model:ir.actions.act_window,help:crm_claim.crm_case_categ_claim0
@@ -674,16 +674,18 @@ msgid ""
 "history for a claim (emails sent, intervention type and so on). Claims may "
 "automatically be linked to an email address using the mail gateway module."
 msgstr ""
+"记录和跟踪你客户的索赔，索赔可以链接到一个或很多销售订单中。你可以发送带附件的邮件和保留一个索赔的所有日志（邮件发送，介入类型等）。索赔可以自动链接到电子"
+"邮件使用的网关。"
 
 #. module: crm_claim
 #: field:crm.claim.report,email:0
 msgid "# Emails"
-msgstr ""
+msgstr "电子邮件"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Follow Up"
-msgstr ""
+msgstr "跟进"
 
 #. module: crm_claim
 #: help:crm.claim,state:0
@@ -696,26 +698,30 @@ msgid ""
 "       \n"
 "If the case needs to be reviewed then the state is set to 'Pending'."
 msgstr ""
+"当一个业务创建时状态设为'草稿'\n"
+"如果业务正在处理状态设为'开启'\n"
+"当业务结束状态设为'完成'\n"
+"如果业务需要审查状态设为'待定'"
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
 msgid "February"
-msgstr ""
+msgstr "2月"
 
 #. module: crm_claim
 #: model:crm.case.stage,name:crm_claim.stage_claim3
 msgid "Won't fix"
-msgstr ""
+msgstr "不修正"
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
 msgid "April"
-msgstr ""
+msgstr "4月"
 
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "My Case(s)"
-msgstr ""
+msgstr "我的业务"
 
 #. module: crm_claim
 #: field:crm.claim,id:0
@@ -725,28 +731,28 @@ msgstr ""
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Actions"
-msgstr ""
+msgstr "动作"
 
 #. module: crm_claim
 #: selection:crm.claim,priority:0
 #: selection:crm.claim.report,priority:0
 msgid "High"
-msgstr ""
+msgstr "高"
 
 #. module: crm_claim
 #: model:ir.actions.act_window,help:crm_claim.crm_claim_categ_action
 msgid ""
 "Create claim categories to better manage and classify your claims. Some "
 "example of claims can be: preventive action, corrective action."
-msgstr ""
+msgstr "创建索赔的类型以更好管理和分类你的索赔。如：索赔可以是预防措施、纠正措施。"
 
 #. module: crm_claim
 #: field:crm.claim.report,create_date:0
 msgid "Create Date"
-msgstr ""
+msgstr "创建日期"
 
 #. module: crm_claim
 #: view:crm.claim.report:0
 #: field:crm.claim.report,name:0
 msgid "Year"
-msgstr ""
+msgstr "年"
diff --git a/addons/crm_fundraising/i18n/zh_CN.po b/addons/crm_fundraising/i18n/zh_CN.po
new file mode 100644
index 00000000000..3f86ae382c1
--- /dev/null
+++ b/addons/crm_fundraising/i18n/zh_CN.po
@@ -0,0 +1,768 @@
+# Chinese (Simplified) translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-04-11 05:52+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (Simplified) <zh_CN@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: 2011-04-12 06:07+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,planned_revenue:0
+msgid "Planned Revenue"
+msgstr "计划收入"
+
+#. module: crm_fundraising
+#: field:crm.fundraising.report,nbr:0
+msgid "# of Cases"
+msgstr "# 业务"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+#: view:crm.fundraising.report:0
+msgid "Group By..."
+msgstr "分组..."
+
+#. module: crm_fundraising
+#: field:crm.fundraising.report,probability:0
+msgid "Avg. Probability"
+msgstr "平均概率"
+
+#. module: crm_fundraising
+#: selection:crm.fundraising.report,month:0
+msgid "March"
+msgstr "3月"
+
+#. module: crm_fundraising
+#: field:crm.fundraising.report,delay_close:0
+msgid "Delay to close"
+msgstr "延迟关闭"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,company_id:0
+#: view:crm.fundraising.report:0
+#: field:crm.fundraising.report,company_id:0
+msgid "Company"
+msgstr "公司"
+
+#. module: crm_fundraising
+#: model:ir.actions.act_window,name:crm_fundraising.crm_fund_categ_action
+msgid "Fundraising Categories"
+msgstr "集资类型"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,email_cc:0
+msgid "Watchers Emails"
+msgstr "关注者的电子邮件"
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+msgid "Cases"
+msgstr "业务"
+
+#. module: crm_fundraising
+#: selection:crm.fundraising,priority:0
+msgid "Highest"
+msgstr "最高"
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+#: field:crm.fundraising.report,day:0
+msgid "Day"
+msgstr "日"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Add Internal Note"
+msgstr "添加内部备注"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,partner_mobile:0
+msgid "Mobile"
+msgstr "手机"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Notes"
+msgstr "备注"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,message_ids:0
+msgid "Messages"
+msgstr "消息"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Amount"
+msgstr "金额"
+
+#. module: crm_fundraising
+#: model:crm.case.categ,name:crm_fundraising.categ_fund4
+msgid "Arts And Culture"
+msgstr "艺术文化"
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+#: field:crm.fundraising.report,amount_revenue:0
+msgid "Est.Revenue"
+msgstr "预计收入"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,partner_address_id:0
+msgid "Partner Contact"
+msgstr "业务伙伴联系方式"
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+msgid "   Month   "
+msgstr "   月   "
+
+#. module: crm_fundraising
+#: field:crm.fundraising,type_id:0
+msgid "Campaign"
+msgstr "营销活动"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,date_action_next:0
+msgid "Next Action"
+msgstr "下一动作"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Reset to Draft"
+msgstr "重置为草稿"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Extra Info"
+msgstr "额外信息"
+
+#. module: crm_fundraising
+#: model:ir.model,name:crm_fundraising.model_crm_fundraising
+#: model:ir.ui.menu,name:crm_fundraising.menu_config_fundrising
+#: model:ir.ui.menu,name:crm_fundraising.menu_crm_case_fund_raise
+msgid "Fund Raising"
+msgstr "资金募集"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+#: field:crm.fundraising,partner_id:0
+#: field:crm.fundraising.report,partner_id:0
+msgid "Partner"
+msgstr "业务伙伴"
+
+#. module: crm_fundraising
+#: model:ir.ui.menu,name:crm_fundraising.menu_report_crm_fundraising_tree
+msgid "Fundraising Analysis"
+msgstr "资金募集分析"
+
+#. module: crm_fundraising
+#: model:ir.module.module,shortdesc:crm_fundraising.module_meta_information
+msgid "CRM Fundraising"
+msgstr "客户关系管理 资金募集"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Misc"
+msgstr "杂项"
+
+#. module: crm_fundraising
+#: field:crm.fundraising.report,section_id:0
+msgid "Section"
+msgstr "分类"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+#: field:crm.fundraising,priority:0
+msgid "Priority"
+msgstr "优先级"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Send New Email"
+msgstr "发送新的电子邮件"
+
+#. module: crm_fundraising
+#: model:crm.case.categ,name:crm_fundraising.categ_fund1
+msgid "Social Rehabilitation And Rural Upliftment"
+msgstr "社会康复和农场振兴"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+#: view:crm.fundraising.report:0
+msgid "Payment Mode"
+msgstr "支付方式"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Reply"
+msgstr "回复"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,email_from:0
+msgid "Email"
+msgstr "电子邮件"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,canal_id:0
+msgid "Channel"
+msgstr "途径"
+
+#. module: crm_fundraising
+#: selection:crm.fundraising,priority:0
+msgid "Lowest"
+msgstr "最低"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,create_date:0
+msgid "Creation Date"
+msgstr "创建日期"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,date_deadline:0
+msgid "Deadline"
+msgstr "截止日期"
+
+#. module: crm_fundraising
+#: selection:crm.fundraising.report,month:0
+msgid "July"
+msgstr "7月"
+
+#. module: crm_fundraising
+#: model:ir.ui.menu,name:crm_fundraising.menu_crm_case_fundraising-act
+msgid "Categories"
+msgstr "类型"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,stage_id:0
+msgid "Stage"
+msgstr "阶段"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "History Information"
+msgstr "日志信息"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Dates"
+msgstr "日期"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,partner_name2:0
+msgid "Employee Email"
+msgstr "员工邮箱"
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+msgid "    Month-1    "
+msgstr "    上月    "
+
+#. module: crm_fundraising
+#: selection:crm.fundraising,state:0
+#: selection:crm.fundraising.report,state:0
+msgid "Cancelled"
+msgstr "已取消"
+
+#. module: crm_fundraising
+#: model:crm.case.categ,name:crm_fundraising.categ_fund2
+msgid "Learning And Education"
+msgstr "学习和教育"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Contact"
+msgstr "联系方式"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Funds Form"
+msgstr "资金类型"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Fund Description"
+msgstr "资金说明"
+
+#. module: crm_fundraising
+#: help:crm.fundraising.report,delay_close:0
+msgid "Number of Days to close the case"
+msgstr "到期天数"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "References"
+msgstr "参考"
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+#: model:ir.actions.act_window,name:crm_fundraising.action_report_crm_fundraising
+#: model:ir.module.module,description:crm_fundraising.module_meta_information
+msgid "Fundraising"
+msgstr "资金募集"
+
+#. module: crm_fundraising
+#: model:ir.actions.act_window,help:crm_fundraising.action_report_crm_fundraising
+msgid ""
+"Have a general overview of all fund raising activities by sorting them with "
+"specific criteria such as the estimated revenue, average success probability "
+"and delay to close."
+msgstr "所有的资金募集活动都有一个一般概述并按具体的标准分类。如预计收入，平均成功的概率和延迟关闭等。"
+
+#. module: crm_fundraising
+#: selection:crm.fundraising.report,month:0
+msgid "September"
+msgstr "9月"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Communication"
+msgstr "沟通"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Funds Tree"
+msgstr "资金树"
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+#: field:crm.fundraising.report,month:0
+msgid "Month"
+msgstr "月"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Escalate"
+msgstr "提升"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,write_date:0
+msgid "Update Date"
+msgstr "更新日期"
+
+#. module: crm_fundraising
+#: model:crm.case.resource.type,name:crm_fundraising.type_fund3
+msgid "Credit Card"
+msgstr "信用卡"
+
+#. module: crm_fundraising
+#: model:ir.actions.act_window,name:crm_fundraising.crm_fundraising_stage_act
+msgid "Fundraising Stages"
+msgstr "资金募集阶段"
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+msgid "Salesman"
+msgstr "业务员"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,ref:0
+msgid "Reference"
+msgstr "参考"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,ref2:0
+msgid "Reference 2"
+msgstr "参考2"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+#: field:crm.fundraising,categ_id:0
+#: view:crm.fundraising.report:0
+#: field:crm.fundraising.report,categ_id:0
+msgid "Category"
+msgstr "类型"
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+msgid "  Year  "
+msgstr "  年  "
+
+#. module: crm_fundraising
+#: field:crm.fundraising,planned_cost:0
+#: view:crm.fundraising.report:0
+#: field:crm.fundraising.report,planned_cost:0
+msgid "Planned Costs"
+msgstr "计划成本"
+
+#. module: crm_fundraising
+#: help:crm.fundraising,email_cc:0
+msgid ""
+"These email addresses will be added to the CC field of all inbound and "
+"outbound emails for this record before being sent. Separate multiple email "
+"addresses with a comma"
+msgstr "这些邮件地址将添加到之前发送记录的发送和接收邮件的抄送字段，分隔多个邮件地址有逗号。"
+
+#. module: crm_fundraising
+#: selection:crm.fundraising,state:0
+#: view:crm.fundraising.report:0
+#: selection:crm.fundraising.report,state:0
+msgid "Draft"
+msgstr "草稿"
+
+#. module: crm_fundraising
+#: selection:crm.fundraising,priority:0
+msgid "Low"
+msgstr "低"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,date_closed:0
+#: selection:crm.fundraising,state:0
+#: selection:crm.fundraising.report,state:0
+msgid "Closed"
+msgstr "已关闭"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+#: selection:crm.fundraising,state:0
+#: view:crm.fundraising.report:0
+#: selection:crm.fundraising.report,state:0
+msgid "Pending"
+msgstr "待定中"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Communication & History"
+msgstr "沟通&日志"
+
+#. module: crm_fundraising
+#: model:ir.ui.menu,name:crm_fundraising.menu_crm_fundraising_stage_act
+msgid "Stages"
+msgstr "阶段"
+
+#. module: crm_fundraising
+#: selection:crm.fundraising.report,month:0
+msgid "August"
+msgstr "8月"
+
+#. module: crm_fundraising
+#: selection:crm.fundraising,priority:0
+msgid "Normal"
+msgstr "普通"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Global CC"
+msgstr "完整抄送"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+#: model:ir.actions.act_window,name:crm_fundraising.crm_case_category_act_fund_all1
+msgid "Funds"
+msgstr "资金"
+
+#. module: crm_fundraising
+#: selection:crm.fundraising.report,month:0
+msgid "June"
+msgstr "6月"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,partner_phone:0
+msgid "Phone"
+msgstr "电话"
+
+#. module: crm_fundraising
+#: field:crm.fundraising.report,user_id:0
+msgid "User"
+msgstr "用户"
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+msgid "#Fundraising"
+msgstr "#资金募集"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,active:0
+msgid "Active"
+msgstr "生效"
+
+#. module: crm_fundraising
+#: selection:crm.fundraising.report,month:0
+msgid "November"
+msgstr "11月"
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+msgid "Extended Filters..."
+msgstr "扩展过滤..."
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+msgid "Search"
+msgstr "查找"
+
+#. module: crm_fundraising
+#: selection:crm.fundraising.report,month:0
+msgid "October"
+msgstr "10月"
+
+#. module: crm_fundraising
+#: selection:crm.fundraising.report,month:0
+msgid "January"
+msgstr "1月"
+
+#. module: crm_fundraising
+#: model:crm.case.resource.type,name:crm_fundraising.type_fund2
+msgid "Cheque"
+msgstr "支票"
+
+#. module: crm_fundraising
+#: model:ir.actions.act_window,help:crm_fundraising.crm_fund_categ_action
+msgid ""
+"Manage and define the fund raising categories you want to be maintained in "
+"the system."
+msgstr "在你的系统中管理和定义资金募集的类型"
+
+#. module: crm_fundraising
+#: help:crm.fundraising,email_from:0
+msgid "These people will receive email."
+msgstr "这些人将收到电子邮件。"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,date:0
+msgid "Date"
+msgstr "日期"
+
+#. module: crm_fundraising
+#: model:crm.case.categ,name:crm_fundraising.categ_fund3
+msgid "Healthcare"
+msgstr "卫生保健"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "History"
+msgstr "日志"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Attachments"
+msgstr "附件"
+
+#. module: crm_fundraising
+#: model:ir.model,name:crm_fundraising.model_crm_case_stage
+msgid "Stage of case"
+msgstr "业务阶段"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Estimates"
+msgstr "估计"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+#: field:crm.fundraising,state:0
+#: view:crm.fundraising.report:0
+#: field:crm.fundraising.report,state:0
+msgid "State"
+msgstr "州/省"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+#: view:crm.fundraising.report:0
+msgid "Done"
+msgstr "完成"
+
+#. module: crm_fundraising
+#: selection:crm.fundraising.report,month:0
+msgid "December"
+msgstr "12月"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+#: view:crm.fundraising.report:0
+msgid "Cancel"
+msgstr "取消"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+#: selection:crm.fundraising,state:0
+#: view:crm.fundraising.report:0
+#: selection:crm.fundraising.report,state:0
+msgid "Open"
+msgstr "开启"
+
+#. module: crm_fundraising
+#: model:ir.actions.act_window,help:crm_fundraising.crm_case_category_act_fund_all1
+msgid ""
+"If you need to collect money for your organization or a campaign, Fund "
+"Raising allows you to track all your fund raising activities. In the search "
+"list, filter by funds description, email, history and probability of success."
+msgstr "如果你需要为你的组织或公司筹集经费，资金募集可以使你跟踪你的资金募集活动。在搜索列表按资金说明、邮件、日志和成功的可能性筛选。"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+#: field:crm.fundraising,user_id:0
+msgid "Responsible"
+msgstr "负责人"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Current"
+msgstr "当前的"
+
+#. module: crm_fundraising
+#: help:crm.fundraising,section_id:0
+msgid ""
+"Sales team to which Case belongs to. Define Responsible user and Email "
+"account for mail gateway."
+msgstr "业务的销售团队，定义责任人和邮件的网关。"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Details"
+msgstr "明细行"
+
+#. module: crm_fundraising
+#: model:ir.model,name:crm_fundraising.model_crm_fundraising_report
+msgid "CRM Fundraising Report"
+msgstr "客户关系管理 资金募集报表"
+
+#. module: crm_fundraising
+#: field:crm.fundraising.report,type_id:0
+msgid "Fundraising Type"
+msgstr "资金募集类型"
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+#: field:crm.fundraising.report,amount_revenue_prob:0
+msgid "Est. Rev*Prob."
+msgstr "估计收入 × 概率"
+
+#. module: crm_fundraising
+#: model:ir.actions.act_window,help:crm_fundraising.crm_fundraising_stage_act
+msgid ""
+"Create and manage fund raising activity categories you want to be maintained "
+"in the system."
+msgstr "在你的系统中创建和管理资金募集活动的类型"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,description:0
+msgid "Description"
+msgstr "说明"
+
+#. module: crm_fundraising
+#: selection:crm.fundraising.report,month:0
+msgid "May"
+msgstr "5月"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,probability:0
+msgid "Probability (%)"
+msgstr "概率(%)"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,partner_name:0
+msgid "Employee's Name"
+msgstr "员工姓名"
+
+#. module: crm_fundraising
+#: help:crm.fundraising,canal_id:0
+msgid ""
+"The channels represent the different communication  modes available with the "
+"customer."
+msgstr "途径代表与客户沟通的不同方式"
+
+#. module: crm_fundraising
+#: help:crm.fundraising,state:0
+msgid ""
+"The state is set to 'Draft', when a case is created.                         "
+"         \n"
+"If the case is in progress the state is set to 'Open'.                       "
+"           \n"
+"When the case is over, the state is set to 'Done'.                           "
+"       \n"
+"If the case needs to be reviewed then the state is set to 'Pending'."
+msgstr ""
+"当一个业务创建时状态设为'草稿'\n"
+"如果业务正在处理状态设为'开启'\n"
+"当业务结束状态设为'完成'\n"
+"如果业务需要审查状态设为'待定'"
+
+#. module: crm_fundraising
+#: selection:crm.fundraising.report,month:0
+msgid "February"
+msgstr "2月"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+#: field:crm.fundraising,name:0
+msgid "Name"
+msgstr "名称"
+
+#. module: crm_fundraising
+#: model:crm.case.resource.type,name:crm_fundraising.type_fund1
+msgid "Cash"
+msgstr "现金"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Funds by Categories"
+msgstr "资金类型"
+
+#. module: crm_fundraising
+#: selection:crm.fundraising.report,month:0
+msgid "April"
+msgstr "4月"
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+msgid "My Case(s)"
+msgstr "我的业务"
+
+#. module: crm_fundraising
+#: model:crm.case.resource.type,name:crm_fundraising.type_fund4
+msgid "Demand Draft"
+msgstr "汇票"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,id:0
+msgid "ID"
+msgstr ""
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Search Funds"
+msgstr "查找资金"
+
+#. module: crm_fundraising
+#: selection:crm.fundraising,priority:0
+msgid "High"
+msgstr "高"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+#: field:crm.fundraising,section_id:0
+#: view:crm.fundraising.report:0
+msgid "Sales Team"
+msgstr "销售团队"
+
+#. module: crm_fundraising
+#: field:crm.fundraising.report,create_date:0
+msgid "Create Date"
+msgstr "创建日期"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,date_action_last:0
+msgid "Last Action"
+msgstr "最近动作"
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+#: field:crm.fundraising.report,name:0
+msgid "Year"
+msgstr "年"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,duration:0
+msgid "Duration"
+msgstr "持续时间"
diff --git a/addons/crm_partner_assign/i18n/zh_CN.po b/addons/crm_partner_assign/i18n/zh_CN.po
new file mode 100644
index 00000000000..71d24f8e031
--- /dev/null
+++ b/addons/crm_partner_assign/i18n/zh_CN.po
@@ -0,0 +1,713 @@
+# Chinese (Simplified) translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-04-11 07:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (Simplified) <zh_CN@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: 2011-04-12 06:07+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,name:0
+msgid "Send to"
+msgstr "发送到"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,delay_close:0
+msgid "Delay to Close"
+msgstr "延迟关闭"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,planned_revenue:0
+msgid "Planned Revenue"
+msgstr "计划收入"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,nbr:0
+msgid "# of Cases"
+msgstr "# 业务"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Group By..."
+msgstr "分组..."
+
+#. module: crm_partner_assign
+#: view:crm.lead:0
+#: view:crm.lead.forward.to.partner:0
+msgid "Forward"
+msgstr "下一页"
+
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,reply_to:0
+msgid "Reply-to of the Sales team defined on this case"
+msgstr "在这业务销售团队定义的“回复到”"
+
+#. module: crm_partner_assign
+#: view:res.partner:0
+msgid "Geo Localize"
+msgstr "geolocalization定位"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "March"
+msgstr "3月"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,type:0
+msgid "Lead"
+msgstr "线索"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Delay to close"
+msgstr "延迟关闭"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.forward.to.partner,history:0
+msgid "Whole Story"
+msgstr "完整的情况"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,company_id:0
+msgid "Company"
+msgstr "公司"
+
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/partner_geo_assign.py:41
+#, python-format
+msgid ""
+"Could not contact geolocation servers, please make sure you have a working "
+"internet connection (%s)"
+msgstr "无法连接到服务器，请确保你的连接 (%s) 正常。"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,partner_date:0
+msgid "Partner Date"
+msgstr "业务伙伴日期"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,priority:0
+msgid "Highest"
+msgstr "最高"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,day:0
+msgid "Day"
+msgstr "日"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.forward.to.partner,history:0
+msgid "Latest email"
+msgstr "最近的邮件"
+
+#. module: crm_partner_assign
+#: field:crm.lead,partner_latitude:0
+#: field:res.partner,partner_latitude:0
+msgid "Geo Latitude"
+msgstr "geolocalization纬度"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.forward.to.partner,state:0
+#: selection:crm.lead.report.assign,state:0
+msgid "Cancelled"
+msgstr "已取消"
+
+#. module: crm_partner_assign
+#: view:crm.lead:0
+msgid "Geo Assignation"
+msgstr "geolocalization指派"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,date_closed:0
+msgid "Close Date"
+msgstr "结束日期"
+
+#. module: crm_partner_assign
+#: help:res.partner,partner_weight:0
+msgid ""
+"Gives the probability to assign a lead to this partner. (0 means no "
+"assignation.)"
+msgstr "为线索指派一个业务伙伴的概率（0表示没指派）"
+
+#. module: crm_partner_assign
+#: model:ir.module.module,description:crm_partner_assign.module_meta_information
+msgid ""
+"\n"
+"This is the module used by OpenERP SA to redirect customers to his "
+"partners,\n"
+"based on geolocalization.\n"
+"    "
+msgstr ""
+"\n"
+"这模块用于系统给业务伙伴定位的地理信息，其基于google的geolocalization服务\n"
+"    "
+
+#. module: crm_partner_assign
+#: selection:crm.lead.forward.to.partner,state:0
+#: selection:crm.lead.report.assign,state:0
+msgid "Pending"
+msgstr "待定中"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.forward.to.partner,name:0
+#: field:crm.lead.forward.to.partner,partner_id:0
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,partner_assigned_id:0
+#: model:ir.model,name:crm_partner_assign.model_res_partner
+msgid "Partner"
+msgstr "业务伙伴"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,probability:0
+msgid "Avg Probability"
+msgstr "平均概率"
+
+#. module: crm_partner_assign
+#: view:res.partner:0
+msgid "Previous"
+msgstr "前一个"
+
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/partner_geo_assign.py:40
+#, python-format
+msgid "Network error"
+msgstr "网络错误"
+
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,email_cc:0
+msgid ""
+"These addresses will receive a copy of this email. To modify the permanent "
+"CC list, edit the global CC field of this case"
+msgstr "这些地址将收到这邮件的副本。要永久修改这抄送地址列表，请编辑这业务的默认抄送字段。"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,email_from:0
+msgid "From"
+msgstr "来自"
+
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_grade_action
+#: model:ir.ui.menu,name:crm_partner_assign.menu_res_partner_grade_action
+#: field:res.partner,grade_id:0
+#: view:res.partner.grade:0
+msgid "Partner Grade"
+msgstr "业务伙伴级别"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Section"
+msgstr "分类"
+
+#. module: crm_partner_assign
+#: view:res.partner:0
+msgid "Next"
+msgstr "下一个"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,priority:0
+msgid "Priority"
+msgstr "优先级"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,state:0
+msgid "State"
+msgstr "州/省"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,delay_expected:0
+msgid "Overpassed Deadline"
+msgstr "超越截止日期"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,html:0
+msgid "HTML formatting?"
+msgstr "HTML格式?"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,type:0
+msgid "Type"
+msgstr "类型："
+
+#. module: crm_partner_assign
+#: help:crm.lead,partner_assigned_id:0
+msgid "Partner this case has been forwarded/assigned to."
+msgstr "这业务的业务伙伴已转发/已分配"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,priority:0
+msgid "Lowest"
+msgstr "最低"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Leads Analysis"
+msgstr "线索分析"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,creation_date:0
+msgid "Creation Date"
+msgstr "创建日期"
+
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,html:0
+msgid "Select this if you want to send email with HTML formatting."
+msgstr "如果你想发送HTML格式的邮件，选此"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "7 Days"
+msgstr "7天"
+
+#. module: crm_partner_assign
+#: view:crm.lead:0
+msgid "Partner Assignation"
+msgstr ""
+
+#. module: crm_partner_assign
+#: help:crm.lead.report.assign,type:0
+msgid "Type is used to separate Leads and Opportunities"
+msgstr "类型用于区分线索和商机"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "July"
+msgstr "7月"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,stage_id:0
+msgid "Stage"
+msgstr "阶段"
+
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:271
+#, python-format
+msgid "Fwd"
+msgstr "转发"
+
+#. module: crm_partner_assign
+#: view:res.partner:0
+msgid "Geo Localization"
+msgstr "geolocalization定位"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Opportunities Assignment Analysis"
+msgstr "商机指派分析"
+
+#. module: crm_partner_assign
+#: view:res.partner:0
+msgid "Cancel"
+msgstr "取消"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,history:0
+msgid "Send history"
+msgstr "发送日志"
+
+#. module: crm_partner_assign
+#: view:crm.lead.forward.to.partner:0
+msgid "Contact"
+msgstr "联系方式"
+
+#. module: crm_partner_assign
+#: view:res.partner:0
+msgid "Close"
+msgstr "结束"
+
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_opportunity_assign
+#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_opportunities_assign_tree
+msgid "Opp. Assignment Analysis"
+msgstr "商机指派分析"
+
+#. module: crm_partner_assign
+#: help:crm.lead.report.assign,delay_close:0
+msgid "Number of Days to close the case"
+msgstr "到期天数"
+
+#. module: crm_partner_assign
+#: field:res.partner,partner_weight:0
+msgid "Weight"
+msgstr "重量"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Delay to open"
+msgstr "延迟开启"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,grade_id:0
+msgid "Grade"
+msgstr "级别"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "December"
+msgstr "12月"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,month:0
+msgid "Month"
+msgstr "月"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,opening_date:0
+msgid "Opening Date"
+msgstr "开启日期"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,subject:0
+msgid "Subject"
+msgstr "主题"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Salesman"
+msgstr "业务员"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,reply_to:0
+msgid "Reply To"
+msgstr "回复"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,categ_id:0
+msgid "Category"
+msgstr "类型"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "#Opportunities"
+msgstr "#商机"
+
+#. module: crm_partner_assign
+#: model:ir.module.module,shortdesc:crm_partner_assign.module_meta_information
+msgid "Partner Geo-Localisation"
+msgstr "业务伙伴geolocalization定位"
+
+#. module: crm_partner_assign
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr "错误！您不能创建递归的相关成员。"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.forward.to.partner,state:0
+#: selection:crm.lead.report.assign,state:0
+msgid "Draft"
+msgstr "草稿"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,priority:0
+msgid "Low"
+msgstr "低"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.forward.to.partner,state:0
+#: view:crm.lead.report.assign:0
+#: selection:crm.lead.report.assign,state:0
+msgid "Closed"
+msgstr "已结束"
+
+#. module: crm_partner_assign
+#: view:res.partner:0
+#: field:res.partner,opportunity_assigned_ids:0
+msgid "Assigned Opportunities"
+msgstr "分配商机"
+
+#. module: crm_partner_assign
+#: field:crm.lead,date_assign:0
+msgid "Assignation Date"
+msgstr "分配日期"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,probability_max:0
+msgid "Max Probability"
+msgstr "最大可能"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "August"
+msgstr "8月"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,priority:0
+msgid "Normal"
+msgstr "普通"
+
+#. module: crm_partner_assign
+#: view:res.partner:0
+msgid "Escalate"
+msgstr "提升"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,attachment_ids:0
+msgid "unknown"
+msgstr "未知"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "June"
+msgstr "6月"
+
+#. module: crm_partner_assign
+#: help:crm.lead.report.assign,delay_open:0
+msgid "Number of Days to open the case"
+msgstr "业务开启的天数"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,delay_open:0
+msgid "Delay to Open"
+msgstr "延迟开启"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.forward.to.partner,name:0
+#: field:crm.lead.forward.to.partner,user_id:0
+#: field:crm.lead.report.assign,user_id:0
+msgid "User"
+msgstr "用户"
+
+#. module: crm_partner_assign
+#: field:res.partner.grade,active:0
+msgid "Active"
+msgstr "生效"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "November"
+msgstr "11月"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Extended Filters..."
+msgstr "扩展过滤..."
+
+#. module: crm_partner_assign
+#: field:crm.lead,partner_longitude:0
+#: field:res.partner,partner_longitude:0
+msgid "Geo Longitude"
+msgstr "geolocalization经度"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Lead Assign"
+msgstr "线索指派"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "October"
+msgstr "10月"
+
+#. module: crm_partner_assign
+#: view:crm.lead:0
+msgid "Assignation"
+msgstr "指派"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,email_cc:0
+msgid "CC"
+msgstr "抄送"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "January"
+msgstr "1月"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Planned Revenues"
+msgstr "计划收入"
+
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_res_partner_grade
+msgid "res.partner.grade"
+msgstr ""
+
+#. module: crm_partner_assign
+#: selection:crm.lead.forward.to.partner,state:0
+msgid "Unchanged"
+msgstr "未更改"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "September"
+msgstr "9月"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Last 30 Days"
+msgstr "最后30天"
+
+#. module: crm_partner_assign
+#: field:res.partner.grade,name:0
+msgid "Grade Name"
+msgstr "级别名称"
+
+#. module: crm_partner_assign
+#: help:crm.lead,date_assign:0
+msgid "Last date this case was forwarded/assigned to a partner"
+msgstr "为这业务指派/跟进的业务伙伴的最后期限"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.forward.to.partner,state:0
+#: selection:crm.lead.report.assign,state:0
+#: view:res.partner:0
+msgid "Open"
+msgstr "开启"
+
+#. module: crm_partner_assign
+#: field:res.partner,date_localization:0
+msgid "Geo Localization Date"
+msgstr "geolocalization定位的日期"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Current"
+msgstr "当前的"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,email_to:0
+msgid "To"
+msgstr "到"
+
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner
+msgid "Send new email"
+msgstr "发送新的邮件"
+
+#. module: crm_partner_assign
+#: view:crm.lead.forward.to.partner:0
+#: model:ir.actions.act_window,name:crm_partner_assign.crm_lead_forward_to_partner_act
+msgid "Forward to Partner"
+msgstr "跟进的业务伙伴"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "May"
+msgstr "5月"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,probable_revenue:0
+msgid "Probable Revenue"
+msgstr "可能收入"
+
+#. module: crm_partner_assign
+#: field:crm.lead,partner_assigned_id:0
+msgid "Assigned Partner"
+msgstr "指派的业务伙伴"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,address_id:0
+msgid "Address"
+msgstr "地址"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,type:0
+msgid "Opportunity"
+msgstr "商机"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,partner_id:0
+msgid "Customer"
+msgstr "客户"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "February"
+msgstr "2月"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.forward.to.partner,name:0
+msgid "Email Address"
+msgstr "电子邮件地址"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,country_id:0
+msgid "Country"
+msgstr "国家"
+
+#. module: crm_partner_assign
+#: view:res.partner:0
+msgid "Convert to Opportunity"
+msgstr "转换为商机"
+
+#. module: crm_partner_assign
+#: view:crm.lead:0
+msgid "Geo Assign"
+msgstr "指定geolocalization"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "April"
+msgstr "4月"
+
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead
+msgid "crm.lead"
+msgstr ""
+
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead_report_assign
+msgid "CRM Lead Report"
+msgstr "客户关系管理线索报表"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.forward.to.partner,history:0
+msgid "Case Information"
+msgstr ""
+
+#. module: crm_partner_assign
+#: field:res.partner.grade,sequence:0
+msgid "Sequence"
+msgstr "序列"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,body:0
+msgid "Message Body"
+msgstr "消息正文"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,priority:0
+msgid "High"
+msgstr "高"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,section_id:0
+msgid "Sales Team"
+msgstr "销售团队"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,create_date:0
+msgid "Create Date"
+msgstr "创建日期"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,state:0
+msgid "Set New State To"
+msgstr "设定新状态"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,name:0
+msgid "Year"
+msgstr "年"
diff --git a/addons/hr_holidays/i18n/ca.po b/addons/hr_holidays/i18n/ca.po
index 92382136b32..060b3ab6eed 100644
--- a/addons/hr_holidays/i18n/ca.po
+++ b/addons/hr_holidays/i18n/ca.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-03-31 22:29+0000\n"
+"PO-Revision-Date: 2011-04-12 05:39+0000\n"
 "Last-Translator: Esther Xaus (Zikzakmedia) <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: 2011-04-01 06:04+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-04-12 06:07+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -447,22 +447,24 @@ msgid ""
 "This value is given by the sum of all holidays requests with a positive "
 "value."
 msgstr ""
+"Aquest valor és la suma de totes les peticions d'absències amb un valor "
+"positiu."
 
 #. module: hr_holidays
 #: view:board.board:0
 msgid "All Employee Leaves"
-msgstr ""
+msgstr "Totes les absències de l'empleat"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Light Coral"
-msgstr ""
+msgstr "Corall clar"
 
 #. module: hr_holidays
 #: view:hr.holidays.summary.dept:0
 #: model:ir.actions.act_window,name:hr_holidays.action_hr_holidays_summary_dept
 msgid "Holidays by Department"
-msgstr ""
+msgstr "Absències per departament"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -472,13 +474,13 @@ msgstr ""
 #. module: hr_holidays
 #: field:resource.calendar.leaves,holiday_id:0
 msgid "Holiday"
-msgstr ""
+msgstr "Absències"
 
 #. module: hr_holidays
 #: field:hr.holidays,case_id:0
 #: field:hr.holidays.status,categ_id:0
 msgid "Meeting"
-msgstr ""
+msgstr "Reunió"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -500,7 +502,7 @@ msgstr ""
 #: field:hr.holidays,user_id:0
 #: field:hr.holidays.remaining.leaves.user,user_id:0
 msgid "User"
-msgstr ""
+msgstr "Usuari/a"
 
 #. module: hr_holidays
 #: field:hr.holidays.status,active:0
@@ -520,39 +522,39 @@ msgstr ""
 #. module: hr_holidays
 #: sql_constraint:hr.holidays:0
 msgid "The number of days must be greater than 0 !"
-msgstr ""
+msgstr "El número de dies ha de ser superior a 0!"
 
 #. module: hr_holidays
 #: field:hr.holidays,manager_id:0
 msgid "First Approval"
-msgstr ""
+msgstr "Primera aprovació"
 
 #. module: hr_holidays
 #: model:hr.holidays.status,name:hr_holidays.holiday_status_cl
 msgid "Casual Leave"
-msgstr ""
+msgstr "Absència ocasional"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: model:ir.ui.menu,name:hr_holidays.menu_open_company_allocation
 msgid "Leaves Summary"
-msgstr ""
+msgstr "Resum d'absències"
 
 #. module: hr_holidays
 #: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
 #, python-format
 msgid "Error"
-msgstr ""
+msgstr "Error"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Light Blue"
-msgstr ""
+msgstr "Blau clar"
 
 #. module: hr_holidays
 #: field:hr.holidays,type:0
 msgid "Request Type"
-msgstr ""
+msgstr "Tipus de petició"
 
 #. module: hr_holidays
 #: help:hr.holidays.status,active:0
@@ -560,6 +562,8 @@ msgid ""
 "If the active field is set to false, it will allow you to hide the leave "
 "type without removing it."
 msgstr ""
+"Si el camp actiu no està marcat, us permetrà amagar el tipus d'absència "
+"sense eliminar-la."
 
 #. module: hr_holidays
 #: view:hr.holidays.status:0
@@ -575,18 +579,18 @@ msgstr ""
 #: view:hr.holidays:0
 #: field:hr.holidays,notes:0
 msgid "Reasons"
-msgstr ""
+msgstr "Raons"
 
 #. module: hr_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_hr_available_holidays_report_tree
 msgid "Leaves Analysis"
-msgstr ""
+msgstr "Anàlisi d'absències"
 
 #. module: hr_holidays
 #: view:hr.holidays.summary.dept:0
 #: view:hr.holidays.summary.employee:0
 msgid "Cancel"
-msgstr ""
+msgstr "Cancel·la"
 
 #. module: hr_holidays
 #: help:hr.holidays.status,color_name:0
@@ -594,19 +598,21 @@ msgid ""
 "This color will be used in the leaves summary located in Reporting\\Leaves "
 "by Departement"
 msgstr ""
+"Aquest color s'utilitzarà en el resum d'absències situat en Informes\\"
+"Absències per departament"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
 msgid "Validated"
-msgstr ""
+msgstr "Validat"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: selection:hr.holidays,type:0
 msgid "Allocation Request"
-msgstr ""
+msgstr "Petició d'assignació"
 
 #. module: hr_holidays
 #: model:ir.model,name:hr_holidays.model_resource_calendar_leaves
diff --git a/addons/idea/i18n/mn.po b/addons/idea/i18n/mn.po
index 97a53e7d9ce..7eaabe93ba9 100644
--- a/addons/idea/i18n/mn.po
+++ b/addons/idea/i18n/mn.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-11 05:43+0000\n"
+"X-Launchpad-Export-Date: 2011-04-12 06:07+0000\n"
 "X-Generator: Launchpad (build 12735)\n"
 
 #. module: idea
diff --git a/addons/l10n_ec/i18n/es_EC.po b/addons/l10n_ec/i18n/es_EC.po
new file mode 100644
index 00000000000..89ad8f96f38
--- /dev/null
+++ b/addons/l10n_ec/i18n/es_EC.po
@@ -0,0 +1,56 @@
+# Spanish (Ecuador) translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-07 06:01+0000\n"
+"PO-Revision-Date: 2011-04-11 18:21+0000\n"
+"Last-Translator: Cristian Salamea (Gnuthink) <ovnicraft@gmail.com>\n"
+"Language-Team: Spanish (Ecuador) <es_EC@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: 2011-04-12 06:07+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
+
+#. module: l10n_ec
+#: model:ir.module.module,shortdesc:l10n_ec.module_meta_information
+msgid "Ecuador - Accounting Chart"
+msgstr "Ecuador - Plan Contable"
+
+#. module: l10n_ec
+#: model:ir.module.module,description:l10n_ec.module_meta_information
+msgid ""
+"\n"
+"    This is the base module to manage the accounting chart for Ecuador in "
+"OpenERP.\n"
+"    "
+msgstr ""
+"\n"
+"    Este es el módulo base para gestionar el plan contable para Ecuador en "
+"OpenERP.\n"
+"    "
+
+#. module: l10n_ec
+#: model:ir.actions.todo,note:l10n_ec.config_call_account_template_ec
+msgid ""
+"Generate Chart of Accounts from a Chart Template. You will be asked to pass "
+"the name of the company, the chart template to follow, the no. of digits to "
+"generate the code for your accounts and Bank account, currency to create "
+"Journals. Thus,the pure copy of chart Template is generated.\n"
+"\tThis is the same wizard that runs from Financial "
+"Management/Configuration/Financial Accounting/Financial Accounts/Generate "
+"Chart of Accounts from a Chart Template."
+msgstr ""
+"Generar el plan contable a partir de una plantilla de plan contable. Se le "
+"pedirá el nombre de la compañía, la plantilla de plan contable a utilizar, "
+"el número de dígitos para generar el código de las cuentas y de la cuenta "
+"bancaria, la moneda para crear los diarios. Así pues, se genere una copia "
+"exacta de la plantilla de plan contable.\n"
+"\tEste es el mismo asistente que se ejecuta desde Contabilidad y finanzas / "
+"Configuración / Contabilidad financiera / Cuentas financieras / Generar el "
+"plan contable a partir de una plantilla de plan contable."
diff --git a/addons/procurement/i18n/es_EC.po b/addons/procurement/i18n/es_EC.po
new file mode 100644
index 00000000000..e0e9652538d
--- /dev/null
+++ b/addons/procurement/i18n/es_EC.po
@@ -0,0 +1,929 @@
+# Spanish (Ecuador) translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-04-11 18:28+0000\n"
+"Last-Translator: Cristian Salamea (Gnuthink) <ovnicraft@gmail.com>\n"
+"Language-Team: Spanish (Ecuador) <es_EC@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: 2011-04-12 06:07+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
+
+#. module: procurement
+#: view:make.procurement:0
+msgid "Ask New Products"
+msgstr "Solicitar nuevos productos"
+
+#. module: procurement
+#: model:ir.ui.menu,name:procurement.menu_stock_sched
+msgid "Schedulers"
+msgstr "Planificaciones"
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_make_procurement
+msgid "Make Procurements"
+msgstr "Realizar abastecimientos"
+
+#. module: procurement
+#: help:procurement.order.compute.all,automatic:0
+msgid ""
+"Triggers an automatic procurement for all products that have a virtual stock "
+"under 0. You should probably not use this option, we suggest using a MTO "
+"configuration on products."
+msgstr ""
+"Dispara un abastecimiento automático para todos los productos que tienen un "
+"stock virtual menor que 0. Probablemente no debería utilizar esta opción, "
+"sugerimos utilizar una configuración de MTO en productos."
+
+#. module: procurement
+#: view:stock.warehouse.orderpoint:0
+msgid "Group By..."
+msgstr "Agrupado por..."
+
+#. module: procurement
+#: help:stock.warehouse.orderpoint,procurement_draft_ids:0
+msgid "Draft procurement of the product and location of that orderpoint"
+msgstr ""
+"Abastecimiento borrador del producto y ubicación para esta regla de stock "
+"mínimo."
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:288
+#, python-format
+msgid "No supplier defined for this product !"
+msgstr "¡No se ha definido un proveedor para este producto!"
+
+#. module: procurement
+#: field:make.procurement,uom_id:0
+msgid "Unit of Measure"
+msgstr "Unidad de Medida"
+
+#. module: procurement
+#: field:procurement.order,procure_method:0
+msgid "Procurement Method"
+msgstr "Método de abastecimiento"
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:298
+#, python-format
+msgid "No address defined for the supplier"
+msgstr "No se ha definido dirección para el proveedor"
+
+#. module: procurement
+#: model:ir.actions.act_window,name:procurement.action_procurement_compute
+msgid "Compute Stock Minimum Rules Only"
+msgstr "Calcular sólo reglas de stock mínimo"
+
+#. module: procurement
+#: field:procurement.order,company_id:0
+#: field:stock.warehouse.orderpoint,company_id:0
+msgid "Company"
+msgstr "Compañia"
+
+#. module: procurement
+#: field:procurement.order,product_uos_qty:0
+msgid "UoS Quantity"
+msgstr "Cantidad UdV"
+
+#. module: procurement
+#: view:procurement.order:0
+#: field:procurement.order,name:0
+msgid "Reason"
+msgstr "Razón"
+
+#. module: procurement
+#: view:procurement.order.compute:0
+msgid "Compute Procurements"
+msgstr "Calcular abastecimientos"
+
+#. module: procurement
+#: field:procurement.order,message:0
+msgid "Latest error"
+msgstr "Último error"
+
+#. module: procurement
+#: help:mrp.property,composition:0
+msgid "Not used in computations, for information purpose only."
+msgstr "No utilizado en cálculos, sólo con la finalidad de informar."
+
+#. module: procurement
+#: field:stock.warehouse.orderpoint,procurement_id:0
+msgid "Latest procurement"
+msgstr "Último abastecimiento"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Notes"
+msgstr "Notas"
+
+#. module: procurement
+#: selection:procurement.order,procure_method:0
+msgid "on order"
+msgstr "bajo pedido"
+
+#. module: procurement
+#: help:procurement.order,message:0
+msgid "Exception occurred while computing procurement orders."
+msgstr ""
+"Ha ocurrido una excepción mientras se calculaban órdenes de abastecimiento."
+
+#. module: procurement
+#: help:procurement.order,state:0
+msgid ""
+"When a procurement is created the state is set to 'Draft'.\n"
+" If the procurement is confirmed, the state is set to 'Confirmed'.           "
+" \n"
+"After confirming the state is set to 'Running'.\n"
+" If any exception arises in the order then the state is set to 'Exception'.\n"
+" Once the exception is removed the state becomes 'Ready'.\n"
+" It is in 'Waiting'. state when the procurement is waiting for another one "
+"to finish."
+msgstr ""
+"Cuando se crea una orden de abastecimiento, su estado es 'Borrador'. \n"
+"Si el abastecimiento se confirma, el estado cambia a 'Confirmada'.           "
+" \n"
+"Después de confirmar el estado se establece como 'En curso'.\n"
+"Si surge cualquier excepción con la orden, el estado pasa a 'Excepción'.\n"
+"Una vez la excepción es solucionada, el estado cambia a 'Preparada'.\n"
+"Está en estado 'En espera' cuando está esperando a que acabe otro "
+"abastecimiento."
+
+#. module: procurement
+#: view:stock.warehouse.orderpoint:0
+msgid "Minimum Stock Rules Search"
+msgstr "Buscar reglas de stock mínimo"
+
+#. module: procurement
+#: help:stock.warehouse.orderpoint,product_min_qty:0
+msgid ""
+"When the virtual stock goes belong the Min Quantity, OpenERP generates a "
+"procurement to bring the virtual stock to the Max Quantity."
+msgstr ""
+"Cuando el stock virtual está por debajo de la cantidad mínima, OpenERP "
+"genera un abastecimiento para aumentar el stock virtual a la cantidad máxima."
+
+#. module: procurement
+#: view:procurement.order.compute.all:0
+msgid "Scheduler Parameters"
+msgstr "Parámetros del planificador"
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_stock_move
+msgid "Stock Move"
+msgstr "Movimiento de stock"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Planification"
+msgstr "Planificación"
+
+#. module: procurement
+#: selection:procurement.order,state:0
+msgid "Ready"
+msgstr "Preparado"
+
+#. module: procurement
+#: field:procurement.order.compute.all,automatic:0
+msgid "Automatic orderpoint"
+msgstr "Generación de orden automática"
+
+#. module: procurement
+#: field:mrp.property,composition:0
+msgid "Properties composition"
+msgstr "Composición de propiedades"
+
+#. module: procurement
+#: selection:procurement.order,state:0
+msgid "Confirmed"
+msgstr "Confirmado"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Retry"
+msgstr "Reintentar"
+
+#. module: procurement
+#: view:procurement.order.compute:0
+#: view:procurement.orderpoint.compute:0
+msgid "Parameters"
+msgstr "Parámetros"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Confirm"
+msgstr "Confirmar"
+
+#. module: procurement
+#: help:procurement.order,origin:0
+msgid ""
+"Reference of the document that created this Procurement.\n"
+"This is automatically completed by OpenERP."
+msgstr ""
+"Referencia del documento que ha creado este abastecimiento.\n"
+"OpenERP lo completa automáticamente."
+
+#. module: procurement
+#: view:stock.warehouse.orderpoint:0
+msgid "Procurement Orders to Process"
+msgstr "Órdenes de abastecimiento a procesar"
+
+#. module: procurement
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "¡Error! No puede crear compañías recursivas."
+
+#. module: procurement
+#: field:procurement.order,priority:0
+msgid "Priority"
+msgstr "Prioridad"
+
+#. module: procurement
+#: view:procurement.order:0
+#: field:procurement.order,state:0
+msgid "State"
+msgstr "Estado"
+
+#. module: procurement
+#: field:procurement.order,location_id:0
+#: view:stock.warehouse.orderpoint:0
+#: field:stock.warehouse.orderpoint,location_id:0
+msgid "Location"
+msgstr "Ubicación"
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_stock_picking
+msgid "Picking List"
+msgstr "Lista Movimientos"
+
+#. module: procurement
+#: field:make.procurement,warehouse_id:0
+#: view:stock.warehouse.orderpoint:0
+#: field:stock.warehouse.orderpoint,warehouse_id:0
+msgid "Warehouse"
+msgstr "Inventario"
+
+#. module: procurement
+#: selection:stock.warehouse.orderpoint,logic:0
+msgid "Best price (not yet active!)"
+msgstr "Mejor precio (aún no activo!)"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Product & Location"
+msgstr "Producto & Ubicación"
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_procurement_order_compute
+msgid "Compute Procurement"
+msgstr "Calcular abastecimiento"
+
+#. module: procurement
+#: model:ir.module.module,shortdesc:procurement.module_meta_information
+#: field:stock.move,procurements:0
+msgid "Procurements"
+msgstr "Abastecimientos"
+
+#. module: procurement
+#: field:res.company,schedule_range:0
+msgid "Scheduler Range Days"
+msgstr "Día rango planificador"
+
+#. module: procurement
+#: model:ir.actions.act_window,help:procurement.procurement_action
+msgid ""
+"A procurement order is used to record a need for a specific product at a "
+"specific location. A procurement order is usually created automatically from "
+"sales orders, a Pull Logistics rule or Minimum Stock Rules. When the "
+"procurement order is confirmed, it automatically creates the necessary "
+"operations to fullfil the need: purchase order proposition, manufacturing "
+"order, etc."
+msgstr ""
+"Una orden de abastecimiento se utiliza para registrar una necesidad de un "
+"producto específico en una ubicación específica. Una orden de abastecimiento "
+"es generalmente creada automáticamente a partir de órdenes de venta, reglas "
+"logísticas Pull o regals de stck mínimo. Cuando la orden de abastecimiento "
+"es confirmada, crea automáticamente las operaciones necesarias para "
+"satisafacer al necesidad: propuesta de orden de compra, orden de fabricaión, "
+"etc."
+
+#. module: procurement
+#: field:make.procurement,date_planned:0
+msgid "Planned Date"
+msgstr "Fecha planificada"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Group By"
+msgstr "Agrupar por"
+
+#. module: procurement
+#: field:make.procurement,qty:0
+#: field:procurement.order,product_qty:0
+msgid "Quantity"
+msgstr "Cantidad"
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:370
+#, python-format
+msgid "Not enough stock and no minimum orderpoint rule defined."
+msgstr ""
+"No hay suficiente stock y no se ha definido una regla de stock mínimo."
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:137
+#, python-format
+msgid "Invalid action !"
+msgstr "¡Acción inválida!"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "References"
+msgstr "Referencias"
+
+#. module: procurement
+#: view:res.company:0
+msgid "Configuration"
+msgstr "Configuración"
+
+#. module: procurement
+#: field:stock.warehouse.orderpoint,qty_multiple:0
+msgid "Qty Multiple"
+msgstr "Cant. Multiple"
+
+#. module: procurement
+#: help:procurement.order,procure_method:0
+msgid ""
+"If you encode manually a Procurement, you probably want to use a make to "
+"order method."
+msgstr ""
+"Si codifica manualmente un abastecimiento, seguramente quiere usar un método "
+"\"Obtener bajo pedido\"."
+
+#. module: procurement
+#: model:ir.ui.menu,name:procurement.menu_stock_procurement
+msgid "Automatic Procurements"
+msgstr "Abastecimientos automáticos"
+
+#. module: procurement
+#: field:stock.warehouse.orderpoint,product_max_qty:0
+msgid "Max Quantity"
+msgstr "Cantidad máx"
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_procurement_order
+#: model:process.process,name:procurement.process_process_procurementprocess0
+#: view:procurement.order:0
+msgid "Procurement"
+msgstr "Abastecimiento"
+
+#. module: procurement
+#: model:ir.actions.act_window,name:procurement.procurement_action
+msgid "Procurement Orders"
+msgstr "Órdenes de abastecimiento"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "To Fix"
+msgstr "Para corregir"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Exceptions"
+msgstr "Excepciones"
+
+#. module: procurement
+#: model:process.node,note:procurement.process_node_serviceonorder0
+msgid "Assignment from Production or Purchase Order."
+msgstr "Asignación desde producción o pedido de compra."
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_mrp_property
+msgid "Property"
+msgstr "Propiedad"
+
+#. module: procurement
+#: model:ir.actions.act_window,name:procurement.act_make_procurement
+#: view:make.procurement:0
+msgid "Procurement Request"
+msgstr "Solicitud de abastecimiento"
+
+#. module: procurement
+#: view:procurement.orderpoint.compute:0
+msgid "Compute Stock"
+msgstr "Calcular stock"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Late"
+msgstr "Retrasada"
+
+#. module: procurement
+#: model:process.process,name:procurement.process_process_serviceproductprocess0
+msgid "Service"
+msgstr "Servicio"
+
+#. module: procurement
+#: model:ir.module.module,description:procurement.module_meta_information
+msgid ""
+"\n"
+"    This is the module for computing Procurements.\n"
+"    "
+msgstr ""
+"\n"
+"    Este es el módulo para calcular abastecimientos.\n"
+"    "
+
+#. module: procurement
+#: field:stock.warehouse.orderpoint,procurement_draft_ids:0
+msgid "Related Procurement Orders"
+msgstr "Órdenes de abastecimiento relacionadas"
+
+#. module: procurement
+#: view:procurement.orderpoint.compute:0
+msgid ""
+"Wizard checks all the stock minimum rules and generate procurement order."
+msgstr ""
+"El asistente comprobará todas las reglas de stock mínimo y generará orden de "
+"abastecimiento."
+
+#. module: procurement
+#: field:stock.warehouse.orderpoint,product_min_qty:0
+msgid "Min Quantity"
+msgstr "Cantidad mín"
+
+#. module: procurement
+#: selection:procurement.order,priority:0
+msgid "Urgent"
+msgstr "Urgente"
+
+#. module: procurement
+#: selection:mrp.property,composition:0
+msgid "plus"
+msgstr "más"
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:319
+#, python-format
+msgid ""
+"Please check the Quantity in Procurement Order(s), it should not be less "
+"than 1!"
+msgstr ""
+"¡Compruebe la cantidad en la(s) orden(es) de abastecimiento, no debería ser "
+"inferior a 1!"
+
+#. module: procurement
+#: help:stock.warehouse.orderpoint,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the "
+"orderpoint without removing it."
+msgstr ""
+"Si el campo activo se desmarca, permite ocultar la regla de stock mínimo sin "
+"eliminarla."
+
+#. module: procurement
+#: help:stock.warehouse.orderpoint,product_max_qty:0
+msgid ""
+"When the virtual stock goes belong the Max Quantity, OpenERP generates a "
+"procurement to bring the virtual stock to the Max Quantity."
+msgstr ""
+"Cuando el stock virtual se sitúa por debajo de la cantidad mínima, OpenERP "
+"genera un abastecimiento para situar el stock virtual a la cantidad máxima."
+
+#. module: procurement
+#: help:procurement.orderpoint.compute,automatic:0
+msgid "If the stock of a product is under 0, it will act like an orderpoint"
+msgstr "Si el stock de un producto es menor que 0, actuará como una orden"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Procurement Lines"
+msgstr "Líneas de abastecimiento"
+
+#. module: procurement
+#: view:procurement.order.compute.all:0
+msgid ""
+"This wizard allows you to run all procurement, production and/or purchase "
+"orders that should be processed based on their configuration. By default, "
+"the scheduler is launched automatically every night by OpenERP. You can use "
+"this menu to force it to be launched now. Note that it runs in the "
+"background, you may have to wait for a few minutes until it has finished "
+"computing."
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+#: field:procurement.order,note:0
+msgid "Note"
+msgstr ""
+
+#. module: procurement
+#: selection:procurement.order,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order.compute:0
+msgid "This wizard will schedule procurements."
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Status"
+msgstr ""
+
+#. module: procurement
+#: selection:procurement.order,priority:0
+msgid "Normal"
+msgstr ""
+
+#. module: procurement
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product"
+msgstr ""
+
+#. module: procurement
+#: field:stock.warehouse.orderpoint,active:0
+msgid "Active"
+msgstr ""
+
+#. module: procurement
+#: model:process.node,name:procurement.process_node_procureproducts0
+msgid "Procure Products"
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order,date_planned:0
+msgid "Scheduled date"
+msgstr ""
+
+#. module: procurement
+#: selection:procurement.order,state:0
+msgid "Exception"
+msgstr ""
+
+#. module: procurement
+#: code:addons/procurement/schedulers.py:179
+#, python-format
+msgid "Automatic OP: %s"
+msgstr ""
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_procurement_orderpoint_compute
+msgid "Automatic Order Point"
+msgstr ""
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_stock_warehouse_orderpoint
+msgid "Minimum Inventory Rule"
+msgstr ""
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Extra Information"
+msgstr ""
+
+#. module: procurement
+#: help:procurement.order,name:0
+msgid "Procurement name."
+msgstr ""
+
+#. module: procurement
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Procurement Reason"
+msgstr ""
+
+#. module: procurement
+#: sql_constraint:stock.warehouse.orderpoint:0
+msgid "Qty Multiple must be greater than zero."
+msgstr ""
+
+#. module: procurement
+#: selection:stock.warehouse.orderpoint,logic:0
+msgid "Order to Max"
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order,date_close:0
+msgid "Date Closed"
+msgstr ""
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:372
+#, python-format
+msgid "Procurement '%s' is in exception: not enough stock."
+msgstr ""
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:138
+#, python-format
+msgid "Cannot delete Procurement Order(s) which are in %s State!"
+msgstr ""
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:318
+#, python-format
+msgid "Data Insufficient !"
+msgstr ""
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_mrp_property_group
+#: field:mrp.property,group_id:0
+#: field:mrp.property.group,name:0
+msgid "Property Group"
+msgstr ""
+
+#. module: procurement
+#: view:stock.warehouse.orderpoint:0
+msgid "Misc"
+msgstr ""
+
+#. module: procurement
+#: view:stock.warehouse.orderpoint:0
+msgid "Locations"
+msgstr ""
+
+#. module: procurement
+#: selection:procurement.order,procure_method:0
+msgid "from stock"
+msgstr ""
+
+#. module: procurement
+#: view:stock.warehouse.orderpoint:0
+msgid "General Information"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Run Procurement"
+msgstr ""
+
+#. module: procurement
+#: selection:procurement.order,state:0
+msgid "Done"
+msgstr ""
+
+#. module: procurement
+#: help:stock.warehouse.orderpoint,qty_multiple:0
+msgid "The procurement quantity will by rounded up to this multiple."
+msgstr ""
+
+#. module: procurement
+#: view:make.procurement:0
+#: view:procurement.order:0
+#: selection:procurement.order,state:0
+#: view:procurement.order.compute:0
+#: view:procurement.order.compute.all:0
+#: view:procurement.orderpoint.compute:0
+msgid "Cancel"
+msgstr ""
+
+#. module: procurement
+#: field:stock.warehouse.orderpoint,logic:0
+msgid "Reordering Mode"
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order,origin:0
+msgid "Source Document"
+msgstr ""
+
+#. module: procurement
+#: selection:procurement.order,priority:0
+msgid "Not urgent"
+msgstr ""
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_procurement_order_compute_all
+msgid "Compute all schedulers"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Current"
+msgstr ""
+
+#. module: procurement
+#: view:board.board:0
+msgid "Procurements in Exception"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Details"
+msgstr ""
+
+#. module: procurement
+#: model:ir.actions.act_window,name:procurement.procurement_action5
+#: model:ir.actions.act_window,name:procurement.procurement_action_board
+#: model:ir.actions.act_window,name:procurement.procurement_exceptions
+#: model:ir.ui.menu,name:procurement.menu_stock_procurement_action
+msgid "Procurement Exceptions"
+msgstr ""
+
+#. module: procurement
+#: model:ir.actions.act_window,name:procurement.act_procurement_2_stock_warehouse_orderpoint
+#: model:ir.actions.act_window,name:procurement.act_product_product_2_stock_warehouse_orderpoint
+#: model:ir.actions.act_window,name:procurement.act_stock_warehouse_2_stock_warehouse_orderpoint
+#: model:ir.actions.act_window,name:procurement.action_orderpoint_form
+#: model:ir.ui.menu,name:procurement.menu_stock_order_points
+#: view:stock.warehouse.orderpoint:0
+msgid "Minimum Stock Rules"
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order,close_move:0
+msgid "Close Move at end"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Scheduled Date"
+msgstr ""
+
+#. module: procurement
+#: field:make.procurement,product_id:0
+#: view:procurement.order:0
+#: field:procurement.order,product_id:0
+#: field:stock.warehouse.orderpoint,product_id:0
+msgid "Product"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Temporary"
+msgstr ""
+
+#. module: procurement
+#: field:mrp.property,description:0
+#: field:mrp.property.group,description:0
+msgid "Description"
+msgstr ""
+
+#. module: procurement
+#: selection:mrp.property,composition:0
+msgid "min"
+msgstr ""
+
+#. module: procurement
+#: view:stock.warehouse.orderpoint:0
+msgid "Quantity Rules"
+msgstr ""
+
+#. module: procurement
+#: selection:procurement.order,state:0
+msgid "Running"
+msgstr ""
+
+#. module: procurement
+#: field:stock.warehouse.orderpoint,product_uom:0
+msgid "Product UOM"
+msgstr ""
+
+#. module: procurement
+#: model:process.node,name:procurement.process_node_serviceonorder0
+msgid "Make to Order"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "UOM"
+msgstr ""
+
+#. module: procurement
+#: selection:procurement.order,state:0
+msgid "Waiting"
+msgstr ""
+
+#. module: procurement
+#: model:ir.actions.act_window,help:procurement.action_orderpoint_form
+msgid ""
+"You can define your minimum stock rules, so that OpenERP will automatically "
+"create draft manufacturing orders or purchase quotations according to the "
+"stock level. Once the virtual stock of a product (= stock on hand minus all "
+"confirmed orders and reservations) is below the minimum quantity, OpenERP "
+"will generate a procurement request to increase the stock up to the maximum "
+"quantity."
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order,move_id:0
+msgid "Reservation"
+msgstr ""
+
+#. module: procurement
+#: model:process.node,note:procurement.process_node_procureproducts0
+msgid "The way to procurement depends on the product type."
+msgstr ""
+
+#. module: procurement
+#: view:make.procurement:0
+msgid ""
+"This wizard will plan the procurement for this product. This procurement may "
+"generate task, production orders or purchase orders."
+msgstr ""
+
+#. module: procurement
+#: view:res.company:0
+msgid "MRP & Logistics Scheduler"
+msgstr ""
+
+#. module: procurement
+#: field:mrp.property,name:0
+#: field:stock.warehouse.orderpoint,name:0
+msgid "Name"
+msgstr ""
+
+#. module: procurement
+#: selection:mrp.property,composition:0
+msgid "max"
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order,product_uos:0
+msgid "Product UoS"
+msgstr ""
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:347
+#, python-format
+msgid "from stock: products assigned."
+msgstr ""
+
+#. module: procurement
+#: model:ir.actions.act_window,name:procurement.action_compute_schedulers
+#: model:ir.ui.menu,name:procurement.menu_stock_proc_schedulers
+#: view:procurement.order.compute.all:0
+msgid "Compute Schedulers"
+msgstr ""
+
+#. module: procurement
+#: model:ir.actions.act_window,help:procurement.procurement_exceptions
+msgid ""
+"Procurement Orders represent the need for a certain quantity of products, at "
+"a given time, in a given location. Sales Orders are one typical source of "
+"Procurement Orders (but these are distinct documents). Depending on the "
+"procurement parameters and the product configuration, the procurement engine "
+"will attempt to satisfy the need by reserving products from stock, ordering "
+"products from a supplier, or passing a manufacturing order, etc. A "
+"Procurement Exception occurs when the system cannot find a way to fulfill a "
+"procurement. Some exceptions will resolve themselves automatically, but "
+"others require manual intervention (those are identified by a specific error "
+"message)."
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order,product_uom:0
+msgid "Product UoM"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Search Procurement"
+msgstr ""
+
+#. module: procurement
+#: help:res.company,schedule_range:0
+msgid ""
+"This is the time frame analysed by the scheduler when computing "
+"procurements. All procurements that are not between today and today+range "
+"are skipped for future computation."
+msgstr ""
+
+#. module: procurement
+#: selection:procurement.order,priority:0
+msgid "Very Urgent"
+msgstr ""
+
+#. module: procurement
+#: field:procurement.orderpoint.compute,automatic:0
+msgid "Automatic Orderpoint"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Procurement Details"
+msgstr ""
+
+#. module: procurement
+#: code:addons/procurement/schedulers.py:180
+#, python-format
+msgid "SCHEDULER"
+msgstr ""
diff --git a/addons/purchase/i18n/en_GB.po b/addons/purchase/i18n/en_GB.po
new file mode 100644
index 00000000000..beb47bc9faf
--- /dev/null
+++ b/addons/purchase/i18n/en_GB.po
@@ -0,0 +1,1793 @@
+# English (United Kingdom) translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-04-11 07:41+0000\n"
+"Last-Translator: Colin MacMillan (publicus-solutions.com) <Unknown>\n"
+"Language-Team: English (United Kingdom) <en_GB@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: 2011-04-12 06:07+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
+msgid ""
+"The buyer has to approve the RFQ before being sent to the supplier. The RFQ "
+"becomes a confirmed Purchase Order."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:282
+#, python-format
+msgid "You can not confirm purchase order without Purchase Order Lines."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,invoiced:0
+msgid "Invoiced & Paid"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,location_id:0
+#: view:purchase.report:0
+#: field:purchase.report,location_id:0
+msgid "Destination"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:710
+#, python-format
+msgid ""
+"You have to select a product UOM in the same category than the purchase UOM "
+"of the product"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.report,date:0
+msgid "Date on which this document has been created"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.purchase_rfq
+msgid ""
+"You can create a request for quotation when you want to buy products to a "
+"supplier but the purchase is not confirmed yet. Use also this menu to review "
+"requests for quotation created automatically based on your logistic rules "
+"(minimum stock, MTO, etc). You can convert the request for quotation into a "
+"purchase order once the order is confirmed. If you use the extended "
+"interface (from user's preferences), you can select the way to control your "
+"supplier invoices: based on the order, based on the receptions or manual "
+"encoding."
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,invoice_method:0
+msgid "From Picking"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Not Invoiced"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,dest_address_id:0
+msgid "Destination Address"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.report,validator:0
+msgid "Validated By"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+#: field:purchase.order,partner_id:0
+#: view:purchase.order.line:0
+#: view:purchase.report:0
+#: field:purchase.report,partner_id:0
+msgid "Supplier"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.line_invoice:0
+msgid "Do you want to generate the supplier invoices ?"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.purchase_form_action
+msgid ""
+"Use this menu to search within your purchase orders by references, supplier, "
+"products, etc. For each purchase order, you can track the products received, "
+"and control the supplier invoices."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:722
+#, python-format
+msgid "The selected supplier only sells this product by %s"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/wizard/purchase_line_invoice.py:156
+#, python-format
+msgid "Supplier Invoices"
+msgstr ""
+
+#. module: purchase
+#: sql_constraint:purchase.order:0
+msgid "Order Reference must be unique !"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_packinginvoice0
+#: model:process.transition,name:purchase.process_transition_productrecept0
+msgid "From a Pick list"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:649
+#, python-format
+msgid "No Pricelist !"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order.line,product_qty:0
+#: view:purchase.report:0
+#: field:purchase.report,quantity:0
+msgid "Quantity"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.line_invoice:0
+msgid "Select an Open Sale Order"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,company_id:0
+#: field:purchase.order.line,company_id:0
+#: view:purchase.report:0
+#: field:purchase.report,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: purchase
+#: view:board.board:0
+#: model:ir.actions.act_window,name:purchase.action_purchase_order_monthly_categ_graph
+#: view:purchase.report:0
+msgid "Monthly Purchase by Category"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Set to Draft"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
+msgid "Invoice Exception"
+msgstr ""
+
+#. module: purchase
+#: model:product.pricelist,name:purchase.list0
+msgid "Default Purchase Pricelist"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_current_purchases
+msgid "Current purchases"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,dest_address_id:0
+msgid ""
+"Put an address if you want to deliver directly from the supplier to the "
+"customer.In this case, it will remove the warehouse link and set the "
+"customer location."
+msgstr ""
+
+#. module: purchase
+#: help:res.partner,property_product_pricelist_purchase:0
+msgid ""
+"This pricelist will be used, instead of the default one, for purchases from "
+"the current partner"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Fax :"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,pricelist_id:0
+msgid ""
+"The pricelist sets the currency used for this purchase order. It also "
+"computes the supplier price for the selected products/quantities."
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_stock_partial_picking
+msgid "Partial Picking"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:286
+#, python-format
+msgid "Purchase order '%s' is confirmed."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Approve Purchase"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_approvepurchaseorder0
+#: view:purchase.order:0
+#: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
+msgid "Approved"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "Reference UOM"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Origin"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,product_uom:0
+msgid "Reference UoM"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_line_product_tree
+msgid "Purchases"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+#: field:purchase.order,notes:0
+#: view:purchase.order.line:0
+#: field:purchase.order.line,notes:0
+msgid "Notes"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:649
+#, python-format
+msgid ""
+"You have to select a pricelist or a supplier in the purchase form !\n"
+"Please set one before choosing a product."
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "September"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.order,amount_tax:0
+#: view:purchase.order.line:0
+#: field:purchase.order.line,taxes_id:0
+msgid "Taxes"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.report.xml,name:purchase.report_purchase_order
+#: model:ir.model,name:purchase.model_purchase_order
+#: model:process.node,name:purchase.process_node_purchaseorder0
+#: field:procurement.order,purchase_id:0
+#: view:purchase.order:0
+#: model:res.request.link,name:purchase.req_link_purchase_order
+#: field:stock.picking,purchase_id:0
+msgid "Purchase Order"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,name:0
+#: view:purchase.order.line:0
+#: field:purchase.order.line,order_id:0
+msgid "Order Reference"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Net Total :"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.installer:0
+msgid "Configure Your Purchases Management Application"
+msgstr ""
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_procurement_management_product
+#: model:ir.ui.menu,name:purchase.menu_procurement_partner_contact_form
+msgid "Products"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.installer,progress:0
+msgid "Configuration Progress"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_packinginvoice0
+msgid ""
+"A Pick list generates an invoice. Depending on the Invoicing control of the "
+"sale order, the invoice is based on delivered or on ordered quantities."
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,state:0
+#: selection:purchase.order.line,state:0
+#: selection:purchase.report,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:305
+#, python-format
+msgid "Purchase amount over the limit"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Convert to Purchase Order"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,pricelist_id:0
+#: field:purchase.report,pricelist_id:0
+msgid "Pricelist"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
+msgid "Shipping Exception"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_packinglist0
+#: model:process.node,name:purchase.process_node_productrecept0
+msgid "Incoming Products"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_packinginvoice0
+msgid "Outgoing Products"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Manually Corrected"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "   Month   "
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Reference"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:237
+#, python-format
+msgid "Cannot delete Purchase Order(s) which are in %s State!"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,dest_address_id:0
+msgid "Dest. Address Contact Name"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_stock_move
+msgid "Stock Move"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,day:0
+msgid "Day"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:334
+#, python-format
+msgid "Purchase order '%s' has been set in draft state."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order.line,account_analytic_id:0
+msgid "Analytic Account"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,nbr:0
+msgid "# of Lines"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:685
+#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/wizard/purchase_order_group.py:47
+#, python-format
+msgid "Warning"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.installer,purchase_analytic_plans:0
+msgid "Purchase Analytic Plans"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_installer
+msgid "purchase.installer"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order.line,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Net Price"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.line:0
+msgid "Order Line"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,shipped:0
+msgid "It indicates that a picking has been done"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:710
+#, python-format
+msgid "Wrong Product UOM !"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_confirmpurchaseorder0
+#: selection:purchase.order.line,state:0
+msgid "Confirmed"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,price_average:0
+msgid "Average Price"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Total :"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition.action,name:purchase.process_transition_action_confirmpurchaseorder0
+#: view:purchase.order.line_invoice:0
+msgid "Confirm"
+msgstr ""
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_procurement_management_invoice
+#: view:purchase.order:0
+msgid "Invoice Control"
+msgstr ""
+
+#. module: purchase
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,partner_ref:0
+msgid "Supplier Reference"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,amount_tax:0
+msgid "The tax amount"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_productrecept0
+msgid ""
+"A Pick list generates a supplier invoice. Depending on the Invoicing control "
+"of the purchase order, the invoice is based on received or on ordered "
+"quantities."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+#: field:purchase.order,state:0
+#: view:purchase.order.line:0
+#: field:purchase.order.line,state:0
+#: view:purchase.report:0
+msgid "State"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.action_stock_move_report_po
+msgid ""
+"Reception Analysis allows you to easily check and analyse your company order "
+"receptions and the performance of your supplier's deliveries."
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Tel.:"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_stock_picking
+#: field:purchase.order,picking_ids:0
+msgid "Picking List"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Print"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_view_purchase_order_group
+msgid "Merge Purchase orders"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,order_line:0
+msgid "Order Lines"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:651
+#, python-format
+msgid "No Partner!"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Fax:"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,price_total:0
+msgid "Total Price"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Untaxed amount"
+msgstr ""
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_product_pricelist_action2_purchase
+#: model:ir.ui.menu,name:purchase.menu_purchase_config_pricelist
+msgid "Pricelists"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,partner_address_id:0
+msgid "Address Contact Name"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,invoice_method:0
+msgid ""
+"From Order: a draft invoice will be pre-generated based on the purchase "
+"order. The accountant will just have to validate this invoice for control.\n"
+"From Picking: a draft invoice will be pre-generated based on validated "
+"receptions.\n"
+"Manual: allows you to generate suppliers invoices by chosing in the "
+"uninvoiced lines of all manual purchase orders."
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,invoice_ids:0
+msgid "Invoices generated for a purchase order"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:282
+#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:362
+#: code:addons/purchase/wizard/purchase_line_invoice.py:122
+#, python-format
+msgid "Error !"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.line:0
+msgid "General Information"
+msgstr ""
+
+#. module: purchase
+#: view:board.board:0
+msgid "My Board"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Purchase Order Confirmation N°"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.action_purchase_order_report_all
+msgid ""
+"Purchase Analysis allows you to easily check and analyse your company "
+"purchase history and performance. From this menu you can track your "
+"negotiation performance, the delivery performance of your suppliers, etc."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Approved by Supplier"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_invoicefrompackinglist0
+msgid ""
+"The invoice is created automatically if the Invoice control of the purchase "
+"order is 'On picking'. The invoice can also be generated manually by the "
+"accountant (Invoice control = Manual)."
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,invoice_method:0
+msgid "From Order"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition.action,name:purchase.process_transition_action_invoicefrompurchaseorder0
+msgid "Create invoice"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order.line,move_dest_id:0
+msgid "Reservation Destination"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:237
+#, python-format
+msgid "Invalid action !"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,state:0
+#: selection:purchase.order.line,state:0
+#: selection:purchase.report,state:0
+msgid "Done"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "July"
+msgstr ""
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_purchase_config_purchase
+#: view:res.company:0
+msgid "Configuration"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_by_supplier
+#: view:purchase.report:0
+msgid "Purchase by supplier"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Total amount"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.act_purchase_order_2_stock_picking
+msgid "Receptions"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,validator:0
+#: view:purchase.report:0
+msgid "Validated by"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.action_invoice_pending
+msgid ""
+"Use this menu to control the invoices to be received from your supplier. "
+"OpenERP pregenerates draft invoices from your purchase orders or receptions, "
+"according to your settings. Once you receive a supplier invoice, you can "
+"match it with the draft invoice and validate it."
+msgstr ""
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_draftpurchaseorder0
+#: model:process.node,name:purchase.process_node_draftpurchaseorder1
+msgid "RFQ"
+msgstr ""
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_procurement_management_pending_invoice
+msgid "Supplier Invoices to Receive"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.installer,purchase_requisition:0
+msgid ""
+"Manages your Purchase Requisition and allows you to easily keep track and "
+"manage all your purchase orders."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "    Month-1    "
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:363
+#, python-format
+msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,invoice_method:0
+msgid "Manual"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:400
+#, python-format
+msgid "You must first cancel all picking attached to this purchase order."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+#: field:purchase.order.line,date_order:0
+#: field:purchase.report,date:0
+msgid "Order Date"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_productrecept0
+msgid "Incoming products to control"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_approvingpurchaseorder0
+msgid "Approbation"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "Purchase Orders Statistics"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
+msgid ""
+"If you set the invoicing control on a purchase order as \"Manual\", you can "
+"track here all the purchase order lines for which you have not received the "
+"supplier invoice yet. Once you are ready to receive a supplier invoice, you "
+"can generate a draft supplier invoice based on the lines from this menu."
+msgstr ""
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_invoiceafterpacking0
+#: model:process.node,name:purchase.process_node_invoicecontrol0
+msgid "Draft Invoice"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.installer,purchase_analytic_plans:0
+msgid "Manages analytic distribution and purchase orders."
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,minimum_planned_date:0
+msgid ""
+"This is computed as the minimum scheduled date of all purchase order lines' "
+"products."
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "August"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.installer,purchase_requisition:0
+msgid "Purchase Requisition"
+msgstr ""
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
+msgid "Units of Measure Categories"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,delay_pass:0
+msgid "Days to Deliver"
+msgstr ""
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_action_picking_tree_in_move
+#: model:ir.ui.menu,name:purchase.menu_procurement_management_inventory
+msgid "Receive Products"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_procurement_order
+msgid "Procurement"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+#: field:purchase.order,invoice_ids:0
+msgid "Invoices"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_purchaseorder0
+msgid "Confirmed purchase order to invoice"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.installer,config_logo:0
+msgid "Image"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "Total Orders Lines by User per month"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,month:0
+msgid "Month"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
+msgid "Waiting Supplier Ack"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Request for Quotation :"
+msgstr ""
+
+#. module: purchase
+#: view:board.board:0
+#: model:ir.actions.act_window,name:purchase.purchase_waiting
+msgid "Purchase Order Waiting Approval"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Total Untaxed amount"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,shipped:0
+#: field:purchase.order,shipped_rate:0
+msgid "Received"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_packinglist0
+msgid "List of ordered products."
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,picking_ids:0
+msgid ""
+"This is the list of picking list that have been generated for this purchase"
+msgstr ""
+
+#. module: purchase
+#: model:ir.module.module,shortdesc:purchase.module_meta_information
+#: model:ir.ui.menu,name:purchase.menu_procurement_management
+msgid "Purchase Management"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_invoiceafterpacking0
+#: model:process.node,note:purchase.process_node_invoicecontrol0
+msgid "To be reviewed by the accountant."
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.purchase_line_form_action2
+#: model:ir.ui.menu,name:purchase.menu_purchase_line_order_draft
+msgid "Purchase Lines Not Invoiced"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Taxes :"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,invoiced_rate:0
+#: field:purchase.order.line,invoiced:0
+msgid "Invoiced"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,category_id:0
+msgid "Category"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_approvepurchaseorder0
+#: model:process.node,note:purchase.process_node_confirmpurchaseorder0
+msgid "State of the Purchase Order."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "  Year  "
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,state:0
+msgid "Order State"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_view_purchase_line_invoice
+msgid "Create invoices"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_order_line
+#: view:purchase.order.line:0
+#: field:stock.move,purchase_line_id:0
+msgid "Purchase Order Line"
+msgstr ""
+
+#. module: purchase
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Calendar View"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_order_group
+msgid "Purchase Order Merge"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Regards,"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_negotiation_by_supplier
+#: view:purchase.report:0
+msgid "Negotiation by Supplier"
+msgstr ""
+
+#. module: purchase
+#: view:res.partner:0
+msgid "Purchase Properties"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_purchaseinvoice0
+msgid ""
+"A purchase order generates a supplier invoice, as soon as it is confirmed by "
+"the buyer. Depending on the Invoicing control of the purchase order, the "
+"invoice is based on received or on ordered quantities."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,invoiced:0
+msgid "It indicates that an invoice has been paid"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_packinginvoice0
+msgid "Outgoing products to invoice"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.installer:0
+msgid "Configure"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_qty_per_product
+#: view:purchase.report:0
+msgid "Qty. per product"
+msgstr ""
+
+#. module: purchase
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,date_order:0
+msgid "Date on which this document has been created."
+msgstr ""
+
+#. module: purchase
+#: view:res.partner:0
+msgid "Sales & Purchases"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "June"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_report
+msgid "Purchases Orders"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.line:0
+msgid "Manual Invoices"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:308
+#, python-format
+msgid ""
+"Somebody has just confirmed a purchase with an amount over the defined limit"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "November"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/wizard/purchase_line_invoice.py:123
+#, python-format
+msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:408
+#, python-format
+msgid "You must first cancel all invoices attached to this purchase order."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/wizard/purchase_order_group.py:48
+#, python-format
+msgid "Please select multiple order to merge in the list view."
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_createpackinglist0
+msgid "Pick list generated"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Exception"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "October"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Compute"
+msgstr ""
+
+#. module: purchase
+#: model:ir.module.module,description:purchase.module_meta_information
+msgid ""
+"\n"
+"    Purchase module is for generating a purchase order for purchase of goods "
+"from a supplier.\n"
+"    A supplier invoice is created for the particular order placed\n"
+"    Dashboard for purchase management that includes:\n"
+"    * Current Purchase Orders\n"
+"    * Draft Purchase Orders\n"
+"    * Graph for quantity and amount per month    \n"
+"\n"
+"    "
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:685
+#, python-format
+msgid ""
+"The selected supplier has a minimal quantity set to %s, you cannot purchase "
+"less."
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Cancel Purchase Order"
+msgstr ""
+
+#. module: purchase
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_createpackinglist0
+msgid "A pick list is generated to track the incoming products."
+msgstr ""
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_purchase_deshboard
+msgid "Dashboard"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,price_standard:0
+msgid "Products Value"
+msgstr ""
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_purchase_product_pricelist_type
+msgid "Pricelists Types"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+#: view:purchase.report:0
+msgid "Quotations"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_po_per_month_tree
+#: view:purchase.report:0
+msgid "Purchase order per month"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.line:0
+msgid "History"
+msgstr ""
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_product_by_category_purchase_form
+msgid "Products by Category"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,delay:0
+msgid "Days to Validate"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,origin:0
+msgid "Reference of the document that generated this purchase order request."
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,state:0
+msgid ""
+"The state of the purchase order or the quotation request. A quotation is a "
+"purchase order in a 'Draft' state. Then the order has to be confirmed by the "
+"user, the state switch to 'Confirmed'. Then the supplier must confirm the "
+"order to change the state to 'Approved'. When the purchase order is paid and "
+"received, the state becomes 'Done'. If a cancel action occurs in the invoice "
+"or in the reception of goods, the state becomes in exception."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order.line,price_subtotal:0
+msgid "Subtotal"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.purchase_rfq
+#: model:ir.ui.menu,name:purchase.menu_purchase_rfq
+msgid "Requests for Quotation"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,date_approve:0
+msgid "Date on which purchase order has been approved"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
+msgid "Waiting"
+msgstr ""
+
+#. module: purchase
+#: model:product.pricelist.version,name:purchase.ver0
+msgid "Default Purchase Pricelist Version"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.installer:0
+msgid ""
+"Extend your Purchases Management Application with additional functionalities."
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_install_module
+#: view:purchase.installer:0
+msgid "Purchases Application Configuration"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,fiscal_position:0
+msgid "Fiscal Position"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Request for Quotation N°"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_invoicefrompackinglist0
+#: model:process.transition,name:purchase.process_transition_invoicefrompurchase0
+msgid "Invoice"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "December"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition.action,name:purchase.process_transition_action_approvingcancelpurchaseorder0
+#: model:process.transition.action,name:purchase.process_transition_action_cancelpurchaseorder0
+#: view:purchase.order:0
+#: view:purchase.order.group:0
+#: view:purchase.order.line_invoice:0
+msgid "Cancel"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+#: view:purchase.order.line:0
+msgid "Purchase Order Lines"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_approvingpurchaseorder0
+msgid "The supplier approves the Purchase Order."
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.act_res_partner_2_purchase_order
+#: model:ir.actions.act_window,name:purchase.purchase_form_action
+#: model:ir.ui.menu,name:purchase.menu_purchase_form_action
+#: view:purchase.report:0
+msgid "Purchase Orders"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,origin:0
+msgid "Source Document"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.group:0
+msgid "Merge orders"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_order_line_invoice
+msgid "Purchase Order Line Make Invoice"
+msgstr ""
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_action_picking_tree4
+msgid "Incoming Shipments"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
+msgid "Total Orders by User per month"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.report.xml,name:purchase.report_purchase_quotation
+#: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
+msgid "Request for Quotation"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Tél. :"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,create_uid:0
+#: view:purchase.report:0
+#: field:purchase.report,user_id:0
+msgid "Responsible"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Our Order Reference"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+#: view:purchase.order.line:0
+msgid "Search Purchase Order"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,warehouse_id:0
+#: view:purchase.report:0
+#: field:purchase.report,warehouse_id:0
+msgid "Warehouse"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_draftpurchaseorder0
+#: model:process.node,note:purchase.process_node_draftpurchaseorder1
+msgid "Request for Quotations."
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Date Req."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,date_approve:0
+#: field:purchase.report,date_approve:0
+msgid "Date Approved"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:407
+#, python-format
+msgid "Could not cancel this purchase order !"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.order.line,price_unit:0
+msgid "Unit Price"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Delivery & Invoicing"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order.line,date_planned:0
+msgid "Scheduled Date"
+msgstr ""
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_product_in_config_purchase
+#: field:purchase.order,product_id:0
+#: view:purchase.order.line:0
+#: field:purchase.order.line,product_id:0
+#: view:purchase.report:0
+#: field:purchase.report,product_id:0
+msgid "Product"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder0
+#: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder1
+msgid "Confirmation"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.order.line,name:0
+#: report:purchase.quotation:0
+msgid "Description"
+msgstr ""
+
+#. module: purchase
+#: help:res.company,po_lead:0
+msgid "This is the leads/security time for each purchase order."
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Expected Delivery address:"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_stock_move_report_po
+#: model:ir.ui.menu,name:purchase.menu_action_stock_move_report_po
+msgid "Receptions Analysis"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,amount_untaxed:0
+msgid "The amount without tax"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.action_supplier_address_form
+msgid ""
+"Access your supplier records and maintain a good relationship with your "
+"suppliers. You can track all your interactions with them through the History "
+"tab: emails, orders, meetings, etc."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Delivery"
+msgstr ""
+
+#. module: purchase
+#: view:board.board:0
+#: model:ir.actions.act_window,name:purchase.purchase_draft
+msgid "Request for Quotations"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order.line,product_uom:0
+msgid "Product UOM"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+#: report:purchase.quotation:0
+msgid "Qty"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,partner_address_id:0
+msgid "Address"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order.line,move_ids:0
+msgid "Reservation"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_order_report_graph
+#: view:purchase.report:0
+msgid "Total Qty and Amount by month"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:399
+#, python-format
+msgid "Could not cancel purchase order !"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder1
+msgid ""
+"In case there is no supplier for this product, the buyer can fill the form "
+"manually and confirm it. The RFQ becomes a confirmed Purchase Order."
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "February"
+msgstr ""
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_product_category_config_purchase
+msgid "Products Categories"
+msgstr "Product Categories"
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_order_report_all
+#: model:ir.ui.menu,name:purchase.menu_action_purchase_order_report_all
+msgid "Purchase Analysis"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Your Order Reference"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+#: field:purchase.order,minimum_planned_date:0
+#: report:purchase.quotation:0
+#: field:purchase.report,expected_date:0
+msgid "Expected Date"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_total_price_by_product_by_state
+#: view:purchase.report:0
+msgid "Total price by product by state"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "TVA:"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.order,date_order:0
+msgid "Date Ordered"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Shipping address :"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Purchase Control"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "March"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "April"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.group:0
+msgid ""
+" Please note that: \n"
+" \n"
+" Orders will only be merged if: \n"
+" * Purchase Orders are in draft \n"
+" * Purchase Orders belong to the same supplier \n"
+" * Purchase Orders are have same stock location, same pricelist \n"
+" \n"
+" Lines will only be merged if: \n"
+" * Order lines are exactly the same except for the product,quantity and unit "
+"\n"
+" "
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,name:0
+msgid "Year"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,negociation:0
+msgid "Purchase-Standard Price"
+msgstr ""
+
+#. module: purchase
+#: model:product.pricelist.type,name:purchase.pricelist_type_purchase
+#: field:res.partner,property_product_pricelist_purchase:0
+msgid "Purchase Pricelist"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,invoice_method:0
+msgid "Invoicing Control"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition.action,name:purchase.process_transition_action_approvingpurchaseorder0
+msgid "Approve"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "To Approve"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.line:0
+msgid "Invoicing"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order.line,state:0
+msgid ""
+" * The 'Draft' state is set automatically when purchase order in draft "
+"state.                                        \n"
+"* The 'Confirmed' state is set automatically as confirm when purchase order "
+"in confirm state.                                        \n"
+"* The 'Done' state is set automatically when purchase order is set as done.  "
+"                                      \n"
+"* The 'Cancelled' state is set automatically when user cancel purchase order."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:414
+#, python-format
+msgid "Purchase order '%s' is cancelled."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,amount_total:0
+msgid "Total"
+msgstr ""
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_product_pricelist_action_purhase
+msgid "Pricelist Versions"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_supplier_address_form
+msgid "Addresses"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.group:0
+msgid "Are you sure you want to merge these orders ?"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+#: view:purchase.order.line:0
+#: view:purchase.report:0
+msgid "Group By..."
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_purchaseinvoice0
+msgid "From a purchase order"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "TVA :"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,amount_total:0
+msgid "The total amount"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "May"
+msgstr ""
+
+#. module: purchase
+#: field:res.company,po_lead:0
+msgid "Purchase Lead Time"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_invoicefrompurchase0
+msgid ""
+"The invoice is created automatically if the Invoice control of the purchase "
+"order is 'On order'. The invoice can also be generated manually by the "
+"accountant (Invoice control = Manual)."
+msgstr ""
+
+#. module: purchase
+#: model:process.process,name:purchase.process_process_purchaseprocess0
+msgid "Purchase"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_res_partner
+#: field:purchase.order.line,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:651
+#, python-format
+msgid ""
+"You have to select a partner in the purchase form !\n"
+"Please set one partner before choosing a product."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.installer:0
+msgid "title"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_stock_partial_move
+msgid "Partial Move"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.line:0
+msgid "Stock Moves"
+msgstr ""
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_purchase_unit_measure_purchase
+#: model:ir.ui.menu,name:purchase.menu_purchase_uom_form_action
+msgid "Units of Measure"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "Orders"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,name:0
+msgid ""
+"unique number of the purchase order,computed automatically when the purchase "
+"order is created"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.open_board_purchase
+#: model:ir.ui.menu,name:purchase.menu_board_purchase
+msgid "Purchase Dashboard"
+msgstr ""

From 5cbd813272777504b2a89a53089b6ae14731e9fb Mon Sep 17 00:00:00 2001
From: "noz (OpenERP)" <noz@tinyerp.com>
Date: Tue, 12 Apr 2011 11:44:33 +0530
Subject: [PATCH 144/331] [FIX] Clear message queue, sent message will display
 only once.

bzr revid: noz@tinyerp.com-20110412061433-u4cvt9kizm8300pg
---
 addons/web_chat/controllers/main.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/web_chat/controllers/main.py b/addons/web_chat/controllers/main.py
index f1c1d392ea9..15c05f00848 100644
--- a/addons/web_chat/controllers/main.py
+++ b/addons/web_chat/controllers/main.py
@@ -136,15 +136,15 @@ class PollServer(openerpweb.Controller):
         msg = '[]'
         
         for i in range(5):
-            received_msg = mq.read('Guest1', i);
+            received_msg = mq.read('Guest1', i)
             if received_msg:
                 msg = self._pollParseMessages(received_msg)
-                time.sleep(1)
+                mq.messages = []
+                return '%s'%kw.get('callback', '') + '(' + str(msg) + ');'
             else:
                 msg = '[]'
-                time.sleep(1)
-
-        return '%s'%kw.get('callback', '') + '(' + str(msg) + ');'
+                time.sleep(2)
+                return '%s'%kw.get('callback', '') + '(' + str(msg) + ');'
         
     @openerpweb.httprequest
     def send(self, req, **kw):

From 0006e356f93e177c1133794a61ef146f05241626 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 12 Apr 2011 08:53:43 +0200
Subject: [PATCH 145/331] [ADD] attrs.invisible in readonly list cells

bzr revid: xmo@openerp.com-20110412065343-ee8iinkqw2iobl90
---
 addons/base/controllers/main.py     |  3 ++-
 addons/base/static/src/js/list.js   | 23 +++++++++++++++++++++--
 addons/base/static/src/xml/base.xml | 22 ++++++++++++----------
 3 files changed, 35 insertions(+), 13 deletions(-)

diff --git a/addons/base/controllers/main.py b/addons/base/controllers/main.py
index d7ba2c46ace..9c9a7f9ac62 100644
--- a/addons/base/controllers/main.py
+++ b/addons/base/controllers/main.py
@@ -569,7 +569,8 @@ class ListView(View):
         eval_context = request.session.evaluation_context(
             request.context)
         return [
-            {'data': row,
+            {'data': dict((key, {'value': value})
+                          for key, value in row.iteritems()),
              'color': self.process_colors(view, row, eval_context)}
             for row in rows
         ]
diff --git a/addons/base/static/src/js/list.js b/addons/base/static/src/js/list.js
index 247b2d535d9..e70b442cac0 100644
--- a/addons/base/static/src/js/list.js
+++ b/addons/base/static/src/js/list.js
@@ -45,10 +45,26 @@ openerp.base.ListView = openerp.base.Controller.extend(
         this.name = "" + this.fields_view.arch.attrs.string;
 
         var fields = this.fields_view.fields;
+        var domain_computer = openerp.base.form.compute_domain;
         this.columns = _(this.fields_view.arch.children).chain()
             .map(function (field) {
                 var name = field.attrs.name;
-                return _.extend({id: name, tag: field.tag}, field.attrs, fields[name]);
+                var column = _.extend({id: name, tag: field.tag},
+                                      field.attrs, fields[name]);
+                // attrs computer
+                if (column.attrs) {
+                    var attrs = eval('(' + column.attrs + ')');
+                    column.attrs_for = function (fields) {
+                        var result = {};
+                        for (var attr in attrs) {
+                            result[attr] = domain_computer(attrs[attr], fields);
+                        }
+                        return result;
+                    };
+                } else {
+                    column.attrs_for = function () { return {}; };
+                }
+                return column;
             }).value();
 
         this.visible_columns = _.filter(this.columns, function (column) {
@@ -86,6 +102,9 @@ openerp.base.ListView = openerp.base.Controller.extend(
      */
     do_fill_table: function(records) {
         this.rows = records;
+        this.dataset.ids = _(records).chain().map(function (record) {
+            return record.data.id.value;
+        }).value();
 
         var $table = this.$element.find('table');
         // remove all data lines
@@ -133,7 +152,7 @@ openerp.base.ListView = openerp.base.Controller.extend(
         // count number of preceding siblings to line clicked
         var row = this.rows[$target.prevAll().length];
 
-        var index = _.indexOf(this.dataset.ids, row.id);
+        var index = _.indexOf(this.dataset.ids, row.data.id.value);
         if (index == undefined || index === -1) {
             return;
         }
diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml
index 8a71b8ebc7a..7e2c5f9eec7 100644
--- a/addons/base/static/src/xml/base.xml
+++ b/addons/base/static/src/xml/base.xml
@@ -209,18 +209,20 @@
         <input type="checkbox"/>
     </th>
     <t t-foreach="columns" t-as="column">
-        <!-- TODO: handle attrs -->
+        <t t-set="attrs" t-value="column.attrs_for(row.data)"/>
         <td t-if="column.invisible !== '1'" t-att-title="column.help">
-            <t t-set="is_button" t-value="column.tag === 'button'"/>
-            <!-- TODO: get correct widget from form -->
-            <t t-if="!is_button and row['data'][column.id]">
-                <t t-esc="row['data'][column.id]"/>
+            <t t-if="!attrs.invisible">
+                <t t-set="is_button" t-value="column.tag === 'button'"/>
+                <!-- TODO: get correct widget from form -->
+                <t t-if="!is_button and row['data'][column.id].value">
+                    <t t-esc="row['data'][column.id].value"/>
+                </t>
+                <button type="button" t-att-title="column.help"
+                        t-if="is_button">
+                    <img t-att-src="'/base/static/src/img/icons/' + column.icon + '.png'"
+                         t-att-alt="column.string"/>
+                </button>
             </t>
-            <button type="button" t-att-title="column.help"
-                    t-if="is_button">
-                <img t-att-src="'/base/static/src/img/icons/' + column.icon + '.png'"
-                     t-att-alt="column.string"/>
-            </button>
         </td>
     </t>
     <td t-if="options.deletable" class='oe-record-delete'>

From 8fb463acaee3cc17b50113aa0e1bfa4d4f5fbff6 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 12 Apr 2011 09:23:56 +0200
Subject: [PATCH 146/331] [FIX] don't forget the action's domain when
 performing a search

bzr revid: xmo@openerp.com-20110412072356-gcbuv9ybi6ohx9uz
---
 addons/base/static/src/js/views.js | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/addons/base/static/src/js/views.js b/addons/base/static/src/js/views.js
index 1e3851c218f..e70495e3491 100644
--- a/addons/base/static/src/js/views.js
+++ b/addons/base/static/src/js/views.js
@@ -113,8 +113,9 @@ openerp.base.ViewManager =  openerp.base.Controller.extend({
             this.searchview.stop();
         }
         this.searchview = new openerp.base.SearchView(this, this.session, this.element_id + "_search", this.dataset, view_id, search_defaults);
-        this.searchview.on_search.add(function() {
-            self.views[self.active_view].controller.do_search.apply(self, arguments);
+        this.searchview.on_search.add(function(domains, contexts, groupbys) {
+            self.views[self.active_view].controller.do_search.call(
+                self, domains.concat(self.domains()), contexts, groupbys);
         });
         return this.searchview.start();
     },
@@ -128,6 +129,15 @@ openerp.base.ViewManager =  openerp.base.Controller.extend({
     on_remove: function() {
     },
     on_edit: function() {
+    },
+    /**
+     * Domains added on searches by the view manager, to override in subsequent
+     * view manager in order to add new pieces of domains to searches
+     *
+     * @returns an empty list
+     */
+    domains: function () {
+        return [];
     }
 });
 
@@ -175,6 +185,14 @@ openerp.base.ViewManagerAction = openerp.base.ViewManager.extend({
             this.sidebar.stop();
         }
         this._super();
+    },
+    /**
+     * adds action domain to the search domains
+     *
+     * @returns the action's domain
+     */
+    domains: function () {
+        return [this.action.domain];
     }
 });
 

From ef9880931cb4284258ea2c07f846b6fba0b60794 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 12 Apr 2011 09:27:50 +0200
Subject: [PATCH 147/331] [FIX] add the action's context to the search contexts
 as well

bzr revid: xmo@openerp.com-20110412072750-8338yfl549glz5wz
---
 addons/base/static/src/js/views.js | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/addons/base/static/src/js/views.js b/addons/base/static/src/js/views.js
index e70495e3491..e4deb375a55 100644
--- a/addons/base/static/src/js/views.js
+++ b/addons/base/static/src/js/views.js
@@ -115,7 +115,8 @@ openerp.base.ViewManager =  openerp.base.Controller.extend({
         this.searchview = new openerp.base.SearchView(this, this.session, this.element_id + "_search", this.dataset, view_id, search_defaults);
         this.searchview.on_search.add(function(domains, contexts, groupbys) {
             self.views[self.active_view].controller.do_search.call(
-                self, domains.concat(self.domains()), contexts, groupbys);
+                self, domains.concat(self.domains()),
+                      contexts.concat(self.contexts()), groupbys);
         });
         return this.searchview.start();
     },
@@ -138,6 +139,14 @@ openerp.base.ViewManager =  openerp.base.Controller.extend({
      */
     domains: function () {
         return [];
+    },
+    /**
+     * Contexts added on searches by the view manager.
+     *
+     * @returns an empty list
+     */
+    contexts: function () {
+        return [];
     }
 });
 
@@ -193,6 +202,14 @@ openerp.base.ViewManagerAction = openerp.base.ViewManager.extend({
      */
     domains: function () {
         return [this.action.domain];
+    },
+    /**
+     * adds action context to the search contexts
+     *
+     * @returns the action's context
+     */
+    contexts: function () {
+        return [this.action.context];
     }
 });
 

From fa02db060dde1e1fd5fbf8dbc8a7c737e2870467 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 12 Apr 2011 09:45:29 +0200
Subject: [PATCH 148/331] [FIX] don't send a domain called 'false' if the
 action has no domain...

bzr revid: xmo@openerp.com-20110412074529-ganfpzhailq2k1zs
---
 addons/base/static/src/js/views.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/addons/base/static/src/js/views.js b/addons/base/static/src/js/views.js
index e4deb375a55..74e058c2c79 100644
--- a/addons/base/static/src/js/views.js
+++ b/addons/base/static/src/js/views.js
@@ -201,6 +201,9 @@ openerp.base.ViewManagerAction = openerp.base.ViewManager.extend({
      * @returns the action's domain
      */
     domains: function () {
+        if (!this.action.domain) {
+            return [];
+        }
         return [this.action.domain];
     },
     /**
@@ -209,6 +212,9 @@ openerp.base.ViewManagerAction = openerp.base.ViewManager.extend({
      * @returns the action's context
      */
     contexts: function () {
+        if (!this.action.context) {
+            return [];
+        }
         return [this.action.context];
     }
 });

From 40f26b7327f991fde5071bfc581adf62ba4b08ec Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 12 Apr 2011 09:50:37 +0200
Subject: [PATCH 149/331] [FIX] handling of search views when not provided with
 an id (still need to go and get a search view, just one with the id 'false'
 to get the default search view for the model)

bzr revid: xmo@openerp.com-20110412075037-6az2uudgp5ktfp8c
---
 addons/base/static/src/js/views.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/base/static/src/js/views.js b/addons/base/static/src/js/views.js
index 74e058c2c79..5e6e3d72745 100644
--- a/addons/base/static/src/js/views.js
+++ b/addons/base/static/src/js/views.js
@@ -168,8 +168,6 @@ openerp.base.ViewManagerAction = openerp.base.ViewManager.extend({
             this.sidebar.start();
         }
 
-        // init search view
-        var view_id = this.action.search_view_id ? this.action.search_view_id[0] || false : false;
         var search_defaults = {};
         _.each(this.action.context, function (value, key) {
             var match = /^search_default_(.*)$/.exec(key);
@@ -177,10 +175,12 @@ openerp.base.ViewManagerAction = openerp.base.ViewManager.extend({
                 search_defaults[match[1]] = value;
             }
         });
-        var searchview_loaded = null;
-        if (view_id) {
-            searchview_loaded = this.setup_search_view(view_id,search_defaults);
-        }
+
+        // init search view
+        var searchview_id = this.action.search_view_id && this.action.search_view_id[0];
+
+        var searchview_loaded = this.setup_search_view(
+                searchview_id || false, search_defaults);
 
         // schedule auto_search
         if (searchview_loaded != null && this.action['auto_search']) {

From 5d7dae6e6f48b5c29ab9a0e964c4fd2404b431f0 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 12 Apr 2011 10:20:28 +0200
Subject: [PATCH 150/331] [FIX] id fetching for deletion signal in list views

bzr revid: xmo@openerp.com-20110412082028-c3yfg1ay14xcrmfh
---
 addons/base/static/src/js/list.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/base/static/src/js/list.js b/addons/base/static/src/js/list.js
index e70b442cac0..7827bbad2a2 100644
--- a/addons/base/static/src/js/list.js
+++ b/addons/base/static/src/js/list.js
@@ -204,7 +204,7 @@ openerp.base.ListView = openerp.base.Controller.extend(
         // don't link to forms
         e.stopImmediatePropagation();
         this.dataset.unlink(
-            [this.rows[$(e.currentTarget).closest('tr').prevAll().length].id]);
+            [this.rows[$(e.currentTarget).closest('tr').prevAll().length].data.id.value]);
     },
     /**
      * Handles deletion of all selected lines
@@ -226,7 +226,7 @@ openerp.base.ListView = openerp.base.Controller.extend(
         var rows = this.rows;
         return this.$element.find('th.oe-record-selector input:checked')
                 .closest('tr').map(function () {
-            return rows[$(this).prevAll().length].id;
+            return rows[$(this).prevAll().length].data.id.value;
         }).get();
     }
 });

From 9f780dd615953b28fcc2d7f388f005daaf554b0e Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 12 Apr 2011 10:38:31 +0200
Subject: [PATCH 151/331] [FIX] form: use boolean attributes (readonly,
 required,...) from field too

bzr revid: fme@openerp.com-20110412083831-1a8e37ozysgrs6y1
---
 addons/base/static/src/js/form.js | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/addons/base/static/src/js/form.js b/addons/base/static/src/js/form.js
index ce6a203a52d..65cb5498c54 100644
--- a/addons/base/static/src/js/form.js
+++ b/addons/base/static/src/js/form.js
@@ -435,12 +435,12 @@ openerp.base.form.WidgetFrame = openerp.base.form.Widget.extend({
             }
         }
     },
-    handle_node: function(n) {
-        var type = this.view.fields_view.fields[n.attrs.name] || {};
-        var widget_type = n.attrs.widget || type.type || n.tag;
-        var widget = new (openerp.base.form.widgets.get_object(widget_type)) (this.view, n);
-        if (n.tag == 'field' && n.attrs.nolabel != '1') {
-            var label = new (openerp.base.form.widgets.get_object('label')) (this.view, n);
+    handle_node: function(node) {
+        var type = this.view.fields_view.fields[node.attrs.name] || {};
+        var widget_type = node.attrs.widget || type.type || node.tag;
+        var widget = new (openerp.base.form.widgets.get_object(widget_type)) (this.view, node);
+        if (node.tag == 'field' && node.attrs.nolabel != '1') {
+            var label = new (openerp.base.form.widgets.get_object('label')) (this.view, node);
             label["for"] = widget;
             this.add_widget(label);
         }
@@ -579,12 +579,13 @@ openerp.base.form.Field = openerp.base.form.Widget.extend({
         if (node.attrs.nolabel != '1' && this.colspan > 1) {
             this.colspan--;
         }
-        this.field = view.fields_view.fields[node.attrs.name];
+        this.field = view.fields_view.fields[node.attrs.name] || {};
         this.string = node.attrs.string || this.field.string;
         this.help = node.attrs.help || this.field.help;
-        this.nolabel = (node.attrs.nolabel == '1');
-        this.readonly = (node.attrs.readonly == '1');
-        this.required = (node.attrs.required == '1');
+        this.invisible = (this.invisible || this.field.invisible == '1');
+        this.nolabel = (this.field.nolabel || node.attrs.nolabel) == '1';
+        this.readonly = (this.field.readonly || node.attrs.readonly) == '1';
+        this.required = (this.field.required || node.attrs.required) == '1';
         this.invalid = false;
         this.touched = false;
     },

From 091f817b14ccb9fb0ca38a2b45fdf008ac33e53a Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 12 Apr 2011 11:07:16 +0200
Subject: [PATCH 152/331] [ADD] Add t-opentag="bool" attribute in order to
 force an empty tag to be opened (IE issue)

bzr revid: fme@openerp.com-20110412090716-s3jy1ct6pz3qfrvn
---
 addons/base/static/lib/qweb/qweb.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/addons/base/static/lib/qweb/qweb.js b/addons/base/static/lib/qweb/qweb.js
index 59bcd12ef9b..05dd9d65fe2 100644
--- a/addons/base/static/lib/qweb/qweb.js
+++ b/addons/base/static/lib/qweb/qweb.js
@@ -166,7 +166,9 @@ var QWeb = {
         for (var an in g_att) {
             att += " " + an + '="' + this.escape_att(g_att[an]) + '"';
         }
-        return inner.length ? "<" + e.tagName + att + ">" + inner + "</" + e.tagName + ">" : "<" + e.tagName + att + "/>";
+        // Some IE versions have problems with closed tags
+        var opentag = !!t_att['opentag'] && this.eval_bool(t_att["opentag"], v);
+        return inner.length || opentag ? "<" + e.tagName + att + ">" + inner + "</" + e.tagName + ">" : "<" + e.tagName + att + "/>";
     },
     render_att_att:function(e, t_att, g_att, v, ext, av) {
         if (ext) {

From e14997c7bcdd34b35e940dbb8123140edf40dd43 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 12 Apr 2011 11:10:36 +0200
Subject: [PATCH 153/331] [FIX] unit tests for list view following change in
 records topology

bzr revid: xmo@openerp.com-20110412091036-w7i9dnh7svqkpa3u
---
 addons/base/static/test/list.js | 38 +++++++++++++++++++++++++++------
 1 file changed, 32 insertions(+), 6 deletions(-)

diff --git a/addons/base/static/test/list.js b/addons/base/static/test/list.js
index 4a5bb3795fe..c0a34aa71be 100644
--- a/addons/base/static/test/list.js
+++ b/addons/base/static/test/list.js
@@ -24,7 +24,9 @@ $(document).ready(function () {
             openerp = window.openerp.init(true);
             window.openerp.base.chrome(openerp);
             // views loader stuff
+            window.openerp.base.data(openerp);
             window.openerp.base.views(openerp);
+            window.openerp.base.form(openerp);
             window.openerp.base.list(openerp);
         }
     });
@@ -36,7 +38,11 @@ $(document).ready(function () {
 
         listview.on_loaded(fvg);
 
-        listview.do_fill_table([{}, {}, {}]).then(function () {
+        listview.do_fill_table([
+                {data: {id: {value: null}}},
+                {data: {id: {value: null}}},
+                {data: {id: {value: null}}}
+        ]).then(function () {
             ok(are(listview.$element.find('tbody th'),
                    '.oe-record-selector'));
             ok(are(listview.$element.find('tbody th input'),
@@ -52,7 +58,11 @@ $(document).ready(function () {
 
         listview.on_loaded(fvg);
 
-        listview.do_fill_table([{}, {}, {}]).then(function () {
+        listview.do_fill_table([
+                {data: {id: {value: null}}},
+                {data: {id: {value: null}}},
+                {data: {id: {value: null}}}
+        ]).then(function () {
             equal(listview.$element.find('tbody th').length, 0);
             start();
         });
@@ -62,7 +72,11 @@ $(document).ready(function () {
                 {}, null, 'qunit-fixture', {model: null});
         listview.on_loaded(fvg);
 
-        listview.do_fill_table([{id: 1}, {id: 2}, {id: 3}]).then(function () {
+        listview.do_fill_table([
+                {data: {id: {value: 1}}},
+                {data: {id: {value: 2}}},
+                {data: {id: {value: 3}}}
+        ]).then(function () {
             listview.$element.find('tbody th input:eq(2)')
                              .attr('checked', true);
             deepEqual(listview.get_selection(), [3]);
@@ -78,7 +92,11 @@ $(document).ready(function () {
 
         listview.on_loaded(fvg);
 
-        listview.do_fill_table([{id: 1}, {id: 2}, {id: 3}]).then(function () {
+        listview.do_fill_table([
+                {data: {id: {value: null}}},
+                {data: {id: {value: null}}},
+                {data: {id: {value: null}}}
+        ]).then(function () {
             equal(
                 listview.$element.find('tbody tr td.oe-record-delete button').length,
                 3);
@@ -95,7 +113,11 @@ $(document).ready(function () {
 
         listview.on_loaded(fvg);
 
-        listview.do_fill_table([{id: 1}, {id: 2}, {id: 3}]).then(function () {
+        listview.do_fill_table([
+                {data: {id: {value: 1}}},
+                {data: {id: {value: 2}}},
+                {data: {id: {value: 3}}}
+        ]).then(function () {
             listview.$element.find('tbody td.oe-record-delete:eq(2) button').click();
             deepEqual(deleted, [3]);
             listview.$element.find('tbody td.oe-record-delete:eq(0) button').click();
@@ -112,7 +134,11 @@ $(document).ready(function () {
 
         listview.on_loaded(fvg);
 
-        listview.do_fill_table([{id: 1}, {id: 2}, {id: 3}]).then(function () {
+        listview.do_fill_table([
+                {data: {id: {value: 1}}},
+                {data: {id: {value: 2}}},
+                {data: {id: {value: 3}}}
+        ]).then(function () {
             listview.$element.find('tbody th input:eq(2)')
                              .attr('checked', true);
             listview.$element.find('tbody th input:eq(1)')

From cf91e73c54db777f9d6ba3754e2c81f589d9b463 Mon Sep 17 00:00:00 2001
From: "pso (OpenERP)" <pso@tinyerp.com>
Date: Tue, 12 Apr 2011 14:51:15 +0530
Subject: [PATCH 154/331] [FIX] hr_timesheet_invoice: Fixed bug of recreating
 invoice if invoice already exists

lp bug: https://launchpad.net/bugs/751269 fixed

bzr revid: pso@tinyerp.com-20110412092115-nz5zelrazbk3og7y
---
 .../wizard/hr_timesheet_invoice_create.py         | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
index 33c23140358..ee66cc045b0 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
@@ -47,6 +47,21 @@ class hr_timesheet_invoice_create(osv.osv_memory):
          'name': lambda *args: 1
     }
 
+    def view_init(self, cr, uid, fields, context=None):
+        """
+        This function checks for precondition before wizard executes
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param fields: List of fields for default value
+        @param context: A standard dictionary for contextual values
+        """
+        analytic_obj = self.pool.get('account.analytic.line')
+        data = context and context.get('active_ids', [])
+        for analytic in analytic_obj.browse(cr, uid, data, context=context):
+            if analytic.invoice_id:
+                     raise osv.except_osv(_('Warning !'), _("Invoice is already linked to some of the analytic line(s)!"))
+
     def do_create(self, cr, uid, ids, context=None):
         mod_obj = self.pool.get('ir.model.data')
         analytic_account_obj = self.pool.get('account.analytic.account')

From 5ed6be00fbf0aa5ee0afe0a6a61114433696b66b Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 12 Apr 2011 11:22:22 +0200
Subject: [PATCH 155/331] [IMP] basic styling cleanup for listview table

bzr revid: xmo@openerp.com-20110412092222-8htdqnzygqa3fsv6
---
 addons/base/static/src/css/base.css | 7 +++++++
 addons/base/static/src/js/list.js   | 4 ++--
 addons/base/static/src/xml/base.xml | 2 +-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/addons/base/static/src/css/base.css b/addons/base/static/src/css/base.css
index 7b686f53fb4..f6d8dac3bee 100644
--- a/addons/base/static/src/css/base.css
+++ b/addons/base/static/src/css/base.css
@@ -414,6 +414,13 @@ body.openerp {
     padding-left: 10px;
 }
 
+/* List */
+.openerp .oe-listview table {
+    clear: right;
+    width: 100%;
+    border-spacing: 0;
+    border-collapse: collapse;
+}
 
 /* Form */
 .openerp .required.error {
diff --git a/addons/base/static/src/js/list.js b/addons/base/static/src/js/list.js
index 7827bbad2a2..bbc69689851 100644
--- a/addons/base/static/src/js/list.js
+++ b/addons/base/static/src/js/list.js
@@ -35,7 +35,7 @@ openerp.base.ListView = openerp.base.Controller.extend(
         this.options = _.extend({}, this.defaults, options || {});
     },
     start: function() {
-        //this.log('Starting ListView '+this.model+this.view_id)
+        this.$element.addClass('oe-listview');
         return this.rpc("/base/listview/load", {"model": this.model, "view_id":this.view_id,
             toolbar:!!this.view_manager.sidebar}, this.on_loaded);
     },
@@ -119,7 +119,7 @@ openerp.base.ListView = openerp.base.Controller.extend(
         var PAGE_SIZE = 50,
             bodies_count = Math.ceil(this.rows.length / PAGE_SIZE),
             body = 0,
-            $body = $('<tbody>').appendTo($table);
+            $body = $('<tbody class="ui-widget-content">').appendTo($table);
 
         var rendered = $.Deferred();
         var render_body = function () {
diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml
index 7e2c5f9eec7..e0d51d105a7 100644
--- a/addons/base/static/src/xml/base.xml
+++ b/addons/base/static/src/xml/base.xml
@@ -175,7 +175,7 @@
     </table>
 </t>
 <t t-name="ListView.header">
-    <thead t-if="options.header">
+    <thead t-if="options.header" class="ui-widget-header">
         <tr t-if="options.selectable and options.deletable">
             <th t-att-colspan="visible_columns.length + 2">
                 <button type="button" id="oe-list-delete">

From 54cf1b688ee229218fc85c30107f1ced0bc635fc Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 12 Apr 2011 11:26:31 +0200
Subject: [PATCH 156/331] [ADD] Added progressbar widget

bzr revid: fme@openerp.com-20110412092631-dvyi1w223yfjm7ot
---
 addons/base/static/src/js/form.js   | 16 +++++++++++++++-
 addons/base/static/src/xml/base.xml |  3 +++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/addons/base/static/src/js/form.js b/addons/base/static/src/js/form.js
index 65cb5498c54..92bc44afd2b 100644
--- a/addons/base/static/src/js/form.js
+++ b/addons/base/static/src/js/form.js
@@ -765,6 +765,20 @@ openerp.base.form.FieldBoolean = openerp.base.form.Field.extend({
     }
 });
 
+openerp.base.form.FieldProgressBar = openerp.base.form.Field.extend({
+    init: function(view, node) {
+        this._super(view, node);
+        this.template = "FieldProgressBar";
+    },
+    start: function() {
+        this._super.apply(this, arguments);
+        this.$element.find('div').progressbar({
+            value: this.value,
+            disabled: this.readonly
+        });
+    }
+});
+
 openerp.base.form.FieldTextXml = openerp.base.form.Field.extend({
 // to replace view editor
 });
@@ -904,7 +918,7 @@ openerp.base.form.widgets = new openerp.base.Registry({
     'boolean' : 'openerp.base.form.FieldBoolean',
     'float' : 'openerp.base.form.FieldFloat',
     'integer': 'openerp.base.form.FieldFloat',
-    'progressbar': 'openerp.base.form.FieldFloat',
+    'progressbar': 'openerp.base.form.FieldProgressBar',
     'float_time': 'openerp.base.form.FieldFloat'
 });
 
diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml
index 9f5d45742f3..4c8e0d07f36 100644
--- a/addons/base/static/src/xml/base.xml
+++ b/addons/base/static/src/xml/base.xml
@@ -360,6 +360,9 @@
         t-att-id="widget.element_id + '_field'"
         t-att-class="'field_' + widget.type"/>
 </t>
+<t t-name="FieldProgressBar">
+    <div t-opentag="true"></div>
+</t>
 <t t-name="WidgetButton">
     <button type="button"
         t-att-id="widget.element_id + '_button'"

From c041d91db4764baadc82c77e61f7c9c9b27c2b42 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 12 Apr 2011 11:27:15 +0200
Subject: [PATCH 157/331] [IMP] fix styling for action buttons in list view

bzr revid: xmo@openerp.com-20110412092715-6sgdg51es8a4hpwz
---
 addons/base/static/src/css/base.css | 9 +++++++++
 addons/base/static/src/xml/base.xml | 3 ++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/addons/base/static/src/css/base.css b/addons/base/static/src/css/base.css
index f6d8dac3bee..2b70396335a 100644
--- a/addons/base/static/src/css/base.css
+++ b/addons/base/static/src/css/base.css
@@ -422,6 +422,15 @@ body.openerp {
     border-collapse: collapse;
 }
 
+.openerp .oe-listview .oe-field-cell button {
+    padding: 0;
+    border: none;
+    background: none;
+}
+.openerp .oe-listview .oe-field-cell button:active {
+    opacity: 0.5;
+}
+
 /* Form */
 .openerp .required.error {
     border: 1px solid #900;
diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml
index e0d51d105a7..4e7dc44660b 100644
--- a/addons/base/static/src/xml/base.xml
+++ b/addons/base/static/src/xml/base.xml
@@ -210,7 +210,8 @@
     </th>
     <t t-foreach="columns" t-as="column">
         <t t-set="attrs" t-value="column.attrs_for(row.data)"/>
-        <td t-if="column.invisible !== '1'" t-att-title="column.help">
+        <td t-if="column.invisible !== '1'" t-att-title="column.help"
+            class="oe-field-cell">
             <t t-if="!attrs.invisible">
                 <t t-set="is_button" t-value="column.tag === 'button'"/>
                 <!-- TODO: get correct widget from form -->

From b659e93b4599e0a8b41841230835f8324f188ccd Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 12 Apr 2011 11:41:57 +0200
Subject: [PATCH 158/331] [IMP] Imrpoved progress bar styling

bzr revid: fme@openerp.com-20110412094157-sj89b1hchgqopzvf
---
 addons/base/static/src/css/base.css | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/addons/base/static/src/css/base.css b/addons/base/static/src/css/base.css
index 2f4aa0b3faf..dde45195c6e 100644
--- a/addons/base/static/src/css/base.css
+++ b/addons/base/static/src/css/base.css
@@ -521,6 +521,20 @@ body.openerp {
 .openerp .ui-widget {
     font-size: 1em;
 }
+.openerp .oe_form_field_progressbar .ui-progressbar {
+    height: 22px;
+    font-size: 10px;
+    -moz-box-sizing: border-box;
+    -webkit-box-sizing: border-box;
+    -ms-box-sizing: border-box;
+    box-sizing: border-box;
+    border: 1px solid #999;
+    -moz-border-radius: 3px;
+    -webkit-border-radius: 3px;
+    border-radius: 3px;
+    background: white;
+    min-width: 90px;
+}
 
 /* Sidebar */
 .openerp .view-manager-main-table {

From 4453dbd483cf4700eeab0f21791f14a647681ca2 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 12 Apr 2011 11:58:39 +0200
Subject: [PATCH 159/331] [ADD] striping of data tables in list view

bzr revid: xmo@openerp.com-20110412095839-y5su1rq6f0oueg4y
---
 addons/base/static/src/css/base.css | 4 ++++
 addons/base/static/src/xml/base.xml | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/addons/base/static/src/css/base.css b/addons/base/static/src/css/base.css
index 2b70396335a..19d18056ec8 100644
--- a/addons/base/static/src/css/base.css
+++ b/addons/base/static/src/css/base.css
@@ -422,6 +422,10 @@ body.openerp {
     border-collapse: collapse;
 }
 
+.openerp .oe-listview tr.odd {
+    background-color: #f3f3f3;
+}
+
 .openerp .oe-listview .oe-field-cell button {
     padding: 0;
     border: none;
diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml
index 4e7dc44660b..97f656378bf 100644
--- a/addons/base/static/src/xml/base.xml
+++ b/addons/base/static/src/xml/base.xml
@@ -204,7 +204,8 @@
         </t-if>
     </t>
 </t>
-<tr t-name="ListView.row" t-att-style="style">
+<tr t-name="ListView.row" t-att-style="style"
+    t-att-class="row_parity">
     <th t-if="options.selectable" class="oe-record-selector">
         <input type="checkbox"/>
     </th>

From 40df0de32defcc6309dc34269d79000699af6f78 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 12 Apr 2011 12:37:27 +0200
Subject: [PATCH 160/331] [ADD] ROUNDED CORNERS!!!!!!!!!

bzr revid: xmo@openerp.com-20110412103727-rhx1jww4084e2eze
---
 addons/base/static/src/css/base.css | 34 ++++++++++++++++++++++++++++-
 addons/base/static/src/xml/base.xml |  2 +-
 2 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/addons/base/static/src/css/base.css b/addons/base/static/src/css/base.css
index 19d18056ec8..eebf8a54a00 100644
--- a/addons/base/static/src/css/base.css
+++ b/addons/base/static/src/css/base.css
@@ -419,7 +419,7 @@ body.openerp {
     clear: right;
     width: 100%;
     border-spacing: 0;
-    border-collapse: collapse;
+    border: 1px solid silver;
 }
 
 .openerp .oe-listview tr.odd {
@@ -435,6 +435,38 @@ body.openerp {
     opacity: 0.5;
 }
 
+/** list rounded corners
+
+    rounded corners are a pain on tables: need to round not only table, but
+    also on the first and last children of the first and last row
+ */
+.openerp .oe-listview table {
+    -webkit-border-radius: 7px;
+    -moz-border-radius: 7px;
+    border-radius: 7px;
+}
+.openerp .oe-listview table thead tr:first-child th:first-child {
+    -webkit-border-top-left-radius: 7px;
+    -moz-border-radius-topleft: 7px;
+    border-top-left-radius: 7px;
+}
+.openerp .oe-listview table thead tr:first-child th:last-child {
+    -webkit-border-top-right-radius: 7px;
+    -moz-border-radius-topright: 7px;
+    border-top-right-radius: 7px;
+}
+.openerp .oe-listview table tbody tr:last-child th:first-child {
+    -webkit-border-bottom-left-radius: 7px;
+    -moz-border-radius-bottomleft: 7px;
+    border-bottom-left-radius: 7px;
+}
+.openerp .oe-listview table tbody tr:last-child td:last-child {
+    -webkit-border-bottom-right-radius: 7px;
+    -moz-border-radius-bottomright: 7px;
+    border-bottom-right-radius: 7px;
+}
+
+
 /* Form */
 .openerp .required.error {
     border: 1px solid #900;
diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml
index 97f656378bf..650c26c46eb 100644
--- a/addons/base/static/src/xml/base.xml
+++ b/addons/base/static/src/xml/base.xml
@@ -170,7 +170,7 @@
             <button type="button" data-pager-action="last">Last</button>
         </div>
     </div>
-    <table>
+    <table cellspacing="0">
         <t t-call="ListView.header"/>
     </table>
 </t>

From 1755727dd3ecd0758795e3b3b6f4ab9b0b3c115c Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 12 Apr 2011 12:46:59 +0200
Subject: [PATCH 161/331] [FIX] no need for cellspacing

bzr revid: xmo@openerp.com-20110412104659-3vp3w2pjq3xfx664
---
 addons/base/static/src/xml/base.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml
index 650c26c46eb..97f656378bf 100644
--- a/addons/base/static/src/xml/base.xml
+++ b/addons/base/static/src/xml/base.xml
@@ -170,7 +170,7 @@
             <button type="button" data-pager-action="last">Last</button>
         </div>
     </div>
-    <table cellspacing="0">
+    <table>
         <t t-call="ListView.header"/>
     </table>
 </t>

From 4e1b38312e6a97522051a4c8548bb480bff480a8 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 12 Apr 2011 13:07:03 +0200
Subject: [PATCH 162/331] [IMP] highlight rows on hover

bzr revid: xmo@openerp.com-20110412110703-3chpip0vrcdwg1s3
---
 addons/base/static/src/css/base.css | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/addons/base/static/src/css/base.css b/addons/base/static/src/css/base.css
index eebf8a54a00..535d152839f 100644
--- a/addons/base/static/src/css/base.css
+++ b/addons/base/static/src/css/base.css
@@ -425,6 +425,12 @@ body.openerp {
 .openerp .oe-listview tr.odd {
     background-color: #f3f3f3;
 }
+.openerp .oe-listview tbody tr:hover {
+    background-color: #ecebf2;
+}
+.openerp .oe-listview tbody tr:hover {
+    background-color: #eae9f0;
+}
 
 .openerp .oe-listview .oe-field-cell button {
     padding: 0;

From e4636f1e7e71666c28ebb9aa4aad5e545c1411dc Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 12 Apr 2011 13:14:56 +0200
Subject: [PATCH 163/331] [IMP] Css improvements for sidebar.

bzr revid: nicolas.vanhoren@openerp.com-20110412111456-zms7v8qapa2f1r50
---
 addons/base/static/src/css/base.css        |  28 ++++++++++++++
 addons/base/static/src/img/toggle-a-bg.png | Bin 0 -> 412 bytes
 addons/base/static/src/js/views.js         |   5 +++
 addons/base/static/src/xml/base.xml        |  41 ++++++++++++---------
 4 files changed, 56 insertions(+), 18 deletions(-)
 create mode 100644 addons/base/static/src/img/toggle-a-bg.png

diff --git a/addons/base/static/src/css/base.css b/addons/base/static/src/css/base.css
index dde45195c6e..b7a9d6c7d60 100644
--- a/addons/base/static/src/css/base.css
+++ b/addons/base/static/src/css/base.css
@@ -559,6 +559,10 @@ body.openerp {
 }
 
 .openerp .sidebar-main-div {
+    height:100%;
+}
+
+.openerp .sidebar-sub-div {
     padding:0;
     margin:0;
     width:180px;
@@ -570,6 +574,14 @@ body.openerp {
     font-size: 0.9em;
 }
 
+.openerp .closed-sidebar .sidebar-sub-div {
+    width:22px;
+}
+
+.openerp .closed-sidebar .sidebar-displaying-div {
+    display:none;
+}
+
 .openerp .sidebar-main-div a {
     color: #555;
     text-decoration: none;
@@ -609,3 +621,19 @@ body.openerp {
     padding: 3px 3px 3px 10px;
 }
 
+.openerp .toggle-sidebar {
+    border-color: #D2CFCF;
+    border-style: solid;
+    border-width: 1px;
+    display: block;
+    background: url(../img/toggle-a-bg.png);
+    width: 21px;
+    height: 21px;
+    position: absolute;
+    z-index: 10;
+}
+.openerp .open-sidebar .toggle-sidebar {
+    margin-left: 158px;
+    background-position: 21px 0;
+}
+
diff --git a/addons/base/static/src/img/toggle-a-bg.png b/addons/base/static/src/img/toggle-a-bg.png
new file mode 100644
index 0000000000000000000000000000000000000000..b9837ab233e5ef387e09fc655e8fc81d8bea286f
GIT binary patch
literal 412
zcmV;N0b~A&P)<h;3K|Lk000e1NJLTq001fg000&U0{{R3fu;Vx0001)P)t-skB^W0
z`ug_v_S)Loj*gDb&d&Mx_|?_b{QLX%^YifV@c#Y%<mBX%l9H{ht-Zay$H&K%l$6`s
z+xhqR`1bbn^YilZ^5Nm(mzS6K_4WGr_@<_&x3;#jva;FO*s!p$udlC|n3$fPp6u-G
z`}_O+{QUj>{r&v>`uh6%`T6+x`1SMi?d$9G^78ie_4oJp@$c{c{{H{}{}P0$7XSbN
zzDYzuRCwCO$~O|iKmbEg**K6fIVa<|1OxX!91JUl0u^+;PJe{^&;EbCse04bpP{9y
zjL1}#5qW00>#(^Ua4-(G&2a5zgfzES{c(36a4-h@?zq3o3H9`)4Zr5qQesS>$w!+5
z_2ebOq1Txt#F$Jvy#pc+IE582&1_fDJMLy?85abnw5ISwZ^Oa3@j@TdlHeGtFm6)0
z95SM;K1@Y2qPz$)VsZS|kP*RIkP*YHAR|U6K}O84f{YJy6qvEHn2#p_0000<MNUMn
GLSTaJLhd^N

literal 0
HcmV?d00001

diff --git a/addons/base/static/src/js/views.js b/addons/base/static/src/js/views.js
index 12935c72132..5ec7906394e 100644
--- a/addons/base/static/src/js/views.js
+++ b/addons/base/static/src/js/views.js
@@ -199,6 +199,11 @@ openerp.base.Sidebar = openerp.base.BaseWidget.extend({
     refresh: function() {
         this.$element.html(QWeb.render("ViewManager.sidebar.internal", _.extend({_:_}, this)));
         var self = this;
+        this.$element.find(".toggle-sidebar").click(function(e) {
+            self.$element.toggleClass('open-sidebar closed-sidebar');
+            e.stopPropagation();
+            e.preventDefault();
+        });
         this.$element.find("a").click(function(e) {
             var $this = jQuery(this);
             var i = $this.attr("data-i");
diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml
index 4c8e0d07f36..391a26f45de 100644
--- a/addons/base/static/src/xml/base.xml
+++ b/addons/base/static/src/xml/base.xml
@@ -525,28 +525,33 @@
     <input t-att-id="element_id"/>
 </t>
 <t t-name="ViewManager.sidebar">
-    <div t-att-id="element_id" class="sidebar-main-div">
+    <div t-att-id="element_id" class="sidebar-main-div open-sidebar">
 
     </div>
 </t>
 <t t-name="ViewManager.sidebar.internal">
-    <t t-if="sections.length &gt; 0 &amp;&amp; _.detect(sections, function(x) {return x.elements.length &gt; 0;}) != undefined">
-    <div t-att-id="element_id" class="sidebar-sub-div">
-        <t t-set="i" t-value="0"/>
-        <t t-foreach="sections" t-as="section">
-        <t t-if="section.elements.length &gt; 0">
-        <h2><t t-esc="section.label"/></h2>
-        <ul>
-            <t t-set="j" t-value="0"/>
-            <t t-foreach="section.elements" t-as="element">
-                <li><a t-att-data-i="i" t-att-data-j="j" href="#"><t t-esc="element.name"/></a></li>
-                <t t-set="j" t-value="j+1"/>
-            </t>
-        </ul>
-        </t>
-        <t t-set="i" t-value="i+1"/>
-        </t>
-    </div>
+    <t t-set="the_condition" t-value="sections.length &gt; 0 &amp;&amp; _.detect(sections, function(x)
+        {return x.elements.length &gt; 0;}) != undefined"/>
+    <t t-if="the_condition">
+        <a class="toggle-sidebar"></a>
+        <div t-att-id="element_id" class="sidebar-sub-div">
+            <div class="sidebar-displaying-div">
+                <t t-set="i" t-value="0"/>
+                <t t-foreach="sections" t-as="section">
+                    <t t-if="section.elements.length &gt; 0">
+                    <h2><t t-esc="section.label"/></h2>
+                    <ul>
+                        <t t-set="j" t-value="0"/>
+                        <t t-foreach="section.elements" t-as="element">
+                            <li><a t-att-data-i="i" t-att-data-j="j" href="#"><t t-esc="element.name"/></a></li>
+                            <t t-set="j" t-value="j+1"/>
+                        </t>
+                    </ul>
+                    </t>
+                    <t t-set="i" t-value="i+1"/>
+                </t>
+            </div>
+        </div>
     </t>
 </t>
 <t t-name="DialogWarning">

From 5c5542e179e5a35bc91720b993e5edb5c973ee46 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 12 Apr 2011 13:17:12 +0200
Subject: [PATCH 164/331] [IMP] merge pager into list table header, remove
 template call between table and table.header

bzr revid: xmo@openerp.com-20110412111712-j3ma06fcec7rhi47
---
 addons/base/static/src/css/base.css |  7 +++++
 addons/base/static/src/xml/base.xml | 47 ++++++++++++-----------------
 2 files changed, 26 insertions(+), 28 deletions(-)

diff --git a/addons/base/static/src/css/base.css b/addons/base/static/src/css/base.css
index 535d152839f..ee15d02f3f7 100644
--- a/addons/base/static/src/css/base.css
+++ b/addons/base/static/src/css/base.css
@@ -441,6 +441,13 @@ body.openerp {
     opacity: 0.5;
 }
 
+.openerp .oe-listview th.oe-actions {
+    text-align: left;
+}
+.openerp .oe-listview th.oe-list-pager {
+    text-align: right;
+}
+
 /** list rounded corners
 
     rounded corners are a pain on tables: need to round not only table, but
diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml
index 97f656378bf..607260018d4 100644
--- a/addons/base/static/src/xml/base.xml
+++ b/addons/base/static/src/xml/base.xml
@@ -152,38 +152,29 @@
 	</tr>
     </table>
 </t>
-<t t-name="ListView">
-    <!--
-    <h3><t t-esc="fields_view.arch['@string']"/></h3>
-    -->
-    <div class="oe_list_header">
-        <div class="oe_list_buttons">
-            <!--<button type="button" class="oe_list_button_new">New</button>-->
-        </div>
-        <div class="oe_list_pager">
-            <button type="button" data-pager-action="first">First</button>
-            <button type="button" data-pager-action="previous">&lt;&lt;</button>
-
-            <span class="oe_pager_index">0</span> / <span class="oe_pager_count">0</span>
-
-            <button type="button" data-pager-action="next">&gt;&gt;</button>
-            <button type="button" data-pager-action="last">Last</button>
-        </div>
-    </div>
-    <table>
-        <t t-call="ListView.header"/>
-    </table>
-</t>
-<t t-name="ListView.header">
-    <thead t-if="options.header" class="ui-widget-header">
+<table t-name="ListView">
+    <thead class="ui-widget-header">
         <tr t-if="options.selectable and options.deletable">
-            <th t-att-colspan="visible_columns.length + 2">
+            <th t-att-colspan="Math.floor((visible_columns.length + 2) / 2)"
+                class="oe-actions">
                 <button type="button" id="oe-list-delete">
-                    Delete Selected
+                    Delete
                 </button>
             </th>
+            <th t-att-colspan="Math.ceil((visible_columns.length + 2) / 2)"
+                class="oe-list-pager">
+                <button type="button" data-pager-action="first">First</button>
+                <button type="button" data-pager-action="previous"
+                        >&lt;&lt;</button>
+
+                <span class="oe-pager-index">1</span>
+                / <span class="oe-pager-count">1</span>
+
+                <button type="button" data-pager-action="next">&gt;&gt;</button>
+                <button type="button" data-pager-action="last">Last</button>
+            </th>
         </tr>
-        <tr>
+        <tr t-if="options.header">
             <th t-if="options.selectable"/>
             <t t-foreach="columns" t-as="column">
                 <th t-if="column.invisible !== '1'">
@@ -195,7 +186,7 @@
             <th t-if="options.deletable"/>
         </tr>
     </thead>
-</t>
+</table>
 <t t-name="ListView.rows" t-foreach="rows" t-as="row">
     <t t-call="ListView.row">
         <t t-set="style" t-value="null"/>

From 2d38e2c95ab2816d1acba461e366ee016fd62257 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 12 Apr 2011 14:02:58 +0200
Subject: [PATCH 165/331] [IMP] Improved notebook styling

bzr revid: fme@openerp.com-20110412120258-yz96u0r3qdoy1z26
---
 addons/base/static/src/css/base.css | 29 +++++++++++++++++++++++++++++
 addons/base/static/src/js/form.js   |  1 +
 2 files changed, 30 insertions(+)

diff --git a/addons/base/static/src/css/base.css b/addons/base/static/src/css/base.css
index b7a9d6c7d60..c4915764e74 100644
--- a/addons/base/static/src/css/base.css
+++ b/addons/base/static/src/css/base.css
@@ -341,6 +341,9 @@ body.openerp {
 }
 
 .openerp h2.oe_view_title {
+    font-size: 175%;
+    font-weight: normal;
+    font-family: Ubuntu, Helvetica, sans-serif;
     margin: 2px 0;
     color: #252424;
     text-shadow: white 0 1px 0;
@@ -440,6 +443,32 @@ body.openerp {
     padding-left: 10px;
 }
 
+/* Notebook */
+.openerp .oe_form_notebook {
+    padding: 0px;
+    background: none;
+    border-width: 0px;
+}
+.openerp .oe_form_notebook ul.ui-tabs-nav {
+    padding-left: 0px;
+    background: transparent;
+    border-width: 0px 0px 1px 0px;
+    border-radius: 0px;
+    -moz-border-radius: 0px;
+    -webkit-border-radius: 0px;
+    line-height: 0.5em;
+}
+.openerp .oe_form_notebook ul.ui-tabs-nav li {
+    font-weight: bold;
+}
+.openerp .oe_form_notebook .ui-tabs-panel {
+    background: #f9f9f9;
+    border-width: 0px 1px 1px 1px;
+}
+.openerp .oe_form_notebook .ui-tabs-selected {
+    background: #f9f9f9;
+}
+
 
 /* Form */
 .openerp .required.error {
diff --git a/addons/base/static/src/js/form.js b/addons/base/static/src/js/form.js
index 92bc44afd2b..5338e9f9335 100644
--- a/addons/base/static/src/js/form.js
+++ b/addons/base/static/src/js/form.js
@@ -907,6 +907,7 @@ openerp.base.form.widgets = new openerp.base.Registry({
     'email' : 'openerp.base.form.FieldEmail',
     'url' : 'openerp.base.form.FieldUrl',
     'text' : 'openerp.base.form.FieldText',
+    'text_wiki' : 'openerp.base.form.FieldText',
     'date' : 'openerp.base.form.FieldDate',
     'datetime' : 'openerp.base.form.FieldDatetime',
     'selection' : 'openerp.base.form.FieldSelection',

From ce82767d166f9138ac3e98b5683564995c08701d Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 12 Apr 2011 14:13:05 +0200
Subject: [PATCH 166/331] [FIX] eval_context and eval_domain should *not*
 modify the dicts they're given (without cloning them), especially since
 they're creating circular references (which blow up when they're serialized
 by simplejson)

bzr revid: xmo@openerp.com-20110412121305-mq6l9a4co5xxrfkz
---
 openerpweb/openerpweb.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/openerpweb/openerpweb.py b/openerpweb/openerpweb.py
index 6a4d4146280..8423dc878ab 100644
--- a/openerpweb/openerpweb.py
+++ b/openerpweb/openerpweb.py
@@ -196,7 +196,7 @@ class OpenERPSession(object):
         if isinstance(context_to_eval, dict):
             return context_to_eval
 
-        ctx = context or {}
+        ctx = dict(context or {})
         ctx['context'] = ctx
 
         # if the domain was unpacked from JSON, it needs the current
@@ -252,7 +252,7 @@ class OpenERPSession(object):
         if isinstance(domain, list):
             return domain
 
-        ctx = context or {}
+        ctx = dict(context or {})
         ctx['context'] = ctx
 
         # if the domain was unpacked from JSON, it needs the current

From 7bb7044087993d185e06c931cdd8e11f29c7ae3d Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 12 Apr 2011 14:24:02 +0200
Subject: [PATCH 167/331] [IMP] toggle delete button on select/unselect rows

bzr revid: xmo@openerp.com-20110412122402-dz53832cx0me8re2
---
 addons/base/static/src/js/list.js | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/addons/base/static/src/js/list.js b/addons/base/static/src/js/list.js
index bbc69689851..4efd7ac84cf 100644
--- a/addons/base/static/src/js/list.js
+++ b/addons/base/static/src/js/list.js
@@ -73,20 +73,29 @@ openerp.base.ListView = openerp.base.Controller.extend(
         this.$element.html(QWeb.render("ListView", this));
 
         // Head hook
-        this.$element.find('#oe-list-delete').click(this.do_delete_selected);
+        this.$element.find('#oe-list-delete')
+                .hide()
+                .click(this.do_delete_selected);
 
+        var $table = this.$element.find('table');
         // Cell events
-        this.$element.find('table').delegate(
-                'th.oe-record-selector', 'click', function (e) {
-                    // A click in the selection cell should not activate the
-                    // linking feature
-                    e.stopImmediatePropagation();
+        $table.delegate(
+            'th.oe-record-selector', 'click', function (e) {
+                // TODO: ~linear performances, would a simple counter work?
+                if ($table.find('th.oe-record-selector input:checked').length) {
+                    $table.find('#oe-list-delete').show();
+                } else {
+                    $table.find('#oe-list-delete').hide();
+                }
+                // A click in the selection cell should not activate the
+                // linking feature
+                e.stopImmediatePropagation();
         });
-        this.$element.find('table').delegate(
+        $table.delegate(
                 'td.oe-record-delete button', 'click', this.do_delete);
 
         // Global rows handlers
-        this.$element.find('table').delegate(
+        $table.delegate(
                 'tr', 'click', this.on_select_row);
 
         // sidebar stuff

From 8c7a9712e1648fb69526dbe75771c85ecf42d4b5 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 12 Apr 2011 14:25:59 +0200
Subject: [PATCH 168/331] [IMP] Improved visual aspect.

bzr revid: nicolas.vanhoren@openerp.com-20110412122559-ebyjs30uo4gicpap
---
 addons/base/static/src/js/chrome.js | 4 ++++
 addons/base/static/src/xml/base.xml | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/addons/base/static/src/js/chrome.js b/addons/base/static/src/js/chrome.js
index ec6462cac30..bbfe37661cf 100644
--- a/addons/base/static/src/js/chrome.js
+++ b/addons/base/static/src/js/chrome.js
@@ -780,6 +780,10 @@ openerp.base.Header =  openerp.base.Controller.extend({
         this.do_update();
     },
     do_update: function() {
+        if(jQuery.param != undefined &&
+                jQuery.deparam(jQuery.param.querystring()).kitten != undefined) {
+            this.kitten = 1;
+        }
         this.$element.html(QWeb.render("Header", this));
     }
 });
diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml
index 391a26f45de..4554ff5f56a 100644
--- a/addons/base/static/src/xml/base.xml
+++ b/addons/base/static/src/xml/base.xml
@@ -60,7 +60,8 @@
 </t>
 <t t-name="Header">
     <a href="/" class="company_logo_link">
-        <img src="/base/static/src/img/logo.png" border="0" class="company_logo"/>
+        <img t-att-src="typeof kitten == 'undefined' ? '/base/static/src/img/logo.png' :
+            'http://placekitten.com/180/46'" border="0" class="company_logo"/>
     </a>
     <h1 class="header_title" t-if="session.session_is_valid()">
         <span class="company">$company</span> - (<span class="database">$database</span>)<br/>

From 6c9886700e5e413998bc33348dc0e8022aa1752a Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 12 Apr 2011 14:34:07 +0200
Subject: [PATCH 169/331] [ADD] trivial implementation of pager

bzr revid: xmo@openerp.com-20110412123407-dl1udbc3vfatb0h6
---
 addons/base/static/src/js/list.js   | 8 +++++++-
 addons/base/static/src/xml/base.xml | 5 +++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/addons/base/static/src/js/list.js b/addons/base/static/src/js/list.js
index 4efd7ac84cf..749f2d18110 100644
--- a/addons/base/static/src/js/list.js
+++ b/addons/base/static/src/js/list.js
@@ -110,12 +110,18 @@ openerp.base.ListView = openerp.base.Controller.extend(
      * @returns {Promise} promise to the end of view rendering (list views are asynchronously filled for improved responsiveness)
      */
     do_fill_table: function(records) {
+        var $table = this.$element.find('table');
         this.rows = records;
         this.dataset.ids = _(records).chain().map(function (record) {
             return record.data.id.value;
         }).value();
 
-        var $table = this.$element.find('table');
+        // TODO: offset, length, count
+        var results = this.rows.length;
+        $table.find('.oe-pager-last').text(results);
+        $table.find('.oe-pager-total').text(results);
+
+
         // remove all data lines
         var $old_body = $table.find('tbody');
 
diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml
index 607260018d4..72fe973f1c9 100644
--- a/addons/base/static/src/xml/base.xml
+++ b/addons/base/static/src/xml/base.xml
@@ -167,8 +167,9 @@
                 <button type="button" data-pager-action="previous"
                         >&lt;&lt;</button>
 
-                <span class="oe-pager-index">1</span>
-                / <span class="oe-pager-count">1</span>
+                <span class="oe-pager-first">1</span>
+                to <span class="oe-pager-last">1</span>
+                of <span class="oe-pager-total">1</span>
 
                 <button type="button" data-pager-action="next">&gt;&gt;</button>
                 <button type="button" data-pager-action="last">Last</button>

From 98ed2622015bf39adea4b1c75625216fea97a563 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 12 Apr 2011 14:40:14 +0200
Subject: [PATCH 170/331] [IMP] Changed text colors

bzr revid: fme@openerp.com-20110412124014-s6b3i6gf1h6ke180
---
 addons/base/static/src/css/base.css | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/addons/base/static/src/css/base.css b/addons/base/static/src/css/base.css
index c4915764e74..963095e70f0 100644
--- a/addons/base/static/src/css/base.css
+++ b/addons/base/static/src/css/base.css
@@ -471,6 +471,10 @@ body.openerp {
 
 
 /* Form */
+.openerp table.oe_frame td {
+    color: #4c4c4c;
+    font-weight: 80%;
+}
 .openerp .required.error {
     border: 1px solid #900;
 }
@@ -510,11 +514,13 @@ body.openerp {
     border-radius: 3px;
     background: white;
     min-width: 90px;
+    color: #1f1f1f;
 }
 .openerp input[type="text"], .openerp input[type="password"], .openerp select, .openerp .button {
     height: 22px;
 }
 .openerp .button {
+    color: #4c4c4c;
     white-space: nowrap;
 }
 .openerp .button span {

From b840e25c1d901f0d83c41eef38ada73e8d61bd7b Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 12 Apr 2011 15:02:29 +0200
Subject: [PATCH 171/331] [ADD] basic handling of addition button, not hooked
 in yet

bzr revid: xmo@openerp.com-20110412130229-78sg833pdcbi1gx3
---
 addons/base/static/src/js/list.js   | 41 ++++++++++++++++++++++++-----
 addons/base/static/src/xml/base.xml | 15 ++++++++---
 2 files changed, 45 insertions(+), 11 deletions(-)

diff --git a/addons/base/static/src/js/list.js b/addons/base/static/src/js/list.js
index 749f2d18110..8d4a1cce360 100644
--- a/addons/base/static/src/js/list.js
+++ b/addons/base/static/src/js/list.js
@@ -8,7 +8,9 @@ openerp.base.ListView = openerp.base.Controller.extend(
         // list rows can be deleted
         'deletable': true,
         // whether the column headers should be displayed
-        'header': true
+        'header': true,
+        // display addition button, with that label
+        'addable': "New"
     },
     /**
      * @constructs
@@ -21,6 +23,7 @@ openerp.base.ListView = openerp.base.Controller.extend(
      * @param {Boolean} [options.selectable=true] determines whether view rows are selectable (e.g. via a checkbox)
      * @param {Boolean} [options.header=true] should the list's header be displayed
      * @param {Boolean} [options.deletable=true] are the list rows deletable
+     * @param {null|String} [options.addable="New"] should the new-record button be displayed, and what should its label be. Use ``null`` to hide the button.
      */
     init: function(view_manager, session, element_id, dataset, view_id, options) {
         this._super(session, element_id);
@@ -73,6 +76,7 @@ openerp.base.ListView = openerp.base.Controller.extend(
         this.$element.html(QWeb.render("ListView", this));
 
         // Head hook
+        this.$element.find('#oe-list-add').click(this.do_add_record);
         this.$element.find('#oe-list-delete')
                 .hide()
                 .click(this.do_delete_selected);
@@ -159,6 +163,23 @@ openerp.base.ListView = openerp.base.Controller.extend(
             $old_body.remove();
         });
     },
+    /**
+     * Asks the view manager to switch to a different view, using the provided
+     * record index (within the current dataset).
+     *
+     * If the index is null, ``switch_to_record`` asks for the creation of a
+     * new record.
+     *
+     * @param {Number|null} index the record index (in the current dataset) to switch to
+     * @param {String} [view="form"] the view to switch to
+     */
+    switch_to_record:function (index, view) {
+        view = view || 'form';
+        this.dataset.index = index;
+        _.delay(_.bind(function () {
+            this.view_manager.on_mode_switch(view);
+        }, this));
+    },
     on_select_row: function (event) {
         var $target = $(event.currentTarget);
         if (!$target.parent().is('tbody')) {
@@ -171,12 +192,8 @@ openerp.base.ListView = openerp.base.Controller.extend(
         if (index == undefined || index === -1) {
             return;
         }
-        this.dataset.index = index;
-        _.delay(_.bind(function () {
-            this.view_manager.on_mode_switch('form');
-        }, this));
-
-    },
+            this.switch_to_record(index);
+        },
     do_show: function () {
         // TODO: re-trigger search
         this.$element.show();
@@ -221,6 +238,16 @@ openerp.base.ListView = openerp.base.Controller.extend(
         this.dataset.unlink(
             [this.rows[$(e.currentTarget).closest('tr').prevAll().length].data.id.value]);
     },
+    /**
+     * Handles signal for the addition of a new record (can be a creation,
+     * can be the addition from a remote source, ...)
+     *
+     * The default implementation is to switch to a new record on the form view
+     */
+    do_add_record: function () {
+        this.notification['default']('Add', "New record");
+        // this.switch_to_record(null);
+    },
     /**
      * Handles deletion of all selected lines
      */
diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml
index 72fe973f1c9..7586f62eff7 100644
--- a/addons/base/static/src/xml/base.xml
+++ b/addons/base/static/src/xml/base.xml
@@ -153,15 +153,22 @@
     </table>
 </t>
 <table t-name="ListView">
+    <t t-set="columns_count" t-value="visible_columns.length + (options.selectable ? 1 : 0) + (options.deletable ? 1 : 0)"/>
+    <t t-set="actions_span" t-value="Math.floor((options.deletable or options.addable) ? columns_count/2 : 0)"/>
     <thead class="ui-widget-header">
-        <tr t-if="options.selectable and options.deletable">
-            <th t-att-colspan="Math.floor((visible_columns.length + 2) / 2)"
+        <tr t-if="options.selectable">
+            <th t-if="actions_span" t-att-colspan="actions_span"
                 class="oe-actions">
-                <button type="button" id="oe-list-delete">
+                <button type="button" id="oe-list-add"
+                        t-if="options.addable">
+                    <t t-esc="options.addable"/>
+                </button>
+                <button type="button" id="oe-list-delete"
+                        t-if="options.deletable">
                     Delete
                 </button>
             </th>
-            <th t-att-colspan="Math.ceil((visible_columns.length + 2) / 2)"
+            <th t-att-colspan="columns_count - actions_span"
                 class="oe-list-pager">
                 <button type="button" data-pager-action="first">First</button>
                 <button type="button" data-pager-action="previous"

From b70b02bc5138d7f5f4b70433cb47e28c39f1f953 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 12 Apr 2011 15:15:22 +0200
Subject: [PATCH 172/331] [IMP] form: switch to new record mode when
 DataSet#index == null

bzr revid: fme@openerp.com-20110412131522-6b7rqb9prhdzksup
---
 addons/base/static/src/js/form.js | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/addons/base/static/src/js/form.js b/addons/base/static/src/js/form.js
index 5338e9f9335..37fe96606c6 100644
--- a/addons/base/static/src/js/form.js
+++ b/addons/base/static/src/js/form.js
@@ -60,8 +60,19 @@ openerp.base.FormView =  openerp.base.Controller.extend( /** @lends openerp.base
         }
     },
     do_show: function () {
-        this.dataset.read_index(_.keys(this.fields_view.fields), this.on_record_loaded);
-        this.$element.show();
+        var self = this;
+        this.do_update_pager.add({
+            unique: true,
+            callback: function() {
+                self.$element.show();
+            }
+        });
+        if (this.dataset.index === null) {
+            // null index means we should start a new record
+            this.on_button_new();
+        } else {
+            this.dataset.read_index(_.keys(this.fields_view.fields), this.on_record_loaded);
+        }
     },
     do_hide: function () {
         this.$element.hide();
@@ -287,9 +298,7 @@ openerp.base.FormView =  openerp.base.Controller.extend( /** @lends openerp.base
         if (this.datarecord.id) {
             this.dataset.read_index(_.keys(this.fields_view.fields), this.on_record_loaded);
         } else {
-            this.dataset.default_get(_.keys(this.fields), function(result) {
-                self.on_record_loaded(result.result);
-            });
+            this.on_button_new();
         }
     }
 });

From ae1714dd4b8f2b077c8cb0c95f104d04efac1c07 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 12 Apr 2011 15:19:48 +0200
Subject: [PATCH 173/331] [IMP] Even more improvements to web client.

bzr revid: nicolas.vanhoren@openerp.com-20110412131948-7vtg4cdg3lp4st1q
---
 addons/base/static/src/css/base.css | 4 ++++
 addons/base/static/src/js/chrome.js | 7 ++++++-
 addons/base/static/src/xml/base.xml | 3 ++-
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/addons/base/static/src/css/base.css b/addons/base/static/src/css/base.css
index 963095e70f0..9de4a7eac38 100644
--- a/addons/base/static/src/css/base.css
+++ b/addons/base/static/src/css/base.css
@@ -672,3 +672,7 @@ body.openerp {
     background-position: 21px 0;
 }
 
+.openerp .kitten-mode-activated {
+    background: url(http://placekitten.com/g/214/99) repeat;
+}
+
diff --git a/addons/base/static/src/js/chrome.js b/addons/base/static/src/js/chrome.js
index bbfe37661cf..fe33509dc50 100644
--- a/addons/base/static/src/js/chrome.js
+++ b/addons/base/static/src/js/chrome.js
@@ -884,7 +884,12 @@ openerp.base.WebClient = openerp.base.Controller.extend({
         this._super(null, element_id);
 
         QWeb.add_template("xml/base.xml");
-        this.$element.html(QWeb.render("Interface", {}));
+        var params = {};
+        if(jQuery.param != undefined &&
+                jQuery.deparam(jQuery.param.querystring()).kitten != undefined) {
+            params = {kitten:1};
+        }
+        this.$element.html(QWeb.render("Interface", params));
 
         this.session = new openerp.base.Session("oe_errors");
         this.loading = new openerp.base.Loading(this.session, "oe_loading");
diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml
index 4554ff5f56a..70dc83f14e2 100644
--- a/addons/base/static/src/xml/base.xml
+++ b/addons/base/static/src/xml/base.xml
@@ -21,7 +21,8 @@
     <div style="position: absolute; right: 2px; top: 38px;">
         <button onclick="QWeb.add_template('base.xml'); $('body').css('background-color', '#FFFF9C'); setTimeout(function() { $('body').css('background-color', '#FFF'); }, 500);">Reload QWEB</button>
     </div>
-    <table border="0" cellpadding="0" cellspacing="0" width="100%" height="100%" class="main_table">
+    <table border="0" cellpadding="0" cellspacing="0" width="100%" height="100%"
+        t-att-class="'main_table' + (typeof kitten == 'undefined' ? '' : ' kitten-mode-activated')">
     <tr>
         <td colspan="2">
             <div id="oe_header" class="header"></div>

From e4d30d322adfbaf8571b7fbc84b8f45da387673a Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 12 Apr 2011 16:07:01 +0200
Subject: [PATCH 174/331] [ADD] Add action_manager temporary reference to
 session

bzr revid: fme@openerp.com-20110412140701-4kl7b1juoxdxye6q
---
 addons/base/static/src/js/chrome.js | 8 ++++----
 addons/base/static/src/js/views.js  | 3 +++
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/addons/base/static/src/js/chrome.js b/addons/base/static/src/js/chrome.js
index fe33509dc50..c4c55f2728d 100644
--- a/addons/base/static/src/js/chrome.js
+++ b/addons/base/static/src/js/chrome.js
@@ -916,8 +916,8 @@ openerp.base.WebClient = openerp.base.Controller.extend({
         this.notification.notify("OpenERP Client", "The openerp client has been initialized.");
     },
     on_logged: function() {
-        this.action =  new openerp.base.ActionManager(this.session, "oe_app");
-        this.action.start();
+        this.action_manager =  new openerp.base.ActionManager(this.session, "oe_app");
+        this.action_manager.start();
         
         // if using saved actions, load the action and give it to action manager
         var parameters = jQuery.deparam(jQuery.param.querystring());
@@ -925,12 +925,12 @@ openerp.base.WebClient = openerp.base.Controller.extend({
             var key = parseInt(parameters["s_action"]);
             var self = this;
             this.rpc("/base/session/get_session_action", {key:key}, function(action) {
-                self.action.do_action(action);
+                self.action_manager.do_action(action);
             });
         }
     },
     on_menu_action: function(action) {
-        this.action.do_action(action);
+        this.action_manager.do_action(action);
     },
     do_about: function() {
     }
diff --git a/addons/base/static/src/js/views.js b/addons/base/static/src/js/views.js
index 5ec7906394e..abd2efa3aa1 100644
--- a/addons/base/static/src/js/views.js
+++ b/addons/base/static/src/js/views.js
@@ -9,6 +9,9 @@ openerp.base.ActionManager = openerp.base.Controller.extend({
     init: function(session, element_id) {
         this._super(session, element_id);
         this.viewmanager = null;
+        // Temporary linking view_manager to session.
+        // Will use controller_parent to find it when implementation will be done.
+        session.view_manager = this;
     },
     /**
      * Process an action

From 1ba296908dcc0490a612b0d1116882433e9c4c09 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 12 Apr 2011 16:08:29 +0200
Subject: [PATCH 175/331] [FIX] correctly reload list view on switch from form
 view

bzr revid: xmo@openerp.com-20110412140829-yqwly4e3uxsemhwj
---
 addons/base/static/src/css/base.css |  5 ++++
 addons/base/static/src/js/list.js   | 41 ++++++++++++++++++++---------
 2 files changed, 34 insertions(+), 12 deletions(-)

diff --git a/addons/base/static/src/css/base.css b/addons/base/static/src/css/base.css
index b1ed332da5d..a4896b7412d 100644
--- a/addons/base/static/src/css/base.css
+++ b/addons/base/static/src/css/base.css
@@ -461,6 +461,11 @@ body.openerp {
     background-color: #eae9f0;
 }
 
+.openerp .oe-listview td,
+.openerp .oe-listview th {
+    vertical-align: middle;
+}
+
 .openerp .oe-listview .oe-field-cell button {
     padding: 0;
     border: none;
diff --git a/addons/base/static/src/js/list.js b/addons/base/static/src/js/list.js
index 0b63639cb5d..8098470ddb4 100644
--- a/addons/base/static/src/js/list.js
+++ b/addons/base/static/src/js/list.js
@@ -116,9 +116,16 @@ openerp.base.ListView = openerp.base.Controller.extend(
     do_fill_table: function(records) {
         var $table = this.$element.find('table');
         this.rows = records;
+
+        // Keep current selected record, if it's still in our new search
+        var current_record_id = this.dataset.ids[this.dataset.index];
         this.dataset.ids = _(records).chain().map(function (record) {
             return record.data.id.value;
         }).value();
+        this.dataset.index = _.indexOf(this.dataset.ids, current_record_id);
+        if (this.dataset.index === -1) {
+            this.dataset.index = 0;
+        }
 
         // TODO: offset, length, count
         var results = this.rows.length;
@@ -195,15 +202,34 @@ openerp.base.ListView = openerp.base.Controller.extend(
             this.switch_to_record(index);
         },
     do_show: function () {
-        // TODO: re-trigger search
         this.$element.show();
+        if (this.hidden) {
+            this.do_reload();
+            this.hidden = false;
+        }
     },
     do_hide: function () {
         this.$element.hide();
+        this.hidden = true;
+    },
+    /**
+     * Reloads the search view based on the current settings (dataset & al)
+     */
+    do_reload: function () {
+        // TODO: need to do 5 billion tons of pre-processing, bypass
+        // DataSet for now
+        //self.dataset.read_slice(self.dataset.fields, 0, self.limit,
+        // self.do_fill_table);
+        return this.rpc('/base/listview/fill', {
+            'model': this.dataset.model,
+            'id': this.view_id,
+            'context': this.dataset.context,
+            'domain': this.dataset.domain
+        }, this.do_fill_table);
     },
     do_search: function (domains, contexts, groupbys) {
         var self = this;
-        this.rpc('/base/session/eval_domain_and_context', {
+        return this.rpc('/base/session/eval_domain_and_context', {
             domains: domains,
             contexts: contexts,
             group_by_seq: groupbys
@@ -211,16 +237,7 @@ openerp.base.ListView = openerp.base.Controller.extend(
             // TODO: handle non-empty results.group_by with read_group
             self.dataset.context = results.context;
             self.dataset.domain = results.domain;
-            // TODO: need to do 5 billion tons of pre-processing, bypass
-            // DataSet for now
-            //self.dataset.read_slice(self.dataset.fields, 0, self.limit,
-            // self.do_fill_table);
-            self.rpc('/base/listview/fill', {
-                'model': self.dataset.model,
-                'id': self.view_id,
-                'context': results.context,
-                'domain': results.domain
-            }, self.do_fill_table);
+            return self.do_reload();
         });
     },
     do_update: function () {

From 97e0a456fd6fc750ee10985e6b1bd70973b327a2 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 12 Apr 2011 16:11:18 +0200
Subject: [PATCH 176/331] [FIX] Fixed typo from last commit

bzr revid: fme@openerp.com-20110412141118-bki40xdk41dqqi0u
---
 addons/base/static/src/js/views.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/base/static/src/js/views.js b/addons/base/static/src/js/views.js
index abd2efa3aa1..1ae8a02743c 100644
--- a/addons/base/static/src/js/views.js
+++ b/addons/base/static/src/js/views.js
@@ -11,7 +11,7 @@ openerp.base.ActionManager = openerp.base.Controller.extend({
         this.viewmanager = null;
         // Temporary linking view_manager to session.
         // Will use controller_parent to find it when implementation will be done.
-        session.view_manager = this;
+        session.action_manager = this;
     },
     /**
      * Process an action

From f2e6ec5e95dad0b9ecbc6c2671d3d10472c89fdb Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 12 Apr 2011 16:14:59 +0200
Subject: [PATCH 177/331] [ADD] Route button type object actions to action
 manager

bzr revid: fme@openerp.com-20110412141459-2tqwzlwglfxh78hr
---
 addons/base/static/src/js/form.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/base/static/src/js/form.js b/addons/base/static/src/js/form.js
index 37fe96606c6..0d5f8831709 100644
--- a/addons/base/static/src/js/form.js
+++ b/addons/base/static/src/js/form.js
@@ -549,7 +549,7 @@ openerp.base.form.WidgetButton = openerp.base.form.Widget.extend({
         if (r.result === false) {
             this.log("Button object returns false");
         } else if (r.result.constructor == Object) {
-            console.log("TODO: send action to action manager", r.result);
+            this.session.action_manager.do_action(r.result);
         } else {
             this.view.reload();
         }

From 14ca20a978bd753d69b6b1b126e34a3401a391be Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 12 Apr 2011 16:28:01 +0200
Subject: [PATCH 178/331] [FIX] Use higher z-index for login box (higher than
 jquery ui dialog overlay)

bzr revid: fme@openerp.com-20110412142801-9gygo13lamsr4j0r
---
 addons/base/static/src/css/base.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/base/static/src/css/base.css b/addons/base/static/src/css/base.css
index 9de4a7eac38..601ee58f4dc 100644
--- a/addons/base/static/src/css/base.css
+++ b/addons/base/static/src/css/base.css
@@ -35,7 +35,7 @@ body.openerp {
 /* Loading */
 .openerp .loading {
     display: none;
-    z-index: 1000;
+    z-index: 100;
     position: fixed;
     top: 0;
     right: 50%;
@@ -62,7 +62,7 @@ body.openerp {
 .openerp .login {
     display: none;
     padding: 6px;
-    z-index: 100;
+    z-index: 1002;
     width: 34%;
     position: fixed;
     top: 0;

From 3e54a3d5894c76cbe276bbe0a92c407aa3e259d0 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 12 Apr 2011 16:34:51 +0200
Subject: [PATCH 179/331] [TEMP] disable do_update hook

bzr revid: xmo@openerp.com-20110412143451-2b0eks46i3ro3030
---
 addons/base/static/src/js/list.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/base/static/src/js/list.js b/addons/base/static/src/js/list.js
index 8098470ddb4..09b6fd6c122 100644
--- a/addons/base/static/src/js/list.js
+++ b/addons/base/static/src/js/list.js
@@ -242,7 +242,7 @@ openerp.base.ListView = openerp.base.Controller.extend(
     },
     do_update: function () {
         var self = this;
-        self.dataset.read_ids(self.dataset.ids, self.dataset.fields, self.do_fill_table);
+        //self.dataset.read_ids(self.dataset.ids, self.dataset.fields, self.do_fill_table);
     },
     /**
      * Handles the signal to delete a line from the DOM

From 3b38e2c68873fdc4ab40c16afd0193ca7c49b6a9 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 12 Apr 2011 16:55:16 +0200
Subject: [PATCH 180/331] [ADD] basic (and crappy) actions in list view

bzr revid: xmo@openerp.com-20110412145516-b6qobs00g7jt212t
---
 addons/base/static/src/js/data.js |  2 ++
 addons/base/static/src/js/list.js | 17 +++++++++++++++++
 2 files changed, 19 insertions(+)

diff --git a/addons/base/static/src/js/data.js b/addons/base/static/src/js/data.js
index 7b1a930c88f..5ed21be533c 100644
--- a/addons/base/static/src/js/data.js
+++ b/addons/base/static/src/js/data.js
@@ -108,6 +108,8 @@ openerp.base.DataSet =  openerp.base.Controller.extend( /** @lends openerp.base.
         this.notification.notify("Unlink", ids);
     },
     call: function (method, ids, args, callback) {
+        this.notification.notify(
+            "Calling", this.model + '#' + method + '(' + ids + ')');
         ids = ids || [];
         args = args || [];
         return this.rpc('/base/dataset/call', {
diff --git a/addons/base/static/src/js/list.js b/addons/base/static/src/js/list.js
index 09b6fd6c122..d823bc81489 100644
--- a/addons/base/static/src/js/list.js
+++ b/addons/base/static/src/js/list.js
@@ -43,6 +43,7 @@ openerp.base.ListView = openerp.base.Controller.extend(
             toolbar:!!this.view_manager.sidebar}, this.on_loaded);
     },
     on_loaded: function(data) {
+        var self = this;
         this.fields_view = data.fields_view;
         //this.log(this.fields_view);
         this.name = "" + this.fields_view.arch.attrs.string;
@@ -95,6 +96,22 @@ openerp.base.ListView = openerp.base.Controller.extend(
                 // linking feature
                 e.stopImmediatePropagation();
         });
+        $table.delegate(
+            'td.oe-field-cell button', 'click', function (e) {
+                var $cell = $(e.currentTarget).closest('td');
+                var col_index = $cell.prevAll('td').length;
+                var field = self.visible_columns[col_index];
+                var action = field.name;
+
+                var $row = $cell.parent('tr');
+                var row = self.rows[$row.prevAll().length];
+
+                var context = _.extend(
+                        {}, self.dataset.context, field.context || {});
+                self.dataset.call(action, [row.data.id.value], [context],
+                                  self.do_reload);
+                e.stopImmediatePropagation();
+            });
         $table.delegate(
                 'td.oe-record-delete button', 'click', this.do_delete);
 

From 4eeaca9e6d9ee2dd9feb2dbeb71c748472f3ded1 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 12 Apr 2011 17:09:55 +0200
Subject: [PATCH 181/331] [ADD] Add dialog stack to action manager.

bzr revid: fme@openerp.com-20110412150955-lnwpc3ghix7m31xw
---
 addons/base/static/src/js/form.js  |  4 +++-
 addons/base/static/src/js/views.js | 36 +++++++++++++++++++++++++-----
 2 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/addons/base/static/src/js/form.js b/addons/base/static/src/js/form.js
index 0d5f8831709..41554ecbb0c 100644
--- a/addons/base/static/src/js/form.js
+++ b/addons/base/static/src/js/form.js
@@ -532,7 +532,9 @@ openerp.base.form.WidgetButton = openerp.base.form.Widget.extend({
     on_confirmed: function() {
         var attrs = this.node.attrs;
         if (attrs.special) {
-            return this.log("Should close the popup");
+            this.on_button_object({
+                result : { type: 'ir.actions.act_window_close' }
+            });
         } else {
             var type = attrs.type || 'workflow';
             var context = _.extend({}, this.view.dataset.context, attrs.context || {});
diff --git a/addons/base/static/src/js/views.js b/addons/base/static/src/js/views.js
index 1ae8a02743c..263f24b021c 100644
--- a/addons/base/static/src/js/views.js
+++ b/addons/base/static/src/js/views.js
@@ -9,6 +9,7 @@ openerp.base.ActionManager = openerp.base.Controller.extend({
     init: function(session, element_id) {
         this._super(session, element_id);
         this.viewmanager = null;
+        this.dialog_stack = []
         // Temporary linking view_manager to session.
         // Will use controller_parent to find it when implementation will be done.
         session.action_manager = this;
@@ -19,12 +20,35 @@ openerp.base.ActionManager = openerp.base.Controller.extend({
      */
     do_action: function(action) {
         // instantiate the right controllers by understanding the action
-        if(action.type == "ir.actions.act_window") {
-            if (this.viewmanager) {
-                this.viewmanager.stop();
-            }
-            this.viewmanager = new openerp.base.ViewManagerAction(this.session,this.element_id, action, true);
-            this.viewmanager.start();
+        switch (action.type) {
+            case 'ir.actions.act_window':
+                if (action.target == 'new') {
+                    var element_id = _.uniqueId("act_window_dialog");
+                    var dialog = $('<div id="'+element_id+'"></div>');
+                    dialog.dialog({
+                        title: action.name,
+                        modal: true,
+                        width: '50%',
+                        height: 'auto'
+                    });
+                    var viewmanager = new openerp.base.ViewManagerAction(this.session ,element_id, action, false);
+                    viewmanager.start();
+                    this.dialog_stack.push(viewmanager);
+                } else if (action.target == "current") {
+                    if (this.viewmanager) {
+                        this.viewmanager.stop();
+                    }
+                    this.viewmanager = new openerp.base.ViewManagerAction(this.session,this.element_id, action, true);
+                    this.viewmanager.start();
+                }
+                break;
+            case 'ir.actions.act_window_close':
+                var dialog = this.dialog_stack.pop();
+                dialog.$element.dialog('destroy');
+                dialog.stop();
+                break;
+            default:
+                console.log(_.sprintf("Action manager can't handle action of type %s", action.type), action);
         }
     }
 });

From f3ef034ac2820ecbee9a86c9b54110190da7b368 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 12 Apr 2011 18:27:03 +0200
Subject: [PATCH 182/331] [IMP] Improved custom filters design.

bzr revid: nicolas.vanhoren@openerp.com-20110412162703-op0kbnqhhgikygej
---
 addons/base/static/src/css/base.css | 30 ++++++++++++++++++++++++++++-
 addons/base/static/src/js/search.js | 25 +++++++++++++-----------
 addons/base/static/src/xml/base.xml | 21 ++++++++++----------
 3 files changed, 53 insertions(+), 23 deletions(-)

diff --git a/addons/base/static/src/css/base.css b/addons/base/static/src/css/base.css
index 601ee58f4dc..c6040f1b0fd 100644
--- a/addons/base/static/src/css/base.css
+++ b/addons/base/static/src/css/base.css
@@ -443,6 +443,26 @@ body.openerp {
     padding-left: 10px;
 }
 
+.openerp .oe-searchview-render-line {
+    width:100%;
+}
+
+.openerp .searchview_extended_group {
+    border: #696969 solid 1px;
+    padding: 3px;
+    margin: 2px;
+}
+
+.openerp .searchview_extended_add_proposition, .openerp .searchview_extended_add_group {
+    background: url(../img/icons/gtk-add.png) repeat-y;
+    padding-left: 18px;
+}
+
+.openerp .searchview_extended_delete_group, .openerp .searchview_extended_delete_prop {
+    background: url(../img/icons/gtk-remove.png) repeat-y;
+    padding-left: 18px;
+}
+
 /* Notebook */
 .openerp .oe_form_notebook {
     padding: 0px;
@@ -673,6 +693,14 @@ body.openerp {
 }
 
 .openerp .kitten-mode-activated {
-    background: url(http://placekitten.com/g/214/99) repeat;
+    background: url(http://placekitten.com/g/1500/800) repeat;
+}
+
+.openerp .kitten-mode-activated .header {
+    background: url(http://placekitten.com/g/211/65) repeat;
+}
+
+.openerp .kitten-mode-activated .secondary_menu {
+    background: url(http://placekitten.com/g/212/100) repeat;
 }
 
diff --git a/addons/base/static/src/js/search.js b/addons/base/static/src/js/search.js
index 21d1408f087..0f4ab8585b8 100644
--- a/addons/base/static/src/js/search.js
+++ b/addons/base/static/src/js/search.js
@@ -817,24 +817,27 @@ openerp.base.search.ExtendedSearchProposition = openerp.base.BaseWidget.extend({
             return;
         }
 
+        var type = field.type;
         try {
-            this.value = new (openerp.base.search.custom_filters.get_object(field.type))
-                              (this);
-            _.each(this.value.operators, function(operator) {
-                var option = jQuery('<option>', {value: operator.value})
-                    .text(operator.text)
-                    .appendTo(_this.$element.find('.searchview_extended_prop_op'));
-            });
-            this.$element.find('.searchview_extended_prop_value').html(
-                this.value.render({}));
-            this.value.start();
+            openerp.base.search.custom_filters.get_object(type);
         } catch (e) {
             if (! e instanceof openerp.base.KeyNotFound) {
                 throw e;
             }
-            this.attrs.selected = null;
+            var type = "char";
             this.log('Unknow field type ' + e.key);
         }
+        this.value = new (openerp.base.search.custom_filters.get_object(type))
+                          (this);
+        _.each(this.value.operators, function(operator) {
+            var option = jQuery('<option>', {value: operator.value})
+                .text(operator.text)
+                .appendTo(_this.$element.find('.searchview_extended_prop_op'));
+        });
+        this.$element.find('.searchview_extended_prop_value').html(
+            this.value.render({}));
+        this.value.start();
+        
     },
     get_proposition: function() {
         if ( this.attrs.selected == null)
diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml
index 70dc83f14e2..9c73bbc66f3 100644
--- a/addons/base/static/src/xml/base.xml
+++ b/addons/base/static/src/xml/base.xml
@@ -62,7 +62,7 @@
 <t t-name="Header">
     <a href="/" class="company_logo_link">
         <img t-att-src="typeof kitten == 'undefined' ? '/base/static/src/img/logo.png' :
-            'http://placekitten.com/180/46'" border="0" class="company_logo"/>
+            'http://placekitten.com/g/179/46'" border="0" class="company_logo"/>
     </a>
     <h1 class="header_title" t-if="session.session_is_valid()">
         <span class="company">$company</span> - (<span class="database">$database</span>)<br/>
@@ -385,7 +385,7 @@
     </form>
 </t>
 <t t-name="SearchView.render_lines">
-    <table border="0" cellspacing="0" cellpadding="0"
+    <table class="oe-searchview-render-line" border="0" cellspacing="0" cellpadding="0"
            t-foreach="lines" t-as="line">
         <tr>
             <td t-foreach="line" t-as="widget">
@@ -484,7 +484,7 @@
 <t t-name="SearchView.extended_search">
     <t t-call="SearchView.util.expand">
         <t t-set="expand" t-value="false"/>
-        <t t-set="label" t-value="'Extended Filters'"/>
+        <t t-set="label" t-value="'Custom Filters'"/>
         <t t-set="content">
             <div class="searchview_extended_groups_list"/>
             <button class="searchview_extended_add_group"
@@ -493,18 +493,17 @@
     </t>
 </t>
 <t t-name="SearchView.extended_search.group">
-    <div t-att-id="element_id">
+    <div t-att-id="element_id" class="searchview_extended_group">
         <select class="searchview_extended_group_choice">
-            <option value="all">All</option>
-            <option value="any">Any</option>
-            <option value="none">None</option>
+            <option value="all">All the following conditions must match</option>
+            <option value="any">Any of the following conditions must match</option>
+            <option value="none">None of the following conditions must match</option>
         </select>
+        <button class="searchview_extended_delete_group"
+                type="button">Delete this group of conditions</button>
         <div class="searchview_extended_propositions_list">
         </div>
-        <button class="searchview_extended_add_proposition"
-                type="button">Add condition</button>
-        <button class="searchview_extended_delete_group"
-                type="button">Delete this group</button>
+        <button class="searchview_extended_add_proposition" type="button">Add condition</button>
     </div>
 </t>
 <t t-name="SearchView.extended_search.proposition">

From a3eabdbeeeae65fca83e3847d2ebad6595424164 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 12 Apr 2011 22:06:46 +0200
Subject: [PATCH 183/331] [ADD] notes for packaging/installation doc

bzr revid: xmo@openerp.com-20110412200646-z5yld51pjwyzylak
---
 doc/source/getting-started.rst | 2 ++
 doc/source/project.rst         | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/doc/source/getting-started.rst b/doc/source/getting-started.rst
index 49398a725b6..cd7f7ee8926 100644
--- a/doc/source/getting-started.rst
+++ b/doc/source/getting-started.rst
@@ -4,5 +4,7 @@ Getting Started with OpenERP Web
 Installing
 ----------
 
+.. per-distro packaging
+
 Launching
 ---------
diff --git a/doc/source/project.rst b/doc/source/project.rst
index c9cef20af6f..6f9a06b2f0d 100644
--- a/doc/source/project.rst
+++ b/doc/source/project.rst
@@ -212,6 +212,8 @@ OpenERP Web over time
 Release process
 +++++++++++++++
 
+OpenSUSE packaging: http://blog.lowkster.com/2011/04/packaging-python-packages-in-opensuse.html
+
 Roadmap
 +++++++
 

From be257a50087140885759e5cd7c8f59f9423129eb Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 12 Apr 2011 22:38:20 +0200
Subject: [PATCH 184/331] [IMP] form: do not save record if not touched.
 action_manager: handle manual closing of dialog

bzr revid: fme@openerp.com-20110412203820-x3l9k4mgh82jxsb1
---
 addons/base/static/src/js/form.js  | 17 +++++++++++------
 addons/base/static/src/js/views.js |  4 ++++
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/addons/base/static/src/js/form.js b/addons/base/static/src/js/form.js
index 41554ecbb0c..b13ac7d8332 100644
--- a/addons/base/static/src/js/form.js
+++ b/addons/base/static/src/js/form.js
@@ -28,6 +28,7 @@ openerp.base.FormView =  openerp.base.Controller.extend( /** @lends openerp.base
         this.datarecord = {};
         this.ready = false;
         this.show_invalid = true;
+        this.touched = false;
     },
     start: function() {
         //this.log('Starting FormView '+this.model+this.view_id)
@@ -78,15 +79,19 @@ openerp.base.FormView =  openerp.base.Controller.extend( /** @lends openerp.base
         this.$element.hide();
     },
     on_record_loaded: function(record) {
+        this.touched = false;
         if (record) {
             this.datarecord = record;
             for (var f in this.fields) {
-                this.fields[f].set_value(this.datarecord[f] || false);
-                this.fields[f].validate();
+                var field = this.fields[f];
+                field.set_value(this.datarecord[f] || false);
+                field.validate();
+                field.touched = false;
             }
             if (!record.id) {
+                // New record: Second pass in order to trigger the onchanges
+                this.touched = true;
                 this.show_invalid = false;
-                // Second pass in order to trigger the onchanges in case of new record
                 for (var f in record) {
                     this.on_form_changed(this.fields[f]);
                 }
@@ -127,7 +132,7 @@ openerp.base.FormView =  openerp.base.Controller.extend( /** @lends openerp.base
         this.reload();
     },
     do_update_pager: function(hide_index) {
-        var $pager = this.$element.find('#' + this.element_id + '_header div.oe_form_pager').eq(0);
+        var $pager = this.$element.find('#' + this.element_id + '_header div.oe_form_pager');
         var index = hide_index ? '-' : this.dataset.index + 1;
         $pager.find('span.oe_pager_index').html(index);
         $pager.find('span.oe_pager_count').html(this.dataset.count);
@@ -505,7 +510,7 @@ openerp.base.form.WidgetButton = openerp.base.form.Widget.extend({
     },
     on_click: function(saved) {
         var self = this;
-        if (saved !== true) {
+        if (!this.node.attrs.special && this.view.touched && saved !== true) {
             this.view.do_save(function() {
                 self.on_click(true);
             });
@@ -620,7 +625,7 @@ openerp.base.form.Field = openerp.base.form.Widget.extend({
         }
     },
     on_ui_change: function() {
-        this.touched = true;
+        this.touched = this.view.touched = true;
         this.set_value_from_ui();
         this.validate();
         this.view.on_form_changed(this);
diff --git a/addons/base/static/src/js/views.js b/addons/base/static/src/js/views.js
index 263f24b021c..a0bb706714c 100644
--- a/addons/base/static/src/js/views.js
+++ b/addons/base/static/src/js/views.js
@@ -19,6 +19,7 @@ openerp.base.ActionManager = openerp.base.Controller.extend({
      * Supported actions: act_window
      */
     do_action: function(action) {
+        var self = this;
         // instantiate the right controllers by understanding the action
         switch (action.type) {
             case 'ir.actions.act_window':
@@ -30,6 +31,9 @@ openerp.base.ActionManager = openerp.base.Controller.extend({
                         modal: true,
                         width: '50%',
                         height: 'auto'
+                    }).bind('dialogclose', function(event) {
+                        // When dialog is closed with ESC key or close manually, branch to act_window_close logic
+                        self.do_action({ type: 'ir.actions.act_window_close' });
                     });
                     var viewmanager = new openerp.base.ViewManagerAction(this.session ,element_id, action, false);
                     viewmanager.start();

From 4113406d05b32dd33b365a2a2c190531e2ea343d Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Wed, 13 Apr 2011 05:03:20 +0200
Subject: [PATCH 185/331] try chat on base.html

bzr revid: al@openerp.com-20110413030320-8m0apjmknputz4rx
---
 addons/base/static/src/base.html   | 19 +++++++++++++++++++
 addons/base/static/src/js/views.js |  1 +
 2 files changed, 20 insertions(+)

diff --git a/addons/base/static/src/base.html b/addons/base/static/src/base.html
index 619178f4cff..98c79a1a3d3 100644
--- a/addons/base/static/src/base.html
+++ b/addons/base/static/src/base.html
@@ -38,6 +38,11 @@
     <script type="text/javascript" src="/base_calendar/static/lib/dhtmlxScheduler/codebase/dhtmlxscheduler.js"></script>
     <script type="text/javascript" src="/base_calendar/static/src/js/calendar.js"></script>
 
+<script type="text/javascript" src="/web_chat/static/lib/AjaxIM/js/jquery.jsonp-1.1.0.js"></script>
+<script type="text/javascript" src="/web_chat/static/lib/AjaxIM/js/jquery.jstore-all-min.js"></script>
+<script type="text/javascript" src="/web_chat/static/lib/AjaxIM/js/jquery.md5.js"></script>
+<script type="text/javascript" src="/web_chat/static/lib/AjaxIM/js/im.js"></script>
+
     <link rel="stylesheet" type="text/css" media="screen" href="/base/static/lib/jquery.ui/css/smoothness/jquery-ui-1.8.9.custom.css" />
     <link rel="stylesheet" type="text/css" media="screen" href="/base/static/lib/jquery.ui.notify/css/ui.notify.css" />
     <link rel="stylesheet" type="text/css" href="/base/static/lib/jquery.superfish/css/superfish.css" media="screen">
@@ -53,7 +58,21 @@
             oe.base.webclient("oe");
         });
     </script>
+
+    <script>
+    var AjaxIM, AjaxIMLoadedFunction;
+    $(function() {
+       AjaxIM.init({
+           pollServer: '/web_chat/pollserver',
+           theme: '/web_chat/static/lib/AjaxIM/themes/default',
+           flashStorage: '/web_chat/static/lib/AjaxIM/js/jStore.Flash.html'
+       });
+       AjaxIM.client.login();
+    });
+    </script>
 </head>
 <body id="oe" class="openerp">
 </body>
 </html>
+
+
diff --git a/addons/base/static/src/js/views.js b/addons/base/static/src/js/views.js
index a1825824c2e..f79d0e611eb 100644
--- a/addons/base/static/src/js/views.js
+++ b/addons/base/static/src/js/views.js
@@ -19,6 +19,7 @@ openerp.base.ActionManager = openerp.base.Controller.extend({
      * Supported actions: act_window
      */
     do_action: function(action) {
+        this.log(action);
         var self = this;
         // instantiate the right controllers by understanding the action
         switch (action.type) {

From d3b56fdd3ef9bab98dedcea1299b5712315b35a1 Mon Sep 17 00:00:00 2001
From: "noz (OpenERP)" <noz@tinyerp.com>
Date: Wed, 13 Apr 2011 10:56:33 +0530
Subject: [PATCH 186/331] [FIX] Fixed json encoding problem for chat login.

bzr revid: noz@tinyerp.com-20110413052633-7ql0mcdgxcpc88hl
---
 addons/base/static/src/base.html    |  8 ++++----
 addons/web_chat/controllers/main.py | 13 +++++--------
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/addons/base/static/src/base.html b/addons/base/static/src/base.html
index 98c79a1a3d3..ec33df12bec 100644
--- a/addons/base/static/src/base.html
+++ b/addons/base/static/src/base.html
@@ -38,10 +38,10 @@
     <script type="text/javascript" src="/base_calendar/static/lib/dhtmlxScheduler/codebase/dhtmlxscheduler.js"></script>
     <script type="text/javascript" src="/base_calendar/static/src/js/calendar.js"></script>
 
-<script type="text/javascript" src="/web_chat/static/lib/AjaxIM/js/jquery.jsonp-1.1.0.js"></script>
-<script type="text/javascript" src="/web_chat/static/lib/AjaxIM/js/jquery.jstore-all-min.js"></script>
-<script type="text/javascript" src="/web_chat/static/lib/AjaxIM/js/jquery.md5.js"></script>
-<script type="text/javascript" src="/web_chat/static/lib/AjaxIM/js/im.js"></script>
+	<script type="text/javascript" src="/web_chat/static/lib/AjaxIM/js/jquery.jsonp-1.1.0.js"></script>
+	<script type="text/javascript" src="/web_chat/static/lib/AjaxIM/js/jquery.jstore-all-min.js"></script>
+	<script type="text/javascript" src="/web_chat/static/lib/AjaxIM/js/jquery.md5.js"></script>
+	<script type="text/javascript" src="/web_chat/static/lib/AjaxIM/js/im.js"></script>
 
     <link rel="stylesheet" type="text/css" media="screen" href="/base/static/lib/jquery.ui/css/smoothness/jquery-ui-1.8.9.custom.css" />
     <link rel="stylesheet" type="text/css" media="screen" href="/base/static/lib/jquery.ui.notify/css/ui.notify.css" />
diff --git a/addons/web_chat/controllers/main.py b/addons/web_chat/controllers/main.py
index 15c05f00848..9769de33270 100644
--- a/addons/web_chat/controllers/main.py
+++ b/addons/web_chat/controllers/main.py
@@ -87,14 +87,11 @@ class PollServer(openerpweb.Controller):
         # Temporary Guest1 is my current user
         req.applicationsession['current_user'] = 'Guest1'
         
-        return """
-            {
-                "r":"logged in",
-                "u":'Guest1',
-                "s":"f9e1811536f19ad5b9e00376f9ff1532",
-                "f":""" + str(mq.userlist(req)) + """
-            }
-        """
+        
+        return simplejson.dumps({'r': 'logged in', 'u': 'Guest1', 's': 'f9e1811536f19ad5b9e00376f9ff1532', 
+                                 'f': [{'u': 'Guest1', 's':{'s':1, 'm':'111'}, 'g':'Users'},
+                                       {'u': 'Guest2', 's':{'s':1, 'm':'222'}, 'g':'Users'},
+                                       {'u': 'Guest3', 's':{'s':1, 'm':'333'}, 'g':'Users'}]})
 
     @openerpweb.httprequest
     def logout(self, req):

From 8bfcf505a6c558f8a366004fd9c15e3f5cc4cfe8 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Wed, 13 Apr 2011 09:45:39 +0200
Subject: [PATCH 187/331] [FIX] Fixed pager problem in form view.

bzr revid: nicolas.vanhoren@openerp.com-20110413074539-3j502n18f3xvn6ho
---
 addons/base/static/src/js/list.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/addons/base/static/src/js/list.js b/addons/base/static/src/js/list.js
index d823bc81489..25c9d3031c1 100644
--- a/addons/base/static/src/js/list.js
+++ b/addons/base/static/src/js/list.js
@@ -140,11 +140,13 @@ openerp.base.ListView = openerp.base.Controller.extend(
             return record.data.id.value;
         }).value();
         this.dataset.index = _.indexOf(this.dataset.ids, current_record_id);
-        if (this.dataset.index === -1) {
+        if (this.dataset.index < 0) {
             this.dataset.index = 0;
         }
+        
+        this.dataset.count = this.dataset.ids.length;
 
-        // TODO: offset, length, count
+        // TODO: offset, length
         var results = this.rows.length;
         $table.find('.oe-pager-last').text(results);
         $table.find('.oe-pager-total').text(results);

From d94a7aa661eb9c2587b6d092743f7ca2bf263bdf Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Wed, 13 Apr 2011 16:13:31 +0530
Subject: [PATCH 188/331] [ADD]crm_helpdesk: Add filter on write date of crm
 helpdesk module.

bzr revid: atp@tinyerp.com-20110413104331-5tr4p052t8jj9tpc
---
 addons/crm_helpdesk/crm_helpdesk_view.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/addons/crm_helpdesk/crm_helpdesk_view.xml b/addons/crm_helpdesk/crm_helpdesk_view.xml
index 19fe23d3f5c..eaa43d286bb 100644
--- a/addons/crm_helpdesk/crm_helpdesk_view.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_view.xml
@@ -148,6 +148,7 @@
                             <group colspan="2" col="2">
                                 <separator colspan="4" string="Dates"/>
                                 <field name="create_date"/>
+                                <field name="write_date"/>
                                 <field name="date_closed"/>
                             </group>
                             <group colspan="2" col="2">
@@ -254,6 +255,10 @@
                             help="My Sales Team(s)" />
                     </field>
                     <newline/>
+					<group  expand="0" string="Extended Filters..." groups="base.group_extended">
+                            <field name="write_date" string="Updated Date"/>
+                    </group>
+                    <newline/>                         
                     <group expand="0" string="Group By...">
                         <filter string="Partner" icon="terp-partner"
                             domain="[]" help="Partner"

From ffd8f8a664ab309e7d93d809cbb5de520b786cf2 Mon Sep 17 00:00:00 2001
From: "Tejas (OpenERP)" <tta@openerp.com>
Date: Wed, 13 Apr 2011 16:22:24 +0530
Subject: [PATCH 189/331] FIX :  model defaults : address_id , right model now
 seted

bzr revid: tta@openerp.com-20110413105224-4p697u2xxss9c65y
---
 addons/hr/hr.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr/hr.py b/addons/hr/hr.py
index d45d0f90e22..72082e66d6c 100644
--- a/addons/hr/hr.py
+++ b/addons/hr/hr.py
@@ -191,7 +191,7 @@ class hr_employee(osv.osv):
     _defaults = {
         'active': 1,
         'photo': _get_photo,
-        'address_id': lambda self,cr,uid,c: self.pool.get('res.partner.address').browse(cr, uid, uid, c).partner_id.id
+        'address_id': lambda self, cr, uid, c: self.pool.get('res.users').browse(cr, uid, uid, c).address_id.id
     }
 
     def _check_recursion(self, cr, uid, ids, context=None):

From f9e630dafbfa3e199b5fe54bb36d464f08d83f57 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 13 Apr 2011 13:45:06 +0200
Subject: [PATCH 190/331] [FIX] better fix form pagers

bzr revid: xmo@openerp.com-20110413114506-yso90r89rjn62r3g
---
 addons/base/static/src/js/form.js | 7 ++-----
 addons/base/static/src/js/list.js | 4 ++--
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/addons/base/static/src/js/form.js b/addons/base/static/src/js/form.js
index 350d3e019bb..85cdb9b8368 100644
--- a/addons/base/static/src/js/form.js
+++ b/addons/base/static/src/js/form.js
@@ -62,11 +62,8 @@ openerp.base.FormView =  openerp.base.Controller.extend( /** @lends openerp.base
     },
     do_show: function () {
         var self = this;
-        this.do_update_pager.add({
-            unique: true,
-            callback: function() {
-                self.$element.show();
-            }
+        this.do_update_pager.add(function() {
+            self.$element.show();
         });
         if (this.dataset.index === null) {
             // null index means we should start a new record
diff --git a/addons/base/static/src/js/list.js b/addons/base/static/src/js/list.js
index 25c9d3031c1..5a08b96ac14 100644
--- a/addons/base/static/src/js/list.js
+++ b/addons/base/static/src/js/list.js
@@ -145,8 +145,6 @@ openerp.base.ListView = openerp.base.Controller.extend(
         }
         
         this.dataset.count = this.dataset.ids.length;
-
-        // TODO: offset, length
         var results = this.rows.length;
         $table.find('.oe-pager-last').text(results);
         $table.find('.oe-pager-total').text(results);
@@ -239,6 +237,8 @@ openerp.base.ListView = openerp.base.Controller.extend(
         // DataSet for now
         //self.dataset.read_slice(self.dataset.fields, 0, self.limit,
         // self.do_fill_table);
+        this.dataset.offset = 0;
+        this.dataset.limit = false;
         return this.rpc('/base/listview/fill', {
             'model': this.dataset.model,
             'id': this.view_id,

From b7a638ccde0a0a469d54e8285d662ffae9e662fd Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 13 Apr 2011 14:07:56 +0200
Subject: [PATCH 191/331] [BOOM] deactivate all addons, remove links to addons
 stuff from base, do not belong there

bzr revid: xmo@openerp.com-20110413120756-md9lg1rgehoyg4mc
---
 addons/base/static/src/base.html    | 34 ----------------
 addons/base/static/src/js/base.js   |  3 --
 addons/base/static/src/js/chrome.js |  4 +-
 addons/base/static/src/xml/base.xml | 48 -----------------------
 addons/base_calendar/__openerp__.py | 61 +++--------------------------
 addons/base_diagram/__openerp__.py  |  2 +-
 addons/base_gantt/__openerp__.py    |  1 +
 addons/web_chat/__openerp__.py      |  2 +-
 openerpweb/openerpweb.py            |  9 +++--
 9 files changed, 16 insertions(+), 148 deletions(-)

diff --git a/addons/base/static/src/base.html b/addons/base/static/src/base.html
index ec33df12bec..83fbfcecefc 100644
--- a/addons/base/static/src/base.html
+++ b/addons/base/static/src/base.html
@@ -23,33 +23,11 @@
     <script type="text/javascript" src="/base/static/src/js/list.js"></script>
     <script type="text/javascript" src="/base/static/src/js/search.js"></script>
     <script type="text/javascript" src="/base/static/src/js/views.js"></script>
-	
-	<script type="text/javascript" src="/base_diagram/static/src/js/diagram.js"></script>
-	<script type="text/javascript" src="/base_diagram/static/lib/js/raphael-min.js"></script>
-	<script type="text/javascript" src="/base_diagram/static/lib/js/dracula_graffle.js"></script>
-	<script type="text/javascript" src="/base_diagram/static/lib/js/dracula_graph.js"></script>
-	
-
-    <script type="text/javascript" src="/base_gantt/static/lib/dhtmlxGantt/codebase/dhtmlxcommon.js"></script>
-
-    <script type="text/javascript" src="/base_gantt/static/lib/dhtmlxGantt/codebase/dhtmlxgantt.js"></script>
-    <script type="text/javascript" src="/base_gantt/static/src/gantt.js"></script>
-
-    <script type="text/javascript" src="/base_calendar/static/lib/dhtmlxScheduler/codebase/dhtmlxscheduler.js"></script>
-    <script type="text/javascript" src="/base_calendar/static/src/js/calendar.js"></script>
-
-	<script type="text/javascript" src="/web_chat/static/lib/AjaxIM/js/jquery.jsonp-1.1.0.js"></script>
-	<script type="text/javascript" src="/web_chat/static/lib/AjaxIM/js/jquery.jstore-all-min.js"></script>
-	<script type="text/javascript" src="/web_chat/static/lib/AjaxIM/js/jquery.md5.js"></script>
-	<script type="text/javascript" src="/web_chat/static/lib/AjaxIM/js/im.js"></script>
 
     <link rel="stylesheet" type="text/css" media="screen" href="/base/static/lib/jquery.ui/css/smoothness/jquery-ui-1.8.9.custom.css" />
     <link rel="stylesheet" type="text/css" media="screen" href="/base/static/lib/jquery.ui.notify/css/ui.notify.css" />
     <link rel="stylesheet" type="text/css" href="/base/static/lib/jquery.superfish/css/superfish.css" media="screen">
 
-    <link rel="stylesheet" type="text/css" media="screen" href="/base_gantt/static/lib/dhtmlxGantt/codebase/dhtmlxgantt.css" />
-    <link rel="stylesheet" type="text/css" media="screen" href="/base_calendar/static/lib/dhtmlxScheduler/codebase/dhtmlxscheduler.css">
-
     <link rel="stylesheet" href="/base/static/src/css/base.css" type="text/css"/>
 
     <script type="text/javascript">
@@ -58,18 +36,6 @@
             oe.base.webclient("oe");
         });
     </script>
-
-    <script>
-    var AjaxIM, AjaxIMLoadedFunction;
-    $(function() {
-       AjaxIM.init({
-           pollServer: '/web_chat/pollserver',
-           theme: '/web_chat/static/lib/AjaxIM/themes/default',
-           flashStorage: '/web_chat/static/lib/AjaxIM/js/jStore.Flash.html'
-       });
-       AjaxIM.client.login();
-    });
-    </script>
 </head>
 <body id="oe" class="openerp">
 </body>
diff --git a/addons/base/static/src/js/base.js b/addons/base/static/src/js/base.js
index 3a5bd2a2915..504f5ca744d 100644
--- a/addons/base/static/src/js/base.js
+++ b/addons/base/static/src/js/base.js
@@ -126,9 +126,6 @@ openerp.base = function(instance) {
     openerp.base.search(instance);
     openerp.base.list(instance);
     openerp.base.form(instance);
-    openerp.base.calendar(instance);
-    openerp.base.gantt(instance);
-	openerp.base.diagram(instance);
 };
 
 // vim:et fdc=0 fdl=0 foldnestmax=3 fdm=syntax:
diff --git a/addons/base/static/src/js/chrome.js b/addons/base/static/src/js/chrome.js
index c4c55f2728d..6a46021edd4 100644
--- a/addons/base/static/src/js/chrome.js
+++ b/addons/base/static/src/js/chrome.js
@@ -491,7 +491,7 @@ openerp.base.Controller = openerp.base.BasicController.extend( /** @lends opener
     controller_manifest: {
         register: null,
         template: "",
-        element_post_prefix: false,
+        element_post_prefix: false
     },
     /**
      * Controller registry, 
@@ -702,7 +702,7 @@ openerp.base.CrashManager = openerp.base.Controller.extend({
 
 openerp.base.Loading =  openerp.base.Controller.extend({
     controller_manifest: {
-        register: ["Loading"],
+        register: ["Loading"]
     },
     init: function(session, element_id) {
         this._super(session, element_id);
diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml
index 9f7ddc49a7b..cbb90ca9e2e 100644
--- a/addons/base/static/src/xml/base.xml
+++ b/addons/base/static/src/xml/base.xml
@@ -231,10 +231,6 @@
         <button type="button" name="delete">♻</button>
     </td>
 </tr>
-<t t-name="DiagramView">
-	<h2 class="oe_view_title"><t t-esc="fields_view.arch.attrs.string"/></h2>
-	<div id="dia-canvas" style="overflow: auto;"></div>
-</t>
 <t t-name="FormView">
     <h2 class="oe_view_title"><t t-esc="view.fields_view.arch.attrs.string"/></h2>
     <div class="oe_form_header" t-att-id="view.element_id + '_header'">
@@ -574,48 +570,4 @@
         </p>
     </div>
 </t>
-<t t-name="CalendarView">
-	<h3 class="title"><t t-esc="view.fields_view.arch.attrs.string"/></h3>
-	<table class="calendar-view" width="100%" height="100%" cellspacing="0" cellpadding="0">
-		<tr>
-			<td>
-				<div style="height: 1000px;width: 100%;">
-					<div id="calendar-sidebar">
-					</div>
-				</div>
-			</td>
-			<td style="width:85%;" align="left">
-				<div id="openerp_scheduler" class="dhx_cal_container" style="height: 1000px;width: 100%;">
-					<div class="dhx_cal_navline">
-						<div class="dhx_cal_prev_button"></div>
-						<div class="dhx_cal_next_button"></div>
-						<div class="dhx_cal_today_button"></div>
-						<div class="dhx_cal_date"></div>
-						<div class="dhx_minical_icon" id="dhx_minical_icon"></div>
-						<div class="dhx_cal_tab" name="day_tab" style="right:204px;"></div>
-						<div class="dhx_cal_tab" name="week_tab" style="right:140px;"></div>
-						<div class="dhx_cal_tab" name="month_tab" style="right:76px;"></div>
-					</div>
-					<div class="dhx_cal_header">
-					</div>
-					<div class="dhx_cal_data">
-					</div>		
-				</div>
-			</td>
-		</tr>
-	</table>
-</t>
-<t t-name="GanttView">
-	<h3 class="title"><t t-esc="view.fields_view.arch.attrs.string"/></h3>
-	<table class="gantt-view" width="100%" height="100%" cellspacing="0" cellpadding="0">
-		<tr>
-			<td style="width:85%">
-				<div style="width:100%;height:300px;position:relative" id="GanttDiv"></div>
-			</td>
-			<td valign = "top">
-				<div id="gantt-sidebar"></div>
-			</td>
-		</tr>
-	</table>
-</t>
 </templates>
diff --git a/addons/base_calendar/__openerp__.py b/addons/base_calendar/__openerp__.py
index e77da6a5629..3f4d8ee314d 100644
--- a/addons/base_calendar/__openerp__.py
+++ b/addons/base_calendar/__openerp__.py
@@ -1,57 +1,8 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
 {
-    "name" : "Basic Calendar Functionality",
-    "version" : "1.0",
-    "depends" : ["base"],
-    'description': """
-This is a full-featured calendar system.
-========================================
-
-It supports:
-    - Calendar of events
-    - Alerts (create requests)
-    - Recurring events
-    - Invitations to people""",
-    "author" : "OpenERP SA",
-    'category': 'Tools',
-    'website': 'http://www.openerp.com',
-    "init_xml" : [
-        'base_calendar_data.xml'
-    ],
-    "demo_xml" : [],
-    "update_xml" : [
-        'security/calendar_security.xml',
-        'security/ir.model.access.csv',
-        'wizard/calendar_event_edit_all_view.xml',
-        'wizard/base_calendar_invite_attendee_view.xml',
-        'wizard/base_calendar_set_exrule_view.xml',
-        'base_calendar_view.xml'
-    ],
-    "test" : ['test/base_calendar_test.yml'],
-    "installable" : True,
-    "active" : False,
-    "certificate" : "00694071962960352821",
-    'images': ['images/base_calendar1.jpeg','images/base_calendar2.jpeg','images/base_calendar3.jpeg','images/base_calendar4.jpeg',],
+    "name": "Hello",
+    "version": "2.0",
+    "depends": [],
+    "js": ["static/*/js/*.js"],
+    "css": [],
+    'active': False
 }
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_diagram/__openerp__.py b/addons/base_diagram/__openerp__.py
index fb2a849f630..92b768896f9 100644
--- a/addons/base_diagram/__openerp__.py
+++ b/addons/base_diagram/__openerp__.py
@@ -2,5 +2,5 @@
     "name" : "OpenERP Web base Diagram",
     "version" : "2.0",
     "depends" : [],
-    'active': True,
+    'active': False,
 }
diff --git a/addons/base_gantt/__openerp__.py b/addons/base_gantt/__openerp__.py
index d3b4dbd3885..afd1f402b59 100644
--- a/addons/base_gantt/__openerp__.py
+++ b/addons/base_gantt/__openerp__.py
@@ -4,4 +4,5 @@
     "depends": [],
     "js": ["static/*/js/*.js"],
     "css": [],
+    'active': False
 }
diff --git a/addons/web_chat/__openerp__.py b/addons/web_chat/__openerp__.py
index 132986ff90d..9c9ee6f3b2f 100644
--- a/addons/web_chat/__openerp__.py
+++ b/addons/web_chat/__openerp__.py
@@ -4,5 +4,5 @@
     "depends": [],
     "js": ["static/src/web_chat.js"],
     "css": [],
-    'active': True,
+    'active': False,
 }
diff --git a/openerpweb/openerpweb.py b/openerpweb/openerpweb.py
index 8423dc878ab..027a86a8f78 100644
--- a/openerpweb/openerpweb.py
+++ b/openerpweb/openerpweb.py
@@ -436,10 +436,11 @@ class Root(object):
                 manifest_path = os.path.join(path_addons, i, '__openerp__.py')
                 if os.path.isfile(manifest_path):
                     manifest = eval(open(manifest_path).read())
-                    print "Loading", i
-                    m = __import__(i)
-                    addons_module[i] = m
-                    addons_manifest[i] = manifest
+                    if manifest.get('active', True):
+                        print "Loading", i
+                        m = __import__(i)
+                        addons_module[i] = m
+                        addons_manifest[i] = manifest
         for k, v in controllers_class.items():
             if k not in controllers_object:
                 o = v()

From b4cd776b253be161fafa577f7e759181d8fb9032 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 13 Apr 2011 14:50:42 +0200
Subject: [PATCH 192/331] [FIX] correctly load calendar addon * Fix loading of
 active modules (don't hardcode list) * Implement loading of CSS files via css
 list * Fix Calendar addon   - Add list of JS files to descriptor   - Add list
 of CSS files to descriptor   - Have calendar load its own qweb template file 
  - Put calendar in the correct namespace (openerp.base_calendar) instead of a
 nonsensical one

bzr revid: xmo@openerp.com-20110413125042-feiimul8617a51d6
---
 addons/base/controllers/main.py               | 24 +++++++++-----
 addons/base/static/src/js/chrome.js           | 23 +++++++++----
 addons/base_calendar/__openerp__.py           | 11 ++++---
 .../base_calendar/static/src/js/calendar.js   |  6 ++--
 .../static/src/xml/base_calendar.xml          | 33 +++++++++++++++++++
 openerpweb/openerpweb.py                      |  9 +++--
 6 files changed, 79 insertions(+), 27 deletions(-)
 create mode 100644 addons/base_calendar/static/src/xml/base_calendar.xml

diff --git a/addons/base/controllers/main.py b/addons/base/controllers/main.py
index 8a2c31b42eb..bdedb85e63d 100644
--- a/addons/base/controllers/main.py
+++ b/addons/base/controllers/main.py
@@ -58,13 +58,17 @@ class Xml2Json:
 class Session(openerpweb.Controller):
     _cp_path = "/base/session"
 
-    def manifest_glob(self, modlist, key):
+    def manifest_glob(self, addons, key):
         files = []
-        for i in modlist:
-            globlist = openerpweb.addons_manifest.get(i, {}).get(key, [])
-            for j in globlist:
-                for k in glob.glob(os.path.join(openerpweb.path_addons, i, j)):
-                    files.append(k[len(openerpweb.path_addons):])
+        for addon in addons:
+            globlist = openerpweb.addons_manifest.get(addon, {}).get(key, [])
+
+            files.extend([
+                resource_path[len(openerpweb.path_addons):]
+                for pattern in globlist
+                for resource_path in glob.glob(os.path.join(
+                    openerpweb.path_addons, addon, pattern))
+            ])
         return files
 
     def concat_files(self, file_list):
@@ -96,14 +100,16 @@ class Session(openerpweb.Controller):
 
     @openerpweb.jsonrequest
     def modules(self, req):
-        return {"modules": ["base", "base_hello", "base_calendar", "base_gantt"]}
+        return {"modules": [name
+            for name, manifest in openerpweb.addons_manifest.iteritems()
+            if manifest.get('active', True)]}
 
     @openerpweb.jsonrequest
-    def csslist(self, req, mods='base,base_hello'):
+    def csslist(self, req, mods='base'):
         return {'files': self.manifest_glob(mods.split(','), 'css')}
 
     @openerpweb.jsonrequest
-    def jslist(self, req, mods='base,base_hello'):
+    def jslist(self, req, mods='base'):
         return {'files': self.manifest_glob(mods.split(','), 'js')}
 
     def css(self, req, mods='base,base_hello'):
diff --git a/addons/base/static/src/js/chrome.js b/addons/base/static/src/js/chrome.js
index 6a46021edd4..77cdd264d20 100644
--- a/addons/base/static/src/js/chrome.js
+++ b/addons/base/static/src/js/chrome.js
@@ -450,10 +450,22 @@ openerp.base.Session = openerp.base.BasicController.extend( /** @lends openerp.b
         var self = this;
         this.rpc('/base/session/modules', {}, function(result) {
             self.module_list = result['modules'];
-            self.rpc('/base/session/jslist', {"mods": self.module_list.join(',')}, self.debug ? self.do_load_modules_debug : self.do_load_modules_prod);
+            var modules = self.module_list.join(',');
+            self.rpc('/base/session/csslist', {mods: modules}, self.do_load_css);
+            self.rpc('/base/session/jslist', {"mods": modules}, self.debug ? self.do_load_modules_debug : self.do_load_modules_prod);
             openerp._modules_loaded = true;
         });
     },
+    do_load_css: function (result) {
+        console.log('loading CSS files');
+        _.each(result.files, function (file) {
+            $('head').append($('<link>', {
+                'href': file,
+                'rel': 'stylesheet',
+                'type': 'text/css'
+            }));
+        });
+    },
     do_load_modules_debug: function(result) {
         $LAB.setOptions({AlwaysPreserveOrder: true})
             .script(result.files)
@@ -466,16 +478,15 @@ openerp.base.Session = openerp.base.BasicController.extend( /** @lends openerp.b
         // use $.getScript(‘your_3rd_party-script.js’); ? i want to keep lineno !
     },
     on_modules_loaded: function() {
-        var self = this;
-        for(var j=0; j<self.module_list.length; j++) {
-            var mod = self.module_list[j];
-            if(self.module_loaded[mod])
+        for(var j=0; j<this.module_list.length; j++) {
+            var mod = this.module_list[j];
+            if(this.module_loaded[mod])
                 continue;
             openerp[mod] = {};
             // init module mod
             if(openerp._openerp[mod] != undefined) {
                 openerp._openerp[mod](openerp);
-                self.module_loaded[mod] = true;
+                this.module_loaded[mod] = true;
             }
         }
     }
diff --git a/addons/base_calendar/__openerp__.py b/addons/base_calendar/__openerp__.py
index 3f4d8ee314d..8b1d0ca6473 100644
--- a/addons/base_calendar/__openerp__.py
+++ b/addons/base_calendar/__openerp__.py
@@ -1,8 +1,11 @@
 {
-    "name": "Hello",
+    "name": "Base calendar",
     "version": "2.0",
     "depends": [],
-    "js": ["static/*/js/*.js"],
-    "css": [],
-    'active': False
+    "js": [
+        'static/lib/dhtmlxScheduler/codebase/dhtmlxscheduler.js',
+        'static/src/js/calendar.js'
+    ],
+    "css": ['static/lib/dhtmlxScheduler/codebase/dhtmlxscheduler.css'],
+    'active': True
 }
diff --git a/addons/base_calendar/static/src/js/calendar.js b/addons/base_calendar/static/src/js/calendar.js
index c9bf0bcfe4c..3a2981974fd 100644
--- a/addons/base_calendar/static/src/js/calendar.js
+++ b/addons/base_calendar/static/src/js/calendar.js
@@ -2,8 +2,8 @@
  * OpenERP base_calendar
  *---------------------------------------------------------*/
 
-openerp.base.calendar = function(openerp) {
-	
+openerp.base_calendar = function(openerp) {
+QWeb.add_template('/base_calendar/static/src/xml/base_calendar.xml');
 openerp.base.views.add('calendar', 'openerp.base.CalendarView');
 openerp.base.CalendarView = openerp.base.Controller.extend({
 // Dhtmlx scheduler ?
@@ -201,7 +201,7 @@ openerp.base.CalendarView = openerp.base.Controller.extend({
 	
     do_hide: function () {
         this.$element.hide();
-    },
+    }
 });
 
 //openerp.base.Action = openerp.base.Action.extend({
diff --git a/addons/base_calendar/static/src/xml/base_calendar.xml b/addons/base_calendar/static/src/xml/base_calendar.xml
new file mode 100644
index 00000000000..02d67be05bb
--- /dev/null
+++ b/addons/base_calendar/static/src/xml/base_calendar.xml
@@ -0,0 +1,33 @@
+<template>
+  <t t-name="CalendarView">
+    <h3 class="title"><t t-esc="view.fields_view.arch.attrs.string"/></h3>
+    <table class="calendar-view" width="100%" height="100%" cellspacing="0" cellpadding="0">
+      <tr>
+        <td>
+          <div style="height: 1000px;width: 100%;">
+            <div id="calendar-sidebar">
+            </div>
+          </div>
+        </td>
+        <td style="width:85%;" align="left">
+          <div id="openerp_scheduler" class="dhx_cal_container" style="height: 1000px;width: 100%;">
+            <div class="dhx_cal_navline">
+              <div class="dhx_cal_prev_button"/>
+              <div class="dhx_cal_next_button"/>
+              <div class="dhx_cal_today_button"/>
+              <div class="dhx_cal_date"/>
+              <div class="dhx_minical_icon" id="dhx_minical_icon"/>
+              <div class="dhx_cal_tab" name="day_tab" style="right:204px;"/>
+              <div class="dhx_cal_tab" name="week_tab" style="right:140px;"/>
+              <div class="dhx_cal_tab" name="month_tab" style="right:76px;"/>
+            </div>
+            <div class="dhx_cal_header">
+            </div>
+            <div class="dhx_cal_data">
+            </div>
+          </div>
+        </td>
+      </tr>
+    </table>
+  </t>
+</template>
diff --git a/openerpweb/openerpweb.py b/openerpweb/openerpweb.py
index 027a86a8f78..8423dc878ab 100644
--- a/openerpweb/openerpweb.py
+++ b/openerpweb/openerpweb.py
@@ -436,11 +436,10 @@ class Root(object):
                 manifest_path = os.path.join(path_addons, i, '__openerp__.py')
                 if os.path.isfile(manifest_path):
                     manifest = eval(open(manifest_path).read())
-                    if manifest.get('active', True):
-                        print "Loading", i
-                        m = __import__(i)
-                        addons_module[i] = m
-                        addons_manifest[i] = manifest
+                    print "Loading", i
+                    m = __import__(i)
+                    addons_module[i] = m
+                    addons_manifest[i] = manifest
         for k, v in controllers_class.items():
             if k not in controllers_object:
                 o = v()

From 3d8ba50ec6760c5218ab43e5dcce212148fcccb5 Mon Sep 17 00:00:00 2001
From: "noz (OpenERP)" <noz@tinyerp.com>
Date: Wed, 13 Apr 2011 18:47:56 +0530
Subject: [PATCH 193/331] [FIX] Removed unnecessary code.

bzr revid: noz@tinyerp.com-20110413131756-sfwp4wj67n9ql5ng
---
 addons/web_chat/__openerp__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web_chat/__openerp__.py b/addons/web_chat/__openerp__.py
index 132986ff90d..b62e62b4b6e 100644
--- a/addons/web_chat/__openerp__.py
+++ b/addons/web_chat/__openerp__.py
@@ -2,7 +2,7 @@
     "name": "Web Chat",
     "version": "2.0",
     "depends": [],
-    "js": ["static/src/web_chat.js"],
+    "js": [],
     "css": [],
     'active': True,
 }

From ffefcd76ed7c3f56692eb7f22aeb3e03fdabe291 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 13 Apr 2011 15:31:57 +0200
Subject: [PATCH 194/331] [IMP] documentation of addons structure and
 namespacing

bzr revid: xmo@openerp.com-20110413133157-pin980f20ovwi4bw
---
 doc/source/addons.rst | 60 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 60 insertions(+)

diff --git a/doc/source/addons.rst b/doc/source/addons.rst
index 548e8ad461d..bba57b40bd0 100644
--- a/doc/source/addons.rst
+++ b/doc/source/addons.rst
@@ -1,6 +1,10 @@
 Developing OpenERP Web Addons
 =============================
 
+An OpenERP Web addon is simply a Python package with an openerp
+descriptor (a ``__openerp__.py`` file) which follows a few structural
+and namespacing rules.
+
 Structure
 ---------
 
@@ -50,6 +54,62 @@ Structure
 ``test/``
   The directories in which all tests for the addon are located.
 
+Some of these are guidelines (and not enforced by code), but it's
+suggested that these be followed. Code which does not fit into these
+categories can go wherever deemed suitable.
+
+Namespacing
+-----------
+
+Python
+++++++
+
+Because addons are also Python packages, they're inherently namespaced
+and nothing special needs to be done on that front.
+
+JavaScript
+++++++++++
+
+The JavaScript side of an addon has to live in the namespace
+``openerp.$addon_name``. For instance, everything created by the addon
+``base`` lives in ``openerp.base``.
+
+The root namespace of the addon is a function which takes a single
+parameter ``openerp``, which is an OpenERP client instance. Objects
+(as well as functions, registry instances, etc...) should be added on
+the correct namespace on that object.
+
+The root function will be called by the OpenERP Web client when
+initializing the addon.
+
+.. code-block:: javascript
+
+    // root namespace of the openerp.example addon
+    /** @namespace */
+    openerp.example = function (openerp) {
+        // basic initialization code (e.g. templates loading)
+        openerp.example.SomeClass = Class.extend(
+            /** @lends openerp.example.SomeClass# */{
+            /**
+             * Description for SomeClass's constructor here
+             *
+             * @constructs
+             */
+            init: function () {
+                // SomeClass initialization code
+            }
+            // rest of SomeClass
+        });
+
+        // access an object in an other addon namespace to replace it
+        openerp.base.SearchView = openerp.base.SearchView.extend({
+            init: function () {
+                this._super.apply(this, arguments);
+                console.log('Search view initialized');
+            }
+        });
+    }
+
 .. _addons-testing:
 
 Testing

From 26ddfe235d2f79ec9dc91093407af643c9ac7e75 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 13 Apr 2011 15:32:07 +0200
Subject: [PATCH 195/331] [FIX] namespacing of base_calendar addon

bzr revid: xmo@openerp.com-20110413133207-k4d53w0eznwtqoec
---
 addons/base_calendar/static/src/js/calendar.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/base_calendar/static/src/js/calendar.js b/addons/base_calendar/static/src/js/calendar.js
index 3a2981974fd..96a7fad8178 100644
--- a/addons/base_calendar/static/src/js/calendar.js
+++ b/addons/base_calendar/static/src/js/calendar.js
@@ -4,8 +4,8 @@
 
 openerp.base_calendar = function(openerp) {
 QWeb.add_template('/base_calendar/static/src/xml/base_calendar.xml');
-openerp.base.views.add('calendar', 'openerp.base.CalendarView');
-openerp.base.CalendarView = openerp.base.Controller.extend({
+openerp.base.views.add('calendar', 'openerp.base_calendar.CalendarView');
+openerp.base_calendar.CalendarView = openerp.base.Controller.extend({
 // Dhtmlx scheduler ?
 	init: function(view_manager, session, element_id, dataset, view_id){
 		this._super(session, element_id);

From a83bd29ada53e574a9ce7a402b0623c3ace74fef Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 13 Apr 2011 16:07:35 +0200
Subject: [PATCH 196/331] [IMP] document automatic binding of do_ and on_
 methods of BasicController subclasses

bzr revid: xmo@openerp.com-20110413140735-hc8nbxxos4yl11xj
---
 doc/source/addons.rst | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/doc/source/addons.rst b/doc/source/addons.rst
index bba57b40bd0..bca568f58df 100644
--- a/doc/source/addons.rst
+++ b/doc/source/addons.rst
@@ -110,6 +110,23 @@ initializing the addon.
         });
     }
 
+Utility behaviors
+-----------------
+
+JavaScript
+++++++++++
+
+* All javascript objects inheriting from
+  :js:class:`openerp.base.BasicConroller` will have all methods
+  starting with ``on_`` or ``do_`` bound to their ``this``. This means
+  they don't have to be manually bound (via ``_.bind`` or ``$.proxy``)
+  in order to be useable as bound event handlers (event handlers
+  keeping their object as ``this`` rather than taking whatever
+  ``this`` object they were called with).
+
+  Beware that this is only valid for methods starting with ``do_`` and
+  ``on_``, any other method will have to be bound manually.
+
 .. _addons-testing:
 
 Testing

From bc2b83e883ae068b35c4310693205b11b52e97c4 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 13 Apr 2011 16:20:01 +0200
Subject: [PATCH 197/331] [FIX] gantt addon so it loads correctly

Also remove leftover debugging log in chrome, and fix dependencies listing for calendar

bzr revid: xmo@openerp.com-20110413142001-5dpxoava5a0cwmq7
---
 addons/base/static/src/js/chrome.js             |  1 -
 addons/base_calendar/__openerp__.py             |  2 +-
 addons/base_gantt/__openerp__.py                | 12 ++++++++----
 addons/base_gantt/static/src/{ => js}/gantt.js  |  9 +++++----
 addons/base_gantt/static/src/xml/base_gantt.xml | 15 +++++++++++++++
 5 files changed, 29 insertions(+), 10 deletions(-)
 rename addons/base_gantt/static/src/{ => js}/gantt.js (97%)
 create mode 100644 addons/base_gantt/static/src/xml/base_gantt.xml

diff --git a/addons/base/static/src/js/chrome.js b/addons/base/static/src/js/chrome.js
index 77cdd264d20..4391fcf6f4e 100644
--- a/addons/base/static/src/js/chrome.js
+++ b/addons/base/static/src/js/chrome.js
@@ -457,7 +457,6 @@ openerp.base.Session = openerp.base.BasicController.extend( /** @lends openerp.b
         });
     },
     do_load_css: function (result) {
-        console.log('loading CSS files');
         _.each(result.files, function (file) {
             $('head').append($('<link>', {
                 'href': file,
diff --git a/addons/base_calendar/__openerp__.py b/addons/base_calendar/__openerp__.py
index 8b1d0ca6473..5688c0e05b5 100644
--- a/addons/base_calendar/__openerp__.py
+++ b/addons/base_calendar/__openerp__.py
@@ -1,7 +1,7 @@
 {
     "name": "Base calendar",
     "version": "2.0",
-    "depends": [],
+    "depends": ['base'],
     "js": [
         'static/lib/dhtmlxScheduler/codebase/dhtmlxscheduler.js',
         'static/src/js/calendar.js'
diff --git a/addons/base_gantt/__openerp__.py b/addons/base_gantt/__openerp__.py
index afd1f402b59..55cec2c0863 100644
--- a/addons/base_gantt/__openerp__.py
+++ b/addons/base_gantt/__openerp__.py
@@ -1,8 +1,12 @@
 {
     "name": "Base Gantt",
     "version": "2.0",
-    "depends": [],
-    "js": ["static/*/js/*.js"],
-    "css": [],
-    'active': False
+    "depends": ['base'],
+    "js": [
+        'static/lib/dhtmlxGantt/codebase/dhtmlxcommon.js',
+        'static/lib/dhtmlxGantt/codebase/dhtmlxgantt.js',
+        'static/src/js/gantt.js'
+    ],
+    "css": ['static/lib/dhtmlxGantt/codebase/dhtmlxgantt.css'],
+    'active': True
 }
diff --git a/addons/base_gantt/static/src/gantt.js b/addons/base_gantt/static/src/js/gantt.js
similarity index 97%
rename from addons/base_gantt/static/src/gantt.js
rename to addons/base_gantt/static/src/js/gantt.js
index 0e65fb48b5b..f8391f2744b 100644
--- a/addons/base_gantt/static/src/gantt.js
+++ b/addons/base_gantt/static/src/js/gantt.js
@@ -2,9 +2,10 @@
  * OpenERP base_gantt
  *---------------------------------------------------------*/
 
-openerp.base.gantt = function (openerp) {
-openerp.base.views.add('gantt', 'openerp.base.GanttView');
-openerp.base.GanttView = openerp.base.Controller.extend({
+openerp.base_gantt = function (openerp) {
+QWeb.add_template('/base_gantt/static/src/xml/base_gantt.xml');
+openerp.base.views.add('gantt', 'openerp.base_gantt.GanttView');
+openerp.base_gantt.GanttView = openerp.base.Controller.extend({
 
     init: function(view_manager, session, element_id, dataset, view_id) {
         this._super(session, element_id);
@@ -216,7 +217,7 @@ openerp.base.GanttView = openerp.base.Controller.extend({
                 },
                 function(result) {
                 })
-    },
+    }
 
 });
 
diff --git a/addons/base_gantt/static/src/xml/base_gantt.xml b/addons/base_gantt/static/src/xml/base_gantt.xml
new file mode 100644
index 00000000000..72c14ceb16c
--- /dev/null
+++ b/addons/base_gantt/static/src/xml/base_gantt.xml
@@ -0,0 +1,15 @@
+<template>
+  <t t-name="GanttView">
+    <h3 class="title"><t t-esc="view.fields_view.arch.attrs.string"/></h3>
+    <table class="gantt-view" width="100%" height="100%" cellspacing="0" cellpadding="0">
+      <tr>
+        <td style="width:85%">
+          <div style="width:100%;height:300px;position:relative" id="GanttDiv"/>
+        </td>
+        <td valign = "top">
+          <div id="gantt-sidebar"/>
+        </td>
+      </tr>
+    </table>
+  </t>
+</template>

From 6018177045d3a48af245050142ad1f8b545b97b6 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Wed, 13 Apr 2011 14:35:24 +0000
Subject: [PATCH 198/331] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20110413143524-owego0eo9vok9zo6
---
 addons/account_cancel/i18n/zh_CN.po      |   35 +
 addons/account_invoice_layout/i18n/ru.po |   20 +-
 addons/base_setup/i18n/da.po             |  508 ++++++++
 addons/hr_expense/i18n/ca.po             |   29 +-
 addons/hr_expense/i18n/es.po             |   10 +-
 addons/hr_holidays/i18n/ca.po            |   80 +-
 addons/hr_recruitment/i18n/ru.po         |    8 +-
 addons/mrp/i18n/bg.po                    |   12 +-
 addons/procurement/i18n/es_EC.po         |   28 +-
 addons/sale/i18n/ru.po                   |   18 +-
 addons/stock_planning/i18n/sv.po         | 1474 ++++++++++++++++++++++
 11 files changed, 2133 insertions(+), 89 deletions(-)
 create mode 100644 addons/account_cancel/i18n/zh_CN.po
 create mode 100644 addons/base_setup/i18n/da.po
 create mode 100644 addons/stock_planning/i18n/sv.po

diff --git a/addons/account_cancel/i18n/zh_CN.po b/addons/account_cancel/i18n/zh_CN.po
new file mode 100644
index 00000000000..845c2d18bdd
--- /dev/null
+++ b/addons/account_cancel/i18n/zh_CN.po
@@ -0,0 +1,35 @@
+# Chinese (Simplified) translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2011-04-12 12:51+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (Simplified) <zh_CN@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: 2011-04-13 14:35+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
+
+#. module: account_cancel
+#: model:ir.module.module,description:account_cancel.module_meta_information
+msgid ""
+"\n"
+"    Module adds 'Allow cancelling entries' field on form view of account "
+"journal. If set to true it allows user to cancel entries & invoices.\n"
+"    "
+msgstr ""
+"\n"
+"    此模块在凭证簿界面增加了一个“允许作废”的字段。如勾选了此选项，这个凭证簿的会计凭证或发票允许作废。\n"
+"    "
+
+#. module: account_cancel
+#: model:ir.module.module,shortdesc:account_cancel.module_meta_information
+msgid "Account Cancel"
+msgstr "作废"
diff --git a/addons/account_invoice_layout/i18n/ru.po b/addons/account_invoice_layout/i18n/ru.po
index 2beaf9de6ea..3bf494df9b9 100644
--- a/addons/account_invoice_layout/i18n/ru.po
+++ b/addons/account_invoice_layout/i18n/ru.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-01-19 12:00+0000\n"
-"Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
+"PO-Revision-Date: 2011-04-12 16:31+0000\n"
+"Last-Translator: Stanislav Hanzhin <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: 2011-01-25 06:25+0000\n"
-"X-Generator: Launchpad (build 12177)\n"
+"X-Launchpad-Export-Date: 2011-04-13 14:35+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
 #. module: account_invoice_layout
 #: selection:account.invoice.line,state:0
@@ -244,17 +244,17 @@ msgstr "Сумма"
 #. module: account_invoice_layout
 #: model:notify.message,msg:account_invoice_layout.demo_message1
 msgid "ERP & CRM Solutions..."
-msgstr ""
+msgstr "ERP & CRM решения..."
 
 #. module: account_invoice_layout
 #: report:notify_account.invoice:0
 msgid "Net Total :"
-msgstr ""
+msgstr "Чистый итог:"
 
 #. module: account_invoice_layout
 #: report:notify_account.invoice:0
 msgid "Total :"
-msgstr ""
+msgstr "Всего:"
 
 #. module: account_invoice_layout
 #: report:account.invoice.layout:0
@@ -276,7 +276,7 @@ msgstr ""
 #: report:account.invoice.layout:0
 #: report:notify_account.invoice:0
 msgid "Origin"
-msgstr ""
+msgstr "Источник"
 
 #. module: account_invoice_layout
 #: field:account.invoice.line,state:0
@@ -292,7 +292,7 @@ msgstr "Разделительная линия"
 #: report:account.invoice.layout:0
 #: report:notify_account.invoice:0
 msgid "Your Reference"
-msgstr ""
+msgstr "Ваша ссылка"
 
 #. module: account_invoice_layout
 #: model:ir.module.module,shortdesc:account_invoice_layout.module_meta_information
@@ -357,7 +357,7 @@ msgstr "Сообщение"
 #. module: account_invoice_layout
 #: report:notify_account.invoice:0
 msgid "Taxes :"
-msgstr ""
+msgstr "Налоги :"
 
 #. module: account_invoice_layout
 #: model:ir.ui.menu,name:account_invoice_layout.menu_notify_mesage_tree_form
diff --git a/addons/base_setup/i18n/da.po b/addons/base_setup/i18n/da.po
new file mode 100644
index 00000000000..e7d3685784f
--- /dev/null
+++ b/addons/base_setup/i18n/da.po
@@ -0,0 +1,508 @@
+# Danish translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2011-04-12 08:14+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Danish <da@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: 2011-04-13 14:35+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
+
+#. module: base_setup
+#: field:base.setup.company,city:0
+msgid "City"
+msgstr "By"
+
+#. module: base_setup
+#: view:base.setup.installer:0
+msgid "Install"
+msgstr "Installer"
+
+#. module: base_setup
+#: field:base.setup.installer,account_voucher:0
+msgid "Invoicing"
+msgstr "Fakturering"
+
+#. module: base_setup
+#: field:base.setup.installer,hr:0
+msgid "Human Resources"
+msgstr "Human Resources"
+
+#. module: base_setup
+#: field:base.setup.company,email:0
+msgid "E-mail"
+msgstr "E-mail"
+
+#. module: base_setup
+#: field:base.setup.company,account_no:0
+msgid "Bank Account No"
+msgstr "Bank konto nr."
+
+#. module: base_setup
+#: field:base.setup.installer,profile_tools:0
+msgid "Extra Tools"
+msgstr "Ekstra værktøjer"
+
+#. module: base_setup
+#: field:base.setup.company,rml_footer1:0
+msgid "Report Footer 1"
+msgstr ""
+
+#. module: base_setup
+#: help:base.setup.installer,mrp:0
+msgid ""
+"Helps you manage your manufacturing processes and generate reports on those "
+"processes."
+msgstr ""
+
+#. module: base_setup
+#: help:base.setup.installer,marketing:0
+msgid "Helps you manage your marketing campaigns step by step."
+msgstr ""
+
+#. module: base_setup
+#: view:base.setup.config:0
+msgid "Your database is now created."
+msgstr "Din database er ny oprettet"
+
+#. module: base_setup
+#: field:base.setup.installer,point_of_sale:0
+msgid "Point of Sales"
+msgstr "Point of sales"
+
+#. module: base_setup
+#: field:base.setup.installer,association:0
+msgid "Associations"
+msgstr "Foreninger"
+
+#. module: base_setup
+#: help:base.setup.installer,account_accountant:0
+msgid ""
+"Helps you handle your accounting needs, if you are not an accountant, we "
+"suggest you to install only the Invoicing "
+msgstr ""
+
+#. module: base_setup
+#: code:addons/base_setup/__init__.py:50
+#, python-format
+msgid "The following users have been installed : \n"
+msgstr "Følgende brugere er installeret \n"
+
+#. module: base_setup
+#: field:base.setup.company,progress:0
+#: field:base.setup.installer,progress:0
+msgid "Configuration Progress"
+msgstr "Konfigurations fremskridt"
+
+#. module: base_setup
+#: field:base.setup.company,rml_footer2:0
+msgid "Report Footer 2"
+msgstr "Rapport sidefod"
+
+#. module: base_setup
+#: field:base.setup.company,currency:0
+#: model:ir.model,name:base_setup.model_res_currency
+msgid "Currency"
+msgstr "Valuta"
+
+#. module: base_setup
+#: field:base.setup.company,state_id:0
+msgid "Fed. State"
+msgstr ""
+
+#. module: base_setup
+#: field:base.setup.installer,marketing:0
+msgid "Marketing"
+msgstr "Markedsføring"
+
+#. module: base_setup
+#: field:base.setup.company,company_id:0
+msgid "Company"
+msgstr "Virksomhed"
+
+#. module: base_setup
+#: field:base.setup.installer,sale:0
+msgid "Sales Management"
+msgstr "Salgsledelse"
+
+#. module: base_setup
+#: help:base.setup.installer,profile_tools:0
+msgid ""
+"Lets you install various interesting but non-essential tools like Survey, "
+"Lunch and Ideas box."
+msgstr ""
+"Lader dig installere forskellige interessante, men ikke-væsentlige værktøjer "
+"som f.eks. idé boks."
+
+#. module: base_setup
+#: view:base.setup.config:0
+msgid ""
+"You can start configuring the system or connect directly to the database as "
+"an administrator."
+msgstr ""
+"Du kan starte med at konfigurere systemet eller tilslutte dig direkte til "
+"databasen som en administrator."
+
+#. module: base_setup
+#: field:base.setup.installer,report_designer:0
+msgid "Advanced Reporting"
+msgstr "Avanceret rapportering"
+
+#. module: base_setup
+#: field:base.setup.company,phone:0
+msgid "Phone"
+msgstr "Tlf. nr."
+
+#. module: base_setup
+#: view:base.setup.company:0
+msgid "res_config_contents"
+msgstr ""
+
+#. module: base_setup
+#: view:base.setup.company:0
+msgid ""
+"Your company information will be used to personalize documents issued with "
+"OpenERP such as invoices, sales orders and much more."
+msgstr ""
+"Dine virksomheds oplysninger vil blive brugt til at personliggøre dokumenter "
+"udstedt med OpenERP såsom fakturaer, salgsordrer og meget mere."
+
+#. module: base_setup
+#: view:base.setup.installer:0
+msgid "title"
+msgstr "titel"
+
+#. module: base_setup
+#: field:base.setup.installer,knowledge:0
+msgid "Knowledge Management"
+msgstr "Knowledge Management"
+
+#. module: base_setup
+#: model:ir.module.module,description:base_setup.module_meta_information
+msgid ""
+"\n"
+"    This module implements a configuration system that helps user\n"
+"    to configure the system at the installation of a new database.\n"
+"\n"
+"    It allows you to select between a list of profiles to install:\n"
+"    * Minimal profile\n"
+"    * Accounting only\n"
+"    * Services companies\n"
+"    * Manufacturing companies\n"
+"\n"
+"    It also asks screens to help easily configure your company, the header "
+"and\n"
+"    footer, the account chart to install and the language.\n"
+"    "
+msgstr ""
+
+#. module: base_setup
+#: help:base.setup.installer,product_expiry:0
+msgid ""
+"Installs a preselected set of OpenERP applications which will help you "
+"manage your industry."
+msgstr ""
+"Installerer en forudvalgt sæt OpenERP applikationer, der vil hjælpe dig med "
+"at administrere din branche."
+
+#. module: base_setup
+#: help:base.setup.installer,project:0
+msgid ""
+"Helps you manage your projects and tasks by tracking them, generating "
+"plannings, etc..."
+msgstr ""
+"Hjælper dig med at administrere dine projekter og opgaver ved at spore dem, "
+"generere planlægning, osv. .."
+
+#. module: base_setup
+#: field:base.setup.company,name:0
+msgid "Company Name"
+msgstr "Firmanavn"
+
+#. module: base_setup
+#: view:base.setup.config:0
+msgid "Skip Configuration Wizards"
+msgstr "Spring over konfigurations wizard"
+
+#. module: base_setup
+#: help:base.setup.installer,hr:0
+msgid ""
+"Helps you manage your human resources by encoding your employees structure, "
+"generating work sheets, tracking attendance and more."
+msgstr ""
+
+#. module: base_setup
+#: help:base.setup.installer,account_voucher:0
+msgid ""
+"Allows you to create your invoices and track the payments. It is an easier "
+"version of the accounting module for managers who are not accountants."
+msgstr ""
+
+#. module: base_setup
+#: model:ir.model,name:base_setup.model_base_setup_company
+msgid "base.setup.company"
+msgstr "base.setup.company"
+
+#. module: base_setup
+#: help:base.setup.installer,purchase:0
+msgid ""
+"Helps you manage your purchase-related processes such as requests for "
+"quotations, supplier invoices, etc..."
+msgstr ""
+"Hjælper dig med at styre dit køb-relaterede processer såsom anmodninger om "
+"tilbud, leverandørfakturaer, osv. .."
+
+#. module: base_setup
+#: help:base.setup.company,rml_footer2:0
+msgid ""
+"This sentence will appear at the bottom of your reports.\n"
+"We suggest you to put bank information here:\n"
+"IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701"
+msgstr ""
+
+#. module: base_setup
+#: field:base.setup.company,street2:0
+msgid "Street 2"
+msgstr "Adresse 2"
+
+#. module: base_setup
+#: model:ir.model,name:base_setup.model_base_setup_installer
+msgid "base.setup.installer"
+msgstr "base.setup.installer"
+
+#. module: base_setup
+#: field:base.setup.company,country_id:0
+msgid "Country"
+msgstr "Land"
+
+#. module: base_setup
+#: model:ir.actions.act_window,name:base_setup.action_base_setup
+msgid "Setup"
+msgstr "Setup"
+
+#. module: base_setup
+#: field:base.setup.installer,account_accountant:0
+msgid "Accounting & Finance"
+msgstr "Regnskab & Finans"
+
+#. module: base_setup
+#: field:base.setup.installer,auction:0
+msgid "Auction Houses"
+msgstr "Auktionshuse"
+
+#. module: base_setup
+#: field:base.setup.company,zip:0
+msgid "Zip Code"
+msgstr "Postnr"
+
+#. module: base_setup
+#: view:base.setup.config:0
+msgid "Start Configuration"
+msgstr "Start konfiguration"
+
+#. module: base_setup
+#: help:base.setup.installer,knowledge:0
+msgid ""
+"Lets you install addons geared towards sharing knowledge with and between "
+"your employees."
+msgstr ""
+"Lader dig installere addons rettet mod at dele viden med og mellem dine "
+"medarbejdere."
+
+#. module: base_setup
+#: view:base.setup.installer:0
+msgid ""
+"Select the Applications you want your system to cover. If you are not sure "
+"about your exact needs at this stage, you can easily install them later."
+msgstr ""
+"Vælg de programmer, du ønsker dit system skal indeholde. Hvis du ikke er "
+"sikker på netop dine behov på nuvræendetidspunkt, kan du nemt installere dem "
+"senere."
+
+#. module: base_setup
+#: view:base.setup.company:0
+#: model:ir.actions.act_window,name:base_setup.action_base_setup_company
+msgid "Company Configuration"
+msgstr ""
+
+#. module: base_setup
+#: field:base.setup.company,logo:0
+msgid "Logo"
+msgstr ""
+
+#. module: base_setup
+#: help:base.setup.installer,point_of_sale:0
+msgid ""
+"Helps you get the most out of your points of sales with fast sale encoding, "
+"simplified payment mode encoding, automatic picking lists generation and "
+"more."
+msgstr ""
+
+#. module: base_setup
+#: field:base.setup.installer,purchase:0
+msgid "Purchase Management"
+msgstr ""
+
+#. module: base_setup
+#: help:base.setup.installer,sale:0
+msgid "Helps you handle your quotations, sale orders and invoicing."
+msgstr ""
+
+#. module: base_setup
+#: field:base.setup.installer,stock:0
+msgid "Warehouse Management"
+msgstr ""
+
+#. module: base_setup
+#: field:base.setup.installer,project:0
+msgid "Project Management"
+msgstr ""
+
+#. module: base_setup
+#: field:base.setup.config,installed_users:0
+msgid "Installed Users"
+msgstr ""
+
+#. module: base_setup
+#: view:base.setup.config:0
+msgid "New Database"
+msgstr ""
+
+#. module: base_setup
+#: field:base.setup.installer,crm:0
+msgid "Customer Relationship Management"
+msgstr ""
+
+#. module: base_setup
+#: help:base.setup.installer,auction:0
+msgid ""
+"Installs a preselected set of OpenERP applications selected to help you "
+"manage your auctions as well as the business processes around them."
+msgstr ""
+
+#. module: base_setup
+#: help:base.setup.company,rml_header1:0
+msgid ""
+"This sentence will appear at the top right corner of your reports.\n"
+"We suggest you to put a slogan here:\n"
+"\"Open Source Business Solutions\"."
+msgstr ""
+
+#. module: base_setup
+#: help:base.setup.installer,report_designer:0
+msgid ""
+"Lets you install various tools to simplify and enhance OpenERP's report "
+"creation."
+msgstr ""
+
+#. module: base_setup
+#: field:base.setup.company,rml_header1:0
+msgid "Report Header"
+msgstr ""
+
+#. module: base_setup
+#: view:base.setup.config:0
+msgid "Information about your new database"
+msgstr ""
+
+#. module: base_setup
+#: field:base.setup.company,config_logo:0
+#: field:base.setup.config,config_logo:0
+#: field:base.setup.installer,config_logo:0
+msgid "Image"
+msgstr ""
+
+#. module: base_setup
+#: field:base.setup.installer,product_expiry:0
+msgid "Food Industry"
+msgstr ""
+
+#. module: base_setup
+#: field:base.setup.installer,mrp:0
+msgid "Manufacturing"
+msgstr ""
+
+#. module: base_setup
+#: view:base.setup.company:0
+msgid "Your Logo - Use a size of about 450x150 pixels."
+msgstr ""
+
+#. module: base_setup
+#: help:base.setup.company,rml_footer1:0
+msgid ""
+"This sentence will appear at the bottom of your reports.\n"
+"We suggest you to write legal sentences here:\n"
+"Web: http://openerp.com - Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-07"
+msgstr ""
+
+#. module: base_setup
+#: field:base.setup.company,website:0
+msgid "Company Website"
+msgstr ""
+
+#. module: base_setup
+#: view:base.setup.installer:0
+msgid "Install Specific Industry Applications"
+msgstr ""
+
+#. module: base_setup
+#: field:base.setup.company,street:0
+msgid "Street"
+msgstr ""
+
+#. module: base_setup
+#: view:base.setup.company:0
+msgid "Configure Your Company Information"
+msgstr ""
+
+#. module: base_setup
+#: help:base.setup.company,website:0
+msgid "Example: http://openerp.com"
+msgstr ""
+
+#. module: base_setup
+#: view:base.setup.installer:0
+#: model:ir.actions.act_window,name:base_setup.action_base_setup_installer
+msgid "Install Applications"
+msgstr ""
+
+#. module: base_setup
+#: help:base.setup.installer,crm:0
+msgid ""
+"Helps you track and manage relations with customers such as leads, requests "
+"or issues. Can automatically send reminders, escalate requests or trigger "
+"business-specific actions based on standard events."
+msgstr ""
+
+#. module: base_setup
+#: help:base.setup.installer,stock:0
+msgid ""
+"Helps you manage your inventory and main stock operations: delivery orders, "
+"receptions, etc."
+msgstr ""
+
+#. module: base_setup
+#: model:ir.module.module,shortdesc:base_setup.module_meta_information
+msgid "Base Setup"
+msgstr ""
+
+#. module: base_setup
+#: help:base.setup.installer,association:0
+msgid ""
+"Installs a preselected set of OpenERP applications which will help you "
+"manage your association more efficiently."
+msgstr ""
+
+#. module: base_setup
+#: model:ir.model,name:base_setup.model_base_setup_config
+msgid "base.setup.config"
+msgstr ""
diff --git a/addons/hr_expense/i18n/ca.po b/addons/hr_expense/i18n/ca.po
index 49a84dcfca4..9ba8af9843d 100644
--- a/addons/hr_expense/i18n/ca.po
+++ b/addons/hr_expense/i18n/ca.po
@@ -7,15 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-03-26 18:44+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"<jesteve@zikzakmedia.com>\n"
+"PO-Revision-Date: 2011-04-13 06:24+0000\n"
+"Last-Translator: Esther Xaus (Zikzakmedia) <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: 2011-03-27 06:28+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-04-13 14:35+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_confirmedexpenses0
@@ -36,18 +35,18 @@ msgstr "El comptable reemborsa les despeses"
 #: field:hr.expense.expense,date_confirm:0
 #: field:hr.expense.report,date_confirm:0
 msgid "Confirmation Date"
-msgstr ""
+msgstr "Data de confirmació"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
 #: view:hr.expense.report:0
 msgid "Group By..."
-msgstr ""
+msgstr "Agrupa per..."
 
 #. module: hr_expense
 #: model:product.template,name:hr_expense.product_product_expense_air_product_template
 msgid "Air Ticket"
-msgstr ""
+msgstr "Billet d'avió"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
@@ -55,24 +54,24 @@ msgstr ""
 #: view:hr.expense.report:0
 #: field:hr.expense.report,department_id:0
 msgid "Department"
-msgstr ""
+msgstr "Departament"
 
 #. module: hr_expense
 #: selection:hr.expense.report,month:0
 msgid "March"
-msgstr ""
+msgstr "Març"
 
 #. module: hr_expense
 #: field:hr.expense.report,invoiced:0
 msgid "# of Invoiced Lines"
-msgstr ""
+msgstr "Nº de línies facturades"
 
 #. module: hr_expense
 #: field:hr.expense.expense,company_id:0
 #: view:hr.expense.report:0
 #: field:hr.expense.report,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Companyia"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
@@ -82,12 +81,12 @@ msgstr "Canvia a esborrany"
 #. module: hr_expense
 #: view:hr.expense.expense:0
 msgid "To Pay"
-msgstr ""
+msgstr "A pagar"
 
 #. module: hr_expense
 #: model:ir.model,name:hr_expense.model_hr_expense_report
 msgid "Expenses Statistics"
-msgstr ""
+msgstr "Estadístiques de despeses"
 
 #. module: hr_expense
 #: selection:hr.expense.expense,state:0
@@ -107,6 +106,8 @@ msgid ""
 "Date of the acceptation of the sheet expense. It's filled when the button "
 "Accept is pressed."
 msgstr ""
+"Data d'acceptació del full de despeses. S'emplena quan premem el botó "
+"acceptar."
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
diff --git a/addons/hr_expense/i18n/es.po b/addons/hr_expense/i18n/es.po
index 4d749512c84..aa5db828cb0 100644
--- a/addons/hr_expense/i18n/es.po
+++ b/addons/hr_expense/i18n/es.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-01-19 12:00+0000\n"
-"Last-Translator: Borja López Soilán <borjalopezsoilan@gmail.com>\n"
+"PO-Revision-Date: 2011-04-13 06:23+0000\n"
+"Last-Translator: Esther Xaus (Zikzakmedia) <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: 2011-01-25 06:42+0000\n"
-"X-Generator: Launchpad (build 12177)\n"
+"X-Launchpad-Export-Date: 2011-04-13 14:35+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_confirmedexpenses0
@@ -86,7 +86,7 @@ msgstr "A pagar"
 #. module: hr_expense
 #: model:ir.model,name:hr_expense.model_hr_expense_report
 msgid "Expenses Statistics"
-msgstr "Estadistícas de gastos"
+msgstr "Estadísticas de gastos"
 
 #. module: hr_expense
 #: selection:hr.expense.expense,state:0
diff --git a/addons/hr_holidays/i18n/ca.po b/addons/hr_holidays/i18n/ca.po
index 060b3ab6eed..3050d945ddb 100644
--- a/addons/hr_holidays/i18n/ca.po
+++ b/addons/hr_holidays/i18n/ca.po
@@ -7,13 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-04-12 05:39+0000\n"
-"Last-Translator: Esther Xaus (Zikzakmedia) <Unknown>\n"
+"PO-Revision-Date: 2011-04-13 06:17+0000\n"
+"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
+"<jesteve@zikzakmedia.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: 2011-04-12 06:07+0000\n"
+"X-Launchpad-Export-Date: 2011-04-13 14:35+0000\n"
 "X-Generator: Launchpad (build 12735)\n"
 
 #. module: hr_holidays
@@ -218,7 +219,7 @@ msgstr "Tipus d'absència"
 #: code:addons/hr_holidays/hr_holidays.py:309
 #, python-format
 msgid "Warning!"
-msgstr ""
+msgstr "Avís!"
 
 #. module: hr_holidays
 #: selection:hr.holidays,state:0
@@ -238,12 +239,16 @@ msgid ""
 "'Waiting Approval'.            If the admin accepts it, the state is "
 "'Approved'. If it is refused, the state is 'Refused'."
 msgstr ""
+"L'estat d'una petició d'absència en el moment de crear-se és 'Esborrany'.\n"
+" Quan l'usuari la confirma, s'envia al responsable i el seu estat canvia a "
+"'Esperant aprovació'. Si el responsable l'autoritza, l'estat canvia a "
+"'Aprovada', però si la rebutja el seu estat canvia a 'Rebutjada'."
 
 #. module: hr_holidays
 #: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
 #, python-format
 msgid "You have to select at least 1 Department. And try again"
-msgstr ""
+msgstr "Heu de seleccionar almenys 1 departament. I intenteu de nou."
 
 #. module: hr_holidays
 #: selection:hr.holidays.summary.dept,holiday_type:0
@@ -428,18 +433,18 @@ msgstr ""
 #. module: hr_holidays
 #: field:hr.holidays.status,limit:0
 msgid "Allow to Override Limit"
-msgstr ""
+msgstr "Permite sobrepasar límite"
 
 #. module: hr_holidays
 #: view:hr.holidays.summary.employee:0
 #: model:ir.actions.act_window,name:hr_holidays.action_hr_holidays_summary_employee
 msgid "Employee's Holidays"
-msgstr ""
+msgstr "Absències de l'empleat"
 
 #. module: hr_holidays
 #: field:hr.holidays,category_id:0
 msgid "Category"
-msgstr ""
+msgstr "Categoria"
 
 #. module: hr_holidays
 #: help:hr.holidays.status,max_leaves:0
@@ -469,7 +474,7 @@ msgstr "Absències per departament"
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Black"
-msgstr ""
+msgstr "Negre"
 
 #. module: hr_holidays
 #: field:resource.calendar.leaves,holiday_id:0
@@ -507,12 +512,12 @@ msgstr "Usuari/a"
 #. module: hr_holidays
 #: field:hr.holidays.status,active:0
 msgid "Active"
-msgstr ""
+msgstr "Actiu"
 
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_manager_board
 msgid "Leaves To Validate"
-msgstr ""
+msgstr "Absències per validar"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -617,12 +622,12 @@ msgstr "Petició d'assignació"
 #. module: hr_holidays
 #: model:ir.model,name:hr_holidays.model_resource_calendar_leaves
 msgid "Leave Detail"
-msgstr ""
+msgstr "Detall absència"
 
 #. module: hr_holidays
 #: field:hr.holidays.status,double_validation:0
 msgid "Apply Double Validation"
-msgstr ""
+msgstr "Aplica doble validació"
 
 #. module: hr_holidays
 #: view:hr.holidays.summary.dept:0
@@ -633,28 +638,28 @@ msgstr ""
 #. module: hr_holidays
 #: view:hr.holidays.status:0
 msgid "Details"
-msgstr ""
+msgstr "Detalls"
 
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.action_hr_holidays_leaves_by_month
 msgid "My Leaves"
-msgstr ""
+msgstr "Les meves absències"
 
 #. module: hr_holidays
 #: selection:hr.holidays,holiday_type:0
 msgid "By Employee Category"
-msgstr ""
+msgstr "Per categoria d'empleat"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: selection:hr.holidays,type:0
 msgid "Leave Request"
-msgstr ""
+msgstr "Petició d'absència"
 
 #. module: hr_holidays
 #: field:hr.holidays,name:0
 msgid "Description"
-msgstr ""
+msgstr "Descripció"
 
 #. module: hr_holidays
 #: help:hr.holidays,holiday_type:0
@@ -667,42 +672,42 @@ msgstr ""
 #: code:addons/hr_holidays/hr_holidays.py:186
 #, python-format
 msgid "You cannot delete a leave which is not in draft state !"
-msgstr ""
+msgstr "No podeu eliminar una absència que no estigui en l'estat esborrany!"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Search Leave"
-msgstr ""
+msgstr "Cerca absència"
 
 #. module: hr_holidays
 #: field:hr.holidays.summary.employee,holiday_type:0
 msgid "Select Holiday Type"
-msgstr ""
+msgstr "Selecciona tipus de vacances"
 
 #. module: hr_holidays
 #: field:hr.holidays.remaining.leaves.user,no_of_leaves:0
 msgid "Remaining leaves"
-msgstr ""
+msgstr "Absències restants"
 
 #. module: hr_holidays
 #: field:hr.holidays.summary.dept,depts:0
 msgid "Department(s)"
-msgstr ""
+msgstr "Departament(s)"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "This Month"
-msgstr ""
+msgstr "Aquest mes"
 
 #. module: hr_holidays
 #: field:hr.holidays,manager_id2:0
 msgid "Second Approval"
-msgstr ""
+msgstr "Segona aprovació"
 
 #. module: hr_holidays
 #: field:hr.holidays,date_to:0
 msgid "End Date"
-msgstr ""
+msgstr "Data final"
 
 #. module: hr_holidays
 #: help:hr.holidays.status,limit:0
@@ -710,6 +715,8 @@ msgid ""
 "If you tick this checkbox, the system will allow, for this section, the "
 "employees to take more leaves than the available ones."
 msgstr ""
+"Si marqueu aquesta casella, el sistema permetrà als empleats, per aquesta "
+"secció, agafar-se més absències de les disponibles."
 
 #. module: hr_holidays
 #: help:hr.holidays.status,leaves_taken:0
@@ -717,6 +724,8 @@ msgid ""
 "This value is given by the sum of all holidays requests with a negative "
 "value."
 msgstr ""
+"Aquest valor es calcul sumant totes les peticions d'absències amb un valor "
+"negatiu."
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -726,7 +735,7 @@ msgstr ""
 #. module: hr_holidays
 #: field:hr.holidays.status,max_leaves:0
 msgid "Maximum Allowed"
-msgstr ""
+msgstr "Màxim permès"
 
 #. module: hr_holidays
 #: help:hr.holidays,manager_id2:0
@@ -734,47 +743,50 @@ msgid ""
 "This area is automaticly filled by the user who validate the leave with "
 "second level (If Leave type need second validation)"
 msgstr ""
+"Aquest espai es emplenat automàticament per l'usuari que valida l'absència "
+"en segon nivell (si el tipus d'absència necessita segona validació)"
 
 #. module: hr_holidays
 #: model:ir.module.module,shortdesc:hr_holidays.module_meta_information
 msgid "Human Resources: Holidays management"
-msgstr ""
+msgstr "Recursos humans: Gestió d'absències"
 
 #. module: hr_holidays
 #: model:ir.model,name:hr_holidays.model_hr_holidays_summary_dept
 msgid "HR Holidays Summary Report By Department"
-msgstr ""
+msgstr "Informe de RRHH de resum d'absències per departament"
 
 #. module: hr_holidays
 #: help:hr.holidays,manager_id:0
 msgid "This area is automaticly filled by the user who validate the leave"
 msgstr ""
+"Aquest espai es emplenat automàticament per l'usuari que valida l'absència"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Approve"
-msgstr ""
+msgstr "Aprova"
 
 #. module: hr_holidays
 #: field:hr.holidays,date_from:0
 msgid "Start Date"
-msgstr ""
+msgstr "Data d'inici"
 
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.open_allocation_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_open_allocation_holidays
 msgid "Allocation Requests"
-msgstr ""
+msgstr "Peticions d'assignació"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Light Yellow"
-msgstr ""
+msgstr "Groc clar"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Light Pink"
-msgstr ""
+msgstr "Rosa clar"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
diff --git a/addons/hr_recruitment/i18n/ru.po b/addons/hr_recruitment/i18n/ru.po
index 61f406a13d7..42af273a419 100644
--- a/addons/hr_recruitment/i18n/ru.po
+++ b/addons/hr_recruitment/i18n/ru.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-01-19 12:00+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2011-04-12 16:29+0000\n"
+"Last-Translator: Stanislav Hanzhin <Unknown>\n"
 "Language-Team: Russian <ru@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: 2011-01-25 06:43+0000\n"
-"X-Generator: Launchpad (build 12177)\n"
+"X-Launchpad-Export-Date: 2011-04-13 14:35+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
 #. module: hr_recruitment
 #: help:hr.applicant,active:0
diff --git a/addons/mrp/i18n/bg.po b/addons/mrp/i18n/bg.po
index 4f30dcc55fd..6b4a53e9ee9 100644
--- a/addons/mrp/i18n/bg.po
+++ b/addons/mrp/i18n/bg.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-03-28 19:44+0000\n"
-"Last-Translator: Dimitar Markov <dimitar.markov@gmail.com>\n"
+"PO-Revision-Date: 2011-04-12 16:42+0000\n"
+"Last-Translator: Vasil Bojilov Bovilov <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: 2011-03-29 06:21+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-04-13 14:35+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
 #. module: mrp
 #: field:mrp.production,move_created_ids:0
@@ -252,7 +252,7 @@ msgstr "Версия"
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.next_id_77
 msgid "Reporting"
-msgstr "Отчети"
+msgstr "Справки"
 
 #. module: mrp
 #: field:mrp.workcenter,costs_cycle_account_id:0
@@ -342,7 +342,7 @@ msgstr "Опитвате се да зададете партида, която 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_production_order
 msgid "Production Order Report"
-msgstr "Производствена поръчка отчет"
+msgstr "Справка за поизводствена поръчка"
 
 #. module: mrp
 #: selection:mrp.production.order,month:0
diff --git a/addons/procurement/i18n/es_EC.po b/addons/procurement/i18n/es_EC.po
index e0e9652538d..e81b0e87389 100644
--- a/addons/procurement/i18n/es_EC.po
+++ b/addons/procurement/i18n/es_EC.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-04-11 18:28+0000\n"
+"PO-Revision-Date: 2011-04-12 17:12+0000\n"
 "Last-Translator: Cristian Salamea (Gnuthink) <ovnicraft@gmail.com>\n"
 "Language-Team: Spanish (Ecuador) <es_EC@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: 2011-04-12 06:07+0000\n"
+"X-Launchpad-Export-Date: 2011-04-13 14:35+0000\n"
 "X-Generator: Launchpad (build 12735)\n"
 
 #. module: procurement
@@ -517,52 +517,58 @@ msgid ""
 "background, you may have to wait for a few minutes until it has finished "
 "computing."
 msgstr ""
+"Este asistente le permite ejecutar todos los abastecimientos, órdenes de "
+"producción y/o compra que deben de ser procesadas en función de su "
+"configuración. Por defecto, el planificador es ejecutado automáticamente "
+"cada noche por OpenERP. Puede utilizar este menú para ejecutarlo ahora. "
+"Tenga en cuenta que, como se ejecuta en segundo plano, puede que tenga que "
+"esperar unos minutos hasta que termine el proceso."
 
 #. module: procurement
 #: view:procurement.order:0
 #: field:procurement.order,note:0
 msgid "Note"
-msgstr ""
+msgstr "Notas"
 
 #. module: procurement
 #: selection:procurement.order,state:0
 msgid "Draft"
-msgstr ""
+msgstr "Borrador"
 
 #. module: procurement
 #: view:procurement.order.compute:0
 msgid "This wizard will schedule procurements."
-msgstr ""
+msgstr "Este asistente planificará abastecimientos."
 
 #. module: procurement
 #: view:procurement.order:0
 msgid "Status"
-msgstr ""
+msgstr "Estado"
 
 #. module: procurement
 #: selection:procurement.order,priority:0
 msgid "Normal"
-msgstr ""
+msgstr "Normal"
 
 #. module: procurement
 #: constraint:stock.move:0
 msgid "You try to assign a lot which is not from the same product"
-msgstr ""
+msgstr "Está intentando asignar un lote que no es del mismo producto"
 
 #. module: procurement
 #: field:stock.warehouse.orderpoint,active:0
 msgid "Active"
-msgstr ""
+msgstr "Activo"
 
 #. module: procurement
 #: model:process.node,name:procurement.process_node_procureproducts0
 msgid "Procure Products"
-msgstr ""
+msgstr "Abastecer productos"
 
 #. module: procurement
 #: field:procurement.order,date_planned:0
 msgid "Scheduled date"
-msgstr ""
+msgstr "Fecha planificada"
 
 #. module: procurement
 #: selection:procurement.order,state:0
diff --git a/addons/sale/i18n/ru.po b/addons/sale/i18n/ru.po
index 70a6fdbffc6..9229c48cb10 100644
--- a/addons/sale/i18n/ru.po
+++ b/addons/sale/i18n/ru.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2011-03-11 11:10+0000\n"
+"PO-Revision-Date: 2011-04-12 16:28+0000\n"
 "Last-Translator: Stanislav Hanzhin <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: 2011-03-12 06:16+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-04-13 14:35+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
 #. module: sale
 #: view:board.board:0
@@ -144,6 +144,14 @@ msgid ""
 "configuration of the sales order, a draft invoice will be generated so that "
 "you just have to confirm it when you want to bill your customer."
 msgstr ""
+"Заказы на продажу помогают вам управлять запросами/предложениями цен и "
+"заказами от клиентов. OpenERP предполагает, что вы начинаете с создания "
+"запроса/предложения цен. Как только это подтверждается, запрос/предложение "
+"цен будет преобразован в заказ на продажу. OpenERP может обрабатывать "
+"множество видов ТМЦ так, что заказ может вызвать выполнение задач, доставку "
+"заказов, заказы на производство, закупки и так далее. В зависимости от вида "
+"заказа на продажу, черновик счета будет создан и вы просто должны "
+"подтвердить его в случае выставления счета заказчику."
 
 #. module: sale
 #: help:sale.order,invoice_quantity:0
@@ -809,7 +817,7 @@ msgstr "Журнал"
 #. module: sale
 #: field:sale.config.picking_policy,picking_policy:0
 msgid "Picking Default Policy"
-msgstr "Политика комплекнования по умолчанию"
+msgstr "Политика комплектования по умолчанию"
 
 #. module: sale
 #: help:sale.order,invoice_ids:0
@@ -1884,7 +1892,7 @@ msgstr "Журналы счетов"
 #. module: sale
 #: field:sale.advance.payment.inv,product_id:0
 msgid "Advance Product"
-msgstr ""
+msgstr "Продвижение продукта"
 
 #. module: sale
 #: view:sale.report:0
diff --git a/addons/stock_planning/i18n/sv.po b/addons/stock_planning/i18n/sv.po
new file mode 100644
index 00000000000..26b3c05aa05
--- /dev/null
+++ b/addons/stock_planning/i18n/sv.po
@@ -0,0 +1,1474 @@
+# Swedish translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:16+0000\n"
+"PO-Revision-Date: 2011-04-12 20:17+0000\n"
+"Last-Translator: Magnus Brandt (mba), Aspirix AB <Unknown>\n"
+"Language-Team: Swedish <sv@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: 2011-04-13 14:35+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
+
+#. module: stock_planning
+#: code:addons/stock_planning/wizard/stock_planning_createlines.py:73
+#, python-format
+msgid ""
+"No forecasts for selected period or no products in selected category !"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,stock_only:0
+msgid ""
+"Check to calculate stock location of selected warehouse only. If not "
+"selected calculation is made for input, stock and output location of "
+"warehouse."
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,maximum_op:0
+msgid "Maximum Rule"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period1_per_company:0
+msgid "This Copmany Period1"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning:0
+#: view:stock.sale.forecast:0
+msgid "Group By..."
+msgstr "Gruppera på"
+
+#. module: stock_planning
+#: help:stock.sale.forecast,product_amt:0
+msgid ""
+"Forecast value which will be converted to Product Quantity according to "
+"prices."
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:621
+#: code:addons/stock_planning/stock_planning.py:663
+#, python-format
+msgid "Incoming Left must be greater than 0 !"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,outgoing_before:0
+msgid ""
+"Planned Out in periods before calculated. Between start date of current "
+"period and one day before start of calculated period."
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/wizard/stock_planning_forecast.py:59
+#, python-format
+msgid "No products in selected category !"
+msgstr "Inga produkter i vald kategori"
+
+#. module: stock_planning
+#: help:stock.sale.forecast.createlines,warehouse_id:0
+msgid ""
+"Warehouse which forecasts will concern. If during stock planning you will "
+"need sales forecast for all warehouses choose any warehouse now."
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,outgoing_left:0
+msgid "Expected Out"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.sale.forecast:0
+msgid " "
+msgstr " "
+
+#. module: stock_planning
+#: field:stock.planning,incoming_left:0
+msgid "Incoming Left"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Requisition history"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.sale.forecast.createlines:0
+msgid "Create Forecasts Lines"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,outgoing:0
+msgid "Quantity of all confirmed outgoing moves in calculated Period."
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.period.createlines:0
+msgid "Create Daily Periods"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning:0
+#: field:stock.planning,company_id:0
+#: field:stock.planning.createlines,company_id:0
+#: view:stock.sale.forecast:0
+#: field:stock.sale.forecast,company_id:0
+#: field:stock.sale.forecast.createlines,company_id:0
+msgid "Company"
+msgstr "Företag"
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:640
+#: code:addons/stock_planning/stock_planning.py:682
+#, python-format
+msgid ""
+"\n"
+" Initial Stock: "
+msgstr ""
+"\n"
+" Ingående Lager: "
+
+#. module: stock_planning
+#: help:stock.planning,warehouse_forecast:0
+msgid ""
+"All sales forecasts for selected Warehouse of selected Product during "
+"selected Period."
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.ui.menu,name:stock_planning.menu_stock_period_creatlines
+msgid "Create Stock and Sales Periods"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Minimum Stock Rule Indicators"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.sale.forecast.createlines,period_id:0
+msgid "Period which forecasts will concern."
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,stock_only:0
+msgid "Stock Location Only"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,already_out:0
+msgid ""
+"Quantity which is already dispatched out of this warehouse in current period."
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,procure_to_stock:0
+msgid ""
+"Chect to make procurement to stock location of selected warehouse. If not "
+"selected procurement will be made into input location of warehouse."
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Current Period Situation"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.period.createlines:0
+msgid "Create Monthly Periods"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,supply_warehouse_id:0
+msgid ""
+"Warehouse used as source in supply pick move created by 'Supply from Another "
+"Warhouse'."
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.model,name:stock_planning.model_stock_period_createlines
+msgid "stock.period.createlines"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,outgoing_before:0
+msgid "Planned Out Before"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning.createlines,forecasted_products:0
+msgid "All Products with Forecast"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.sale.forecast:0
+msgid "Periods :"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,already_in:0
+msgid ""
+"Quantity which is already picked up to this warehouse in current period."
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:644
+#: code:addons/stock_planning/stock_planning.py:686
+#, python-format
+msgid "    Confirmed In Before: "
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.sale.forecast:0
+msgid "Stock and Sales Forecast"
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.model,name:stock_planning.model_stock_sale_forecast
+msgid "stock.sale.forecast"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_dept_id:0
+msgid "This Department"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,to_procure:0
+msgid "Planned In"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,stock_simulation:0
+msgid "Stock Simulation"
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.model,name:stock_planning.model_stock_planning_createlines
+msgid "stock.planning.createlines"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,incoming_before:0
+msgid ""
+"Confirmed incoming in periods before calculated (Including Already In). "
+"Between start date of current period and one day before start of calculated "
+"period."
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.sale.forecast:0
+msgid "Search  Sales Forecast"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period5_per_user:0
+msgid "This User Period5"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,history:0
+msgid "History of procurement or internal supply of this planning line."
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,company_forecast:0
+msgid ""
+"All sales forecasts for whole company (for all Warehouses) of selected "
+"Product during selected Period."
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period1_per_user:0
+msgid "This User Period1"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period3_per_user:0
+msgid "This User Period3"
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.ui.menu,name:stock_planning.menu_stock_planning_main
+#: view:stock.planning:0
+msgid "Stock Planning"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,minimum_op:0
+msgid "Minimum Rule"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Procure Incoming Left"
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:646
+#: code:addons/stock_planning/stock_planning.py:688
+#, python-format
+msgid "    Incoming Left: "
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:715
+#, python-format
+msgid "Pick List "
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning.createlines:0
+#: view:stock.sale.forecast.createlines:0
+msgid "Create"
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.actions.act_window,name:stock_planning.action_view_stock_planning_form
+#: model:ir.module.module,shortdesc:stock_planning.module_meta_information
+#: model:ir.ui.menu,name:stock_planning.menu_stock_planning
+#: view:stock.planning:0
+msgid "Master Procurement Schedule"
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:636
+#: code:addons/stock_planning/stock_planning.py:678
+#, python-format
+msgid "  Creation Date: "
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,period_id:0
+#: field:stock.planning.createlines,period_id:0
+#: field:stock.sale.forecast,period_id:0
+#: field:stock.sale.forecast.createlines,period_id:0
+msgid "Period"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.period:0
+#: field:stock.period,state:0
+#: field:stock.planning,state:0
+#: field:stock.sale.forecast,state:0
+msgid "State"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.sale.forecast.createlines,product_categ_id:0
+msgid "Product Category of products which created forecasts will concern."
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.model,name:stock_planning.model_stock_period
+msgid "stock period"
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.model,name:stock_planning.model_stock_sale_forecast_createlines
+msgid "stock.sale.forecast.createlines"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,warehouse_id:0
+#: field:stock.planning.createlines,warehouse_id:0
+#: field:stock.sale.forecast,warehouse_id:0
+#: field:stock.sale.forecast.createlines,warehouse_id:0
+msgid "Warehouse"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,stock_simulation:0
+msgid ""
+"Stock simulation at the end of selected Period.\n"
+" For current period it is: \n"
+"Initial Stock - Already Out + Already In - Expected Out + Incoming Left.\n"
+"For periods ahead it is: \n"
+"Initial Stock - Planned Out Before + Incoming Before - Planned Out + Planned "
+"In."
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.sale.forecast,analyze_company:0
+msgid "Check this box to see the sales for whole company."
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,name:0
+msgid "Name"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Search Stock Planning"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,incoming_before:0
+msgid "Incoming Before"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning.createlines,product_categ_id:0
+#: field:stock.sale.forecast.createlines,product_categ_id:0
+msgid "Product Category"
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:621
+#: code:addons/stock_planning/stock_planning.py:663
+#: code:addons/stock_planning/stock_planning.py:665
+#: code:addons/stock_planning/stock_planning.py:667
+#: code:addons/stock_planning/wizard/stock_planning_createlines.py:73
+#: code:addons/stock_planning/wizard/stock_planning_forecast.py:59
+#, python-format
+msgid "Error !"
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:626
+#, python-format
+msgid "Manual planning for "
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_user_id:0
+msgid "This User"
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:643
+#: code:addons/stock_planning/stock_planning.py:685
+#, python-format
+msgid ""
+"\n"
+" Confirmed Out: "
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Forecasts"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Supply from Another Warehouse"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Calculate Planning"
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:636
+#, python-format
+msgid "Procurement created in MPS by user: "
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:140
+#, python-format
+msgid "Invalid action !"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,stock_start:0
+msgid "Stock quantity one day before current period."
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.period.createlines:0
+msgid "Create Weekly Periods"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,maximum_op:0
+msgid "Maximum quantity set in Minimum Stock Rules for this Warhouse"
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:665
+#, python-format
+msgid "You must specify a Source Warehouse !"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning.createlines:0
+msgid "Creates planning lines for selected period and warehouse."
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period4_per_user:0
+msgid "This User Period4"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning.createlines:0
+#: view:stock.sale.forecast.createlines:0
+msgid "Note: Doesn't duplicate existing lines created by you."
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.period:0
+msgid "Stock and Sales Period"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,company_forecast:0
+msgid "Company Forecast"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,product_uom:0
+#: help:stock.sale.forecast,product_uom:0
+msgid ""
+"Unit of Measure used to show the quanities of stock calculation.You can use "
+"units form default category or from second category (UoS category)."
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.sale.forecast:0
+msgid "Per User :"
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.ui.menu,name:stock_planning.menu_stock_sale_forecast
+#: model:ir.ui.menu,name:stock_planning.menu_stock_sale_forecast_all
+#: view:stock.sale.forecast:0
+msgid "Sales Forecasts"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.period,name:0
+#: field:stock.period.createlines,name:0
+msgid "Period Name"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,user_id:0
+msgid "Created/Validated by"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Internal Supply"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period4_per_company:0
+msgid "This Company Period4"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period5_per_company:0
+msgid "This Company Period5"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period2_per_company:0
+msgid "This Company Period2"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period3_per_company:0
+msgid "This Company Period3"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.period,date_start:0
+#: field:stock.period.createlines,date_start:0
+msgid "Start Date"
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:642
+#: code:addons/stock_planning/stock_planning.py:684
+#, python-format
+msgid ""
+"\n"
+" Already Out: "
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,confirmed_forecasts_only:0
+msgid "Validated Forecasts"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning.createlines,product_categ_id:0
+msgid ""
+"Planning will be created for products from Product Category selected by this "
+"field. This field is ignored when you check \"All Forecasted Product\" box."
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,planned_outgoing:0
+msgid "Planned Out"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.sale.forecast:0
+msgid "Per Department :"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Forecast"
+msgstr ""
+
+#. module: stock_planning
+#: selection:stock.period,state:0
+#: selection:stock.planning,state:0
+#: selection:stock.sale.forecast,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.period:0
+msgid "Closed"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning:0
+#: view:stock.sale.forecast:0
+msgid "Warehouse "
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:646
+#: code:addons/stock_planning/stock_planning.py:688
+#, python-format
+msgid ""
+"\n"
+" Expected Out: "
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.period.createlines:0
+msgid "Create periods for Stock and Sales Planning"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,planned_outgoing:0
+msgid ""
+"Enter planned outgoing quantity from selected Warehouse during the selected "
+"Period of selected Product. To plan this value look at Confirmed Out or "
+"Sales Forecasts. This value should be equal or greater than Confirmed Out."
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.module.module,description:stock_planning.module_meta_information
+msgid ""
+"\n"
+"This module is based on original OpenERP SA module stock_planning version "
+"1.0 of the same name Master Procurement Schedule.\n"
+"\n"
+"Purpose of MPS is to allow create a manual procurement (requisition) apart "
+"of MRP scheduler (which works automatically on minimum stock rules).\n"
+"\n"
+"Terms used in the module:\n"
+"- Stock and Sales Period - is the time (between Start Date and End Date) for "
+"which you plan Stock and Sales Forecast and make Procurement Planning. \n"
+"- Stock and Sales Forecast - is the quantity of products you plan to sell in "
+"the Period.\n"
+"- Stock Planning - is the quantity of products you plan to purchase or "
+"produce for the Period.\n"
+"\n"
+"Because we have another module sale_forecast which uses terms \"Sales "
+"Forecast\" and \"Planning\" as amount values we will use terms \"Stock and "
+"Sales Forecast\" and \"Stock Planning\" to emphasize that we use quantity "
+"values. \n"
+"\n"
+"Activity with this module is divided to three steps:\n"
+"- Creating Periods. Mandatory step.\n"
+"- Creating Sale Forecasts and entering quantities to them. Optional step but "
+"useful for further planning.\n"
+"- Creating Planning lines, entering quantities to them and making "
+"Procurement. Making procurement is the final step for the Period.\n"
+"\n"
+"Periods\n"
+"=======\n"
+"You have two menu items for Periods in \"Sales Management - Configuration\". "
+"There are:\n"
+"- \"Create Sales Periods\" - Which automates creating daily, weekly or "
+"monthly periods.\n"
+"- \"Stock and sales Periods\" - Which allows to create any type of periods, "
+"change the dates and change the State of period.\n"
+"\n"
+"Creating periods is the first step you have to do to use modules features. "
+"You can create custom periods using \"New\" button in \"Stock and Sales "
+"Periods\" form or view but it is recommended to use automating tool.\n"
+"\n"
+"Remarks:\n"
+"- These periods (officially Stock and Sales Periods) are separated of "
+"Financial or other periods in the system.\n"
+"- Periods are not assigned to companies (when you use multicompany feature "
+"at all). Module suppose that you use the same periods across companies. If "
+"you wish to use different periods for different companies define them as you "
+"wish (they can overlap). Later on in this text will be indications how to "
+"use such periods.\n"
+"- When periods are created automatically their start and finish dates are "
+"with start hour 00:00:00 and end hour 23:59:00. Fe. when you create daily "
+"periods they will have start date 31.01.2010 00:00:00 and end date "
+"31.01.2010 23:59:00. It works only in automatic creation of periods. When "
+"you create periods manually you have to take care about hours because you "
+"can have incorrect values form sales or stock. \n"
+"- If you use overlapping periods for the same product, warehouse and company "
+"results can be unpredictable.\n"
+"- If current date doesn't belong to any period or you have holes between "
+"periods results can be unpredictable.\n"
+"\n"
+"Sales Forecasts\n"
+"===============\n"
+"You have few menus for Sales forecast in \"Sales Management - Sales "
+"Forecasts\".\n"
+"- \"Create Sales Forecasts for Sales Periods\" - which automates creating "
+"forecasts lines according to some parameters.\n"
+"- \"Sales Forecasts\" - few menus for working with forecasts lists and "
+"forms.\n"
+"\n"
+"Menu \"Create Sales Forecasts for Sales Periods\" creates Forecasts for "
+"products from selected Category, for selected Period and for selected "
+"Warehouse. It is an option \"Copy Last Forecast\" to copy forecast and other "
+"settings of period before this one to created one.\n"
+"\n"
+"Remarks:\n"
+"- This tool doesn't create lines, if relevant lines (for the same Product, "
+"Period, Warehouse and validated or created by you) already exists. If you "
+"wish to create another forecast, if relevant lines exists you have to do it "
+"manually using menus described bellow.\n"
+"- When created lines are validated by someone else you can use this tool to "
+"create another lines for the same Period, Product and Warehouse. \n"
+"- When you choose \"Copy Last Forecast\" created line takes quantity and "
+"some settings from your (validated by you or created by you if not validated "
+"yet) forecast which is for last period before period of created forecast. If "
+"there are few your forecasts for period before this one (it is possible) "
+"system takes one of them (no rule which of them).\n"
+"\n"
+"\n"
+"Menus \"Sales Forecasts\"\n"
+"On \"Sales Forecast\" form mainly you have to enter a forecast quantity in "
+"\"Product Quantity\". Further calculation can work for draft forecasts. But "
+"validation can save your data against any accidental changes. You can click "
+"\"Validate\" button but it is not mandatory.\n"
+"\n"
+"Instead of forecast quantity you can enter amount of forecast sales in field "
+"\"Product Amount\". System will count quantity from amount according to Sale "
+"price of the Product.\n"
+"\n"
+"All values on the form are expressed in unit of measure selected on form. "
+"You can select one of unit of measure from default category or from second "
+"category. When you change unit of measure the quanities will be recalculated "
+"according to new UoM: editable values (blue fields) immediately, non edited "
+"fields after clicking of \"Calculate Planning\" button.\n"
+"\n"
+"To find proper value for Sale Forecast you can use \"Sales History\" table "
+"for this product. You have to enter parameters to the top and left of this "
+"table and system will count sale quantities according to these parameters. "
+"So you can select fe. your department (at the top) then (to the left): last "
+"period, period before last and period year ago.\n"
+"\n"
+"Remarks:\n"
+"\n"
+"\n"
+"Procurement Planning\n"
+"====================\n"
+"Menu for Planning you can find in \"Warehouse - Stock Planning\".\n"
+"- \"Create Stock Planning Lines\" - allows you to automate creating planning "
+"lines according to some parameters.\n"
+"- \"Master Procurement Scheduler\" - is the most important menu of the "
+"module which allows to create procurement.\n"
+"\n"
+"As Sales forecast is phase of planning sales. The Procurement Planning "
+"(Planning) is the phase of scheduling Purchasing or Producing. You can "
+"create Procurement Planning quickly using tool from menu \"Create Stock "
+"Planning Lines\", then you can review created planning and make procurement "
+"using menu \"Master Procurement Schedule\".\n"
+"\n"
+"Menu \"Create Stock Planning Lines\" allows you to create quickly Planning "
+"lines for products from selected Category, for selected Period, and for "
+"selected Warehouse. When you check option \"All Products with Forecast\" "
+"system creates lines for all products having forecast for selected Period "
+"and Warehouse. Selected Category will be ignored in this case.\n"
+"\n"
+"Under menu \"Master Procurement Scheduler\" you can generally change the "
+"values \"Planned Out\" and \"Planned In\" to observe the field \"Stock "
+"Simulation\" and decide if this value would be accurate for end of the "
+"Period. \n"
+"\"Planned Out\" can be based on \"Warehouse Forecast\" which is the sum of "
+"all forecasts for Period and Warehouse. But your planning can be based on "
+"any other information you have. It is not necessary to have any forecast. \n"
+"\"Planned In\" quantity is used to calculate field \"Incoming Left\" which "
+"is the quantity to be procured to make stock as indicated in \"Stock "
+"Simulation\" at the end of Period. You can compare \"Stock Simulation\" "
+"quantity to minimum stock rules visible on the form. But you can plan "
+"different quantity than in Minimum Stock Rules. Calculation is made for "
+"whole Warehouse by default. But if you want to see values for Stock location "
+"of calculated warehouse you can use check box \"Stock Location Only\".\n"
+"\n"
+"If after few tries you decide that you found correct quantities for "
+"\"Planned Out\" and \"Planned In\" and you are satisfied with end of period "
+"stock calculated in \"Stock Simulation\" you can click \"Procure Incoming "
+"Left\" button to procure quantity of field \"Incoming Left\" into the "
+"Warehouse. System creates appropriate Procurement Order. You can decide if "
+"procurement will be made to Stock or Input location of calculated Warehouse. "
+"\n"
+"\n"
+"If you don't want to Produce or Buy the product but just pick calculated "
+"quantity from another warehouse you can click \"Supply from Another "
+"Warehouse\" (instead of \"Procure Incoming Left\"). System creates pick list "
+"with move from selected source Warehouse to calculated Warehouse (as "
+"destination). You can also decide if this pick should be done from Stock or "
+"Output location of source warehouse. Destination location (Stock or Input) "
+"of destination warehouse will be used as set for \"Procure Incoming Left\". "
+"\n"
+"\n"
+"To see proper quantities in fields \"Confirmed In\", \"Confirmed Out\", "
+"\"Confirmed In Before\", \"Planned Out Before\" and \"Stock Simulation\" you "
+"have to click button \"Calculate Planning\".\n"
+"\n"
+"All values on the form are expressed in unit of measure selected on form. "
+"You can select one of unit of measure from default category or from second "
+"category. When you change unit of measure the quanities will be recalculated "
+"according to new UoM: editable values (blue fields) immediately, non edited "
+"fields after clicking of \"Calculate Planning\" button.\n"
+"\n"
+"How Stock Simulation field is calculated:\n"
+"Generally Stock Simulation shows the stock for end of the calculated period "
+"according to some planned or confirmed stock moves. Calculation always "
+"starts with quantity of real stock of beginning of current period. Then "
+"calculation adds or subtracts quantities of calculated period or periods "
+"before calculated.\n"
+"When you are in the same period (current period is the same as calculated) "
+"Stock Simulation is calculated as follows:\n"
+"Stock Simulation = \n"
+"\tStock of beginning of current Period\n"
+"\t- Planned Out \n"
+"\t+ Planned In\n"
+"\n"
+"When you calculate period next to current:\n"
+"Stock Simulation = \n"
+"\tStock of beginning of current Period\n"
+"\t- Planned Out of current Period \n"
+"\t+ Confirmed In of current Period  (incl. Already In)\n"
+"\t- Planned Out of calculated Period \n"
+"\t+ Planned In of calculated Period .\n"
+"\n"
+"As you see calculated Period is taken the same way like in case above. But "
+"calculation of current Period are made a little bit different. First you "
+"should note that system takes for current Period only Confirmed In moves. It "
+"means that you have to make planning and procurement for current Period "
+"before this calculation (for Period next to current). \n"
+"\n"
+"When you calculate Period ahead:\n"
+"Stock Simulation = \n"
+"\tStock of beginning of current Period \n"
+"\t- Sum of Planned Out of Periods before calculated \n"
+"\t+ Sum of Confirmed In of Periods before calculated (incl. Already In) \n"
+"\t- Planned Out of calculated Period \n"
+"\t+ Planned In of calculated Period.\n"
+"\n"
+"Periods before calculated means periods starting from current till period "
+"before calculated.\n"
+"\n"
+"Remarks:\n"
+"- Remember to make planning for all periods before calculated because "
+"omitting these quantities and procurements can cause wrong suggestions for "
+"procurements few periods ahead.\n"
+"- If you made planning few periods ahead and you find that real Confirmed "
+"Out is bigger than Planned Out in some periods before you can repeat "
+"Planning and make another procurement. You should do it in the same planning "
+"line. If you create another planning line the suggestions can be wrong.\n"
+"- When you wish to work with different periods for some part of products "
+"define two kinds of periods (fe. Weekly and Monthly) and use them for "
+"different products. Example: If you use always Weekly periods for Products "
+"A, and Monthly periods for Products B your all calculations will work "
+"correctly. You can also use different kind of periods for the same products "
+"from different warehouse or companies. But you cannot use overlapping "
+"periods for the same product, warehouse and company because results can be "
+"unpredictable. The same apply to Forecasts lines.\n"
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:140
+#, python-format
+msgid "Cannot delete Validated Sale Forecasts !"
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:641
+#: code:addons/stock_planning/stock_planning.py:683
+#, python-format
+msgid ""
+"\n"
+" Planned Out: "
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:667
+#, python-format
+msgid ""
+"You must specify a Source Warehouse different than calculated (destination) "
+"Warehouse !"
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.actions.act_window,name:stock_planning.action_stock_sale_forecast_createlines_form
+#: model:ir.ui.menu,name:stock_planning.menu_stock_sale_forecast_createlines
+msgid "Create Sales Forecasts"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.sale.forecast.createlines:0
+msgid "Creates forecast lines for selected warehouse and period."
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:655
+#, python-format
+msgid "Requisition ("
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,outgoing_left:0
+msgid ""
+"Quantity expected to go out in selected period. As a difference between "
+"Planned Out and Confirmed Out. For current period Already Out is also "
+"calculated"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period4_id:0
+msgid "Period4"
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:642
+#: code:addons/stock_planning/stock_planning.py:684
+#, python-format
+msgid "    Already In: "
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period2_id:0
+msgid "Period2"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period3_id:0
+msgid "Period3"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period1_id:0
+msgid "Period1"
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:647
+#: code:addons/stock_planning/stock_planning.py:689
+#, python-format
+msgid "    Minimum stock: "
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,active_uom:0
+#: field:stock.sale.forecast,active_uom:0
+msgid "Active UoM"
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.actions.act_window,name:stock_planning.action_stock_planning_createlines_form
+#: model:ir.ui.menu,name:stock_planning.menu_stock_planning_createlines
+#: view:stock.planning.createlines:0
+msgid "Create Stock Planning Lines"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "General Info"
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.actions.act_window,name:stock_planning.action_view_stock_sale_forecast_form
+msgid "Sales Forecast"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Planning and Situation for Calculated Period"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period1_per_warehouse:0
+msgid "This Warehouse Period1"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,warehouse_forecast:0
+msgid "Warehouse Forecast"
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:643
+#: code:addons/stock_planning/stock_planning.py:685
+#, python-format
+msgid "    Confirmed In: "
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.sale.forecast:0
+msgid "Sales history"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,supply_warehouse_id:0
+msgid "Source Warehouse"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.sale.forecast,product_qty:0
+msgid "Forecasted quantity."
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Stock"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,stock_supply_location:0
+msgid "Stock Supply Location"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.period.createlines,date_stop:0
+msgid "Ending date for planning period."
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period2_per_user:0
+msgid "This User Period2"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning.createlines,forecasted_products:0
+msgid ""
+"Check this box to create planning for all products having any forecast for "
+"selected Warehouse and Period. Product Category field will be ignored."
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,already_in:0
+msgid "Already In"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,product_uom_categ:0
+#: field:stock.planning,product_uos_categ:0
+#: field:stock.sale.forecast,product_uom_categ:0
+msgid "Product UoM Category"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,incoming:0
+msgid "Confirmed In"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,line_time:0
+msgid "Past/Future"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,product_uos_categ:0
+msgid "Product UoS Category"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,product_qty:0
+msgid "Product Quantity"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast.createlines,copy_forecast:0
+msgid "Copy Last Forecast"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.sale.forecast,product_id:0
+msgid "Shows which product this forecast concerns."
+msgstr ""
+
+#. module: stock_planning
+#: selection:stock.planning,state:0
+msgid "Done"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.period.createlines,period_ids:0
+msgid "Periods"
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:638
+#: code:addons/stock_planning/stock_planning.py:680
+#, python-format
+msgid " according to state:"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.period.createlines:0
+msgid "Cancel"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.period:0
+#: selection:stock.period,state:0
+#: view:stock.planning.createlines:0
+#: view:stock.sale.forecast.createlines:0
+msgid "Close"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.sale.forecast:0
+#: selection:stock.sale.forecast,state:0
+msgid "Validated"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.period:0
+#: selection:stock.period,state:0
+msgid "Open"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.sale.forecast.createlines,copy_forecast:0
+msgid "Copy quantities from last Stock and Sale Forecast."
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period1_per_dept:0
+msgid "This Dept Period1"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period3_per_dept:0
+msgid "This Dept Period3"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period2_per_dept:0
+msgid "This Dept Period2"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period5_per_dept:0
+msgid "This Dept Period5"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period4_per_dept:0
+msgid "This Dept Period4"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period2_per_warehouse:0
+msgid "This Warehouse Period2"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period3_per_warehouse:0
+msgid "This Warehouse Period3"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,outgoing:0
+msgid "Confirmed Out"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,create_uid:0
+msgid "Responsible"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.sale.forecast:0
+msgid "Default UOM"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period4_per_warehouse:0
+msgid "This Warehouse Period4"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period5_per_warehouse:0
+msgid "This Warehouse Period5"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.period:0
+msgid "Current"
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.model,name:stock_planning.model_stock_planning
+msgid "stock.planning"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.sale.forecast,warehouse_id:0
+msgid ""
+"Shows which warehouse this forecast concerns. If during stock planning you "
+"will need sales forecast for all warehouses choose any warehouse now."
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning.createlines,warehouse_id:0
+msgid "Warehouse which planning will concern."
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:647
+#: code:addons/stock_planning/stock_planning.py:689
+#, python-format
+msgid ""
+"\n"
+" Stock Simulation: "
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,to_procure:0
+msgid ""
+"Enter quantity which (by your plan) should come in. Change this value and "
+"observe Stock simulation. This value should be equal or greater than "
+"Confirmed In."
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning.createlines,period_id:0
+msgid "Period which planning will concern."
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,already_out:0
+msgid "Already Out"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,product_id:0
+msgid "Product which this planning is created for."
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.sale.forecast:0
+msgid "Per Warehouse :"
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:639
+#: code:addons/stock_planning/stock_planning.py:681
+#, python-format
+msgid ""
+"\n"
+" Warehouse Forecast: "
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,history:0
+msgid "Procurement History"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.period.createlines,date_start:0
+msgid "Starting date for planning period."
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:641
+#: code:addons/stock_planning/stock_planning.py:683
+#, python-format
+msgid "    Planned In: "
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyze_company:0
+msgid "Per Company"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,incoming_left:0
+msgid ""
+"Quantity left to Planned incoming quantity. This is calculated difference "
+"between Planned In and Confirmed In. For current period Already In is also "
+"calculated. This value is used to create procurement for lacking quantity."
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,incoming:0
+msgid "Quantity of all confirmed incoming moves in calculated Period."
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.period,date_stop:0
+#: field:stock.period.createlines,date_stop:0
+msgid "End Date"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,stock_supply_location:0
+msgid ""
+"Check to supply from Stock location of Supply Warehouse. If not checked "
+"supply will be made from Output location of Supply Warehouse. Used in "
+"'Supply from Another Warhouse' with Supply Warehouse."
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "No Requisition"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,minimum_op:0
+msgid "Minimum quantity set in Minimum Stock Rules for this Warhouse"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.sale.forecast,period_id:0
+msgid "Shows which period this forecast concerns."
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,product_uom:0
+msgid "UoM"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Calculated Period Simulation"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning:0
+#: field:stock.planning,product_id:0
+#: view:stock.sale.forecast:0
+#: field:stock.sale.forecast,product_id:0
+msgid "Product"
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:638
+#: code:addons/stock_planning/stock_planning.py:680
+#, python-format
+msgid ""
+"\n"
+"For period: "
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,product_uom:0
+msgid "Product UoM"
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:627
+#: code:addons/stock_planning/stock_planning.py:671
+#: code:addons/stock_planning/stock_planning.py:693
+#, python-format
+msgid "MPS("
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:678
+#, python-format
+msgid "Pick created from MPS by user: "
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,procure_to_stock:0
+msgid "Procure To Stock Location"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.sale.forecast:0
+msgid "Approve"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,period_id:0
+msgid ""
+"Period for this planning. Requisition will be created for beginning of the "
+"period."
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.sale.forecast:0
+msgid "Calculate Sales History"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,product_amt:0
+msgid "Product Amount"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,confirmed_forecasts_only:0
+msgid ""
+"Check to take validated forecasts only. If not checked system takes "
+"validated and draft forecasts."
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period5_id:0
+msgid "Period5"
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.actions.act_window,name:stock_planning.action_stock_period_createlines_form
+msgid "Stock and Sales Planning Periods"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_warehouse_id:0
+msgid "This Warehouse"
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.actions.act_window,name:stock_planning.action_stock_period_form
+#: model:ir.ui.menu,name:stock_planning.menu_stock_period
+#: model:ir.ui.menu,name:stock_planning.menu_stock_period_main
+#: view:stock.period:0
+#: view:stock.period.createlines:0
+msgid "Stock and Sales Periods"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.sale.forecast,user_id:0
+msgid "Shows who created this forecast, or who validated."
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:644
+#: code:addons/stock_planning/stock_planning.py:686
+#, python-format
+msgid ""
+"\n"
+" Planned Out Before: "
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,stock_start:0
+msgid "Initial Stock"
+msgstr ""

From bf93263cc328ceb36b2df227c8f6e908711e802d Mon Sep 17 00:00:00 2001
From: Rifakat <>
Date: Wed, 13 Apr 2011 23:29:03 +0530
Subject: [PATCH 199/331] [FIX] Product : Corrected the calculation of
 pricelist when the option is 'Partner section of the product form'

lp bug: https://launchpad.net/bugs/727162 fixed

bzr revid: jvo@tinyerp.com-20110413175903-k4h01lsy3aki3ytd
---
 addons/product/pricelist.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/addons/product/pricelist.py b/addons/product/pricelist.py
index ad04b056210..f52ad20bba3 100644
--- a/addons/product/pricelist.py
+++ b/addons/product/pricelist.py
@@ -155,6 +155,7 @@ class product_pricelist(osv.osv):
 
         currency_obj = self.pool.get('res.currency')
         product_obj = self.pool.get('product.product')
+        product_template_obj = self.pool.get('product.template')
         product_category_obj = self.pool.get('product.category')
         product_uom_obj = self.pool.get('product.uom')
         supplierinfo_obj = self.pool.get('product.supplierinfo')
@@ -244,8 +245,9 @@ class product_pricelist(osv.osv):
                             price = 0.0
                             if sinfo:
                                 qty_in_product_uom = qty
-                                product_default_uom = product_obj.read(cr, uid, [tmpl_id], ['uom_id'])[0]['uom_id'][0]
-                                seller_uom = supplierinfo_obj.read(cr, uid, sinfo, ['product_uom'])[0]['product_uom'][0]
+                                product_default_uom = product_template_obj.read(cr, uid, [tmpl_id], ['uom_id'])[0]['uom_id'][0]
+                                supplier = supplierinfo_obj.browse(cr, uid, sinfo, context=context)[0]
+                                seller_uom = supplier.product_uom and supplier.product_uom.id or False
                                 if seller_uom and product_default_uom and product_default_uom != seller_uom:
                                     uom_price_already_computed = True
                                     qty_in_product_uom = product_uom_obj._compute_qty(cr, uid, product_default_uom, qty, to_uom_id=seller_uom)

From 31bcd2588fb89eb67533781fff36e8326b07f628 Mon Sep 17 00:00:00 2001
From: "Rucha (Open ERP)" <rpa@tinyerp.com>
Date: Thu, 14 Apr 2011 12:53:04 +0530
Subject: [PATCH 200/331] [FIX]: crm: Fixed missing functionalities for "Allow
 unlink" in case sections

bzr revid: rpa@tinyerp.com-20110414072304-cqvsezoeb5g20182
---
 addons/crm/crm.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index f25e4c1a0bf..7014fd77517 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -199,6 +199,13 @@ class crm_case(object):
         user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
         return user.context_section_id.id or False
 
+    def unlink(self, cr, uid, ids, context={}):
+        for case in self.browse(cr, uid, ids, context):
+            if (not case.section_id.allow_unlink) and (case.state <> 'draft'):
+                raise osv.except_osv(_('Warning !'),
+                    _('You can not delete this case. You should better cancel it.'))
+        return super(crm_case, self).unlink(cr, uid, ids, context)
+
     def _find_next_stage(self, cr, uid, stage_list, index, current_seq, stage_pool, context=None):
         if index + 1 == len(stage_list):
             return False

From b0b547ef77e5cbf1b1e132f231acbea595e36bea Mon Sep 17 00:00:00 2001
From: "Rucha (Open ERP)" <rpa@tinyerp.com>
Date: Thu, 14 Apr 2011 12:53:51 +0530
Subject: [PATCH 201/331] [IMP]: crm: Meeting recurrency option, Way to end
 reccurency, End date, then field "Repeat Until" must be set as required

bzr revid: rpa@tinyerp.com-20110414072351-7ya4vrw3tofxywc3
---
 addons/crm/crm_meeting_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index aba69889f57..70104403f23 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -179,7 +179,7 @@
                                 <field name="count" attrs="{'invisible' : [('end_type', '!=', 'count')] }"/>
                                 <label string=" " colspan="2" />
                                 <newline />
-                                <field name="end_date" attrs="{'invisible' : [('end_type', '!=', 'end_date')] }"/>
+                                <field name="end_date" attrs="{'invisible' : [('end_type', '!=', 'end_date')], 'required': [('end_type', '=', 'end_date')]}"/>
                                 <newline />
                            
                       

From 077d56f53e70f1d2c80b73213c4bd7710c4f1912 Mon Sep 17 00:00:00 2001
From: "Rucha (Open ERP)" <rpa@tinyerp.com>
Date: Thu, 14 Apr 2011 12:57:16 +0530
Subject: [PATCH 202/331] [FIX]: crm: Fixed computation of repeat Until, if I
 set 15th as until date, it must include 15th , but it was taking meetings
 till 14th only

bzr revid: rpa@tinyerp.com-20110414072716-q4ao5c2iczas19f6
---
 addons/base_calendar/base_calendar.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index 9693a0d5c0f..095a1654991 100644
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -1296,7 +1296,7 @@ e.g.: Every other month on the last Sunday of the month for 10 occurrences:\
                         if name == "UNTIL":
                             is_until = True
                             value = parser.parse(value)
-                            rrule_until_date = parser.parse(value.strftime("%Y-%m-%d"))
+                            rrule_until_date = parser.parse(value.strftime("%Y-%m-%d %H:%M:%S"))
                             if until_date and until_date >= rrule_until_date:
                                 until_date = rrule_until_date
                             if until_date:

From ba121d110d30d9932b7d1c1695f4c3e6b0051633 Mon Sep 17 00:00:00 2001
From: "Rucha (Open ERP)" <rpa@tinyerp.com>
Date: Thu, 14 Apr 2011 12:58:30 +0530
Subject: [PATCH 203/331] [IMP]: caldav: Added button in the wizard

bzr revid: rpa@tinyerp.com-20110414072830-1x4ofwu90s0ldwzd
---
 addons/caldav/wizard/caldav_browse_view.xml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/addons/caldav/wizard/caldav_browse_view.xml b/addons/caldav/wizard/caldav_browse_view.xml
index 0a7e6269fe2..53af6029883 100644
--- a/addons/caldav/wizard/caldav_browse_view.xml
+++ b/addons/caldav/wizard/caldav_browse_view.xml
@@ -15,8 +15,10 @@
                         <separator string="Description" colspan="4"/>
                         <field name="description"  colspan="4"  nolabel="1"/>
                         <separator colspan="4"/>
-                       
-                        
+                      <group col="4" colspan="4">
+                        <label string="" colspan="2"/>
+                        <button special="cancel" string="_Close" icon="gtk-close"/>
+                      </group>
                     </group>
                 </form>
             </field>

From e8e8c3bd44e023e569f28f3a4cb8c1e3300cae8c Mon Sep 17 00:00:00 2001
From: "AMP (OpenERP)" <amp@tinyerp.com>
Date: Thu, 14 Apr 2011 13:06:11 +0530
Subject: [PATCH 204/331] [FIX] account : Fixes the integrity problem when
 remove the sequence id in jounral

bzr revid: amp@tinyerp.com-20110414073611-e870z2bc1g5qrsrp
---
 addons/account/account_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index bab2f43060f..e0a355c35bf 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -454,7 +454,7 @@
                             </group>
                             <group colspan="2" col="2" groups="base.group_extended">
                                 <separator string="Sequence" colspan="4"/>
-                                <field name="sequence_id" required="0"/>
+                                <field name="sequence_id"/>
                             </group>
                         </page>
                         <page string="Entry Controls" groups="base.group_extended">

From 39d0932dfab7f6735f4b43fd1d1f1d5fbafb3e90 Mon Sep 17 00:00:00 2001
From: "Rucha (Open ERP)" <rpa@tinyerp.com>
Date: Thu, 14 Apr 2011 15:05:40 +0530
Subject: [PATCH 205/331] [FIX]: purchase: Fixed invoiced rate for purchase
 order

bzr revid: rpa@tinyerp.com-20110414093540-lv5x998zs3cv770b
---
 addons/purchase/purchase.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 6f6ab0c1b44..324fe130f81 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -98,7 +98,7 @@ class purchase_order(osv.osv):
             tot = 0.0
             for invoice in purchase.invoice_ids:
                 if invoice.state not in ('draft','cancel'):
-                    tot += invoice.amount_untaxed
+                    tot += (invoice.amount_untaxed - invoice.residual)
             if purchase.amount_untaxed:
                 res[purchase.id] = tot * 100.0 / purchase.amount_untaxed
             else:

From ec90de83c38dd6154065ec3c86e26192b7e91345 Mon Sep 17 00:00:00 2001
From: "pso (OpenERP)" <pso@tinyerp.com>
Date: Thu, 14 Apr 2011 15:10:54 +0530
Subject: [PATCH 206/331] [IMP] Usability Improvements

bzr revid: pso@tinyerp.com-20110414094054-q9yxjhj1nmjid027
---
 addons/account_payment/account_payment.py | 2 +-
 addons/hr_attendance/hr_attendance.py     | 4 ++--
 addons/point_of_sale/point_of_sale.py     | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/account_payment/account_payment.py b/addons/account_payment/account_payment.py
index f3259f846cc..8437622e93e 100644
--- a/addons/account_payment/account_payment.py
+++ b/addons/account_payment/account_payment.py
@@ -328,7 +328,7 @@ class payment_line(osv.osv):
             required=True, help='Payment amount in the partner currency'),
         'currency': fields.many2one('res.currency','Partner Currency', required=True),
         'company_currency': fields.many2one('res.currency', 'Company Currency', readonly=True),
-        'bank_id': fields.many2one('res.partner.bank', 'Destination Bank account'),
+        'bank_id': fields.many2one('res.partner.bank', 'Destination Bank Account'),
         'order_id': fields.many2one('payment.order', 'Order', required=True,
             ondelete='cascade', select=True),
         'partner_id': fields.many2one('res.partner', string="Partner", required=True, help='The Ordering Customer'),
diff --git a/addons/hr_attendance/hr_attendance.py b/addons/hr_attendance/hr_attendance.py
index 7699e7468d9..8c5648a1040 100644
--- a/addons/hr_attendance/hr_attendance.py
+++ b/addons/hr_attendance/hr_attendance.py
@@ -29,7 +29,7 @@ class hr_action_reason(osv.osv):
     _description = "Action Reason"
     _columns = {
         'name': fields.char('Reason', size=64, required=True, help='Specifies the reason for Signing In/Signing Out.'),
-        'action_type': fields.selection([('sign_in', 'Sign in'), ('sign_out', 'Sign out')], "Action's type"),
+        'action_type': fields.selection([('sign_in', 'Sign in'), ('sign_out', 'Sign out')], "Action Type"),
     }
     _defaults = {
         'action_type': 'sign_in',
@@ -137,7 +137,7 @@ class hr_employee(osv.osv):
 
             res = {'action': type, 'employee_id': emp['id']}
             if dt:
-                res['name'] = dt   
+                res['name'] = dt
         id = obj_attendance.create(cr, uid, res, context=context)
 
         if type != 'action':
diff --git a/addons/point_of_sale/point_of_sale.py b/addons/point_of_sale/point_of_sale.py
index a2123cb287c..4426eaf9999 100644
--- a/addons/point_of_sale/point_of_sale.py
+++ b/addons/point_of_sale/point_of_sale.py
@@ -267,7 +267,7 @@ class pos_order(osv.osv):
         'lines': fields.one2many('pos.order.line', 'order_id', 'Order Lines', states={'draft': [('readonly', False)]}, readonly=True),
         'price_type': fields.selection([
                                 ('tax_excluded','Tax excluded')],
-                                 'Price method', required=True),
+                                 'Price Method', required=True),
         'statement_ids': fields.one2many('account.bank.statement.line', 'pos_statement_id', 'Payments', states={'draft': [('readonly', False)]}, readonly=True),
         'pricelist_id': fields.many2one('product.pricelist', 'Pricelist', required=True, states={'draft': [('readonly', False)]}, readonly=True),
         'partner_id': fields.many2one('res.partner', 'Customer', change_default=True, select=1, states={'draft': [('readonly', False)], 'paid': [('readonly', False)]}),

From 59ee56541c419268aafd7890396923459d903a53 Mon Sep 17 00:00:00 2001
From: "AMP (OpenERP)" <amp@tinyerp.com>
Date: Thu, 14 Apr 2011 15:22:31 +0530
Subject: [PATCH 207/331] [FIX] base : Fixes the partner manager group problem

bzr revid: amp@tinyerp.com-20110414095231-jltmqb3i22z4s7i3
---
 openerp/addons/base/res/res_security.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/openerp/addons/base/res/res_security.xml b/openerp/addons/base/res/res_security.xml
index 9185ec2dcac..df80f90373c 100644
--- a/openerp/addons/base/res/res_security.xml
+++ b/openerp/addons/base/res/res_security.xml
@@ -12,6 +12,9 @@
     <record model="ir.ui.menu" id="menu_base_config">
         <field eval="[(6,0,[ref('group_system'), ref('group_partner_manager')])]" name="groups_id"/>
     </record>
+    <record model="ir.ui.menu" id="menu_base_partner">
+        <field eval="[(6,0,[ref('group_partner_manager')])]" name="groups_id"/>
+    </record>
 
 
     <!-- Record Rule For Company -->

From 442981388721be6f6b40ca142346b2d3282b9408 Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Thu, 14 Apr 2011 15:45:32 +0530
Subject: [PATCH 208/331] [IMP] Holidays: State field tooltips

bzr revid: mra@mra-laptop-20110414101532-jceuzg8bx0el02p7
---
 addons/hr_holidays/hr_holidays.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index 131d38d7001..ebe4948ef16 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -113,8 +113,10 @@ class hr_holidays(osv.osv):
         'name': fields.char('Description', required=True, size=64),
         'state': fields.selection([('draft', 'Draft'), ('confirm', 'Waiting Approval'), ('refuse', 'Refused'),
             ('validate1', 'Waiting Second Approval'), ('validate', 'Approved'), ('cancel', 'Cancelled')],
-            'State', readonly=True, help='When the holiday request is created the state is \'Draft\'.\n It is confirmed by the user and request is sent to admin, the state is \'Waiting Approval\'.\
-            If the admin accepts it, the state is \'Approved\'. If it is refused, the state is \'Refused\'.'),
+            'State', readonly=True, help='The state is set to \'Draft\', when a holiday request is created.\
+            \nThe state is \'Waiting Approval\', when holiday request is confirmed by user.\
+            \nThe state is \'Refused\', when holiday request is refused by manager.\
+            \nThe state is \'Approved\', when holiday request is approved by manager.'),
         'user_id':fields.related('employee_id', 'user_id', type='many2one', relation='res.users', string='User', store=True),
         'date_from': fields.datetime('Start Date', readonly=True, states={'draft':[('readonly',False)]}),
         'date_to': fields.datetime('End Date', readonly=True, states={'draft':[('readonly',False)]}),

From d566e5eb8055faca9cfb4cb887ebb5f010b1b0fc Mon Sep 17 00:00:00 2001
From: "AMP (OpenERP)" <amp@tinyerp.com>
Date: Thu, 14 Apr 2011 16:03:49 +0530
Subject: [PATCH 209/331] [FIX] crm,stock : Fixes the partner manager group
 problem

bzr revid: amp@tinyerp.com-20110414103349-uj2zhs8q00qt6e5p
---
 addons/crm/crm_view.xml                   | 2 +-
 addons/stock/security/ir.model.access.csv | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index 685019a3001..cc9005d69bf 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -3,7 +3,7 @@
     <data>
 
         <menuitem icon="terp-partner" id="base.menu_base_partner" name="Sales" sequence="0" 
-            groups="base.group_sale_manager,base.group_sale_salesman,base.group_partner_manager"/>
+            groups="base.group_sale_manager,base.group_sale_salesman"/>
 
         <menuitem id="base.menu_crm_config_lead" name="Leads &amp; Opportunities"
             parent="base.menu_base_config" sequence="1" groups="base.group_sale_manager"/>
diff --git a/addons/stock/security/ir.model.access.csv b/addons/stock/security/ir.model.access.csv
index 8c7c53ed8ba..68a210e535d 100644
--- a/addons/stock/security/ir.model.access.csv
+++ b/addons/stock/security/ir.model.access.csv
@@ -3,6 +3,7 @@
 "access_stock_incoterms_manager","stock.incoterms manager","model_stock_incoterms","stock.group_stock_manager",1,1,1,1
 "access_stock_warehouse_manager","stock.warehouse.manager","model_stock_warehouse","stock.group_stock_manager",1,1,1,1
 "access_stock_warehouse_user","stock.warehouse.user","model_stock_warehouse","base.group_user",1,0,0,0
+"access_stock_location__partner_manager","stock.location.partner.manager","model_stock_location","base.group_partner_manager",1,1,1,1
 "access_stock_location_manager","stock.location.manager","model_stock_location","stock.group_stock_manager",1,1,1,1
 "access_stock_location_user","stock.location.user","model_stock_location","base.group_user",1,0,0,0
 "access_stock_journal_user","stock.journal.user","model_stock_journal","base.group_user",1,0,0,0

From 3bccbb1c12813e832a1f52376e8d817e956a8f77 Mon Sep 17 00:00:00 2001
From: "Tejas (OpenERP)" <tta@openerp.com>
Date: Thu, 14 Apr 2011 16:40:33 +0530
Subject: [PATCH 210/331] FIX : sale_margin, wrong invoice type was set ,
 improved the code

bzr revid: tta@openerp.com-20110414111033-22q08b79c7fvmyvb
---
 addons/sale_margin/sale_margin.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/addons/sale_margin/sale_margin.py b/addons/sale_margin/sale_margin.py
index f7bbf41e5d3..c5d6379769b 100644
--- a/addons/sale_margin/sale_margin.py
+++ b/addons/sale_margin/sale_margin.py
@@ -82,10 +82,11 @@ class stock_picking(osv.osv):
     def action_invoice_create(self, cr, uid, ids, journal_id=False,
             group=False, type='out_invoice', context=None):
         # need to carify with new requirement
-        invoice_ids = []
+        invoice_ids = []            
+        if context is None:
+            context = {}
         picking_obj = self.pool.get('stock.picking')
-        res = super(stock_picking, self).action_invoice_create(cr, uid, ids, journal_id=False,
-            group=False, type='out_invoice', context=None)
+        res = super(stock_picking, self).action_invoice_create(cr, uid, ids, journal_id=journal_id,group=group, type=type, context=context)        
         invoice_ids = res.values()
         picking_obj.write(cr, uid, ids, {'invoice_ids': [[6, 0, invoice_ids]]})
         return res

From d224cc22054ee46646b8b43aed347a1efb6fda2e Mon Sep 17 00:00:00 2001
From: "aag (OpenERP)" <aag@tinyerp.co.in>
Date: Thu, 14 Apr 2011 18:10:49 +0530
Subject: [PATCH 211/331] [IMP]resource:Usability Issue-Remove Read only Field
 working period

bzr revid: aag@tinyerp.co.in-20110414124049-ehkses30irtpjiv4
---
 addons/resource/resource_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/resource/resource_view.xml b/addons/resource/resource_view.xml
index 7663a5af5d4..424955d0584 100644
--- a/addons/resource/resource_view.xml
+++ b/addons/resource/resource_view.xml
@@ -225,7 +225,7 @@
                        </group>
                        <group colspan="2" col="2">
                            <field name="date_from"/>
-                           <field name="calendar_id" string="Working Period" readonly='1'/>
+                           <field name="calendar_id" string="Working Period"/>
                            <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                        </group>
                        <group colspan="2" col="2">

From 8519b21aebaa29ef9e2645354df9efd88426a552 Mon Sep 17 00:00:00 2001
From: vro <vro@tinyerp.com>
Date: Thu, 14 Apr 2011 18:44:17 +0530
Subject: [PATCH 212/331] [FIX]: Fixed idea module parent category bug.

bzr revid: vro@tinyerp.com-20110414131417-hoponmoszarth5nl
---
 addons/idea/idea.py       | 21 +++++++++++++++++++++
 addons/idea/idea_view.xml |  2 +-
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/addons/idea/idea.py b/addons/idea/idea.py
index deda3ab1350..04ae4dff5df 100644
--- a/addons/idea/idea.py
+++ b/addons/idea/idea.py
@@ -31,11 +31,28 @@ DefaultVoteValue = '50'
 class idea_category(osv.osv):
     """ Category of Idea """
 
+    def name_get(self, cr, uid, ids, context=None):
+        if not len(ids):
+            return []
+        reads = self.read(cr, uid, ids, ['name','parent_id'], context=context)
+        res = []
+        for record in reads:
+            name = record['name']
+            if record['parent_id']:
+                name = record['parent_id'][1]+' / '+name
+            res.append((record['id'], name))
+        return res
+
+    def _categ_name_get_fnc(self, cr, uid, ids, prop, unknow_none, context=None):
+        res = self.name_get(cr, uid, ids, context=context)
+        return dict(res)
+
     _name = "idea.category"
     _description = "Idea Category"
 
     _columns = {
         'name': fields.char('Category', size=64, required=True),
+        'complete_name': fields.function(_categ_name_get_fnc, method=True, type="char", string='Name'),
         'summary': fields.text('Summary'),
         'parent_id': fields.many2one('idea.category', 'Parent Categories', ondelete='set null'),
         'child_ids': fields.one2many('idea.category', 'parent_id', 'Child Categories'),
@@ -46,6 +63,10 @@ class idea_category(osv.osv):
     ]
     _order = 'parent_id,name asc'
 
+    _constraints = [
+        (osv.osv._check_recursion, 'Error ! You can not create recursive categories.', ['parent_id'])
+    ]
+
 idea_category()
 
 class idea_idea(osv.osv):
diff --git a/addons/idea/idea_view.xml b/addons/idea/idea_view.xml
index 493fda2c01f..2d42ab25711 100644
--- a/addons/idea/idea_view.xml
+++ b/addons/idea/idea_view.xml
@@ -46,7 +46,7 @@
             <field name="field_parent">child_ids</field>
             <field name="arch" type="xml">
                 <tree string="Category of ideas">
-                    <field name="name"/>
+                    <field name="complete_name"/>
                     <field name="parent_id" invisible="1"/>
                 </tree>
             </field>

From a560130ee2d9fb6db96535ebf60878d5f68dd9b4 Mon Sep 17 00:00:00 2001
From: vro <vro@tinyerp.com>
Date: Thu, 14 Apr 2011 18:45:33 +0530
Subject: [PATCH 213/331] [FIX]: Fixed idea module typos.

bzr revid: vro@tinyerp.com-20110414131533-kk2hokwe2pfmybg3
---
 addons/idea/idea_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/idea/idea_view.xml b/addons/idea/idea_view.xml
index 2d42ab25711..e4cfa4efbe7 100644
--- a/addons/idea/idea_view.xml
+++ b/addons/idea/idea_view.xml
@@ -234,11 +234,11 @@
                         <field name="count_votes" />
                     </group>
                     <field name="stat_vote_ids" colspan="4" mode="graph,tree" nolabel="1">
-                        <graph string="Vots Statistics" type="bar">
+                        <graph string="Votes Statistics" type="bar">
                             <field name="score"/>
                             <field name="nbr"/>
                         </graph>
-                        <tree string="Vots Statistics">
+                        <tree string="Votes Statistics">
                             <field name="score"/>
                             <field name="nbr"/>
                         </tree>

From 8acaa289a0a8dc20239c78c9bf815c2633e60284 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 14 Apr 2011 15:23:10 +0200
Subject: [PATCH 214/331] [FIX] correctly initialize web_chat addon

bzr revid: xmo@openerp.com-20110414132310-qfuewowccf1f2fx9
---
 addons/web_chat/__openerp__.py            | 12 +++++++++---
 addons/web_chat/static/src/js/web_chat.js | 10 ++++++++++
 addons/web_chat/static/src/web_chat.html  | 24 -----------------------
 3 files changed, 19 insertions(+), 27 deletions(-)
 create mode 100644 addons/web_chat/static/src/js/web_chat.js
 delete mode 100644 addons/web_chat/static/src/web_chat.html

diff --git a/addons/web_chat/__openerp__.py b/addons/web_chat/__openerp__.py
index 9c9ee6f3b2f..e177288953c 100644
--- a/addons/web_chat/__openerp__.py
+++ b/addons/web_chat/__openerp__.py
@@ -1,8 +1,14 @@
 {
     "name": "Web Chat",
     "version": "2.0",
-    "depends": [],
-    "js": ["static/src/web_chat.js"],
+    "depends": ['base'],
+    "js": [
+        'static/lib/AjaxIM/js/jquery.jsonp-1.1.0.js',
+        'static/lib/AjaxIM/js/jquery.jstore-all-min.js',
+        'static/lib/AjaxIM/js/jquery.md5.js',
+        'static/lib/AjaxIM/js/im.js',
+        'static/src/js/web_chat.js'
+    ],
     "css": [],
-    'active': False,
+    'active': True,
 }
diff --git a/addons/web_chat/static/src/js/web_chat.js b/addons/web_chat/static/src/js/web_chat.js
new file mode 100644
index 00000000000..fce64ee6f78
--- /dev/null
+++ b/addons/web_chat/static/src/js/web_chat.js
@@ -0,0 +1,10 @@
+openerp.web_chat = function (openerp) {
+    openerp.web_chat = {};
+    openerp.web_chat.im = new AjaxIM({
+       storageMethod: 'local',
+       pollServer: '/web_chat/pollserver',
+       theme: '/web_chat/static/lib/AjaxIM/themes/default',
+       flashStorage: '/web_chat/static/lib/AjaxIM/js/jStore.Flash.html'
+    });
+    openerp.web_chat.im.login();
+};
diff --git a/addons/web_chat/static/src/web_chat.html b/addons/web_chat/static/src/web_chat.html
deleted file mode 100644
index a1070ab475a..00000000000
--- a/addons/web_chat/static/src/web_chat.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<script type="text/javascript" src="/web_chat/static/lib/AjaxIM/js/jquery-1.3.2.js"></script>
-<script type="text/javascript" src="/web_chat/static/lib/AjaxIM/js/jquery.jsonp-1.1.0.js"></script>
-<script type="text/javascript" src="/web_chat/static/lib/AjaxIM/js/jquery.jstore-all-min.js"></script>
-<script type="text/javascript" src="/web_chat/static/lib/AjaxIM/js/jquery.md5.js"></script>
-<script type="text/javascript" src="/web_chat/static/lib/AjaxIM/js/im.js"></script>
-</head>
-<body>
-<script>
-var AjaxIM, AjaxIMLoadedFunction;
-$(function() {
-    AjaxIM.init({
-        pollServer: '/web_chat/pollserver',
-        theme: '/web_chat/static/lib/AjaxIM/themes/default',
-        flashStorage: '/web_chat/static/lib/AjaxIM/js/jStore.Flash.html'
-    });
-    AjaxIM.client.login();
-});
-</script>
-</body>
-</html>
-

From eac805b553f4898644c439b74fc6d2b6e47add5d Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 14 Apr 2011 15:37:34 +0200
Subject: [PATCH 215/331] [FIX] content-type for chat polling method

bzr revid: xmo@openerp.com-20110414133734-y8fv82rhutp0q0nr
---
 addons/web_chat/controllers/main.py | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/addons/web_chat/controllers/main.py b/addons/web_chat/controllers/main.py
index 9769de33270..5e8d48344f8 100644
--- a/addons/web_chat/controllers/main.py
+++ b/addons/web_chat/controllers/main.py
@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 import sys, time
+import cherrypy
 
 import simplejson
 import random
@@ -102,11 +103,6 @@ class PollServer(openerpweb.Controller):
 
     @openerpweb.httprequest
     def poll(self, req, **kw):
-        
-        mq = req.applicationsession.setdefault("web_chat", PollServerMessageQueue())
-        
-        # Method: Long Poll
-        
         """
         --> GET http://im.ajaxim.com/poll?callback=jsonp1302138663582&_1302138663582=
         <-- 200 OK
@@ -129,8 +125,14 @@ class PollServer(openerpweb.Controller):
             echo '<script type="text/javascript">parent.AjaxIM.incoming('. json_encode($this->_pollParseMessages($messages)) .  ');</script>'
 
         """
+        mq = req.applicationsession.setdefault("web_chat", PollServerMessageQueue())
+        
+        # Method: Long Poll
+
         
         msg = '[]'
+
+        cherrypy.response.headers['content-type'] = 'application/javascript';
         
         for i in range(5):
             received_msg = mq.read('Guest1', i)
@@ -145,12 +147,6 @@ class PollServer(openerpweb.Controller):
         
     @openerpweb.httprequest
     def send(self, req, **kw):
-        
-        to = kw.get('to')
-        message = kw.get('message')
-        
-        mq = req.applicationsession.setdefault("web_chat", PollServerMessageQueue())
-        
         """
         --> GET http://im.ajaxim.com/send?callback=jsonp1302139980022&to=Guest130205108745.47&message=test&_1302139980022=
             callback: jsonp1302139980022
@@ -168,6 +164,12 @@ class PollServer(openerpweb.Controller):
 
         """
         
+        to = kw.get('to')
+        message = kw.get('message')
+        
+        mq = req.applicationsession.setdefault("web_chat", PollServerMessageQueue())
+
+        
         if not req.applicationsession['current_user']:
             return dict(r='error', e='no session found')
         
@@ -182,8 +184,6 @@ class PollServer(openerpweb.Controller):
 
     @openerpweb.httprequest
     def status(self, req, **kw):
-        mq = req.applicationsession.setdefault("web_chat", PollServerMessageQueue())
-        
         """
         --> GET status call
            const Offline = 0;
@@ -198,6 +198,8 @@ class PollServer(openerpweb.Controller):
             return array('r' => 'error', 'e' => 'no session found');
             return array('r' => 'error', 'e' => 'status error');
         """
+        mq = req.applicationsession.setdefault("web_chat", PollServerMessageQueue())
+
         print "======== chat status ========",kw
         # mq.write()
         return {"action": ""}

From 82b08318fe0bd3d4cb92ee3a46873714e51a708a Mon Sep 17 00:00:00 2001
From: Daniel Watkins <daniel@daniel-watkins.co.uk>
Date: Thu, 14 Apr 2011 22:20:45 +0100
Subject: [PATCH 216/331] Typo fixes.

bzr revid: daniel@daniel-watkins.co.uk-20110414212045-hlglpa7dfum3j15w
---
 doc/source/development.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/source/development.rst b/doc/source/development.rst
index a1d989b46ac..81f2d8219a5 100644
--- a/doc/source/development.rst
+++ b/doc/source/development.rst
@@ -55,7 +55,7 @@ Events
   Event triggered after a user asked for a search. The search view
   fires this event after collecting all input data (contexts, domains
   and group_by contexts). Note that the search view does *not* merge
-  those (or therwise evaluate them), they are returned as provided by
+  those (or otherwise evaluate them), they are returned as provided by
   the various inputs within the view.
 
 ``on_clear``
@@ -104,7 +104,7 @@ reaction:
     the search process.
 
     :js:class:`~openerp.base.search.Invalid` takes three mandatory
-    arguments: an indentifier (a name for instance), the invalid value
+    arguments: an identifier (a name for instance), the invalid value,
     and a validation message indicating the issue.
 
 ``get_domain``

From 8b4fd867430b8e14c8d48b8d6c8ee2c9d41df121 Mon Sep 17 00:00:00 2001
From: Daniel Watkins <daniel@daniel-watkins.co.uk>
Date: Thu, 14 Apr 2011 22:21:32 +0100
Subject: [PATCH 217/331] s/have to/must/ -- it's a more common directive in
 docs.

bzr revid: daniel@daniel-watkins.co.uk-20110414212132-yw281minl1zx5a7d
---
 doc/source/development.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/source/development.rst b/doc/source/development.rst
index 81f2d8219a5..8e37ed744b1 100644
--- a/doc/source/development.rst
+++ b/doc/source/development.rst
@@ -114,7 +114,7 @@ reaction:
 
 The :js:class:`openerp.base.search.Input` type implements registration
 on its own, but its implementations of ``get_context`` and
-``get_domain`` simply raise errors and *have* to be overridden.
+``get_domain`` simply raise errors and *must* be overridden.
 
 One last action is for filters, as an activation order has to be kept
 on them for some controls (establish the correct grouping sequence for

From 417bdbf6903d440333e6e221740d2a9140569bff Mon Sep 17 00:00:00 2001
From: Daniel Watkins <daniel@daniel-watkins.co.uk>
Date: Thu, 14 Apr 2011 22:23:43 +0100
Subject: [PATCH 218/331] s/falsy//

bzr revid: daniel@daniel-watkins.co.uk-20110414212343-aam4fc6nxgkxmnwz
---
 doc/source/development.rst | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/doc/source/development.rst b/doc/source/development.rst
index 8e37ed744b1..a103893d86c 100644
--- a/doc/source/development.rst
+++ b/doc/source/development.rst
@@ -71,7 +71,7 @@ An important concept in the search view is that of input. It is both
 an informal protocol and an abstract type that can be inherited from.
 
 Inputs are widgets which can contain user data (a char widget for
-instance, or a selection box). They are able of action and of
+instance, or a selection box). They are capable of action and of
 reaction:
 
 .. _views-search-registration:
@@ -93,9 +93,9 @@ reaction:
   * Return a context (an object), this is the "normal" response if the
     input holds a value.
 
-  * Return a falsy value (generally ``null``). This value indicates
-    the input does not contain any value and will not take part in the
-    research.
+  * Return a value that evaluates as false (generally ``null``). This
+    value indicates the input does not contain any value and will not
+    take part in the research.
 
   * Raise :js:class:`openerp.base.search.Invalid` to indicate that it
     holds a value but this value can not be used in the search

From 2fabcdffd988918d1968896f8fe78bc286cb940c Mon Sep 17 00:00:00 2001
From: Daniel Watkins <daniel@daniel-watkins.co.uk>
Date: Thu, 14 Apr 2011 22:24:48 +0100
Subject: [PATCH 219/331] 'research' unclear; changed wording.

bzr revid: daniel@daniel-watkins.co.uk-20110414212448-oncc720ar4gw7td9
---
 doc/source/development.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/source/development.rst b/doc/source/development.rst
index a103893d86c..c81ceec9498 100644
--- a/doc/source/development.rst
+++ b/doc/source/development.rst
@@ -95,7 +95,7 @@ reaction:
 
   * Return a value that evaluates as false (generally ``null``). This
     value indicates the input does not contain any value and will not
-    take part in the research.
+    affect the results of the search.
 
   * Raise :js:class:`openerp.base.search.Invalid` to indicate that it
     holds a value but this value can not be used in the search

From 8ed08b8d6fed3beccc7e7ef77acefe5268f4de13 Mon Sep 17 00:00:00 2001
From: Daniel Watkins <daniel@daniel-watkins.co.uk>
Date: Thu, 14 Apr 2011 22:26:03 +0100
Subject: [PATCH 220/331] Minor grammatical improvement.

bzr revid: daniel@daniel-watkins.co.uk-20110414212603-3wn8ek3xiawug8ry
---
 doc/source/development.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/source/development.rst b/doc/source/development.rst
index c81ceec9498..719c6baa74a 100644
--- a/doc/source/development.rst
+++ b/doc/source/development.rst
@@ -117,8 +117,8 @@ on its own, but its implementations of ``get_context`` and
 ``get_domain`` simply raise errors and *must* be overridden.
 
 One last action is for filters, as an activation order has to be kept
-on them for some controls (establish the correct grouping sequence for
-instance).
+on them for some controls (to establish the correct grouping sequence,
+for instance).
 
 To that end, filters can call
 :js:func:`openerp.base.Search.do_toggle_filter`, providing themselves

From fcfa8feb192a0979bc515483f645fe04bef7102d Mon Sep 17 00:00:00 2001
From: Daniel Watkins <daniel@daniel-watkins.co.uk>
Date: Thu, 14 Apr 2011 22:36:11 +0100
Subject: [PATCH 221/331] Consistent reference to methods.

bzr revid: daniel@daniel-watkins.co.uk-20110414213611-e7duvzsd65ygxp9o
---
 doc/source/development.rst | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/doc/source/development.rst b/doc/source/development.rst
index 719c6baa74a..07ee7dabf64 100644
--- a/doc/source/development.rst
+++ b/doc/source/development.rst
@@ -137,7 +137,7 @@ Life cycle
 
 The search view has a pretty simple and linear life cycle, in three main steps:
 
-:js:class:`init <openerp.base.SearchView>`
+:js:class:`~openerp.base.SearchView.init`
 
   Nothing interesting happens here
 
@@ -232,7 +232,8 @@ abstract types, used to implement input widgets:
   <views-search-registration>`.
 
   If inherited from, descendant classes should not call its
-  implementations of ``get_context`` and ``get_domain``.
+  implementations of :js:func:`~openerp.base.search.Input.get_context`
+  and :js:func:`~openerp.base.search.Input.get_domain`.
 
 * :js:class:`openerp.base.search.Field` is used to implement more
   "field" widgets (which allow the user to input potentially complex

From ec98904f9c8aec9d32a3cdc21368cdc49836a336 Mon Sep 17 00:00:00 2001
From: Daniel Watkins <daniel@daniel-watkins.co.uk>
Date: Thu, 14 Apr 2011 22:36:22 +0100
Subject: [PATCH 222/331] Typos.

bzr revid: daniel@daniel-watkins.co.uk-20110414213622-7c3zb9zd5o1ur4yb
---
 doc/source/development.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/source/development.rst b/doc/source/development.rst
index 07ee7dabf64..514e094b689 100644
--- a/doc/source/development.rst
+++ b/doc/source/development.rst
@@ -211,7 +211,7 @@ called in this order:
   Gives the widget the opportunity to unbind its events, remove itself
   from the DOM and perform any other cleanup task it may have.
 
-  Event if the widget does not do anything itself, it is responsible
+  Even if the widget does not do anything itself, it is responsible
   for shutting down its children.
 
 An abstract type is available and can be inherited from, to simplify
@@ -252,7 +252,7 @@ abstract types, used to implement input widgets:
     :js:func:`~openerp.base.search.Widget.make_id`.
 
   * It sets up a basic (overridable)
-    :js:attr:`~opererp.base.search.Field.template` attribute, combined
+    :js:attr:`~openerp.base.search.Field.template` attribute, combined
     with the previous tasks, this makes subclasses of
     :js:class:`~openerp.base.search.Field` render themselves "for
     free".

From 9c99f01964bc0a750a5232c8ec21305b995ae900 Mon Sep 17 00:00:00 2001
From: Daniel Watkins <daniel@daniel-watkins.co.uk>
Date: Thu, 14 Apr 2011 22:43:32 +0100
Subject: [PATCH 223/331] Prettify JSON examples.

bzr revid: daniel@daniel-watkins.co.uk-20110414214332-2zsj9i4ogf3l7u1z
---
 openerpweb/openerpweb.py | 33 +++++++++++++++++++++++++++------
 1 file changed, 27 insertions(+), 6 deletions(-)

diff --git a/openerpweb/openerpweb.py b/openerpweb/openerpweb.py
index 8423dc878ab..d569a9d5f20 100644
--- a/openerpweb/openerpweb.py
+++ b/openerpweb/openerpweb.py
@@ -289,13 +289,34 @@ class JsonRequest(object):
     * the json string is passed as a form parameter named "request"
     * method is currently ignored
 
-    Sucessful request:
-    --> {"jsonrpc": "2.0", "method": "call", "params": {"session_id": "SID", "context": {}, "arg1": "val1" }, "id": null}
-    <-- {"jsonrpc": "2.0", "result": { "res1": "val1" }, "id": null}
+    Sucessful request::
 
-    Request producing a error:
-    --> {"jsonrpc": "2.0", "method": "call", "params": {"session_id": "SID", "context": {}, "arg1": "val1" }, "id": null}
-    <-- {"jsonrpc": "2.0", "error": {"code": 1, "message": "End user error message.", "data": {"code": "codestring", "debug": "traceback" } }, "id": null}
+      --> {"jsonrpc": "2.0",
+           "method": "call",
+           "params": {"session_id": "SID",
+                      "context": {},
+                      "arg1": "val1" },
+           "id": null}
+
+      <-- {"jsonrpc": "2.0",
+           "result": { "res1": "val1" },
+           "id": null}
+
+    Request producing a error::
+
+      --> {"jsonrpc": "2.0",
+           "method": "call",
+           "params": {"session_id": "SID",
+                      "context": {},
+                      "arg1": "val1" },
+           "id": null}
+
+      <-- {"jsonrpc": "2.0",
+           "error": {"code": 1,
+                     "message": "End user error message.",
+                     "data": {"code": "codestring",
+                              "debug": "traceback" } },
+           "id": null}
 
     """
 

From c6b812ebfad91d9833ba7fe127932da1f49a7be6 Mon Sep 17 00:00:00 2001
From: Daniel Watkins <daniel@daniel-watkins.co.uk>
Date: Thu, 14 Apr 2011 22:45:30 +0100
Subject: [PATCH 224/331] Minor fixes.

bzr revid: daniel@daniel-watkins.co.uk-20110414214530-767qdh3ygh8kxkpj
---
 doc/source/project.rst | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/source/project.rst b/doc/source/project.rst
index 6f9a06b2f0d..d435a731d40 100644
--- a/doc/source/project.rst
+++ b/doc/source/project.rst
@@ -31,7 +31,7 @@ Guides and main documentation
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 The meat and most important part of all documentation. Should be
-written in plain english, using reStructuredText_ and taking advantage
+written in plain English, using reStructuredText_ and taking advantage
 of `Sphinx's extensions`_, especially `cross-references`_.
 
 Python API Documentation
@@ -65,7 +65,7 @@ RST, using Sphinx's `Python domain`_ [#]_:
   and ``__new__``), using the `info fields`_  as well.
 
 * Attributes (class and instance) should be documented in their
-  class's docstrin via the ``.. attribute::`` directiveg, following
+  class's docstring via the ``.. attribute::`` directiveg, following
   the class's own documentation.
 
 * The relation between modules and module-level attributes is similar:
@@ -220,7 +220,7 @@ Roadmap
 Release notes
 +++++++++++++
 
-.. [#] because Python is the default domain, the ``py:`` markup prefix
+.. [#] Because Python is the default domain, the ``py:`` markup prefix
        is optional and should be left out.
 
 .. [#] Resig's Class still uses prototypes under the hood, it doesn't

From ad0ececa4e84b6abb4e1ba0a7eb96dd31904a9be Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Fri, 15 Apr 2011 05:06:33 +0000
Subject: [PATCH 225/331] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20110412043500-p2dr3313fnqonqsm
bzr revid: launchpad_translations_on_behalf_of_openerp-20110413044003-7pujurdq9cldrqkm
bzr revid: launchpad_translations_on_behalf_of_openerp-20110415050633-iw3b088ogvp5c34f
---
 addons/account_accountant/i18n/zh_CN.po       |   11 +-
 .../account_analytic_analysis/i18n/zh_CN.po   |   30 +-
 addons/account_anglo_saxon/i18n/zh_CN.po      |   35 +-
 addons/account_cancel/i18n/zh_CN.po           |   35 +
 addons/base_action_rule/i18n/ca.po            |  502 +++++
 addons/base_action_rule/i18n/ru.po            |   10 +-
 addons/base_setup/i18n/da.po                  |  508 +++++
 addons/board/i18n/zh_CN.po                    |   12 +-
 addons/crm/i18n/zh_CN.po                      |   12 +-
 addons/crm_claim/i18n/zh_CN.po                |  185 +-
 addons/crm_fundraising/i18n/gl.po             |  785 ++++++++
 addons/crm_fundraising/i18n/zh_CN.po          |  768 +++++++
 addons/crm_partner_assign/i18n/zh_CN.po       |  713 +++++++
 addons/hr_payroll_account/i18n/ca.po          |  328 +++
 addons/l10n_ec/i18n/es_EC.po                  |   56 +
 addons/procurement/i18n/es_EC.po              |  929 +++++++++
 addons/purchase/i18n/en_GB.po                 | 1793 +++++++++++++++++
 addons/stock_planning/i18n/sv.po              | 1515 ++++++++++++++
 addons/subscription/i18n/gl.po                |  341 ++++
 19 files changed, 8431 insertions(+), 137 deletions(-)
 create mode 100644 addons/account_cancel/i18n/zh_CN.po
 create mode 100644 addons/base_action_rule/i18n/ca.po
 create mode 100644 addons/base_setup/i18n/da.po
 create mode 100644 addons/crm_fundraising/i18n/gl.po
 create mode 100644 addons/crm_fundraising/i18n/zh_CN.po
 create mode 100644 addons/crm_partner_assign/i18n/zh_CN.po
 create mode 100644 addons/hr_payroll_account/i18n/ca.po
 create mode 100644 addons/l10n_ec/i18n/es_EC.po
 create mode 100644 addons/procurement/i18n/es_EC.po
 create mode 100644 addons/purchase/i18n/en_GB.po
 create mode 100644 addons/stock_planning/i18n/sv.po
 create mode 100644 addons/subscription/i18n/gl.po

diff --git a/addons/account_accountant/i18n/zh_CN.po b/addons/account_accountant/i18n/zh_CN.po
index 5ab0e7f6b34..3dfcf883c39 100644
--- a/addons/account_accountant/i18n/zh_CN.po
+++ b/addons/account_accountant/i18n/zh_CN.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2010-12-21 15:14+0000\n"
-"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
+"PO-Revision-Date: 2011-04-12 03:56+0000\n"
+"Last-Translator: Black Jack <Unknown>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@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: 2011-01-15 05:56+0000\n"
-"X-Generator: Launchpad (build 12177)\n"
+"X-Launchpad-Export-Date: 2011-04-13 04:40+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
 #. module: account_accountant
 #: model:ir.module.module,description:account_accountant.module_meta_information
@@ -26,6 +26,9 @@ msgid ""
 "items and the chart of accounts.\n"
 "    "
 msgstr ""
+"\n"
+"这模块给管理员设定所有的会计要素如：凭证簿项科目表\n"
+"    "
 
 #. module: account_accountant
 #: model:ir.module.module,shortdesc:account_accountant.module_meta_information
diff --git a/addons/account_analytic_analysis/i18n/zh_CN.po b/addons/account_analytic_analysis/i18n/zh_CN.po
index aaf02e0a84c..9afc132483a 100644
--- a/addons/account_analytic_analysis/i18n/zh_CN.po
+++ b/addons/account_analytic_analysis/i18n/zh_CN.po
@@ -7,26 +7,26 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2010-12-20 08:39+0000\n"
-"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
+"PO-Revision-Date: 2011-04-12 18:24+0000\n"
+"Last-Translator: Black Jack <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: 2011-01-15 05:32+0000\n"
-"X-Generator: Launchpad (build 12177)\n"
+"X-Launchpad-Export-Date: 2011-04-13 04:39+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,hours_qtt_invoiced:0
 msgid ""
 "Number of hours that can be invoiced plus those that already have been "
 "invoiced."
-msgstr "小时数能加在已开的发票上"
+msgstr "小时数能开票,加到已开的发票上."
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,remaining_ca:0
 msgid "Computed using the formula: Max Invoice Price - Invoiced Amount."
-msgstr "计算公式为:最高发票价格 -  已开票金额"
+msgstr "计算公式为:最大发票价格 -  已开票金额"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,remaining_hours:0
@@ -56,6 +56,10 @@ msgid ""
 "You can also view the report of account analytic summary\n"
 "user-wise as well as month wise.\n"
 msgstr ""
+"\n"
+"此模块在分析会计视图为公司的项目经理显示重要的数据,增加菜单为管理者显示有关信息。\n"
+"\n"
+"你可以查看会计分析报表如：用户- wise 或月度-wise\n"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,last_invoice_date:0
@@ -75,7 +79,7 @@ msgstr "实际利润(%)"
 #. module: account_analytic_analysis
 #: field:account.analytic.account,ca_theorical:0
 msgid "Theoretical Revenue"
-msgstr ""
+msgstr "理论收入"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_worked_invoiced_date:0
@@ -87,12 +91,12 @@ msgstr "如果发票来自费用, 这是最近工作日期或已开票的费用"
 #. module: account_analytic_analysis
 #: model:ir.ui.menu,name:account_analytic_analysis.menu_invoicing
 msgid "Billing"
-msgstr ""
+msgstr "收费"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,last_worked_date:0
 msgid "Date of Last Cost/Work"
-msgstr "费用或工作的最近日期"
+msgstr "最近日期的工作成本"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,total_cost:0
@@ -104,17 +108,17 @@ msgstr "总成本"
 msgid ""
 "Number of hours you spent on the analytic account (from timesheet). It "
 "computes on all journal of type 'general'."
-msgstr "在辅助核算项目你花费的小时数(根据时间表). 它在所有类型为普通的记录集合里计算."
+msgstr "在分析会计中你花费的小时数(根据时间表). 它在计算所有类型为'普通的'凭证簿."
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,remaining_hours:0
 msgid "Remaining Hours"
-msgstr "剩余的小时数"
+msgstr "剩余小时数"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,theorical_margin:0
 msgid "Theoretical Margin"
-msgstr ""
+msgstr "理论的差额"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,ca_theorical:0
@@ -122,7 +126,7 @@ msgid ""
 "Based on the costs you had on the project, what would have been the revenue "
 "if all these costs have been invoiced at the normal sale price provided by "
 "the pricelist."
-msgstr "如果所有这些成本开发票按普通销售价目表.你项目的成本,将按这计算收入."
+msgstr "如果所有成本按正常的销售价格开票那这项目的成本基于未来的收入."
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,user_ids:0
diff --git a/addons/account_anglo_saxon/i18n/zh_CN.po b/addons/account_anglo_saxon/i18n/zh_CN.po
index ed27c3bc4ca..6c076ea88e4 100644
--- a/addons/account_anglo_saxon/i18n/zh_CN.po
+++ b/addons/account_anglo_saxon/i18n/zh_CN.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2010-07-13 08:42+0000\n"
-"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
+"PO-Revision-Date: 2011-04-12 17:30+0000\n"
+"Last-Translator: Black Jack <Unknown>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@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: 2011-01-15 05:50+0000\n"
-"X-Generator: Launchpad (build 12177)\n"
+"X-Launchpad-Export-Date: 2011-04-13 04:39+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
 #. module: account_anglo_saxon
 #: view:product.category:0
@@ -25,43 +25,43 @@ msgstr " 会计属性"
 #. module: account_anglo_saxon
 #: sql_constraint:purchase.order:0
 msgid "Order Reference must be unique !"
-msgstr ""
+msgstr "单号必须唯一！"
 
 #. module: account_anglo_saxon
 #: constraint:product.category:0
 msgid "Error ! You can not create recursive categories."
-msgstr ""
+msgstr "错误!你不能创建递归的类型."
 
 #. module: account_anglo_saxon
 #: constraint:product.template:0
 msgid ""
 "Error: The default UOM and the purchase UOM must be in the same category."
-msgstr ""
+msgstr "错误:默认的计量单位和采购的计量单位必须是同一类型."
 
 #. module: account_anglo_saxon
 #: model:ir.model,name:account_anglo_saxon.model_account_invoice_line
 msgid "Invoice Line"
-msgstr ""
+msgstr "发票明细"
 
 #. module: account_anglo_saxon
 #: model:ir.model,name:account_anglo_saxon.model_purchase_order
 msgid "Purchase Order"
-msgstr ""
+msgstr "采购订单"
 
 #. module: account_anglo_saxon
 #: model:ir.model,name:account_anglo_saxon.model_product_template
 msgid "Product Template"
-msgstr ""
+msgstr "产品模板"
 
 #. module: account_anglo_saxon
 #: model:ir.model,name:account_anglo_saxon.model_product_category
 msgid "Product Category"
-msgstr ""
+msgstr "产品类型"
 
 #. module: account_anglo_saxon
 #: model:ir.module.module,shortdesc:account_anglo_saxon.module_meta_information
 msgid "Stock Accounting for Anglo Saxon countries"
-msgstr ""
+msgstr "新美国模式的库存会计"
 
 #. module: account_anglo_saxon
 #: field:product.category,property_account_creditor_price_difference_categ:0
@@ -72,12 +72,12 @@ msgstr "价格差异科目"
 #. module: account_anglo_saxon
 #: model:ir.model,name:account_anglo_saxon.model_account_invoice
 msgid "Invoice"
-msgstr ""
+msgstr "发票"
 
 #. module: account_anglo_saxon
 #: model:ir.model,name:account_anglo_saxon.model_stock_picking
 msgid "Picking List"
-msgstr ""
+msgstr "分拣单"
 
 #. module: account_anglo_saxon
 #: model:ir.module.module,description:account_anglo_saxon.module_meta_information
@@ -97,6 +97,11 @@ msgid ""
 "    Secondly, price differences between actual purchase price and fixed "
 "product standard price are booked on a separate account"
 msgstr ""
+"此模块支持按新美国会计模式更改会计逻辑和库存运作.\n"
+"新美国会计模式和欧洲大陆会计模式的不同在货物销售成本对应的销售成本不同.\n"
+"新美国会计模式的成本在在创建销售发票是完成,欧洲大陆会计模式的成本含货物运送成本.\n"
+"这模块通过使用一个临时性的科目来增加这功能.货物运输时的库存价值将保存在这临时科目,当创建发票时这金额将转借方或贷方科目.\n"
+"其次实际价格和固定的标准价格的差异价格保存在一个独立的科目."
 
 #. module: account_anglo_saxon
 #: help:product.category,property_account_creditor_price_difference_categ:0
@@ -104,7 +109,7 @@ msgstr ""
 msgid ""
 "This account will be used to value price difference between purchase price "
 "and cost price."
-msgstr "这科目将用于在采购价格和销售价格之间的价格差异"
+msgstr "这科目将用于采购价格和成本价格之间的差异"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "无效XML视图结构!"
diff --git a/addons/account_cancel/i18n/zh_CN.po b/addons/account_cancel/i18n/zh_CN.po
new file mode 100644
index 00000000000..6182c00f6ea
--- /dev/null
+++ b/addons/account_cancel/i18n/zh_CN.po
@@ -0,0 +1,35 @@
+# Chinese (Simplified) translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2011-04-12 12:51+0000\n"
+"Last-Translator: Black Jack <Unknown>\n"
+"Language-Team: Chinese (Simplified) <zh_CN@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: 2011-04-13 04:39+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
+
+#. module: account_cancel
+#: model:ir.module.module,description:account_cancel.module_meta_information
+msgid ""
+"\n"
+"    Module adds 'Allow cancelling entries' field on form view of account "
+"journal. If set to true it allows user to cancel entries & invoices.\n"
+"    "
+msgstr ""
+"\n"
+"    此模块在凭证簿界面增加了一个“允许作废”的字段。如勾选了此选项，这个凭证簿的会计凭证或发票允许作废。\n"
+"    "
+
+#. module: account_cancel
+#: model:ir.module.module,shortdesc:account_cancel.module_meta_information
+msgid "Account Cancel"
+msgstr "作废"
diff --git a/addons/base_action_rule/i18n/ca.po b/addons/base_action_rule/i18n/ca.po
new file mode 100644
index 00000000000..ff5e454b899
--- /dev/null
+++ b/addons/base_action_rule/i18n/ca.po
@@ -0,0 +1,502 @@
+# Catalan translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2011-04-11 21:15+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Catalan <ca@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: 2011-04-12 04:34+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
+
+#. module: base_action_rule
+#: help:base.action.rule,act_mail_to_user:0
+msgid ""
+"Check this if you want the rule to send an email to the responsible person."
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,act_remind_partner:0
+msgid "Remind Partner"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,trg_partner_categ_id:0
+msgid "Partner Category"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,act_mail_to_watchers:0
+msgid "Mail to Watchers (CC)"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,trg_state_to:0
+msgid "Button Pressed"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,model_id:0
+msgid "Object"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,act_mail_to_email:0
+msgid "Mail to these Emails"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,act_state:0
+msgid "Set State to"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,act_email_from:0
+msgid "Email From"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Email Body"
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_range_type:0
+msgid "Days"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,last_run:0
+msgid "Last Run"
+msgstr ""
+
+#. module: base_action_rule
+#: code:addons/base_action_rule/base_action_rule.py:313
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,act_reply_to:0
+msgid "Reply-To"
+msgstr ""
+
+#. module: base_action_rule
+#: help:base.action.rule,act_email_cc:0
+msgid ""
+"These people will receive a copy of the future communication between partner "
+"and users by email"
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_range_type:0
+msgid "Minutes"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,name:0
+msgid "Rule Name"
+msgstr ""
+
+#. module: base_action_rule
+#: help:base.action.rule,act_remind_partner:0
+msgid ""
+"Check this if you want the rule to send a reminder by email to the partner."
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Conditions on Model Partner"
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_type:0
+msgid "Deadline"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,trg_partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(object_subject)s = Object subject"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Email Reminders"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Special Keywords to Be Used in The Body"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,trg_state_from:0
+msgid "State"
+msgstr ""
+
+#. module: base_action_rule
+#: model:ir.actions.act_window,help:base_action_rule.base_action_rule_act
+msgid ""
+"Use automated actions to automatically trigger actions for various screens. "
+"Example: a lead created by a specific user may be automatically set to a "
+"specific sales team, or an opportunity which still has status pending after "
+"14 days might trigger an automatic reminder email."
+msgstr ""
+
+#. module: base_action_rule
+#: help:base.action.rule,act_mail_to_email:0
+msgid "Email-id of the persons whom mail is to be sent"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+#: model:ir.module.module,shortdesc:base_action_rule.module_meta_information
+msgid "Action Rule"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Fields to Change"
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_type:0
+msgid "Creation Date"
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_type:0
+msgid "Last Action Date"
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_range_type:0
+msgid "Hours"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(object_id)s = Object ID"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Delay After Trigger Date"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,act_remind_attach:0
+msgid "Remind with Attachment"
+msgstr ""
+
+#. module: base_action_rule
+#: constraint:ir.cron:0
+msgid "Invalid arguments"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,act_user_id:0
+msgid "Set Responsible to"
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_type:0
+msgid "None"
+msgstr ""
+
+#. module: base_action_rule
+#: help:base.action.rule,act_email_to:0
+msgid ""
+"Use a python expression to specify the right field on which one than we will "
+"use for the 'To' field of the header"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(object_user_phone)s = Responsible phone"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid ""
+"The rule uses the AND operator. The model must match all non-empty fields so "
+"that the rule executes the action described in the 'Actions' tab."
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,trg_date_range_type:0
+msgid "Delay type"
+msgstr ""
+
+#. module: base_action_rule
+#: help:base.action.rule,regex_name:0
+msgid ""
+"Regular expression for matching name of the resource\n"
+"e.g.: 'urgent.*' will search for records having name starting with the "
+"string 'urgent'\n"
+"Note: This is case sensitive search."
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,act_method:0
+msgid "Call Object Method"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,act_email_to:0
+msgid "Email To"
+msgstr ""
+
+#. module: base_action_rule
+#: help:base.action.rule,act_mail_to_watchers:0
+msgid ""
+"Check this if you want the rule to mark CC(mail to any other person defined "
+"in actions)."
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(partner)s = Partner name"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Note"
+msgstr ""
+
+#. module: base_action_rule
+#: help:base.action.rule,act_email_from:0
+msgid ""
+"Use a python expression to specify the right field on which one than we will "
+"use for the 'From' field of the header"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,trg_date_range:0
+msgid "Delay after trigger date"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Conditions"
+msgstr ""
+
+#. module: base_action_rule
+#: help:base.action.rule,trg_date_range:0
+msgid ""
+"Delay After Trigger Date,specifies you can put a negative number. If you "
+"need a delay before the trigger date, like sending a reminder 15 minutes "
+"before a meeting."
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,active:0
+msgid "Active"
+msgstr ""
+
+#. module: base_action_rule
+#: code:addons/base_action_rule/base_action_rule.py:314
+#, python-format
+msgid "No E-Mail ID Found for your Company address!"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,act_remind_user:0
+msgid "Remind Responsible"
+msgstr ""
+
+#. module: base_action_rule
+#: model:ir.module.module,description:base_action_rule.module_meta_information
+msgid "This module allows to implement action rules for any object."
+msgstr ""
+
+#. module: base_action_rule
+#: help:base.action.rule,sequence:0
+msgid "Gives the sequence order when displaying a list of rules."
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_range_type:0
+msgid "Months"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,filter_id:0
+msgid "Filter"
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_type:0
+msgid "Date"
+msgstr ""
+
+#. module: base_action_rule
+#: help:base.action.rule,server_action_id:0
+msgid ""
+"Describes the action name.\n"
+"eg:on which object which action to be taken on basis of which condition"
+msgstr ""
+
+#. module: base_action_rule
+#: model:ir.model,name:base_action_rule.model_ir_cron
+msgid "ir.cron"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(object_description)s = Object description"
+msgstr ""
+
+#. module: base_action_rule
+#: constraint:base.action.rule:0
+msgid "Error: The mail is not well formated"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Email Actions"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Email Information"
+msgstr ""
+
+#. module: base_action_rule
+#: model:ir.model,name:base_action_rule.model_base_action_rule
+msgid "Action Rules"
+msgstr ""
+
+#. module: base_action_rule
+#: help:base.action.rule,act_mail_body:0
+msgid "Content of mail"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,trg_user_id:0
+msgid "Responsible"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(partner_email)s = Partner Email"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(object_date)s = Creation date"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(object_user_email)s = Responsible Email"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,act_mail_body:0
+msgid "Mail body"
+msgstr ""
+
+#. module: base_action_rule
+#: help:base.action.rule,act_remind_user:0
+msgid ""
+"Check this if you want the rule to send a reminder by email to the user."
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Server Action to be Triggered"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,act_mail_to_user:0
+msgid "Mail to Responsible"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,act_email_cc:0
+msgid "Add Watchers (Cc)"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Conditions on Model Fields"
+msgstr ""
+
+#. module: base_action_rule
+#: model:ir.actions.act_window,name:base_action_rule.base_action_rule_act
+#: model:ir.ui.menu,name:base_action_rule.menu_base_action_rule_form
+msgid "Automated Actions"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,server_action_id:0
+msgid "Server Action"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,regex_name:0
+msgid "Regex on Resource Name"
+msgstr ""
+
+#. module: base_action_rule
+#: help:base.action.rule,act_remind_attach:0
+msgid ""
+"Check this if you want that all documents attached to the object be attached "
+"to the reminder email sent."
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Conditions on Timing"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Actions"
+msgstr ""
+
+#. module: base_action_rule
+#: help:base.action.rule,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the rule "
+"without removing it."
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(object_user)s = Responsible name"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,create_date:0
+msgid "Create Date"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Conditions on States"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,trg_date_type:0
+msgid "Trigger Date"
+msgstr ""
diff --git a/addons/base_action_rule/i18n/ru.po b/addons/base_action_rule/i18n/ru.po
index 2edea84a77c..e54e38f77c8 100644
--- a/addons/base_action_rule/i18n/ru.po
+++ b/addons/base_action_rule/i18n/ru.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-01-02 09:33+0000\n"
-"Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
+"PO-Revision-Date: 2011-04-12 16:27+0000\n"
+"Last-Translator: Viktor Prokopiev <Unknown>\n"
 "Language-Team: Russian <ru@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: 2011-01-15 05:55+0000\n"
-"X-Generator: Launchpad (build 12177)\n"
+"X-Launchpad-Export-Date: 2011-04-13 04:39+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_user:0
@@ -78,7 +78,7 @@ msgstr "Дней"
 #. module: base_action_rule
 #: field:base.action.rule,last_run:0
 msgid "Last Run"
-msgstr ""
+msgstr "Последнее выполнение"
 
 #. module: base_action_rule
 #: code:addons/base_action_rule/base_action_rule.py:313
diff --git a/addons/base_setup/i18n/da.po b/addons/base_setup/i18n/da.po
new file mode 100644
index 00000000000..a9b3da168b1
--- /dev/null
+++ b/addons/base_setup/i18n/da.po
@@ -0,0 +1,508 @@
+# Danish translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2011-04-12 08:42+0000\n"
+"Last-Translator: Lars Dige <Unknown>\n"
+"Language-Team: Danish <da@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: 2011-04-13 04:39+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
+
+#. module: base_setup
+#: field:base.setup.company,city:0
+msgid "City"
+msgstr "By"
+
+#. module: base_setup
+#: view:base.setup.installer:0
+msgid "Install"
+msgstr "Installer"
+
+#. module: base_setup
+#: field:base.setup.installer,account_voucher:0
+msgid "Invoicing"
+msgstr "Fakturering"
+
+#. module: base_setup
+#: field:base.setup.installer,hr:0
+msgid "Human Resources"
+msgstr "Human Resources"
+
+#. module: base_setup
+#: field:base.setup.company,email:0
+msgid "E-mail"
+msgstr "E-mail"
+
+#. module: base_setup
+#: field:base.setup.company,account_no:0
+msgid "Bank Account No"
+msgstr "Bank konto nr."
+
+#. module: base_setup
+#: field:base.setup.installer,profile_tools:0
+msgid "Extra Tools"
+msgstr "Ekstra værktøjer"
+
+#. module: base_setup
+#: field:base.setup.company,rml_footer1:0
+msgid "Report Footer 1"
+msgstr ""
+
+#. module: base_setup
+#: help:base.setup.installer,mrp:0
+msgid ""
+"Helps you manage your manufacturing processes and generate reports on those "
+"processes."
+msgstr ""
+
+#. module: base_setup
+#: help:base.setup.installer,marketing:0
+msgid "Helps you manage your marketing campaigns step by step."
+msgstr ""
+
+#. module: base_setup
+#: view:base.setup.config:0
+msgid "Your database is now created."
+msgstr "Din database er ny oprettet"
+
+#. module: base_setup
+#: field:base.setup.installer,point_of_sale:0
+msgid "Point of Sales"
+msgstr "Point of sales"
+
+#. module: base_setup
+#: field:base.setup.installer,association:0
+msgid "Associations"
+msgstr "Foreninger"
+
+#. module: base_setup
+#: help:base.setup.installer,account_accountant:0
+msgid ""
+"Helps you handle your accounting needs, if you are not an accountant, we "
+"suggest you to install only the Invoicing "
+msgstr ""
+
+#. module: base_setup
+#: code:addons/base_setup/__init__.py:50
+#, python-format
+msgid "The following users have been installed : \n"
+msgstr "Følgende brugere er installeret \n"
+
+#. module: base_setup
+#: field:base.setup.company,progress:0
+#: field:base.setup.installer,progress:0
+msgid "Configuration Progress"
+msgstr "Konfigurations fremskridt"
+
+#. module: base_setup
+#: field:base.setup.company,rml_footer2:0
+msgid "Report Footer 2"
+msgstr "Rapport sidefod"
+
+#. module: base_setup
+#: field:base.setup.company,currency:0
+#: model:ir.model,name:base_setup.model_res_currency
+msgid "Currency"
+msgstr "Valuta"
+
+#. module: base_setup
+#: field:base.setup.company,state_id:0
+msgid "Fed. State"
+msgstr ""
+
+#. module: base_setup
+#: field:base.setup.installer,marketing:0
+msgid "Marketing"
+msgstr "Markedsføring"
+
+#. module: base_setup
+#: field:base.setup.company,company_id:0
+msgid "Company"
+msgstr "Virksomhed"
+
+#. module: base_setup
+#: field:base.setup.installer,sale:0
+msgid "Sales Management"
+msgstr "Salgsledelse"
+
+#. module: base_setup
+#: help:base.setup.installer,profile_tools:0
+msgid ""
+"Lets you install various interesting but non-essential tools like Survey, "
+"Lunch and Ideas box."
+msgstr ""
+"Lader dig installere forskellige interessante, men ikke-væsentlige værktøjer "
+"som f.eks. idé boks."
+
+#. module: base_setup
+#: view:base.setup.config:0
+msgid ""
+"You can start configuring the system or connect directly to the database as "
+"an administrator."
+msgstr ""
+"Du kan starte med at konfigurere systemet eller tilslutte dig direkte til "
+"databasen som en administrator."
+
+#. module: base_setup
+#: field:base.setup.installer,report_designer:0
+msgid "Advanced Reporting"
+msgstr "Avanceret rapportering"
+
+#. module: base_setup
+#: field:base.setup.company,phone:0
+msgid "Phone"
+msgstr "Tlf. nr."
+
+#. module: base_setup
+#: view:base.setup.company:0
+msgid "res_config_contents"
+msgstr ""
+
+#. module: base_setup
+#: view:base.setup.company:0
+msgid ""
+"Your company information will be used to personalize documents issued with "
+"OpenERP such as invoices, sales orders and much more."
+msgstr ""
+"Dine virksomheds oplysninger vil blive brugt til at personliggøre dokumenter "
+"udstedt med OpenERP såsom fakturaer, salgsordrer og meget mere."
+
+#. module: base_setup
+#: view:base.setup.installer:0
+msgid "title"
+msgstr "titel"
+
+#. module: base_setup
+#: field:base.setup.installer,knowledge:0
+msgid "Knowledge Management"
+msgstr "Knowledge Management"
+
+#. module: base_setup
+#: model:ir.module.module,description:base_setup.module_meta_information
+msgid ""
+"\n"
+"    This module implements a configuration system that helps user\n"
+"    to configure the system at the installation of a new database.\n"
+"\n"
+"    It allows you to select between a list of profiles to install:\n"
+"    * Minimal profile\n"
+"    * Accounting only\n"
+"    * Services companies\n"
+"    * Manufacturing companies\n"
+"\n"
+"    It also asks screens to help easily configure your company, the header "
+"and\n"
+"    footer, the account chart to install and the language.\n"
+"    "
+msgstr ""
+
+#. module: base_setup
+#: help:base.setup.installer,product_expiry:0
+msgid ""
+"Installs a preselected set of OpenERP applications which will help you "
+"manage your industry."
+msgstr ""
+"Installerer en forudvalgt sæt OpenERP applikationer, der vil hjælpe dig med "
+"at administrere din branche."
+
+#. module: base_setup
+#: help:base.setup.installer,project:0
+msgid ""
+"Helps you manage your projects and tasks by tracking them, generating "
+"plannings, etc..."
+msgstr ""
+"Hjælper dig med at administrere dine projekter og opgaver ved at spore dem, "
+"generere planlægning, osv. .."
+
+#. module: base_setup
+#: field:base.setup.company,name:0
+msgid "Company Name"
+msgstr "Firmanavn"
+
+#. module: base_setup
+#: view:base.setup.config:0
+msgid "Skip Configuration Wizards"
+msgstr "Spring over konfigurations wizard"
+
+#. module: base_setup
+#: help:base.setup.installer,hr:0
+msgid ""
+"Helps you manage your human resources by encoding your employees structure, "
+"generating work sheets, tracking attendance and more."
+msgstr ""
+
+#. module: base_setup
+#: help:base.setup.installer,account_voucher:0
+msgid ""
+"Allows you to create your invoices and track the payments. It is an easier "
+"version of the accounting module for managers who are not accountants."
+msgstr ""
+
+#. module: base_setup
+#: model:ir.model,name:base_setup.model_base_setup_company
+msgid "base.setup.company"
+msgstr "base.setup.company"
+
+#. module: base_setup
+#: help:base.setup.installer,purchase:0
+msgid ""
+"Helps you manage your purchase-related processes such as requests for "
+"quotations, supplier invoices, etc..."
+msgstr ""
+"Hjælper dig med at styre dit køb-relaterede processer såsom anmodninger om "
+"tilbud, leverandørfakturaer, osv. .."
+
+#. module: base_setup
+#: help:base.setup.company,rml_footer2:0
+msgid ""
+"This sentence will appear at the bottom of your reports.\n"
+"We suggest you to put bank information here:\n"
+"IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701"
+msgstr ""
+
+#. module: base_setup
+#: field:base.setup.company,street2:0
+msgid "Street 2"
+msgstr "Adresse 2"
+
+#. module: base_setup
+#: model:ir.model,name:base_setup.model_base_setup_installer
+msgid "base.setup.installer"
+msgstr "base.setup.installer"
+
+#. module: base_setup
+#: field:base.setup.company,country_id:0
+msgid "Country"
+msgstr "Land"
+
+#. module: base_setup
+#: model:ir.actions.act_window,name:base_setup.action_base_setup
+msgid "Setup"
+msgstr "Setup"
+
+#. module: base_setup
+#: field:base.setup.installer,account_accountant:0
+msgid "Accounting & Finance"
+msgstr "Regnskab & Finans"
+
+#. module: base_setup
+#: field:base.setup.installer,auction:0
+msgid "Auction Houses"
+msgstr "Auktionshuse"
+
+#. module: base_setup
+#: field:base.setup.company,zip:0
+msgid "Zip Code"
+msgstr "Postnr"
+
+#. module: base_setup
+#: view:base.setup.config:0
+msgid "Start Configuration"
+msgstr "Start konfiguration"
+
+#. module: base_setup
+#: help:base.setup.installer,knowledge:0
+msgid ""
+"Lets you install addons geared towards sharing knowledge with and between "
+"your employees."
+msgstr ""
+"Lader dig installere addons rettet mod at dele viden med og mellem dine "
+"medarbejdere."
+
+#. module: base_setup
+#: view:base.setup.installer:0
+msgid ""
+"Select the Applications you want your system to cover. If you are not sure "
+"about your exact needs at this stage, you can easily install them later."
+msgstr ""
+"Vælg de programmer, du ønsker dit system skal indeholde. Hvis du ikke er "
+"sikker på netop dine behov på nuvræendetidspunkt, kan du nemt installere dem "
+"senere."
+
+#. module: base_setup
+#: view:base.setup.company:0
+#: model:ir.actions.act_window,name:base_setup.action_base_setup_company
+msgid "Company Configuration"
+msgstr ""
+
+#. module: base_setup
+#: field:base.setup.company,logo:0
+msgid "Logo"
+msgstr ""
+
+#. module: base_setup
+#: help:base.setup.installer,point_of_sale:0
+msgid ""
+"Helps you get the most out of your points of sales with fast sale encoding, "
+"simplified payment mode encoding, automatic picking lists generation and "
+"more."
+msgstr ""
+
+#. module: base_setup
+#: field:base.setup.installer,purchase:0
+msgid "Purchase Management"
+msgstr ""
+
+#. module: base_setup
+#: help:base.setup.installer,sale:0
+msgid "Helps you handle your quotations, sale orders and invoicing."
+msgstr ""
+
+#. module: base_setup
+#: field:base.setup.installer,stock:0
+msgid "Warehouse Management"
+msgstr ""
+
+#. module: base_setup
+#: field:base.setup.installer,project:0
+msgid "Project Management"
+msgstr ""
+
+#. module: base_setup
+#: field:base.setup.config,installed_users:0
+msgid "Installed Users"
+msgstr ""
+
+#. module: base_setup
+#: view:base.setup.config:0
+msgid "New Database"
+msgstr ""
+
+#. module: base_setup
+#: field:base.setup.installer,crm:0
+msgid "Customer Relationship Management"
+msgstr ""
+
+#. module: base_setup
+#: help:base.setup.installer,auction:0
+msgid ""
+"Installs a preselected set of OpenERP applications selected to help you "
+"manage your auctions as well as the business processes around them."
+msgstr ""
+
+#. module: base_setup
+#: help:base.setup.company,rml_header1:0
+msgid ""
+"This sentence will appear at the top right corner of your reports.\n"
+"We suggest you to put a slogan here:\n"
+"\"Open Source Business Solutions\"."
+msgstr ""
+
+#. module: base_setup
+#: help:base.setup.installer,report_designer:0
+msgid ""
+"Lets you install various tools to simplify and enhance OpenERP's report "
+"creation."
+msgstr ""
+
+#. module: base_setup
+#: field:base.setup.company,rml_header1:0
+msgid "Report Header"
+msgstr ""
+
+#. module: base_setup
+#: view:base.setup.config:0
+msgid "Information about your new database"
+msgstr ""
+
+#. module: base_setup
+#: field:base.setup.company,config_logo:0
+#: field:base.setup.config,config_logo:0
+#: field:base.setup.installer,config_logo:0
+msgid "Image"
+msgstr ""
+
+#. module: base_setup
+#: field:base.setup.installer,product_expiry:0
+msgid "Food Industry"
+msgstr ""
+
+#. module: base_setup
+#: field:base.setup.installer,mrp:0
+msgid "Manufacturing"
+msgstr ""
+
+#. module: base_setup
+#: view:base.setup.company:0
+msgid "Your Logo - Use a size of about 450x150 pixels."
+msgstr ""
+
+#. module: base_setup
+#: help:base.setup.company,rml_footer1:0
+msgid ""
+"This sentence will appear at the bottom of your reports.\n"
+"We suggest you to write legal sentences here:\n"
+"Web: http://openerp.com - Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-07"
+msgstr ""
+
+#. module: base_setup
+#: field:base.setup.company,website:0
+msgid "Company Website"
+msgstr ""
+
+#. module: base_setup
+#: view:base.setup.installer:0
+msgid "Install Specific Industry Applications"
+msgstr ""
+
+#. module: base_setup
+#: field:base.setup.company,street:0
+msgid "Street"
+msgstr ""
+
+#. module: base_setup
+#: view:base.setup.company:0
+msgid "Configure Your Company Information"
+msgstr ""
+
+#. module: base_setup
+#: help:base.setup.company,website:0
+msgid "Example: http://openerp.com"
+msgstr ""
+
+#. module: base_setup
+#: view:base.setup.installer:0
+#: model:ir.actions.act_window,name:base_setup.action_base_setup_installer
+msgid "Install Applications"
+msgstr ""
+
+#. module: base_setup
+#: help:base.setup.installer,crm:0
+msgid ""
+"Helps you track and manage relations with customers such as leads, requests "
+"or issues. Can automatically send reminders, escalate requests or trigger "
+"business-specific actions based on standard events."
+msgstr ""
+
+#. module: base_setup
+#: help:base.setup.installer,stock:0
+msgid ""
+"Helps you manage your inventory and main stock operations: delivery orders, "
+"receptions, etc."
+msgstr ""
+
+#. module: base_setup
+#: model:ir.module.module,shortdesc:base_setup.module_meta_information
+msgid "Base Setup"
+msgstr ""
+
+#. module: base_setup
+#: help:base.setup.installer,association:0
+msgid ""
+"Installs a preselected set of OpenERP applications which will help you "
+"manage your association more efficiently."
+msgstr ""
+
+#. module: base_setup
+#: model:ir.model,name:base_setup.model_base_setup_config
+msgid "base.setup.config"
+msgstr ""
diff --git a/addons/board/i18n/zh_CN.po b/addons/board/i18n/zh_CN.po
index 63fc6cbff11..071e34d2304 100644
--- a/addons/board/i18n/zh_CN.po
+++ b/addons/board/i18n/zh_CN.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-01-20 15:46+0000\n"
-"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
+"PO-Revision-Date: 2011-04-11 14:24+0000\n"
+"Last-Translator: Black Jack <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: 2011-01-21 04:40+0000\n"
-"X-Generator: Launchpad (build 12177)\n"
+"X-Launchpad-Export-Date: 2011-04-12 04:34+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
 #. module: board
 #: view:res.log.report:0
@@ -42,7 +42,7 @@ msgstr "作者"
 #. module: board
 #: model:ir.module.module,shortdesc:board.module_meta_information
 msgid "Dashboard main module"
-msgstr "仪表盘主模块"
+msgstr "控制台主模块"
 
 #. module: board
 #: view:res.users:0
@@ -60,7 +60,7 @@ msgstr "用户错误！"
 #: model:ir.actions.act_window,name:board.open_board_administration_form
 #: model:ir.ui.menu,name:board.menu_board_admin
 msgid "Administration Dashboard"
-msgstr "管理员仪表盘"
+msgstr "管理员控制台"
 
 #. module: board
 #: view:board.note:0
diff --git a/addons/crm/i18n/zh_CN.po b/addons/crm/i18n/zh_CN.po
index 2659bb040b9..f070c94e1b3 100644
--- a/addons/crm/i18n/zh_CN.po
+++ b/addons/crm/i18n/zh_CN.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-04-10 15:13+0000\n"
-"Last-Translator: Black Jack <Unknown>\n"
+"PO-Revision-Date: 2011-04-11 11:33+0000\n"
+"Last-Translator: lky <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: 2011-04-11 04:53+0000\n"
+"X-Launchpad-Export-Date: 2011-04-12 04:34+0000\n"
 "X-Generator: Launchpad (build 12735)\n"
 
 #. module: crm
@@ -31,7 +31,7 @@ msgstr "线索"
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor3
 msgid "Need Services"
-msgstr "需要的服务"
+msgstr "需要服务"
 
 #. module: crm
 #: selection:crm.meeting,rrule_type:0
@@ -405,7 +405,7 @@ msgstr "当发现一个明确的项目/商机"
 #. module: crm
 #: field:crm.installer,crm_fundraising:0
 msgid "Fundraising"
-msgstr "集资"
+msgstr "资金募集"
 
 #. module: crm
 #: view:res.partner:0
@@ -2433,7 +2433,7 @@ msgstr "帮助你管理销售应用程序问题与解答的wiki网页"
 #. module: crm
 #: help:crm.installer,crm_fundraising:0
 msgid "This may help associations in their fundraising process and tracking."
-msgstr "这可能会帮助组织集资的处理和跟踪"
+msgstr "这可能会帮助组织资金募集的过程和跟踪"
 
 #. module: crm
 #: field:crm.lead2opportunity.partner,action:0
diff --git a/addons/crm_claim/i18n/zh_CN.po b/addons/crm_claim/i18n/zh_CN.po
index 7667ba03a12..513525cb81e 100644
--- a/addons/crm_claim/i18n/zh_CN.po
+++ b/addons/crm_claim/i18n/zh_CN.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-04-11 04:47+0000\n"
+"PO-Revision-Date: 2011-04-11 05:47+0000\n"
 "Last-Translator: Black Jack <Unknown>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@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: 2011-04-11 04:54+0000\n"
+"X-Launchpad-Export-Date: 2011-04-12 04:34+0000\n"
 "X-Generator: Launchpad (build 12735)\n"
 
 #. module: crm_claim
@@ -241,34 +241,34 @@ msgstr "最低"
 #. module: crm_claim
 #: field:crm.claim,create_date:0
 msgid "Creation Date"
-msgstr ""
+msgstr "创建日期"
 
 #. module: crm_claim
 #: field:crm.claim,name:0
 msgid "Claim Subject"
-msgstr ""
+msgstr "索赔主题"
 
 #. module: crm_claim
 #: model:ir.actions.act_window,help:crm_claim.action_report_crm_claim
 msgid ""
 "Have a general overview of all claims processed in the system by sorting "
 "them with specific criteria."
-msgstr ""
+msgstr "所有索赔都有一个一般描述在系统里还对它们按具体的标准分类。"
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
 msgid "July"
-msgstr ""
+msgstr "7月"
 
 #. module: crm_claim
 #: model:ir.actions.act_window,name:crm_claim.crm_claim_stage_act
 msgid "Claim Stages"
-msgstr ""
+msgstr "索赔阶段"
 
 #. module: crm_claim
 #: model:ir.ui.menu,name:crm_claim.menu_crm_case_claim-act
 msgid "Categories"
-msgstr ""
+msgstr "类型"
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -276,106 +276,106 @@ msgstr ""
 #: view:crm.claim.report:0
 #: field:crm.claim.report,stage_id:0
 msgid "Stage"
-msgstr ""
+msgstr "阶段"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "History Information"
-msgstr ""
+msgstr "日志信息"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Dates"
-msgstr ""
+msgstr "日期"
 
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "    Month-1    "
-msgstr ""
+msgstr "    上月    "
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Contact"
-msgstr ""
+msgstr "联系方式"
 
 #. module: crm_claim
 #: model:ir.ui.menu,name:crm_claim.menu_crm_claim_stage_act
 msgid "Stages"
-msgstr ""
+msgstr "阶段"
 
 #. module: crm_claim
 #: model:ir.ui.menu,name:crm_claim.menu_report_crm_claim_tree
 msgid "Claims Analysis"
-msgstr ""
+msgstr "索赔分析"
 
 #. module: crm_claim
 #: help:crm.claim.report,delay_close:0
 msgid "Number of Days to close the case"
-msgstr ""
+msgstr "到期天数"
 
 #. module: crm_claim
 #: model:ir.model,name:crm_claim.model_crm_claim_report
 msgid "CRM Claim Report"
-msgstr ""
+msgstr "客户关系管理索赔报表"
 
 #. module: crm_claim
 #: model:crm.case.stage,name:crm_claim.stage_claim1
 msgid "Accepted as Claim"
-msgstr ""
+msgstr "作为索赔接受"
 
 #. module: crm_claim
 #: model:crm.case.resource.type,name:crm_claim.type_claim1
 msgid "Corrective"
-msgstr ""
+msgstr "纠正"
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
 msgid "September"
-msgstr ""
+msgstr "9月"
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
 msgid "December"
-msgstr ""
+msgstr "12月"
 
 #. module: crm_claim
 #: view:crm.claim.report:0
 #: field:crm.claim.report,month:0
 msgid "Month"
-msgstr ""
+msgstr "月"
 
 #. module: crm_claim
 #: field:crm.claim,type_action:0
 #: field:crm.claim.report,type_action:0
 msgid "Action Type"
-msgstr ""
+msgstr "动作类型"
 
 #. module: crm_claim
 #: field:crm.claim,write_date:0
 msgid "Update Date"
-msgstr ""
+msgstr "更新日期"
 
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "Salesman"
-msgstr ""
+msgstr "业务员"
 
 #. module: crm_claim
 #: field:crm.claim,categ_id:0
 #: view:crm.claim.report:0
 #: field:crm.claim.report,categ_id:0
 msgid "Category"
-msgstr ""
+msgstr "类型"
 
 #. module: crm_claim
 #: model:crm.case.categ,name:crm_claim.categ_claim2
 msgid "Value Claims"
-msgstr ""
+msgstr "索赔金额"
 
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "  Year  "
-msgstr ""
+msgstr "  年  "
 
 #. module: crm_claim
 #: help:crm.claim,email_cc:0
@@ -383,27 +383,27 @@ msgid ""
 "These email addresses will be added to the CC field of all inbound and "
 "outbound emails for this record before being sent. Separate multiple email "
 "addresses with a comma"
-msgstr ""
+msgstr "这些邮件地址将添加到之前发送记录的发送和接收邮件的抄送字段，分隔多个邮件地址有逗号。"
 
 #. module: crm_claim
 #: selection:crm.claim,state:0
 #: view:crm.claim.report:0
 #: selection:crm.claim.report,state:0
 msgid "Draft"
-msgstr ""
+msgstr "草稿"
 
 #. module: crm_claim
 #: selection:crm.claim,priority:0
 #: selection:crm.claim.report,priority:0
 msgid "Low"
-msgstr ""
+msgstr "低"
 
 #. module: crm_claim
 #: field:crm.claim,date_closed:0
 #: selection:crm.claim,state:0
 #: selection:crm.claim.report,state:0
 msgid "Closed"
-msgstr ""
+msgstr "已结束"
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -411,83 +411,83 @@ msgstr ""
 #: view:crm.claim.report:0
 #: selection:crm.claim.report,state:0
 msgid "Pending"
-msgstr ""
+msgstr "待定中"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Communication & History"
-msgstr ""
+msgstr "沟通&日志"
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
 msgid "August"
-msgstr ""
+msgstr "8月"
 
 #. module: crm_claim
 #: selection:crm.claim,priority:0
 #: selection:crm.claim.report,priority:0
 msgid "Normal"
-msgstr ""
+msgstr "普通"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Global CC"
-msgstr ""
+msgstr "完整抄送"
 
 #. module: crm_claim
 #: model:ir.module.module,shortdesc:crm_claim.module_meta_information
 msgid "Customer & Supplier Relationship Management"
-msgstr ""
+msgstr "客户&供应商关系管理"
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
 msgid "June"
-msgstr ""
+msgstr "6月"
 
 #. module: crm_claim
 #: field:crm.claim,partner_phone:0
 msgid "Phone"
-msgstr ""
+msgstr "电话"
 
 #. module: crm_claim
 #: field:crm.claim.report,user_id:0
 msgid "User"
-msgstr ""
+msgstr "用户"
 
 #. module: crm_claim
 #: model:crm.case.stage,name:crm_claim.stage_claim5
 msgid "Awaiting Response"
-msgstr ""
+msgstr "等待回复"
 
 #. module: crm_claim
 #: model:ir.actions.act_window,name:crm_claim.crm_claim_categ_action
 msgid "Claim Categories"
-msgstr ""
+msgstr "索赔类型"
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
 msgid "November"
-msgstr ""
+msgstr "11月"
 
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "扩展过滤..."
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Closure"
-msgstr ""
+msgstr "关闭"
 
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "Search"
-msgstr ""
+msgstr "查找"
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
 msgid "October"
-msgstr ""
+msgstr "10月"
 
 #. module: crm_claim
 #: model:ir.module.module,description:crm_claim.module_meta_information
@@ -499,22 +499,25 @@ msgid ""
 "automatically new claims based on incoming emails.\n"
 "    "
 msgstr ""
+"\n"
+"这模块能跟踪你客户和供应商索赔和不满，它是全面整合在电子邮件的网关中，所以你能基于收到的邮件自动创建新的索赔\n"
+"    "
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
 msgid "January"
-msgstr ""
+msgstr "1月"
 
 #. module: crm_claim
 #: view:crm.claim:0
 #: field:crm.claim,date:0
 msgid "Claim Date"
-msgstr ""
+msgstr "索赔日期"
 
 #. module: crm_claim
 #: help:crm.claim,email_from:0
 msgid "These people will receive email."
-msgstr ""
+msgstr "这些人将收到电子邮件。"
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -523,39 +526,39 @@ msgstr ""
 #: model:ir.actions.act_window,name:crm_claim.crm_case_categ_claim0
 #: model:ir.ui.menu,name:crm_claim.menu_crm_case_claims
 msgid "Claims"
-msgstr ""
+msgstr "索赔"
 
 #. module: crm_claim
 #: selection:crm.claim,type_action:0
 #: selection:crm.claim.report,type_action:0
 msgid "Corrective Action"
-msgstr ""
+msgstr "纠正的动作"
 
 #. module: crm_claim
 #: model:crm.case.categ,name:crm_claim.categ_claim3
 msgid "Policy Claims"
-msgstr ""
+msgstr "保险单索赔"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "History"
-msgstr ""
+msgstr "日志"
 
 #. module: crm_claim
 #: model:ir.model,name:crm_claim.model_crm_claim
 #: model:ir.ui.menu,name:crm_claim.menu_config_claim
 msgid "Claim"
-msgstr ""
+msgstr "索赔"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Attachments"
-msgstr ""
+msgstr "附件"
 
 #. module: crm_claim
 #: model:ir.model,name:crm_claim.model_crm_case_stage
 msgid "Stage of case"
-msgstr ""
+msgstr "业务阶段"
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -563,29 +566,29 @@ msgstr ""
 #: view:crm.claim.report:0
 #: field:crm.claim.report,state:0
 msgid "State"
-msgstr ""
+msgstr "州/省"
 
 #. module: crm_claim
 #: view:crm.claim:0
 #: view:crm.claim.report:0
 msgid "Done"
-msgstr ""
+msgstr "完成"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Claim Reporter"
-msgstr ""
+msgstr "索赔记者"
 
 #. module: crm_claim
 #: view:crm.claim:0
 #: view:crm.claim.report:0
 msgid "Cancel"
-msgstr ""
+msgstr "取消"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Close"
-msgstr ""
+msgstr "结束"
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -593,75 +596,75 @@ msgstr ""
 #: view:crm.claim.report:0
 #: selection:crm.claim.report,state:0
 msgid "Open"
-msgstr ""
+msgstr "开启"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "In Progress"
-msgstr ""
+msgstr "进行中"
 
 #. module: crm_claim
 #: view:crm.claim:0
 #: field:crm.claim,user_id:0
 msgid "Responsible"
-msgstr ""
+msgstr "负责人"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Current"
-msgstr ""
+msgstr "当前的"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Details"
-msgstr ""
+msgstr "明细行"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Reply"
-msgstr ""
+msgstr "回复"
 
 #. module: crm_claim
 #: field:crm.claim,cause:0
 msgid "Root Cause"
-msgstr ""
+msgstr "根本原因"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Claim/Action Description"
-msgstr ""
+msgstr "索赔/动作说明"
 
 #. module: crm_claim
 #: field:crm.claim,description:0
 msgid "Description"
-msgstr ""
+msgstr "说明"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Search Claims"
-msgstr ""
+msgstr "查找索赔"
 
 #. module: crm_claim
 #: field:crm.claim,section_id:0
 #: view:crm.claim.report:0
 msgid "Sales Team"
-msgstr ""
+msgstr "销售团队"
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
 msgid "May"
-msgstr ""
+msgstr "5月"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Resolution Actions"
-msgstr ""
+msgstr "决定采取的行动"
 
 #. module: crm_claim
 #: model:ir.actions.act_window,name:crm_claim.act_claim_partner
 #: model:ir.actions.act_window,name:crm_claim.act_claim_partner_address
 msgid "Report a Claim"
-msgstr ""
+msgstr "报告一个索赔"
 
 #. module: crm_claim
 #: model:ir.actions.act_window,help:crm_claim.crm_case_categ_claim0
@@ -671,16 +674,18 @@ msgid ""
 "history for a claim (emails sent, intervention type and so on). Claims may "
 "automatically be linked to an email address using the mail gateway module."
 msgstr ""
+"记录和跟踪你客户的索赔，索赔可以链接到一个或很多销售订单中。你可以发送带附件的邮件和保留一个索赔的所有日志（邮件发送，介入类型等）。索赔可以自动链接到电子"
+"邮件使用的网关。"
 
 #. module: crm_claim
 #: field:crm.claim.report,email:0
 msgid "# Emails"
-msgstr ""
+msgstr "电子邮件"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Follow Up"
-msgstr ""
+msgstr "跟进"
 
 #. module: crm_claim
 #: help:crm.claim,state:0
@@ -693,26 +698,30 @@ msgid ""
 "       \n"
 "If the case needs to be reviewed then the state is set to 'Pending'."
 msgstr ""
+"当一个业务创建时状态设为'草稿'\n"
+"如果业务正在处理状态设为'开启'\n"
+"当业务结束状态设为'完成'\n"
+"如果业务需要审查状态设为'待定'"
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
 msgid "February"
-msgstr ""
+msgstr "2月"
 
 #. module: crm_claim
 #: model:crm.case.stage,name:crm_claim.stage_claim3
 msgid "Won't fix"
-msgstr ""
+msgstr "不修正"
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
 msgid "April"
-msgstr ""
+msgstr "4月"
 
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "My Case(s)"
-msgstr ""
+msgstr "我的业务"
 
 #. module: crm_claim
 #: field:crm.claim,id:0
@@ -722,28 +731,28 @@ msgstr ""
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Actions"
-msgstr ""
+msgstr "动作"
 
 #. module: crm_claim
 #: selection:crm.claim,priority:0
 #: selection:crm.claim.report,priority:0
 msgid "High"
-msgstr ""
+msgstr "高"
 
 #. module: crm_claim
 #: model:ir.actions.act_window,help:crm_claim.crm_claim_categ_action
 msgid ""
 "Create claim categories to better manage and classify your claims. Some "
 "example of claims can be: preventive action, corrective action."
-msgstr ""
+msgstr "创建索赔的类型以更好管理和分类你的索赔。如：索赔可以是预防措施、纠正措施。"
 
 #. module: crm_claim
 #: field:crm.claim.report,create_date:0
 msgid "Create Date"
-msgstr ""
+msgstr "创建日期"
 
 #. module: crm_claim
 #: view:crm.claim.report:0
 #: field:crm.claim.report,name:0
 msgid "Year"
-msgstr ""
+msgstr "年"
diff --git a/addons/crm_fundraising/i18n/gl.po b/addons/crm_fundraising/i18n/gl.po
new file mode 100644
index 00000000000..019724fee08
--- /dev/null
+++ b/addons/crm_fundraising/i18n/gl.po
@@ -0,0 +1,785 @@
+# Galician translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-04-14 16:37+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Galician <gl@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: 2011-04-15 05:06+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,planned_revenue:0
+msgid "Planned Revenue"
+msgstr "Ingresos previstos"
+
+#. module: crm_fundraising
+#: field:crm.fundraising.report,nbr:0
+msgid "# of Cases"
+msgstr "Nº de casos"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+#: view:crm.fundraising.report:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: crm_fundraising
+#: field:crm.fundraising.report,probability:0
+msgid "Avg. Probability"
+msgstr "Probabilidade media"
+
+#. module: crm_fundraising
+#: selection:crm.fundraising.report,month:0
+msgid "March"
+msgstr "Marzo"
+
+#. module: crm_fundraising
+#: field:crm.fundraising.report,delay_close:0
+msgid "Delay to close"
+msgstr "Demora peche"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,company_id:0
+#: view:crm.fundraising.report:0
+#: field:crm.fundraising.report,company_id:0
+msgid "Company"
+msgstr "Compañía"
+
+#. module: crm_fundraising
+#: model:ir.actions.act_window,name:crm_fundraising.crm_fund_categ_action
+msgid "Fundraising Categories"
+msgstr "Categorías de recadación"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,email_cc:0
+msgid "Watchers Emails"
+msgstr "Destinatarios de correos electrónicos (CC)"
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+msgid "Cases"
+msgstr "Casos"
+
+#. module: crm_fundraising
+#: selection:crm.fundraising,priority:0
+msgid "Highest"
+msgstr "A máis alta"
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+#: field:crm.fundraising.report,day:0
+msgid "Day"
+msgstr "Día"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Add Internal Note"
+msgstr "Engadir nota interna"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,partner_mobile:0
+msgid "Mobile"
+msgstr "Móbil"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Notes"
+msgstr "Notas"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,message_ids:0
+msgid "Messages"
+msgstr "Mensaxes"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Amount"
+msgstr "Importe"
+
+#. module: crm_fundraising
+#: model:crm.case.categ,name:crm_fundraising.categ_fund4
+msgid "Arts And Culture"
+msgstr "Arte e cultura"
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+#: field:crm.fundraising.report,amount_revenue:0
+msgid "Est.Revenue"
+msgstr "Beneficio est."
+
+#. module: crm_fundraising
+#: field:crm.fundraising,partner_address_id:0
+msgid "Partner Contact"
+msgstr "Contacto"
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+msgid "   Month   "
+msgstr "   Mes   "
+
+#. module: crm_fundraising
+#: field:crm.fundraising,type_id:0
+msgid "Campaign"
+msgstr "Campaña"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,date_action_next:0
+msgid "Next Action"
+msgstr "Seguinte acción"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Reset to Draft"
+msgstr "Cambiar a modo Borrador"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Extra Info"
+msgstr "Información adicional"
+
+#. module: crm_fundraising
+#: model:ir.model,name:crm_fundraising.model_crm_fundraising
+#: model:ir.ui.menu,name:crm_fundraising.menu_config_fundrising
+#: model:ir.ui.menu,name:crm_fundraising.menu_crm_case_fund_raise
+msgid "Fund Raising"
+msgstr "Recadación de fondos"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+#: field:crm.fundraising,partner_id:0
+#: field:crm.fundraising.report,partner_id:0
+msgid "Partner"
+msgstr "Socio"
+
+#. module: crm_fundraising
+#: model:ir.ui.menu,name:crm_fundraising.menu_report_crm_fundraising_tree
+msgid "Fundraising Analysis"
+msgstr "Análise da recadación"
+
+#. module: crm_fundraising
+#: model:ir.module.module,shortdesc:crm_fundraising.module_meta_information
+msgid "CRM Fundraising"
+msgstr "Recadación CRM"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Misc"
+msgstr "Varios"
+
+#. module: crm_fundraising
+#: field:crm.fundraising.report,section_id:0
+msgid "Section"
+msgstr "Sección"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+#: field:crm.fundraising,priority:0
+msgid "Priority"
+msgstr "Prioridade"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Send New Email"
+msgstr "Enviar novo email"
+
+#. module: crm_fundraising
+#: model:crm.case.categ,name:crm_fundraising.categ_fund1
+msgid "Social Rehabilitation And Rural Upliftment"
+msgstr "Rehabilitación social e desenvolvemento rural"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+#: view:crm.fundraising.report:0
+msgid "Payment Mode"
+msgstr "Modo de pagamento"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Reply"
+msgstr "Resposta"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,email_from:0
+msgid "Email"
+msgstr "E-mail"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,canal_id:0
+msgid "Channel"
+msgstr "Canle"
+
+#. module: crm_fundraising
+#: selection:crm.fundraising,priority:0
+msgid "Lowest"
+msgstr "A máis baixa"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,create_date:0
+msgid "Creation Date"
+msgstr "Data de creación"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,date_deadline:0
+msgid "Deadline"
+msgstr "Data límite"
+
+#. module: crm_fundraising
+#: selection:crm.fundraising.report,month:0
+msgid "July"
+msgstr "Xullo"
+
+#. module: crm_fundraising
+#: model:ir.ui.menu,name:crm_fundraising.menu_crm_case_fundraising-act
+msgid "Categories"
+msgstr "Categorías"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,stage_id:0
+msgid "Stage"
+msgstr "Fase"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "History Information"
+msgstr "Información histórica"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Dates"
+msgstr "Datas"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,partner_name2:0
+msgid "Employee Email"
+msgstr "E-mail do empregado"
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+msgid "    Month-1    "
+msgstr "    Mes-1    "
+
+#. module: crm_fundraising
+#: selection:crm.fundraising,state:0
+#: selection:crm.fundraising.report,state:0
+msgid "Cancelled"
+msgstr "Anulado"
+
+#. module: crm_fundraising
+#: model:crm.case.categ,name:crm_fundraising.categ_fund2
+msgid "Learning And Education"
+msgstr "Aprendizaxe e educación"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Contact"
+msgstr "Contacto"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Funds Form"
+msgstr "Formulario fondos"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Fund Description"
+msgstr "Descrición do fondo"
+
+#. module: crm_fundraising
+#: help:crm.fundraising.report,delay_close:0
+msgid "Number of Days to close the case"
+msgstr "Número de días para pechar o caso"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "References"
+msgstr "Referencias"
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+#: model:ir.actions.act_window,name:crm_fundraising.action_report_crm_fundraising
+#: model:ir.module.module,description:crm_fundraising.module_meta_information
+msgid "Fundraising"
+msgstr "Recadación de fondos"
+
+#. module: crm_fundraising
+#: model:ir.actions.act_window,help:crm_fundraising.action_report_crm_fundraising
+msgid ""
+"Have a general overview of all fund raising activities by sorting them with "
+"specific criteria such as the estimated revenue, average success probability "
+"and delay to close."
+msgstr ""
+"Obteña unha vista xeral de tódalas actividades de recadación ordenándoas por "
+"criterios específicos como beneficio estimado, probabilidade de éxito media "
+"e demora de peche."
+
+#. module: crm_fundraising
+#: selection:crm.fundraising.report,month:0
+msgid "September"
+msgstr "Setembro"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Communication"
+msgstr "Comunicación"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Funds Tree"
+msgstr "Árbore de fondos"
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+#: field:crm.fundraising.report,month:0
+msgid "Month"
+msgstr "Mes"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Escalate"
+msgstr "Escalado"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,write_date:0
+msgid "Update Date"
+msgstr "Data de actualización"
+
+#. module: crm_fundraising
+#: model:crm.case.resource.type,name:crm_fundraising.type_fund3
+msgid "Credit Card"
+msgstr "Tarxeta de crédito"
+
+#. module: crm_fundraising
+#: model:ir.actions.act_window,name:crm_fundraising.crm_fundraising_stage_act
+msgid "Fundraising Stages"
+msgstr "Etapas de recadación"
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+msgid "Salesman"
+msgstr "Vendedor"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,ref:0
+msgid "Reference"
+msgstr "Referencia"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,ref2:0
+msgid "Reference 2"
+msgstr "Referencia 2"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+#: field:crm.fundraising,categ_id:0
+#: view:crm.fundraising.report:0
+#: field:crm.fundraising.report,categ_id:0
+msgid "Category"
+msgstr "Categoría"
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+msgid "  Year  "
+msgstr "  Ano  "
+
+#. module: crm_fundraising
+#: field:crm.fundraising,planned_cost:0
+#: view:crm.fundraising.report:0
+#: field:crm.fundraising.report,planned_cost:0
+msgid "Planned Costs"
+msgstr "Custos planeados"
+
+#. module: crm_fundraising
+#: help:crm.fundraising,email_cc:0
+msgid ""
+"These email addresses will be added to the CC field of all inbound and "
+"outbound emails for this record before being sent. Separate multiple email "
+"addresses with a comma"
+msgstr ""
+"Estes enderezos de correo engadiranse ó campo CC para tódolos correos "
+"entrantes e saíntes deste rexistro antes de ser enviados. Separe os "
+"diferentes enderezos de correo cunha coma."
+
+#. module: crm_fundraising
+#: selection:crm.fundraising,state:0
+#: view:crm.fundraising.report:0
+#: selection:crm.fundraising.report,state:0
+msgid "Draft"
+msgstr "Borrador"
+
+#. module: crm_fundraising
+#: selection:crm.fundraising,priority:0
+msgid "Low"
+msgstr "Baixo"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,date_closed:0
+#: selection:crm.fundraising,state:0
+#: selection:crm.fundraising.report,state:0
+msgid "Closed"
+msgstr "Pechado"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+#: selection:crm.fundraising,state:0
+#: view:crm.fundraising.report:0
+#: selection:crm.fundraising.report,state:0
+msgid "Pending"
+msgstr "Pendente"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Communication & History"
+msgstr "Comunicación e historial"
+
+#. module: crm_fundraising
+#: model:ir.ui.menu,name:crm_fundraising.menu_crm_fundraising_stage_act
+msgid "Stages"
+msgstr "Etapas"
+
+#. module: crm_fundraising
+#: selection:crm.fundraising.report,month:0
+msgid "August"
+msgstr "Agosto"
+
+#. module: crm_fundraising
+#: selection:crm.fundraising,priority:0
+msgid "Normal"
+msgstr "Normal"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Global CC"
+msgstr "CC global"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+#: model:ir.actions.act_window,name:crm_fundraising.crm_case_category_act_fund_all1
+msgid "Funds"
+msgstr "Fondos"
+
+#. module: crm_fundraising
+#: selection:crm.fundraising.report,month:0
+msgid "June"
+msgstr "Xuño"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,partner_phone:0
+msgid "Phone"
+msgstr "Teléfono"
+
+#. module: crm_fundraising
+#: field:crm.fundraising.report,user_id:0
+msgid "User"
+msgstr "Usuario"
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+msgid "#Fundraising"
+msgstr "Nº obtención fondos"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,active:0
+msgid "Active"
+msgstr "Activo"
+
+#. module: crm_fundraising
+#: selection:crm.fundraising.report,month:0
+msgid "November"
+msgstr "Novembro"
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+msgid "Extended Filters..."
+msgstr "Filtros extendidos..."
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+msgid "Search"
+msgstr "Buscar"
+
+#. module: crm_fundraising
+#: selection:crm.fundraising.report,month:0
+msgid "October"
+msgstr "Outubro"
+
+#. module: crm_fundraising
+#: selection:crm.fundraising.report,month:0
+msgid "January"
+msgstr "Xaneiro"
+
+#. module: crm_fundraising
+#: model:crm.case.resource.type,name:crm_fundraising.type_fund2
+msgid "Cheque"
+msgstr "Cheque"
+
+#. module: crm_fundraising
+#: model:ir.actions.act_window,help:crm_fundraising.crm_fund_categ_action
+msgid ""
+"Manage and define the fund raising categories you want to be maintained in "
+"the system."
+msgstr ""
+"Xestione e defina as categorías de recadación que desexe manter no sistema."
+
+#. module: crm_fundraising
+#: help:crm.fundraising,email_from:0
+msgid "These people will receive email."
+msgstr "Estas persoas recibirán un e-mail."
+
+#. module: crm_fundraising
+#: field:crm.fundraising,date:0
+msgid "Date"
+msgstr "Data"
+
+#. module: crm_fundraising
+#: model:crm.case.categ,name:crm_fundraising.categ_fund3
+msgid "Healthcare"
+msgstr "Servizos de Saúde"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "History"
+msgstr "Historia"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Attachments"
+msgstr "Anexos"
+
+#. module: crm_fundraising
+#: model:ir.model,name:crm_fundraising.model_crm_case_stage
+msgid "Stage of case"
+msgstr "Fase do caso"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Estimates"
+msgstr "Estimacións"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+#: field:crm.fundraising,state:0
+#: view:crm.fundraising.report:0
+#: field:crm.fundraising.report,state:0
+msgid "State"
+msgstr "Estado"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+#: view:crm.fundraising.report:0
+msgid "Done"
+msgstr "Feito"
+
+#. module: crm_fundraising
+#: selection:crm.fundraising.report,month:0
+msgid "December"
+msgstr "Decembro"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+#: view:crm.fundraising.report:0
+msgid "Cancel"
+msgstr "Anular"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+#: selection:crm.fundraising,state:0
+#: view:crm.fundraising.report:0
+#: selection:crm.fundraising.report,state:0
+msgid "Open"
+msgstr "Aberto"
+
+#. module: crm_fundraising
+#: model:ir.actions.act_window,help:crm_fundraising.crm_case_category_act_fund_all1
+msgid ""
+"If you need to collect money for your organization or a campaign, Fund "
+"Raising allows you to track all your fund raising activities. In the search "
+"list, filter by funds description, email, history and probability of success."
+msgstr ""
+"Se precisa reunir cartos para a súa organización ou para unha campaña, "
+"Recadación de Fondos permítelle rexistrar tódalas súas actividades de "
+"recadación. Na lista de busca, filtre os fondos por descrición, correo "
+"electrónico, historial e probabilidade de éxito."
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+#: field:crm.fundraising,user_id:0
+msgid "Responsible"
+msgstr "Responsable"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Current"
+msgstr "Actual"
+
+#. module: crm_fundraising
+#: help:crm.fundraising,section_id:0
+msgid ""
+"Sales team to which Case belongs to. Define Responsible user and Email "
+"account for mail gateway."
+msgstr ""
+"Equipo de vendas ó que pertence o caso. Defina o usuario responsable e a "
+"conta de email para a pasarela de correo."
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Details"
+msgstr "Detalles"
+
+#. module: crm_fundraising
+#: model:ir.model,name:crm_fundraising.model_crm_fundraising_report
+msgid "CRM Fundraising Report"
+msgstr "CRM Informe de recadacións"
+
+#. module: crm_fundraising
+#: field:crm.fundraising.report,type_id:0
+msgid "Fundraising Type"
+msgstr "Tipo de recadación"
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+#: field:crm.fundraising.report,amount_revenue_prob:0
+msgid "Est. Rev*Prob."
+msgstr "Beneficio*Prob. estim."
+
+#. module: crm_fundraising
+#: model:ir.actions.act_window,help:crm_fundraising.crm_fundraising_stage_act
+msgid ""
+"Create and manage fund raising activity categories you want to be maintained "
+"in the system."
+msgstr ""
+"Cree e xestione as categorías de actividades de recadación que desexe manter "
+"no sistema."
+
+#. module: crm_fundraising
+#: field:crm.fundraising,description:0
+msgid "Description"
+msgstr "Descrición"
+
+#. module: crm_fundraising
+#: selection:crm.fundraising.report,month:0
+msgid "May"
+msgstr "Maio"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,probability:0
+msgid "Probability (%)"
+msgstr "Probabilidade (%)"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,partner_name:0
+msgid "Employee's Name"
+msgstr "Nome do empregado"
+
+#. module: crm_fundraising
+#: help:crm.fundraising,canal_id:0
+msgid ""
+"The channels represent the different communication  modes available with the "
+"customer."
+msgstr ""
+"As canles representan os diferentes modos de comunicación dispoñibles co "
+"cliente"
+
+#. module: crm_fundraising
+#: help:crm.fundraising,state:0
+msgid ""
+"The state is set to 'Draft', when a case is created.                         "
+"         \n"
+"If the case is in progress the state is set to 'Open'.                       "
+"           \n"
+"When the case is over, the state is set to 'Done'.                           "
+"       \n"
+"If the case needs to be reviewed then the state is set to 'Pending'."
+msgstr ""
+"O estado configúrase como \"Borrador\", cando se crea un caso. Se o caso "
+"está en curso, o estado configúrase como \"Aberto\". Cando se pecha o caso, "
+"o estado configúrase como \"Realizado\". Se cómpre revisar o caso, o estado "
+"configúrase como \"Pendente\"."
+
+#. module: crm_fundraising
+#: selection:crm.fundraising.report,month:0
+msgid "February"
+msgstr "Febreiro"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+#: field:crm.fundraising,name:0
+msgid "Name"
+msgstr "Nome"
+
+#. module: crm_fundraising
+#: model:crm.case.resource.type,name:crm_fundraising.type_fund1
+msgid "Cash"
+msgstr "Efectivo"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Funds by Categories"
+msgstr "Fondos por categorías"
+
+#. module: crm_fundraising
+#: selection:crm.fundraising.report,month:0
+msgid "April"
+msgstr "Abril"
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+msgid "My Case(s)"
+msgstr "O(s) meu(s) caso(s)"
+
+#. module: crm_fundraising
+#: model:crm.case.resource.type,name:crm_fundraising.type_fund4
+msgid "Demand Draft"
+msgstr "Solicitar borrador"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,id:0
+msgid "ID"
+msgstr "ID"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Search Funds"
+msgstr "Buscar fondos"
+
+#. module: crm_fundraising
+#: selection:crm.fundraising,priority:0
+msgid "High"
+msgstr "Alto"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+#: field:crm.fundraising,section_id:0
+#: view:crm.fundraising.report:0
+msgid "Sales Team"
+msgstr "Equipo de vendas"
+
+#. module: crm_fundraising
+#: field:crm.fundraising.report,create_date:0
+msgid "Create Date"
+msgstr "Crear data"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,date_action_last:0
+msgid "Last Action"
+msgstr "Última acción"
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+#: field:crm.fundraising.report,name:0
+msgid "Year"
+msgstr "Ano"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,duration:0
+msgid "Duration"
+msgstr "Duración"
diff --git a/addons/crm_fundraising/i18n/zh_CN.po b/addons/crm_fundraising/i18n/zh_CN.po
new file mode 100644
index 00000000000..4b4f6720855
--- /dev/null
+++ b/addons/crm_fundraising/i18n/zh_CN.po
@@ -0,0 +1,768 @@
+# Chinese (Simplified) translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-04-11 07:40+0000\n"
+"Last-Translator: Black Jack <Unknown>\n"
+"Language-Team: Chinese (Simplified) <zh_CN@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: 2011-04-12 04:34+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,planned_revenue:0
+msgid "Planned Revenue"
+msgstr "计划收入"
+
+#. module: crm_fundraising
+#: field:crm.fundraising.report,nbr:0
+msgid "# of Cases"
+msgstr "# 业务"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+#: view:crm.fundraising.report:0
+msgid "Group By..."
+msgstr "分组..."
+
+#. module: crm_fundraising
+#: field:crm.fundraising.report,probability:0
+msgid "Avg. Probability"
+msgstr "平均概率"
+
+#. module: crm_fundraising
+#: selection:crm.fundraising.report,month:0
+msgid "March"
+msgstr "3月"
+
+#. module: crm_fundraising
+#: field:crm.fundraising.report,delay_close:0
+msgid "Delay to close"
+msgstr "延迟关闭"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,company_id:0
+#: view:crm.fundraising.report:0
+#: field:crm.fundraising.report,company_id:0
+msgid "Company"
+msgstr "公司"
+
+#. module: crm_fundraising
+#: model:ir.actions.act_window,name:crm_fundraising.crm_fund_categ_action
+msgid "Fundraising Categories"
+msgstr "集资类型"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,email_cc:0
+msgid "Watchers Emails"
+msgstr "关注者的电子邮件"
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+msgid "Cases"
+msgstr "业务"
+
+#. module: crm_fundraising
+#: selection:crm.fundraising,priority:0
+msgid "Highest"
+msgstr "最高"
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+#: field:crm.fundraising.report,day:0
+msgid "Day"
+msgstr "日"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Add Internal Note"
+msgstr "添加内部备注"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,partner_mobile:0
+msgid "Mobile"
+msgstr "手机"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Notes"
+msgstr "备注"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,message_ids:0
+msgid "Messages"
+msgstr "消息"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Amount"
+msgstr "金额"
+
+#. module: crm_fundraising
+#: model:crm.case.categ,name:crm_fundraising.categ_fund4
+msgid "Arts And Culture"
+msgstr "艺术文化"
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+#: field:crm.fundraising.report,amount_revenue:0
+msgid "Est.Revenue"
+msgstr "预计收入"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,partner_address_id:0
+msgid "Partner Contact"
+msgstr "业务伙伴联系方式"
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+msgid "   Month   "
+msgstr "   月   "
+
+#. module: crm_fundraising
+#: field:crm.fundraising,type_id:0
+msgid "Campaign"
+msgstr "营销活动"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,date_action_next:0
+msgid "Next Action"
+msgstr "下一动作"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Reset to Draft"
+msgstr "重置为草稿"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Extra Info"
+msgstr "额外信息"
+
+#. module: crm_fundraising
+#: model:ir.model,name:crm_fundraising.model_crm_fundraising
+#: model:ir.ui.menu,name:crm_fundraising.menu_config_fundrising
+#: model:ir.ui.menu,name:crm_fundraising.menu_crm_case_fund_raise
+msgid "Fund Raising"
+msgstr "资金募集"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+#: field:crm.fundraising,partner_id:0
+#: field:crm.fundraising.report,partner_id:0
+msgid "Partner"
+msgstr "业务伙伴"
+
+#. module: crm_fundraising
+#: model:ir.ui.menu,name:crm_fundraising.menu_report_crm_fundraising_tree
+msgid "Fundraising Analysis"
+msgstr "资金募集分析"
+
+#. module: crm_fundraising
+#: model:ir.module.module,shortdesc:crm_fundraising.module_meta_information
+msgid "CRM Fundraising"
+msgstr "客户关系管理 资金募集"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Misc"
+msgstr "杂项"
+
+#. module: crm_fundraising
+#: field:crm.fundraising.report,section_id:0
+msgid "Section"
+msgstr "分类"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+#: field:crm.fundraising,priority:0
+msgid "Priority"
+msgstr "优先级"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Send New Email"
+msgstr "发送新的电子邮件"
+
+#. module: crm_fundraising
+#: model:crm.case.categ,name:crm_fundraising.categ_fund1
+msgid "Social Rehabilitation And Rural Upliftment"
+msgstr "社会康复和农场振兴"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+#: view:crm.fundraising.report:0
+msgid "Payment Mode"
+msgstr "支付方式"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Reply"
+msgstr "回复"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,email_from:0
+msgid "Email"
+msgstr "电子邮件"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,canal_id:0
+msgid "Channel"
+msgstr "途径"
+
+#. module: crm_fundraising
+#: selection:crm.fundraising,priority:0
+msgid "Lowest"
+msgstr "最低"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,create_date:0
+msgid "Creation Date"
+msgstr "创建日期"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,date_deadline:0
+msgid "Deadline"
+msgstr "截止日期"
+
+#. module: crm_fundraising
+#: selection:crm.fundraising.report,month:0
+msgid "July"
+msgstr "7月"
+
+#. module: crm_fundraising
+#: model:ir.ui.menu,name:crm_fundraising.menu_crm_case_fundraising-act
+msgid "Categories"
+msgstr "类型"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,stage_id:0
+msgid "Stage"
+msgstr "阶段"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "History Information"
+msgstr "日志信息"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Dates"
+msgstr "日期"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,partner_name2:0
+msgid "Employee Email"
+msgstr "员工邮箱"
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+msgid "    Month-1    "
+msgstr "    上月    "
+
+#. module: crm_fundraising
+#: selection:crm.fundraising,state:0
+#: selection:crm.fundraising.report,state:0
+msgid "Cancelled"
+msgstr "已取消"
+
+#. module: crm_fundraising
+#: model:crm.case.categ,name:crm_fundraising.categ_fund2
+msgid "Learning And Education"
+msgstr "学习和教育"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Contact"
+msgstr "联系方式"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Funds Form"
+msgstr "资金类型"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Fund Description"
+msgstr "资金说明"
+
+#. module: crm_fundraising
+#: help:crm.fundraising.report,delay_close:0
+msgid "Number of Days to close the case"
+msgstr "到期天数"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "References"
+msgstr "参考"
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+#: model:ir.actions.act_window,name:crm_fundraising.action_report_crm_fundraising
+#: model:ir.module.module,description:crm_fundraising.module_meta_information
+msgid "Fundraising"
+msgstr "资金募集"
+
+#. module: crm_fundraising
+#: model:ir.actions.act_window,help:crm_fundraising.action_report_crm_fundraising
+msgid ""
+"Have a general overview of all fund raising activities by sorting them with "
+"specific criteria such as the estimated revenue, average success probability "
+"and delay to close."
+msgstr "所有的资金募集活动都有一个一般概述并按具体的标准分类。如预计收入，平均成功的概率和延迟关闭等。"
+
+#. module: crm_fundraising
+#: selection:crm.fundraising.report,month:0
+msgid "September"
+msgstr "9月"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Communication"
+msgstr "沟通"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Funds Tree"
+msgstr "资金树"
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+#: field:crm.fundraising.report,month:0
+msgid "Month"
+msgstr "月"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Escalate"
+msgstr "提升"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,write_date:0
+msgid "Update Date"
+msgstr "更新日期"
+
+#. module: crm_fundraising
+#: model:crm.case.resource.type,name:crm_fundraising.type_fund3
+msgid "Credit Card"
+msgstr "信用卡"
+
+#. module: crm_fundraising
+#: model:ir.actions.act_window,name:crm_fundraising.crm_fundraising_stage_act
+msgid "Fundraising Stages"
+msgstr "资金募集阶段"
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+msgid "Salesman"
+msgstr "业务员"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,ref:0
+msgid "Reference"
+msgstr "参考"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,ref2:0
+msgid "Reference 2"
+msgstr "参考2"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+#: field:crm.fundraising,categ_id:0
+#: view:crm.fundraising.report:0
+#: field:crm.fundraising.report,categ_id:0
+msgid "Category"
+msgstr "类型"
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+msgid "  Year  "
+msgstr "  年  "
+
+#. module: crm_fundraising
+#: field:crm.fundraising,planned_cost:0
+#: view:crm.fundraising.report:0
+#: field:crm.fundraising.report,planned_cost:0
+msgid "Planned Costs"
+msgstr "计划成本"
+
+#. module: crm_fundraising
+#: help:crm.fundraising,email_cc:0
+msgid ""
+"These email addresses will be added to the CC field of all inbound and "
+"outbound emails for this record before being sent. Separate multiple email "
+"addresses with a comma"
+msgstr "这些邮件地址将添加到之前发送记录的发送和接收邮件的抄送字段，分隔多个邮件地址有逗号。"
+
+#. module: crm_fundraising
+#: selection:crm.fundraising,state:0
+#: view:crm.fundraising.report:0
+#: selection:crm.fundraising.report,state:0
+msgid "Draft"
+msgstr "草稿"
+
+#. module: crm_fundraising
+#: selection:crm.fundraising,priority:0
+msgid "Low"
+msgstr "低"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,date_closed:0
+#: selection:crm.fundraising,state:0
+#: selection:crm.fundraising.report,state:0
+msgid "Closed"
+msgstr "已关闭"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+#: selection:crm.fundraising,state:0
+#: view:crm.fundraising.report:0
+#: selection:crm.fundraising.report,state:0
+msgid "Pending"
+msgstr "待定中"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Communication & History"
+msgstr "沟通&日志"
+
+#. module: crm_fundraising
+#: model:ir.ui.menu,name:crm_fundraising.menu_crm_fundraising_stage_act
+msgid "Stages"
+msgstr "阶段"
+
+#. module: crm_fundraising
+#: selection:crm.fundraising.report,month:0
+msgid "August"
+msgstr "8月"
+
+#. module: crm_fundraising
+#: selection:crm.fundraising,priority:0
+msgid "Normal"
+msgstr "普通"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Global CC"
+msgstr "完整抄送"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+#: model:ir.actions.act_window,name:crm_fundraising.crm_case_category_act_fund_all1
+msgid "Funds"
+msgstr "资金"
+
+#. module: crm_fundraising
+#: selection:crm.fundraising.report,month:0
+msgid "June"
+msgstr "6月"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,partner_phone:0
+msgid "Phone"
+msgstr "电话"
+
+#. module: crm_fundraising
+#: field:crm.fundraising.report,user_id:0
+msgid "User"
+msgstr "用户"
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+msgid "#Fundraising"
+msgstr "#资金募集"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,active:0
+msgid "Active"
+msgstr "生效"
+
+#. module: crm_fundraising
+#: selection:crm.fundraising.report,month:0
+msgid "November"
+msgstr "11月"
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+msgid "Extended Filters..."
+msgstr "扩展过滤..."
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+msgid "Search"
+msgstr "查找"
+
+#. module: crm_fundraising
+#: selection:crm.fundraising.report,month:0
+msgid "October"
+msgstr "10月"
+
+#. module: crm_fundraising
+#: selection:crm.fundraising.report,month:0
+msgid "January"
+msgstr "1月"
+
+#. module: crm_fundraising
+#: model:crm.case.resource.type,name:crm_fundraising.type_fund2
+msgid "Cheque"
+msgstr "支票"
+
+#. module: crm_fundraising
+#: model:ir.actions.act_window,help:crm_fundraising.crm_fund_categ_action
+msgid ""
+"Manage and define the fund raising categories you want to be maintained in "
+"the system."
+msgstr "在你的系统中管理和定义资金募集的类型"
+
+#. module: crm_fundraising
+#: help:crm.fundraising,email_from:0
+msgid "These people will receive email."
+msgstr "这些人将收到电子邮件。"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,date:0
+msgid "Date"
+msgstr "日期"
+
+#. module: crm_fundraising
+#: model:crm.case.categ,name:crm_fundraising.categ_fund3
+msgid "Healthcare"
+msgstr "卫生保健"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "History"
+msgstr "日志"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Attachments"
+msgstr "附件"
+
+#. module: crm_fundraising
+#: model:ir.model,name:crm_fundraising.model_crm_case_stage
+msgid "Stage of case"
+msgstr "业务阶段"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Estimates"
+msgstr "估计"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+#: field:crm.fundraising,state:0
+#: view:crm.fundraising.report:0
+#: field:crm.fundraising.report,state:0
+msgid "State"
+msgstr "州/省"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+#: view:crm.fundraising.report:0
+msgid "Done"
+msgstr "完成"
+
+#. module: crm_fundraising
+#: selection:crm.fundraising.report,month:0
+msgid "December"
+msgstr "12月"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+#: view:crm.fundraising.report:0
+msgid "Cancel"
+msgstr "取消"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+#: selection:crm.fundraising,state:0
+#: view:crm.fundraising.report:0
+#: selection:crm.fundraising.report,state:0
+msgid "Open"
+msgstr "开启"
+
+#. module: crm_fundraising
+#: model:ir.actions.act_window,help:crm_fundraising.crm_case_category_act_fund_all1
+msgid ""
+"If you need to collect money for your organization or a campaign, Fund "
+"Raising allows you to track all your fund raising activities. In the search "
+"list, filter by funds description, email, history and probability of success."
+msgstr "如果你需要为你的组织或公司筹集经费，资金募集可以使你跟踪你的资金募集活动。在搜索列表按资金说明、邮件、日志和成功的可能性筛选。"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+#: field:crm.fundraising,user_id:0
+msgid "Responsible"
+msgstr "负责人"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Current"
+msgstr "当前的"
+
+#. module: crm_fundraising
+#: help:crm.fundraising,section_id:0
+msgid ""
+"Sales team to which Case belongs to. Define Responsible user and Email "
+"account for mail gateway."
+msgstr "业务的销售团队，定义责任人和邮件的网关。"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Details"
+msgstr "明细行"
+
+#. module: crm_fundraising
+#: model:ir.model,name:crm_fundraising.model_crm_fundraising_report
+msgid "CRM Fundraising Report"
+msgstr "客户关系管理 资金募集报表"
+
+#. module: crm_fundraising
+#: field:crm.fundraising.report,type_id:0
+msgid "Fundraising Type"
+msgstr "资金募集类型"
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+#: field:crm.fundraising.report,amount_revenue_prob:0
+msgid "Est. Rev*Prob."
+msgstr "估计收入 × 概率"
+
+#. module: crm_fundraising
+#: model:ir.actions.act_window,help:crm_fundraising.crm_fundraising_stage_act
+msgid ""
+"Create and manage fund raising activity categories you want to be maintained "
+"in the system."
+msgstr "在你的系统中创建和管理资金募集活动的类型"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,description:0
+msgid "Description"
+msgstr "说明"
+
+#. module: crm_fundraising
+#: selection:crm.fundraising.report,month:0
+msgid "May"
+msgstr "5月"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,probability:0
+msgid "Probability (%)"
+msgstr "概率(%)"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,partner_name:0
+msgid "Employee's Name"
+msgstr "员工姓名"
+
+#. module: crm_fundraising
+#: help:crm.fundraising,canal_id:0
+msgid ""
+"The channels represent the different communication  modes available with the "
+"customer."
+msgstr "途径代表与客户沟通的不同方式"
+
+#. module: crm_fundraising
+#: help:crm.fundraising,state:0
+msgid ""
+"The state is set to 'Draft', when a case is created.                         "
+"         \n"
+"If the case is in progress the state is set to 'Open'.                       "
+"           \n"
+"When the case is over, the state is set to 'Done'.                           "
+"       \n"
+"If the case needs to be reviewed then the state is set to 'Pending'."
+msgstr ""
+"当一个业务创建时状态设为'草稿'\n"
+"如果业务正在处理状态设为'开启'\n"
+"当业务结束状态设为'完成'\n"
+"如果业务需要审查状态设为'待定'"
+
+#. module: crm_fundraising
+#: selection:crm.fundraising.report,month:0
+msgid "February"
+msgstr "2月"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+#: field:crm.fundraising,name:0
+msgid "Name"
+msgstr "名称"
+
+#. module: crm_fundraising
+#: model:crm.case.resource.type,name:crm_fundraising.type_fund1
+msgid "Cash"
+msgstr "现金"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Funds by Categories"
+msgstr "资金类型"
+
+#. module: crm_fundraising
+#: selection:crm.fundraising.report,month:0
+msgid "April"
+msgstr "4月"
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+msgid "My Case(s)"
+msgstr "我的业务"
+
+#. module: crm_fundraising
+#: model:crm.case.resource.type,name:crm_fundraising.type_fund4
+msgid "Demand Draft"
+msgstr "汇票"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,id:0
+msgid "ID"
+msgstr ""
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Search Funds"
+msgstr "查找资金"
+
+#. module: crm_fundraising
+#: selection:crm.fundraising,priority:0
+msgid "High"
+msgstr "高"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+#: field:crm.fundraising,section_id:0
+#: view:crm.fundraising.report:0
+msgid "Sales Team"
+msgstr "销售团队"
+
+#. module: crm_fundraising
+#: field:crm.fundraising.report,create_date:0
+msgid "Create Date"
+msgstr "创建日期"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,date_action_last:0
+msgid "Last Action"
+msgstr "最近动作"
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+#: field:crm.fundraising.report,name:0
+msgid "Year"
+msgstr "年"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,duration:0
+msgid "Duration"
+msgstr "持续时间"
diff --git a/addons/crm_partner_assign/i18n/zh_CN.po b/addons/crm_partner_assign/i18n/zh_CN.po
new file mode 100644
index 00000000000..306f09f7a00
--- /dev/null
+++ b/addons/crm_partner_assign/i18n/zh_CN.po
@@ -0,0 +1,713 @@
+# Chinese (Simplified) translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-04-11 08:43+0000\n"
+"Last-Translator: Black Jack <Unknown>\n"
+"Language-Team: Chinese (Simplified) <zh_CN@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: 2011-04-12 04:34+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,name:0
+msgid "Send to"
+msgstr "发送到"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,delay_close:0
+msgid "Delay to Close"
+msgstr "延迟关闭"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,planned_revenue:0
+msgid "Planned Revenue"
+msgstr "计划收入"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,nbr:0
+msgid "# of Cases"
+msgstr "# 业务"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Group By..."
+msgstr "分组..."
+
+#. module: crm_partner_assign
+#: view:crm.lead:0
+#: view:crm.lead.forward.to.partner:0
+msgid "Forward"
+msgstr "下一页"
+
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,reply_to:0
+msgid "Reply-to of the Sales team defined on this case"
+msgstr "在这业务销售团队定义的“回复到”"
+
+#. module: crm_partner_assign
+#: view:res.partner:0
+msgid "Geo Localize"
+msgstr "geolocalization定位"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "March"
+msgstr "3月"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,type:0
+msgid "Lead"
+msgstr "线索"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Delay to close"
+msgstr "延迟关闭"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.forward.to.partner,history:0
+msgid "Whole Story"
+msgstr "完整的情况"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,company_id:0
+msgid "Company"
+msgstr "公司"
+
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/partner_geo_assign.py:41
+#, python-format
+msgid ""
+"Could not contact geolocation servers, please make sure you have a working "
+"internet connection (%s)"
+msgstr "无法连接到服务器，请确保你的连接 (%s) 正常。"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,partner_date:0
+msgid "Partner Date"
+msgstr "业务伙伴日期"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,priority:0
+msgid "Highest"
+msgstr "最高"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,day:0
+msgid "Day"
+msgstr "日"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.forward.to.partner,history:0
+msgid "Latest email"
+msgstr "最近的邮件"
+
+#. module: crm_partner_assign
+#: field:crm.lead,partner_latitude:0
+#: field:res.partner,partner_latitude:0
+msgid "Geo Latitude"
+msgstr "geolocalization纬度"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.forward.to.partner,state:0
+#: selection:crm.lead.report.assign,state:0
+msgid "Cancelled"
+msgstr "已取消"
+
+#. module: crm_partner_assign
+#: view:crm.lead:0
+msgid "Geo Assignation"
+msgstr "geolocalization指派"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,date_closed:0
+msgid "Close Date"
+msgstr "结束日期"
+
+#. module: crm_partner_assign
+#: help:res.partner,partner_weight:0
+msgid ""
+"Gives the probability to assign a lead to this partner. (0 means no "
+"assignation.)"
+msgstr "为线索指派一个业务伙伴的概率（0表示没指派）"
+
+#. module: crm_partner_assign
+#: model:ir.module.module,description:crm_partner_assign.module_meta_information
+msgid ""
+"\n"
+"This is the module used by OpenERP SA to redirect customers to his "
+"partners,\n"
+"based on geolocalization.\n"
+"    "
+msgstr ""
+"\n"
+"这模块用于系统给业务伙伴定位的地理信息，其基于google的geolocalization服务\n"
+"    "
+
+#. module: crm_partner_assign
+#: selection:crm.lead.forward.to.partner,state:0
+#: selection:crm.lead.report.assign,state:0
+msgid "Pending"
+msgstr "待定中"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.forward.to.partner,name:0
+#: field:crm.lead.forward.to.partner,partner_id:0
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,partner_assigned_id:0
+#: model:ir.model,name:crm_partner_assign.model_res_partner
+msgid "Partner"
+msgstr "业务伙伴"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,probability:0
+msgid "Avg Probability"
+msgstr "平均概率"
+
+#. module: crm_partner_assign
+#: view:res.partner:0
+msgid "Previous"
+msgstr "前一个"
+
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/partner_geo_assign.py:40
+#, python-format
+msgid "Network error"
+msgstr "网络错误"
+
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,email_cc:0
+msgid ""
+"These addresses will receive a copy of this email. To modify the permanent "
+"CC list, edit the global CC field of this case"
+msgstr "这些地址将收到这邮件的副本。要永久修改这抄送地址列表，请编辑这业务的默认抄送字段。"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,email_from:0
+msgid "From"
+msgstr "来自"
+
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_grade_action
+#: model:ir.ui.menu,name:crm_partner_assign.menu_res_partner_grade_action
+#: field:res.partner,grade_id:0
+#: view:res.partner.grade:0
+msgid "Partner Grade"
+msgstr "业务伙伴级别"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Section"
+msgstr "分类"
+
+#. module: crm_partner_assign
+#: view:res.partner:0
+msgid "Next"
+msgstr "下一个"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,priority:0
+msgid "Priority"
+msgstr "优先级"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,state:0
+msgid "State"
+msgstr "州/省"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,delay_expected:0
+msgid "Overpassed Deadline"
+msgstr "超越截止日期"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,html:0
+msgid "HTML formatting?"
+msgstr "HTML格式?"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,type:0
+msgid "Type"
+msgstr "类型："
+
+#. module: crm_partner_assign
+#: help:crm.lead,partner_assigned_id:0
+msgid "Partner this case has been forwarded/assigned to."
+msgstr "这业务的业务伙伴已转发/已分配"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,priority:0
+msgid "Lowest"
+msgstr "最低"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Leads Analysis"
+msgstr "线索分析"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,creation_date:0
+msgid "Creation Date"
+msgstr "创建日期"
+
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,html:0
+msgid "Select this if you want to send email with HTML formatting."
+msgstr "如果你想发送HTML格式的邮件，选此"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "7 Days"
+msgstr "7天"
+
+#. module: crm_partner_assign
+#: view:crm.lead:0
+msgid "Partner Assignation"
+msgstr ""
+
+#. module: crm_partner_assign
+#: help:crm.lead.report.assign,type:0
+msgid "Type is used to separate Leads and Opportunities"
+msgstr "类型用于区分线索和商机"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "July"
+msgstr "7月"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,stage_id:0
+msgid "Stage"
+msgstr "阶段"
+
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:271
+#, python-format
+msgid "Fwd"
+msgstr "转发"
+
+#. module: crm_partner_assign
+#: view:res.partner:0
+msgid "Geo Localization"
+msgstr "geolocalization定位"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Opportunities Assignment Analysis"
+msgstr "商机指派分析"
+
+#. module: crm_partner_assign
+#: view:res.partner:0
+msgid "Cancel"
+msgstr "取消"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,history:0
+msgid "Send history"
+msgstr "发送日志"
+
+#. module: crm_partner_assign
+#: view:crm.lead.forward.to.partner:0
+msgid "Contact"
+msgstr "联系方式"
+
+#. module: crm_partner_assign
+#: view:res.partner:0
+msgid "Close"
+msgstr "结束"
+
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_opportunity_assign
+#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_opportunities_assign_tree
+msgid "Opp. Assignment Analysis"
+msgstr "商机指派分析"
+
+#. module: crm_partner_assign
+#: help:crm.lead.report.assign,delay_close:0
+msgid "Number of Days to close the case"
+msgstr "到期天数"
+
+#. module: crm_partner_assign
+#: field:res.partner,partner_weight:0
+msgid "Weight"
+msgstr "重量"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Delay to open"
+msgstr "延迟开启"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,grade_id:0
+msgid "Grade"
+msgstr "级别"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "December"
+msgstr "12月"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,month:0
+msgid "Month"
+msgstr "月"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,opening_date:0
+msgid "Opening Date"
+msgstr "开启日期"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,subject:0
+msgid "Subject"
+msgstr "主题"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Salesman"
+msgstr "业务员"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,reply_to:0
+msgid "Reply To"
+msgstr "回复"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,categ_id:0
+msgid "Category"
+msgstr "类型"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "#Opportunities"
+msgstr "#商机"
+
+#. module: crm_partner_assign
+#: model:ir.module.module,shortdesc:crm_partner_assign.module_meta_information
+msgid "Partner Geo-Localisation"
+msgstr "业务伙伴geolocalization定位"
+
+#. module: crm_partner_assign
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr "错误！您不能创建递归的相关成员。"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.forward.to.partner,state:0
+#: selection:crm.lead.report.assign,state:0
+msgid "Draft"
+msgstr "草稿"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,priority:0
+msgid "Low"
+msgstr "低"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.forward.to.partner,state:0
+#: view:crm.lead.report.assign:0
+#: selection:crm.lead.report.assign,state:0
+msgid "Closed"
+msgstr "已结束"
+
+#. module: crm_partner_assign
+#: view:res.partner:0
+#: field:res.partner,opportunity_assigned_ids:0
+msgid "Assigned Opportunities"
+msgstr "分配商机"
+
+#. module: crm_partner_assign
+#: field:crm.lead,date_assign:0
+msgid "Assignation Date"
+msgstr "分配日期"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,probability_max:0
+msgid "Max Probability"
+msgstr "最大可能"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "August"
+msgstr "8月"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,priority:0
+msgid "Normal"
+msgstr "普通"
+
+#. module: crm_partner_assign
+#: view:res.partner:0
+msgid "Escalate"
+msgstr "提升"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,attachment_ids:0
+msgid "unknown"
+msgstr "未知"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "June"
+msgstr "6月"
+
+#. module: crm_partner_assign
+#: help:crm.lead.report.assign,delay_open:0
+msgid "Number of Days to open the case"
+msgstr "业务开启的天数"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,delay_open:0
+msgid "Delay to Open"
+msgstr "延迟开启"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.forward.to.partner,name:0
+#: field:crm.lead.forward.to.partner,user_id:0
+#: field:crm.lead.report.assign,user_id:0
+msgid "User"
+msgstr "用户"
+
+#. module: crm_partner_assign
+#: field:res.partner.grade,active:0
+msgid "Active"
+msgstr "生效"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "November"
+msgstr "11月"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Extended Filters..."
+msgstr "扩展过滤..."
+
+#. module: crm_partner_assign
+#: field:crm.lead,partner_longitude:0
+#: field:res.partner,partner_longitude:0
+msgid "Geo Longitude"
+msgstr "geolocalization经度"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Lead Assign"
+msgstr "线索指派"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "October"
+msgstr "10月"
+
+#. module: crm_partner_assign
+#: view:crm.lead:0
+msgid "Assignation"
+msgstr "指派"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,email_cc:0
+msgid "CC"
+msgstr "抄送"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "January"
+msgstr "1月"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Planned Revenues"
+msgstr "计划收入"
+
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_res_partner_grade
+msgid "res.partner.grade"
+msgstr ""
+
+#. module: crm_partner_assign
+#: selection:crm.lead.forward.to.partner,state:0
+msgid "Unchanged"
+msgstr "未更改"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "September"
+msgstr "9月"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Last 30 Days"
+msgstr "最后30天"
+
+#. module: crm_partner_assign
+#: field:res.partner.grade,name:0
+msgid "Grade Name"
+msgstr "级别名称"
+
+#. module: crm_partner_assign
+#: help:crm.lead,date_assign:0
+msgid "Last date this case was forwarded/assigned to a partner"
+msgstr "为这业务指派/跟进的业务伙伴的最后期限"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.forward.to.partner,state:0
+#: selection:crm.lead.report.assign,state:0
+#: view:res.partner:0
+msgid "Open"
+msgstr "开启"
+
+#. module: crm_partner_assign
+#: field:res.partner,date_localization:0
+msgid "Geo Localization Date"
+msgstr "geolocalization定位的日期"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Current"
+msgstr "当前的"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,email_to:0
+msgid "To"
+msgstr "到"
+
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner
+msgid "Send new email"
+msgstr "发送新的邮件"
+
+#. module: crm_partner_assign
+#: view:crm.lead.forward.to.partner:0
+#: model:ir.actions.act_window,name:crm_partner_assign.crm_lead_forward_to_partner_act
+msgid "Forward to Partner"
+msgstr "跟进的业务伙伴"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "May"
+msgstr "5月"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,probable_revenue:0
+msgid "Probable Revenue"
+msgstr "可能收入"
+
+#. module: crm_partner_assign
+#: field:crm.lead,partner_assigned_id:0
+msgid "Assigned Partner"
+msgstr "指派的业务伙伴"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,address_id:0
+msgid "Address"
+msgstr "地址"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,type:0
+msgid "Opportunity"
+msgstr "商机"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,partner_id:0
+msgid "Customer"
+msgstr "客户"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "February"
+msgstr "2月"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.forward.to.partner,name:0
+msgid "Email Address"
+msgstr "电子邮件地址"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,country_id:0
+msgid "Country"
+msgstr "国家"
+
+#. module: crm_partner_assign
+#: view:res.partner:0
+msgid "Convert to Opportunity"
+msgstr "转换为商机"
+
+#. module: crm_partner_assign
+#: view:crm.lead:0
+msgid "Geo Assign"
+msgstr "指定geolocalization"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "April"
+msgstr "4月"
+
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead
+msgid "crm.lead"
+msgstr ""
+
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead_report_assign
+msgid "CRM Lead Report"
+msgstr "客户关系管理线索报表"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.forward.to.partner,history:0
+msgid "Case Information"
+msgstr ""
+
+#. module: crm_partner_assign
+#: field:res.partner.grade,sequence:0
+msgid "Sequence"
+msgstr "序列"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,body:0
+msgid "Message Body"
+msgstr "消息正文"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,priority:0
+msgid "High"
+msgstr "高"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,section_id:0
+msgid "Sales Team"
+msgstr "销售团队"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,create_date:0
+msgid "Create Date"
+msgstr "创建日期"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,state:0
+msgid "Set New State To"
+msgstr "设定新状态"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,name:0
+msgid "Year"
+msgstr "年"
diff --git a/addons/hr_payroll_account/i18n/ca.po b/addons/hr_payroll_account/i18n/ca.po
new file mode 100644
index 00000000000..6506ebb49d0
--- /dev/null
+++ b/addons/hr_payroll_account/i18n/ca.po
@@ -0,0 +1,328 @@
+# Catalan translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-04-14 20:42+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Catalan <ca@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: 2011-04-15 05:06+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
+
+#. module: hr_payroll_account
+#: field:hr.payslip,move_line_ids:0
+msgid "Accounting Lines"
+msgstr ""
+
+#. module: hr_payroll_account
+#: field:hr.payroll.register,bank_journal_id:0
+#: field:hr.payslip,bank_journal_id:0
+msgid "Bank Journal"
+msgstr ""
+
+#. module: hr_payroll_account
+#: model:ir.model,name:hr_payroll_account.model_hr_contibution_register_line
+msgid "Contribution Register Line"
+msgstr ""
+
+#. module: hr_payroll_account
+#: model:ir.model,name:hr_payroll_account.model_hr_contibution_register
+msgid "Contribution Register"
+msgstr ""
+
+#. module: hr_payroll_account
+#: help:hr.employee,analytic_account:0
+msgid "Analytic Account for Salary Analysis"
+msgstr ""
+
+#. module: hr_payroll_account
+#: field:hr.payroll.register,journal_id:0
+#: field:hr.payslip,journal_id:0
+msgid "Expense Journal"
+msgstr ""
+
+#. module: hr_payroll_account
+#: field:hr.contibution.register.line,period_id:0
+msgid "Period"
+msgstr ""
+
+#. module: hr_payroll_account
+#: model:ir.model,name:hr_payroll_account.model_hr_employee
+msgid "Employee"
+msgstr ""
+
+#. module: hr_payroll_account
+#: view:hr.payslip:0
+msgid "Other Informations"
+msgstr ""
+
+#. module: hr_payroll_account
+#: field:hr.employee,salary_account:0
+msgid "Salary Account"
+msgstr ""
+
+#. module: hr_payroll_account
+#: help:hr.employee,property_bank_account:0
+msgid "Select Bank Account from where Salary Expense will be Paid"
+msgstr ""
+
+#. module: hr_payroll_account
+#: model:ir.model,name:hr_payroll_account.model_hr_payroll_register
+msgid "Payroll Register"
+msgstr ""
+
+#. module: hr_payroll_account
+#: model:ir.model,name:hr_payroll_account.model_hr_payslip_account_move
+msgid "Account Move Link to Pay Slip"
+msgstr ""
+
+#. module: hr_payroll_account
+#: view:hr.payslip:0
+msgid "Description"
+msgstr ""
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:330
+#, python-format
+msgid "Please Confirm all Expense Invoice appear for Reimbursement"
+msgstr ""
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:432
+#, python-format
+msgid "Please defined partner in bank account for %s !"
+msgstr ""
+
+#. module: hr_payroll_account
+#: view:hr.payslip:0
+msgid "Accounting Informations"
+msgstr ""
+
+#. module: hr_payroll_account
+#: help:hr.employee,salary_account:0
+msgid "Expense account when Salary Expense will be recorded"
+msgstr ""
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:429
+#, python-format
+msgid "Please defined bank account for %s !"
+msgstr ""
+
+#. module: hr_payroll_account
+#: model:ir.module.module,description:hr_payroll_account.module_meta_information
+msgid ""
+"Generic Payroll system Integrated with Accountings\n"
+"    * Expanse Encoding\n"
+"    * Payment Encoding\n"
+"    * Comany Contribution Managemet\n"
+"    "
+msgstr ""
+
+#. module: hr_payroll_account
+#: model:ir.module.module,shortdesc:hr_payroll_account.module_meta_information
+msgid "Human Resource Payroll Accounting"
+msgstr ""
+
+#. module: hr_payroll_account
+#: view:hr.payslip:0
+#: field:hr.payslip,move_payment_ids:0
+msgid "Payment Lines"
+msgstr ""
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:273
+#: code:addons/hr_payroll_account/hr_payroll_account.py:444
+#, python-format
+msgid "Please define fiscal year for perticular contract"
+msgstr ""
+
+#. module: hr_payroll_account
+#: field:hr.payslip.account.move,slip_id:0
+#: model:ir.model,name:hr_payroll_account.model_hr_payslip
+msgid "Pay Slip"
+msgstr ""
+
+#. module: hr_payroll_account
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
+msgstr ""
+
+#. module: hr_payroll_account
+#: view:hr.payslip:0
+msgid "Account Lines"
+msgstr ""
+
+#. module: hr_payroll_account
+#: field:hr.contibution.register,account_id:0
+#: field:hr.holidays.status,account_id:0
+#: field:hr.payroll.advice,account_id:0
+msgid "Account"
+msgstr ""
+
+#. module: hr_payroll_account
+#: field:hr.employee,property_bank_account:0
+msgid "Bank Account"
+msgstr ""
+
+#. module: hr_payroll_account
+#: field:hr.payslip.account.move,name:0
+msgid "Name"
+msgstr ""
+
+#. module: hr_payroll_account
+#: model:ir.model,name:hr_payroll_account.model_hr_payslip_line
+msgid "Payslip Line"
+msgstr ""
+
+#. module: hr_payroll_account
+#: view:hr.payslip:0
+msgid "Accounting Vouchers"
+msgstr ""
+
+#. module: hr_payroll_account
+#: constraint:hr.employee:0
+msgid ""
+"Error ! You cannot select a department for which the employee is the manager."
+msgstr ""
+
+#. module: hr_payroll_account
+#: help:hr.payroll.register,period_id:0
+#: help:hr.payslip,period_id:0
+msgid "Keep empty to use the period of the validation(Payslip) date."
+msgstr ""
+
+#. module: hr_payroll_account
+#: model:ir.model,name:hr_payroll_account.model_hr_payroll_advice
+msgid "Bank Advice Note"
+msgstr ""
+
+#. module: hr_payroll_account
+#: field:hr.payslip.account.move,move_id:0
+msgid "Expense Entries"
+msgstr ""
+
+#. module: hr_payroll_account
+#: field:hr.payslip,move_ids:0
+msgid "Accounting vouchers"
+msgstr ""
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:273
+#: code:addons/hr_payroll_account/hr_payroll_account.py:280
+#: code:addons/hr_payroll_account/hr_payroll_account.py:283
+#: code:addons/hr_payroll_account/hr_payroll_account.py:330
+#: code:addons/hr_payroll_account/hr_payroll_account.py:444
+#: code:addons/hr_payroll_account/hr_payroll_account.py:451
+#: code:addons/hr_payroll_account/hr_payroll_account.py:454
+#, python-format
+msgid "Warning !"
+msgstr ""
+
+#. module: hr_payroll_account
+#: field:hr.employee,employee_account:0
+msgid "Employee Account"
+msgstr ""
+
+#. module: hr_payroll_account
+#: field:hr.payslip.line,account_id:0
+msgid "General Account"
+msgstr ""
+
+#. module: hr_payroll_account
+#: field:hr.contibution.register,yearly_total_by_emp:0
+msgid "Total By Employee"
+msgstr ""
+
+#. module: hr_payroll_account
+#: field:hr.payslip.account.move,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: hr_payroll_account
+#: field:hr.payroll.register,period_id:0
+#: field:hr.payslip,period_id:0
+msgid "Force Period"
+msgstr ""
+
+#. module: hr_payroll_account
+#: model:ir.model,name:hr_payroll_account.model_hr_holidays_status
+msgid "Leave Type"
+msgstr ""
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:280
+#: code:addons/hr_payroll_account/hr_payroll_account.py:451
+#, python-format
+msgid "Fiscal Year is not defined for slip date %s"
+msgstr ""
+
+#. module: hr_payroll_account
+#: field:hr.contibution.register,analytic_account_id:0
+#: field:hr.employee,analytic_account:0
+#: field:hr.holidays.status,analytic_account_id:0
+#: field:hr.payroll.structure,account_id:0
+#: field:hr.payslip.line,analytic_account_id:0
+msgid "Analytic Account"
+msgstr ""
+
+#. module: hr_payroll_account
+#: help:hr.employee,employee_account:0
+msgid "Employee Payable Account"
+msgstr ""
+
+#. module: hr_payroll_account
+#: field:hr.contibution.register,yearly_total_by_comp:0
+msgid "Total By Company"
+msgstr ""
+
+#. module: hr_payroll_account
+#: model:ir.model,name:hr_payroll_account.model_hr_payroll_structure
+msgid "Salary Structure"
+msgstr ""
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:550
+#, python-format
+msgid "Please Configure Partners Receivable Account!!"
+msgstr ""
+
+#. module: hr_payroll_account
+#: view:hr.contibution.register:0
+msgid "Year"
+msgstr ""
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:283
+#: code:addons/hr_payroll_account/hr_payroll_account.py:454
+#, python-format
+msgid "Period is not defined for slip date %s"
+msgstr ""
+
+#. module: hr_payroll_account
+#: view:hr.payslip:0
+msgid "Accounting Details"
+msgstr ""
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:533
+#, python-format
+msgid "Please Configure Partners Payable Account!!"
+msgstr ""
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:429
+#: code:addons/hr_payroll_account/hr_payroll_account.py:432
+#: code:addons/hr_payroll_account/hr_payroll_account.py:533
+#: code:addons/hr_payroll_account/hr_payroll_account.py:550
+#, python-format
+msgid "Integrity Error !"
+msgstr ""
diff --git a/addons/l10n_ec/i18n/es_EC.po b/addons/l10n_ec/i18n/es_EC.po
new file mode 100644
index 00000000000..cb0ab1a7512
--- /dev/null
+++ b/addons/l10n_ec/i18n/es_EC.po
@@ -0,0 +1,56 @@
+# Spanish (Ecuador) translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-07 06:01+0000\n"
+"PO-Revision-Date: 2011-04-11 18:21+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (Ecuador) <es_EC@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: 2011-04-12 04:34+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
+
+#. module: l10n_ec
+#: model:ir.module.module,shortdesc:l10n_ec.module_meta_information
+msgid "Ecuador - Accounting Chart"
+msgstr "Ecuador - Plan Contable"
+
+#. module: l10n_ec
+#: model:ir.module.module,description:l10n_ec.module_meta_information
+msgid ""
+"\n"
+"    This is the base module to manage the accounting chart for Ecuador in "
+"OpenERP.\n"
+"    "
+msgstr ""
+"\n"
+"    Este es el módulo base para gestionar el plan contable para Ecuador en "
+"OpenERP.\n"
+"    "
+
+#. module: l10n_ec
+#: model:ir.actions.todo,note:l10n_ec.config_call_account_template_ec
+msgid ""
+"Generate Chart of Accounts from a Chart Template. You will be asked to pass "
+"the name of the company, the chart template to follow, the no. of digits to "
+"generate the code for your accounts and Bank account, currency to create "
+"Journals. Thus,the pure copy of chart Template is generated.\n"
+"\tThis is the same wizard that runs from Financial "
+"Management/Configuration/Financial Accounting/Financial Accounts/Generate "
+"Chart of Accounts from a Chart Template."
+msgstr ""
+"Generar el plan contable a partir de una plantilla de plan contable. Se le "
+"pedirá el nombre de la compañía, la plantilla de plan contable a utilizar, "
+"el número de dígitos para generar el código de las cuentas y de la cuenta "
+"bancaria, la moneda para crear los diarios. Así pues, se genere una copia "
+"exacta de la plantilla de plan contable.\n"
+"\tEste es el mismo asistente que se ejecuta desde Contabilidad y finanzas / "
+"Configuración / Contabilidad financiera / Cuentas financieras / Generar el "
+"plan contable a partir de una plantilla de plan contable."
diff --git a/addons/procurement/i18n/es_EC.po b/addons/procurement/i18n/es_EC.po
new file mode 100644
index 00000000000..945884f602b
--- /dev/null
+++ b/addons/procurement/i18n/es_EC.po
@@ -0,0 +1,929 @@
+# Spanish (Ecuador) translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-04-11 18:23+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (Ecuador) <es_EC@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: 2011-04-12 04:34+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
+
+#. module: procurement
+#: view:make.procurement:0
+msgid "Ask New Products"
+msgstr "Solicitar nuevos productos"
+
+#. module: procurement
+#: model:ir.ui.menu,name:procurement.menu_stock_sched
+msgid "Schedulers"
+msgstr "Planificaciones"
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_make_procurement
+msgid "Make Procurements"
+msgstr "Realizar abastecimientos"
+
+#. module: procurement
+#: help:procurement.order.compute.all,automatic:0
+msgid ""
+"Triggers an automatic procurement for all products that have a virtual stock "
+"under 0. You should probably not use this option, we suggest using a MTO "
+"configuration on products."
+msgstr ""
+"Dispara un abastecimiento automático para todos los productos que tienen un "
+"stock virtual menor que 0. Probablemente no debería utilizar esta opción, "
+"sugerimos utilizar una configuración de MTO en productos."
+
+#. module: procurement
+#: view:stock.warehouse.orderpoint:0
+msgid "Group By..."
+msgstr "Agrupado por..."
+
+#. module: procurement
+#: help:stock.warehouse.orderpoint,procurement_draft_ids:0
+msgid "Draft procurement of the product and location of that orderpoint"
+msgstr ""
+"Abastecimiento borrador del producto y ubicación para esta regla de stock "
+"mínimo."
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:288
+#, python-format
+msgid "No supplier defined for this product !"
+msgstr "¡No se ha definido un proveedor para este producto!"
+
+#. module: procurement
+#: field:make.procurement,uom_id:0
+msgid "Unit of Measure"
+msgstr "Unidad de Medida"
+
+#. module: procurement
+#: field:procurement.order,procure_method:0
+msgid "Procurement Method"
+msgstr "Método de abastecimiento"
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:298
+#, python-format
+msgid "No address defined for the supplier"
+msgstr "No se ha definido dirección para el proveedor"
+
+#. module: procurement
+#: model:ir.actions.act_window,name:procurement.action_procurement_compute
+msgid "Compute Stock Minimum Rules Only"
+msgstr "Calcular sólo reglas de stock mínimo"
+
+#. module: procurement
+#: field:procurement.order,company_id:0
+#: field:stock.warehouse.orderpoint,company_id:0
+msgid "Company"
+msgstr "Compañia"
+
+#. module: procurement
+#: field:procurement.order,product_uos_qty:0
+msgid "UoS Quantity"
+msgstr "Cantidad UdV"
+
+#. module: procurement
+#: view:procurement.order:0
+#: field:procurement.order,name:0
+msgid "Reason"
+msgstr "Razón"
+
+#. module: procurement
+#: view:procurement.order.compute:0
+msgid "Compute Procurements"
+msgstr "Calcular abastecimientos"
+
+#. module: procurement
+#: field:procurement.order,message:0
+msgid "Latest error"
+msgstr "Último error"
+
+#. module: procurement
+#: help:mrp.property,composition:0
+msgid "Not used in computations, for information purpose only."
+msgstr "No utilizado en cálculos, sólo con la finalidad de informar."
+
+#. module: procurement
+#: field:stock.warehouse.orderpoint,procurement_id:0
+msgid "Latest procurement"
+msgstr "Último abastecimiento"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Notes"
+msgstr "Notas"
+
+#. module: procurement
+#: selection:procurement.order,procure_method:0
+msgid "on order"
+msgstr "bajo pedido"
+
+#. module: procurement
+#: help:procurement.order,message:0
+msgid "Exception occurred while computing procurement orders."
+msgstr ""
+"Ha ocurrido una excepción mientras se calculaban órdenes de abastecimiento."
+
+#. module: procurement
+#: help:procurement.order,state:0
+msgid ""
+"When a procurement is created the state is set to 'Draft'.\n"
+" If the procurement is confirmed, the state is set to 'Confirmed'.           "
+" \n"
+"After confirming the state is set to 'Running'.\n"
+" If any exception arises in the order then the state is set to 'Exception'.\n"
+" Once the exception is removed the state becomes 'Ready'.\n"
+" It is in 'Waiting'. state when the procurement is waiting for another one "
+"to finish."
+msgstr ""
+"Cuando se crea una orden de abastecimiento, su estado es 'Borrador'. \n"
+"Si el abastecimiento se confirma, el estado cambia a 'Confirmada'.           "
+" \n"
+"Después de confirmar el estado se establece como 'En curso'.\n"
+"Si surge cualquier excepción con la orden, el estado pasa a 'Excepción'.\n"
+"Una vez la excepción es solucionada, el estado cambia a 'Preparada'.\n"
+"Está en estado 'En espera' cuando está esperando a que acabe otro "
+"abastecimiento."
+
+#. module: procurement
+#: view:stock.warehouse.orderpoint:0
+msgid "Minimum Stock Rules Search"
+msgstr "Buscar reglas de stock mínimo"
+
+#. module: procurement
+#: help:stock.warehouse.orderpoint,product_min_qty:0
+msgid ""
+"When the virtual stock goes belong the Min Quantity, OpenERP generates a "
+"procurement to bring the virtual stock to the Max Quantity."
+msgstr ""
+"Cuando el stock virtual está por debajo de la cantidad mínima, OpenERP "
+"genera un abastecimiento para aumentar el stock virtual a la cantidad máxima."
+
+#. module: procurement
+#: view:procurement.order.compute.all:0
+msgid "Scheduler Parameters"
+msgstr "Parámetros del planificador"
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_stock_move
+msgid "Stock Move"
+msgstr "Movimiento de stock"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Planification"
+msgstr "Planificación"
+
+#. module: procurement
+#: selection:procurement.order,state:0
+msgid "Ready"
+msgstr "Preparado"
+
+#. module: procurement
+#: field:procurement.order.compute.all,automatic:0
+msgid "Automatic orderpoint"
+msgstr "Generación de orden automática"
+
+#. module: procurement
+#: field:mrp.property,composition:0
+msgid "Properties composition"
+msgstr "Composición de propiedades"
+
+#. module: procurement
+#: selection:procurement.order,state:0
+msgid "Confirmed"
+msgstr "Confirmado"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Retry"
+msgstr "Reintentar"
+
+#. module: procurement
+#: view:procurement.order.compute:0
+#: view:procurement.orderpoint.compute:0
+msgid "Parameters"
+msgstr "Parámetros"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Confirm"
+msgstr "Confirmar"
+
+#. module: procurement
+#: help:procurement.order,origin:0
+msgid ""
+"Reference of the document that created this Procurement.\n"
+"This is automatically completed by OpenERP."
+msgstr ""
+"Referencia del documento que ha creado este abastecimiento.\n"
+"OpenERP lo completa automáticamente."
+
+#. module: procurement
+#: view:stock.warehouse.orderpoint:0
+msgid "Procurement Orders to Process"
+msgstr "Órdenes de abastecimiento a procesar"
+
+#. module: procurement
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "¡Error! No puede crear compañías recursivas."
+
+#. module: procurement
+#: field:procurement.order,priority:0
+msgid "Priority"
+msgstr "Prioridad"
+
+#. module: procurement
+#: view:procurement.order:0
+#: field:procurement.order,state:0
+msgid "State"
+msgstr "Estado"
+
+#. module: procurement
+#: field:procurement.order,location_id:0
+#: view:stock.warehouse.orderpoint:0
+#: field:stock.warehouse.orderpoint,location_id:0
+msgid "Location"
+msgstr "Ubicación"
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_stock_picking
+msgid "Picking List"
+msgstr "Lista Movimientos"
+
+#. module: procurement
+#: field:make.procurement,warehouse_id:0
+#: view:stock.warehouse.orderpoint:0
+#: field:stock.warehouse.orderpoint,warehouse_id:0
+msgid "Warehouse"
+msgstr "Inventario"
+
+#. module: procurement
+#: selection:stock.warehouse.orderpoint,logic:0
+msgid "Best price (not yet active!)"
+msgstr "Mejor precio (aún no activo!)"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Product & Location"
+msgstr "Producto & Ubicación"
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_procurement_order_compute
+msgid "Compute Procurement"
+msgstr "Calcular abastecimiento"
+
+#. module: procurement
+#: model:ir.module.module,shortdesc:procurement.module_meta_information
+#: field:stock.move,procurements:0
+msgid "Procurements"
+msgstr "Abastecimientos"
+
+#. module: procurement
+#: field:res.company,schedule_range:0
+msgid "Scheduler Range Days"
+msgstr "Día rango planificador"
+
+#. module: procurement
+#: model:ir.actions.act_window,help:procurement.procurement_action
+msgid ""
+"A procurement order is used to record a need for a specific product at a "
+"specific location. A procurement order is usually created automatically from "
+"sales orders, a Pull Logistics rule or Minimum Stock Rules. When the "
+"procurement order is confirmed, it automatically creates the necessary "
+"operations to fullfil the need: purchase order proposition, manufacturing "
+"order, etc."
+msgstr ""
+"Una orden de abastecimiento se utiliza para registrar una necesidad de un "
+"producto específico en una ubicación específica. Una orden de abastecimiento "
+"es generalmente creada automáticamente a partir de órdenes de venta, reglas "
+"logísticas Pull o regals de stck mínimo. Cuando la orden de abastecimiento "
+"es confirmada, crea automáticamente las operaciones necesarias para "
+"satisafacer al necesidad: propuesta de orden de compra, orden de fabricaión, "
+"etc."
+
+#. module: procurement
+#: field:make.procurement,date_planned:0
+msgid "Planned Date"
+msgstr "Fecha planificada"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Group By"
+msgstr "Agrupar por"
+
+#. module: procurement
+#: field:make.procurement,qty:0
+#: field:procurement.order,product_qty:0
+msgid "Quantity"
+msgstr "Cantidad"
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:370
+#, python-format
+msgid "Not enough stock and no minimum orderpoint rule defined."
+msgstr ""
+"No hay suficiente stock y no se ha definido una regla de stock mínimo."
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:137
+#, python-format
+msgid "Invalid action !"
+msgstr "¡Acción inválida!"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "References"
+msgstr "Referencias"
+
+#. module: procurement
+#: view:res.company:0
+msgid "Configuration"
+msgstr "Configuración"
+
+#. module: procurement
+#: field:stock.warehouse.orderpoint,qty_multiple:0
+msgid "Qty Multiple"
+msgstr "Cant. Multiple"
+
+#. module: procurement
+#: help:procurement.order,procure_method:0
+msgid ""
+"If you encode manually a Procurement, you probably want to use a make to "
+"order method."
+msgstr ""
+"Si codifica manualmente un abastecimiento, seguramente quiere usar un método "
+"\"Obtener bajo pedido\"."
+
+#. module: procurement
+#: model:ir.ui.menu,name:procurement.menu_stock_procurement
+msgid "Automatic Procurements"
+msgstr "Abastecimientos automáticos"
+
+#. module: procurement
+#: field:stock.warehouse.orderpoint,product_max_qty:0
+msgid "Max Quantity"
+msgstr "Cantidad máx"
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_procurement_order
+#: model:process.process,name:procurement.process_process_procurementprocess0
+#: view:procurement.order:0
+msgid "Procurement"
+msgstr "Abastecimiento"
+
+#. module: procurement
+#: model:ir.actions.act_window,name:procurement.procurement_action
+msgid "Procurement Orders"
+msgstr "Órdenes de abastecimiento"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "To Fix"
+msgstr "Para corregir"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Exceptions"
+msgstr "Excepciones"
+
+#. module: procurement
+#: model:process.node,note:procurement.process_node_serviceonorder0
+msgid "Assignment from Production or Purchase Order."
+msgstr "Asignación desde producción o pedido de compra."
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_mrp_property
+msgid "Property"
+msgstr "Propiedad"
+
+#. module: procurement
+#: model:ir.actions.act_window,name:procurement.act_make_procurement
+#: view:make.procurement:0
+msgid "Procurement Request"
+msgstr "Solicitud de abastecimiento"
+
+#. module: procurement
+#: view:procurement.orderpoint.compute:0
+msgid "Compute Stock"
+msgstr "Calcular stock"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Late"
+msgstr "Retrasada"
+
+#. module: procurement
+#: model:process.process,name:procurement.process_process_serviceproductprocess0
+msgid "Service"
+msgstr "Servicio"
+
+#. module: procurement
+#: model:ir.module.module,description:procurement.module_meta_information
+msgid ""
+"\n"
+"    This is the module for computing Procurements.\n"
+"    "
+msgstr ""
+"\n"
+"    Este es el módulo para calcular abastecimientos.\n"
+"    "
+
+#. module: procurement
+#: field:stock.warehouse.orderpoint,procurement_draft_ids:0
+msgid "Related Procurement Orders"
+msgstr "Órdenes de abastecimiento relacionadas"
+
+#. module: procurement
+#: view:procurement.orderpoint.compute:0
+msgid ""
+"Wizard checks all the stock minimum rules and generate procurement order."
+msgstr ""
+"El asistente comprobará todas las reglas de stock mínimo y generará orden de "
+"abastecimiento."
+
+#. module: procurement
+#: field:stock.warehouse.orderpoint,product_min_qty:0
+msgid "Min Quantity"
+msgstr "Cantidad mín"
+
+#. module: procurement
+#: selection:procurement.order,priority:0
+msgid "Urgent"
+msgstr "Urgente"
+
+#. module: procurement
+#: selection:mrp.property,composition:0
+msgid "plus"
+msgstr "más"
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:319
+#, python-format
+msgid ""
+"Please check the Quantity in Procurement Order(s), it should not be less "
+"than 1!"
+msgstr ""
+"¡Compruebe la cantidad en la(s) orden(es) de abastecimiento, no debería ser "
+"inferior a 1!"
+
+#. module: procurement
+#: help:stock.warehouse.orderpoint,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the "
+"orderpoint without removing it."
+msgstr ""
+"Si el campo activo se desmarca, permite ocultar la regla de stock mínimo sin "
+"eliminarla."
+
+#. module: procurement
+#: help:stock.warehouse.orderpoint,product_max_qty:0
+msgid ""
+"When the virtual stock goes belong the Max Quantity, OpenERP generates a "
+"procurement to bring the virtual stock to the Max Quantity."
+msgstr ""
+"Cuando el stock virtual se sitúa por debajo de la cantidad mínima, OpenERP "
+"genera un abastecimiento para situar el stock virtual a la cantidad máxima."
+
+#. module: procurement
+#: help:procurement.orderpoint.compute,automatic:0
+msgid "If the stock of a product is under 0, it will act like an orderpoint"
+msgstr "Si el stock de un producto es menor que 0, actuará como una orden"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Procurement Lines"
+msgstr "Líneas de abastecimiento"
+
+#. module: procurement
+#: view:procurement.order.compute.all:0
+msgid ""
+"This wizard allows you to run all procurement, production and/or purchase "
+"orders that should be processed based on their configuration. By default, "
+"the scheduler is launched automatically every night by OpenERP. You can use "
+"this menu to force it to be launched now. Note that it runs in the "
+"background, you may have to wait for a few minutes until it has finished "
+"computing."
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+#: field:procurement.order,note:0
+msgid "Note"
+msgstr ""
+
+#. module: procurement
+#: selection:procurement.order,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order.compute:0
+msgid "This wizard will schedule procurements."
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Status"
+msgstr ""
+
+#. module: procurement
+#: selection:procurement.order,priority:0
+msgid "Normal"
+msgstr ""
+
+#. module: procurement
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product"
+msgstr ""
+
+#. module: procurement
+#: field:stock.warehouse.orderpoint,active:0
+msgid "Active"
+msgstr ""
+
+#. module: procurement
+#: model:process.node,name:procurement.process_node_procureproducts0
+msgid "Procure Products"
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order,date_planned:0
+msgid "Scheduled date"
+msgstr ""
+
+#. module: procurement
+#: selection:procurement.order,state:0
+msgid "Exception"
+msgstr ""
+
+#. module: procurement
+#: code:addons/procurement/schedulers.py:179
+#, python-format
+msgid "Automatic OP: %s"
+msgstr ""
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_procurement_orderpoint_compute
+msgid "Automatic Order Point"
+msgstr ""
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_stock_warehouse_orderpoint
+msgid "Minimum Inventory Rule"
+msgstr ""
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Extra Information"
+msgstr ""
+
+#. module: procurement
+#: help:procurement.order,name:0
+msgid "Procurement name."
+msgstr ""
+
+#. module: procurement
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Procurement Reason"
+msgstr ""
+
+#. module: procurement
+#: sql_constraint:stock.warehouse.orderpoint:0
+msgid "Qty Multiple must be greater than zero."
+msgstr ""
+
+#. module: procurement
+#: selection:stock.warehouse.orderpoint,logic:0
+msgid "Order to Max"
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order,date_close:0
+msgid "Date Closed"
+msgstr ""
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:372
+#, python-format
+msgid "Procurement '%s' is in exception: not enough stock."
+msgstr ""
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:138
+#, python-format
+msgid "Cannot delete Procurement Order(s) which are in %s State!"
+msgstr ""
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:318
+#, python-format
+msgid "Data Insufficient !"
+msgstr ""
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_mrp_property_group
+#: field:mrp.property,group_id:0
+#: field:mrp.property.group,name:0
+msgid "Property Group"
+msgstr ""
+
+#. module: procurement
+#: view:stock.warehouse.orderpoint:0
+msgid "Misc"
+msgstr ""
+
+#. module: procurement
+#: view:stock.warehouse.orderpoint:0
+msgid "Locations"
+msgstr ""
+
+#. module: procurement
+#: selection:procurement.order,procure_method:0
+msgid "from stock"
+msgstr ""
+
+#. module: procurement
+#: view:stock.warehouse.orderpoint:0
+msgid "General Information"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Run Procurement"
+msgstr ""
+
+#. module: procurement
+#: selection:procurement.order,state:0
+msgid "Done"
+msgstr ""
+
+#. module: procurement
+#: help:stock.warehouse.orderpoint,qty_multiple:0
+msgid "The procurement quantity will by rounded up to this multiple."
+msgstr ""
+
+#. module: procurement
+#: view:make.procurement:0
+#: view:procurement.order:0
+#: selection:procurement.order,state:0
+#: view:procurement.order.compute:0
+#: view:procurement.order.compute.all:0
+#: view:procurement.orderpoint.compute:0
+msgid "Cancel"
+msgstr ""
+
+#. module: procurement
+#: field:stock.warehouse.orderpoint,logic:0
+msgid "Reordering Mode"
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order,origin:0
+msgid "Source Document"
+msgstr ""
+
+#. module: procurement
+#: selection:procurement.order,priority:0
+msgid "Not urgent"
+msgstr ""
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_procurement_order_compute_all
+msgid "Compute all schedulers"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Current"
+msgstr ""
+
+#. module: procurement
+#: view:board.board:0
+msgid "Procurements in Exception"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Details"
+msgstr ""
+
+#. module: procurement
+#: model:ir.actions.act_window,name:procurement.procurement_action5
+#: model:ir.actions.act_window,name:procurement.procurement_action_board
+#: model:ir.actions.act_window,name:procurement.procurement_exceptions
+#: model:ir.ui.menu,name:procurement.menu_stock_procurement_action
+msgid "Procurement Exceptions"
+msgstr ""
+
+#. module: procurement
+#: model:ir.actions.act_window,name:procurement.act_procurement_2_stock_warehouse_orderpoint
+#: model:ir.actions.act_window,name:procurement.act_product_product_2_stock_warehouse_orderpoint
+#: model:ir.actions.act_window,name:procurement.act_stock_warehouse_2_stock_warehouse_orderpoint
+#: model:ir.actions.act_window,name:procurement.action_orderpoint_form
+#: model:ir.ui.menu,name:procurement.menu_stock_order_points
+#: view:stock.warehouse.orderpoint:0
+msgid "Minimum Stock Rules"
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order,close_move:0
+msgid "Close Move at end"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Scheduled Date"
+msgstr ""
+
+#. module: procurement
+#: field:make.procurement,product_id:0
+#: view:procurement.order:0
+#: field:procurement.order,product_id:0
+#: field:stock.warehouse.orderpoint,product_id:0
+msgid "Product"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Temporary"
+msgstr ""
+
+#. module: procurement
+#: field:mrp.property,description:0
+#: field:mrp.property.group,description:0
+msgid "Description"
+msgstr ""
+
+#. module: procurement
+#: selection:mrp.property,composition:0
+msgid "min"
+msgstr ""
+
+#. module: procurement
+#: view:stock.warehouse.orderpoint:0
+msgid "Quantity Rules"
+msgstr ""
+
+#. module: procurement
+#: selection:procurement.order,state:0
+msgid "Running"
+msgstr ""
+
+#. module: procurement
+#: field:stock.warehouse.orderpoint,product_uom:0
+msgid "Product UOM"
+msgstr ""
+
+#. module: procurement
+#: model:process.node,name:procurement.process_node_serviceonorder0
+msgid "Make to Order"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "UOM"
+msgstr ""
+
+#. module: procurement
+#: selection:procurement.order,state:0
+msgid "Waiting"
+msgstr ""
+
+#. module: procurement
+#: model:ir.actions.act_window,help:procurement.action_orderpoint_form
+msgid ""
+"You can define your minimum stock rules, so that OpenERP will automatically "
+"create draft manufacturing orders or purchase quotations according to the "
+"stock level. Once the virtual stock of a product (= stock on hand minus all "
+"confirmed orders and reservations) is below the minimum quantity, OpenERP "
+"will generate a procurement request to increase the stock up to the maximum "
+"quantity."
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order,move_id:0
+msgid "Reservation"
+msgstr ""
+
+#. module: procurement
+#: model:process.node,note:procurement.process_node_procureproducts0
+msgid "The way to procurement depends on the product type."
+msgstr ""
+
+#. module: procurement
+#: view:make.procurement:0
+msgid ""
+"This wizard will plan the procurement for this product. This procurement may "
+"generate task, production orders or purchase orders."
+msgstr ""
+
+#. module: procurement
+#: view:res.company:0
+msgid "MRP & Logistics Scheduler"
+msgstr ""
+
+#. module: procurement
+#: field:mrp.property,name:0
+#: field:stock.warehouse.orderpoint,name:0
+msgid "Name"
+msgstr ""
+
+#. module: procurement
+#: selection:mrp.property,composition:0
+msgid "max"
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order,product_uos:0
+msgid "Product UoS"
+msgstr ""
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:347
+#, python-format
+msgid "from stock: products assigned."
+msgstr ""
+
+#. module: procurement
+#: model:ir.actions.act_window,name:procurement.action_compute_schedulers
+#: model:ir.ui.menu,name:procurement.menu_stock_proc_schedulers
+#: view:procurement.order.compute.all:0
+msgid "Compute Schedulers"
+msgstr ""
+
+#. module: procurement
+#: model:ir.actions.act_window,help:procurement.procurement_exceptions
+msgid ""
+"Procurement Orders represent the need for a certain quantity of products, at "
+"a given time, in a given location. Sales Orders are one typical source of "
+"Procurement Orders (but these are distinct documents). Depending on the "
+"procurement parameters and the product configuration, the procurement engine "
+"will attempt to satisfy the need by reserving products from stock, ordering "
+"products from a supplier, or passing a manufacturing order, etc. A "
+"Procurement Exception occurs when the system cannot find a way to fulfill a "
+"procurement. Some exceptions will resolve themselves automatically, but "
+"others require manual intervention (those are identified by a specific error "
+"message)."
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order,product_uom:0
+msgid "Product UoM"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Search Procurement"
+msgstr ""
+
+#. module: procurement
+#: help:res.company,schedule_range:0
+msgid ""
+"This is the time frame analysed by the scheduler when computing "
+"procurements. All procurements that are not between today and today+range "
+"are skipped for future computation."
+msgstr ""
+
+#. module: procurement
+#: selection:procurement.order,priority:0
+msgid "Very Urgent"
+msgstr ""
+
+#. module: procurement
+#: field:procurement.orderpoint.compute,automatic:0
+msgid "Automatic Orderpoint"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Procurement Details"
+msgstr ""
+
+#. module: procurement
+#: code:addons/procurement/schedulers.py:180
+#, python-format
+msgid "SCHEDULER"
+msgstr ""
diff --git a/addons/purchase/i18n/en_GB.po b/addons/purchase/i18n/en_GB.po
new file mode 100644
index 00000000000..4e73fa6c4f7
--- /dev/null
+++ b/addons/purchase/i18n/en_GB.po
@@ -0,0 +1,1793 @@
+# English (United Kingdom) translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-04-11 07:41+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: English (United Kingdom) <en_GB@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: 2011-04-12 04:34+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
+msgid ""
+"The buyer has to approve the RFQ before being sent to the supplier. The RFQ "
+"becomes a confirmed Purchase Order."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:282
+#, python-format
+msgid "You can not confirm purchase order without Purchase Order Lines."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,invoiced:0
+msgid "Invoiced & Paid"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,location_id:0
+#: view:purchase.report:0
+#: field:purchase.report,location_id:0
+msgid "Destination"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:710
+#, python-format
+msgid ""
+"You have to select a product UOM in the same category than the purchase UOM "
+"of the product"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.report,date:0
+msgid "Date on which this document has been created"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.purchase_rfq
+msgid ""
+"You can create a request for quotation when you want to buy products to a "
+"supplier but the purchase is not confirmed yet. Use also this menu to review "
+"requests for quotation created automatically based on your logistic rules "
+"(minimum stock, MTO, etc). You can convert the request for quotation into a "
+"purchase order once the order is confirmed. If you use the extended "
+"interface (from user's preferences), you can select the way to control your "
+"supplier invoices: based on the order, based on the receptions or manual "
+"encoding."
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,invoice_method:0
+msgid "From Picking"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Not Invoiced"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,dest_address_id:0
+msgid "Destination Address"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.report,validator:0
+msgid "Validated By"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+#: field:purchase.order,partner_id:0
+#: view:purchase.order.line:0
+#: view:purchase.report:0
+#: field:purchase.report,partner_id:0
+msgid "Supplier"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.line_invoice:0
+msgid "Do you want to generate the supplier invoices ?"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.purchase_form_action
+msgid ""
+"Use this menu to search within your purchase orders by references, supplier, "
+"products, etc. For each purchase order, you can track the products received, "
+"and control the supplier invoices."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:722
+#, python-format
+msgid "The selected supplier only sells this product by %s"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/wizard/purchase_line_invoice.py:156
+#, python-format
+msgid "Supplier Invoices"
+msgstr ""
+
+#. module: purchase
+#: sql_constraint:purchase.order:0
+msgid "Order Reference must be unique !"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_packinginvoice0
+#: model:process.transition,name:purchase.process_transition_productrecept0
+msgid "From a Pick list"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:649
+#, python-format
+msgid "No Pricelist !"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order.line,product_qty:0
+#: view:purchase.report:0
+#: field:purchase.report,quantity:0
+msgid "Quantity"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.line_invoice:0
+msgid "Select an Open Sale Order"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,company_id:0
+#: field:purchase.order.line,company_id:0
+#: view:purchase.report:0
+#: field:purchase.report,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: purchase
+#: view:board.board:0
+#: model:ir.actions.act_window,name:purchase.action_purchase_order_monthly_categ_graph
+#: view:purchase.report:0
+msgid "Monthly Purchase by Category"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Set to Draft"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
+msgid "Invoice Exception"
+msgstr ""
+
+#. module: purchase
+#: model:product.pricelist,name:purchase.list0
+msgid "Default Purchase Pricelist"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_current_purchases
+msgid "Current purchases"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,dest_address_id:0
+msgid ""
+"Put an address if you want to deliver directly from the supplier to the "
+"customer.In this case, it will remove the warehouse link and set the "
+"customer location."
+msgstr ""
+
+#. module: purchase
+#: help:res.partner,property_product_pricelist_purchase:0
+msgid ""
+"This pricelist will be used, instead of the default one, for purchases from "
+"the current partner"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Fax :"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,pricelist_id:0
+msgid ""
+"The pricelist sets the currency used for this purchase order. It also "
+"computes the supplier price for the selected products/quantities."
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_stock_partial_picking
+msgid "Partial Picking"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:286
+#, python-format
+msgid "Purchase order '%s' is confirmed."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Approve Purchase"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_approvepurchaseorder0
+#: view:purchase.order:0
+#: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
+msgid "Approved"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "Reference UOM"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Origin"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,product_uom:0
+msgid "Reference UoM"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_line_product_tree
+msgid "Purchases"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+#: field:purchase.order,notes:0
+#: view:purchase.order.line:0
+#: field:purchase.order.line,notes:0
+msgid "Notes"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:649
+#, python-format
+msgid ""
+"You have to select a pricelist or a supplier in the purchase form !\n"
+"Please set one before choosing a product."
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "September"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.order,amount_tax:0
+#: view:purchase.order.line:0
+#: field:purchase.order.line,taxes_id:0
+msgid "Taxes"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.report.xml,name:purchase.report_purchase_order
+#: model:ir.model,name:purchase.model_purchase_order
+#: model:process.node,name:purchase.process_node_purchaseorder0
+#: field:procurement.order,purchase_id:0
+#: view:purchase.order:0
+#: model:res.request.link,name:purchase.req_link_purchase_order
+#: field:stock.picking,purchase_id:0
+msgid "Purchase Order"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,name:0
+#: view:purchase.order.line:0
+#: field:purchase.order.line,order_id:0
+msgid "Order Reference"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Net Total :"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.installer:0
+msgid "Configure Your Purchases Management Application"
+msgstr ""
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_procurement_management_product
+#: model:ir.ui.menu,name:purchase.menu_procurement_partner_contact_form
+msgid "Products"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.installer,progress:0
+msgid "Configuration Progress"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_packinginvoice0
+msgid ""
+"A Pick list generates an invoice. Depending on the Invoicing control of the "
+"sale order, the invoice is based on delivered or on ordered quantities."
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,state:0
+#: selection:purchase.order.line,state:0
+#: selection:purchase.report,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:305
+#, python-format
+msgid "Purchase amount over the limit"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Convert to Purchase Order"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,pricelist_id:0
+#: field:purchase.report,pricelist_id:0
+msgid "Pricelist"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
+msgid "Shipping Exception"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_packinglist0
+#: model:process.node,name:purchase.process_node_productrecept0
+msgid "Incoming Products"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_packinginvoice0
+msgid "Outgoing Products"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Manually Corrected"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "   Month   "
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Reference"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:237
+#, python-format
+msgid "Cannot delete Purchase Order(s) which are in %s State!"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,dest_address_id:0
+msgid "Dest. Address Contact Name"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_stock_move
+msgid "Stock Move"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,day:0
+msgid "Day"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:334
+#, python-format
+msgid "Purchase order '%s' has been set in draft state."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order.line,account_analytic_id:0
+msgid "Analytic Account"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,nbr:0
+msgid "# of Lines"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:685
+#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/wizard/purchase_order_group.py:47
+#, python-format
+msgid "Warning"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.installer,purchase_analytic_plans:0
+msgid "Purchase Analytic Plans"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_installer
+msgid "purchase.installer"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order.line,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Net Price"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.line:0
+msgid "Order Line"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,shipped:0
+msgid "It indicates that a picking has been done"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:710
+#, python-format
+msgid "Wrong Product UOM !"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_confirmpurchaseorder0
+#: selection:purchase.order.line,state:0
+msgid "Confirmed"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,price_average:0
+msgid "Average Price"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Total :"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition.action,name:purchase.process_transition_action_confirmpurchaseorder0
+#: view:purchase.order.line_invoice:0
+msgid "Confirm"
+msgstr ""
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_procurement_management_invoice
+#: view:purchase.order:0
+msgid "Invoice Control"
+msgstr ""
+
+#. module: purchase
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,partner_ref:0
+msgid "Supplier Reference"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,amount_tax:0
+msgid "The tax amount"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_productrecept0
+msgid ""
+"A Pick list generates a supplier invoice. Depending on the Invoicing control "
+"of the purchase order, the invoice is based on received or on ordered "
+"quantities."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+#: field:purchase.order,state:0
+#: view:purchase.order.line:0
+#: field:purchase.order.line,state:0
+#: view:purchase.report:0
+msgid "State"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.action_stock_move_report_po
+msgid ""
+"Reception Analysis allows you to easily check and analyse your company order "
+"receptions and the performance of your supplier's deliveries."
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Tel.:"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_stock_picking
+#: field:purchase.order,picking_ids:0
+msgid "Picking List"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Print"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_view_purchase_order_group
+msgid "Merge Purchase orders"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,order_line:0
+msgid "Order Lines"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:651
+#, python-format
+msgid "No Partner!"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Fax:"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,price_total:0
+msgid "Total Price"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Untaxed amount"
+msgstr ""
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_product_pricelist_action2_purchase
+#: model:ir.ui.menu,name:purchase.menu_purchase_config_pricelist
+msgid "Pricelists"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,partner_address_id:0
+msgid "Address Contact Name"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,invoice_method:0
+msgid ""
+"From Order: a draft invoice will be pre-generated based on the purchase "
+"order. The accountant will just have to validate this invoice for control.\n"
+"From Picking: a draft invoice will be pre-generated based on validated "
+"receptions.\n"
+"Manual: allows you to generate suppliers invoices by chosing in the "
+"uninvoiced lines of all manual purchase orders."
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,invoice_ids:0
+msgid "Invoices generated for a purchase order"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:282
+#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:362
+#: code:addons/purchase/wizard/purchase_line_invoice.py:122
+#, python-format
+msgid "Error !"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.line:0
+msgid "General Information"
+msgstr ""
+
+#. module: purchase
+#: view:board.board:0
+msgid "My Board"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Purchase Order Confirmation N°"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.action_purchase_order_report_all
+msgid ""
+"Purchase Analysis allows you to easily check and analyse your company "
+"purchase history and performance. From this menu you can track your "
+"negotiation performance, the delivery performance of your suppliers, etc."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Approved by Supplier"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_invoicefrompackinglist0
+msgid ""
+"The invoice is created automatically if the Invoice control of the purchase "
+"order is 'On picking'. The invoice can also be generated manually by the "
+"accountant (Invoice control = Manual)."
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,invoice_method:0
+msgid "From Order"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition.action,name:purchase.process_transition_action_invoicefrompurchaseorder0
+msgid "Create invoice"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order.line,move_dest_id:0
+msgid "Reservation Destination"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:237
+#, python-format
+msgid "Invalid action !"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,state:0
+#: selection:purchase.order.line,state:0
+#: selection:purchase.report,state:0
+msgid "Done"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "July"
+msgstr ""
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_purchase_config_purchase
+#: view:res.company:0
+msgid "Configuration"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_by_supplier
+#: view:purchase.report:0
+msgid "Purchase by supplier"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Total amount"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.act_purchase_order_2_stock_picking
+msgid "Receptions"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,validator:0
+#: view:purchase.report:0
+msgid "Validated by"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.action_invoice_pending
+msgid ""
+"Use this menu to control the invoices to be received from your supplier. "
+"OpenERP pregenerates draft invoices from your purchase orders or receptions, "
+"according to your settings. Once you receive a supplier invoice, you can "
+"match it with the draft invoice and validate it."
+msgstr ""
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_draftpurchaseorder0
+#: model:process.node,name:purchase.process_node_draftpurchaseorder1
+msgid "RFQ"
+msgstr ""
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_procurement_management_pending_invoice
+msgid "Supplier Invoices to Receive"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.installer,purchase_requisition:0
+msgid ""
+"Manages your Purchase Requisition and allows you to easily keep track and "
+"manage all your purchase orders."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "    Month-1    "
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:363
+#, python-format
+msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,invoice_method:0
+msgid "Manual"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:400
+#, python-format
+msgid "You must first cancel all picking attached to this purchase order."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+#: field:purchase.order.line,date_order:0
+#: field:purchase.report,date:0
+msgid "Order Date"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_productrecept0
+msgid "Incoming products to control"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_approvingpurchaseorder0
+msgid "Approbation"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "Purchase Orders Statistics"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
+msgid ""
+"If you set the invoicing control on a purchase order as \"Manual\", you can "
+"track here all the purchase order lines for which you have not received the "
+"supplier invoice yet. Once you are ready to receive a supplier invoice, you "
+"can generate a draft supplier invoice based on the lines from this menu."
+msgstr ""
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_invoiceafterpacking0
+#: model:process.node,name:purchase.process_node_invoicecontrol0
+msgid "Draft Invoice"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.installer,purchase_analytic_plans:0
+msgid "Manages analytic distribution and purchase orders."
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,minimum_planned_date:0
+msgid ""
+"This is computed as the minimum scheduled date of all purchase order lines' "
+"products."
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "August"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.installer,purchase_requisition:0
+msgid "Purchase Requisition"
+msgstr ""
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
+msgid "Units of Measure Categories"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,delay_pass:0
+msgid "Days to Deliver"
+msgstr ""
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_action_picking_tree_in_move
+#: model:ir.ui.menu,name:purchase.menu_procurement_management_inventory
+msgid "Receive Products"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_procurement_order
+msgid "Procurement"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+#: field:purchase.order,invoice_ids:0
+msgid "Invoices"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_purchaseorder0
+msgid "Confirmed purchase order to invoice"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.installer,config_logo:0
+msgid "Image"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "Total Orders Lines by User per month"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,month:0
+msgid "Month"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
+msgid "Waiting Supplier Ack"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Request for Quotation :"
+msgstr ""
+
+#. module: purchase
+#: view:board.board:0
+#: model:ir.actions.act_window,name:purchase.purchase_waiting
+msgid "Purchase Order Waiting Approval"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Total Untaxed amount"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,shipped:0
+#: field:purchase.order,shipped_rate:0
+msgid "Received"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_packinglist0
+msgid "List of ordered products."
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,picking_ids:0
+msgid ""
+"This is the list of picking list that have been generated for this purchase"
+msgstr ""
+
+#. module: purchase
+#: model:ir.module.module,shortdesc:purchase.module_meta_information
+#: model:ir.ui.menu,name:purchase.menu_procurement_management
+msgid "Purchase Management"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_invoiceafterpacking0
+#: model:process.node,note:purchase.process_node_invoicecontrol0
+msgid "To be reviewed by the accountant."
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.purchase_line_form_action2
+#: model:ir.ui.menu,name:purchase.menu_purchase_line_order_draft
+msgid "Purchase Lines Not Invoiced"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Taxes :"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,invoiced_rate:0
+#: field:purchase.order.line,invoiced:0
+msgid "Invoiced"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,category_id:0
+msgid "Category"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_approvepurchaseorder0
+#: model:process.node,note:purchase.process_node_confirmpurchaseorder0
+msgid "State of the Purchase Order."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "  Year  "
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,state:0
+msgid "Order State"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_view_purchase_line_invoice
+msgid "Create invoices"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_order_line
+#: view:purchase.order.line:0
+#: field:stock.move,purchase_line_id:0
+msgid "Purchase Order Line"
+msgstr ""
+
+#. module: purchase
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Calendar View"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_order_group
+msgid "Purchase Order Merge"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Regards,"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_negotiation_by_supplier
+#: view:purchase.report:0
+msgid "Negotiation by Supplier"
+msgstr ""
+
+#. module: purchase
+#: view:res.partner:0
+msgid "Purchase Properties"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_purchaseinvoice0
+msgid ""
+"A purchase order generates a supplier invoice, as soon as it is confirmed by "
+"the buyer. Depending on the Invoicing control of the purchase order, the "
+"invoice is based on received or on ordered quantities."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,invoiced:0
+msgid "It indicates that an invoice has been paid"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_packinginvoice0
+msgid "Outgoing products to invoice"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.installer:0
+msgid "Configure"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_qty_per_product
+#: view:purchase.report:0
+msgid "Qty. per product"
+msgstr ""
+
+#. module: purchase
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,date_order:0
+msgid "Date on which this document has been created."
+msgstr ""
+
+#. module: purchase
+#: view:res.partner:0
+msgid "Sales & Purchases"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "June"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_report
+msgid "Purchases Orders"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.line:0
+msgid "Manual Invoices"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:308
+#, python-format
+msgid ""
+"Somebody has just confirmed a purchase with an amount over the defined limit"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "November"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/wizard/purchase_line_invoice.py:123
+#, python-format
+msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:408
+#, python-format
+msgid "You must first cancel all invoices attached to this purchase order."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/wizard/purchase_order_group.py:48
+#, python-format
+msgid "Please select multiple order to merge in the list view."
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_createpackinglist0
+msgid "Pick list generated"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Exception"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "October"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Compute"
+msgstr ""
+
+#. module: purchase
+#: model:ir.module.module,description:purchase.module_meta_information
+msgid ""
+"\n"
+"    Purchase module is for generating a purchase order for purchase of goods "
+"from a supplier.\n"
+"    A supplier invoice is created for the particular order placed\n"
+"    Dashboard for purchase management that includes:\n"
+"    * Current Purchase Orders\n"
+"    * Draft Purchase Orders\n"
+"    * Graph for quantity and amount per month    \n"
+"\n"
+"    "
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:685
+#, python-format
+msgid ""
+"The selected supplier has a minimal quantity set to %s, you cannot purchase "
+"less."
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Cancel Purchase Order"
+msgstr ""
+
+#. module: purchase
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_createpackinglist0
+msgid "A pick list is generated to track the incoming products."
+msgstr ""
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_purchase_deshboard
+msgid "Dashboard"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,price_standard:0
+msgid "Products Value"
+msgstr ""
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_purchase_product_pricelist_type
+msgid "Pricelists Types"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+#: view:purchase.report:0
+msgid "Quotations"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_po_per_month_tree
+#: view:purchase.report:0
+msgid "Purchase order per month"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.line:0
+msgid "History"
+msgstr ""
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_product_by_category_purchase_form
+msgid "Products by Category"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,delay:0
+msgid "Days to Validate"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,origin:0
+msgid "Reference of the document that generated this purchase order request."
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,state:0
+msgid ""
+"The state of the purchase order or the quotation request. A quotation is a "
+"purchase order in a 'Draft' state. Then the order has to be confirmed by the "
+"user, the state switch to 'Confirmed'. Then the supplier must confirm the "
+"order to change the state to 'Approved'. When the purchase order is paid and "
+"received, the state becomes 'Done'. If a cancel action occurs in the invoice "
+"or in the reception of goods, the state becomes in exception."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order.line,price_subtotal:0
+msgid "Subtotal"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.purchase_rfq
+#: model:ir.ui.menu,name:purchase.menu_purchase_rfq
+msgid "Requests for Quotation"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,date_approve:0
+msgid "Date on which purchase order has been approved"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
+msgid "Waiting"
+msgstr ""
+
+#. module: purchase
+#: model:product.pricelist.version,name:purchase.ver0
+msgid "Default Purchase Pricelist Version"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.installer:0
+msgid ""
+"Extend your Purchases Management Application with additional functionalities."
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_install_module
+#: view:purchase.installer:0
+msgid "Purchases Application Configuration"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,fiscal_position:0
+msgid "Fiscal Position"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Request for Quotation N°"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_invoicefrompackinglist0
+#: model:process.transition,name:purchase.process_transition_invoicefrompurchase0
+msgid "Invoice"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "December"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition.action,name:purchase.process_transition_action_approvingcancelpurchaseorder0
+#: model:process.transition.action,name:purchase.process_transition_action_cancelpurchaseorder0
+#: view:purchase.order:0
+#: view:purchase.order.group:0
+#: view:purchase.order.line_invoice:0
+msgid "Cancel"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+#: view:purchase.order.line:0
+msgid "Purchase Order Lines"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_approvingpurchaseorder0
+msgid "The supplier approves the Purchase Order."
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.act_res_partner_2_purchase_order
+#: model:ir.actions.act_window,name:purchase.purchase_form_action
+#: model:ir.ui.menu,name:purchase.menu_purchase_form_action
+#: view:purchase.report:0
+msgid "Purchase Orders"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,origin:0
+msgid "Source Document"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.group:0
+msgid "Merge orders"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_order_line_invoice
+msgid "Purchase Order Line Make Invoice"
+msgstr ""
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_action_picking_tree4
+msgid "Incoming Shipments"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
+msgid "Total Orders by User per month"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.report.xml,name:purchase.report_purchase_quotation
+#: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
+msgid "Request for Quotation"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Tél. :"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,create_uid:0
+#: view:purchase.report:0
+#: field:purchase.report,user_id:0
+msgid "Responsible"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Our Order Reference"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+#: view:purchase.order.line:0
+msgid "Search Purchase Order"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,warehouse_id:0
+#: view:purchase.report:0
+#: field:purchase.report,warehouse_id:0
+msgid "Warehouse"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_draftpurchaseorder0
+#: model:process.node,note:purchase.process_node_draftpurchaseorder1
+msgid "Request for Quotations."
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Date Req."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,date_approve:0
+#: field:purchase.report,date_approve:0
+msgid "Date Approved"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:407
+#, python-format
+msgid "Could not cancel this purchase order !"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.order.line,price_unit:0
+msgid "Unit Price"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Delivery & Invoicing"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order.line,date_planned:0
+msgid "Scheduled Date"
+msgstr ""
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_product_in_config_purchase
+#: field:purchase.order,product_id:0
+#: view:purchase.order.line:0
+#: field:purchase.order.line,product_id:0
+#: view:purchase.report:0
+#: field:purchase.report,product_id:0
+msgid "Product"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder0
+#: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder1
+msgid "Confirmation"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.order.line,name:0
+#: report:purchase.quotation:0
+msgid "Description"
+msgstr ""
+
+#. module: purchase
+#: help:res.company,po_lead:0
+msgid "This is the leads/security time for each purchase order."
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Expected Delivery address:"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_stock_move_report_po
+#: model:ir.ui.menu,name:purchase.menu_action_stock_move_report_po
+msgid "Receptions Analysis"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,amount_untaxed:0
+msgid "The amount without tax"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.action_supplier_address_form
+msgid ""
+"Access your supplier records and maintain a good relationship with your "
+"suppliers. You can track all your interactions with them through the History "
+"tab: emails, orders, meetings, etc."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Delivery"
+msgstr ""
+
+#. module: purchase
+#: view:board.board:0
+#: model:ir.actions.act_window,name:purchase.purchase_draft
+msgid "Request for Quotations"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order.line,product_uom:0
+msgid "Product UOM"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+#: report:purchase.quotation:0
+msgid "Qty"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,partner_address_id:0
+msgid "Address"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order.line,move_ids:0
+msgid "Reservation"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_order_report_graph
+#: view:purchase.report:0
+msgid "Total Qty and Amount by month"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:399
+#, python-format
+msgid "Could not cancel purchase order !"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder1
+msgid ""
+"In case there is no supplier for this product, the buyer can fill the form "
+"manually and confirm it. The RFQ becomes a confirmed Purchase Order."
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "February"
+msgstr ""
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_product_category_config_purchase
+msgid "Products Categories"
+msgstr "Product Categories"
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_order_report_all
+#: model:ir.ui.menu,name:purchase.menu_action_purchase_order_report_all
+msgid "Purchase Analysis"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Your Order Reference"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+#: field:purchase.order,minimum_planned_date:0
+#: report:purchase.quotation:0
+#: field:purchase.report,expected_date:0
+msgid "Expected Date"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_total_price_by_product_by_state
+#: view:purchase.report:0
+msgid "Total price by product by state"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "TVA:"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.order,date_order:0
+msgid "Date Ordered"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Shipping address :"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Purchase Control"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "March"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "April"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.group:0
+msgid ""
+" Please note that: \n"
+" \n"
+" Orders will only be merged if: \n"
+" * Purchase Orders are in draft \n"
+" * Purchase Orders belong to the same supplier \n"
+" * Purchase Orders are have same stock location, same pricelist \n"
+" \n"
+" Lines will only be merged if: \n"
+" * Order lines are exactly the same except for the product,quantity and unit "
+"\n"
+" "
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,name:0
+msgid "Year"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,negociation:0
+msgid "Purchase-Standard Price"
+msgstr ""
+
+#. module: purchase
+#: model:product.pricelist.type,name:purchase.pricelist_type_purchase
+#: field:res.partner,property_product_pricelist_purchase:0
+msgid "Purchase Pricelist"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,invoice_method:0
+msgid "Invoicing Control"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition.action,name:purchase.process_transition_action_approvingpurchaseorder0
+msgid "Approve"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "To Approve"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.line:0
+msgid "Invoicing"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order.line,state:0
+msgid ""
+" * The 'Draft' state is set automatically when purchase order in draft "
+"state.                                        \n"
+"* The 'Confirmed' state is set automatically as confirm when purchase order "
+"in confirm state.                                        \n"
+"* The 'Done' state is set automatically when purchase order is set as done.  "
+"                                      \n"
+"* The 'Cancelled' state is set automatically when user cancel purchase order."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:414
+#, python-format
+msgid "Purchase order '%s' is cancelled."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,amount_total:0
+msgid "Total"
+msgstr ""
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_product_pricelist_action_purhase
+msgid "Pricelist Versions"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_supplier_address_form
+msgid "Addresses"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.group:0
+msgid "Are you sure you want to merge these orders ?"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+#: view:purchase.order.line:0
+#: view:purchase.report:0
+msgid "Group By..."
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_purchaseinvoice0
+msgid "From a purchase order"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "TVA :"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,amount_total:0
+msgid "The total amount"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "May"
+msgstr ""
+
+#. module: purchase
+#: field:res.company,po_lead:0
+msgid "Purchase Lead Time"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_invoicefrompurchase0
+msgid ""
+"The invoice is created automatically if the Invoice control of the purchase "
+"order is 'On order'. The invoice can also be generated manually by the "
+"accountant (Invoice control = Manual)."
+msgstr ""
+
+#. module: purchase
+#: model:process.process,name:purchase.process_process_purchaseprocess0
+msgid "Purchase"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_res_partner
+#: field:purchase.order.line,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:651
+#, python-format
+msgid ""
+"You have to select a partner in the purchase form !\n"
+"Please set one partner before choosing a product."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.installer:0
+msgid "title"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_stock_partial_move
+msgid "Partial Move"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.line:0
+msgid "Stock Moves"
+msgstr ""
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_purchase_unit_measure_purchase
+#: model:ir.ui.menu,name:purchase.menu_purchase_uom_form_action
+msgid "Units of Measure"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "Orders"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,name:0
+msgid ""
+"unique number of the purchase order,computed automatically when the purchase "
+"order is created"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.open_board_purchase
+#: model:ir.ui.menu,name:purchase.menu_board_purchase
+msgid "Purchase Dashboard"
+msgstr ""
diff --git a/addons/stock_planning/i18n/sv.po b/addons/stock_planning/i18n/sv.po
new file mode 100644
index 00000000000..e54496d02ba
--- /dev/null
+++ b/addons/stock_planning/i18n/sv.po
@@ -0,0 +1,1515 @@
+# Swedish translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:16+0000\n"
+"PO-Revision-Date: 2011-04-12 20:16+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Swedish <sv@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: 2011-04-13 04:39+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
+
+#. module: stock_planning
+#: code:addons/stock_planning/wizard/stock_planning_createlines.py:73
+#, python-format
+msgid ""
+"No forecasts for selected period or no products in selected category !"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,stock_only:0
+msgid ""
+"Check to calculate stock location of selected warehouse only. If not "
+"selected calculation is made for input, stock and output location of "
+"warehouse."
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,maximum_op:0
+msgid "Maximum Rule"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period1_per_company:0
+msgid "This Copmany Period1"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning:0
+#: view:stock.sale.forecast:0
+msgid "Group By..."
+msgstr "Gruppera på"
+
+#. module: stock_planning
+#: help:stock.sale.forecast,product_amt:0
+msgid ""
+"Forecast value which will be converted to Product Quantity according to "
+"prices."
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:621
+#: code:addons/stock_planning/stock_planning.py:663
+#, python-format
+msgid "Incoming Left must be greater than 0 !"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,outgoing_before:0
+msgid ""
+"Planned Out in periods before calculated. Between start date of current "
+"period and one day before start of calculated period."
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/wizard/stock_planning_forecast.py:59
+#, python-format
+msgid "No products in selected category !"
+msgstr "Inga produkter i vald kategori"
+
+#. module: stock_planning
+#: help:stock.sale.forecast.createlines,warehouse_id:0
+msgid ""
+"Warehouse which forecasts will concern. If during stock planning you will "
+"need sales forecast for all warehouses choose any warehouse now."
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,outgoing_left:0
+msgid "Expected Out"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.sale.forecast:0
+msgid " "
+msgstr " "
+
+#. module: stock_planning
+#: field:stock.planning,incoming_left:0
+msgid "Incoming Left"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Requisition history"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.sale.forecast.createlines:0
+msgid "Create Forecasts Lines"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,outgoing:0
+msgid "Quantity of all confirmed outgoing moves in calculated Period."
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.period.createlines:0
+msgid "Create Daily Periods"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning:0
+#: field:stock.planning,company_id:0
+#: field:stock.planning.createlines,company_id:0
+#: view:stock.sale.forecast:0
+#: field:stock.sale.forecast,company_id:0
+#: field:stock.sale.forecast.createlines,company_id:0
+msgid "Company"
+msgstr "Företag"
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:640
+#: code:addons/stock_planning/stock_planning.py:682
+#, python-format
+msgid ""
+"\n"
+" Initial Stock: "
+msgstr ""
+"\n"
+" Ingående Lager: "
+
+#. module: stock_planning
+#: help:stock.planning,warehouse_forecast:0
+msgid ""
+"All sales forecasts for selected Warehouse of selected Product during "
+"selected Period."
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.ui.menu,name:stock_planning.menu_stock_period_creatlines
+msgid "Create Stock and Sales Periods"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Minimum Stock Rule Indicators"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.sale.forecast.createlines,period_id:0
+msgid "Period which forecasts will concern."
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,stock_only:0
+msgid "Stock Location Only"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,already_out:0
+msgid ""
+"Quantity which is already dispatched out of this warehouse in current period."
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,procure_to_stock:0
+msgid ""
+"Chect to make procurement to stock location of selected warehouse. If not "
+"selected procurement will be made into input location of warehouse."
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Current Period Situation"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.period.createlines:0
+msgid "Create Monthly Periods"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,supply_warehouse_id:0
+msgid ""
+"Warehouse used as source in supply pick move created by 'Supply from Another "
+"Warhouse'."
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.model,name:stock_planning.model_stock_period_createlines
+msgid "stock.period.createlines"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,outgoing_before:0
+msgid "Planned Out Before"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning.createlines,forecasted_products:0
+msgid "All Products with Forecast"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.sale.forecast:0
+msgid "Periods :"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,already_in:0
+msgid ""
+"Quantity which is already picked up to this warehouse in current period."
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:644
+#: code:addons/stock_planning/stock_planning.py:686
+#, python-format
+msgid "    Confirmed In Before: "
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.sale.forecast:0
+msgid "Stock and Sales Forecast"
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.model,name:stock_planning.model_stock_sale_forecast
+msgid "stock.sale.forecast"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_dept_id:0
+msgid "This Department"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,to_procure:0
+msgid "Planned In"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,stock_simulation:0
+msgid "Stock Simulation"
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.model,name:stock_planning.model_stock_planning_createlines
+msgid "stock.planning.createlines"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,incoming_before:0
+msgid ""
+"Confirmed incoming in periods before calculated (Including Already In). "
+"Between start date of current period and one day before start of calculated "
+"period."
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.sale.forecast:0
+msgid "Search  Sales Forecast"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period5_per_user:0
+msgid "This User Period5"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,history:0
+msgid "History of procurement or internal supply of this planning line."
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,company_forecast:0
+msgid ""
+"All sales forecasts for whole company (for all Warehouses) of selected "
+"Product during selected Period."
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period1_per_user:0
+msgid "This User Period1"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period3_per_user:0
+msgid "This User Period3"
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.ui.menu,name:stock_planning.menu_stock_planning_main
+#: view:stock.planning:0
+msgid "Stock Planning"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,minimum_op:0
+msgid "Minimum Rule"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Procure Incoming Left"
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:646
+#: code:addons/stock_planning/stock_planning.py:688
+#, python-format
+msgid "    Incoming Left: "
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:719
+#, python-format
+msgid "%s Pick List %s (%s,  %s) %s %s \n"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning.createlines:0
+#: view:stock.sale.forecast.createlines:0
+msgid "Create"
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.actions.act_window,name:stock_planning.action_view_stock_planning_form
+#: model:ir.module.module,shortdesc:stock_planning.module_meta_information
+#: model:ir.ui.menu,name:stock_planning.menu_stock_planning
+#: view:stock.planning:0
+msgid "Master Procurement Schedule"
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:636
+#: code:addons/stock_planning/stock_planning.py:678
+#, python-format
+msgid "  Creation Date: "
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,period_id:0
+#: field:stock.planning.createlines,period_id:0
+#: field:stock.sale.forecast,period_id:0
+#: field:stock.sale.forecast.createlines,period_id:0
+msgid "Period"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.period:0
+#: field:stock.period,state:0
+#: field:stock.planning,state:0
+#: field:stock.sale.forecast,state:0
+msgid "State"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.sale.forecast.createlines,product_categ_id:0
+msgid "Product Category of products which created forecasts will concern."
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.model,name:stock_planning.model_stock_period
+msgid "stock period"
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.model,name:stock_planning.model_stock_sale_forecast_createlines
+msgid "stock.sale.forecast.createlines"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,warehouse_id:0
+#: field:stock.planning.createlines,warehouse_id:0
+#: field:stock.sale.forecast,warehouse_id:0
+#: field:stock.sale.forecast.createlines,warehouse_id:0
+msgid "Warehouse"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,stock_simulation:0
+msgid ""
+"Stock simulation at the end of selected Period.\n"
+" For current period it is: \n"
+"Initial Stock - Already Out + Already In - Expected Out + Incoming Left.\n"
+"For periods ahead it is: \n"
+"Initial Stock - Planned Out Before + Incoming Before - Planned Out + Planned "
+"In."
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.sale.forecast,analyze_company:0
+msgid "Check this box to see the sales for whole company."
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,name:0
+msgid "Name"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Search Stock Planning"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,incoming_before:0
+msgid "Incoming Before"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning.createlines,product_categ_id:0
+#: field:stock.sale.forecast.createlines,product_categ_id:0
+msgid "Product Category"
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:621
+#: code:addons/stock_planning/stock_planning.py:663
+#: code:addons/stock_planning/stock_planning.py:665
+#: code:addons/stock_planning/stock_planning.py:667
+#: code:addons/stock_planning/wizard/stock_planning_createlines.py:73
+#: code:addons/stock_planning/wizard/stock_planning_forecast.py:59
+#, python-format
+msgid "Error !"
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:626
+#, python-format
+msgid "Manual planning for %s"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_user_id:0
+msgid "This User"
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:643
+#: code:addons/stock_planning/stock_planning.py:685
+#, python-format
+msgid ""
+"\n"
+" Confirmed Out: "
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Forecasts"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Supply from Another Warehouse"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Calculate Planning"
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:636
+#, python-format
+msgid ""
+" Procurement created in MPS by user: %s   Creation Date: %s                  "
+"                       \n"
+" For period: %s                                         \n"
+" according to state:                                         \n"
+" Warehouse Forecast: %s                                         \n"
+" Initial Stock: %s                                         \n"
+" Planned Out: %s    Planned In: %s                                         \n"
+" Already Out: %s    Already In: %s                                         \n"
+" Confirmed Out: %s    Confirmed In: %s                                       "
+"  \n"
+" Planned Out Before: %s    Confirmed In Before: %s                           "
+"              \n"
+" Expected Out: %s    Incoming Left: %s                                       "
+"  \n"
+" Stock Simulation: %s    Minimum stock: %s"
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:140
+#, python-format
+msgid "Invalid action !"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,stock_start:0
+msgid "Stock quantity one day before current period."
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.period.createlines:0
+msgid "Create Weekly Periods"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,maximum_op:0
+msgid "Maximum quantity set in Minimum Stock Rules for this Warhouse"
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:665
+#, python-format
+msgid "You must specify a Source Warehouse !"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning.createlines:0
+msgid "Creates planning lines for selected period and warehouse."
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period4_per_user:0
+msgid "This User Period4"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning.createlines:0
+#: view:stock.sale.forecast.createlines:0
+msgid "Note: Doesn't duplicate existing lines created by you."
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.period:0
+msgid "Stock and Sales Period"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,company_forecast:0
+msgid "Company Forecast"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,product_uom:0
+#: help:stock.sale.forecast,product_uom:0
+msgid ""
+"Unit of Measure used to show the quanities of stock calculation.You can use "
+"units form default category or from second category (UoS category)."
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.sale.forecast:0
+msgid "Per User :"
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.ui.menu,name:stock_planning.menu_stock_sale_forecast
+#: model:ir.ui.menu,name:stock_planning.menu_stock_sale_forecast_all
+#: view:stock.sale.forecast:0
+msgid "Sales Forecasts"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.period,name:0
+#: field:stock.period.createlines,name:0
+msgid "Period Name"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,user_id:0
+msgid "Created/Validated by"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Internal Supply"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period4_per_company:0
+msgid "This Company Period4"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period5_per_company:0
+msgid "This Company Period5"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period2_per_company:0
+msgid "This Company Period2"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period3_per_company:0
+msgid "This Company Period3"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.period,date_start:0
+#: field:stock.period.createlines,date_start:0
+msgid "Start Date"
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:642
+#: code:addons/stock_planning/stock_planning.py:684
+#, python-format
+msgid ""
+"\n"
+" Already Out: "
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,confirmed_forecasts_only:0
+msgid "Validated Forecasts"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning.createlines,product_categ_id:0
+msgid ""
+"Planning will be created for products from Product Category selected by this "
+"field. This field is ignored when you check \"All Forecasted Product\" box."
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,planned_outgoing:0
+msgid "Planned Out"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.sale.forecast:0
+msgid "Per Department :"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Forecast"
+msgstr ""
+
+#. module: stock_planning
+#: selection:stock.period,state:0
+#: selection:stock.planning,state:0
+#: selection:stock.sale.forecast,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.period:0
+msgid "Closed"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning:0
+#: view:stock.sale.forecast:0
+msgid "Warehouse "
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:646
+#: code:addons/stock_planning/stock_planning.py:688
+#, python-format
+msgid ""
+"\n"
+" Expected Out: "
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.period.createlines:0
+msgid "Create periods for Stock and Sales Planning"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,planned_outgoing:0
+msgid ""
+"Enter planned outgoing quantity from selected Warehouse during the selected "
+"Period of selected Product. To plan this value look at Confirmed Out or "
+"Sales Forecasts. This value should be equal or greater than Confirmed Out."
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.module.module,description:stock_planning.module_meta_information
+msgid ""
+"\n"
+"This module is based on original OpenERP SA module stock_planning version "
+"1.0 of the same name Master Procurement Schedule.\n"
+"\n"
+"Purpose of MPS is to allow create a manual procurement (requisition) apart "
+"of MRP scheduler (which works automatically on minimum stock rules).\n"
+"\n"
+"Terms used in the module:\n"
+"- Stock and Sales Period - is the time (between Start Date and End Date) for "
+"which you plan Stock and Sales Forecast and make Procurement Planning. \n"
+"- Stock and Sales Forecast - is the quantity of products you plan to sell in "
+"the Period.\n"
+"- Stock Planning - is the quantity of products you plan to purchase or "
+"produce for the Period.\n"
+"\n"
+"Because we have another module sale_forecast which uses terms \"Sales "
+"Forecast\" and \"Planning\" as amount values we will use terms \"Stock and "
+"Sales Forecast\" and \"Stock Planning\" to emphasize that we use quantity "
+"values. \n"
+"\n"
+"Activity with this module is divided to three steps:\n"
+"- Creating Periods. Mandatory step.\n"
+"- Creating Sale Forecasts and entering quantities to them. Optional step but "
+"useful for further planning.\n"
+"- Creating Planning lines, entering quantities to them and making "
+"Procurement. Making procurement is the final step for the Period.\n"
+"\n"
+"Periods\n"
+"=======\n"
+"You have two menu items for Periods in \"Sales Management - Configuration\". "
+"There are:\n"
+"- \"Create Sales Periods\" - Which automates creating daily, weekly or "
+"monthly periods.\n"
+"- \"Stock and sales Periods\" - Which allows to create any type of periods, "
+"change the dates and change the State of period.\n"
+"\n"
+"Creating periods is the first step you have to do to use modules features. "
+"You can create custom periods using \"New\" button in \"Stock and Sales "
+"Periods\" form or view but it is recommended to use automating tool.\n"
+"\n"
+"Remarks:\n"
+"- These periods (officially Stock and Sales Periods) are separated of "
+"Financial or other periods in the system.\n"
+"- Periods are not assigned to companies (when you use multicompany feature "
+"at all). Module suppose that you use the same periods across companies. If "
+"you wish to use different periods for different companies define them as you "
+"wish (they can overlap). Later on in this text will be indications how to "
+"use such periods.\n"
+"- When periods are created automatically their start and finish dates are "
+"with start hour 00:00:00 and end hour 23:59:00. Fe. when you create daily "
+"periods they will have start date 31.01.2010 00:00:00 and end date "
+"31.01.2010 23:59:00. It works only in automatic creation of periods. When "
+"you create periods manually you have to take care about hours because you "
+"can have incorrect values form sales or stock. \n"
+"- If you use overlapping periods for the same product, warehouse and company "
+"results can be unpredictable.\n"
+"- If current date doesn't belong to any period or you have holes between "
+"periods results can be unpredictable.\n"
+"\n"
+"Sales Forecasts\n"
+"===============\n"
+"You have few menus for Sales forecast in \"Sales Management - Sales "
+"Forecasts\".\n"
+"- \"Create Sales Forecasts for Sales Periods\" - which automates creating "
+"forecasts lines according to some parameters.\n"
+"- \"Sales Forecasts\" - few menus for working with forecasts lists and "
+"forms.\n"
+"\n"
+"Menu \"Create Sales Forecasts for Sales Periods\" creates Forecasts for "
+"products from selected Category, for selected Period and for selected "
+"Warehouse. It is an option \"Copy Last Forecast\" to copy forecast and other "
+"settings of period before this one to created one.\n"
+"\n"
+"Remarks:\n"
+"- This tool doesn't create lines, if relevant lines (for the same Product, "
+"Period, Warehouse and validated or created by you) already exists. If you "
+"wish to create another forecast, if relevant lines exists you have to do it "
+"manually using menus described bellow.\n"
+"- When created lines are validated by someone else you can use this tool to "
+"create another lines for the same Period, Product and Warehouse. \n"
+"- When you choose \"Copy Last Forecast\" created line takes quantity and "
+"some settings from your (validated by you or created by you if not validated "
+"yet) forecast which is for last period before period of created forecast. If "
+"there are few your forecasts for period before this one (it is possible) "
+"system takes one of them (no rule which of them).\n"
+"\n"
+"\n"
+"Menus \"Sales Forecasts\"\n"
+"On \"Sales Forecast\" form mainly you have to enter a forecast quantity in "
+"\"Product Quantity\". Further calculation can work for draft forecasts. But "
+"validation can save your data against any accidental changes. You can click "
+"\"Validate\" button but it is not mandatory.\n"
+"\n"
+"Instead of forecast quantity you can enter amount of forecast sales in field "
+"\"Product Amount\". System will count quantity from amount according to Sale "
+"price of the Product.\n"
+"\n"
+"All values on the form are expressed in unit of measure selected on form. "
+"You can select one of unit of measure from default category or from second "
+"category. When you change unit of measure the quanities will be recalculated "
+"according to new UoM: editable values (blue fields) immediately, non edited "
+"fields after clicking of \"Calculate Planning\" button.\n"
+"\n"
+"To find proper value for Sale Forecast you can use \"Sales History\" table "
+"for this product. You have to enter parameters to the top and left of this "
+"table and system will count sale quantities according to these parameters. "
+"So you can select fe. your department (at the top) then (to the left): last "
+"period, period before last and period year ago.\n"
+"\n"
+"Remarks:\n"
+"\n"
+"\n"
+"Procurement Planning\n"
+"====================\n"
+"Menu for Planning you can find in \"Warehouse - Stock Planning\".\n"
+"- \"Create Stock Planning Lines\" - allows you to automate creating planning "
+"lines according to some parameters.\n"
+"- \"Master Procurement Scheduler\" - is the most important menu of the "
+"module which allows to create procurement.\n"
+"\n"
+"As Sales forecast is phase of planning sales. The Procurement Planning "
+"(Planning) is the phase of scheduling Purchasing or Producing. You can "
+"create Procurement Planning quickly using tool from menu \"Create Stock "
+"Planning Lines\", then you can review created planning and make procurement "
+"using menu \"Master Procurement Schedule\".\n"
+"\n"
+"Menu \"Create Stock Planning Lines\" allows you to create quickly Planning "
+"lines for products from selected Category, for selected Period, and for "
+"selected Warehouse. When you check option \"All Products with Forecast\" "
+"system creates lines for all products having forecast for selected Period "
+"and Warehouse. Selected Category will be ignored in this case.\n"
+"\n"
+"Under menu \"Master Procurement Scheduler\" you can generally change the "
+"values \"Planned Out\" and \"Planned In\" to observe the field \"Stock "
+"Simulation\" and decide if this value would be accurate for end of the "
+"Period. \n"
+"\"Planned Out\" can be based on \"Warehouse Forecast\" which is the sum of "
+"all forecasts for Period and Warehouse. But your planning can be based on "
+"any other information you have. It is not necessary to have any forecast. \n"
+"\"Planned In\" quantity is used to calculate field \"Incoming Left\" which "
+"is the quantity to be procured to make stock as indicated in \"Stock "
+"Simulation\" at the end of Period. You can compare \"Stock Simulation\" "
+"quantity to minimum stock rules visible on the form. But you can plan "
+"different quantity than in Minimum Stock Rules. Calculation is made for "
+"whole Warehouse by default. But if you want to see values for Stock location "
+"of calculated warehouse you can use check box \"Stock Location Only\".\n"
+"\n"
+"If after few tries you decide that you found correct quantities for "
+"\"Planned Out\" and \"Planned In\" and you are satisfied with end of period "
+"stock calculated in \"Stock Simulation\" you can click \"Procure Incoming "
+"Left\" button to procure quantity of field \"Incoming Left\" into the "
+"Warehouse. System creates appropriate Procurement Order. You can decide if "
+"procurement will be made to Stock or Input location of calculated Warehouse. "
+"\n"
+"\n"
+"If you don't want to Produce or Buy the product but just pick calculated "
+"quantity from another warehouse you can click \"Supply from Another "
+"Warehouse\" (instead of \"Procure Incoming Left\"). System creates pick list "
+"with move from selected source Warehouse to calculated Warehouse (as "
+"destination). You can also decide if this pick should be done from Stock or "
+"Output location of source warehouse. Destination location (Stock or Input) "
+"of destination warehouse will be used as set for \"Procure Incoming Left\". "
+"\n"
+"\n"
+"To see proper quantities in fields \"Confirmed In\", \"Confirmed Out\", "
+"\"Confirmed In Before\", \"Planned Out Before\" and \"Stock Simulation\" you "
+"have to click button \"Calculate Planning\".\n"
+"\n"
+"All values on the form are expressed in unit of measure selected on form. "
+"You can select one of unit of measure from default category or from second "
+"category. When you change unit of measure the quanities will be recalculated "
+"according to new UoM: editable values (blue fields) immediately, non edited "
+"fields after clicking of \"Calculate Planning\" button.\n"
+"\n"
+"How Stock Simulation field is calculated:\n"
+"Generally Stock Simulation shows the stock for end of the calculated period "
+"according to some planned or confirmed stock moves. Calculation always "
+"starts with quantity of real stock of beginning of current period. Then "
+"calculation adds or subtracts quantities of calculated period or periods "
+"before calculated.\n"
+"When you are in the same period (current period is the same as calculated) "
+"Stock Simulation is calculated as follows:\n"
+"Stock Simulation = \n"
+"\tStock of beginning of current Period\n"
+"\t- Planned Out \n"
+"\t+ Planned In\n"
+"\n"
+"When you calculate period next to current:\n"
+"Stock Simulation = \n"
+"\tStock of beginning of current Period\n"
+"\t- Planned Out of current Period \n"
+"\t+ Confirmed In of current Period  (incl. Already In)\n"
+"\t- Planned Out of calculated Period \n"
+"\t+ Planned In of calculated Period .\n"
+"\n"
+"As you see calculated Period is taken the same way like in case above. But "
+"calculation of current Period are made a little bit different. First you "
+"should note that system takes for current Period only Confirmed In moves. It "
+"means that you have to make planning and procurement for current Period "
+"before this calculation (for Period next to current). \n"
+"\n"
+"When you calculate Period ahead:\n"
+"Stock Simulation = \n"
+"\tStock of beginning of current Period \n"
+"\t- Sum of Planned Out of Periods before calculated \n"
+"\t+ Sum of Confirmed In of Periods before calculated (incl. Already In) \n"
+"\t- Planned Out of calculated Period \n"
+"\t+ Planned In of calculated Period.\n"
+"\n"
+"Periods before calculated means periods starting from current till period "
+"before calculated.\n"
+"\n"
+"Remarks:\n"
+"- Remember to make planning for all periods before calculated because "
+"omitting these quantities and procurements can cause wrong suggestions for "
+"procurements few periods ahead.\n"
+"- If you made planning few periods ahead and you find that real Confirmed "
+"Out is bigger than Planned Out in some periods before you can repeat "
+"Planning and make another procurement. You should do it in the same planning "
+"line. If you create another planning line the suggestions can be wrong.\n"
+"- When you wish to work with different periods for some part of products "
+"define two kinds of periods (fe. Weekly and Monthly) and use them for "
+"different products. Example: If you use always Weekly periods for Products "
+"A, and Monthly periods for Products B your all calculations will work "
+"correctly. You can also use different kind of periods for the same products "
+"from different warehouse or companies. But you cannot use overlapping "
+"periods for the same product, warehouse and company because results can be "
+"unpredictable. The same apply to Forecasts lines.\n"
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:140
+#, python-format
+msgid "Cannot delete Validated Sale Forecasts !"
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:641
+#: code:addons/stock_planning/stock_planning.py:683
+#, python-format
+msgid ""
+"\n"
+" Planned Out: "
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:667
+#, python-format
+msgid ""
+"You must specify a Source Warehouse different than calculated (destination) "
+"Warehouse !"
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.actions.act_window,name:stock_planning.action_stock_sale_forecast_createlines_form
+#: model:ir.ui.menu,name:stock_planning.menu_stock_sale_forecast_createlines
+msgid "Create Sales Forecasts"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.sale.forecast.createlines:0
+msgid "Creates forecast lines for selected warehouse and period."
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:656
+#, python-format
+msgid "%s Requisition (%s,  %s) %s %s \n"
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:655
+#, python-format
+msgid "Requisition ("
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,outgoing_left:0
+msgid ""
+"Quantity expected to go out in selected period. As a difference between "
+"Planned Out and Confirmed Out. For current period Already Out is also "
+"calculated"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period4_id:0
+msgid "Period4"
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:642
+#: code:addons/stock_planning/stock_planning.py:684
+#, python-format
+msgid "    Already In: "
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period2_id:0
+msgid "Period2"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period3_id:0
+msgid "Period3"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period1_id:0
+msgid "Period1"
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:647
+#: code:addons/stock_planning/stock_planning.py:689
+#, python-format
+msgid "    Minimum stock: "
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,active_uom:0
+#: field:stock.sale.forecast,active_uom:0
+msgid "Active UoM"
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.actions.act_window,name:stock_planning.action_stock_planning_createlines_form
+#: model:ir.ui.menu,name:stock_planning.menu_stock_planning_createlines
+#: view:stock.planning.createlines:0
+msgid "Create Stock Planning Lines"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "General Info"
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.actions.act_window,name:stock_planning.action_view_stock_sale_forecast_form
+msgid "Sales Forecast"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Planning and Situation for Calculated Period"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period1_per_warehouse:0
+msgid "This Warehouse Period1"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,warehouse_forecast:0
+msgid "Warehouse Forecast"
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:643
+#: code:addons/stock_planning/stock_planning.py:685
+#, python-format
+msgid "    Confirmed In: "
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.sale.forecast:0
+msgid "Sales history"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,supply_warehouse_id:0
+msgid "Source Warehouse"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.sale.forecast,product_qty:0
+msgid "Forecasted quantity."
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Stock"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,stock_supply_location:0
+msgid "Stock Supply Location"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.period.createlines,date_stop:0
+msgid "Ending date for planning period."
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period2_per_user:0
+msgid "This User Period2"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning.createlines,forecasted_products:0
+msgid ""
+"Check this box to create planning for all products having any forecast for "
+"selected Warehouse and Period. Product Category field will be ignored."
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,already_in:0
+msgid "Already In"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,product_uom_categ:0
+#: field:stock.planning,product_uos_categ:0
+#: field:stock.sale.forecast,product_uom_categ:0
+msgid "Product UoM Category"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,incoming:0
+msgid "Confirmed In"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,line_time:0
+msgid "Past/Future"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,product_uos_categ:0
+msgid "Product UoS Category"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,product_qty:0
+msgid "Product Quantity"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast.createlines,copy_forecast:0
+msgid "Copy Last Forecast"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.sale.forecast,product_id:0
+msgid "Shows which product this forecast concerns."
+msgstr ""
+
+#. module: stock_planning
+#: selection:stock.planning,state:0
+msgid "Done"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.period.createlines,period_ids:0
+msgid "Periods"
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:638
+#: code:addons/stock_planning/stock_planning.py:680
+#, python-format
+msgid " according to state:"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.period.createlines:0
+msgid "Cancel"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.period:0
+#: selection:stock.period,state:0
+#: view:stock.planning.createlines:0
+#: view:stock.sale.forecast.createlines:0
+msgid "Close"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.sale.forecast:0
+#: selection:stock.sale.forecast,state:0
+msgid "Validated"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.period:0
+#: selection:stock.period,state:0
+msgid "Open"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.sale.forecast.createlines,copy_forecast:0
+msgid "Copy quantities from last Stock and Sale Forecast."
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period1_per_dept:0
+msgid "This Dept Period1"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period3_per_dept:0
+msgid "This Dept Period3"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period2_per_dept:0
+msgid "This Dept Period2"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period5_per_dept:0
+msgid "This Dept Period5"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period4_per_dept:0
+msgid "This Dept Period4"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period2_per_warehouse:0
+msgid "This Warehouse Period2"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period3_per_warehouse:0
+msgid "This Warehouse Period3"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,outgoing:0
+msgid "Confirmed Out"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,create_uid:0
+msgid "Responsible"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.sale.forecast:0
+msgid "Default UOM"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period4_per_warehouse:0
+msgid "This Warehouse Period4"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period5_per_warehouse:0
+msgid "This Warehouse Period5"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.period:0
+msgid "Current"
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.model,name:stock_planning.model_stock_planning
+msgid "stock.planning"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.sale.forecast,warehouse_id:0
+msgid ""
+"Shows which warehouse this forecast concerns. If during stock planning you "
+"will need sales forecast for all warehouses choose any warehouse now."
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning.createlines,warehouse_id:0
+msgid "Warehouse which planning will concern."
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:647
+#: code:addons/stock_planning/stock_planning.py:689
+#, python-format
+msgid ""
+"\n"
+" Stock Simulation: "
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,to_procure:0
+msgid ""
+"Enter quantity which (by your plan) should come in. Change this value and "
+"observe Stock simulation. This value should be equal or greater than "
+"Confirmed In."
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning.createlines,period_id:0
+msgid "Period which planning will concern."
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,already_out:0
+msgid "Already Out"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,product_id:0
+msgid "Product which this planning is created for."
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.sale.forecast:0
+msgid "Per Warehouse :"
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:639
+#: code:addons/stock_planning/stock_planning.py:681
+#, python-format
+msgid ""
+"\n"
+" Warehouse Forecast: "
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,history:0
+msgid "Procurement History"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.period.createlines,date_start:0
+msgid "Starting date for planning period."
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:641
+#: code:addons/stock_planning/stock_planning.py:683
+#, python-format
+msgid "    Planned In: "
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyze_company:0
+msgid "Per Company"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,incoming_left:0
+msgid ""
+"Quantity left to Planned incoming quantity. This is calculated difference "
+"between Planned In and Confirmed In. For current period Already In is also "
+"calculated. This value is used to create procurement for lacking quantity."
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,incoming:0
+msgid "Quantity of all confirmed incoming moves in calculated Period."
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.period,date_stop:0
+#: field:stock.period.createlines,date_stop:0
+msgid "End Date"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,stock_supply_location:0
+msgid ""
+"Check to supply from Stock location of Supply Warehouse. If not checked "
+"supply will be made from Output location of Supply Warehouse. Used in "
+"'Supply from Another Warhouse' with Supply Warehouse."
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "No Requisition"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,minimum_op:0
+msgid "Minimum quantity set in Minimum Stock Rules for this Warhouse"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.sale.forecast,period_id:0
+msgid "Shows which period this forecast concerns."
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,product_uom:0
+msgid "UoM"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Calculated Period Simulation"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning:0
+#: field:stock.planning,product_id:0
+#: view:stock.sale.forecast:0
+#: field:stock.sale.forecast,product_id:0
+msgid "Product"
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:638
+#: code:addons/stock_planning/stock_planning.py:680
+#, python-format
+msgid ""
+"\n"
+"For period: "
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,product_uom:0
+msgid "Product UoM"
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:627
+#: code:addons/stock_planning/stock_planning.py:673
+#: code:addons/stock_planning/stock_planning.py:697
+#, python-format
+msgid "MPS(%s) %s"
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:627
+#: code:addons/stock_planning/stock_planning.py:671
+#: code:addons/stock_planning/stock_planning.py:693
+#, python-format
+msgid "MPS("
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:680
+#, python-format
+msgid ""
+"Pick created from MPS by user: %s   Creation Date: %s                        "
+"             \n"
+"For period: %s   according to state:                                     \n"
+" Warehouse Forecast: %s                                     \n"
+" Initial Stock: %s                                     \n"
+" Planned Out: %s  Planned In: %s                                     \n"
+" Already Out: %s  Already In: %s                                     \n"
+" Confirmed Out: %s   Confirmed In: %s                                     \n"
+" Planned Out Before: %s   Confirmed In Before: %s                            "
+"         \n"
+" Expected Out: %s   Incoming Left: %s                                     \n"
+" Stock Simulation: %s   Minimum stock: %s "
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,procure_to_stock:0
+msgid "Procure To Stock Location"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.sale.forecast:0
+msgid "Approve"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,period_id:0
+msgid ""
+"Period for this planning. Requisition will be created for beginning of the "
+"period."
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.sale.forecast:0
+msgid "Calculate Sales History"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,product_amt:0
+msgid "Product Amount"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,confirmed_forecasts_only:0
+msgid ""
+"Check to take validated forecasts only. If not checked system takes "
+"validated and draft forecasts."
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period5_id:0
+msgid "Period5"
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.actions.act_window,name:stock_planning.action_stock_period_createlines_form
+msgid "Stock and Sales Planning Periods"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_warehouse_id:0
+msgid "This Warehouse"
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.actions.act_window,name:stock_planning.action_stock_period_form
+#: model:ir.ui.menu,name:stock_planning.menu_stock_period
+#: model:ir.ui.menu,name:stock_planning.menu_stock_period_main
+#: view:stock.period:0
+#: view:stock.period.createlines:0
+msgid "Stock and Sales Periods"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.sale.forecast,user_id:0
+msgid "Shows who created this forecast, or who validated."
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:644
+#: code:addons/stock_planning/stock_planning.py:686
+#, python-format
+msgid ""
+"\n"
+" Planned Out Before: "
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,stock_start:0
+msgid "Initial Stock"
+msgstr ""
diff --git a/addons/subscription/i18n/gl.po b/addons/subscription/i18n/gl.po
new file mode 100644
index 00000000000..d1fee1eb4be
--- /dev/null
+++ b/addons/subscription/i18n/gl.po
@@ -0,0 +1,341 @@
+# Galician translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:16+0000\n"
+"PO-Revision-Date: 2011-04-14 18:27+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Galician <gl@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: 2011-04-15 05:06+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
+
+#. module: subscription
+#: field:subscription.subscription,doc_source:0
+#: field:subscription.subscription.history,document_id:0
+msgid "Source Document"
+msgstr "Documento orixe"
+
+#. module: subscription
+#: field:subscription.document,model:0
+msgid "Object"
+msgstr "Obxecto"
+
+#. module: subscription
+#: view:subscription.subscription:0
+msgid "This Week"
+msgstr "Esta semana"
+
+#. module: subscription
+#: view:subscription.subscription:0
+msgid "Search Subscription"
+msgstr "Buscar subscrición"
+
+#. module: subscription
+#: field:subscription.subscription,date_init:0
+msgid "First Date"
+msgstr "Primeira data"
+
+#. module: subscription
+#: field:subscription.document.fields,field:0
+msgid "Field"
+msgstr "Campo"
+
+#. module: subscription
+#: view:subscription.subscription:0
+#: field:subscription.subscription,state:0
+msgid "State"
+msgstr "Estado"
+
+#. module: subscription
+#: model:ir.model,name:subscription.model_subscription_subscription_history
+msgid "Subscription history"
+msgstr "Historial de documentos periódicos"
+
+#. module: subscription
+#: selection:subscription.subscription,state:0
+msgid "Draft"
+msgstr "Borrador"
+
+#. module: subscription
+#: selection:subscription.document.fields,value:0
+msgid "Current Date"
+msgstr "Data actual"
+
+#. module: subscription
+#: selection:subscription.subscription,interval_type:0
+msgid "Weeks"
+msgstr "Semanas"
+
+#. module: subscription
+#: view:subscription.subscription:0
+msgid "Today"
+msgstr "Hoxe"
+
+#. module: subscription
+#: code:addons/subscription/subscription.py:44
+#, python-format
+msgid "Error !"
+msgstr "Erro!"
+
+#. module: subscription
+#: model:ir.actions.act_window,name:subscription.action_subscription_form
+#: model:ir.ui.menu,name:subscription.menu_action_subscription_form
+#: view:subscription.subscription:0
+msgid "Subscriptions"
+msgstr "Subscricións"
+
+#. module: subscription
+#: field:subscription.subscription,interval_number:0
+msgid "Interval Qty"
+msgstr "Período: Cantidade de tempo"
+
+#. module: subscription
+#: view:subscription.subscription:0
+msgid "Stop"
+msgstr ""
+
+#. module: subscription
+#: view:subscription.subscription:0
+msgid "Set to Draft"
+msgstr "Establecer como borrador"
+
+#. module: subscription
+#: model:ir.module.module,description:subscription.module_meta_information
+msgid ""
+"Module allows to create new documents and add subscription on that document."
+msgstr ""
+"Este módulo permite crear novos documentos e engadir subscricións a este "
+"documento."
+
+#. module: subscription
+#: view:subscription.subscription:0
+#: selection:subscription.subscription,state:0
+msgid "Running"
+msgstr "Executándose"
+
+#. module: subscription
+#: view:subscription.subscription.history:0
+msgid "Subscription History"
+msgstr "Historial de documentos periódicos"
+
+#. module: subscription
+#: view:subscription.subscription:0
+#: field:subscription.subscription,user_id:0
+msgid "User"
+msgstr "Usuario"
+
+#. module: subscription
+#: field:subscription.subscription,interval_type:0
+msgid "Interval Unit"
+msgstr "Unidade de intervalo"
+
+#. module: subscription
+#: field:subscription.subscription.history,date:0
+msgid "Date"
+msgstr "Data"
+
+#. module: subscription
+#: field:subscription.subscription,exec_init:0
+msgid "Number of documents"
+msgstr "Número de documentos"
+
+#. module: subscription
+#: help:subscription.document,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the "
+"subscription document without removing it."
+msgstr ""
+"Se se desmarca o campo activo, permite ocultar o documento de subscrición "
+"sen eliminalo."
+
+#. module: subscription
+#: selection:subscription.subscription.history,document_id:0
+msgid "Sale Order"
+msgstr "Pedido de venda"
+
+#. module: subscription
+#: field:subscription.document,name:0
+#: field:subscription.subscription,name:0
+msgid "Name"
+msgstr "Nome"
+
+#. module: subscription
+#: code:addons/subscription/subscription.py:44
+#, python-format
+msgid ""
+"You cannot modify the Object linked to the Document Type!\n"
+"Create another Document instead !"
+msgstr ""
+"Non pode modificar o obxecto vinculado ó tipo de documento! Cree outro "
+"documento no seu lugar!"
+
+#. module: subscription
+#: field:subscription.document,field_ids:0
+msgid "Fields"
+msgstr "Campos"
+
+#. module: subscription
+#: view:subscription.subscription:0
+#: field:subscription.subscription,note:0
+#: field:subscription.subscription,notes:0
+msgid "Notes"
+msgstr "Notas"
+
+#. module: subscription
+#: selection:subscription.subscription,interval_type:0
+msgid "Months"
+msgstr "Meses"
+
+#. module: subscription
+#: selection:subscription.subscription,interval_type:0
+msgid "Days"
+msgstr "Días"
+
+#. module: subscription
+#: field:subscription.document,active:0
+#: field:subscription.subscription,active:0
+msgid "Active"
+msgstr "Activo"
+
+#. module: subscription
+#: field:subscription.subscription,cron_id:0
+msgid "Cron Job"
+msgstr "Tarea de Cron"
+
+#. module: subscription
+#: model:ir.model,name:subscription.model_subscription_subscription
+#: field:subscription.subscription.history,subscription_id:0
+msgid "Subscription"
+msgstr "Subscrición"
+
+#. module: subscription
+#: view:subscription.subscription:0
+#: field:subscription.subscription,partner_id:0
+msgid "Partner"
+msgstr "Socio"
+
+#. module: subscription
+#: help:subscription.subscription,cron_id:0
+msgid "Scheduler which runs on subscription"
+msgstr "Planificador que executa a subscrición."
+
+#. module: subscription
+#: model:ir.ui.menu,name:subscription.config_recuuring_event
+#: model:ir.ui.menu,name:subscription.next_id_45
+msgid "Recurring Events"
+msgstr "Eventos recorrentes"
+
+#. module: subscription
+#: view:subscription.subscription:0
+msgid "Subsription Data"
+msgstr "Datos da subscrición"
+
+#. module: subscription
+#: help:subscription.subscription,note:0
+msgid "Description or Summary of Subscription"
+msgstr "Descrición ou resumo da subscrición."
+
+#. module: subscription
+#: model:ir.model,name:subscription.model_subscription_document
+#: view:subscription.document:0
+#: field:subscription.document.fields,document_id:0
+msgid "Subscription Document"
+msgstr "Documento de subscrición"
+
+#. module: subscription
+#: help:subscription.subscription,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the "
+"subscription without removing it."
+msgstr ""
+"Se se desmarca o campo activo, permite ocultar a subscrición sen eliminala."
+
+#. module: subscription
+#: help:subscription.document.fields,value:0
+msgid "Default value is considered for field when new document is generated."
+msgstr ""
+"Tense en conta o valor por defecto do campo cando se xera un novo documento."
+
+#. module: subscription
+#: selection:subscription.document.fields,value:0
+msgid "False"
+msgstr "Falso"
+
+#. module: subscription
+#: view:subscription.subscription:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: subscription
+#: view:subscription.subscription:0
+msgid "Process"
+msgstr "Proceso"
+
+#. module: subscription
+#: model:ir.module.module,shortdesc:subscription.module_meta_information
+msgid "Subscription and recurring operations"
+msgstr "Subscricións e operacións recorrentes"
+
+#. module: subscription
+#: help:subscription.subscription,doc_source:0
+msgid ""
+"User can choose the source document on which he wants to create documents"
+msgstr ""
+"O usuario pode seleccionar o documento orixinal sobre o cal desexa crear os "
+"documentos."
+
+#. module: subscription
+#: model:ir.actions.act_window,name:subscription.action_document_form
+#: model:ir.ui.menu,name:subscription.menu_action_document_form
+msgid "Document Types"
+msgstr "Tipos de documento"
+
+#. module: subscription
+#: code:addons/subscription/subscription.py:115
+#, python-format
+msgid "Wrong Source Document !"
+msgstr "Documento fonte erróneo!"
+
+#. module: subscription
+#: model:ir.model,name:subscription.model_subscription_document_fields
+#: view:subscription.document.fields:0
+msgid "Subscription Document Fields"
+msgstr "Campos do documento de subscrición"
+
+#. module: subscription
+#: view:subscription.subscription:0
+#: selection:subscription.subscription,state:0
+msgid "Done"
+msgstr "Feito"
+
+#. module: subscription
+#: selection:subscription.subscription.history,document_id:0
+msgid "Invoice"
+msgstr "Factura"
+
+#. module: subscription
+#: code:addons/subscription/subscription.py:115
+#, python-format
+msgid ""
+"Please provide another source document.\n"
+"This one does not exist !"
+msgstr "Por favor, proporcione outro documento fonte. Este non existe!"
+
+#. module: subscription
+#: field:subscription.document.fields,value:0
+msgid "Default Value"
+msgstr "Valor predeterminado"
+
+#. module: subscription
+#: view:subscription.subscription:0
+#: field:subscription.subscription,doc_lines:0
+msgid "Documents created"
+msgstr "Documentos creados"

From f0cf5764c820aa35ed59bbc1bf41ee51c5c8ec7c Mon Sep 17 00:00:00 2001
From: "aag (OpenERP)" <aag@tinyerp.co.in>
Date: Fri, 15 Apr 2011 11:28:17 +0530
Subject: [PATCH 226/331] [IMP]MRP :Usability Issue-Now MO: Product is not
 Consumable or Service type

bzr revid: aag@tinyerp.co.in-20110415055817-3366enzlvbav7yr2
---
 addons/mrp/mrp_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 1ac11707870..48c136d1258 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -638,7 +638,7 @@
                         <field name="date_planned"/>
                         <field name="origin"/>
                         <newline/>
-                        <field name="product_id" on_change="product_id_change(product_id)"/>
+                        <field name="product_id" on_change="product_id_change(product_id)" domain="[('type','=','product')]"/>
                         <field name="product_qty"/>
                         <field name="product_uom"/>
                         <button type="action"

From db491b415b5ddfbf2ab3e94adf7134f27f8c8d3c Mon Sep 17 00:00:00 2001
From: "ARA (OpenERP)" <ara@tinyerp.com>
Date: Fri, 15 Apr 2011 11:39:42 +0530
Subject: [PATCH 227/331] [FIX] account_budget: Print budget report without
 analytic account gives error

bzr revid: ara@tinyerp.com-20110415060942-czsjpgs1jguwvc11
---
 addons/account_budget/report/budget_report.py             | 2 ++
 addons/account_budget/report/crossovered_budget_report.py | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/addons/account_budget/report/budget_report.py b/addons/account_budget/report/budget_report.py
index 8b98b067bb3..7681f9268d9 100644
--- a/addons/account_budget/report/budget_report.py
+++ b/addons/account_budget/report/budget_report.py
@@ -67,6 +67,8 @@ class budget_report(report_sxw.rml_parse):
 
             context = {'wizard_date_from': d_from, 'wizard_date_to': d_to}
             for i in range(0, len(an_ids)):
+                if not an_ids[i][0]:
+                    continue
                 analytic_name = acc_analytic_obj.browse(self.cr, self.uid, [an_ids[i][0]])
                 res={
                     'b_id': '-1',
diff --git a/addons/account_budget/report/crossovered_budget_report.py b/addons/account_budget/report/crossovered_budget_report.py
index 8a3b745e32a..b70b7da34bb 100644
--- a/addons/account_budget/report/crossovered_budget_report.py
+++ b/addons/account_budget/report/crossovered_budget_report.py
@@ -72,6 +72,8 @@ class budget_report(report_sxw.rml_parse):
 
             context = {'wizard_date_from': d_from, 'wizard_date_to': d_to}
             for i in range(0, len(an_ids)):
+                if not an_ids[i][0]:
+                    continue
                 analytic_name = acc_analytic_obj.browse(self.cr, self.uid, [an_ids[i][0]])
                 res={
                     'b_id': '-1',

From 3fe9f6b1f1eb3f696b674b940c6f877bd61deed1 Mon Sep 17 00:00:00 2001
From: vro <vro@tinyerp.com>
Date: Fri, 15 Apr 2011 11:59:18 +0530
Subject: [PATCH 228/331] [IMP]: Event tooltip typos and grammar.

bzr revid: vro@tinyerp.com-20110415062918-bluxwdyxixtxyjbi
---
 addons/event/event.py | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/addons/event/event.py b/addons/event/event.py
index f4f7c4930b8..4d392689bba 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -205,12 +205,12 @@ class event_event(osv.osv):
         'child_ids': fields.one2many('event.event', 'parent_id', 'Child Events', readonly=False, states={'done': [('readonly', True)]}),
         'reply_to': fields.char('Reply-To', size=64, readonly=False, states={'done': [('readonly', True)]}, help="The email address put in the 'Reply-To' of all emails sent by OpenERP"),
         'type': fields.many2one('event.type', 'Type', help="Type of Event like Seminar, Exhibition, Conference, Training.", readonly=False, states={'done': [('readonly', True)]}),
-        'register_max': fields.integer('Maximum Registrations', help="Provide Maximun Number of Registrations", readonly=True, states={'draft': [('readonly', False)]}),
-        'register_min': fields.integer('Minimum Registrations', help="Providee Minimum Number of Registrations", readonly=True, states={'draft': [('readonly', False)]}),
+        'register_max': fields.integer('Maximum Registrations', help="Provide Maximum Number of Registrations", readonly=True, states={'draft': [('readonly', False)]}),
+        'register_min': fields.integer('Minimum Registrations', help="Provide Minimum Number of Registrations", readonly=True, states={'draft': [('readonly', False)]}),
         'register_current': fields.function(_get_register, method=True, string='Confirmed Registrations', multi='register_current',
             help="Total of Open and Done Registrations"),
         'register_prospect': fields.function(_get_register, method=True, string='Unconfirmed Registrations', multi='register_prospect',
-            help="Total of Prospect Registrati./event/event.py:41:ons"),
+            help="Total of Prospect Registrations"),
         'registration_ids': fields.one2many('event.registration', 'event_id', 'Registrations', readonly=False, states={'done': [('readonly', True)]}),
         'date_begin': fields.datetime('Beginning date', required=True, help="Beginning Date of Event", readonly=True, states={'draft': [('readonly', False)]}),
         'date_end': fields.datetime('Closing date', required=True, help="Closing Date of Event", readonly=True, states={'draft': [('readonly', False)]}),
@@ -221,15 +221,15 @@ class event_event(osv.osv):
             ('cancel', 'Cancelled')],
             'State', readonly=True, required=True,
             help='If event is created, the state is \'Draft\'.If event is confirmed for the particular dates the state is set to \'Confirmed\'. If the event is over, the state is set to \'Done\'.If event is cancelled the state is set to \'Cancelled\'.'),
-        'mail_auto_registr': fields.boolean('Mail Auto Register', readonly=False, states={'done': [('readonly', True)]}, help='Check this box if you want to use the automatic mailing for new registration'),
-        'mail_auto_confirm': fields.boolean('Mail Auto Confirm', readonly=False, states={'done': [('readonly', True)]}, help='Check this box if you want ot use the automatic confirmation emailing or the reminder'),
+        'mail_auto_registr': fields.boolean('Mail Auto Register', readonly=False, states={'done': [('readonly', True)]}, help='Check this box if you want to use automatic emailing for new registration.'),
+        'mail_auto_confirm': fields.boolean('Mail Auto Confirm', readonly=False, states={'done': [('readonly', True)]}, help='Check this box if you want to use automatic confirmation emailing or reminder.'),
         'mail_registr': fields.text('Registration Email', readonly=False, states={'done': [('readonly', True)]}, help='This email will be sent when someone subscribes to the event.'),
-        'mail_confirm': fields.text('Confirmation Email', readonly=False, states={'done': [('readonly', True)]}, help="This email will be sent when the event gets confimed or when someone subscribes to a confirmed event. This is also the email sent to remind someone about the event."),
+        'mail_confirm': fields.text('Confirmation Email', readonly=False, states={'done': [('readonly', True)]}, help="This email will be sent when the event gets confirmed or when someone subscribes to a confirmed event. This is also the email sent to remind someone about the event."),
         'product_id': fields.many2one('product.product', 'Product', required=True, readonly=True, states={'draft': [('readonly', False)]}, help="The invoices of this event registration will be created with this Product. Thus it allows you to set the default label and the accounting info you want by default on these invoices."),
         'note': fields.text('Notes', help="Description or Summary of Event", readonly=False, states={'done': [('readonly', True)]}),
         'pricelist_id': fields.many2one('product.pricelist', 'Pricelist', readonly=True, states={'draft': [('readonly', False)]}, help="Pricelist version for current event."),
-        'unit_price': fields.related('product_id', 'list_price', type='float', string='Registration Cost', readonly=True, states={'draft':[('readonly',False)]}, help="This will be the default price used as registration cost when invoicing this event. Note that you can specify for each registration a specific amount if you want to", digits_compute=dp.get_precision('Sale Price')),
-        'main_speaker_id': fields.many2one('res.partner','Main Speaker', readonly=False, states={'done': [('readonly', True)]}, help="Speaker who are giving speech on event."),
+        'unit_price': fields.related('product_id', 'list_price', type='float', string='Registration Cost', readonly=True, states={'draft':[('readonly',False)]}, help="This will be the default price used as registration cost when invoicing this event. Note that you can specify a specific amount for each registration.", digits_compute=dp.get_precision('Sale Price')),
+        'main_speaker_id': fields.many2one('res.partner','Main Speaker', readonly=False, states={'done': [('readonly', True)]}, help="Speaker who will be giving speech at the event."),
         'speaker_ids': fields.many2many('res.partner', 'event_speaker_rel', 'speaker_id', 'partner_id', 'Other Speakers', readonly=False, states={'done': [('readonly', True)]}),
         'address_id': fields.many2one('res.partner.address','Location Address', readonly=False, states={'done': [('readonly', True)]}),
         'speaker_confirmed': fields.boolean('Speaker Confirmed', readonly=False, states={'done': [('readonly', True)]}),

From aa8b62f489fea4b0c5a6f844cd8cd86559d030ae Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Fri, 15 Apr 2011 07:07:45 +0000
Subject: [PATCH 229/331] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20110415070745-6rqdci3o0g8qbti0
---
 addons/account/i18n/de.po                   |  10 +-
 addons/account/i18n/pt.po                   | 373 ++++++++--
 addons/account_analytic_analysis/i18n/pt.po |  29 +-
 addons/account_chart/i18n/pt.po             |  11 +-
 addons/account_invoice_layout/i18n/pt.po    |  11 +-
 addons/crm_fundraising/i18n/gl.po           | 785 ++++++++++++++++++++
 addons/hr_expense/i18n/ca.po                |  37 +-
 addons/hr_expense/i18n/es.po                |   6 +-
 addons/hr_payroll_account/i18n/ca.po        | 328 ++++++++
 addons/subscription/i18n/gl.po              | 341 +++++++++
 10 files changed, 1835 insertions(+), 96 deletions(-)
 create mode 100644 addons/crm_fundraising/i18n/gl.po
 create mode 100644 addons/hr_payroll_account/i18n/ca.po
 create mode 100644 addons/subscription/i18n/gl.po

diff --git a/addons/account/i18n/de.po b/addons/account/i18n/de.po
index 3ebb9dca2f5..9ec6d2c8e78 100644
--- a/addons/account/i18n/de.po
+++ b/addons/account/i18n/de.po
@@ -7,15 +7,15 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-01-19 12:00+0000\n"
+"PO-Revision-Date: 2011-04-14 05:09+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\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: 2011-01-25 06:17+0000\n"
-"X-Generator: Launchpad (build 12177)\n"
+"X-Launchpad-Export-Date: 2011-04-15 07:07+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -4630,7 +4630,7 @@ msgstr "Fehler"
 #: field:account.analytic.cost.ledger.journal.report,date2:0
 #: field:account.analytic.inverted.balance,date2:0
 msgid "End of period"
-msgstr "Ende der Periode"
+msgstr "Ende Periode"
 
 #. module: account
 #: view:res.partner:0
@@ -9782,7 +9782,7 @@ msgstr "Rechnungspositionen"
 #: field:account.report.general.ledger,period_to:0
 #: field:account.vat.declaration,period_to:0
 msgid "End period"
-msgstr "Ende der Periode"
+msgstr "Ende Periode"
 
 #. module: account
 #: code:addons/account/account_move_line.py:738
diff --git a/addons/account/i18n/pt.po b/addons/account/i18n/pt.po
index b9d529db049..6ab960c97c7 100644
--- a/addons/account/i18n/pt.po
+++ b/addons/account/i18n/pt.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-04-11 16:08+0000\n"
+"PO-Revision-Date: 2011-04-14 10:50+0000\n"
 "Last-Translator: António Anacleto (www.biztek.cv) "
 "<antonio.anacleto@biztek.cv>\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: 2011-04-12 06:06+0000\n"
+"X-Launchpad-Export-Date: 2011-04-15 07:07+0000\n"
 "X-Generator: Launchpad (build 12735)\n"
 
 #. module: account
@@ -691,7 +691,7 @@ msgstr "Fechar periodo"
 #. module: account
 #: model:ir.model,name:account.model_account_common_partner_report
 msgid "Account Common Partner Report"
-msgstr ""
+msgstr "Relatório Comum de Conta de Terceiro"
 
 #. module: account
 #: field:account.fiscalyear.close,period_id:0
@@ -1733,7 +1733,7 @@ msgstr "Tem que fornecer uma conta para o fecho do movimento!"
 #. module: account
 #: model:ir.model,name:account.model_account_common_journal_report
 msgid "Account Common Journal Report"
-msgstr ""
+msgstr "Relatório de Diário de Contas Comum"
 
 #. module: account
 #: selection:account.partner.balance,display_partner:0
@@ -1891,7 +1891,7 @@ msgstr "Válido"
 #: model:ir.actions.act_window,name:account.action_account_print_journal
 #: model:ir.model,name:account.model_account_print_journal
 msgid "Account Print Journal"
-msgstr ""
+msgstr "Imprimir Diário de Contas"
 
 #. module: account
 #: model:ir.model,name:account.model_product_category
@@ -2355,6 +2355,12 @@ msgid ""
 "useful because it enables you to preview at any time the tax that you owe at "
 "the start and end of the month or quarter."
 msgstr ""
+"Este menu imprime a declaração de IVA baseada em facturas ou pagamentos. "
+"Seleccione um ou vários períodos do ano fiscal. A informação requerida para "
+"uma declaração de impostos é automaticamente gerada pelo OpenERP a partir de "
+"facturas (ou pagamentos, em alguns países). Estes dados são actualizados em "
+"tempo real. Isto é muito útil porque permite pré-visualizar a qualquer "
+"momento o imposto em divida no inicio e fim do mês ou trimestre."
 
 #. module: account
 #: selection:account.move.line,centralisation:0
@@ -2624,6 +2630,11 @@ msgid ""
 "Note that journal entries that are automatically created by the system are "
 "always skipping that state."
 msgstr ""
+"Marque esta caixa se não pretende que os novos movimentos do diário passem "
+"através do estado \"rascunho\" e vão directamente para o estado "
+"\"Publicado\" sem qualquer validação manual.\n"
+"Note que os movimentos do diário que são automaticamente criados pelo "
+"sistema também ignoram este estado."
 
 #. module: account
 #: model:ir.actions.server,name:account.ir_actions_server_action_wizard_multi_chart
@@ -3041,6 +3052,14 @@ msgid ""
 " 'Unreconciled' will copy only the journal items that were unreconciled on "
 "the first day of the new fiscal year."
 msgstr ""
+"Defina aqui o método que será utilizado para gerar os movimentos do diário "
+"de encerramento de ano para todas as contas deste tipo.\n"
+"\"Nenhum\" significa que nada será feito.\n"
+"\"Saldo\" será habitualmente utilizado para contas de dinheiro.\n"
+"\"Detalhe\" irá copiar cada item de diário do ano anterior, mesmo os "
+"reconciliados.\n"
+"\"Não Reconciliados\" copiará somente os itens de diário que estejam "
+"reconciliados no primeiro dia do novo ano fiscal."
 
 #. module: account
 #: view:account.tax:0
@@ -3445,6 +3464,9 @@ msgid ""
 "based on partner payment term!\n"
 "Please define partner on it!"
 msgstr ""
+"A data de maturidade da linha de movimento gerada pela linha de modelo "
+"\"%s\" do modelo \"%s\" é baseado no termo de pagamento do terceiro!\n"
+"Por favor defina o terceira na mesma!"
 
 #. module: account
 #: code:addons/account/account_move_line.py:810
@@ -3696,6 +3718,10 @@ msgid ""
 "debit/credit accounts, of type 'situation' and with a centralized "
 "counterpart."
 msgstr ""
+"A melhor prática aqui é utilizar um diário dedicado para conter os "
+"movimentos de abertura de todos os anos fiscais. Note que deve defini-lo com "
+"contas por defeito a crédito e a débito, do tipo \"situação\" e com "
+"contrapartida centralizada."
 
 #. module: account
 #: view:account.installer:0
@@ -3740,6 +3766,10 @@ msgid ""
 "customer as well as payment delays. The tool search can also be used to "
 "personalise your Invoices reports and so, match this analysis to your needs."
 msgstr ""
+"A partir deste relatório, pode ter uma visualização do montante facturado ao "
+"seu cliente tal como detalhes de pagamento. A ferramenta de pesquisa também "
+"pode ser utilizada para personalizar os seus relatórios de facturação e "
+"assim corresponder esta análise ás suas necessidades."
 
 #. module: account
 #: view:account.invoice.confirm:0
@@ -3934,7 +3964,7 @@ msgstr "Nota"
 #. module: account
 #: view:account.analytic.account:0
 msgid "Overdue Account"
-msgstr ""
+msgstr "Conta Vencida"
 
 #. module: account
 #: selection:account.invoice,state:0
@@ -3961,6 +3991,11 @@ msgid ""
 "the system on document validation (invoices, bank statements...) and will be "
 "created in 'Posted' state."
 msgstr ""
+"Qualquer novo movimento de diário criado manualmente está habitualmente no "
+"estado \"Não Publicado\", mas pode definir a opção de ignorar este estado no "
+"diário relacionado. Nesse caso, estes comportam-se como movimentos de diário "
+"criados automaticamente pelo sistema na validação de documentos (facturas, "
+"extractos bancários...) e serão criados no estado \"Publicado\"."
 
 #. module: account
 #: code:addons/account/account_analytic_line.py:91
@@ -4051,6 +4086,9 @@ msgid ""
 "When new move line is created the state will be 'Draft'.\n"
 "* When all the payments are done it will be in 'Valid' state."
 msgstr ""
+"Quando uma nova linha de movimento é criada o estado será \"Rascunho\".\n"
+"* Quando todos os pagamentos estiverem efectuados  estará no estado "
+"\"Valido\"."
 
 #. module: account
 #: field:account.journal,view_id:0
@@ -4329,6 +4367,9 @@ msgid ""
 "the account \"%s - %s\". Clear the secondary currency field of the account "
 "definition if you want to accept all currencies."
 msgstr ""
+"Não é possível criar um movimento com divisa diferente da divisa secundária "
+"da conta \"%s - %s\". Limpe o campo da divisa secundária da definição de "
+"conta se deseja aceitar todas as divisas."
 
 #. module: account
 #: field:account.invoice.refund,date:0
@@ -5008,7 +5049,7 @@ msgstr ""
 #. module: account
 #: model:ir.model,name:account.model_account_common_account_report
 msgid "Account Common Account Report"
-msgstr ""
+msgstr "Relatório de Contas Comum"
 
 #. module: account
 #: field:account.bank.statement.line,name:0
@@ -5072,6 +5113,9 @@ msgid ""
 "something to reconcile or not. This figure already count the current partner "
 "as reconciled."
 msgstr ""
+"Estes são os terceiros remanescentes para os quais deve verificar se existe "
+"algo a reconciliar ou não. Este valor já conta com o terceiro actual como "
+"reconciliado."
 
 #. module: account
 #: view:account.subscription.line:0
@@ -5129,6 +5173,8 @@ msgid ""
 "According value related accounts will be display on respective reports "
 "(Balance Sheet Profit & Loss Account)"
 msgstr ""
+"Segundo o valor das contas relacionadas será apresentado nos respectivos "
+"relatórios (Balanço, Demonstração de Resultados)"
 
 #. module: account
 #: field:account.report.general.ledger,sortby:0
@@ -5142,6 +5188,8 @@ msgid ""
 "There is no default default credit account defined \n"
 "on journal \"%s\""
 msgstr ""
+"Não existe conta de crédito predefinida\n"
+"no diário \"%s\""
 
 #. module: account
 #: field:account.entries.report,amount_currency:0
@@ -5196,6 +5244,8 @@ msgid ""
 "Number of partial amounts that can be combined to find a balance point can "
 "be chosen as the power of the automatic reconciliation"
 msgstr ""
+"Numero de montantes parciais que podem ser combinados para encontrar um "
+"saldo podem ser escolhidos com o poder da reconciliação automática"
 
 #. module: account
 #: help:account.payment.term.line,sequence:0
@@ -5227,6 +5277,10 @@ msgid ""
 "impossible any new entry record. Close a fiscal year when you need to "
 "finalize your end of year results definitive "
 msgstr ""
+"Se nenhum movimento adicional deverá ser registado no ano fiscal, pode "
+"encerra-lo aqui. Fechará todos os períodos abertos neste ano, o que tornará "
+"impossível o registo de novos movimentos. Feche um ano fiscal quando "
+"necessitar de finalizar os seus resultados de fim de ano definitivamente. "
 
 #. module: account
 #: field:account.central.journal,amount_currency:0
@@ -6227,6 +6281,13 @@ msgid ""
 "account. From this view, you can create and manage the account types you "
 "need for your company."
 msgstr ""
+"Um tipo de conta é utilizado para determinar como uma conta é utilizada em "
+"cada diário. O método de diferimento de um tipo de conta determina o "
+"processo para o encerramento anual. Relatórios como o Balanço e a "
+"Demonstração de resultados utilizam a categoria (Receitas/Gastos ou "
+"Balanço). Por exemplo, o tipo de conta pode estar ligado a uma conta de "
+"activo, despesa, a pagar. Desta vista pode criar e gerir tipos de conta que "
+"necessite para a sua empresa."
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_bank_reconcile_tree
@@ -6382,6 +6443,11 @@ msgid ""
 "reconcile in a series of accounts. It finds entries for each partner where "
 "the amounts correspond."
 msgstr ""
+"Para que uma factura seja considerada paga, os movimentos da factura devem "
+"ser reconciliados com contrapartidas, habitualmente pagamentos. Com a "
+"funcionalidade de reconciliação automática o OpenERP faz a sua própria "
+"pesquisa para movimentos a reconciliar em séries de contas. Encontra "
+"movimentos para cada terceiro onde os montantes correspondam."
 
 #. module: account
 #: view:account.move:0
@@ -6552,6 +6618,14 @@ msgid ""
 "\n"
 "e.g. My model on %(date)s"
 msgstr ""
+"Pode especificar ano, mês e data em nome do modelo utilizando as seguintes "
+"etiquetas:\n"
+"\n"
+"%(year)s: Para Especificar Ano\n"
+"%(month)s: Para Especificar Mês\n"
+"%(date)s: Para Especificar Data Actual\n"
+"\n"
+"Ex. Meu modelo em %(date)s"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_aged_income
@@ -6621,6 +6695,12 @@ msgid ""
 "you request an interval of 30 days OpenERP generates an analysis of "
 "creditors for the past month, past two months, and so on. "
 msgstr ""
+"Balancete de terceiros por antiguidade é um relatório mais detalhado dos "
+"seus valores a receber por intervalos. Quando abre este relatório o OpenERP "
+"pergunta o nome da empresa, o período fiscal e o intervalo a ser analisado "
+"(em dias). O OpenERP calcula a tabela de saldo credor por período. Então se "
+"requisitar um intervalo de 30 dias o OpenERP gera uma análise de credores "
+"para o mês passado, passados 2 meses e por ai adiante. "
 
 #. module: account
 #: field:account.invoice,origin:0
@@ -6666,6 +6746,10 @@ msgid ""
 "an agreement with a customer or a supplier. With Define Recurring Entries, "
 "you can create such entries to automate the postings in the system."
 msgstr ""
+"Um movimento recorrente é uma movimento misto que ocorre numa base "
+"periódica, ex. correspondendo á assinatura de um contracto ou um acordo com "
+"um cliente ou um fornecedor. Com a definição de Movimentos Recorrentes, pode "
+"gerar estes movimentos para automatizar as publicações no sistema."
 
 #. module: account
 #: field:account.entries.report,product_uom_id:0
@@ -6682,6 +6766,11 @@ msgid ""
 "basis. You can enter the coins that are in your cash box, and then post "
 "entries when money comes in or goes out of the cash box."
 msgstr ""
+"Um registador de dinheiro permite gerir movimentos de dinheiro nos seus "
+"diários de dinheiro. Esta funcionalidade proporciona uma forma fácil de "
+"acompanhar pagamentos a dinheiro numa base diária. Pode introduzir as moedas "
+"que estão na sua caixa e depois publicar movimentos quando o dinheiro entra "
+"ou sai da caixa."
 
 #. module: account
 #: selection:account.automatic.reconcile,power:0
@@ -6722,6 +6811,12 @@ msgid ""
 "Most of the OpenERP operations (invoices, timesheets, expenses, etc) "
 "generate analytic entries on the related account."
 msgstr ""
+"O plano de contas normal tem uma estrutura definida pelo requerimentos "
+"legais do pais. A estrutura do plano analítico deve reflectir as "
+"necessidades próprias do negócio em termos de relatório de  gastos/receitas. "
+"Estas estão habitualmente estruturadas por contractos, projectos, produtos "
+"ou departamentos. A maioria das operações (Facturas, Horários, Despesas, "
+"etc) geram movimentos analíticos na conta relacionada."
 
 #. module: account
 #: field:account.analytic.journal,line_ids:0
@@ -6802,6 +6897,25 @@ msgid ""
 "module named account_voucher.\n"
 "    "
 msgstr ""
+"Módulo financeiro e contabilístico que cobre:\n"
+"    Contabilidade Geral\n"
+"    Contabilidade de Custos / Analítica\n"
+"    Contabilidade de Terceiros\n"
+"    Gestão de Impostos\n"
+"    Orçamentos\n"
+"    Facturas de Clientes e Fornecedores\n"
+"    Extractos Bancários\n"
+"    Processo de reconciliação por terceiro\n"
+"    Cria um painel para contabilistas que inclui:\n"
+"    *Lista de cotações não facturadas\n"
+"    *Gráfico de valores a receber por antiguidade\n"
+"    *Gráfico de receitas por antiguidade\n"
+"\n"
+"Processos como manter um balancete geral são feitos através de diários "
+"financeiros definidos (linha de movimento ou agrupamento é mantido através "
+"de diários) para um ano financeiro particular e para preparação de vales "
+"existe um módulo chamado account_voucher.\n"
+"    "
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_journal_period_tree
@@ -6809,6 +6923,9 @@ msgid ""
 "You can search for individual account entries through useful information. To "
 "search for account entries, open a journal, then select a record line."
 msgstr ""
+"Pode pesquisar por movimentos de conta individuais através de informação "
+"útil. Para pesquisar por movimentos de conta, abra um diário, depois "
+"seleccione uma linha de registo."
 
 #. module: account
 #: report:account.invoice:0
@@ -6893,6 +7010,8 @@ msgid ""
 "Bank Account Number, Company bank account if Invoice is customer or supplier "
 "refund, otherwise Partner bank account number."
 msgstr ""
+"Numero de conta bancária, conta bancária da empresa se for uma devolução de "
+"cliente ou a fornecedor, de outra forma numero de conta bancária do terceiro."
 
 #. module: account
 #: help:account.tax,domain:0
@@ -6953,6 +7072,9 @@ msgid ""
 "the system to go through the reconciliation process, based on the latest day "
 "it have been reconciled."
 msgstr ""
+"Este campo mostra o terceiro seguinte que será automaticamente escolhido "
+"pelo sistema para o processo de reconciliação, baseado no ultimo dia em que "
+"foi reconciliado."
 
 #. module: account
 #: field:account.move.line.reconcile.writeoff,comment:0
@@ -6978,6 +7100,11 @@ msgid ""
 "line of the expense account, OpenERP will propose to you automatically the "
 "Tax related to this account and the counter-part \"Account Payable\"."
 msgstr ""
+"Esta vista é utilizada por contabilistas para registar movimentos em massa "
+"no OpenERP. Se desejar registar uma factura de fornecedor, comece por "
+"registar a linha da conta de despesas, O OpenERP irá propor automáticamente "
+"a conta de impostos relacionada com esta conta e a contrapartida \"Conta a "
+"pagar\"."
 
 #. module: account
 #: help:res.company,property_reserve_and_surplus_account:0
@@ -6986,6 +7113,9 @@ msgid ""
 "will be added, Loss : Amount will be deducted.), Which is calculated from "
 "Profit & Loss Report"
 msgstr ""
+"Esta conta é utilizada para transferir Receitas/Gastos(Se é Receitas: "
+"Montante a ser adicionado, Gastos: Montante a ser deduzido.),O que será "
+"calculado a partir do relatório de Receitas & Gastos"
 
 #. module: account
 #: view:account.invoice.line:0
@@ -7012,7 +7142,7 @@ msgstr "Definir relatórios"
 #: code:addons/account/account_cash_statement.py:249
 #, python-format
 msgid "You can not have two open register for the same journal"
-msgstr ""
+msgstr "Não pode ter dois registos abertos para o mesmo diário"
 
 #. module: account
 #: view:account.payment.term.line:0
@@ -7034,6 +7164,13 @@ msgid ""
 "Situation' to be used at the time of new fiscal year creation or end of year "
 "entries generation."
 msgstr ""
+"Seleccione \"Vendas\" para o diário de vendas a ser utilizado no momento do "
+"lançamento da factura. Seleccione \"Compras\" Para o diário de compras a ser "
+"utilizado no momento da aprovação da ordem de compra. Seleccione "
+"\"Dinheiro\" para ser utilizado no momento de efectuar pagamentos. "
+"Seleccione \"Geral\" para outras operações. Seleccione \"Situação "
+"Abertura/Encerramento\" a ser utilizado na abertura e encerramento de anos "
+"fiscais."
 
 #. module: account
 #: report:account.invoice:0
@@ -7093,6 +7230,8 @@ msgid ""
 "This field is used for payable and receivable journal entries. You can put "
 "the limit date for the payment of this line."
 msgstr ""
+"Este campo é utilizado para movimentos de diário a pagar ou a receber. Pode "
+"pôr a data limite para o pagamento desta linha."
 
 #. module: account
 #: code:addons/account/account_move_line.py:1271
@@ -7276,6 +7415,11 @@ msgid ""
 "in which they will appear. Then you can create a new journal and link your "
 "view to it."
 msgstr ""
+"Aqui é possível customizar uma vista de  diário existente ou criar uma nova "
+"vista. Vistas de diário determinam a forma de registar movimentos no diário. "
+"Seleccione os campos que deseja que apareçam no diário e determine a "
+"sequência em que devem aparecer. De seguida pode criar um novo diário e "
+"ligar a vista ao mesmo."
 
 #. module: account
 #: view:account.payment.term.line:0
@@ -7338,7 +7482,7 @@ msgstr ""
 #. module: account
 #: model:ir.model,name:account.model_account_cashbox_line
 msgid "CashBox Line"
-msgstr ""
+msgstr "Linha de Folha de Caixa"
 
 #. module: account
 #: view:account.partner.ledger:0
@@ -7519,6 +7663,8 @@ msgid ""
 "When monthly periods are created. The state is 'Draft'. At the end of "
 "monthly period it is in 'Done' state."
 msgstr ""
+"Quando são criados períodos mensais, o estado é \"Rascunho\". No fim do "
+"período mensal está no estado \"Finalizado\"."
 
 #. module: account
 #: report:account.analytic.account.inverted.balance:0
@@ -7609,7 +7755,7 @@ msgstr "Proforma"
 #. module: account
 #: report:account.analytic.account.cost_ledger:0
 msgid "J.C. /Move name"
-msgstr ""
+msgstr "J.C./Nome de movimento"
 
 #. module: account
 #: model:ir.model,name:account.model_account_open_closed_fiscalyear
@@ -7713,7 +7859,7 @@ msgstr "Modelos de Posição Fiscal"
 #. module: account
 #: view:account.entries.report:0
 msgid "Int.Type"
-msgstr ""
+msgstr "Tipo de int."
 
 #. module: account
 #: field:account.move.line,tax_amount:0
@@ -7728,6 +7874,10 @@ msgid ""
 "can easily generate refunds and reconcile them directly from the invoice "
 "form."
 msgstr ""
+"Com Devoluções de Clientes pode gerir as notas de crédito para os seus "
+"clientes. Uma devolução é um documento que credita uma factura completa ou "
+"parcialmente. Pode facilmente gerar devoluções e reconcilia-las directamente "
+"a partir do formulário da factura."
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_vat_declaration
@@ -7739,6 +7889,12 @@ msgid ""
 "useful because it enables you to preview at any time the tax that you owe at "
 "the start and end of the month or quarter."
 msgstr ""
+"Este menu imprime uma declaração de IVA baseada em facturas ou pagamentos. "
+"Pode seleccionar um ou vários períodos do ano fiscal. A informação requerida "
+"para a declaração de impostos é automaticamente gerada pelo OpenERP a partir "
+"das facturas ( ou pagamentos, em certos países). Estes dados são "
+"actualizados em tempo real. Isto é muito útil porque permite pré-visualizar "
+"a qualquer momento o imposto que deve no inicio e no fim do mês ou trimestre."
 
 #. module: account
 #: report:account.invoice:0
@@ -7771,6 +7927,9 @@ msgid ""
 "added, Loss: Amount will be duducted), which is calculated from Profilt & "
 "Loss Report"
 msgstr ""
+"Esta conta é utilizada para transferir Receitas/Gastos (Receitas: Montante "
+"que será adicionado, Gastos: Montante que será deduzido), que será calculado "
+"a partir do relatório de Receitas/Gastos"
 
 #. module: account
 #: help:account.move.line,blocked:0
@@ -7778,6 +7937,8 @@ msgid ""
 "You can check this box to mark this journal item as a litigation with the "
 "associated partner"
 msgstr ""
+"Pode marcar esta caixa para definir este item de diário como um litígio com "
+"o terceiro associado"
 
 #. module: account
 #: field:account.move.line,reconcile_partial_id:0
@@ -7788,17 +7949,17 @@ msgstr "Reconciliação parcial"
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_inverted_balance
 msgid "Account Analytic Inverted Balance"
-msgstr ""
+msgstr "Saldo Invertido da conta analitica"
 
 #. module: account
 #: model:ir.model,name:account.model_account_common_report
 msgid "Account Common Report"
-msgstr ""
+msgstr "Relatório Comum de Conta"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_filestatement0
 msgid "Automatic import of the bank sta"
-msgstr ""
+msgstr "Importação automática do extracto bancário"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_journal_view
@@ -7809,7 +7970,7 @@ msgstr "Vistas de diários"
 #. module: account
 #: model:ir.model,name:account.model_account_move_bank_reconcile
 msgid "Move bank reconcile"
-msgstr ""
+msgstr "Reconciliação de movimento bancário"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_type_form
@@ -7826,7 +7987,7 @@ msgstr "Não é possível criar movimentos na factura do diário centralizado"
 #. module: account
 #: field:account.account.type,report_type:0
 msgid "P&L / BS Category"
-msgstr ""
+msgstr "P&L / Categoria BS"
 
 #. module: account
 #: view:account.automatic.reconcile:0
@@ -7880,6 +8041,10 @@ msgid ""
 "sales orders or deliveries. You should only confirm them before sending them "
 "to your customers."
 msgstr ""
+"Com Facturas a Clientes pode criar e gerir facturas de vendas para os seus "
+"clientes. O OpenERP pode também gerar facturas rascunho automaticamente a "
+"partir de ordens de venda ou entregas. Deve somente confirma-las antes de as "
+"enviar aos seus clientes."
 
 #. module: account
 #: view:account.entries.report:0
@@ -7932,7 +8097,7 @@ msgstr "Imprimir declaração de impostos"
 #. module: account
 #: view:account.model.line:0
 msgid "Journal Entry Model Line"
-msgstr ""
+msgstr "Linha de Modelo de movimento de diário"
 
 #. module: account
 #: view:account.invoice:0
@@ -7972,6 +8137,8 @@ msgid ""
 "The residual amount on a receivable or payable of a journal entry expressed "
 "in the company currency."
 msgstr ""
+"O montante residual num documento a receber ou a pagar de um movimento de "
+"diário expresso na divisa da empresa."
 
 #. module: account
 #: view:account.payment.term.line:0
@@ -8052,7 +8219,7 @@ msgstr "Montante total que você tera que pagar a este fornecedor"
 #: model:process.node,name:account.process_node_analytic0
 #: model:process.node,name:account.process_node_analyticcost0
 msgid "Analytic Costs"
-msgstr ""
+msgstr "Custos Analíticos"
 
 #. module: account
 #: field:account.analytic.journal,name:0
@@ -8074,7 +8241,7 @@ msgstr ""
 msgid ""
 "The amount of the voucher must be the same amount as the one on the "
 "statement line"
-msgstr ""
+msgstr "O montante do vale deve ser o mesmo que o da linha do estracto"
 
 #. module: account
 #: code:addons/account/account_move_line.py:1131
@@ -8086,13 +8253,13 @@ msgstr "Má Conta!"
 #. module: account
 #: help:account.chart,fiscalyear:0
 msgid "Keep empty for all open fiscal years"
-msgstr ""
+msgstr "Manter vazio para todos os anos fiscais abertos"
 
 #. module: account
 #: code:addons/account/account_move_line.py:1056
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed!"
-msgstr ""
+msgstr "O movimento de conta (%s) para centralização foi confirmado!"
 
 #. module: account
 #: help:account.move.line,amount_currency:0
@@ -8133,11 +8300,13 @@ msgstr "Moeda"
 msgid ""
 "Gives the sequence order when displaying a list of bank statement lines."
 msgstr ""
+"Dá a ordem de sequência quando exibe a lista de linhas de extracto bancário."
 
 #. module: account
 #: model:process.transition,note:account.process_transition_validentries0
 msgid "Accountant validates the accounting entries coming from the invoice."
 msgstr ""
+"O(A) contabilista valida os movimentos contabilísticos que vem da factura."
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_fiscalyear_form
@@ -8150,6 +8319,13 @@ msgid ""
 "would be referred to as FY 2011. You are not obliged to follow the actual "
 "calendar year."
 msgstr ""
+"Defina o ano financeiro da sue empresa de acordo com as suas necessidades. "
+"Um ano financeiro é um período ao fim do qual as contas da empresa são "
+"compostas (habitualmente 12 meses). O ano financeiro é habitualmente "
+"referido pela data no qual termina. Por exemplo, se o ano financeiro da "
+"empresa termina em 30 de Novembro de 2011 então tudo entre 1 Dezembro 2010 e "
+"30 de Novembro de 2011 será referido como FY 2011. Não é obrigatório seguir "
+"o ano do calendário."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_acount_move_line_reconcile_open
@@ -8173,6 +8349,14 @@ msgid ""
 "* The 'Paid' state is set automatically when invoice is paid.            \n"
 "* The 'Cancelled' state is used when user cancel invoice."
 msgstr ""
+" * O estado \"Rascunho\" é utilizado quando o utilizador lança uma factura "
+"nova e não confirmada.\n"
+"* \"Pro-Forma\" quando a factura está no estado Pro-forma, a factura não tem "
+"um numero atribuido.\n"
+"* \"Em Aberto\" é utilizado quando o utilizador cria a factura, o número da "
+"factura é gerado. Fica em Aberto até o utilizador pagar a factura.\n"
+"* O estado \"Pago \" é definido automaticamente quando a factura é paga.\n"
+"* \"Cancelado\" é utilizado quando o utilizador cancela a factura."
 
 #. module: account
 #: field:account.invoice.refund,period:0
@@ -8182,7 +8366,7 @@ msgstr "Forçar período"
 #. module: account
 #: model:ir.model,name:account.model_account_partner_balance
 msgid "Print Account Partner Balance"
-msgstr ""
+msgstr "Imprima o Saldo de Conta do Terceiro"
 
 #. module: account
 #: field:res.partner,contract_ids:0
@@ -8213,6 +8397,9 @@ msgid ""
 "will be added, Loss: Amount will be deducted.), Which is calculated from "
 "Profilt & Loss Report"
 msgstr ""
+"Esta conta é utilizada para transferir Receitas/Gastos (Se é Receita: O "
+"montante será adicionado, Gasto: O montante será deduzido), O que é "
+"calculado a partir do relatório de Receitas & Despesas"
 
 #. module: account
 #: field:account.invoice,reference_type:0
@@ -8222,7 +8409,7 @@ msgstr "Tipo de referência"
 #. module: account
 #: view:account.analytic.cost.ledger.journal.report:0
 msgid "Cost Ledger for period"
-msgstr ""
+msgstr "Balancete de Custos para o período"
 
 #. module: account
 #: help:account.tax,child_depend:0
@@ -8237,7 +8424,7 @@ msgstr ""
 #. module: account
 #: selection:account.tax,applicable_type:0
 msgid "Given by Python Code"
-msgstr ""
+msgstr "Dado por Código Python"
 
 #. module: account
 #: field:account.analytic.journal,code:0
@@ -8251,6 +8438,9 @@ msgid ""
 "the amount of this case into its parent. For example, set 1/-1 if you want "
 "to add/substract it."
 msgstr ""
+"Pode especificar aqui o coeficiente que será utilizado quando consolidando o "
+"montante deste caso no seu ascendente. Por exemplo, defina 1/-1 se quer "
+"adicionar/subtrai-lo."
 
 #. module: account
 #: view:account.invoice:0
@@ -8297,6 +8487,8 @@ msgid ""
 "You cannot modify company of this period as its related record exist in "
 "Entry Lines"
 msgstr ""
+"Não é possível modificar a empresa deste período porque o seu registo "
+"relacionado existe nas linhas de movimento"
 
 #. module: account
 #: view:account.move:0
@@ -8313,7 +8505,7 @@ msgstr "Pagamento registado"
 #. module: account
 #: view:account.fiscalyear.close.state:0
 msgid "Close states of Fiscal year and periods"
-msgstr ""
+msgstr "Feche os estados do Ano fiscal e períodos"
 
 #. module: account
 #: view:account.analytic.line:0
@@ -8353,14 +8545,14 @@ msgstr "Caro Sr./Sra."
 #. module: account
 #: view:account.installer.modules:0
 msgid "Configure Your Accounting Application"
-msgstr ""
+msgstr "Configure a Sua Aplicação de Contabilidade"
 
 #. module: account
 #: code:addons/account/account.py:2820
 #: code:addons/account/installer.py:479
 #, python-format
 msgid "SCNJ"
-msgstr ""
+msgstr "SCNJ"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_analyticinvoice0
@@ -8368,6 +8560,8 @@ msgid ""
 "Analytic costs (timesheets, some purchased products, ...) come from analytic "
 "accounts. These generate draft invoices."
 msgstr ""
+"Custos analíticos (horários, alguns produtos comprados, ...) vem das contas "
+"analíticas. Estas geram facturas rascunho."
 
 #. module: account
 #: help:account.journal,view_id:0
@@ -8377,6 +8571,10 @@ msgid ""
 "in which order. You can create your own view for a faster encoding in each "
 "journal."
 msgstr ""
+"Dá a vista utilizada quando se escreve ou navega nos movimentos neste "
+"diário. A vista diz ao OpenERP que campos devem ser visíveis, requeridos ou "
+"só de leitura e em que ordem. Pode criar a sua própria vista para mais "
+"rapidamente fazer lançamentos em cada diário."
 
 #. module: account
 #: field:account.period,date_stop:0
@@ -8387,7 +8585,7 @@ msgstr "Fim do período"
 #. module: account
 #: field:account.installer.modules,account_followup:0
 msgid "Followups Management"
-msgstr ""
+msgstr "Gestão de Seguimento de dividas"
 
 #. module: account
 #: report:account.account.balance:0
@@ -8406,7 +8604,7 @@ msgstr "Início do período"
 #: code:addons/account/account.py:2333
 #, python-format
 msgid "Cannot locate parent code for template account!"
-msgstr ""
+msgstr "Não é possível localizar o código ascendente para conta modelo!"
 
 #. module: account
 #: field:account.aged.trial.balance,direction_selection:0
@@ -8438,6 +8636,7 @@ msgstr "Crédito total"
 #: model:process.transition,note:account.process_transition_suppliervalidentries0
 msgid "Accountant validates the accounting entries coming from the invoice. "
 msgstr ""
+"O(A) contabilista valida os movimentos contabilísticos que vem da factura. "
 
 #. module: account
 #: code:addons/account/invoice.py:1008
@@ -8483,6 +8682,10 @@ msgid ""
 "partially. You can easily generate refunds and reconcile them directly from "
 "the invoice form."
 msgstr ""
+"Com Devoluções a Fornecedores pode gerir as notas de crédito que recebe dos "
+"seus fornecedores. Uma devolução é um documento que credito a factura "
+"completa ou parcialmente. ode facilmente gerar devoluções e reconcilia-las "
+"directamente a partir do formulário da factura."
 
 #. module: account
 #: view:account.account.template:0
@@ -8497,7 +8700,7 @@ msgstr "Particulares"
 #. module: account
 #: selection:account.account.type,report_type:0
 msgid "Profit & Loss (Income Accounts)"
-msgstr ""
+msgstr "Receitas & Gastos (Contas de Entradas)"
 
 #. module: account
 #: view:account.tax:0
@@ -8533,7 +8736,7 @@ msgstr "Saldo"
 #. module: account
 #: model:process.node,note:account.process_node_supplierbankstatement0
 msgid "Manually or automatically entered in the system"
-msgstr ""
+msgstr "Introduzidos manualmente ou automaticamente no sistema"
 
 #. module: account
 #: report:account.account.balance:0
@@ -8561,6 +8764,8 @@ msgid ""
 "This report is analysis by partner. It is a PDF report containing one line "
 "per partner representing the cumulative credit balance."
 msgstr ""
+"Este relatório é uma análise por terceiro. É um relatório PDF contendo uma "
+"linha por terceiro representando o saldo crédor acumulado."
 
 #. module: account
 #: selection:account.account,type:0
@@ -8596,12 +8801,17 @@ msgid ""
 "the income account. OpenERP will propose to you automatically the Tax "
 "related to this account and the counter-part \"Account receivable\"."
 msgstr ""
+"Esta vista é utilizada por contabilistas para registar movimentos em massa "
+"no OpenERP. Se que registar uma factura de cliente, seleccione o diário e o "
+"período na barra de pesquisa, Depois, comesse por registar a linha de "
+"movimento da conta de entradas, O OpenERP proporá automaticamente o imposto "
+"relacionado e a contrapartida \"Conta a receber\"."
 
 #. module: account
 #: code:addons/account/account_bank_statement.py:391
 #, python-format
 msgid "Cannot delete bank statement(s) which are already confirmed !"
-msgstr ""
+msgstr "Não é possível remover extractos bancários confirmados !"
 
 #. module: account
 #: code:addons/account/wizard/account_automatic_reconcile.py:152
@@ -8618,6 +8828,8 @@ msgstr "Saldo por tipo de conta"
 #: model:process.transition,note:account.process_transition_entriesreconcile0
 msgid "Accounting entries are the first input of the reconciliation."
 msgstr ""
+"Os movimentos contabilísticos são os primeiros a ser introduzidos para uma "
+"reconciliação."
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_period_form
@@ -8629,6 +8841,12 @@ msgid ""
 "closed or left open depending on your company's activities over a specific "
 "period."
 msgstr ""
+"Aqui é possível definir um período financeiro, um intervalo de tempo no ano "
+"financeiro da empresa, Um período contabilístico é tipicamente um mês ou um "
+"trimestre. Habitualmente corresponde aos períodos da declaração de impostos. "
+"Pode criar e gerir períodos a partir daqui e decidir se um período deve ser "
+"encerrado ou deixado em aberto dependendo das actividades da sua empresa num "
+"determinado período."
 
 #. module: account
 #: report:account.move.voucher:0
@@ -8666,7 +8884,7 @@ msgstr "Não pode mudar o imposto, deve remover e recriar as linhas!"
 #. module: account
 #: report:account.central.journal:0
 msgid "A/C No."
-msgstr ""
+msgstr "Nº A/C"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_journal_2_account_bank_statement
@@ -8678,6 +8896,7 @@ msgstr "Extratos Bancários"
 msgid ""
 "Creates an account with the selected template under this existing parent."
 msgstr ""
+"Cria uma conta com o modelo seleccionado sob um determinado ascendente."
 
 #. module: account
 #: selection:account.model.line,date_maturity:0
@@ -8717,6 +8936,8 @@ msgid ""
 "The journal must have centralised counterpart without the Skipping draft "
 "state option checked!"
 msgstr ""
+"O diário deve ter uma contrapartida centralizada sem a opção de estado "
+"rascunho de expedição marcada!"
 
 #. module: account
 #: model:process.node,note:account.process_node_paymententries0
@@ -8875,6 +9096,15 @@ msgid ""
 "open period. Close a period when you do not want to record new entries and "
 "want to lock this period for tax related calculation."
 msgstr ""
+"Um período é um período fiscal de tempo durante o qual movimentos "
+"contabilísticos deve ser registados para actividades relacionadas com a "
+"contabilidade. Períodos mensais são o normal mês dependendo dos países e "
+"necessidades das empresas, deve também ter períodos trimestrais. Fechar um "
+"período fará com que não seja mais possível criar novos movimentos "
+"contabilísticos no mesmo, todos os novos movimentos devem então ser feitos "
+"no período aberto seguinte. Feche um período quando já não deseja registar "
+"novos movimentos e quer bloquear este período para cálculos relacionado com "
+"impostos."
 
 #. module: account
 #: view:account.analytic.account:0
@@ -8925,6 +9155,9 @@ msgid ""
 "Make sure you have configured Payment Term properly !\n"
 "It should contain atleast one Payment Term Line with type \"Balance\" !"
 msgstr ""
+"Não é possível validar um movimento não saldado!\n"
+"Garanta que configurou correctamente os termos de pagamento!\n"
+"Deverá conter pelo menos uma linha de termo de pagamento do tipo \"Saldo\"!"
 
 #. module: account
 #: help:res.partner,property_account_payable:0
@@ -8983,6 +9216,8 @@ msgid ""
 "created. If you leave that field empty, it will use the same journal as the "
 "current invoice."
 msgstr ""
+"Pode seleccionar aqui o diário a utilizar para a devolução que será criada. "
+"Se deixar em branco será utilizado o mesmo diário da actual factura."
 
 #. module: account
 #: report:account.move.voucher:0
@@ -8998,7 +9233,7 @@ msgstr "Diários genéricos"
 #. module: account
 #: view:account.model:0
 msgid "Journal Entry Model"
-msgstr ""
+msgstr "Modelo de Movimento de Diário"
 
 #. module: account
 #: code:addons/account/wizard/account_use_model.py:44
@@ -9008,6 +9243,9 @@ msgid ""
 "payment term!\n"
 "Please define partner on it!"
 msgstr ""
+"A data de maturidade da linha de movimento gerada pela linha de modelo '%s' "
+"é baseada no termo de pagamento do terceiro!\n"
+"Por favor defina o terceiro na mesma!"
 
 #. module: account
 #: field:account.cashbox.line,number:0
@@ -9135,6 +9373,9 @@ msgid ""
 "and is the process of transferring debit and credit amounts from a journal "
 "of original entry to a ledger book."
 msgstr ""
+"O processo de validação de movimentos de diário também é chamado de "
+"\"Publicação de Razão\" e é o processo de transferir os montantes a débito e "
+"a crédito do diário original para um livro do razão."
 
 #. module: account
 #: report:account.tax.code.entries:0
@@ -9157,6 +9398,8 @@ msgid ""
 "This report allows you to print or generate a pdf of your general ledger "
 "with details of all your account journals"
 msgstr ""
+"Este relatório permite imprimir ou gerar um PDF do balancete geral com "
+"detalhes de todos os diários contabilisticos"
 
 #. module: account
 #: selection:account.account,type:0
@@ -9293,7 +9536,7 @@ msgstr "JNRL"
 #. module: account
 #: view:account.payment.term.line:0
 msgid "  value amount: 0.02"
-msgstr ""
+msgstr "  montante: 0.02"
 
 #. module: account
 #: view:account.fiscalyear:0
@@ -9321,7 +9564,7 @@ msgstr "Total"
 #: code:addons/account/wizard/account_move_journal.py:97
 #, python-format
 msgid "Journal: All"
-msgstr ""
+msgstr "diário: Todos"
 
 #. module: account
 #: field:account.account,company_id:0
@@ -9361,7 +9604,7 @@ msgstr "Definir lançamentos recorrentes"
 #. module: account
 #: field:account.entries.report,date_maturity:0
 msgid "Date Maturity"
-msgstr ""
+msgstr "Data de Maturidade"
 
 #. module: account
 #: help:account.bank.statement,total_entry_encoding:0
@@ -9375,6 +9618,8 @@ msgid ""
 "reconciliation process today. The current partner is counted as already "
 "processed."
 msgstr ""
+"Este valor retrata o número total de terceiros que passaram através do "
+"processo de reconciliação hoje. O cliente actual conta como já processado."
 
 #. module: account
 #: view:account.fiscalyear:0
@@ -9384,12 +9629,12 @@ msgstr "Criar períodos mensais"
 #. module: account
 #: field:account.tax.code.template,sign:0
 msgid "Sign For Parent"
-msgstr ""
+msgstr "Inscreva-se para o ascendente"
 
 #. module: account
 #: model:ir.model,name:account.model_account_balance_report
 msgid "Trial Balance Report"
-msgstr ""
+msgstr "Relatório de Balancete de Verificação"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_bank_statement_draft_tree
@@ -9401,6 +9646,8 @@ msgstr "Declarações em rascunho"
 msgid ""
 "Manual or automatic creation of payment entries according to the statements"
 msgstr ""
+"Criação manual ou automática de movimentos de pagamento de acordo com os "
+"extractos"
 
 #. module: account
 #: view:account.invoice:0
@@ -9447,6 +9694,8 @@ msgid ""
 "This account will be used to value outgoing stock for the current product "
 "category using cost price"
 msgstr ""
+"Esta conta será utilizada para valorizar saídas de stock para a categoria de "
+"produtos actual utilizando o preço de custo"
 
 #. module: account
 #: report:account.move.voucher:0
@@ -9462,17 +9711,17 @@ msgstr "Fechar movimento"
 #. module: account
 #: model:process.node,note:account.process_node_paidinvoice0
 msgid "Invoice's state is Done"
-msgstr ""
+msgstr "O estado da factura é \"Terminado\""
 
 #. module: account
 #: model:ir.model,name:account.model_report_account_sales
 msgid "Report of the Sales by Account"
-msgstr ""
+msgstr "Relatório de Vendas Por Conta"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account
 msgid "Accounts Fiscal Position"
-msgstr ""
+msgstr "Posição Fiscal de Contas"
 
 #. module: account
 #: report:account.invoice:0
@@ -9525,6 +9774,9 @@ msgid ""
 "Make sure if the account template has parent then it should be type "
 "\"View\"! "
 msgstr ""
+"Não é possível criar um modelo de conta!\n"
+"Verificar se o modelo de conta tem ascendente, nesse caso deverá ser do tipo "
+"\"Vista\"! "
 
 #. module: account
 #: view:account.subscription:0
@@ -9550,7 +9802,7 @@ msgstr "Condições de pagamento do parceiro"
 #. module: account
 #: field:temp.range,name:0
 msgid "Range"
-msgstr ""
+msgstr "Intervalo"
 
 #. module: account
 #: code:addons/account/account_move_line.py:1246
@@ -9614,12 +9866,12 @@ msgstr "Conta financeira"
 #: model:ir.actions.act_window,name:account.action_aged_receivable_graph
 #: view:report.aged.receivable:0
 msgid "Aged Receivable"
-msgstr ""
+msgstr "Valores A Receber Antigos"
 
 #. module: account
 #: field:account.tax,applicable_type:0
 msgid "Applicability"
-msgstr ""
+msgstr "Aplicabilidade"
 
 #. module: account
 #: code:addons/account/wizard/account_move_journal.py:165
@@ -9637,6 +9889,7 @@ msgstr "A outra divisa (opcional) se é um movimento multi-divisa."
 msgid ""
 "Import of the statement in the system from a supplier or customer invoice"
 msgstr ""
+"Importação do extracto no sistema de um factura de cliente ou fornecedor"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_periodical_processing_billing
@@ -9658,6 +9911,12 @@ msgid ""
 "may keep several types of specialized journals such as a cash journal, "
 "purchase journal, sales journal..."
 msgstr ""
+"Crie ou gira os diários da sua empresa a partir deste menu. Um diário é "
+"utilizado para registar transacções de todos os datos contabilísticos "
+"relacionados com o negócio do dia-a-dia da empresa utilizando o sistema de "
+"contabilização de dupla-entrada. Dependendo na natureza das actividades e o "
+"numero diário de transacções, a empresa pode manter vários tipos de diários "
+"especializados tais como o diário de dinheiro, compras, vendas..."
 
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_chart
@@ -9765,12 +10024,12 @@ msgstr "Informação geral"
 #: view:account.move:0
 #: view:account.move.line:0
 msgid "Accounting Documents"
-msgstr ""
+msgstr "Documentos Contabilísticos"
 
 #. module: account
 #: model:ir.model,name:account.model_validate_account_move_lines
 msgid "Validate Account Move Lines"
-msgstr ""
+msgstr "Validar Linhas de Movimento de Conta"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_analytic_cost_ledger_journal
@@ -9787,6 +10046,7 @@ msgstr "O estado da fatura é 'Fechada'"
 #: model:process.transition,note:account.process_transition_reconcilepaid0
 msgid "As soon as the reconciliation is done, the invoice can be paid."
 msgstr ""
+"Assim que a reconciliação estiver terminada, a factura poderá se paga."
 
 #. module: account
 #: view:account.account.template:0
@@ -9832,6 +10092,8 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the analytic "
 "journal without removing it."
 msgstr ""
+"Se o campo \"Activo\" estiver marcado como falso, permitirá esconder o "
+"diário analítico sem o remover."
 
 #. module: account
 #: field:account.analytic.line,ref:0
@@ -9866,7 +10128,7 @@ msgstr "Conta bancária"
 #: model:ir.actions.act_window,name:account.action_account_central_journal
 #: model:ir.model,name:account.model_account_central_journal
 msgid "Account Central Journal"
-msgstr ""
+msgstr "Diário Central de Conta"
 
 #. module: account
 #: report:account.overdue:0
@@ -9881,7 +10143,7 @@ msgstr "Futuro"
 #. module: account
 #: view:account.move.line:0
 msgid "Search Journal Items"
-msgstr ""
+msgstr "Pesquisar Itens de Diário"
 
 #. module: account
 #: help:account.tax,base_sign:0
@@ -9898,7 +10160,7 @@ msgstr "Normalmente 1 ou -1"
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account_template
 msgid "Template Account Fiscal Mapping"
-msgstr ""
+msgstr "Modelo de Mapeamento Fiscal de Conta"
 
 #. module: account
 #: field:account.chart.template,property_account_expense:0
@@ -9908,7 +10170,7 @@ msgstr "Conta de Gastos no Modelo do Produto"
 #. module: account
 #: field:account.analytic.line,amount_currency:0
 msgid "Amount currency"
-msgstr ""
+msgstr "Divisa do montante"
 
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:55
@@ -9933,6 +10195,13 @@ msgid ""
 "certain amount of information. They have to be certified by an external "
 "auditor annually."
 msgstr ""
+"Criar e Gerir as contas necessárias para registar movimentos de diário. Uma "
+"conta é parte de um razão permitindo que a empresa registe todos os tipos de "
+"transacções a débito e crédito. As empresas apresentam as suas contas "
+"anualmente em duas partes principais: O balanço e a Demonstração de "
+"Resultados (Contas de Receitas e Gastos). Na prestação de  contas anual de "
+"uma empresa é requerido por lei a inclusão de certas informações. Dependendo "
+"da empresa poderá ter que ser certificada por um auditor externo."
 
 #. module: account
 #: help:account.move.line,amount_residual_currency:0
@@ -9940,3 +10209,5 @@ msgid ""
 "The residual amount on a receivable or payable of a journal entry expressed "
 "in its currency (maybe different of the company currency)."
 msgstr ""
+"O montante residual num movimento de diário a receber ou a pagar, expresso "
+"na sua divisa (Poderá ser diferente da divisa da empresa)."
diff --git a/addons/account_analytic_analysis/i18n/pt.po b/addons/account_analytic_analysis/i18n/pt.po
index 219ca1e7373..a22c433f46b 100644
--- a/addons/account_analytic_analysis/i18n/pt.po
+++ b/addons/account_analytic_analysis/i18n/pt.po
@@ -7,14 +7,15 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-01-19 12:00+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2011-04-14 18:06+0000\n"
+"Last-Translator: António Anacleto (www.biztek.cv) "
+"<antonio.anacleto@biztek.cv>\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: 2011-01-25 06:22+0000\n"
-"X-Generator: Launchpad (build 12177)\n"
+"X-Launchpad-Export-Date: 2011-04-15 07:07+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,hours_qtt_invoiced:0
@@ -28,20 +29,19 @@ msgstr ""
 #: help:account.analytic.account,remaining_ca:0
 msgid "Computed using the formula: Max Invoice Price - Invoiced Amount."
 msgstr ""
-"Processado ao utilizar a fórmula: Preço Máximo da Factura - Montante "
-"Facturado"
+"Processado com a fórmula: Preço Máximo da Factura - Montante Facturado."
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,remaining_hours:0
 msgid "Computed using the formula: Maximum Quantity - Hours Tot."
-msgstr "Processado ao utilizar a fórmula: Quantidade Máxima - Horas Totais."
+msgstr "Processado com a fórmula: Quantidade Máxima - Total de Horas."
 
 #. module: account_analytic_analysis
 #: code:addons/account_analytic_analysis/account_analytic_analysis.py:532
 #: code:addons/account_analytic_analysis/account_analytic_analysis.py:703
 #, python-format
 msgid "AccessError"
-msgstr "Erro de acesso"
+msgstr "Erro de Acesso"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_invoice_date:0
@@ -59,6 +59,13 @@ msgid ""
 "You can also view the report of account analytic summary\n"
 "user-wise as well as month wise.\n"
 msgstr ""
+"\n"
+"Este módulo serve par modificar a vista da conta analítica para mostrar\n"
+"dados importantes para gestores de projecto ou empresas de serviços.\n"
+"Adiciona um menu para mostrar informação relevante para cada gestor.\n"
+"\n"
+"Pode também ver o relatório sumário de contas analíticas\n"
+"por utilizador bem como por mês.\n"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,last_invoice_date:0
@@ -78,7 +85,7 @@ msgstr "Margem Real da Taxa (%)"
 #. module: account_analytic_analysis
 #: field:account.analytic.account,ca_theorical:0
 msgid "Theoretical Revenue"
-msgstr ""
+msgstr "Retorno Teórico"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_worked_invoiced_date:0
@@ -121,7 +128,7 @@ msgstr "Horas Restantes"
 #. module: account_analytic_analysis
 #: field:account.analytic.account,theorical_margin:0
 msgid "Theoretical Margin"
-msgstr ""
+msgstr "Margem Teórica"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,ca_theorical:0
@@ -202,7 +209,7 @@ msgstr "Margem Real"
 msgid ""
 "Error! The currency has to be the same as the currency of the selected "
 "company"
-msgstr ""
+msgstr "Erro! A divisa tem que ser a mesma que a da empresa seleccionada"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,ca_invoiced:0
diff --git a/addons/account_chart/i18n/pt.po b/addons/account_chart/i18n/pt.po
index a954f6f6568..06d7259ac41 100644
--- a/addons/account_chart/i18n/pt.po
+++ b/addons/account_chart/i18n/pt.po
@@ -7,14 +7,15 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-01-19 12:00+0000\n"
-"Last-Translator: João Figueira <jjnf@ciberzonne.com>\n"
+"PO-Revision-Date: 2011-04-14 18:06+0000\n"
+"Last-Translator: António Anacleto (www.biztek.cv) "
+"<antonio.anacleto@biztek.cv>\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: 2011-01-25 06:24+0000\n"
-"X-Generator: Launchpad (build 12177)\n"
+"X-Launchpad-Export-Date: 2011-04-15 07:07+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
 #. module: account_chart
 #: model:ir.module.module,description:account_chart.module_meta_information
@@ -24,4 +25,4 @@ msgstr "Remover Plano de Contas minimo"
 #. module: account_chart
 #: model:ir.module.module,shortdesc:account_chart.module_meta_information
 msgid "Charts of Accounts"
-msgstr ""
+msgstr "Plano de Contas"
diff --git a/addons/account_invoice_layout/i18n/pt.po b/addons/account_invoice_layout/i18n/pt.po
index 8085ccbf12c..86f19bb3caa 100644
--- a/addons/account_invoice_layout/i18n/pt.po
+++ b/addons/account_invoice_layout/i18n/pt.po
@@ -7,14 +7,15 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-03-03 15:49+0000\n"
-"Last-Translator: Emanuel Massano <Unknown>\n"
+"PO-Revision-Date: 2011-04-14 18:08+0000\n"
+"Last-Translator: António Anacleto (www.biztek.cv) "
+"<antonio.anacleto@biztek.cv>\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: 2011-03-04 06:23+0000\n"
-"X-Generator: Launchpad (build 12351)\n"
+"X-Launchpad-Export-Date: 2011-04-15 07:07+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
 #. module: account_invoice_layout
 #: selection:account.invoice.line,state:0
@@ -271,7 +272,7 @@ msgstr "Número da Sequência"
 #. module: account_invoice_layout
 #: model:ir.model,name:account_invoice_layout.model_account_invoice_special_msg
 msgid "Account Invoice Special Message"
-msgstr ""
+msgstr "Mensagem Especial da Factura"
 
 #. module: account_invoice_layout
 #: report:account.invoice.layout:0
diff --git a/addons/crm_fundraising/i18n/gl.po b/addons/crm_fundraising/i18n/gl.po
new file mode 100644
index 00000000000..e147049d0c3
--- /dev/null
+++ b/addons/crm_fundraising/i18n/gl.po
@@ -0,0 +1,785 @@
+# Galician translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-04-14 17:33+0000\n"
+"Last-Translator: Santi (Pexego) <santiago@pexego.es>\n"
+"Language-Team: Galician <gl@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: 2011-04-15 07:07+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,planned_revenue:0
+msgid "Planned Revenue"
+msgstr "Ingresos previstos"
+
+#. module: crm_fundraising
+#: field:crm.fundraising.report,nbr:0
+msgid "# of Cases"
+msgstr "Nº de casos"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+#: view:crm.fundraising.report:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: crm_fundraising
+#: field:crm.fundraising.report,probability:0
+msgid "Avg. Probability"
+msgstr "Probabilidade media"
+
+#. module: crm_fundraising
+#: selection:crm.fundraising.report,month:0
+msgid "March"
+msgstr "Marzo"
+
+#. module: crm_fundraising
+#: field:crm.fundraising.report,delay_close:0
+msgid "Delay to close"
+msgstr "Demora peche"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,company_id:0
+#: view:crm.fundraising.report:0
+#: field:crm.fundraising.report,company_id:0
+msgid "Company"
+msgstr "Compañía"
+
+#. module: crm_fundraising
+#: model:ir.actions.act_window,name:crm_fundraising.crm_fund_categ_action
+msgid "Fundraising Categories"
+msgstr "Categorías de recadación"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,email_cc:0
+msgid "Watchers Emails"
+msgstr "Destinatarios de correos electrónicos (CC)"
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+msgid "Cases"
+msgstr "Casos"
+
+#. module: crm_fundraising
+#: selection:crm.fundraising,priority:0
+msgid "Highest"
+msgstr "A máis alta"
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+#: field:crm.fundraising.report,day:0
+msgid "Day"
+msgstr "Día"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Add Internal Note"
+msgstr "Engadir nota interna"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,partner_mobile:0
+msgid "Mobile"
+msgstr "Móbil"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Notes"
+msgstr "Notas"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,message_ids:0
+msgid "Messages"
+msgstr "Mensaxes"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Amount"
+msgstr "Importe"
+
+#. module: crm_fundraising
+#: model:crm.case.categ,name:crm_fundraising.categ_fund4
+msgid "Arts And Culture"
+msgstr "Arte e cultura"
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+#: field:crm.fundraising.report,amount_revenue:0
+msgid "Est.Revenue"
+msgstr "Beneficio est."
+
+#. module: crm_fundraising
+#: field:crm.fundraising,partner_address_id:0
+msgid "Partner Contact"
+msgstr "Contacto"
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+msgid "   Month   "
+msgstr "   Mes   "
+
+#. module: crm_fundraising
+#: field:crm.fundraising,type_id:0
+msgid "Campaign"
+msgstr "Campaña"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,date_action_next:0
+msgid "Next Action"
+msgstr "Seguinte acción"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Reset to Draft"
+msgstr "Cambiar a modo Borrador"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Extra Info"
+msgstr "Información adicional"
+
+#. module: crm_fundraising
+#: model:ir.model,name:crm_fundraising.model_crm_fundraising
+#: model:ir.ui.menu,name:crm_fundraising.menu_config_fundrising
+#: model:ir.ui.menu,name:crm_fundraising.menu_crm_case_fund_raise
+msgid "Fund Raising"
+msgstr "Recadación de fondos"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+#: field:crm.fundraising,partner_id:0
+#: field:crm.fundraising.report,partner_id:0
+msgid "Partner"
+msgstr "Socio"
+
+#. module: crm_fundraising
+#: model:ir.ui.menu,name:crm_fundraising.menu_report_crm_fundraising_tree
+msgid "Fundraising Analysis"
+msgstr "Análise da recadación"
+
+#. module: crm_fundraising
+#: model:ir.module.module,shortdesc:crm_fundraising.module_meta_information
+msgid "CRM Fundraising"
+msgstr "Recadación CRM"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Misc"
+msgstr "Varios"
+
+#. module: crm_fundraising
+#: field:crm.fundraising.report,section_id:0
+msgid "Section"
+msgstr "Sección"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+#: field:crm.fundraising,priority:0
+msgid "Priority"
+msgstr "Prioridade"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Send New Email"
+msgstr "Enviar novo email"
+
+#. module: crm_fundraising
+#: model:crm.case.categ,name:crm_fundraising.categ_fund1
+msgid "Social Rehabilitation And Rural Upliftment"
+msgstr "Rehabilitación social e desenvolvemento rural"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+#: view:crm.fundraising.report:0
+msgid "Payment Mode"
+msgstr "Modo de pagamento"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Reply"
+msgstr "Resposta"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,email_from:0
+msgid "Email"
+msgstr "E-mail"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,canal_id:0
+msgid "Channel"
+msgstr "Canle"
+
+#. module: crm_fundraising
+#: selection:crm.fundraising,priority:0
+msgid "Lowest"
+msgstr "A máis baixa"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,create_date:0
+msgid "Creation Date"
+msgstr "Data de creación"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,date_deadline:0
+msgid "Deadline"
+msgstr "Data límite"
+
+#. module: crm_fundraising
+#: selection:crm.fundraising.report,month:0
+msgid "July"
+msgstr "Xullo"
+
+#. module: crm_fundraising
+#: model:ir.ui.menu,name:crm_fundraising.menu_crm_case_fundraising-act
+msgid "Categories"
+msgstr "Categorías"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,stage_id:0
+msgid "Stage"
+msgstr "Fase"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "History Information"
+msgstr "Información histórica"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Dates"
+msgstr "Datas"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,partner_name2:0
+msgid "Employee Email"
+msgstr "E-mail do empregado"
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+msgid "    Month-1    "
+msgstr "    Mes-1    "
+
+#. module: crm_fundraising
+#: selection:crm.fundraising,state:0
+#: selection:crm.fundraising.report,state:0
+msgid "Cancelled"
+msgstr "Anulado"
+
+#. module: crm_fundraising
+#: model:crm.case.categ,name:crm_fundraising.categ_fund2
+msgid "Learning And Education"
+msgstr "Aprendizaxe e educación"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Contact"
+msgstr "Contacto"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Funds Form"
+msgstr "Formulario fondos"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Fund Description"
+msgstr "Descrición do fondo"
+
+#. module: crm_fundraising
+#: help:crm.fundraising.report,delay_close:0
+msgid "Number of Days to close the case"
+msgstr "Número de días para pechar o caso"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "References"
+msgstr "Referencias"
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+#: model:ir.actions.act_window,name:crm_fundraising.action_report_crm_fundraising
+#: model:ir.module.module,description:crm_fundraising.module_meta_information
+msgid "Fundraising"
+msgstr "Recadación de fondos"
+
+#. module: crm_fundraising
+#: model:ir.actions.act_window,help:crm_fundraising.action_report_crm_fundraising
+msgid ""
+"Have a general overview of all fund raising activities by sorting them with "
+"specific criteria such as the estimated revenue, average success probability "
+"and delay to close."
+msgstr ""
+"Obteña unha vista xeral de tódalas actividades de recadación ordenándoas por "
+"criterios específicos como beneficio estimado, probabilidade de éxito media "
+"e demora de peche."
+
+#. module: crm_fundraising
+#: selection:crm.fundraising.report,month:0
+msgid "September"
+msgstr "Setembro"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Communication"
+msgstr "Comunicación"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Funds Tree"
+msgstr "Árbore de fondos"
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+#: field:crm.fundraising.report,month:0
+msgid "Month"
+msgstr "Mes"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Escalate"
+msgstr "Escalado"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,write_date:0
+msgid "Update Date"
+msgstr "Data de actualización"
+
+#. module: crm_fundraising
+#: model:crm.case.resource.type,name:crm_fundraising.type_fund3
+msgid "Credit Card"
+msgstr "Tarxeta de crédito"
+
+#. module: crm_fundraising
+#: model:ir.actions.act_window,name:crm_fundraising.crm_fundraising_stage_act
+msgid "Fundraising Stages"
+msgstr "Etapas de recadación"
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+msgid "Salesman"
+msgstr "Vendedor"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,ref:0
+msgid "Reference"
+msgstr "Referencia"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,ref2:0
+msgid "Reference 2"
+msgstr "Referencia 2"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+#: field:crm.fundraising,categ_id:0
+#: view:crm.fundraising.report:0
+#: field:crm.fundraising.report,categ_id:0
+msgid "Category"
+msgstr "Categoría"
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+msgid "  Year  "
+msgstr "  Ano  "
+
+#. module: crm_fundraising
+#: field:crm.fundraising,planned_cost:0
+#: view:crm.fundraising.report:0
+#: field:crm.fundraising.report,planned_cost:0
+msgid "Planned Costs"
+msgstr "Custos planeados"
+
+#. module: crm_fundraising
+#: help:crm.fundraising,email_cc:0
+msgid ""
+"These email addresses will be added to the CC field of all inbound and "
+"outbound emails for this record before being sent. Separate multiple email "
+"addresses with a comma"
+msgstr ""
+"Estes enderezos de correo engadiranse ó campo CC para tódolos correos "
+"entrantes e saíntes deste rexistro antes de ser enviados. Separe os "
+"diferentes enderezos de correo cunha coma."
+
+#. module: crm_fundraising
+#: selection:crm.fundraising,state:0
+#: view:crm.fundraising.report:0
+#: selection:crm.fundraising.report,state:0
+msgid "Draft"
+msgstr "Borrador"
+
+#. module: crm_fundraising
+#: selection:crm.fundraising,priority:0
+msgid "Low"
+msgstr "Baixo"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,date_closed:0
+#: selection:crm.fundraising,state:0
+#: selection:crm.fundraising.report,state:0
+msgid "Closed"
+msgstr "Pechado"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+#: selection:crm.fundraising,state:0
+#: view:crm.fundraising.report:0
+#: selection:crm.fundraising.report,state:0
+msgid "Pending"
+msgstr "Pendente"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Communication & History"
+msgstr "Comunicación e historial"
+
+#. module: crm_fundraising
+#: model:ir.ui.menu,name:crm_fundraising.menu_crm_fundraising_stage_act
+msgid "Stages"
+msgstr "Etapas"
+
+#. module: crm_fundraising
+#: selection:crm.fundraising.report,month:0
+msgid "August"
+msgstr "Agosto"
+
+#. module: crm_fundraising
+#: selection:crm.fundraising,priority:0
+msgid "Normal"
+msgstr "Normal"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Global CC"
+msgstr "CC global"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+#: model:ir.actions.act_window,name:crm_fundraising.crm_case_category_act_fund_all1
+msgid "Funds"
+msgstr "Fondos"
+
+#. module: crm_fundraising
+#: selection:crm.fundraising.report,month:0
+msgid "June"
+msgstr "Xuño"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,partner_phone:0
+msgid "Phone"
+msgstr "Teléfono"
+
+#. module: crm_fundraising
+#: field:crm.fundraising.report,user_id:0
+msgid "User"
+msgstr "Usuario"
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+msgid "#Fundraising"
+msgstr "Nº obtención fondos"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,active:0
+msgid "Active"
+msgstr "Activo"
+
+#. module: crm_fundraising
+#: selection:crm.fundraising.report,month:0
+msgid "November"
+msgstr "Novembro"
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+msgid "Extended Filters..."
+msgstr "Filtros extendidos..."
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+msgid "Search"
+msgstr "Buscar"
+
+#. module: crm_fundraising
+#: selection:crm.fundraising.report,month:0
+msgid "October"
+msgstr "Outubro"
+
+#. module: crm_fundraising
+#: selection:crm.fundraising.report,month:0
+msgid "January"
+msgstr "Xaneiro"
+
+#. module: crm_fundraising
+#: model:crm.case.resource.type,name:crm_fundraising.type_fund2
+msgid "Cheque"
+msgstr "Cheque"
+
+#. module: crm_fundraising
+#: model:ir.actions.act_window,help:crm_fundraising.crm_fund_categ_action
+msgid ""
+"Manage and define the fund raising categories you want to be maintained in "
+"the system."
+msgstr ""
+"Xestione e defina as categorías de recadación que desexe manter no sistema."
+
+#. module: crm_fundraising
+#: help:crm.fundraising,email_from:0
+msgid "These people will receive email."
+msgstr "Estas persoas recibirán un e-mail."
+
+#. module: crm_fundraising
+#: field:crm.fundraising,date:0
+msgid "Date"
+msgstr "Data"
+
+#. module: crm_fundraising
+#: model:crm.case.categ,name:crm_fundraising.categ_fund3
+msgid "Healthcare"
+msgstr "Servizos de Saúde"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "History"
+msgstr "Historia"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Attachments"
+msgstr "Anexos"
+
+#. module: crm_fundraising
+#: model:ir.model,name:crm_fundraising.model_crm_case_stage
+msgid "Stage of case"
+msgstr "Fase do caso"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Estimates"
+msgstr "Estimacións"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+#: field:crm.fundraising,state:0
+#: view:crm.fundraising.report:0
+#: field:crm.fundraising.report,state:0
+msgid "State"
+msgstr "Estado"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+#: view:crm.fundraising.report:0
+msgid "Done"
+msgstr "Feito"
+
+#. module: crm_fundraising
+#: selection:crm.fundraising.report,month:0
+msgid "December"
+msgstr "Decembro"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+#: view:crm.fundraising.report:0
+msgid "Cancel"
+msgstr "Anular"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+#: selection:crm.fundraising,state:0
+#: view:crm.fundraising.report:0
+#: selection:crm.fundraising.report,state:0
+msgid "Open"
+msgstr "Aberto"
+
+#. module: crm_fundraising
+#: model:ir.actions.act_window,help:crm_fundraising.crm_case_category_act_fund_all1
+msgid ""
+"If you need to collect money for your organization or a campaign, Fund "
+"Raising allows you to track all your fund raising activities. In the search "
+"list, filter by funds description, email, history and probability of success."
+msgstr ""
+"Se precisa reunir cartos para a súa organización ou para unha campaña, "
+"Recadación de Fondos permítelle rexistrar tódalas súas actividades de "
+"recadación. Na lista de busca, filtre os fondos por descrición, correo "
+"electrónico, historial e probabilidade de éxito."
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+#: field:crm.fundraising,user_id:0
+msgid "Responsible"
+msgstr "Responsable"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Current"
+msgstr "Actual"
+
+#. module: crm_fundraising
+#: help:crm.fundraising,section_id:0
+msgid ""
+"Sales team to which Case belongs to. Define Responsible user and Email "
+"account for mail gateway."
+msgstr ""
+"Equipo de vendas ó que pertence o caso. Defina o usuario responsable e a "
+"conta de email para a pasarela de correo."
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Details"
+msgstr "Detalles"
+
+#. module: crm_fundraising
+#: model:ir.model,name:crm_fundraising.model_crm_fundraising_report
+msgid "CRM Fundraising Report"
+msgstr "CRM Informe de recadacións"
+
+#. module: crm_fundraising
+#: field:crm.fundraising.report,type_id:0
+msgid "Fundraising Type"
+msgstr "Tipo de recadación"
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+#: field:crm.fundraising.report,amount_revenue_prob:0
+msgid "Est. Rev*Prob."
+msgstr "Beneficio*Prob. estim."
+
+#. module: crm_fundraising
+#: model:ir.actions.act_window,help:crm_fundraising.crm_fundraising_stage_act
+msgid ""
+"Create and manage fund raising activity categories you want to be maintained "
+"in the system."
+msgstr ""
+"Cree e xestione as categorías de actividades de recadación que desexe manter "
+"no sistema."
+
+#. module: crm_fundraising
+#: field:crm.fundraising,description:0
+msgid "Description"
+msgstr "Descrición"
+
+#. module: crm_fundraising
+#: selection:crm.fundraising.report,month:0
+msgid "May"
+msgstr "Maio"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,probability:0
+msgid "Probability (%)"
+msgstr "Probabilidade (%)"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,partner_name:0
+msgid "Employee's Name"
+msgstr "Nome do empregado"
+
+#. module: crm_fundraising
+#: help:crm.fundraising,canal_id:0
+msgid ""
+"The channels represent the different communication  modes available with the "
+"customer."
+msgstr ""
+"As canles representan os diferentes modos de comunicación dispoñibles co "
+"cliente"
+
+#. module: crm_fundraising
+#: help:crm.fundraising,state:0
+msgid ""
+"The state is set to 'Draft', when a case is created.                         "
+"         \n"
+"If the case is in progress the state is set to 'Open'.                       "
+"           \n"
+"When the case is over, the state is set to 'Done'.                           "
+"       \n"
+"If the case needs to be reviewed then the state is set to 'Pending'."
+msgstr ""
+"O estado configúrase como \"Borrador\", cando se crea un caso. Se o caso "
+"está en curso, o estado configúrase como \"Aberto\". Cando se pecha o caso, "
+"o estado configúrase como \"Realizado\". Se cómpre revisar o caso, o estado "
+"configúrase como \"Pendente\"."
+
+#. module: crm_fundraising
+#: selection:crm.fundraising.report,month:0
+msgid "February"
+msgstr "Febreiro"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+#: field:crm.fundraising,name:0
+msgid "Name"
+msgstr "Nome"
+
+#. module: crm_fundraising
+#: model:crm.case.resource.type,name:crm_fundraising.type_fund1
+msgid "Cash"
+msgstr "Efectivo"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Funds by Categories"
+msgstr "Fondos por categorías"
+
+#. module: crm_fundraising
+#: selection:crm.fundraising.report,month:0
+msgid "April"
+msgstr "Abril"
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+msgid "My Case(s)"
+msgstr "O(s) meu(s) caso(s)"
+
+#. module: crm_fundraising
+#: model:crm.case.resource.type,name:crm_fundraising.type_fund4
+msgid "Demand Draft"
+msgstr "Solicitar borrador"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,id:0
+msgid "ID"
+msgstr "ID"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Search Funds"
+msgstr "Buscar fondos"
+
+#. module: crm_fundraising
+#: selection:crm.fundraising,priority:0
+msgid "High"
+msgstr "Alto"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+#: field:crm.fundraising,section_id:0
+#: view:crm.fundraising.report:0
+msgid "Sales Team"
+msgstr "Equipo de vendas"
+
+#. module: crm_fundraising
+#: field:crm.fundraising.report,create_date:0
+msgid "Create Date"
+msgstr "Crear data"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,date_action_last:0
+msgid "Last Action"
+msgstr "Última acción"
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+#: field:crm.fundraising.report,name:0
+msgid "Year"
+msgstr "Ano"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,duration:0
+msgid "Duration"
+msgstr "Duración"
diff --git a/addons/hr_expense/i18n/ca.po b/addons/hr_expense/i18n/ca.po
index 9ba8af9843d..26ad55f969a 100644
--- a/addons/hr_expense/i18n/ca.po
+++ b/addons/hr_expense/i18n/ca.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-04-13 06:24+0000\n"
+"PO-Revision-Date: 2011-04-14 12:48+0000\n"
 "Last-Translator: Esther Xaus (Zikzakmedia) <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: 2011-04-13 14:35+0000\n"
+"X-Launchpad-Export-Date: 2011-04-15 07:07+0000\n"
 "X-Generator: Launchpad (build 12735)\n"
 
 #. module: hr_expense
@@ -117,7 +117,7 @@ msgstr "Notes"
 #. module: hr_expense
 #: field:hr.expense.expense,invoice_id:0
 msgid "Employee's Invoice"
-msgstr ""
+msgstr "Factura d'empleat"
 
 #. module: hr_expense
 #: model:ir.module.module,description:hr_expense.module_meta_information
@@ -162,7 +162,7 @@ msgstr "Acceptat"
 #. module: hr_expense
 #: view:hr.expense.report:0
 msgid "   Month   "
-msgstr ""
+msgstr "   Mes   "
 
 #. module: hr_expense
 #: report:hr.expense:0
@@ -182,6 +182,8 @@ msgid ""
 "Date of the confirmation of the sheet expense. It's filled when the button "
 "Confirm is pressed."
 msgstr ""
+"Data de confirmació del full de despeses. S'omple quan premem el botó "
+"confirmar."
 
 #. module: hr_expense
 #: view:hr.expense.report:0
@@ -197,17 +199,17 @@ msgstr "Refusar despeses"
 #. module: hr_expense
 #: model:product.template,name:hr_expense.product_product_expense_car_product_template
 msgid "Car Travel"
-msgstr ""
+msgstr "Viatge amb cotxe"
 
 #. module: hr_expense
 #: field:hr.expense.report,price_average:0
 msgid "Average Price"
-msgstr ""
+msgstr "Preu mitjà"
 
 #. module: hr_expense
 #: view:hr.expense.report:0
 msgid "Total Invoiced Lines"
-msgstr ""
+msgstr "Total línies facturades"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
@@ -223,12 +225,13 @@ msgstr "El comptable valida la fulla"
 #. module: hr_expense
 #: field:hr.expense.report,delay_valid:0
 msgid "Delay to Valid"
-msgstr ""
+msgstr "Temps fins validar"
 
 #. module: hr_expense
 #: help:hr.expense.line,sequence:0
 msgid "Gives the sequence order when displaying a list of expense lines."
 msgstr ""
+"Doneu l'ordre de seqüència al mostrar una llista de línies de despeses."
 
 #. module: hr_expense
 #: field:hr.expense.line,analytic_account:0
@@ -240,7 +243,7 @@ msgstr "Compte analític"
 #. module: hr_expense
 #: field:hr.expense.report,date:0
 msgid "Date "
-msgstr ""
+msgstr "Data "
 
 #. module: hr_expense
 #: field:hr.expense.expense,state:0
@@ -256,6 +259,8 @@ msgid ""
 "Please configure Default Expense account for Product purchase, "
 "`property_account_expense_categ`"
 msgstr ""
+"Configureu el compte de despeses per defecte per a compres de productes, "
+"`property_account_expense_categ`"
 
 #. module: hr_expense
 #: report:hr.expense:0
@@ -298,12 +303,12 @@ msgstr "Les meves despeses"
 #. module: hr_expense
 #: view:hr.expense.report:0
 msgid "Creation Date"
-msgstr ""
+msgstr "Data de creació"
 
 #. module: hr_expense
 #: model:ir.actions.report.xml,name:hr_expense.hr_expenses
 msgid "HR expenses"
-msgstr ""
+msgstr "Despeses RRHH"
 
 #. module: hr_expense
 #: field:hr.expense.expense,id:0
@@ -330,7 +335,7 @@ msgstr ""
 #. module: hr_expense
 #: selection:hr.expense.report,month:0
 msgid "July"
-msgstr ""
+msgstr "Juliol"
 
 #. module: hr_expense
 #: model:process.transition,note:hr_expense.process_transition_reimburseexpense0
@@ -346,25 +351,25 @@ msgstr "Reembors"
 #: code:addons/hr_expense/hr_expense.py:158
 #, python-format
 msgid "The employee must have a Home address"
-msgstr ""
+msgstr "L'empleat ha de tenir un domicili"
 
 #. module: hr_expense
 #: view:hr.expense.report:0
 msgid "    Month-1    "
-msgstr ""
+msgstr "    Mes-1    "
 
 #. module: hr_expense
 #: field:hr.expense.expense,date_valid:0
 #: field:hr.expense.report,date_valid:0
 msgid "Validation Date"
-msgstr ""
+msgstr "Data de validació"
 
 #. module: hr_expense
 #: view:hr.expense.report:0
 #: model:ir.actions.act_window,name:hr_expense.action_hr_expense_report_all
 #: model:ir.ui.menu,name:hr_expense.menu_hr_expense_report_all
 msgid "Expenses Analysis"
-msgstr ""
+msgstr "Anàlisi de despeses"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
diff --git a/addons/hr_expense/i18n/es.po b/addons/hr_expense/i18n/es.po
index aa5db828cb0..684009726fb 100644
--- a/addons/hr_expense/i18n/es.po
+++ b/addons/hr_expense/i18n/es.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-04-13 06:23+0000\n"
+"PO-Revision-Date: 2011-04-14 12:41+0000\n"
 "Last-Translator: Esther Xaus (Zikzakmedia) <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: 2011-04-13 14:35+0000\n"
+"X-Launchpad-Export-Date: 2011-04-15 07:07+0000\n"
 "X-Generator: Launchpad (build 12735)\n"
 
 #. module: hr_expense
@@ -148,7 +148,7 @@ msgstr ""
 "    * Validación por el contable y creación de la factura\n"
 "    * Pago de la factura al empleado\n"
 "\n"
-"    Este módulo también usas la contabilidad analítica y es compatible con\n"
+"    Este módulo también usa la contabilidad analítica y es compatible con\n"
 "    el módulo de facturación de hojas de servicios de forma que pueda\n"
 "     re-facturar automáticamente sus gastos de clientes si trabaja por "
 "proyectos.\n"
diff --git a/addons/hr_payroll_account/i18n/ca.po b/addons/hr_payroll_account/i18n/ca.po
new file mode 100644
index 00000000000..fcdb2588666
--- /dev/null
+++ b/addons/hr_payroll_account/i18n/ca.po
@@ -0,0 +1,328 @@
+# Catalan translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-04-14 20:42+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Catalan <ca@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: 2011-04-15 07:07+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
+
+#. module: hr_payroll_account
+#: field:hr.payslip,move_line_ids:0
+msgid "Accounting Lines"
+msgstr ""
+
+#. module: hr_payroll_account
+#: field:hr.payroll.register,bank_journal_id:0
+#: field:hr.payslip,bank_journal_id:0
+msgid "Bank Journal"
+msgstr ""
+
+#. module: hr_payroll_account
+#: model:ir.model,name:hr_payroll_account.model_hr_contibution_register_line
+msgid "Contribution Register Line"
+msgstr ""
+
+#. module: hr_payroll_account
+#: model:ir.model,name:hr_payroll_account.model_hr_contibution_register
+msgid "Contribution Register"
+msgstr ""
+
+#. module: hr_payroll_account
+#: help:hr.employee,analytic_account:0
+msgid "Analytic Account for Salary Analysis"
+msgstr ""
+
+#. module: hr_payroll_account
+#: field:hr.payroll.register,journal_id:0
+#: field:hr.payslip,journal_id:0
+msgid "Expense Journal"
+msgstr ""
+
+#. module: hr_payroll_account
+#: field:hr.contibution.register.line,period_id:0
+msgid "Period"
+msgstr ""
+
+#. module: hr_payroll_account
+#: model:ir.model,name:hr_payroll_account.model_hr_employee
+msgid "Employee"
+msgstr ""
+
+#. module: hr_payroll_account
+#: view:hr.payslip:0
+msgid "Other Informations"
+msgstr ""
+
+#. module: hr_payroll_account
+#: field:hr.employee,salary_account:0
+msgid "Salary Account"
+msgstr ""
+
+#. module: hr_payroll_account
+#: help:hr.employee,property_bank_account:0
+msgid "Select Bank Account from where Salary Expense will be Paid"
+msgstr ""
+
+#. module: hr_payroll_account
+#: model:ir.model,name:hr_payroll_account.model_hr_payroll_register
+msgid "Payroll Register"
+msgstr ""
+
+#. module: hr_payroll_account
+#: model:ir.model,name:hr_payroll_account.model_hr_payslip_account_move
+msgid "Account Move Link to Pay Slip"
+msgstr ""
+
+#. module: hr_payroll_account
+#: view:hr.payslip:0
+msgid "Description"
+msgstr ""
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:330
+#, python-format
+msgid "Please Confirm all Expense Invoice appear for Reimbursement"
+msgstr ""
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:432
+#, python-format
+msgid "Please defined partner in bank account for %s !"
+msgstr ""
+
+#. module: hr_payroll_account
+#: view:hr.payslip:0
+msgid "Accounting Informations"
+msgstr ""
+
+#. module: hr_payroll_account
+#: help:hr.employee,salary_account:0
+msgid "Expense account when Salary Expense will be recorded"
+msgstr ""
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:429
+#, python-format
+msgid "Please defined bank account for %s !"
+msgstr ""
+
+#. module: hr_payroll_account
+#: model:ir.module.module,description:hr_payroll_account.module_meta_information
+msgid ""
+"Generic Payroll system Integrated with Accountings\n"
+"    * Expanse Encoding\n"
+"    * Payment Encoding\n"
+"    * Comany Contribution Managemet\n"
+"    "
+msgstr ""
+
+#. module: hr_payroll_account
+#: model:ir.module.module,shortdesc:hr_payroll_account.module_meta_information
+msgid "Human Resource Payroll Accounting"
+msgstr ""
+
+#. module: hr_payroll_account
+#: view:hr.payslip:0
+#: field:hr.payslip,move_payment_ids:0
+msgid "Payment Lines"
+msgstr ""
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:273
+#: code:addons/hr_payroll_account/hr_payroll_account.py:444
+#, python-format
+msgid "Please define fiscal year for perticular contract"
+msgstr ""
+
+#. module: hr_payroll_account
+#: field:hr.payslip.account.move,slip_id:0
+#: model:ir.model,name:hr_payroll_account.model_hr_payslip
+msgid "Pay Slip"
+msgstr ""
+
+#. module: hr_payroll_account
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
+msgstr ""
+
+#. module: hr_payroll_account
+#: view:hr.payslip:0
+msgid "Account Lines"
+msgstr ""
+
+#. module: hr_payroll_account
+#: field:hr.contibution.register,account_id:0
+#: field:hr.holidays.status,account_id:0
+#: field:hr.payroll.advice,account_id:0
+msgid "Account"
+msgstr ""
+
+#. module: hr_payroll_account
+#: field:hr.employee,property_bank_account:0
+msgid "Bank Account"
+msgstr ""
+
+#. module: hr_payroll_account
+#: field:hr.payslip.account.move,name:0
+msgid "Name"
+msgstr ""
+
+#. module: hr_payroll_account
+#: model:ir.model,name:hr_payroll_account.model_hr_payslip_line
+msgid "Payslip Line"
+msgstr ""
+
+#. module: hr_payroll_account
+#: view:hr.payslip:0
+msgid "Accounting Vouchers"
+msgstr ""
+
+#. module: hr_payroll_account
+#: constraint:hr.employee:0
+msgid ""
+"Error ! You cannot select a department for which the employee is the manager."
+msgstr ""
+
+#. module: hr_payroll_account
+#: help:hr.payroll.register,period_id:0
+#: help:hr.payslip,period_id:0
+msgid "Keep empty to use the period of the validation(Payslip) date."
+msgstr ""
+
+#. module: hr_payroll_account
+#: model:ir.model,name:hr_payroll_account.model_hr_payroll_advice
+msgid "Bank Advice Note"
+msgstr ""
+
+#. module: hr_payroll_account
+#: field:hr.payslip.account.move,move_id:0
+msgid "Expense Entries"
+msgstr ""
+
+#. module: hr_payroll_account
+#: field:hr.payslip,move_ids:0
+msgid "Accounting vouchers"
+msgstr ""
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:273
+#: code:addons/hr_payroll_account/hr_payroll_account.py:280
+#: code:addons/hr_payroll_account/hr_payroll_account.py:283
+#: code:addons/hr_payroll_account/hr_payroll_account.py:330
+#: code:addons/hr_payroll_account/hr_payroll_account.py:444
+#: code:addons/hr_payroll_account/hr_payroll_account.py:451
+#: code:addons/hr_payroll_account/hr_payroll_account.py:454
+#, python-format
+msgid "Warning !"
+msgstr ""
+
+#. module: hr_payroll_account
+#: field:hr.employee,employee_account:0
+msgid "Employee Account"
+msgstr ""
+
+#. module: hr_payroll_account
+#: field:hr.payslip.line,account_id:0
+msgid "General Account"
+msgstr ""
+
+#. module: hr_payroll_account
+#: field:hr.contibution.register,yearly_total_by_emp:0
+msgid "Total By Employee"
+msgstr ""
+
+#. module: hr_payroll_account
+#: field:hr.payslip.account.move,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: hr_payroll_account
+#: field:hr.payroll.register,period_id:0
+#: field:hr.payslip,period_id:0
+msgid "Force Period"
+msgstr ""
+
+#. module: hr_payroll_account
+#: model:ir.model,name:hr_payroll_account.model_hr_holidays_status
+msgid "Leave Type"
+msgstr ""
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:280
+#: code:addons/hr_payroll_account/hr_payroll_account.py:451
+#, python-format
+msgid "Fiscal Year is not defined for slip date %s"
+msgstr ""
+
+#. module: hr_payroll_account
+#: field:hr.contibution.register,analytic_account_id:0
+#: field:hr.employee,analytic_account:0
+#: field:hr.holidays.status,analytic_account_id:0
+#: field:hr.payroll.structure,account_id:0
+#: field:hr.payslip.line,analytic_account_id:0
+msgid "Analytic Account"
+msgstr ""
+
+#. module: hr_payroll_account
+#: help:hr.employee,employee_account:0
+msgid "Employee Payable Account"
+msgstr ""
+
+#. module: hr_payroll_account
+#: field:hr.contibution.register,yearly_total_by_comp:0
+msgid "Total By Company"
+msgstr ""
+
+#. module: hr_payroll_account
+#: model:ir.model,name:hr_payroll_account.model_hr_payroll_structure
+msgid "Salary Structure"
+msgstr ""
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:550
+#, python-format
+msgid "Please Configure Partners Receivable Account!!"
+msgstr ""
+
+#. module: hr_payroll_account
+#: view:hr.contibution.register:0
+msgid "Year"
+msgstr ""
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:283
+#: code:addons/hr_payroll_account/hr_payroll_account.py:454
+#, python-format
+msgid "Period is not defined for slip date %s"
+msgstr ""
+
+#. module: hr_payroll_account
+#: view:hr.payslip:0
+msgid "Accounting Details"
+msgstr ""
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:533
+#, python-format
+msgid "Please Configure Partners Payable Account!!"
+msgstr ""
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:429
+#: code:addons/hr_payroll_account/hr_payroll_account.py:432
+#: code:addons/hr_payroll_account/hr_payroll_account.py:533
+#: code:addons/hr_payroll_account/hr_payroll_account.py:550
+#, python-format
+msgid "Integrity Error !"
+msgstr ""
diff --git a/addons/subscription/i18n/gl.po b/addons/subscription/i18n/gl.po
new file mode 100644
index 00000000000..cbc95ad13fe
--- /dev/null
+++ b/addons/subscription/i18n/gl.po
@@ -0,0 +1,341 @@
+# Galician translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:16+0000\n"
+"PO-Revision-Date: 2011-04-14 18:38+0000\n"
+"Last-Translator: Santi (Pexego) <santiago@pexego.es>\n"
+"Language-Team: Galician <gl@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: 2011-04-15 07:07+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
+
+#. module: subscription
+#: field:subscription.subscription,doc_source:0
+#: field:subscription.subscription.history,document_id:0
+msgid "Source Document"
+msgstr "Documento orixe"
+
+#. module: subscription
+#: field:subscription.document,model:0
+msgid "Object"
+msgstr "Obxecto"
+
+#. module: subscription
+#: view:subscription.subscription:0
+msgid "This Week"
+msgstr "Esta semana"
+
+#. module: subscription
+#: view:subscription.subscription:0
+msgid "Search Subscription"
+msgstr "Buscar subscrición"
+
+#. module: subscription
+#: field:subscription.subscription,date_init:0
+msgid "First Date"
+msgstr "Primeira data"
+
+#. module: subscription
+#: field:subscription.document.fields,field:0
+msgid "Field"
+msgstr "Campo"
+
+#. module: subscription
+#: view:subscription.subscription:0
+#: field:subscription.subscription,state:0
+msgid "State"
+msgstr "Estado"
+
+#. module: subscription
+#: model:ir.model,name:subscription.model_subscription_subscription_history
+msgid "Subscription history"
+msgstr "Historial de documentos periódicos"
+
+#. module: subscription
+#: selection:subscription.subscription,state:0
+msgid "Draft"
+msgstr "Borrador"
+
+#. module: subscription
+#: selection:subscription.document.fields,value:0
+msgid "Current Date"
+msgstr "Data actual"
+
+#. module: subscription
+#: selection:subscription.subscription,interval_type:0
+msgid "Weeks"
+msgstr "Semanas"
+
+#. module: subscription
+#: view:subscription.subscription:0
+msgid "Today"
+msgstr "Hoxe"
+
+#. module: subscription
+#: code:addons/subscription/subscription.py:44
+#, python-format
+msgid "Error !"
+msgstr "Erro!"
+
+#. module: subscription
+#: model:ir.actions.act_window,name:subscription.action_subscription_form
+#: model:ir.ui.menu,name:subscription.menu_action_subscription_form
+#: view:subscription.subscription:0
+msgid "Subscriptions"
+msgstr "Subscricións"
+
+#. module: subscription
+#: field:subscription.subscription,interval_number:0
+msgid "Interval Qty"
+msgstr "Período: Cantidade de tempo"
+
+#. module: subscription
+#: view:subscription.subscription:0
+msgid "Stop"
+msgstr ""
+
+#. module: subscription
+#: view:subscription.subscription:0
+msgid "Set to Draft"
+msgstr "Establecer como borrador"
+
+#. module: subscription
+#: model:ir.module.module,description:subscription.module_meta_information
+msgid ""
+"Module allows to create new documents and add subscription on that document."
+msgstr ""
+"Este módulo permite crear novos documentos e engadir subscricións a este "
+"documento."
+
+#. module: subscription
+#: view:subscription.subscription:0
+#: selection:subscription.subscription,state:0
+msgid "Running"
+msgstr "Executándose"
+
+#. module: subscription
+#: view:subscription.subscription.history:0
+msgid "Subscription History"
+msgstr "Historial de documentos periódicos"
+
+#. module: subscription
+#: view:subscription.subscription:0
+#: field:subscription.subscription,user_id:0
+msgid "User"
+msgstr "Usuario"
+
+#. module: subscription
+#: field:subscription.subscription,interval_type:0
+msgid "Interval Unit"
+msgstr "Unidade de intervalo"
+
+#. module: subscription
+#: field:subscription.subscription.history,date:0
+msgid "Date"
+msgstr "Data"
+
+#. module: subscription
+#: field:subscription.subscription,exec_init:0
+msgid "Number of documents"
+msgstr "Número de documentos"
+
+#. module: subscription
+#: help:subscription.document,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the "
+"subscription document without removing it."
+msgstr ""
+"Se se desmarca o campo activo, permite ocultar o documento de subscrición "
+"sen eliminalo."
+
+#. module: subscription
+#: selection:subscription.subscription.history,document_id:0
+msgid "Sale Order"
+msgstr "Pedido de venda"
+
+#. module: subscription
+#: field:subscription.document,name:0
+#: field:subscription.subscription,name:0
+msgid "Name"
+msgstr "Nome"
+
+#. module: subscription
+#: code:addons/subscription/subscription.py:44
+#, python-format
+msgid ""
+"You cannot modify the Object linked to the Document Type!\n"
+"Create another Document instead !"
+msgstr ""
+"Non pode modificar o obxecto vinculado ó tipo de documento! Cree outro "
+"documento no seu lugar!"
+
+#. module: subscription
+#: field:subscription.document,field_ids:0
+msgid "Fields"
+msgstr "Campos"
+
+#. module: subscription
+#: view:subscription.subscription:0
+#: field:subscription.subscription,note:0
+#: field:subscription.subscription,notes:0
+msgid "Notes"
+msgstr "Notas"
+
+#. module: subscription
+#: selection:subscription.subscription,interval_type:0
+msgid "Months"
+msgstr "Meses"
+
+#. module: subscription
+#: selection:subscription.subscription,interval_type:0
+msgid "Days"
+msgstr "Días"
+
+#. module: subscription
+#: field:subscription.document,active:0
+#: field:subscription.subscription,active:0
+msgid "Active"
+msgstr "Activo"
+
+#. module: subscription
+#: field:subscription.subscription,cron_id:0
+msgid "Cron Job"
+msgstr "Tarea de Cron"
+
+#. module: subscription
+#: model:ir.model,name:subscription.model_subscription_subscription
+#: field:subscription.subscription.history,subscription_id:0
+msgid "Subscription"
+msgstr "Subscrición"
+
+#. module: subscription
+#: view:subscription.subscription:0
+#: field:subscription.subscription,partner_id:0
+msgid "Partner"
+msgstr "Socio"
+
+#. module: subscription
+#: help:subscription.subscription,cron_id:0
+msgid "Scheduler which runs on subscription"
+msgstr "Planificador que executa a subscrición."
+
+#. module: subscription
+#: model:ir.ui.menu,name:subscription.config_recuuring_event
+#: model:ir.ui.menu,name:subscription.next_id_45
+msgid "Recurring Events"
+msgstr "Eventos recorrentes"
+
+#. module: subscription
+#: view:subscription.subscription:0
+msgid "Subsription Data"
+msgstr "Datos da subscrición"
+
+#. module: subscription
+#: help:subscription.subscription,note:0
+msgid "Description or Summary of Subscription"
+msgstr "Descrición ou resumo da subscrición."
+
+#. module: subscription
+#: model:ir.model,name:subscription.model_subscription_document
+#: view:subscription.document:0
+#: field:subscription.document.fields,document_id:0
+msgid "Subscription Document"
+msgstr "Documento de subscrición"
+
+#. module: subscription
+#: help:subscription.subscription,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the "
+"subscription without removing it."
+msgstr ""
+"Se se desmarca o campo activo, permite ocultar a subscrición sen eliminala."
+
+#. module: subscription
+#: help:subscription.document.fields,value:0
+msgid "Default value is considered for field when new document is generated."
+msgstr ""
+"Tense en conta o valor por defecto do campo cando se xera un novo documento."
+
+#. module: subscription
+#: selection:subscription.document.fields,value:0
+msgid "False"
+msgstr "Falso"
+
+#. module: subscription
+#: view:subscription.subscription:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: subscription
+#: view:subscription.subscription:0
+msgid "Process"
+msgstr "Proceso"
+
+#. module: subscription
+#: model:ir.module.module,shortdesc:subscription.module_meta_information
+msgid "Subscription and recurring operations"
+msgstr "Subscricións e operacións recorrentes"
+
+#. module: subscription
+#: help:subscription.subscription,doc_source:0
+msgid ""
+"User can choose the source document on which he wants to create documents"
+msgstr ""
+"O usuario pode seleccionar o documento orixinal sobre o cal desexa crear os "
+"documentos."
+
+#. module: subscription
+#: model:ir.actions.act_window,name:subscription.action_document_form
+#: model:ir.ui.menu,name:subscription.menu_action_document_form
+msgid "Document Types"
+msgstr "Tipos de documento"
+
+#. module: subscription
+#: code:addons/subscription/subscription.py:115
+#, python-format
+msgid "Wrong Source Document !"
+msgstr "Documento fonte erróneo!"
+
+#. module: subscription
+#: model:ir.model,name:subscription.model_subscription_document_fields
+#: view:subscription.document.fields:0
+msgid "Subscription Document Fields"
+msgstr "Campos do documento de subscrición"
+
+#. module: subscription
+#: view:subscription.subscription:0
+#: selection:subscription.subscription,state:0
+msgid "Done"
+msgstr "Feito"
+
+#. module: subscription
+#: selection:subscription.subscription.history,document_id:0
+msgid "Invoice"
+msgstr "Factura"
+
+#. module: subscription
+#: code:addons/subscription/subscription.py:115
+#, python-format
+msgid ""
+"Please provide another source document.\n"
+"This one does not exist !"
+msgstr "Por favor, proporcione outro documento fonte. Este non existe!"
+
+#. module: subscription
+#: field:subscription.document.fields,value:0
+msgid "Default Value"
+msgstr "Valor predeterminado"
+
+#. module: subscription
+#: view:subscription.subscription:0
+#: field:subscription.subscription,doc_lines:0
+msgid "Documents created"
+msgstr "Documentos creados"

From eeaa82523233a5ab498288172000ca175770a343 Mon Sep 17 00:00:00 2001
From: "aag (OpenERP)" <aag@tinyerp.co.in>
Date: Fri, 15 Apr 2011 14:13:11 +0530
Subject: [PATCH 230/331] [IMP]Procrument :Usability Issue-solve Speling
 Mistack of  tooltip

bzr revid: aag@tinyerp.co.in-20110415084311-3iygvwq221ctgqd1
---
 addons/procurement/procurement.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/procurement/procurement.py b/addons/procurement/procurement.py
index 3257f0a5694..fccc6445d3d 100644
--- a/addons/procurement/procurement.py
+++ b/addons/procurement/procurement.py
@@ -512,13 +512,13 @@ class stock_warehouse_orderpoint(osv.osv):
         'product_id': fields.many2one('product.product', 'Product', required=True, ondelete='cascade', domain=[('type','=','product')]),
         'product_uom': fields.many2one('product.uom', 'Product UOM', required=True),
         'product_min_qty': fields.float('Min Quantity', required=True,
-            help="When the virtual stock goes belong the Min Quantity, OpenERP generates "\
+            help="When the virtual stock goes below the Min Quantity, OpenERP generates "\
             "a procurement to bring the virtual stock to the Max Quantity."),
         'product_max_qty': fields.float('Max Quantity', required=True,
-            help="When the virtual stock goes belong the Max Quantity, OpenERP generates "\
+            help="When the virtual stock goes below the Max Quantity, OpenERP generates "\
             "a procurement to bring the virtual stock to the Max Quantity."),
         'qty_multiple': fields.integer('Qty Multiple', required=True,
-            help="The procurement quantity will by rounded up to this multiple."),
+            help="The procurement quantity will be rounded up to this multiple."),
         'procurement_id': fields.many2one('procurement.order', 'Latest procurement', ondelete="set null"),
         'company_id': fields.many2one('res.company','Company',required=True),
         'procurement_draft_ids': fields.function(_get_draft_procurements, method=True, type='many2many', relation="procurement.order", \

From 943c96f639e92e62d900792045bffbe13473c646 Mon Sep 17 00:00:00 2001
From: "Ujjvala Collins (OpenERP)" <uco@tinyerp.com>
Date: Fri, 15 Apr 2011 14:15:14 +0530
Subject: [PATCH 231/331] [FIX] document: Renamed tab name.

lp bug: https://launchpad.net/bugs/758717 fixed

bzr revid: uco@tinyerp.com-20110415084514-l0ohwka0ayrgqun8
---
 addons/document/document_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml
index 6f82dde0a4f..c82c7be8973 100644
--- a/addons/document/document_view.xml
+++ b/addons/document/document_view.xml
@@ -274,7 +274,7 @@
                         <field name="write_date" readonly="1"/>
                     </group>
                 </page>
-                <page string="Indexed Content" groups="base.group_extended">
+                <page string="Indexed Content - experimental" groups="base.group_extended">
                     <field name="index_content" colspan="4" nolabel="1"/>
                 </page>
                 <page string="Notes">

From 6b83b67f60e6336b8b2e2fdb809e35c1e1b7a3cb Mon Sep 17 00:00:00 2001
From: skh <skh@tinyerp.com>
Date: Fri, 15 Apr 2011 14:19:06 +0530
Subject: [PATCH 232/331] [FIX] Adding working time in a confirmed timesheet

lp bug: https://launchpad.net/bugs/760493 fixed

bzr revid: skh@tinyerp.com-20110415084906-j70rij3nfvr77cn3
---
 addons/hr_timesheet_sheet/hr_timesheet_sheet.py | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
index 23ab63247e5..c65dc810c3e 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
@@ -481,6 +481,19 @@ class hr_timesheet_line(osv.osv):
         'date': _get_default_date,
     }
 
+    def _check_sheet_state(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
+        line = self.browse(cr, uid, ids, context=context)
+        for timesheet in line:
+            if timesheet.sheet_id and timesheet.sheet_id.state not in ('draft', 'new'):
+                return False
+        return True
+
+    _constraints = [
+        (_check_sheet_state, 'You can not modify an entry in a confirmed timesheet !.', ['state']),
+    ]
+
     def create(self, cr, uid, vals, *args, **kwargs):
         if vals.get('sheet_id', False):
             ts = self.pool.get('hr_timesheet_sheet.sheet').browse(cr, uid, vals['sheet_id'])

From bb0095642e246702212db85b271d1833bf27f779 Mon Sep 17 00:00:00 2001
From: mtr <mtr@mtr>
Date: Fri, 15 Apr 2011 14:43:34 +0530
Subject: [PATCH 233/331] [FIX] sale:improved execute method of config wizard
 when there is one step picking

lp bug: https://launchpad.net/bugs/759695 fixed

bzr revid: mtr@mtr-20110415091334-tna4ac2k0e1ltnwn
---
 addons/sale/sale.py | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index f80d610eb03..60b09f08518 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -710,7 +710,7 @@ class sale_order(osv.osv):
                         'note': line.notes,
                         'company_id': order.company_id.id,
                     })
-
+                    
                 if line.product_id:
                     proc_id = self.pool.get('procurement.order').create(cr, uid, {
                         'name': line.name,
@@ -1202,14 +1202,16 @@ class sale_config_picking_policy(osv.osv_memory):
     }
 
     def execute(self, cr, uid, ids, context=None):
+        ir_values_obj = self.pool.get('ir.values')
+        ir_model_data_obj = self.pool.get('ir.model.data')
+        location_id = ir_model_data_obj.get_object_reference(cr, uid, 'stock', 'stock_location_output')
+        location_id = location_id and location_id[1] or False
         for o in self.browse(cr, uid, ids, context=context):
-            ir_values_obj = self.pool.get('ir.values')
             ir_values_obj.set(cr, uid, 'default', False, 'picking_policy', ['sale.order'], o.picking_policy)
             ir_values_obj.set(cr, uid, 'default', False, 'order_policy', ['sale.order'], o.order_policy)
+            if o.step == 'one':
+                self.pool.get('stock.location').write(cr, uid, [location_id], {'chained_auto_packing': 'transparent'})
             if o.step == 'two':
-                md = self.pool.get('ir.model.data')
-                location_id = md.get_object_reference(cr, uid, 'stock', 'stock_location_output')
-                location_id = location_id and location_id[1] or False
                 self.pool.get('stock.location').write(cr, uid, [location_id], {'chained_auto_packing': 'manual'})
 
 sale_config_picking_policy()

From 75c16a19ccb94283f0897421db4fb5583cee2200 Mon Sep 17 00:00:00 2001
From: skh <skh@tinyerp.com>
Date: Fri, 15 Apr 2011 14:44:28 +0530
Subject: [PATCH 234/331] [FIX] Adding working time in a confirmed timesheet

lp bug: https://launchpad.net/bugs/760493 fixed

bzr revid: skh@tinyerp.com-20110415091428-r9rm44mkdnjiwp9x
---
 addons/hr_timesheet_sheet/hr_timesheet_sheet.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
index c65dc810c3e..4e5d8331441 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
@@ -484,14 +484,13 @@ class hr_timesheet_line(osv.osv):
     def _check_sheet_state(self, cr, uid, ids, context=None):
         if context is None:
             context = {}
-        line = self.browse(cr, uid, ids, context=context)
-        for timesheet in line:
-            if timesheet.sheet_id and timesheet.sheet_id.state not in ('draft', 'new'):
+        for timesheet_line in self.browse(cr, uid, ids, context=context):
+            if timesheet_line.sheet_id and timesheet_line.sheet_id.state not in ('draft', 'new'):
                 return False
         return True
 
     _constraints = [
-        (_check_sheet_state, 'You can not modify an entry in a confirmed timesheet !.', ['state']),
+        (_check_sheet_state, 'You can not modify an entry in a Confirmed/Done timesheet !.', ['state']),
     ]
 
     def create(self, cr, uid, vals, *args, **kwargs):

From 4b46fd652aef91324875955e04256ca158d89ce3 Mon Sep 17 00:00:00 2001
From: mtr <mtr@mtr>
Date: Fri, 15 Apr 2011 15:05:16 +0530
Subject: [PATCH 235/331] [IMP] sale:improved code for revision no 4640

bzr revid: mtr@mtr-20110415093516-r3ffuz6mrbaqca3c
---
 addons/sale/sale.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 60b09f08518..1c0e8cc48f7 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -1204,15 +1204,16 @@ class sale_config_picking_policy(osv.osv_memory):
     def execute(self, cr, uid, ids, context=None):
         ir_values_obj = self.pool.get('ir.values')
         ir_model_data_obj = self.pool.get('ir.model.data')
+        stock_location_obj = self.pool.get('stock.location')
         location_id = ir_model_data_obj.get_object_reference(cr, uid, 'stock', 'stock_location_output')
         location_id = location_id and location_id[1] or False
         for o in self.browse(cr, uid, ids, context=context):
             ir_values_obj.set(cr, uid, 'default', False, 'picking_policy', ['sale.order'], o.picking_policy)
             ir_values_obj.set(cr, uid, 'default', False, 'order_policy', ['sale.order'], o.order_policy)
             if o.step == 'one':
-                self.pool.get('stock.location').write(cr, uid, [location_id], {'chained_auto_packing': 'transparent'})
+                stock_location_obj.write(cr, uid, [location_id], {'chained_auto_packing': 'transparent'})
             if o.step == 'two':
-                self.pool.get('stock.location').write(cr, uid, [location_id], {'chained_auto_packing': 'manual'})
+                stock_location_obj.write(cr, uid, [location_id], {'chained_auto_packing': 'manual'})
 
 sale_config_picking_policy()
 

From c2719f0f8cd984db73cb9ca58907c7a53f7c700a Mon Sep 17 00:00:00 2001
From: skh <skh@tinyerp.com>
Date: Fri, 15 Apr 2011 15:35:34 +0530
Subject: [PATCH 236/331] [FIX] Adding working time in a confirmed timesheet

lp bug: https://launchpad.net/bugs/760493 fixed

bzr revid: skh@tinyerp.com-20110415100534-g823ifs3sa7ufz4l
---
 addons/hr_timesheet_sheet/hr_timesheet_sheet.py | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
index 4e5d8331441..6fca2b7e23e 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
@@ -493,21 +493,10 @@ class hr_timesheet_line(osv.osv):
         (_check_sheet_state, 'You can not modify an entry in a Confirmed/Done timesheet !.', ['state']),
     ]
 
-    def create(self, cr, uid, vals, *args, **kwargs):
-        if vals.get('sheet_id', False):
-            ts = self.pool.get('hr_timesheet_sheet.sheet').browse(cr, uid, vals['sheet_id'])
-            if not ts.state in ('draft', 'new'):
-                raise osv.except_osv(_('Error !'), _('You can not modify an entry in a confirmed timesheet !'))
-        return super(hr_timesheet_line,self).create(cr, uid, vals, *args, **kwargs)
-
     def unlink(self, cr, uid, ids, *args, **kwargs):
         self._check(cr, uid, ids)
         return super(hr_timesheet_line,self).unlink(cr, uid, ids,*args, **kwargs)
 
-    def write(self, cr, uid, ids, *args, **kwargs):
-        self._check(cr, uid, ids)
-        return super(hr_timesheet_line,self).write(cr, uid, ids,*args, **kwargs)
-
     def _check(self, cr, uid, ids):
         for att in self.browse(cr, uid, ids):
             if att.sheet_id and att.sheet_id.state not in ('draft', 'new'):

From f91905c2f024530e6164d64570324375e9c55763 Mon Sep 17 00:00:00 2001
From: rch-openerp <rch@tinyerp.com>
Date: Fri, 15 Apr 2011 15:39:01 +0530
Subject: [PATCH 237/331] [FIX]: Usability: Labels of Account module's Wizards.

bzr revid: rch@tinyerp.com-20110415100901-ya1358pdli70465a
---
 .../account/wizard/account_report_aged_partner_balance.py | 2 +-
 addons/account/wizard/account_report_common.py            | 8 ++++----
 addons/account/wizard/account_report_common_account.py    | 2 +-
 addons/account/wizard/account_report_general_ledger.py    | 4 ++--
 addons/account/wizard/account_report_partner_ledger.py    | 4 ++--
 addons/account/wizard/account_report_print_journal.py     | 2 +-
 addons/account/wizard/account_vat.py                      | 2 +-
 7 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/addons/account/wizard/account_report_aged_partner_balance.py b/addons/account/wizard/account_report_aged_partner_balance.py
index 59784e6e15d..4e6c6dea752 100644
--- a/addons/account/wizard/account_report_aged_partner_balance.py
+++ b/addons/account/wizard/account_report_aged_partner_balance.py
@@ -31,7 +31,7 @@ class account_aged_trial_balance(osv.osv_memory):
     _description = 'Account Aged Trial balance Report'
 
     _columns = {
-        'period_length':fields.integer('Period length (days)', required=True),
+        'period_length':fields.integer('Period Length (days)', required=True),
         'direction_selection': fields.selection([('past','Past'),
                                                  ('future','Future')],
                                                  'Analysis Direction', required=True),
diff --git a/addons/account/wizard/account_report_common.py b/addons/account/wizard/account_report_common.py
index 7a8a0365208..42153c096e6 100644
--- a/addons/account/wizard/account_report_common.py
+++ b/addons/account/wizard/account_report_common.py
@@ -30,11 +30,11 @@ class account_common_report(osv.osv_memory):
     _description = "Account Common Report"
 
     _columns = {
-        'chart_account_id': fields.many2one('account.account', 'Chart of account', help='Select Charts of Accounts', required=True, domain = [('parent_id','=',False)]),
-        'fiscalyear_id': fields.many2one('account.fiscalyear', 'Fiscal year', help='Keep empty for all open fiscal year'),
+        'chart_account_id': fields.many2one('account.account', 'Chart of Account', help='Select Charts of Accounts', required=True, domain = [('parent_id','=',False)]),
+        'fiscalyear_id': fields.many2one('account.fiscalyear', 'Fiscal Year', help='Keep empty for all open fiscal year'),
         'filter': fields.selection([('filter_no', 'No Filters'), ('filter_date', 'Date'), ('filter_period', 'Periods')], "Filter by", required=True),
-        'period_from': fields.many2one('account.period', 'Start period'),
-        'period_to': fields.many2one('account.period', 'End period'),
+        'period_from': fields.many2one('account.period', 'Start Period'),
+        'period_to': fields.many2one('account.period', 'End Period'),
         'journal_ids': fields.many2many('account.journal', 'account_common_journal_rel', 'account_id', 'journal_id', 'Journals', required=True),
         'date_from': fields.date("Start Date"),
         'date_to': fields.date("End Date"),
diff --git a/addons/account/wizard/account_report_common_account.py b/addons/account/wizard/account_report_common_account.py
index 7205a9e53bf..0040d563bdd 100644
--- a/addons/account/wizard/account_report_common_account.py
+++ b/addons/account/wizard/account_report_common_account.py
@@ -28,7 +28,7 @@ class account_common_account_report(osv.osv_memory):
     _columns = {
         'display_account': fields.selection([('bal_all','All'), ('bal_movement','With movements'),
                                             ('bal_solde','With balance is not equal to 0'),
-                                            ],'Display accounts', required=True),
+                                            ],'Display Accounts', required=True),
 
     }
     _defaults = {
diff --git a/addons/account/wizard/account_report_general_ledger.py b/addons/account/wizard/account_report_general_ledger.py
index c08894bfadd..1e17a66dd85 100644
--- a/addons/account/wizard/account_report_general_ledger.py
+++ b/addons/account/wizard/account_report_general_ledger.py
@@ -28,10 +28,10 @@ class account_report_general_ledger(osv.osv_memory):
 
     _columns = {
         'landscape': fields.boolean("Landscape Mode"),
-        'initial_balance': fields.boolean("Include initial balances",
+        'initial_balance': fields.boolean("Include Initial Balances",
                                           help='It adds initial balance row on report which display previous sum amount of debit/credit/balance'),
         'amount_currency': fields.boolean("With Currency", help="It adds the currency column if the currency is different then the company currency"),
-        'sortby': fields.selection([('sort_date', 'Date'), ('sort_journal_partner', 'Journal & Partner')], 'Sort By', required=True),
+        'sortby': fields.selection([('sort_date', 'Date'), ('sort_journal_partner', 'Journal & Partner')], 'Sort by', required=True),
     }
     _defaults = {
         'landscape': True,
diff --git a/addons/account/wizard/account_report_partner_ledger.py b/addons/account/wizard/account_report_partner_ledger.py
index 1a09a6344f4..590ba80bd02 100644
--- a/addons/account/wizard/account_report_partner_ledger.py
+++ b/addons/account/wizard/account_report_partner_ledger.py
@@ -30,10 +30,10 @@ class account_partner_ledger(osv.osv_memory):
     _description = 'Account Partner Ledger'
 
     _columns = {
-        'initial_balance': fields.boolean('Include initial balances',
+        'initial_balance': fields.boolean('Include Initial Balances',
                                     help='It adds initial balance row on report which display previous sum amount of debit/credit/balance'),
         'reconcil': fields.boolean('Include Reconciled Entries', help='Consider reconciled entries'),
-        'page_split': fields.boolean('One Partner Per Page', help='Display Ledger Report with One partner per page'),
+        'page_split': fields.boolean('One Partner per Page', help='Display Ledger Report with One partner per page'),
         'amount_currency': fields.boolean("With Currency", help="It adds the currency column if the currency is different then the company currency"),
 
     }
diff --git a/addons/account/wizard/account_report_print_journal.py b/addons/account/wizard/account_report_print_journal.py
index b1ca30dc560..f4a5fcaf9f9 100644
--- a/addons/account/wizard/account_report_print_journal.py
+++ b/addons/account/wizard/account_report_print_journal.py
@@ -29,7 +29,7 @@ class account_print_journal(osv.osv_memory):
     _columns = {
         'sort_selection': fields.selection([('date', 'Date'),
                                             ('ref', 'Reference Number'),],
-                                            'Entries Sorted By', required=True),
+                                            'Entries Sorted by', required=True),
     }
     _defaults = {
         'sort_selection': 'date',
diff --git a/addons/account/wizard/account_vat.py b/addons/account/wizard/account_vat.py
index 3aecfb04a30..186f79cad6d 100644
--- a/addons/account/wizard/account_vat.py
+++ b/addons/account/wizard/account_vat.py
@@ -28,7 +28,7 @@ class account_vat_declaration(osv.osv_memory):
     _columns = {
         'based_on': fields.selection([('invoices', 'Invoices'),
                                       ('payments', 'Payments'),],
-                                      'Based On', required=True),
+                                      'Based on', required=True),
         'chart_tax_id': fields.many2one('account.tax.code', 'Chart of Tax', help='Select Charts of Taxes', required=True, domain = [('parent_id','=', False)]),
     }
 

From 995b1bacd84985a25d59dcf4d81da5a1fb9e9ca4 Mon Sep 17 00:00:00 2001
From: mtr <mtr@mtr>
Date: Fri, 15 Apr 2011 16:11:21 +0530
Subject: [PATCH 238/331] [IMP] sale: optimized code for execute method of
 config wizard

bzr revid: mtr@mtr-20110415104121-30u1fodo8osjw9v3
---
 addons/sale/sale.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 1c0e8cc48f7..4a49a52ede1 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -1207,13 +1207,15 @@ class sale_config_picking_policy(osv.osv_memory):
         stock_location_obj = self.pool.get('stock.location')
         location_id = ir_model_data_obj.get_object_reference(cr, uid, 'stock', 'stock_location_output')
         location_id = location_id and location_id[1] or False
+        chaining_type = False
         for o in self.browse(cr, uid, ids, context=context):
             ir_values_obj.set(cr, uid, 'default', False, 'picking_policy', ['sale.order'], o.picking_policy)
             ir_values_obj.set(cr, uid, 'default', False, 'order_policy', ['sale.order'], o.order_policy)
             if o.step == 'one':
-                stock_location_obj.write(cr, uid, [location_id], {'chained_auto_packing': 'transparent'})
-            if o.step == 'two':
-                stock_location_obj.write(cr, uid, [location_id], {'chained_auto_packing': 'manual'})
+                chaining_type = 'transparent'
+            else:
+                chaining_type = 'manual'
+            stock_location_obj.write(cr, uid, [location_id], {'chained_auto_packing': chaining_type})
 
 sale_config_picking_policy()
 

From 25da1b63a304c815c064282256703bfc7d938bb1 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Sun, 17 Apr 2011 04:36:34 +0000
Subject: [PATCH 239/331] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20110416045916-5ck4ifulww06owks
bzr revid: launchpad_translations_on_behalf_of_openerp-20110417043634-x8jqcrbbylxdj06l
---
 addons/account/i18n/ru.po                |   50 +-
 addons/account_analytic_plans/i18n/ru.po |    9 +-
 addons/board/i18n/ln.po                  |  393 +++++
 addons/caldav/i18n/ca.po                 |  818 +++++++++++
 addons/crm/i18n/ru.po                    |    8 +-
 addons/crm_fundraising/i18n/pt_BR.po     |   10 +-
 addons/email_template/i18n/ca.po         | 1278 ++++++++++++++++
 addons/email_template/i18n/pt_BR.po      |   14 +-
 addons/survey/i18n/ca.po                 | 1717 ++++++++++++++++++++++
 addons/survey/i18n/pt_BR.po              |   56 +-
 addons/wiki/i18n/ru.po                   |   57 +-
 11 files changed, 4316 insertions(+), 94 deletions(-)
 create mode 100644 addons/board/i18n/ln.po
 create mode 100644 addons/caldav/i18n/ca.po
 create mode 100644 addons/email_template/i18n/ca.po
 create mode 100644 addons/survey/i18n/ca.po

diff --git a/addons/account/i18n/ru.po b/addons/account/i18n/ru.po
index 575723fc90d..2a4d65e1ef4 100644
--- a/addons/account/i18n/ru.po
+++ b/addons/account/i18n/ru.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-03-20 16:41+0000\n"
+"PO-Revision-Date: 2011-04-15 19:34+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@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: 2011-03-21 04:46+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-04-16 04:59+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -2890,7 +2890,7 @@ msgstr "Вид"
 #: code:addons/account/account.py:2951
 #, python-format
 msgid "BNK%s"
-msgstr ""
+msgstr "БНК%s"
 
 #. module: account
 #: code:addons/account/account.py:2906
@@ -3751,7 +3751,7 @@ msgstr ""
 #. module: account
 #: view:account.tax.template:0
 msgid "Search Tax Templates"
-msgstr ""
+msgstr "Искать шаблоны налогов"
 
 #. module: account
 #: model:ir.ui.menu,name:account.periodical_processing_journal_entries_validation
@@ -4547,7 +4547,7 @@ msgstr ""
 #: code:addons/account/account.py:940
 #, python-format
 msgid "Start period should be smaller then End period"
-msgstr ""
+msgstr "Начало периода должно быть меньше, чем конец периода"
 
 #. module: account
 #: selection:account.automatic.reconcile,power:0
@@ -5090,7 +5090,7 @@ msgstr "Количество"
 #. module: account
 #: view:account.move.line:0
 msgid "Number (Move)"
-msgstr ""
+msgstr "Номер (перемещение)"
 
 #. module: account
 #: view:account.invoice.refund:0
@@ -5164,7 +5164,7 @@ msgstr "Фиксированная величина"
 #. module: account
 #: view:account.subscription:0
 msgid "Valid Up to"
-msgstr ""
+msgstr "Действительно до"
 
 #. module: account
 #: view:board.board:0
@@ -5191,7 +5191,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:account.action_account_fiscalyear_close
 #: model:ir.ui.menu,name:account.menu_wizard_fy_close
 msgid "Generate Opening Entries"
-msgstr ""
+msgstr "Генерировать открывающие проводки"
 
 #. module: account
 #: code:addons/account/account_move_line.py:738
@@ -5261,7 +5261,7 @@ msgstr "Поставщик"
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "March"
-msgstr ""
+msgstr "Март"
 
 #. module: account
 #: view:account.account.template:0
@@ -5370,7 +5370,7 @@ msgstr "# строк"
 #: code:addons/account/wizard/account_change_currency.py:60
 #, python-format
 msgid "New currency is not confirured properly !"
-msgstr ""
+msgstr "Новая валюта неправильно настроена !"
 
 #. module: account
 #: field:account.aged.trial.balance,filter:0
@@ -5624,7 +5624,7 @@ msgstr "Настройка отчетов"
 #. module: account
 #: constraint:account.move.line:0
 msgid "Company must be same for its related account and period."
-msgstr ""
+msgstr "Для счета и периода должна быть одна компания."
 
 #. module: account
 #: field:account.tax,type:0
@@ -5927,7 +5927,7 @@ msgstr ""
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:57
 #, python-format
 msgid "Enter a Start date !"
-msgstr ""
+msgstr "Введите дату начала !"
 
 #. module: account
 #: report:account.invoice:0
@@ -6141,6 +6141,8 @@ msgid ""
 "This account will be used instead of the default one as the receivable "
 "account for the current partner"
 msgstr ""
+"Этот счет будет использоваться, вместо счета по умолчанию, для дебиторской "
+"задолженности по текущему контрагенту."
 
 #. module: account
 #: field:account.tax,python_applicable:0
@@ -6315,13 +6317,13 @@ msgstr ""
 #. module: account
 #: view:account.journal.select:0
 msgid "Journal Select"
-msgstr ""
+msgstr "Выбор журнала"
 
 #. module: account
 #: code:addons/account/wizard/account_change_currency.py:65
 #, python-format
 msgid "Currnt currency is not confirured properly !"
-msgstr ""
+msgstr "Текущая валюта неправильно настроена !"
 
 #. module: account
 #: model:ir.model,name:account.model_account_move_reconcile
@@ -6468,7 +6470,7 @@ msgstr "Выполнено"
 #. module: account
 #: model:process.transition,note:account.process_transition_invoicemanually0
 msgid "A statement with manual entries becomes a draft statement."
-msgstr ""
+msgstr "Документ с проводками вручную становится черновиком."
 
 #. module: account
 #: view:account.aged.trial.balance:0
@@ -6782,7 +6784,7 @@ msgstr "Отчетность"
 #. module: account
 #: sql_constraint:account.journal:0
 msgid "The code of the journal must be unique per company !"
-msgstr ""
+msgstr "Код журнала должен быть уникальным для компании !"
 
 #. module: account
 #: field:account.bank.statement,ending_details_ids:0
@@ -6822,7 +6824,7 @@ msgstr "Домен"
 #. module: account
 #: model:ir.model,name:account.model_account_use_model
 msgid "Use model"
-msgstr ""
+msgstr "Использовать модель"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_moves_purchase
@@ -7417,7 +7419,7 @@ msgstr "Банковские и кассовые счета"
 #: view:account.invoice.report:0
 #: field:account.invoice.report,residual:0
 msgid "Total Residual"
-msgstr ""
+msgstr "Общий остаток"
 
 #. module: account
 #: model:process.node,note:account.process_node_invoiceinvoice0
@@ -7798,6 +7800,8 @@ msgstr "Поставщики"
 msgid ""
 "You cannot create more than one move per period on centralized journal"
 msgstr ""
+"Вы не можете создать больше одного действия за период по централизованному "
+"журналу."
 
 #. module: account
 #: view:account.journal:0
@@ -8488,7 +8492,7 @@ msgstr ""
 #: model:process.node,note:account.process_node_manually0
 #: model:process.transition,name:account.process_transition_invoicemanually0
 msgid "Manual entry"
-msgstr ""
+msgstr "Проводка вручную"
 
 #. module: account
 #: report:account.general.ledger:0
@@ -8697,7 +8701,7 @@ msgstr "Не сверенные"
 #: code:addons/account/invoice.py:804
 #, python-format
 msgid "Bad total !"
-msgstr ""
+msgstr "Плохой итог !"
 
 #. module: account
 #: field:account.journal,sequence_id:0
@@ -9200,7 +9204,7 @@ msgstr "Определить повторяющиеся проводки"
 #. module: account
 #: field:account.entries.report,date_maturity:0
 msgid "Date Maturity"
-msgstr ""
+msgstr "Дата погашения"
 
 #. module: account
 #: help:account.bank.statement,total_entry_encoding:0
@@ -9228,7 +9232,7 @@ msgstr ""
 #. module: account
 #: model:ir.model,name:account.model_account_balance_report
 msgid "Trial Balance Report"
-msgstr ""
+msgstr "Балансовый отчет"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_bank_statement_draft_tree
diff --git a/addons/account_analytic_plans/i18n/ru.po b/addons/account_analytic_plans/i18n/ru.po
index ca2f431d36e..6f5f6baa5ba 100644
--- a/addons/account_analytic_plans/i18n/ru.po
+++ b/addons/account_analytic_plans/i18n/ru.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-03 16:56+0000\n"
-"PO-Revision-Date: 2011-02-19 12:26+0000\n"
+"PO-Revision-Date: 2011-04-15 19:38+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@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: 2011-02-20 04:34+0000\n"
-"X-Generator: Launchpad (build 12351)\n"
+"X-Launchpad-Export-Date: 2011-04-16 04:59+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
 #. module: account_analytic_plans
 #: view:analytic.plan.create.model:0
@@ -154,6 +154,7 @@ msgstr ""
 msgid ""
 "You can not create move line on receivable/payable account without partner"
 msgstr ""
+"Нельзя сделать действие по дебетовому/кредитовому счету без контрагента"
 
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_sale_order_line
@@ -361,7 +362,7 @@ msgstr "Счет 1 уровня"
 #. module: account_analytic_plans
 #: constraint:account.move.line:0
 msgid "Company must be same for its related account and period."
-msgstr ""
+msgstr "Для счета и периода должна быть одна компания."
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.line,min_required:0
diff --git a/addons/board/i18n/ln.po b/addons/board/i18n/ln.po
new file mode 100644
index 00000000000..0544a3e51ec
--- /dev/null
+++ b/addons/board/i18n/ln.po
@@ -0,0 +1,393 @@
+# Lingala translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2011-04-15 08:55+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Lingala <ln@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: 2011-04-16 04:59+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
+
+#. module: board
+#: view:res.log.report:0
+msgid "  Year  "
+msgstr "  Mobú  "
+
+#. module: board
+#: model:ir.model,name:board.model_board_menu_create
+msgid "Menu Create"
+msgstr ""
+
+#. module: board
+#: view:board.note:0
+#: field:board.note.type,name:0
+#: model:ir.model,name:board.model_board_note_type
+msgid "Note Type"
+msgstr ""
+
+#. module: board
+#: view:board.note:0
+#: field:board.note,user_id:0
+msgid "Author"
+msgstr ""
+
+#. module: board
+#: model:ir.module.module,shortdesc:board.module_meta_information
+msgid "Dashboard main module"
+msgstr ""
+
+#. module: board
+#: view:res.users:0
+msgid "Latest Connections"
+msgstr ""
+
+#. module: board
+#: code:addons/board/wizard/board_menu_create.py:45
+#, python-format
+msgid "User Error!"
+msgstr ""
+
+#. module: board
+#: view:board.board:0
+#: model:ir.actions.act_window,name:board.open_board_administration_form
+#: model:ir.ui.menu,name:board.menu_board_admin
+msgid "Administration Dashboard"
+msgstr ""
+
+#. module: board
+#: view:board.note:0
+#: field:board.note,note:0
+#: model:ir.model,name:board.model_board_note
+msgid "Note"
+msgstr ""
+
+#. module: board
+#: view:board.note:0
+#: view:res.log.report:0
+msgid "Group By..."
+msgstr ""
+
+#. module: board
+#: model:ir.model,name:board.model_board_board
+msgid "Board"
+msgstr ""
+
+#. module: board
+#: view:board.board:0
+#: model:ir.actions.act_window,name:board.board_weekly_res_log_report_action
+#: view:res.log.report:0
+msgid "Weekly Global Activity"
+msgstr ""
+
+#. module: board
+#: field:board.board.line,name:0
+msgid "Title"
+msgstr ""
+
+#. module: board
+#: field:res.log.report,nbr:0
+msgid "# of Entries"
+msgstr ""
+
+#. module: board
+#: view:res.log.report:0
+#: field:res.log.report,month:0
+msgid "Month"
+msgstr "Sánzá"
+
+#. module: board
+#: model:ir.actions.act_window,name:board.dashboard_open
+msgid "Open Dashboard"
+msgstr ""
+
+#. module: board
+#: view:board.board:0
+#: model:ir.actions.act_window,name:board.board_monthly_res_log_report_action
+#: view:res.log.report:0
+msgid "Monthly Activity per Document"
+msgstr ""
+
+#. module: board
+#: view:res.log.report:0
+msgid "Log Analysis"
+msgstr ""
+
+#. module: board
+#: model:ir.actions.act_window,name:board.action_view_board_list_form
+#: model:ir.ui.menu,name:board.menu_view_board_form
+msgid "Dashboard Definition"
+msgstr ""
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "March"
+msgstr "mársi"
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "August"
+msgstr "augústo"
+
+#. module: board
+#: view:board.board:0
+#: model:ir.actions.act_window,name:board.action_user_connection_tree
+msgid "User Connections"
+msgstr ""
+
+#. module: board
+#: field:res.log.report,creation_date:0
+msgid "Creation Date"
+msgstr ""
+
+#. module: board
+#: model:ir.actions.act_window,name:board.action_view_board_note_form
+#: model:ir.ui.menu,name:board.menu_view_board_note_form
+msgid "Publish a note"
+msgstr ""
+
+#. module: board
+#: view:board.menu.create:0
+msgid "Menu Information"
+msgstr ""
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "June"
+msgstr "yúni"
+
+#. module: board
+#: field:board.note,type:0
+msgid "Note type"
+msgstr ""
+
+#. module: board
+#: field:board.board,line_ids:0
+msgid "Action Views"
+msgstr ""
+
+#. module: board
+#: model:ir.model,name:board.model_res_log_report
+msgid "Log Report"
+msgstr ""
+
+#. module: board
+#: view:board.note:0
+#: field:board.note,date:0
+msgid "Date"
+msgstr "Dáte"
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "July"
+msgstr "yúli"
+
+#. module: board
+#: view:res.log.report:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: board
+#: view:res.log.report:0
+#: field:res.log.report,day:0
+msgid "Day"
+msgstr "Mokɔlɔ"
+
+#. module: board
+#: view:board.menu.create:0
+msgid "Create Menu For Dashboard"
+msgstr ""
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "February"
+msgstr "febwáli"
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "October"
+msgstr "ɔkɔtɔ́bɛ"
+
+#. module: board
+#: model:ir.model,name:board.model_board_board_line
+msgid "Board Line"
+msgstr ""
+
+#. module: board
+#: field:board.menu.create,menu_parent_id:0
+msgid "Parent Menu"
+msgstr ""
+
+#. module: board
+#: view:res.log.report:0
+msgid "    Month-1    "
+msgstr "    Sánzá-1    "
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "January"
+msgstr "yanwáli"
+
+#. module: board
+#: view:board.note:0
+msgid "Notes"
+msgstr ""
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "November"
+msgstr "novɛ́mbɛ"
+
+#. module: board
+#: help:board.board.line,sequence:0
+msgid ""
+"Gives the sequence order                         when displaying a list of "
+"board lines."
+msgstr ""
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "April"
+msgstr "apríli"
+
+#. module: board
+#: view:board.board:0
+#: field:board.board,name:0
+#: field:board.board.line,board_id:0
+#: model:ir.ui.menu,name:board.admin_menu_dasboard
+#: model:ir.ui.menu,name:board.menu_dasboard
+msgid "Dashboard"
+msgstr ""
+
+#. module: board
+#: model:ir.module.module,description:board.module_meta_information
+msgid "Base module for all dashboards."
+msgstr ""
+
+#. module: board
+#: field:board.board.line,action_id:0
+msgid "Action"
+msgstr ""
+
+#. module: board
+#: field:board.board.line,position:0
+msgid "Position"
+msgstr ""
+
+#. module: board
+#: view:res.log.report:0
+msgid "Model"
+msgstr ""
+
+#. module: board
+#: field:board.menu.create,menu_name:0
+msgid "Menu Name"
+msgstr ""
+
+#. module: board
+#: view:board.board:0
+#: model:ir.actions.act_window,name:board.action_latest_activities_tree
+msgid "Latest Activities"
+msgstr ""
+
+#. module: board
+#: selection:board.board.line,position:0
+msgid "Left"
+msgstr ""
+
+#. module: board
+#: field:board.board,view_id:0
+msgid "Board View"
+msgstr ""
+
+#. module: board
+#: selection:board.board.line,position:0
+msgid "Right"
+msgstr ""
+
+#. module: board
+#: field:board.board.line,width:0
+msgid "Width"
+msgstr ""
+
+#. module: board
+#: view:res.log.report:0
+msgid "   Month   "
+msgstr "   Sánzá   "
+
+#. module: board
+#: field:board.board.line,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "September"
+msgstr "sɛtɛ́mbɛ"
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "December"
+msgstr "dɛsɛ́mbɛ"
+
+#. module: board
+#: view:board.board:0
+#: view:board.menu.create:0
+msgid "Create Menu"
+msgstr ""
+
+#. module: board
+#: field:board.board.line,height:0
+msgid "Height"
+msgstr ""
+
+#. module: board
+#: model:ir.actions.act_window,name:board.action_board_menu_create
+msgid "Create Board Menu"
+msgstr ""
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "May"
+msgstr "máyí"
+
+#. module: board
+#: field:res.log.report,res_model:0
+msgid "Object"
+msgstr ""
+
+#. module: board
+#: view:res.log.report:0
+#: field:res.log.report,name:0
+msgid "Year"
+msgstr "Mobú"
+
+#. module: board
+#: view:board.menu.create:0
+msgid "Cancel"
+msgstr "Tika"
+
+#. module: board
+#: view:board.board:0
+msgid "Dashboard View"
+msgstr ""
+
+#. module: board
+#: code:addons/board/wizard/board_menu_create.py:46
+#, python-format
+msgid "Please Insert Dashboard View(s) !"
+msgstr ""
+
+#. module: board
+#: view:board.note:0
+#: field:board.note,name:0
+msgid "Subject"
+msgstr ""
diff --git a/addons/caldav/i18n/ca.po b/addons/caldav/i18n/ca.po
new file mode 100644
index 00000000000..0d2cd8ec58e
--- /dev/null
+++ b/addons/caldav/i18n/ca.po
@@ -0,0 +1,818 @@
+# Catalan translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2011-04-15 16:29+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Catalan <ca@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: 2011-04-16 04:59+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
+
+#. module: caldav
+#: view:basic.calendar:0
+msgid "Value Mapping"
+msgstr ""
+
+#. module: caldav
+#: help:caldav.browse,url:0
+msgid "Url of the caldav server, use for synchronization"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar.alias,name:0
+msgid "Filename"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_calendar_event_export
+msgid "Event Export"
+msgstr ""
+
+#. module: caldav
+#: view:calendar.event.subscribe:0
+msgid "Provide path for Remote Calendar"
+msgstr ""
+
+#. module: caldav
+#: model:ir.actions.act_window,name:caldav.action_calendar_event_import_values
+msgid "Import .ics File"
+msgstr ""
+
+#. module: caldav
+#: view:calendar.event.export:0
+msgid "_Close"
+msgstr ""
+
+#. module: caldav
+#: selection:basic.calendar.attributes,type:0
+#: selection:basic.calendar.lines,name:0
+msgid "Attendee"
+msgstr ""
+
+#. module: caldav
+#: sql_constraint:basic.calendar.fields:0
+msgid "Can not map a field more than once"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/calendar.py:772
+#: code:addons/caldav/calendar.py:861
+#: code:addons/caldav/wizard/calendar_event_import.py:63
+#, python-format
+msgid "Warning !"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar.lines,object_id:0
+msgid "Object"
+msgstr ""
+
+#. module: caldav
+#: view:basic.calendar:0
+msgid "Todo"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_user_preference
+msgid "User preference Form"
+msgstr ""
+
+#. module: caldav
+#: field:user.preference,service:0
+msgid "Services"
+msgstr ""
+
+#. module: caldav
+#: selection:basic.calendar.fields,fn:0
+msgid "Expression as constant"
+msgstr ""
+
+#. module: caldav
+#: selection:user.preference,device:0
+msgid "Evolution"
+msgstr ""
+
+#. module: caldav
+#: view:calendar.event.import:0
+#: view:calendar.event.subscribe:0
+msgid "Ok"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/calendar.py:861
+#, python-format
+msgid "Please provide proper configuration of \"%s\" in Calendar Lines"
+msgstr ""
+
+#. module: caldav
+#: field:calendar.event.export,name:0
+msgid "File name"
+msgstr ""
+
+#. module: caldav
+#: field:caldav.browse,url:0
+msgid "Caldav Server"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/wizard/calendar_event_subscribe.py:59
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: caldav
+#: help:caldav.browse,caldav_doc_file:0
+msgid "download full caldav Documentation."
+msgstr ""
+
+#. module: caldav
+#: selection:user.preference,device:0
+msgid "iPhone"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/wizard/caldav_browse.py:32
+#, python-format
+msgid ""
+"\n"
+"  * Webdav server that provides remote access to calendar\n"
+"  * Synchronisation of calendar using WebDAV\n"
+"  * Customize calendar event and todo attribute with any of OpenERP model\n"
+"  * Provides iCal Import/Export functionality\n"
+"\n"
+"    To access Calendars using CalDAV clients, point them to:\n"
+"        "
+"http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/users/USERNAME/c\n"
+"\n"
+"    To access OpenERP Calendar using WebCal to remote site use the URL "
+"like:\n"
+"        "
+"http://HOSTNAME:PORT/webdav/DATABASE_NAME/Calendars/CALENDAR_NAME.ics\n"
+"\n"
+"      Where,\n"
+"        HOSTNAME: Host on which OpenERP server(With webdav) is running\n"
+"        PORT : Port on which OpenERP server is running (By Default : 8069)\n"
+"        DATABASE_NAME: Name of database on which OpenERP Calendar is "
+"created\n"
+"        CALENDAR_NAME: Name of calendar to access\n"
+"     "
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/wizard/caldav_browse.py:147
+#, python-format
+msgid ""
+"\n"
+"Prerequire\n"
+"----------\n"
+"If you are using thunderbird, first you need to install the lightning "
+"module\n"
+"http://www.mozilla.org/projects/calendar/lightning/\n"
+"\n"
+"configuration\n"
+"-------------\n"
+"\n"
+"1. Go to Calendar View\n"
+"\n"
+"2. File -> New Calendar\n"
+"\n"
+"3. Chosse \"On the Network\"\n"
+"\n"
+"4. for format choose CalDav\n"
+"   and as location the url given above (ie : "
+"http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
+"   \n"
+"5. Choose a name and a color for the Calendar, and we advice you to uncheck "
+"\"alarm\"\n"
+"\n"
+"6. Then put your openerp login and password (to give the password only check "
+"the box \"Use password Manager to remember this password\"\n"
+"\n"
+"7. Then Finish, your meetings should appear now in your calendar view\n"
+msgstr ""
+
+#. module: caldav
+#: selection:basic.calendar,type:0
+#: selection:basic.calendar.attributes,type:0
+#: selection:basic.calendar.lines,name:0
+msgid "TODO"
+msgstr ""
+
+#. module: caldav
+#: view:calendar.event.export:0
+msgid "Export ICS"
+msgstr ""
+
+#. module: caldav
+#: selection:basic.calendar.fields,fn:0
+msgid "Use the field"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/calendar.py:772
+#, python-format
+msgid "Can not create line \"%s\" more than once"
+msgstr ""
+
+#. module: caldav
+#: view:basic.calendar:0
+#: field:basic.calendar,line_ids:0
+#: model:ir.model,name:caldav.model_basic_calendar_lines
+msgid "Calendar Lines"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_calendar_event_subscribe
+msgid "Event subscribe"
+msgstr ""
+
+#. module: caldav
+#: view:calendar.event.import:0
+msgid "Import ICS"
+msgstr ""
+
+#. module: caldav
+#: view:calendar.event.import:0
+#: view:calendar.event.subscribe:0
+#: view:user.preference:0
+msgid "_Cancel"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar_event
+msgid "basic.calendar.event"
+msgstr ""
+
+#. module: caldav
+#: view:basic.calendar:0
+#: selection:basic.calendar,type:0
+#: selection:basic.calendar.attributes,type:0
+#: selection:basic.calendar.lines,name:0
+msgid "Event"
+msgstr ""
+
+#. module: caldav
+#: field:document.directory,calendar_collection:0
+#: field:user.preference,collection:0
+msgid "Calendar Collection"
+msgstr ""
+
+#. module: caldav
+#: constraint:document.directory:0
+msgid "Error! You can not create recursive Directories."
+msgstr ""
+
+#. module: caldav
+#: view:user.preference:0
+msgid "_Open"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar,type:0
+#: field:basic.calendar.attributes,type:0
+#: field:basic.calendar.fields,type_id:0
+#: field:basic.calendar.lines,name:0
+msgid "Type"
+msgstr ""
+
+#. module: caldav
+#: help:calendar.event.export,name:0
+msgid "Save in .ics format"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/calendar.py:1275
+#, python-format
+msgid "Error !"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/wizard/caldav_browse.py:128
+#, python-format
+msgid ""
+"\n"
+"    1. Go to Calendar View\n"
+"\n"
+"    2. File -> New -> Calendar\n"
+"\n"
+"    3. Fill the form \n"
+"        - type : CalDav\n"
+"        - name : Whaterver you want (ie : Meeting)\n"
+"        - url : "
+"http://HOST:PORT/webdav/DB_NAME/calendars/users/USER/c/Meetings (ie : "
+"http://localhost:8069/webdav/db_1/calendars/users/demo/c/Meetings) the one "
+"given on the top of this window\n"
+"        - uncheck \"User SSL\"\n"
+"        - Username : Your username (ie : Demo)\n"
+"        - Refresh : everytime you want that evolution synchronize the data "
+"with the server\n"
+"\n"
+"    4. Click ok and give your openerp password\n"
+"\n"
+"    5. A new calendar named with the name you gave should appear on the left "
+"side.     \n"
+"     "
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar_attributes
+msgid "Calendar attributes"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_caldav_browse
+msgid "Caldav Browse"
+msgstr ""
+
+#. module: caldav
+#: model:ir.module.module,description:caldav.module_meta_information
+msgid ""
+"\n"
+"    This module Contains basic functionality for caldav system like:  \n"
+"  - Webdav server that provides remote access to calendar\n"
+"  - Synchronisation of calendar using WebDAV\n"
+"  - Customize calendar event and todo attribute with any of OpenERP model\n"
+"  - Provides iCal Import/Export functionality\n"
+"\n"
+"    To access Calendars using CalDAV clients, point them to:\n"
+"        "
+"http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/users/USERNAME/c\n"
+"\n"
+"    To access OpenERP Calendar using WebCal to remote site use the URL "
+"like:\n"
+"        "
+"http://HOSTNAME:PORT/webdav/DATABASE_NAME/Calendars/CALENDAR_NAME.ics\n"
+"\n"
+"      Where,\n"
+"        HOSTNAME: Host on which OpenERP server(With webdav) is running\n"
+"        PORT : Port on which OpenERP server is running (By Default : 8069)\n"
+"        DATABASE_NAME: Name of database on which OpenERP Calendar is "
+"created\n"
+"        CALENDAR_NAME: Name of calendar to access\n"
+msgstr ""
+
+#. module: caldav
+#: selection:user.preference,device:0
+msgid "Android based device"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar,create_date:0
+msgid "Created Date"
+msgstr ""
+
+#. module: caldav
+#: view:basic.calendar:0
+msgid "Attributes Mapping"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_document_directory
+msgid "Directory"
+msgstr ""
+
+#. module: caldav
+#: field:calendar.event.subscribe,url_path:0
+msgid "Provide path for remote calendar"
+msgstr ""
+
+#. module: caldav
+#: view:caldav.browse:0
+msgid "_Ok"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar.lines,domain:0
+msgid "Domain"
+msgstr ""
+
+#. module: caldav
+#: view:calendar.event.subscribe:0
+msgid "_Subscribe"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar,user_id:0
+msgid "Owner"
+msgstr ""
+
+#. module: caldav
+#: view:basic.calendar:0
+#: field:basic.calendar.alias,cal_line_id:0
+#: field:basic.calendar.lines,calendar_id:0
+#: model:ir.ui.menu,name:caldav.menu_calendar
+#: field:user.preference,calendar:0
+msgid "Calendar"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/calendar.py:41
+#, python-format
+msgid ""
+"Please install python-vobject from http://vobject.skyhouseconsulting.com/"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/wizard/calendar_event_import.py:63
+#, python-format
+msgid "Invalid format of the ics, file can not be imported"
+msgstr ""
+
+#. module: caldav
+#: selection:user.preference,service:0
+msgid "CalDAV"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar.fields,field_id:0
+msgid "OpenObject Field"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar.alias,res_id:0
+msgid "Res. ID"
+msgstr ""
+
+#. module: caldav
+#: view:calendar.event.subscribe:0
+msgid "Message..."
+msgstr ""
+
+#. module: caldav
+#: selection:user.preference,device:0
+msgid "Other"
+msgstr ""
+
+#. module: caldav
+#: view:basic.calendar:0
+#: field:basic.calendar,has_webcal:0
+msgid "WebCal"
+msgstr ""
+
+#. module: caldav
+#: view:document.directory:0
+#: model:ir.actions.act_window,name:caldav.action_calendar_collection_form
+#: model:ir.ui.menu,name:caldav.menu_calendar_collection
+msgid "Calendar Collections"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/calendar.py:798
+#: sql_constraint:basic.calendar.alias:0
+#, python-format
+msgid "The same filename cannot apply to two records!"
+msgstr ""
+
+#. module: caldav
+#: sql_constraint:document.directory:0
+msgid "Directory cannot be parent of itself!"
+msgstr ""
+
+#. module: caldav
+#: view:basic.calendar:0
+#: field:document.directory,calendar_ids:0
+#: model:ir.actions.act_window,name:caldav.action_caldav_form
+#: model:ir.ui.menu,name:caldav.menu_caldav_directories
+msgid "Calendars"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar,collection_id:0
+msgid "Collection"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar,write_date:0
+msgid "Write Date"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/wizard/caldav_browse.py:104
+#, python-format
+msgid ""
+"\n"
+"Prerequire\n"
+"----------\n"
+"There is no buit-in way to synchronize calendar with caldav.\n"
+"So you need to install a third part software : Calendar (CalDav) \n"
+"for now it's the only one\n"
+"\n"
+"configuration\n"
+"-------------\n"
+"\n"
+"1. Open Calendar Sync\n"
+"   I'll get an interface with 2 tabs\n"
+"   Stay on the first one\n"
+"   \n"
+"2. CaDAV Calendar URL : put the URL given above (ie : "
+"http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
+"\n"
+"3. Put your openerp username and password\n"
+"\n"
+"4. If your server don't use SSL, you'll get a warnign, say \"Yes\"\n"
+"\n"
+"5. Then you can synchronize manually or custom the settings to synchronize "
+"every x minutes.\n"
+"    \n"
+"    "
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/wizard/caldav_browse.py:53
+#, python-format
+msgid ""
+"\n"
+"    For SSL specific configuration see the documentation below\n"
+"\n"
+"Now, to setup the calendars, you need to:\n"
+"\n"
+"1. Click on the \"Settings\" and go to the \"Mail, Contacts, Calendars\" "
+"page.\n"
+"2. Go to \"Add account...\"\n"
+"3. Click on \"Other\"\n"
+"4. From the \"Calendars\" group, select \"Add CalDAV Account\"\n"
+"\n"
+"5. Enter the host's name \n"
+"   (ie : if the url is http://openerp.com:8069/webdav/db_1/calendars/ , "
+"openerp.com is the host)\n"
+"\n"
+"6. Fill Username and password with your openerp login and password\n"
+"\n"
+"7. As a description, you can either leave the server's name or\n"
+"   something like \"OpenERP calendars\".\n"
+"\n"
+"9. If you are not using a SSL server, you'll get an error, do not worry and "
+"push \"Continue\"\n"
+"\n"
+"10. Then click to \"Advanced Settings\" to specify the right\n"
+"    ports and paths. \n"
+"    \n"
+"11. Specify the port for the OpenERP server: 8071 for SSL, 8069 without.\n"
+"\n"
+"12. Set the \"Account URL\" to the right path of the OpenERP webdav:\n"
+"    the url given by the wizard (ie : "
+"http://my.server.ip:8069/webdav/dbname/calendars/ )\n"
+"\n"
+"11. Click on Done. The phone will hopefully connect to the OpenERP server\n"
+"    and verify it can use the account.\n"
+"\n"
+"12. Go to the main menu of the iPhone and enter the Calendar application.\n"
+"    Your OpenERP calendars will be visible inside the selection of the\n"
+"    \"Calendars\" button.\n"
+"    Note that when creating a new calendar entry, you will have to specify\n"
+"    which calendar it should be saved at.\n"
+"\n"
+"\n"
+"\n"
+"IF you need SSL (and your certificate is not a verified one, as usual),\n"
+"then you first will need to let the iPhone trust that. Follow these\n"
+"steps:\n"
+"\n"
+"    s1. Open Safari and enter the https location of the OpenERP server:\n"
+"      https://my.server.ip:8071/\n"
+"      (assuming you have the server at \"my.server.ip\" and the HTTPS port\n"
+"      is the default 8071)\n"
+"    s2. Safari will try to connect and issue a warning about the "
+"certificate\n"
+"      used. Inspect the certificate and click \"Accept\" so that iPhone\n"
+"      now trusts it.   \n"
+"    "
+msgstr ""
+
+#. module: caldav
+#: sql_constraint:document.directory:0
+msgid "The directory name must be unique !"
+msgstr ""
+
+#. module: caldav
+#: view:user.preference:0
+msgid "User Preference"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/wizard/calendar_event_subscribe.py:59
+#, python-format
+msgid "Please provide Proper URL !"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar_timezone
+msgid "basic.calendar.timezone"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar.fields,expr:0
+msgid "Expression"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar_attendee
+msgid "basic.calendar.attendee"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar_alias
+msgid "basic.calendar.alias"
+msgstr ""
+
+#. module: caldav
+#: view:calendar.event.import:0
+#: field:calendar.event.import,file_path:0
+msgid "Select ICS file"
+msgstr ""
+
+#. module: caldav
+#: field:caldav.browse,caldav_doc_file:0
+msgid "Caldav Document"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar.lines,mapping_ids:0
+msgid "Fields Mapping"
+msgstr ""
+
+#. module: caldav
+#: view:caldav.browse:0
+msgid "Browse caldav"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar
+msgid "basic.calendar"
+msgstr ""
+
+#. module: caldav
+#: view:basic.calendar:0
+msgid "Other Info"
+msgstr ""
+
+#. module: caldav
+#: field:user.preference,device:0
+msgid "Software/Devices"
+msgstr ""
+
+#. module: caldav
+#: help:basic.calendar,has_webcal:0
+msgid ""
+"Also export a <name>.ics entry next to the calendar folder, with WebCal "
+"content."
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar.fields,fn:0
+msgid "Function"
+msgstr ""
+
+#. module: caldav
+#: view:basic.calendar:0
+#: field:basic.calendar,description:0
+#: view:caldav.browse:0
+#: field:caldav.browse,description:0
+msgid "Description"
+msgstr ""
+
+#. module: caldav
+#: help:basic.calendar.alias,cal_line_id:0
+msgid "The calendar/line this mapping applies to"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar.fields,mapping:0
+msgid "Mapping"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/wizard/calendar_event_import.py:86
+#, python-format
+msgid "Import Sucessful"
+msgstr ""
+
+#. module: caldav
+#: view:calendar.event.import:0
+msgid "_Import"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_calendar_event_import
+msgid "Event Import"
+msgstr ""
+
+#. module: caldav
+#: selection:basic.calendar.fields,fn:0
+msgid "Interval in hours"
+msgstr ""
+
+#. module: caldav
+#: view:calendar.event.subscribe:0
+msgid "Subscribe to Remote Calendar"
+msgstr ""
+
+#. module: caldav
+#: help:basic.calendar,calendar_color:0
+msgid "For supporting clients, the color of the calendar entries"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar,name:0
+#: field:basic.calendar.attributes,name:0
+#: field:basic.calendar.fields,name:0
+msgid "Name"
+msgstr ""
+
+#. module: caldav
+#: selection:basic.calendar.attributes,type:0
+#: selection:basic.calendar.lines,name:0
+msgid "Alarm"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar_alarm
+msgid "basic.calendar.alarm"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/calendar.py:1275
+#, python-format
+msgid "Attendee must have an Email Id"
+msgstr ""
+
+#. module: caldav
+#: model:ir.actions.act_window,name:caldav.action_calendar_event_export_values
+msgid "Export .ics File"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/calendar.py:41
+#, python-format
+msgid "vobject Import Error!"
+msgstr ""
+
+#. module: caldav
+#: field:calendar.event.export,file_path:0
+msgid "Save ICS file"
+msgstr ""
+
+#. module: caldav
+#: selection:user.preference,device:0
+msgid "Sunbird/Thunderbird"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar,calendar_order:0
+msgid "Order"
+msgstr ""
+
+#. module: caldav
+#: model:ir.module.module,shortdesc:caldav.module_meta_information
+msgid "Share Calendar using CalDAV"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar,calendar_color:0
+msgid "Color"
+msgstr ""
+
+#. module: caldav
+#: view:basic.calendar:0
+msgid "MY"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar_fields
+msgid "Calendar fields"
+msgstr ""
+
+#. module: caldav
+#: view:calendar.event.import:0
+msgid "Import Message"
+msgstr ""
+
+#. module: caldav
+#: model:ir.actions.act_window,name:caldav.action_calendar_event_subscribe
+#: model:ir.actions.act_window,name:caldav.action_calendar_event_subscribe_values
+msgid "Subscribe"
+msgstr ""
+
+#. module: caldav
+#: sql_constraint:document.directory:0
+msgid "Directory must have a parent or a storage"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar_todo
+msgid "basic.calendar.todo"
+msgstr ""
+
+#. module: caldav
+#: help:basic.calendar,calendar_order:0
+msgid "For supporting clients, the order of this folder among the calendars"
+msgstr ""
diff --git a/addons/crm/i18n/ru.po b/addons/crm/i18n/ru.po
index f900b3b37b6..21c2bb2263d 100644
--- a/addons/crm/i18n/ru.po
+++ b/addons/crm/i18n/ru.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-03-31 18:13+0000\n"
+"PO-Revision-Date: 2011-04-15 19:44+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@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: 2011-04-01 04:47+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-04-16 04:58+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -3218,7 +3218,7 @@ msgstr ""
 #. module: crm
 #: field:crm.meeting,exdate:0
 msgid "Exception Date/Times"
-msgstr ""
+msgstr "Дата/время исключительной ситуации"
 
 #. module: crm
 #: selection:crm.meeting,class:0
diff --git a/addons/crm_fundraising/i18n/pt_BR.po b/addons/crm_fundraising/i18n/pt_BR.po
index 5aad1af6fe1..fac5dd8283b 100644
--- a/addons/crm_fundraising/i18n/pt_BR.po
+++ b/addons/crm_fundraising/i18n/pt_BR.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-02-01 01:58+0000\n"
-"Last-Translator: Adriano Prado <adrianojprado@hotmail.com>\n"
+"PO-Revision-Date: 2011-04-16 20:51+0000\n"
+"Last-Translator: Emerson <Unknown>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@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: 2011-02-02 04:41+0000\n"
-"X-Generator: Launchpad (build 12177)\n"
+"X-Launchpad-Export-Date: 2011-04-17 04:36+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
 #. module: crm_fundraising
 #: field:crm.fundraising,planned_revenue:0
@@ -109,7 +109,7 @@ msgstr "Valor"
 #. module: crm_fundraising
 #: model:crm.case.categ,name:crm_fundraising.categ_fund4
 msgid "Arts And Culture"
-msgstr ""
+msgstr "Artes E Cultura"
 
 #. module: crm_fundraising
 #: view:crm.fundraising.report:0
diff --git a/addons/email_template/i18n/ca.po b/addons/email_template/i18n/ca.po
new file mode 100644
index 00000000000..ba1128aeedb
--- /dev/null
+++ b/addons/email_template/i18n/ca.po
@@ -0,0 +1,1278 @@
+# Catalan translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-04-16 11:56+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Catalan <ca@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: 2011-04-17 04:36+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
+
+#. module: email_template
+#: help:email_template.account,auto_delete:0
+msgid "Permanently delete emails after sending"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Email Account Configuration"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/wizard/email_template_send_wizard.py:195
+#, python-format
+msgid "Emails for multiple items saved in outbox."
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/wizard/email_template_send_wizard.py:59
+#: code:addons/email_template/wizard/email_template_send_wizard.py:60
+#, python-format
+msgid ""
+"No personal email accounts are configured for you. \n"
+"Either ask admin to enforce an account for this template or get yourself a "
+"personal email account."
+msgstr ""
+
+#. module: email_template
+#: view:email_template.mailbox:0
+msgid "Personal Emails"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,file_name:0
+msgid "Report Filename"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Email Content  "
+msgstr ""
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid "Send mail Wizard"
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.mailbox,mail_type:0
+msgid "Plain Text & HTML with no attachments"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,model_object_field:0
+msgid ""
+"Select the field from the model you want to use.\n"
+"If it is a relationship field you will be able to choose the nested values "
+"in the box below\n"
+"(Note:If there are no values make sure you have selected the correct model)"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.preview,body_html:0
+#: field:email_template.preview,body_text:0
+#: field:email_template.send.wizard,body_html:0
+#: field:email_template.send.wizard,body_text:0
+msgid "Body"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:304
+#, python-format
+msgid "Deletion of Record failed"
+msgstr ""
+
+#. module: email_template
+#: help:email_template.account,company:0
+msgid ""
+"Select if this mail account does not belong to specific user but to the "
+"organization as a whole. eg: info@companydomain.com"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid "Send now"
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.mailbox,state:0
+msgid "Not Applicable"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.account:0
+#: model:ir.ui.menu,name:email_template.menu_email_account_all_tools
+#: model:ir.ui.menu,name:email_template.menu_email_template_account_all
+msgid "Email Accounts"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid "Send all mails"
+msgstr ""
+
+#. module: email_template
+#: help:email_template.account,smtpuname:0
+msgid ""
+"Specify the username if your SMTP server requires authentication, otherwise "
+"leave it empty."
+msgstr ""
+
+#. module: email_template
+#: field:email_template.mailbox,server_ref:0
+msgid "Server Reference of mail"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.account:0
+#: selection:email_template.account,state:0
+msgid "Approved"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,def_cc:0
+msgid ""
+"Carbon Copy address(es), comma-separated. Placeholders can be used here. "
+"e.g. ${object.email_cc}"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Account"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,table_html:0
+msgid "HTML code"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.mailbox:0
+msgid "Send Mail"
+msgstr ""
+
+#. module: email_template
+#: help:email_template.account,name:0
+msgid ""
+"The description is used as the Sender name along with the provided From "
+"Email, unless it is already specified in the From Email, e.g: John Doe "
+"<john@doe.com>"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,from_account:0
+msgid "Email Account"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/wizard/email_template_send_wizard.py:201
+#, python-format
+msgid "Email sending failed for one or more objects."
+msgstr ""
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid ""
+"Add here all attachments of the current document you want to include in the "
+"Email."
+msgstr ""
+
+#. module: email_template
+#: help:email.template,lang:0
+msgid ""
+"The default language for the email. Placeholders can be used here. eg. "
+"${object.partner_id.lang}"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,sub_model_object_field:0
+msgid ""
+"When you choose relationship fields this field will specify the sub value "
+"you can use."
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.send.wizard,state:0
+msgid "Wizard Complete"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,reply_to:0
+#: field:email_template.mailbox,reply_to:0
+#: field:email_template.preview,reply_to:0
+#: field:email_template.send.wizard,reply_to:0
+msgid "Reply-To"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Delete Action"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Approve Account"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.preview,rel_model_ref:0
+#: field:email_template.send.wizard,rel_model_ref:0
+msgid "Referred Document"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.send.wizard,full_success:0
+msgid "Complete Success"
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.account,send_pref:0
+msgid "Both HTML & Text (Mixed)"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.preview:0
+msgid "OK"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.account,auto_delete:0
+msgid "Auto Delete"
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.account,send_pref:0
+msgid "Both HTML & Text (Alternative)"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.send.wizard,requested:0
+msgid "No of requested Mails"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,def_body_text:0
+#: view:email_template.mailbox:0
+#: field:email_template.mailbox,body_text:0
+msgid "Standard Body (Text)"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,attachment_ids:0
+msgid "Attached Files"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.account,smtpssl:0
+msgid "SSL/TLS (only in python 2.6)"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.account,email_id:0
+msgid "From Email"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:304
+#, python-format
+msgid "Warning"
+msgstr ""
+
+#. module: email_template
+#: model:ir.actions.act_window,name:email_template.action_email_template_account_tree_all
+msgid "Accounts"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.preview:0
+msgid "Body(Text)"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.mailbox:0
+msgid "Company Emails"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid ""
+"Tip: Multiple emails are sent in the same language (the first one is "
+"proposed). We suggest you send emails in groups according to language."
+msgstr ""
+
+#. module: email_template
+#: help:email_template.preview,reply_to:0
+#: help:email_template.send.wizard,reply_to:0
+msgid ""
+"The address recipients should reply to, if different from the From address. "
+"Placeholders can be used here."
+msgstr ""
+
+#. module: email_template
+#: field:email.template,def_subject:0
+#: field:email_template.mailbox,subject:0
+#: field:email_template.preview,subject:0
+#: field:email_template.send.wizard,subject:0
+msgid "Subject"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:256
+#, python-format
+msgid "Reason: %s"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.mailbox,email_from:0
+msgid "From"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.preview,ref_template:0
+#: field:email_template.send.wizard,ref_template:0
+msgid "Template"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:367
+#, python-format
+msgid ""
+"Mail from Account %s failed. Probable Reason: Server Send Error\n"
+" Description: %s"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Insert Simple Field"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.preview:0
+msgid "Body(Html)"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,def_bcc:0
+msgid ""
+"Blind Carbon Copy address(es), comma-separated. Placeholders can be used "
+"here. e.g. ${object.email_bcc}"
+msgstr ""
+
+#. module: email_template
+#: model:ir.actions.act_window,name:email_template.wizard_email_template_preview
+msgid "Template Preview"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,def_body_html:0
+msgid "Body (Text-Web Client Only)"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.account,state:0
+#: view:email_template.mailbox:0
+msgid "State"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,ref_ir_value:0
+msgid "Wizard Button"
+msgstr ""
+
+#. module: email_template
+#: help:email_template.account,email_id:0
+msgid "eg: 'john@doe.com' or 'John Doe <john@doe.com>'"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+#: field:email.template,object_name:0
+msgid "Resource"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:255
+#, python-format
+msgid "Out going connection test failed"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:371
+#, python-format
+msgid "Mail from Account %s successfully Sent."
+msgstr ""
+
+#. module: email_template
+#: view:email_template.mailbox:0
+msgid "Standard Body"
+msgstr ""
+
+#. module: email_template
+#: selection:email.template,template_language:0
+msgid "Mako Templates"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,def_body_html:0
+#: help:email.template,def_body_text:0
+msgid "The text version of the mail"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:449
+#, python-format
+msgid " (Email Attachment)"
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.mailbox,folder:0
+msgid "Sent Items"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Test Outgoing Connection"
+msgstr ""
+
+#. module: email_template
+#: model:ir.actions.act_window,name:email_template.action_email_template_mailbox
+msgid "Mailbox"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,reply_to:0
+msgid ""
+"The address recipients should reply to, if different from the From address. "
+"Placeholders can be used here. e.g. ${object.email_reply_to}"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,ref_ir_value:0
+msgid ""
+"Button in the side bar of the form view of this Resource that will invoke "
+"the Window Action"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.mailbox,account_id:0
+msgid "User account"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.send.wizard,signature:0
+msgid "Attach my signature to mail"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/wizard/email_template_send_wizard.py:255
+#: view:email.template:0
+#, python-format
+msgid "Report"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,sub_model_object_field:0
+msgid "Sub Field"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+#: view:email_template.mailbox:0
+msgid "Advanced"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.mailbox:0
+msgid "My Emails"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Expression Builder"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,sub_object:0
+msgid ""
+"When a relation field is used this field will show you the type of field you "
+"have selected"
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.mailbox,mail_type:0
+msgid "HTML Body"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Suspend Account"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,null_value:0
+msgid "This Value is used if the field is empty"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Preview Template"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.account,smtpserver:0
+msgid "Server"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,copyvalue:0
+msgid ""
+"Copy and paste the value in the location you want to use a system value."
+msgstr ""
+
+#. module: email_template
+#: help:email.template,track_campaign_item:0
+msgid ""
+"Enable this is you wish to include a special tracking marker in outgoing "
+"emails so you can identify replies and link them back to the corresponding "
+"resource record. This is useful for CRM leads for example"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Body (Raw HTML)"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,use_sign:0
+msgid "Signature"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,sub_object:0
+msgid "Sub-model"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Options"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid "Body (Plain Text)"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Body (Text)"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.mailbox,date_mail:0
+msgid "Rec/Sent Date"
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.account,state:0
+msgid "Initiated"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,report_template:0
+msgid "Report to send"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Server Information"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.send.wizard,generated:0
+msgid "No of generated Mails"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Mail Details"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:235
+#, python-format
+msgid "SMTP SERVER or PORT not specified"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Note: This is Raw HTML."
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Group by..."
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.send.wizard,state:0
+msgid "Multiple Mail Wizard Step 1"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.account,user:0
+msgid "Related User"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.mailbox,body_html:0
+msgid "Body (Rich Text Clients Only)"
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.account,company:0
+msgid "Yes"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,ref_ir_act_window:0
+msgid "Window Action"
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.account,send_pref:0
+msgid "HTML, otherwise Text"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.mailbox:0
+#: selection:email_template.mailbox,folder:0
+msgid "Drafts"
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.account,company:0
+msgid "No"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.account,smtpport:0
+msgid "SMTP Port"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.mailbox,mail_type:0
+msgid "Mail Contents"
+msgstr ""
+
+#. module: email_template
+#: sql_constraint:email.template:0
+msgid "The template name must be unique !"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,def_bcc:0
+#: field:email_template.mailbox,email_bcc:0
+#: field:email_template.preview,bcc:0
+#: field:email_template.send.wizard,bcc:0
+msgid "BCC"
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.mailbox,mail_type:0
+msgid "Plain Text"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Draft"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,model_int_name:0
+msgid "Model Internal Name"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,message_id:0
+#: field:email_template.mailbox,message_id:0
+#: field:email_template.preview,message_id:0
+#: field:email_template.send.wizard,message_id:0
+msgid "Message-ID"
+msgstr ""
+
+#. module: email_template
+#: help:email_template.mailbox,server_ref:0
+msgid "Applicable for inward items only"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid ""
+"After clicking send all mails, mails will be sent to outbox and cleared in "
+"next Send/Recieve"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.mailbox,state:0
+#: field:email_template.send.wizard,state:0
+msgid "Status"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Outgoing"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:427
+#, python-format
+msgid "Datetime Extraction failed.Date:%s                       \tError:%s"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,use_sign:0
+msgid "the signature from the User details will be appended to the mail"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.send.wizard,from:0
+msgid "From Account"
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.mailbox,mail_type:0
+msgid "Intermixed content"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Request Re-activation"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+#: model:ir.actions.act_window,name:email_template.action_email_template_tree_all
+#: model:ir.ui.menu,name:email_template.menu_email_template_all
+#: model:ir.ui.menu,name:email_template.menu_email_template_all_tools
+msgid "Email Templates"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.account,smtpuname:0
+msgid "User Name"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.mailbox,user:0
+msgid "User"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Advanced Options"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.mailbox:0
+#: selection:email_template.mailbox,folder:0
+msgid "Outbox"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid "Save in Drafts"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:362
+#, python-format
+msgid ""
+"Mail from Account %s failed. Probable Reason:MIME Error\n"
+"Description: %s"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.account,smtptls:0
+msgid "TLS"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,lang:0
+msgid "Language"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:275
+#: code:addons/email_template/email_template_account.py:280
+#: code:addons/email_template/email_template_account.py:362
+#: code:addons/email_template/email_template_account.py:371
+#: code:addons/email_template/email_template_account.py:374
+#: code:addons/email_template/email_template_account.py:424
+#: code:addons/email_template/wizard/email_template_send_wizard.py:201
+#: model:ir.ui.menu,name:email_template.menu_email_template
+#: model:ir.ui.menu,name:email_template.menu_email_template_config_tools
+#: model:ir.ui.menu,name:email_template.menu_email_template_configuration
+#: model:ir.ui.menu,name:email_template.menu_email_template_tools
+#, python-format
+msgid "Email Template"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Send/Receive"
+msgstr ""
+
+#. module: email_template
+#: model:ir.ui.menu,name:email_template.menu_email_template_personal_mails
+msgid "Personal Mails"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.account:0
+#: selection:email_template.account,state:0
+msgid "Suspended"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,allowed_groups:0
+msgid ""
+"Only users from these groups will be allowed to send mails from this Template"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:284
+#, python-format
+msgid "Send Mail (%s)"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,def_subject:0
+msgid "The subject of email. Placeholders can be used here."
+msgstr ""
+
+#. module: email_template
+#: field:email_template.send.wizard,report:0
+msgid "Report File Name"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,copyvalue:0
+msgid "Expression"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.mailbox:0
+#: field:email_template.mailbox,history:0
+msgid "History"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+#: view:email_template.mailbox:0
+#: field:email_template.mailbox,attachments_ids:0
+#: view:email_template.send.wizard:0
+#: field:email_template.send.wizard,attachment_ids:0
+msgid "Attachments"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.preview,to:0
+#: field:email_template.send.wizard,to:0
+msgid "To"
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.account,send_pref:0
+msgid "Text, otherwise HTML"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:319
+#, python-format
+msgid "Copy of template %s"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid "Discard Mail"
+msgstr ""
+
+#. module: email_template
+#: model:ir.model,name:email_template.model_email_template
+msgid "Email Templates for Models"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid "Close"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template_mailbox.py:49
+#, python-format
+msgid "Error sending mail: %s"
+msgstr ""
+
+#. module: email_template
+#: constraint:email_template.account:0
+msgid "Error: You are not allowed to have more than 1 account."
+msgstr ""
+
+#. module: email_template
+#: view:email_template.mailbox:0
+msgid "Body (HTML-Web Client Only)"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/wizard/email_template_send_wizard.py:253
+#, python-format
+msgid "%s (Email Attachment)"
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.mailbox,state:0
+msgid "Sending"
+msgstr ""
+
+#. module: email_template
+#: model:ir.actions.act_window,help:email_template.action_email_template_mailbox
+msgid ""
+"An email template is an email document that will be sent as part of a "
+"marketing campaign. You can personalize it according to specific customer "
+"profile fields, so that a partner name or other partner related information "
+"may be inserted automatically."
+msgstr ""
+
+#. module: email_template
+#: field:email.template,allowed_groups:0
+msgid "Allowed User Groups"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,model_object_field:0
+msgid "Field"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "User Information"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Actions"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:363
+#: code:addons/email_template/email_template_account.py:368
+#, python-format
+msgid ""
+"Server Send Error\n"
+"Description: %s"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,file_name:0
+msgid ""
+"Name of the generated report file. Placeholders can be used in the filename. "
+"eg: 2009_SO003.pdf"
+msgstr ""
+
+#. module: email_template
+#: help:email_template.mailbox,date_mail:0
+msgid "Date on which Email Sent or Received"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.mailbox:0
+#: selection:email_template.mailbox,folder:0
+msgid "Trash"
+msgstr ""
+
+#. module: email_template
+#: model:ir.model,name:email_template.model_email_template_mailbox
+msgid "Email Mailbox"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template_mailbox.py:116
+#, python-format
+msgid ""
+"Sending of Mail %s failed. Probable Reason:Could not login to server\n"
+"Error: %s"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/wizard/email_template_send_wizard.py:60
+#, python-format
+msgid "Missing mail account"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:250
+#, python-format
+msgid "SMTP Test Connection Was Successful"
+msgstr ""
+
+#. module: email_template
+#: model:ir.module.module,shortdesc:email_template.module_meta_information
+msgid "Email Template for OpenERP"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.account,name:0
+msgid "Description"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Create Action"
+msgstr ""
+
+#. module: email_template
+#: help:email_template.account,smtpserver:0
+msgid "Enter name of outgoing server, eg: smtp.yourdomain.com"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,attachment_ids:0
+msgid ""
+"You may attach existing files to this template, so they will be added in all "
+"emails created from this template"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,message_id:0
+msgid ""
+"Specify the Message-ID SMTP header to use in outgoing emails. Please note "
+"that this overrides the Resource tracking option! Placeholders can be used "
+"here."
+msgstr ""
+
+#. module: email_template
+#: field:email.template,def_to:0
+#: field:email_template.mailbox,email_to:0
+msgid "Recipient (To)"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,null_value:0
+msgid "Null Value"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,template_language:0
+msgid "Templating Language"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,def_cc:0
+#: field:email_template.mailbox,email_cc:0
+#: field:email_template.preview,cc:0
+#: field:email_template.send.wizard,cc:0
+msgid "CC"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.mailbox:0
+msgid "Sent"
+msgstr ""
+
+#. module: email_template
+#: sql_constraint:email_template.account:0
+msgid "Another setting already exists with this email ID !"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,ref_ir_act_window:0
+msgid "Action that will open this email template on Resource records"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.account,smtppass:0
+msgid "Password"
+msgstr ""
+
+#. module: email_template
+#: help:email_template.preview,message_id:0
+#: help:email_template.send.wizard,message_id:0
+msgid ""
+"The Message-ID header value, if you need tospecify it, for example to "
+"automatically recognize the replies later. Placeholders can be used here."
+msgstr ""
+
+#. module: email_template
+#: view:email_template.mailbox:0
+#: model:ir.ui.menu,name:email_template.menu_email_template_mails_tools
+msgid "Emails"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Templates"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.preview,report:0
+msgid "Report Name"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,name:0
+msgid "Name"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,track_campaign_item:0
+msgid "Resource Tracking"
+msgstr ""
+
+#. module: email_template
+#: model:ir.model,name:email_template.model_email_template_preview
+msgid "Email Template Preview"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.preview:0
+msgid "Email Preview"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,def_to:0
+msgid ""
+"The Recipient of email. Placeholders can be used here. e.g. "
+"${object.email_to}"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Existing files"
+msgstr ""
+
+#. module: email_template
+#: model:ir.module.module,description:email_template.module_meta_information
+msgid ""
+"\n"
+"    Email Template is extraction of Power Email basically just to send the "
+"emails.\n"
+"    "
+msgstr ""
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid "Body (HTML)"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,table_html:0
+msgid ""
+"Copy this html code to your HTML message body for displaying the info in "
+"your mail."
+msgstr ""
+
+#. module: email_template
+#: model:ir.model,name:email_template.model_email_template_account
+msgid "email_template.account"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.preview,rel_model:0
+#: field:email_template.send.wizard,rel_model:0
+msgid "Model"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:236
+#, python-format
+msgid "Core connection for the given ID does not exist"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.account,company:0
+msgid "Corporate"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:275
+#, python-format
+msgid ""
+"Mail from Account %s failed on login. Probable Reason:Could not login to "
+"server\n"
+"Error: %s"
+msgstr ""
+
+#. module: email_template
+#: model:ir.model,name:email_template.model_email_template_send_wizard
+msgid "This is the wizard for sending mail"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Addresses"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,from_account:0
+msgid "Emails will be sent from this approved account."
+msgstr ""
+
+#. module: email_template
+#: field:email_template.account,send_pref:0
+msgid "Mail Format"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.mailbox,folder:0
+msgid "Folder"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Company Accounts"
+msgstr ""
+
+#. module: email_template
+#: help:email_template.account,smtpport:0
+msgid "Enter port number, eg: 25 or 587"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/wizard/email_template_send_wizard.py:59
+#, python-format
+msgid "email-template"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:280
+#: code:addons/email_template/email_template_account.py:374
+#: code:addons/email_template/email_template_account.py:375
+#, python-format
+msgid "Mail from Account %s failed. Probable Reason:Account not approved"
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.send.wizard,state:0
+msgid "Simple Mail Wizard Step 1"
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.mailbox,mail_type:0
+msgid "Has Attachments"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:452
+#: code:addons/email_template/wizard/email_template_send_wizard.py:256
+#, python-format
+msgid "No Description"
+msgstr ""
diff --git a/addons/email_template/i18n/pt_BR.po b/addons/email_template/i18n/pt_BR.po
index 31c40f452d3..8138216ef67 100644
--- a/addons/email_template/i18n/pt_BR.po
+++ b/addons/email_template/i18n/pt_BR.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-03-26 15:24+0000\n"
+"PO-Revision-Date: 2011-04-16 20:56+0000\n"
 "Last-Translator: Emerson <Unknown>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@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: 2011-03-27 04:53+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-04-17 04:36+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
 #. module: email_template
 #: help:email_template.account,auto_delete:0
@@ -142,7 +142,7 @@ msgstr ""
 #. module: email_template
 #: field:email_template.mailbox,server_ref:0
 msgid "Server Reference of mail"
-msgstr ""
+msgstr "Referência do Servidor de email"
 
 #. module: email_template
 #: view:email_template.account:0
@@ -237,7 +237,7 @@ msgstr "Responder-Para"
 #. module: email_template
 #: view:email.template:0
 msgid "Delete Action"
-msgstr ""
+msgstr "Excluir Ação"
 
 #. module: email_template
 #: view:email_template.account:0
@@ -375,6 +375,8 @@ msgid ""
 "Mail from Account %s failed. Probable Reason: Server Send Error\n"
 " Description: %s"
 msgstr ""
+"O email da conta %s falhou. Razão Provável: Erro Enviado pelo Servidor\n"
+" Descrição: %s"
 
 #. module: email_template
 #: view:email.template:0
@@ -727,7 +729,7 @@ msgstr "Rascunho"
 #. module: email_template
 #: field:email.template,model_int_name:0
 msgid "Model Internal Name"
-msgstr ""
+msgstr "Nome Interno do Modelo"
 
 #. module: email_template
 #: field:email.template,message_id:0
diff --git a/addons/survey/i18n/ca.po b/addons/survey/i18n/ca.po
new file mode 100644
index 00000000000..858f5b3952b
--- /dev/null
+++ b/addons/survey/i18n/ca.po
@@ -0,0 +1,1717 @@
+# Catalan translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-03 16:58+0000\n"
+"PO-Revision-Date: 2011-04-16 13:20+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Catalan <ca@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: 2011-04-17 04:36+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
+
+#. module: survey
+#: view:survey.print:0
+#: view:survey.print.answer:0
+msgid "Print Option"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/survey.py:422
+#, python-format
+msgid ""
+"Minimum Required Answer you                                     entered is "
+"greater than the number of answer.                                      "
+"Please use a number that is smaller than %d."
+msgstr ""
+
+#. module: survey
+#: view:survey.question.wiz:0
+msgid "Your Messages"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,comment_valid_type:0
+#: field:survey.question,validation_type:0
+msgid "Text Validation"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/survey.py:434
+#, python-format
+msgid ""
+"Maximum Required Answer you                                     entered for "
+"your maximum is greater than the number of answer.                           "
+"           Please use a number that is smaller than %d."
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: field:survey,invited_user_ids:0
+msgid "Invited User"
+msgstr ""
+
+#. module: survey
+#: selection:survey.answer,type:0
+msgid "Character"
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_survey_form1
+#: model:ir.ui.menu,name:survey.menu_print_survey_form
+#: model:ir.ui.menu,name:survey.menu_reporting
+#: model:ir.ui.menu,name:survey.menu_survey_form
+#: model:ir.ui.menu,name:survey.menu_surveys
+msgid "Surveys"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+msgid "Set to draft"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,in_visible_answer_type:0
+msgid "Is Answer Type Invisible?"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: view:survey.page:0
+#: view:survey.question:0
+#: view:survey.request:0
+msgid "Group By..."
+msgstr ""
+
+#. module: survey
+#: view:survey.send.invitation.log:0
+msgid "Results :"
+msgstr ""
+
+#. module: survey
+#: view:survey.request:0
+msgid "Survey Request"
+msgstr ""
+
+#. module: survey
+#: selection:survey.question,required_type:0
+msgid "A Range"
+msgstr ""
+
+#. module: survey
+#: view:survey.response.line:0
+msgid "Table Answer"
+msgstr ""
+
+#. module: survey
+#: field:survey.history,date:0
+msgid "Date started"
+msgstr ""
+
+#. module: survey
+#: field:survey,history:0
+msgid "History Lines"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/survey.py:448
+#, python-format
+msgid ""
+"You must enter one or more menu                                 choices in "
+"column heading (white spaces not allowed)"
+msgstr ""
+
+#. module: survey
+#: field:survey.question.column.heading,in_visible_menu_choice:0
+msgid "Is Menu Choice Invisible??"
+msgstr ""
+
+#. module: survey
+#: field:survey.send.invitation,mail:0
+msgid "Body"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,allow_comment:0
+msgid "Allow Comment Field"
+msgstr ""
+
+#. module: survey
+#: selection:survey.print,paper_size:0
+#: selection:survey.print.answer,paper_size:0
+msgid "A4 (210mm x 297mm)"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,comment_maximum_date:0
+#: field:survey.question,validation_maximum_date:0
+msgid "Maximum date"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,in_visible_menu_choice:0
+msgid "Is Menu Choice Invisible?"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+msgid "Completed"
+msgstr ""
+
+#. module: survey
+#: selection:survey.question,required_type:0
+msgid "Exactly"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+msgid "Open Date"
+msgstr ""
+
+#. module: survey
+#: view:survey.request:0
+msgid "Set to Draft"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,is_comment_require:0
+msgid "Add Comment Field"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/survey.py:401
+#, python-format
+msgid ""
+"#Required Answer you entered                                     is greater "
+"than the number of answer.                                     Please use a "
+"number that is smaller than %d."
+msgstr ""
+
+#. module: survey
+#: field:survey.question,tot_resp:0
+msgid "Total Answer"
+msgstr ""
+
+#. module: survey
+#: field:survey.tbl.column.heading,name:0
+msgid "Row Number"
+msgstr ""
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_name_wiz
+msgid "survey.name.wiz"
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_survey_question_form
+msgid "Survey Questions"
+msgstr ""
+
+#. module: survey
+#: selection:survey.question,type:0
+msgid "Matrix of Choices (Only One Answers Per Row)"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/survey.py:475
+#, python-format
+msgid ""
+"Maximum Required Answer you entered for your maximum is greater than the "
+"number of answer. Please use a number that is smaller than %d."
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_view_survey_question_message
+#: model:ir.model,name:survey.model_survey_question
+#: view:survey:0
+#: view:survey.page:0
+#: view:survey.question:0
+msgid "Survey Question"
+msgstr ""
+
+#. module: survey
+#: view:survey.question.column.heading:0
+msgid "Use if question type is rating_scale"
+msgstr ""
+
+#. module: survey
+#: field:survey.print,page_number:0
+#: field:survey.print.answer,page_number:0
+msgid "Include Page Number"
+msgstr ""
+
+#. module: survey
+#: view:survey.page:0
+#: view:survey.question:0
+#: view:survey.send.invitation.log:0
+msgid "Ok"
+msgstr ""
+
+#. module: survey
+#: field:survey.page,title:0
+msgid "Page Title"
+msgstr ""
+
+#. module: survey
+#: model:ir.ui.menu,name:survey.menu_define_survey
+msgid "Define Surveys"
+msgstr ""
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_history
+msgid "Survey History"
+msgstr ""
+
+#. module: survey
+#: field:survey.response.answer,comment:0
+#: field:survey.response.line,comment:0
+msgid "Notes"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: view:survey.request:0
+msgid "Search Survey"
+msgstr ""
+
+#. module: survey
+#: field:survey.response.answer,answer:0
+#: field:survey.tbl.column.heading,value:0
+msgid "Value"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,column_heading_ids:0
+msgid " Column heading"
+msgstr ""
+
+#. module: survey
+#: model:ir.ui.menu,name:survey.menu_run_survey_form
+msgid "Answer a Survey"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/wizard/survey_answer.py:92
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: survey
+#: field:survey,tot_comp_survey:0
+msgid "Total Completed Survey"
+msgstr ""
+
+#. module: survey
+#: view:survey.response.answer:0
+msgid "(Use Only Question Type is matrix_of_drop_down_menus)"
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.report.xml,name:survey.survey_analysis
+msgid "Survey Statistics"
+msgstr ""
+
+#. module: survey
+#: selection:survey,state:0
+#: view:survey.request:0
+#: selection:survey.request,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: survey
+#: selection:survey.question,type:0
+msgid "Rating Scale"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,comment_field_type:0
+msgid "Comment Field Type"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/survey.py:375
+#: code:addons/survey/survey.py:387
+#: code:addons/survey/survey.py:401
+#: code:addons/survey/survey.py:406
+#: code:addons/survey/survey.py:416
+#: code:addons/survey/survey.py:422
+#: code:addons/survey/survey.py:428
+#: code:addons/survey/survey.py:434
+#: code:addons/survey/survey.py:438
+#: code:addons/survey/survey.py:444
+#: code:addons/survey/survey.py:448
+#: code:addons/survey/survey.py:458
+#: code:addons/survey/survey.py:462
+#: code:addons/survey/survey.py:467
+#: code:addons/survey/survey.py:473
+#: code:addons/survey/survey.py:475
+#: code:addons/survey/survey.py:477
+#: code:addons/survey/survey.py:482
+#: code:addons/survey/survey.py:484
+#: code:addons/survey/survey.py:642
+#: code:addons/survey/wizard/survey_answer.py:124
+#: code:addons/survey/wizard/survey_answer.py:131
+#: code:addons/survey/wizard/survey_answer.py:699
+#: code:addons/survey/wizard/survey_answer.py:738
+#: code:addons/survey/wizard/survey_answer.py:758
+#: code:addons/survey/wizard/survey_answer.py:787
+#: code:addons/survey/wizard/survey_answer.py:792
+#: code:addons/survey/wizard/survey_answer.py:800
+#: code:addons/survey/wizard/survey_answer.py:811
+#: code:addons/survey/wizard/survey_answer.py:820
+#: code:addons/survey/wizard/survey_answer.py:825
+#: code:addons/survey/wizard/survey_answer.py:899
+#: code:addons/survey/wizard/survey_answer.py:935
+#: code:addons/survey/wizard/survey_answer.py:953
+#: code:addons/survey/wizard/survey_answer.py:981
+#: code:addons/survey/wizard/survey_answer.py:984
+#: code:addons/survey/wizard/survey_answer.py:987
+#: code:addons/survey/wizard/survey_answer.py:999
+#: code:addons/survey/wizard/survey_answer.py:1006
+#: code:addons/survey/wizard/survey_answer.py:1009
+#: code:addons/survey/wizard/survey_selection.py:134
+#: code:addons/survey/wizard/survey_selection.py:138
+#: code:addons/survey/wizard/survey_send_invitation.py:74
+#, python-format
+msgid "Warning !"
+msgstr ""
+
+#. module: survey
+#: selection:survey.question,comment_field_type:0
+msgid "Single Line Of Text"
+msgstr ""
+
+#. module: survey
+#: view:survey.send.invitation:0
+#: field:survey.send.invitation,send_mail_existing:0
+msgid "Send reminder for existing user"
+msgstr ""
+
+#. module: survey
+#: selection:survey.question,type:0
+msgid "Multiple Choice (Multiple Answer)"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+msgid "Edit Survey"
+msgstr ""
+
+#. module: survey
+#: view:survey.response.line:0
+msgid "Survey Answer Line"
+msgstr ""
+
+#. module: survey
+#: field:survey.question.column.heading,menu_choice:0
+msgid "Menu Choice"
+msgstr ""
+
+#. module: survey
+#: selection:survey.question,required_type:0
+msgid "At Most"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,is_validation_require:0
+msgid "Validate Text"
+msgstr ""
+
+#. module: survey
+#: field:survey.response.line,single_text:0
+msgid "Text"
+msgstr ""
+
+#. module: survey
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+
+#. module: survey
+#: selection:survey.print,paper_size:0
+#: selection:survey.print.answer,paper_size:0
+msgid "Letter (8.5\" x 11\")"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: field:survey,responsible_id:0
+msgid "Responsible"
+msgstr ""
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_request
+msgid "survey.request"
+msgstr ""
+
+#. module: survey
+#: field:survey.send.invitation,mail_subject:0
+#: field:survey.send.invitation,mail_subject_existing:0
+msgid "Subject"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,comment_maximum_float:0
+#: field:survey.question,validation_maximum_float:0
+msgid "Maximum decimal number"
+msgstr ""
+
+#. module: survey
+#: selection:survey.request,state:0
+msgid "Wating Answer"
+msgstr ""
+
+#. module: survey
+#: view:survey.request:0
+msgid "Late"
+msgstr ""
+
+#. module: survey
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr ""
+
+#. module: survey
+#: field:survey.send.invitation,mail_from:0
+msgid "From"
+msgstr ""
+
+#. module: survey
+#: selection:survey.question,comment_valid_type:0
+#: selection:survey.question,validation_type:0
+msgid "Don't Validate Comment Text."
+msgstr ""
+
+#. module: survey
+#: selection:survey.question,comment_valid_type:0
+#: selection:survey.question,validation_type:0
+msgid "Must Be A Whole Number"
+msgstr ""
+
+#. module: survey
+#: field:survey.answer,question_id:0
+#: field:survey.page,question_ids:0
+#: field:survey.question,question:0
+#: field:survey.question.column.heading,question_id:0
+#: field:survey.response.line,question_id:0
+msgid "Question"
+msgstr ""
+
+#. module: survey
+#: view:survey.page:0
+msgid "Search Survey Page"
+msgstr ""
+
+#. module: survey
+#: view:survey.send.invitation:0
+msgid "Send"
+msgstr ""
+
+#. module: survey
+#: field:survey.question.wiz,name:0
+msgid "Number"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/survey.py:444
+#, python-format
+msgid ""
+"You must enter one or more menu choices                                 in "
+"column heading"
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.act_window,help:survey.action_survey_form1
+msgid ""
+"You can create survey for different purposes: recruitment interviews, "
+"employee's periodical evaluations, marketing campaigns, etc. A survey is "
+"made of pages containing questions of several types: text, multiple choices, "
+"etc. You can edit survey manually or click on the 'Edit Survey' for a "
+"WYSIWYG interface."
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: view:survey.request:0
+#: field:survey.request,state:0
+msgid "State"
+msgstr ""
+
+#. module: survey
+#: view:survey.request:0
+msgid "Evaluation Plan Phase"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: view:survey.page:0
+#: view:survey.question:0
+msgid "Between"
+msgstr ""
+
+#. module: survey
+#: view:survey.print:0
+#: view:survey.print.answer:0
+#: view:survey.print.statistics:0
+msgid "Print"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,make_comment_field:0
+msgid "Make Comment Field an Answer Choice"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: field:survey,type:0
+msgid "Type"
+msgstr ""
+
+#. module: survey
+#: selection:survey.answer,type:0
+msgid "Email"
+msgstr ""
+
+#. module: survey
+#: model:ir.ui.menu,name:survey.menu_answer_surveys
+msgid "Answer Surveys"
+msgstr ""
+
+#. module: survey
+#: selection:survey.response,state:0
+msgid "Not Finished"
+msgstr ""
+
+#. module: survey
+#: view:survey.print:0
+msgid "Survey Print"
+msgstr ""
+
+#. module: survey
+#: view:survey.send.invitation:0
+msgid "Select Partner"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,type:0
+msgid "Question Type"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/wizard/survey_answer.py:131
+#, python-format
+msgid "You can not answer this survey more than %s times"
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.act_survey_answer
+msgid "Answers"
+msgstr ""
+
+#. module: survey
+#: model:ir.module.module,description:survey.module_meta_information
+msgid ""
+"\n"
+"    This module is used for surveying. It depends on the answers or reviews "
+"of some questions by different users.\n"
+"    A survey may have multiple pages. Each page may contain multiple "
+"questions and each question may have multiple answers.\n"
+"    Different users may give different answers of question and according to "
+"that survey is done. \n"
+"    Partners are also sent mails with user name and password for the "
+"invitation of the survey\n"
+"    "
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/wizard/survey_answer.py:124
+#, python-format
+msgid "You can not answer because the survey is not open"
+msgstr ""
+
+#. module: survey
+#: selection:survey.response,response_type:0
+msgid "Link"
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_survey_type_form
+#: model:ir.model,name:survey.model_survey_type
+#: view:survey.type:0
+msgid "Survey Type"
+msgstr ""
+
+#. module: survey
+#: field:survey.page,sequence:0
+msgid "Page Nr"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: view:survey.page:0
+#: view:survey.question:0
+#: field:survey.question,descriptive_text:0
+#: selection:survey.question,type:0
+msgid "Descriptive Text"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,minimum_req_ans:0
+msgid "Minimum Required Answer"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/survey.py:484
+#, python-format
+msgid ""
+"You must enter one or more menu choices in column heading (white spaces not "
+"allowed)"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,req_error_msg:0
+msgid "Error Message"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/survey.py:482
+#, python-format
+msgid "You must enter one or more menu choices in column heading"
+msgstr ""
+
+#. module: survey
+#: field:survey.request,date_deadline:0
+msgid "Deadline date"
+msgstr ""
+
+#. module: survey
+#: selection:survey.question,comment_valid_type:0
+#: selection:survey.question,validation_type:0
+msgid "Must Be A Date"
+msgstr ""
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_print
+msgid "survey.print"
+msgstr ""
+
+#. module: survey
+#: view:survey.question.column.heading:0
+#: field:survey.question.column.heading,title:0
+msgid "Column Heading"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,is_require_answer:0
+msgid "Require Answer to Question"
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_survey_request_tree
+#: model:ir.ui.menu,name:survey.menu_survey_type_form1
+msgid "Survey Requests"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/survey.py:375
+#: code:addons/survey/survey.py:462
+#, python-format
+msgid "You must enter one or more column heading."
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/wizard/survey_answer.py:758
+#: code:addons/survey/wizard/survey_answer.py:953
+#, python-format
+msgid "Please enter an integer value"
+msgstr ""
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_browse_answer
+msgid "survey.browse.answer"
+msgstr ""
+
+#. module: survey
+#: selection:survey.question,comment_field_type:0
+msgid "Paragraph of Text"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/survey.py:428
+#, python-format
+msgid ""
+"Maximum Required Answer you                                     entered for "
+"your maximum is greater than the number of answer.                           "
+"          Please use a number that is smaller than %d."
+msgstr ""
+
+#. module: survey
+#: view:survey.request:0
+msgid "Watting Answer"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: view:survey.page:0
+#: view:survey.question:0
+msgid "When the question is not answered, display this error message:"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: view:survey.page:0
+#: view:survey.question:0
+msgid "Options"
+msgstr ""
+
+#. module: survey
+#: model:ir.ui.menu,name:survey.menu_browse_survey_response
+msgid "Browse Answers"
+msgstr ""
+
+#. module: survey
+#: field:survey.response.answer,comment_field:0
+#: view:survey.response.line:0
+msgid "Comment"
+msgstr ""
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_answer
+#: model:ir.model,name:survey.model_survey_response_answer
+#: view:survey.answer:0
+#: view:survey.response:0
+#: view:survey.response.answer:0
+#: view:survey.response.line:0
+msgid "Survey Answer"
+msgstr ""
+
+#. module: survey
+#: selection:survey.answer,type:0
+msgid "Selection"
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_browse_survey_response
+#: view:survey:0
+msgid "Answer Survey"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: view:survey.page:0
+#: view:survey.question:0
+msgid "Comment Field"
+msgstr ""
+
+#. module: survey
+#: selection:survey.response,response_type:0
+msgid "Manually"
+msgstr ""
+
+#. module: survey
+#: help:survey,responsible_id:0
+msgid "User responsible for survey"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,comment_column:0
+msgid "Add comment column in matrix"
+msgstr ""
+
+#. module: survey
+#: field:survey.answer,response:0
+msgid "#Answer"
+msgstr ""
+
+#. module: survey
+#: field:survey.print,without_pagebreak:0
+#: field:survey.print.answer,without_pagebreak:0
+msgid "Print Without Page Breaks"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: view:survey.page:0
+#: view:survey.question:0
+msgid "When the comment is an invalid format, display this error message"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/wizard/survey_selection.py:138
+#, python-format
+msgid ""
+"You can not give more response. Please contact the author of this survey for "
+"further assistance."
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.act_survey_page_question
+#: model:ir.actions.act_window,name:survey.act_survey_question
+msgid "Questions"
+msgstr ""
+
+#. module: survey
+#: help:survey,response_user:0
+msgid "Set to one if  you require only one Answer per user"
+msgstr ""
+
+#. module: survey
+#: field:survey,users:0
+msgid "Users"
+msgstr ""
+
+#. module: survey
+#: view:survey.send.invitation:0
+msgid "Message"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: view:survey.request:0
+msgid "MY"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,maximum_req_ans:0
+msgid "Maximum Required Answer"
+msgstr ""
+
+#. module: survey
+#: field:survey.name.wiz,page_no:0
+msgid "Page Number"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/wizard/survey_answer.py:92
+#, python-format
+msgid "Cannot locate survey for the question wizard!"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: view:survey.page:0
+#: view:survey.question:0
+msgid "and"
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_view_survey_print_statistics
+#: view:survey.print.statistics:0
+msgid "Survey Print Statistics"
+msgstr ""
+
+#. module: survey
+#: field:survey.send.invitation.log,note:0
+msgid "Log"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: view:survey.page:0
+#: view:survey.question:0
+msgid "When the choices do not add up correctly, display this error message"
+msgstr ""
+
+#. module: survey
+#: field:survey,date_close:0
+msgid "Survey Close Date"
+msgstr ""
+
+#. module: survey
+#: field:survey,date_open:0
+msgid "Survey Open Date"
+msgstr ""
+
+#. module: survey
+#: field:survey.question.column.heading,in_visible_rating_weight:0
+msgid "Is Rating Scale Invisible ??"
+msgstr ""
+
+#. module: survey
+#: view:survey.browse.answer:0
+#: view:survey.name.wiz:0
+msgid "Start"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/survey.py:477
+#, python-format
+msgid "Maximum Required Answer is greater than Minimum Required Answer"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,comment_maximum_no:0
+#: field:survey.question,validation_maximum_no:0
+msgid "Maximum number"
+msgstr ""
+
+#. module: survey
+#: selection:survey,state:0
+#: selection:survey.request,state:0
+#: selection:survey.response.line,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_print_statistics
+msgid "survey.print.statistics"
+msgstr ""
+
+#. module: survey
+#: selection:survey,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: survey
+#: selection:survey.question,type:0
+msgid "Matrix of Drop-down Menus"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: field:survey.answer,answer:0
+#: field:survey.name.wiz,response:0
+#: view:survey.page:0
+#: view:survey.print.answer:0
+#: field:survey.print.answer,response_ids:0
+#: view:survey.question:0
+#: field:survey.question,answer_choice_ids:0
+#: field:survey.request,response:0
+#: field:survey.response,question_ids:0
+#: field:survey.response.answer,answer_id:0
+#: field:survey.response.answer,response_id:0
+#: view:survey.response.line:0
+#: field:survey.response.line,response_answer_ids:0
+#: field:survey.response.line,response_id:0
+#: field:survey.response.line,response_table_ids:0
+#: field:survey.send.invitation,partner_ids:0
+#: field:survey.tbl.column.heading,response_table_id:0
+msgid "Answer"
+msgstr ""
+
+#. module: survey
+#: field:survey,max_response_limit:0
+msgid "Maximum Answer Limit"
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_act_view_survey_send_invitation
+msgid "Send Invitations"
+msgstr ""
+
+#. module: survey
+#: field:survey.name.wiz,store_ans:0
+msgid "Store Answer"
+msgstr ""
+
+#. module: survey
+#: selection:survey.question,type:0
+msgid "Date and Time"
+msgstr ""
+
+#. module: survey
+#: field:survey,state:0
+#: field:survey.response,state:0
+#: field:survey.response.line,state:0
+msgid "Status"
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_view_survey_print
+msgid "Print Survey"
+msgstr ""
+
+#. module: survey
+#: field:survey,send_response:0
+msgid "E-mail Notification on Answer"
+msgstr ""
+
+#. module: survey
+#: field:survey.response.answer,value_choice:0
+msgid "Value Choice"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+msgid "Started"
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_view_survey_print_answer
+#: view:survey:0
+#: view:survey.print.answer:0
+msgid "Print Answer"
+msgstr ""
+
+#. module: survey
+#: selection:survey.question,type:0
+msgid "Multiple Textboxes"
+msgstr ""
+
+#. module: survey
+#: selection:survey.print,orientation:0
+#: selection:survey.print.answer,orientation:0
+msgid "Landscape(Horizontal)"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,no_of_rows:0
+msgid "No of Rows"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: view:survey.name.wiz:0
+msgid "Survey Details"
+msgstr ""
+
+#. module: survey
+#: selection:survey.question,type:0
+msgid "Multiple Textboxes With Different Type"
+msgstr ""
+
+#. module: survey
+#: view:survey.question.column.heading:0
+msgid "Menu Choices (each choice on separate lines)"
+msgstr ""
+
+#. module: survey
+#: field:survey.response,response_type:0
+msgid "Answer Type"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: view:survey.page:0
+#: view:survey.question:0
+msgid "Validation"
+msgstr ""
+
+#. module: survey
+#: view:survey.request:0
+#: selection:survey.request,state:0
+msgid "Waiting Answer"
+msgstr ""
+
+#. module: survey
+#: selection:survey.question,comment_valid_type:0
+#: selection:survey.question,validation_type:0
+msgid "Must Be A Decimal Number"
+msgstr ""
+
+#. module: survey
+#: field:res.users,survey_id:0
+msgid "Groups"
+msgstr ""
+
+#. module: survey
+#: selection:survey.answer,type:0
+#: selection:survey.question,type:0
+msgid "Date"
+msgstr ""
+
+#. module: survey
+#: selection:survey.answer,type:0
+msgid "Integer"
+msgstr ""
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_send_invitation
+msgid "survey.send.invitation"
+msgstr ""
+
+#. module: survey
+#: field:survey.history,user_id:0
+#: view:survey.request:0
+#: field:survey.request,user_id:0
+#: field:survey.response,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: survey
+#: field:survey.name.wiz,transfer:0
+msgid "Page Transfer"
+msgstr ""
+
+#. module: survey
+#: selection:survey.response.line,state:0
+msgid "Skiped"
+msgstr ""
+
+#. module: survey
+#: field:survey.print,paper_size:0
+#: field:survey.print.answer,paper_size:0
+msgid "Paper Size"
+msgstr ""
+
+#. module: survey
+#: field:survey.response.answer,column_id:0
+#: field:survey.tbl.column.heading,column_id:0
+msgid "Column"
+msgstr ""
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_tbl_column_heading
+msgid "survey.tbl.column.heading"
+msgstr ""
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_response_line
+msgid "Survey Response Line"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/wizard/survey_selection.py:134
+#, python-format
+msgid "You can not give response for this survey more than %s times"
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.report.xml,name:survey.report_survey_form
+#: model:ir.model,name:survey.model_survey
+#: view:survey:0
+#: view:survey.browse.answer:0
+#: field:survey.browse.answer,survey_id:0
+#: field:survey.history,survey_id:0
+#: view:survey.name.wiz:0
+#: field:survey.name.wiz,survey_id:0
+#: view:survey.page:0
+#: field:survey.page,survey_id:0
+#: view:survey.print:0
+#: field:survey.print,survey_ids:0
+#: field:survey.print.statistics,survey_ids:0
+#: field:survey.question,survey:0
+#: view:survey.request:0
+#: field:survey.request,survey_id:0
+#: field:survey.response,survey_id:0
+msgid "Survey"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,in_visible_rating_weight:0
+msgid "Is Rating Scale Invisible?"
+msgstr ""
+
+#. module: survey
+#: selection:survey.question,type:0
+msgid "Numerical Textboxes"
+msgstr ""
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_question_wiz
+msgid "survey.question.wiz"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+msgid "History"
+msgstr ""
+
+#. module: survey
+#: help:survey.browse.answer,response_id:0
+msgid ""
+"If this field is empty, all answers of the selected survey will be print."
+msgstr ""
+
+#. module: survey
+#: field:survey.type,code:0
+msgid "Code"
+msgstr ""
+
+#. module: survey
+#: model:ir.ui.menu,name:survey.menu_print_survey_statistics
+msgid "Surveys Statistics"
+msgstr ""
+
+#. module: survey
+#: field:survey.print,orientation:0
+#: field:survey.print.answer,orientation:0
+msgid "Orientation"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: view:survey.answer:0
+#: view:survey.page:0
+#: view:survey.question:0
+msgid "Seq"
+msgstr ""
+
+#. module: survey
+#: field:survey.request,email:0
+msgid "E-mail"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,comment_minimum_no:0
+#: field:survey.question,validation_minimum_no:0
+msgid "Minimum number"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,req_ans:0
+msgid "#Required Answer"
+msgstr ""
+
+#. module: survey
+#: field:survey.answer,sequence:0
+#: field:survey.question,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,comment_label:0
+msgid "Field Label"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+msgid "Other"
+msgstr ""
+
+#. module: survey
+#: view:survey.request:0
+#: selection:survey.request,state:0
+msgid "Done"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+msgid "Test Survey"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,rating_allow_one_column_require:0
+msgid "Allow Only One Answer per Column (Forced Ranking)"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: view:survey.browse.answer:0
+#: view:survey.name.wiz:0
+#: view:survey.print:0
+#: view:survey.print.answer:0
+#: view:survey.print.statistics:0
+#: view:survey.send.invitation:0
+msgid "Cancel"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+msgid "Close"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,comment_minimum_float:0
+#: field:survey.question,validation_minimum_float:0
+msgid "Minimum decimal number"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: selection:survey,state:0
+msgid "Open"
+msgstr ""
+
+#. module: survey
+#: field:survey,tot_start_survey:0
+msgid "Total Started Survey"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/survey.py:467
+#, python-format
+msgid ""
+"#Required Answer you entered is greater than the number of answer. Please "
+"use a number that is smaller than %d."
+msgstr ""
+
+#. module: survey
+#: help:survey,max_response_limit:0
+msgid "Set to one if survey is answerable only once"
+msgstr ""
+
+#. module: survey
+#: selection:survey.response,state:0
+msgid "Finished "
+msgstr ""
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_question_column_heading
+msgid "Survey Question Column Heading"
+msgstr ""
+
+#. module: survey
+#: field:survey.answer,average:0
+msgid "#Avg"
+msgstr ""
+
+#. module: survey
+#: selection:survey.question,type:0
+msgid "Matrix of Choices (Multiple Answers Per Row)"
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_view_survey_name
+msgid "Give Survey Answer"
+msgstr ""
+
+#. module: survey
+#: model:ir.model,name:survey.model_res_users
+msgid "res.users"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+msgid "Current"
+msgstr ""
+
+#. module: survey
+#: selection:survey.response.line,state:0
+msgid "Answered"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/wizard/survey_answer.py:432
+#, python-format
+msgid "Complete Survey Answer"
+msgstr ""
+
+#. module: survey
+#: selection:survey.question,type:0
+msgid "Comment/Essay Box"
+msgstr ""
+
+#. module: survey
+#: field:survey.answer,type:0
+msgid "Type of Answer"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,required_type:0
+msgid "Respondent must answer"
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_view_survey_send_invitation
+#: view:survey.send.invitation:0
+msgid "Send Invitation"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/wizard/survey_answer.py:792
+#, python-format
+msgid "You cannot select the same answer more than one time"
+msgstr ""
+
+#. module: survey
+#: view:survey.question:0
+msgid "Search Question"
+msgstr ""
+
+#. module: survey
+#: field:survey,title:0
+msgid "Survey Title"
+msgstr ""
+
+#. module: survey
+#: selection:survey.question,type:0
+msgid "Single Textbox"
+msgstr ""
+
+#. module: survey
+#: field:survey,note:0
+#: field:survey.name.wiz,note:0
+#: view:survey.page:0
+#: field:survey.page,note:0
+#: view:survey.response.line:0
+msgid "Description"
+msgstr ""
+
+#. module: survey
+#: view:survey.name.wiz:0
+msgid "Select Survey"
+msgstr ""
+
+#. module: survey
+#: selection:survey.question,required_type:0
+msgid "At Least"
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_view_survey_send_invitation_log
+#: model:ir.model,name:survey.model_survey_send_invitation_log
+msgid "survey.send.invitation.log"
+msgstr ""
+
+#. module: survey
+#: selection:survey.print,orientation:0
+#: selection:survey.print.answer,orientation:0
+msgid "Portrait(Vertical)"
+msgstr ""
+
+#. module: survey
+#: selection:survey.question,comment_valid_type:0
+#: selection:survey.question,validation_type:0
+msgid "Must Be Specific Length"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: view:survey.page:0
+#: field:survey.question,page_id:0
+msgid "Survey Page"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: view:survey.page:0
+#: view:survey.question:0
+msgid "Required Answer"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/survey.py:473
+#, python-format
+msgid ""
+"Minimum Required Answer you entered is greater than the number of answer. "
+"Please use a number that is smaller than %d."
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/survey.py:458
+#, python-format
+msgid "You must enter one or more answer."
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.report.xml,name:survey.survey_browse_response
+#: field:survey.browse.answer,response_id:0
+msgid "Survey Answers"
+msgstr ""
+
+#. module: survey
+#: view:survey.browse.answer:0
+msgid "Select Survey and related answer"
+msgstr ""
+
+#. module: survey
+#: model:ir.ui.menu,name:survey.menu_print_survey_answer
+msgid "Surveys Answers"
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.act_survey_pages
+msgid "Pages"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/survey.py:406
+#, python-format
+msgid ""
+"#Required Answer you entered is                                     greater "
+"than the number of answer.                                    Please use a "
+"number that is smaller than %d."
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/wizard/survey_answer.py:984
+#, python-format
+msgid "You cannot select same answer more than one time'"
+msgstr ""
+
+#. module: survey
+#: selection:survey.print,paper_size:0
+#: selection:survey.print.answer,paper_size:0
+msgid "Legal (8.5\" x 14\")"
+msgstr ""
+
+#. module: survey
+#: field:survey.type,name:0
+msgid "Name"
+msgstr ""
+
+#. module: survey
+#: view:survey.page:0
+msgid "#Questions"
+msgstr ""
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_response
+msgid "survey.response"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,comment_valid_err_msg:0
+#: field:survey.question,make_comment_field_err_msg:0
+#: field:survey.question,numeric_required_sum_err_msg:0
+#: field:survey.question,validation_valid_err_msg:0
+msgid "Error message"
+msgstr ""
+
+#. module: survey
+#: model:ir.module.module,shortdesc:survey.module_meta_information
+msgid "Survey Module"
+msgstr ""
+
+#. module: survey
+#: view:survey.send.invitation:0
+#: field:survey.send.invitation,send_mail:0
+msgid "Send mail for new user"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/survey.py:387
+#, python-format
+msgid "You must enter one or more Answer."
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/survey.py:416
+#, python-format
+msgid ""
+"Minimum Required Answer                                     you entered is "
+"greater than the number of answer.                                    Please "
+"use a number that is smaller than %d."
+msgstr ""
+
+#. module: survey
+#: field:survey.answer,menu_choice:0
+msgid "Menu Choices"
+msgstr ""
+
+#. module: survey
+#: field:survey,page_ids:0
+#: view:survey.question:0
+#: field:survey.response.line,page_id:0
+msgid "Page"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/survey.py:438
+#, python-format
+msgid ""
+"Maximum Required Answer is greater                                     than "
+"Minimum Required Answer"
+msgstr ""
+
+#. module: survey
+#: view:survey.send.invitation.log:0
+msgid "User creation"
+msgstr ""
+
+#. module: survey
+#: selection:survey.question,required_type:0
+msgid "All"
+msgstr ""
+
+#. module: survey
+#: selection:survey.question,comment_valid_type:0
+#: selection:survey.question,validation_type:0
+msgid "Must Be An Email Address"
+msgstr ""
+
+#. module: survey
+#: selection:survey.question,type:0
+msgid "Multiple Choice (Only One Answer)"
+msgstr ""
+
+#. module: survey
+#: field:survey.answer,in_visible_answer_type:0
+msgid "Is Answer Type Invisible??"
+msgstr ""
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_print_answer
+msgid "survey.print.answer"
+msgstr ""
+
+#. module: survey
+#: view:survey.answer:0
+msgid "Menu Choices (each choice on separate by lines)"
+msgstr ""
+
+#. module: survey
+#: selection:survey.answer,type:0
+msgid "Float"
+msgstr ""
+
+#. module: survey
+#: view:survey.response.line:0
+msgid "Single Textboxes"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/wizard/survey_send_invitation.py:74
+#, python-format
+msgid "%sSurvey is not in open state"
+msgstr ""
+
+#. module: survey
+#: field:survey.question.column.heading,rating_weight:0
+msgid "Weight"
+msgstr ""
+
+#. module: survey
+#: selection:survey.answer,type:0
+msgid "Date & Time"
+msgstr ""
+
+#. module: survey
+#: field:survey.response,date_create:0
+#: field:survey.response.line,date_create:0
+msgid "Create Date"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,column_name:0
+msgid "Column Name"
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_survey_page_form
+#: model:ir.model,name:survey.model_survey_page
+#: model:ir.ui.menu,name:survey.menu_survey_page_form1
+#: view:survey.page:0
+msgid "Survey Pages"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,numeric_required_sum:0
+msgid "Sum of all choices"
+msgstr ""
+
+#. module: survey
+#: selection:survey.question,type:0
+#: view:survey.response.line:0
+msgid "Table"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/survey.py:642
+#, python-format
+msgid "You cannot duplicate the resource!"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,comment_minimum_date:0
+#: field:survey.question,validation_minimum_date:0
+msgid "Minimum date"
+msgstr ""
+
+#. module: survey
+#: field:survey,response_user:0
+msgid "Maximum Answer per User"
+msgstr ""
+
+#. module: survey
+#: field:survey.name.wiz,page:0
+msgid "Page Position"
+msgstr ""
diff --git a/addons/survey/i18n/pt_BR.po b/addons/survey/i18n/pt_BR.po
index e6c29033c86..179c4ec5937 100644
--- a/addons/survey/i18n/pt_BR.po
+++ b/addons/survey/i18n/pt_BR.po
@@ -8,20 +8,20 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-03 16:58+0000\n"
-"PO-Revision-Date: 2011-03-01 00:32+0000\n"
-"Last-Translator: Emerson <Unknown>\n"
+"PO-Revision-Date: 2011-04-16 21:15+0000\n"
+"Last-Translator: ERIVELTON PIRES GUEDES <Unknown>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@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: 2011-03-02 04:38+0000\n"
-"X-Generator: Launchpad (build 12351)\n"
+"X-Launchpad-Export-Date: 2011-04-17 04:36+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
 #. module: survey
 #: view:survey.print:0
 #: view:survey.print.answer:0
 msgid "Print Option"
-msgstr ""
+msgstr "Opções de Impressão"
 
 #. module: survey
 #: code:addons/survey/survey.py:422
@@ -103,7 +103,7 @@ msgstr "Requisitar Pesquisa"
 #. module: survey
 #: selection:survey.question,required_type:0
 msgid "A Range"
-msgstr ""
+msgstr "Um Intervalo"
 
 #. module: survey
 #: view:survey.response.line:0
@@ -113,7 +113,7 @@ msgstr "Tabela de Resposta"
 #. module: survey
 #: field:survey.history,date:0
 msgid "Date started"
-msgstr ""
+msgstr "Data iniciada"
 
 #. module: survey
 #: field:survey,history:0
@@ -127,6 +127,8 @@ msgid ""
 "You must enter one or more menu                                 choices in "
 "column heading (white spaces not allowed)"
 msgstr ""
+"Você deve escolher uma ou mais opções de menu no cabeçalho da coluna "
+"(espaços em branco não são permitidos)"
 
 #. module: survey
 #: field:survey.question.column.heading,in_visible_menu_choice:0
@@ -392,7 +394,7 @@ msgstr "Linha Simples de Texto"
 #: view:survey.send.invitation:0
 #: field:survey.send.invitation,send_mail_existing:0
 msgid "Send reminder for existing user"
-msgstr ""
+msgstr "Enviar lembrete para usuário existente"
 
 #. module: survey
 #: selection:survey.question,type:0
@@ -462,7 +464,7 @@ msgstr "Assunto"
 #: field:survey.question,comment_maximum_float:0
 #: field:survey.question,validation_maximum_float:0
 msgid "Maximum decimal number"
-msgstr ""
+msgstr "Máximo número decimal"
 
 #. module: survey
 #: selection:survey.request,state:0
@@ -494,7 +496,7 @@ msgstr ""
 #: selection:survey.question,comment_valid_type:0
 #: selection:survey.question,validation_type:0
 msgid "Must Be A Whole Number"
-msgstr ""
+msgstr "Precisa Ser Um Número Completo"
 
 #. module: survey
 #: field:survey.answer,question_id:0
@@ -527,6 +529,7 @@ msgid ""
 "You must enter one or more menu choices                                 in "
 "column heading"
 msgstr ""
+"Você precisa especificar um ou mais opções de menu no cabeçalho da coluna"
 
 #. module: survey
 #: model:ir.actions.act_window,help:survey.action_survey_form1
@@ -548,7 +551,7 @@ msgstr "Status"
 #. module: survey
 #: view:survey.request:0
 msgid "Evaluation Plan Phase"
-msgstr ""
+msgstr "Fase do Plano de Avaliação"
 
 #. module: survey
 #: view:survey:0
@@ -588,7 +591,7 @@ msgstr "Responder Pesquisas"
 #. module: survey
 #: selection:survey.response,state:0
 msgid "Not Finished"
-msgstr ""
+msgstr "Não Acabado"
 
 #. module: survey
 #: view:survey.print:0
@@ -666,7 +669,7 @@ msgstr "Texto Descritivo"
 #. module: survey
 #: field:survey.question,minimum_req_ans:0
 msgid "Minimum Required Answer"
-msgstr ""
+msgstr "Mínimo de Respostas Necessárias"
 
 #. module: survey
 #: code:addons/survey/survey.py:484
@@ -712,7 +715,7 @@ msgstr "Título de Coluna"
 #. module: survey
 #: field:survey.question,is_require_answer:0
 msgid "Require Answer to Question"
-msgstr ""
+msgstr "Resposta Necessária para a Questão"
 
 #. module: survey
 #: model:ir.actions.act_window,name:survey.action_survey_request_tree
@@ -742,7 +745,7 @@ msgstr "survey.browse.answer"
 #. module: survey
 #: selection:survey.question,comment_field_type:0
 msgid "Paragraph of Text"
-msgstr ""
+msgstr "Parágrafo de Texto"
 
 #. module: survey
 #: code:addons/survey/survey.py:428
@@ -756,7 +759,7 @@ msgstr ""
 #. module: survey
 #: view:survey.request:0
 msgid "Watting Answer"
-msgstr ""
+msgstr "Aguardando Resposta"
 
 #. module: survey
 #: view:survey:0
@@ -1010,7 +1013,7 @@ msgstr "Enviar Convites"
 #. module: survey
 #: field:survey.name.wiz,store_ans:0
 msgid "Store Answer"
-msgstr ""
+msgstr "Armazenar Resposta"
 
 #. module: survey
 #: selection:survey.question,type:0
@@ -1054,7 +1057,7 @@ msgstr "Imprimir Resposta"
 #. module: survey
 #: selection:survey.question,type:0
 msgid "Multiple Textboxes"
-msgstr ""
+msgstr "Múltiplas Caixas de Texto"
 
 #. module: survey
 #: selection:survey.print,orientation:0
@@ -1076,7 +1079,7 @@ msgstr "Detalhes da Pesquisa"
 #. module: survey
 #: selection:survey.question,type:0
 msgid "Multiple Textboxes With Different Type"
-msgstr ""
+msgstr "Múltiplas Caixas de Texto Com Diferentes Tipos"
 
 #. module: survey
 #: view:survey.question.column.heading:0
@@ -1097,6 +1100,7 @@ msgstr "Validação"
 
 #. module: survey
 #: view:survey.request:0
+#: selection:survey.request,state:0
 msgid "Waiting Answer"
 msgstr "Aguardando Resposta"
 
@@ -1138,7 +1142,7 @@ msgstr "Usuário"
 #. module: survey
 #: field:survey.name.wiz,transfer:0
 msgid "Page Transfer"
-msgstr ""
+msgstr "Transferência de Página"
 
 #. module: survey
 #: selection:survey.response.line,state:0
@@ -1202,7 +1206,7 @@ msgstr ""
 #. module: survey
 #: selection:survey.question,type:0
 msgid "Numerical Textboxes"
-msgstr ""
+msgstr "Caixas de Texto Numéricas"
 
 #. module: survey
 #: model:ir.model,name:survey.model_survey_question_wiz
@@ -1463,7 +1467,7 @@ msgstr "Retrato (Vertical)"
 #: selection:survey.question,comment_valid_type:0
 #: selection:survey.question,validation_type:0
 msgid "Must Be Specific Length"
-msgstr ""
+msgstr "Deve Ter Tamanho Específico"
 
 #. module: survey
 #: view:survey:0
@@ -1533,7 +1537,7 @@ msgstr "Você não pode selecionar a mesma resposta mais de uma vez"
 #: selection:survey.print,paper_size:0
 #: selection:survey.print.answer,paper_size:0
 msgid "Legal (8.5\" x 14\")"
-msgstr ""
+msgstr "Carta (8.5\" x 14\")"
 
 #. module: survey
 #: field:survey.type,name:0
@@ -1587,7 +1591,7 @@ msgstr ""
 #. module: survey
 #: field:survey.answer,menu_choice:0
 msgid "Menu Choices"
-msgstr ""
+msgstr "Opções de Menu"
 
 #. module: survey
 #: field:survey,page_ids:0
@@ -1638,7 +1642,7 @@ msgstr "survey.print.answer"
 #. module: survey
 #: view:survey.answer:0
 msgid "Menu Choices (each choice on separate by lines)"
-msgstr ""
+msgstr "Menu de opções (cada opção em uma linha separada)"
 
 #. module: survey
 #: selection:survey.answer,type:0
@@ -1688,7 +1692,7 @@ msgstr "Páginas de Pesquisa"
 #. module: survey
 #: field:survey.question,numeric_required_sum:0
 msgid "Sum of all choices"
-msgstr ""
+msgstr "Soma de todas as escolhas"
 
 #. module: survey
 #: selection:survey.question,type:0
diff --git a/addons/wiki/i18n/ru.po b/addons/wiki/i18n/ru.po
index 283ff319c9c..7bb7b2fae3b 100644
--- a/addons/wiki/i18n/ru.po
+++ b/addons/wiki/i18n/ru.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2011-01-12 17:12+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2011-04-15 20:00+0000\n"
+"Last-Translator: Chertykov Denis <chertykov@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: 2011-01-15 05:44+0000\n"
-"X-Generator: Launchpad (build 12177)\n"
+"X-Launchpad-Export-Date: 2011-04-16 04:59+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
 #. module: wiki
 #: field:wiki.groups,template:0
@@ -30,7 +30,7 @@ msgstr "Wiki страницы"
 #. module: wiki
 #: field:wiki.groups,method:0
 msgid "Display Method"
-msgstr ""
+msgstr "Метод вывода"
 
 #. module: wiki
 #: view:wiki.wiki:0
@@ -57,7 +57,7 @@ msgstr "Секция"
 #. module: wiki
 #: help:wiki.wiki,toc:0
 msgid "Indicates that this pages have a table of contents or not"
-msgstr ""
+msgstr "Показывает имеется ли содержание на этой странице"
 
 #. module: wiki
 #: model:ir.model,name:wiki.model_wiki_wiki_history
@@ -68,7 +68,7 @@ msgstr "История Wiki"
 #. module: wiki
 #: field:wiki.wiki,minor_edit:0
 msgid "Minor edit"
-msgstr ""
+msgstr "Малозначимое изменение"
 
 #. module: wiki
 #: view:wiki.wiki:0
@@ -79,18 +79,18 @@ msgstr "Содержание"
 #. module: wiki
 #: field:wiki.wiki,child_ids:0
 msgid "Child Pages"
-msgstr ""
+msgstr "Подчиненные страницы"
 
 #. module: wiki
 #: field:wiki.wiki,parent_id:0
 msgid "Parent Page"
-msgstr ""
+msgstr "Главная страница"
 
 #. module: wiki
 #: view:wiki.wiki:0
 #: field:wiki.wiki,write_uid:0
 msgid "Last Contributor"
-msgstr ""
+msgstr "Последний корректор"
 
 #. module: wiki
 #: field:wiki.create.menu,menu_parent_id:0
@@ -100,7 +100,7 @@ msgstr "Родительское меню"
 #. module: wiki
 #: help:wiki.wiki,group_id:0
 msgid "Topic, also called Wiki Group"
-msgstr ""
+msgstr "Тема, которая также называется Вики группа"
 
 #. module: wiki
 #: field:wiki.groups,name:0
@@ -117,12 +117,12 @@ msgstr "Заголовок"
 #. module: wiki
 #: model:ir.model,name:wiki.model_wiki_create_menu
 msgid "Wizard Create Menu"
-msgstr ""
+msgstr "Помощник создания меню"
 
 #. module: wiki
 #: field:wiki.wiki,history_id:0
 msgid "History Lines"
-msgstr ""
+msgstr "Строки истории"
 
 #. module: wiki
 #: view:wiki.wiki:0
@@ -144,7 +144,7 @@ msgstr ""
 #. module: wiki
 #: model:ir.module.module,shortdesc:wiki.module_meta_information
 msgid "Document Management - Wiki"
-msgstr ""
+msgstr "Управление документами - Вики"
 
 #. module: wiki
 #: field:wiki.create.menu,menu_name:0
@@ -159,7 +159,7 @@ msgstr "Описание"
 #. module: wiki
 #: field:wiki.wiki,review:0
 msgid "Needs Review"
-msgstr ""
+msgstr "Нуждается в проверке"
 
 #. module: wiki
 #: help:wiki.wiki,review:0
@@ -167,6 +167,8 @@ msgid ""
 "Indicates that this page should be reviewed, raising the attention of other "
 "contributors"
 msgstr ""
+"Указывает, что эта страница должна быть проверена, привлекает внимание "
+"других участников"
 
 #. module: wiki
 #: view:wiki.create.menu:0
@@ -177,7 +179,7 @@ msgstr "Информация меню"
 #. module: wiki
 #: model:ir.actions.act_window,name:wiki.act_wiki_wiki_history
 msgid "Page History"
-msgstr ""
+msgstr "История страницы"
 
 #. module: wiki
 #: selection:wiki.groups,method:0
@@ -244,12 +246,12 @@ msgstr "Описание группы"
 #. module: wiki
 #: help:wiki.wiki,section:0
 msgid "Use page section code like 1.2.1"
-msgstr ""
+msgstr "Используйте код выбора страницы, например: 1.2.1"
 
 #. module: wiki
 #: view:wiki.wiki.page.open:0
 msgid "Want to open a wiki page? "
-msgstr ""
+msgstr "Хотите открыть вики ? "
 
 #. module: wiki
 #: field:wiki.groups,section:0
@@ -311,7 +313,7 @@ msgstr "История всех страниц"
 #. module: wiki
 #: model:ir.model,name:wiki.model_wiki_wiki
 msgid "wiki.wiki"
-msgstr ""
+msgstr "wiki.wiki"
 
 #. module: wiki
 #: help:wiki.groups,method:0
@@ -342,12 +344,12 @@ msgstr "Главная страница"
 #. module: wiki
 #: help:wiki.wiki,parent_id:0
 msgid "Allows you to link with the other page with in the current topic"
-msgstr ""
+msgstr "Позволяет сделать ссылку на другую страницу в текущем разделе"
 
 #. module: wiki
 #: view:wiki.wiki:0
 msgid "Modification Information"
-msgstr ""
+msgstr "Информация об изменениях"
 
 #. module: wiki
 #: model:ir.ui.menu,name:wiki.menu_wiki_configuration
@@ -395,7 +397,7 @@ msgstr "Создать меню"
 #. module: wiki
 #: field:wiki.wiki.history,minor_edit:0
 msgid "This is a major edit ?"
-msgstr ""
+msgstr "Это существенные изменения ?"
 
 #. module: wiki
 #: model:ir.actions.act_window,name:wiki.action_wiki_groups
@@ -404,7 +406,7 @@ msgstr ""
 #: model:ir.ui.menu,name:wiki.menu_action_wiki_groups
 #: view:wiki.groups:0
 msgid "Wiki Groups"
-msgstr ""
+msgstr "Вики группы"
 
 #. module: wiki
 #: view:wiki.wiki:0
@@ -414,7 +416,7 @@ msgstr "Тема"
 #. module: wiki
 #: field:wiki.wiki.history,write_uid:0
 msgid "Modify By"
-msgstr ""
+msgstr "Изменено"
 
 #. module: wiki
 #: code:addons/wiki/web/widgets/wikimarkup/__init__.py:1981
@@ -427,7 +429,7 @@ msgstr "Содержание"
 #: view:wiki.groups:0
 #: view:wiki.wiki.page.open:0
 msgid "Open Wiki Page"
-msgstr ""
+msgstr "Открыть вики-страницу"
 
 #. module: wiki
 #: model:ir.model,name:wiki.model_wiki_wiki_page_open
@@ -454,7 +456,7 @@ msgstr "Необходима Проверка"
 #. module: wiki
 #: model:ir.actions.act_window,name:wiki.action_wiki_review
 msgid "Pages Waiting Review"
-msgstr ""
+msgstr "Страницы ожидающие проверки"
 
 #. module: wiki
 #: model:ir.actions.act_window,name:wiki.act_wiki_group_open
@@ -514,3 +516,6 @@ msgstr "Страница поиска"
 
 #~ msgid "Size of the field can never be less than 1 !"
 #~ msgstr "Размер поля не может быть меньше 1 !"
+
+#~ msgid "Child Groups"
+#~ msgstr "Подчиненные группы"

From fb32f5584960b48ed46ef535915707207fa7a8ef Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Sun, 17 Apr 2011 06:13:31 +0000
Subject: [PATCH 240/331] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20110416065239-g3irbzfx16z2npex
bzr revid: launchpad_translations_on_behalf_of_openerp-20110417061331-ca79vijfetbbvsf4
---
 addons/board/i18n/ln.po                      |  393 ++++
 addons/caldav/i18n/ca.po                     |  818 +++++++++
 addons/email_template/i18n/ca.po             | 1278 +++++++++++++
 addons/product/i18n/id.po                    |    6 +-
 addons/purchase_double_validation/i18n/fr.po |   22 +-
 addons/survey/i18n/ca.po                     | 1712 ++++++++++++++++++
 addons/thunderbird/i18n/fr.po                |   10 +-
 7 files changed, 4223 insertions(+), 16 deletions(-)
 create mode 100644 addons/board/i18n/ln.po
 create mode 100644 addons/caldav/i18n/ca.po
 create mode 100644 addons/email_template/i18n/ca.po
 create mode 100644 addons/survey/i18n/ca.po

diff --git a/addons/board/i18n/ln.po b/addons/board/i18n/ln.po
new file mode 100644
index 00000000000..04a1061af30
--- /dev/null
+++ b/addons/board/i18n/ln.po
@@ -0,0 +1,393 @@
+# Lingala translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2011-04-15 08:58+0000\n"
+"Last-Translator: Etienne Ruedin <Unknown>\n"
+"Language-Team: Lingala <ln@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: 2011-04-16 06:52+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
+
+#. module: board
+#: view:res.log.report:0
+msgid "  Year  "
+msgstr "  Mobú  "
+
+#. module: board
+#: model:ir.model,name:board.model_board_menu_create
+msgid "Menu Create"
+msgstr ""
+
+#. module: board
+#: view:board.note:0
+#: field:board.note.type,name:0
+#: model:ir.model,name:board.model_board_note_type
+msgid "Note Type"
+msgstr ""
+
+#. module: board
+#: view:board.note:0
+#: field:board.note,user_id:0
+msgid "Author"
+msgstr ""
+
+#. module: board
+#: model:ir.module.module,shortdesc:board.module_meta_information
+msgid "Dashboard main module"
+msgstr ""
+
+#. module: board
+#: view:res.users:0
+msgid "Latest Connections"
+msgstr ""
+
+#. module: board
+#: code:addons/board/wizard/board_menu_create.py:45
+#, python-format
+msgid "User Error!"
+msgstr ""
+
+#. module: board
+#: view:board.board:0
+#: model:ir.actions.act_window,name:board.open_board_administration_form
+#: model:ir.ui.menu,name:board.menu_board_admin
+msgid "Administration Dashboard"
+msgstr ""
+
+#. module: board
+#: view:board.note:0
+#: field:board.note,note:0
+#: model:ir.model,name:board.model_board_note
+msgid "Note"
+msgstr ""
+
+#. module: board
+#: view:board.note:0
+#: view:res.log.report:0
+msgid "Group By..."
+msgstr ""
+
+#. module: board
+#: model:ir.model,name:board.model_board_board
+msgid "Board"
+msgstr ""
+
+#. module: board
+#: view:board.board:0
+#: model:ir.actions.act_window,name:board.board_weekly_res_log_report_action
+#: view:res.log.report:0
+msgid "Weekly Global Activity"
+msgstr ""
+
+#. module: board
+#: field:board.board.line,name:0
+msgid "Title"
+msgstr ""
+
+#. module: board
+#: field:res.log.report,nbr:0
+msgid "# of Entries"
+msgstr ""
+
+#. module: board
+#: view:res.log.report:0
+#: field:res.log.report,month:0
+msgid "Month"
+msgstr "Sánzá"
+
+#. module: board
+#: model:ir.actions.act_window,name:board.dashboard_open
+msgid "Open Dashboard"
+msgstr ""
+
+#. module: board
+#: view:board.board:0
+#: model:ir.actions.act_window,name:board.board_monthly_res_log_report_action
+#: view:res.log.report:0
+msgid "Monthly Activity per Document"
+msgstr ""
+
+#. module: board
+#: view:res.log.report:0
+msgid "Log Analysis"
+msgstr ""
+
+#. module: board
+#: model:ir.actions.act_window,name:board.action_view_board_list_form
+#: model:ir.ui.menu,name:board.menu_view_board_form
+msgid "Dashboard Definition"
+msgstr ""
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "March"
+msgstr "mársi"
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "August"
+msgstr "augústo"
+
+#. module: board
+#: view:board.board:0
+#: model:ir.actions.act_window,name:board.action_user_connection_tree
+msgid "User Connections"
+msgstr ""
+
+#. module: board
+#: field:res.log.report,creation_date:0
+msgid "Creation Date"
+msgstr ""
+
+#. module: board
+#: model:ir.actions.act_window,name:board.action_view_board_note_form
+#: model:ir.ui.menu,name:board.menu_view_board_note_form
+msgid "Publish a note"
+msgstr ""
+
+#. module: board
+#: view:board.menu.create:0
+msgid "Menu Information"
+msgstr ""
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "June"
+msgstr "yúni"
+
+#. module: board
+#: field:board.note,type:0
+msgid "Note type"
+msgstr ""
+
+#. module: board
+#: field:board.board,line_ids:0
+msgid "Action Views"
+msgstr ""
+
+#. module: board
+#: model:ir.model,name:board.model_res_log_report
+msgid "Log Report"
+msgstr ""
+
+#. module: board
+#: view:board.note:0
+#: field:board.note,date:0
+msgid "Date"
+msgstr "Dáte"
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "July"
+msgstr "yúli"
+
+#. module: board
+#: view:res.log.report:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: board
+#: view:res.log.report:0
+#: field:res.log.report,day:0
+msgid "Day"
+msgstr "Mokɔlɔ"
+
+#. module: board
+#: view:board.menu.create:0
+msgid "Create Menu For Dashboard"
+msgstr ""
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "February"
+msgstr "febwáli"
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "October"
+msgstr "ɔkɔtɔ́bɛ"
+
+#. module: board
+#: model:ir.model,name:board.model_board_board_line
+msgid "Board Line"
+msgstr ""
+
+#. module: board
+#: field:board.menu.create,menu_parent_id:0
+msgid "Parent Menu"
+msgstr ""
+
+#. module: board
+#: view:res.log.report:0
+msgid "    Month-1    "
+msgstr "    Sánzá-1    "
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "January"
+msgstr "yanwáli"
+
+#. module: board
+#: view:board.note:0
+msgid "Notes"
+msgstr ""
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "November"
+msgstr "novɛ́mbɛ"
+
+#. module: board
+#: help:board.board.line,sequence:0
+msgid ""
+"Gives the sequence order                         when displaying a list of "
+"board lines."
+msgstr ""
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "April"
+msgstr "apríli"
+
+#. module: board
+#: view:board.board:0
+#: field:board.board,name:0
+#: field:board.board.line,board_id:0
+#: model:ir.ui.menu,name:board.admin_menu_dasboard
+#: model:ir.ui.menu,name:board.menu_dasboard
+msgid "Dashboard"
+msgstr ""
+
+#. module: board
+#: model:ir.module.module,description:board.module_meta_information
+msgid "Base module for all dashboards."
+msgstr ""
+
+#. module: board
+#: field:board.board.line,action_id:0
+msgid "Action"
+msgstr ""
+
+#. module: board
+#: field:board.board.line,position:0
+msgid "Position"
+msgstr ""
+
+#. module: board
+#: view:res.log.report:0
+msgid "Model"
+msgstr ""
+
+#. module: board
+#: field:board.menu.create,menu_name:0
+msgid "Menu Name"
+msgstr ""
+
+#. module: board
+#: view:board.board:0
+#: model:ir.actions.act_window,name:board.action_latest_activities_tree
+msgid "Latest Activities"
+msgstr ""
+
+#. module: board
+#: selection:board.board.line,position:0
+msgid "Left"
+msgstr ""
+
+#. module: board
+#: field:board.board,view_id:0
+msgid "Board View"
+msgstr ""
+
+#. module: board
+#: selection:board.board.line,position:0
+msgid "Right"
+msgstr ""
+
+#. module: board
+#: field:board.board.line,width:0
+msgid "Width"
+msgstr ""
+
+#. module: board
+#: view:res.log.report:0
+msgid "   Month   "
+msgstr "   Sánzá   "
+
+#. module: board
+#: field:board.board.line,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "September"
+msgstr "sɛtɛ́mbɛ"
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "December"
+msgstr "dɛsɛ́mbɛ"
+
+#. module: board
+#: view:board.board:0
+#: view:board.menu.create:0
+msgid "Create Menu"
+msgstr ""
+
+#. module: board
+#: field:board.board.line,height:0
+msgid "Height"
+msgstr ""
+
+#. module: board
+#: model:ir.actions.act_window,name:board.action_board_menu_create
+msgid "Create Board Menu"
+msgstr ""
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "May"
+msgstr "máyí"
+
+#. module: board
+#: field:res.log.report,res_model:0
+msgid "Object"
+msgstr ""
+
+#. module: board
+#: view:res.log.report:0
+#: field:res.log.report,name:0
+msgid "Year"
+msgstr "Mobú"
+
+#. module: board
+#: view:board.menu.create:0
+msgid "Cancel"
+msgstr "Tika"
+
+#. module: board
+#: view:board.board:0
+msgid "Dashboard View"
+msgstr ""
+
+#. module: board
+#: code:addons/board/wizard/board_menu_create.py:46
+#, python-format
+msgid "Please Insert Dashboard View(s) !"
+msgstr ""
+
+#. module: board
+#: view:board.note:0
+#: field:board.note,name:0
+msgid "Subject"
+msgstr ""
diff --git a/addons/caldav/i18n/ca.po b/addons/caldav/i18n/ca.po
new file mode 100644
index 00000000000..bf98faaf749
--- /dev/null
+++ b/addons/caldav/i18n/ca.po
@@ -0,0 +1,818 @@
+# Catalan translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2011-04-15 16:29+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Catalan <ca@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: 2011-04-16 06:52+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
+
+#. module: caldav
+#: view:basic.calendar:0
+msgid "Value Mapping"
+msgstr ""
+
+#. module: caldav
+#: help:caldav.browse,url:0
+msgid "Url of the caldav server, use for synchronization"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar.alias,name:0
+msgid "Filename"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_calendar_event_export
+msgid "Event Export"
+msgstr ""
+
+#. module: caldav
+#: view:calendar.event.subscribe:0
+msgid "Provide path for Remote Calendar"
+msgstr ""
+
+#. module: caldav
+#: model:ir.actions.act_window,name:caldav.action_calendar_event_import_values
+msgid "Import .ics File"
+msgstr ""
+
+#. module: caldav
+#: view:calendar.event.export:0
+msgid "_Close"
+msgstr ""
+
+#. module: caldav
+#: selection:basic.calendar.attributes,type:0
+#: selection:basic.calendar.lines,name:0
+msgid "Attendee"
+msgstr ""
+
+#. module: caldav
+#: sql_constraint:basic.calendar.fields:0
+msgid "Can not map a field more than once"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/calendar.py:772
+#: code:addons/caldav/calendar.py:861
+#: code:addons/caldav/wizard/calendar_event_import.py:63
+#, python-format
+msgid "Warning !"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar.lines,object_id:0
+msgid "Object"
+msgstr ""
+
+#. module: caldav
+#: view:basic.calendar:0
+msgid "Todo"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_user_preference
+msgid "User preference Form"
+msgstr ""
+
+#. module: caldav
+#: field:user.preference,service:0
+msgid "Services"
+msgstr ""
+
+#. module: caldav
+#: selection:basic.calendar.fields,fn:0
+msgid "Expression as constant"
+msgstr ""
+
+#. module: caldav
+#: selection:user.preference,device:0
+msgid "Evolution"
+msgstr ""
+
+#. module: caldav
+#: view:calendar.event.import:0
+#: view:calendar.event.subscribe:0
+msgid "Ok"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/calendar.py:861
+#, python-format
+msgid "Please provide proper configuration of \"%s\" in Calendar Lines"
+msgstr ""
+
+#. module: caldav
+#: field:calendar.event.export,name:0
+msgid "File name"
+msgstr ""
+
+#. module: caldav
+#: field:caldav.browse,url:0
+msgid "Caldav Server"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/wizard/calendar_event_subscribe.py:59
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: caldav
+#: help:caldav.browse,caldav_doc_file:0
+msgid "download full caldav Documentation."
+msgstr ""
+
+#. module: caldav
+#: selection:user.preference,device:0
+msgid "iPhone"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/wizard/caldav_browse.py:32
+#, python-format
+msgid ""
+"\n"
+"  * Webdav server that provides remote access to calendar\n"
+"  * Synchronisation of calendar using WebDAV\n"
+"  * Customize calendar event and todo attribute with any of OpenERP model\n"
+"  * Provides iCal Import/Export functionality\n"
+"\n"
+"    To access Calendars using CalDAV clients, point them to:\n"
+"        "
+"http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/users/USERNAME/c\n"
+"\n"
+"    To access OpenERP Calendar using WebCal to remote site use the URL "
+"like:\n"
+"        "
+"http://HOSTNAME:PORT/webdav/DATABASE_NAME/Calendars/CALENDAR_NAME.ics\n"
+"\n"
+"      Where,\n"
+"        HOSTNAME: Host on which OpenERP server(With webdav) is running\n"
+"        PORT : Port on which OpenERP server is running (By Default : 8069)\n"
+"        DATABASE_NAME: Name of database on which OpenERP Calendar is "
+"created\n"
+"        CALENDAR_NAME: Name of calendar to access\n"
+"     "
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/wizard/caldav_browse.py:147
+#, python-format
+msgid ""
+"\n"
+"Prerequire\n"
+"----------\n"
+"If you are using thunderbird, first you need to install the lightning "
+"module\n"
+"http://www.mozilla.org/projects/calendar/lightning/\n"
+"\n"
+"configuration\n"
+"-------------\n"
+"\n"
+"1. Go to Calendar View\n"
+"\n"
+"2. File -> New Calendar\n"
+"\n"
+"3. Chosse \"On the Network\"\n"
+"\n"
+"4. for format choose CalDav\n"
+"   and as location the url given above (ie : "
+"http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
+"   \n"
+"5. Choose a name and a color for the Calendar, and we advice you to uncheck "
+"\"alarm\"\n"
+"\n"
+"6. Then put your openerp login and password (to give the password only check "
+"the box \"Use password Manager to remember this password\"\n"
+"\n"
+"7. Then Finish, your meetings should appear now in your calendar view\n"
+msgstr ""
+
+#. module: caldav
+#: selection:basic.calendar,type:0
+#: selection:basic.calendar.attributes,type:0
+#: selection:basic.calendar.lines,name:0
+msgid "TODO"
+msgstr ""
+
+#. module: caldav
+#: view:calendar.event.export:0
+msgid "Export ICS"
+msgstr ""
+
+#. module: caldav
+#: selection:basic.calendar.fields,fn:0
+msgid "Use the field"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/calendar.py:772
+#, python-format
+msgid "Can not create line \"%s\" more than once"
+msgstr ""
+
+#. module: caldav
+#: view:basic.calendar:0
+#: field:basic.calendar,line_ids:0
+#: model:ir.model,name:caldav.model_basic_calendar_lines
+msgid "Calendar Lines"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_calendar_event_subscribe
+msgid "Event subscribe"
+msgstr ""
+
+#. module: caldav
+#: view:calendar.event.import:0
+msgid "Import ICS"
+msgstr ""
+
+#. module: caldav
+#: view:calendar.event.import:0
+#: view:calendar.event.subscribe:0
+#: view:user.preference:0
+msgid "_Cancel"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar_event
+msgid "basic.calendar.event"
+msgstr ""
+
+#. module: caldav
+#: view:basic.calendar:0
+#: selection:basic.calendar,type:0
+#: selection:basic.calendar.attributes,type:0
+#: selection:basic.calendar.lines,name:0
+msgid "Event"
+msgstr ""
+
+#. module: caldav
+#: field:document.directory,calendar_collection:0
+#: field:user.preference,collection:0
+msgid "Calendar Collection"
+msgstr ""
+
+#. module: caldav
+#: constraint:document.directory:0
+msgid "Error! You can not create recursive Directories."
+msgstr ""
+
+#. module: caldav
+#: view:user.preference:0
+msgid "_Open"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar,type:0
+#: field:basic.calendar.attributes,type:0
+#: field:basic.calendar.fields,type_id:0
+#: field:basic.calendar.lines,name:0
+msgid "Type"
+msgstr ""
+
+#. module: caldav
+#: help:calendar.event.export,name:0
+msgid "Save in .ics format"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/calendar.py:1275
+#, python-format
+msgid "Error !"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/wizard/caldav_browse.py:128
+#, python-format
+msgid ""
+"\n"
+"    1. Go to Calendar View\n"
+"\n"
+"    2. File -> New -> Calendar\n"
+"\n"
+"    3. Fill the form \n"
+"        - type : CalDav\n"
+"        - name : Whaterver you want (ie : Meeting)\n"
+"        - url : "
+"http://HOST:PORT/webdav/DB_NAME/calendars/users/USER/c/Meetings (ie : "
+"http://localhost:8069/webdav/db_1/calendars/users/demo/c/Meetings) the one "
+"given on the top of this window\n"
+"        - uncheck \"User SSL\"\n"
+"        - Username : Your username (ie : Demo)\n"
+"        - Refresh : everytime you want that evolution synchronize the data "
+"with the server\n"
+"\n"
+"    4. Click ok and give your openerp password\n"
+"\n"
+"    5. A new calendar named with the name you gave should appear on the left "
+"side.     \n"
+"     "
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar_attributes
+msgid "Calendar attributes"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_caldav_browse
+msgid "Caldav Browse"
+msgstr ""
+
+#. module: caldav
+#: model:ir.module.module,description:caldav.module_meta_information
+msgid ""
+"\n"
+"    This module Contains basic functionality for caldav system like:  \n"
+"  - Webdav server that provides remote access to calendar\n"
+"  - Synchronisation of calendar using WebDAV\n"
+"  - Customize calendar event and todo attribute with any of OpenERP model\n"
+"  - Provides iCal Import/Export functionality\n"
+"\n"
+"    To access Calendars using CalDAV clients, point them to:\n"
+"        "
+"http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/users/USERNAME/c\n"
+"\n"
+"    To access OpenERP Calendar using WebCal to remote site use the URL "
+"like:\n"
+"        "
+"http://HOSTNAME:PORT/webdav/DATABASE_NAME/Calendars/CALENDAR_NAME.ics\n"
+"\n"
+"      Where,\n"
+"        HOSTNAME: Host on which OpenERP server(With webdav) is running\n"
+"        PORT : Port on which OpenERP server is running (By Default : 8069)\n"
+"        DATABASE_NAME: Name of database on which OpenERP Calendar is "
+"created\n"
+"        CALENDAR_NAME: Name of calendar to access\n"
+msgstr ""
+
+#. module: caldav
+#: selection:user.preference,device:0
+msgid "Android based device"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar,create_date:0
+msgid "Created Date"
+msgstr ""
+
+#. module: caldav
+#: view:basic.calendar:0
+msgid "Attributes Mapping"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_document_directory
+msgid "Directory"
+msgstr ""
+
+#. module: caldav
+#: field:calendar.event.subscribe,url_path:0
+msgid "Provide path for remote calendar"
+msgstr ""
+
+#. module: caldav
+#: view:caldav.browse:0
+msgid "_Ok"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar.lines,domain:0
+msgid "Domain"
+msgstr ""
+
+#. module: caldav
+#: view:calendar.event.subscribe:0
+msgid "_Subscribe"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar,user_id:0
+msgid "Owner"
+msgstr ""
+
+#. module: caldav
+#: view:basic.calendar:0
+#: field:basic.calendar.alias,cal_line_id:0
+#: field:basic.calendar.lines,calendar_id:0
+#: model:ir.ui.menu,name:caldav.menu_calendar
+#: field:user.preference,calendar:0
+msgid "Calendar"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/calendar.py:41
+#, python-format
+msgid ""
+"Please install python-vobject from http://vobject.skyhouseconsulting.com/"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/wizard/calendar_event_import.py:63
+#, python-format
+msgid "Invalid format of the ics, file can not be imported"
+msgstr ""
+
+#. module: caldav
+#: selection:user.preference,service:0
+msgid "CalDAV"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar.fields,field_id:0
+msgid "OpenObject Field"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar.alias,res_id:0
+msgid "Res. ID"
+msgstr ""
+
+#. module: caldav
+#: view:calendar.event.subscribe:0
+msgid "Message..."
+msgstr ""
+
+#. module: caldav
+#: selection:user.preference,device:0
+msgid "Other"
+msgstr ""
+
+#. module: caldav
+#: view:basic.calendar:0
+#: field:basic.calendar,has_webcal:0
+msgid "WebCal"
+msgstr ""
+
+#. module: caldav
+#: view:document.directory:0
+#: model:ir.actions.act_window,name:caldav.action_calendar_collection_form
+#: model:ir.ui.menu,name:caldav.menu_calendar_collection
+msgid "Calendar Collections"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/calendar.py:798
+#: sql_constraint:basic.calendar.alias:0
+#, python-format
+msgid "The same filename cannot apply to two records!"
+msgstr ""
+
+#. module: caldav
+#: sql_constraint:document.directory:0
+msgid "Directory cannot be parent of itself!"
+msgstr ""
+
+#. module: caldav
+#: view:basic.calendar:0
+#: field:document.directory,calendar_ids:0
+#: model:ir.actions.act_window,name:caldav.action_caldav_form
+#: model:ir.ui.menu,name:caldav.menu_caldav_directories
+msgid "Calendars"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar,collection_id:0
+msgid "Collection"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar,write_date:0
+msgid "Write Date"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/wizard/caldav_browse.py:104
+#, python-format
+msgid ""
+"\n"
+"Prerequire\n"
+"----------\n"
+"There is no buit-in way to synchronize calendar with caldav.\n"
+"So you need to install a third part software : Calendar (CalDav) \n"
+"for now it's the only one\n"
+"\n"
+"configuration\n"
+"-------------\n"
+"\n"
+"1. Open Calendar Sync\n"
+"   I'll get an interface with 2 tabs\n"
+"   Stay on the first one\n"
+"   \n"
+"2. CaDAV Calendar URL : put the URL given above (ie : "
+"http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
+"\n"
+"3. Put your openerp username and password\n"
+"\n"
+"4. If your server don't use SSL, you'll get a warnign, say \"Yes\"\n"
+"\n"
+"5. Then you can synchronize manually or custom the settings to synchronize "
+"every x minutes.\n"
+"    \n"
+"    "
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/wizard/caldav_browse.py:53
+#, python-format
+msgid ""
+"\n"
+"    For SSL specific configuration see the documentation below\n"
+"\n"
+"Now, to setup the calendars, you need to:\n"
+"\n"
+"1. Click on the \"Settings\" and go to the \"Mail, Contacts, Calendars\" "
+"page.\n"
+"2. Go to \"Add account...\"\n"
+"3. Click on \"Other\"\n"
+"4. From the \"Calendars\" group, select \"Add CalDAV Account\"\n"
+"\n"
+"5. Enter the host's name \n"
+"   (ie : if the url is http://openerp.com:8069/webdav/db_1/calendars/ , "
+"openerp.com is the host)\n"
+"\n"
+"6. Fill Username and password with your openerp login and password\n"
+"\n"
+"7. As a description, you can either leave the server's name or\n"
+"   something like \"OpenERP calendars\".\n"
+"\n"
+"9. If you are not using a SSL server, you'll get an error, do not worry and "
+"push \"Continue\"\n"
+"\n"
+"10. Then click to \"Advanced Settings\" to specify the right\n"
+"    ports and paths. \n"
+"    \n"
+"11. Specify the port for the OpenERP server: 8071 for SSL, 8069 without.\n"
+"\n"
+"12. Set the \"Account URL\" to the right path of the OpenERP webdav:\n"
+"    the url given by the wizard (ie : "
+"http://my.server.ip:8069/webdav/dbname/calendars/ )\n"
+"\n"
+"11. Click on Done. The phone will hopefully connect to the OpenERP server\n"
+"    and verify it can use the account.\n"
+"\n"
+"12. Go to the main menu of the iPhone and enter the Calendar application.\n"
+"    Your OpenERP calendars will be visible inside the selection of the\n"
+"    \"Calendars\" button.\n"
+"    Note that when creating a new calendar entry, you will have to specify\n"
+"    which calendar it should be saved at.\n"
+"\n"
+"\n"
+"\n"
+"IF you need SSL (and your certificate is not a verified one, as usual),\n"
+"then you first will need to let the iPhone trust that. Follow these\n"
+"steps:\n"
+"\n"
+"    s1. Open Safari and enter the https location of the OpenERP server:\n"
+"      https://my.server.ip:8071/\n"
+"      (assuming you have the server at \"my.server.ip\" and the HTTPS port\n"
+"      is the default 8071)\n"
+"    s2. Safari will try to connect and issue a warning about the "
+"certificate\n"
+"      used. Inspect the certificate and click \"Accept\" so that iPhone\n"
+"      now trusts it.   \n"
+"    "
+msgstr ""
+
+#. module: caldav
+#: sql_constraint:document.directory:0
+msgid "The directory name must be unique !"
+msgstr ""
+
+#. module: caldav
+#: view:user.preference:0
+msgid "User Preference"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/wizard/calendar_event_subscribe.py:59
+#, python-format
+msgid "Please provide Proper URL !"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar_timezone
+msgid "basic.calendar.timezone"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar.fields,expr:0
+msgid "Expression"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar_attendee
+msgid "basic.calendar.attendee"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar_alias
+msgid "basic.calendar.alias"
+msgstr ""
+
+#. module: caldav
+#: view:calendar.event.import:0
+#: field:calendar.event.import,file_path:0
+msgid "Select ICS file"
+msgstr ""
+
+#. module: caldav
+#: field:caldav.browse,caldav_doc_file:0
+msgid "Caldav Document"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar.lines,mapping_ids:0
+msgid "Fields Mapping"
+msgstr ""
+
+#. module: caldav
+#: view:caldav.browse:0
+msgid "Browse caldav"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar
+msgid "basic.calendar"
+msgstr ""
+
+#. module: caldav
+#: view:basic.calendar:0
+msgid "Other Info"
+msgstr ""
+
+#. module: caldav
+#: field:user.preference,device:0
+msgid "Software/Devices"
+msgstr ""
+
+#. module: caldav
+#: help:basic.calendar,has_webcal:0
+msgid ""
+"Also export a <name>.ics entry next to the calendar folder, with WebCal "
+"content."
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar.fields,fn:0
+msgid "Function"
+msgstr ""
+
+#. module: caldav
+#: view:basic.calendar:0
+#: field:basic.calendar,description:0
+#: view:caldav.browse:0
+#: field:caldav.browse,description:0
+msgid "Description"
+msgstr ""
+
+#. module: caldav
+#: help:basic.calendar.alias,cal_line_id:0
+msgid "The calendar/line this mapping applies to"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar.fields,mapping:0
+msgid "Mapping"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/wizard/calendar_event_import.py:86
+#, python-format
+msgid "Import Sucessful"
+msgstr ""
+
+#. module: caldav
+#: view:calendar.event.import:0
+msgid "_Import"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_calendar_event_import
+msgid "Event Import"
+msgstr ""
+
+#. module: caldav
+#: selection:basic.calendar.fields,fn:0
+msgid "Interval in hours"
+msgstr ""
+
+#. module: caldav
+#: view:calendar.event.subscribe:0
+msgid "Subscribe to Remote Calendar"
+msgstr ""
+
+#. module: caldav
+#: help:basic.calendar,calendar_color:0
+msgid "For supporting clients, the color of the calendar entries"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar,name:0
+#: field:basic.calendar.attributes,name:0
+#: field:basic.calendar.fields,name:0
+msgid "Name"
+msgstr ""
+
+#. module: caldav
+#: selection:basic.calendar.attributes,type:0
+#: selection:basic.calendar.lines,name:0
+msgid "Alarm"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar_alarm
+msgid "basic.calendar.alarm"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/calendar.py:1275
+#, python-format
+msgid "Attendee must have an Email Id"
+msgstr ""
+
+#. module: caldav
+#: model:ir.actions.act_window,name:caldav.action_calendar_event_export_values
+msgid "Export .ics File"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/calendar.py:41
+#, python-format
+msgid "vobject Import Error!"
+msgstr ""
+
+#. module: caldav
+#: field:calendar.event.export,file_path:0
+msgid "Save ICS file"
+msgstr ""
+
+#. module: caldav
+#: selection:user.preference,device:0
+msgid "Sunbird/Thunderbird"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar,calendar_order:0
+msgid "Order"
+msgstr ""
+
+#. module: caldav
+#: model:ir.module.module,shortdesc:caldav.module_meta_information
+msgid "Share Calendar using CalDAV"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar,calendar_color:0
+msgid "Color"
+msgstr ""
+
+#. module: caldav
+#: view:basic.calendar:0
+msgid "MY"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar_fields
+msgid "Calendar fields"
+msgstr ""
+
+#. module: caldav
+#: view:calendar.event.import:0
+msgid "Import Message"
+msgstr ""
+
+#. module: caldav
+#: model:ir.actions.act_window,name:caldav.action_calendar_event_subscribe
+#: model:ir.actions.act_window,name:caldav.action_calendar_event_subscribe_values
+msgid "Subscribe"
+msgstr ""
+
+#. module: caldav
+#: sql_constraint:document.directory:0
+msgid "Directory must have a parent or a storage"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar_todo
+msgid "basic.calendar.todo"
+msgstr ""
+
+#. module: caldav
+#: help:basic.calendar,calendar_order:0
+msgid "For supporting clients, the order of this folder among the calendars"
+msgstr ""
diff --git a/addons/email_template/i18n/ca.po b/addons/email_template/i18n/ca.po
new file mode 100644
index 00000000000..3703667d689
--- /dev/null
+++ b/addons/email_template/i18n/ca.po
@@ -0,0 +1,1278 @@
+# Catalan translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-04-16 11:56+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Catalan <ca@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: 2011-04-17 06:13+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
+
+#. module: email_template
+#: help:email_template.account,auto_delete:0
+msgid "Permanently delete emails after sending"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Email Account Configuration"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/wizard/email_template_send_wizard.py:195
+#, python-format
+msgid "Emails for multiple items saved in outbox."
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/wizard/email_template_send_wizard.py:59
+#: code:addons/email_template/wizard/email_template_send_wizard.py:60
+#, python-format
+msgid ""
+"No personal email accounts are configured for you. \n"
+"Either ask admin to enforce an account for this template or get yourself a "
+"personal email account."
+msgstr ""
+
+#. module: email_template
+#: view:email_template.mailbox:0
+msgid "Personal Emails"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,file_name:0
+msgid "Report Filename"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Email Content  "
+msgstr ""
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid "Send mail Wizard"
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.mailbox,mail_type:0
+msgid "Plain Text & HTML with no attachments"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,model_object_field:0
+msgid ""
+"Select the field from the model you want to use.\n"
+"If it is a relationship field you will be able to choose the nested values "
+"in the box below\n"
+"(Note:If there are no values make sure you have selected the correct model)"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.preview,body_html:0
+#: field:email_template.preview,body_text:0
+#: field:email_template.send.wizard,body_html:0
+#: field:email_template.send.wizard,body_text:0
+msgid "Body"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:304
+#, python-format
+msgid "Deletion of Record failed"
+msgstr ""
+
+#. module: email_template
+#: help:email_template.account,company:0
+msgid ""
+"Select if this mail account does not belong to specific user but to the "
+"organization as a whole. eg: info@companydomain.com"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid "Send now"
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.mailbox,state:0
+msgid "Not Applicable"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.account:0
+#: model:ir.ui.menu,name:email_template.menu_email_account_all_tools
+#: model:ir.ui.menu,name:email_template.menu_email_template_account_all
+msgid "Email Accounts"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid "Send all mails"
+msgstr ""
+
+#. module: email_template
+#: help:email_template.account,smtpuname:0
+msgid ""
+"Specify the username if your SMTP server requires authentication, otherwise "
+"leave it empty."
+msgstr ""
+
+#. module: email_template
+#: field:email_template.mailbox,server_ref:0
+msgid "Server Reference of mail"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.account:0
+#: selection:email_template.account,state:0
+msgid "Approved"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,def_cc:0
+msgid ""
+"Carbon Copy address(es), comma-separated. Placeholders can be used here. "
+"e.g. ${object.email_cc}"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Account"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,table_html:0
+msgid "HTML code"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.mailbox:0
+msgid "Send Mail"
+msgstr ""
+
+#. module: email_template
+#: help:email_template.account,name:0
+msgid ""
+"The description is used as the Sender name along with the provided From "
+"Email, unless it is already specified in the From Email, e.g: John Doe "
+"<john@doe.com>"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,from_account:0
+msgid "Email Account"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/wizard/email_template_send_wizard.py:201
+#, python-format
+msgid "Email sending failed for one or more objects."
+msgstr ""
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid ""
+"Add here all attachments of the current document you want to include in the "
+"Email."
+msgstr ""
+
+#. module: email_template
+#: help:email.template,lang:0
+msgid ""
+"The default language for the email. Placeholders can be used here. eg. "
+"${object.partner_id.lang}"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,sub_model_object_field:0
+msgid ""
+"When you choose relationship fields this field will specify the sub value "
+"you can use."
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.send.wizard,state:0
+msgid "Wizard Complete"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,reply_to:0
+#: field:email_template.mailbox,reply_to:0
+#: field:email_template.preview,reply_to:0
+#: field:email_template.send.wizard,reply_to:0
+msgid "Reply-To"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Delete Action"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Approve Account"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.preview,rel_model_ref:0
+#: field:email_template.send.wizard,rel_model_ref:0
+msgid "Referred Document"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.send.wizard,full_success:0
+msgid "Complete Success"
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.account,send_pref:0
+msgid "Both HTML & Text (Mixed)"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.preview:0
+msgid "OK"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.account,auto_delete:0
+msgid "Auto Delete"
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.account,send_pref:0
+msgid "Both HTML & Text (Alternative)"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.send.wizard,requested:0
+msgid "No of requested Mails"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,def_body_text:0
+#: view:email_template.mailbox:0
+#: field:email_template.mailbox,body_text:0
+msgid "Standard Body (Text)"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,attachment_ids:0
+msgid "Attached Files"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.account,smtpssl:0
+msgid "SSL/TLS (only in python 2.6)"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.account,email_id:0
+msgid "From Email"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:304
+#, python-format
+msgid "Warning"
+msgstr ""
+
+#. module: email_template
+#: model:ir.actions.act_window,name:email_template.action_email_template_account_tree_all
+msgid "Accounts"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.preview:0
+msgid "Body(Text)"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.mailbox:0
+msgid "Company Emails"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid ""
+"Tip: Multiple emails are sent in the same language (the first one is "
+"proposed). We suggest you send emails in groups according to language."
+msgstr ""
+
+#. module: email_template
+#: help:email_template.preview,reply_to:0
+#: help:email_template.send.wizard,reply_to:0
+msgid ""
+"The address recipients should reply to, if different from the From address. "
+"Placeholders can be used here."
+msgstr ""
+
+#. module: email_template
+#: field:email.template,def_subject:0
+#: field:email_template.mailbox,subject:0
+#: field:email_template.preview,subject:0
+#: field:email_template.send.wizard,subject:0
+msgid "Subject"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:256
+#, python-format
+msgid "Reason: %s"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.mailbox,email_from:0
+msgid "From"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.preview,ref_template:0
+#: field:email_template.send.wizard,ref_template:0
+msgid "Template"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:367
+#, python-format
+msgid ""
+"Mail from Account %s failed. Probable Reason: Server Send Error\n"
+" Description: %s"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Insert Simple Field"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.preview:0
+msgid "Body(Html)"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,def_bcc:0
+msgid ""
+"Blind Carbon Copy address(es), comma-separated. Placeholders can be used "
+"here. e.g. ${object.email_bcc}"
+msgstr ""
+
+#. module: email_template
+#: model:ir.actions.act_window,name:email_template.wizard_email_template_preview
+msgid "Template Preview"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,def_body_html:0
+msgid "Body (Text-Web Client Only)"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.account,state:0
+#: view:email_template.mailbox:0
+msgid "State"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,ref_ir_value:0
+msgid "Wizard Button"
+msgstr ""
+
+#. module: email_template
+#: help:email_template.account,email_id:0
+msgid "eg: 'john@doe.com' or 'John Doe <john@doe.com>'"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+#: field:email.template,object_name:0
+msgid "Resource"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:255
+#, python-format
+msgid "Out going connection test failed"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:371
+#, python-format
+msgid "Mail from Account %s successfully Sent."
+msgstr ""
+
+#. module: email_template
+#: view:email_template.mailbox:0
+msgid "Standard Body"
+msgstr ""
+
+#. module: email_template
+#: selection:email.template,template_language:0
+msgid "Mako Templates"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,def_body_html:0
+#: help:email.template,def_body_text:0
+msgid "The text version of the mail"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:449
+#, python-format
+msgid " (Email Attachment)"
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.mailbox,folder:0
+msgid "Sent Items"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Test Outgoing Connection"
+msgstr ""
+
+#. module: email_template
+#: model:ir.actions.act_window,name:email_template.action_email_template_mailbox
+msgid "Mailbox"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,reply_to:0
+msgid ""
+"The address recipients should reply to, if different from the From address. "
+"Placeholders can be used here. e.g. ${object.email_reply_to}"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,ref_ir_value:0
+msgid ""
+"Button in the side bar of the form view of this Resource that will invoke "
+"the Window Action"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.mailbox,account_id:0
+msgid "User account"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.send.wizard,signature:0
+msgid "Attach my signature to mail"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/wizard/email_template_send_wizard.py:255
+#: view:email.template:0
+#, python-format
+msgid "Report"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,sub_model_object_field:0
+msgid "Sub Field"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+#: view:email_template.mailbox:0
+msgid "Advanced"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.mailbox:0
+msgid "My Emails"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Expression Builder"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,sub_object:0
+msgid ""
+"When a relation field is used this field will show you the type of field you "
+"have selected"
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.mailbox,mail_type:0
+msgid "HTML Body"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Suspend Account"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,null_value:0
+msgid "This Value is used if the field is empty"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Preview Template"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.account,smtpserver:0
+msgid "Server"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,copyvalue:0
+msgid ""
+"Copy and paste the value in the location you want to use a system value."
+msgstr ""
+
+#. module: email_template
+#: help:email.template,track_campaign_item:0
+msgid ""
+"Enable this is you wish to include a special tracking marker in outgoing "
+"emails so you can identify replies and link them back to the corresponding "
+"resource record. This is useful for CRM leads for example"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Body (Raw HTML)"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,use_sign:0
+msgid "Signature"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,sub_object:0
+msgid "Sub-model"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Options"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid "Body (Plain Text)"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Body (Text)"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.mailbox,date_mail:0
+msgid "Rec/Sent Date"
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.account,state:0
+msgid "Initiated"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,report_template:0
+msgid "Report to send"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Server Information"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.send.wizard,generated:0
+msgid "No of generated Mails"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Mail Details"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:235
+#, python-format
+msgid "SMTP SERVER or PORT not specified"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Note: This is Raw HTML."
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Group by..."
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.send.wizard,state:0
+msgid "Multiple Mail Wizard Step 1"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.account,user:0
+msgid "Related User"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.mailbox,body_html:0
+msgid "Body (Rich Text Clients Only)"
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.account,company:0
+msgid "Yes"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,ref_ir_act_window:0
+msgid "Window Action"
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.account,send_pref:0
+msgid "HTML, otherwise Text"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.mailbox:0
+#: selection:email_template.mailbox,folder:0
+msgid "Drafts"
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.account,company:0
+msgid "No"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.account,smtpport:0
+msgid "SMTP Port"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.mailbox,mail_type:0
+msgid "Mail Contents"
+msgstr ""
+
+#. module: email_template
+#: sql_constraint:email.template:0
+msgid "The template name must be unique !"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,def_bcc:0
+#: field:email_template.mailbox,email_bcc:0
+#: field:email_template.preview,bcc:0
+#: field:email_template.send.wizard,bcc:0
+msgid "BCC"
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.mailbox,mail_type:0
+msgid "Plain Text"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Draft"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,model_int_name:0
+msgid "Model Internal Name"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,message_id:0
+#: field:email_template.mailbox,message_id:0
+#: field:email_template.preview,message_id:0
+#: field:email_template.send.wizard,message_id:0
+msgid "Message-ID"
+msgstr ""
+
+#. module: email_template
+#: help:email_template.mailbox,server_ref:0
+msgid "Applicable for inward items only"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid ""
+"After clicking send all mails, mails will be sent to outbox and cleared in "
+"next Send/Recieve"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.mailbox,state:0
+#: field:email_template.send.wizard,state:0
+msgid "Status"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Outgoing"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:427
+#, python-format
+msgid "Datetime Extraction failed.Date:%s                       \tError:%s"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,use_sign:0
+msgid "the signature from the User details will be appended to the mail"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.send.wizard,from:0
+msgid "From Account"
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.mailbox,mail_type:0
+msgid "Intermixed content"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Request Re-activation"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+#: model:ir.actions.act_window,name:email_template.action_email_template_tree_all
+#: model:ir.ui.menu,name:email_template.menu_email_template_all
+#: model:ir.ui.menu,name:email_template.menu_email_template_all_tools
+msgid "Email Templates"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.account,smtpuname:0
+msgid "User Name"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.mailbox,user:0
+msgid "User"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Advanced Options"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.mailbox:0
+#: selection:email_template.mailbox,folder:0
+msgid "Outbox"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid "Save in Drafts"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:362
+#, python-format
+msgid ""
+"Mail from Account %s failed. Probable Reason:MIME Error\n"
+"Description: %s"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.account,smtptls:0
+msgid "TLS"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,lang:0
+msgid "Language"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:275
+#: code:addons/email_template/email_template_account.py:280
+#: code:addons/email_template/email_template_account.py:362
+#: code:addons/email_template/email_template_account.py:371
+#: code:addons/email_template/email_template_account.py:374
+#: code:addons/email_template/email_template_account.py:424
+#: code:addons/email_template/wizard/email_template_send_wizard.py:201
+#: model:ir.ui.menu,name:email_template.menu_email_template
+#: model:ir.ui.menu,name:email_template.menu_email_template_config_tools
+#: model:ir.ui.menu,name:email_template.menu_email_template_configuration
+#: model:ir.ui.menu,name:email_template.menu_email_template_tools
+#, python-format
+msgid "Email Template"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Send/Receive"
+msgstr ""
+
+#. module: email_template
+#: model:ir.ui.menu,name:email_template.menu_email_template_personal_mails
+msgid "Personal Mails"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.account:0
+#: selection:email_template.account,state:0
+msgid "Suspended"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,allowed_groups:0
+msgid ""
+"Only users from these groups will be allowed to send mails from this Template"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:284
+#, python-format
+msgid "Send Mail (%s)"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,def_subject:0
+msgid "The subject of email. Placeholders can be used here."
+msgstr ""
+
+#. module: email_template
+#: field:email_template.send.wizard,report:0
+msgid "Report File Name"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,copyvalue:0
+msgid "Expression"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.mailbox:0
+#: field:email_template.mailbox,history:0
+msgid "History"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+#: view:email_template.mailbox:0
+#: field:email_template.mailbox,attachments_ids:0
+#: view:email_template.send.wizard:0
+#: field:email_template.send.wizard,attachment_ids:0
+msgid "Attachments"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.preview,to:0
+#: field:email_template.send.wizard,to:0
+msgid "To"
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.account,send_pref:0
+msgid "Text, otherwise HTML"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:319
+#, python-format
+msgid "Copy of template "
+msgstr ""
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid "Discard Mail"
+msgstr ""
+
+#. module: email_template
+#: model:ir.model,name:email_template.model_email_template
+msgid "Email Templates for Models"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid "Close"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template_mailbox.py:49
+#, python-format
+msgid "Error sending mail: %s"
+msgstr ""
+
+#. module: email_template
+#: constraint:email_template.account:0
+msgid "Error: You are not allowed to have more than 1 account."
+msgstr ""
+
+#. module: email_template
+#: view:email_template.mailbox:0
+msgid "Body (HTML-Web Client Only)"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/wizard/email_template_send_wizard.py:253
+#, python-format
+msgid "%s (Email Attachment)"
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.mailbox,state:0
+msgid "Sending"
+msgstr ""
+
+#. module: email_template
+#: model:ir.actions.act_window,help:email_template.action_email_template_mailbox
+msgid ""
+"An email template is an email document that will be sent as part of a "
+"marketing campaign. You can personalize it according to specific customer "
+"profile fields, so that a partner name or other partner related information "
+"may be inserted automatically."
+msgstr ""
+
+#. module: email_template
+#: field:email.template,allowed_groups:0
+msgid "Allowed User Groups"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,model_object_field:0
+msgid "Field"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "User Information"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Actions"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:363
+#: code:addons/email_template/email_template_account.py:368
+#, python-format
+msgid ""
+"Server Send Error\n"
+"Description: %s"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,file_name:0
+msgid ""
+"Name of the generated report file. Placeholders can be used in the filename. "
+"eg: 2009_SO003.pdf"
+msgstr ""
+
+#. module: email_template
+#: help:email_template.mailbox,date_mail:0
+msgid "Date on which Email Sent or Received"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.mailbox:0
+#: selection:email_template.mailbox,folder:0
+msgid "Trash"
+msgstr ""
+
+#. module: email_template
+#: model:ir.model,name:email_template.model_email_template_mailbox
+msgid "Email Mailbox"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template_mailbox.py:116
+#, python-format
+msgid ""
+"Sending of Mail %s failed. Probable Reason:Could not login to server\n"
+"Error: %s"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/wizard/email_template_send_wizard.py:60
+#, python-format
+msgid "Missing mail account"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:250
+#, python-format
+msgid "SMTP Test Connection Was Successful"
+msgstr ""
+
+#. module: email_template
+#: model:ir.module.module,shortdesc:email_template.module_meta_information
+msgid "Email Template for OpenERP"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.account,name:0
+msgid "Description"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Create Action"
+msgstr ""
+
+#. module: email_template
+#: help:email_template.account,smtpserver:0
+msgid "Enter name of outgoing server, eg: smtp.yourdomain.com"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,attachment_ids:0
+msgid ""
+"You may attach existing files to this template, so they will be added in all "
+"emails created from this template"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,message_id:0
+msgid ""
+"Specify the Message-ID SMTP header to use in outgoing emails. Please note "
+"that this overrides the Resource tracking option! Placeholders can be used "
+"here."
+msgstr ""
+
+#. module: email_template
+#: field:email.template,def_to:0
+#: field:email_template.mailbox,email_to:0
+msgid "Recipient (To)"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,null_value:0
+msgid "Null Value"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,template_language:0
+msgid "Templating Language"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,def_cc:0
+#: field:email_template.mailbox,email_cc:0
+#: field:email_template.preview,cc:0
+#: field:email_template.send.wizard,cc:0
+msgid "CC"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.mailbox:0
+msgid "Sent"
+msgstr ""
+
+#. module: email_template
+#: sql_constraint:email_template.account:0
+msgid "Another setting already exists with this email ID !"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,ref_ir_act_window:0
+msgid "Action that will open this email template on Resource records"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.account,smtppass:0
+msgid "Password"
+msgstr ""
+
+#. module: email_template
+#: help:email_template.preview,message_id:0
+#: help:email_template.send.wizard,message_id:0
+msgid ""
+"The Message-ID header value, if you need tospecify it, for example to "
+"automatically recognize the replies later. Placeholders can be used here."
+msgstr ""
+
+#. module: email_template
+#: view:email_template.mailbox:0
+#: model:ir.ui.menu,name:email_template.menu_email_template_mails_tools
+msgid "Emails"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Templates"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.preview,report:0
+msgid "Report Name"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,name:0
+msgid "Name"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,track_campaign_item:0
+msgid "Resource Tracking"
+msgstr ""
+
+#. module: email_template
+#: model:ir.model,name:email_template.model_email_template_preview
+msgid "Email Template Preview"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.preview:0
+msgid "Email Preview"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,def_to:0
+msgid ""
+"The Recipient of email. Placeholders can be used here. e.g. "
+"${object.email_to}"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Existing files"
+msgstr ""
+
+#. module: email_template
+#: model:ir.module.module,description:email_template.module_meta_information
+msgid ""
+"\n"
+"    Email Template is extraction of Power Email basically just to send the "
+"emails.\n"
+"    "
+msgstr ""
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid "Body (HTML)"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,table_html:0
+msgid ""
+"Copy this html code to your HTML message body for displaying the info in "
+"your mail."
+msgstr ""
+
+#. module: email_template
+#: model:ir.model,name:email_template.model_email_template_account
+msgid "email_template.account"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.preview,rel_model:0
+#: field:email_template.send.wizard,rel_model:0
+msgid "Model"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:236
+#, python-format
+msgid "Core connection for the given ID does not exist"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.account,company:0
+msgid "Corporate"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:275
+#, python-format
+msgid ""
+"Mail from Account %s failed on login. Probable Reason:Could not login to "
+"server\n"
+"Error: %s"
+msgstr ""
+
+#. module: email_template
+#: model:ir.model,name:email_template.model_email_template_send_wizard
+msgid "This is the wizard for sending mail"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Addresses"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,from_account:0
+msgid "Emails will be sent from this approved account."
+msgstr ""
+
+#. module: email_template
+#: field:email_template.account,send_pref:0
+msgid "Mail Format"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.mailbox,folder:0
+msgid "Folder"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Company Accounts"
+msgstr ""
+
+#. module: email_template
+#: help:email_template.account,smtpport:0
+msgid "Enter port number, eg: 25 or 587"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/wizard/email_template_send_wizard.py:59
+#, python-format
+msgid "email-template"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:280
+#: code:addons/email_template/email_template_account.py:374
+#: code:addons/email_template/email_template_account.py:375
+#, python-format
+msgid "Mail from Account %s failed. Probable Reason:Account not approved"
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.send.wizard,state:0
+msgid "Simple Mail Wizard Step 1"
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.mailbox,mail_type:0
+msgid "Has Attachments"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:452
+#: code:addons/email_template/wizard/email_template_send_wizard.py:256
+#, python-format
+msgid "No Description"
+msgstr ""
diff --git a/addons/product/i18n/id.po b/addons/product/i18n/id.po
index 3852f3732da..a22e36afb88 100644
--- a/addons/product/i18n/id.po
+++ b/addons/product/i18n/id.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-04-08 06:05+0000\n"
+"PO-Revision-Date: 2011-04-15 08:54+0000\n"
 "Last-Translator: moelyana <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: 2011-04-09 06:16+0000\n"
+"X-Launchpad-Export-Date: 2011-04-16 06:52+0000\n"
 "X-Generator: Launchpad (build 12735)\n"
 
 #. module: product
@@ -781,7 +781,7 @@ msgstr ""
 #. module: product
 #: view:product.pricelist.item:0
 msgid "Min. Margin"
-msgstr ""
+msgstr "Margin Minimum"
 
 #. module: product
 #: field:product.category,child_id:0
diff --git a/addons/purchase_double_validation/i18n/fr.po b/addons/purchase_double_validation/i18n/fr.po
index 8880e8bce0c..7e1d953d579 100644
--- a/addons/purchase_double_validation/i18n/fr.po
+++ b/addons/purchase_double_validation/i18n/fr.po
@@ -8,19 +8,19 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-02-11 20:51+0000\n"
+"PO-Revision-Date: 2011-04-15 09:42+0000\n"
 "Last-Translator: lolivier <olivier.lenoir@free.fr>\n"
 "Language-Team: French <fr@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: 2011-02-12 06:06+0000\n"
-"X-Generator: Launchpad (build 12351)\n"
+"X-Launchpad-Export-Date: 2011-04-16 06:52+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
 #. module: purchase_double_validation
 #: view:purchase.double.validation.installer:0
 msgid "Purchase Application Configuration"
-msgstr ""
+msgstr "Configuration des d'achats"
 
 #. module: purchase_double_validation
 #: field:purchase.double.validation.installer,progress:0
@@ -31,6 +31,7 @@ msgstr "Avancement de la configuration"
 #: view:purchase.double.validation.installer:0
 msgid "Define minimum amount after which puchase is needed to be validated."
 msgstr ""
+"Définir le seuil à partir duquel la validation d'un achat est nécessaire."
 
 #. module: purchase_double_validation
 #: view:purchase.double.validation.installer:0
@@ -45,7 +46,7 @@ msgstr "purchase_double_validation"
 #. module: purchase_double_validation
 #: field:purchase.double.validation.installer,config_logo:0
 msgid "Image"
-msgstr ""
+msgstr "Image"
 
 #. module: purchase_double_validation
 #: model:ir.module.module,description:purchase_double_validation.module_meta_information
@@ -55,12 +56,17 @@ msgid ""
 "that exceeds minimum amount set by configuration wizard\n"
 "    "
 msgstr ""
+"\n"
+"\tCe module modifie le  workflow d'achat afin de valider les achats qui "
+"excèdent les achats dont le montant dépasse le seuil fixé avec l'assistant "
+"de configuration\n"
+"    "
 
 #. module: purchase_double_validation
 #: model:ir.actions.act_window,name:purchase_double_validation.action_config_purchase_limit_amount
 #: view:purchase.double.validation.installer:0
 msgid "Configure Limit Amount for Purchase"
-msgstr ""
+msgstr "Configurer le montant limite d'achat"
 
 #. module: purchase_double_validation
 #: view:purchase.double.validation.installer:0
@@ -70,7 +76,7 @@ msgstr "res_config_contents"
 #. module: purchase_double_validation
 #: help:purchase.double.validation.installer,limit_amount:0
 msgid "Maximum amount after which validation of purchase is required."
-msgstr ""
+msgstr "Maximum au delà duquel la validation de l'achat est requise."
 
 #. module: purchase_double_validation
 #: model:ir.model,name:purchase_double_validation.model_purchase_double_validation_installer
@@ -80,4 +86,4 @@ msgstr "purchase.double.validation.installer"
 #. module: purchase_double_validation
 #: field:purchase.double.validation.installer,limit_amount:0
 msgid "Maximum Purchase Amount"
-msgstr ""
+msgstr "Montant maximum d'achat"
diff --git a/addons/survey/i18n/ca.po b/addons/survey/i18n/ca.po
new file mode 100644
index 00000000000..a34fc195e48
--- /dev/null
+++ b/addons/survey/i18n/ca.po
@@ -0,0 +1,1712 @@
+# Catalan translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:16+0000\n"
+"PO-Revision-Date: 2011-04-16 13:20+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Catalan <ca@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: 2011-04-17 06:13+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
+
+#. module: survey
+#: view:survey.print:0
+#: view:survey.print.answer:0
+msgid "Print Option"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/survey.py:422
+#, python-format
+msgid ""
+"Minimum Required Answer you                                     entered is "
+"greater than the number of answer.                                      "
+"Please use a number that is smaller than %d."
+msgstr ""
+
+#. module: survey
+#: view:survey.question.wiz:0
+msgid "Your Messages"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,comment_valid_type:0
+#: field:survey.question,validation_type:0
+msgid "Text Validation"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/survey.py:434
+#, python-format
+msgid ""
+"Maximum Required Answer you                                     entered for "
+"your maximum is greater than the number of answer.                           "
+"           Please use a number that is smaller than %d."
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: field:survey,invited_user_ids:0
+msgid "Invited User"
+msgstr ""
+
+#. module: survey
+#: selection:survey.answer,type:0
+msgid "Character"
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_survey_form1
+#: model:ir.ui.menu,name:survey.menu_print_survey_form
+#: model:ir.ui.menu,name:survey.menu_reporting
+#: model:ir.ui.menu,name:survey.menu_survey_form
+#: model:ir.ui.menu,name:survey.menu_surveys
+msgid "Surveys"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+msgid "Set to draft"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,in_visible_answer_type:0
+msgid "Is Answer Type Invisible?"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: view:survey.page:0
+#: view:survey.question:0
+#: view:survey.request:0
+msgid "Group By..."
+msgstr ""
+
+#. module: survey
+#: view:survey.send.invitation.log:0
+msgid "Results :"
+msgstr ""
+
+#. module: survey
+#: view:survey.request:0
+msgid "Survey Request"
+msgstr ""
+
+#. module: survey
+#: selection:survey.question,required_type:0
+msgid "A Range"
+msgstr ""
+
+#. module: survey
+#: view:survey.response.line:0
+msgid "Table Answer"
+msgstr ""
+
+#. module: survey
+#: field:survey.history,date:0
+msgid "Date started"
+msgstr ""
+
+#. module: survey
+#: field:survey,history:0
+msgid "History Lines"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/survey.py:448
+#, python-format
+msgid ""
+"You must enter one or more menu                                 choices in "
+"column heading (white spaces not allowed)"
+msgstr ""
+
+#. module: survey
+#: field:survey.question.column.heading,in_visible_menu_choice:0
+msgid "Is Menu Choice Invisible??"
+msgstr ""
+
+#. module: survey
+#: field:survey.send.invitation,mail:0
+msgid "Body"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,allow_comment:0
+msgid "Allow Comment Field"
+msgstr ""
+
+#. module: survey
+#: selection:survey.print,paper_size:0
+#: selection:survey.print.answer,paper_size:0
+msgid "A4 (210mm x 297mm)"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,comment_maximum_date:0
+#: field:survey.question,validation_maximum_date:0
+msgid "Maximum date"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,in_visible_menu_choice:0
+msgid "Is Menu Choice Invisible?"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+msgid "Completed"
+msgstr ""
+
+#. module: survey
+#: selection:survey.question,required_type:0
+msgid "Exactly"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+msgid "Open Date"
+msgstr ""
+
+#. module: survey
+#: view:survey.request:0
+msgid "Set to Draft"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,is_comment_require:0
+msgid "Add Comment Field"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/survey.py:401
+#, python-format
+msgid ""
+"#Required Answer you entered                                     is greater "
+"than the number of answer.                                     Please use a "
+"number that is smaller than %d."
+msgstr ""
+
+#. module: survey
+#: field:survey.question,tot_resp:0
+msgid "Total Answer"
+msgstr ""
+
+#. module: survey
+#: field:survey.tbl.column.heading,name:0
+msgid "Row Number"
+msgstr ""
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_name_wiz
+msgid "survey.name.wiz"
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_survey_question_form
+msgid "Survey Questions"
+msgstr ""
+
+#. module: survey
+#: selection:survey.question,type:0
+msgid "Matrix of Choices (Only One Answers Per Row)"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/survey.py:475
+#, python-format
+msgid ""
+"Maximum Required Answer you entered for your maximum is greater than the "
+"number of answer. Please use a number that is smaller than %d."
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_view_survey_question_message
+#: model:ir.model,name:survey.model_survey_question
+#: view:survey:0
+#: view:survey.page:0
+#: view:survey.question:0
+msgid "Survey Question"
+msgstr ""
+
+#. module: survey
+#: view:survey.question.column.heading:0
+msgid "Use if question type is rating_scale"
+msgstr ""
+
+#. module: survey
+#: field:survey.print,page_number:0
+#: field:survey.print.answer,page_number:0
+msgid "Include Page Number"
+msgstr ""
+
+#. module: survey
+#: view:survey.page:0
+#: view:survey.question:0
+#: view:survey.send.invitation.log:0
+msgid "Ok"
+msgstr ""
+
+#. module: survey
+#: field:survey.page,title:0
+msgid "Page Title"
+msgstr ""
+
+#. module: survey
+#: model:ir.ui.menu,name:survey.menu_define_survey
+msgid "Define Surveys"
+msgstr ""
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_history
+msgid "Survey History"
+msgstr ""
+
+#. module: survey
+#: field:survey.response.answer,comment:0
+#: field:survey.response.line,comment:0
+msgid "Notes"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: view:survey.request:0
+msgid "Search Survey"
+msgstr ""
+
+#. module: survey
+#: field:survey.response.answer,answer:0
+#: field:survey.tbl.column.heading,value:0
+msgid "Value"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,column_heading_ids:0
+msgid " Column heading"
+msgstr ""
+
+#. module: survey
+#: model:ir.ui.menu,name:survey.menu_run_survey_form
+msgid "Answer a Survey"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/wizard/survey_answer.py:92
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: survey
+#: field:survey,tot_comp_survey:0
+msgid "Total Completed Survey"
+msgstr ""
+
+#. module: survey
+#: view:survey.response.answer:0
+msgid "(Use Only Question Type is matrix_of_drop_down_menus)"
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.report.xml,name:survey.survey_analysis
+msgid "Survey Statistics"
+msgstr ""
+
+#. module: survey
+#: selection:survey,state:0
+#: view:survey.request:0
+#: selection:survey.request,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: survey
+#: selection:survey.question,type:0
+msgid "Rating Scale"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,comment_field_type:0
+msgid "Comment Field Type"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/survey.py:375
+#: code:addons/survey/survey.py:387
+#: code:addons/survey/survey.py:401
+#: code:addons/survey/survey.py:406
+#: code:addons/survey/survey.py:416
+#: code:addons/survey/survey.py:422
+#: code:addons/survey/survey.py:428
+#: code:addons/survey/survey.py:434
+#: code:addons/survey/survey.py:438
+#: code:addons/survey/survey.py:444
+#: code:addons/survey/survey.py:448
+#: code:addons/survey/survey.py:458
+#: code:addons/survey/survey.py:462
+#: code:addons/survey/survey.py:467
+#: code:addons/survey/survey.py:473
+#: code:addons/survey/survey.py:475
+#: code:addons/survey/survey.py:477
+#: code:addons/survey/survey.py:482
+#: code:addons/survey/survey.py:484
+#: code:addons/survey/survey.py:642
+#: code:addons/survey/wizard/survey_answer.py:124
+#: code:addons/survey/wizard/survey_answer.py:131
+#: code:addons/survey/wizard/survey_answer.py:699
+#: code:addons/survey/wizard/survey_answer.py:738
+#: code:addons/survey/wizard/survey_answer.py:758
+#: code:addons/survey/wizard/survey_answer.py:787
+#: code:addons/survey/wizard/survey_answer.py:792
+#: code:addons/survey/wizard/survey_answer.py:800
+#: code:addons/survey/wizard/survey_answer.py:811
+#: code:addons/survey/wizard/survey_answer.py:820
+#: code:addons/survey/wizard/survey_answer.py:825
+#: code:addons/survey/wizard/survey_answer.py:899
+#: code:addons/survey/wizard/survey_answer.py:935
+#: code:addons/survey/wizard/survey_answer.py:953
+#: code:addons/survey/wizard/survey_answer.py:981
+#: code:addons/survey/wizard/survey_answer.py:984
+#: code:addons/survey/wizard/survey_answer.py:987
+#: code:addons/survey/wizard/survey_answer.py:999
+#: code:addons/survey/wizard/survey_answer.py:1006
+#: code:addons/survey/wizard/survey_answer.py:1009
+#: code:addons/survey/wizard/survey_selection.py:134
+#: code:addons/survey/wizard/survey_selection.py:138
+#: code:addons/survey/wizard/survey_send_invitation.py:74
+#, python-format
+msgid "Warning !"
+msgstr ""
+
+#. module: survey
+#: selection:survey.question,comment_field_type:0
+msgid "Single Line Of Text"
+msgstr ""
+
+#. module: survey
+#: view:survey.send.invitation:0
+#: field:survey.send.invitation,send_mail_existing:0
+msgid "Send reminder for existing user"
+msgstr ""
+
+#. module: survey
+#: selection:survey.question,type:0
+msgid "Multiple Choice (Multiple Answer)"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+msgid "Edit Survey"
+msgstr ""
+
+#. module: survey
+#: view:survey.response.line:0
+msgid "Survey Answer Line"
+msgstr ""
+
+#. module: survey
+#: field:survey.question.column.heading,menu_choice:0
+msgid "Menu Choice"
+msgstr ""
+
+#. module: survey
+#: selection:survey.question,required_type:0
+msgid "At Most"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,is_validation_require:0
+msgid "Validate Text"
+msgstr ""
+
+#. module: survey
+#: field:survey.response.line,single_text:0
+msgid "Text"
+msgstr ""
+
+#. module: survey
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+
+#. module: survey
+#: selection:survey.print,paper_size:0
+#: selection:survey.print.answer,paper_size:0
+msgid "Letter (8.5\" x 11\")"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: field:survey,responsible_id:0
+msgid "Responsible"
+msgstr ""
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_request
+msgid "survey.request"
+msgstr ""
+
+#. module: survey
+#: field:survey.send.invitation,mail_subject:0
+#: field:survey.send.invitation,mail_subject_existing:0
+msgid "Subject"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,comment_maximum_float:0
+#: field:survey.question,validation_maximum_float:0
+msgid "Maximum decimal number"
+msgstr ""
+
+#. module: survey
+#: view:survey.request:0
+msgid "Late"
+msgstr ""
+
+#. module: survey
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr ""
+
+#. module: survey
+#: field:survey.send.invitation,mail_from:0
+msgid "From"
+msgstr ""
+
+#. module: survey
+#: selection:survey.question,comment_valid_type:0
+#: selection:survey.question,validation_type:0
+msgid "Don't Validate Comment Text."
+msgstr ""
+
+#. module: survey
+#: selection:survey.question,comment_valid_type:0
+#: selection:survey.question,validation_type:0
+msgid "Must Be A Whole Number"
+msgstr ""
+
+#. module: survey
+#: field:survey.answer,question_id:0
+#: field:survey.page,question_ids:0
+#: field:survey.question,question:0
+#: field:survey.question.column.heading,question_id:0
+#: field:survey.response.line,question_id:0
+msgid "Question"
+msgstr ""
+
+#. module: survey
+#: view:survey.page:0
+msgid "Search Survey Page"
+msgstr ""
+
+#. module: survey
+#: view:survey.send.invitation:0
+msgid "Send"
+msgstr ""
+
+#. module: survey
+#: field:survey.question.wiz,name:0
+msgid "Number"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/survey.py:444
+#, python-format
+msgid ""
+"You must enter one or more menu choices                                 in "
+"column heading"
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.act_window,help:survey.action_survey_form1
+msgid ""
+"You can create survey for different purposes: recruitment interviews, "
+"employee's periodical evaluations, marketing campaigns, etc. A survey is "
+"made of pages containing questions of several types: text, multiple choices, "
+"etc. You can edit survey manually or click on the 'Edit Survey' for a "
+"WYSIWYG interface."
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: view:survey.request:0
+#: field:survey.request,state:0
+msgid "State"
+msgstr ""
+
+#. module: survey
+#: view:survey.request:0
+msgid "Evaluation Plan Phase"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: view:survey.page:0
+#: view:survey.question:0
+msgid "Between"
+msgstr ""
+
+#. module: survey
+#: view:survey.print:0
+#: view:survey.print.answer:0
+#: view:survey.print.statistics:0
+msgid "Print"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,make_comment_field:0
+msgid "Make Comment Field an Answer Choice"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: field:survey,type:0
+msgid "Type"
+msgstr ""
+
+#. module: survey
+#: selection:survey.answer,type:0
+msgid "Email"
+msgstr ""
+
+#. module: survey
+#: model:ir.ui.menu,name:survey.menu_answer_surveys
+msgid "Answer Surveys"
+msgstr ""
+
+#. module: survey
+#: selection:survey.response,state:0
+msgid "Not Finished"
+msgstr ""
+
+#. module: survey
+#: view:survey.print:0
+msgid "Survey Print"
+msgstr ""
+
+#. module: survey
+#: view:survey.send.invitation:0
+msgid "Select Partner"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,type:0
+msgid "Question Type"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/wizard/survey_answer.py:131
+#, python-format
+msgid "You can not answer this survey more than %s times"
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.act_survey_answer
+msgid "Answers"
+msgstr ""
+
+#. module: survey
+#: model:ir.module.module,description:survey.module_meta_information
+msgid ""
+"\n"
+"    This module is used for surveying. It depends on the answers or reviews "
+"of some questions by different users.\n"
+"    A survey may have multiple pages. Each page may contain multiple "
+"questions and each question may have multiple answers.\n"
+"    Different users may give different answers of question and according to "
+"that survey is done. \n"
+"    Partners are also sent mails with user name and password for the "
+"invitation of the survey\n"
+"    "
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/wizard/survey_answer.py:124
+#, python-format
+msgid "You can not answer because the survey is not open"
+msgstr ""
+
+#. module: survey
+#: selection:survey.response,response_type:0
+msgid "Link"
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_survey_type_form
+#: model:ir.model,name:survey.model_survey_type
+#: view:survey.type:0
+msgid "Survey Type"
+msgstr ""
+
+#. module: survey
+#: field:survey.page,sequence:0
+msgid "Page Nr"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: view:survey.page:0
+#: view:survey.question:0
+#: field:survey.question,descriptive_text:0
+#: selection:survey.question,type:0
+msgid "Descriptive Text"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,minimum_req_ans:0
+msgid "Minimum Required Answer"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/survey.py:484
+#, python-format
+msgid ""
+"You must enter one or more menu choices in column heading (white spaces not "
+"allowed)"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,req_error_msg:0
+msgid "Error Message"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/survey.py:482
+#, python-format
+msgid "You must enter one or more menu choices in column heading"
+msgstr ""
+
+#. module: survey
+#: field:survey.request,date_deadline:0
+msgid "Deadline date"
+msgstr ""
+
+#. module: survey
+#: selection:survey.question,comment_valid_type:0
+#: selection:survey.question,validation_type:0
+msgid "Must Be A Date"
+msgstr ""
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_print
+msgid "survey.print"
+msgstr ""
+
+#. module: survey
+#: view:survey.question.column.heading:0
+#: field:survey.question.column.heading,title:0
+msgid "Column Heading"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,is_require_answer:0
+msgid "Require Answer to Question"
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_survey_request_tree
+#: model:ir.ui.menu,name:survey.menu_survey_type_form1
+msgid "Survey Requests"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/survey.py:375
+#: code:addons/survey/survey.py:462
+#, python-format
+msgid "You must enter one or more column heading."
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/wizard/survey_answer.py:758
+#: code:addons/survey/wizard/survey_answer.py:953
+#, python-format
+msgid "Please enter an integer value"
+msgstr ""
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_browse_answer
+msgid "survey.browse.answer"
+msgstr ""
+
+#. module: survey
+#: selection:survey.question,comment_field_type:0
+msgid "Paragraph of Text"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/survey.py:428
+#, python-format
+msgid ""
+"Maximum Required Answer you                                     entered for "
+"your maximum is greater than the number of answer.                           "
+"          Please use a number that is smaller than %d."
+msgstr ""
+
+#. module: survey
+#: view:survey.request:0
+msgid "Watting Answer"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: view:survey.page:0
+#: view:survey.question:0
+msgid "When the question is not answered, display this error message:"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: view:survey.page:0
+#: view:survey.question:0
+msgid "Options"
+msgstr ""
+
+#. module: survey
+#: model:ir.ui.menu,name:survey.menu_browse_survey_response
+msgid "Browse Answers"
+msgstr ""
+
+#. module: survey
+#: field:survey.response.answer,comment_field:0
+#: view:survey.response.line:0
+msgid "Comment"
+msgstr ""
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_answer
+#: model:ir.model,name:survey.model_survey_response_answer
+#: view:survey.answer:0
+#: view:survey.response:0
+#: view:survey.response.answer:0
+#: view:survey.response.line:0
+msgid "Survey Answer"
+msgstr ""
+
+#. module: survey
+#: selection:survey.answer,type:0
+msgid "Selection"
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_browse_survey_response
+#: view:survey:0
+msgid "Answer Survey"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: view:survey.page:0
+#: view:survey.question:0
+msgid "Comment Field"
+msgstr ""
+
+#. module: survey
+#: selection:survey.response,response_type:0
+msgid "Manually"
+msgstr ""
+
+#. module: survey
+#: help:survey,responsible_id:0
+msgid "User responsible for survey"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,comment_column:0
+msgid "Add comment column in matrix"
+msgstr ""
+
+#. module: survey
+#: field:survey.answer,response:0
+msgid "#Answer"
+msgstr ""
+
+#. module: survey
+#: field:survey.print,without_pagebreak:0
+#: field:survey.print.answer,without_pagebreak:0
+msgid "Print Without Page Breaks"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: view:survey.page:0
+#: view:survey.question:0
+msgid "When the comment is an invalid format, display this error message"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/wizard/survey_selection.py:138
+#, python-format
+msgid ""
+"You can not give more response. Please contact the author of this survey for "
+"further assistance."
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.act_survey_page_question
+#: model:ir.actions.act_window,name:survey.act_survey_question
+msgid "Questions"
+msgstr ""
+
+#. module: survey
+#: help:survey,response_user:0
+msgid "Set to one if  you require only one Answer per user"
+msgstr ""
+
+#. module: survey
+#: field:survey,users:0
+msgid "Users"
+msgstr ""
+
+#. module: survey
+#: view:survey.send.invitation:0
+msgid "Message"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: view:survey.request:0
+msgid "MY"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,maximum_req_ans:0
+msgid "Maximum Required Answer"
+msgstr ""
+
+#. module: survey
+#: field:survey.name.wiz,page_no:0
+msgid "Page Number"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/wizard/survey_answer.py:92
+#, python-format
+msgid "Cannot locate survey for the question wizard!"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: view:survey.page:0
+#: view:survey.question:0
+msgid "and"
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_view_survey_print_statistics
+#: view:survey.print.statistics:0
+msgid "Survey Print Statistics"
+msgstr ""
+
+#. module: survey
+#: field:survey.send.invitation.log,note:0
+msgid "Log"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: view:survey.page:0
+#: view:survey.question:0
+msgid "When the choices do not add up correctly, display this error message"
+msgstr ""
+
+#. module: survey
+#: field:survey,date_close:0
+msgid "Survey Close Date"
+msgstr ""
+
+#. module: survey
+#: field:survey,date_open:0
+msgid "Survey Open Date"
+msgstr ""
+
+#. module: survey
+#: field:survey.question.column.heading,in_visible_rating_weight:0
+msgid "Is Rating Scale Invisible ??"
+msgstr ""
+
+#. module: survey
+#: view:survey.browse.answer:0
+#: view:survey.name.wiz:0
+msgid "Start"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/survey.py:477
+#, python-format
+msgid "Maximum Required Answer is greater than Minimum Required Answer"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,comment_maximum_no:0
+#: field:survey.question,validation_maximum_no:0
+msgid "Maximum number"
+msgstr ""
+
+#. module: survey
+#: selection:survey,state:0
+#: selection:survey.request,state:0
+#: selection:survey.response.line,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_print_statistics
+msgid "survey.print.statistics"
+msgstr ""
+
+#. module: survey
+#: selection:survey,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: survey
+#: selection:survey.question,type:0
+msgid "Matrix of Drop-down Menus"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: field:survey.answer,answer:0
+#: field:survey.name.wiz,response:0
+#: view:survey.page:0
+#: view:survey.print.answer:0
+#: field:survey.print.answer,response_ids:0
+#: view:survey.question:0
+#: field:survey.question,answer_choice_ids:0
+#: field:survey.request,response:0
+#: field:survey.response,question_ids:0
+#: field:survey.response.answer,answer_id:0
+#: field:survey.response.answer,response_id:0
+#: view:survey.response.line:0
+#: field:survey.response.line,response_answer_ids:0
+#: field:survey.response.line,response_id:0
+#: field:survey.response.line,response_table_ids:0
+#: field:survey.send.invitation,partner_ids:0
+#: field:survey.tbl.column.heading,response_table_id:0
+msgid "Answer"
+msgstr ""
+
+#. module: survey
+#: field:survey,max_response_limit:0
+msgid "Maximum Answer Limit"
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_act_view_survey_send_invitation
+msgid "Send Invitations"
+msgstr ""
+
+#. module: survey
+#: field:survey.name.wiz,store_ans:0
+msgid "Store Answer"
+msgstr ""
+
+#. module: survey
+#: selection:survey.question,type:0
+msgid "Date and Time"
+msgstr ""
+
+#. module: survey
+#: field:survey,state:0
+#: field:survey.response,state:0
+#: field:survey.response.line,state:0
+msgid "Status"
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_view_survey_print
+msgid "Print Survey"
+msgstr ""
+
+#. module: survey
+#: field:survey,send_response:0
+msgid "E-mail Notification on Answer"
+msgstr ""
+
+#. module: survey
+#: field:survey.response.answer,value_choice:0
+msgid "Value Choice"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+msgid "Started"
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_view_survey_print_answer
+#: view:survey:0
+#: view:survey.print.answer:0
+msgid "Print Answer"
+msgstr ""
+
+#. module: survey
+#: selection:survey.question,type:0
+msgid "Multiple Textboxes"
+msgstr ""
+
+#. module: survey
+#: selection:survey.print,orientation:0
+#: selection:survey.print.answer,orientation:0
+msgid "Landscape(Horizontal)"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,no_of_rows:0
+msgid "No of Rows"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: view:survey.name.wiz:0
+msgid "Survey Details"
+msgstr ""
+
+#. module: survey
+#: selection:survey.question,type:0
+msgid "Multiple Textboxes With Different Type"
+msgstr ""
+
+#. module: survey
+#: view:survey.question.column.heading:0
+msgid "Menu Choices (each choice on separate lines)"
+msgstr ""
+
+#. module: survey
+#: field:survey.response,response_type:0
+msgid "Answer Type"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: view:survey.page:0
+#: view:survey.question:0
+msgid "Validation"
+msgstr ""
+
+#. module: survey
+#: view:survey.request:0
+#: selection:survey.request,state:0
+msgid "Waiting Answer"
+msgstr ""
+
+#. module: survey
+#: selection:survey.question,comment_valid_type:0
+#: selection:survey.question,validation_type:0
+msgid "Must Be A Decimal Number"
+msgstr ""
+
+#. module: survey
+#: field:res.users,survey_id:0
+msgid "Groups"
+msgstr ""
+
+#. module: survey
+#: selection:survey.answer,type:0
+#: selection:survey.question,type:0
+msgid "Date"
+msgstr ""
+
+#. module: survey
+#: selection:survey.answer,type:0
+msgid "Integer"
+msgstr ""
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_send_invitation
+msgid "survey.send.invitation"
+msgstr ""
+
+#. module: survey
+#: field:survey.history,user_id:0
+#: view:survey.request:0
+#: field:survey.request,user_id:0
+#: field:survey.response,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: survey
+#: field:survey.name.wiz,transfer:0
+msgid "Page Transfer"
+msgstr ""
+
+#. module: survey
+#: selection:survey.response.line,state:0
+msgid "Skiped"
+msgstr ""
+
+#. module: survey
+#: field:survey.print,paper_size:0
+#: field:survey.print.answer,paper_size:0
+msgid "Paper Size"
+msgstr ""
+
+#. module: survey
+#: field:survey.response.answer,column_id:0
+#: field:survey.tbl.column.heading,column_id:0
+msgid "Column"
+msgstr ""
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_tbl_column_heading
+msgid "survey.tbl.column.heading"
+msgstr ""
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_response_line
+msgid "Survey Response Line"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/wizard/survey_selection.py:134
+#, python-format
+msgid "You can not give response for this survey more than %s times"
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.report.xml,name:survey.report_survey_form
+#: model:ir.model,name:survey.model_survey
+#: view:survey:0
+#: view:survey.browse.answer:0
+#: field:survey.browse.answer,survey_id:0
+#: field:survey.history,survey_id:0
+#: view:survey.name.wiz:0
+#: field:survey.name.wiz,survey_id:0
+#: view:survey.page:0
+#: field:survey.page,survey_id:0
+#: view:survey.print:0
+#: field:survey.print,survey_ids:0
+#: field:survey.print.statistics,survey_ids:0
+#: field:survey.question,survey:0
+#: view:survey.request:0
+#: field:survey.request,survey_id:0
+#: field:survey.response,survey_id:0
+msgid "Survey"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,in_visible_rating_weight:0
+msgid "Is Rating Scale Invisible?"
+msgstr ""
+
+#. module: survey
+#: selection:survey.question,type:0
+msgid "Numerical Textboxes"
+msgstr ""
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_question_wiz
+msgid "survey.question.wiz"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+msgid "History"
+msgstr ""
+
+#. module: survey
+#: help:survey.browse.answer,response_id:0
+msgid ""
+"If this field is empty, all answers of the selected survey will be print."
+msgstr ""
+
+#. module: survey
+#: field:survey.type,code:0
+msgid "Code"
+msgstr ""
+
+#. module: survey
+#: model:ir.ui.menu,name:survey.menu_print_survey_statistics
+msgid "Surveys Statistics"
+msgstr ""
+
+#. module: survey
+#: field:survey.print,orientation:0
+#: field:survey.print.answer,orientation:0
+msgid "Orientation"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: view:survey.answer:0
+#: view:survey.page:0
+#: view:survey.question:0
+msgid "Seq"
+msgstr ""
+
+#. module: survey
+#: field:survey.request,email:0
+msgid "E-mail"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,comment_minimum_no:0
+#: field:survey.question,validation_minimum_no:0
+msgid "Minimum number"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,req_ans:0
+msgid "#Required Answer"
+msgstr ""
+
+#. module: survey
+#: field:survey.answer,sequence:0
+#: field:survey.question,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,comment_label:0
+msgid "Field Label"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+msgid "Other"
+msgstr ""
+
+#. module: survey
+#: view:survey.request:0
+#: selection:survey.request,state:0
+msgid "Done"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+msgid "Test Survey"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,rating_allow_one_column_require:0
+msgid "Allow Only One Answer per Column (Forced Ranking)"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: view:survey.browse.answer:0
+#: view:survey.name.wiz:0
+#: view:survey.print:0
+#: view:survey.print.answer:0
+#: view:survey.print.statistics:0
+#: view:survey.send.invitation:0
+msgid "Cancel"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+msgid "Close"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,comment_minimum_float:0
+#: field:survey.question,validation_minimum_float:0
+msgid "Minimum decimal number"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: selection:survey,state:0
+msgid "Open"
+msgstr ""
+
+#. module: survey
+#: field:survey,tot_start_survey:0
+msgid "Total Started Survey"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/survey.py:467
+#, python-format
+msgid ""
+"#Required Answer you entered is greater than the number of answer. Please "
+"use a number that is smaller than %d."
+msgstr ""
+
+#. module: survey
+#: help:survey,max_response_limit:0
+msgid "Set to one if survey is answerable only once"
+msgstr ""
+
+#. module: survey
+#: selection:survey.response,state:0
+msgid "Finished "
+msgstr ""
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_question_column_heading
+msgid "Survey Question Column Heading"
+msgstr ""
+
+#. module: survey
+#: field:survey.answer,average:0
+msgid "#Avg"
+msgstr ""
+
+#. module: survey
+#: selection:survey.question,type:0
+msgid "Matrix of Choices (Multiple Answers Per Row)"
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_view_survey_name
+msgid "Give Survey Answer"
+msgstr ""
+
+#. module: survey
+#: model:ir.model,name:survey.model_res_users
+msgid "res.users"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+msgid "Current"
+msgstr ""
+
+#. module: survey
+#: selection:survey.response.line,state:0
+msgid "Answered"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/wizard/survey_answer.py:432
+#, python-format
+msgid "Complete Survey Answer"
+msgstr ""
+
+#. module: survey
+#: selection:survey.question,type:0
+msgid "Comment/Essay Box"
+msgstr ""
+
+#. module: survey
+#: field:survey.answer,type:0
+msgid "Type of Answer"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,required_type:0
+msgid "Respondent must answer"
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_view_survey_send_invitation
+#: view:survey.send.invitation:0
+msgid "Send Invitation"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/wizard/survey_answer.py:792
+#, python-format
+msgid "You cannot select the same answer more than one time"
+msgstr ""
+
+#. module: survey
+#: view:survey.question:0
+msgid "Search Question"
+msgstr ""
+
+#. module: survey
+#: field:survey,title:0
+msgid "Survey Title"
+msgstr ""
+
+#. module: survey
+#: selection:survey.question,type:0
+msgid "Single Textbox"
+msgstr ""
+
+#. module: survey
+#: field:survey,note:0
+#: field:survey.name.wiz,note:0
+#: view:survey.page:0
+#: field:survey.page,note:0
+#: view:survey.response.line:0
+msgid "Description"
+msgstr ""
+
+#. module: survey
+#: view:survey.name.wiz:0
+msgid "Select Survey"
+msgstr ""
+
+#. module: survey
+#: selection:survey.question,required_type:0
+msgid "At Least"
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_view_survey_send_invitation_log
+#: model:ir.model,name:survey.model_survey_send_invitation_log
+msgid "survey.send.invitation.log"
+msgstr ""
+
+#. module: survey
+#: selection:survey.print,orientation:0
+#: selection:survey.print.answer,orientation:0
+msgid "Portrait(Vertical)"
+msgstr ""
+
+#. module: survey
+#: selection:survey.question,comment_valid_type:0
+#: selection:survey.question,validation_type:0
+msgid "Must Be Specific Length"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: view:survey.page:0
+#: field:survey.question,page_id:0
+msgid "Survey Page"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: view:survey.page:0
+#: view:survey.question:0
+msgid "Required Answer"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/survey.py:473
+#, python-format
+msgid ""
+"Minimum Required Answer you entered is greater than the number of answer. "
+"Please use a number that is smaller than %d."
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/survey.py:458
+#, python-format
+msgid "You must enter one or more answer."
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.report.xml,name:survey.survey_browse_response
+#: field:survey.browse.answer,response_id:0
+msgid "Survey Answers"
+msgstr ""
+
+#. module: survey
+#: view:survey.browse.answer:0
+msgid "Select Survey and related answer"
+msgstr ""
+
+#. module: survey
+#: model:ir.ui.menu,name:survey.menu_print_survey_answer
+msgid "Surveys Answers"
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.act_survey_pages
+msgid "Pages"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/survey.py:406
+#, python-format
+msgid ""
+"#Required Answer you entered is                                     greater "
+"than the number of answer.                                    Please use a "
+"number that is smaller than %d."
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/wizard/survey_answer.py:984
+#, python-format
+msgid "You cannot select same answer more than one time'"
+msgstr ""
+
+#. module: survey
+#: selection:survey.print,paper_size:0
+#: selection:survey.print.answer,paper_size:0
+msgid "Legal (8.5\" x 14\")"
+msgstr ""
+
+#. module: survey
+#: field:survey.type,name:0
+msgid "Name"
+msgstr ""
+
+#. module: survey
+#: view:survey.page:0
+msgid "#Questions"
+msgstr ""
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_response
+msgid "survey.response"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,comment_valid_err_msg:0
+#: field:survey.question,make_comment_field_err_msg:0
+#: field:survey.question,numeric_required_sum_err_msg:0
+#: field:survey.question,validation_valid_err_msg:0
+msgid "Error message"
+msgstr ""
+
+#. module: survey
+#: model:ir.module.module,shortdesc:survey.module_meta_information
+msgid "Survey Module"
+msgstr ""
+
+#. module: survey
+#: view:survey.send.invitation:0
+#: field:survey.send.invitation,send_mail:0
+msgid "Send mail for new user"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/survey.py:387
+#, python-format
+msgid "You must enter one or more Answer."
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/survey.py:416
+#, python-format
+msgid ""
+"Minimum Required Answer                                     you entered is "
+"greater than the number of answer.                                    Please "
+"use a number that is smaller than %d."
+msgstr ""
+
+#. module: survey
+#: field:survey.answer,menu_choice:0
+msgid "Menu Choices"
+msgstr ""
+
+#. module: survey
+#: field:survey,page_ids:0
+#: view:survey.question:0
+#: field:survey.response.line,page_id:0
+msgid "Page"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/survey.py:438
+#, python-format
+msgid ""
+"Maximum Required Answer is greater                                     than "
+"Minimum Required Answer"
+msgstr ""
+
+#. module: survey
+#: view:survey.send.invitation.log:0
+msgid "User creation"
+msgstr ""
+
+#. module: survey
+#: selection:survey.question,required_type:0
+msgid "All"
+msgstr ""
+
+#. module: survey
+#: selection:survey.question,comment_valid_type:0
+#: selection:survey.question,validation_type:0
+msgid "Must Be An Email Address"
+msgstr ""
+
+#. module: survey
+#: selection:survey.question,type:0
+msgid "Multiple Choice (Only One Answer)"
+msgstr ""
+
+#. module: survey
+#: field:survey.answer,in_visible_answer_type:0
+msgid "Is Answer Type Invisible??"
+msgstr ""
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_print_answer
+msgid "survey.print.answer"
+msgstr ""
+
+#. module: survey
+#: view:survey.answer:0
+msgid "Menu Choices (each choice on separate by lines)"
+msgstr ""
+
+#. module: survey
+#: selection:survey.answer,type:0
+msgid "Float"
+msgstr ""
+
+#. module: survey
+#: view:survey.response.line:0
+msgid "Single Textboxes"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/wizard/survey_send_invitation.py:74
+#, python-format
+msgid "%sSurvey is not in open state"
+msgstr ""
+
+#. module: survey
+#: field:survey.question.column.heading,rating_weight:0
+msgid "Weight"
+msgstr ""
+
+#. module: survey
+#: selection:survey.answer,type:0
+msgid "Date & Time"
+msgstr ""
+
+#. module: survey
+#: field:survey.response,date_create:0
+#: field:survey.response.line,date_create:0
+msgid "Create Date"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,column_name:0
+msgid "Column Name"
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_survey_page_form
+#: model:ir.model,name:survey.model_survey_page
+#: model:ir.ui.menu,name:survey.menu_survey_page_form1
+#: view:survey.page:0
+msgid "Survey Pages"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,numeric_required_sum:0
+msgid "Sum of all choices"
+msgstr ""
+
+#. module: survey
+#: selection:survey.question,type:0
+#: view:survey.response.line:0
+msgid "Table"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/survey.py:642
+#, python-format
+msgid "You cannot duplicate the resource!"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,comment_minimum_date:0
+#: field:survey.question,validation_minimum_date:0
+msgid "Minimum date"
+msgstr ""
+
+#. module: survey
+#: field:survey,response_user:0
+msgid "Maximum Answer per User"
+msgstr ""
+
+#. module: survey
+#: field:survey.name.wiz,page:0
+msgid "Page Position"
+msgstr ""
diff --git a/addons/thunderbird/i18n/fr.po b/addons/thunderbird/i18n/fr.po
index 90df4ae255a..53a4c284df7 100644
--- a/addons/thunderbird/i18n/fr.po
+++ b/addons/thunderbird/i18n/fr.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2011-01-19 12:00+0000\n"
-"Last-Translator: Aline (OpenERP) <Unknown>\n"
+"PO-Revision-Date: 2011-04-15 09:42+0000\n"
+"Last-Translator: Christophe Chauvet - http://www.syleam.fr/ <Unknown>\n"
 "Language-Team: French <fr@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: 2011-01-25 07:08+0000\n"
-"X-Generator: Launchpad (build 12177)\n"
+"X-Launchpad-Export-Date: 2011-04-16 06:52+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
 #. module: thunderbird
 #: field:thunderbird.installer,plugin_file:0
@@ -50,7 +50,7 @@ msgstr ""
 #. module: thunderbird
 #: model:ir.model,name:thunderbird.model_email_server_tools
 msgid "Email Server Tools"
-msgstr ""
+msgstr "Outils pour le serveur e-mail"
 
 #. module: thunderbird
 #: view:thunderbird.installer:0

From 7c2cc54d102cc0741a635b0fd2b912d67aa463dc Mon Sep 17 00:00:00 2001
From: Rodrigo Fernandez <rodrigo@solucionesprisma.com>
Date: Sun, 17 Apr 2011 16:48:28 +0000
Subject: [PATCH 241/331] Changed the price_include field on VAT taxes from
 False to True

bzr revid: rodrigo@solucionesprisma.com-20110417164828-5b3wvjdhnf9w3d74
---
 addons/l10n_gt/l10n_gt_base.xml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/addons/l10n_gt/l10n_gt_base.xml b/addons/l10n_gt/l10n_gt_base.xml
index 0f6e8da73b9..87b1adb72f7 100644
--- a/addons/l10n_gt/l10n_gt_base.xml
+++ b/addons/l10n_gt/l10n_gt_base.xml
@@ -47,7 +47,7 @@
         <record id="impuestos_plantilla_iva_por_cobrar" model="account.tax.template">
             <field name="chart_template_id" ref="cuentas_plantilla"/>
             <field name="name">IVA por Cobrar</field>
-            <field eval="0.12" name="amount"/>
+            <field name="amount" eval="0.12"/>
             <field name="type">percent</field>
             <field name="account_collected_id" ref="cta110301"/>
             <field name="account_paid_id" ref="cta110301"/>
@@ -56,6 +56,7 @@
             <field name="ref_base_code_id" ref="impuestos_base_iva_compras"/>
             <field name="ref_tax_code_id" ref="impuestos_iva_por_cobrar"/>
             <field name="type_tax_use">purchase</field>
+            <field name="price_include" eval="True"/>
         </record>
 
         <!-- Ventas e IVA por Pagar -->
@@ -63,7 +64,7 @@
         <record id="impuestos_plantilla_iva_por_pagar" model="account.tax.template">
             <field name="chart_template_id" ref="cuentas_plantilla"/>
             <field name="name">IVA por Pagar</field>
-            <field eval="0.12" name="amount"/>
+            <field name="amount" eval="0.12"/>
             <field name="type">percent</field>
             <field name="account_collected_id" ref="cta210201"/>
             <field name="account_paid_id" ref="cta210201"/>
@@ -72,6 +73,7 @@
             <field name="ref_base_code_id" ref="impuestos_base_iva_ventas"/>
             <field name="ref_tax_code_id" ref="impuestos_iva_por_pagar"/>
             <field name="type_tax_use">sale</field>
+            <field name="price_include" eval="True"/>
         </record>
 
     </data>

From 45d43912582c67f1afc1f6c6ac84380f942daafd Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Mon, 18 Apr 2011 06:26:30 +0000
Subject: [PATCH 242/331] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20110418062630-eth2g6msxzxkqvjw
---
 addons/account/i18n/ru.po              | 262 ++++++++++++++--------
 addons/auction/i18n/bg.po              | 298 +++++++++++++------------
 addons/hr/i18n/bg.po                   |  20 +-
 addons/hr_evaluation/i18n/bg.po        | 128 ++++++-----
 addons/hr_expense/i18n/bg.po           |  16 +-
 addons/hr_holidays/i18n/bg.po          |  50 ++---
 addons/hr_recruitment/i18n/bg.po       |  28 +--
 addons/hr_timesheet/i18n/bg.po         |  26 +--
 addons/hr_timesheet_invoice/i18n/bg.po |   8 +-
 addons/product/i18n/ru.po              |  21 +-
 addons/resource/i18n/ru.po             |  56 ++---
 addons/sale/i18n/ru.po                 |   8 +-
 12 files changed, 501 insertions(+), 420 deletions(-)

diff --git a/addons/account/i18n/ru.po b/addons/account/i18n/ru.po
index 8fdd75ca3fd..6db60c1528b 100644
--- a/addons/account/i18n/ru.po
+++ b/addons/account/i18n/ru.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-03-11 11:37+0000\n"
-"Last-Translator: Stanislav Hanzhin <Unknown>\n"
+"PO-Revision-Date: 2011-04-17 15:55+0000\n"
+"Last-Translator: Chertykov Denis <chertykov@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: 2011-03-12 06:15+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-04-18 06:26+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -244,7 +244,7 @@ msgstr ""
 #. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile_select
 msgid "Move line reconcile select"
-msgstr ""
+msgstr "Выбор сверки действия"
 
 #. module: account
 #: help:account.model.line,sequence:0
@@ -297,7 +297,7 @@ msgstr "Вычисленный баланс"
 #: model:ir.actions.act_window,name:account.action_view_account_use_model
 #: model:ir.ui.menu,name:account.menu_action_manual_recurring
 msgid "Manual Recurring"
-msgstr ""
+msgstr "Повтор вручную"
 
 #. module: account
 #: view:account.fiscalyear.close.state:0
@@ -336,6 +336,8 @@ msgid ""
 "Installs localized accounting charts to match as closely as possible the "
 "accounting needs of your company based on your country."
 msgstr ""
+"Устанавливает локализованный план счетов, чтобы соответствовать как можно "
+"ближе потребностям учета вашей компании на основе учета в вашей стране."
 
 #. module: account
 #: code:addons/account/wizard/account_move_journal.py:63
@@ -380,9 +382,9 @@ msgid ""
 "OpenERP. Journal items are created by OpenERP if you use Bank Statements, "
 "Cash Registers, or Customer/Supplier payments."
 msgstr ""
-"Этот вид используется, бухгалтерами для массовой регистрации записей в "
-"OpenERP.  Пункты журнала создаются OpenERP если вы используете банковские "
-"выписки, фискальные регистраторы, или платежи заказчик / поставщик."
+"Этот вид используется бухгалтерами для массового ввода проводок в OpenERP.  "
+"Элементы журнала создаются OpenERP если вы используете банковские выписки, "
+"фискальные регистраторы, платежи от заказчика или поставщику."
 
 #. module: account
 #: model:ir.model,name:account.model_account_tax_template
@@ -467,6 +469,9 @@ msgid ""
 "it comes to 'Printed' state. When all transactions are done, it comes in "
 "'Done' state."
 msgstr ""
+"При создании периода журнала его состояние - 'Черновик'. Если отчет "
+"напечатан оно становится 'Напечатано'. Когда все операции произведены, оно "
+"становится 'Сделано'."
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_tax_chart
@@ -616,6 +621,8 @@ msgid ""
 "If you unreconciliate transactions, you must also verify all the actions "
 "that are linked to those transactions because they will not be disable"
 msgstr ""
+"Если вы отменили сверку операций, вы должны также проверить все действия, "
+"которые связаны с этими операциями, потому что они не будут отключены."
 
 #. module: account
 #: view:analytic.entries.report:0
@@ -936,7 +943,7 @@ msgstr "Выписка банка"
 #. module: account
 #: field:account.analytic.line,move_id:0
 msgid "Move Line"
-msgstr "Перемещение строки"
+msgstr "Действие"
 
 #. module: account
 #: help:account.move.line,tax_amount:0
@@ -1287,7 +1294,7 @@ msgstr "Параметры отчета"
 #. module: account
 #: model:ir.model,name:account.model_account_entries_report
 msgid "Journal Items Analysis"
-msgstr "Анализ записей журнала"
+msgstr "Анализ элементов журнала"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_partner_all
@@ -1343,7 +1350,7 @@ msgstr "Искать налоги"
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_cost_ledger
 msgid "Account Analytic Cost Ledger"
-msgstr ""
+msgstr "Аналитический счет журнала издержек"
 
 #. module: account
 #: view:account.model:0
@@ -1389,6 +1396,10 @@ msgid ""
 "entry per accounting document: invoice, refund, supplier payment, bank "
 "statements, etc."
 msgstr ""
+"Запись журнала состоит из нескольких элементов журнала, каждый из которых "
+"дебетовая или кредитовая операция. OpenERP автоматически создает одну запись "
+"в журнале на один бухгалтерский документ: счет, возврат, платеж поставщику, "
+"платежное поручение и т.д."
 
 #. module: account
 #: view:account.entries.report:0
@@ -1424,7 +1435,7 @@ msgstr ""
 #. module: account
 #: field:account.installer.modules,account_anglo_saxon:0
 msgid "Anglo-Saxon Accounting"
-msgstr ""
+msgstr "Англосаксонский бухгалтерский учет"
 
 #. module: account
 #: selection:account.account,type:0
@@ -1612,7 +1623,7 @@ msgstr ""
 #: field:account.partner.ledger,initial_balance:0
 #: field:account.report.general.ledger,initial_balance:0
 msgid "Include initial balances"
-msgstr ""
+msgstr "Включать начальные остатки"
 
 #. module: account
 #: field:account.tax.code,sum:0
@@ -1636,6 +1647,9 @@ msgid ""
 "Have a complete tree view of all journal items per account code by clicking "
 "on an account."
 msgstr ""
+"Отображение плана счетов вашей компании на финансовый год с фильтром по "
+"периодам. Отображается как древовидная структура всех элементов журнала по "
+"коду счета при нажатии на счет."
 
 #. module: account
 #: constraint:account.fiscalyear:0
@@ -1736,7 +1750,7 @@ msgstr ""
 #: code:addons/account/account.py:499
 #, python-format
 msgid "You cannot deactivate an account that contains account moves."
-msgstr ""
+msgstr "Вы не можете отключить счет, по которому есть движение."
 
 #. module: account
 #: field:account.move.line.reconcile,credit:0
@@ -1746,7 +1760,7 @@ msgstr "Сумма кредита"
 #. module: account
 #: constraint:account.move.line:0
 msgid "You can not create move line on closed account."
-msgstr "Нельзя сделать проводку по закрытому счету."
+msgstr "Нельзя сделать действие по закрытому счету."
 
 #. module: account
 #: code:addons/account/account.py:519
@@ -1755,6 +1769,8 @@ msgid ""
 "You cannot change the type of account from 'Closed' to any other type which "
 "contains account entries!"
 msgstr ""
+"Вы не можете изменить тип счета с 'Закрыт' на любой другой, содержащий "
+"проводки!"
 
 #. module: account
 #: view:res.company:0
@@ -1786,7 +1802,7 @@ msgstr "Настройка финансового года"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_project_account_analytic_line_form
 msgid "Entries By Line"
-msgstr ""
+msgstr "Проводки по позициям"
 
 #. module: account
 #: report:account.tax.code.entries:0
@@ -1840,7 +1856,7 @@ msgstr "Корректный"
 #: model:ir.actions.act_window,name:account.action_account_print_journal
 #: model:ir.model,name:account.model_account_print_journal
 msgid "Account Print Journal"
-msgstr ""
+msgstr "Счет - печать журнала"
 
 #. module: account
 #: model:ir.model,name:account.model_product_category
@@ -1855,7 +1871,7 @@ msgstr "/"
 #. module: account
 #: field:account.bs.report,reserve_account_id:0
 msgid "Reserve & Profit/Loss Account"
-msgstr ""
+msgstr "Счет резервов и прибылей / убытков"
 
 #. module: account
 #: help:account.bank.statement,balance_end:0
@@ -1890,6 +1906,7 @@ msgid ""
 "It adds the currency column if the currency is different then the company "
 "currency"
 msgstr ""
+"Добавляет столбец валюты , если валюта отличается, от валюты компании."
 
 #. module: account
 #: help:account.journal,allow_date:0
@@ -1929,6 +1946,8 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the tax "
 "without removing it."
 msgstr ""
+"Если поле 'Активно' имеет значение Ложь, то это позволит вам скрыть налог, "
+"не удаляя его."
 
 #. module: account
 #: help:account.bank.statement,name:0
@@ -1988,7 +2007,7 @@ msgstr "Январь"
 #. module: account
 #: view:account.journal:0
 msgid "Validations"
-msgstr "Проверки"
+msgstr "Утверждение"
 
 #. module: account
 #: view:account.entries.report:0
@@ -2057,6 +2076,9 @@ msgid ""
 "certified Chart of Accounts exists for your specified country, a generic one "
 "can be installed and will be selected by default."
 msgstr ""
+"План счетов по умолчанию соответствует выбранной стране. Если для выбранной "
+"страны нет сертифицированного плана счетов, то общий план счетов может быть "
+"установлен и выбран по умолчанию."
 
 #. module: account
 #: view:account.account.type:0
@@ -2122,7 +2144,7 @@ msgstr "Изменить на"
 #. module: account
 #: view:account.entries.report:0
 msgid "# of Products Qty "
-msgstr ""
+msgstr "# кол. ТМЦ "
 
 #. module: account
 #: model:ir.model,name:account.model_product_template
@@ -2264,7 +2286,7 @@ msgstr "Базовый Код"
 #. module: account
 #: help:account.invoice.tax,sequence:0
 msgid "Gives the sequence order when displaying a list of invoice tax."
-msgstr ""
+msgstr "Определяет последовательность при выводе списка налогов счета."
 
 #. module: account
 #: field:account.tax,base_sign:0
@@ -2431,6 +2453,8 @@ msgid ""
 "You cannot modify company of this journal as its related record exist in "
 "Entry Lines"
 msgstr ""
+"Вы не можете изменить компанию этого журнала, так как существуют связанные с "
+"ним проводки."
 
 #. module: account
 #: report:account.journal.period.print:0
@@ -2521,6 +2545,8 @@ msgid ""
 "Automatically generate entries based on what has been entered in the  system "
 "before a specific date."
 msgstr ""
+"Автоматически генерируются проводки основанные на том, что было введено в "
+"систему до определенной даты."
 
 #. module: account
 #: view:account.aged.trial.balance:0
@@ -2549,6 +2575,10 @@ msgid ""
 "Note that journal entries that are automatically created by the system are "
 "always skipping that state."
 msgstr ""
+"Отметьте, если не хотите, чтобы новые записи в журнале проходили через "
+"состояние 'Черновик', а сразу проводились без утверждения вручную. \n"
+"Автоматически создаваемые системой записи в журнал всегда пропускают это "
+"состояние."
 
 #. module: account
 #: model:ir.actions.server,name:account.ir_actions_server_action_wizard_multi_chart
@@ -3369,6 +3399,8 @@ msgid ""
 "You cannot validate a Journal Entry unless all journal items are in same "
 "chart of accounts !"
 msgstr ""
+"Вы не можете утвердить запись в журнале, если не все элементы журнала в "
+"одном плане счетов!"
 
 #. module: account
 #: view:account.tax:0
@@ -3454,6 +3486,8 @@ msgstr "Счета к оплате"
 msgid ""
 "You cannot create entries on different periods/journals in the same move"
 msgstr ""
+"Вы не можете создавать проводки по разным периодам / журналам в одном "
+"действии."
 
 #. module: account
 #: model:process.node,name:account.process_node_supplierpaymentorder0
@@ -3566,7 +3600,7 @@ msgstr "Журнал аналитических проводок"
 #: view:product.template:0
 #: view:res.partner:0
 msgid "Accounting"
-msgstr "Бухгалтерский"
+msgstr "Бухгалтерия"
 
 #. module: account
 #: help:account.central.journal,amount_currency:0
@@ -3624,7 +3658,7 @@ msgstr "Вывести партнеров"
 #. module: account
 #: view:account.invoice:0
 msgid "Validate"
-msgstr "Проверить"
+msgstr "Утвердить"
 
 #. module: account
 #: sql_constraint:account.model.line:0
@@ -3718,7 +3752,7 @@ msgstr ""
 #. module: account
 #: view:account.tax.template:0
 msgid "Search Tax Templates"
-msgstr ""
+msgstr "Искать шаблоны налогов"
 
 #. module: account
 #: model:ir.ui.menu,name:account.periodical_processing_journal_entries_validation
@@ -3898,7 +3932,7 @@ msgstr "Все проведенные проводки"
 #: code:addons/account/account_bank_statement.py:357
 #, python-format
 msgid "Statement %s is confirmed, journal items are created."
-msgstr "Документ %s подтвержден, записи в журнал сделаны."
+msgstr "Документ %s подтвержден, элементы журнала созданы."
 
 #. module: account
 #: constraint:account.fiscalyear:0
@@ -4238,6 +4272,8 @@ msgid ""
 "All draft account entries in this journal and period will be validated. It "
 "means you won't be able to modify their accounting fields anymore."
 msgstr ""
+"Все черновики проводок в этом журнале и периоде будут утверждены. Вы больше "
+"не сможете изменять их бухгалтерские поля."
 
 #. module: account
 #: report:account.account.balance.landscape:0
@@ -4349,7 +4385,7 @@ msgstr "Для сверки с банком использовать банко
 #. module: account
 #: model:process.transition,note:account.process_transition_suppliercustomerinvoice0
 msgid "Draft invoices are validated. "
-msgstr "Черновики счетов проверяются. "
+msgstr "Черновики счетов утверждаются. "
 
 #. module: account
 #: view:account.bank.statement:0
@@ -4518,7 +4554,7 @@ msgstr ""
 #: code:addons/account/account.py:940
 #, python-format
 msgid "Start period should be smaller then End period"
-msgstr ""
+msgstr "Начало периода должно быть меньше, чем конец периода"
 
 #. module: account
 #: selection:account.automatic.reconcile,power:0
@@ -4646,7 +4682,7 @@ msgstr "месяц"
 #: code:addons/account/account_bank_statement.py:293
 #, python-format
 msgid "Journal Item \"%s\" is not valid"
-msgstr "Запись  \"%s\" в журнале не верна"
+msgstr "Элемент  \"%s\" в журнале не верный"
 
 #. module: account
 #: view:account.payment.term:0
@@ -4751,7 +4787,7 @@ msgstr "Запись конца финансового года"
 #: model:process.transition,name:account.process_transition_suppliervalidentries0
 #: model:process.transition,name:account.process_transition_validentries0
 msgid "Validation"
-msgstr "Проверка"
+msgstr "Утверждение"
 
 #. module: account
 #: help:account.invoice,reconciled:0
@@ -4772,7 +4808,7 @@ msgstr "Налог на детей"
 #: constraint:account.move.line:0
 msgid ""
 "You can not create move line on receivable/payable account without partner"
-msgstr ""
+msgstr "Нельзя сделать действие по дебетовому/кредитовому счету без партнера"
 
 #. module: account
 #: code:addons/account/account.py:2067
@@ -5061,7 +5097,7 @@ msgstr "Количество"
 #. module: account
 #: view:account.move.line:0
 msgid "Number (Move)"
-msgstr ""
+msgstr "Номер (перемещение)"
 
 #. module: account
 #: view:account.invoice.refund:0
@@ -5135,7 +5171,7 @@ msgstr "Фиксированная величина"
 #. module: account
 #: view:account.subscription:0
 msgid "Valid Up to"
-msgstr ""
+msgstr "Действительно до"
 
 #. module: account
 #: view:board.board:0
@@ -5151,7 +5187,7 @@ msgstr "Автоматическая сверка счета"
 #: view:account.move:0
 #: view:account.move.line:0
 msgid "Journal Item"
-msgstr "Запись в журнале"
+msgstr "Элемент журнала"
 
 #. module: account
 #: model:ir.model,name:account.model_account_move_journal
@@ -5162,7 +5198,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:account.action_account_fiscalyear_close
 #: model:ir.ui.menu,name:account.menu_wizard_fy_close
 msgid "Generate Opening Entries"
-msgstr ""
+msgstr "Генерировать открывающие проводки"
 
 #. module: account
 #: code:addons/account/account_move_line.py:738
@@ -5232,7 +5268,7 @@ msgstr "Поставщик"
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "March"
-msgstr ""
+msgstr "Март"
 
 #. module: account
 #: view:account.account.template:0
@@ -5341,7 +5377,7 @@ msgstr "# строк"
 #: code:addons/account/wizard/account_change_currency.py:60
 #, python-format
 msgid "New currency is not confirured properly !"
-msgstr ""
+msgstr "Новая валюта неправильно настроена !"
 
 #. module: account
 #: field:account.aged.trial.balance,filter:0
@@ -5595,7 +5631,7 @@ msgstr "Настройка отчетов"
 #. module: account
 #: constraint:account.move.line:0
 msgid "Company must be same for its related account and period."
-msgstr ""
+msgstr "Для счета и периода должна быть одна компания."
 
 #. module: account
 #: field:account.tax,type:0
@@ -5851,7 +5887,7 @@ msgstr "Ликвидность"
 #: model:ir.actions.act_window,name:account.action_account_analytic_journal_open_form
 #: model:ir.ui.menu,name:account.account_analytic_journal_entries
 msgid "Analytic Journal Items"
-msgstr "Записи журнала аналитики"
+msgstr "Элементы журнала аналитики"
 
 #. module: account
 #: view:account.fiscalyear.close:0
@@ -5898,7 +5934,7 @@ msgstr ""
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:57
 #, python-format
 msgid "Enter a Start date !"
-msgstr ""
+msgstr "Введите дату начала !"
 
 #. module: account
 #: report:account.invoice:0
@@ -6112,6 +6148,8 @@ msgid ""
 "This account will be used instead of the default one as the receivable "
 "account for the current partner"
 msgstr ""
+"Этот счет будет использоваться, вместо счета по умолчанию, для дебиторской "
+"задолженности по текущему контрагенту."
 
 #. module: account
 #: field:account.tax,python_applicable:0
@@ -6286,13 +6324,13 @@ msgstr ""
 #. module: account
 #: view:account.journal.select:0
 msgid "Journal Select"
-msgstr ""
+msgstr "Выбор журнала"
 
 #. module: account
 #: code:addons/account/wizard/account_change_currency.py:65
 #, python-format
 msgid "Currnt currency is not confirured properly !"
-msgstr ""
+msgstr "Текущая валюта неправильно настроена !"
 
 #. module: account
 #: model:ir.model,name:account.model_account_move_reconcile
@@ -6333,6 +6371,8 @@ msgid ""
 "Check this box if you are unsure of that journal entry and if you want to "
 "note it as 'to be reviewed' by an accounting expert."
 msgstr ""
+"Отметьте этот квадрат, если вы не уверены в этой записи журнала и хотите "
+"отметить её \"для проверки\" опытному бухгалтеру."
 
 #. module: account
 #: help:account.installer.modules,account_voucher:0
@@ -6439,7 +6479,7 @@ msgstr "Выполнено"
 #. module: account
 #: model:process.transition,note:account.process_transition_invoicemanually0
 msgid "A statement with manual entries becomes a draft statement."
-msgstr ""
+msgstr "Документ с проводками вручную становится черновиком."
 
 #. module: account
 #: view:account.aged.trial.balance:0
@@ -6563,6 +6603,8 @@ msgid ""
 "Can not find account chart for this company in invoice line account, Please "
 "Create account."
 msgstr ""
+"Не могу найти план счетов для этой компании в позиции счета, пожалуйста "
+"создайте бух. счет."
 
 #. module: account
 #: view:account.tax.template:0
@@ -6572,7 +6614,7 @@ msgstr "Шаблон налогового счета"
 #. module: account
 #: view:account.journal.select:0
 msgid "Are you sure you want to open Journal Entries?"
-msgstr ""
+msgstr "Вы уверены, что хотите открыть записи журнала ?"
 
 #. module: account
 #: view:account.state.open:0
@@ -6588,7 +6630,7 @@ msgstr "Бухгалтерские проводки"
 #. module: account
 #: field:account.account.template,parent_id:0
 msgid "Parent Account Template"
-msgstr ""
+msgstr "Шаблон основного счета"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -6601,7 +6643,7 @@ msgstr "Выписка"
 #. module: account
 #: help:account.journal,default_debit_account_id:0
 msgid "It acts as a default account for debit amount"
-msgstr ""
+msgstr "Действует как счет по умолчанию для дебетовых сумм"
 
 #. module: account
 #: model:ir.module.module,description:account.module_meta_information
@@ -6702,7 +6744,7 @@ msgstr "Дата окончания"
 #. module: account
 #: field:wizard.multi.charts.accounts,purchase_tax:0
 msgid "Default Purchase Tax"
-msgstr ""
+msgstr "Налог на покупку по умолчанию"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -6751,7 +6793,7 @@ msgstr "Отчетность"
 #. module: account
 #: sql_constraint:account.journal:0
 msgid "The code of the journal must be unique per company !"
-msgstr ""
+msgstr "Код журнала должен быть уникальным для компании !"
 
 #. module: account
 #: field:account.bank.statement,ending_details_ids:0
@@ -6791,7 +6833,7 @@ msgstr "Домен"
 #. module: account
 #: model:ir.model,name:account.model_account_use_model
 msgid "Use model"
-msgstr ""
+msgstr "Использовать модель"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_moves_purchase
@@ -6871,6 +6913,8 @@ msgid ""
 "Helps you generate reminder letters for unpaid invoices, including multiple "
 "levels of reminding and customized per-partner policies."
 msgstr ""
+"Поможет вам создавать письма - напоминания о неоплаченных счетах и "
+"многоуровневые напоминания в соответствии с настройками партнера."
 
 #. module: account
 #: selection:account.entries.report,move_line_state:0
@@ -6932,7 +6976,7 @@ msgstr "Журнал продаж"
 #: code:addons/account/wizard/account_move_journal.py:104
 #, python-format
 msgid "Open Journal Items !"
-msgstr ""
+msgstr "Открыть элементы журнала"
 
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_tax
@@ -7014,7 +7058,7 @@ msgstr ""
 #. module: account
 #: view:validate.account.move:0
 msgid "Post Journal Entries of a Journal"
-msgstr ""
+msgstr "Провести записи журнала из журнала"
 
 #. module: account
 #: view:product.product:0
@@ -7033,7 +7077,7 @@ msgstr "Наличные"
 #: field:account.fiscal.position.account,account_dest_id:0
 #: field:account.fiscal.position.account.template,account_dest_id:0
 msgid "Account Destination"
-msgstr ""
+msgstr "Счет назначения"
 
 #. module: account
 #: model:process.node,note:account.process_node_supplierpaymentorder0
@@ -7064,7 +7108,7 @@ msgstr "Отчет - баланс счета"
 msgid ""
 "Check this if the price you use on the product and invoices includes this "
 "tax."
-msgstr ""
+msgstr "Отметьте, если цена ТМЦ и счета включают этот налог."
 
 #. module: account
 #: view:account.state.open:0
@@ -7079,7 +7123,7 @@ msgstr "Продажи по типу счета"
 #. module: account
 #: help:account.invoice,move_id:0
 msgid "Link to the automatically generated Journal Items."
-msgstr ""
+msgstr "Ссылка на созданные автоматически элементы журнала."
 
 #. module: account
 #: selection:account.installer,period:0
@@ -7095,6 +7139,8 @@ msgid ""
 "in which they will appear. Then you can create a new journal and link your "
 "view to it."
 msgstr ""
+"Здесь вы можете настроить существующий вид журнала или создать новый вид. "
+"Вид журнала определяет каким образом создаются  записи в вашем журнале."
 
 #. module: account
 #: view:account.payment.term.line:0
@@ -7196,13 +7242,13 @@ msgstr "Warning !"
 #. module: account
 #: field:account.entries.report,move_line_state:0
 msgid "State of Move Line"
-msgstr ""
+msgstr "Состояние действия"
 
 #. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile
 #: model:ir.model,name:account.model_account_move_line_reconcile_writeoff
 msgid "Account move line reconcile"
-msgstr "сверка проводки по счету"
+msgstr "Сверка действия по счету"
 
 #. module: account
 #: view:account.subscription.generate:0
@@ -7241,7 +7287,7 @@ msgstr "Контрагент"
 #. module: account
 #: help:account.change.currency,currency_id:0
 msgid "Select a currency to apply on the invoice"
-msgstr ""
+msgstr "Выбрать валюту применяемую в счете"
 
 #. module: account
 #: code:addons/account/wizard/account_invoice_refund.py:100
@@ -7291,7 +7337,7 @@ msgstr "Использовать налог в"
 #: code:addons/account/account_bank_statement.py:346
 #, python-format
 msgid "The account entries lines are not in valid state."
-msgstr ""
+msgstr "Проводки в ненадлежащем состоянии."
 
 #. module: account
 #: field:account.account.type,close_method:0
@@ -7307,12 +7353,12 @@ msgstr "Счет '%s' оплачен."
 #. module: account
 #: model:process.node,note:account.process_node_electronicfile0
 msgid "Automatic entry"
-msgstr ""
+msgstr "Автоматическая проводка"
 
 #. module: account
 #: constraint:account.tax.code.template:0
 msgid "Error ! You can not create recursive Tax Codes."
-msgstr ""
+msgstr "Ошибка ! Нельзя создавать рекурсивные коды налогов."
 
 #. module: account
 #: view:account.invoice.line:0
@@ -7376,13 +7422,13 @@ msgstr "Дополнительная информация"
 #. module: account
 #: view:account.installer:0
 msgid "Bank and Cash Accounts"
-msgstr ""
+msgstr "Банковские и кассовые счета"
 
 #. module: account
 #: view:account.invoice.report:0
 #: field:account.invoice.report,residual:0
 msgid "Total Residual"
-msgstr ""
+msgstr "Общий остаток"
 
 #. module: account
 #: model:process.node,note:account.process_node_invoiceinvoice0
@@ -7401,7 +7447,7 @@ msgstr ""
 #. module: account
 #: view:account.installer.modules:0
 msgid "Add extra Accounting functionalities to the ones already installed."
-msgstr ""
+msgstr "Добавить дополнительную функциональность учета к уже установленной."
 
 #. module: account
 #: report:account.analytic.account.cost_ledger:0
@@ -7431,7 +7477,7 @@ msgstr "Закрыть отчетный год"
 #: code:addons/account/installer.py:495
 #, python-format
 msgid "Purchase Refund Journal"
-msgstr ""
+msgstr "Журнал возврата покупок"
 
 #. module: account
 #: help:account.tax.template,amount:0
@@ -7449,6 +7495,8 @@ msgid ""
 "Modify Invoice: Cancels the current invoice and creates a new copy of it "
 "ready for editing."
 msgstr ""
+"Изменить счет: отменяет текущий счет и создает его новую копию готовую для "
+"редактирования."
 
 #. module: account
 #: model:ir.module.module,shortdesc:account.module_meta_information
@@ -7585,6 +7633,8 @@ msgid ""
 "You can check this box to mark this journal item as a litigation with the "
 "associated partner"
 msgstr ""
+"Отметьте для обозначения этого элемента журнала как спорного с "
+"соответствующим партнером"
 
 #. module: account
 #: field:account.move.line,reconcile_partial_id:0
@@ -7737,7 +7787,7 @@ msgstr ""
 #. module: account
 #: view:account.model.line:0
 msgid "Journal Entry Model Line"
-msgstr ""
+msgstr "Модель записи журнала"
 
 #. module: account
 #: view:account.invoice:0
@@ -7759,6 +7809,8 @@ msgstr "Поставщики"
 msgid ""
 "You cannot create more than one move per period on centralized journal"
 msgstr ""
+"Вы не можете создать больше одного действия за период по централизованному "
+"журналу."
 
 #. module: account
 #: view:account.journal:0
@@ -7856,7 +7908,7 @@ msgstr "Общая сумма к оплате этому поставщику."
 #: model:process.node,name:account.process_node_analytic0
 #: model:process.node,name:account.process_node_analyticcost0
 msgid "Analytic Costs"
-msgstr ""
+msgstr "Аналитические расходы"
 
 #. module: account
 #: field:account.analytic.journal,name:0
@@ -7884,7 +7936,7 @@ msgstr ""
 #: code:addons/account/account_move_line.py:1214
 #, python-format
 msgid "Bad account!"
-msgstr ""
+msgstr "Плохой счет!"
 
 #. module: account
 #: help:account.chart,fiscalyear:0
@@ -7936,11 +7988,12 @@ msgstr "Валюта"
 msgid ""
 "Gives the sequence order when displaying a list of bank statement lines."
 msgstr ""
+"Определяет последовательность вывода списка позиций банковской выписки."
 
 #. module: account
 #: model:process.transition,note:account.process_transition_validentries0
 msgid "Accountant validates the accounting entries coming from the invoice."
-msgstr ""
+msgstr "Бухгалтер утверждает проводки созданные по счет-фактуре."
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_fiscalyear_form
@@ -7985,7 +8038,7 @@ msgstr ""
 #. module: account
 #: model:ir.model,name:account.model_account_partner_balance
 msgid "Print Account Partner Balance"
-msgstr ""
+msgstr "Печать баланс счета партнера"
 
 #. module: account
 #: field:res.partner,contract_ids:0
@@ -8007,7 +8060,7 @@ msgstr "Открытие журнала проводок"
 #. module: account
 #: model:process.transition,note:account.process_transition_customerinvoice0
 msgid "Draft invoices are checked, validated and printed."
-msgstr "Черновики счетов проверены и напечатаны."
+msgstr "Черновики счетов проверены, утверждены и напечатаны."
 
 #. module: account
 #: help:account.chart.template,property_reserve_and_surplus_account:0
@@ -8025,7 +8078,7 @@ msgstr "Тип ссылки"
 #. module: account
 #: view:account.analytic.cost.ledger.journal.report:0
 msgid "Cost Ledger for period"
-msgstr ""
+msgstr "Журнал издержек за период"
 
 #. module: account
 #: help:account.tax,child_depend:0
@@ -8038,7 +8091,7 @@ msgstr ""
 #. module: account
 #: selection:account.tax,applicable_type:0
 msgid "Given by Python Code"
-msgstr ""
+msgstr "Задается кодом на Python"
 
 #. module: account
 #: field:account.analytic.journal,code:0
@@ -8089,7 +8142,7 @@ msgstr "Период с"
 #: code:addons/account/installer.py:476
 #, python-format
 msgid "Sales Refund Journal"
-msgstr ""
+msgstr "Журнал возврата продаж"
 
 #. module: account
 #: code:addons/account/account.py:927
@@ -8201,13 +8254,13 @@ msgstr "Управление напоминаниями"
 #: report:account.third_party_ledger_other:0
 #: report:account.vat.declaration:0
 msgid "Start Period"
-msgstr ""
+msgstr "Начало периода"
 
 #. module: account
 #: code:addons/account/account.py:2333
 #, python-format
 msgid "Cannot locate parent code for template account!"
-msgstr ""
+msgstr "Не удается найти родительский код для шаблона счета!"
 
 #. module: account
 #: field:account.aged.trial.balance,direction_selection:0
@@ -8238,7 +8291,7 @@ msgstr "Всего кредит"
 #. module: account
 #: model:process.transition,note:account.process_transition_suppliervalidentries0
 msgid "Accountant validates the accounting entries coming from the invoice. "
-msgstr ""
+msgstr "Бухгалтер утверждает проводки созданные по счет-фактуре. "
 
 #. module: account
 #: code:addons/account/invoice.py:1008
@@ -8268,7 +8321,7 @@ msgstr "Документ: выписка клиенту со счета"
 #. module: account
 #: constraint:account.move.line:0
 msgid "You can not create move line on view account."
-msgstr ""
+msgstr "Нельзя создать действие по счету с типом Вид."
 
 #. module: account
 #: code:addons/account/wizard/account_change_currency.py:71
@@ -8293,7 +8346,7 @@ msgstr ""
 #. module: account
 #: report:account.move.voucher:0
 msgid "Particulars"
-msgstr ""
+msgstr "Детали"
 
 #. module: account
 #: selection:account.account.type,report_type:0
@@ -8334,7 +8387,7 @@ msgstr "Остаток"
 #. module: account
 #: model:process.node,note:account.process_node_supplierbankstatement0
 msgid "Manually or automatically entered in the system"
-msgstr ""
+msgstr "Вручную или автоматически введенные в систему"
 
 #. module: account
 #: report:account.account.balance:0
@@ -8448,7 +8501,7 @@ msgstr ""
 #: model:process.node,note:account.process_node_manually0
 #: model:process.transition,name:account.process_transition_invoicemanually0
 msgid "Manual entry"
-msgstr ""
+msgstr "Проводка вручную"
 
 #. module: account
 #: report:account.general.ledger:0
@@ -8463,6 +8516,7 @@ msgstr "Перемещение"
 #, python-format
 msgid "You can not change the tax, you should remove and recreate lines !"
 msgstr ""
+"Вы не можете изменить налог, вы должны удалить и создать заново позиции !"
 
 #. module: account
 #: report:account.central.journal:0
@@ -8524,7 +8578,7 @@ msgstr ""
 #: model:process.transition,name:account.process_transition_paymentorderbank0
 #: model:process.transition,name:account.process_transition_paymentreconcile0
 msgid "Payment entries"
-msgstr ""
+msgstr "Проводки платежей"
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -8548,7 +8602,7 @@ msgstr "Подписка"
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_balance
 msgid "Account Analytic Balance"
-msgstr ""
+msgstr "Аналитический баланс"
 
 #. module: account
 #: report:account.account.balance:0
@@ -8561,7 +8615,7 @@ msgstr ""
 #: report:account.third_party_ledger_other:0
 #: report:account.vat.declaration:0
 msgid "End Period"
-msgstr ""
+msgstr "Конец периода"
 
 #. module: account
 #: field:account.aged.trial.balance,chart_account_id:0
@@ -8656,7 +8710,7 @@ msgstr "Не сверенные"
 #: code:addons/account/invoice.py:804
 #, python-format
 msgid "Bad total !"
-msgstr ""
+msgstr "Плохой итог !"
 
 #. module: account
 #: field:account.journal,sequence_id:0
@@ -8747,7 +8801,7 @@ msgstr "Вторичная валюта"
 #. module: account
 #: model:ir.model,name:account.model_validate_account_move
 msgid "Validate Account Move"
-msgstr ""
+msgstr "Утвердить действие по счету"
 
 #. module: account
 #: field:account.account,credit:0
@@ -8790,12 +8844,12 @@ msgstr "Через :"
 #: view:account.general.journal:0
 #: model:ir.ui.menu,name:account.menu_account_general_journal
 msgid "General Journals"
-msgstr ""
+msgstr "Общие журналы"
 
 #. module: account
 #: view:account.model:0
 msgid "Journal Entry Model"
-msgstr ""
+msgstr "Модель записи журнала"
 
 #. module: account
 #: code:addons/account/wizard/account_use_model.py:44
@@ -8930,6 +8984,9 @@ msgid ""
 "and is the process of transferring debit and credit amounts from a journal "
 "of original entry to a ledger book."
 msgstr ""
+"Процесс утверждения записей в журнале так же называется \"разнесением по "
+"счетам\" и это процесс переноса сумм по дебету и и кредиту из  журнала в "
+"главную книгу."
 
 #. module: account
 #: report:account.tax.code.entries:0
@@ -8967,7 +9024,7 @@ msgstr "Обычный"
 #: field:account.account.template,type:0
 #: field:account.entries.report,type:0
 msgid "Internal Type"
-msgstr ""
+msgstr "Внутренний тип"
 
 #. module: account
 #: report:account.move.voucher:0
@@ -9038,7 +9095,7 @@ msgstr "Дата окончания"
 #: model:ir.actions.act_window,name:account.action_account_open_closed_fiscalyear
 #: model:ir.ui.menu,name:account.menu_wizard_account_open_closed_fiscalyear
 msgid "Cancel Opening Entries"
-msgstr ""
+msgstr "Отмена открывающих проводок"
 
 #. module: account
 #: field:account.payment.term.line,days2:0
@@ -9116,7 +9173,7 @@ msgstr "Всего"
 #: code:addons/account/wizard/account_move_journal.py:97
 #, python-format
 msgid "Journal: All"
-msgstr ""
+msgstr "Журнал: Все"
 
 #. module: account
 #: field:account.account,company_id:0
@@ -9156,7 +9213,7 @@ msgstr "Определить повторяющиеся проводки"
 #. module: account
 #: field:account.entries.report,date_maturity:0
 msgid "Date Maturity"
-msgstr ""
+msgstr "Дата погашения"
 
 #. module: account
 #: help:account.bank.statement,total_entry_encoding:0
@@ -9184,7 +9241,7 @@ msgstr ""
 #. module: account
 #: model:ir.model,name:account.model_account_balance_report
 msgid "Trial Balance Report"
-msgstr ""
+msgstr "Балансовый отчет"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_bank_statement_draft_tree
@@ -9196,6 +9253,8 @@ msgstr "Черновые выписки"
 msgid ""
 "Manual or automatic creation of payment entries according to the statements"
 msgstr ""
+"Ручное или автоматическое создание проводок оплаты в соответствии с "
+"документами"
 
 #. module: account
 #: view:account.invoice:0
@@ -9242,6 +9301,8 @@ msgid ""
 "This account will be used to value outgoing stock for the current product "
 "category using cost price"
 msgstr ""
+"Счет будет использован для исчисления себестоимости исходящих ТМЦ текущей "
+"категории."
 
 #. module: account
 #: report:account.move.voucher:0
@@ -9421,13 +9482,14 @@ msgstr "Этот период уже закрыт !"
 #. module: account
 #: help:account.move.line,currency_id:0
 msgid "The optional other currency if it is a multi-currency entry."
-msgstr ""
+msgstr "Дополнительная валюта, если эта запись мульти-валютная."
 
 #. module: account
 #: model:process.transition,note:account.process_transition_invoiceimport0
 msgid ""
 "Import of the statement in the system from a supplier or customer invoice"
 msgstr ""
+"Импорт документа в систему из счета-фактуры поставщика или покупателя."
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_periodical_processing_billing
@@ -9449,11 +9511,17 @@ msgid ""
 "may keep several types of specialized journals such as a cash journal, "
 "purchase journal, sales journal..."
 msgstr ""
+"Создание и управление журналами вашей компании. Журнал используется для "
+"записи всех операций учета данных связанных с ежедневной деятельностью вашей "
+"компании используя двойную запись. В зависимости от характера  деятельности "
+"и количества ежедневных операций, компания может использовать несколько "
+"типов специализированных журналов таких, как кассовый журнал, журнал "
+"покупок, журнал продаж..."
 
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_chart
 msgid "Account Analytic Chart"
-msgstr ""
+msgstr "План счетов аналитики"
 
 #. module: account
 #: help:account.invoice,residual:0
@@ -9481,7 +9549,7 @@ msgstr ""
 #: code:addons/account/invoice.py:346
 #, python-format
 msgid "Invoice '%s' is waiting for validation."
-msgstr "Счет '%s' ожидает проверки."
+msgstr "Счет '%s' ожидает утверждения."
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -9561,7 +9629,7 @@ msgstr "Бухгалтерские документы"
 #. module: account
 #: model:ir.model,name:account.model_validate_account_move_lines
 msgid "Validate Account Move Lines"
-msgstr ""
+msgstr "Утвердить действия по счету"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_analytic_cost_ledger_journal
@@ -9672,7 +9740,7 @@ msgstr "Будущие"
 #. module: account
 #: view:account.move.line:0
 msgid "Search Journal Items"
-msgstr "Искать записи в журале"
+msgstr "Искать элементы журала"
 
 #. module: account
 #: help:account.tax,base_sign:0
diff --git a/addons/auction/i18n/bg.po b/addons/auction/i18n/bg.po
index a11c63cfeda..214ef8d2e9b 100644
--- a/addons/auction/i18n/bg.po
+++ b/addons/auction/i18n/bg.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-03-28 20:21+0000\n"
+"PO-Revision-Date: 2011-04-17 13:04+0000\n"
 "Last-Translator: Dimitar Markov <dimitar.markov@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: 2011-03-29 06:21+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-04-18 06:26+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.auction_report_menu
@@ -24,7 +24,7 @@ msgstr "Справки"
 #. module: auction
 #: model:ir.model,name:auction.model_auction_taken
 msgid "Auction taken"
-msgstr ""
+msgstr "Търгът се е състоял"
 
 #. module: auction
 #: view:auction.lots:0
@@ -65,7 +65,7 @@ msgstr ""
 #. module: auction
 #: help:auction.pay.buy,statement_id1:0
 msgid "First Bank Statement For Buyer"
-msgstr ""
+msgstr "Първо банково извлечение за Купувач"
 
 #. module: auction
 #: field:auction.bid_line,lot_id:0
@@ -76,7 +76,7 @@ msgstr "Обект"
 #. module: auction
 #: field:report.auction.object.date,obj_num:0
 msgid "# of Objects"
-msgstr ""
+msgstr "# от обекти"
 
 #. module: auction
 #: view:auction.lots:0
@@ -128,7 +128,7 @@ msgstr "Фактурирана сума"
 #. module: auction
 #: help:auction.lots,name:0
 msgid "Auction object name"
-msgstr ""
+msgstr "Име на обеката на търга"
 
 #. module: auction
 #: model:ir.model,name:auction.model_aie_category
@@ -160,6 +160,8 @@ msgid ""
 "When auction starts the state is 'Draft'.\n"
 " At the end of auction, the state becomes 'Closed'."
 msgstr ""
+"Когато стартира търг състоянието му е 'Чернови'.\n"
+" В края на търга състоянието става 'Затворен'."
 
 #. module: auction
 #: field:auction.dates,account_analytic_id:0
@@ -169,7 +171,7 @@ msgstr "Аналитична сметка"
 #. module: auction
 #: help:auction.pay.buy,amount3:0
 msgid "Amount For Third Bank Statement"
-msgstr ""
+msgstr "Сума за трето банково извлечение"
 
 #. module: auction
 #: field:auction.lots,lot_num:0
@@ -199,7 +201,7 @@ msgstr "Състояние"
 #. module: auction
 #: view:auction.dates:0
 msgid "First Auction Date"
-msgstr ""
+msgstr "Първа тръжна дата"
 
 #. module: auction
 #: selection:report.auction,month:0
@@ -236,7 +238,7 @@ msgstr ""
 #. module: auction
 #: help:auction.lots,costs:0
 msgid "Deposit cost"
-msgstr ""
+msgstr "Цена на депозит"
 
 #. module: auction
 #: selection:auction.lots,state:0
@@ -274,7 +276,7 @@ msgstr ""
 #: model:ir.actions.report.xml,name:auction.bid_auction
 #: model:ir.ui.menu,name:auction.menu_action_bid_open
 msgid "Bids"
-msgstr ""
+msgstr "Залози"
 
 #. module: auction
 #: view:auction.lots.buyer_map:0
@@ -300,7 +302,7 @@ msgstr ""
 #: code:addons/auction/wizard/auction_lots_buyer_map.py:70
 #, python-format
 msgid "No buyer is set for this lot."
-msgstr ""
+msgstr "Не еуказан купувач за тази партида"
 
 #. module: auction
 #: code:addons/auction/auction.py:578
@@ -311,12 +313,12 @@ msgstr ""
 #. module: auction
 #: view:auction.dates:0
 msgid "Commissions"
-msgstr ""
+msgstr "Комисионни"
 
 #. module: auction
 #: model:ir.model,name:auction.model_auction_deposit_cost
 msgid "Auction Deposit Cost"
-msgstr ""
+msgstr "Сума на депозит за търга"
 
 #. module: auction
 #: view:auction.deposit:0
@@ -326,12 +328,12 @@ msgstr ""
 #. module: auction
 #: help:auction.lots,statement_id:0
 msgid "Bank statement line for given buyer"
-msgstr ""
+msgstr "Ред от банково извлечение за даден купувач"
 
 #. module: auction
 #: field:auction.lot.category,aie_categ:0
 msgid "Category"
-msgstr ""
+msgstr "Категория"
 
 #. module: auction
 #: model:ir.actions.act_window,name:auction.action_view_auction_buyer_map
@@ -341,7 +343,7 @@ msgstr ""
 #. module: auction
 #: view:auction.lots:0
 msgid "Search Auction Lots"
-msgstr ""
+msgstr "Търсене на партиди в търга"
 
 #. module: auction
 #: field:report.auction,net_revenue:0
@@ -381,7 +383,7 @@ msgstr "Юни"
 #: code:addons/auction/wizard/auction_catalog_flagey_report.py:63
 #, python-format
 msgid "No Lots belong to this Auction Date"
-msgstr ""
+msgstr "Няма паритиди към тази тръжна дата"
 
 #. module: auction
 #: selection:report.auction,month:0
@@ -391,7 +393,7 @@ msgstr "Октомври"
 #. module: auction
 #: field:auction.bid_line,name:0
 msgid "Bid date"
-msgstr ""
+msgstr "Дата на залога"
 
 #. module: auction
 #: field:auction.dates,acc_expense:0
@@ -401,17 +403,17 @@ msgstr "Сметка за разходи"
 #. module: auction
 #: model:ir.ui.menu,name:auction.menu_wizard_emporte
 msgid "Deliveries Management"
-msgstr ""
+msgstr "Управление на доставки"
 
 #. module: auction
 #: field:auction.lots,obj_desc:0
 msgid "Object Description"
-msgstr ""
+msgstr "Описание на обект"
 
 #. module: auction
 #: field:auction.lots,artist2_id:0
 msgid "Artist/Author2"
-msgstr ""
+msgstr "Артист/Автор2"
 
 #. module: auction
 #: view:auction.pay.buy:0
@@ -427,12 +429,12 @@ msgstr ""
 #: field:auction.lots,gross_revenue:0
 #: field:report.object.encoded,gross_revenue:0
 msgid "Gross revenue"
-msgstr ""
+msgstr "Брутен приход"
 
 #. module: auction
 #: model:ir.actions.act_window,name:auction.action_auction_pay_buy
 msgid "Pay objects of the buyer"
-msgstr ""
+msgstr "Плащане на обектите от купувач"
 
 #. module: auction
 #: help:auction.dates,auction2:0
@@ -447,13 +449,13 @@ msgstr "Изпращане на SMS"
 #. module: auction
 #: field:auction.lots,name2:0
 msgid "Short Description (2)"
-msgstr ""
+msgstr "Кратко описание (2)"
 
 #. module: auction
 #: report:auction.total.rml:0
 #: model:ir.ui.menu,name:auction.auction_buyers_menu
 msgid "Buyers"
-msgstr ""
+msgstr "Купувачи"
 
 #. module: auction
 #: model:account.tax.code,name:auction.account_tax_code_id4
@@ -463,7 +465,7 @@ msgstr "ДДС 12%"
 #. module: auction
 #: view:auction.dates:0
 msgid "Buyer Invoices"
-msgstr ""
+msgstr "Фактури на купувач"
 
 #. module: auction
 #: model:ir.actions.report.xml,name:auction.res_w_buyer
@@ -488,7 +490,7 @@ msgstr ""
 #. module: auction
 #: help:auction.dates,buyer_costs:0
 msgid "Account tax for buyer"
-msgstr ""
+msgstr "Данъчна сметка за купувач"
 
 #. module: auction
 #: view:auction.dates:0
@@ -498,7 +500,7 @@ msgstr "Следващ търг"
 #. module: auction
 #: view:auction.taken:0
 msgid "Select lots which are Sold"
-msgstr ""
+msgstr "Избиране на продадените партиди"
 
 #. module: auction
 #: field:auction.lots,statement_id:0
@@ -510,12 +512,12 @@ msgstr "Плащане"
 #: code:addons/auction/auction.py:686
 #, python-format
 msgid "The object \"%s\" has no buyer assigned."
-msgstr ""
+msgstr "Обектът \"%s\" няма свързан купувач."
 
 #. module: auction
 #: selection:auction.deposit,method:0
 msgid "Keep until sold"
-msgstr ""
+msgstr "Запазване до продажба"
 
 #. module: auction
 #: view:auction.dates:0
@@ -525,23 +527,23 @@ msgstr "Последна тръжна дата"
 #. module: auction
 #: model:account.tax,name:auction.tax_seller
 msgid "Seller Costs (12%)"
-msgstr ""
+msgstr "Разходи на продавач (12%)"
 
 #. module: auction
 #: field:auction.lots,paid_vnd:0
 msgid "Seller Paid"
-msgstr ""
+msgstr "Платено от продавач"
 
 #. module: auction
 #: view:board.board:0
 #: view:report.object.encoded:0
 msgid "Objects statistics"
-msgstr ""
+msgstr "Статистика за обекти"
 
 #. module: auction
 #: report:auction.total.rml:0
 msgid "# of sellers:"
-msgstr ""
+msgstr "# от купувачи:"
 
 #. module: auction
 #: field:report.auction,date:0
@@ -564,48 +566,48 @@ msgstr ""
 #: model:ir.model,name:auction.model_report_auction
 #: view:report.auction:0
 msgid "Auction's Summary"
-msgstr ""
+msgstr "Обобщена информация за търга"
 
 #. module: auction
 #: report:buyer.list:0
 msgid "%)"
-msgstr ""
+msgstr "%)"
 
 #. module: auction
 #: view:auction.lots:0
 msgid "Buyer Information"
-msgstr ""
+msgstr "Информация за купувач"
 
 #. module: auction
 #: help:auction.lots,gross_revenue:0
 msgid "Buyer Price - Seller Price"
-msgstr ""
+msgstr "Цена на купувач - Цена на продавач"
 
 #. module: auction
 #: field:auction.lots.make.invoice,objects:0
 #: field:auction.lots.make.invoice.buyer,objects:0
 msgid "# of objects"
-msgstr ""
+msgstr "# от обекти"
 
 #. module: auction
 #: field:auction.lots,lot_est2:0
 msgid "Maximum Estimation"
-msgstr ""
+msgstr "Максималн преценка"
 
 #. module: auction
 #: field:auction.lots,buyer_price:0
 msgid "Buyer price"
-msgstr ""
+msgstr "Цена на купувач"
 
 #. module: auction
 #: view:auction.lots:0
 msgid "Bids Details"
-msgstr ""
+msgstr "Подробности за залози"
 
 #. module: auction
 #: field:auction.lots,is_ok:0
 msgid "Buyer's payment"
-msgstr ""
+msgstr "Плащане на купувач"
 
 #. module: auction
 #: view:auction.dates:0
@@ -626,7 +628,7 @@ msgstr "Март"
 #. module: auction
 #: model:account.tax,name:auction.auction_tax4
 msgid "Seller Costs1"
-msgstr ""
+msgstr "Разходи на продавач1"
 
 #. module: auction
 #: field:auction.deposit,create_uid:0
@@ -637,17 +639,17 @@ msgstr "Създадено от"
 #. module: auction
 #: report:auction.total.rml:0
 msgid "# of buyers:"
-msgstr ""
+msgstr "# от купувачи:"
 
 #. module: auction
 #: field:auction.lots,costs:0
 msgid "Indirect costs"
-msgstr ""
+msgstr "Косвени разходи"
 
 #. module: auction
 #: help:auction.dates,seller_costs:0
 msgid "Account tax for seller"
-msgstr ""
+msgstr "Данъчна сметка на продавач"
 
 #. module: auction
 #: code:addons/auction/wizard/auction_lots_invoice.py:68
@@ -660,12 +662,12 @@ msgstr "Потребителска грешка"
 #. module: auction
 #: model:ir.module.module,shortdesc:auction.module_meta_information
 msgid "Auction Management"
-msgstr ""
+msgstr "Управление на търг"
 
 #. module: auction
 #: field:auction.dates,journal_seller_id:0
 msgid "Seller Journal"
-msgstr ""
+msgstr "Дневник на продавач"
 
 #. module: auction
 #: view:auction.dates:0
@@ -758,7 +760,7 @@ msgstr "Септември"
 #. module: auction
 #: field:report.auction,net_margin:0
 msgid "Net Margin"
-msgstr ""
+msgstr "Нетен марж"
 
 #. module: auction
 #: field:auction.lots,vnd_lim_net:0
@@ -773,7 +775,7 @@ msgstr "неизвестен"
 #. module: auction
 #: report:auction.total.rml:0
 msgid "# of commissions:"
-msgstr ""
+msgstr "# от комисионни:"
 
 #. module: auction
 #: field:auction.bid_line,auction:0
@@ -800,13 +802,13 @@ msgstr ""
 #: view:auction.lots.make.invoice:0
 #: view:auction.lots.make.invoice.buyer:0
 msgid "(Keep empty for automatic number)"
-msgstr ""
+msgstr "(Оставете празно за автоматично номериране)"
 
 #. module: auction
 #: code:addons/auction/auction.py:578
 #, python-format
 msgid "No Invoice Address"
-msgstr ""
+msgstr "Няма адрес за фактура"
 
 #. module: auction
 #: model:ir.actions.report.xml,name:auction.v_huissier
@@ -818,23 +820,23 @@ msgstr ""
 #: code:addons/auction/wizard/auction_lots_numerotate.py:129
 #, python-format
 msgid "This record does not exist !"
-msgstr ""
+msgstr "Този запис не съществува!"
 
 #. module: auction
 #: field:auction.pay.buy,total:0
 msgid "Total Amount"
-msgstr ""
+msgstr "Обща сума"
 
 #. module: auction
 #: help:auction.pay.buy,amount:0
 msgid "Amount For First Bank Statement"
-msgstr ""
+msgstr "Сума за първо банково извлечение"
 
 #. module: auction
 #: model:ir.model,name:auction.model_report_auction_object_date
 #: view:report.auction.object.date:0
 msgid "Objects per day"
-msgstr ""
+msgstr "Обекти за ден"
 
 #. module: auction
 #: help:auction.lots,author_right:0
@@ -860,12 +862,12 @@ msgstr "Дата"
 #. module: auction
 #: field:auction.lots,obj_ret:0
 msgid "Price retired"
-msgstr ""
+msgstr "Оттеглена цена"
 
 #. module: auction
 #: view:auction.deposit:0
 msgid "Extra Costs"
-msgstr ""
+msgstr "Извънредни разходи"
 
 #. module: auction
 #: view:auction.lots.buyer_map:0
@@ -880,27 +882,27 @@ msgstr ""
 #. module: auction
 #: field:auction.deposit,date_dep:0
 msgid "Deposit date"
-msgstr ""
+msgstr "Дата на депозит"
 
 #. module: auction
 #: model:ir.actions.report.xml,name:auction.id_deposit
 msgid "Deposits"
-msgstr ""
+msgstr "Депозити"
 
 #. module: auction
 #: field:auction.deposit,specific_cost_ids:0
 msgid "Specific Costs"
-msgstr ""
+msgstr "Специфични разходи"
 
 #. module: auction
 #: report:buyer.list:0
 msgid "To pay ("
-msgstr ""
+msgstr "За плащане ("
 
 #. module: auction
 #: model:account.tax,name:auction.tax_buyer
 msgid "Buyer Costs (20%)"
-msgstr ""
+msgstr "Разходи на купувач (20%)"
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.menu_board_auction
@@ -964,13 +966,13 @@ msgstr "Отмяна"
 #. module: auction
 #: view:auction.lots:0
 msgid "Buyer's Payment History"
-msgstr ""
+msgstr "История на плащанията на купувача"
 
 #. module: auction
 #: view:auction.artists:0
 #: field:auction.artists,biography:0
 msgid "Biography"
-msgstr ""
+msgstr "Биография"
 
 #. module: auction
 #: view:auction.lots:0
@@ -985,17 +987,17 @@ msgstr "Плащане"
 #. module: auction
 #: view:auction.lots.make.invoice:0
 msgid "Create Invoices For Seller"
-msgstr ""
+msgstr "Създаване на фактура за Продавач"
 
 #. module: auction
 #: field:report.object.encoded,obj_margin:0
 msgid "Net margin"
-msgstr ""
+msgstr "Нетен марж"
 
 #. module: auction
 #: help:auction.lots,lot_local:0
 msgid "Auction Location"
-msgstr ""
+msgstr "Местонахождение на търга"
 
 #. module: auction
 #: view:auction.dates:0
@@ -1012,12 +1014,12 @@ msgstr ""
 #: report:bids.lots:0
 #: report:bids.phones.details:0
 msgid "Cat.N"
-msgstr ""
+msgstr "Кат.№"
 
 #. module: auction
 #: selection:auction.deposit,method:0
 msgid "Decrease limit of 10%"
-msgstr ""
+msgstr "Намаляване налимита с 10%"
 
 #. module: auction
 #: field:auction.dates,adj_total:0
@@ -1033,7 +1035,7 @@ msgstr ""
 #. module: auction
 #: view:report.auction:0
 msgid "My Auction"
-msgstr ""
+msgstr "Моят търг"
 
 #. module: auction
 #: help:auction.lots,gross_margin:0
@@ -1082,12 +1084,12 @@ msgstr ""
 #: code:addons/auction/wizard/auction_aie_send_result.py:117
 #, python-format
 msgid "Connection to WWW.Auction-in-Europe.com failed !"
-msgstr ""
+msgstr "Връзката с WWW.Auction-in-Europe.com е невъзможна!"
 
 #. module: auction
 #: field:report.auction,gross_revenue:0
 msgid "Gross Revenue"
-msgstr ""
+msgstr "Брутен приход"
 
 #. module: auction
 #: model:ir.actions.act_window,name:auction.open_board_auction
@@ -1111,7 +1113,7 @@ msgstr ""
 #: code:addons/auction/auction.py:692
 #, python-format
 msgid "The Buyer has no Invoice Address."
-msgstr ""
+msgstr "Купувачът няма адрес за фактура."
 
 #. module: auction
 #: view:report.object.encoded:0
@@ -1131,13 +1133,13 @@ msgstr ""
 #. module: auction
 #: model:ir.actions.report.xml,name:auction.seller_lots_3
 msgid "Seller Form"
-msgstr ""
+msgstr "Форма за продавач"
 
 #. module: auction
 #: field:auction.lots,lot_type:0
 #: field:report.auction,lot_type:0
 msgid "Object category"
-msgstr ""
+msgstr "Категория на обект"
 
 #. module: auction
 #: view:auction.taken:0
@@ -1147,13 +1149,13 @@ msgstr ""
 #. module: auction
 #: model:ir.model,name:auction.model_auction_lots
 msgid "Auction Object"
-msgstr ""
+msgstr "Обект на търга"
 
 #. module: auction
 #: field:auction.lots,obj_num:0
 #: field:auction.lots.enable,confirm_en:0
 msgid "Catalog Number"
-msgstr ""
+msgstr "Каталожен номер"
 
 #. module: auction
 #: view:auction.dates:0
@@ -1163,7 +1165,7 @@ msgstr "Счетоводство"
 #. module: auction
 #: model:ir.actions.report.xml,name:auction.bid_phone
 msgid "Bids phones"
-msgstr ""
+msgstr "Телефонни залози"
 
 #. module: auction
 #: field:report.auction,avg_estimation:0
@@ -1173,12 +1175,12 @@ msgstr "Усреднена оценка"
 #. module: auction
 #: report:auction.total.rml:0
 msgid "Debit:"
-msgstr ""
+msgstr "Дебит:"
 
 #. module: auction
 #: field:auction.lots,author_right:0
 msgid "Author rights"
-msgstr ""
+msgstr "Авторски права:"
 
 #. module: auction
 #: view:auction.bid:0
@@ -1216,12 +1218,12 @@ msgstr "Обновяване"
 #: report:auction.total.rml:0
 #: model:ir.ui.menu,name:auction.auction_seller_menu
 msgid "Sellers"
-msgstr ""
+msgstr "Продавачи"
 
 #. module: auction
 #: help:auction.lots,lot_est2:0
 msgid "Maximum Estimate Price"
-msgstr ""
+msgstr "Максимална преценка за цена"
 
 #. module: auction
 #: view:auction.lots:0
@@ -1236,7 +1238,7 @@ msgstr ""
 #. module: auction
 #: report:auction.total.rml:0
 msgid "# of unsold items:"
-msgstr ""
+msgstr "# от непродадени артикули:"
 
 #. module: auction
 #: view:auction.dates:0
@@ -1263,18 +1265,18 @@ msgstr ""
 #. module: auction
 #: model:ir.actions.report.xml,name:auction.lot_list_inv
 msgid "Lots List - Landscape"
-msgstr ""
+msgstr "Списък партиди - Хоризонтално"
 
 #. module: auction
 #: view:auction.artists:0
 msgid "Author/Artist"
-msgstr ""
+msgstr "Автор/Художник"
 
 #. module: auction
 #: field:auction.lots,ach_login:0
 #: field:auction.lots.buyer_map,ach_login:0
 msgid "Buyer Username"
-msgstr ""
+msgstr "Потребителско име на купувач"
 
 #. module: auction
 #: field:auction.lot.category,priority:0
@@ -1284,7 +1286,7 @@ msgstr "Приоритет"
 #. module: auction
 #: view:board.board:0
 msgid "Latest objects"
-msgstr ""
+msgstr "Последни обекти"
 
 #. module: auction
 #: field:auction.lots,lot_local:0
@@ -1319,13 +1321,13 @@ msgstr ""
 #. module: auction
 #: view:auction.deposit:0
 msgid "Deposit Date"
-msgstr ""
+msgstr "Дата на депозит"
 
 #. module: auction
 #: code:addons/auction/wizard/auction_lots_numerotate.py:145
 #, python-format
 msgid "This lot does not exist !"
-msgstr ""
+msgstr "Тази партида не съществува"
 
 #. module: auction
 #: selection:report.auction,month:0
@@ -1346,12 +1348,12 @@ msgstr ""
 #. module: auction
 #: field:auction.lots,lot_est1:0
 msgid "Minimum Estimation"
-msgstr ""
+msgstr "Минимална оценка"
 
 #. module: auction
 #: model:ir.model,name:auction.model_auction_lots_sms_send
 msgid "Sms send "
-msgstr ""
+msgstr "СМС - Изпратен "
 
 #. module: auction
 #: view:auction.lots.auction.move:0
@@ -1368,12 +1370,12 @@ msgstr ""
 #: view:auction.deposit:0
 #: field:auction.deposit,method:0
 msgid "Withdrawned method"
-msgstr ""
+msgstr "Начин на оттегляне"
 
 #. module: auction
 #: view:auction.dates:0
 msgid "Buyer Commissions"
-msgstr ""
+msgstr "Комисионна на купувач"
 
 #. module: auction
 #: model:ir.actions.act_window,name:auction.action_report_auction
@@ -1385,12 +1387,12 @@ msgstr "Анализи на търга"
 #: code:addons/auction/wizard/auction_pay_buy.py:80
 #, python-format
 msgid "Payment aborted !"
-msgstr ""
+msgstr "Плащането е отхвърлено!"
 
 #. module: auction
 #: field:auction.lot.history,price:0
 msgid "Withdrawn price"
-msgstr ""
+msgstr "Оттеглена цена"
 
 #. module: auction
 #: view:auction.dates:0
@@ -1400,7 +1402,7 @@ msgstr "Начало на аукцион"
 #. module: auction
 #: help:auction.pay.buy,statement_id3:0
 msgid "Third Bank Statement For Buyer"
-msgstr ""
+msgstr "Трето банково извлечение за купувач"
 
 #. module: auction
 #: view:report.auction:0
@@ -1412,7 +1414,7 @@ msgstr "Месец"
 #. module: auction
 #: report:auction.total.rml:0
 msgid "Max Estimate:"
-msgstr ""
+msgstr "Макс. оценка:"
 
 #. module: auction
 #: view:auction.lots:0
@@ -1427,7 +1429,7 @@ msgstr ""
 #. module: auction
 #: model:ir.actions.act_window,name:auction.action_report_object_encoded_tree
 msgid "Object statistics"
-msgstr ""
+msgstr "Статистики за обект"
 
 #. module: auction
 #: help:auction.lots,net_margin:0
@@ -1437,7 +1439,7 @@ msgstr ""
 #. module: auction
 #: model:ir.model,name:auction.model_auction_lot_history
 msgid "Lot History"
-msgstr ""
+msgstr "История на партида"
 
 #. module: auction
 #: view:auction.lots.make.invoice:0
@@ -1448,12 +1450,12 @@ msgstr "Създаване на фактури"
 #. module: auction
 #: model:account.tax.code,name:auction.account_tax_code_id5
 msgid "VAT 5%"
-msgstr ""
+msgstr "ДДС 5%"
 
 #. module: auction
 #: field:auction.dates,expo1:0
 msgid "First Exposition Day"
-msgstr ""
+msgstr "Първи изложбен ден"
 
 #. module: auction
 #: report:buyer.list:0
@@ -1468,17 +1470,17 @@ msgstr ""
 #. module: auction
 #: field:report.auction,avg_price:0
 msgid "Avg Price."
-msgstr ""
+msgstr "Ср. цена"
 
 #. module: auction
 #: help:auction.pay.buy,statement_id2:0
 msgid "Second Bank Statement For Buyer"
-msgstr ""
+msgstr "Второ банково извлечение за купувач"
 
 #. module: auction
 #: field:auction.dates,journal_id:0
 msgid "Buyer Journal"
-msgstr ""
+msgstr "Дневник на купуавач"
 
 #. module: auction
 #: selection:auction.lots,state:0
@@ -1532,12 +1534,12 @@ msgstr ""
 #: field:auction.lots,sel_inv_id:0
 #: view:auction.lots.make.invoice:0
 msgid "Seller Invoice"
-msgstr ""
+msgstr "Фактура на продавач"
 
 #. module: auction
 #: view:board.board:0
 msgid "Objects by day"
-msgstr ""
+msgstr "Обекти за ден"
 
 #. module: auction
 #: help:auction.dates,expo2:0
@@ -1559,7 +1561,7 @@ msgstr ""
 #. module: auction
 #: view:board.board:0
 msgid "Auction manager "
-msgstr ""
+msgstr "Мениджър на търг "
 
 #. module: auction
 #: code:addons/auction/wizard/auction_lots_invoice.py:68
@@ -1607,7 +1609,7 @@ msgstr ""
 #. module: auction
 #: selection:auction.deposit,method:0
 msgid "Contact the Seller"
-msgstr ""
+msgstr "За контакт с продавачът"
 
 #. module: auction
 #: field:auction.taken,lot_ids:0
@@ -1617,7 +1619,7 @@ msgstr ""
 #. module: auction
 #: field:auction.lots,net_margin:0
 msgid "Net Margin (%)"
-msgstr ""
+msgstr "Нетен марж (%)"
 
 #. module: auction
 #: field:auction.lots,product_id:0
@@ -1632,7 +1634,7 @@ msgstr ")"
 #. module: auction
 #: view:auction.lots:0
 msgid "Seller Information"
-msgstr ""
+msgstr "Информация за продавач"
 
 #. module: auction
 #: view:auction.deposit:0
@@ -1646,12 +1648,12 @@ msgstr "Oбекти"
 #. module: auction
 #: view:auction.dates:0
 msgid "Seller Invoices"
-msgstr ""
+msgstr "Фактури на продавач"
 
 #. module: auction
 #: report:auction.total.rml:0
 msgid "Paid:"
-msgstr ""
+msgstr "Платено:"
 
 #. module: auction
 #: field:auction.deposit,total_neg:0
@@ -1661,7 +1663,7 @@ msgstr ""
 #. module: auction
 #: help:auction.pay.buy,amount2:0
 msgid "Amount For Second Bank Statement"
-msgstr ""
+msgstr "Сума за второ банково извлечение"
 
 #. module: auction
 #: field:auction.lot.history,auction_id:0
@@ -1683,12 +1685,12 @@ msgstr "Първа тръжна дата"
 #. module: auction
 #: view:auction.lots.make.invoice.buyer:0
 msgid "Create Invoices For Buyer"
-msgstr ""
+msgstr "Текст на СМС"
 
 #. module: auction
 #: view:auction.dates:0
 msgid "Names"
-msgstr ""
+msgstr "Имена"
 
 #. module: auction
 #: view:auction.artists:0
@@ -1699,17 +1701,17 @@ msgstr "Изпълнители"
 #. module: auction
 #: view:auction.pay.buy:0
 msgid "Pay Objects"
-msgstr ""
+msgstr "Плащане на обекти"
 
 #. module: auction
 #: help:auction.dates,expo1:0
 msgid "Beginning exposition date for auction"
-msgstr ""
+msgstr "Начална дата за излагане на обектите"
 
 #. module: auction
 #: model:ir.actions.act_window,name:auction.act_auction_lot_line_open
 msgid "Open lots"
-msgstr ""
+msgstr "Отворени партиди"
 
 #. module: auction
 #: model:ir.actions.act_window,name:auction.act_auction_lot_open_deposit
@@ -1729,7 +1731,7 @@ msgstr "Партиди"
 #. module: auction
 #: field:auction.lots,seller_price:0
 msgid "Seller price"
-msgstr ""
+msgstr "Цена на продавач"
 
 #. module: auction
 #: model:ir.actions.report.xml,name:auction.buy_id_list
@@ -1752,7 +1754,7 @@ msgstr "Извлечение"
 #: help:auction.lots,seller_price:0
 #: help:auction.lots.make.invoice,amount:0
 msgid "Seller Price"
-msgstr ""
+msgstr "Цена на продавач"
 
 #. module: auction
 #: model:account.tax,name:auction.auction_tax20
@@ -1778,7 +1780,7 @@ msgstr ""
 #. module: auction
 #: field:report.auction.object.date,name:0
 msgid "Created date"
-msgstr ""
+msgstr "Създаден на дата"
 
 #. module: auction
 #: help:auction.lots,bord_vnd_id:0
@@ -1791,7 +1793,7 @@ msgstr ""
 #: field:auction.lots,net_revenue:0
 #: field:report.object.encoded,net_revenue:0
 msgid "Net revenue"
-msgstr ""
+msgstr "Нетен приход"
 
 #. module: auction
 #: code:addons/auction/wizard/auction_catalog_flagey_report.py:63
@@ -1808,7 +1810,7 @@ msgstr ""
 #. module: auction
 #: model:account.tax,name:auction.tax_buyer_author
 msgid "Author rights (4%)"
-msgstr ""
+msgstr "Авторски права  (4%)"
 
 #. module: auction
 #: field:report.object.encoded,estimation:0
@@ -1847,7 +1849,7 @@ msgstr ""
 #. module: auction
 #: field:auction.bid,partner_id:0
 msgid "Buyer Name"
-msgstr ""
+msgstr "Име на купувач"
 
 #. module: auction
 #: view:report.auction:0
@@ -1863,7 +1865,7 @@ msgstr ""
 #. module: auction
 #: field:auction.lots,gross_margin:0
 msgid "Gross Margin (%)"
-msgstr ""
+msgstr "Марж бруто(%)"
 
 #. module: auction
 #: selection:auction.dates,state:0
@@ -1874,7 +1876,7 @@ msgstr "Приключен"
 #. module: auction
 #: view:auction.dates:0
 msgid "Search Next Auction Dates"
-msgstr ""
+msgstr "Търсене на следващи тръжни дати"
 
 #. module: auction
 #: view:auction.catalog.flagey:0
@@ -1884,7 +1886,7 @@ msgstr ""
 #. module: auction
 #: field:auction.lots,ach_avance:0
 msgid "Buyer Advance"
-msgstr ""
+msgstr "Аванс от купувач"
 
 #. module: auction
 #: field:auction.lots,obj_comm:0
@@ -1904,12 +1906,12 @@ msgstr ""
 #. module: auction
 #: help:auction.lots,obj_price:0
 msgid "Object Price"
-msgstr ""
+msgstr "Цена на обект"
 
 #. module: auction
 #: view:auction.bid:0
 msgid "Bids Lines"
-msgstr ""
+msgstr "Редове залози"
 
 #. module: auction
 #: view:auction.lots:0
@@ -1919,7 +1921,7 @@ msgstr "Каталог"
 #. module: auction
 #: help:auction.lots,auction_id:0
 msgid "Auction for object"
-msgstr ""
+msgstr "Търгове за обект"
 
 #. module: auction
 #: field:auction.deposit.cost,account:0
@@ -1956,7 +1958,7 @@ msgstr "Депозит"
 #. module: auction
 #: field:auction.dates,expo2:0
 msgid "Last Exposition Day"
-msgstr ""
+msgstr "Последен изложбен ден"
 
 #. module: auction
 #: model:ir.model,name:auction.model_auction_lots_able
@@ -1966,7 +1968,7 @@ msgstr ""
 #. module: auction
 #: model:account.tax.code,name:auction.account_tax_code_id3
 msgid "VAT 10%"
-msgstr ""
+msgstr "ДДС 10%"
 
 #. module: auction
 #: field:auction.artists,name:0
@@ -2044,7 +2046,7 @@ msgstr ""
 #: view:auction.dates:0
 #: model:ir.model,name:auction.model_auction_dates
 msgid "Auction Dates"
-msgstr ""
+msgstr "Тръжни дати"
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.menu_board_auction_open
@@ -2069,22 +2071,22 @@ msgstr "Редове от плащане"
 #: code:addons/auction/auction.py:692
 #, python-format
 msgid "Missed Address !"
-msgstr ""
+msgstr "Пропуснат адрес!"
 
 #. module: auction
 #: help:auction.lots,net_revenue:0
 msgid "Buyer Price - Seller Price - Indirect Cost"
-msgstr ""
+msgstr "Цена на купувач - Цена на продавач - Косвени разходи"
 
 #. module: auction
 #: model:ir.actions.act_window,name:auction.act_auction_lot_open_bid
 msgid "Open Bids"
-msgstr ""
+msgstr "Отворени залози"
 
 #. module: auction
 #: field:auction.artists,pseudo:0
 msgid "Pseudo"
-msgstr ""
+msgstr "Псевдо"
 
 #. module: auction
 #: view:auction.lots:0
@@ -2156,7 +2158,7 @@ msgstr ""
 #. module: auction
 #: view:auction.bid:0
 msgid "Search Auction Bid"
-msgstr ""
+msgstr "Търсене по залог"
 
 #. module: auction
 #: report:bids.phones.details:0
@@ -2166,7 +2168,7 @@ msgstr "Est"
 #. module: auction
 #: view:auction.dates:0
 msgid "Seller Commissions"
-msgstr ""
+msgstr "Комисионн на продавач"
 
 #. module: auction
 #: view:report.object.encoded:0
@@ -2181,12 +2183,12 @@ msgstr ""
 #. module: auction
 #: field:auction.dates,auction2:0
 msgid "Last Auction Day"
-msgstr ""
+msgstr "Последен тържен ден"
 
 #. module: auction
 #: view:auction.deposit:0
 msgid "Objects Description"
-msgstr ""
+msgstr "Описание на обекти"
 
 #. module: auction
 #: code:addons/auction/wizard/auction_pay_buy.py:87
@@ -2239,22 +2241,22 @@ msgstr ""
 #. module: auction
 #: view:report.object.encoded:0
 msgid "# objects"
-msgstr ""
+msgstr "# обекти"
 
 #. module: auction
 #: report:auction.total.rml:0
 msgid "Adjudication:"
-msgstr ""
+msgstr "Отсъждане:"
 
 #. module: auction
 #: model:ir.actions.report.xml,name:auction.details_bids_phones
 msgid "Bids per lot (phone)"
-msgstr ""
+msgstr "Залози за партида (телефонни)"
 
 #. module: auction
 #: field:report.auction,buyer_login:0
 msgid "Buyer Login"
-msgstr ""
+msgstr "Вход на купувач"
 
 #. module: auction
 #: field:auction.deposit,tax_id:0
diff --git a/addons/hr/i18n/bg.po b/addons/hr/i18n/bg.po
index cc1b6541441..44d7ec6d0d2 100644
--- a/addons/hr/i18n/bg.po
+++ b/addons/hr/i18n/bg.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-03-28 20:48+0000\n"
+"PO-Revision-Date: 2011-04-17 09:16+0000\n"
 "Last-Translator: Dimitar Markov <dimitar.markov@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: 2011-03-29 06:21+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-04-18 06:26+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -35,7 +35,7 @@ msgstr "Грешка! Вие не можете да създадете реку
 #. module: hr
 #: model:process.transition,name:hr.process_transition_contactofemployee0
 msgid "Link the employee to information"
-msgstr ""
+msgstr "Свързване на служителя с информацията"
 
 #. module: hr
 #: field:hr.employee,sinid:0
@@ -139,7 +139,7 @@ msgstr ""
 #. module: hr
 #: model:process.transition,name:hr.process_transition_employeeuser0
 msgid "Link a user to an employee"
-msgstr ""
+msgstr "Свързване на потребител към служител"
 
 #. module: hr
 #: field:hr.installer,hr_contract:0
@@ -188,7 +188,7 @@ msgstr "Позиция"
 #. module: hr
 #: model:ir.actions.act_window,name:hr.action2
 msgid "Employee Hierarchy"
-msgstr ""
+msgstr "Йерархия на служителите"
 
 #. module: hr
 #: model:process.transition,note:hr.process_transition_employeeuser0
@@ -269,7 +269,7 @@ msgstr "Описание на работата"
 #. module: hr
 #: field:hr.employee,work_location:0
 msgid "Office Location"
-msgstr ""
+msgstr "Местоположение на офис"
 
 #. module: hr
 #: view:hr.employee:0
@@ -368,7 +368,7 @@ msgstr "Родителска категория"
 #. module: hr
 #: constraint:hr.employee.category:0
 msgid "Error ! You cannot create recursive Categories."
-msgstr ""
+msgstr "Грешка! Не могат да бъдат създавани рекурсивни Категории."
 
 #. module: hr
 #: view:hr.department:0
@@ -573,7 +573,7 @@ msgstr "Стари"
 #. module: hr
 #: field:hr.employee.marital.status,description:0
 msgid "Status Description"
-msgstr ""
+msgstr "Описание на състоянието"
 
 #. module: hr
 #: sql_constraint:res.users:0
@@ -657,7 +657,7 @@ msgstr ""
 #. module: hr
 #: view:hr.employee.category:0
 msgid "Employees Categories"
-msgstr ""
+msgstr "Категории на служители"
 
 #. module: hr
 #: field:hr.employee,address_home_id:0
diff --git a/addons/hr_evaluation/i18n/bg.po b/addons/hr_evaluation/i18n/bg.po
index 89fd20b646a..05312e22f5a 100644
--- a/addons/hr_evaluation/i18n/bg.po
+++ b/addons/hr_evaluation/i18n/bg.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-03-27 16:19+0000\n"
+"PO-Revision-Date: 2011-04-17 09:02+0000\n"
 "Last-Translator: Dimitar Markov <dimitar.markov@gmail.com>\n"
 "Language-Team: Bulgarian <bg@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: 2011-03-28 05:24+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-04-18 06:26+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,state:0
@@ -62,7 +62,7 @@ msgstr "Легенда"
 #: code:addons/hr_evaluation/hr_evaluation.py:311
 #, python-format
 msgid "You cannot start evaluation without Evaluation."
-msgstr ""
+msgstr "Не може да бъде стартирано оценяване без ОЦЕНЯВАНЕ"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,month:0
@@ -97,7 +97,7 @@ msgstr "Фирма"
 #. module: hr_evaluation
 #: model:ir.actions.act_window,name:hr_evaluation.act_hr_employee_2_hr__evaluation_interview
 msgid "Evaluation Interviews"
-msgstr ""
+msgstr "Интервюта за оценяване"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.plan.phase,survey_id:0
@@ -113,12 +113,12 @@ msgstr "Ден"
 #. module: hr_evaluation
 #: field:hr.evaluation.interview,evaluation_id:0
 msgid "Evaluation Form"
-msgstr ""
+msgstr "Форма за оценяване"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_employee:0
 msgid "Send an anonymous summary to the employee"
-msgstr ""
+msgstr "Изпращане анонимно обобщена информация на служител"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan,month_first:0
@@ -126,6 +126,8 @@ msgid ""
 "This number of months will be used to schedule the first evaluation date of "
 "the employee when selecting an evaluation plan. "
 msgstr ""
+"Този брой месеци ще се използва за насрочване на първа дата за оценка на "
+"служител при избор на план за оценяване "
 
 #. module: hr_evaluation
 #: view:hr.employee:0
@@ -135,7 +137,7 @@ msgstr "Бележки"
 #. module: hr_evaluation
 #: view:hr.evaluation.interview:0
 msgid "Interview Request"
-msgstr ""
+msgstr "Заявка за интервю"
 
 #. module: hr_evaluation
 #: constraint:hr.employee:0
@@ -146,14 +148,14 @@ msgstr "Грешка! Не можете да изберете отдел, в к
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
 msgid "Mail Body"
-msgstr ""
+msgstr "Тяло на имейл"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
 #: model:ir.actions.act_window,name:hr_evaluation.action_evaluation_report_all
 #: model:ir.ui.menu,name:hr_evaluation.menu_evaluation_report_all
 msgid "Evaluations Analysis"
-msgstr ""
+msgstr "Анализ на Оценяване"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,state:0
@@ -165,12 +167,13 @@ msgstr "Отказани"
 #: model:ir.model,name:hr_evaluation.model_hr_evaluation_reminder
 msgid "Sends Reminders to employess to fill the evaluations"
 msgstr ""
+"Изпраща Напомняния на служетелите за попълване на формите за оценяване"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,rating:0
 #: selection:hr_evaluation.evaluation,rating:0
 msgid "Did not meet expectations"
-msgstr ""
+msgstr "Не отговаря на очакванията"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
@@ -185,7 +188,7 @@ msgstr "Юли"
 #. module: hr_evaluation
 #: field:hr_evaluation.plan,month_next:0
 msgid "Periodicity of Evaluations (months)"
-msgstr ""
+msgstr "Периодично оценяване (месеци)"
 
 #. module: hr_evaluation
 #: code:addons/hr_evaluation/hr_evaluation.py:242
@@ -203,7 +206,7 @@ msgstr "Крайна дата"
 #. module: hr_evaluation
 #: field:hr_evaluation.plan,month_first:0
 msgid "First Evaluation in (months)"
-msgstr ""
+msgstr "Първо оценяване в (месеци)"
 
 #. module: hr_evaluation
 #: code:addons/hr_evaluation/hr_evaluation.py:81
@@ -229,7 +232,7 @@ msgstr ""
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
 msgid "Send to Employees"
-msgstr ""
+msgstr "Изпращане до служителите"
 
 #. module: hr_evaluation
 #: field:hr.evaluation.report,deadline:0
@@ -256,7 +259,7 @@ msgstr "Периодично оценяване"
 #. module: hr_evaluation
 #: view:hr.evaluation.reminder:0
 msgid "Send evaluation reminder"
-msgstr ""
+msgstr "Изпращане на напомняне за оценяване"
 
 #. module: hr_evaluation
 #: model:ir.module.module,description:hr_evaluation.module_meta_information
@@ -279,7 +282,7 @@ msgstr ""
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
 msgid "(date)s: Current Date"
-msgstr ""
+msgstr "(date)s: Текуща дата"
 
 #. module: hr_evaluation
 #: code:addons/hr_evaluation/hr_evaluation.py:80
@@ -299,7 +302,7 @@ msgstr "Състояние"
 #. module: hr_evaluation
 #: model:ir.model,name:hr_evaluation.model_hr_evaluation_plan_phase
 msgid "Evaluation Plan Phase"
-msgstr ""
+msgstr "Фази на план за оценяване"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
@@ -313,7 +316,7 @@ msgstr "Служител"
 #. module: hr_evaluation
 #: field:hr.evaluation.report,overpass_delay:0
 msgid "Overpassed Deadline"
-msgstr ""
+msgstr "Хадхвърлен краен срок"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.plan.phase,mail_body:0
@@ -324,7 +327,7 @@ msgstr "Имейл"
 #: selection:hr.evaluation.report,rating:0
 #: selection:hr_evaluation.evaluation,rating:0
 msgid "Exceeds expectations"
-msgstr ""
+msgstr "Надхвърля очакванията"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,mail_feature:0
@@ -335,7 +338,7 @@ msgstr ""
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_answer_manager:0
 msgid "Send all answers to the manager"
-msgstr ""
+msgstr "Изпращане на всички отговори до мениджъра"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
@@ -345,12 +348,12 @@ msgstr "    Месец-1    "
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
 msgid "Public Notes"
-msgstr ""
+msgstr "Публични бележки"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.evaluation,date:0
 msgid "Evaluation Deadline"
-msgstr ""
+msgstr "Краен срок за оценяване"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.interview:0
@@ -367,13 +370,13 @@ msgstr "Затворен"
 #: selection:hr.evaluation.report,rating:0
 #: selection:hr_evaluation.evaluation,rating:0
 msgid "Meet expectations"
-msgstr ""
+msgstr "Отговаря на очакванията"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
 #: field:hr.evaluation.report,nbr:0
 msgid "# of Requests"
-msgstr ""
+msgstr "# от молби"
 
 #. module: hr_evaluation
 #: model:ir.actions.act_window,name:hr_evaluation.open_view_hr_evaluation_tree
@@ -395,12 +398,12 @@ msgstr ""
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
 msgid "Action to Perform"
-msgstr ""
+msgstr "Действие, което да се изпълни"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.evaluation,note_action:0
 msgid "Action Plan"
-msgstr ""
+msgstr "План за действие"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
@@ -416,7 +419,7 @@ msgstr ""
 #: selection:hr.evaluation.report,rating:0
 #: selection:hr_evaluation.evaluation,rating:0
 msgid "Significantly exceeds expectations"
-msgstr ""
+msgstr "Значително надхвърля очакванията"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
@@ -458,18 +461,18 @@ msgstr "Групиране по ..."
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
 msgid "Mail Settings"
-msgstr ""
+msgstr "Настойки за имейл"
 
 #. module: hr_evaluation
 #: field:hr.evaluation.interview,user_to_review_id:0
 msgid "Employee to Interview"
-msgstr ""
+msgstr "Служител да бъде интервюиран"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.interview:0
 #: view:hr_evaluation.evaluation:0
 msgid "Interview Question"
-msgstr ""
+msgstr "Въпрос от интервю"
 
 #. module: hr_evaluation
 #: field:survey.request,is_evaluation:0
@@ -491,7 +494,7 @@ msgstr ""
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
 msgid "Evaluation Data"
-msgstr ""
+msgstr "Дани за оценка"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.evaluation,note_action:0
@@ -509,29 +512,29 @@ msgstr "Чернова"
 #. module: hr_evaluation
 #: field:hr_evaluation.evaluation,note_summary:0
 msgid "Evaluation Summary"
-msgstr ""
+msgstr "Обобщена оценка"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.plan.phase,send_anonymous_employee:0
 #: field:hr_evaluation.plan.phase,send_anonymous_manager:0
 msgid "Anonymous Summary"
-msgstr ""
+msgstr "Анонимна обобщена информация"
 
 #. module: hr_evaluation
 #: view:hr.employee:0
 #: view:hr_evaluation.evaluation:0
 msgid "Evaluation"
-msgstr ""
+msgstr "Оценяване"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
 msgid "7 Days"
-msgstr ""
+msgstr "7 Дни"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
 msgid " Year "
-msgstr ""
+msgstr " Година "
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,month:0
@@ -541,7 +544,7 @@ msgstr "Август"
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
 msgid "Start Evaluation"
-msgstr ""
+msgstr "Начало на оценяване"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.interview:0
@@ -557,12 +560,12 @@ msgstr "Юни"
 #: selection:hr.evaluation.report,rating:0
 #: selection:hr_evaluation.evaluation,rating:0
 msgid "Significantly bellow expectations"
-msgstr ""
+msgstr "Значително под очакванията"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
 msgid " (employee_name)s: Partner name"
-msgstr ""
+msgstr " (employee_name)s: Име на контрагент"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
@@ -611,7 +614,7 @@ msgstr "Изпращане на е-поща"
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
 msgid "Send an anonymous summary to the manager"
-msgstr ""
+msgstr "Изпращане на анонимна обобщена информация на мениджър"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.interview:0
@@ -623,7 +626,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:hr_evaluation.open_view_hr_evaluation_plan_tree
 #: model:ir.ui.menu,name:hr_evaluation.menu_open_view_hr_evaluation_plan_tree
 msgid "Evaluation Plans"
-msgstr ""
+msgstr "Планове за оценяване"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
@@ -649,7 +652,7 @@ msgstr "Действие"
 #: view:hr.evaluation.report:0
 #: selection:hr.evaluation.report,state:0
 msgid "Final Validation"
-msgstr ""
+msgstr "Последно одобряване"
 
 #. module: hr_evaluation
 #: selection:hr_evaluation.evaluation,state:0
@@ -659,7 +662,7 @@ msgstr ""
 #. module: hr_evaluation
 #: field:hr_evaluation.plan.phase,mail_feature:0
 msgid "Send mail for this phase"
-msgstr ""
+msgstr "Изпращане на имейл за тази фаза"
 
 #. module: hr_evaluation
 #: field:hr.evaluation.report,rating:0
@@ -670,23 +673,23 @@ msgstr ""
 #: view:hr.evaluation.interview:0
 #: view:hr_evaluation.evaluation:0
 msgid "Late"
-msgstr ""
+msgstr "Закъснял"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.interview:0
 #: view:hr_evaluation.evaluation:0
 msgid "Interviewer"
-msgstr ""
+msgstr "Интервюиращ"
 
 #. module: hr_evaluation
 #: model:ir.model,name:hr_evaluation.model_hr_evaluation_report
 msgid "Evaluations Statistics"
-msgstr ""
+msgstr "Статистика за оценяване на служители"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.interview:0
 msgid "Deadline Date"
-msgstr ""
+msgstr "Крайна дата"
 
 #. module: hr_evaluation
 #: selection:hr_evaluation.plan.phase,action:0
@@ -701,12 +704,12 @@ msgstr "Основни"
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_answer_employee:0
 msgid "Send all answers to the employee"
-msgstr ""
+msgstr "Изпращане на всички отговори до служител"
 
 #. module: hr_evaluation
 #: field:hr.employee,evaluation_date:0
 msgid "Next Evaluation Date"
-msgstr ""
+msgstr "Дата за следващо оценяване"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
@@ -719,7 +722,7 @@ msgstr "Завършен"
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
 msgid "Evaluation Plan Phases"
-msgstr ""
+msgstr "Фази на план за оценяване"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.reminder:0
@@ -739,6 +742,9 @@ msgid ""
 "employee's evaluation plan. Each user receives automatic emails and requests "
 "to evaluate their colleagues periodically."
 msgstr ""
+"Заявките за интервюта се генерират автоматично от OpenERP според плана за "
+"оценяване на служител. Всеки потребител получава автоматично имейли и заявки "
+"за оценка на техните колеги периодично."
 
 #. module: hr_evaluation
 #: view:hr_evaluation.plan:0
@@ -754,7 +760,7 @@ msgstr "Текущ"
 #. module: hr_evaluation
 #: model:ir.model,name:hr_evaluation.model_hr_evaluation_interview
 msgid "Evaluation Interview"
-msgstr ""
+msgstr "Интервю за оценяване"
 
 #. module: hr_evaluation
 #: field:hr.evaluation.reminder,evaluation_id:0
@@ -765,7 +771,7 @@ msgstr "Интервю"
 #: view:hr.evaluation.reminder:0
 #: model:ir.ui.menu,name:hr_evaluation.menu_eval_send_mail
 msgid "Evaluation Reminders"
-msgstr ""
+msgstr "Напомняния за оценяване"
 
 #. module: hr_evaluation
 #: selection:hr_evaluation.plan.phase,action:0
@@ -795,12 +801,12 @@ msgstr "Вътрешни бележки"
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
 msgid "Validate Evaluation"
-msgstr ""
+msgstr "Одобряване на оценяване"
 
 #. module: hr_evaluation
 #: selection:hr_evaluation.plan.phase,action:0
 msgid "Final Interview"
-msgstr ""
+msgstr "Последно интервю"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.plan.phase,name:0
@@ -816,7 +822,7 @@ msgstr ""
 #: view:hr.evaluation.interview:0
 #: view:hr_evaluation.evaluation:0
 msgid "Search Evaluation"
-msgstr ""
+msgstr "Търсене на оценяване"
 
 #. module: hr_evaluation
 #: field:hr.employee,evaluation_plan_id:0
@@ -825,7 +831,7 @@ msgstr ""
 #: field:hr_evaluation.plan.phase,plan_id:0
 #: model:ir.model,name:hr_evaluation.model_hr_evaluation_plan
 msgid "Evaluation Plan"
-msgstr ""
+msgstr "План за оценяване"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,month:0
@@ -835,7 +841,7 @@ msgstr "Февруари"
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
 msgid "Send to Managers"
-msgstr ""
+msgstr "Изпращане до мениджъри"
 
 #. module: hr_evaluation
 #: model:ir.actions.act_window,name:hr_evaluation.action_hr_evaluation_send_mail
@@ -850,17 +856,17 @@ msgstr "Април"
 #. module: hr_evaluation
 #: model:ir.model,name:hr_evaluation.model_hr_evaluation_evaluation
 msgid "Employee Evaluation"
-msgstr ""
+msgstr "Оценяване на служител"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.plan:0
 msgid "Search Evaluation Plan"
-msgstr ""
+msgstr "Търсене на планове за оценяване"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.plan:0
 msgid "(months)"
-msgstr ""
+msgstr "(месеци)"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.plan.phase,sequence:0
@@ -870,7 +876,7 @@ msgstr "Последователност"
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
 msgid "(user_signature)s: User name"
-msgstr ""
+msgstr "(user_signature)s: Име на потребител"
 
 #. module: hr_evaluation
 #: model:ir.actions.act_window,name:hr_evaluation.action_hr_evaluation_interview_tree
diff --git a/addons/hr_expense/i18n/bg.po b/addons/hr_expense/i18n/bg.po
index bd391a70c9c..b9ac515b81e 100644
--- a/addons/hr_expense/i18n/bg.po
+++ b/addons/hr_expense/i18n/bg.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-03-27 16:36+0000\n"
+"PO-Revision-Date: 2011-04-17 09:14+0000\n"
 "Last-Translator: Dimitar Markov <dimitar.markov@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: 2011-03-28 05:24+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-04-18 06:26+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_confirmedexpenses0
@@ -115,7 +115,7 @@ msgstr "Бележки"
 #. module: hr_expense
 #: field:hr.expense.expense,invoice_id:0
 msgid "Employee's Invoice"
-msgstr ""
+msgstr "Фактура от служител"
 
 #. module: hr_expense
 #: model:ir.module.module,description:hr_expense.module_meta_information
@@ -195,7 +195,7 @@ msgstr "Отказване на разход"
 #. module: hr_expense
 #: model:product.template,name:hr_expense.product_product_expense_car_product_template
 msgid "Car Travel"
-msgstr ""
+msgstr "Пътуване с МПС"
 
 #. module: hr_expense
 #: field:hr.expense.report,price_average:0
@@ -291,7 +291,7 @@ msgstr "Грешка!"
 #: view:board.board:0
 #: model:ir.actions.act_window,name:hr_expense.action_my_expense
 msgid "My Expenses"
-msgstr ""
+msgstr "Моите разходи"
 
 #. module: hr_expense
 #: view:hr.expense.report:0
@@ -362,7 +362,7 @@ msgstr "Дата на валидиране"
 #: model:ir.actions.act_window,name:hr_expense.action_hr_expense_report_all
 #: model:ir.ui.menu,name:hr_expense.menu_hr_expense_report_all
 msgid "Expenses Analysis"
-msgstr ""
+msgstr "Анализ на разходите"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
@@ -370,7 +370,7 @@ msgstr ""
 #: model:ir.model,name:hr_expense.model_hr_expense_expense
 #: model:process.process,name:hr_expense.process_process_expenseprocess0
 msgid "Expense"
-msgstr ""
+msgstr "Разход"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
diff --git a/addons/hr_holidays/i18n/bg.po b/addons/hr_holidays/i18n/bg.po
index 358504abe0d..575ee78ca68 100644
--- a/addons/hr_holidays/i18n/bg.po
+++ b/addons/hr_holidays/i18n/bg.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-03-21 16:39+0000\n"
+"PO-Revision-Date: 2011-04-17 09:13+0000\n"
 "Last-Translator: Dimitar Markov <dimitar.markov@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: 2011-03-22 06:22+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-04-18 06:26+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -35,12 +35,12 @@ msgstr "Чакащи второ одобрение"
 #. module: hr_holidays
 #: help:hr.holidays.status,remaining_leaves:0
 msgid "Maximum Leaves Allowed - Leaves Already Taken"
-msgstr ""
+msgstr "Максимално разрешени отпуски - Вече изразходан отпуск"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Leaves Management"
-msgstr ""
+msgstr "Упаравление на отпуски"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -50,7 +50,7 @@ msgstr "Групирай по"
 #. module: hr_holidays
 #: model:hr.holidays.status,name:hr_holidays.holiday_status_sl
 msgid "Sick Leave"
-msgstr ""
+msgstr "Отпуск по болест"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -124,7 +124,7 @@ msgstr ""
 #. module: hr_holidays
 #: model:ir.actions.report.xml,name:hr_holidays.report_holidays_summary
 msgid "Summary Of Leaves"
-msgstr ""
+msgstr "Обобщена информация за Отпуски"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -181,7 +181,7 @@ msgstr "Проверка"
 #. module: hr_holidays
 #: field:hr.holidays.status,color_name:0
 msgid "Color in Report"
-msgstr ""
+msgstr "Цвят в отчета"
 
 #. module: hr_holidays
 #: model:ir.model,name:hr_holidays.model_hr_holidays_summary_employee
@@ -199,7 +199,7 @@ msgstr ""
 #: model:ir.model,name:hr_holidays.model_hr_holidays_status
 #: model:ir.ui.menu,name:hr_holidays.menu_open_view_holiday_status
 msgid "Leave Type"
-msgstr ""
+msgstr "Тип отпуск"
 
 #. module: hr_holidays
 #: code:addons/hr_holidays/hr_holidays.py:186
@@ -295,7 +295,7 @@ msgstr ""
 #. module: hr_holidays
 #: field:hr.holidays.status,remaining_leaves:0
 msgid "Remaining Leaves"
-msgstr ""
+msgstr "Оставащи отпуски"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -328,7 +328,7 @@ msgstr "Червено"
 #. module: hr_holidays
 #: view:hr.holidays.remaining.leaves.user:0
 msgid "Leaves by Type"
-msgstr ""
+msgstr "Отпуски по тип"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -355,7 +355,7 @@ msgstr "Брой дни"
 #. module: hr_holidays
 #: view:hr.holidays.status:0
 msgid "Search Leave Type"
-msgstr ""
+msgstr "Терсене по тип отпуск"
 
 #. module: hr_holidays
 #: sql_constraint:hr.holidays:0
@@ -405,7 +405,7 @@ msgstr "Светлолилав"
 #: model:ir.actions.act_window,name:hr_holidays.open_ask_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_open_ask_holidays_new
 msgid "Leave Requests"
-msgstr ""
+msgstr "Молби за отпуск"
 
 #. module: hr_holidays
 #: field:hr.holidays.status,limit:0
@@ -433,7 +433,7 @@ msgstr ""
 #. module: hr_holidays
 #: view:board.board:0
 msgid "All Employee Leaves"
-msgstr ""
+msgstr "Всички отпуски на служител"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -476,7 +476,7 @@ msgstr "Проверено и потвърдено"
 #. module: hr_holidays
 #: field:hr.holidays.status,leaves_taken:0
 msgid "Leaves Already Taken"
-msgstr ""
+msgstr "Отпускът е вече използван"
 
 #. module: hr_holidays
 #: field:hr.holidays,user_id:0
@@ -492,7 +492,7 @@ msgstr "Активен"
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_manager_board
 msgid "Leaves To Validate"
-msgstr ""
+msgstr "Отпуски за одобрение"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -562,7 +562,7 @@ msgstr "Причини"
 #. module: hr_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_hr_available_holidays_report_tree
 msgid "Leaves Analysis"
-msgstr ""
+msgstr "Анализи на Отпуски"
 
 #. module: hr_holidays
 #: view:hr.holidays.summary.dept:0
@@ -593,12 +593,12 @@ msgstr ""
 #. module: hr_holidays
 #: model:ir.model,name:hr_holidays.model_resource_calendar_leaves
 msgid "Leave Detail"
-msgstr ""
+msgstr "Подробности за отпуск"
 
 #. module: hr_holidays
 #: field:hr.holidays.status,double_validation:0
 msgid "Apply Double Validation"
-msgstr ""
+msgstr "Прилагане на двойно одобрение"
 
 #. module: hr_holidays
 #: view:hr.holidays.summary.dept:0
@@ -614,18 +614,18 @@ msgstr "Подробности"
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.action_hr_holidays_leaves_by_month
 msgid "My Leaves"
-msgstr ""
+msgstr "Моите отпуски"
 
 #. module: hr_holidays
 #: selection:hr.holidays,holiday_type:0
 msgid "By Employee Category"
-msgstr ""
+msgstr "По категория на служител"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: selection:hr.holidays,type:0
 msgid "Leave Request"
-msgstr ""
+msgstr "Молба за отпуск"
 
 #. module: hr_holidays
 #: field:hr.holidays,name:0
@@ -643,12 +643,12 @@ msgstr ""
 #: code:addons/hr_holidays/hr_holidays.py:186
 #, python-format
 msgid "You cannot delete a leave which is not in draft state !"
-msgstr ""
+msgstr "Не може да бъде изтрит отпуск, който не е в състояние чернова!"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Search Leave"
-msgstr ""
+msgstr "Търсене на отпуск"
 
 #. module: hr_holidays
 #: field:hr.holidays.summary.employee,holiday_type:0
@@ -658,7 +658,7 @@ msgstr "Избери типа на празника"
 #. module: hr_holidays
 #: field:hr.holidays.remaining.leaves.user,no_of_leaves:0
 msgid "Remaining leaves"
-msgstr ""
+msgstr "Оставащи отпуски"
 
 #. module: hr_holidays
 #: field:hr.holidays.summary.dept,depts:0
diff --git a/addons/hr_recruitment/i18n/bg.po b/addons/hr_recruitment/i18n/bg.po
index f9270370d4a..b347127c71b 100644
--- a/addons/hr_recruitment/i18n/bg.po
+++ b/addons/hr_recruitment/i18n/bg.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-03-27 15:57+0000\n"
+"PO-Revision-Date: 2011-04-17 09:20+0000\n"
 "Last-Translator: Dimitar Markov <dimitar.markov@gmail.com>\n"
 "Language-Team: Bulgarian <bg@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: 2011-03-28 05:24+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-04-18 06:26+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
 #. module: hr_recruitment
 #: help:hr.applicant,active:0
@@ -89,19 +89,19 @@ msgstr ""
 #. module: hr_recruitment
 #: field:hr.recruitment.job2phonecall,note:0
 msgid "Goals"
-msgstr ""
+msgstr "Цели"
 
 #. module: hr_recruitment
 #: field:hr.recruitment.report,partner_address_id:0
 msgid "Partner Contact Name"
-msgstr ""
+msgstr "За констакт с контрагент"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
 #: view:hr.recruitment.partner.create:0
 #: model:ir.actions.act_window,name:hr_recruitment.action_hr_recruitment_partner_create
 msgid "Create Partner"
-msgstr ""
+msgstr "Създаване на контрагент"
 
 #. module: hr_recruitment
 #: view:hr.recruitment.report:0
@@ -112,7 +112,7 @@ msgstr "Ден"
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Contract Data"
-msgstr ""
+msgstr "Дани от договор"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -153,7 +153,7 @@ msgstr ""
 #. module: hr_recruitment
 #: model:hr.recruitment.degree,name:hr_recruitment.degree_graduate
 msgid "Graduate"
-msgstr ""
+msgstr "Образование"
 
 #. module: hr_recruitment
 #: model:hr.recruitment.stage,name:hr_recruitment.stage_job1
@@ -230,7 +230,7 @@ msgstr "Телефонно обаждане"
 #. module: hr_recruitment
 #: view:hr.recruitment.partner.create:0
 msgid "Convert To Partner"
-msgstr ""
+msgstr "Конвертиране в контрагент"
 
 #. module: hr_recruitment
 #: model:ir.model,name:hr_recruitment.model_hr_recruitment_report
@@ -673,7 +673,7 @@ msgstr "Отговор"
 #. module: hr_recruitment
 #: model:hr.recruitment.degree,name:hr_recruitment.degree_licenced
 msgid "Licenced"
-msgstr ""
+msgstr "Лицензиран"
 
 #. module: hr_recruitment
 #: field:hr.recruitment.report,salary_prop_avg:0
@@ -712,7 +712,7 @@ msgstr "Дата"
 #. module: hr_recruitment
 #: view:hr.recruitment.job2phonecall:0
 msgid "Phone Call Description"
-msgstr ""
+msgstr "Описание на телефонно обаждане"
 
 #. module: hr_recruitment
 #: view:hr.recruitment.partner.create:0
@@ -744,7 +744,7 @@ msgstr "Прикачени файлове"
 #. module: hr_recruitment
 #: model:hr.recruitment.stage,name:hr_recruitment.stage_job4
 msgid "Contract Proposed"
-msgstr ""
+msgstr "Предложен договор"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -855,7 +855,7 @@ msgstr "Май"
 #. module: hr_recruitment
 #: model:hr.recruitment.stage,name:hr_recruitment.stage_job5
 msgid "Contract Signed"
-msgstr ""
+msgstr "Подписна договор"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -881,7 +881,7 @@ msgstr "Нает"
 #. module: hr_recruitment
 #: model:hr.recruitment.stage,name:hr_recruitment.stage_job6
 msgid "Refused by Employee"
-msgstr ""
+msgstr "Отказан от служител"
 
 #. module: hr_recruitment
 #: selection:hr.applicant,priority:0
diff --git a/addons/hr_timesheet/i18n/bg.po b/addons/hr_timesheet/i18n/bg.po
index 47d00bf1ee2..935fb85797d 100644
--- a/addons/hr_timesheet/i18n/bg.po
+++ b/addons/hr_timesheet/i18n/bg.po
@@ -7,19 +7,19 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-03-21 09:47+0000\n"
+"PO-Revision-Date: 2011-04-17 09:22+0000\n"
 "Last-Translator: Dimitar Markov <dimitar.markov@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: 2011-03-22 06:23+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-04-18 06:26+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
 #. module: hr_timesheet
 #: model:product.template,name:hr_timesheet.product_consultant_product_template
 msgid "Service on Timesheet"
-msgstr ""
+msgstr "Услуги по график"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:42
@@ -89,7 +89,7 @@ msgstr "График"
 #: selection:hr.analytical.timesheet.employee,month:0
 #: selection:hr.analytical.timesheet.users,month:0
 msgid "janvier"
-msgstr ""
+msgstr "януари"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:42
@@ -115,7 +115,7 @@ msgstr ""
 #. module: hr_timesheet
 #: field:hr.sign.out.project,analytic_amount:0
 msgid "Minimum Analytic Amount"
-msgstr ""
+msgstr "Максимално аналитично количество"
 
 #. module: hr_timesheet
 #: view:hr.analytical.timesheet.employee:0
@@ -222,7 +222,7 @@ msgstr "Печат"
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
 msgid "Timesheet Lines"
-msgstr ""
+msgstr "Редове в график"
 
 #. module: hr_timesheet
 #: selection:hr.analytical.timesheet.employee,month:0
@@ -233,7 +233,7 @@ msgstr ""
 #. module: hr_timesheet
 #: view:hr.analytical.timesheet.users:0
 msgid "Monthly Employees Timesheet"
-msgstr ""
+msgstr "Месечен график на служители"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:39
@@ -257,7 +257,7 @@ msgstr "Категории"
 #: selection:hr.analytical.timesheet.employee,month:0
 #: selection:hr.analytical.timesheet.users,month:0
 msgid "novembre"
-msgstr ""
+msgstr "ноември"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,help:hr_timesheet.act_hr_timesheet_line_evry1_all_form
@@ -310,7 +310,7 @@ msgstr "Септември"
 #. module: hr_timesheet
 #: model:ir.model,name:hr_timesheet.model_hr_analytic_timesheet
 msgid "Timesheet Line"
-msgstr ""
+msgstr "Ред в график"
 
 #. module: hr_timesheet
 #: field:hr.analytical.timesheet.users,employee_ids:0
@@ -489,7 +489,7 @@ msgstr "Обща информация"
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_my
 msgid "My Timesheet"
-msgstr ""
+msgstr "Моят график"
 
 #. module: hr_timesheet
 #: view:account.analytic.account:0
@@ -672,7 +672,7 @@ msgstr "Статистика по потребител"
 #: code:addons/hr_timesheet/wizard/hr_timesheet_print_employee.py:42
 #, python-format
 msgid "No employee defined for this user"
-msgstr ""
+msgstr "Не е дефиниран служител за този потребител"
 
 #. module: hr_timesheet
 #: field:hr.analytical.timesheet.employee,year:0
@@ -699,4 +699,4 @@ msgstr ""
 #: selection:hr.analytical.timesheet.employee,month:0
 #: selection:hr.analytical.timesheet.users,month:0
 msgid "septembre"
-msgstr ""
+msgstr "септември"
diff --git a/addons/hr_timesheet_invoice/i18n/bg.po b/addons/hr_timesheet_invoice/i18n/bg.po
index 835812bcd11..991db3aef79 100644
--- a/addons/hr_timesheet_invoice/i18n/bg.po
+++ b/addons/hr_timesheet_invoice/i18n/bg.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-03-27 17:55+0000\n"
+"PO-Revision-Date: 2011-04-17 09:21+0000\n"
 "Last-Translator: Dimitar Markov <dimitar.markov@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: 2011-03-28 05:24+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-04-18 06:26+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -56,7 +56,7 @@ msgstr "    7 Дни    "
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
 msgid "Income"
-msgstr ""
+msgstr "Приход"
 
 #. module: hr_timesheet_invoice
 #: view:account.analytic.line:0
diff --git a/addons/product/i18n/ru.po b/addons/product/i18n/ru.po
index 9ff48063de4..74fbfb6ae01 100644
--- a/addons/product/i18n/ru.po
+++ b/addons/product/i18n/ru.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-04-05 08:00+0000\n"
+"PO-Revision-Date: 2011-04-17 15:43+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@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: 2011-04-06 06:02+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-04-18 06:26+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
@@ -343,7 +343,7 @@ msgstr ""
 #. module: product
 #: model:product.template,name:product.product_product_woodmm0_product_template
 msgid "Wood 2mm"
-msgstr ""
+msgstr "Древесина 2мм"
 
 #. module: product
 #: field:product.price_list,qty1:0
@@ -667,7 +667,7 @@ msgstr ""
 #. module: product
 #: model:product.template,name:product.product_product_kitshelfofcm0_product_template
 msgid "KIT Shelf of 100cm"
-msgstr ""
+msgstr "Комплект полок 100см"
 
 #. module: product
 #: field:product.supplierinfo,name:0
@@ -904,6 +904,9 @@ msgid ""
 "You can define a conversion rate between several Units of Measure within the "
 "same category."
 msgstr ""
+"Создание единиц измерения  и управление ими в вашей системе. Вы можете "
+"определить коэффициент преобразования между несколькими единицами измерения "
+"в одной категории."
 
 #. module: product
 #: field:product.packaging,weight:0
@@ -1598,7 +1601,7 @@ msgstr "Открытый каталог"
 #. module: product
 #: model:product.category,name:product.product_category_marketableproduct0
 msgid "Marketable Products"
-msgstr ""
+msgstr "Ходовой товар"
 
 #. module: product
 #: field:product.supplierinfo,product_code:0
@@ -1935,7 +1938,7 @@ msgstr "Коробка"
 msgid ""
 "Create and manage your packaging dimensions and types you want to be "
 "maintained in your system."
-msgstr ""
+msgstr "Управление размерами и типами упаковки в вашей системе."
 
 #. module: product
 #: model:product.template,name:product.product_product_rearpanelarm1_product_template
@@ -1948,6 +1951,8 @@ msgid ""
 "Used in the code to select specific prices based on the context. Keep "
 "unchanged."
 msgstr ""
+"Использоваться в коде, чтобы выбрать конкретные цены в зависимости от "
+"контекста. Сохранить без изменений."
 
 #. module: product
 #: model:product.template,name:product.product_product_hdd1_product_template
@@ -1972,7 +1977,7 @@ msgstr "Упаковка"
 #. module: product
 #: model:product.category,name:product.product_category_4
 msgid "Dello Computer"
-msgstr ""
+msgstr "Dell компьютер"
 
 #. module: product
 #: model:product.uom.categ,name:product.product_uom_categ_kgm
diff --git a/addons/resource/i18n/ru.po b/addons/resource/i18n/ru.po
index 10e89246669..70a6023a3eb 100644
--- a/addons/resource/i18n/ru.po
+++ b/addons/resource/i18n/ru.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2011-01-19 12:00+0000\n"
+"PO-Revision-Date: 2011-04-17 15:29+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: Russian <ru@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: 2011-01-25 07:02+0000\n"
-"X-Generator: Launchpad (build 12177)\n"
+"X-Launchpad-Export-Date: 2011-04-18 06:26+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
 #. module: resource
 #: help:resource.calendar.leaves,resource_id:0
@@ -32,7 +32,7 @@ msgstr "Пятница"
 #. module: resource
 #: field:resource.resource,resource_type:0
 msgid "Resource Type"
-msgstr ""
+msgstr "Тип ресурса"
 
 #. module: resource
 #: model:ir.model,name:resource.model_resource_calendar_leaves
@@ -71,28 +71,28 @@ msgstr "Воскресенье"
 #. module: resource
 #: view:resource.resource:0
 msgid "Search Resource"
-msgstr ""
+msgstr "Поиск ресурсов"
 
 #. module: resource
 #: view:resource.resource:0
 msgid "Type"
-msgstr ""
+msgstr "Тип"
 
 #. module: resource
 #: model:ir.actions.act_window,name:resource.action_resource_resource_tree
 #: view:resource.resource:0
 msgid "Resources"
-msgstr ""
+msgstr "Ресурсы"
 
 #. module: resource
 #: field:resource.calendar,manager:0
 msgid "Workgroup manager"
-msgstr ""
+msgstr "Руководитель группы"
 
 #. module: resource
 #: help:resource.calendar.attendance,hour_from:0
 msgid "Working time will start from"
-msgstr ""
+msgstr "Рабочее время начнется с"
 
 #. module: resource
 #: constraint:resource.calendar.leaves:0
@@ -116,7 +116,7 @@ msgstr "Компания"
 #. module: resource
 #: selection:resource.resource,resource_type:0
 msgid "Material"
-msgstr ""
+msgstr "Материал"
 
 #. module: resource
 #: field:resource.calendar.attendance,dayofweek:0
@@ -126,22 +126,22 @@ msgstr "День недели"
 #. module: resource
 #: help:resource.calendar.attendance,hour_to:0
 msgid "Working time will end at"
-msgstr ""
+msgstr "Рабочее время будет заканчиваться в"
 
 #. module: resource
 #: field:resource.calendar.attendance,date_from:0
 msgid "Starting date"
-msgstr ""
+msgstr "Дата начала"
 
 #. module: resource
 #: view:resource.calendar:0
 msgid "Search Working Time"
-msgstr ""
+msgstr "Искать рабочее время"
 
 #. module: resource
 #: view:resource.calendar.leaves:0
 msgid "Reason"
-msgstr ""
+msgstr "Причина"
 
 #. module: resource
 #: view:resource.resource:0
@@ -176,7 +176,7 @@ msgstr ""
 #: field:resource.calendar.leaves,resource_id:0
 #: view:resource.resource:0
 msgid "Resource"
-msgstr ""
+msgstr "Ресурс"
 
 #. module: resource
 #: view:resource.calendar:0
@@ -185,7 +185,7 @@ msgstr ""
 #: field:resource.calendar.leaves,name:0
 #: field:resource.resource,name:0
 msgid "Name"
-msgstr ""
+msgstr "Название"
 
 #. module: resource
 #: model:ir.module.module,description:resource.module_meta_information
@@ -211,7 +211,7 @@ msgstr "Среда"
 #: view:resource.resource:0
 #: field:resource.resource,calendar_id:0
 msgid "Working Period"
-msgstr ""
+msgstr "Рабочий период"
 
 #. module: resource
 #: model:ir.model,name:resource.model_resource_resource
@@ -221,7 +221,7 @@ msgstr ""
 #. module: resource
 #: field:resource.resource,active:0
 msgid "Active"
-msgstr ""
+msgstr "Активно"
 
 #. module: resource
 #: help:resource.resource,active:0
@@ -243,17 +243,17 @@ msgstr ""
 #. module: resource
 #: help:resource.resource,calendar_id:0
 msgid "Define the schedule of resource"
-msgstr ""
+msgstr "Определить график ресурса"
 
 #. module: resource
 #: field:resource.calendar.attendance,hour_from:0
 msgid "Work from"
-msgstr ""
+msgstr "Работа с"
 
 #. module: resource
 #: field:resource.resource,code:0
 msgid "Code"
-msgstr ""
+msgstr "Код"
 
 #. module: resource
 #: selection:resource.calendar.attendance,dayofweek:0
@@ -263,7 +263,7 @@ msgstr "Понедельник"
 #. module: resource
 #: field:resource.calendar.attendance,hour_to:0
 msgid "Work to"
-msgstr ""
+msgstr "Работа до"
 
 #. module: resource
 #: help:resource.resource,time_efficiency:0
@@ -282,7 +282,7 @@ msgstr "Вторник"
 #. module: resource
 #: field:resource.calendar.leaves,calendar_id:0
 msgid "Working time"
-msgstr ""
+msgstr "Рабочее время"
 
 #. module: resource
 #: model:ir.actions.act_window,name:resource.action_resource_calendar_leave_tree
@@ -293,7 +293,7 @@ msgstr ""
 #. module: resource
 #: view:resource.resource:0
 msgid "General Information"
-msgstr ""
+msgstr "Общие сведения"
 
 #. module: resource
 #: model:ir.actions.act_window,help:resource.action_resource_resource_tree
@@ -306,23 +306,23 @@ msgstr ""
 #. module: resource
 #: view:resource.resource:0
 msgid "Inactive"
-msgstr ""
+msgstr "Неактивен"
 
 #. module: resource
 #: code:addons/resource/faces/resource.py:340
 #, python-format
 msgid "(vacation)"
-msgstr ""
+msgstr "(отпуск)"
 
 #. module: resource
 #: field:resource.resource,time_efficiency:0
 msgid "Efficiency factor"
-msgstr ""
+msgstr "КПД"
 
 #. module: resource
 #: selection:resource.resource,resource_type:0
 msgid "Human"
-msgstr ""
+msgstr "Человек"
 
 #. module: resource
 #: model:ir.model,name:resource.model_resource_calendar_attendance
diff --git a/addons/sale/i18n/ru.po b/addons/sale/i18n/ru.po
index 9229c48cb10..329334173aa 100644
--- a/addons/sale/i18n/ru.po
+++ b/addons/sale/i18n/ru.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2011-04-12 16:28+0000\n"
-"Last-Translator: Stanislav Hanzhin <Unknown>\n"
+"PO-Revision-Date: 2011-04-17 15:48+0000\n"
+"Last-Translator: Chertykov Denis <chertykov@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: 2011-04-13 14:35+0000\n"
+"X-Launchpad-Export-Date: 2011-04-18 06:26+0000\n"
 "X-Generator: Launchpad (build 12735)\n"
 
 #. module: sale
@@ -2088,7 +2088,7 @@ msgstr "Апрель"
 #. module: sale
 #: view:sale.shop:0
 msgid "Accounting"
-msgstr "Бухгалтерский учет"
+msgstr "Бухгалтерия"
 
 #. module: sale
 #: field:sale.config.picking_policy,step:0

From 24677a0bf1fcf5765345fd25c1e0c568c52c33af Mon Sep 17 00:00:00 2001
From: skh <skh@tinyerp.com>
Date: Mon, 18 Apr 2011 12:52:09 +0530
Subject: [PATCH 243/331] [FIX] The configuration is mismatch compare to sale
 order field

bzr revid: skh@tinyerp.com-20110418072209-zubjokkl82uupp41
---
 addons/sale/sale.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index f80d610eb03..4bb8bc75885 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -1180,12 +1180,14 @@ class sale_config_picking_policy(osv.osv_memory):
         'picking_policy': fields.selection([
             ('direct', 'Direct Delivery'),
             ('one', 'All at Once')
-        ], 'Picking Default Policy', required=True, help="The Shipping Policy is used to configure per order if you want to deliver as soon as possible when one product is available or you wait that all products are available.."),
+        ], 'Picking Default Policy', required=True, help="If you are sure that you have enough stock to send complete order at once please select 'All at Once'. If you want to send the order in the partial shipments please select 'Direct Delivery'..."),
         'order_policy': fields.selection([
             ('manual', 'Invoice Based on Sales Orders'),
             ('picking', 'Invoice Based on Deliveries'),
         ], 'Shipping Default Policy', required=True,
-           help="You can generate invoices based on sales orders or based on shippings."),
+           help="""The Shipping Policy is used to synchronise invoice and delivery operations.
+        - The "Invoice Based on Sales Orders" choice will create the picking order directly and wait for the user to manually click on the 'Invoice' button to generate the draft invoice.  
+        - The "Invoice Based on Deliveries" choice is used to create an invoice during the picking process."""),
         'step': fields.selection([
             ('one', 'Delivery Order Only'),
             ('two', 'Picking List & Delivery Order')

From 2199cd7f34272b5bae97233e25b0d303c5ef0e16 Mon Sep 17 00:00:00 2001
From: "ARA (OpenERP)" <ara@tinyerp.com>
Date: Mon, 18 Apr 2011 14:50:07 +0530
Subject: [PATCH 244/331] [FIX] hr_holiday: The Flow of Hr Holiday is working
 Wrong, it should Got to end at end but not to Second_validation or refuse.

bzr revid: ara@tinyerp.com-20110418092007-nus4n0g7lexwh7j1
---
 addons/hr_holidays/hr_holidays.py       | 1 +
 addons/hr_holidays/hr_holidays_view.xml | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index 131d38d7001..8cd64585603 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -217,6 +217,7 @@ class hr_holidays(osv.osv):
         })
         wf_service = netsvc.LocalService("workflow")
         for id in ids:
+            wf_service.trg_delete(uid, 'hr.holidays', id, cr)
             wf_service.trg_create(uid, 'hr.holidays', id, cr)
         return True
 
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 7740470ccc7..7c429c37310 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -93,11 +93,11 @@
                             <newline/>
                             <field name="state" colspan="2"/>
                             <group colspan="2" col="6">
-                                <button string="Refuse" name="refuse" states="confirm" type="workflow" icon="gtk-no" groups="base.group_hr_user,base.group_hr_manager"/>
+                                <button string="Refuse" name="refuse" states="confirm,validate1" type="workflow" icon="gtk-no" groups="base.group_hr_user,base.group_hr_manager"/>
                                 <button string="Confirm" name="confirm" states="draft" type="workflow" icon="gtk-yes"/>
                                 <button string="Approve" name="validate" states="confirm" type="workflow" icon="gtk-apply" groups="base.group_hr_user"/>
                                 <button string="Approved" name="second_validate" states="validate1" type="workflow" icon="gtk-apply" groups="base.group_hr_user"/>
-                                <button string="Set to Draft" name="set_to_draft" states="refuse,validate,validate1" type="object" icon="gtk-convert" groups="base.group_hr_user"/>
+                                <button string="Set to Draft" name="set_to_draft" states="refuse,validate" type="object" icon="gtk-convert" groups="base.group_hr_user"/>
                             </group>
                         </page>
                     </notebook>
@@ -135,11 +135,11 @@
                         <newline/>
                         <field name="state" colspan="2"/>
                         <group colspan="2" col="6">
-                            <button string="Refuse" name="refuse" states="confirm" type="workflow" icon="gtk-no" groups="base.group_hr_user"/>
+                            <button string="Refuse" name="refuse" states="confirm,validate1" type="workflow" icon="gtk-no" groups="base.group_hr_user"/>
                             <button string="Confirm" name="confirm" states="draft" type="workflow" icon="gtk-yes"/>
                             <button string="Approve" name="validate" states="confirm" type="workflow" icon="gtk-apply" groups="base.group_hr_user"/>
                             <button string="Approved" name="second_validate" states="validate1" type="workflow" icon="gtk-apply" groups="base.group_hr_user"/>
-                            <button string="Set to Draft" name="set_to_draft" states="cancel,validate,validate1" type="object" icon="gtk-convert" groups="base.group_hr_user"/>
+                            <button string="Set to Draft" name="set_to_draft" states="cancel,validate" type="object" icon="gtk-convert" groups="base.group_hr_user"/>
                         </group>
                     </page>
                 </notebook>

From 2c3c064a2237e21788226056d14362200cfc0d6d Mon Sep 17 00:00:00 2001
From: "tfr@openerp.com" <>
Date: Mon, 18 Apr 2011 14:00:34 +0200
Subject: [PATCH 245/331] [CLEAN] remove duplicate method _check_dates in
 project

bzr revid: tfr@openerp.com-20110418120034-jkmu9jar833b2w2d
---
 addons/project/project.py | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/addons/project/project.py b/addons/project/project.py
index 134364d8b1a..7fbe39219a8 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -405,12 +405,6 @@ class task(osv.osv):
                  default.update({'name':new_name})
         return super(task, self).copy_data(cr, uid, id, default, context)
 
-    def _check_dates(self, cr, uid, ids, context=None):
-        task = self.read(cr, uid, ids[0], ['date_start', 'date_end'])
-        if task['date_start'] and task['date_end']:
-             if task['date_start'] > task['date_end']:
-                 return False
-        return True
 
     def _is_template(self, cr, uid, ids, field_name, arg, context=None):
         res = {}

From 7f52403414feb08a1133cbe50e77c64514bdeca0 Mon Sep 17 00:00:00 2001
From: "ARA (OpenERP)" <ara@tinyerp.com>
Date: Mon, 18 Apr 2011 17:42:56 +0530
Subject: [PATCH 246/331] [FIX] point_of_sale: output opration wizard not
 working

bzr revid: ara@tinyerp.com-20110418121256-a9ai8qykk330tj9v
---
 addons/point_of_sale/wizard/pos_box_out.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/point_of_sale/wizard/pos_box_out.py b/addons/point_of_sale/wizard/pos_box_out.py
index a05c5f579e1..f5a70789ee0 100644
--- a/addons/point_of_sale/wizard/pos_box_out.py
+++ b/addons/point_of_sale/wizard/pos_box_out.py
@@ -94,9 +94,9 @@ class pos_box_out(osv.osv_memory):
                 val = (res_obj.browse(cr, uid, uid).company_id.max_diff or 0.0) + am
                 raise osv.except_osv(_('Error !'), _('The maximum value you can still withdraw is exceeded. \n Remaining value is equal to %d ')%(val))
 
-            acc_id = product_obj.browse(cr, uid, data['product_id'], context=context).property_account_income
+            acc_id = productp_obj.browse(cr, uid, data['product_id'], context=context).property_account_income
             if not acc_id:
-                raise osv.except_osv(_('Error !'), _('please check that account is set to %s')%(product_obj.browse(cr, uid, data['product_id'], context=context).name))
+                raise osv.except_osv(_('Error !'), _('please check that account is set to %s')%(productp_obj.browse(cr, uid, data['product_id'], context=context).name))
             if not statement_id:
                 raise osv.except_osv(_('Error !'), _('You have to open at least one cashbox'))
             if statement_id:
@@ -119,7 +119,7 @@ class pos_box_out(osv.osv_memory):
             if productp_obj.browse(cr, uid, data['product_id'], context=context).am_out:
                 vals['am_out'] = True
             vals['ref'] = data['ref'] or ''
-            vals['name'] = "%s: %s " % (product_obj.browse(cr, uid, data['product_id'], context=context).name, data['name'].decode('utf8'))
+            vals['name'] = "%s: %s " % (productp_obj.browse(cr, uid, data['product_id'], context=context).name, data['name'].decode('utf8'))
             address_u = res_obj.browse(cr, uid, uid, context=context).address_id
             if address_u:
                 vals['partner_id'] = address_u.partner_id and address_u.partner_id.id or None

From e357bf71a67e736ed3dabbf293b358f8f0f45947 Mon Sep 17 00:00:00 2001
From: "ARA (OpenERP)" <ara@tinyerp.com>
Date: Mon, 18 Apr 2011 18:51:25 +0530
Subject: [PATCH 247/331] [FIX] base_module_doc_rst: InvocationException

bzr revid: ara@tinyerp.com-20110418132125-rf6oe0qz3dhzcazx
---
 addons/base_module_doc_rst/report/report_proximity_graph.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/base_module_doc_rst/report/report_proximity_graph.py b/addons/base_module_doc_rst/report/report_proximity_graph.py
index 2d3704fd5b7..d14d709f501 100644
--- a/addons/base_module_doc_rst/report/report_proximity_graph.py
+++ b/addons/base_module_doc_rst/report/report_proximity_graph.py
@@ -48,7 +48,7 @@ class report_graph(report.interface.report_int):
                     if id:
                         get_dpend_module(id[0].id)
         get_dpend_module(module_id)
-        graph = pydot.Dot(graph_type='digraph',fontsize='10', label="\\nProximity Graph. \\n\\nGray Color:Official Modules, Red  Color:Extra Addons Modules, Blue Color:Community Modules, Purple Color:Unknow Modules"
+        graph = pydot.Dot(graph_type='digraph',fontsize='10', label="\\nProximity Graph. \\n\\nGray Color-Official Modules, Red  Color-Extra Addons Modules, Blue Color-Community Modules, Purple Color-Unknow Modules"
                                      , center='1')
         for node in nodes:
             if node[1] == "official":

From 2030bc90f9a3243c940cc8f1833d21be2bfa3576 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Tue, 19 Apr 2011 04:50:43 +0000
Subject: [PATCH 248/331] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20110419045043-ne4koiq8t3z30356
---
 bin/addons/base/i18n/af.po       |   4 +-
 bin/addons/base/i18n/am.po       |   4 +-
 bin/addons/base/i18n/ar.po       |   4 +-
 bin/addons/base/i18n/bg.po       |   4 +-
 bin/addons/base/i18n/bs.po       |   4 +-
 bin/addons/base/i18n/ca.po       |   4 +-
 bin/addons/base/i18n/cs.po       |   4 +-
 bin/addons/base/i18n/da.po       |   4 +-
 bin/addons/base/i18n/de.po       |   4 +-
 bin/addons/base/i18n/el.po       |   4 +-
 bin/addons/base/i18n/en_GB.po    |   4 +-
 bin/addons/base/i18n/es.po       |   4 +-
 bin/addons/base/i18n/es_CL.po    |   4 +-
 bin/addons/base/i18n/es_EC.po    |   4 +-
 bin/addons/base/i18n/et.po       |   4 +-
 bin/addons/base/i18n/eu.po       |   4 +-
 bin/addons/base/i18n/fa.po       |   4 +-
 bin/addons/base/i18n/fa_AF.po    |   4 +-
 bin/addons/base/i18n/fi.po       |   4 +-
 bin/addons/base/i18n/fr.po       |   4 +-
 bin/addons/base/i18n/gl.po       |   4 +-
 bin/addons/base/i18n/he.po       |   4 +-
 bin/addons/base/i18n/hr.po       |   4 +-
 bin/addons/base/i18n/hu.po       |   4 +-
 bin/addons/base/i18n/id.po       |   4 +-
 bin/addons/base/i18n/is.po       |   4 +-
 bin/addons/base/i18n/it.po       |   4 +-
 bin/addons/base/i18n/ja.po       |   4 +-
 bin/addons/base/i18n/ko.po       |   4 +-
 bin/addons/base/i18n/lt.po       |   4 +-
 bin/addons/base/i18n/lv.po       |   4 +-
 bin/addons/base/i18n/mn.po       |   4 +-
 bin/addons/base/i18n/nb.po       |   4 +-
 bin/addons/base/i18n/nl.po       |   6 +-
 bin/addons/base/i18n/nl_BE.po    |   4 +-
 bin/addons/base/i18n/pl.po       |   4 +-
 bin/addons/base/i18n/pt.po       |   4 +-
 bin/addons/base/i18n/pt_BR.po    |   4 +-
 bin/addons/base/i18n/ro.po       |   4 +-
 bin/addons/base/i18n/ru.po       | 122 ++++++++++++++++++++++---------
 bin/addons/base/i18n/sk.po       |   4 +-
 bin/addons/base/i18n/sl.po       |   4 +-
 bin/addons/base/i18n/sq.po       |   4 +-
 bin/addons/base/i18n/sr.po       |   4 +-
 bin/addons/base/i18n/sr@latin.po |   4 +-
 bin/addons/base/i18n/sv.po       |   4 +-
 bin/addons/base/i18n/th.po       |   4 +-
 bin/addons/base/i18n/tlh.po      |   4 +-
 bin/addons/base/i18n/tr.po       |   4 +-
 bin/addons/base/i18n/uk.po       |   4 +-
 bin/addons/base/i18n/ur.po       |   4 +-
 bin/addons/base/i18n/vi.po       |  18 +++--
 bin/addons/base/i18n/zh_CN.po    |   4 +-
 bin/addons/base/i18n/zh_TW.po    |   4 +-
 debian/po/bg.po                  |   4 +-
 debian/po/ca.po                  |   4 +-
 debian/po/cs.po                  |   4 +-
 debian/po/de.po                  |   4 +-
 debian/po/el.po                  |   4 +-
 debian/po/en_GB.po               |   4 +-
 debian/po/es.po                  |   4 +-
 debian/po/es_CL.po               |   4 +-
 debian/po/es_EC.po               |   4 +-
 debian/po/fa.po                  |   4 +-
 debian/po/fi.po                  |   4 +-
 debian/po/fr.po                  |   4 +-
 debian/po/gl.po                  |   4 +-
 debian/po/he.po                  |   4 +-
 debian/po/hr.po                  |   4 +-
 debian/po/hu.po                  |   4 +-
 debian/po/it.po                  |   4 +-
 debian/po/ja.po                  |   4 +-
 debian/po/ko.po                  |   4 +-
 debian/po/lv.po                  |   4 +-
 debian/po/mn.po                  |   4 +-
 debian/po/nb.po                  |   4 +-
 debian/po/nl.po                  |   4 +-
 debian/po/pl.po                  |   4 +-
 debian/po/pt.po                  |   4 +-
 debian/po/pt_BR.po               |   4 +-
 debian/po/ro.po                  |   4 +-
 debian/po/ru.po                  |   4 +-
 debian/po/sk.po                  |   4 +-
 debian/po/sq.po                  |   4 +-
 debian/po/sr.po                  |   4 +-
 debian/po/sv.po                  |   4 +-
 debian/po/tr.po                  |   4 +-
 debian/po/uk.po                  |   4 +-
 debian/po/vi.po                  |   4 +-
 debian/po/zh_CN.po               |   4 +-
 debian/po/zh_TW.po               |   4 +-
 91 files changed, 276 insertions(+), 222 deletions(-)

diff --git a/bin/addons/base/i18n/af.po b/bin/addons/base/i18n/af.po
index 290fd5f2304..103aec7236b 100644
--- a/bin/addons/base/i18n/af.po
+++ b/bin/addons/base/i18n/af.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:49+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:40+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/bin/addons/base/i18n/am.po b/bin/addons/base/i18n/am.po
index 4b094993afb..50c593c3838 100644
--- a/bin/addons/base/i18n/am.po
+++ b/bin/addons/base/i18n/am.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:49+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:40+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/bin/addons/base/i18n/ar.po b/bin/addons/base/i18n/ar.po
index 8baa0e9c4ab..789178750b2 100644
--- a/bin/addons/base/i18n/ar.po
+++ b/bin/addons/base/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:49+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:40+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/bin/addons/base/i18n/bg.po b/bin/addons/base/i18n/bg.po
index 3c0c2397239..01e86fc2c36 100644
--- a/bin/addons/base/i18n/bg.po
+++ b/bin/addons/base/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:50+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:41+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/bin/addons/base/i18n/bs.po b/bin/addons/base/i18n/bs.po
index c85db96d9d0..668ae300964 100644
--- a/bin/addons/base/i18n/bs.po
+++ b/bin/addons/base/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:49+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:41+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/bin/addons/base/i18n/ca.po b/bin/addons/base/i18n/ca.po
index 50d6366292c..a0339e47061 100644
--- a/bin/addons/base/i18n/ca.po
+++ b/bin/addons/base/i18n/ca.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:50+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:41+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/bin/addons/base/i18n/cs.po b/bin/addons/base/i18n/cs.po
index 5ef4fd42337..5ed283c690f 100644
--- a/bin/addons/base/i18n/cs.po
+++ b/bin/addons/base/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:50+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:41+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/bin/addons/base/i18n/da.po b/bin/addons/base/i18n/da.po
index 4f1a81e8101..150cac70abe 100644
--- a/bin/addons/base/i18n/da.po
+++ b/bin/addons/base/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:50+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:41+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/bin/addons/base/i18n/de.po b/bin/addons/base/i18n/de.po
index 6f16b160580..ca85a64983b 100644
--- a/bin/addons/base/i18n/de.po
+++ b/bin/addons/base/i18n/de.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:51+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:42+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/bin/addons/base/i18n/el.po b/bin/addons/base/i18n/el.po
index 119131b5c99..5032e6beb3f 100644
--- a/bin/addons/base/i18n/el.po
+++ b/bin/addons/base/i18n/el.po
@@ -12,8 +12,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:52+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:43+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
diff --git a/bin/addons/base/i18n/en_GB.po b/bin/addons/base/i18n/en_GB.po
index 5ccc7a440b8..63e4faa9418 100644
--- a/bin/addons/base/i18n/en_GB.po
+++ b/bin/addons/base/i18n/en_GB.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:57+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:48+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/bin/addons/base/i18n/es.po b/bin/addons/base/i18n/es.po
index 844ecca994f..306bd03eef9 100644
--- a/bin/addons/base/i18n/es.po
+++ b/bin/addons/base/i18n/es.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:55+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:47+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/bin/addons/base/i18n/es_CL.po b/bin/addons/base/i18n/es_CL.po
index 79375bd3876..bc3020f4a36 100644
--- a/bin/addons/base/i18n/es_CL.po
+++ b/bin/addons/base/i18n/es_CL.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:57+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:48+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/bin/addons/base/i18n/es_EC.po b/bin/addons/base/i18n/es_EC.po
index a46ebe723d3..b4942d6a898 100644
--- a/bin/addons/base/i18n/es_EC.po
+++ b/bin/addons/base/i18n/es_EC.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:58+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:49+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/bin/addons/base/i18n/et.po b/bin/addons/base/i18n/et.po
index 3590c222e88..7d399d8ed6a 100644
--- a/bin/addons/base/i18n/et.po
+++ b/bin/addons/base/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:51+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:42+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/bin/addons/base/i18n/eu.po b/bin/addons/base/i18n/eu.po
index 3dbadd6a886..05f3ee08b1a 100644
--- a/bin/addons/base/i18n/eu.po
+++ b/bin/addons/base/i18n/eu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:49+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:40+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/bin/addons/base/i18n/fa.po b/bin/addons/base/i18n/fa.po
index e4b5dd3395f..6f2ca1d3994 100644
--- a/bin/addons/base/i18n/fa.po
+++ b/bin/addons/base/i18n/fa.po
@@ -9,8 +9,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:54+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:45+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 "X-Poedit-Country: IRAN, ISLAMIC REPUBLIC OF\n"
 "X-Poedit-Language: Persian\n"
 
diff --git a/bin/addons/base/i18n/fa_AF.po b/bin/addons/base/i18n/fa_AF.po
index 83780362eca..f30fd952992 100644
--- a/bin/addons/base/i18n/fa_AF.po
+++ b/bin/addons/base/i18n/fa_AF.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:58+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:49+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/bin/addons/base/i18n/fi.po b/bin/addons/base/i18n/fi.po
index 32e145c153f..25257a41706 100644
--- a/bin/addons/base/i18n/fi.po
+++ b/bin/addons/base/i18n/fi.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:51+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:42+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/bin/addons/base/i18n/fr.po b/bin/addons/base/i18n/fr.po
index 11a14a34072..7f5ea7a73b4 100644
--- a/bin/addons/base/i18n/fr.po
+++ b/bin/addons/base/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:51+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:42+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/bin/addons/base/i18n/gl.po b/bin/addons/base/i18n/gl.po
index 8be8f25f964..2919ed6a67c 100644
--- a/bin/addons/base/i18n/gl.po
+++ b/bin/addons/base/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:51+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:42+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/bin/addons/base/i18n/he.po b/bin/addons/base/i18n/he.po
index 47696150834..b514fe214db 100644
--- a/bin/addons/base/i18n/he.po
+++ b/bin/addons/base/i18n/he.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:52+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:43+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/bin/addons/base/i18n/hr.po b/bin/addons/base/i18n/hr.po
index f5e875a42c1..ba56818bc70 100644
--- a/bin/addons/base/i18n/hr.po
+++ b/bin/addons/base/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:55+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:46+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 "Language: hr\n"
 
 #. module: base
diff --git a/bin/addons/base/i18n/hu.po b/bin/addons/base/i18n/hu.po
index 48d704160e7..75e1b487555 100644
--- a/bin/addons/base/i18n/hu.po
+++ b/bin/addons/base/i18n/hu.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:52+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:43+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/bin/addons/base/i18n/id.po b/bin/addons/base/i18n/id.po
index 784609da885..236d4d7549e 100644
--- a/bin/addons/base/i18n/id.po
+++ b/bin/addons/base/i18n/id.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:52+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:43+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/bin/addons/base/i18n/is.po b/bin/addons/base/i18n/is.po
index de51518f8d8..e0dd68512e2 100644
--- a/bin/addons/base/i18n/is.po
+++ b/bin/addons/base/i18n/is.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:52+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:43+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/bin/addons/base/i18n/it.po b/bin/addons/base/i18n/it.po
index 4b658e70064..62593446b37 100644
--- a/bin/addons/base/i18n/it.po
+++ b/bin/addons/base/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:53+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:44+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/bin/addons/base/i18n/ja.po b/bin/addons/base/i18n/ja.po
index 0d71b875f72..80d89c416bc 100644
--- a/bin/addons/base/i18n/ja.po
+++ b/bin/addons/base/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:53+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:44+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/bin/addons/base/i18n/ko.po b/bin/addons/base/i18n/ko.po
index ae16ee197a6..b192364ed8f 100644
--- a/bin/addons/base/i18n/ko.po
+++ b/bin/addons/base/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:53+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:44+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/bin/addons/base/i18n/lt.po b/bin/addons/base/i18n/lt.po
index 8cd0811d7cb..c7ad2dbbdac 100644
--- a/bin/addons/base/i18n/lt.po
+++ b/bin/addons/base/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:53+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:44+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/bin/addons/base/i18n/lv.po b/bin/addons/base/i18n/lv.po
index 661d9b0509e..387b975bfdd 100644
--- a/bin/addons/base/i18n/lv.po
+++ b/bin/addons/base/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:53+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:44+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/bin/addons/base/i18n/mn.po b/bin/addons/base/i18n/mn.po
index eea96c609d7..c88f6a637cc 100644
--- a/bin/addons/base/i18n/mn.po
+++ b/bin/addons/base/i18n/mn.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:53+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:44+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/bin/addons/base/i18n/nb.po b/bin/addons/base/i18n/nb.po
index 5303a2e26cd..d230e1b2770 100644
--- a/bin/addons/base/i18n/nb.po
+++ b/bin/addons/base/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:54+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:45+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/bin/addons/base/i18n/nl.po b/bin/addons/base/i18n/nl.po
index 00e24675f38..a212b9a9823 100644
--- a/bin/addons/base/i18n/nl.po
+++ b/bin/addons/base/i18n/nl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:50+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:41+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: base
 #: view:ir.filters:0
@@ -918,7 +918,7 @@ msgstr "Toegang verwijderen"
 #. module: base
 #: model:res.country,name:base.ne
 msgid "Niger"
-msgstr "Nigeria"
+msgstr "Niger"
 
 #. module: base
 #: selection:base.language.install,lang:0
diff --git a/bin/addons/base/i18n/nl_BE.po b/bin/addons/base/i18n/nl_BE.po
index 6a43a00cb10..6565a0a7b94 100644
--- a/bin/addons/base/i18n/nl_BE.po
+++ b/bin/addons/base/i18n/nl_BE.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:57+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:48+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/bin/addons/base/i18n/pl.po b/bin/addons/base/i18n/pl.po
index 4ae7b3209e4..609986998bc 100644
--- a/bin/addons/base/i18n/pl.po
+++ b/bin/addons/base/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:54+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:45+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/bin/addons/base/i18n/pt.po b/bin/addons/base/i18n/pt.po
index 516ea0a3a7b..1e61950e3c8 100644
--- a/bin/addons/base/i18n/pt.po
+++ b/bin/addons/base/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:54+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:45+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/bin/addons/base/i18n/pt_BR.po b/bin/addons/base/i18n/pt_BR.po
index a0e7a8e3d8c..ac7d9343ef4 100644
--- a/bin/addons/base/i18n/pt_BR.po
+++ b/bin/addons/base/i18n/pt_BR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:57+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:48+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/bin/addons/base/i18n/ro.po b/bin/addons/base/i18n/ro.po
index c4573a3822b..e1c8534efa9 100644
--- a/bin/addons/base/i18n/ro.po
+++ b/bin/addons/base/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:54+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:45+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/bin/addons/base/i18n/ru.po b/bin/addons/base/i18n/ru.po
index 48d62b57ca6..238dc2f6582 100644
--- a/bin/addons/base/i18n/ru.po
+++ b/bin/addons/base/i18n/ru.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:55+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:46+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: base
 #: view:ir.filters:0
@@ -181,7 +181,7 @@ msgstr "создано."
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_woodsuppliers0
 msgid "Wood Suppliers"
-msgstr ""
+msgstr "Поставщики древисины"
 
 #. module: base
 #: code:addons/base/module/module.py:303
@@ -440,7 +440,7 @@ msgstr "Запланировать обновление"
 #: code:addons/orm.py:838
 #, python-format
 msgid "Key/value '%s' not found in selection field '%s'"
-msgstr ""
+msgstr "Ключ/значение '%s' не найдено в поле выбора '%s'"
 
 #. module: base
 #: help:res.country,code:0
@@ -515,6 +515,7 @@ msgstr "Описание модели"
 msgid ""
 "Optional model name of the objects on which this action should be visible"
 msgstr ""
+"Необязательное имя модели объектов, для которых действие должно быть видимым"
 
 #. module: base
 #: field:workflow.transition,trigger_expr_id:0
@@ -724,7 +725,7 @@ msgstr "Рабочие дни"
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "Other OSI Approved Licence"
-msgstr ""
+msgstr "Другие лицензии утвержденные OSI"
 
 #. module: base
 #: help:res.config.users,context_lang:0
@@ -863,7 +864,7 @@ msgstr "Переходы состояний"
 #: code:addons/orm.py:4020
 #, python-format
 msgid "Record #%d of %s not found, cannot copy!"
-msgstr ""
+msgstr "Запись №%d из %s не найдена, нельзя скопировать !"
 
 #. module: base
 #: field:ir.module.module,contributors:0
@@ -965,7 +966,7 @@ msgstr "Маршалловы Острова"
 #: code:addons/base/ir/ir_model.py:328
 #, python-format
 msgid "Changing the model of a field is forbidden!"
-msgstr ""
+msgstr "Изменение модели поля запрещено!"
 
 #. module: base
 #: model:res.country,name:base.ht
@@ -987,6 +988,10 @@ msgid ""
 "reference it\n"
 "- creation/update: a mandatory field is not correctly set"
 msgstr ""
+"Операция не может быть завершена, вероятно, связано со следующим:\n"
+"- удаление: возможно, вы пытаетесь удалить запись в то время как другие "
+"записи, по-прежнему ссылаются на неё\n"
+"- создание/изменение: обязательное поле не корректно"
 
 #. module: base
 #: view:ir.rule:0
@@ -1058,7 +1063,7 @@ msgstr "Нет языка с кодом \"%s\""
 #: code:addons/base/publisher_warranty/publisher_warranty.py:163
 #, python-format
 msgid "Error during communication with the publisher warranty server."
-msgstr ""
+msgstr "Ошибка во время связи с сервером гарантии издателя."
 
 #. module: base
 #: help:ir.actions.server,email:0
@@ -1174,6 +1179,8 @@ msgid ""
 "Access all the fields related to the current object using expressions, i.e. "
 "object.partner_id.name "
 msgstr ""
+"Доступ ко всем полям, связанным с текущим объектом с помощью выражений, "
+"прим.: object.partner_id.name "
 
 #. module: base
 #: model:ir.model,name:base.model_res_country_state
@@ -1612,6 +1619,10 @@ msgid ""
 "access to selected functionalities within the system. Click on 'Done' if you "
 "do not wish to add more users at this stage, you can always do this later."
 msgstr ""
+"Создание дополнительных пользователей и назначение им групп, что позволит им "
+"иметь доступ к отдельным функциям в рамках системы. Нажмите на кнопку "
+"\"Готово\", если вы не хотите добавлять пользователей на данном этапе, вы "
+"всегда можете сделать это позже."
 
 #. module: base
 #: model:res.country,name:base.bz
@@ -1957,6 +1968,8 @@ msgid ""
 "One of the records you are trying to modify has already been deleted "
 "(Document type: %s)."
 msgstr ""
+"Одна из записей, которую вы пытаетесь изменить, уже удалена (Тип документа: "
+"%s)."
 
 #. module: base
 #: model:ir.actions.act_window,help:base.action_country
@@ -1965,6 +1978,8 @@ msgid ""
 "partner records. You can create or delete countries to make sure the ones "
 "you are working on will be maintained."
 msgstr ""
+"Отображение и управление списком всех стран, которые могут быть отнесены к "
+"вашим контрагентам. Вы можете создавать или удалять страны в процессе работы."
 
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_7
@@ -1984,7 +1999,7 @@ msgstr ""
 #. module: base
 #: help:ir.model.fields,model:0
 msgid "The technical name of the model this field belongs to"
-msgstr ""
+msgstr "Техническое название модели к которой относится это поле"
 
 #. module: base
 #: field:ir.actions.server,action_id:0
@@ -2031,7 +2046,7 @@ msgstr "События партнера"
 #. module: base
 #: model:res.widget,title:base.facebook_widget
 msgid "Facebook"
-msgstr ""
+msgstr "Facebook"
 
 #. module: base
 #: model:res.country,name:base.am
@@ -2167,6 +2182,8 @@ msgid ""
 "way you want to print them in letters and other documents. Some example: "
 "Mr., Mrs. "
 msgstr ""
+"Управление обращениями к контактам, доступным в вашей системе, обращения при "
+"печати в письмах и других документах. Например: Г-н, Г-жа. "
 
 #. module: base
 #: field:res.company,rml_footer1:0
@@ -2426,7 +2443,7 @@ msgstr "Фильтры"
 #: code:addons/orm.py:758
 #, python-format
 msgid "Please check that all your lines have %d columns."
-msgstr ""
+msgstr "Проверьте, что во всех строках имеется %d столбцов."
 
 #. module: base
 #: model:ir.actions.act_window,name:base.ir_cron_act
@@ -2446,12 +2463,14 @@ msgstr "Название"
 #: help:ir.property,res_id:0
 msgid "If not set, acts as a default value for new resources"
 msgstr ""
+"Если не установлено, выступает в качестве значения по умолчанию для новых "
+"ресурсов"
 
 #. module: base
 #: code:addons/orm.py:3448
 #, python-format
 msgid "Recursivity Detected."
-msgstr ""
+msgstr "Обнаружена рекурсия."
 
 #. module: base
 #: code:addons/base/module/module.py:262
@@ -2694,6 +2713,8 @@ msgstr "Португалия"
 msgid ""
 "You cannot have multiple records with the same id for the same module !"
 msgstr ""
+"Вы не можете иметь несколько записей с одинаковым идентификатором для одного "
+"модуля !"
 
 #. module: base
 #: field:ir.module.module,certificate:0
@@ -2973,6 +2994,8 @@ msgid ""
 "The selected language has been successfully installed. You must change the "
 "preferences of the user and open a new menu to view the changes."
 msgstr ""
+"Выбранный язык был успешно установлен. Вы должны изменить настройки "
+"пользователя и открыть новое меню для просмотра изменений."
 
 #. module: base
 #: sql_constraint:ir.config_parameter:0
@@ -3099,7 +3122,7 @@ msgstr "Рабочие процессы"
 #. module: base
 #: field:ir.translation,xml_id:0
 msgid "XML Id"
-msgstr ""
+msgstr "XML Id"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_config_user_form
@@ -3176,7 +3199,7 @@ msgstr "Настройка системы выполнена"
 #: code:addons/orm.py:929
 #, python-format
 msgid "Error occurred while validating the field(s) %s: %s"
-msgstr ""
+msgstr "Произошла ошибка при проверке поля(ей)  %s: %s"
 
 #. module: base
 #: view:ir.property:0
@@ -3246,6 +3269,8 @@ msgid ""
 "You can not create this document (%s) ! Be sure your user belongs to one of "
 "these groups: %s."
 msgstr ""
+"Вы не можете создать этот документ (%s) ! Убедитесь, что ваш пользователь "
+"принадлежит к одной из этих групп: %s."
 
 #. module: base
 #: model:res.country,name:base.mu
@@ -3333,7 +3358,7 @@ msgstr "Следующее число"
 #. module: base
 #: help:workflow.transition,condition:0
 msgid "Expression to be satisfied if we want the transition done."
-msgstr ""
+msgstr "Выражение, которое будет выполнено, если мы хотим сделать переход."
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -3412,7 +3437,7 @@ msgstr "Применить для удаления"
 #: code:addons/base/ir/ir_model.py:319
 #, python-format
 msgid "Cannot rename column to %s, because that column already exists!"
-msgstr ""
+msgstr "Нельзя переименовать столбец в %s, потому что он уже существует !"
 
 #. module: base
 #: view:ir.attachment:0
@@ -3826,6 +3851,7 @@ msgstr ""
 #: view:publisher_warranty.contract.wizard:0
 msgid "Please enter the serial key provided in your contract document:"
 msgstr ""
+"Пожалуйста, введите серийный ключ, предоставленный в вашем контракте:"
 
 #. module: base
 #: view:workflow.activity:0
@@ -3838,6 +3864,7 @@ msgstr "Начало процесса"
 #, python-format
 msgid "module base cannot be loaded! (hint: verify addons-path)"
 msgstr ""
+"базовый модуль не может быть загружен! (Подсказка: проверьте addons-path)"
 
 #. module: base
 #: view:res.partner.bank:0
@@ -3972,13 +3999,13 @@ msgstr "ir.actions.url"
 #. module: base
 #: model:res.widget,title:base.currency_converter_widget
 msgid "Currency Converter"
-msgstr ""
+msgstr "Конвертер валют"
 
 #. module: base
 #: code:addons/orm.py:156
 #, python-format
 msgid "Wrong ID for the browse record, got %r, expected an integer."
-msgstr ""
+msgstr "Неверный идентификатор записи, получено %r, ожидалось число."
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_partner_addess_tree
@@ -5798,7 +5825,7 @@ msgstr ""
 #. module: base
 #: view:ir.model:0
 msgid "Custom"
-msgstr ""
+msgstr "Пользовательский"
 
 #. module: base
 #: view:res.request:0
@@ -5845,7 +5872,7 @@ msgstr "%I - часы [01,12]."
 #. module: base
 #: selection:publisher_warranty.contract.wizard,state:0
 msgid "Finished"
-msgstr ""
+msgstr "Завершено"
 
 #. module: base
 #: model:res.country,name:base.de
@@ -5901,6 +5928,8 @@ msgstr "Гондурас"
 msgid ""
 "Check out this box if you want to always display tips on each menu action"
 msgstr ""
+"Отметьте этот квадратик, если вы хотите всегда выводить советы для каждого "
+"пункта меню"
 
 #. module: base
 #: model:res.country,name:base.eg
@@ -6295,6 +6324,8 @@ msgid ""
 "OpenERP will automatically adds some '0' on the left of the 'Next Number' to "
 "get the required padding size."
 msgstr ""
+"OpenERP автоматически добавляет несколько '0' слева от 'Следующее число' для "
+" заданного выравнивания."
 
 #. module: base
 #: view:res.lang:0
@@ -6581,7 +6612,7 @@ msgstr "Пиктограмма"
 #. module: base
 #: help:ir.model.fields,model_id:0
 msgid "The model this field belongs to"
-msgstr ""
+msgstr "Модель к которой принадлежит это поле"
 
 #. module: base
 #: model:res.country,name:base.mq
@@ -6675,7 +6706,7 @@ msgstr "Открыть модули"
 #. module: base
 #: model:ir.actions.act_window,help:base.action_res_bank_form
 msgid "Manage bank records you want to be used in the system."
-msgstr ""
+msgstr "Управление банковскими документами используемыми в системе."
 
 #. module: base
 #: view:base.module.import:0
@@ -6719,6 +6750,8 @@ msgid ""
 "The sum of the data (2nd field) is null.\n"
 "We can't draw a pie chart !"
 msgstr ""
+"Сумма данных (второе поле) равно нулю.\n"
+"Мы не можем нарисовать круговую диаграмму !"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_lunch_reporting
@@ -6804,7 +6837,7 @@ msgstr "Начать обновление"
 #: code:addons/base/publisher_warranty/publisher_warranty.py:144
 #, python-format
 msgid "Contract validation error"
-msgstr ""
+msgstr "Ошибка проверки контракта"
 
 #. module: base
 #: field:res.country.state,name:0
@@ -6998,7 +7031,7 @@ msgstr "Настоящее имя пользователя, использует
 #: code:addons/osv.py:156
 #, python-format
 msgid "Integrity Error"
-msgstr ""
+msgstr "Ошибка целостности"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_wizard_screen
@@ -7048,7 +7081,7 @@ msgstr "Аргументы"
 #: code:addons/orm.py:716
 #, python-format
 msgid "Database ID doesn't exist: %s : %s"
-msgstr ""
+msgstr "Идентификатор базы данных не существует:  %s : %s"
 
 #. module: base
 #: selection:ir.module.module,license:0
@@ -7064,7 +7097,7 @@ msgstr "GPL версия 3"
 #: code:addons/orm.py:836
 #, python-format
 msgid "key '%s' not found in selection field '%s'"
-msgstr ""
+msgstr "Ключ '%s' не найден в поле выбора '%s'"
 
 #. module: base
 #: view:partner.wizard.ean.check:0
@@ -7075,7 +7108,7 @@ msgstr "Правильный штрих-код"
 #: code:addons/orm.py:2317
 #, python-format
 msgid "The value \"%s\" for the field \"%s\" is not in the selection"
-msgstr ""
+msgstr "Значение \"%s\" в поле \"%s\" не входит в выбранные"
 
 #. module: base
 #: field:res.partner,customer:0
@@ -7252,6 +7285,9 @@ msgid ""
 "\n"
 "[object with reference: %s - %s]"
 msgstr ""
+"\n"
+"\n"
+"[объект со ссылкой: %s - %s]"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_default
@@ -7605,7 +7641,7 @@ msgstr "workflow.instance"
 #: code:addons/orm.py:278
 #, python-format
 msgid "Unknown attribute %s in %s "
-msgstr ""
+msgstr "Неизвестный атрибут %s в %s "
 
 #. module: base
 #: view:res.lang:0
@@ -7616,7 +7652,7 @@ msgstr "10. %S              ==> 20"
 #: code:addons/fields.py:106
 #, python-format
 msgid "undefined get method !"
-msgstr ""
+msgstr "не определен метод 'get'!"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -7630,6 +7666,8 @@ msgid ""
 "Only specify a value if you want to change the user password. This user will "
 "have to logout and login again!"
 msgstr ""
+"Вводите пароль, только если вы хотите его изменить. Этому пользователю "
+"придется выйти и снова войти !"
 
 #. module: base
 #: model:res.partner.title,name:base.res_partner_title_madam
@@ -7655,7 +7693,7 @@ msgstr "Двоичный файл или внешний URL"
 #: field:res.config.users,new_password:0
 #: field:res.users,new_password:0
 msgid "Change password"
-msgstr ""
+msgstr "Сменить пароль"
 
 #. module: base
 #: model:res.country,name:base.nl
@@ -7695,7 +7733,7 @@ msgstr ""
 #: model:ir.ui.menu,name:base.menu_emails
 #: model:ir.ui.menu,name:base.menu_mail_gateway
 msgid "Emails"
-msgstr ""
+msgstr "Адреса эл.почты"
 
 #. module: base
 #: model:res.country,name:base.cd
@@ -7950,6 +7988,8 @@ msgid ""
 "Name of the method to be called on the object when this scheduler is "
 "executed."
 msgstr ""
+"Название метода который будет вызван из объекта, когда этот планировщик "
+"запустится."
 
 #. module: base
 #: code:addons/base/ir/ir_model.py:219
@@ -8024,7 +8064,7 @@ msgstr "Болгария"
 #. module: base
 #: view:publisher_warranty.contract.wizard:0
 msgid "Publisher warranty contract successfully registered!"
-msgstr ""
+msgstr "Контракт гарантии издателя успешно зарегистрирован !"
 
 #. module: base
 #: model:res.country,name:base.ao
@@ -8580,7 +8620,7 @@ msgstr "Конфигурация системы завершена"
 #. module: base
 #: field:workflow.triggers,instance_id:0
 msgid "Destination Instance"
-msgstr ""
+msgstr "Целевой элемент"
 
 #. module: base
 #: field:ir.actions.act_window,multi:0
@@ -8632,7 +8672,7 @@ msgstr "Ошибка ! Нельзя создать зацикленные мен
 #: model:ir.ui.menu,name:base.menu_publisher_warranty_contract_add
 #: view:publisher_warranty.contract.wizard:0
 msgid "Register a Contract"
-msgstr ""
+msgstr "Зарегистрировать договор"
 
 #. module: base
 #: view:ir.rule:0
@@ -8840,6 +8880,8 @@ msgid ""
 "You can not delete this document (%s) ! Be sure your user belongs to one of "
 "these groups: %s."
 msgstr ""
+"Вы не можете удалить этот документ (%s) ! Убедитесь, что ваш пользователь "
+"принадлежит к одной из этих групп: %s."
 
 #. module: base
 #: model:ir.model,name:base.model_base_module_configuration
@@ -8958,6 +9000,10 @@ msgid ""
 "categories have a hierarchy structure: a partner belonging to a category "
 "also belong to his parent category."
 msgstr ""
+"Управление категориями контрагентов, чтобы лучше классифицировать их для "
+"отслеживания и анализа. Контрагент может принадлежать к нескольким "
+"категориям в иерархической структуре: партнер принадлежащих к категории "
+"также относятся к своей родительской категории."
 
 #. module: base
 #: model:res.country,name:base.az
@@ -9116,6 +9162,10 @@ msgid ""
 "1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
 "106,500. Provided ',' as the thousand separator in each case."
 msgstr ""
+"Формат разделителя должен иметь вид [,n] где 0 < n : начиная с разряда "
+"единиц. -1 завершает разделение. Например, [3,2,-1] представит число 106500 "
+"в виде 1,06,500; [1,2,-1] представит его в виде 106,50,0; [3] представит вид "
+"106,500. В каждом случае ',' используется для разделения разрядов."
 
 #. module: base
 #: view:res.company:0
@@ -9126,7 +9176,7 @@ msgstr "Книжная"
 #: code:addons/base/ir/ir_model.py:317
 #, python-format
 msgid "Can only rename one column at a time!"
-msgstr ""
+msgstr "Можно переименовать только одну колонку за один раз !"
 
 #. module: base
 #: selection:ir.translation,type:0
@@ -9230,6 +9280,8 @@ msgid ""
 "Only one client action will be executed, last client action will be "
 "considered in case of multiple client actions."
 msgstr ""
+"Только одно действие клиента будет выполнено, последнее действие клиента "
+"будет выполнено в случае использования нескольких действий клиента."
 
 #. module: base
 #: view:res.lang:0
diff --git a/bin/addons/base/i18n/sk.po b/bin/addons/base/i18n/sk.po
index 947f18ea4d3..fec1566e620 100644
--- a/bin/addons/base/i18n/sk.po
+++ b/bin/addons/base/i18n/sk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:55+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:46+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/bin/addons/base/i18n/sl.po b/bin/addons/base/i18n/sl.po
index b90532f954b..5484d1bee7b 100644
--- a/bin/addons/base/i18n/sl.po
+++ b/bin/addons/base/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:55+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:46+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/bin/addons/base/i18n/sq.po b/bin/addons/base/i18n/sq.po
index 5163adbf424..5f8d38faf8a 100644
--- a/bin/addons/base/i18n/sq.po
+++ b/bin/addons/base/i18n/sq.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:49+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:40+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/bin/addons/base/i18n/sr.po b/bin/addons/base/i18n/sr.po
index 892fa6f8f8c..892105cdae7 100644
--- a/bin/addons/base/i18n/sr.po
+++ b/bin/addons/base/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:55+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:46+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/bin/addons/base/i18n/sr@latin.po b/bin/addons/base/i18n/sr@latin.po
index 3b9f7fb9118..0325d6d9824 100644
--- a/bin/addons/base/i18n/sr@latin.po
+++ b/bin/addons/base/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:58+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:49+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/bin/addons/base/i18n/sv.po b/bin/addons/base/i18n/sv.po
index 40170e9079d..0641132311f 100644
--- a/bin/addons/base/i18n/sv.po
+++ b/bin/addons/base/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:56+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:47+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/bin/addons/base/i18n/th.po b/bin/addons/base/i18n/th.po
index 8a477dd3aff..cdbf281c161 100644
--- a/bin/addons/base/i18n/th.po
+++ b/bin/addons/base/i18n/th.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:56+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:47+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/bin/addons/base/i18n/tlh.po b/bin/addons/base/i18n/tlh.po
index 94ce3d0d2a2..903ebe55f41 100644
--- a/bin/addons/base/i18n/tlh.po
+++ b/bin/addons/base/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:56+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:47+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/bin/addons/base/i18n/tr.po b/bin/addons/base/i18n/tr.po
index d2966e4cf56..a60d999da7d 100644
--- a/bin/addons/base/i18n/tr.po
+++ b/bin/addons/base/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:56+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:47+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/bin/addons/base/i18n/uk.po b/bin/addons/base/i18n/uk.po
index 2c8dc3201e2..4e0d168b913 100644
--- a/bin/addons/base/i18n/uk.po
+++ b/bin/addons/base/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:56+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:47+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/bin/addons/base/i18n/ur.po b/bin/addons/base/i18n/ur.po
index 265444a22c9..48476d52953 100644
--- a/bin/addons/base/i18n/ur.po
+++ b/bin/addons/base/i18n/ur.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:56+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:47+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/bin/addons/base/i18n/vi.po b/bin/addons/base/i18n/vi.po
index a1a0f9c96c5..1ae261cb99e 100644
--- a/bin/addons/base/i18n/vi.po
+++ b/bin/addons/base/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:57+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:48+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: base
 #: view:ir.filters:0
@@ -109,7 +109,7 @@ msgstr ""
 #. module: base
 #: view:ir.module.module:0
 msgid "Created Views"
-msgstr ""
+msgstr "Tạo khung nhìn"
 
 #. module: base
 #: code:addons/base/ir/ir_model.py:485
@@ -150,12 +150,14 @@ msgid ""
 "Properties of base fields cannot be altered in this manner! Please modify "
 "them through Python code, preferably through a custom addon!"
 msgstr ""
+"các thuộc tính cơ bản không thể thay đổi theo cách này  ! hãy thay đổi chúng "
+"thông qua Python mã, tốt hơn thông qua một addon tùy chỉnh!"
 
 #. module: base
 #: code:addons/osv.py:133
 #, python-format
 msgid "Constraint Error"
-msgstr ""
+msgstr "Lỗi ràng buộc"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_ui_view_custom
@@ -177,7 +179,7 @@ msgstr "đã được tạo."
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_woodsuppliers0
 msgid "Wood Suppliers"
-msgstr ""
+msgstr "người bán gỗ"
 
 #. module: base
 #: code:addons/base/module/module.py:303
@@ -192,13 +194,13 @@ msgstr ""
 #. module: base
 #: field:ir.sequence,number_increment:0
 msgid "Increment Number"
-msgstr ""
+msgstr "số tự tăng"
 
 #. module: base
 #: 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 "Cơ cấu công ty"
+msgstr "cấu trúc của công ty"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -6548,7 +6550,7 @@ msgstr ""
 #: view:base.module.import:0
 #: view:base.module.update:0
 msgid "Open Modules"
-msgstr ""
+msgstr "Mở danh sách Mô-đun"
 
 #. module: base
 #: model:ir.actions.act_window,help:base.action_res_bank_form
diff --git a/bin/addons/base/i18n/zh_CN.po b/bin/addons/base/i18n/zh_CN.po
index e2a22c6c33b..cb281fb3d50 100644
--- a/bin/addons/base/i18n/zh_CN.po
+++ b/bin/addons/base/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:58+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:49+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/bin/addons/base/i18n/zh_TW.po b/bin/addons/base/i18n/zh_TW.po
index c947f2027cb..42f3fc3356a 100644
--- a/bin/addons/base/i18n/zh_TW.po
+++ b/bin/addons/base/i18n/zh_TW.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:58+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:49+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/debian/po/bg.po b/debian/po/bg.po
index 4114098bf1f..664882e1034 100644
--- a/debian/po/bg.po
+++ b/debian/po/bg.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:58+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:50+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/ca.po b/debian/po/ca.po
index d6620325be2..7c0cbad994a 100644
--- a/debian/po/ca.po
+++ b/debian/po/ca.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:58+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:50+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/cs.po b/debian/po/cs.po
index 828da50ac8c..1e01a82c214 100644
--- a/debian/po/cs.po
+++ b/debian/po/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:59+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:50+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/de.po b/debian/po/de.po
index 0913e1f9390..5cfe8d9d7fa 100644
--- a/debian/po/de.po
+++ b/debian/po/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:59+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:50+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/el.po b/debian/po/el.po
index cf0a0ce7d49..d117f515aad 100644
--- a/debian/po/el.po
+++ b/debian/po/el.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:59+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:50+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/en_GB.po b/debian/po/en_GB.po
index d18900928f6..5092197883c 100644
--- a/debian/po/en_GB.po
+++ b/debian/po/en_GB.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:59+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:50+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/es.po b/debian/po/es.po
index a2b756e0b56..d9eb83615bc 100644
--- a/debian/po/es.po
+++ b/debian/po/es.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:59+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:50+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/es_CL.po b/debian/po/es_CL.po
index 534d217c24c..2cc55b1c818 100644
--- a/debian/po/es_CL.po
+++ b/debian/po/es_CL.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:59+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:50+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/es_EC.po b/debian/po/es_EC.po
index 56a5a0679e4..311ccc49a10 100644
--- a/debian/po/es_EC.po
+++ b/debian/po/es_EC.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:59+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:50+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/fa.po b/debian/po/fa.po
index 71e215d85a1..09ea0d83eda 100644
--- a/debian/po/fa.po
+++ b/debian/po/fa.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:59+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:50+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/fi.po b/debian/po/fi.po
index 0b21344078d..16b500b10d0 100644
--- a/debian/po/fi.po
+++ b/debian/po/fi.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:59+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:50+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/fr.po b/debian/po/fr.po
index d886baf38c0..f44e0d7e81f 100644
--- a/debian/po/fr.po
+++ b/debian/po/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:59+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:50+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/gl.po b/debian/po/gl.po
index c77faee2a0d..b8510d961dd 100644
--- a/debian/po/gl.po
+++ b/debian/po/gl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:59+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:50+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/he.po b/debian/po/he.po
index 0980a8f64a8..50dd3c2b883 100644
--- a/debian/po/he.po
+++ b/debian/po/he.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:59+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:50+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/hr.po b/debian/po/hr.po
index 97fccea596f..62c81f52c56 100644
--- a/debian/po/hr.po
+++ b/debian/po/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:59+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:50+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/hu.po b/debian/po/hu.po
index 2749b521ed7..6db4d67bea4 100644
--- a/debian/po/hu.po
+++ b/debian/po/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:59+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:50+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/it.po b/debian/po/it.po
index c8b7cddb483..8e5372bd037 100644
--- a/debian/po/it.po
+++ b/debian/po/it.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:59+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:50+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/ja.po b/debian/po/ja.po
index 4cc67c42c40..bf96d93bcbb 100644
--- a/debian/po/ja.po
+++ b/debian/po/ja.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:59+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:50+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/ko.po b/debian/po/ko.po
index 99b7c4820a6..f1a07767e55 100644
--- a/debian/po/ko.po
+++ b/debian/po/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:59+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:50+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/lv.po b/debian/po/lv.po
index f3be1623204..852bf1b9928 100644
--- a/debian/po/lv.po
+++ b/debian/po/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:59+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:50+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/mn.po b/debian/po/mn.po
index 15422904083..9d50a9e737b 100644
--- a/debian/po/mn.po
+++ b/debian/po/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:59+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:50+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/nb.po b/debian/po/nb.po
index 2cd4488244c..e6c6aca696f 100644
--- a/debian/po/nb.po
+++ b/debian/po/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:59+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:50+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/nl.po b/debian/po/nl.po
index bdc691b1ecc..1690b5becc8 100644
--- a/debian/po/nl.po
+++ b/debian/po/nl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:59+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:50+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/pl.po b/debian/po/pl.po
index 5276332e671..8f5233a9ffc 100644
--- a/debian/po/pl.po
+++ b/debian/po/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:59+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:50+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/pt.po b/debian/po/pt.po
index f0753a5dc23..1981a87f8e9 100644
--- a/debian/po/pt.po
+++ b/debian/po/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:59+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:50+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/pt_BR.po b/debian/po/pt_BR.po
index b57bfa26a26..9908b9dab06 100644
--- a/debian/po/pt_BR.po
+++ b/debian/po/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:59+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:50+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/ro.po b/debian/po/ro.po
index f0b3e852908..cc8e901cd85 100644
--- a/debian/po/ro.po
+++ b/debian/po/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:59+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:50+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/ru.po b/debian/po/ru.po
index 2206e7bcb5b..8dbf7c8f8d0 100644
--- a/debian/po/ru.po
+++ b/debian/po/ru.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:59+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:50+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/sk.po b/debian/po/sk.po
index 6d392a41dc5..ec27b8de8ee 100644
--- a/debian/po/sk.po
+++ b/debian/po/sk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:59+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:50+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/sq.po b/debian/po/sq.po
index a579e919dcb..604519da129 100644
--- a/debian/po/sq.po
+++ b/debian/po/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:58+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:50+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/sr.po b/debian/po/sr.po
index f8a410e4c8c..1bf6b98d2b1 100644
--- a/debian/po/sr.po
+++ b/debian/po/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:59+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:50+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/sv.po b/debian/po/sv.po
index 9484bde189a..1abda4c3f78 100644
--- a/debian/po/sv.po
+++ b/debian/po/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:59+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:50+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 "X-Poedit-Language: Swedish\n"
 
 #. Type: string
diff --git a/debian/po/tr.po b/debian/po/tr.po
index 61c0d2ae9dd..00b127ee2b6 100644
--- a/debian/po/tr.po
+++ b/debian/po/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:59+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:50+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/uk.po b/debian/po/uk.po
index 62c139cdbad..ec02b0ed450 100644
--- a/debian/po/uk.po
+++ b/debian/po/uk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:59+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:50+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/vi.po b/debian/po/vi.po
index 7b05a26b1c2..2fc62d4664f 100644
--- a/debian/po/vi.po
+++ b/debian/po/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:59+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:50+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/zh_CN.po b/debian/po/zh_CN.po
index e9facd90e03..54af64bd9f2 100644
--- a/debian/po/zh_CN.po
+++ b/debian/po/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:59+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:50+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/zh_TW.po b/debian/po/zh_TW.po
index b176cd4c2a7..3d5c7ac0a2c 100644
--- a/debian/po/zh_TW.po
+++ b/debian/po/zh_TW.po
@@ -12,8 +12,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:59+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:50+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 "X-Poedit-Country: TAIWAN\n"
 "X-Poedit-Language: Chinese\n"
 "X-Poedit-SourceCharset: utf-8\n"

From 3e2d5096845b6c3de94be07755ba4dad7fda5c36 Mon Sep 17 00:00:00 2001
From: "psi (Open ERP)" <psi@tinyerp.co.in>
Date: Tue, 19 Apr 2011 11:14:51 +0530
Subject: [PATCH 249/331] [FIX] hr_holidays: Improve _sql_constraint and help

bzr revid: psi@tinyerp.co.in-20110419054451-7ien3mqbaqooozj3
---
 addons/hr_holidays/hr_holidays.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index 131d38d7001..84e142d7f12 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -120,9 +120,9 @@ class hr_holidays(osv.osv):
         'date_to': fields.datetime('End Date', readonly=True, states={'draft':[('readonly',False)]}),
         'holiday_status_id': fields.many2one("hr.holidays.status", "Leave Type", required=True,readonly=True, states={'draft':[('readonly',False)]}),
         'employee_id': fields.many2one('hr.employee', "Employee", select=True, invisible=False, readonly=True, states={'draft':[('readonly',False)]}, help='Leave Manager can let this field empty if this leave request/allocation is for every employee'),
-        #'manager_id': fields.many2one('hr.employee', 'Leave Manager', invisible=False, readonly=True, help='This area is automaticly filled by the user who validate the leave'),
+        #'manager_id': fields.many2one('hr.employee', 'Leave Manager', invisible=False, readonly=True, help='This area is automatically filled by the user who validate the leave'),
         #'notes': fields.text('Notes',readonly=True, states={'draft':[('readonly',False)]}),
-        'manager_id': fields.many2one('hr.employee', 'First Approval', invisible=False, readonly=True, help='This area is automaticly filled by the user who validate the leave'),
+        'manager_id': fields.many2one('hr.employee', 'First Approval', invisible=False, readonly=True, help='This area is automatically filled by the user who validate the leave'),
         'notes': fields.text('Reasons',readonly=True, states={'draft':[('readonly',False)]}),
         'number_of_days_temp': fields.float('Number of Days', readonly=True, states={'draft':[('readonly',False)]}),
         'number_of_days': fields.function(_compute_number_of_days, method=True, string='Number of Days', store=True),
@@ -133,7 +133,7 @@ class hr_holidays(osv.osv):
         'department_id':fields.related('employee_id', 'department_id', string='Department', type='many2one', relation='hr.department', readonly=True, store=True),
         'category_id': fields.many2one('hr.employee.category', "Category", help='Category of Employee'),
         'holiday_type': fields.selection([('employee','By Employee'),('category','By Employee Category')], 'Allocation Type', help='By Employee: Allocation/Request for individual Employee, By Employee Category: Allocation/Request for group of employees in category', required=True),
-        'manager_id2': fields.many2one('hr.employee', 'Second Approval', readonly=True, help='This area is automaticly filled by the user who validate the leave with second level (If Leave type need second validation)')
+        'manager_id2': fields.many2one('hr.employee', 'Second Approval', readonly=True, help='This area is automatically filled by the user who validate the leave with second level (If Leave type need second validation)')
     }
     _defaults = {
         'employee_id': _employee_get,
@@ -144,8 +144,8 @@ class hr_holidays(osv.osv):
     }
     _sql_constraints = [
         ('type_value', "CHECK( (holiday_type='employee' AND employee_id IS NOT NULL) or (holiday_type='category' AND category_id IS NOT NULL))", "You have to select an employee or a category"),
-        ('date_check', "CHECK ( number_of_days_temp > 0 )", "The number of days must be greater than 0 !"),
-        ('date_check2', "CHECK ( (type='add') OR (date_from < date_to))", "The start date must be before the end date !")
+        ('date_check2', "CHECK ( (type='add') OR (date_from <= date_to))", "The start date must be before the end date !"),
+        ('date_check', "CHECK ( number_of_days_temp >= 0 )", "The number of days must be greater than 0 !"),
     ]
 
     def _create_resource_leave(self, cr, uid, vals, context=None):

From 4fa85c3e57165b8165b333c9b794e7f6f683577c Mon Sep 17 00:00:00 2001
From: "Ujjvala Collins (OpenERP)" <uco@tinyerp.com>
Date: Tue, 19 Apr 2011 11:50:38 +0530
Subject: [PATCH 250/331] [FIX] project: Parent project field should display
 the views of project not analytic account.

lp bug: https://launchpad.net/bugs/751329 fixed

bzr revid: uco@tinyerp.com-20110419062038-atx62scqlb26r6pv
---
 addons/project/project.py       | 1 +
 addons/project/project_data.xml | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/project/project.py b/addons/project/project.py
index 134364d8b1a..f5e39d1484b 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -128,6 +128,7 @@ class project(osv.osv):
         'active': fields.boolean('Active', help="If the active field is set to False, it will allow you to hide the project without removing it."),
         'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of Projects."),
         'analytic_account_id': fields.many2one('account.analytic.account', 'Analytic Account', help="Link this project to an analytic account if you need financial management on projects. It enables you to connect projects with budgets, planning, cost and revenue analysis, timesheets on projects, etc.", ondelete="cascade", required=True),
+        'parent_id': fields.many2one('project.project', 'Parent Project'),
         'priority': fields.integer('Sequence', help="Gives the sequence order when displaying the list of projects"),
         'warn_manager': fields.boolean('Warn Manager', help="If you check this field, the project manager will receive a request each time a task is completed by his team.", states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}),
 
diff --git a/addons/project/project_data.xml b/addons/project/project_data.xml
index a2df2e2e76c..059334215db 100644
--- a/addons/project/project_data.xml
+++ b/addons/project/project_data.xml
@@ -20,7 +20,7 @@
 		Resource: project.project
 		-->
 
-        <record id="all_projects_account" model="account.analytic.account">
+        <record id="all_projects_account" model="project.project">
             <field name="name">Projects</field>
             <field name="code">3</field>
         </record>

From 35e60ce67ea90bd1872d50d8eb910b88d056e57c Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Tue, 19 Apr 2011 06:21:26 +0000
Subject: [PATCH 251/331] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20110419062126-0ye7hrss0z2nwq08
---
 addons/crm/i18n/ru.po            | 153 ++++++++++++++++---------------
 addons/document/i18n/ru.po       | 133 ++++++++++++++-------------
 addons/document_ftp/i18n/ru.po   |  36 ++++----
 addons/procurement/i18n/ru.po    |  21 ++++-
 addons/product/i18n/id.po        |  41 +++++++--
 addons/product/i18n/ru.po        |  14 ++-
 addons/stock_location/i18n/ru.po |  10 +-
 addons/warning/i18n/ru.po        |  20 ++--
 addons/wiki/i18n/ru.po           |  58 +++++++-----
 9 files changed, 276 insertions(+), 210 deletions(-)

diff --git a/addons/crm/i18n/ru.po b/addons/crm/i18n/ru.po
index da42c2a51d0..e99f23800b2 100644
--- a/addons/crm/i18n/ru.po
+++ b/addons/crm/i18n/ru.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-03-14 18:42+0000\n"
+"PO-Revision-Date: 2011-04-18 19:14+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@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: 2011-03-15 06:11+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-04-19 06:21+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -78,7 +78,7 @@ msgstr "Сегодня"
 #. module: crm
 #: view:crm.merge.opportunity:0
 msgid "Select Opportunities"
-msgstr "Выберите сделки"
+msgstr "Выберите предложения"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -127,7 +127,7 @@ msgstr "Код отдела продаж должен быть уникальн
 #: code:addons/crm/wizard/crm_lead_to_opportunity.py:93
 #, python-format
 msgid "Lead '%s' has been converted to an opportunity."
-msgstr "Кандидат '%s' был преобразован в сделку."
+msgstr "Кандидат '%s' был преобразован в предложение."
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:228
@@ -177,14 +177,15 @@ msgstr "Не создавать партнера"
 #. module: crm
 #: view:crm.lead:0
 msgid "Search Opportunities"
-msgstr "Искать сделки"
+msgstr "Искать предложения"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_merge_opportunities.py:46
 #, python-format
 msgid ""
 "Opportunity must have Partner assigned before merging with other Opportunity."
-msgstr "Сделка должна иметь партнера перед объединением с другой сделкой."
+msgstr ""
+"Предложение должно иметь партнера перед объединением с другим предложением."
 
 #. module: crm
 #: code:addons/crm/wizard/crm_merge_opportunities.py:46
@@ -198,7 +199,7 @@ msgstr "Внимание!"
 #: model:ir.actions.act_window,name:crm.action_report_crm_opportunity
 #: model:ir.ui.menu,name:crm.menu_report_crm_opportunities_tree
 msgid "Opportunities Analysis"
-msgstr "Анализ сделок"
+msgstr "Анализ предложений"
 
 #. module: crm
 #: field:crm.lead,partner_id:0
@@ -260,7 +261,7 @@ msgstr "Отказ"
 #: code:addons/crm/crm_opportunity.py:108
 #, python-format
 msgid "The opportunity '%s' has been marked as lost."
-msgstr "Сделка '%s' была отмечена как проигранная."
+msgstr "Предложение '%s' было отмечено как проигранное."
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.action_report_crm_lead
@@ -310,9 +311,9 @@ msgid ""
 "communication history) will be merged with existing Opportunity of Selected "
 "partner."
 msgstr ""
-"При выборе объединения с существующей сделкой, реквизиты кандидата (вместе с "
-"историей общения) будут объединены с существующей сделкой выбранного "
-"партнера."
+"При выборе объединения с существующим предложением, реквизиты кандидата "
+"(вместе с историей общения) будут объединены с существующим предложением "
+"выбранного партнера."
 
 #. module: crm
 #: selection:crm.meeting,class:0
@@ -394,7 +395,7 @@ msgstr "Кандидат '%s' был открыт"
 #. module: crm
 #: model:process.transition,name:crm.process_transition_opportunitymeeting0
 msgid "Opportunity Meeting"
-msgstr "Встреча по сделке"
+msgstr "Встреча по предложению"
 
 #. module: crm
 #: help:crm.lead.report,delay_close:0
@@ -405,7 +406,7 @@ msgstr "Количество дней, чтобы закрыть вопрос"
 #. module: crm
 #: model:process.node,note:crm.process_node_opportunities0
 msgid "When a real project/opportunity is detected"
-msgstr "При обнаружении реального проекта/сделки"
+msgstr "При обнаружении реального проекта/предложения"
 
 #. module: crm
 #: field:crm.installer,crm_fundraising:0
@@ -416,7 +417,7 @@ msgstr "Фандрайзинг"
 #: view:res.partner:0
 #: field:res.partner,opportunity_ids:0
 msgid "Leads and Opportunities"
-msgstr "Кандидаты и сделки"
+msgstr "Кандидаты и предложения"
 
 #. module: crm
 #: view:crm.send.mail:0
@@ -451,7 +452,7 @@ msgstr ""
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead2opportunity_action
 msgid "Convert/Merge Opportunity"
-msgstr "Преобразовать/Объединить сделку"
+msgstr "Преобразовать/Объединить предложение"
 
 #. module: crm
 #: field:crm.lead,write_date:0
@@ -480,7 +481,7 @@ msgstr "Категория"
 #. module: crm
 #: view:crm.lead.report:0
 msgid "#Opportunities"
-msgstr "#Сделок"
+msgstr "# Предложений"
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_oppor2
@@ -500,7 +501,7 @@ msgstr "Конфиденциальность"
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Opportunity Analysis"
-msgstr "Анализ сделок"
+msgstr "Анализ предложений"
 
 #. module: crm
 #: help:crm.meeting,location:0
@@ -530,7 +531,7 @@ msgstr "Позволяет получать эл. почту с POP/IMAP сер
 #. module: crm
 #: model:process.transition,note:crm.process_transition_opportunitymeeting0
 msgid "Normal or phone meeting for opportunity"
-msgstr "Обычная встреча или звонок по сделке"
+msgstr "Обычная встреча или звонок по предложению"
 
 #. module: crm
 #: model:process.node,note:crm.process_node_leads0
@@ -549,7 +550,7 @@ msgstr "Самый первый перспективный контакт"
 #: model:ir.actions.act_window,name:crm.crm_partner2opportunity
 #, python-format
 msgid "Create Opportunity"
-msgstr "Создать сделку"
+msgstr "Создать предложение"
 
 #. module: crm
 #: view:crm.installer:0
@@ -832,7 +833,7 @@ msgstr "Панель статистики"
 #: field:crm.phonecall,opportunity_id:0
 #, python-format
 msgid "Opportunity"
-msgstr "Сделка"
+msgstr "Предложение"
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead7
@@ -896,7 +897,7 @@ msgstr "Эксклюзивный"
 #: code:addons/crm/crm_opportunity.py:91
 #, python-format
 msgid "The opportunity '%s' has been won."
-msgstr "Сделка  '%s' выиграна."
+msgstr "Предложение  '%s' выиграно."
 
 #. module: crm
 #: help:crm.meeting,alarm_id:0
@@ -972,7 +973,7 @@ msgstr ""
 #. module: crm
 #: view:crm.phonecall2opportunity:0
 msgid "Convert To Opportunity "
-msgstr "Преобразовать в сделку "
+msgstr "Преобразовать в предложение "
 
 #. module: crm
 #: help:crm.case.stage,sequence:0
@@ -986,12 +987,12 @@ msgstr "Дает последовательность при отображен
 #: model:ir.ui.menu,name:crm.menu_crm_case_opp
 #: model:process.node,name:crm.process_node_opportunities0
 msgid "Opportunities"
-msgstr "Сделки"
+msgstr "Предложения"
 
 #. module: crm
 #: field:crm.segmentation,categ_id:0
 msgid "Partner Category"
-msgstr "Категория партнера"
+msgstr "Категория контрагента"
 
 #. module: crm
 #: view:crm.add.note:0
@@ -1035,7 +1036,7 @@ msgstr "Март"
 #: code:addons/crm/crm_lead.py:230
 #, python-format
 msgid "The opportunity '%s' has been closed."
-msgstr "Сделка '%s'  закрыта."
+msgstr "Предложение '%s'  закрыто."
 
 #. module: crm
 #: field:crm.lead,day_open:0
@@ -1076,7 +1077,8 @@ msgstr "Способ прекращения повторения"
 msgid ""
 "There are no other 'Open' or 'Pending' Opportunities for the partner '%s'."
 msgstr ""
-"Нет других сделок в стадии \"Открыто\" или \"В ожидании\" для партнера '%s'."
+"Нет других предложений в стадии \"Открыто\" или \"В ожидании\" для партнера "
+"'%s'."
 
 #. module: crm
 #: view:crm.lead:0
@@ -1150,7 +1152,7 @@ msgstr ""
 #: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:57
 #, python-format
 msgid "Closed/Cancelled Phone Call Could not convert into Opportunity"
-msgstr "Закрытый/отмененный звонок нельзя преобразовать в сделку"
+msgstr "Закрытый/отмененный звонок нельзя преобразовать в предложение"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -1397,7 +1399,7 @@ msgstr "Управление техподдержкой"
 #. module: crm
 #: field:crm.partner2opportunity,name:0
 msgid "Opportunity Name"
-msgstr "Название сделки"
+msgstr "Название предложения"
 
 #. module: crm
 #: help:crm.case.section,active:0
@@ -1432,7 +1434,7 @@ msgstr "crm.lead"
 #. module: crm
 #: field:crm.meeting,write_date:0
 msgid "Write Date"
-msgstr ""
+msgstr "Дата записи"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -1496,7 +1498,7 @@ msgstr "Идентификатор"
 #. module: crm
 #: model:ir.model,name:crm.model_crm_partner2opportunity
 msgid "Partner To Opportunity"
-msgstr "Партнер в Сделку"
+msgstr "Партнер в Предложение"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -1520,7 +1522,7 @@ msgstr "Расширенные фильтры..."
 #. module: crm
 #: field:crm.phonecall2opportunity,name:0
 msgid "Opportunity Summary"
-msgstr "Кратко о сделке"
+msgstr "Кратко о предложении"
 
 #. module: crm
 #: view:crm.phonecall.report:0
@@ -1530,7 +1532,7 @@ msgstr "Искать"
 #. module: crm
 #: view:board.board:0
 msgid "Opportunities by Categories"
-msgstr "Сделки по категориям"
+msgstr "Предложения по категориям"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -1615,12 +1617,12 @@ msgstr "res.users"
 #. module: crm
 #: model:ir.model,name:crm.model_crm_merge_opportunity
 msgid "Merge two Opportunities"
-msgstr "Объединить две сделки"
+msgstr "Объединить два предложения"
 
 #. module: crm
 #: selection:crm.meeting,end_type:0
 msgid "Fix amout of times"
-msgstr ""
+msgstr "Определенное количество раз"
 
 #. module: crm
 #: view:crm.lead:0
@@ -1690,6 +1692,11 @@ msgid ""
 "mainly used by the sales manager in order to do the periodic review with the "
 "teams of the sales pipeline."
 msgstr ""
+"Анализ предложений дает вам мгновенный доступ к такой информации, как "
+"ожидаемый доход, плановая себестоимость, пропущенные сроки или количество "
+"взаимодействий в предложении. Этот отчет в основном используется менеджером "
+"по продажам, с тем чтобы сделать периодический обзор по отделам продаж в "
+"процессе продаж."
 
 #. module: crm
 #: field:crm.case.categ,name:0
@@ -1713,9 +1720,9 @@ msgid ""
 "organise their sales pipeline. Stages will allow them to easily track how a "
 "specific lead or opportunity is positioned in the sales cycle."
 msgstr ""
-"Добавление специальных этапов к кандидатам и сделкам позволяет лучше "
+"Добавление специальных этапов к кандидатам и предложениям позволяет лучше "
 "организовать процесс продаж. Этапы позволяют легче отслеживать нахождение "
-"кандидатов и сделок в процессе продаж."
+"кандидатов и предложений в процессе продаж."
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -1960,7 +1967,7 @@ msgstr "Значение"
 #: view:crm.lead:0
 #: view:crm.lead.report:0
 msgid "Opportunity by Categories"
-msgstr "Сделки по категориям"
+msgstr "Предложения по категориям"
 
 #. module: crm
 #: view:crm.lead:0
@@ -1980,7 +1987,7 @@ msgstr ""
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall2opportunity
 msgid "Phonecall To Opportunity"
-msgstr "Звонок в Сделку"
+msgstr "Звонок в Предложение"
 
 #. module: crm
 #: field:crm.case.section,reply_to:0
@@ -1995,7 +2002,7 @@ msgstr "Выберите этапы для этого отдела продаж"
 #. module: crm
 #: view:board.board:0
 msgid "Opportunities by Stage"
-msgstr "Сделки по этапам"
+msgstr "Предложения по этапам"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -2012,7 +2019,7 @@ msgstr "Перспектива преобразуется в бизнес-пар
 #: view:crm.partner2opportunity:0
 #: model:ir.actions.act_window,name:crm.phonecall2opportunity_act
 msgid "Convert To Opportunity"
-msgstr "Преобразовать в сделку"
+msgstr "Преобразовать в предложение"
 
 #. module: crm
 #: view:crm.phonecall:0
@@ -2038,7 +2045,7 @@ msgstr "Доп. информация"
 #: model:ir.actions.act_window,name:crm.action_merge_opportunities
 #: model:ir.actions.act_window,name:crm.merge_opportunity_act
 msgid "Merge Opportunities"
-msgstr "Объединить сделки"
+msgstr "Объединить предложения"
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead5
@@ -2090,7 +2097,7 @@ msgstr "Использовать правила продаж покупок"
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead2opportunity_partner
 msgid "Lead To Opportunity Partner"
-msgstr "Кандидат в партнера сделки"
+msgstr "Кандидат в партнера предложения"
 
 #. module: crm
 #: field:crm.meeting,location:0
@@ -2157,7 +2164,7 @@ msgstr "Google Adwords 2"
 #: help:crm.lead,type:0
 #: help:crm.lead.report,type:0
 msgid "Type is used to separate Leads and Opportunities"
-msgstr "Тип используется для разделения кандидатов и сделок"
+msgstr "Тип используется для разделения кандидатов и предложений"
 
 #. module: crm
 #: view:crm.phonecall2partner:0
@@ -2182,8 +2189,8 @@ msgid ""
 msgstr ""
 "Определение отдела продаж для организации различных продавцов или отделов "
 "продаж в отдельные команды. Каждая команда будет работать со своим списком "
-"сделок, заказов и т.д. Каждый пользователь может установить команду по "
-"умолчанию  в своих настройках. Выводимые сделки и заказы, будут "
+"предложений, заказов и т.д. Каждый пользователь может установить команду по "
+"умолчанию  в своих настройках. Выводимые предложения и заказы, будут "
 "автоматически фильтроваться в соответствии с отделом продаж пользователя."
 
 #. module: crm
@@ -2265,7 +2272,7 @@ msgstr ""
 "Кандидаты позволяют управлять и отслеживать все первоначальные контакты с "
 "предполагаемыми клиентами или партнерами проявившими интерес к вашей "
 "продукции или услугам. Кандидат - обычно первый шаг в процессе продажи. "
-"После оценки, кандидат может быть преобразован в сделку с созданием "
+"После оценки, кандидат может быть преобразован в предложение с созданием "
 "соответствующего партнера для будущего отслеживания связанной с ним "
 "деятельности. Вы можете импортировать базу данных предполагаемых клиентов, "
 "работать с визитными карточками или интегрировать запросы с вашего сайта с "
@@ -2415,7 +2422,7 @@ msgstr "Активен"
 #: code:addons/crm/crm_lead.py:306
 #, python-format
 msgid "The stage of opportunity '%s' has been changed to '%s'."
-msgstr "Этап сделки '%s'  изменен на '%s'."
+msgstr "Этап предложения '%s'  изменен на '%s'."
 
 #. module: crm
 #: selection:crm.segmentation.line,operator:0
@@ -2585,7 +2592,7 @@ msgstr "Вопрос '%s' отменен."
 #. module: crm
 #: field:crm.installer,sale_crm:0
 msgid "Opportunity to Quotation"
-msgstr "Сделка в Запрос цен"
+msgstr "Предложение в Заказ на продажу"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_send_mail
@@ -2596,7 +2603,7 @@ msgstr "Послать новое эл. письмо"
 #: view:board.board:0
 #: model:ir.actions.act_window,name:crm.act_my_oppor
 msgid "My Open Opportunities"
-msgstr "Мои открытые сделки"
+msgstr "Мои открытые предложения"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.open_board_statistical_dash
@@ -2640,7 +2647,7 @@ msgstr "Тип встречи"
 #: code:addons/crm/wizard/crm_lead_to_opportunity.py:312
 #, python-format
 msgid "Merge with Existing Opportunity"
-msgstr "Объединить с существующей сделкой"
+msgstr "Объединить с существующим предложением"
 
 #. module: crm
 #: help:crm.lead,state:0
@@ -2724,7 +2731,7 @@ msgstr "Указатель"
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead2opportunity
 msgid "Lead To Opportunity"
-msgstr "Кандидат в Сделку"
+msgstr "Кандидат в Предложение"
 
 #. module: crm
 #: model:ir.model,name:crm.model_calendar_attendee
@@ -2757,7 +2764,8 @@ msgid ""
 "The name of the future partner that will be created while converting the "
 "into opportunity"
 msgstr ""
-"Название будущего партнера, который будет создан при преобразовании в сделку"
+"Название будущего партнера, который будет создан при преобразовании в "
+"предложение"
 
 #. module: crm
 #: field:crm.opportunity2phonecall,user_id:0
@@ -2858,15 +2866,16 @@ msgid ""
 "opportunities, convert them into quotations, manage related documents, track "
 "all customer related activities, and much more."
 msgstr ""
-"Со сделками вы можете управлять и отслеживать процесс продаж с помощью "
+"С предложениями вы можете управлять и отслеживать процесс продаж с помощью "
 "создания специфичных для заказчика или предполагаемого клиента документов "
 "для продаж. Может быть сохранена такая информация: ожидаемый доход, этап "
-"сделки, ожидаемая дата закрытия, история общения и многое другое. Сделки "
-"могут быть связаны с почтовым шлюзом: новые сообщения могут создавать "
-"сделки, каждая из них автоматически получает историю общения с клиентом.\n"
+"предложения, ожидаемая дата закрытия, история общения и многое другое. "
+"Предложения могут быть связаны с почтовым шлюзом: новые сообщения могут "
+"создавать предложения, каждое из них автоматически получает историю общения "
+"с клиентом.\n"
 "\n"
 "Вы и ваш отдел будете иметь возможность планировать встречи и телефонные "
-"звонки по сделкам, превращать их в запросы цен, управлять связанными "
+"звонки по предложениям, превращать их в запросы цен, управлять связанными "
 "документами, отслеживать деятельность связанную с заказчиком, и многое "
 "другое."
 
@@ -3014,8 +3023,8 @@ msgid ""
 msgstr ""
 "Создавать специальные категории, которые подходят к деятельности вашей "
 "компании, чтобы лучше классифицировать и анализировать ваших кандидатов и "
-"сделки. Такие категории, могут, например, отражать вашу структуру продукции "
-"или различные типы продаж."
+"предложения. Такие категории, могут, например, отражать вашу структуру "
+"продукции или различные типы продаж."
 
 #. module: crm
 #: help:crm.segmentation,som_interval_decrease:0
@@ -3184,7 +3193,7 @@ msgstr "Запланировать звонок"
 #: code:addons/crm/wizard/crm_lead_to_opportunity.py:258
 #, python-format
 msgid "Closed/Cancelled Leads Could not convert into Opportunity"
-msgstr "Закрытого/отмененного кандидата нельзя преобразовать в сделку"
+msgstr "Закрытого/отмененного кандидата нельзя преобразовать в предложение"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -3203,7 +3212,7 @@ msgstr ""
 #. module: crm
 #: field:crm.meeting,exdate:0
 msgid "Exception Date/Times"
-msgstr ""
+msgstr "Дата/время исключительной ситуации"
 
 #. module: crm
 #: selection:crm.meeting,class:0
@@ -3227,7 +3236,7 @@ msgstr "Штат"
 #. module: crm
 #: model:process.transition,note:crm.process_transition_leadopportunity0
 msgid "Creating business opportunities from Leads"
-msgstr "Создание сделок из кандидатов"
+msgstr "Создание предложений из кандидатов"
 
 #. module: crm
 #: help:crm.send.mail,html:0
@@ -3242,7 +3251,7 @@ msgstr "Нужна информация"
 #. module: crm
 #: model:process.transition,name:crm.process_transition_leadopportunity0
 msgid "Prospect Opportunity"
-msgstr "Перспективы сделки"
+msgstr "Перспективы предложения"
 
 #. module: crm
 #: view:crm.installer:0
@@ -3382,7 +3391,7 @@ msgstr "Ожидаемое закрытие"
 #. module: crm
 #: model:ir.model,name:crm.model_crm_opportunity2phonecall
 msgid "Opportunity to Phonecall"
-msgstr "Сделка в звонок"
+msgstr "Предложение в звонок"
 
 #. module: crm
 #: help:crm.case.section,allow_unlink:0
@@ -3578,7 +3587,7 @@ msgstr "Нет ID эл. почты в адресе вашей компании!"
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Opportunities By Stage"
-msgstr "Сделки по этапам"
+msgstr "Предложения по этапам"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_categ_phone_create_partner
@@ -3601,7 +3610,7 @@ msgid ""
 "cycle."
 msgstr ""
 "Добавление специальных этапов, которые будут помогать лучше организовывать "
-"процесс продаж. Этапы позволяют легче отслеживать положение сделок в "
+"процесс продаж. Этапы позволяют легче отслеживать положение предложений в "
 "процессе продаж."
 
 #. module: crm
@@ -3665,7 +3674,7 @@ msgstr "Вы не можете иметь двух одинаковых поль
 #: code:addons/crm/wizard/crm_merge_opportunities.py:100
 #, python-format
 msgid "Merged into Opportunity: %s"
-msgstr "Объединено со сделкой: %s"
+msgstr "Объединено с предложением: %s"
 
 #. module: crm
 #: code:addons/crm/crm.py:347
@@ -3775,7 +3784,7 @@ msgstr "Интерес к аксессуарам"
 #: code:addons/crm/crm_lead.py:211
 #, python-format
 msgid "The opportunity '%s' has been opened."
-msgstr "Сделка '%s' была открыта."
+msgstr "Предложение '%s' было открыто."
 
 #. module: crm
 #: field:crm.lead.report,email:0
@@ -3790,7 +3799,7 @@ msgstr "Улица"
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Opportunities by User and Team"
-msgstr "Сделки по пользователям и отделам"
+msgstr "Предложения по пользователям и отделам"
 
 #. module: crm
 #: field:crm.case.section,working_hours:0
@@ -3837,7 +3846,7 @@ msgstr "Страна"
 #: view:crm.phonecall:0
 #: view:res.partner:0
 msgid "Convert to Opportunity"
-msgstr "Преобразовать в сделку"
+msgstr "Преобразовать в предложение"
 
 #. module: crm
 #: selection:crm.meeting,week_list:0
@@ -3864,7 +3873,7 @@ msgstr "Звонки по пользователям и секциям"
 #. module: crm
 #: selection:crm.lead2opportunity.action,name:0
 msgid "Merge with existing Opportunity"
-msgstr "Объединить с существующей сделкой"
+msgstr "Объединить с существующим предложением"
 
 #. module: crm
 #: field:crm.meeting,select1:0
diff --git a/addons/document/i18n/ru.po b/addons/document/i18n/ru.po
index f8b04878974..ee0f25a0f12 100644
--- a/addons/document/i18n/ru.po
+++ b/addons/document/i18n/ru.po
@@ -7,19 +7,19 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-03-16 15:07+0000\n"
-"Last-Translator: devcode <brestows@gmail.com>\n"
+"PO-Revision-Date: 2011-04-18 19:50+0000\n"
+"Last-Translator: Chertykov Denis <chertykov@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: 2011-03-17 06:12+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-04-19 06:21+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
 msgid "Parent Directory"
-msgstr ""
+msgstr "Родительский каталог"
 
 #. module: document
 #: model:ir.model,name:document.model_document_configuration
@@ -34,7 +34,7 @@ msgstr ""
 #. module: document
 #: view:board.board:0
 msgid "Document board"
-msgstr ""
+msgstr "Доска документов"
 
 #. module: document
 #: model:ir.model,name:document.model_process_node
@@ -57,13 +57,13 @@ msgstr ""
 #: code:addons/document/document_directory.py:276
 #, python-format
 msgid "Directory name contains special characters!"
-msgstr ""
+msgstr "Имя каталога содержит специальные символы !"
 
 #. module: document
 #: view:document.directory:0
 #: view:document.storage:0
 msgid "Group By..."
-msgstr ""
+msgstr "Группировать по ..."
 
 #. module: document
 #: model:ir.model,name:document.model_document_directory_content_type
@@ -73,7 +73,7 @@ msgstr ""
 #. module: document
 #: view:document.directory:0
 msgid "Resources"
-msgstr ""
+msgstr "Ресурсы"
 
 #. module: document
 #: field:document.directory,file_ids:0
@@ -90,7 +90,7 @@ msgstr "Файлов в месяц"
 #: selection:report.document.user,month:0
 #: selection:report.files.partner,month:0
 msgid "March"
-msgstr ""
+msgstr "Март"
 
 #. module: document
 #: view:document.configuration:0
@@ -101,7 +101,7 @@ msgstr ""
 #: view:document.directory:0
 #: field:document.directory,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Компании"
 
 #. module: document
 #: model:ir.model,name:document.model_document_directory_content
@@ -129,19 +129,19 @@ msgstr ""
 #. module: document
 #: view:report.document.user:0
 msgid "This Year"
-msgstr ""
+msgstr "Этот год"
 
 #. module: document
 #: field:document.storage,path:0
 msgid "Path"
-msgstr ""
+msgstr "Путь"
 
 #. module: document
 #: code:addons/document/document_directory.py:266
 #: code:addons/document/document_directory.py:271
 #, python-format
 msgid "Directory name must be unique!"
-msgstr ""
+msgstr "Имя каталога должно быть уникальным!"
 
 #. module: document
 #: view:ir.attachment:0
@@ -162,12 +162,12 @@ msgstr ""
 #: model:ir.actions.act_window,name:document.action_document_directory_form
 #: model:ir.ui.menu,name:document.menu_document_directories
 msgid "Directories"
-msgstr ""
+msgstr "Каталоги"
 
 #. module: document
 #: field:document.configuration,sale_order:0
 msgid "Sale Order"
-msgstr ""
+msgstr "Заказ на продажу"
 
 #. module: document
 #: model:ir.model,name:document.model_report_document_user
@@ -177,14 +177,14 @@ msgstr ""
 #. module: document
 #: field:document.configuration,project:0
 msgid "Project"
-msgstr ""
+msgstr "Проект"
 
 #. module: document
 #: code:addons/document/document_storage.py:573
 #: code:addons/document/document_storage.py:601
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "Ошибка !"
 
 #. module: document
 #: help:document.configuration,product:0
@@ -194,7 +194,7 @@ msgstr ""
 #. module: document
 #: field:document.directory,resource_find_all:0
 msgid "Find all resources"
-msgstr ""
+msgstr "Найти все ресурсы"
 
 #. module: document
 #: selection:document.directory,type:0
@@ -214,7 +214,7 @@ msgstr "Изменённая дата"
 #. module: document
 #: view:document.configuration:0
 msgid "Knowledge Application Configuration"
-msgstr ""
+msgstr "Настройка приложения Знания"
 
 #. module: document
 #: view:ir.attachment:0
@@ -226,7 +226,7 @@ msgstr "Партнер"
 #. module: document
 #: view:board.board:0
 msgid "Files by Users"
-msgstr ""
+msgstr "Файлы по пользователям"
 
 #. module: document
 #: field:process.node,directory_id:0
@@ -254,7 +254,7 @@ msgstr "ir.actions.report.xml"
 #: model:ir.ui.menu,name:document.menu_document_doc
 #: model:ir.ui.menu,name:document.menu_document_files
 msgid "Documents"
-msgstr ""
+msgstr "Документы"
 
 #. module: document
 #: constraint:document.directory:0
@@ -265,7 +265,7 @@ msgstr "Ошибка! Вы не можете созадавать вложенн
 #: view:document.directory:0
 #: field:document.directory,storage_id:0
 msgid "Storage"
-msgstr ""
+msgstr "Хранилище"
 
 #. module: document
 #: view:document.configuration:0
@@ -342,13 +342,13 @@ msgstr "Отчёт"
 #: selection:report.document.user,month:0
 #: selection:report.files.partner,month:0
 msgid "July"
-msgstr ""
+msgstr "Июль"
 
 #. module: document
 #: model:ir.actions.act_window,name:document.open_board_document_manager
 #: model:ir.ui.menu,name:document.menu_reports_document_manager
 msgid "Document Dashboard"
-msgstr ""
+msgstr "Панель документов"
 
 #. module: document
 #: field:document.directory.content.type,code:0
@@ -358,17 +358,17 @@ msgstr "Расширение"
 #. module: document
 #: view:ir.attachment:0
 msgid "Created"
-msgstr ""
+msgstr "Создан"
 
 #. module: document
 #: field:document.directory,content_ids:0
 msgid "Virtual Files"
-msgstr ""
+msgstr "Виртуальные файлы"
 
 #. module: document
 #: view:ir.attachment:0
 msgid "Modified"
-msgstr ""
+msgstr "Изменен"
 
 #. module: document
 #: code:addons/document/document_storage.py:639
@@ -395,7 +395,7 @@ msgstr "Папка"
 #. module: document
 #: view:board.board:0
 msgid "Files by Partner"
-msgstr ""
+msgstr "Файлы по партнёрам"
 
 #. module: document
 #: field:document.directory,write_uid:0
@@ -408,12 +408,12 @@ msgstr "Последние изменения пользователя"
 #: model:ir.actions.act_window,name:document.act_res_partner_document
 #: model:ir.actions.act_window,name:document.zoom_directory
 msgid "Related Documents"
-msgstr ""
+msgstr "Документы по теме"
 
 #. module: document
 #: field:document.configuration,progress:0
 msgid "Configuration Progress"
-msgstr ""
+msgstr "Процесс настройки"
 
 #. module: document
 #: field:document.directory,domain:0
@@ -442,18 +442,18 @@ msgstr ""
 #: model:ir.actions.act_window,name:document.action_view_size_month
 #: view:report.document.file:0
 msgid "File Size by Month"
-msgstr ""
+msgstr "Размер файла по месяцам"
 
 #. module: document
 #: selection:report.document.user,month:0
 #: selection:report.files.partner,month:0
 msgid "December"
-msgstr ""
+msgstr "Декабрь"
 
 #. module: document
 #: field:document.configuration,config_logo:0
 msgid "Image"
-msgstr ""
+msgstr "Изображение"
 
 #. module: document
 #: selection:document.directory,type:0
@@ -463,12 +463,12 @@ msgstr ""
 #. module: document
 #: field:document.directory,child_ids:0
 msgid "Children"
-msgstr ""
+msgstr "Дочерний"
 
 #. module: document
 #: view:document.directory:0
 msgid "Define words in the context, for all child directories and files"
-msgstr ""
+msgstr "Определить слова в контексте, для всех дочерних каталогов и файлов"
 
 #. module: document
 #: model:ir.module.module,description:document.module_meta_information
@@ -546,7 +546,7 @@ msgstr ""
 #. module: document
 #: view:ir.attachment:0
 msgid "Attachment"
-msgstr ""
+msgstr "Вложение"
 
 #. module: document
 #: field:ir.actions.report.xml,model_id:0
@@ -581,7 +581,7 @@ msgstr ""
 #: selection:report.document.user,month:0
 #: selection:report.files.partner,month:0
 msgid "August"
-msgstr ""
+msgstr "Август"
 
 #. module: document
 #: sql_constraint:document.directory:0
@@ -592,7 +592,7 @@ msgstr ""
 #: selection:report.document.user,month:0
 #: selection:report.files.partner,month:0
 msgid "June"
-msgstr ""
+msgstr "Июнь"
 
 #. module: document
 #: field:report.document.user,user:0
@@ -609,13 +609,13 @@ msgstr "Группы"
 #. module: document
 #: field:document.directory.content.type,active:0
 msgid "Active"
-msgstr ""
+msgstr "Активно"
 
 #. module: document
 #: selection:report.document.user,month:0
 #: selection:report.files.partner,month:0
 msgid "November"
-msgstr ""
+msgstr "Ноябрь"
 
 #. module: document
 #: view:ir.attachment:0
@@ -641,12 +641,12 @@ msgstr "Описание"
 #: selection:report.document.user,month:0
 #: selection:report.files.partner,month:0
 msgid "October"
-msgstr ""
+msgstr "Октябрь"
 
 #. module: document
 #: view:document.directory:0
 msgid "Seq."
-msgstr ""
+msgstr "Посл."
 
 #. module: document
 #: selection:document.storage,type:0
@@ -661,12 +661,12 @@ msgstr ""
 #. module: document
 #: view:ir.attachment:0
 msgid "Related to"
-msgstr ""
+msgstr "Связан с"
 
 #. module: document
 #: model:ir.module.module,shortdesc:document.module_meta_information
 msgid "Integrated Document Management System"
-msgstr ""
+msgstr "Интегрированная система управления документами"
 
 #. module: document
 #: view:document.configuration:0
@@ -681,7 +681,7 @@ msgstr "Вложено в"
 #. module: document
 #: model:ir.ui.menu,name:document.menu_reports_document
 msgid "Dashboard"
-msgstr ""
+msgstr "Панель"
 
 #. module: document
 #: model:ir.actions.act_window,name:document.action_view_user_graph
@@ -691,17 +691,17 @@ msgstr ""
 #. module: document
 #: field:document.storage,readonly:0
 msgid "Read Only"
-msgstr ""
+msgstr "Только чтение"
 
 #. module: document
 #: field:document.directory.dctx,expr:0
 msgid "Expression"
-msgstr ""
+msgstr "Выражение"
 
 #. module: document
 #: sql_constraint:document.directory:0
 msgid "The directory name must be unique !"
-msgstr ""
+msgstr "Имя каталога должно быть уникальным!"
 
 #. module: document
 #: field:document.directory,create_uid:0
@@ -720,12 +720,12 @@ msgstr "Файлы по месяцам"
 #: selection:report.document.user,month:0
 #: selection:report.files.partner,month:0
 msgid "September"
-msgstr ""
+msgstr "Сентябрь"
 
 #. module: document
 #: field:document.directory.content,prefix:0
 msgid "Prefix"
-msgstr ""
+msgstr "Префикс"
 
 #. module: document
 #: field:report.document.wall,last:0
@@ -772,7 +772,7 @@ msgstr ""
 #. module: document
 #: field:document.directory.dctx,field:0
 msgid "Field"
-msgstr ""
+msgstr "Поле"
 
 #. module: document
 #: model:ir.model,name:document.model_document_directory_dctx
@@ -806,7 +806,7 @@ msgstr "Отчетность"
 #. module: document
 #: field:document.configuration,product:0
 msgid "Product"
-msgstr ""
+msgstr "ТМЦ"
 
 #. module: document
 #: field:document.directory,ressource_tree:0
@@ -817,7 +817,7 @@ msgstr "Древовидная структура"
 #: selection:report.document.user,month:0
 #: selection:report.files.partner,month:0
 msgid "May"
-msgstr ""
+msgstr "Май"
 
 #. module: document
 #: model:ir.actions.act_window,name:document.action_view_all_document_tree1
@@ -835,11 +835,13 @@ msgid ""
 "The Documents repository gives you access to all attachments, such as mails, "
 "project documents, invoices etc."
 msgstr ""
+"Хранилище документов дает вам доступ ко всем вложениям, таким как: почта, "
+"счета, ..."
 
 #. module: document
 #: view:document.directory:0
 msgid "For each entry here, virtual files will appear in this folder."
-msgstr ""
+msgstr "Для каждой записи здесь, виртуальные файлы появятся в этой папке."
 
 #. module: document
 #: model:ir.model,name:document.model_ir_attachment
@@ -849,13 +851,13 @@ msgstr "ir.attachment"
 #. module: document
 #: view:board.board:0
 msgid "New Files"
-msgstr ""
+msgstr "Новые файлы"
 
 #. module: document
 #: selection:report.document.user,month:0
 #: selection:report.files.partner,month:0
 msgid "January"
-msgstr ""
+msgstr "Январь"
 
 #. module: document
 #: view:document.directory:0
@@ -904,13 +906,13 @@ msgstr ""
 #: selection:report.document.user,month:0
 #: selection:report.files.partner,month:0
 msgid "February"
-msgstr ""
+msgstr "Февраль"
 
 #. module: document
 #: model:ir.actions.act_window,name:document.open_board_document_manager1
 #: model:ir.ui.menu,name:document.menu_reports_document_manager1
 msgid "Statistics by User"
-msgstr ""
+msgstr "Статистика по пользователям"
 
 #. module: document
 #: field:document.directory,name:0
@@ -921,30 +923,30 @@ msgstr "Имя"
 #. module: document
 #: sql_constraint:document.storage:0
 msgid "The storage path must be unique!"
-msgstr ""
+msgstr "Путь хранения должен быть уникальным !"
 
 #. module: document
 #: view:document.directory:0
 msgid "Fields"
-msgstr ""
+msgstr "Поля"
 
 #. module: document
 #: help:document.storage,readonly:0
 msgid "If set, media is for reading only"
-msgstr ""
+msgstr "Если установлено, носитель только для чтения"
 
 #. module: document
 #: selection:report.document.user,month:0
 #: selection:report.files.partner,month:0
 msgid "April"
-msgstr ""
+msgstr "Апрель"
 
 #. module: document
 #: field:report.document.file,nbr:0
 #: field:report.document.user,nbr:0
 #: field:report.files.partner,nbr:0
 msgid "# of Files"
-msgstr ""
+msgstr "# файлов"
 
 #. module: document
 #: view:document.directory:0
@@ -952,6 +954,7 @@ msgid ""
 "Only members of these groups will have access to this directory and its "
 "files."
 msgstr ""
+"Только члены этих групп будут иметь доступ к этой директории и файлам."
 
 #. module: document
 #: view:document.directory:0
@@ -963,7 +966,7 @@ msgstr ""
 #. module: document
 #: field:document.directory.content.type,mimetype:0
 msgid "Mime Type"
-msgstr ""
+msgstr "Тип Mime"
 
 #. module: document
 #: field:document.directory.content,sequence:0
diff --git a/addons/document_ftp/i18n/ru.po b/addons/document_ftp/i18n/ru.po
index 8751ecf82cf..c9705437e6d 100644
--- a/addons/document_ftp/i18n/ru.po
+++ b/addons/document_ftp/i18n/ru.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-03-16 00:06+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2011-04-18 19:23+0000\n"
+"Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: Russian <ru@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: 2011-03-17 06:12+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-04-19 06:21+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: document_ftp
 #: model:ir.model,name:document_ftp.model_document_ftp_configuration
@@ -35,32 +35,32 @@ msgstr ""
 #. module: document_ftp
 #: field:document.ftp.configuration,progress:0
 msgid "Configuration Progress"
-msgstr ""
+msgstr "Выполнение настройки"
 
 #. module: document_ftp
 #: model:ir.actions.url,name:document_ftp.action_document_browse
 msgid "Browse Files"
-msgstr ""
+msgstr "Просмотр файлов"
 
 #. module: document_ftp
 #: field:document.ftp.configuration,config_logo:0
 msgid "Image"
-msgstr ""
+msgstr "Изображение"
 
 #. module: document_ftp
 #: field:document.ftp.configuration,host:0
 msgid "Address"
-msgstr ""
+msgstr "Адрес"
 
 #. module: document_ftp
 #: field:document.ftp.browse,url:0
 msgid "FTP Server"
-msgstr ""
+msgstr "FTP Сервер"
 
 #. module: document_ftp
 #: model:ir.actions.act_window,name:document_ftp.action_config_auto_directory
 msgid "FTP Server Configuration"
-msgstr ""
+msgstr "Настройка FTP сервера"
 
 #. module: document_ftp
 #: model:ir.module.module,description:document_ftp.module_meta_information
@@ -83,11 +83,13 @@ msgstr ""
 msgid ""
 "Server address or IP and port to which users should connect to for DMS access"
 msgstr ""
+"Адрес сервера или IP и порт для соединения пользователя и доступа к "
+"документам"
 
 #. module: document_ftp
 #: model:ir.ui.menu,name:document_ftp.menu_document_browse
 msgid "Shared Repository (FTP)"
-msgstr ""
+msgstr "Общее хранилище (FTP)"
 
 #. module: document_ftp
 #: view:document.ftp.browse:0
@@ -97,12 +99,12 @@ msgstr ""
 #. module: document_ftp
 #: view:document.ftp.configuration:0
 msgid "Configure FTP Server"
-msgstr ""
+msgstr "Настройка FTP сервера"
 
 #. module: document_ftp
 #: model:ir.module.module,shortdesc:document_ftp.module_meta_information
 msgid "Integrated FTP Server with Document Management System"
-msgstr ""
+msgstr "Сервер FTP интегрированный  с системой управления документами"
 
 #. module: document_ftp
 #: view:document.ftp.configuration:0
@@ -112,22 +114,22 @@ msgstr ""
 #. module: document_ftp
 #: model:ir.model,name:document_ftp.model_document_ftp_browse
 msgid "Document FTP Browse"
-msgstr ""
+msgstr "Просмотр документа через FTP"
 
 #. module: document_ftp
 #: view:document.ftp.configuration:0
 msgid "Knowledge Application Configuration"
-msgstr ""
+msgstr "Настройка приложения Знания"
 
 #. module: document_ftp
 #: model:ir.actions.act_window,name:document_ftp.action_ftp_browse
 msgid "Document Browse"
-msgstr ""
+msgstr "Просмотр документа"
 
 #. module: document_ftp
 #: view:document.ftp.browse:0
 msgid "Browse Document"
-msgstr ""
+msgstr "Просмотр документа"
 
 #. module: document_ftp
 #: view:document.ftp.configuration:0
diff --git a/addons/procurement/i18n/ru.po b/addons/procurement/i18n/ru.po
index c7b0b0b8927..6fd3884b5e5 100644
--- a/addons/procurement/i18n/ru.po
+++ b/addons/procurement/i18n/ru.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-01-19 12:00+0000\n"
+"PO-Revision-Date: 2011-04-18 18:58+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: Russian <ru@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: 2011-01-25 06:54+0000\n"
-"X-Generator: Launchpad (build 12177)\n"
+"X-Launchpad-Export-Date: 2011-04-19 06:21+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: procurement
 #: view:make.procurement:0
@@ -426,6 +426,9 @@ msgid ""
 "    This is the module for computing Procurements.\n"
 "    "
 msgstr ""
+"\n"
+"    Это модуль для расчета снабжения.\n"
+"    "
 
 #. module: procurement
 #: field:stock.warehouse.orderpoint,procurement_draft_ids:0
@@ -879,6 +882,16 @@ msgid ""
 "others require manual intervention (those are identified by a specific error "
 "message)."
 msgstr ""
+"Заказы на снабжение представляют собой необходимость определенного "
+"количества ТМЦ, в данный момент времени, в данном месте. Заказ на продажу "
+"это типичный источник для заказа на снабжение (но это различные документы). "
+"В зависимости от требуемых условий снабжения и свойств ТМЦ алгоритм "
+"снабжения будет резервировать ТМЦ на складе, заказывать ТМЦ у поставщика, "
+"передавать заказ на производство и т.д. Исключительная ситуация при "
+"снабжении случается когда системе не удается найти способ выполнить "
+"снабжение. Некоторые исключительные ситуации могут разрешиться сами собой "
+"автоматически, другие требуют вмешательства (определяется по конкретному "
+"сообщению об ошибке)."
 
 #. module: procurement
 #: field:procurement.order,product_uom:0
@@ -897,6 +910,8 @@ msgid ""
 "procurements. All procurements that are not between today and today+range "
 "are skipped for future computation."
 msgstr ""
+"Это временные рамки анализа планировщика снабжения. Все снабжение, которое "
+"за рамками сегодня и сегодня+диапазон откладывается до будущих расчетов."
 
 #. module: procurement
 #: selection:procurement.order,priority:0
diff --git a/addons/product/i18n/id.po b/addons/product/i18n/id.po
index a22e36afb88..c5fbb9e8079 100644
--- a/addons/product/i18n/id.po
+++ b/addons/product/i18n/id.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-04-15 08:54+0000\n"
+"PO-Revision-Date: 2011-04-18 16:18+0000\n"
 "Last-Translator: moelyana <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: 2011-04-16 06:52+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 06:21+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
@@ -1092,7 +1092,7 @@ msgstr "Untuk dijual"
 #. module: product
 #: model:product.category,name:product.product_category_services0
 msgid "Marketable Services"
-msgstr ""
+msgstr "Layanan berharga"
 
 #. module: product
 #: field:product.pricelist.item,price_surcharge:0
@@ -1258,6 +1258,25 @@ msgid ""
 "    Print product labels with barcode.\n"
 "    "
 msgstr ""
+"\n"
+"    Ini adalah modul dasar untuk mengelola produk dan pricelists di "
+"OpenERP.\n"
+"\n"
+"     Produk dukungan varian, metode penentuan harga yang berbeda, pemasok\n"
+"     informasi, membuat untuk stok / order, unit yang berbeda ukuran,\n"
+"     kemasan dan properti.\n"
+"\n"
+"     Pricelists dukungan:\n"
+"     * Multiple-tingkat diskonto (dengan produk, kategori, jumlah)\n"
+"     * Hitung harga berdasarkan kriteria yang berbeda:\n"
+"         * daftar harga lainnya,\n"
+"         * harga Biaya,\n"
+"         * harga Daftar,\n"
+"         * Supplier harga, ...\n"
+"     Pricelists preferensi dengan produk dan / atau mitra.\n"
+"\n"
+"     Cetak label produk dengan barcode.\n"
+"    "
 
 #. module: product
 #: help:product.template,seller_delay:0
@@ -1455,7 +1474,7 @@ msgstr "Dikelompokan berdasarkan ...."
 #. module: product
 #: model:product.template,name:product.product_product_cpu_gen_product_template
 msgid "Regular processor config"
-msgstr ""
+msgstr "Konfigurasi regular prosesor"
 
 #. module: product
 #: code:addons/product/product.py:142
@@ -1612,16 +1631,18 @@ msgid ""
 "How many times this UoM is smaller than the reference UoM in this category:\n"
 "1 * (reference unit) = ratio * (this unit)"
 msgstr ""
+"Berapa kali UoM ini lebih kecil daripada UoM referensi dalam kategori ini:\n"
+"1 * (reference unit) = ratio * (this unit)"
 
 #. module: product
 #: help:product.template,uom_id:0
 msgid "Default Unit of Measure used for all stock operation."
-msgstr ""
+msgstr "Default Satuan Ukur digunakan untuk semua operasi stok."
 
 #. module: product
 #: model:product.category,name:product.product_category_misc0
 msgid "Misc"
-msgstr ""
+msgstr "Lain-lain"
 
 #. module: product
 #: model:product.template,name:product.product_product_pc4_product_template
@@ -1631,7 +1652,7 @@ msgstr ""
 #. module: product
 #: field:pricelist.partnerinfo,price:0
 msgid "Unit Price"
-msgstr ""
+msgstr "Harga Satuan"
 
 #. module: product
 #: model:product.category,name:product.product_category_7
@@ -1642,7 +1663,7 @@ msgstr ""
 #. module: product
 #: model:product.pricelist,name:product.list0
 msgid "Public Pricelist"
-msgstr ""
+msgstr "Daftar Harga Umum"
 
 #. module: product
 #: model:product.category,name:product.product_category_marketableproduct0
@@ -1652,7 +1673,7 @@ msgstr ""
 #. module: product
 #: field:product.supplierinfo,product_code:0
 msgid "Supplier Product Code"
-msgstr ""
+msgstr "Kode Produk Supplier"
 
 #. module: product
 #: view:product.product:0
diff --git a/addons/product/i18n/ru.po b/addons/product/i18n/ru.po
index 74fbfb6ae01..fd3e0630eec 100644
--- a/addons/product/i18n/ru.po
+++ b/addons/product/i18n/ru.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-04-17 15:43+0000\n"
+"PO-Revision-Date: 2011-04-18 19:10+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@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: 2011-04-18 06:26+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 06:21+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
@@ -536,6 +536,8 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the product "
 "without removing it."
 msgstr ""
+"Если поле 'Активно' имеет значение Ложь, вы сможете скрыть ТМЦ, не удаляя "
+"его."
 
 #. module: product
 #: model:product.template,name:product.product_product_metalcleats0_product_template
@@ -721,6 +723,8 @@ msgid ""
 "Product UoM if not empty, in the default unit of measure of the product "
 "otherwise."
 msgstr ""
+"Минимальное количество для закупки у этого поставщика, выражено в ед.изм. "
+"поставщика, если они есть, иначе в единицах измерения ТМЦ по умолчанию."
 
 #. module: product
 #: view:product.pricelist.item:0
@@ -733,6 +737,8 @@ msgid ""
 "This price will be considered as a price for the supplier UoM if any or the "
 "default Unit of Measure of the product otherwise"
 msgstr ""
+"Эта цена будет рассматриваться как цена за ед.изм. поставщика, если задана, "
+"иначе за единицу измерения ТМЦ."
 
 #. module: product
 #: model:product.category,name:product.product_category_accessories
@@ -1459,6 +1465,8 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the pricelist "
 "without removing it."
 msgstr ""
+"Если поле 'Активно' имеет значение Ложь, вы сможете скрыть прайс лист, не "
+"удаляя его."
 
 #. module: product
 #: field:product.product,qty_available:0
diff --git a/addons/stock_location/i18n/ru.po b/addons/stock_location/i18n/ru.po
index b5273b46a38..5103053c4f9 100644
--- a/addons/stock_location/i18n/ru.po
+++ b/addons/stock_location/i18n/ru.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2011-03-10 12:25+0000\n"
-"Last-Translator: Stanislav Hanzhin <Unknown>\n"
+"PO-Revision-Date: 2011-04-18 18:33+0000\n"
+"Last-Translator: Chertykov Denis <chertykov@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: 2011-03-11 06:00+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-04-19 06:21+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: stock_location
 #: selection:product.pulled.flow,picking_type:0
@@ -176,7 +176,7 @@ msgstr "Компания"
 #. module: stock_location
 #: view:product.product:0
 msgid "Logistics Flows"
-msgstr ""
+msgstr "Логистика потоков"
 
 #. module: stock_location
 #: help:stock.move,cancel_cascade:0
diff --git a/addons/warning/i18n/ru.po b/addons/warning/i18n/ru.po
index c10e8f42bfe..64b3d85cbc1 100644
--- a/addons/warning/i18n/ru.po
+++ b/addons/warning/i18n/ru.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2011-01-19 12:00+0000\n"
+"PO-Revision-Date: 2011-04-18 18:15+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@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: 2011-01-25 07:08+0000\n"
-"X-Generator: Launchpad (build 12177)\n"
+"X-Launchpad-Export-Date: 2011-04-19 06:21+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: warning
 #: model:ir.model,name:warning.model_purchase_order_line
@@ -55,13 +55,13 @@ msgstr "Предупреждение при покупке этого товар
 #. module: warning
 #: model:ir.model,name:warning.model_product_product
 msgid "Product"
-msgstr "Продукция"
+msgstr "ТМЦ"
 
 #. module: warning
 #: sql_constraint:purchase.order:0
 #: sql_constraint:sale.order:0
 msgid "Order Reference must be unique !"
-msgstr ""
+msgstr "Номер заказа должен быть уникальным!"
 
 #. module: warning
 #: view:product.product:0
@@ -173,7 +173,7 @@ msgstr ""
 #: code:addons/warning/warning.py:246
 #, python-format
 msgid "Alert for %s !"
-msgstr ""
+msgstr "Сигнал о %s !"
 
 #. module: warning
 #: field:res.partner,invoice_warn_msg:0
@@ -214,7 +214,7 @@ msgstr "Предупреждение при заказе на продажу"
 #. module: warning
 #: constraint:product.product:0
 msgid "Error: Invalid ean code"
-msgstr "Ошибка: Неправильный штрих-код"
+msgstr "Ошибка: Неверный штрих-код"
 
 #. module: warning
 #: field:res.partner,picking_warn_msg:0
@@ -224,14 +224,14 @@ msgstr "Сообщение для комплектования запасов"
 #. module: warning
 #: model:ir.model,name:warning.model_res_partner
 msgid "Partner"
-msgstr "Партнёр"
+msgstr "Контрагент"
 
 #. module: warning
 #: model:ir.model,name:warning.model_sale_order
 msgid "Sales Order"
-msgstr ""
+msgstr "Заказ на продажу"
 
 #. module: warning
 #: model:ir.model,name:warning.model_sale_order_line
 msgid "Sales Order Line"
-msgstr ""
+msgstr "Позиция заказа на продажу"
diff --git a/addons/wiki/i18n/ru.po b/addons/wiki/i18n/ru.po
index 7e77f036fde..b44ed73889d 100644
--- a/addons/wiki/i18n/ru.po
+++ b/addons/wiki/i18n/ru.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2011-03-16 15:49+0000\n"
-"Last-Translator: Stanislav Hanzhin <Unknown>\n"
+"PO-Revision-Date: 2011-04-18 18:24+0000\n"
+"Last-Translator: Chertykov Denis <chertykov@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: 2011-03-17 06:12+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-04-19 06:21+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: wiki
 #: field:wiki.groups,template:0
@@ -30,7 +30,7 @@ msgstr "Wiki страницы"
 #. module: wiki
 #: field:wiki.groups,method:0
 msgid "Display Method"
-msgstr ""
+msgstr "Метод вывода"
 
 #. module: wiki
 #: view:wiki.wiki:0
@@ -57,7 +57,7 @@ msgstr "Секция"
 #. module: wiki
 #: help:wiki.wiki,toc:0
 msgid "Indicates that this pages have a table of contents or not"
-msgstr ""
+msgstr "Показывает имеется ли содержание на этой странице"
 
 #. module: wiki
 #: model:ir.model,name:wiki.model_wiki_wiki_history
@@ -68,7 +68,7 @@ msgstr "История Wiki"
 #. module: wiki
 #: field:wiki.wiki,minor_edit:0
 msgid "Minor edit"
-msgstr ""
+msgstr "Малозначимое изменение"
 
 #. module: wiki
 #: view:wiki.wiki:0
@@ -79,18 +79,18 @@ msgstr "Содержание"
 #. module: wiki
 #: field:wiki.wiki,child_ids:0
 msgid "Child Pages"
-msgstr ""
+msgstr "Подчиненные страницы"
 
 #. module: wiki
 #: field:wiki.wiki,parent_id:0
 msgid "Parent Page"
-msgstr ""
+msgstr "Главная страница"
 
 #. module: wiki
 #: view:wiki.wiki:0
 #: field:wiki.wiki,write_uid:0
 msgid "Last Contributor"
-msgstr ""
+msgstr "Последний корректор"
 
 #. module: wiki
 #: field:wiki.create.menu,menu_parent_id:0
@@ -100,7 +100,7 @@ msgstr "Родительское меню"
 #. module: wiki
 #: help:wiki.wiki,group_id:0
 msgid "Topic, also called Wiki Group"
-msgstr ""
+msgstr "Тема, которая также называется Вики группа"
 
 #. module: wiki
 #: field:wiki.groups,name:0
@@ -117,12 +117,12 @@ msgstr "Заголовок"
 #. module: wiki
 #: model:ir.model,name:wiki.model_wiki_create_menu
 msgid "Wizard Create Menu"
-msgstr ""
+msgstr "Помощник создания меню"
 
 #. module: wiki
 #: field:wiki.wiki,history_id:0
 msgid "History Lines"
-msgstr ""
+msgstr "Строки истории"
 
 #. module: wiki
 #: view:wiki.wiki:0
@@ -139,12 +139,12 @@ msgstr "Внимание!"
 #: code:addons/wiki/wiki.py:236
 #, python-format
 msgid "There are no changes in revisions"
-msgstr ""
+msgstr "Нет изменений"
 
 #. module: wiki
 #: model:ir.module.module,shortdesc:wiki.module_meta_information
 msgid "Document Management - Wiki"
-msgstr ""
+msgstr "Управление документами - Вики"
 
 #. module: wiki
 #: field:wiki.create.menu,menu_name:0
@@ -159,7 +159,7 @@ msgstr "Описание"
 #. module: wiki
 #: field:wiki.wiki,review:0
 msgid "Needs Review"
-msgstr ""
+msgstr "Нуждается в проверке"
 
 #. module: wiki
 #: help:wiki.wiki,review:0
@@ -167,6 +167,8 @@ msgid ""
 "Indicates that this page should be reviewed, raising the attention of other "
 "contributors"
 msgstr ""
+"Указывает, что эта страница должна быть проверена, привлекает внимание "
+"других участников"
 
 #. module: wiki
 #: view:wiki.create.menu:0
@@ -177,7 +179,7 @@ msgstr "Информация меню"
 #. module: wiki
 #: model:ir.actions.act_window,name:wiki.act_wiki_wiki_history
 msgid "Page History"
-msgstr ""
+msgstr "История страницы"
 
 #. module: wiki
 #: selection:wiki.groups,method:0
@@ -244,12 +246,12 @@ msgstr "Описание группы"
 #. module: wiki
 #: help:wiki.wiki,section:0
 msgid "Use page section code like 1.2.1"
-msgstr ""
+msgstr "Используйте код выбора страницы, например: 1.2.1"
 
 #. module: wiki
 #: view:wiki.wiki.page.open:0
 msgid "Want to open a wiki page? "
-msgstr ""
+msgstr "Хотите открыть вики ? "
 
 #. module: wiki
 #: field:wiki.groups,section:0
@@ -275,6 +277,11 @@ msgid ""
 "keep track for the wiki groups, pages, and history\n"
 "    "
 msgstr ""
+"\n"
+"Базовый модуль для управления документацией (вики)\n"
+"\n"
+"отслеживание вики групп, страниц и истории\n"
+"    "
 
 #. module: wiki
 #: view:wiki.groups:0
@@ -286,6 +293,7 @@ msgstr "Заметки"
 #: help:wiki.groups,home:0
 msgid "Required to select home page if display method is Home Page"
 msgstr ""
+"Необходимо выбрать домашнюю страницу если метод вывода \"Домашняя страница\""
 
 #. module: wiki
 #: selection:wiki.groups,method:0
@@ -342,12 +350,12 @@ msgstr "Главная страница"
 #. module: wiki
 #: help:wiki.wiki,parent_id:0
 msgid "Allows you to link with the other page with in the current topic"
-msgstr ""
+msgstr "Позволяет сделать ссылку на другую страницу в текущем разделе"
 
 #. module: wiki
 #: view:wiki.wiki:0
 msgid "Modification Information"
-msgstr ""
+msgstr "Информация об изменениях"
 
 #. module: wiki
 #: model:ir.ui.menu,name:wiki.menu_wiki_configuration
@@ -395,7 +403,7 @@ msgstr "Создать меню"
 #. module: wiki
 #: field:wiki.wiki.history,minor_edit:0
 msgid "This is a major edit ?"
-msgstr ""
+msgstr "Это существенные изменения ?"
 
 #. module: wiki
 #: model:ir.actions.act_window,name:wiki.action_wiki_groups
@@ -404,7 +412,7 @@ msgstr ""
 #: model:ir.ui.menu,name:wiki.menu_action_wiki_groups
 #: view:wiki.groups:0
 msgid "Wiki Groups"
-msgstr ""
+msgstr "Вики группы"
 
 #. module: wiki
 #: view:wiki.wiki:0
@@ -427,7 +435,7 @@ msgstr "Содержание"
 #: view:wiki.groups:0
 #: view:wiki.wiki.page.open:0
 msgid "Open Wiki Page"
-msgstr ""
+msgstr "Открыть вики-страницу"
 
 #. module: wiki
 #: model:ir.model,name:wiki.model_wiki_wiki_page_open
@@ -454,7 +462,7 @@ msgstr "Необходима Проверка"
 #. module: wiki
 #: model:ir.actions.act_window,name:wiki.action_wiki_review
 msgid "Pages Waiting Review"
-msgstr ""
+msgstr "Страницы ожидающие проверки"
 
 #. module: wiki
 #: model:ir.actions.act_window,name:wiki.act_wiki_group_open

From 58a9ccd223e37c902c3cfab28955a4437d0db492 Mon Sep 17 00:00:00 2001
From: "Anup (OpenERP)" <ach@tinyerp.com>
Date: Tue, 19 Apr 2011 13:01:35 +0530
Subject: [PATCH 252/331] [FIX] product,hr_timesheet_invoice : Invoicing
 analytic lines(timesheet lines) were calculating wrong prices for product
 (Support SaaS Case : 5267)

bzr revid: ach@tinyerp.com-20110419073135-az6tvqgfbepkr94c
---
 .../wizard/hr_timesheet_invoice_create.py            | 12 +++++++-----
 addons/product/pricelist.py                          |  3 +++
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
index f3f720687cf..63d1b3d66f8 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
@@ -108,13 +108,13 @@ class hr_timesheet_invoice_create(osv.osv_memory):
 
             context2 = context.copy()
             context2['lang'] = partner.lang
-            cr.execute("SELECT product_id, to_invoice, sum(unit_amount) " \
+            cr.execute("SELECT product_id, to_invoice, sum(unit_amount),product_uom_id " \
                     "FROM account_analytic_line as line " \
                     "WHERE account_id = %s " \
                         "AND id IN %s AND to_invoice IS NOT NULL " \
-                    "GROUP BY product_id,to_invoice", (account.id, tuple(context['active_ids']),))
+                    "GROUP BY product_id,to_invoice,product_uom_id", (account.id, tuple(context['active_ids']),))
 
-            for product_id, factor_id, qty in cr.fetchall():
+            for product_id, factor_id, qty, uom in cr.fetchall():
                 product = product_obj.browse(cr, uid, product_id, context2)
                 if not product:
                     raise osv.except_osv(_('Error'), _('At least one line has no product !'))
@@ -129,9 +129,11 @@ class hr_timesheet_invoice_create(osv.osv_memory):
                 else:
                     factor_name = product_obj.name_get(cr, uid, [data['product']], context=context)[0][1]
 
+                ctx =  context.copy()
+                ctx.update({'uom':uom})
                 if account.pricelist_id:
                     pl = account.pricelist_id.id
-                    price = pro_price_obj.price_get(cr,uid,[pl], data['product'] or product_id, qty or 1.0, account.partner_id.id)[pl]
+                    price = pro_price_obj.price_get(cr,uid,[pl], data['product'] or product_id, qty or 1.0, account.partner_id.id, context=ctx)[pl]
                 else:
                     price = 0.0
 
@@ -147,7 +149,7 @@ class hr_timesheet_invoice_create(osv.osv_memory):
                     'name': factor_name,
                     'product_id': data['product'] or product_id,
                     'invoice_line_tax_id': [(6,0,tax)],
-                    'uos_id': product.uom_id.id,
+                    'uos_id': uom,
                     'account_id': account_id,
                     'account_analytic_id': account.id,
                 }
diff --git a/addons/product/pricelist.py b/addons/product/pricelist.py
index f52ad20bba3..2c9db54f0a3 100644
--- a/addons/product/pricelist.py
+++ b/addons/product/pricelist.py
@@ -265,6 +265,9 @@ class product_pricelist(osv.osv):
                                     price_type.currency_id.id, res['currency_id'],
                                     product_obj.price_get(cr, uid, [product_id],
                                         price_type.field,context=context)[product_id], round=False, context=context)
+                        
+                            if 'uom' in context:
+                                uom_price_already_computed = True
 
                         if price is not False:
                             price_limit = price

From da64dc059f21cbd1fcf07f11a78df613b8ae2c2d Mon Sep 17 00:00:00 2001
From: "Anup (OpenERP)" <ach@tinyerp.com>
Date: Tue, 19 Apr 2011 14:33:43 +0530
Subject: [PATCH 253/331] [FIX] base : Now It's Possible to save languages that
 have code having size>5

bzr revid: ach@tinyerp.com-20110419090343-7h35qwblnfeotsg2
---
 openerp/addons/base/res/partner/partner.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/addons/base/res/partner/partner.py b/openerp/addons/base/res/partner/partner.py
index a2de7f9d154..f02260a520f 100644
--- a/openerp/addons/base/res/partner/partner.py
+++ b/openerp/addons/base/res/partner/partner.py
@@ -116,7 +116,7 @@ class res_partner(osv.osv):
         'parent_id': fields.many2one('res.partner','Parent Partner'),
         'child_ids': fields.one2many('res.partner', 'parent_id', 'Partner Ref.'),
         'ref': fields.char('Reference', size=64, select=1),
-        'lang': fields.selection(_lang_get, 'Language', size=5, help="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."),
+        'lang': fields.selection(_lang_get, 'Language', help="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."),
         'user_id': fields.many2one('res.users', 'Salesman', help='The internal user that is in charge of communicating with this partner if any.'),
         'vat': fields.char('VAT',size=32 ,help="Value Added Tax number. Check the box if the partner is subjected to the VAT. Used by the VAT legal statement."),
         'bank_ids': fields.one2many('res.partner.bank', 'partner_id', 'Banks'),

From ab16169e1b02860dd68448d803a308fbf79ab967 Mon Sep 17 00:00:00 2001
From: "AMP (OpenERP)" <amp@tinyerp.com>
Date: Tue, 19 Apr 2011 14:54:43 +0530
Subject: [PATCH 254/331] [FIX] point_of_sale : pass the partner refernce in
 delivery order

bzr revid: amp@tinyerp.com-20110419092443-hq2fn23jjc9a4h1c
---
 addons/point_of_sale/point_of_sale.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/addons/point_of_sale/point_of_sale.py b/addons/point_of_sale/point_of_sale.py
index a2123cb287c..09bb4210561 100644
--- a/addons/point_of_sale/point_of_sale.py
+++ b/addons/point_of_sale/point_of_sale.py
@@ -427,11 +427,13 @@ class pos_order(osv.osv):
         pick_name = self.pool.get('ir.sequence').get(cr, uid, 'stock.picking.out')
         orders = self.browse(cr, uid, ids, context=context)
         for order in orders:
+            addr = self.pool.get('res.partner').address_get(cr, uid, [order.partner_id.id], ['delivery'])
             if not order.picking_id:
                 new = True
                 picking_id = picking_obj.create(cr, uid, {
                     'name': pick_name,
                     'origin': order.name,
+                    'address_id': addr.get('delivery',False),
                     'type': 'out',
                     'state': 'draft',
                     'move_type': 'direct',

From 7b35e1bbf24c3abe9f7f22e0c4831ac48332a10c Mon Sep 17 00:00:00 2001
From: "AMP (OpenERP)" <amp@tinyerp.com>
Date: Tue, 19 Apr 2011 15:42:25 +0530
Subject: [PATCH 255/331] [FIX] crm_caldav : Usability Improvement

bzr revid: amp@tinyerp.com-20110419101225-arhrw2yoagsx5nu4
---
 addons/crm_caldav/crm_caldav_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/crm_caldav/crm_caldav_view.xml b/addons/crm_caldav/crm_caldav_view.xml
index cc1b6d00396..1fc6c341cb5 100644
--- a/addons/crm_caldav/crm_caldav_view.xml
+++ b/addons/crm_caldav/crm_caldav_view.xml
@@ -13,7 +13,7 @@
         </record>
     
         <menuitem
-            name="Synchronyze this calendar"
+            name="Synchronize this Calendar"
             action="action_caldav_browse"
             id="menu_caldav_browse"
             icon="STOCK_EXECUTE"

From 53c757663c75586bb70c1f28e9e7e9cf9f066040 Mon Sep 17 00:00:00 2001
From: "Anup (OpenERP)" <ach@tinyerp.com>
Date: Tue, 19 Apr 2011 15:46:05 +0530
Subject: [PATCH 256/331] [FIX] crm : Typos fixed in wizards

bzr revid: ach@tinyerp.com-20110419101605-zveh2v8hm3uygdgt
---
 addons/crm/wizard/crm_lead_to_opportunity.py      | 2 +-
 addons/crm/wizard/crm_phonecall_to_opportunity.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/crm/wizard/crm_lead_to_opportunity.py b/addons/crm/wizard/crm_lead_to_opportunity.py
index 33ec426d7d6..4b6e047f475 100644
--- a/addons/crm/wizard/crm_lead_to_opportunity.py
+++ b/addons/crm/wizard/crm_lead_to_opportunity.py
@@ -105,7 +105,7 @@ class crm_lead2opportunity_partner(osv.osv_memory):
 
         for lead in lead_obj.browse(cr, uid, context.get('active_ids', []), context=context):
             if lead.state in ['done', 'cancel']:
-                raise osv.except_osv(_("Warning !"), _("Closed/Cancelled Leads Could not convert into Opportunity"))
+                raise osv.except_osv(_("Warning !"), _("Closed/Cancelled Leads can not be converted into Opportunity"))
         return False
 
     def _convert(self, cr, uid, ids, lead, partner_id, stage_ids, context=None):
diff --git a/addons/crm/wizard/crm_phonecall_to_opportunity.py b/addons/crm/wizard/crm_phonecall_to_opportunity.py
index 98e3c978eb0..32810d2f15e 100644
--- a/addons/crm/wizard/crm_phonecall_to_opportunity.py
+++ b/addons/crm/wizard/crm_phonecall_to_opportunity.py
@@ -55,7 +55,7 @@ class crm_phonecall2opportunity(osv.osv_memory):
         case = phonecall_obj.browse(cr, uid, record_id, context=context)
         if case.state in ['done', 'cancel']:
                 raise osv.except_osv(_("Warning"), _("Closed/Cancelled Phone \
-Call Could not convert into Opportunity"))
+Call can not be converted into Opportunity"))
 
 
     def action_apply(self, cr, uid, ids, context=None):

From 9f84f223db2f0ae30d766f9a2d6165fb2b992df2 Mon Sep 17 00:00:00 2001
From: "Anup (OpenERP)" <ach@tinyerp.com>
Date: Tue, 19 Apr 2011 15:57:03 +0530
Subject: [PATCH 257/331] [FIX] hr_contract : Notes Separator added which
 describes the use of the ntoes field in the Advantages Section

bzr revid: ach@tinyerp.com-20110419102703-zjsp7i24hbjjwi35
---
 addons/hr_contract/hr_contract_view.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/hr_contract/hr_contract_view.xml b/addons/hr_contract/hr_contract_view.xml
index 67607af8146..524ef5f57f4 100644
--- a/addons/hr_contract/hr_contract_view.xml
+++ b/addons/hr_contract/hr_contract_view.xml
@@ -183,6 +183,7 @@
                         <separator colspan="2" string="Advantages"/>
                         <field name="advantages_net"/>
                         <field name="advantages_gross"/>
+                        <separator colspan="2" string="Advantages Notes"/>
                         <field name="advantages" nolabel="1" colspan="2"/>
                         </group>
                         <separator colspan="4" string="Notes"/>

From 483c4374311f64fea0395221a0b0d0d13ed95351 Mon Sep 17 00:00:00 2001
From: "AMP (OpenERP)" <amp@tinyerp.com>
Date: Tue, 19 Apr 2011 16:15:57 +0530
Subject: [PATCH 258/331] [FIX] account : Usability Improvement

bzr revid: amp@tinyerp.com-20110419104557-n0g8ojzztcyefn17
---
 addons/account/account.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index c11d7394100..75041705547 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -2146,8 +2146,8 @@ class account_model_line(osv.osv):
     _description = "Account Model Entries"
     _columns = {
         'name': fields.char('Name', size=64, required=True),
-        'sequence': fields.integer('Sequence', required=True, help="The sequence field is used to order the resources from lower sequences to higher ones"),
-        'quantity': fields.float('Quantity', digits_compute=dp.get_precision('Account'), help="The optional quantity on entries"),
+        'sequence': fields.integer('Sequence', required=True, help="The sequence field is used to order the resources from lower sequences to higher ones."),
+        'quantity': fields.float('Quantity', digits_compute=dp.get_precision('Account'), help="The optional quantity on entries."),
         'debit': fields.float('Debit', digits_compute=dp.get_precision('Account')),
         'credit': fields.float('Credit', digits_compute=dp.get_precision('Account')),
         'account_id': fields.many2one('account.account', 'Account', required=True, ondelete="cascade"),
@@ -2156,7 +2156,7 @@ class account_model_line(osv.osv):
         'amount_currency': fields.float('Amount Currency', help="The amount expressed in an optional other currency."),
         'currency_id': fields.many2one('res.currency', 'Currency'),
         'partner_id': fields.many2one('res.partner', 'Partner'),
-        'date_maturity': fields.selection([('today','Date of the day'), ('partner','Partner Payment Term')], 'Maturity date', help="The maturity date of the generated entries for this model. You can choose between the creation date or the creation date of the entries plus the partner payment terms."),
+        'date_maturity': fields.selection([('today','Date of the day'), ('partner','Partner Payment Term')], 'Maturity Date', help="The maturity date of the generated entries for this model. You can choose between the creation date or the creation date of the entries plus the partner payment terms."),
     }
     _order = 'sequence'
     _sql_constraints = [

From 2704f564dd3e69d9574107a0eaf8ef3a9463a4d3 Mon Sep 17 00:00:00 2001
From: "Anup (OpenERP)" <ach@tinyerp.com>
Date: Tue, 19 Apr 2011 16:20:57 +0530
Subject: [PATCH 259/331] [FIX] hr_recruitment : Partner should be disabled
 untill the person is Hired

bzr revid: ach@tinyerp.com-20110419105057-tfvbtorx0aqgi6rl
---
 addons/hr_recruitment/hr_recruitment_view.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index ee7c9d6100c..1f2cf865c9a 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -97,15 +97,15 @@
                     <page string="Job Info">
                         <group col="3" colspan="2">
                             <separator colspan="3" string="Contact"/>
-                            <field name="partner_id" on_change="onchange_partner_id(partner_id, email_from)" />
+                            <field name="partner_id" on_change="onchange_partner_id(partner_id, email_from)" attrs="{'readonly':[('state','not in','done')]}"/>
                             <button string="Create Partner"
                                     name="%(action_hr_recruitment_partner_create)d"
-                                    icon="gtk-index" type="action" attrs="{'readonly':[('partner_id','!=',False)]}" groups="base.group_partner_manager"/>
+                                    icon="gtk-index" type="action" attrs="{'readonly':['!',('partner_id','!=',False),('state','not in','done')]}" groups="base.group_partner_manager"/>
                             <newline/>
-                            <field name="partner_address_id" on_change="onchange_partner_address_id(partner_address_id, email_from)" colspan="3"/>
-                            <field name="email_from" colspan="3"/>
-                            <field name="partner_phone" colspan="3"/>
-                            <field name="partner_mobile" colspan="3"/>
+                            <field name="partner_address_id" on_change="onchange_partner_address_id(partner_address_id, email_from)" colspan="3" attrs="{'readonly':[('state','not in','done')]}"/>
+                            <field name="email_from" colspan="3" attrs="{'readonly':[('state','not in','done')]}"/>
+                            <field name="partner_phone" colspan="3" attrs="{'readonly':[('state','not in','done')]}"/>
+                            <field name="partner_mobile" colspan="3" attrs="{'readonly':[('state','not in','done')]}"/>
                         </group>
                         <group col="2" colspan="2">
                             <separator colspan="2" string="Contract Data"/>

From d7b4c39ff813018d86dc2dd04eedc2542ac24aed Mon Sep 17 00:00:00 2001
From: "Anup (OpenERP)" <ach@tinyerp.com>
Date: Tue, 19 Apr 2011 16:27:33 +0530
Subject: [PATCH 260/331] [FIX] hr_recruitment : Button names should be refuse
 and hire

bzr revid: ach@tinyerp.com-20110419105733-hz13pahb9ykq4m2d
---
 addons/hr_recruitment/hr_recruitment_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index ee7c9d6100c..d43cd7bf581 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -130,10 +130,10 @@
                         <separator colspan="4" string="Status"/>
                         <group col="8" colspan="4">
                             <field name="state"/>
-                            <button name="case_cancel" string="Refused" states="draft,open,pending" type="object" icon="gtk-cancel"/>
+                            <button name="case_cancel" string="Refuse" states="draft,open,pending" type="object" icon="gtk-cancel"/>
                             <button name="case_open" string="In Progress" states="draft,pending" type="object" icon="gtk-go-forward"/>
                             <button name="case_pending" string="Pending" states="open" type="object" icon="gtk-media-pause"/>
-                            <button name="%(action_hr_recruitment_hired_employee)d" string="Hired" states="open,pending" type="action" icon="terp-partner"/>
+                            <button name="%(action_hr_recruitment_hired_employee)d" string="Hire" states="open,pending" type="action" icon="terp-partner"/>
                             <button name="case_reset" string="Reset to New" states="done,cancel" type="object" icon="gtk-convert"/>
                         </group>
                    </page>

From 47fbcd34a8af1217fe688eb2469f97f93209a729 Mon Sep 17 00:00:00 2001
From: "Anup (OpenERP)" <ach@tinyerp.com>
Date: Tue, 19 Apr 2011 16:55:23 +0530
Subject: [PATCH 261/331] [FIX] crm : Confusing Typo in Schedule Phone call
 wizard changed.

bzr revid: ach@tinyerp.com-20110419112523-0nvutph0kqqx9fiy
---
 addons/crm/wizard/crm_opportunity_to_phonecall_view.xml | 2 +-
 addons/crm/wizard/crm_phonecall_to_phonecall_view.xml   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml b/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml
index 23ddaad5bfe..9a623d2eaab 100644
--- a/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml
+++ b/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml
@@ -16,7 +16,7 @@
                     <newline/>
                     <field name="user_id" />
                     <field name="section_id" widget="selection" />
-                    <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.phonecall')]"/>
+                    <field name="categ_id" string="Type" widget="selection" domain="[('object_id.model', '=', 'crm.phonecall')]"/>
                     <separator string="" colspan="4"/>
                     <group colspan="4">
                         <label string ="" colspan="2"/>
diff --git a/addons/crm/wizard/crm_phonecall_to_phonecall_view.xml b/addons/crm/wizard/crm_phonecall_to_phonecall_view.xml
index 34a0d2c158e..82c3191a17b 100644
--- a/addons/crm/wizard/crm_phonecall_to_phonecall_view.xml
+++ b/addons/crm/wizard/crm_phonecall_to_phonecall_view.xml
@@ -15,7 +15,7 @@
                         <field name="date" string="Planned Date"/>
                         <field name="user_id" />
                         <field name="section_id"/>
-                        <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.phonecall')]"/>
+                        <field name="categ_id" string="Type" widget="selection" domain="[('object_id.model', '=', 'crm.phonecall')]"/>
                         <separator string=" " colspan="4"/>
                         <group colspan="4" col="3" >
                             <label string=" " />

From bf48bbbdcf58b5a91b0b1f9d63158c3ceeec68f8 Mon Sep 17 00:00:00 2001
From: "Anup (OpenERP)" <ach@tinyerp.com>
Date: Tue, 19 Apr 2011 17:09:24 +0530
Subject: [PATCH 262/331] [FIX] crm : Tool Tip on Recurrent Improved in Meeting

bzr revid: ach@tinyerp.com-20110419113924-zq48lf4uin6lbc3v
---
 addons/crm/crm_meeting_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index aba69889f57..ef942426be3 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -44,7 +44,7 @@
                     <field name="alarm_id" string="Reminder"
                         widget="selection" />
                     <group colspan="2" col="4" attrs="{'readonly': ['|', ('recurrent_uid','!=',False), ('state','=','done')]}">
-                           <field name="recurrency"/>
+                           <field name="recurrency" help="Is Meeting is occurring frequently or repeatedly?"/>
                            <field name="edit_all" attrs="{'invisible':[('recurrency','=', False)]}"
                                 on_change="onchange_edit_all(rrule_type,edit_all)"/>
                     </group>

From 1060ac58c368dc3ef3aa8c88b72c79846b45c38e Mon Sep 17 00:00:00 2001
From: "Anup (OpenERP)" <ach@tinyerp.com>
Date: Tue, 19 Apr 2011 17:29:36 +0530
Subject: [PATCH 263/331] [FIX] base_calendar : Typo Fixed on notification for
 missing email on invitation wizard

bzr revid: ach@tinyerp.com-20110419115936-2x0o1rrvu9sov1b0
---
 addons/base_calendar/wizard/base_calendar_invite_attendee.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/base_calendar/wizard/base_calendar_invite_attendee.py b/addons/base_calendar/wizard/base_calendar_invite_attendee.py
index ea4d5aca85f..59bde615645 100644
--- a/addons/base_calendar/wizard/base_calendar_invite_attendee.py
+++ b/addons/base_calendar/wizard/base_calendar_invite_attendee.py
@@ -140,7 +140,7 @@ send an Email to Invited Person')
                 if not mail_to:
                     name =  map(lambda x: x[1], filter(lambda x: type==x[0], \
                                        self._columns['type'].selection))
-                    raise osv.except_osv(_('Error!'), ("%s must have an email  Address to send mail") %(name[0]))
+                    raise osv.except_osv(_('Error!'), ("%s must have an email  address to send mail") %(name[0]))
                 att_obj._send_mail(cr, uid, attendees, mail_to, \
                        email_from = current_user.user_email or tools.config.get('email_from', False))
 

From 0d9276a6c907122129a64d3ee728a6042951e15e Mon Sep 17 00:00:00 2001
From: Jigar Amin <jam@tinyerp.com>
Date: Tue, 19 Apr 2011 17:41:32 +0530
Subject: [PATCH 264/331] [FIX] crm : lp:747776 added condition for the ids

lp bug: https://launchpad.net/bugs/747776 fixed

bzr revid: jam@tinyerp.com-20110419121132-ttcra01mxigd2tp1
---
 addons/crm/crm.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index f25e4c1a0bf..d7b67879a7a 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -666,7 +666,8 @@ class crm_case_section(osv.osv):
         """
         if context is None:
             context = {}
-
+        if not isinstance(ids, list) : 
+            ids = [ids]
         res = []
         if not ids:
             return res

From 8cd3b960193f5709cbaf73f1575ed7d7bd454f00 Mon Sep 17 00:00:00 2001
From: "AMP (OpenERP)" <amp@tinyerp.com>
Date: Tue, 19 Apr 2011 18:41:54 +0530
Subject: [PATCH 265/331] [FIX] Usability : Usability Improvement

bzr revid: amp@tinyerp.com-20110419131154-1ucsrn7wtpq83apg
---
 .../base/publisher_warranty/publisher_warranty_view.xml     | 5 +++--
 openerp/addons/base/res/bank_view.xml                       | 2 +-
 openerp/addons/base/res/partner/partner.py                  | 4 ++--
 openerp/addons/base/res/res_currency.py                     | 6 +++---
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/openerp/addons/base/publisher_warranty/publisher_warranty_view.xml b/openerp/addons/base/publisher_warranty/publisher_warranty_view.xml
index 7ee95eecde9..8c40d0a1c6b 100644
--- a/openerp/addons/base/publisher_warranty/publisher_warranty_view.xml
+++ b/openerp/addons/base/publisher_warranty/publisher_warranty_view.xml
@@ -37,9 +37,10 @@
                             <field name="check_opw"/>
                         </group>
                         <group col="2" colspan="3">
-                            <button name="check_validity" string="Validate" type="object"
+                            <button name="check_validity" icon="camera_test.png
+" string="Validate" type="object"
                             attrs="{'invisible':[('state','in',['valid', 'terminated', 'canceled'])]}"/>
-                            <button name="check_validity" string="Refresh Validation Dates" type="object"
+                            <button name="check_validity" icon="camera_test.png" string="Refresh Validation Dates" type="object"
                             attrs="{'invisible':[('state','in',['unvalidated'])]}"/>
                         </group>
                     </group>
diff --git a/openerp/addons/base/res/bank_view.xml b/openerp/addons/base/res/bank_view.xml
index 2929055b21e..10c78e847a2 100644
--- a/openerp/addons/base/res/bank_view.xml
+++ b/openerp/addons/base/res/bank_view.xml
@@ -25,7 +25,7 @@
                     <group colspan="2" col="2">
                         <field name="phone"/>
                         <field name="fax"/>
-                        <field name="email"/>
+                        <field name="email" widget="email"/>
                     </group>
                 </form>
             </field>
diff --git a/openerp/addons/base/res/partner/partner.py b/openerp/addons/base/res/partner/partner.py
index a2de7f9d154..f773a101827 100644
--- a/openerp/addons/base/res/partner/partner.py
+++ b/openerp/addons/base/res/partner/partner.py
@@ -112,7 +112,7 @@ class res_partner(osv.osv):
     _columns = {
         'name': fields.char('Name', size=128, required=True, select=True),
         'date': fields.date('Date', select=1),
-        'title': fields.many2one('res.partner.title','Partner Form'),
+        'title': fields.many2one('res.partner.title','Partner Firm'),
         'parent_id': fields.many2one('res.partner','Parent Partner'),
         'child_ids': fields.one2many('res.partner', 'parent_id', 'Partner Ref.'),
         'ref': fields.char('Reference', size=64, select=1),
@@ -120,7 +120,7 @@ class res_partner(osv.osv):
         'user_id': fields.many2one('res.users', 'Salesman', help='The internal user that is in charge of communicating with this partner if any.'),
         'vat': fields.char('VAT',size=32 ,help="Value Added Tax number. Check the box if the partner is subjected to the VAT. Used by the VAT legal statement."),
         'bank_ids': fields.one2many('res.partner.bank', 'partner_id', 'Banks'),
-        'website': fields.char('Website',size=64, help="Website of Partner"),
+        'website': fields.char('Website',size=64, help="Website of Partner."),
         'comment': fields.text('Notes'),
         'address': fields.one2many('res.partner.address', 'partner_id', 'Contacts'),
         'category_id': fields.many2many('res.partner.category', 'res_partner_category_rel', 'partner_id', 'category_id', 'Categories'),
diff --git a/openerp/addons/base/res/res_currency.py b/openerp/addons/base/res/res_currency.py
index 2565d471cd3..caa97ec0339 100644
--- a/openerp/addons/base/res/res_currency.py
+++ b/openerp/addons/base/res/res_currency.py
@@ -49,12 +49,12 @@ class res_currency(osv.osv):
     _columns = {
         # Note: 'code' column was removed as of v6.0, the 'name' should now hold the ISO code.
         'name': fields.char('Currency', size=32, required=True, help="Currency Code (ISO 4217)"),
-        'symbol': fields.char('Symbol', size=3, help="Currency sign, to be used when printing amounts"),
+        'symbol': fields.char('Symbol', size=3, help="Currency sign, to be used when printing amounts."),
         'rate': fields.function(_current_rate, method=True, string='Current Rate', digits=(12,6),
-            help='The rate of the currency to the currency of rate 1'),
+            help='The rate of the currency to the currency of rate 1.'),
         'rate_ids': fields.one2many('res.currency.rate', 'currency_id', 'Rates'),
         'accuracy': fields.integer('Computational Accuracy'),
-        'rounding': fields.float('Rounding factor', digits=(12,6)),
+        'rounding': fields.float('Rounding Factor', digits=(12,6)),
         'active': fields.boolean('Active'),
         'company_id':fields.many2one('res.company', 'Company'),
         'date': fields.date('Date'),

From 537acc4dc44947a90a0bda5c3787afe753baf4cd Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Wed, 20 Apr 2011 04:36:50 +0000
Subject: [PATCH 266/331] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20110420043650-t0kj7brgbg2vz79t
---
 addons/account/i18n/pt_BR.po      |   12 +-
 addons/account_payment/i18n/nb.po |  714 ++++++++++
 addons/marketing/i18n/id.po       |  119 ++
 addons/sale/i18n/gl.po            | 2074 +++++++++++++++++++++++++++++
 4 files changed, 2913 insertions(+), 6 deletions(-)
 create mode 100644 addons/account_payment/i18n/nb.po
 create mode 100644 addons/marketing/i18n/id.po
 create mode 100644 addons/sale/i18n/gl.po

diff --git a/addons/account/i18n/pt_BR.po b/addons/account/i18n/pt_BR.po
index dcdb807b7d9..53eccc4f28f 100644
--- a/addons/account/i18n/pt_BR.po
+++ b/addons/account/i18n/pt_BR.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-03-08 21:39+0000\n"
-"Last-Translator: Emerson <Unknown>\n"
+"PO-Revision-Date: 2011-04-19 14:37+0000\n"
+"Last-Translator: Nédio Batista Marques <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: 2011-03-18 04:56+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-04-20 04:36+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -4150,7 +4150,7 @@ msgstr "Extratos Bancários são lançados no sistema."
 #: code:addons/account/wizard/account_reconcile.py:133
 #, python-format
 msgid "Reconcile Writeoff"
-msgstr ""
+msgstr "Reconcílie a amortização"
 
 #. module: account
 #: field:account.model.line,date_maturity:0
@@ -4956,7 +4956,7 @@ msgstr "Permite cancelar lançamentos"
 #. module: account
 #: field:account.tax.code,sign:0
 msgid "Coefficent for parent"
-msgstr ""
+msgstr "Coeficiente para conta principal"
 
 #. module: account
 #: report:account.partner.balance:0
diff --git a/addons/account_payment/i18n/nb.po b/addons/account_payment/i18n/nb.po
new file mode 100644
index 00000000000..2e2e11a56a8
--- /dev/null
+++ b/addons/account_payment/i18n/nb.po
@@ -0,0 +1,714 @@
+# Norwegian Bokmal translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2011-04-19 10:53+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Bokmal <nb@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: 2011-04-20 04:36+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
+
+#. module: account_payment
+#: field:payment.order,date_scheduled:0
+msgid "Scheduled date if fixed"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,currency:0
+msgid "Partner Currency"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.order:0
+msgid "Set to draft"
+msgstr ""
+
+#. module: account_payment
+#: help:payment.order,mode:0
+msgid "Select the Payment Mode to be applied."
+msgstr ""
+
+#. module: account_payment
+#: view:payment.mode:0
+#: view:payment.order:0
+msgid "Group By..."
+msgstr "Grupper etter..."
+
+#. module: account_payment
+#: model:ir.module.module,description:account_payment.module_meta_information
+msgid ""
+"\n"
+"This module provides :\n"
+"* a more efficient way to manage invoice payment.\n"
+"* a basic mechanism to easily plug various automated payment.\n"
+"    "
+msgstr ""
+
+#. module: account_payment
+#: field:payment.order,line_ids:0
+msgid "Payment lines"
+msgstr "Betalingslinjer"
+
+#. module: account_payment
+#: view:payment.line:0
+#: field:payment.line,info_owner:0
+#: view:payment.order:0
+msgid "Owner Account"
+msgstr ""
+
+#. module: account_payment
+#: help:payment.order,state:0
+msgid ""
+"When an order is placed the state is 'Draft'.\n"
+" Once the bank is confirmed the state is set to 'Confirmed'.\n"
+" Then the order is paid the state is 'Done'."
+msgstr ""
+
+#. module: account_payment
+#: help:account.invoice,amount_to_pay:0
+msgid ""
+"The amount which should be paid at the current date\n"
+"minus the amount which is already in payment order"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.mode,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.order,date_prefered:0
+msgid "Preferred date"
+msgstr ""
+
+#. module: account_payment
+#: selection:payment.line,state:0
+msgid "Free"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.order.create,entries:0
+msgid "Entries"
+msgstr ""
+
+#. module: account_payment
+#: report:payment.order:0
+msgid "Used Account"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,ml_maturity_date:0
+#: field:payment.order.create,duedate:0
+msgid "Due Date"
+msgstr ""
+
+#. module: account_payment
+#: constraint:account.move.line:0
+msgid "You can not create move line on closed account."
+msgstr ""
+
+#. module: account_payment
+#: view:account.move.line:0
+msgid "Account Entry Line"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.order.create:0
+msgid "_Add to payment order"
+msgstr ""
+
+#. module: account_payment
+#: model:ir.actions.act_window,name:account_payment.action_account_payment_populate_statement
+#: model:ir.actions.act_window,name:account_payment.action_account_populate_statement_confirm
+msgid "Payment Populate statement"
+msgstr ""
+
+#. module: account_payment
+#: report:payment.order:0
+#: view:payment.order:0
+msgid "Amount"
+msgstr "Beløp"
+
+#. module: account_payment
+#: sql_constraint:account.move.line:0
+msgid "Wrong credit or debit value in accounting entry !"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.order:0
+msgid "Total in Company Currency"
+msgstr ""
+
+#. module: account_payment
+#: selection:payment.order,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: account_payment
+#: model:ir.actions.act_window,name:account_payment.action_payment_order_tree_new
+msgid "New Payment Order"
+msgstr ""
+
+#. module: account_payment
+#: report:payment.order:0
+#: field:payment.order,reference:0
+msgid "Reference"
+msgstr "Referanse"
+
+#. module: account_payment
+#: sql_constraint:payment.line:0
+msgid "The payment line name must be unique!"
+msgstr ""
+
+#. module: account_payment
+#: model:ir.actions.act_window,name:account_payment.action_payment_order_tree
+#: model:ir.ui.menu,name:account_payment.menu_action_payment_order_form
+msgid "Payment Orders"
+msgstr ""
+
+#. module: account_payment
+#: selection:payment.order,date_prefered:0
+msgid "Directly"
+msgstr ""
+
+#. module: account_payment
+#: model:ir.actions.act_window,name:account_payment.action_payment_line_form
+#: model:ir.model,name:account_payment.model_payment_line
+#: view:payment.line:0
+#: view:payment.order:0
+msgid "Payment Line"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.line:0
+msgid "Amount Total"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.order:0
+#: selection:payment.order,state:0
+msgid "Confirmed"
+msgstr ""
+
+#. module: account_payment
+#: help:payment.line,ml_date_created:0
+msgid "Invoice Effective Date"
+msgstr ""
+
+#. module: account_payment
+#: report:payment.order:0
+msgid "Execution Type"
+msgstr ""
+
+#. module: account_payment
+#: selection:payment.line,state:0
+msgid "Structured"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.order:0
+#: field:payment.order,state:0
+msgid "State"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.line:0
+#: view:payment.order:0
+msgid "Transaction Information"
+msgstr ""
+
+#. module: account_payment
+#: model:ir.actions.act_window,name:account_payment.action_payment_mode_form
+#: model:ir.model,name:account_payment.model_payment_mode
+#: model:ir.ui.menu,name:account_payment.menu_action_payment_mode_form
+#: view:payment.mode:0
+#: view:payment.order:0
+msgid "Payment Mode"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,ml_date_created:0
+msgid "Effective Date"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,ml_inv_ref:0
+msgid "Invoice Ref."
+msgstr ""
+
+#. module: account_payment
+#: help:payment.order,date_prefered:0
+msgid ""
+"Choose an option for the Payment Order:'Fixed' stands for a date specified "
+"by you.'Directly' stands for the direct execution.'Due date' stands for the "
+"scheduled date of execution."
+msgstr ""
+
+#. module: account_payment
+#: code:addons/account_payment/account_move_line.py:110
+#, python-format
+msgid "Error !"
+msgstr ""
+
+#. module: account_payment
+#: view:account.move.line:0
+msgid "Total debit"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.order,date_done:0
+msgid "Execution date"
+msgstr ""
+
+#. module: account_payment
+#: help:payment.mode,journal:0
+msgid "Bank or Cash Journal for the Payment Mode"
+msgstr ""
+
+#. module: account_payment
+#: selection:payment.order,date_prefered:0
+msgid "Fixed date"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,info_partner:0
+#: view:payment.order:0
+msgid "Destination Account"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.line:0
+msgid "Desitination Account"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.order:0
+msgid "Search Payment Orders"
+msgstr ""
+
+#. module: account_payment
+#: constraint:account.move.line:0
+msgid ""
+"You can not create move line on receivable/payable account without partner"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,create_date:0
+msgid "Created"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.order:0
+msgid "Select Invoices to Pay"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.line:0
+msgid "Currency Amount Total"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.order:0
+msgid "Make Payments"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,state:0
+msgid "Communication Type"
+msgstr ""
+
+#. module: account_payment
+#: model:ir.module.module,shortdesc:account_payment.module_meta_information
+msgid "Payment Management"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,bank_statement_line_id:0
+msgid "Bank statement line"
+msgstr ""
+
+#. module: account_payment
+#: selection:payment.order,date_prefered:0
+msgid "Due date"
+msgstr ""
+
+#. module: account_payment
+#: field:account.invoice,amount_to_pay:0
+msgid "Amount to be paid"
+msgstr ""
+
+#. module: account_payment
+#: report:payment.order:0
+msgid "Currency"
+msgstr ""
+
+#. module: account_payment
+#: view:account.payment.make.payment:0
+msgid "Yes"
+msgstr ""
+
+#. module: account_payment
+#: help:payment.line,info_owner:0
+msgid "Address of the Main Partner"
+msgstr ""
+
+#. module: account_payment
+#: help:payment.line,date:0
+msgid ""
+"If no payment date is specified, the bank will treat this payment line "
+"directly"
+msgstr ""
+
+#. module: account_payment
+#: model:ir.model,name:account_payment.model_account_payment_populate_statement
+msgid "Account Payment Populate Statement"
+msgstr ""
+
+#. module: account_payment
+#: help:payment.mode,name:0
+msgid "Mode of Payment"
+msgstr ""
+
+#. module: account_payment
+#: report:payment.order:0
+msgid "Value Date"
+msgstr ""
+
+#. module: account_payment
+#: report:payment.order:0
+msgid "Payment Type"
+msgstr ""
+
+#. module: account_payment
+#: help:payment.line,amount_currency:0
+msgid "Payment amount in the partner currency"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.order:0
+#: selection:payment.order,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: account_payment
+#: help:payment.line,communication2:0
+msgid "The successor message of Communication."
+msgstr ""
+
+#. module: account_payment
+#: code:addons/account_payment/account_move_line.py:110
+#, python-format
+msgid "No partner defined on entry line"
+msgstr ""
+
+#. module: account_payment
+#: help:payment.line,info_partner:0
+msgid "Address of the Ordering Customer."
+msgstr ""
+
+#. module: account_payment
+#: view:account.payment.populate.statement:0
+msgid "Populate Statement:"
+msgstr ""
+
+#. module: account_payment
+#: view:account.move.line:0
+msgid "Total credit"
+msgstr ""
+
+#. module: account_payment
+#: help:payment.order,date_scheduled:0
+msgid "Select a date if you have chosen Preferred Date to be fixed."
+msgstr ""
+
+#. module: account_payment
+#: field:payment.order,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: account_payment
+#: field:account.payment.populate.statement,lines:0
+#: model:ir.actions.act_window,name:account_payment.act_account_invoice_2_payment_line
+msgid "Payment Lines"
+msgstr ""
+
+#. module: account_payment
+#: model:ir.model,name:account_payment.model_account_move_line
+msgid "Journal Items"
+msgstr ""
+
+#. module: account_payment
+#: constraint:account.move.line:0
+msgid "Company must be same for its related account and period."
+msgstr ""
+
+#. module: account_payment
+#: help:payment.line,move_line_id:0
+msgid ""
+"This Entry Line will be referred for the information of the ordering "
+"customer."
+msgstr ""
+
+#. module: account_payment
+#: view:payment.order.create:0
+msgid "Search"
+msgstr ""
+
+#. module: account_payment
+#: model:ir.actions.report.xml,name:account_payment.payment_order1
+#: model:ir.model,name:account_payment.model_payment_order
+msgid "Payment Order"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,date:0
+msgid "Payment Date"
+msgstr ""
+
+#. module: account_payment
+#: report:payment.order:0
+msgid "Total:"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.order,date_created:0
+msgid "Creation date"
+msgstr ""
+
+#. module: account_payment
+#: view:account.payment.populate.statement:0
+msgid "ADD"
+msgstr ""
+
+#. module: account_payment
+#: view:account.bank.statement:0
+msgid "Import payment lines"
+msgstr ""
+
+#. module: account_payment
+#: field:account.move.line,amount_to_pay:0
+msgid "Amount to pay"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,amount:0
+msgid "Amount in Company Currency"
+msgstr ""
+
+#. module: account_payment
+#: help:payment.line,partner_id:0
+msgid "The Ordering Customer"
+msgstr ""
+
+#. module: account_payment
+#: model:ir.model,name:account_payment.model_account_payment_make_payment
+msgid "Account make payment"
+msgstr ""
+
+#. module: account_payment
+#: report:payment.order:0
+msgid "Invoice Ref"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,name:0
+msgid "Your Reference"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.order,mode:0
+msgid "Payment mode"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.order:0
+msgid "Payment order"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.line:0
+#: view:payment.order:0
+msgid "General Information"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.order:0
+#: selection:payment.order,state:0
+msgid "Done"
+msgstr ""
+
+#. module: account_payment
+#: model:ir.model,name:account_payment.model_account_invoice
+msgid "Invoice"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,communication:0
+msgid "Communication"
+msgstr ""
+
+#. module: account_payment
+#: view:account.payment.make.payment:0
+#: view:account.payment.populate.statement:0
+#: view:payment.order:0
+#: view:payment.order.create:0
+msgid "Cancel"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.line:0
+#: view:payment.order:0
+msgid "Information"
+msgstr ""
+
+#. module: account_payment
+#: model:ir.actions.act_window,help:account_payment.action_payment_order_tree
+msgid ""
+"A payment order is a payment request from your company to pay a supplier "
+"invoice or a customer credit note. Here you can register all payment orders "
+"that should be done, keep track of all payment orders and mention the "
+"invoice reference and the partner the payment should be done for."
+msgstr ""
+
+#. module: account_payment
+#: help:payment.line,amount:0
+msgid "Payment amount in the company currency"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.order.create:0
+msgid "Search Payment lines"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,amount_currency:0
+msgid "Amount in Partner Currency"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,communication2:0
+msgid "Communication 2"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,bank_id:0
+msgid "Destination Bank account"
+msgstr ""
+
+#. module: account_payment
+#: view:account.payment.make.payment:0
+msgid "Are you sure you want to make payment?"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.mode:0
+#: field:payment.mode,journal:0
+msgid "Journal"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.mode,bank_id:0
+msgid "Bank account"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.order:0
+msgid "Confirm Payments"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,company_currency:0
+#: report:payment.order:0
+msgid "Company Currency"
+msgstr ""
+
+#. module: account_payment
+#: model:ir.ui.menu,name:account_payment.menu_main_payment
+#: view:payment.line:0
+#: view:payment.order:0
+msgid "Payment"
+msgstr ""
+
+#. module: account_payment
+#: report:payment.order:0
+msgid "Payment Order / Payment"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,move_line_id:0
+msgid "Entry line"
+msgstr ""
+
+#. module: account_payment
+#: help:payment.line,communication:0
+msgid ""
+"Used as the message between ordering customer and current company. Depicts "
+"'What do you want to say to the recipient about this order ?'"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.mode,name:0
+msgid "Name"
+msgstr ""
+
+#. module: account_payment
+#: report:payment.order:0
+msgid "Bank Account"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.line:0
+#: view:payment.order:0
+msgid "Entry Information"
+msgstr ""
+
+#. module: account_payment
+#: model:ir.model,name:account_payment.model_payment_order_create
+msgid "payment.order.create"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,order_id:0
+msgid "Order"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.order,total:0
+msgid "Total"
+msgstr ""
+
+#. module: account_payment
+#: view:account.payment.make.payment:0
+#: model:ir.actions.act_window,name:account_payment.action_account_payment_make_payment
+msgid "Make Payment"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,partner_id:0
+#: report:payment.order:0
+msgid "Partner"
+msgstr ""
+
+#. module: account_payment
+#: model:ir.actions.act_window,name:account_payment.action_create_payment_order
+msgid "Populate Payment"
+msgstr ""
+
+#. module: account_payment
+#: help:payment.mode,bank_id:0
+msgid "Bank Account for the Payment Mode"
+msgstr ""
+
+#. module: account_payment
+#: constraint:account.move.line:0
+msgid "You can not create move line on view account."
+msgstr ""
diff --git a/addons/marketing/i18n/id.po b/addons/marketing/i18n/id.po
new file mode 100644
index 00000000000..c7c8a962b63
--- /dev/null
+++ b/addons/marketing/i18n/id.po
@@ -0,0 +1,119 @@
+# Indonesian translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-04-19 15:57+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Indonesian <id@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: 2011-04-20 04:36+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
+
+#. module: marketing
+#: model:ir.module.module,description:marketing.module_meta_information
+msgid "Menu for Marketing"
+msgstr "Menu Untuk Marketing"
+
+#. module: marketing
+#: help:marketing.installer,marketing_campaign:0
+msgid ""
+"Helps you to manage marketing campaigns and automate actions and "
+"communication steps."
+msgstr ""
+"Membantu Anda untuk mengelola kampanye pemasaran dan langkah mengotomatisasi "
+"dan langkah komunikasi."
+
+#. module: marketing
+#: field:marketing.installer,progress:0
+msgid "Configuration Progress"
+msgstr "Kemajuan Konfigurasi"
+
+#. module: marketing
+#: view:marketing.installer:0
+msgid "title"
+msgstr "Judul:"
+
+#. module: marketing
+#: field:marketing.installer,email_template:0
+msgid "Automated E-Mails"
+msgstr "Email otomatis"
+
+#. module: marketing
+#: field:marketing.installer,config_logo:0
+msgid "Image"
+msgstr "Gambar"
+
+#. module: marketing
+#: view:marketing.installer:0
+msgid "Configure Your Marketing Application"
+msgstr "Konfigurasikan Aplikasi Pemasaran Anda"
+
+#. module: marketing
+#: help:marketing.installer,email_template:0
+msgid ""
+"Helps you to design templates of emails and integrate them in your different "
+"processes."
+msgstr ""
+"Membantu Anda untuk merancang template email dan mengintegrasikan mereka "
+"dalam proses yang berbeda."
+
+#. module: marketing
+#: model:ir.model,name:marketing.model_marketing_installer
+msgid "marketing.installer"
+msgstr ""
+
+#. module: marketing
+#: model:ir.module.module,shortdesc:marketing.module_meta_information
+msgid "Marketing"
+msgstr "Pemasaran"
+
+#. module: marketing
+#: field:marketing.installer,crm_profiling:0
+msgid "Profiling Tools"
+msgstr ""
+
+#. module: marketing
+#: view:marketing.installer:0
+msgid ""
+"OpenERP provides Addons to better manage your sales and marketing processes. "
+"Select the ones you would be interested in."
+msgstr ""
+"OpenERP menyediakan Addons untuk lebih baik mengelola proses penjualan dan "
+"pemasaran. Pilih salah satu yang menurut anda menarik."
+
+#. module: marketing
+#: view:marketing.installer:0
+msgid "Marketing Application Configuration"
+msgstr "Konfigurasi Aplikasi Pemasaran"
+
+#. module: marketing
+#: model:ir.actions.act_window,name:marketing.action_marketing_installer
+msgid "Marketing Modules Installation"
+msgstr "Instalasi Modul Marketing"
+
+#. module: marketing
+#: model:ir.module.module,shortdesc:marketing.module_meta_information
+msgid "Marketing Campaigns"
+msgstr "Kampanye Pemasaran"
+
+#. module: marketing
+#: help:marketing.installer,crm_profiling:0
+msgid ""
+"Helps you to perform segmentation of partners and design segmentation "
+"questionnaires"
+msgstr ""
+"Membantu Anda untuk melakukan segmentasi mitra dan desain kuesioner "
+"segmentasi"
+
+#. module: marketing
+#: view:marketing.installer:0
+msgid "Configure"
+msgstr "Pengaturan"
diff --git a/addons/sale/i18n/gl.po b/addons/sale/i18n/gl.po
new file mode 100644
index 00000000000..1e2e54272c6
--- /dev/null
+++ b/addons/sale/i18n/gl.po
@@ -0,0 +1,2074 @@
+# Galician translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:16+0000\n"
+"PO-Revision-Date: 2011-04-19 14:52+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Galician <gl@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: 2011-04-20 04:36+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_sales_by_salesman
+msgid "Sales by Salesman in last 90 days"
+msgstr ""
+
+#. module: sale
+#: help:sale.installer,delivery:0
+msgid "Allows you to compute delivery costs on your quotations."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,picking_policy:0
+msgid ""
+"If you don't have enough stock available to deliver all at once, do you "
+"accept partial shipments or not?"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,partner_shipping_id:0
+msgid "Shipping address for current sales order."
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,qtty:0
+#: report:sale.order:0
+msgid "Quantity"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,day:0
+msgid "Day"
+msgstr ""
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_cancelorder0
+#: view:sale.order:0
+msgid "Cancel Order"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.picking_policy:0
+msgid "Configure Sales Order Logistics"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:603
+#, python-format
+msgid "The quotation '%s' has been converted to a sales order."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Payment Before Delivery"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice.py:42
+#, python-format
+msgid "Warning !"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "VAT"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_saleorderprocurement0
+msgid "Drives procurement orders for every sales order line."
+msgstr ""
+
+#. module: sale
+#: selection:sale.config.picking_policy,picking_policy:0
+msgid "All at Once"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,project_id:0
+#: view:sale.report:0
+#: field:sale.report,analytic_account_id:0
+#: field:sale.shop,project_id:0
+msgid "Analytic Account"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_line_tree2
+msgid ""
+"Here is a list of each sales order line to be invoiced. You can invoice "
+"sales orders partially, by lines of sales order. You do not need this list "
+"if you invoice from the delivery orders or if you invoice sales totally."
+msgstr ""
+
+#. module: sale
+#: model:process.node,name:sale.process_node_saleprocurement0
+msgid "Procurement Order"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Order Line"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_form
+msgid ""
+"Sales Orders help you manage quotations and orders from your customers. "
+"OpenERP suggests that you start by creating a quotation. Once it is "
+"confirmed, the quotation will be converted into a Sales Order. OpenERP can "
+"handle several types of products so that a sales order may trigger tasks, "
+"delivery orders, manufacturing orders, purchases and so on. Based on the "
+"configuration of the sales order, a draft invoice will be generated so that "
+"you just have to confirm it when you want to bill your customer."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_quantity:0
+msgid ""
+"The sale order will automatically create the invoice proposition (draft "
+"invoice). Ordered and delivered quantities may not be the same. You have to "
+"choose if you want your invoice based on ordered or shipped quantities. If "
+"the product is a service, shipped quantities means hours spent on the "
+"associated tasks."
+msgstr ""
+"O pedido de venda creará automáticamente a proposta de factura (factura "
+"borrador). As cantidades pedidas e entregadas poden non ser as mesmas. Debe "
+"elixir se desexa que a sua factura se basee nas cantidades pedidas ou "
+"entregadas. Se o producto e un servizo, as cantidades enviadas son as horas "
+"dedicadas as tarefas asociadas."
+
+#. module: sale
+#: field:sale.shop,payment_default_id:0
+msgid "Default Payment Term"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_config_picking_policy
+msgid "Configure Picking Policy for Sales Order"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+#: field:sale.order.line,state:0
+#: view:sale.report:0
+msgid "State"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Disc.(%)"
+msgstr ""
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
+msgid "Force Assignation"
+msgstr ""
+
+#. module: sale
+#: help:sale.make.invoice,grouped:0
+msgid "Check the box to group the invoices for the same customers"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Ordered Quantities"
+msgstr "Cantidades Pedidas"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Sales by Salesman"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,move_ids:0
+msgid "Inventory Moves"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,name:0
+#: field:sale.order.line,order_id:0
+msgid "Order Reference"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Other Information"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Dates"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_invoiceafterdelivery0
+msgid ""
+"The invoice is created automatically if the shipping policy is 'Invoice from "
+"pick' or 'Invoice on order after delivery'."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_make_invoice
+msgid "Sales Make Invoice"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Recreate Packing"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,discount:0
+msgid "Discount (%)"
+msgstr ""
+
+#. module: sale
+#: help:res.company,security_lead:0
+msgid ""
+"This is the days added to what you promise to customers for security purpose"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.open_board_sales_manager
+#: model:ir.ui.menu,name:sale.menu_board_sales_manager
+msgid "Sales Manager Dashboard"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_packaging:0
+msgid "Packaging"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_saleinvoice0
+msgid "From a sales order"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,name:0
+msgid "Shop Name"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1014
+#, python-format
+msgid "No Customer Defined !"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree2
+msgid "Sales in Exception"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Set to Draft"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Conditions"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,order_policy:0
+msgid ""
+"The Shipping Policy is used to synchronise invoice and delivery operations.\n"
+"  - The 'Pay Before delivery' choice will first generate the invoice and "
+"then generate the picking order after the payment of this invoice.\n"
+"  - The 'Shipping & Manual Invoice' will create the picking order directly "
+"and wait for the user to manually click on the 'Invoice' button to generate "
+"the draft invoice.\n"
+"  - The 'Invoice On Order After Delivery' choice will generate the draft "
+"invoice based on sales order after all picking lists have been finished.\n"
+"  - The 'Invoice From The Picking' choice is used to create an invoice "
+"during the picking process."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:939
+#, python-format
+msgid ""
+"There is no income category account defined in default Properties for "
+"Product Category or Fiscal Position is not defined !"
+msgstr ""
+
+#. module: sale
+#: view:sale.installer:0
+msgid "Configure"
+msgstr ""
+
+#. module: sale
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:620
+#, python-format
+msgid "invalid mode for test_state"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "June"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:584
+#, python-format
+msgid "Could not cancel this sales order !"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,project_id:0
+msgid "The analytic account related to a sales order."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "October"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Quotations"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,pricelist_id:0
+msgid "Pricelist for current sales order."
+msgstr ""
+
+#. module: sale
+#: selection:sale.config.picking_policy,step:0
+msgid "Delivery Order Only"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "TVA :"
+msgstr ""
+
+#. module: sale
+#: help:sale.order.line,delay:0
+msgid ""
+"Number of days between the order confirmation the shipping of the products "
+"to the customer"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Quotation Date"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,fiscal_position:0
+msgid "Fiscal Position"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "UoM"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,number_packages:0
+msgid "Number Packages"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "In Progress"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_confirmquotation0
+msgid ""
+"The salesman confirms the quotation. The state of the sales order becomes "
+"'In progress' or 'Manual in progress'."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:971
+#, python-format
+msgid "You must first cancel stock moves attached to this sales order line."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1042
+#, python-format
+msgid "(n/a)"
+msgstr ""
+
+#. module: sale
+#: help:sale.advance.payment.inv,product_id:0
+msgid ""
+"Select a product of type service which is called 'Advance Product'. You may "
+"have to create it and set it as a default value on this field."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Tel. :"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:64
+#, python-format
+msgid ""
+"You cannot make an advance on a sales order                              "
+"that is defined as 'Automatic Invoice after delivery'."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,note:0
+#: view:sale.order.line:0
+#: field:sale.order.line,notes:0
+msgid "Notes"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,partner_invoice_id:0
+msgid "Invoice address for current sales order."
+msgstr ""
+
+#. module: sale
+#: view:sale.installer:0
+msgid "Enhance your core Sales Application with additional functionalities."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoiced_rate:0
+#: field:sale.order.line,invoiced:0
+msgid "Invoiced"
+msgstr ""
+
+#. module: sale
+#: model:process.node,name:sale.process_node_deliveryorder0
+msgid "Delivery Order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,date_confirm:0
+msgid "Confirmation Date"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,address_allotment_id:0
+msgid "Allotment Partner"
+msgstr ""
+
+#. module: sale
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique !"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "March"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,amount_total:0
+msgid "The total amount."
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,price_subtotal:0
+msgid "Subtotal"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Invoice address :"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_saleorderprocurement0
+msgid ""
+"For every sales order line, a procurement order is created to supply the "
+"sold product."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,incoterm:0
+msgid ""
+"Incoterm which stands for 'International Commercial terms' implies its a "
+"series of sales terms which are used in the commercial transaction."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,partner_invoice_id:0
+msgid "Invoice Address"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Search Uninvoiced Lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.report.xml,name:sale.report_sale_order
+msgid "Quotation / Order"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,nbr:0
+msgid "# of Lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_open_invoice
+msgid "Sales Open Invoice"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line
+#: field:stock.move,sale_line_id:0
+msgid "Sales Order Line"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.picking_policy:0
+msgid "Setup your sales workflow and default values."
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,warehouse_id:0
+msgid "Warehouse"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Order N°"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,order_line:0
+msgid "Order Lines"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Untaxed amount"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree2
+#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
+msgid "Lines to Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uom_qty:0
+msgid "Quantity (UoM)"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,create_date:0
+msgid "Creation Date"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree3
+msgid "Uninvoiced and Delivered Lines"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Total :"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "My Sales"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:290
+#: code:addons/sale/sale.py:966
+#: code:addons/sale/sale.py:1165
+#, python-format
+msgid "Invalid action !"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,pricelist_id:0
+#: field:sale.report,pricelist_id:0
+#: field:sale.shop,pricelist_id:0
+msgid "Pricelist"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,product_uom_qty:0
+msgid "# of Qty"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Order Date"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.report,shipped:0
+msgid "Shipped"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree5
+msgid "All Quotations"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Invoice On Order After Delivery"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "September"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,categ_id:0
+msgid "Category of Product"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Taxes :"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Stock Moves"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "  Year  "
+msgstr ""
+
+#. module: sale
+#: field:sale.order,state:0
+#: field:sale.report,state:0
+msgid "Order State"
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Do you really want to create the invoice(s) ?"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Sales By Month"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:970
+#, python-format
+msgid "Could not cancel sales order line!"
+msgstr ""
+
+#. module: sale
+#: field:res.company,security_lead:0
+msgid "Security Days"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_saleorderprocurement0
+msgid "Procurement of sold material"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Create Final Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,partner_shipping_id:0
+msgid "Shipping Address"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,shipped:0
+msgid ""
+"It indicates that the sales order has been delivered. This field is updated "
+"only after the scheduler(s) have been launched."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: sale
+#: model:ir.module.module,description:sale.module_meta_information
+msgid ""
+"\n"
+"    The base module to manage quotations and sales orders.\n"
+"\n"
+"    * Workflow with validation steps:\n"
+"        - Quotation -> Sales order -> Invoice\n"
+"    * Invoicing methods:\n"
+"        - Invoice on order (before or after shipping)\n"
+"        - Invoice on delivery\n"
+"        - Invoice on timesheets\n"
+"        - Advance invoice\n"
+"    * Partners preferences (shipping, invoicing, incoterm, ...)\n"
+"    * Products stocks and prices\n"
+"    * Delivery methods:\n"
+"        - all at once, multi-parcel\n"
+"        - delivery costs\n"
+"    * Dashboard for salesman that includes:\n"
+"    * Your open quotations\n"
+"    * Top 10 sales of the month\n"
+"    * Cases statistics\n"
+"    * Graph of sales by product\n"
+"    * Graph of cases of the month\n"
+"    "
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
+msgid "Sales Shop"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "November"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "History"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,picking_policy:0
+msgid "Picking Default Policy"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_ids:0
+msgid ""
+"This is the list of invoices that have been generated for this sales order. "
+"The same sales order may have been invoiced in several times (by line for "
+"example)."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Your Reference"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,partner_order_id:0
+msgid ""
+"The name and address of the contact who requested the order or quotation."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:966
+#, python-format
+msgid "You cannot cancel a sales order line that has already been invoiced !"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Qty"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "References"
+msgstr ""
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_cancel0
+#: model:process.transition.action,name:sale.process_transition_action_cancel1
+#: model:process.transition.action,name:sale.process_transition_action_cancel2
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order.line:0
+#: view:sale.order.line.make.invoice:0
+msgid "Cancel"
+msgstr ""
+
+#. module: sale
+#: field:sale.installer,sale_order_dates:0
+msgid "Sales Order Dates"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Exception"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_invoice0
+#: model:process.transition,name:sale.process_transition_invoiceafterdelivery0
+#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
+#: view:sale.advance.payment.inv:0
+#: view:sale.order.line:0
+msgid "Create Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.installer,sale_margin:0
+msgid "Margins in Sales Orders"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Total Tax Excluded"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Compute"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Sales by Partner"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,partner_order_id:0
+msgid "Ordering Contact"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_view_sale_open_invoice
+#: view:sale.open.invoice:0
+msgid "Open Invoice"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+#: view:sale.order.line:0
+msgid "Price"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_sale_installer
+#: view:sale.config.picking_policy:0
+#: view:sale.installer:0
+msgid "Sales Application Configuration"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,type:0
+msgid "on order"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_invoiceafterdelivery0
+msgid "Based on the shipped or on the ordered quantities."
+msgstr "Basado en nas cantidades enviadas ou pedidas."
+
+#. module: sale
+#: field:sale.order,picking_ids:0
+msgid "Related Picking"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,name:0
+msgid "Name"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Shipping address :"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_sales_by_partner
+msgid "Sales per Customer in last 90 days"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_quotation0
+msgid "Draft state of sales order"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_deliver0
+msgid "Create Delivery Order"
+msgstr ""
+
+#. module: sale
+#: field:sale.installer,delivery:0
+msgid "Delivery Costs"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Total Tax Included"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_packing0
+msgid "Create Pick List"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Sales by Product Category"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,picking_policy:0
+msgid "Partial Delivery"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_confirmquotation0
+msgid "Confirm Quotation"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,origin:0
+msgid "Reference of the document that generated this sales order request."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+#: view:sale.report:0
+msgid "Group By..."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Recreate Invoice"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.outgoing_picking_list_to_invoice
+#: model:ir.ui.menu,name:sale.menu_action_picking_list_to_invoice
+msgid "Deliveries to Invoice"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Waiting Schedule"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,type:0
+msgid "Procurement Method"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.picking_policy:0
+#: view:sale.installer:0
+msgid "title"
+msgstr ""
+
+#. module: sale
+#: model:process.node,name:sale.process_node_packinglist0
+msgid "Pick List"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Order date"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_packinglist0
+msgid "Document of the move to the output or to the customer."
+msgstr ""
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_validate0
+msgid "Validate"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Confirm Order"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_saleprocurement0
+msgid "Create Procurement Order"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,amount_tax:0
+#: field:sale.order.line,tax_id:0
+msgid "Taxes"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,order_policy:0
+msgid "Shipping Policy"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,create_date:0
+msgid "Date on which sales order is created."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_stock_move
+msgid "Stock Move"
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create Invoices"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Extra Info"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Fax :"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,amount:0
+msgid "Advance Amount"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Shipped Quantities"
+msgstr ""
+
+#. module: sale
+#: selection:sale.config.picking_policy,order_policy:0
+msgid "Invoice Based on Sales Orders"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_stock_picking
+msgid "Picking List"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:387
+#: code:addons/sale/sale.py:920
+#: code:addons/sale/sale.py:938
+#, python-format
+msgid "Error !"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:570
+#, python-format
+msgid "Could not cancel sales order !"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "July"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,procurement_id:0
+msgid "Procurement"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Shipping Exception"
+msgstr ""
+
+#. module: sale
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Shipping & Manual Invoice"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1051
+#, python-format
+msgid "Picking Information !"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr ""
+
+#. module: sale
+#: model:ir.module.module,shortdesc:sale.module_meta_information
+msgid "Sales Management"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Invoice From The Picking"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_invoice0
+msgid "To be reviewed by the accountant."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,uom_name:0
+msgid "Reference UoM"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line_make_invoice
+msgid "Sale OrderLine Make_invoice"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.picking_policy,step:0
+msgid ""
+"By default, OpenERP is able to manage complex routing and paths of products "
+"in your warehouse and partner locations. This will configure the most common "
+"and simple methods to deliver products to the customer in one or two "
+"operations by the worker."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoiced:0
+msgid "Paid"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_report_all
+#: model:ir.ui.menu,name:sale.menu_report_product_all
+#: view:sale.report:0
+msgid "Sales Analysis"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,property_ids:0
+msgid "Properties"
+msgstr ""
+
+#. module: sale
+#: model:process.node,name:sale.process_node_quotation0
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Quotation"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_invoice0
+msgid ""
+"The Salesman creates an invoice manually, if the sales order shipping policy "
+"is 'Shipping and Manual in Progress'. The invoice is created automatically "
+"if the shipping policy is 'Payment before Delivery'."
+msgstr ""
+
+#. module: sale
+#: help:sale.config.picking_policy,order_policy:0
+msgid ""
+"You can generate invoices based on sales orders or based on shippings."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: model:process.process,name:sale.process_process_salesprocess0
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Sales"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+#: field:sale.order.line,price_unit:0
+msgid "Unit Price"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: view:sale.order.line:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Done"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_installer
+msgid "sale.installer"
+msgstr ""
+
+#. module: sale
+#: model:process.node,name:sale.process_node_invoice0
+#: model:process.node,name:sale.process_node_invoiceafterdelivery0
+msgid "Invoice"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1014
+#, python-format
+msgid ""
+"You have to select a customer in the sales form !\n"
+"Please set one customer before choosing a product."
+msgstr ""
+
+#. module: sale
+#: selection:sale.config.picking_policy,step:0
+msgid "Picking List & Delivery Order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,origin:0
+msgid "Source Document"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "To Do"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,picking_policy:0
+msgid "Picking Policy"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_deliveryorder0
+msgid "Document of the move to the customer."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,amount_untaxed:0
+msgid "The amount without tax."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:571
+#, python-format
+msgid "You must first cancel all picking attached to this sales order."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,incoterm:0
+msgid "Incoterm"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.order.line,product_id:0
+#: view:sale.report:0
+#: field:sale.report,product_id:0
+msgid "Product"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.menu_invoiced
+msgid "Invoicing"
+msgstr ""
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_cancelassignation0
+msgid "Cancel Assignation"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_config_picking_policy
+msgid "sale.config.picking_policy"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,state:0
+msgid ""
+"Gives the state of the quotation or sales order. \n"
+"The exception state is automatically set when a cancel operation occurs in "
+"the invoice validation (Invoice Exception) or in the picking list process "
+"(Shipping Exception). \n"
+"The 'Waiting Schedule' state is set when the invoice is confirmed but "
+"waiting for the scheduler to run on the date 'Ordered Date'."
+msgstr ""
+"Indica o estado do presuposto o pedido de venda.\n"
+"O estado de excepción establecese automáticamente cando se produce unha "
+"operación de cancelación na validación da factura (excepción de factura) ou "
+"no procesado do albará (excepción de envío).\n"
+"O estado 'Esperando planificación' establece cando se confirma a factura, "
+"pero está esperando que o planificador a active na data de \"Data pedido\"."
+
+#. module: sale
+#: field:sale.order,invoice_quantity:0
+msgid "Invoice on"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Date Ordered"
+msgstr "Data Pedido"
+
+#. module: sale
+#: field:sale.order.line,product_uos:0
+msgid "Product UoS"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Manual In Progress"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uom:0
+msgid "Product UoM"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Logistic"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Order"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:921
+#, python-format
+msgid "There is no income account defined for this product: \"%s\" (id:%d)"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_saleinvoice0
+msgid ""
+"Depending on the Invoicing control of the sales order, the invoice can be "
+"based on delivered or on ordered quantities. Thus, a sales order can "
+"generates an invoice or a delivery order as soon as it is confirmed by the "
+"salesman."
+msgstr ""
+"En función do control de facturación dos pedidos de venda, a factura pode "
+"estar baseada nas cantidades enviadas ou vendidas. Polo tanto, un pedido de "
+"venda pode xerar unha factura ou un albará tan pronto como sea confirmada "
+"polo comercial."
+
+#. module: sale
+#: code:addons/sale/sale.py:1116
+#, python-format
+msgid ""
+"You plan to sell %.2f %s but you only have %.2f %s available !\n"
+"The real stock is %.2f %s. (without reservations)"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "States"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.picking_policy:0
+msgid "res_config_contents"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,client_order_ref:0
+msgid "Customer Reference"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_total:0
+#: view:sale.order.line:0
+msgid "Total"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:388
+#, python-format
+msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_deliver0
+msgid ""
+"Depending on the configuration of the location Output, the move between the "
+"output area and the customer is done through the Delivery Order manually or "
+"automatically."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1165
+#, python-format
+msgid "Cannot delete a sales order line which is %s !"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
+#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
+#: view:sale.order:0
+msgid "Make Invoices"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "To Invoice"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,date_confirm:0
+msgid "Date on which sales order is confirmed."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,company_id:0
+#: field:sale.order.line,company_id:0
+#: view:sale.report:0
+#: field:sale.report,company_id:0
+#: field:sale.shop,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: sale
+#: field:sale.make.invoice,invoice_date:0
+msgid "Invoice Date"
+msgstr ""
+
+#. module: sale
+#: help:sale.advance.payment.inv,amount:0
+msgid "The amount to be invoiced in advance."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,picking_ids:0
+msgid ""
+"This is a list of picking that has been generated for this sales order."
+msgstr ""
+
+#. module: sale
+#: help:sale.installer,sale_margin:0
+msgid ""
+"Gives the margin of profitability by calculating the difference between Unit "
+"Price and Cost Price."
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create invoices"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Net Total :"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_shop_form
+#: model:ir.ui.menu,name:sale.menu_action_shop_form
+#: field:sale.order,shop_id:0
+#: view:sale.report:0
+#: field:sale.report,shop_id:0
+msgid "Shop"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "   Month   "
+msgstr ""
+
+#. module: sale
+#: field:sale.report,date_confirm:0
+msgid "Date Confirm"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:111
+#, python-format
+msgid "Warning"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_view_sales_by_month
+msgid "Sales by Month"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1045
+#, python-format
+msgid ""
+"You selected a quantity of %d Units.\n"
+"But it's not compatible with the selected packaging.\n"
+"Here is a proposition of quantities according to the packaging:\n"
+"\n"
+"EAN: %s Quantity: %s Type of ul: %s"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order
+#: model:process.node,name:sale.process_node_order0
+#: model:process.node,name:sale.process_node_saleorder0
+#: model:res.request.link,name:sale.req_link_sale_order
+#: view:sale.order:0
+#: field:stock.picking,sale_id:0
+msgid "Sales Order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uos_qty:0
+msgid "Quantity (UoS)"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_packing0
+msgid ""
+"The Pick List form is created as soon as the sales order is confirmed, in "
+"the same time as the procurement order. It represents the assignment of "
+"parts to the sales order. There is 1 pick list by sales order line which "
+"evolves with the availability of parts."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Confirmed"
+msgstr ""
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_confirm0
+msgid "Confirm"
+msgstr ""
+
+#. module: sale
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_sales_product_total_price
+msgid "Sales by Product's Category in last 90 days"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Sales Order Lines"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,delay:0
+msgid "Delivery Lead Time"
+msgstr ""
+
+#. module: sale
+#: view:res.company:0
+msgid "Configuration"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,picking_policy:0
+msgid "Complete Delivery"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "    Month-1    "
+msgstr ""
+
+#. module: sale
+#: help:sale.config.picking_policy,picking_policy:0
+msgid ""
+"The Shipping Policy is used to configure per order if you want to deliver as "
+"soon as possible when one product is available or you wait that all products "
+"are available.."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "August"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:111
+#, python-format
+msgid ""
+"Invoice cannot be created for this Sales Order Line due to one of the "
+"following reasons:\n"
+"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
+"2.The Sales Order Line is Invoiced!"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,th_weight:0
+msgid "Weight"
+msgstr ""
+
+#. module: sale
+#: view:sale.open.invoice:0
+#: view:sale.order:0
+#: field:sale.order,invoice_ids:0
+msgid "Invoices"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "December"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,config_logo:0
+#: field:sale.installer,config_logo:0
+msgid "Image"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_saleprocurement0
+msgid ""
+"A procurement order is automatically created as soon as a sales order is "
+"confirmed or as the invoice is paid. It drives the purchasing and the "
+"production of products regarding to the rules and to the sales order's "
+"parameters. "
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Uninvoiced"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+#: view:sale.order:0
+#: field:sale.order,user_id:0
+#: view:sale.order.line:0
+#: field:sale.order.line,salesman_id:0
+#: view:sale.report:0
+#: field:sale.report,user_id:0
+msgid "Salesman"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:163
+#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
+#: view:sale.advance.payment.inv:0
+#: view:sale.order:0
+#, python-format
+msgid "Advance Invoice"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:591
+#, python-format
+msgid "The sales order '%s' has been cancelled."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: sale
+#: help:sale.order.line,state:0
+msgid ""
+"* The 'Draft' state is set when the related sales order in draft state.      "
+"               \n"
+"* The 'Confirmed' state is set when the related sales order is confirmed.    "
+"                 \n"
+"* The 'Exception' state is set when the related sales order is set as "
+"exception.                     \n"
+"* The 'Done' state is set when the sales order line has been picked.         "
+"            \n"
+"* The 'Cancelled' state is set when a user cancel the sales order related."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,amount_tax:0
+msgid "The tax amount."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Packings"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,progress:0
+#: field:sale.installer,progress:0
+msgid "Configuration Progress"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
+msgid "Product sales"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,date_order:0
+msgid "Ordered Date"
+msgstr "Fecha Pedido"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_form
+#: model:ir.ui.menu,name:sale.menu_sale_order
+#: view:sale.order:0
+msgid "Sales Orders"
+msgstr ""
+
+#. module: sale
+#: selection:sale.config.picking_policy,picking_policy:0
+msgid "Direct Delivery"
+msgstr ""
+
+#. module: sale
+#: field:sale.installer,sale_journal:0
+msgid "Invoicing journals"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,product_id:0
+msgid "Advance Product"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,shipped_qty_1:0
+msgid "Shipped Qty"
+msgstr ""
+
+#. module: sale
+#: view:sale.open.invoice:0
+msgid "You invoice has been successfully created!"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:585
+#, python-format
+msgid "You must first cancel all invoices attached to this sales order."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: sale
+#: view:sale.installer:0
+msgid "Configure Your Sales Management Application"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree4
+msgid "Sales Order in Progress"
+msgstr ""
+
+#. module: sale
+#: field:sale.installer,sale_layout:0
+msgid "Sales Order Layout Improvement"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
+#, python-format
+msgid "Error"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,delay:0
+msgid "Commitment Delay"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_saleprocurement0
+msgid ""
+"One Procurement order for each sales order line and for each of the "
+"components."
+msgstr ""
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_assign0
+msgid "Assign"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,date:0
+msgid "Date Order"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_order0
+msgid "Confirmed sales order to invoice."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:290
+#, python-format
+msgid "Cannot delete Sales Order(s) which are already confirmed !"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:316
+#, python-format
+msgid "The sales order '%s' has been set in draft state."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,type:0
+msgid "from stock"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,order_policy:0
+msgid "Shipping Default Policy"
+msgstr ""
+
+#. module: sale
+#: view:sale.open.invoice:0
+msgid "Close"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,shipped:0
+msgid "Delivered"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1115
+#, python-format
+msgid "Not enough stock !"
+msgstr ""
+
+#. module: sale
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Layout Sequence"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_shop_form
+msgid ""
+"If you have more than one shop reselling your company products, you can "
+"create and manage that from here. Whenever you will record a new quotation "
+"or sales order, it has to be linked to a shop. The shop also defines the "
+"warehouse from which the products will be delivered for each particular "
+"sales."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoiced:0
+msgid "It indicates that an invoice has been paid."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+#: field:sale.order.line,name:0
+msgid "Description"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "May"
+msgstr ""
+
+#. module: sale
+#: help:sale.installer,sale_order_dates:0
+msgid "Adds commitment, requested and effective dates on Sales Orders."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,partner_id:0
+#: field:sale.order.line,order_partner_id:0
+msgid "Customer"
+msgstr ""
+
+#. module: sale
+#: model:product.template,name:sale.advance_product_0_product_template
+msgid "Advance"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "February"
+msgstr ""
+
+#. module: sale
+#: help:sale.installer,sale_journal:0
+msgid ""
+"Allows you to group and invoice your delivery orders according to different "
+"invoicing types: daily, weekly, etc."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "April"
+msgstr ""
+
+#. module: sale
+#: view:sale.shop:0
+msgid "Accounting"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,step:0
+msgid "Steps To Deliver a Sales Order"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Search Sales Order"
+msgstr ""
+
+#. module: sale
+#: model:process.node,name:sale.process_node_saleorderprocurement0
+msgid "Sales Order Requisition"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+#: field:sale.order,payment_term:0
+msgid "Payment Term"
+msgstr ""
+
+#. module: sale
+#: help:sale.installer,sale_layout:0
+msgid ""
+"Provides some features to improve the layout of the Sales Order reports."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_report_all
+msgid ""
+"This report performs analysis on your quotations and sales orders. Analysis "
+"check your sales revenues and sort it by different group criteria (salesman, "
+"partner, product, etc.) Use this report to perform analysis on sales not "
+"having invoiced yet. If you want to analyse your turnover, you should use "
+"the Invoice Analysis report in the Accounting application."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Quotation N°"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,picked_rate:0
+#: view:sale.report:0
+msgid "Picked"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,year:0
+msgid "Year"
+msgstr ""
+
+#. module: sale
+#: selection:sale.config.picking_policy,order_policy:0
+msgid "Invoice Based on Deliveries"
+msgstr ""

From 6e516475ee4896a053d3227d93c2603ac23afe08 Mon Sep 17 00:00:00 2001
From: "Naresh (OpenERP)" <nch@tinyerp.com>
Date: Wed, 20 Apr 2011 11:19:47 +0530
Subject: [PATCH 267/331] [FIX]:editing shortcuts from client were not
 dispalying the changes

bzr revid: nch@tinyerp.com-20110420054947-t02qg7sm8g5vzcuf
---
 openerp/addons/base/ir/ir_ui_view.py | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/openerp/addons/base/ir/ir_ui_view.py b/openerp/addons/base/ir/ir_ui_view.py
index b342235133e..1600fa62d90 100644
--- a/openerp/addons/base/ir/ir_ui_view.py
+++ b/openerp/addons/base/ir/ir_ui_view.py
@@ -196,13 +196,10 @@ class view_sc(osv.osv):
 
     def get_sc(self, cr, uid, user_id, model='ir.ui.menu', context=None):
         ids = self.search(cr, uid, [('user_id','=',user_id),('resource','=',model)], context=context)
-        results = self.read(cr, uid, ids, ['res_id'], context=context)
-        name_map = dict(self.pool.get(model).name_get(cr, uid, [x['res_id'] for x in results], context=context))
+        results = self.read(cr, uid, ids, ['res_id','name'], context=context)
+        available_menus = self.pool.get(model).search(cr, uid, [], context=context)
         # Make sure to return only shortcuts pointing to exisintg menu items.
-        filtered_results = filter(lambda result: result['res_id'] in name_map, results)
-        for result in filtered_results:
-            result.update(name=name_map[result['res_id']])
-        return filtered_results
+        return filter(lambda result: result['res_id'] in available_menus, results)
 
     _order = 'sequence,name'
     _defaults = {

From dbdaa8185c3abd81375b03ae960d598fb7480765 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Wed, 20 Apr 2011 05:57:25 +0000
Subject: [PATCH 268/331] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20110420055725-hcqozx8j6xaa10zx
---
 addons/account/i18n/ru.po         |   18 +-
 addons/account_payment/i18n/id.po |   79 +-
 addons/account_payment/i18n/nb.po |  714 ++++++++++
 addons/crm/i18n/ru.po             |    2 +-
 addons/document/i18n/ru.po        |    2 +-
 addons/document_ftp/i18n/ru.po    |    2 +-
 addons/marketing/i18n/id.po       |  119 ++
 addons/point_of_sale/i18n/fr.po   |  403 ++----
 addons/procurement/i18n/ru.po     |    2 +-
 addons/product/i18n/id.po         |  174 ++-
 addons/product/i18n/ru.po         |    2 +-
 addons/sale/i18n/gl.po            | 2074 +++++++++++++++++++++++++++++
 addons/stock/i18n/ru.po           |   14 +-
 addons/stock_location/i18n/ru.po  |    2 +-
 addons/warning/i18n/ru.po         |    2 +-
 addons/wiki/i18n/ru.po            |    2 +-
 16 files changed, 3219 insertions(+), 392 deletions(-)
 create mode 100644 addons/account_payment/i18n/nb.po
 create mode 100644 addons/marketing/i18n/id.po
 create mode 100644 addons/sale/i18n/gl.po

diff --git a/addons/account/i18n/ru.po b/addons/account/i18n/ru.po
index 6db60c1528b..7a7630e4bd0 100644
--- a/addons/account/i18n/ru.po
+++ b/addons/account/i18n/ru.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-04-17 15:55+0000\n"
+"PO-Revision-Date: 2011-04-19 17:03+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@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: 2011-04-18 06:26+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-20 05:56+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -30,7 +30,7 @@ msgstr "Прочие настройки"
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
 #, python-format
 msgid "No End of year journal defined for the fiscal year"
-msgstr ""
+msgstr "Не определен журнал конца года для финансового года"
 
 #. module: account
 #: code:addons/account/account.py:506
@@ -176,8 +176,8 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the payment "
 "term without removing it."
 msgstr ""
-"Если в активном поле установлено значение Ложь, вы сможете скрыть срок "
-"оплаты, не удаляя его."
+"Если поле 'Активно' имеет значение Ложь, вы сможете скрыть срок оплаты, не "
+"удаляя его."
 
 #. module: account
 #: code:addons/account/invoice.py:1421
@@ -1673,6 +1673,8 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the journal "
 "period without removing it."
 msgstr ""
+"Если поле 'Активно' имеет значение Ложь, вы сможете скрыть период журнала, "
+"не удаляя его."
 
 #. module: account
 #: view:res.partner:0
@@ -3748,6 +3750,8 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the account "
 "without removing it."
 msgstr ""
+"Если поле 'Активно' имеет значение Ложь, вы сможете скрыть счет, не удаляя "
+"его."
 
 #. module: account
 #: view:account.tax.template:0
@@ -9691,6 +9695,8 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the analytic "
 "journal without removing it."
 msgstr ""
+"Если поле 'Активно' имеет значение Ложь, вы сможете скрыть журнал аналитики, "
+"не удаляя его."
 
 #. module: account
 #: field:account.analytic.line,ref:0
diff --git a/addons/account_payment/i18n/id.po b/addons/account_payment/i18n/id.po
index 81856241c35..1f9a3e304b6 100644
--- a/addons/account_payment/i18n/id.po
+++ b/addons/account_payment/i18n/id.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-04-01 06:26+0000\n"
+"PO-Revision-Date: 2011-04-20 03:52+0000\n"
 "Last-Translator: moelyana <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: 2011-04-02 06:46+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-04-20 05:56+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: account_payment
 #: field:payment.order,date_scheduled:0
@@ -92,33 +92,33 @@ msgstr ""
 #. module: account_payment
 #: field:payment.mode,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Perusahaan"
 
 #. module: account_payment
 #: field:payment.order,date_prefered:0
 msgid "Preferred date"
-msgstr ""
+msgstr "Tanggal yang di pilih"
 
 #. module: account_payment
 #: selection:payment.line,state:0
 msgid "Free"
-msgstr ""
+msgstr "Bebas"
 
 #. module: account_payment
 #: field:payment.order.create,entries:0
 msgid "Entries"
-msgstr ""
+msgstr "Entri"
 
 #. module: account_payment
 #: report:payment.order:0
 msgid "Used Account"
-msgstr ""
+msgstr "Akun yang di gunakan"
 
 #. module: account_payment
 #: field:payment.line,ml_maturity_date:0
 #: field:payment.order.create,duedate:0
 msgid "Due Date"
-msgstr ""
+msgstr "Jatuh Tempo"
 
 #. module: account_payment
 #: constraint:account.move.line:0
@@ -133,7 +133,7 @@ msgstr "Baris Entri Rekening"
 #. module: account_payment
 #: view:payment.order.create:0
 msgid "_Add to payment order"
-msgstr ""
+msgstr "Tambahkan ke perintah pembayaran"
 
 #. module: account_payment
 #: model:ir.actions.act_window,name:account_payment.action_account_payment_populate_statement
@@ -145,49 +145,49 @@ msgstr ""
 #: report:payment.order:0
 #: view:payment.order:0
 msgid "Amount"
-msgstr ""
+msgstr "Jumlah"
 
 #. module: account_payment
 #: sql_constraint:account.move.line:0
 msgid "Wrong credit or debit value in accounting entry !"
-msgstr ""
+msgstr "Nilai kredit atau debit salah dalam catatan akuntansi !"
 
 #. module: account_payment
 #: view:payment.order:0
 msgid "Total in Company Currency"
-msgstr ""
+msgstr "Jumlah Mata Uang dalam Perusahaan"
 
 #. module: account_payment
 #: selection:payment.order,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Dibatalkan"
 
 #. module: account_payment
 #: model:ir.actions.act_window,name:account_payment.action_payment_order_tree_new
 msgid "New Payment Order"
-msgstr ""
+msgstr "Order Pembayaran Baru"
 
 #. module: account_payment
 #: report:payment.order:0
 #: field:payment.order,reference:0
 msgid "Reference"
-msgstr ""
+msgstr "Referensi"
 
 #. module: account_payment
 #: sql_constraint:payment.line:0
 msgid "The payment line name must be unique!"
-msgstr ""
+msgstr "Nama line pembayaran harus unik!"
 
 #. module: account_payment
 #: model:ir.actions.act_window,name:account_payment.action_payment_order_tree
 #: model:ir.ui.menu,name:account_payment.menu_action_payment_order_form
 msgid "Payment Orders"
-msgstr ""
+msgstr "Order Pembayaran"
 
 #. module: account_payment
 #: selection:payment.order,date_prefered:0
 msgid "Directly"
-msgstr ""
+msgstr "Langsung"
 
 #. module: account_payment
 #: model:ir.actions.act_window,name:account_payment.action_payment_line_form
@@ -195,45 +195,45 @@ msgstr ""
 #: view:payment.line:0
 #: view:payment.order:0
 msgid "Payment Line"
-msgstr ""
+msgstr "Baris Pembayaran"
 
 #. module: account_payment
 #: view:payment.line:0
 msgid "Amount Total"
-msgstr ""
+msgstr "Jumlah total"
 
 #. module: account_payment
 #: view:payment.order:0
 #: selection:payment.order,state:0
 msgid "Confirmed"
-msgstr ""
+msgstr "Dikonfirmasi"
 
 #. module: account_payment
 #: help:payment.line,ml_date_created:0
 msgid "Invoice Effective Date"
-msgstr ""
+msgstr "Tanggal Efektif Faktur"
 
 #. module: account_payment
 #: report:payment.order:0
 msgid "Execution Type"
-msgstr ""
+msgstr "Jenis Eksekusi"
 
 #. module: account_payment
 #: selection:payment.line,state:0
 msgid "Structured"
-msgstr ""
+msgstr "Terstruktur"
 
 #. module: account_payment
 #: view:payment.order:0
 #: field:payment.order,state:0
 msgid "State"
-msgstr ""
+msgstr "Status"
 
 #. module: account_payment
 #: view:payment.line:0
 #: view:payment.order:0
 msgid "Transaction Information"
-msgstr ""
+msgstr "Informasi Transaksi"
 
 #. module: account_payment
 #: model:ir.actions.act_window,name:account_payment.action_payment_mode_form
@@ -242,17 +242,17 @@ msgstr ""
 #: view:payment.mode:0
 #: view:payment.order:0
 msgid "Payment Mode"
-msgstr ""
+msgstr "Mode Pembayaran"
 
 #. module: account_payment
 #: field:payment.line,ml_date_created:0
 msgid "Effective Date"
-msgstr ""
+msgstr "Tanggal Efektif"
 
 #. module: account_payment
 #: field:payment.line,ml_inv_ref:0
 msgid "Invoice Ref."
-msgstr ""
+msgstr "Referensi Faktur"
 
 #. module: account_payment
 #: help:payment.order,date_prefered:0
@@ -266,7 +266,7 @@ msgstr ""
 #: code:addons/account_payment/account_move_line.py:110
 #, python-format
 msgid "Error !"
-msgstr ""
+msgstr "Ada Kesalahan !!!"
 
 #. module: account_payment
 #: view:account.move.line:0
@@ -276,49 +276,50 @@ msgstr "Total debit"
 #. module: account_payment
 #: field:payment.order,date_done:0
 msgid "Execution date"
-msgstr ""
+msgstr "Tanggal Pelaksanaan"
 
 #. module: account_payment
 #: help:payment.mode,journal:0
 msgid "Bank or Cash Journal for the Payment Mode"
-msgstr ""
+msgstr "Bank atau Kas Jurnal untuk  Mode Pembayaran"
 
 #. module: account_payment
 #: selection:payment.order,date_prefered:0
 msgid "Fixed date"
-msgstr ""
+msgstr "Tanggal tetap"
 
 #. module: account_payment
 #: field:payment.line,info_partner:0
 #: view:payment.order:0
 msgid "Destination Account"
-msgstr ""
+msgstr "Akun Tujuan"
 
 #. module: account_payment
 #: view:payment.line:0
 msgid "Desitination Account"
-msgstr ""
+msgstr "Akun Tujuan"
 
 #. module: account_payment
 #: view:payment.order:0
 msgid "Search Payment Orders"
-msgstr ""
+msgstr "Cari Order Pembayaran"
 
 #. module: account_payment
 #: constraint:account.move.line:0
 msgid ""
 "You can not create move line on receivable/payable account without partner"
 msgstr ""
+"Anda tidak dapat membuat move line atas piutang / hutang tanpa adanya partner"
 
 #. module: account_payment
 #: field:payment.line,create_date:0
 msgid "Created"
-msgstr ""
+msgstr "Dibuat"
 
 #. module: account_payment
 #: view:payment.order:0
 msgid "Select Invoices to Pay"
-msgstr ""
+msgstr "Pilih Faktur untuk bayar"
 
 #. module: account_payment
 #: view:payment.line:0
diff --git a/addons/account_payment/i18n/nb.po b/addons/account_payment/i18n/nb.po
new file mode 100644
index 00000000000..f3955dc1110
--- /dev/null
+++ b/addons/account_payment/i18n/nb.po
@@ -0,0 +1,714 @@
+# Norwegian Bokmal translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2011-04-19 10:54+0000\n"
+"Last-Translator: Rolv Råen (adEgo) <Unknown>\n"
+"Language-Team: Norwegian Bokmal <nb@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: 2011-04-20 05:56+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
+
+#. module: account_payment
+#: field:payment.order,date_scheduled:0
+msgid "Scheduled date if fixed"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,currency:0
+msgid "Partner Currency"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.order:0
+msgid "Set to draft"
+msgstr ""
+
+#. module: account_payment
+#: help:payment.order,mode:0
+msgid "Select the Payment Mode to be applied."
+msgstr ""
+
+#. module: account_payment
+#: view:payment.mode:0
+#: view:payment.order:0
+msgid "Group By..."
+msgstr "Grupper etter..."
+
+#. module: account_payment
+#: model:ir.module.module,description:account_payment.module_meta_information
+msgid ""
+"\n"
+"This module provides :\n"
+"* a more efficient way to manage invoice payment.\n"
+"* a basic mechanism to easily plug various automated payment.\n"
+"    "
+msgstr ""
+
+#. module: account_payment
+#: field:payment.order,line_ids:0
+msgid "Payment lines"
+msgstr "Betalingslinjer"
+
+#. module: account_payment
+#: view:payment.line:0
+#: field:payment.line,info_owner:0
+#: view:payment.order:0
+msgid "Owner Account"
+msgstr ""
+
+#. module: account_payment
+#: help:payment.order,state:0
+msgid ""
+"When an order is placed the state is 'Draft'.\n"
+" Once the bank is confirmed the state is set to 'Confirmed'.\n"
+" Then the order is paid the state is 'Done'."
+msgstr ""
+
+#. module: account_payment
+#: help:account.invoice,amount_to_pay:0
+msgid ""
+"The amount which should be paid at the current date\n"
+"minus the amount which is already in payment order"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.mode,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.order,date_prefered:0
+msgid "Preferred date"
+msgstr ""
+
+#. module: account_payment
+#: selection:payment.line,state:0
+msgid "Free"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.order.create,entries:0
+msgid "Entries"
+msgstr ""
+
+#. module: account_payment
+#: report:payment.order:0
+msgid "Used Account"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,ml_maturity_date:0
+#: field:payment.order.create,duedate:0
+msgid "Due Date"
+msgstr ""
+
+#. module: account_payment
+#: constraint:account.move.line:0
+msgid "You can not create move line on closed account."
+msgstr ""
+
+#. module: account_payment
+#: view:account.move.line:0
+msgid "Account Entry Line"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.order.create:0
+msgid "_Add to payment order"
+msgstr ""
+
+#. module: account_payment
+#: model:ir.actions.act_window,name:account_payment.action_account_payment_populate_statement
+#: model:ir.actions.act_window,name:account_payment.action_account_populate_statement_confirm
+msgid "Payment Populate statement"
+msgstr ""
+
+#. module: account_payment
+#: report:payment.order:0
+#: view:payment.order:0
+msgid "Amount"
+msgstr "Beløp"
+
+#. module: account_payment
+#: sql_constraint:account.move.line:0
+msgid "Wrong credit or debit value in accounting entry !"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.order:0
+msgid "Total in Company Currency"
+msgstr ""
+
+#. module: account_payment
+#: selection:payment.order,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: account_payment
+#: model:ir.actions.act_window,name:account_payment.action_payment_order_tree_new
+msgid "New Payment Order"
+msgstr ""
+
+#. module: account_payment
+#: report:payment.order:0
+#: field:payment.order,reference:0
+msgid "Reference"
+msgstr "Referanse"
+
+#. module: account_payment
+#: sql_constraint:payment.line:0
+msgid "The payment line name must be unique!"
+msgstr ""
+
+#. module: account_payment
+#: model:ir.actions.act_window,name:account_payment.action_payment_order_tree
+#: model:ir.ui.menu,name:account_payment.menu_action_payment_order_form
+msgid "Payment Orders"
+msgstr ""
+
+#. module: account_payment
+#: selection:payment.order,date_prefered:0
+msgid "Directly"
+msgstr ""
+
+#. module: account_payment
+#: model:ir.actions.act_window,name:account_payment.action_payment_line_form
+#: model:ir.model,name:account_payment.model_payment_line
+#: view:payment.line:0
+#: view:payment.order:0
+msgid "Payment Line"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.line:0
+msgid "Amount Total"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.order:0
+#: selection:payment.order,state:0
+msgid "Confirmed"
+msgstr ""
+
+#. module: account_payment
+#: help:payment.line,ml_date_created:0
+msgid "Invoice Effective Date"
+msgstr ""
+
+#. module: account_payment
+#: report:payment.order:0
+msgid "Execution Type"
+msgstr ""
+
+#. module: account_payment
+#: selection:payment.line,state:0
+msgid "Structured"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.order:0
+#: field:payment.order,state:0
+msgid "State"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.line:0
+#: view:payment.order:0
+msgid "Transaction Information"
+msgstr ""
+
+#. module: account_payment
+#: model:ir.actions.act_window,name:account_payment.action_payment_mode_form
+#: model:ir.model,name:account_payment.model_payment_mode
+#: model:ir.ui.menu,name:account_payment.menu_action_payment_mode_form
+#: view:payment.mode:0
+#: view:payment.order:0
+msgid "Payment Mode"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,ml_date_created:0
+msgid "Effective Date"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,ml_inv_ref:0
+msgid "Invoice Ref."
+msgstr ""
+
+#. module: account_payment
+#: help:payment.order,date_prefered:0
+msgid ""
+"Choose an option for the Payment Order:'Fixed' stands for a date specified "
+"by you.'Directly' stands for the direct execution.'Due date' stands for the "
+"scheduled date of execution."
+msgstr ""
+
+#. module: account_payment
+#: code:addons/account_payment/account_move_line.py:110
+#, python-format
+msgid "Error !"
+msgstr ""
+
+#. module: account_payment
+#: view:account.move.line:0
+msgid "Total debit"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.order,date_done:0
+msgid "Execution date"
+msgstr ""
+
+#. module: account_payment
+#: help:payment.mode,journal:0
+msgid "Bank or Cash Journal for the Payment Mode"
+msgstr ""
+
+#. module: account_payment
+#: selection:payment.order,date_prefered:0
+msgid "Fixed date"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,info_partner:0
+#: view:payment.order:0
+msgid "Destination Account"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.line:0
+msgid "Desitination Account"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.order:0
+msgid "Search Payment Orders"
+msgstr ""
+
+#. module: account_payment
+#: constraint:account.move.line:0
+msgid ""
+"You can not create move line on receivable/payable account without partner"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,create_date:0
+msgid "Created"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.order:0
+msgid "Select Invoices to Pay"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.line:0
+msgid "Currency Amount Total"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.order:0
+msgid "Make Payments"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,state:0
+msgid "Communication Type"
+msgstr ""
+
+#. module: account_payment
+#: model:ir.module.module,shortdesc:account_payment.module_meta_information
+msgid "Payment Management"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,bank_statement_line_id:0
+msgid "Bank statement line"
+msgstr ""
+
+#. module: account_payment
+#: selection:payment.order,date_prefered:0
+msgid "Due date"
+msgstr ""
+
+#. module: account_payment
+#: field:account.invoice,amount_to_pay:0
+msgid "Amount to be paid"
+msgstr ""
+
+#. module: account_payment
+#: report:payment.order:0
+msgid "Currency"
+msgstr ""
+
+#. module: account_payment
+#: view:account.payment.make.payment:0
+msgid "Yes"
+msgstr ""
+
+#. module: account_payment
+#: help:payment.line,info_owner:0
+msgid "Address of the Main Partner"
+msgstr ""
+
+#. module: account_payment
+#: help:payment.line,date:0
+msgid ""
+"If no payment date is specified, the bank will treat this payment line "
+"directly"
+msgstr ""
+
+#. module: account_payment
+#: model:ir.model,name:account_payment.model_account_payment_populate_statement
+msgid "Account Payment Populate Statement"
+msgstr ""
+
+#. module: account_payment
+#: help:payment.mode,name:0
+msgid "Mode of Payment"
+msgstr ""
+
+#. module: account_payment
+#: report:payment.order:0
+msgid "Value Date"
+msgstr ""
+
+#. module: account_payment
+#: report:payment.order:0
+msgid "Payment Type"
+msgstr ""
+
+#. module: account_payment
+#: help:payment.line,amount_currency:0
+msgid "Payment amount in the partner currency"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.order:0
+#: selection:payment.order,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: account_payment
+#: help:payment.line,communication2:0
+msgid "The successor message of Communication."
+msgstr ""
+
+#. module: account_payment
+#: code:addons/account_payment/account_move_line.py:110
+#, python-format
+msgid "No partner defined on entry line"
+msgstr ""
+
+#. module: account_payment
+#: help:payment.line,info_partner:0
+msgid "Address of the Ordering Customer."
+msgstr ""
+
+#. module: account_payment
+#: view:account.payment.populate.statement:0
+msgid "Populate Statement:"
+msgstr ""
+
+#. module: account_payment
+#: view:account.move.line:0
+msgid "Total credit"
+msgstr ""
+
+#. module: account_payment
+#: help:payment.order,date_scheduled:0
+msgid "Select a date if you have chosen Preferred Date to be fixed."
+msgstr ""
+
+#. module: account_payment
+#: field:payment.order,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: account_payment
+#: field:account.payment.populate.statement,lines:0
+#: model:ir.actions.act_window,name:account_payment.act_account_invoice_2_payment_line
+msgid "Payment Lines"
+msgstr ""
+
+#. module: account_payment
+#: model:ir.model,name:account_payment.model_account_move_line
+msgid "Journal Items"
+msgstr ""
+
+#. module: account_payment
+#: constraint:account.move.line:0
+msgid "Company must be same for its related account and period."
+msgstr ""
+
+#. module: account_payment
+#: help:payment.line,move_line_id:0
+msgid ""
+"This Entry Line will be referred for the information of the ordering "
+"customer."
+msgstr ""
+
+#. module: account_payment
+#: view:payment.order.create:0
+msgid "Search"
+msgstr ""
+
+#. module: account_payment
+#: model:ir.actions.report.xml,name:account_payment.payment_order1
+#: model:ir.model,name:account_payment.model_payment_order
+msgid "Payment Order"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,date:0
+msgid "Payment Date"
+msgstr ""
+
+#. module: account_payment
+#: report:payment.order:0
+msgid "Total:"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.order,date_created:0
+msgid "Creation date"
+msgstr ""
+
+#. module: account_payment
+#: view:account.payment.populate.statement:0
+msgid "ADD"
+msgstr ""
+
+#. module: account_payment
+#: view:account.bank.statement:0
+msgid "Import payment lines"
+msgstr ""
+
+#. module: account_payment
+#: field:account.move.line,amount_to_pay:0
+msgid "Amount to pay"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,amount:0
+msgid "Amount in Company Currency"
+msgstr ""
+
+#. module: account_payment
+#: help:payment.line,partner_id:0
+msgid "The Ordering Customer"
+msgstr ""
+
+#. module: account_payment
+#: model:ir.model,name:account_payment.model_account_payment_make_payment
+msgid "Account make payment"
+msgstr ""
+
+#. module: account_payment
+#: report:payment.order:0
+msgid "Invoice Ref"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,name:0
+msgid "Your Reference"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.order,mode:0
+msgid "Payment mode"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.order:0
+msgid "Payment order"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.line:0
+#: view:payment.order:0
+msgid "General Information"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.order:0
+#: selection:payment.order,state:0
+msgid "Done"
+msgstr ""
+
+#. module: account_payment
+#: model:ir.model,name:account_payment.model_account_invoice
+msgid "Invoice"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,communication:0
+msgid "Communication"
+msgstr ""
+
+#. module: account_payment
+#: view:account.payment.make.payment:0
+#: view:account.payment.populate.statement:0
+#: view:payment.order:0
+#: view:payment.order.create:0
+msgid "Cancel"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.line:0
+#: view:payment.order:0
+msgid "Information"
+msgstr ""
+
+#. module: account_payment
+#: model:ir.actions.act_window,help:account_payment.action_payment_order_tree
+msgid ""
+"A payment order is a payment request from your company to pay a supplier "
+"invoice or a customer credit note. Here you can register all payment orders "
+"that should be done, keep track of all payment orders and mention the "
+"invoice reference and the partner the payment should be done for."
+msgstr ""
+
+#. module: account_payment
+#: help:payment.line,amount:0
+msgid "Payment amount in the company currency"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.order.create:0
+msgid "Search Payment lines"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,amount_currency:0
+msgid "Amount in Partner Currency"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,communication2:0
+msgid "Communication 2"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,bank_id:0
+msgid "Destination Bank account"
+msgstr ""
+
+#. module: account_payment
+#: view:account.payment.make.payment:0
+msgid "Are you sure you want to make payment?"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.mode:0
+#: field:payment.mode,journal:0
+msgid "Journal"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.mode,bank_id:0
+msgid "Bank account"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.order:0
+msgid "Confirm Payments"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,company_currency:0
+#: report:payment.order:0
+msgid "Company Currency"
+msgstr ""
+
+#. module: account_payment
+#: model:ir.ui.menu,name:account_payment.menu_main_payment
+#: view:payment.line:0
+#: view:payment.order:0
+msgid "Payment"
+msgstr ""
+
+#. module: account_payment
+#: report:payment.order:0
+msgid "Payment Order / Payment"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,move_line_id:0
+msgid "Entry line"
+msgstr ""
+
+#. module: account_payment
+#: help:payment.line,communication:0
+msgid ""
+"Used as the message between ordering customer and current company. Depicts "
+"'What do you want to say to the recipient about this order ?'"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.mode,name:0
+msgid "Name"
+msgstr ""
+
+#. module: account_payment
+#: report:payment.order:0
+msgid "Bank Account"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.line:0
+#: view:payment.order:0
+msgid "Entry Information"
+msgstr ""
+
+#. module: account_payment
+#: model:ir.model,name:account_payment.model_payment_order_create
+msgid "payment.order.create"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,order_id:0
+msgid "Order"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.order,total:0
+msgid "Total"
+msgstr ""
+
+#. module: account_payment
+#: view:account.payment.make.payment:0
+#: model:ir.actions.act_window,name:account_payment.action_account_payment_make_payment
+msgid "Make Payment"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,partner_id:0
+#: report:payment.order:0
+msgid "Partner"
+msgstr ""
+
+#. module: account_payment
+#: model:ir.actions.act_window,name:account_payment.action_create_payment_order
+msgid "Populate Payment"
+msgstr ""
+
+#. module: account_payment
+#: help:payment.mode,bank_id:0
+msgid "Bank Account for the Payment Mode"
+msgstr ""
+
+#. module: account_payment
+#: constraint:account.move.line:0
+msgid "You can not create move line on view account."
+msgstr ""
diff --git a/addons/crm/i18n/ru.po b/addons/crm/i18n/ru.po
index e99f23800b2..ed60c121edf 100644
--- a/addons/crm/i18n/ru.po
+++ b/addons/crm/i18n/ru.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-19 06:21+0000\n"
+"X-Launchpad-Export-Date: 2011-04-20 05:57+0000\n"
 "X-Generator: Launchpad (build 12758)\n"
 
 #. module: crm
diff --git a/addons/document/i18n/ru.po b/addons/document/i18n/ru.po
index ee0f25a0f12..481e16009ad 100644
--- a/addons/document/i18n/ru.po
+++ b/addons/document/i18n/ru.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-19 06:21+0000\n"
+"X-Launchpad-Export-Date: 2011-04-20 05:57+0000\n"
 "X-Generator: Launchpad (build 12758)\n"
 
 #. module: document
diff --git a/addons/document_ftp/i18n/ru.po b/addons/document_ftp/i18n/ru.po
index c9705437e6d..ca5a7a90306 100644
--- a/addons/document_ftp/i18n/ru.po
+++ b/addons/document_ftp/i18n/ru.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-19 06:21+0000\n"
+"X-Launchpad-Export-Date: 2011-04-20 05:57+0000\n"
 "X-Generator: Launchpad (build 12758)\n"
 
 #. module: document_ftp
diff --git a/addons/marketing/i18n/id.po b/addons/marketing/i18n/id.po
new file mode 100644
index 00000000000..70141128305
--- /dev/null
+++ b/addons/marketing/i18n/id.po
@@ -0,0 +1,119 @@
+# Indonesian translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-04-19 16:01+0000\n"
+"Last-Translator: moelyana <Unknown>\n"
+"Language-Team: Indonesian <id@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: 2011-04-20 05:57+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
+
+#. module: marketing
+#: model:ir.module.module,description:marketing.module_meta_information
+msgid "Menu for Marketing"
+msgstr "Menu Untuk Marketing"
+
+#. module: marketing
+#: help:marketing.installer,marketing_campaign:0
+msgid ""
+"Helps you to manage marketing campaigns and automate actions and "
+"communication steps."
+msgstr ""
+"Membantu Anda untuk mengelola kampanye pemasaran dan langkah mengotomatisasi "
+"dan langkah komunikasi."
+
+#. module: marketing
+#: field:marketing.installer,progress:0
+msgid "Configuration Progress"
+msgstr "Kemajuan Konfigurasi"
+
+#. module: marketing
+#: view:marketing.installer:0
+msgid "title"
+msgstr "Judul:"
+
+#. module: marketing
+#: field:marketing.installer,email_template:0
+msgid "Automated E-Mails"
+msgstr "Email otomatis"
+
+#. module: marketing
+#: field:marketing.installer,config_logo:0
+msgid "Image"
+msgstr "Gambar"
+
+#. module: marketing
+#: view:marketing.installer:0
+msgid "Configure Your Marketing Application"
+msgstr "Konfigurasikan Aplikasi Pemasaran Anda"
+
+#. module: marketing
+#: help:marketing.installer,email_template:0
+msgid ""
+"Helps you to design templates of emails and integrate them in your different "
+"processes."
+msgstr ""
+"Membantu Anda untuk merancang template email dan mengintegrasikan mereka "
+"dalam proses yang berbeda."
+
+#. module: marketing
+#: model:ir.model,name:marketing.model_marketing_installer
+msgid "marketing.installer"
+msgstr ""
+
+#. module: marketing
+#: model:ir.module.module,shortdesc:marketing.module_meta_information
+msgid "Marketing"
+msgstr "Pemasaran"
+
+#. module: marketing
+#: field:marketing.installer,crm_profiling:0
+msgid "Profiling Tools"
+msgstr ""
+
+#. module: marketing
+#: view:marketing.installer:0
+msgid ""
+"OpenERP provides Addons to better manage your sales and marketing processes. "
+"Select the ones you would be interested in."
+msgstr ""
+"OpenERP menyediakan Addons untuk lebih baik mengelola proses penjualan dan "
+"pemasaran. Pilih salah satu yang menurut anda menarik."
+
+#. module: marketing
+#: view:marketing.installer:0
+msgid "Marketing Application Configuration"
+msgstr "Konfigurasi Aplikasi Pemasaran"
+
+#. module: marketing
+#: model:ir.actions.act_window,name:marketing.action_marketing_installer
+msgid "Marketing Modules Installation"
+msgstr "Instalasi Modul Marketing"
+
+#. module: marketing
+#: model:ir.module.module,shortdesc:marketing.module_meta_information
+msgid "Marketing Campaigns"
+msgstr "Kampanye Pemasaran"
+
+#. module: marketing
+#: help:marketing.installer,crm_profiling:0
+msgid ""
+"Helps you to perform segmentation of partners and design segmentation "
+"questionnaires"
+msgstr ""
+"Membantu Anda untuk melakukan segmentasi mitra dan desain kuesioner "
+"segmentasi"
+
+#. module: marketing
+#: view:marketing.installer:0
+msgid "Configure"
+msgstr "Pengaturan"
diff --git a/addons/point_of_sale/i18n/fr.po b/addons/point_of_sale/i18n/fr.po
index 4e511b43be3..9734a9db945 100644
--- a/addons/point_of_sale/i18n/fr.po
+++ b/addons/point_of_sale/i18n/fr.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-03 16:58+0000\n"
-"PO-Revision-Date: 2011-01-19 12:00+0000\n"
+"PO-Revision-Date: 2011-04-19 19:15+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: 2011-01-25 06:52+0000\n"
-"X-Generator: Launchpad (build 12177)\n"
+"X-Launchpad-Export-Date: 2011-04-20 05:57+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: point_of_sale
 #: field:pos.discount,discount_notes:0
@@ -32,10 +32,9 @@ msgid "Point of Sale Confirm"
 msgstr "Confimer la vente"
 
 #. module: point_of_sale
-#: model:ir.actions.act_window,name:point_of_sale.action_pos_discount
-#: view:pos.discount:0
+#: wizard_button:pos.discount,init,apply_discount:0
 msgid "Apply Discount"
-msgstr "Appliquer la remise"
+msgstr "Appliquer Remise"
 
 #. module: point_of_sale
 #: view:pos.order:0
@@ -58,7 +57,7 @@ msgid "Today"
 msgstr "Quotidien"
 
 #. module: point_of_sale
-#: view:pos.add.product:0
+#: wizard_view:pos.add_product,init:0
 msgid "Add product :"
 msgstr "Ajouter Produit :"
 
@@ -80,8 +79,6 @@ msgstr "Analyse des enregistreuses"
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_lines_detail
-#: report:pos.details:0
-#: report:pos.details_summary:0
 msgid "Details of Sales"
 msgstr "Détail de la vente"
 
@@ -91,9 +88,7 @@ msgid "Are you sure you want to close the statements ?"
 msgstr "Êtes-vous sûr de vouloir clôturer les relevés ?"
 
 #. module: point_of_sale
-#: model:ir.actions.act_window,name:point_of_sale.action_pos_scan_product
-#: model:ir.model,name:point_of_sale.model_pos_scan_product
-#: view:pos.scan.product:0
+#: wizard_view:pos.scan_product,init:0
 msgid "Scan product"
 msgstr "Scan de produit"
 
@@ -106,7 +101,7 @@ msgid "Day"
 msgstr "Jour"
 
 #. module: point_of_sale
-#: view:pos.make.payment:0
+#: wizard_view:pos.payment,ask_pay:0
 msgid "Add payment :"
 msgstr "Ajouter un paiement :"
 
@@ -127,18 +122,16 @@ msgid "Today's Sales By Current User"
 msgstr "Ventes du jour par utilisateurs actuels"
 
 #. module: point_of_sale
-#: report:account.statement:0
-#: field:pos.box.entries,amount:0
-#: field:pos.box.out,amount:0
-#: report:pos.invoice:0
-#: field:pos.make.payment,amount:0
-#: report:pos.user.product:0
+#: rml:pos.invoice:0
+#: field:pos.payment,amount:0
+#: wizard_field:pos.payment,ask_pay,amount:0
 #: field:report.transaction.pos,amount:0
 msgid "Amount"
 msgstr "Montant"
 
 #. module: point_of_sale
-#: report:pos.lines:0
+#: rml:pos.details:0
+#: rml:pos.lines:0
 msgid "VAT"
 msgstr "TVA"
 
@@ -148,7 +141,7 @@ msgid "Origin"
 msgstr "Origine"
 
 #. module: point_of_sale
-#: report:pos.invoice:0
+#: rml:pos.invoice:0
 msgid "Tax"
 msgstr "Taxe"
 
@@ -165,14 +158,13 @@ msgstr ""
 "acceptation."
 
 #. module: point_of_sale
-#: report:account.statement:0
-#: field:report.pos.order,partner_id:0
+#: field:pos.order,partner_id:0
 msgid "Partner"
 msgstr "Partenaire"
 
 #. module: point_of_sale
-#: report:pos.details:0
-#: report:pos.details_summary:0
+#: rml:pos.details:0
+#: rml:pos.details_summary:0
 msgid "Total of the day"
 msgstr "Total du Jour"
 
@@ -183,25 +175,19 @@ msgid "Average Price"
 msgstr "Prix moyen"
 
 #. module: point_of_sale
-#: report:pos.lines:0
+#: rml:pos.invoice:0
+#: rml:pos.lines:0
 msgid "Disc. (%)"
 msgstr "Rem. (%)"
 
 #. module: point_of_sale
-#: report:pos.details:0
-#: report:pos.details_summary:0
+#: rml:pos.details:0
+#: rml:pos.details_summary:0
 msgid "Total discount"
 msgstr "Remise totale"
 
 #. module: point_of_sale
-#: view:account.bank.statement:0
-#: view:pos.order:0
 #: field:pos.order,state:0
-#: report:pos.sales.user:0
-#: report:pos.sales.user.today:0
-#: report:pos.sales.user.today.current.user:0
-#: field:report.cash.register,state:0
-#: field:report.pos.order,state:0
 msgid "State"
 msgstr "État"
 
@@ -284,8 +270,7 @@ msgid "Cash register management"
 msgstr "Gestion des caisses enregistreuses"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1056
-#: code:addons/point_of_sale/point_of_sale.py:1075
+#: code:addons/point_of_sale/pos.py:0
 #, python-format
 msgid "No valid pricelist line found !"
 msgstr "Aucune ligne de Liste de Prix valide trouvée !"
@@ -309,7 +294,7 @@ msgstr "Marge"
 #. module: point_of_sale
 #: field:pos.order.line,discount:0
 msgid "Discount (%)"
-msgstr "Ristourne (%)"
+msgstr "Remise (%)"
 
 #. module: point_of_sale
 #: view:pos.order.line:0
@@ -380,10 +365,9 @@ msgid "Sales by User Monthly"
 msgstr "Ventes par magasin"
 
 #. module: point_of_sale
-#: field:pos.order,date_payment:0
-#: field:report.pos.order,date_payment:0
+#: field:pos.payment,payment_date:0
 msgid "Payment Date"
-msgstr "Date de paiement"
+msgstr "Date de règlement"
 
 #. module: point_of_sale
 #: report:account.statement:0
@@ -403,8 +387,8 @@ msgid "To count"
 msgstr "À compter"
 
 #. module: point_of_sale
-#: report:pos.details:0
-#: report:pos.details_summary:0
+#: rml:pos.details:0
+#: rml:pos.details_summary:0
 msgid "Summary"
 msgstr "Résumé"
 
@@ -419,12 +403,10 @@ msgid "Delay Payment"
 msgstr "Delai de paiement"
 
 #. module: point_of_sale
-#: field:pos.add.product,quantity:0
-#: report:pos.invoice:0
-#: report:pos.lines:0
+#: wizard_field:pos.add_product,init,quantity:0
+#: rml:pos.invoice:0
+#: rml:pos.lines:0
 #: field:pos.order.line,qty:0
-#: field:report.sales.by.user.pos,qty:0
-#: field:report.sales.by.user.pos.month,qty:0
 msgid "Quantity"
 msgstr "Quantité"
 
@@ -439,8 +421,7 @@ msgid "Period"
 msgstr "Période"
 
 #. module: point_of_sale
-#: report:pos.invoice:0
-#: report:pos.payment.report:0
+#: rml:pos.invoice:0
 msgid "Net Total:"
 msgstr "Total net:"
 
@@ -472,12 +453,9 @@ msgid "Print Report"
 msgstr "Imprimer le rapport"
 
 #. module: point_of_sale
-#: report:pos.invoice:0
-#: report:pos.lines:0
+#: rml:pos.invoice:0
+#: rml:pos.lines:0
 #: field:pos.order.line,price_unit:0
-#: report:pos.payment.report:0
-#: report:pos.payment.report.date:0
-#: report:pos.payment.report.user:0
 msgid "Unit Price"
 msgstr "Prix unitaire"
 
@@ -503,28 +481,22 @@ msgid "Invoice Amount"
 msgstr "Montant de la facture"
 
 #. module: point_of_sale
-#: view:account.bank.statement:0
-#: field:account.bank.statement.line,journal_id:0
-#: report:account.statement:0
-#: report:all.closed.cashbox.of.the.day:0
-#: model:ir.model,name:point_of_sale.model_account_journal
 #: field:pos.config.journal,journal_id:0
 #: field:pos.order,sale_journal:0
-#: view:report.cash.register:0
-#: field:report.cash.register,journal_id:0
-#: field:report.pos.order,journal_id:0
+#: wizard_field:pos.payment,ask_pay,journal:0
+#: field:pos.payment,journal_id:0
+#: field:report.transaction.pos,journal_id:0
 msgid "Journal"
 msgstr "Journal"
 
 #. module: point_of_sale
-#: report:pos.invoice:0
+#: rml:pos.invoice:0
 msgid "Tel. :"
 msgstr "Tél. :"
 
 #. module: point_of_sale
+#: model:ir.actions.wizard,name:point_of_sale.pos_payment
 #: view:pos.order:0
-#: selection:pos.order,state:0
-#: selection:report.pos.order,state:0
 msgid "Payment"
 msgstr "Paiement"
 
@@ -555,8 +527,8 @@ msgstr ""
 "des caisses confirmées !"
 
 #. module: point_of_sale
-#: report:pos.details:0
-#: report:pos.details_summary:0
+#: rml:pos.details:0
+#: rml:pos.details_summary:0
 msgid "Mode of Taxes"
 msgstr "Mode des Taxes"
 
@@ -576,7 +548,7 @@ msgstr "Erreur: code EAN invalide"
 #: view:pos.confirm:0
 #: view:pos.open.statement:0
 msgid "Open Statements"
-msgstr "Ouvrir les caisses"
+msgstr "Ouvrir les caisses automatiques"
 
 #. module: point_of_sale
 #: view:pos.add.product:0
@@ -589,8 +561,8 @@ msgid "Sales total(Revenue)"
 msgstr "Total des ventes(revenu)"
 
 #. module: point_of_sale
-#: report:pos.details:0
-#: report:pos.details_summary:0
+#: rml:pos.details:0
+#: rml:pos.details_summary:0
 msgid "Total paid"
 msgstr "Total Payé"
 
@@ -600,15 +572,15 @@ msgid "Check Details"
 msgstr "Vérifier les détails"
 
 #. module: point_of_sale
-#: report:pos.details:0
-#: report:pos.details_summary:0
+#: rml:pos.details:0
+#: rml:pos.details_summary:0
 msgid "Qty of product"
 msgstr "Qté de Produits"
 
 #. module: point_of_sale
 #: field:pos.order,contract_number:0
 msgid "Contract Number"
-msgstr "Numéro de contrat"
+msgstr "N° de contrat"
 
 #. module: point_of_sale
 #: selection:report.cash.register,month:0
@@ -634,8 +606,7 @@ msgstr ""
 "Veuillez en choisir une avant de choisir un produit"
 
 #. module: point_of_sale
-#: view:pos.order:0
-#: field:pos.order.line,price_subtotal_incl:0
+#: field:pos.order.line,price_subtotal:0
 msgid "Subtotal"
 msgstr "Sous-total"
 
@@ -692,7 +663,8 @@ msgid "St.Name"
 msgstr "Nom du relevé"
 
 #. module: point_of_sale
-#: report:pos.details_summary:0
+#: rml:pos.details:0
+#: rml:pos.details_summary:0
 msgid "Sales total"
 msgstr "Total des Ventes"
 
@@ -702,7 +674,7 @@ msgid "Sum of subtotals"
 msgstr "Somme des sous-totaux"
 
 #. module: point_of_sale
-#: field:pos.make.payment,payment_date:0
+#: wizard_field:pos.payment,ask_pay,payment_date:0
 msgid "Payment date"
 msgstr "Date du paiement"
 
@@ -722,10 +694,6 @@ msgid "Today's Sales"
 msgstr "Les ventes du jour"
 
 #. module: point_of_sale
-#: view:report.sales.by.margin.pos:0
-#: view:report.sales.by.margin.pos.month:0
-#: view:report.sales.by.user.pos:0
-#: view:report.sales.by.user.pos.month:0
 #: view:report.transaction.pos:0
 msgid "POS "
 msgstr "Point de Vente "
@@ -738,7 +706,7 @@ msgid "Total :"
 msgstr "Total :"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1206
+#: code:addons/point_of_sale/pos.py:0
 #, python-format
 msgid "Create line failed !"
 msgstr "Échec de création de ligne !"
@@ -750,20 +718,19 @@ msgid "Product Name"
 msgstr "Nom du Produit"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:69
+#: code:addons/point_of_sale/pos.py:0
 #, python-format
 msgid "Invalid action !"
 msgstr "Action incorrecte !"
 
 #. module: point_of_sale
-#: field:pos.make.payment,pricelist_id:0
 #: field:pos.order,pricelist_id:0
 msgid "Pricelist"
 msgstr "Liste de prix"
 
 #. module: point_of_sale
-#: report:pos.details:0
-#: report:pos.details_summary:0
+#: rml:pos.details:0
+#: rml:pos.details_summary:0
 msgid "Total invoiced"
 msgstr "Total Facturé"
 
@@ -798,7 +765,7 @@ msgid "Today's Closed Cashbox"
 msgstr "Caisse fermée d'aujourd'hui"
 
 #. module: point_of_sale
-#: report:pos.invoice:0
+#: rml:pos.invoice:0
 msgid "Draft Invoice"
 msgstr "Facture Brouillon"
 
@@ -850,7 +817,7 @@ msgid "Disc."
 msgstr "Rem."
 
 #. module: point_of_sale
-#: report:pos.invoice:0
+#: rml:pos.invoice:0
 msgid "VAT :"
 msgstr "TVA"
 
@@ -865,13 +832,13 @@ msgid "Receipt :"
 msgstr "Reçu :"
 
 #. module: point_of_sale
-#: field:account.bank.statement.line,pos_statement_id:0
+#: field:pos.order,amount_paid:0
 #: field:pos.order,amount_return:0
 msgid "unknown"
 msgstr "inconnu"
 
 #. module: point_of_sale
-#: report:pos.details:0
+#: rml:pos.details:0
 #: field:report.transaction.pos,date_create:0
 msgid "Date"
 msgstr "Date"
@@ -908,7 +875,7 @@ msgid "Pos Box Entries"
 msgstr "Entrées de caisse de point de vente"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/wizard/pos_get_sale.py:54
+#: code:addons/point_of_sale/wizard/wizard_get_sale.py:0
 #, python-format
 msgid "You can't modify this order. It has already been paid"
 msgstr "Paiement déjà effectué: Vous ne pouvez pas modifier cette vente."
@@ -930,14 +897,15 @@ msgid "Number of Transaction"
 msgstr "Nombre de Transactions"
 
 #. module: point_of_sale
-#: view:pos.add.product:0
-#: view:pos.box.entries:0
-#: view:pos.box.out:0
-#: view:pos.get.sale:0
-#: view:pos.make.payment:0
+#: wizard_button:pos.add_product,init,end:0
+#: wizard_button:pos.config.journal,init,end:0
+#: wizard_button:pos.discount,init,end:0
+#: view:pos.order:0
 #: selection:pos.order,state:0
-#: view:pos.receipt:0
-#: selection:report.pos.order,state:0
+#: wizard_button:pos.payment,ask_pay,end:0
+#: wizard_button:pos.refund_order,init,end:0
+#: wizard_button:pos.sale.get,init,end:0
+#: wizard_button:pos.scan_product,init,end:0
 msgid "Cancel"
 msgstr "Annuler"
 
@@ -983,7 +951,7 @@ msgid "First Name"
 msgstr "Prénom"
 
 #. module: point_of_sale
-#: view:res.company:0
+#: view:pos.order:0
 msgid "Other"
 msgstr "Autre"
 
@@ -1011,22 +979,19 @@ msgid "Users"
 msgstr "Utilisateurs"
 
 #. module: point_of_sale
-#: report:pos.details:0
-#: report:pos.invoice:0
-#: report:pos.lines:0
+#: rml:pos.details:0
+#: rml:pos.invoice:0
+#: rml:pos.lines:0
+#: rml:pos.receipt:0
 msgid "Price"
 msgstr "Prix"
 
 #. module: point_of_sale
-#: field:pos.scan.product,gencod:0
+#: wizard_field:pos.scan_product,init,gencod:0
 msgid "Barcode"
 msgstr "Code Barre"
 
 #. module: point_of_sale
-#: view:report.sales.by.margin.pos:0
-#: view:report.sales.by.margin.pos.month:0
-#: view:report.sales.by.user.pos:0
-#: view:report.sales.by.user.pos.month:0
 #: view:report.transaction.pos:0
 msgid "POS"
 msgstr "Point de vente"
@@ -1039,7 +1004,7 @@ msgstr "Date de création"
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_wizard_enter_jrnl2
 msgid "Output Operations"
-msgstr "Opérations de sortie de caisse"
+msgstr "Sortie de caisse"
 
 #. module: point_of_sale
 #: report:pos.details:0
@@ -1076,7 +1041,7 @@ msgid "The name of the journal must be unique per company !"
 msgstr "Le nom du journal doit être unique dans chaque société !"
 
 #. module: point_of_sale
-#: report:pos.invoice:0
+#: rml:pos.invoice:0
 msgid "Supplier Refund"
 msgstr "Note de Crédit Fournisseur"
 
@@ -1099,15 +1064,13 @@ msgid "All Closed CashBox"
 msgstr "Fermer toute les caisses"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1041
-#: code:addons/point_of_sale/point_of_sale.py:1066
+#: code:addons/point_of_sale/pos.py:0
 #, python-format
 msgid "No Pricelist !"
 msgstr "Pas de Liste de Prix !"
 
 #. module: point_of_sale
-#: model:ir.actions.act_window,name:point_of_sale.action_pos_get_sale
-#: view:pos.get.sale:0
+#: wizard_view:pos.sale.get,init:0
 msgid "Select an Open Sale Order"
 msgstr "Sélectionnez une Commande Ouverte"
 
@@ -1117,7 +1080,7 @@ msgid "Order date"
 msgstr "Date de commande"
 
 #. module: point_of_sale
-#: report:pos.invoice:0
+#: rml:pos.invoice:0
 msgid "Base"
 msgstr "Base"
 
@@ -1129,21 +1092,22 @@ msgstr "Compte"
 #. module: point_of_sale
 #: field:pos.order,sale_manager:0
 msgid "Salesman Manager"
-msgstr "Responsable du vendeur"
+msgstr "Vendeur 2"
 
 #. module: point_of_sale
 #: view:pos.order:0
+#: field:pos.order,note:0
 msgid "Notes"
 msgstr "Notes"
 
 #. module: point_of_sale
-#: field:pos.get.sale,picking_id:0
-#: view:pos.order:0
+#: wizard_field:pos.sale.get,init,picking_id:0
 msgid "Sale Order"
 msgstr "Commande client"
 
 #. module: point_of_sale
-#: report:pos.invoice:0
+#: rml:pos.invoice:0
+#: rml:pos.lines:0
 #: field:pos.order,amount_tax:0
 msgid "Taxes"
 msgstr "Taxes"
@@ -1151,13 +1115,12 @@ msgstr "Taxes"
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line_day
-#: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line_form
 msgid "Sale line"
 msgstr "Ligne de Vente"
 
 #. module: point_of_sale
 #: field:pos.config.journal,code:0
-#: report:pos.details:0
+#: rml:pos.details:0
 msgid "Code"
 msgstr "Code"
 
@@ -1190,7 +1153,7 @@ msgid "Extra Info"
 msgstr "Info complémentaire"
 
 #. module: point_of_sale
-#: report:pos.invoice:0
+#: rml:pos.invoice:0
 msgid "Fax :"
 msgstr "Fax :"
 
@@ -1242,14 +1205,8 @@ msgid "Picking List"
 msgstr "Liste de colisage"
 
 #. module: point_of_sale
-#: report:pos.details:0
-#: report:pos.payment.report:0
-#: report:pos.payment.report.date:0
-#: report:pos.payment.report.user:0
-#: report:pos.sales.user.today.current.user:0
-#: report:pos.user.product:0
-#: field:report.sales.by.margin.pos,qty:0
-#: field:report.sales.by.margin.pos.month,qty:0
+#: rml:pos.details:0
+#: rml:pos.receipt:0
 msgid "Qty"
 msgstr "Qté"
 
@@ -1267,15 +1224,8 @@ msgid "Sale by User"
 msgstr "Ventes par Utilisateur"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:555
-#: code:addons/point_of_sale/point_of_sale.py:743
-#: code:addons/point_of_sale/point_of_sale.py:851
-#: code:addons/point_of_sale/report/pos_invoice.py:46
-#: code:addons/point_of_sale/wizard/pos_box_entries.py:103
-#: code:addons/point_of_sale/wizard/pos_box_entries.py:107
-#: code:addons/point_of_sale/wizard/pos_box_out.py:95
-#: code:addons/point_of_sale/wizard/pos_box_out.py:99
-#: code:addons/point_of_sale/wizard/pos_box_out.py:101
+#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/report/pos_invoice.py:0
 #, python-format
 msgid "Error !"
 msgstr "Erreur !"
@@ -1360,7 +1310,7 @@ msgstr "Mois"
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "Sales Order POS"
-msgstr "Commande de ventes PDV"
+msgstr "Ventes"
 
 #. module: point_of_sale
 #: report:account.statement:0
@@ -1403,7 +1353,7 @@ msgid "Customer Note"
 msgstr "Note client"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:337
+#: code:addons/point_of_sale/pos.py:0
 #, python-format
 msgid "No order lines defined for this sale."
 msgstr "Aucune lignes de commande pour cette vente."
@@ -1414,10 +1364,7 @@ msgid "Opening Balance"
 msgstr "Solde initial"
 
 #. module: point_of_sale
-#: field:pos.order,amount_paid:0
 #: selection:pos.order,state:0
-#: view:report.pos.order:0
-#: selection:report.pos.order,state:0
 msgid "Paid"
 msgstr "Payé"
 
@@ -1433,11 +1380,7 @@ msgid "Quotation"
 msgstr "Devis"
 
 #. module: point_of_sale
-#: report:all.closed.cashbox.of.the.day:0
-#: report:pos.invoice:0
-#: report:pos.lines:0
-#: report:pos.payment.report.date:0
-#: report:pos.payment.report.user:0
+#: rml:pos.invoice:0
 msgid "Total:"
 msgstr "Total:"
 
@@ -1471,26 +1414,26 @@ msgid "Nbr Invoice"
 msgstr "Nbr Facture"
 
 #. module: point_of_sale
-#: model:ir.actions.act_window,name:point_of_sale.action_report_pos_receipt
+#: model:ir.actions.report.xml,name:point_of_sale.pos_receipt
 msgid "Receipt"
 msgstr "Reçu"
 
 #. module: point_of_sale
 #: field:pos.order,invoice_wanted:0
 msgid "Create Invoice"
-msgstr "Créer une facture"
+msgstr "Créer Facture"
 
 #. module: point_of_sale
 #: selection:pos.order,state:0
-#: selection:report.pos.order,state:0
 msgid "Done"
 msgstr "Terminé"
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_invoice_report
-#: report:pos.invoice:0
-#: field:pos.make.payment,invoice_wanted:0
+#: rml:pos.invoice:0
 #: field:pos.order,invoice_id:0
+#: wizard_field:pos.payment,ask_pay,invoice_wanted:0
+#: field:report.transaction.pos,invoice_id:0
 msgid "Invoice"
 msgstr "Facture"
 
@@ -1507,6 +1450,7 @@ msgstr "Ouvrir"
 
 #. module: point_of_sale
 #: field:pos.order.line,order_id:0
+#: field:pos.payment,order_id:0
 msgid "Order Ref"
 msgstr "Réf. Commande"
 
@@ -1540,7 +1484,7 @@ msgid "Sales by User Margin"
 msgstr "Marges par utilisateurs"
 
 #. module: point_of_sale
-#: report:pos.invoice:0
+#: rml:pos.invoice:0
 msgid "Taxes:"
 msgstr "Taxes :"
 
@@ -1550,17 +1494,9 @@ msgid "Point of Sale Orders Statistics"
 msgstr "Statistiques des commandes du point de vente"
 
 #. module: point_of_sale
-#: model:ir.model,name:point_of_sale.model_product_product
-#: field:pos.add.product,product_id:0
-#: report:pos.details:0
+#: wizard_field:pos.add_product,init,product:0
+#: rml:pos.details:0
 #: field:pos.order.line,product_id:0
-#: report:pos.payment.report:0
-#: report:pos.payment.report.date:0
-#: report:pos.payment.report.user:0
-#: report:pos.user.product:0
-#: view:product.product:0
-#: view:report.pos.order:0
-#: field:report.pos.order,product_id:0
 msgid "Product"
 msgstr "Produit"
 
@@ -1643,13 +1579,8 @@ msgid "Date Start"
 msgstr "Date de début"
 
 #. module: point_of_sale
+#: rml:pos.lines:0
 #: field:pos.order,amount_total:0
-#: report:pos.payment.report:0
-#: report:pos.payment.report.date:0
-#: report:pos.payment.report.user:0
-#: report:pos.sales.user.today.current.user:0
-#: field:report.sales.by.user.pos,amount:0
-#: field:report.sales.by.user.pos.month,amount:0
 msgid "Total"
 msgstr "Total"
 
@@ -1693,26 +1624,12 @@ msgid "Return lines"
 msgstr "Lignes de retour"
 
 #. module: point_of_sale
-#: report:account.statement:0
-#: report:all.closed.cashbox.of.the.day:0
-#: report:pos.details:0
-#: report:pos.details_summary:0
-#: report:pos.lines:0
-#: field:pos.order,company_id:0
-#: field:pos.order.line,company_id:0
-#: report:pos.payment.report:0
-#: report:pos.payment.report.date:0
-#: report:pos.payment.report.user:0
-#: report:pos.sales.user:0
-#: report:pos.sales.user.today:0
-#: report:pos.sales.user.today.current.user:0
-#: report:pos.user.product:0
-#: field:report.pos.order,company_id:0
+#: rml:pos.lines:0
 msgid "Company"
 msgstr "Société"
 
 #. module: point_of_sale
-#: report:pos.invoice:0
+#: rml:pos.invoice:0
 msgid "Invoice Date"
 msgstr "Date de Facture"
 
@@ -1764,30 +1681,31 @@ msgid "Error!"
 msgstr "Erreur !"
 
 #. module: point_of_sale
-#: report:pos.lines:0
+#: rml:pos.lines:0
 msgid "No. Of Articles"
 msgstr "Nb. d'articles"
 
 #. module: point_of_sale
 #: field:pos.order,date_validity:0
+#: wizard_field:pos.refund_order,init,date_validity:0
 msgid "Validity Date"
 msgstr "Date de validité"
 
 #. module: point_of_sale
+#: view:pos.order:0
 #: field:pos.order,pickings:0
 msgid "Picking"
 msgstr "Colisage"
 
 #. module: point_of_sale
 #: field:pos.order,shop_id:0
-#: field:report.pos.order,shop_id:0
 msgid "Shop"
 msgstr "Magasin"
 
 #. module: point_of_sale
-#: field:pos.order,picking_id:0
+#: field:pos.order,last_out_picking:0
 msgid "Last Output Picking"
-msgstr "Dernier colisage sortant"
+msgstr "Colisages"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_account_bank_statement_line
@@ -1827,7 +1745,7 @@ msgid "Refunded Quantity"
 msgstr "Qté Remboursée"
 
 #. module: point_of_sale
-#: view:pos.scan.product:0
+#: wizard_view:pos.scan_product,init:0
 msgid "Scan Barcode"
 msgstr "Scanner le code barre"
 
@@ -1858,9 +1776,8 @@ msgid "Cancelled Invoice"
 msgstr "Facture annulée"
 
 #. module: point_of_sale
-#: view:account.bank.statement:0
-#: view:pos.get.sale:0
-#: view:report.cash.register:0
+#: model:ir.actions.wizard,name:point_of_sale.pos_confirm
+#: wizard_button:pos.sale.get,init,set:0
 msgid "Confirm"
 msgstr "Confirmer"
 
@@ -1880,18 +1797,18 @@ msgid "Discount "
 msgstr "Remise "
 
 #. module: point_of_sale
-#: report:pos.invoice:0
+#: rml:pos.invoice:0
 msgid "Supplier Invoice"
 msgstr "Facture fournisseur"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1214
+#: code:addons/point_of_sale/pos.py:0
 #, python-format
 msgid "Modify line failed !"
 msgstr "Échec de modification de ligne !"
 
 #. module: point_of_sale
-#: field:pos.make.payment,payment_name:0
+#: wizard_field:pos.payment,ask_pay,payment_name:0
 msgid "Payment name"
 msgstr "Nom sur le paiement"
 
@@ -1921,7 +1838,7 @@ msgid "The code of the journal must be unique per company !"
 msgstr "Le code du journal doit être unique dans chaque société !"
 
 #. module: point_of_sale
-#: model:ir.ui.menu,name:point_of_sale.menu_point_config_product
+#: model:ir.ui.menu,name:point_of_sale.menu_point_config
 msgid "Configuration"
 msgstr "Configuration"
 
@@ -1985,32 +1902,23 @@ msgid "Message"
 msgstr "Message"
 
 #. module: point_of_sale
-#: view:account.journal:0
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_tree2
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_tree3
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_pos_form
-#: model:ir.actions.act_window,name:point_of_sale.action_pos_pos_form_user
 #: model:ir.model,name:point_of_sale.model_pos_order
+#: model:ir.ui.menu,name:point_of_sale.menu_point_ofsale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_root
 msgid "Point of Sale"
 msgstr "Point de Vente"
 
 #. module: point_of_sale
-#: view:pos.order:0
-#: field:pos.payment.report.date,user_id:0
-#: field:pos.payment.report.user,user_id:0
-#: field:pos.sale.user,user_id:0
-#: field:pos.sales.user.today,user_id:0
-#: view:report.pos.order:0
-#: field:report.pos.order,user_id:0
+#: field:pos.order,user_id:0
 msgid "Salesman"
 msgstr "Vendeur"
 
 #. module: point_of_sale
-#: report:pos.details:0
+#: rml:pos.details:0
 #: selection:pos.order,state:0
-#: view:report.pos.order:0
-#: selection:report.pos.order,state:0
 msgid "Invoiced"
 msgstr "Facturée"
 
@@ -2027,13 +1935,12 @@ msgid "Discount Notice"
 msgstr "Note de remise"
 
 #. module: point_of_sale
-#: view:pos.scan.product:0
+#: wizard_button:pos.scan_product,init,add:0
 msgid "Add"
 msgstr "Ajouter"
 
 #. module: point_of_sale
-#: view:report.cash.register:0
-#: selection:report.pos.order,state:0
+#: selection:pos.order,state:0
 msgid "Draft"
 msgstr "Brouillon"
 
@@ -2053,12 +1960,12 @@ msgid "POS Payment Report according to date"
 msgstr "Rapport de paiement du point de vente en fonction de la date"
 
 #. module: point_of_sale
-#: report:pos.invoice:0
+#: rml:pos.invoice:0
 msgid "PRO-FORMA"
 msgstr "PRO-FORMA"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:637
+#: code:addons/point_of_sale/pos.py:0
 #, python-format
 msgid "Please provide a partner for the sale."
 msgstr "Veuiller renseigner un client"
@@ -2078,26 +1985,14 @@ msgid "Cashier"
 msgstr "Caissier"
 
 #. module: point_of_sale
-#: report:account.statement:0
-#: report:all.closed.cashbox.of.the.day:0
-#: view:pos.payment.report.date:0
-#: report:pos.sales.user:0
-#: report:pos.sales.user.today:0
-#: report:pos.sales.user.today.current.user:0
-#: report:pos.user.product:0
-#: view:report.cash.register:0
-#: field:report.cash.register,user_id:0
-#: field:report.sales.by.margin.pos,user_id:0
-#: field:report.sales.by.margin.pos.month,user_id:0
-#: field:report.sales.by.user.pos,user_id:0
-#: field:report.sales.by.user.pos.month,user_id:0
 #: field:report.transaction.pos,user_id:0
 msgid "User"
 msgstr "Utilisateur"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree
-#: model:ir.model,name:point_of_sale.model_report_sales_by_user_pos
+#: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_month
+#: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_today
 msgid "Sales by user"
 msgstr "Ventes par utilisateur"
 
@@ -2124,13 +2019,7 @@ msgid "POS Orders lines"
 msgstr "Ligne de commandes du point de vente"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:337
-#: code:addons/point_of_sale/point_of_sale.py:504
-#: code:addons/point_of_sale/point_of_sale.py:506
-#: code:addons/point_of_sale/point_of_sale.py:544
-#: code:addons/point_of_sale/point_of_sale.py:637
-#: code:addons/point_of_sale/point_of_sale.py:1206
-#: code:addons/point_of_sale/point_of_sale.py:1214
+#: code:addons/point_of_sale/pos.py:0
 #, python-format
 msgid "Error"
 msgstr "Erreur"
@@ -2141,12 +2030,12 @@ msgid "Sales Journal"
 msgstr "Journal de ventes"
 
 #. module: point_of_sale
-#: report:pos.invoice:0
+#: rml:pos.invoice:0
 msgid "Refund"
 msgstr "Remboursement"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/report/pos_invoice.py:46
+#: code:addons/point_of_sale/report/pos_invoice.py:0
 #, python-format
 msgid "Please create an invoice for this sale."
 msgstr "Veuillez créer une facture pour cette vente."
@@ -2171,16 +2060,7 @@ msgid "Disc(%)"
 msgstr "Rem (%)"
 
 #. module: point_of_sale
-#: view:all.closed.cashbox.of.the.day:0
-#: view:pos.details:0
-#: view:pos.discount:0
-#: view:pos.payment.report:0
-#: view:pos.payment.report.date:0
-#: view:pos.payment.report.user:0
-#: view:pos.sale.user:0
-#: view:pos.sales.user.today:0
-#: view:pos.sales.user.today.current_user:0
-#: view:pos.scan.product:0
+#: view:pos.order:0
 msgid "Close"
 msgstr "Fermer"
 
@@ -2232,11 +2112,11 @@ msgid "please check that account is set to %s"
 msgstr "Vérifier que le compte comptable est mis à %s"
 
 #. module: point_of_sale
-#: field:pos.box.entries,name:0
-#: field:pos.box.out,name:0
 #: field:pos.config.journal,name:0
-#: report:pos.invoice:0
-#: report:pos.lines:0
+#: rml:pos.invoice:0
+#: rml:pos.lines:0
+#: field:pos.payment,name:0
+#: rml:pos.receipt:0
 msgid "Description"
 msgstr "Description"
 
@@ -2332,23 +2212,14 @@ msgid "April"
 msgstr "Avril"
 
 #. module: point_of_sale
-#: field:pos.order,statement_ids:0
+#: view:pos.order:0
 msgid "Payments"
 msgstr "Paiements"
 
 #. module: point_of_sale
-#: report:pos.details:0
-#: report:pos.details_summary:0
-#: report:pos.lines:0
-#: report:pos.payment.report:0
-#: report:pos.payment.report.date:0
-#: report:pos.payment.report.user:0
-#: report:pos.sales.user:0
-#: report:pos.sales.user.today:0
-#: report:pos.sales.user.today.current.user:0
-#: report:pos.user.product:0
+#: rml:pos.lines:0
 msgid "Print Date"
-msgstr "Date d'Impression"
+msgstr "Date d'impression"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_report_sales_by_margin_pos_month
@@ -2363,7 +2234,7 @@ msgstr "Recherche de bon de commande"
 #. module: point_of_sale
 #: field:pos.order,account_move:0
 msgid "Account Entry"
-msgstr "Pièce comptable"
+msgstr "Écriture comptable"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_add_product.py:84
diff --git a/addons/procurement/i18n/ru.po b/addons/procurement/i18n/ru.po
index 6fd3884b5e5..ba0e8cfcea4 100644
--- a/addons/procurement/i18n/ru.po
+++ b/addons/procurement/i18n/ru.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-19 06:21+0000\n"
+"X-Launchpad-Export-Date: 2011-04-20 05:57+0000\n"
 "X-Generator: Launchpad (build 12758)\n"
 
 #. module: procurement
diff --git a/addons/product/i18n/id.po b/addons/product/i18n/id.po
index c5fbb9e8079..8a6a38794a7 100644
--- a/addons/product/i18n/id.po
+++ b/addons/product/i18n/id.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-04-18 16:18+0000\n"
+"PO-Revision-Date: 2011-04-19 15:45+0000\n"
 "Last-Translator: moelyana <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: 2011-04-19 06:21+0000\n"
+"X-Launchpad-Export-Date: 2011-04-20 05:57+0000\n"
 "X-Generator: Launchpad (build 12758)\n"
 
 #. module: product
@@ -1693,7 +1693,7 @@ msgstr ""
 #. module: product
 #: field:product.template,warranty:0
 msgid "Warranty (months)"
-msgstr ""
+msgstr "Garansi (bulan)"
 
 #. module: product
 #: help:product.pricelist.item,categ_id:0
@@ -1701,6 +1701,9 @@ msgid ""
 "Set a category of product if this rule only apply to products of a category "
 "and his children. Keep empty for all products"
 msgstr ""
+"Tentukan kategori produk jika peraturan ini hanya berlaku untuk produk dari "
+"sebuah kategori dan turunannya. Simpan dalam keadaan kosong untuk semua "
+"produk"
 
 #. module: product
 #: model:ir.model,name:product.model_product_product
@@ -1713,12 +1716,12 @@ msgstr ""
 #: field:product.supplierinfo,product_id:0
 #: model:res.request.link,name:product.req_link_product
 msgid "Product"
-msgstr ""
+msgstr "Produk"
 
 #. module: product
 #: selection:product.template,supply_method:0
 msgid "Produce"
-msgstr ""
+msgstr "memproduksi"
 
 #. module: product
 #: selection:product.template,procure_method:0
@@ -1728,24 +1731,24 @@ msgstr ""
 #. module: product
 #: help:product.packaging,qty:0
 msgid "The total number of products you can put by pallet or box."
-msgstr ""
+msgstr "Jumlah produk Anda dapat diajukan oleh palet atau kotak."
 
 #. module: product
 #: field:product.product,variants:0
 msgid "Variants"
-msgstr ""
+msgstr "Varian"
 
 #. module: product
 #: model:ir.actions.act_window,name:product.product_category_action
 #: model:ir.ui.menu,name:product.menu_products_category
 msgid "Products by Category"
-msgstr ""
+msgstr "Produk berdasarkan kategori"
 
 #. module: product
 #: model:ir.actions.act_window,name:product.product_category_action_form
 #: model:ir.ui.menu,name:product.menu_product_category_action_form
 msgid "Products Categories"
-msgstr ""
+msgstr "Kategori Produk"
 
 #. module: product
 #: field:product.template,uos_coeff:0
@@ -1755,12 +1758,12 @@ msgstr ""
 #. module: product
 #: help:product.supplierinfo,sequence:0
 msgid "Assigns the priority to the list of product supplier."
-msgstr ""
+msgstr "Memberikan prioritas ke dalam daftar produk supplier."
 
 #. module: product
 #: field:product.template,uom_id:0
 msgid "Default Unit Of Measure"
-msgstr ""
+msgstr "Default Unit Of Measure"
 
 #. module: product
 #: model:product.template,name:product.product_product_tow1_product_template
@@ -1775,12 +1778,12 @@ msgstr ""
 #. module: product
 #: view:product.pricelist.item:0
 msgid "Rounding Method"
-msgstr ""
+msgstr "Metode Pembulatan"
 
 #. module: product
 #: model:ir.actions.report.xml,name:product.report_product_label
 msgid "Products Labels"
-msgstr ""
+msgstr "Label Produk"
 
 #. module: product
 #: model:product.ul,name:product.product_ul_big_box
@@ -1790,17 +1793,17 @@ msgstr ""
 #. module: product
 #: selection:product.template,type:0
 msgid "Service"
-msgstr ""
+msgstr "Layanan"
 
 #. module: product
 #: help:product.packaging,height:0
 msgid "The height of the package"
-msgstr ""
+msgstr "Tinggi Paket"
 
 #. module: product
 #: view:product.pricelist:0
 msgid "Products Price List"
-msgstr ""
+msgstr "Daftar harga produk"
 
 #. module: product
 #: field:product.pricelist,company_id:0
@@ -1809,12 +1812,12 @@ msgstr ""
 #: field:product.supplierinfo,company_id:0
 #: field:product.template,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Perusahaan"
 
 #. module: product
 #: model:ir.actions.act_window,name:product.product_price_type_action
 msgid "Prices Types"
-msgstr ""
+msgstr "Jenis Harga"
 
 #. module: product
 #: help:product.template,list_price:0
@@ -1822,12 +1825,14 @@ msgid ""
 "Base price for computing the customer price. Sometimes called the catalog "
 "price."
 msgstr ""
+"Harga dasar untuk menghitung harga pelanggan. Kadang-kadang disebut harga "
+"katalog."
 
 #. module: product
 #: code:addons/product/pricelist.py:515
 #, python-format
 msgid "Partner section of the product form"
-msgstr ""
+msgstr "Partner bagian dari bentuk produk"
 
 #. module: product
 #: help:product.price.type,name:0
@@ -1842,7 +1847,7 @@ msgstr ""
 #. module: product
 #: help:product.pricelist.version,date_start:0
 msgid "Starting date for this pricelist version to be valid."
-msgstr ""
+msgstr "Tanggal dimulai untuk versi daftar harga yang akan berlaku."
 
 #. module: product
 #: help:product.template,uom_po_id:0
@@ -1850,48 +1855,50 @@ msgid ""
 "Default Unit of Measure used for purchase orders. It must be in the same "
 "category than the default unit of measure."
 msgstr ""
+"Default Satuan Ukur digunakan untuk order pembelian. Harus dalam kategori "
+"yang sama dari satuan default ukuran."
 
 #. module: product
 #: model:product.template,description:product.product_product_cpu1_product_template
 msgid "This product is configured with example of push/pull flows"
-msgstr ""
+msgstr "Produk ini dikonfigurasi dengan contoh push / pull arus"
 
 #. module: product
 #: field:product.packaging,length:0
 msgid "Length"
-msgstr ""
+msgstr "Durasi"
 
 #. module: product
 #: model:product.uom.categ,name:product.uom_categ_length
 msgid "Length / Distance"
-msgstr ""
+msgstr "Panjang / Jarak"
 
 #. module: product
 #: model:product.template,name:product.product_product_0_product_template
 msgid "Onsite Senior Intervention"
-msgstr ""
+msgstr "Onsite Senior Intervensi"
 
 #. module: product
 #: model:ir.model,name:product.model_product_pricelist_type
 #: field:product.pricelist,type:0
 #: view:product.pricelist.type:0
 msgid "Pricelist Type"
-msgstr ""
+msgstr "Type daftar harga"
 
 #. module: product
 #: model:product.category,name:product.product_category_otherproducts0
 msgid "Other Products"
-msgstr ""
+msgstr "Produk lain"
 
 #. module: product
 #: view:product.product:0
 msgid "Characteristics"
-msgstr ""
+msgstr "Karakteristik"
 
 #. module: product
 #: field:product.template,sale_ok:0
 msgid "Can be Sold"
-msgstr ""
+msgstr "Dapat di jual"
 
 #. module: product
 #: field:product.template,produce_delay:0
@@ -1901,17 +1908,17 @@ msgstr ""
 #. module: product
 #: field:product.supplierinfo,pricelist_ids:0
 msgid "Supplier Pricelist"
-msgstr ""
+msgstr "Daftar harga Supplier"
 
 #. module: product
 #: field:product.pricelist.item,base:0
 msgid "Based on"
-msgstr ""
+msgstr "Berdasarkan"
 
 #. module: product
 #: model:product.category,name:product.product_category_rawmaterial0
 msgid "Raw Materials"
-msgstr ""
+msgstr "Bahan Baku"
 
 #. module: product
 #: help:product.product,virtual_available:0
@@ -1920,18 +1927,21 @@ msgid ""
 "internal if none have been selected. Computed as: Real Stock - Outgoing + "
 "Incoming."
 msgstr ""
+"stok masa mendatang untuk produk ini sesuai dengan lokasi yang dipilih atau "
+"semua internal jika tidak ada sudah dipilih. Dihitung sebagai: Stok Real - "
+"Outgoing + Incoming."
 
 #. module: product
 #: field:product.pricelist,name:0
 msgid "Pricelist Name"
-msgstr ""
+msgstr "Nama Daftar harga"
 
 #. module: product
 #: model:ir.model,name:product.model_product_pricelist_version
 #: view:product.pricelist:0
 #: view:product.pricelist.version:0
 msgid "Pricelist Version"
-msgstr ""
+msgstr "Versi Daftar Harga"
 
 #. module: product
 #: view:product.pricelist.item:0
@@ -1951,7 +1961,7 @@ msgstr ""
 #. module: product
 #: model:product.template,name:product.product_product_employee0_product_template
 msgid "Employee"
-msgstr ""
+msgstr "Karyawan"
 
 #. module: product
 #: model:product.template,name:product.product_product_shelfofcm0_product_template
@@ -1962,17 +1972,17 @@ msgstr ""
 #: model:ir.model,name:product.model_product_category
 #: field:product.pricelist.item,categ_id:0
 msgid "Product Category"
-msgstr ""
+msgstr "Kategori Produk"
 
 #. module: product
 #: report:product.pricelist:0
 msgid "Price List Name"
-msgstr ""
+msgstr "Nama Daftar Harga"
 
 #. module: product
 #: field:product.supplierinfo,delay:0
 msgid "Delivery Lead Time"
-msgstr ""
+msgstr "Lama Waktu Pengiriman"
 
 #. module: product
 #: help:product.uom,active:0
@@ -1980,16 +1990,18 @@ msgid ""
 "By unchecking the active field you can disable a unit of measure without "
 "deleting it."
 msgstr ""
+"Dengan tidak mencentang bidang aktif Anda dapat menonaktifkan unit ukuran "
+"tanpa menghapusnya"
 
 #. module: product
 #: field:product.template,seller_delay:0
 msgid "Supplier Lead Time"
-msgstr ""
+msgstr "Supplier Lead Time"
 
 #. module: product
 #: selection:product.ul,type:0
 msgid "Box"
-msgstr ""
+msgstr "Kotak"
 
 #. module: product
 #: model:ir.actions.act_window,help:product.product_ul_form_action
@@ -1997,6 +2009,8 @@ msgid ""
 "Create and manage your packaging dimensions and types you want to be "
 "maintained in your system."
 msgstr ""
+"Membuat dan mengelola jenis dimensi kemasan yang Anda ingin pelihara dalam "
+"sistem Anda."
 
 #. module: product
 #: model:product.template,name:product.product_product_rearpanelarm1_product_template
@@ -2009,6 +2023,8 @@ msgid ""
 "Used in the code to select specific prices based on the context. Keep "
 "unchanged."
 msgstr ""
+"Digunakan dalam kode untuk memilih harga tertentu berdasarkan konteks. "
+"Simpan dalam tanpa ada perubahan"
 
 #. module: product
 #: model:product.template,name:product.product_product_hdd1_product_template
@@ -2018,17 +2034,17 @@ msgstr ""
 #. module: product
 #: help:product.supplierinfo,qty:0
 msgid "This is a quantity which is converted into Default Uom."
-msgstr ""
+msgstr "Ini adalah jumlah yang dikonversi menjadi Default Uom."
 
 #. module: product
 #: field:product.packaging,ul:0
 msgid "Type of Package"
-msgstr ""
+msgstr "Jenis Kemasan"
 
 #. module: product
 #: selection:product.ul,type:0
 msgid "Pack"
-msgstr ""
+msgstr "Pak"
 
 #. module: product
 #: model:product.category,name:product.product_category_4
@@ -2038,7 +2054,7 @@ msgstr ""
 #. module: product
 #: model:product.uom.categ,name:product.product_uom_categ_kgm
 msgid "Weight"
-msgstr ""
+msgstr "Berat"
 
 #. module: product
 #: model:product.template,name:product.product_product_22_product_template
@@ -2053,12 +2069,12 @@ msgstr ""
 #. module: product
 #: field:product.uom,uom_type:0
 msgid "UoM Type"
-msgstr ""
+msgstr "Jenis UoM"
 
 #. module: product
 #: help:product.template,product_manager:0
 msgid "This is use as task responsible"
-msgstr ""
+msgstr "Ini digunakan sebagai penugasan tanggung jawab"
 
 #. module: product
 #: help:product.uom,rounding:0
@@ -2066,17 +2082,19 @@ msgid ""
 "The computed quantity will be a multiple of this value. Use 1.0 for a UoM "
 "that cannot be further split, such as a piece."
 msgstr ""
+"Jumlah akan dihitung kelipatan dari nilai ini. Gunakan 1.0 untuk UoM yang "
+"tidak dapat dibagi lebih lanjut, seperti potongan."
 
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
 msgid "Descriptions"
-msgstr ""
+msgstr "Keterangan"
 
 #. module: product
 #: field:product.template,loc_row:0
 msgid "Row"
-msgstr ""
+msgstr "Baris"
 
 #. module: product
 #: model:product.template,name:product.product_product_rearpanelarm0_product_template
@@ -2097,12 +2115,12 @@ msgstr ""
 #. module: product
 #: constraint:res.partner:0
 msgid "Error ! You can not create recursive associated members."
-msgstr ""
+msgstr "Error! Anda tidak dapat membuat anggota terkait secara terus menerus"
 
 #. module: product
 #: model:product.template,name:product.product_product_hotelexpenses0_product_template
 msgid "Hotel Expenses"
-msgstr ""
+msgstr "Beban Hotel"
 
 #. module: product
 #: help:product.uom,factor_inv:0
@@ -2110,6 +2128,7 @@ msgid ""
 "How many times this UoM is bigger than the reference UoM in this category:\n"
 "1 * (this unit) = ratio * (reference unit)"
 msgstr ""
+"Berapa kali UoM ini lebih besar daripada UoM referensi dalam kategori ini"
 
 #. module: product
 #: model:product.template,name:product.product_product_shelf0_product_template
@@ -2120,11 +2139,12 @@ msgstr ""
 #: help:product.packaging,sequence:0
 msgid "Gives the sequence order when displaying a list of packaging."
 msgstr ""
+"Memberikan susunan yang berurutan ketika menampilkan daftar kemasannya."
 
 #. module: product
 #: field:product.pricelist.item,price_round:0
 msgid "Price Rounding"
-msgstr ""
+msgstr "Harga Pembulatan"
 
 #. module: product
 #: field:product.pricelist.item,price_max_margin:0
@@ -2137,11 +2157,13 @@ msgid ""
 "This supplier's product name will be used when printing a request for "
 "quotation. Keep empty to use the internal one."
 msgstr ""
+"Nama produk pemasok tersebut ini akan digunakan saat mencetak permintaan "
+"untuk kuotasi. Tetap kosongkan untuk menggunakan salah satu internal."
 
 #. module: product
 #: selection:product.template,mes_type:0
 msgid "Variable"
-msgstr ""
+msgstr "Variabel"
 
 #. module: product
 #: field:product.template,rental:0
@@ -2152,7 +2174,7 @@ msgstr ""
 #: model:product.price.type,name:product.standard_price
 #: field:product.template,standard_price:0
 msgid "Cost Price"
-msgstr ""
+msgstr "Biaya produksi"
 
 #. module: product
 #: field:product.pricelist.item,price_min_margin:0
@@ -2162,12 +2184,12 @@ msgstr ""
 #. module: product
 #: field:product.template,weight:0
 msgid "Gross weight"
-msgstr ""
+msgstr "Berat kotor"
 
 #. module: product
 #: model:product.template,name:product.product_product_assemblysection0_product_template
 msgid "Assembly Section"
-msgstr ""
+msgstr "Seksi asembling"
 
 #. module: product
 #: model:product.category,name:product.product_category_3
@@ -2186,16 +2208,20 @@ msgid ""
 "Rounding is applied after the discount and before the surcharge.\n"
 "To have prices that end in 9.99, set rounding 10, surcharge -0.01"
 msgstr ""
+"Menetapkan harga sehingga merupakan kelipatan dari nilai ini.\n"
+"Pembulatan diterapkan setelah diskon dan sebelum biaya tambahan.\n"
+"Untuk memiliki harga yang berakhir pada 9,99, pembulatan 10 set, biaya "
+"tambahan -0,01"
 
 #. module: product
 #: view:product.price_list:0
 msgid "Close"
-msgstr ""
+msgstr "Tutup"
 
 #. module: product
 #: model:ir.model,name:product.model_product_pricelist_item
 msgid "Pricelist item"
-msgstr ""
+msgstr "Pricelist item"
 
 #. module: product
 #: model:product.template,name:product.product_product_21_product_template
@@ -2205,7 +2231,7 @@ msgstr ""
 #. module: product
 #: view:res.partner:0
 msgid "Sales Properties"
-msgstr ""
+msgstr "Properti Penjualan"
 
 #. module: product
 #: model:product.uom,name:product.product_uom_ton
@@ -2216,12 +2242,12 @@ msgstr ""
 #: view:product.product:0
 #: view:product.template:0
 msgid "Delays"
-msgstr ""
+msgstr "Penundaan"
 
 #. module: product
 #: model:process.node,note:product.process_node_product0
 msgid "Creation of the product"
-msgstr ""
+msgstr "Pembuatan produk"
 
 #. module: product
 #: help:product.template,type:0
@@ -2230,6 +2256,9 @@ msgid ""
 "products with infinite stock, or for use when you have no inventory "
 "management in the system."
 msgstr ""
+"Akan mengubah cara pengadaan yang diproses. Consumables adalah produk "
+"stockable dengan stok terbatas, atau untuk digunakan ketika Anda tidak "
+"memiliki manajemen persediaan dalam sistem."
 
 #. module: product
 #: field:pricelist.partnerinfo,name:0
@@ -2239,7 +2268,7 @@ msgstr ""
 #: view:product.template:0
 #: field:product.template,description:0
 msgid "Description"
-msgstr ""
+msgstr "Keterangan"
 
 #. module: product
 #: code:addons/product/pricelist.py:358
@@ -2248,11 +2277,13 @@ msgid ""
 "Could not resolve product category, you have defined cyclic categories of "
 "products!"
 msgstr ""
+"Tidak dapat menemukan kategori produk, Anda telah menetapkan kategori siklik "
+"produk!"
 
 #. module: product
 #: view:product.template:0
 msgid "Product Description"
-msgstr ""
+msgstr "Deskripsi Produk"
 
 #. module: product
 #: view:product.pricelist.item:0
@@ -2265,11 +2296,13 @@ msgid ""
 "Quantities of products that are planned to arrive in selected locations or "
 "all internal if none have been selected."
 msgstr ""
+"Quantities of products that are planned to arrive in selected locations or "
+"all internal if none have been selected."
 
 #. module: product
 #: field:product.template,volume:0
 msgid "Volume"
-msgstr ""
+msgstr "Volume"
 
 #. module: product
 #: field:product.template,loc_case:0
@@ -2279,7 +2312,7 @@ msgstr ""
 #. module: product
 #: view:product.product:0
 msgid "Product Variant"
-msgstr ""
+msgstr "Varian Produk"
 
 #. module: product
 #: model:product.category,name:product.product_category_shelves0
@@ -2290,7 +2323,7 @@ msgstr ""
 #: code:addons/product/pricelist.py:514
 #, python-format
 msgid "Other Pricelist"
-msgstr ""
+msgstr "Rak-rak"
 
 #. module: product
 #: model:ir.model,name:product.model_product_template
@@ -2298,12 +2331,12 @@ msgstr ""
 #: field:product.product,product_tmpl_id:0
 #: view:product.template:0
 msgid "Product Template"
-msgstr ""
+msgstr "Produk Template"
 
 #. module: product
 #: field:product.template,cost_method:0
 msgid "Costing Method"
-msgstr ""
+msgstr "Metode penetapan biaya"
 
 #. module: product
 #: view:product.packaging:0
@@ -2314,7 +2347,7 @@ msgstr ""
 #. module: product
 #: selection:product.template,state:0
 msgid "End of Lifecycle"
-msgstr ""
+msgstr "Akhir Siklus Hidup"
 
 #. module: product
 #: help:product.product,packaging:0
@@ -2322,13 +2355,16 @@ msgid ""
 "Gives the different ways to package the same product. This has no impact on "
 "the picking order and is mainly used if you use the EDI module."
 msgstr ""
+"Memberikan cara yang berbeda dengan paket produk yang sama. Ini tidak "
+"berdampak pada urutan pengambilan dan terutama digunakan jika Anda "
+"menggunakan modul EDI"
 
 #. module: product
 #: model:ir.actions.act_window,name:product.product_pricelist_action
 #: model:ir.ui.menu,name:product.menu_product_pricelist_action
 #: field:product.pricelist,version_id:0
 msgid "Pricelist Versions"
-msgstr ""
+msgstr "Versi Daftar Harga"
 
 #. module: product
 #: field:product.category,sequence:0
@@ -2336,7 +2372,7 @@ msgstr ""
 #: field:product.pricelist.item,sequence:0
 #: field:product.supplierinfo,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "Urutan"
 
 #. module: product
 #: field:product.template,list_price:0
diff --git a/addons/product/i18n/ru.po b/addons/product/i18n/ru.po
index fd3e0630eec..f17a60cbcb1 100644
--- a/addons/product/i18n/ru.po
+++ b/addons/product/i18n/ru.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-19 06:21+0000\n"
+"X-Launchpad-Export-Date: 2011-04-20 05:57+0000\n"
 "X-Generator: Launchpad (build 12758)\n"
 
 #. module: product
diff --git a/addons/sale/i18n/gl.po b/addons/sale/i18n/gl.po
new file mode 100644
index 00000000000..ab69ee7f3c1
--- /dev/null
+++ b/addons/sale/i18n/gl.po
@@ -0,0 +1,2074 @@
+# Galician translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:16+0000\n"
+"PO-Revision-Date: 2011-04-19 15:29+0000\n"
+"Last-Translator: Vicente <jviares@gmail.com>\n"
+"Language-Team: Galician <gl@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: 2011-04-20 05:57+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_sales_by_salesman
+msgid "Sales by Salesman in last 90 days"
+msgstr ""
+
+#. module: sale
+#: help:sale.installer,delivery:0
+msgid "Allows you to compute delivery costs on your quotations."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,picking_policy:0
+msgid ""
+"If you don't have enough stock available to deliver all at once, do you "
+"accept partial shipments or not?"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,partner_shipping_id:0
+msgid "Shipping address for current sales order."
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,qtty:0
+#: report:sale.order:0
+msgid "Quantity"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,day:0
+msgid "Day"
+msgstr ""
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_cancelorder0
+#: view:sale.order:0
+msgid "Cancel Order"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.picking_policy:0
+msgid "Configure Sales Order Logistics"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:603
+#, python-format
+msgid "The quotation '%s' has been converted to a sales order."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Payment Before Delivery"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice.py:42
+#, python-format
+msgid "Warning !"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "VAT"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_saleorderprocurement0
+msgid "Drives procurement orders for every sales order line."
+msgstr ""
+
+#. module: sale
+#: selection:sale.config.picking_policy,picking_policy:0
+msgid "All at Once"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,project_id:0
+#: view:sale.report:0
+#: field:sale.report,analytic_account_id:0
+#: field:sale.shop,project_id:0
+msgid "Analytic Account"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_line_tree2
+msgid ""
+"Here is a list of each sales order line to be invoiced. You can invoice "
+"sales orders partially, by lines of sales order. You do not need this list "
+"if you invoice from the delivery orders or if you invoice sales totally."
+msgstr ""
+
+#. module: sale
+#: model:process.node,name:sale.process_node_saleprocurement0
+msgid "Procurement Order"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Order Line"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_form
+msgid ""
+"Sales Orders help you manage quotations and orders from your customers. "
+"OpenERP suggests that you start by creating a quotation. Once it is "
+"confirmed, the quotation will be converted into a Sales Order. OpenERP can "
+"handle several types of products so that a sales order may trigger tasks, "
+"delivery orders, manufacturing orders, purchases and so on. Based on the "
+"configuration of the sales order, a draft invoice will be generated so that "
+"you just have to confirm it when you want to bill your customer."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_quantity:0
+msgid ""
+"The sale order will automatically create the invoice proposition (draft "
+"invoice). Ordered and delivered quantities may not be the same. You have to "
+"choose if you want your invoice based on ordered or shipped quantities. If "
+"the product is a service, shipped quantities means hours spent on the "
+"associated tasks."
+msgstr ""
+"O pedido de venda creará automáticamente a proposta de factura (factura "
+"borrador). As cantidades pedidas e entregadas poden non ser as mesmas. Debe "
+"elixir se desexa que a sua factura se basee nas cantidades pedidas ou "
+"entregadas. Se o producto e un servizo, as cantidades enviadas son as horas "
+"dedicadas as tarefas asociadas."
+
+#. module: sale
+#: field:sale.shop,payment_default_id:0
+msgid "Default Payment Term"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_config_picking_policy
+msgid "Configure Picking Policy for Sales Order"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+#: field:sale.order.line,state:0
+#: view:sale.report:0
+msgid "State"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Disc.(%)"
+msgstr ""
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
+msgid "Force Assignation"
+msgstr ""
+
+#. module: sale
+#: help:sale.make.invoice,grouped:0
+msgid "Check the box to group the invoices for the same customers"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Ordered Quantities"
+msgstr "Cantidades Pedidas"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Sales by Salesman"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,move_ids:0
+msgid "Inventory Moves"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,name:0
+#: field:sale.order.line,order_id:0
+msgid "Order Reference"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Other Information"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Dates"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_invoiceafterdelivery0
+msgid ""
+"The invoice is created automatically if the shipping policy is 'Invoice from "
+"pick' or 'Invoice on order after delivery'."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_make_invoice
+msgid "Sales Make Invoice"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Recreate Packing"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,discount:0
+msgid "Discount (%)"
+msgstr ""
+
+#. module: sale
+#: help:res.company,security_lead:0
+msgid ""
+"This is the days added to what you promise to customers for security purpose"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.open_board_sales_manager
+#: model:ir.ui.menu,name:sale.menu_board_sales_manager
+msgid "Sales Manager Dashboard"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_packaging:0
+msgid "Packaging"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_saleinvoice0
+msgid "From a sales order"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,name:0
+msgid "Shop Name"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1014
+#, python-format
+msgid "No Customer Defined !"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree2
+msgid "Sales in Exception"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Set to Draft"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Conditions"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,order_policy:0
+msgid ""
+"The Shipping Policy is used to synchronise invoice and delivery operations.\n"
+"  - The 'Pay Before delivery' choice will first generate the invoice and "
+"then generate the picking order after the payment of this invoice.\n"
+"  - The 'Shipping & Manual Invoice' will create the picking order directly "
+"and wait for the user to manually click on the 'Invoice' button to generate "
+"the draft invoice.\n"
+"  - The 'Invoice On Order After Delivery' choice will generate the draft "
+"invoice based on sales order after all picking lists have been finished.\n"
+"  - The 'Invoice From The Picking' choice is used to create an invoice "
+"during the picking process."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:939
+#, python-format
+msgid ""
+"There is no income category account defined in default Properties for "
+"Product Category or Fiscal Position is not defined !"
+msgstr ""
+
+#. module: sale
+#: view:sale.installer:0
+msgid "Configure"
+msgstr ""
+
+#. module: sale
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:620
+#, python-format
+msgid "invalid mode for test_state"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "June"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:584
+#, python-format
+msgid "Could not cancel this sales order !"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,project_id:0
+msgid "The analytic account related to a sales order."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "October"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Quotations"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,pricelist_id:0
+msgid "Pricelist for current sales order."
+msgstr ""
+
+#. module: sale
+#: selection:sale.config.picking_policy,step:0
+msgid "Delivery Order Only"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "TVA :"
+msgstr ""
+
+#. module: sale
+#: help:sale.order.line,delay:0
+msgid ""
+"Number of days between the order confirmation the shipping of the products "
+"to the customer"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Quotation Date"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,fiscal_position:0
+msgid "Fiscal Position"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "UoM"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,number_packages:0
+msgid "Number Packages"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "In Progress"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_confirmquotation0
+msgid ""
+"The salesman confirms the quotation. The state of the sales order becomes "
+"'In progress' or 'Manual in progress'."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:971
+#, python-format
+msgid "You must first cancel stock moves attached to this sales order line."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1042
+#, python-format
+msgid "(n/a)"
+msgstr ""
+
+#. module: sale
+#: help:sale.advance.payment.inv,product_id:0
+msgid ""
+"Select a product of type service which is called 'Advance Product'. You may "
+"have to create it and set it as a default value on this field."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Tel. :"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:64
+#, python-format
+msgid ""
+"You cannot make an advance on a sales order                              "
+"that is defined as 'Automatic Invoice after delivery'."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,note:0
+#: view:sale.order.line:0
+#: field:sale.order.line,notes:0
+msgid "Notes"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,partner_invoice_id:0
+msgid "Invoice address for current sales order."
+msgstr ""
+
+#. module: sale
+#: view:sale.installer:0
+msgid "Enhance your core Sales Application with additional functionalities."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoiced_rate:0
+#: field:sale.order.line,invoiced:0
+msgid "Invoiced"
+msgstr ""
+
+#. module: sale
+#: model:process.node,name:sale.process_node_deliveryorder0
+msgid "Delivery Order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,date_confirm:0
+msgid "Confirmation Date"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,address_allotment_id:0
+msgid "Allotment Partner"
+msgstr ""
+
+#. module: sale
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique !"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "March"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,amount_total:0
+msgid "The total amount."
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,price_subtotal:0
+msgid "Subtotal"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Invoice address :"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_saleorderprocurement0
+msgid ""
+"For every sales order line, a procurement order is created to supply the "
+"sold product."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,incoterm:0
+msgid ""
+"Incoterm which stands for 'International Commercial terms' implies its a "
+"series of sales terms which are used in the commercial transaction."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,partner_invoice_id:0
+msgid "Invoice Address"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Search Uninvoiced Lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.report.xml,name:sale.report_sale_order
+msgid "Quotation / Order"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,nbr:0
+msgid "# of Lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_open_invoice
+msgid "Sales Open Invoice"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line
+#: field:stock.move,sale_line_id:0
+msgid "Sales Order Line"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.picking_policy:0
+msgid "Setup your sales workflow and default values."
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,warehouse_id:0
+msgid "Warehouse"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Order N°"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,order_line:0
+msgid "Order Lines"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Untaxed amount"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree2
+#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
+msgid "Lines to Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uom_qty:0
+msgid "Quantity (UoM)"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,create_date:0
+msgid "Creation Date"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree3
+msgid "Uninvoiced and Delivered Lines"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Total :"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "My Sales"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:290
+#: code:addons/sale/sale.py:966
+#: code:addons/sale/sale.py:1165
+#, python-format
+msgid "Invalid action !"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,pricelist_id:0
+#: field:sale.report,pricelist_id:0
+#: field:sale.shop,pricelist_id:0
+msgid "Pricelist"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,product_uom_qty:0
+msgid "# of Qty"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Order Date"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.report,shipped:0
+msgid "Shipped"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree5
+msgid "All Quotations"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Invoice On Order After Delivery"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "September"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,categ_id:0
+msgid "Category of Product"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Taxes :"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Stock Moves"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "  Year  "
+msgstr ""
+
+#. module: sale
+#: field:sale.order,state:0
+#: field:sale.report,state:0
+msgid "Order State"
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Do you really want to create the invoice(s) ?"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Sales By Month"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:970
+#, python-format
+msgid "Could not cancel sales order line!"
+msgstr ""
+
+#. module: sale
+#: field:res.company,security_lead:0
+msgid "Security Days"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_saleorderprocurement0
+msgid "Procurement of sold material"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Create Final Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,partner_shipping_id:0
+msgid "Shipping Address"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,shipped:0
+msgid ""
+"It indicates that the sales order has been delivered. This field is updated "
+"only after the scheduler(s) have been launched."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: sale
+#: model:ir.module.module,description:sale.module_meta_information
+msgid ""
+"\n"
+"    The base module to manage quotations and sales orders.\n"
+"\n"
+"    * Workflow with validation steps:\n"
+"        - Quotation -> Sales order -> Invoice\n"
+"    * Invoicing methods:\n"
+"        - Invoice on order (before or after shipping)\n"
+"        - Invoice on delivery\n"
+"        - Invoice on timesheets\n"
+"        - Advance invoice\n"
+"    * Partners preferences (shipping, invoicing, incoterm, ...)\n"
+"    * Products stocks and prices\n"
+"    * Delivery methods:\n"
+"        - all at once, multi-parcel\n"
+"        - delivery costs\n"
+"    * Dashboard for salesman that includes:\n"
+"    * Your open quotations\n"
+"    * Top 10 sales of the month\n"
+"    * Cases statistics\n"
+"    * Graph of sales by product\n"
+"    * Graph of cases of the month\n"
+"    "
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
+msgid "Sales Shop"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "November"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "History"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,picking_policy:0
+msgid "Picking Default Policy"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_ids:0
+msgid ""
+"This is the list of invoices that have been generated for this sales order. "
+"The same sales order may have been invoiced in several times (by line for "
+"example)."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Your Reference"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,partner_order_id:0
+msgid ""
+"The name and address of the contact who requested the order or quotation."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:966
+#, python-format
+msgid "You cannot cancel a sales order line that has already been invoiced !"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Qty"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "References"
+msgstr ""
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_cancel0
+#: model:process.transition.action,name:sale.process_transition_action_cancel1
+#: model:process.transition.action,name:sale.process_transition_action_cancel2
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order.line:0
+#: view:sale.order.line.make.invoice:0
+msgid "Cancel"
+msgstr ""
+
+#. module: sale
+#: field:sale.installer,sale_order_dates:0
+msgid "Sales Order Dates"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Exception"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_invoice0
+#: model:process.transition,name:sale.process_transition_invoiceafterdelivery0
+#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
+#: view:sale.advance.payment.inv:0
+#: view:sale.order.line:0
+msgid "Create Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.installer,sale_margin:0
+msgid "Margins in Sales Orders"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Total Tax Excluded"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Compute"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Sales by Partner"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,partner_order_id:0
+msgid "Ordering Contact"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_view_sale_open_invoice
+#: view:sale.open.invoice:0
+msgid "Open Invoice"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+#: view:sale.order.line:0
+msgid "Price"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_sale_installer
+#: view:sale.config.picking_policy:0
+#: view:sale.installer:0
+msgid "Sales Application Configuration"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,type:0
+msgid "on order"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_invoiceafterdelivery0
+msgid "Based on the shipped or on the ordered quantities."
+msgstr "Basado en nas cantidades enviadas ou pedidas."
+
+#. module: sale
+#: field:sale.order,picking_ids:0
+msgid "Related Picking"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,name:0
+msgid "Name"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Shipping address :"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_sales_by_partner
+msgid "Sales per Customer in last 90 days"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_quotation0
+msgid "Draft state of sales order"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_deliver0
+msgid "Create Delivery Order"
+msgstr ""
+
+#. module: sale
+#: field:sale.installer,delivery:0
+msgid "Delivery Costs"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Total Tax Included"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_packing0
+msgid "Create Pick List"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Sales by Product Category"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,picking_policy:0
+msgid "Partial Delivery"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_confirmquotation0
+msgid "Confirm Quotation"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,origin:0
+msgid "Reference of the document that generated this sales order request."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+#: view:sale.report:0
+msgid "Group By..."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Recreate Invoice"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.outgoing_picking_list_to_invoice
+#: model:ir.ui.menu,name:sale.menu_action_picking_list_to_invoice
+msgid "Deliveries to Invoice"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Waiting Schedule"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,type:0
+msgid "Procurement Method"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.picking_policy:0
+#: view:sale.installer:0
+msgid "title"
+msgstr ""
+
+#. module: sale
+#: model:process.node,name:sale.process_node_packinglist0
+msgid "Pick List"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Order date"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_packinglist0
+msgid "Document of the move to the output or to the customer."
+msgstr ""
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_validate0
+msgid "Validate"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Confirm Order"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_saleprocurement0
+msgid "Create Procurement Order"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,amount_tax:0
+#: field:sale.order.line,tax_id:0
+msgid "Taxes"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,order_policy:0
+msgid "Shipping Policy"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,create_date:0
+msgid "Date on which sales order is created."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_stock_move
+msgid "Stock Move"
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create Invoices"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Extra Info"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Fax :"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,amount:0
+msgid "Advance Amount"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Shipped Quantities"
+msgstr ""
+
+#. module: sale
+#: selection:sale.config.picking_policy,order_policy:0
+msgid "Invoice Based on Sales Orders"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_stock_picking
+msgid "Picking List"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:387
+#: code:addons/sale/sale.py:920
+#: code:addons/sale/sale.py:938
+#, python-format
+msgid "Error !"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:570
+#, python-format
+msgid "Could not cancel sales order !"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "July"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,procurement_id:0
+msgid "Procurement"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Shipping Exception"
+msgstr ""
+
+#. module: sale
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Shipping & Manual Invoice"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1051
+#, python-format
+msgid "Picking Information !"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr ""
+
+#. module: sale
+#: model:ir.module.module,shortdesc:sale.module_meta_information
+msgid "Sales Management"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Invoice From The Picking"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_invoice0
+msgid "To be reviewed by the accountant."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,uom_name:0
+msgid "Reference UoM"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line_make_invoice
+msgid "Sale OrderLine Make_invoice"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.picking_policy,step:0
+msgid ""
+"By default, OpenERP is able to manage complex routing and paths of products "
+"in your warehouse and partner locations. This will configure the most common "
+"and simple methods to deliver products to the customer in one or two "
+"operations by the worker."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoiced:0
+msgid "Paid"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_report_all
+#: model:ir.ui.menu,name:sale.menu_report_product_all
+#: view:sale.report:0
+msgid "Sales Analysis"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,property_ids:0
+msgid "Properties"
+msgstr ""
+
+#. module: sale
+#: model:process.node,name:sale.process_node_quotation0
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Quotation"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_invoice0
+msgid ""
+"The Salesman creates an invoice manually, if the sales order shipping policy "
+"is 'Shipping and Manual in Progress'. The invoice is created automatically "
+"if the shipping policy is 'Payment before Delivery'."
+msgstr ""
+
+#. module: sale
+#: help:sale.config.picking_policy,order_policy:0
+msgid ""
+"You can generate invoices based on sales orders or based on shippings."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: model:process.process,name:sale.process_process_salesprocess0
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Sales"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+#: field:sale.order.line,price_unit:0
+msgid "Unit Price"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: view:sale.order.line:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Done"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_installer
+msgid "sale.installer"
+msgstr ""
+
+#. module: sale
+#: model:process.node,name:sale.process_node_invoice0
+#: model:process.node,name:sale.process_node_invoiceafterdelivery0
+msgid "Invoice"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1014
+#, python-format
+msgid ""
+"You have to select a customer in the sales form !\n"
+"Please set one customer before choosing a product."
+msgstr ""
+
+#. module: sale
+#: selection:sale.config.picking_policy,step:0
+msgid "Picking List & Delivery Order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,origin:0
+msgid "Source Document"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "To Do"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,picking_policy:0
+msgid "Picking Policy"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_deliveryorder0
+msgid "Document of the move to the customer."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,amount_untaxed:0
+msgid "The amount without tax."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:571
+#, python-format
+msgid "You must first cancel all picking attached to this sales order."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,incoterm:0
+msgid "Incoterm"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.order.line,product_id:0
+#: view:sale.report:0
+#: field:sale.report,product_id:0
+msgid "Product"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.menu_invoiced
+msgid "Invoicing"
+msgstr ""
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_cancelassignation0
+msgid "Cancel Assignation"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_config_picking_policy
+msgid "sale.config.picking_policy"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,state:0
+msgid ""
+"Gives the state of the quotation or sales order. \n"
+"The exception state is automatically set when a cancel operation occurs in "
+"the invoice validation (Invoice Exception) or in the picking list process "
+"(Shipping Exception). \n"
+"The 'Waiting Schedule' state is set when the invoice is confirmed but "
+"waiting for the scheduler to run on the date 'Ordered Date'."
+msgstr ""
+"Indica o estado do presuposto o pedido de venda.\n"
+"O estado de excepción establecese automáticamente cando se produce unha "
+"operación de cancelación na validación da factura (excepción de factura) ou "
+"no procesado do albará (excepción de envío).\n"
+"O estado 'Esperando planificación' establece cando se confirma a factura, "
+"pero está esperando que o planificador a active na data de \"Data pedido\"."
+
+#. module: sale
+#: field:sale.order,invoice_quantity:0
+msgid "Invoice on"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Date Ordered"
+msgstr "Data Pedido"
+
+#. module: sale
+#: field:sale.order.line,product_uos:0
+msgid "Product UoS"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Manual In Progress"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uom:0
+msgid "Product UoM"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Logistic"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Order"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:921
+#, python-format
+msgid "There is no income account defined for this product: \"%s\" (id:%d)"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_saleinvoice0
+msgid ""
+"Depending on the Invoicing control of the sales order, the invoice can be "
+"based on delivered or on ordered quantities. Thus, a sales order can "
+"generates an invoice or a delivery order as soon as it is confirmed by the "
+"salesman."
+msgstr ""
+"En función do control de facturación dos pedidos de venda, a factura pode "
+"estar baseada nas cantidades enviadas ou vendidas. Polo tanto, un pedido de "
+"venda pode xerar unha factura ou un albará tan pronto como sea confirmada "
+"polo comercial."
+
+#. module: sale
+#: code:addons/sale/sale.py:1116
+#, python-format
+msgid ""
+"You plan to sell %.2f %s but you only have %.2f %s available !\n"
+"The real stock is %.2f %s. (without reservations)"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "States"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.picking_policy:0
+msgid "res_config_contents"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,client_order_ref:0
+msgid "Customer Reference"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_total:0
+#: view:sale.order.line:0
+msgid "Total"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:388
+#, python-format
+msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_deliver0
+msgid ""
+"Depending on the configuration of the location Output, the move between the "
+"output area and the customer is done through the Delivery Order manually or "
+"automatically."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1165
+#, python-format
+msgid "Cannot delete a sales order line which is %s !"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
+#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
+#: view:sale.order:0
+msgid "Make Invoices"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "To Invoice"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,date_confirm:0
+msgid "Date on which sales order is confirmed."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,company_id:0
+#: field:sale.order.line,company_id:0
+#: view:sale.report:0
+#: field:sale.report,company_id:0
+#: field:sale.shop,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: sale
+#: field:sale.make.invoice,invoice_date:0
+msgid "Invoice Date"
+msgstr ""
+
+#. module: sale
+#: help:sale.advance.payment.inv,amount:0
+msgid "The amount to be invoiced in advance."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,picking_ids:0
+msgid ""
+"This is a list of picking that has been generated for this sales order."
+msgstr ""
+
+#. module: sale
+#: help:sale.installer,sale_margin:0
+msgid ""
+"Gives the margin of profitability by calculating the difference between Unit "
+"Price and Cost Price."
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create invoices"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Net Total :"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_shop_form
+#: model:ir.ui.menu,name:sale.menu_action_shop_form
+#: field:sale.order,shop_id:0
+#: view:sale.report:0
+#: field:sale.report,shop_id:0
+msgid "Shop"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "   Month   "
+msgstr ""
+
+#. module: sale
+#: field:sale.report,date_confirm:0
+msgid "Date Confirm"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:111
+#, python-format
+msgid "Warning"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_view_sales_by_month
+msgid "Sales by Month"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1045
+#, python-format
+msgid ""
+"You selected a quantity of %d Units.\n"
+"But it's not compatible with the selected packaging.\n"
+"Here is a proposition of quantities according to the packaging:\n"
+"\n"
+"EAN: %s Quantity: %s Type of ul: %s"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order
+#: model:process.node,name:sale.process_node_order0
+#: model:process.node,name:sale.process_node_saleorder0
+#: model:res.request.link,name:sale.req_link_sale_order
+#: view:sale.order:0
+#: field:stock.picking,sale_id:0
+msgid "Sales Order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uos_qty:0
+msgid "Quantity (UoS)"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_packing0
+msgid ""
+"The Pick List form is created as soon as the sales order is confirmed, in "
+"the same time as the procurement order. It represents the assignment of "
+"parts to the sales order. There is 1 pick list by sales order line which "
+"evolves with the availability of parts."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Confirmed"
+msgstr ""
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_confirm0
+msgid "Confirm"
+msgstr ""
+
+#. module: sale
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_sales_product_total_price
+msgid "Sales by Product's Category in last 90 days"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Sales Order Lines"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,delay:0
+msgid "Delivery Lead Time"
+msgstr ""
+
+#. module: sale
+#: view:res.company:0
+msgid "Configuration"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,picking_policy:0
+msgid "Complete Delivery"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "    Month-1    "
+msgstr ""
+
+#. module: sale
+#: help:sale.config.picking_policy,picking_policy:0
+msgid ""
+"The Shipping Policy is used to configure per order if you want to deliver as "
+"soon as possible when one product is available or you wait that all products "
+"are available.."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "August"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:111
+#, python-format
+msgid ""
+"Invoice cannot be created for this Sales Order Line due to one of the "
+"following reasons:\n"
+"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
+"2.The Sales Order Line is Invoiced!"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,th_weight:0
+msgid "Weight"
+msgstr ""
+
+#. module: sale
+#: view:sale.open.invoice:0
+#: view:sale.order:0
+#: field:sale.order,invoice_ids:0
+msgid "Invoices"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "December"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,config_logo:0
+#: field:sale.installer,config_logo:0
+msgid "Image"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_saleprocurement0
+msgid ""
+"A procurement order is automatically created as soon as a sales order is "
+"confirmed or as the invoice is paid. It drives the purchasing and the "
+"production of products regarding to the rules and to the sales order's "
+"parameters. "
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Uninvoiced"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+#: view:sale.order:0
+#: field:sale.order,user_id:0
+#: view:sale.order.line:0
+#: field:sale.order.line,salesman_id:0
+#: view:sale.report:0
+#: field:sale.report,user_id:0
+msgid "Salesman"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:163
+#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
+#: view:sale.advance.payment.inv:0
+#: view:sale.order:0
+#, python-format
+msgid "Advance Invoice"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:591
+#, python-format
+msgid "The sales order '%s' has been cancelled."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: sale
+#: help:sale.order.line,state:0
+msgid ""
+"* The 'Draft' state is set when the related sales order in draft state.      "
+"               \n"
+"* The 'Confirmed' state is set when the related sales order is confirmed.    "
+"                 \n"
+"* The 'Exception' state is set when the related sales order is set as "
+"exception.                     \n"
+"* The 'Done' state is set when the sales order line has been picked.         "
+"            \n"
+"* The 'Cancelled' state is set when a user cancel the sales order related."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,amount_tax:0
+msgid "The tax amount."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Packings"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,progress:0
+#: field:sale.installer,progress:0
+msgid "Configuration Progress"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
+msgid "Product sales"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,date_order:0
+msgid "Ordered Date"
+msgstr "Fecha Pedido"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_form
+#: model:ir.ui.menu,name:sale.menu_sale_order
+#: view:sale.order:0
+msgid "Sales Orders"
+msgstr ""
+
+#. module: sale
+#: selection:sale.config.picking_policy,picking_policy:0
+msgid "Direct Delivery"
+msgstr ""
+
+#. module: sale
+#: field:sale.installer,sale_journal:0
+msgid "Invoicing journals"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,product_id:0
+msgid "Advance Product"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,shipped_qty_1:0
+msgid "Shipped Qty"
+msgstr ""
+
+#. module: sale
+#: view:sale.open.invoice:0
+msgid "You invoice has been successfully created!"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:585
+#, python-format
+msgid "You must first cancel all invoices attached to this sales order."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: sale
+#: view:sale.installer:0
+msgid "Configure Your Sales Management Application"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree4
+msgid "Sales Order in Progress"
+msgstr ""
+
+#. module: sale
+#: field:sale.installer,sale_layout:0
+msgid "Sales Order Layout Improvement"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
+#, python-format
+msgid "Error"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,delay:0
+msgid "Commitment Delay"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_saleprocurement0
+msgid ""
+"One Procurement order for each sales order line and for each of the "
+"components."
+msgstr ""
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_assign0
+msgid "Assign"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,date:0
+msgid "Date Order"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_order0
+msgid "Confirmed sales order to invoice."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:290
+#, python-format
+msgid "Cannot delete Sales Order(s) which are already confirmed !"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:316
+#, python-format
+msgid "The sales order '%s' has been set in draft state."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,type:0
+msgid "from stock"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,order_policy:0
+msgid "Shipping Default Policy"
+msgstr ""
+
+#. module: sale
+#: view:sale.open.invoice:0
+msgid "Close"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,shipped:0
+msgid "Delivered"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1115
+#, python-format
+msgid "Not enough stock !"
+msgstr ""
+
+#. module: sale
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Layout Sequence"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_shop_form
+msgid ""
+"If you have more than one shop reselling your company products, you can "
+"create and manage that from here. Whenever you will record a new quotation "
+"or sales order, it has to be linked to a shop. The shop also defines the "
+"warehouse from which the products will be delivered for each particular "
+"sales."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoiced:0
+msgid "It indicates that an invoice has been paid."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+#: field:sale.order.line,name:0
+msgid "Description"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "May"
+msgstr ""
+
+#. module: sale
+#: help:sale.installer,sale_order_dates:0
+msgid "Adds commitment, requested and effective dates on Sales Orders."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,partner_id:0
+#: field:sale.order.line,order_partner_id:0
+msgid "Customer"
+msgstr ""
+
+#. module: sale
+#: model:product.template,name:sale.advance_product_0_product_template
+msgid "Advance"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "February"
+msgstr ""
+
+#. module: sale
+#: help:sale.installer,sale_journal:0
+msgid ""
+"Allows you to group and invoice your delivery orders according to different "
+"invoicing types: daily, weekly, etc."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "April"
+msgstr ""
+
+#. module: sale
+#: view:sale.shop:0
+msgid "Accounting"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,step:0
+msgid "Steps To Deliver a Sales Order"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Search Sales Order"
+msgstr ""
+
+#. module: sale
+#: model:process.node,name:sale.process_node_saleorderprocurement0
+msgid "Sales Order Requisition"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+#: field:sale.order,payment_term:0
+msgid "Payment Term"
+msgstr ""
+
+#. module: sale
+#: help:sale.installer,sale_layout:0
+msgid ""
+"Provides some features to improve the layout of the Sales Order reports."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_report_all
+msgid ""
+"This report performs analysis on your quotations and sales orders. Analysis "
+"check your sales revenues and sort it by different group criteria (salesman, "
+"partner, product, etc.) Use this report to perform analysis on sales not "
+"having invoiced yet. If you want to analyse your turnover, you should use "
+"the Invoice Analysis report in the Accounting application."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Quotation N°"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,picked_rate:0
+#: view:sale.report:0
+msgid "Picked"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,year:0
+msgid "Year"
+msgstr ""
+
+#. module: sale
+#: selection:sale.config.picking_policy,order_policy:0
+msgid "Invoice Based on Deliveries"
+msgstr ""
diff --git a/addons/stock/i18n/ru.po b/addons/stock/i18n/ru.po
index aa8330c41c9..fb30ea8ea5d 100644
--- a/addons/stock/i18n/ru.po
+++ b/addons/stock/i18n/ru.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2011-03-16 15:44+0000\n"
+"PO-Revision-Date: 2011-04-19 10:58+0000\n"
 "Last-Translator: Stanislav Hanzhin <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: 2011-03-17 06:12+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-04-20 05:57+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
@@ -98,6 +98,10 @@ msgid ""
 "per location. You can use it once a year when you do the general inventory "
 "or whenever you need it, to correct the current stock level of a product."
 msgstr ""
+"Периодические инвентаризации используются для подсчета количества ТМЦ в "
+"месте хранения. Вы можете использовать её один раз в год, когда вы делаете "
+"общую инвентаризацию или всякий раз, когда вам это нужно, чтобы исправить "
+"текущие остатки ТМЦ."
 
 #. module: stock
 #: view:stock.picking:0
@@ -134,6 +138,8 @@ msgid ""
 "This is the list of all delivery orders that have to be prepared, according "
 "to your different sales orders and your logistics rules."
 msgstr ""
+"Это список всех заказов на доставку, которые были приготовлены в "
+"соответствии с вашими заказами на продажу и правилами логистики."
 
 #. module: stock
 #: view:report.stock.move:0
@@ -3783,7 +3789,7 @@ msgstr ""
 #: field:stock.partial.picking,product_moves_in:0
 #: field:stock.partial.picking,product_moves_out:0
 msgid "Moves"
-msgstr "Перемещения тоаров"
+msgstr "Перемещения товаров"
 
 #. module: stock
 #: view:report.stock.move:0
diff --git a/addons/stock_location/i18n/ru.po b/addons/stock_location/i18n/ru.po
index 5103053c4f9..9ceb1017c78 100644
--- a/addons/stock_location/i18n/ru.po
+++ b/addons/stock_location/i18n/ru.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-19 06:21+0000\n"
+"X-Launchpad-Export-Date: 2011-04-20 05:57+0000\n"
 "X-Generator: Launchpad (build 12758)\n"
 
 #. module: stock_location
diff --git a/addons/warning/i18n/ru.po b/addons/warning/i18n/ru.po
index 64b3d85cbc1..002b1849328 100644
--- a/addons/warning/i18n/ru.po
+++ b/addons/warning/i18n/ru.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-19 06:21+0000\n"
+"X-Launchpad-Export-Date: 2011-04-20 05:57+0000\n"
 "X-Generator: Launchpad (build 12758)\n"
 
 #. module: warning
diff --git a/addons/wiki/i18n/ru.po b/addons/wiki/i18n/ru.po
index b44ed73889d..2a5d13669e6 100644
--- a/addons/wiki/i18n/ru.po
+++ b/addons/wiki/i18n/ru.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-19 06:21+0000\n"
+"X-Launchpad-Export-Date: 2011-04-20 05:57+0000\n"
 "X-Generator: Launchpad (build 12758)\n"
 
 #. module: wiki

From c71cc3e686e8549899ce7079ff55ff0f7f8f1bc4 Mon Sep 17 00:00:00 2001
From: "ARA (OpenERP)" <ara@tinyerp.com>
Date: Wed, 20 Apr 2011 11:37:17 +0530
Subject: [PATCH 269/331] [FIX] account_voucher: correct red fields..error when
 default account not set on journal

bzr revid: ara@tinyerp.com-20110420060717-2wm93bmrbm35333i
---
 addons/account_voucher/account_voucher.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py
index 9bfee8b8d49..b4422cd8051 100644
--- a/addons/account_voucher/account_voucher.py
+++ b/addons/account_voucher/account_voucher.py
@@ -379,6 +379,8 @@ class account_voucher(osv.osv):
             account_id = partner.property_account_payable.id
             tr_type = 'purchase'
         else:
+            if not journal.default_credit_account_id or not journal.default_debit_account_id:
+                raise osv.except_osv(_('Error !'), _('Please define default credit/debit account on the %s !') % (journal.name))
             account_id = journal.default_credit_account_id.id or journal.default_debit_account_id.id
             tr_type = 'receipt'
 

From 71049f8bb6043bd7d9db40af76f87c690cd73404 Mon Sep 17 00:00:00 2001
From: "Rucha (Open ERP)" <rpa@tinyerp.com>
Date: Wed, 20 Apr 2011 11:43:48 +0530
Subject: [PATCH 270/331] [IMP]: procurement: Improved tooltip for min-max qty
 of minimun stock rule

bzr revid: rpa@tinyerp.com-20110420061348-uy8xmycbeehfa7l3
---
 addons/procurement/procurement.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/procurement/procurement.py b/addons/procurement/procurement.py
index fccc6445d3d..1f808f2bef6 100644
--- a/addons/procurement/procurement.py
+++ b/addons/procurement/procurement.py
@@ -512,11 +512,11 @@ class stock_warehouse_orderpoint(osv.osv):
         'product_id': fields.many2one('product.product', 'Product', required=True, ondelete='cascade', domain=[('type','=','product')]),
         'product_uom': fields.many2one('product.uom', 'Product UOM', required=True),
         'product_min_qty': fields.float('Min Quantity', required=True,
-            help="When the virtual stock goes below the Min Quantity, OpenERP generates "\
+            help="When the virtual stock goes below the Min Quantity specified for this field, OpenERP generates "\
             "a procurement to bring the virtual stock to the Max Quantity."),
         'product_max_qty': fields.float('Max Quantity', required=True,
-            help="When the virtual stock goes below the Max Quantity, OpenERP generates "\
-            "a procurement to bring the virtual stock to the Max Quantity."),
+            help="When the virtual stock goes below the Min Quantity, OpenERP generates "\
+            "a procurement to bring the virtual stock to the Quantity specified as Max Quantity."),
         'qty_multiple': fields.integer('Qty Multiple', required=True,
             help="The procurement quantity will be rounded up to this multiple."),
         'procurement_id': fields.many2one('procurement.order', 'Latest procurement', ondelete="set null"),

From 6730b692db58eebe78dead6cb847582d674d04bb Mon Sep 17 00:00:00 2001
From: "AMP (OpenERP)" <amp@tinyerp.com>
Date: Wed, 20 Apr 2011 12:21:19 +0530
Subject: [PATCH 271/331] [FIX] Usability : Usability Improvement

bzr revid: amp@tinyerp.com-20110420065119-qoeakgace48dnugv
---
 addons/crm_caldav/crm_caldav_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/crm_caldav/crm_caldav_view.xml b/addons/crm_caldav/crm_caldav_view.xml
index 1fc6c341cb5..b8b0ffdea03 100644
--- a/addons/crm_caldav/crm_caldav_view.xml
+++ b/addons/crm_caldav/crm_caldav_view.xml
@@ -13,7 +13,7 @@
         </record>
     
         <menuitem
-            name="Synchronize this Calendar"
+            name="Synchronize This Calendar"
             action="action_caldav_browse"
             id="menu_caldav_browse"
             icon="STOCK_EXECUTE"

From 144c3a902ed598770b42f5085e9a1536c40a02e2 Mon Sep 17 00:00:00 2001
From: rch-openerp <rch@tinyerp.com>
Date: Wed, 20 Apr 2011 16:17:14 +0530
Subject: [PATCH 272/331] [IMP]: Usability improvement in Timebox form of
 project_gtd module.

bzr revid: rch@tinyerp.com-20110420104714-7fsvb5wal7o90aqh
---
 addons/project_gtd/wizard/project_gtd_empty_view.xml | 5 +++--
 addons/project_gtd/wizard/project_gtd_fill_view.xml  | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/addons/project_gtd/wizard/project_gtd_empty_view.xml b/addons/project_gtd/wizard/project_gtd_empty_view.xml
index b39391728a4..b7ebeb1bd00 100644
--- a/addons/project_gtd/wizard/project_gtd_empty_view.xml
+++ b/addons/project_gtd/wizard/project_gtd_empty_view.xml
@@ -10,9 +10,10 @@
               	<form string="Empty Timebox">
               		<group width="345" height="70">
               			<label string="Timebox Empty Process Completed Successfully." />
-							<newline/>
+              			    <newline/>
+              			    <separator colspan="4"/>
 		            		<button icon="gtk-ok" special="cancel" string="_Ok" colspan="1"/><label colspan="1"/>
-		          	</group>		   
+		          	</group>
 			  	</form>
             </field>
 		</record>
diff --git a/addons/project_gtd/wizard/project_gtd_fill_view.xml b/addons/project_gtd/wizard/project_gtd_fill_view.xml
index 6206a0a5d89..41b99eb1b1e 100644
--- a/addons/project_gtd/wizard/project_gtd_fill_view.xml
+++ b/addons/project_gtd/wizard/project_gtd_fill_view.xml
@@ -11,6 +11,7 @@
               		  <field name="timebox_id" widget="selection"/>
               		  <field name="timebox_to_id" widget="selection"/>
               		  <field colspan="4" name="task_ids" nolabel="1" domain="[('timebox_id','=',timebox_id),('state','=','open')]" />
+              		  <separator colspan="4"/>
 		              <group colspan="4" col="6">
 				            <button icon="gtk-cancel" special="cancel" string="_Cancel"/>
 		              		<button name="process" icon="gtk-ok" string="Add to Timebox" type="object" />

From 290ef7ed6c8f1c030aaceb4338652fa60e6b0695 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Wed, 20 Apr 2011 14:55:21 +0200
Subject: [PATCH 273/331] [FIX] hr_timesheet_sheet: Improved Exception coming
 on Sign In and Sign Out buttons

lp bug: https://launchpad.net/bugs/74642 fixed

bzr revid: qdp-launchpad@openerp.com-20110420125521-p2js2tk3z7q5lw5t
---
 addons/hr_timesheet_sheet/hr_timesheet_sheet.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
index 23ab63247e5..5a899555e5d 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
@@ -251,7 +251,7 @@ class hr_timesheet_sheet(osv.osv):
         if context is None:
             context = {}
         if not sheet.date_current == time.strftime('%Y-%m-%d'):
-            raise osv.except_osv(_('Error !'), _('You can not sign in from an other date than today'))
+            raise osv.except_osv(_('Error !'), _('You cannot sign in/sign out from an other date than today'))
         emp_id = sheet.employee_id.id
         context['sheet_id']=ids[0]
         emp_obj.attendance_action_change(cr, uid, [emp_id], type=typ, context=context,)

From dc6973b41ed1267291f65571f721080e6bb38b5c Mon Sep 17 00:00:00 2001
From: "Naresh (OpenERP)" <nch@tinyerp.com>
Date: Wed, 20 Apr 2011 18:43:46 +0530
Subject: [PATCH 274/331] [FIX]:help defined in xml view was not considered for
 translation eg:on button

lp bug: https://launchpad.net/bugs/705597 fixed

bzr revid: nch@tinyerp.com-20110420131346-n5jfy76efdgnztqr
---
 openerp/osv/orm.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py
index c0b2e65c678..26f011cd252 100644
--- a/openerp/osv/orm.py
+++ b/openerp/osv/orm.py
@@ -1277,6 +1277,10 @@ class orm_template(object):
                 trans = self.pool.get('ir.translation')._get_source(cr, user, self._name, 'view', context['lang'], node.get('sum'))
                 if trans:
                     node.set('sum', trans)
+            if node.get('help'):
+                trans = self.pool.get('ir.translation')._get_source(cr, user, self._name, 'view', context['lang'], node.get('help'))
+                if trans:
+                    node.set('help', trans)
 
         for f in node:
             if children or (node.tag == 'field' and f.tag in ('filter','separator')):

From 7549fe14d7a8cb45e59c1ec33970aedd6a3673ee Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Thu, 21 Apr 2011 04:38:54 +0000
Subject: [PATCH 275/331] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20110421043854-dslduy3emr1ypjgy
---
 addons/l10n_br/i18n/tr.po | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 addons/l10n_br/i18n/tr.po

diff --git a/addons/l10n_br/i18n/tr.po b/addons/l10n_br/i18n/tr.po
new file mode 100644
index 00000000000..bd89cac59da
--- /dev/null
+++ b/addons/l10n_br/i18n/tr.po
@@ -0,0 +1,36 @@
+# Turkish translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-07 06:40+0000\n"
+"PO-Revision-Date: 2011-04-20 20:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Turkish <tr@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: 2011-04-21 04:38+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
+
+#. module: l10n_br
+#: model:ir.actions.todo,note:l10n_br.config_call_account_template_brazilian_localization
+msgid ""
+"Generate Chart of Accounts from a Chart Template. You will be asked to pass "
+"the name of the company, the chart template to follow, the no. of digits to "
+"generate the code for your accounts and Bank account, currency to create "
+"Journals. Thus,the pure copy of chart Template is generated.\n"
+"    This is the same wizard that runs from Financial "
+"Management/Configuration/Financial Accounting/Financial Accounts/Generate "
+"Chart of Accounts from a Chart Template."
+msgstr ""
+
+#. module: l10n_br
+#: model:ir.module.module,description:l10n_br.module_meta_information
+#: model:ir.module.module,shortdesc:l10n_br.module_meta_information
+msgid "Brazilian Localization"
+msgstr ""

From d5ad855eebb8fe92125419642bb5e1ce5400c642 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Thu, 21 Apr 2011 06:01:21 +0000
Subject: [PATCH 276/331] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20110421060121-cl5hm55v9hw5a8oq
---
 addons/account/i18n/de.po         |  19 ++--
 addons/account_payment/i18n/id.po | 141 ++++++++++++++++--------------
 addons/l10n_br/i18n/tr.po         |  36 ++++++++
 addons/sale/i18n/ru.po            |  11 ++-
 addons/stock/i18n/ru.po           |  14 +--
 5 files changed, 136 insertions(+), 85 deletions(-)
 create mode 100644 addons/l10n_br/i18n/tr.po

diff --git a/addons/account/i18n/de.po b/addons/account/i18n/de.po
index 9ec6d2c8e78..d6527fe9306 100644
--- a/addons/account/i18n/de.po
+++ b/addons/account/i18n/de.po
@@ -7,15 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-04-14 05:09+0000\n"
-"Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
-"consulting.net>\n"
+"PO-Revision-Date: 2011-04-20 18:45+0000\n"
+"Last-Translator: Ferdinand @ Camptocamp <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: 2011-04-15 07:07+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-21 06:01+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -918,7 +917,7 @@ msgstr "Erzeuge 3 Monats Periode"
 #. module: account
 #: report:account.overdue:0
 msgid "Due"
-msgstr "fällig am"
+msgstr "Fällig"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -4012,7 +4011,7 @@ msgstr "Fällige Analytische Konten"
 #: selection:account.invoice,state:0
 #: report:account.overdue:0
 msgid "Paid"
-msgstr "bezahlt am"
+msgstr "bezahlt"
 
 #. module: account
 #: field:account.invoice,tax_line:0
@@ -4187,7 +4186,7 @@ msgstr "Storniere Abschreibung"
 #: field:account.model.line,date_maturity:0
 #: report:account.overdue:0
 msgid "Maturity date"
-msgstr "Fälligkeitstermin"
+msgstr "Datum Fällig"
 
 #. module: account
 #: view:report.account.receivable:0
@@ -7359,7 +7358,7 @@ msgstr "Manueller Kontenausgleich"
 #. module: account
 #: report:account.overdue:0
 msgid "Total amount due:"
-msgstr "Gesamtbetrag (fällig):"
+msgstr "Gesamtbetrag fällig:"
 
 #. module: account
 #: field:account.analytic.chart,to_date:0
@@ -8745,7 +8744,7 @@ msgstr ""
 #. module: account
 #: report:account.overdue:0
 msgid "Best regards."
-msgstr "Viele Grüsse."
+msgstr "Beste Grüsse."
 
 #. module: account
 #: view:account.invoice:0
diff --git a/addons/account_payment/i18n/id.po b/addons/account_payment/i18n/id.po
index 1f9a3e304b6..64cc3ba120e 100644
--- a/addons/account_payment/i18n/id.po
+++ b/addons/account_payment/i18n/id.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-04-20 03:52+0000\n"
+"PO-Revision-Date: 2011-04-20 07:26+0000\n"
 "Last-Translator: moelyana <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: 2011-04-20 05:56+0000\n"
+"X-Launchpad-Export-Date: 2011-04-21 06:01+0000\n"
 "X-Generator: Launchpad (build 12758)\n"
 
 #. module: account_payment
@@ -324,22 +324,22 @@ msgstr "Pilih Faktur untuk bayar"
 #. module: account_payment
 #: view:payment.line:0
 msgid "Currency Amount Total"
-msgstr ""
+msgstr "Total jumlah mata uang"
 
 #. module: account_payment
 #: view:payment.order:0
 msgid "Make Payments"
-msgstr ""
+msgstr "Lakukan Pembayaran"
 
 #. module: account_payment
 #: field:payment.line,state:0
 msgid "Communication Type"
-msgstr ""
+msgstr "Jenis Komunikasi"
 
 #. module: account_payment
 #: model:ir.module.module,shortdesc:account_payment.module_meta_information
 msgid "Payment Management"
-msgstr ""
+msgstr "Manajemen pembayaran"
 
 #. module: account_payment
 #: field:payment.line,bank_statement_line_id:0
@@ -349,27 +349,27 @@ msgstr ""
 #. module: account_payment
 #: selection:payment.order,date_prefered:0
 msgid "Due date"
-msgstr ""
+msgstr "Tanggal Jatuh Tempo"
 
 #. module: account_payment
 #: field:account.invoice,amount_to_pay:0
 msgid "Amount to be paid"
-msgstr ""
+msgstr "Jumlah yang harus di bayar"
 
 #. module: account_payment
 #: report:payment.order:0
 msgid "Currency"
-msgstr ""
+msgstr "Mata Uang"
 
 #. module: account_payment
 #: view:account.payment.make.payment:0
 msgid "Yes"
-msgstr ""
+msgstr "Ya"
 
 #. module: account_payment
 #: help:payment.line,info_owner:0
 msgid "Address of the Main Partner"
-msgstr ""
+msgstr "Alamat Rekanan Utama"
 
 #. module: account_payment
 #: help:payment.line,date:0
@@ -377,6 +377,8 @@ msgid ""
 "If no payment date is specified, the bank will treat this payment line "
 "directly"
 msgstr ""
+"Jika tidak ada tanggal pembayaran yang ditentukan, bank akan menangani "
+"bagian ini dengan membayar secara langsung"
 
 #. module: account_payment
 #: model:ir.model,name:account_payment.model_account_payment_populate_statement
@@ -386,44 +388,44 @@ msgstr ""
 #. module: account_payment
 #: help:payment.mode,name:0
 msgid "Mode of Payment"
-msgstr ""
+msgstr "Cara Pembayaran"
 
 #. module: account_payment
 #: report:payment.order:0
 msgid "Value Date"
-msgstr ""
+msgstr "Nilai Tanggal"
 
 #. module: account_payment
 #: report:payment.order:0
 msgid "Payment Type"
-msgstr ""
+msgstr "Tipe Pembayaran"
 
 #. module: account_payment
 #: help:payment.line,amount_currency:0
 msgid "Payment amount in the partner currency"
-msgstr ""
+msgstr "Jumlah pembayaran dalam mata uang partner"
 
 #. module: account_payment
 #: view:payment.order:0
 #: selection:payment.order,state:0
 msgid "Draft"
-msgstr ""
+msgstr "Draft"
 
 #. module: account_payment
 #: help:payment.line,communication2:0
 msgid "The successor message of Communication."
-msgstr ""
+msgstr "Pesan pengganti dari Komunikasi."
 
 #. module: account_payment
 #: code:addons/account_payment/account_move_line.py:110
 #, python-format
 msgid "No partner defined on entry line"
-msgstr ""
+msgstr "Tidak ada partner didefinisikan pada baris entri"
 
 #. module: account_payment
 #: help:payment.line,info_partner:0
 msgid "Address of the Ordering Customer."
-msgstr ""
+msgstr "Alamat Customer Pemesan."
 
 #. module: account_payment
 #: view:account.payment.populate.statement:0
@@ -439,27 +441,29 @@ msgstr "Total Kredit"
 #: help:payment.order,date_scheduled:0
 msgid "Select a date if you have chosen Preferred Date to be fixed."
 msgstr ""
+"Pilih tanggal jika Anda telah memilih Tanggal Preferred yang harus "
+"diperbaiki."
 
 #. module: account_payment
 #: field:payment.order,user_id:0
 msgid "User"
-msgstr ""
+msgstr "Pengguna"
 
 #. module: account_payment
 #: field:account.payment.populate.statement,lines:0
 #: model:ir.actions.act_window,name:account_payment.act_account_invoice_2_payment_line
 msgid "Payment Lines"
-msgstr ""
+msgstr "Daftar Pembayaran"
 
 #. module: account_payment
 #: model:ir.model,name:account_payment.model_account_move_line
 msgid "Journal Items"
-msgstr ""
+msgstr "Item Jurnal"
 
 #. module: account_payment
 #: constraint:account.move.line:0
 msgid "Company must be same for its related account and period."
-msgstr ""
+msgstr "Perusahaan harus sama untuk account terkait dan periode."
 
 #. module: account_payment
 #: help:payment.line,move_line_id:0
@@ -467,104 +471,105 @@ msgid ""
 "This Entry Line will be referred for the information of the ordering "
 "customer."
 msgstr ""
+"Entri Line ini akan dirujuk untuk informasi pemesanan dari pelanggan."
 
 #. module: account_payment
 #: view:payment.order.create:0
 msgid "Search"
-msgstr ""
+msgstr "Penelusuran"
 
 #. module: account_payment
 #: model:ir.actions.report.xml,name:account_payment.payment_order1
 #: model:ir.model,name:account_payment.model_payment_order
 msgid "Payment Order"
-msgstr ""
+msgstr "Order Pembayaran"
 
 #. module: account_payment
 #: field:payment.line,date:0
 msgid "Payment Date"
-msgstr ""
+msgstr "Tanggal Pembayaran"
 
 #. module: account_payment
 #: report:payment.order:0
 msgid "Total:"
-msgstr ""
+msgstr "Total:"
 
 #. module: account_payment
 #: field:payment.order,date_created:0
 msgid "Creation date"
-msgstr ""
+msgstr "Tanggal Pembuatan"
 
 #. module: account_payment
 #: view:account.payment.populate.statement:0
 msgid "ADD"
-msgstr ""
+msgstr "Tambahkan"
 
 #. module: account_payment
 #: view:account.bank.statement:0
 msgid "Import payment lines"
-msgstr ""
+msgstr "Impor baris pembayaran"
 
 #. module: account_payment
 #: field:account.move.line,amount_to_pay:0
 msgid "Amount to pay"
-msgstr ""
+msgstr "Nilai yang harus dibayar"
 
 #. module: account_payment
 #: field:payment.line,amount:0
 msgid "Amount in Company Currency"
-msgstr ""
+msgstr "Jumlah dalam mata uang perusahaan"
 
 #. module: account_payment
 #: help:payment.line,partner_id:0
 msgid "The Ordering Customer"
-msgstr ""
+msgstr "Customer Pemesan"
 
 #. module: account_payment
 #: model:ir.model,name:account_payment.model_account_payment_make_payment
 msgid "Account make payment"
-msgstr ""
+msgstr "Akun untuk pembayaran"
 
 #. module: account_payment
 #: report:payment.order:0
 msgid "Invoice Ref"
-msgstr ""
+msgstr "Ref. Faktur"
 
 #. module: account_payment
 #: field:payment.line,name:0
 msgid "Your Reference"
-msgstr ""
+msgstr "Referensi Anda"
 
 #. module: account_payment
 #: field:payment.order,mode:0
 msgid "Payment mode"
-msgstr ""
+msgstr "Mode Pembayaran"
 
 #. module: account_payment
 #: view:payment.order:0
 msgid "Payment order"
-msgstr ""
+msgstr "Order Pembayaran"
 
 #. module: account_payment
 #: view:payment.line:0
 #: view:payment.order:0
 msgid "General Information"
-msgstr ""
+msgstr "Informasi Umum"
 
 #. module: account_payment
 #: view:payment.order:0
 #: selection:payment.order,state:0
 msgid "Done"
-msgstr ""
+msgstr "selesai"
 
 #. module: account_payment
 #: model:ir.model,name:account_payment.model_account_invoice
 msgid "Invoice"
-msgstr ""
+msgstr "Faktur"
 
 #. module: account_payment
 #: field:payment.line,communication:0
 msgid "Communication"
-msgstr ""
+msgstr "Komunikasi"
 
 #. module: account_payment
 #: view:account.payment.make.payment:0
@@ -572,13 +577,13 @@ msgstr ""
 #: view:payment.order:0
 #: view:payment.order.create:0
 msgid "Cancel"
-msgstr ""
+msgstr "Batal"
 
 #. module: account_payment
 #: view:payment.line:0
 #: view:payment.order:0
 msgid "Information"
-msgstr ""
+msgstr "Informasi"
 
 #. module: account_payment
 #: model:ir.actions.act_window,help:account_payment.action_payment_order_tree
@@ -588,75 +593,80 @@ msgid ""
 "that should be done, keep track of all payment orders and mention the "
 "invoice reference and the partner the payment should be done for."
 msgstr ""
+"Sebuah perintah pembayaran adalah permintaan pembayaran dari perusahaan Anda "
+"untuk membayar Tagihan dari pemasok atau catatan kredit pelanggan. Di sini "
+"Anda dapat mendaftarkan semua perintah pembayaran yang harus dilakukan, "
+"melacak semua perintah pembayaran dan menyebutkan referensi faktur dan mitra "
+"pembayaran harus dilakukan"
 
 #. module: account_payment
 #: help:payment.line,amount:0
 msgid "Payment amount in the company currency"
-msgstr ""
+msgstr "Jumlah pembayaran dalam mata uang perusahaan"
 
 #. module: account_payment
 #: view:payment.order.create:0
 msgid "Search Payment lines"
-msgstr ""
+msgstr "Pencarian Line Pembayaran"
 
 #. module: account_payment
 #: field:payment.line,amount_currency:0
 msgid "Amount in Partner Currency"
-msgstr ""
+msgstr "Jumlah dalam mata uang perusahaan"
 
 #. module: account_payment
 #: field:payment.line,communication2:0
 msgid "Communication 2"
-msgstr ""
+msgstr "komunikasi 2"
 
 #. module: account_payment
 #: field:payment.line,bank_id:0
 msgid "Destination Bank account"
-msgstr ""
+msgstr "Akun Bank Tujuan"
 
 #. module: account_payment
 #: view:account.payment.make.payment:0
 msgid "Are you sure you want to make payment?"
-msgstr ""
+msgstr "Apakah Anda yakin ingin melakukan pembayaran?"
 
 #. module: account_payment
 #: view:payment.mode:0
 #: field:payment.mode,journal:0
 msgid "Journal"
-msgstr ""
+msgstr "Jurnal"
 
 #. module: account_payment
 #: field:payment.mode,bank_id:0
 msgid "Bank account"
-msgstr ""
+msgstr "Akun Bank"
 
 #. module: account_payment
 #: view:payment.order:0
 msgid "Confirm Payments"
-msgstr ""
+msgstr "Konfirmasi Pembayaran"
 
 #. module: account_payment
 #: field:payment.line,company_currency:0
 #: report:payment.order:0
 msgid "Company Currency"
-msgstr ""
+msgstr "Mata uang perusahaan"
 
 #. module: account_payment
 #: model:ir.ui.menu,name:account_payment.menu_main_payment
 #: view:payment.line:0
 #: view:payment.order:0
 msgid "Payment"
-msgstr ""
+msgstr "Pembayaran"
 
 #. module: account_payment
 #: report:payment.order:0
 msgid "Payment Order / Payment"
-msgstr ""
+msgstr "Order Pembayaran / pembayaran"
 
 #. module: account_payment
 #: field:payment.line,move_line_id:0
 msgid "Entry line"
-msgstr ""
+msgstr "Baris Entri"
 
 #. module: account_payment
 #: help:payment.line,communication:0
@@ -664,43 +674,46 @@ msgid ""
 "Used as the message between ordering customer and current company. Depicts "
 "'What do you want to say to the recipient about this order ?'"
 msgstr ""
+"Digunakan sebagai pesan antara pelanggan pemesanan dan perusahaan saat ini. "
+"Melukiskan \"Apa yang ingin Anda katakan kepada si penerima tentang pesanan "
+"ini?\""
 
 #. module: account_payment
 #: field:payment.mode,name:0
 msgid "Name"
-msgstr ""
+msgstr "Nama"
 
 #. module: account_payment
 #: report:payment.order:0
 msgid "Bank Account"
-msgstr ""
+msgstr "Akun Bank"
 
 #. module: account_payment
 #: view:payment.line:0
 #: view:payment.order:0
 msgid "Entry Information"
-msgstr ""
+msgstr "Informasi Entri"
 
 #. module: account_payment
 #: model:ir.model,name:account_payment.model_payment_order_create
 msgid "payment.order.create"
-msgstr ""
+msgstr "buat order pembayaran"
 
 #. module: account_payment
 #: field:payment.line,order_id:0
 msgid "Order"
-msgstr ""
+msgstr "Pesanan"
 
 #. module: account_payment
 #: field:payment.order,total:0
 msgid "Total"
-msgstr ""
+msgstr "Total"
 
 #. module: account_payment
 #: view:account.payment.make.payment:0
 #: model:ir.actions.act_window,name:account_payment.action_account_payment_make_payment
 msgid "Make Payment"
-msgstr ""
+msgstr "Lakukan Pembayaran"
 
 #. module: account_payment
 #: field:payment.line,partner_id:0
diff --git a/addons/l10n_br/i18n/tr.po b/addons/l10n_br/i18n/tr.po
new file mode 100644
index 00000000000..6a6026d7c9a
--- /dev/null
+++ b/addons/l10n_br/i18n/tr.po
@@ -0,0 +1,36 @@
+# Turkish translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-07 06:40+0000\n"
+"PO-Revision-Date: 2011-04-20 20:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Turkish <tr@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: 2011-04-21 06:01+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
+
+#. module: l10n_br
+#: model:ir.actions.todo,note:l10n_br.config_call_account_template_brazilian_localization
+msgid ""
+"Generate Chart of Accounts from a Chart Template. You will be asked to pass "
+"the name of the company, the chart template to follow, the no. of digits to "
+"generate the code for your accounts and Bank account, currency to create "
+"Journals. Thus,the pure copy of chart Template is generated.\n"
+"    This is the same wizard that runs from Financial "
+"Management/Configuration/Financial Accounting/Financial Accounts/Generate "
+"Chart of Accounts from a Chart Template."
+msgstr ""
+
+#. module: l10n_br
+#: model:ir.module.module,description:l10n_br.module_meta_information
+#: model:ir.module.module,shortdesc:l10n_br.module_meta_information
+msgid "Brazilian Localization"
+msgstr ""
diff --git a/addons/sale/i18n/ru.po b/addons/sale/i18n/ru.po
index 329334173aa..899d539dd12 100644
--- a/addons/sale/i18n/ru.po
+++ b/addons/sale/i18n/ru.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2011-04-17 15:48+0000\n"
-"Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
+"PO-Revision-Date: 2011-04-20 16:08+0000\n"
+"Last-Translator: Stanislav Hanzhin <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: 2011-04-18 06:26+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-21 06:01+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: sale
 #: view:board.board:0
@@ -457,6 +457,9 @@ msgid ""
 "Select a product of type service which is called 'Advance Product'. You may "
 "have to create it and set it as a default value on this field."
 msgstr ""
+"Выберите значение с названием «Предварительное изделие» имеющий тип "
+"«Услуга». Возможно вам понадобится создать его и установить в качестве "
+"значения по-умолчанию для этого поля."
 
 #. module: sale
 #: report:sale.order:0
diff --git a/addons/stock/i18n/ru.po b/addons/stock/i18n/ru.po
index fb30ea8ea5d..bcfab7d5560 100644
--- a/addons/stock/i18n/ru.po
+++ b/addons/stock/i18n/ru.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2011-04-19 10:58+0000\n"
-"Last-Translator: Stanislav Hanzhin <Unknown>\n"
+"PO-Revision-Date: 2011-04-20 16:03+0000\n"
+"Last-Translator: Dmitriy Leyfer <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: 2011-04-20 05:57+0000\n"
+"X-Launchpad-Export-Date: 2011-04-21 06:01+0000\n"
 "X-Generator: Launchpad (build 12758)\n"
 
 #. module: stock
@@ -385,7 +385,7 @@ msgstr "Задержка (в днях)"
 #. module: stock
 #: model:ir.model,name:stock.model_action_traceability
 msgid "Action traceability "
-msgstr ""
+msgstr "Слежение за действиями "
 
 #. module: stock
 #: field:stock.location,posy:0
@@ -480,7 +480,7 @@ msgstr "Тип доставки определяет приход или рас
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_move_labels
 msgid "Item Labels"
-msgstr ""
+msgstr "Метки изделия"
 
 #. module: stock
 #: model:ir.model,name:stock.model_report_stock_move
@@ -1178,7 +1178,7 @@ msgstr ""
 #. module: stock
 #: view:stock.production.lot:0
 msgid "Downstream Traceability"
-msgstr ""
+msgstr "Слежение за нижестоящим"
 
 #. module: stock
 #: help:product.template,property_stock_production:0
@@ -1469,7 +1469,7 @@ msgstr "Пожалуйста предоставьте положительное
 #. module: stock
 #: field:stock.location,chained_delay:0
 msgid "Chaining Lead Time"
-msgstr ""
+msgstr "Последовательность во времени"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_partial_move.py:85

From b1fdf78299c432675f6844d93e6b4f8965157b7b Mon Sep 17 00:00:00 2001
From: "Tejas (OpenERP)" <tta@openerp.com>
Date: Thu, 21 Apr 2011 12:06:26 +0530
Subject: [PATCH 277/331] FIX : Stop to create validated invoice from
 hr_expense, now hr_expense invoice created with draft state

lp bug: https://launchpad.net/bugs/735368 fixed

bzr revid: tta@openerp.com-20110421063626-idhopqjg3vbelva8
---
 addons/hr_expense/hr_expense.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py
index f3d5f9657cb..8b126423565 100644
--- a/addons/hr_expense/hr_expense.py
+++ b/addons/hr_expense/hr_expense.py
@@ -193,9 +193,6 @@ class hr_expense_expense(osv.osv):
                     account_journal.write(cr, uid, [journal.id],{'analytic_journal_id':analytic_journal_ids[0]})
             inv_id = invoice_obj.create(cr, uid, inv, {'type': 'in_invoice'})
             invoice_obj.button_compute(cr, uid, [inv_id], {'type': 'in_invoice'}, set_total=True)
-            wf_service = netsvc.LocalService("workflow")
-            wf_service.trg_validate(uid, 'account.invoice', inv_id, 'invoice_open', cr)
-
             self.write(cr, uid, [exp.id], {'invoice_id': inv_id, 'state': 'invoiced'})
             res = inv_id
         return res

From 4c65b5fbcc430dda6e246415e4629f0c5cfa4039 Mon Sep 17 00:00:00 2001
From: "Naresh (OpenERP)" <nch@tinyerp.com>
Date: Thu, 21 Apr 2011 12:06:28 +0530
Subject: [PATCH 278/331] [FIX]:printscreen report Title not getting translated
 value

lp bug: https://launchpad.net/bugs/728173 fixed

bzr revid: nch@tinyerp.com-20110421063628-1hy46os11im1qh0i
---
 openerp/report/printscreen/ps_list.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/openerp/report/printscreen/ps_list.py b/openerp/report/printscreen/ps_list.py
index 851945922ab..8b0ece6eaa0 100644
--- a/openerp/report/printscreen/ps_list.py
+++ b/openerp/report/printscreen/ps_list.py
@@ -67,11 +67,12 @@ class report_printscreen_list(report_int):
         self.groupby_no_leaf = context.get('group_by_no_leaf',False)
         pool = pooler.get_pool(cr.dbname)
         model = pool.get(datas['model'])
-        # Title come from description of model which are specified in py file.
+        model_id = pool.get('ir.model').search(cr, uid, [('model','=',model._name)])
         model_desc = model._description
+        if model_id:
+            model_desc = pool.get('ir.model').browse(cr, uid, model_id[0], context).name
         self.title = model_desc
         datas['ids'] = ids
-        model = pooler.get_pool(cr.dbname).get(datas['model'])
         result = model.fields_view_get(cr, uid, view_type='tree', context=context)
         fields_order =  self.groupby + self._parse_string(result['arch'])
         if self.groupby:

From d8a6f9b4e270d3fdd94464ad9182c6108dfdf723 Mon Sep 17 00:00:00 2001
From: "Jay Vora (OpenERP)" <jvo@tinyerp.com>
Date: Thu, 21 Apr 2011 13:21:29 +0530
Subject: [PATCH 279/331] [REF] HR_timesheet_invoice : Removed unnecesary
 code(Courtesy : Anup)

bzr revid: jvo@tinyerp.com-20110421075129-vw7lx4ej4sot8hm7
---
 .../wizard/hr_timesheet_final_invoice_create.py              | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py b/addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py
index 6263498d126..ee2096760d1 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py
@@ -95,11 +95,6 @@ class final_invoice_create(osv.osv_memory):
 
             context2 = context.copy()
             context2['lang'] = partner.lang
-            cr.execute("SELECT product_id, to_invoice, sum(unit_amount) " \
-                    "FROM account_analytic_line as line " \
-                    "WHERE account_id = %s " \
-                        "AND to_invoice IS NOT NULL " \
-                    "GROUP BY product_id, to_invoice", (account.id,))
 
             cr.execute("""SELECT
                     line.product_id,

From c59d9b69a29a29e0a17a9ff63ca066c2f794d805 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 21 Apr 2011 10:52:28 +0200
Subject: [PATCH 280/331] [REM] extraneous g tacked at the end of 'directive'

bzr revid: xmo@openerp.com-20110421085228-ydy0pc7p594xuj50
---
 doc/source/project.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/source/project.rst b/doc/source/project.rst
index d435a731d40..faa15da2163 100644
--- a/doc/source/project.rst
+++ b/doc/source/project.rst
@@ -65,7 +65,7 @@ RST, using Sphinx's `Python domain`_ [#]_:
   and ``__new__``), using the `info fields`_  as well.
 
 * Attributes (class and instance) should be documented in their
-  class's docstring via the ``.. attribute::`` directiveg, following
+  class's docstring via the ``.. attribute::`` directive, following
   the class's own documentation.
 
 * The relation between modules and module-level attributes is similar:

From 9de7a041ae0f372a24e0860c411ed98575235bd3 Mon Sep 17 00:00:00 2001
From: "Naresh (OpenERP)" <nch@tinyerp.com>
Date: Thu, 21 Apr 2011 14:22:57 +0530
Subject: [PATCH 281/331] [IMP]:added model name in the list view for
 ir.actions.report.xml

lp bug: https://launchpad.net/bugs/755473 fixed

bzr revid: nch@tinyerp.com-20110421085257-e0aitgy4vuz2m0so
---
 openerp/addons/base/ir/ir.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/openerp/addons/base/ir/ir.xml b/openerp/addons/base/ir/ir.xml
index 8867dcd2351..6ce6d8c3285 100644
--- a/openerp/addons/base/ir/ir.xml
+++ b/openerp/addons/base/ir/ir.xml
@@ -474,6 +474,7 @@
                 <tree string="Report xml">
                     <field name="name"/>
                     <field name="type"/>
+                    <field name="model"/>
                     <field name="report_name"/>
                     <field name="report_type"/>
                     <field name="attachment"/>

From 95a248e3751e1eec54fc3e8f7ba4883a62ec7a51 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 21 Apr 2011 10:53:18 +0200
Subject: [PATCH 282/331] [FIX] Fixed bug reported by Daniel Watkins. Invisible
 fields are not added in DOM.

bzr revid: fme@openerp.com-20110421085318-yoeb7pmll4ee0xh0
---
 addons/base/static/src/js/form.js | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/addons/base/static/src/js/form.js b/addons/base/static/src/js/form.js
index 85cdb9b8368..30fcca5d149 100644
--- a/addons/base/static/src/js/form.js
+++ b/addons/base/static/src/js/form.js
@@ -457,16 +457,14 @@ openerp.base.form.WidgetFrame = openerp.base.form.Widget.extend({
         }
         this.add_widget(widget);
     },
-    add_widget: function(w) {
-        if (!w.invisible) {
-            var current_row = this.table[this.table.length - 1];
-            if (current_row.length && (this.x + w.colspan) > this.columns) {
-                current_row = this.add_row();
-            }
-            current_row.push(w);
-            this.x += w.colspan;
+    add_widget: function(widget) {
+        var current_row = this.table[this.table.length - 1];
+        if (current_row.length && (this.x + widget.colspan) > this.columns) {
+            current_row = this.add_row();
         }
-        return w;
+        current_row.push(widget);
+        this.x += widget.colspan;
+        return widget;
     }
 });
 

From 2811c71fc7c81ceca8764d47bdc2b26128c473e6 Mon Sep 17 00:00:00 2001
From: "Jay Vora (OpenERP)" <jvo@tinyerp.com>
Date: Thu, 21 Apr 2011 14:30:39 +0530
Subject: [PATCH 283/331] [FIX] Stock : Fixed the problem suggested by Buildbot

bzr revid: jvo@tinyerp.com-20110421090039-yt9zau6vvz833r92
---
 addons/stock/wizard/stock_fill_inventory.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/stock/wizard/stock_fill_inventory.py b/addons/stock/wizard/stock_fill_inventory.py
index 118f8f8a2ce..45eb6e67c8b 100644
--- a/addons/stock/wizard/stock_fill_inventory.py
+++ b/addons/stock/wizard/stock_fill_inventory.py
@@ -43,7 +43,7 @@ class stock_fill_inventory(osv.osv_memory):
             context = {}
         super(stock_fill_inventory, self).view_init(cr, uid, fields_list, context=context)
         
-        if len(context['active_ids']) > 1:
+        if len(context.get('active_ids',[])) > 1:
             raise osv.except_osv(_('Error!'), _('You cannot perform this operation on more than one Stock Inventories.'))
         
         if context.get('active_id', False):

From cb7df3bc534f04f28d02b17a3b27438e2c65b811 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 21 Apr 2011 11:23:22 +0200
Subject: [PATCH 284/331] [IMP] Added pointer-cursor for list's fields cells

bzr revid: fme@openerp.com-20110421092322-9p2gf2hylynbox7b
---
 addons/base/static/src/css/base.css | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/addons/base/static/src/css/base.css b/addons/base/static/src/css/base.css
index cf6d0beabd4..2ed2b27ba28 100644
--- a/addons/base/static/src/css/base.css
+++ b/addons/base/static/src/css/base.css
@@ -486,6 +486,9 @@ body.openerp {
     vertical-align: middle;
 }
 
+.openerp .oe-listview .oe-field-cell {
+    cursor: pointer;
+}
 .openerp .oe-listview .oe-field-cell button {
     padding: 0;
     border: none;

From dce1a9ab59f11e75fad0d1ba92c60024614e31e7 Mon Sep 17 00:00:00 2001
From: "Naresh (OpenERP)" <nch@tinyerp.com>
Date: Thu, 21 Apr 2011 15:04:00 +0530
Subject: [PATCH 285/331] [FIX]:added missing of parsing of 'help' attribute
 while synchronizing translations

bzr revid: nch@tinyerp.com-20110421093400-aigxqul71iw2avph
---
 openerp/tools/translate.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/openerp/tools/translate.py b/openerp/tools/translate.py
index 6b23ddd25a8..9723135ff49 100644
--- a/openerp/tools/translate.py
+++ b/openerp/tools/translate.py
@@ -503,6 +503,8 @@ def trans_parse_view(de):
             res.append(de.text.encode("utf8"))
     if de.get("string"):
         res.append(de.get('string').encode("utf8"))
+    if de.get("help"):
+        res.append(de.get('help').encode("utf8"))
     if de.get("sum"):
         res.append(de.get('sum').encode("utf8"))
     if de.get("confirm"):
@@ -993,7 +995,7 @@ def resetlocale():
 def load_language(cr, lang):
     """Loads a translation terms for a language.
     Used mainly to automate language loading at db initialization.
-    
+
     :param lang: language ISO code with optional _underscore_ and l10n flavor (ex: 'fr', 'fr_BE', but not 'fr-BE')
     :type lang: str
     """

From 101084dfa07e18341724bd2fe55c3cd627839bc8 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 21 Apr 2011 12:12:12 +0200
Subject: [PATCH 286/331] [IMP] Improved sidebar styling

bzr revid: fme@openerp.com-20110421101212-bomgipspn3tlwahu
---
 addons/base/static/src/css/base.css | 11 +++++---
 addons/base/static/src/xml/base.xml | 39 +++++++++++++----------------
 2 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/addons/base/static/src/css/base.css b/addons/base/static/src/css/base.css
index 2ed2b27ba28..cd39b2ad147 100644
--- a/addons/base/static/src/css/base.css
+++ b/addons/base/static/src/css/base.css
@@ -336,8 +336,9 @@ body.openerp {
 }
 
 /* Main Application */
-.openerp .application {
+.openerp .oe-application {
     padding: 0px;
+    height: 100%;
 }
 
 .openerp h2.oe_view_title {
@@ -676,13 +677,14 @@ body.openerp {
 }
 
 .openerp .view-manager-main-content {
+    width: 100%;
     padding: 6px;
 }
 
 .openerp .view-manager-main-sidebar {
-    width:0;
-    padding:0;
-    margin:0;
+    width: 180px;
+    padding: 0;
+    margin: 0;
 }
 
 .openerp .sidebar-main-div {
@@ -749,6 +751,7 @@ body.openerp {
 }
 
 .openerp .toggle-sidebar {
+    cursor: pointer;
     border-color: #D2CFCF;
     border-style: solid;
     border-width: 1px;
diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml
index cbb90ca9e2e..163ae8d335c 100644
--- a/addons/base/static/src/xml/base.xml
+++ b/addons/base/static/src/xml/base.xml
@@ -33,10 +33,7 @@
         <td valign="top" id="oe_secondary_menu" class="secondary_menu">
         </td>
         <td valign="top" width="100%" height="100%">
-            <div id="oe_main" class="main">
-                <div id="oe_app" class="application"></div>
-                <div id="oe_sidebar"></div>
-            </div>
+            <div id="oe_app" class="oe-application"></div>
         </td>
     </tr>
     <tr>
@@ -135,23 +132,23 @@
 <t t-name="ViewManager">
     <table class="view-manager-main-table">
     <tr>
-    <td class="view-manager-main-content">
-    <!-- TODO prefix id with the element_id of the controller t-attf-id="#{prefix}_localid" -->
-    <div class="oe_vm_switch">
-        <t t-foreach="views" t-as="view">
-            <button type="button" t-att-data-view-type="view[1]">
-                <t t-esc="view[1]"/>
-            </button>
-        </t>
-    </div>
-    <div t-attf-id="#{prefix}_search"/>
-    <t t-foreach="views" t-as="view">
-        <div t-attf-id="#{prefix}_view_#{view[1]}"/>
-    </t>
-	</td>
-	<td class="view-manager-main-sidebar">
-	</td>
-	</tr>
+        <td class="view-manager-main-content">
+            <!-- TODO prefix id with the element_id of the controller t-attf-id="#{prefix}_localid" -->
+            <div class="oe_vm_switch">
+                <t t-foreach="views" t-as="view">
+                    <button type="button" t-att-data-view-type="view[1]">
+                        <t t-esc="view[1]"/>
+                    </button>
+                </t>
+            </div>
+            <div t-attf-id="#{prefix}_search" t-opentag="true"/>
+            <t t-foreach="views" t-as="view">
+                <div t-attf-id="#{prefix}_view_#{view[1]}"/>
+            </t>
+        </td>
+        <td class="view-manager-main-sidebar">
+        </td>
+    </tr>
     </table>
 </t>
 <table t-name="ListView">

From d087f5f37abb4d2548bec1301eb17948c2b3a34e Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 21 Apr 2011 12:24:54 +0200
Subject: [PATCH 287/331] [IMP] Quick & dirty support for non-scalar fields
 values in listviews

bzr revid: fme@openerp.com-20110421102454-cumtcqzyo0smgybo
---
 addons/base/static/src/xml/base.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml
index 163ae8d335c..1221c811039 100644
--- a/addons/base/static/src/xml/base.xml
+++ b/addons/base/static/src/xml/base.xml
@@ -214,7 +214,8 @@
                 <t t-set="is_button" t-value="column.tag === 'button'"/>
                 <!-- TODO: get correct widget from form -->
                 <t t-if="!is_button and row['data'][column.id].value">
-                    <t t-esc="row['data'][column.id].value"/>
+                    <t t-set="value" t-value="row['data'][column.id].value"/>
+                    <t t-esc="value instanceof Array ? value[1] : value"/>
                 </t>
                 <button type="button" t-att-title="column.help"
                         t-if="is_button">

From bf476cddf628473ff96ad7b35090d32ab9fde3dc Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 21 Apr 2011 13:59:16 +0200
Subject: [PATCH 288/331] [IMP] form: no colon for tag label. Removed "Reload
 OpenERP" button

bzr revid: fme@openerp.com-20110421115916-4bdhufvcq85dhujb
---
 addons/base/static/src/xml/base.xml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml
index 1221c811039..b49ef2c7d6a 100644
--- a/addons/base/static/src/xml/base.xml
+++ b/addons/base/static/src/xml/base.xml
@@ -18,9 +18,6 @@
         </div>
     </div>
     <div id="oe_login" class="login"></div>
-    <div style="position: absolute; right: 2px; top: 38px;">
-        <button onclick="QWeb.add_template('base.xml'); $('body').css('background-color', '#FFFF9C'); setTimeout(function() { $('body').css('background-color', '#FFF'); }, 500);">Reload QWEB</button>
-    </div>
     <table border="0" cellpadding="0" cellspacing="0" width="100%" height="100%"
         t-att-class="'main_table' + (typeof kitten == 'undefined' ? '' : ' kitten-mode-activated')">
     <tr>
@@ -297,7 +294,7 @@
            t-att-ondblclick="'console.log(\'' + widget.element_id + '\', openerp.screen.' + widget.element_id + ')'">
         <t t-esc="widget.string"/>
         <span t-if="widget.help">?</span>
-        <t t-if="widget.string">:</t>
+        <t t-if="widget.string and widget.node.tag != 'label'">:</t>
     </label>
 </t>
 <t t-name="FieldChar">

From 96386dbdd90a9ec9074796fb4e5691dd1b930300 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 21 Apr 2011 12:48:43 +0200
Subject: [PATCH 289/331] [REM] disable dummy actions implementation in lists,
 so nobody is confused as to their status

bzr revid: xmo@openerp.com-20110421104843-5sof6p8uuhq7gsap
---
 addons/base/static/src/js/list.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/addons/base/static/src/js/list.js b/addons/base/static/src/js/list.js
index 5a08b96ac14..c3b5075126c 100644
--- a/addons/base/static/src/js/list.js
+++ b/addons/base/static/src/js/list.js
@@ -108,8 +108,9 @@ openerp.base.ListView = openerp.base.Controller.extend(
 
                 var context = _.extend(
                         {}, self.dataset.context, field.context || {});
-                self.dataset.call(action, [row.data.id.value], [context],
-                                  self.do_reload);
+                self.notification.notify(
+                    '[Dummy] Execute action', self.dataset.model + '#' + action + "([" + row.data.id.value + '])');
+                // TODO: implement actions correctly once the corresponding manager has been extracted (and filled)
                 e.stopImmediatePropagation();
             });
         $table.delegate(

From 3d6a623b1acc142e10073bade3ca85cfa0bd116c Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 21 Apr 2011 13:59:24 +0200
Subject: [PATCH 290/331] [IMP] documentation for list view as it will be
 needed for some new widgets

bzr revid: xmo@openerp.com-20110421115924-7gj2tyrzm789bkom
---
 addons/base/static/src/js/list.js | 84 +++++++++++++++++++++++++++----
 1 file changed, 75 insertions(+), 9 deletions(-)

diff --git a/addons/base/static/src/js/list.js b/addons/base/static/src/js/list.js
index c3b5075126c..c60828732e8 100644
--- a/addons/base/static/src/js/list.js
+++ b/addons/base/static/src/js/list.js
@@ -13,6 +13,15 @@ openerp.base.ListView = openerp.base.Controller.extend(
         'addable': "New"
     },
     /**
+     * Core class for list-type displays.
+     *
+     * As a view, needs a number of view-related parameters to be correctly
+     * instantiated, provides options and overridable methods for behavioral
+     * customization.
+     *
+     * See constructor parameters and method documentations for information on
+     * the default behaviors and possible options for the list view.
+     *
      * @constructs
      * @param view_manager
      * @param session An OpenERP session object
@@ -37,11 +46,42 @@ openerp.base.ListView = openerp.base.Controller.extend(
 
         this.options = _.extend({}, this.defaults, options || {});
     },
+    /**
+     * View startup method, the default behavior is to set the ``oe-listview``
+     * class on its root element and to perform an RPC load call.
+     *
+     * @returns {$.Deferred} loading promise
+     */
     start: function() {
         this.$element.addClass('oe-listview');
-        return this.rpc("/base/listview/load", {"model": this.model, "view_id":this.view_id,
-            toolbar:!!this.view_manager.sidebar}, this.on_loaded);
+        return this.rpc("/base/listview/load", {
+            model: this.model,
+            view_id: this.view_id,
+            toolbar: !!this.view_manager.sidebar
+        }, this.on_loaded);
     },
+    /**
+     * Called after loading the list view's description, sets up such things
+     * as the view table's columns, renders the table itself and hooks up the
+     * various table-level and row-level DOM events (action buttons, deletion
+     * buttons, selection of records, [New] button, selection of a given
+     * record, ...)
+     *
+     * Sets up the following:
+     *
+     * * Processes arch and fields to generate a complete field descriptor for each field
+     * * Create the table itself and allocate visible columns
+     * * Hook in the top-level (header) [New|Add] and [Delete] button
+     * * Sets up showing/hiding the top-level [Delete] button based on records being selected or not
+     * * Sets up event handlers for action buttons and per-row deletion button
+     * * Hooks global callback for clicking on a row
+     * * Sets up its sidebar, if any
+     *
+     * @param {Object} data wrapped fields_view_get result
+     * @param {Object} data.fields_view fields_view_get result (processed)
+     * @param {Object} data.fields_view.fields mapping of fields for the current model
+     * @param {Object} data.fields_view.arch current list view descriptor
+     */
     on_loaded: function(data) {
         var self = this;
         this.fields_view = data.fields_view;
@@ -128,6 +168,8 @@ openerp.base.ListView = openerp.base.Controller.extend(
     /**
      * Fills the table with the provided records after emptying it
      *
+     * TODO: should also re-load the table itself, as e.g. columns may have changed
+     *
      * @param {Array} records the records to fill the list view with
      * @returns {Promise} promise to the end of view rendering (list views are asynchronously filled for improved responsiveness)
      */
@@ -189,14 +231,19 @@ openerp.base.ListView = openerp.base.Controller.extend(
         });
     },
     /**
-     * Asks the view manager to switch to a different view, using the provided
-     * record index (within the current dataset).
+     * Used to handle a click on a table row, if no other handler caught the
+     * event.
+     *
+     * The default implementation asks the list view's view manager to switch
+     * to a different view (by calling
+     * :js:func:`~openerp.base.ViewManager.on_mode_switch`), using the
+     * provided record index (within the current list view's dataset).
      *
      * If the index is null, ``switch_to_record`` asks for the creation of a
      * new record.
      *
      * @param {Number|null} index the record index (in the current dataset) to switch to
-     * @param {String} [view="form"] the view to switch to
+     * @param {String} [view="form"] the view type to switch to
      */
     switch_to_record:function (index, view) {
         view = view || 'form';
@@ -205,6 +252,16 @@ openerp.base.ListView = openerp.base.Controller.extend(
             this.view_manager.on_mode_switch(view);
         }, this));
     },
+    /**
+     * Base handler for clicking on a row, discovers the index of the record
+     * corresponding to the clicked row in the list view's dataset.
+     *
+     * Should not be overridden, use
+     * :js:func:`~openerp.base.ListView.switch_to_record` to customize the
+     * behavior of the list view when clicking on a row instead.
+     *
+     * @param {Object} event jQuery DOM event object
+     */
     on_select_row: function (event) {
         var $target = $(event.currentTarget);
         if (!$target.parent().is('tbody')) {
@@ -217,8 +274,8 @@ openerp.base.ListView = openerp.base.Controller.extend(
         if (index == undefined || index === -1) {
             return;
         }
-            this.switch_to_record(index);
-        },
+        this.switch_to_record(index);
+    },
     do_show: function () {
         this.$element.show();
         if (this.hidden) {
@@ -247,6 +304,15 @@ openerp.base.ListView = openerp.base.Controller.extend(
             'domain': this.dataset.domain
         }, this.do_fill_table);
     },
+    /**
+     * Event handler for a search, asks for the computation/folding of domains
+     * and contexts (and group-by), then reloads the view's content.
+     *
+     * @param {Array} domains a sequence of literal and non-literal domains
+     * @param {Array} contexts a sequence of literal and non-literal contexts
+     * @param {Array} groupbys a sequence of literal and non-literal group-by contexts
+     * @returns {$.Deferred} fold request evaluation promise
+     */
     do_search: function (domains, contexts, groupbys) {
         var self = this;
         return this.rpc('/base/session/eval_domain_and_context', {
@@ -267,7 +333,7 @@ openerp.base.ListView = openerp.base.Controller.extend(
     /**
      * Handles the signal to delete a line from the DOM
      *
-     * @param e
+     * @param e jQuery event object
      */
     do_delete: function (e) {
         // don't link to forms
@@ -296,7 +362,7 @@ openerp.base.ListView = openerp.base.Controller.extend(
     },
     /**
      * Gets the ids of all currently selected records, if any
-     * @returns a list of ids, empty if no record is selected (or the list view is not selectable
+     * @returns {Array} empty if no record is selected (or the list view is not selectable)
      */
     get_selection: function () {
         if (!this.options.selectable) {

From ddfac1ecf7c63ce041ae636294a9697dbdff019b Mon Sep 17 00:00:00 2001
From: "Naresh (OpenERP)" <nch@tinyerp.com>
Date: Thu, 21 Apr 2011 17:34:43 +0530
Subject: [PATCH 291/331] [IMP]:optimization

lp bug: https://launchpad.net/bugs/722766 fixed

bzr revid: nch@tinyerp.com-20110421120443-d30x5z0u1wciut42
---
 openerp/osv/orm.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py
index c0b2e65c678..70d22ed1dc4 100644
--- a/openerp/osv/orm.py
+++ b/openerp/osv/orm.py
@@ -1616,7 +1616,7 @@ class orm_template(object):
                     _rec_name = self._columns.keys()[0]
                 xml = '<?xml version="1.0" encoding="utf-8"?>' \
                        '<tree string="%s"><field name="%s"/></tree>' \
-                       % (self._description, self._rec_name)
+                       % (self._description, _rec_name)
 
             elif view_type == 'calendar':
                 xml = self.__get_default_calendar_view()

From 17be3b65996923644b6553dd88b5408894314e9d Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 21 Apr 2011 14:06:08 +0200
Subject: [PATCH 292/331] [ADD] options for sortable and reorderable list
 views, so the API is pretty much complete

bzr revid: xmo@openerp.com-20110421120608-vefcelpe5fxsz1op
---
 addons/base/static/src/js/list.js | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/addons/base/static/src/js/list.js b/addons/base/static/src/js/list.js
index c60828732e8..04a97d902cf 100644
--- a/addons/base/static/src/js/list.js
+++ b/addons/base/static/src/js/list.js
@@ -10,7 +10,12 @@ openerp.base.ListView = openerp.base.Controller.extend(
         // whether the column headers should be displayed
         'header': true,
         // display addition button, with that label
-        'addable': "New"
+        'addable': "New",
+        // whether the list view can be sorted, note that once a view has been
+        // sorted it can not be reordered anymore
+        'sortable': true,
+        // whether the view rows can be reordered (via vertical drag & drop)
+        'reorderable': true
     },
     /**
      * Core class for list-type displays.
@@ -33,6 +38,8 @@ openerp.base.ListView = openerp.base.Controller.extend(
      * @param {Boolean} [options.header=true] should the list's header be displayed
      * @param {Boolean} [options.deletable=true] are the list rows deletable
      * @param {null|String} [options.addable="New"] should the new-record button be displayed, and what should its label be. Use ``null`` to hide the button.
+     * @param {Boolean} [options.sortable=true] is it possible to sort the table by clicking on column headers
+     * @param {Boolean} [options.reorderable=true] is it possible to reorder list rows
      */
     init: function(view_manager, session, element_id, dataset, view_id, options) {
         this._super(session, element_id);
@@ -374,6 +381,8 @@ openerp.base.ListView = openerp.base.Controller.extend(
             return rows[$(this).prevAll().length].data.id.value;
         }).get();
     }
+    // TODO: implement sort (click on column headers), if sorted, the list can not be reordered anymore
+    // TODO: implement reorder (drag and drop rows)
 });
 
 openerp.base.TreeView = openerp.base.Controller.extend({

From a383be5549df8b8b3393c446c86759983297ec94 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 21 Apr 2011 15:12:39 +0200
Subject: [PATCH 293/331] [IMP] add a level of nesting to do_fill result so
 do_fill_table can get the view data, also fix failing tests involving
 do_fill_table

bzr revid: xmo@openerp.com-20110421131239-dbr5cg27qntj0nuu
---
 addons/base/controllers/main.py   | 17 +++++++++------
 addons/base/static/src/js/list.js |  7 ++++--
 addons/base/static/test/list.js   | 36 +++++++++++++++----------------
 3 files changed, 33 insertions(+), 27 deletions(-)

diff --git a/addons/base/controllers/main.py b/addons/base/controllers/main.py
index bdedb85e63d..f51b42fe4a6 100644
--- a/addons/base/controllers/main.py
+++ b/addons/base/controllers/main.py
@@ -573,19 +573,22 @@ class ListView(View):
         :param int limit: search limit, for pagination
         :returns: hell if I have any idea yet
         """
-        view = self.fields_view_get(request, model, id)
+        view = self.fields_view_get(request, model, id, toolbar=True)
 
         rows = DataSet().do_search_read(request, model,
                                         offset=offset, limit=limit,
                                         domain=domain)
         eval_context = request.session.evaluation_context(
             request.context)
-        return [
-            {'data': dict((key, {'value': value})
-                          for key, value in row.iteritems()),
-             'color': self.process_colors(view, row, eval_context)}
-            for row in rows
-        ]
+        return {
+            'view': view,
+            'records': [
+                {'data': dict((key, {'value': value})
+                              for key, value in row.iteritems()),
+                 'color': self.process_colors(view, row, eval_context)}
+                for row in rows
+            ]
+        }
 
     def process_colors(self, view, row, context):
         colors = view['arch']['attrs'].get('colors')
diff --git a/addons/base/static/src/js/list.js b/addons/base/static/src/js/list.js
index 04a97d902cf..862c9df3868 100644
--- a/addons/base/static/src/js/list.js
+++ b/addons/base/static/src/js/list.js
@@ -177,10 +177,13 @@ openerp.base.ListView = openerp.base.Controller.extend(
      *
      * TODO: should also re-load the table itself, as e.g. columns may have changed
      *
-     * @param {Array} records the records to fill the list view with
+     * @param {Object} result filling result
+     * @param {Array} [result.view] the new view (wrapped fields_view_get result)
+     * @param {Array} result.records records the records to fill the list view with
      * @returns {Promise} promise to the end of view rendering (list views are asynchronously filled for improved responsiveness)
      */
-    do_fill_table: function(records) {
+    do_fill_table: function(result) {
+        var records = result.records;
         var $table = this.$element.find('table');
         this.rows = records;
 
diff --git a/addons/base/static/test/list.js b/addons/base/static/test/list.js
index c0a34aa71be..92d0bdd5fd5 100644
--- a/addons/base/static/test/list.js
+++ b/addons/base/static/test/list.js
@@ -34,15 +34,15 @@ $(document).ready(function () {
     asyncTest('render selection checkboxes', 2, function () {
         var listview = new openerp.base.ListView(
                 {}, null,
-                'qunit-fixture', {model: null});
+                'qunit-fixture', {model: null, ids: [null, null, null], index: 0});
 
         listview.on_loaded(fvg);
 
-        listview.do_fill_table([
+        listview.do_fill_table({records: [
                 {data: {id: {value: null}}},
                 {data: {id: {value: null}}},
                 {data: {id: {value: null}}}
-        ]).then(function () {
+        ]}).then(function () {
             ok(are(listview.$element.find('tbody th'),
                    '.oe-record-selector'));
             ok(are(listview.$element.find('tbody th input'),
@@ -53,30 +53,30 @@ $(document).ready(function () {
     asyncTest('render no checkbox if selectable=false', 1, function () {
         var listview = new openerp.base.ListView(
                 {}, null,
-                'qunit-fixture', {model: null}, false,
+                'qunit-fixture', {model: null, ids: [null, null, null], index: 0}, false,
                 {selectable: false});
 
         listview.on_loaded(fvg);
 
-        listview.do_fill_table([
+        listview.do_fill_table({records: [
                 {data: {id: {value: null}}},
                 {data: {id: {value: null}}},
                 {data: {id: {value: null}}}
-        ]).then(function () {
+        ]}).then(function () {
             equal(listview.$element.find('tbody th').length, 0);
             start();
         });
     });
     asyncTest('select a bunch of records', 2, function () {
         var listview = new openerp.base.ListView(
-                {}, null, 'qunit-fixture', {model: null});
+                {}, null, 'qunit-fixture', {model: null, ids: [1, 2, 3], index: 0});
         listview.on_loaded(fvg);
 
-        listview.do_fill_table([
+        listview.do_fill_table({records: [
                 {data: {id: {value: 1}}},
                 {data: {id: {value: 2}}},
                 {data: {id: {value: 3}}}
-        ]).then(function () {
+        ]}).then(function () {
             listview.$element.find('tbody th input:eq(2)')
                              .attr('checked', true);
             deepEqual(listview.get_selection(), [3]);
@@ -88,15 +88,15 @@ $(document).ready(function () {
     });
     asyncTest('render deletion button if list is deletable', 1, function () {
         var listview = new openerp.base.ListView(
-                {}, null, 'qunit-fixture', {model: null});
+                {}, null, 'qunit-fixture', {model: null, ids: [null, null, null], index: 0});
 
         listview.on_loaded(fvg);
 
-        listview.do_fill_table([
+        listview.do_fill_table({records: [
                 {data: {id: {value: null}}},
                 {data: {id: {value: null}}},
                 {data: {id: {value: null}}}
-        ]).then(function () {
+        ]}).then(function () {
             equal(
                 listview.$element.find('tbody tr td.oe-record-delete button').length,
                 3);
@@ -109,15 +109,15 @@ $(document).ready(function () {
         var listview = new openerp.base.ListView(
                 {}, null, 'qunit-fixture', {model: null, unlink: function (ids) {
             deleted = ids;
-        }});
+        }, ids: [1, 2, 3], index: 0});
 
         listview.on_loaded(fvg);
 
-        listview.do_fill_table([
+        listview.do_fill_table({records: [
                 {data: {id: {value: 1}}},
                 {data: {id: {value: 2}}},
                 {data: {id: {value: 3}}}
-        ]).then(function () {
+        ]}).then(function () {
             listview.$element.find('tbody td.oe-record-delete:eq(2) button').click();
             deepEqual(deleted, [3]);
             listview.$element.find('tbody td.oe-record-delete:eq(0) button').click();
@@ -130,15 +130,15 @@ $(document).ready(function () {
         var listview = new openerp.base.ListView(
                 {}, null, 'qunit-fixture', {model: null, unlink: function (ids) {
             deleted = ids;
-        }});
+        }, ids: [1, 2, 3], index: 0});
 
         listview.on_loaded(fvg);
 
-        listview.do_fill_table([
+        listview.do_fill_table({records: [
                 {data: {id: {value: 1}}},
                 {data: {id: {value: 2}}},
                 {data: {id: {value: 3}}}
-        ]).then(function () {
+        ]}).then(function () {
             listview.$element.find('tbody th input:eq(2)')
                              .attr('checked', true);
             listview.$element.find('tbody th input:eq(1)')

From 912738c712df98710b9044f9c07db1b59895328d Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 21 Apr 2011 15:13:28 +0200
Subject: [PATCH 294/331] [IMP] regenerate table on load in case of columns
 changes

bzr revid: xmo@openerp.com-20110421131328-7ydomgj1w1fxl3kp
---
 addons/base/static/src/js/list.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/addons/base/static/src/js/list.js b/addons/base/static/src/js/list.js
index 862c9df3868..8035616e59a 100644
--- a/addons/base/static/src/js/list.js
+++ b/addons/base/static/src/js/list.js
@@ -183,6 +183,9 @@ openerp.base.ListView = openerp.base.Controller.extend(
      * @returns {Promise} promise to the end of view rendering (list views are asynchronously filled for improved responsiveness)
      */
     do_fill_table: function(result) {
+        if (result.view) {
+            this.on_loaded({fields_view: result.view});
+        }
         var records = result.records;
         var $table = this.$element.find('table');
         this.rows = records;

From 85c28f6d2332ac529e3d17f7c2efe20089a0fd57 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 21 Apr 2011 15:23:54 +0200
Subject: [PATCH 295/331] [ADD] Added /base/action/load controller

bzr revid: fme@openerp.com-20110421132354-ubji3zz8k181qlxu
---
 addons/base/controllers/main.py | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/addons/base/controllers/main.py b/addons/base/controllers/main.py
index f51b42fe4a6..554b04099ed 100644
--- a/addons/base/controllers/main.py
+++ b/addons/base/controllers/main.py
@@ -621,5 +621,12 @@ class Action(openerpweb.Controller):
     _cp_path = "/base/action"
 
     @openerpweb.jsonrequest
-    def load(self, req, action_id):
-        return {}
+    def load(self, req, action_id, context={}):
+        Actions = req.session.model('ir.actions.actions')
+        value = False
+        action_type = Actions.read([action_id], ['type'], context)
+        if action_type:
+            action = req.session.model(action_type[0]['type']).read([action_id], False, context)
+            if action:
+                value = action[0]
+        return {'value': value}

From 190d61fbb920b1dabfb723c787d22eee4efbf8a1 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 21 Apr 2011 15:28:45 +0200
Subject: [PATCH 296/331] [ADD] Added support for buttons@type=action

bzr revid: fme@openerp.com-20110421132845-n2r6fa05q0qhvxjp
---
 addons/base/static/src/js/form.js  |  5 +++--
 addons/base/static/src/js/views.js | 17 +++++++++++++----
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/addons/base/static/src/js/form.js b/addons/base/static/src/js/form.js
index 30fcca5d149..2cb185b42ec 100644
--- a/addons/base/static/src/js/form.js
+++ b/addons/base/static/src/js/form.js
@@ -541,9 +541,10 @@ openerp.base.form.WidgetButton = openerp.base.form.Widget.extend({
             switch(type) {
                 case 'object':
                     return this.view.dataset.call(attrs.name, [this.view.datarecord.id], [context], this.on_button_object);
-                    break;
+                case 'action':
+                    return this.session.action_manager.do_action_id(parseInt(this.node.attrs.name));
                 default:
-                    this.log(_.sprintf("Unsupported button type : %s", type));
+                    this.log(_.sprintf("Unsupported button type : %s", type), this.node);
             }
         }
     },
diff --git a/addons/base/static/src/js/views.js b/addons/base/static/src/js/views.js
index f79d0e611eb..f5824b8a889 100644
--- a/addons/base/static/src/js/views.js
+++ b/addons/base/static/src/js/views.js
@@ -18,8 +18,17 @@ openerp.base.ActionManager = openerp.base.Controller.extend({
      * Process an action
      * Supported actions: act_window
      */
+    do_action_id: function(action_id) {
+        var self = this;
+        this.rpc('/base/action/load', { action_id: action_id }, function(result) {
+            if (result instanceof Object) {
+                self.do_action(result.value);
+            } else {
+                this.log("Could not load action with id ", action_id);
+            }
+        });
+    },
     do_action: function(action) {
-        this.log(action);
         var self = this;
         // instantiate the right controllers by understanding the action
         switch (action.type) {
@@ -36,14 +45,14 @@ openerp.base.ActionManager = openerp.base.Controller.extend({
                         // When dialog is closed with ESC key or close manually, branch to act_window_close logic
                         self.do_action({ type: 'ir.actions.act_window_close' });
                     });
-                    var viewmanager = new openerp.base.ViewManagerAction(this.session ,element_id, action, false);
+                    var viewmanager = new openerp.base.ViewManagerAction(this.session, element_id, action, false);
                     viewmanager.start();
                     this.dialog_stack.push(viewmanager);
-                } else if (action.target == "current") {
+                } else {
                     if (this.viewmanager) {
                         this.viewmanager.stop();
                     }
-                    this.viewmanager = new openerp.base.ViewManagerAction(this.session,this.element_id, action, true);
+                    this.viewmanager = new openerp.base.ViewManagerAction(this.session, this.element_id, action, true);
                     this.viewmanager.start();
                 }
                 break;

From 27c778c514072d8413c17ceb62ea9f7be2a6bfe5 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 21 Apr 2011 15:51:50 +0200
Subject: [PATCH 297/331] [FIX] ViewManagerAction: do not initialize search
 view when no search view id given

bzr revid: fme@openerp.com-20110421135150-5c2csi4uiug3mylt
---
 addons/base/static/src/js/views.js | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/addons/base/static/src/js/views.js b/addons/base/static/src/js/views.js
index f5824b8a889..1cbb2185e7b 100644
--- a/addons/base/static/src/js/views.js
+++ b/addons/base/static/src/js/views.js
@@ -193,6 +193,7 @@ openerp.base.ViewManager =  openerp.base.Controller.extend({
 
 openerp.base.ViewManagerAction = openerp.base.ViewManager.extend({
     init: function(session, element_id, action, sidebar) {
+        console.log("init view manager action", action)
         var dataset = new openerp.base.DataSetSearch(session, action.res_model);
         this._super(session, element_id, dataset, action.views);
         this.action = action;
@@ -220,14 +221,17 @@ openerp.base.ViewManagerAction = openerp.base.ViewManager.extend({
         // init search view
         var searchview_id = this.action.search_view_id && this.action.search_view_id[0];
 
-        var searchview_loaded = this.setup_search_view(
-                searchview_id || false, search_defaults);
+        if (searchview_id) {
+            var searchview_loaded = this.setup_search_view(
+                    searchview_id, search_defaults);
 
-        // schedule auto_search
-        if (searchview_loaded != null && this.action['auto_search']) {
-            $.when(searchview_loaded, inital_view_loaded)
-                .then(this.searchview.do_search);
+            // schedule auto_search
+            if (this.action['auto_search']) {
+                $.when(searchview_loaded, inital_view_loaded)
+                    .then(this.searchview.do_search);
+            }
         }
+
     },
     stop: function() {
         // should be replaced by automatic destruction implemented in BaseWidget

From 3e4c62c53671563b81d8b608b296c1f839826827 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 21 Apr 2011 17:56:05 +0200
Subject: [PATCH 298/331] [ADD] Added exec_workflow controllers

bzr revid: fme@openerp.com-20110421155605-ek8effxz9xln26s4
---
 addons/base/controllers/main.py   | 5 +++++
 addons/base/static/src/js/data.js | 7 +++++++
 openerpweb/openerpweb.py          | 6 ++++++
 3 files changed, 18 insertions(+)

diff --git a/addons/base/controllers/main.py b/addons/base/controllers/main.py
index 554b04099ed..844198a203e 100644
--- a/addons/base/controllers/main.py
+++ b/addons/base/controllers/main.py
@@ -409,6 +409,11 @@ class DataSet(openerpweb.Controller):
         r = getattr(m, method)(ids, *args)
         return {'result': r}
 
+    @openerpweb.jsonrequest
+    def exec_workflow(self, req, model, id, signal):
+        r = req.session.exec_workflow(model, id, signal)
+        return {'result': r}
+
     @openerpweb.jsonrequest
     def default_get(self, req, model, fields, context={}):
         m = req.session.model(model)
diff --git a/addons/base/static/src/js/data.js b/addons/base/static/src/js/data.js
index 5ed21be533c..a29f320b79c 100644
--- a/addons/base/static/src/js/data.js
+++ b/addons/base/static/src/js/data.js
@@ -118,6 +118,13 @@ openerp.base.DataSet =  openerp.base.Controller.extend( /** @lends openerp.base.
             ids: ids,
             args: args
         }, callback);
+    },
+    exec_workflow: function (id, signal, callback) {
+        return this.rpc('/base/dataset/exec_workflow', {
+            model: this.model,
+            id: id,
+            signal: signal
+        }, callback);
     }
 });
 
diff --git a/openerpweb/openerpweb.py b/openerpweb/openerpweb.py
index d569a9d5f20..d96a9c5ffec 100644
--- a/openerpweb/openerpweb.py
+++ b/openerpweb/openerpweb.py
@@ -116,6 +116,12 @@ class OpenERPSession(object):
         r = self.proxy('object').execute(self._db, self._uid, self._password, model, func, *l, **d)
         return r
 
+    def exec_workflow(self, model, id, signal):
+        if not (self._db and self._uid and self._password):
+            raise OpenERPUnboundException()
+        r = self.proxy('object').exec_workflow(self._db, self._uid, self._password, model, signal, id)
+        return r
+
     def model(self, model):
         """ Get an RPC proxy for the object ``model``, bound to this session.
 

From 14270adaaf4479589669291987b5aa0af9a3b202 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 21 Apr 2011 18:13:43 +0200
Subject: [PATCH 299/331] [ADD] Added support for buttons of type 'workflow'

bzr revid: fme@openerp.com-20110421161343-k0jejshvx12nf9ex
---
 addons/base/controllers/main.py    |  2 +-
 addons/base/static/src/js/form.js  | 16 ++++++++--------
 addons/base/static/src/js/views.js | 11 -----------
 3 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/addons/base/controllers/main.py b/addons/base/controllers/main.py
index 844198a203e..8faca685300 100644
--- a/addons/base/controllers/main.py
+++ b/addons/base/controllers/main.py
@@ -634,4 +634,4 @@ class Action(openerpweb.Controller):
             action = req.session.model(action_type[0]['type']).read([action_id], False, context)
             if action:
                 value = action[0]
-        return {'value': value}
+        return {'result': value}
diff --git a/addons/base/static/src/js/form.js b/addons/base/static/src/js/form.js
index 2cb185b42ec..84d7fe0babd 100644
--- a/addons/base/static/src/js/form.js
+++ b/addons/base/static/src/js/form.js
@@ -532,7 +532,7 @@ openerp.base.form.WidgetButton = openerp.base.form.Widget.extend({
     on_confirmed: function() {
         var attrs = this.node.attrs;
         if (attrs.special) {
-            this.on_button_object({
+            this.on_button_action({
                 result : { type: 'ir.actions.act_window_close' }
             });
         } else {
@@ -540,20 +540,20 @@ openerp.base.form.WidgetButton = openerp.base.form.Widget.extend({
             var context = _.extend({}, this.view.dataset.context, attrs.context || {});
             switch(type) {
                 case 'object':
-                    return this.view.dataset.call(attrs.name, [this.view.datarecord.id], [context], this.on_button_object);
+                    return this.view.dataset.call(attrs.name, [this.view.datarecord.id], [context], this.on_button_action);
                 case 'action':
-                    return this.session.action_manager.do_action_id(parseInt(this.node.attrs.name));
+                    return this.rpc('/base/action/load', { action_id: parseInt(attrs.name) }, this.on_button_action);
                 default:
-                    this.log(_.sprintf("Unsupported button type : %s", type), this.node);
+                    return this.view.dataset.exec_workflow(this.view.datarecord.id, attrs.name, this.on_button_action);
             }
         }
     },
-    on_button_object: function(r) {
-        if (r.result === false) {
-            this.log("Button object returns false");
-        } else if (r.result.constructor == Object) {
+    on_button_action: function(r) {
+        console.log("Got reesonse button", r)
+        if (r.result && r.result.constructor == Object) {
             this.session.action_manager.do_action(r.result);
         } else {
+            this.log("Button returned", r.result);
             this.view.reload();
         }
     }
diff --git a/addons/base/static/src/js/views.js b/addons/base/static/src/js/views.js
index 1cbb2185e7b..8ef14a3edbf 100644
--- a/addons/base/static/src/js/views.js
+++ b/addons/base/static/src/js/views.js
@@ -18,16 +18,6 @@ openerp.base.ActionManager = openerp.base.Controller.extend({
      * Process an action
      * Supported actions: act_window
      */
-    do_action_id: function(action_id) {
-        var self = this;
-        this.rpc('/base/action/load', { action_id: action_id }, function(result) {
-            if (result instanceof Object) {
-                self.do_action(result.value);
-            } else {
-                this.log("Could not load action with id ", action_id);
-            }
-        });
-    },
     do_action: function(action) {
         var self = this;
         // instantiate the right controllers by understanding the action
@@ -193,7 +183,6 @@ openerp.base.ViewManager =  openerp.base.Controller.extend({
 
 openerp.base.ViewManagerAction = openerp.base.ViewManager.extend({
     init: function(session, element_id, action, sidebar) {
-        console.log("init view manager action", action)
         var dataset = new openerp.base.DataSetSearch(session, action.res_model);
         this._super(session, element_id, dataset, action.views);
         this.action = action;

From ceb524e3376d92dde25e68dd7d74b6de0a5c8a6d Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 21 Apr 2011 18:55:01 +0200
Subject: [PATCH 300/331] [IMP] Added textarea invalid field styling

bzr revid: fme@openerp.com-20110421165501-6q072nbuhq38359i
---
 addons/base/static/src/css/base.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/base/static/src/css/base.css b/addons/base/static/src/css/base.css
index cd39b2ad147..1bd004b53f6 100644
--- a/addons/base/static/src/css/base.css
+++ b/addons/base/static/src/css/base.css
@@ -640,7 +640,7 @@ body.openerp {
 .openerp td.required input, .openerp td.required select {
     background-color: #D2D2FF;
 }
-.openerp td.invalid input, .openerp td.invalid select {
+.openerp td.invalid input, .openerp td.invalid select, .openerp td.invalid textarea {
     background-color: #F66;
     border: 1px solid #D00;
 }

From 47387d5d29481e6df5ba772d34fb5544b073a203 Mon Sep 17 00:00:00 2001
From: Jacques-Etienne Baudoux <jba@openerp.com>
Date: Fri, 22 Apr 2011 16:21:42 +0200
Subject: [PATCH 301/331] [IMP] Add index on the code to improve name_search
 performance [FIX] Use operator argument of name_search [FIX] Allow searching
 account without specific domain and return children of that account with
 specific domain (args) [IMP] Support '/' in the name to search in the tree
 (complete name).

lp bug: https://launchpad.net/bugs/768994 fixed

bzr revid: jba@openerp.com-20110422142142-mo13kww6qa1xiz3s
---
 addons/analytic/analytic.py | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/addons/analytic/analytic.py b/addons/analytic/analytic.py
index 39ffeb70eed..6dfaac21e70 100644
--- a/addons/analytic/analytic.py
+++ b/addons/analytic/analytic.py
@@ -150,7 +150,7 @@ class account_analytic_account(osv.osv):
     _columns = {
         'name': fields.char('Account Name', size=128, required=True),
         'complete_name': fields.function(_complete_name_calc, method=True, type='char', string='Full Account Name'),
-        'code': fields.char('Account Code', size=24),
+        'code': fields.char('Account Code', size=24, select=True),
         'type': fields.selection([('view','View'), ('normal','Normal')], 'Account Type', help='If you select the View Type, it means you won\'t allow to create journal entries using that account.'),
         'description': fields.text('Description'),
         'parent_id': fields.many2one('account.analytic.account', 'Parent Analytic Account', select=2),
@@ -245,13 +245,23 @@ class account_analytic_account(osv.osv):
             cr.execute("select analytic_account_id from project_project")
             project_ids = [x[0] for x in cr.fetchall()]
             return self.name_get(cr, uid, project_ids, context=context)
-        account = self.search(cr, uid, [('code', '=', name)] + args, limit=limit, context=context)
-        if not account:
-            account = self.search(cr, uid, [('name', 'ilike', '%%%s%%' % name)] + args, limit=limit, context=context)
-            newacc = account
-            while newacc:
-                newacc = self.search(cr, uid, [('parent_id', 'in', newacc)]+args, limit=limit, context=context)
-                account += newacc
+        if name:
+            account = self.search(cr, uid, [('code', '=', name)] + args, limit=limit, context=context)
+            if not account:
+                names=map(lambda i : i.strip(),name.split('/'))
+                for i in range(len(names)):
+                    dom=[('name', operator, names[i])]
+                    if i>0:
+                        dom+=[('id','child_of',account)]
+                    account = self.search(cr, uid, dom, limit=limit, context=context)
+                newacc = account
+                while newacc:
+                    newacc = self.search(cr, uid, [('parent_id', 'in', newacc)], limit=limit, context=context)
+                    account += newacc
+                if args:
+                    account = self.search(cr, uid, [('id', 'in', account)] + args, limit=limit, context=context)
+        else:
+            account = self.search(cr, uid, args, limit=limit, context=context)
         return self.name_get(cr, uid, account, context=context)
 
 account_analytic_account()

From 0ae1e8f2b9b6d5d499b145302bc982fcaf7faa4a Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Fri, 22 Apr 2011 17:54:52 +0200
Subject: [PATCH 302/331] [IMP] Some code about many2many widgets.

bzr revid: nicolas.vanhoren@openerp.com-20110422155452-9lth3lrm8pwf9c2r
---
 addons/base/static/src/js/form.js   | 16 ++++++++++++++++
 addons/base/static/src/js/list.js   |  8 +++++---
 addons/base/static/src/xml/base.xml |  1 +
 3 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/addons/base/static/src/js/form.js b/addons/base/static/src/js/form.js
index 84d7fe0babd..ea2b377078b 100644
--- a/addons/base/static/src/js/form.js
+++ b/addons/base/static/src/js/form.js
@@ -896,6 +896,22 @@ openerp.base.form.FieldMany2Many = openerp.base.form.Field.extend({
     init: function(view, node) {
         this._super(view, node);
         this.template = "FieldMany2Many";
+        this.list_id = _.uniqueId("many2many");
+    },
+    start: function() {
+        debugger;
+        this._super.apply(this, arguments);
+        this.dataset = new openerp.base.DataSetSearch(this.session, this.field.relation);
+        this.list_view = new openerp.base.ListView(undefined, this.view.session,
+                this.list_id, this.dataset, false, undefined);
+        this.list_view.start();
+    },
+    set_value: function(value) {
+        if (value != false) {
+            this.dataset.ids = value;
+            this.dataset.count = value.length;
+            this.list_view.do_update();
+        }
     }
 });
 
diff --git a/addons/base/static/src/js/list.js b/addons/base/static/src/js/list.js
index 8035616e59a..aa9882aed36 100644
--- a/addons/base/static/src/js/list.js
+++ b/addons/base/static/src/js/list.js
@@ -64,7 +64,7 @@ openerp.base.ListView = openerp.base.Controller.extend(
         return this.rpc("/base/listview/load", {
             model: this.model,
             view_id: this.view_id,
-            toolbar: !!this.view_manager.sidebar
+            toolbar: this.view_manager ? !!this.view_manager.sidebar : false
         }, this.on_loaded);
     },
     /**
@@ -168,7 +168,7 @@ openerp.base.ListView = openerp.base.Controller.extend(
                 'tr', 'click', this.on_select_row);
 
         // sidebar stuff
-        if (this.view_manager.sidebar) {
+        if (this.view_manager && this.view_manager.sidebar) {
             this.view_manager.sidebar.set_toolbar(data.fields_view.toolbar);
         }
     },
@@ -262,7 +262,9 @@ openerp.base.ListView = openerp.base.Controller.extend(
         view = view || 'form';
         this.dataset.index = index;
         _.delay(_.bind(function () {
-            this.view_manager.on_mode_switch(view);
+            if(this.view_manager) {
+                this.view_manager.on_mode_switch(view);
+            }
         }, this));
     },
     /**
diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml
index b49ef2c7d6a..4804f34d785 100644
--- a/addons/base/static/src/xml/base.xml
+++ b/addons/base/static/src/xml/base.xml
@@ -353,6 +353,7 @@
 <t t-name="FieldMany2Many">
     <div style="background: #ccc; padding: 20px">
         Many2Many widget
+        <div t-attr-id="widget.list_id"></div>
     </div>
 </t>
 <t t-name="FieldReference">

From 25eb9fe41503f43f082e86aa7841ee78e1fdcc60 Mon Sep 17 00:00:00 2001
From: "Ujjvala Collins (OpenERP)" <uco@tinyerp.com>
Date: Mon, 25 Apr 2011 10:43:25 +0530
Subject: [PATCH 303/331] [FIX] project: Label name changed for Parent project.

bzr revid: uco@tinyerp.com-20110425051325-2goe21h2z2vswb0a
---
 addons/project/project.py       | 1 -
 addons/project/project_data.xml | 2 +-
 addons/project/project_view.xml | 6 +++---
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/addons/project/project.py b/addons/project/project.py
index de214b197a5..7fbe39219a8 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -128,7 +128,6 @@ class project(osv.osv):
         'active': fields.boolean('Active', help="If the active field is set to False, it will allow you to hide the project without removing it."),
         'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of Projects."),
         'analytic_account_id': fields.many2one('account.analytic.account', 'Analytic Account', help="Link this project to an analytic account if you need financial management on projects. It enables you to connect projects with budgets, planning, cost and revenue analysis, timesheets on projects, etc.", ondelete="cascade", required=True),
-        'parent_id': fields.many2one('project.project', 'Parent Project'),
         'priority': fields.integer('Sequence', help="Gives the sequence order when displaying the list of projects"),
         'warn_manager': fields.boolean('Warn Manager', help="If you check this field, the project manager will receive a request each time a task is completed by his team.", states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}),
 
diff --git a/addons/project/project_data.xml b/addons/project/project_data.xml
index 059334215db..a2df2e2e76c 100644
--- a/addons/project/project_data.xml
+++ b/addons/project/project_data.xml
@@ -20,7 +20,7 @@
 		Resource: project.project
 		-->
 
-        <record id="all_projects_account" model="project.project">
+        <record id="all_projects_account" model="account.analytic.account">
             <field name="name">Projects</field>
             <field name="code">3</field>
         </record>
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index bce4ba6f2f4..fe8d660be7f 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -21,7 +21,7 @@
                 <form string="Project">
                     <group colspan="6" col="6">
                         <field name="name" string="Project Name" select="1"/>
-                        <field name="parent_id" string="Parent Project" domain="[('id','!=',active_id)]" context="{'current_model': 'project.project'}"/>
+                        <field name="parent_id" string="Parent" domain="[('id','!=',active_id)]" context="{'current_model': 'project.project'}"/>
                         <field name="user_id" string="Project Manager" select="1" attrs="{'readonly':[('state','in',['close', 'cancelled'])]}"/>
                         <field name="date_start" string="Start Date" attrs="{'readonly':[('state','in',['close', 'cancelled'])]}"/>
                         <field name="date" string="End Date" attrs="{'readonly':[('state','in',['close', 'cancelled'])]}"/>
@@ -122,7 +122,7 @@
                         <filter string="Manager" name="Manager"  icon="terp-personal" domain = "[]" context="{'group_by':'user_id'}"/>
                         <filter string="Partner" name="Partner" icon="terp-partner" domain = "[]" context="{'group_by':'partner_id'}"/>
                          <separator orientation="vertical"/>
-                        <filter string="Parent" name="Parent"  help="Parent Project" icon="terp-folder-blue" domain = "[]" context="{'group_by':'parent_id'}"/>
+                        <filter string="Parent" name="Parent"  help="Parent" icon="terp-folder-blue" domain = "[]" context="{'group_by':'parent_id'}"/>
                     </group>
                </search>
             </field>
@@ -140,7 +140,7 @@
                     <field name="name" string="Project Name"/>
                     <field name="user_id" string="Project Manager"/>
                     <field name="partner_id" string="Partner"/>
-                    <field name="parent_id" string="Parent Project" invisible="1"/>
+                    <field name="parent_id" string="Parent" invisible="1"/>
                     <field name="planned_hours" widget="float_time"/>
                     <field name="total_hours" widget="float_time"/>
                     <field name="effective_hours" widget="float_time"/>

From ad590ddc86b73d31265f5ea6913cee74f96a755a Mon Sep 17 00:00:00 2001
From: "ARA (OpenERP)" <ara@tinyerp.com>
Date: Mon, 25 Apr 2011 11:41:14 +0530
Subject: [PATCH 304/331] [FIX] account: Cancel of invoice throws error,
 validate of move_id is invalid

bzr revid: ara@tinyerp.com-20110425061114-nq2mzpc8w082hu3j
---
 addons/account/account_analytic_line.py |  2 +-
 addons/account/account_move_line.py     | 15 +++------------
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/addons/account/account_analytic_line.py b/addons/account/account_analytic_line.py
index a93dc70b2fb..08123c8f460 100644
--- a/addons/account/account_analytic_line.py
+++ b/addons/account/account_analytic_line.py
@@ -32,7 +32,7 @@ class account_analytic_line(osv.osv):
         'product_uom_id': fields.many2one('product.uom', 'UoM'),
         'product_id': fields.many2one('product.product', 'Product'),
         'general_account_id': fields.many2one('account.account', 'General Account', required=True, ondelete='restrict'),
-        'move_id': fields.many2one('account.move.line', 'Move Line', ondelete='restrict', select=True),
+        'move_id': fields.many2one('account.move.line', 'Move Line', ondelete='cascade', select=True),
         'journal_id': fields.many2one('account.analytic.journal', 'Analytic Journal', required=True, ondelete='restrict', select=True),
         'code': fields.char('Code', size=8),
         'ref': fields.char('Ref.', size=64),
diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index 2cbe9de9630..83a67df9178 100644
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -1085,24 +1085,15 @@ class account_move_line(osv.osv):
         if context is None:
             context = {}
         move_obj = self.pool.get('account.move')
-        analytic_obj = self.pool.get('account.analytic.line')
         self._update_check(cr, uid, ids, context)
         result = False
         move_ids = set()
-        analytic_ids = set()
-        move_line_ids = set()
         for line in self.browse(cr, uid, ids, context=context):
             move_ids.add(line.move_id.id)
-            move_line_ids.add(line.id)
-            for analytic in line.analytic_lines:
-                analytic_ids.add(analytic.id)
-
-        analytic_ids = list(analytic_ids)
+            context['journal_id'] = line.journal_id.id
+            context['period_id'] = line.period_id.id
+            result = super(account_move_line, self).unlink(cr, uid, [line.id], context=context)
         move_ids = list(move_ids)
-
-        if analytic_ids:
-            analytic_obj.unlink(cr,uid, analytic_ids, context=context)
-        result = super(account_move_line, self).unlink(cr, uid, list(move_line_ids), context=context)
         if check and move_ids:
             move_obj.validate(cr, uid, move_ids, context=context)
         return result

From 2cb2d1e4eadaab8c54022a6126506937d494daf8 Mon Sep 17 00:00:00 2001
From: Jigar Amin <jam@tinyerp.com>
Date: Mon, 25 Apr 2011 17:52:07 +0530
Subject: [PATCH 305/331] [FIX/BUG] project_lon_term : Task Scheduling shoud
 repect the parent task end date with faces

bzr revid: jam@tinyerp.com-20110425122207-yp32joiufdyl5709
---
 addons/project_long_term/project_long_term.py | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py
index c2bc55db212..4620fc81a7a 100644
--- a/addons/project_long_term/project_long_term.py
+++ b/addons/project_long_term/project_long_term.py
@@ -731,6 +731,7 @@ class project_task(osv.osv):
         task = self.browse(cr, uid, task_id, context=context)
         duration = str(task.planned_hours )+ 'H'
         str_resource = False
+        parent = task.parent_ids
         if task.phase_id.resource_ids:
             str_resource = ('%s | '*len(task.phase_id.resource_ids))[:-2]
             str_resource = str_resource % tuple(map(lambda x: 'Resource_%s'%x.resource_id.id, task.phase_id.resource_ids))
@@ -742,7 +743,10 @@ class project_task(osv.osv):
             effort = \'%s\'
             resource = %s
 '''%(task.id, task.name, duration, str_resource)
-            #start = datetime.strftime((datetime.strptime(start, "%Y-%m-%d")), "%Y-%m-%d")
+            if parent:
+                s +='''
+            start = up.Task_%s.end
+'''%(parent[0].id)
         else:
             s = '''
     def Task_%s():
@@ -750,6 +754,10 @@ class project_task(osv.osv):
         effort = \'%s\'
         resource = %s
 '''%(task.id, task.name, duration, str_resource)
+            if parent:
+                s +='''
+        start = up.Task_%s.end
+'''%(parent[0].id)
         s += '\n'
         return s
 project_task()

From 2f1607c786edb621164ab26a9c904ef1585a37fb Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Tue, 26 Apr 2011 04:41:54 +0000
Subject: [PATCH 306/331] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20110422043906-4a4yeks4mzl3sfef
bzr revid: launchpad_translations_on_behalf_of_openerp-20110423045345-9xga4elfyud8nsec
bzr revid: launchpad_translations_on_behalf_of_openerp-20110424043747-9x0ffekdqw8ldcc1
bzr revid: launchpad_translations_on_behalf_of_openerp-20110425045050-3owniws6mcmmclll
bzr revid: launchpad_translations_on_behalf_of_openerp-20110426044154-jrf1eg82ie49zl0r
---
 addons/account/i18n/de.po               |   18 +-
 addons/account/i18n/pt_BR.po            |    8 +-
 addons/account/i18n/tr.po               |   20 +-
 addons/account_accountant/i18n/lt.po    |   38 +
 addons/account_sequence/i18n/pt.po      |  221 +++
 addons/base_action_rule/i18n/it.po      |   10 +-
 addons/base_calendar/i18n/tr.po         | 1660 +++++++++++++++++++++++
 addons/base_synchro/i18n/ru.po          |   57 +-
 addons/crm/i18n/ru.po                   |   49 +-
 addons/hr_attendance/i18n/pt_BR.po      |   81 +-
 addons/hr_timesheet_sheet/i18n/pt_BR.po |   90 +-
 addons/knowledge/i18n/it.po             |   10 +-
 addons/l10n_ca/i18n/it.po               |   12 +-
 addons/l10n_cr/i18n/it.po               |   10 +-
 addons/mrp_repair/i18n/it.po            |   14 +-
 addons/outlook/i18n/tr.po               |   18 +-
 addons/procurement/i18n/tr.po           |  906 +++++++++++++
 addons/profile_tools/i18n/ru.po         |  144 ++
 addons/project_mailgate/i18n/it.po      |   14 +-
 addons/project_planning/i18n/it.po      |   30 +-
 addons/sale/i18n/ru.po                  |   15 +-
 addons/sale_crm/i18n/it.po              |   10 +-
 addons/sale_mrp/i18n/ru.po              |    8 +-
 23 files changed, 3228 insertions(+), 215 deletions(-)
 create mode 100644 addons/account_accountant/i18n/lt.po
 create mode 100644 addons/account_sequence/i18n/pt.po
 create mode 100644 addons/base_calendar/i18n/tr.po
 create mode 100644 addons/procurement/i18n/tr.po
 create mode 100644 addons/profile_tools/i18n/ru.po

diff --git a/addons/account/i18n/de.po b/addons/account/i18n/de.po
index dae24fa0df8..6c0713306f5 100644
--- a/addons/account/i18n/de.po
+++ b/addons/account/i18n/de.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-04-03 09:24+0000\n"
+"PO-Revision-Date: 2011-04-21 05:36+0000\n"
 "Last-Translator: Ferdinand @ Camptocamp <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: 2011-04-04 04:47+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-04-22 04:38+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -911,7 +911,7 @@ msgstr "Erzeuge 3 Monats Periode"
 #. module: account
 #: report:account.overdue:0
 msgid "Due"
-msgstr "fällig am"
+msgstr "Fällig"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -2664,7 +2664,7 @@ msgstr ""
 #: model:ir.actions.server,name:account.ir_actions_server_action_wizard_multi_chart
 #: model:ir.ui.menu,name:account.menu_act_ir_actions_bleble
 msgid "New Company Financial Setting"
-msgstr "Basiskonfiguration Unternehmen"
+msgstr "Neue Firma Financial Rahmen"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
@@ -4014,7 +4014,7 @@ msgstr "Fällige Analytische Konten"
 #: selection:account.invoice,state:0
 #: report:account.overdue:0
 msgid "Paid"
-msgstr "bezahlt am"
+msgstr "bezahlt"
 
 #. module: account
 #: field:account.invoice,tax_line:0
@@ -4189,7 +4189,7 @@ msgstr "Storniere Abschreibung"
 #: field:account.model.line,date_maturity:0
 #: report:account.overdue:0
 msgid "Maturity date"
-msgstr "Fälligkeitstermin"
+msgstr "Datum Fällig"
 
 #. module: account
 #: view:report.account.receivable:0
@@ -7355,7 +7355,7 @@ msgstr "Manueller Kontenausgleich"
 #. module: account
 #: report:account.overdue:0
 msgid "Total amount due:"
-msgstr "Gesamtbetrag (fällig):"
+msgstr "Gesamtbetrag fällig:"
 
 #. module: account
 #: field:account.analytic.chart,to_date:0
@@ -8741,7 +8741,7 @@ msgstr ""
 #. module: account
 #: report:account.overdue:0
 msgid "Best regards."
-msgstr "Viele Grüsse."
+msgstr "Beste Grüsse."
 
 #. module: account
 #: view:account.invoice:0
diff --git a/addons/account/i18n/pt_BR.po b/addons/account/i18n/pt_BR.po
index 53eccc4f28f..fd8020ae0b8 100644
--- a/addons/account/i18n/pt_BR.po
+++ b/addons/account/i18n/pt_BR.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-04-19 14:37+0000\n"
+"PO-Revision-Date: 2011-04-21 21:39+0000\n"
 "Last-Translator: Nédio Batista Marques <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: 2011-04-20 04:36+0000\n"
+"X-Launchpad-Export-Date: 2011-04-22 04:38+0000\n"
 "X-Generator: Launchpad (build 12758)\n"
 
 #. module: account
@@ -1843,7 +1843,7 @@ msgstr "Registros por Linha"
 #. module: account
 #: report:account.tax.code.entries:0
 msgid "A/c Code"
-msgstr ""
+msgstr "Código A/C"
 
 #. module: account
 #: field:account.invoice,move_id:0
@@ -2707,6 +2707,8 @@ msgid ""
 "The statement balance is incorrect !\n"
 "The expected balance (%.2f) is different than the computed one. (%.2f)"
 msgstr ""
+"O saldo final do extrato está incorreto!\n"
+"O saldo experado (%.2f) é diferente do saldo calculado (%.2f)"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_paymentreconcile0
diff --git a/addons/account/i18n/tr.po b/addons/account/i18n/tr.po
index 30b597eaf77..fc1edc96b66 100644
--- a/addons/account/i18n/tr.po
+++ b/addons/account/i18n/tr.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-01-23 22:42+0000\n"
-"Last-Translator: Ahmet Altınışık <Unknown>\n"
+"PO-Revision-Date: 2011-04-23 18:35+0000\n"
+"Last-Translator: Ayhan KIZILTAN <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: 2011-03-18 04:55+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-04-24 04:37+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -50,7 +50,7 @@ msgstr "Yevmiye Kaydını Mutabakatla"
 #. module: account
 #: field:account.installer.modules,account_voucher:0
 msgid "Voucher Management"
-msgstr "Çek Yönetimi"
+msgstr ""
 
 #. module: account
 #: view:account.account:0
@@ -114,7 +114,7 @@ msgstr "Fatura ya da ödemeden içe aktar"
 #. module: account
 #: model:ir.model,name:account.model_wizard_multi_charts_accounts
 msgid "wizard.multi.charts.accounts"
-msgstr "wizard.multi.charts.accounts"
+msgstr ""
 
 #. module: account
 #: view:account.move:0
@@ -243,8 +243,8 @@ msgid ""
 "No period defined for this date: %s !\n"
 "Please create a fiscal year."
 msgstr ""
-"Bu tarih için dönem tanımlanmadı: ( %s )\n"
-"Lütfen mali yıl yaratınız."
+"Bu tarih için dönem belirtilmedi: %s !\n"
+"Lütfen bir mali yıl oluşturun."
 
 #. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile_select
@@ -279,7 +279,7 @@ msgstr "'%s' faturası parçalı öndendi: (Ödenen %s%s Toplam %s%s Kalan %s%s)
 #. module: account
 #: model:process.transition,note:account.process_transition_supplierentriesreconcile0
 msgid "Accounting entries are an input of the reconciliation."
-msgstr "Accounting entries are an input of the reconciliation."
+msgstr "Hesap girişleri uzlaşmaya ait girişlerdir."
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_management_belgian_reports
@@ -467,7 +467,7 @@ msgstr "Hesap Planı Şablonu"
 #. module: account
 #: help:account.model.line,amount_currency:0
 msgid "The amount expressed in an optional other currency."
-msgstr "The amount expressed in an optional other currency."
+msgstr "Tutar, seçmeli olarak başka bir para birimiyle beliritlebilir."
 
 #. module: account
 #: help:account.journal.period,state:0
diff --git a/addons/account_accountant/i18n/lt.po b/addons/account_accountant/i18n/lt.po
new file mode 100644
index 00000000000..bc9bcaa33ad
--- /dev/null
+++ b/addons/account_accountant/i18n/lt.po
@@ -0,0 +1,38 @@
+# Lithuanian translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2011-04-25 15:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Lithuanian <lt@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: 2011-04-26 04:41+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
+
+#. module: account_accountant
+#: model:ir.module.module,description:account_accountant.module_meta_information
+msgid ""
+"\n"
+"This module gives the admin user the access to all the accounting features "
+"like the journal\n"
+"items and the chart of accounts.\n"
+"    "
+msgstr ""
+"\n"
+"Šis modulis suteikia priėjimą administratoriui prie visų apskaitos "
+"galimybių, tokių kaip žurnalų\n"
+"eilutės ar sąskaitų planas.\n"
+"    "
+
+#. module: account_accountant
+#: model:ir.module.module,shortdesc:account_accountant.module_meta_information
+msgid "Accountant"
+msgstr "Apskaitininkas"
diff --git a/addons/account_sequence/i18n/pt.po b/addons/account_sequence/i18n/pt.po
new file mode 100644
index 00000000000..053e67f95b3
--- /dev/null
+++ b/addons/account_sequence/i18n/pt.po
@@ -0,0 +1,221 @@
+# Portuguese translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2011-04-24 03:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Portuguese <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: 2011-04-25 04:50+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
+
+#. module: account_sequence
+#: view:account.sequence.installer:0
+#: model:ir.actions.act_window,name:account_sequence.action_account_seq_installer
+msgid "Account Sequence Application Configuration"
+msgstr ""
+
+#. module: account_sequence
+#: constraint:account.move:0
+msgid ""
+"You cannot create entries on different periods/journals in the same move"
+msgstr ""
+
+#. module: account_sequence
+#: help:account.move,internal_sequence_number:0
+#: help:account.move.line,internal_sequence_number:0
+msgid "Internal Sequence Number"
+msgstr ""
+
+#. module: account_sequence
+#: help:account.sequence.installer,number_next:0
+msgid "Next number of this sequence"
+msgstr ""
+
+#. module: account_sequence
+#: field:account.sequence.installer,number_next:0
+msgid "Next Number"
+msgstr ""
+
+#. module: account_sequence
+#: field:account.sequence.installer,number_increment:0
+msgid "Increment Number"
+msgstr ""
+
+#. module: account_sequence
+#: model:ir.module.module,description:account_sequence.module_meta_information
+msgid ""
+"\n"
+"    This module maintains internal sequence number for accounting entries.\n"
+"    "
+msgstr ""
+
+#. module: account_sequence
+#: model:ir.module.module,shortdesc:account_sequence.module_meta_information
+msgid "Entries Sequence Numbering"
+msgstr ""
+
+#. module: account_sequence
+#: help:account.sequence.installer,number_increment:0
+msgid "The next number of the sequence will be incremented by this number"
+msgstr ""
+
+#. module: account_sequence
+#: view:account.sequence.installer:0
+msgid "Configure Your Account Sequence Application"
+msgstr ""
+
+#. module: account_sequence
+#: field:account.sequence.installer,progress:0
+msgid "Configuration Progress"
+msgstr ""
+
+#. module: account_sequence
+#: help:account.sequence.installer,suffix:0
+msgid "Suffix value of the record for the sequence"
+msgstr ""
+
+#. module: account_sequence
+#: field:account.sequence.installer,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: account_sequence
+#: help:account.journal,internal_sequence_id:0
+msgid ""
+"This sequence will be used to maintain the internal number for the journal "
+"entries related to this journal."
+msgstr ""
+
+#. module: account_sequence
+#: field:account.sequence.installer,padding:0
+msgid "Number padding"
+msgstr ""
+
+#. module: account_sequence
+#: model:ir.model,name:account_sequence.model_account_move_line
+msgid "Journal Items"
+msgstr ""
+
+#. module: account_sequence
+#: field:account.move,internal_sequence_number:0
+#: field:account.move.line,internal_sequence_number:0
+msgid "Internal Number"
+msgstr ""
+
+#. module: account_sequence
+#: constraint:account.move.line:0
+msgid "Company must be same for its related account and period."
+msgstr ""
+
+#. module: account_sequence
+#: help:account.sequence.installer,padding:0
+msgid ""
+"OpenERP will automatically adds some '0' on the left of the 'Next Number' to "
+"get the required padding size."
+msgstr ""
+
+#. module: account_sequence
+#: field:account.sequence.installer,name:0
+msgid "Name"
+msgstr ""
+
+#. module: account_sequence
+#: constraint:account.move.line:0
+msgid "You can not create move line on closed account."
+msgstr ""
+
+#. module: account_sequence
+#: constraint:account.move:0
+msgid ""
+"You cannot create more than one move per period on centralized journal"
+msgstr ""
+
+#. module: account_sequence
+#: sql_constraint:account.move.line:0
+msgid "Wrong credit or debit value in accounting entry !"
+msgstr ""
+
+#. module: account_sequence
+#: field:account.journal,internal_sequence_id:0
+msgid "Internal Sequence"
+msgstr ""
+
+#. module: account_sequence
+#: model:ir.model,name:account_sequence.model_account_sequence_installer
+msgid "account.sequence.installer"
+msgstr ""
+
+#. module: account_sequence
+#: view:account.sequence.installer:0
+msgid "Configure"
+msgstr ""
+
+#. module: account_sequence
+#: help:account.sequence.installer,prefix:0
+msgid "Prefix value of the record for the sequence"
+msgstr ""
+
+#. module: account_sequence
+#: model:ir.model,name:account_sequence.model_account_move
+msgid "Account Entry"
+msgstr ""
+
+#. module: account_sequence
+#: field:account.sequence.installer,suffix:0
+msgid "Suffix"
+msgstr ""
+
+#. module: account_sequence
+#: field:account.sequence.installer,config_logo:0
+msgid "Image"
+msgstr ""
+
+#. module: account_sequence
+#: view:account.sequence.installer:0
+msgid "title"
+msgstr ""
+
+#. module: account_sequence
+#: sql_constraint:account.journal:0
+msgid "The name of the journal must be unique per company !"
+msgstr ""
+
+#. module: account_sequence
+#: field:account.sequence.installer,prefix:0
+msgid "Prefix"
+msgstr ""
+
+#. module: account_sequence
+#: sql_constraint:account.journal:0
+msgid "The code of the journal must be unique per company !"
+msgstr ""
+
+#. module: account_sequence
+#: constraint:account.move.line:0
+msgid ""
+"You can not create move line on receivable/payable account without partner"
+msgstr ""
+
+#. module: account_sequence
+#: model:ir.model,name:account_sequence.model_account_journal
+msgid "Journal"
+msgstr ""
+
+#. module: account_sequence
+#: view:account.sequence.installer:0
+msgid "You can enhance the Account Sequence Application by installing ."
+msgstr ""
+
+#. module: account_sequence
+#: constraint:account.move.line:0
+msgid "You can not create move line on view account."
+msgstr ""
diff --git a/addons/base_action_rule/i18n/it.po b/addons/base_action_rule/i18n/it.po
index 5eb83aebe3f..06b819cb545 100644
--- a/addons/base_action_rule/i18n/it.po
+++ b/addons/base_action_rule/i18n/it.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-01-13 11:58+0000\n"
-"Last-Translator: Nicola Riolini - Micronaet <Unknown>\n"
+"PO-Revision-Date: 2011-04-25 09:02+0000\n"
+"Last-Translator: simone.sandri <Unknown>\n"
 "Language-Team: Italian <it@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: 2011-01-15 05:55+0000\n"
-"X-Generator: Launchpad (build 12177)\n"
+"X-Launchpad-Export-Date: 2011-04-26 04:41+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_user:0
@@ -78,7 +78,7 @@ msgstr "Giorni"
 #. module: base_action_rule
 #: field:base.action.rule,last_run:0
 msgid "Last Run"
-msgstr ""
+msgstr "Ultima Esecuzione"
 
 #. module: base_action_rule
 #: code:addons/base_action_rule/base_action_rule.py:313
diff --git a/addons/base_calendar/i18n/tr.po b/addons/base_calendar/i18n/tr.po
new file mode 100644
index 00000000000..97cefdf1d28
--- /dev/null
+++ b/addons/base_calendar/i18n/tr.po
@@ -0,0 +1,1660 @@
+# Turkish translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2011-04-23 18:46+0000\n"
+"Last-Translator: Ayhan KIZILTAN <Unknown>\n"
+"Language-Team: Turkish <tr@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: 2011-04-24 04:37+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
+
+#. module: base_calendar
+#: selection:calendar.alarm,trigger_related:0
+#: selection:res.alarm,trigger_related:0
+msgid "The event starts"
+msgstr "Olay Başlar"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,freq:0
+msgid "Hourly"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Required to Join"
+msgstr "Katılmak gerekir"
+
+#. module: base_calendar
+#: help:calendar.event,exdate:0
+#: help:calendar.todo,exdate:0
+msgid ""
+"This property defines the list of date/time exceptions for a recurring "
+"calendar component."
+msgstr ""
+"Bu özellik yinelenen takvim öğeleri için istisna tutulan tarih/saat "
+"listesini belirtir."
+
+#. module: base_calendar
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event.edit.all,name:0
+msgid "Title"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,freq:0
+#: selection:calendar.event,rrule_type:0
+#: selection:calendar.todo,rrule_type:0
+msgid "Monthly"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Invited User"
+msgstr "Davetli Kullanıcı"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Invitation"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.event,recurrency:0
+#: help:calendar.todo,recurrency:0
+msgid "Recurrent Meeting"
+msgstr "Yinelenen Toplantı"
+
+#. module: base_calendar
+#: model:ir.actions.act_window,name:base_calendar.action_res_alarm_view
+#: model:ir.ui.menu,name:base_calendar.menu_crm_meeting_avail_alarm
+msgid "Alarms"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,week_list:0
+#: selection:calendar.event,week_list:0
+#: selection:calendar.todo,week_list:0
+msgid "Sunday"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: field:calendar.attendee,role:0
+msgid "Role"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: view:calendar.event:0
+msgid "Invitation details"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,byday:0
+#: selection:calendar.event,byday:0
+#: selection:calendar.todo,byday:0
+msgid "Fourth"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,show_as:0
+#: field:calendar.todo,show_as:0
+msgid "Show as"
+msgstr "Farklı Göster"
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,day:0
+#: selection:base.calendar.set.exrule,select1:0
+#: field:calendar.event,day:0
+#: selection:calendar.event,select1:0
+#: field:calendar.todo,day:0
+#: selection:calendar.todo,select1:0
+msgid "Date of month"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,class:0
+#: selection:calendar.todo,class:0
+msgid "Public"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid " "
+msgstr " "
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "March"
+msgstr ""
+
+#. module: base_calendar
+#: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:90
+#, python-format
+msgid "Warning !"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,week_list:0
+#: selection:calendar.event,week_list:0
+#: selection:calendar.todo,week_list:0
+msgid "Friday"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,allday:0
+#: field:calendar.todo,allday:0
+msgid "All Day"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,select1:0
+#: field:calendar.event,select1:0
+#: field:calendar.todo,select1:0
+msgid "Option"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,availability:0
+#: selection:calendar.event,show_as:0
+#: selection:calendar.todo,show_as:0
+#: selection:res.users,availability:0
+msgid "Free"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.attendee,rsvp:0
+msgid "Indicats whether the favor of a reply is requested"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_ir_attachment
+msgid "ir.attachment"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.attendee,delegated_to:0
+msgid "The users that the original request was delegated to"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,ref:0
+msgid "Event Ref"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,we:0
+#: field:calendar.event,we:0
+#: field:calendar.todo,we:0
+msgid "Wed"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Show time as"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,tu:0
+#: field:calendar.event,tu:0
+#: field:calendar.todo,tu:0
+msgid "Tue"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,freq:0
+#: selection:calendar.event,rrule_type:0
+#: selection:calendar.todo,rrule_type:0
+msgid "Yearly"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,trigger_related:0
+#: selection:res.alarm,trigger_related:0
+msgid "The event ends"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,byday:0
+#: selection:calendar.event,byday:0
+#: selection:calendar.todo,byday:0
+msgid "Last"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.attendee,state:0
+msgid "Status of the attendee's participation"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,cutype:0
+msgid "Room"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,trigger_interval:0
+#: selection:calendar.event,freq:0
+#: selection:calendar.todo,freq:0
+#: selection:res.alarm,trigger_interval:0
+msgid "Days"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: view:calendar.event:0
+msgid "Invitation Detail"
+msgstr ""
+
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:1356
+#: code:addons/base_calendar/wizard/base_calendar_invite_attendee.py:96
+#: code:addons/base_calendar/wizard/base_calendar_invite_attendee.py:143
+#: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:128
+#: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:136
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,role:0
+msgid "Chair Person"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,action:0
+msgid "Procedure"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,state:0
+#: selection:calendar.todo,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,trigger_interval:0
+#: selection:res.alarm,trigger_interval:0
+msgid "Minutes"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,action:0
+msgid "Display"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event.edit.all:0
+msgid "Edit all Occurrences"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Invitation type"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,freq:0
+msgid "Secondly"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,event_date:0
+#: field:calendar.attendee,event_date:0
+#: view:calendar.event:0
+msgid "Event Date"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: view:calendar.event:0
+msgid "Group By..."
+msgstr ""
+
+#. module: base_calendar
+#: help:base_calendar.invite.attendee,email:0
+msgid "Provide external email address who will receive this invitation."
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.module.module,description:base_calendar.module_meta_information
+msgid ""
+"Full featured calendar system that supports:\n"
+"    - Calendar of events\n"
+"    - Alerts (create requests)\n"
+"    - Recurring events\n"
+"    - Invitations to people"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.attendee,cutype:0
+msgid "Specify the type of Invitation"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,freq:0
+#: selection:calendar.todo,freq:0
+msgid "Years"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,event_end_date:0
+#: field:calendar.attendee,event_end_date:0
+msgid "Event End Date"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,role:0
+msgid "Optional Participation"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,date_deadline:0
+#: field:calendar.todo,date_deadline:0
+msgid "Deadline"
+msgstr ""
+
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:385
+#: code:addons/base_calendar/base_calendar.py:1090
+#: code:addons/base_calendar/base_calendar.py:1092
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.event,active:0
+#: help:calendar.todo,active:0
+msgid ""
+"If the active field is set to          true, it will allow you to hide the "
+"event alarm information without removing it."
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.module.module,shortdesc:base_calendar.module_meta_information
+msgid "Basic Calendar Functionality"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,organizer:0
+#: field:calendar.event,organizer_id:0
+#: field:calendar.todo,organizer:0
+#: field:calendar.todo,organizer_id:0
+msgid "Organizer"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: view:calendar.event:0
+#: field:calendar.event,user_id:0
+#: field:calendar.todo,user_id:0
+msgid "Responsible"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+#: model:res.request.link,name:base_calendar.request_link_meeting
+msgid "Event"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.event,edit_all:0
+#: help:calendar.todo,edit_all:0
+msgid "Edit all Occurrences  of recurrent Meeting."
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,trigger_occurs:0
+#: selection:res.alarm,trigger_occurs:0
+msgid "Before"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+#: selection:calendar.event,state:0
+#: selection:calendar.todo,state:0
+msgid "Confirmed"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.actions.act_window,name:base_calendar.action_calendar_event_edit_all
+msgid "Edit all events"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,attendee_ids:0
+#: field:calendar.event,attendee_ids:0
+#: field:calendar.todo,attendee_ids:0
+msgid "Attendees"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Confirm"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_calendar_todo
+msgid "Calendar Task"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,su:0
+#: field:calendar.event,su:0
+#: field:calendar.todo,su:0
+msgid "Sun"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,cutype:0
+msgid "Invite Type"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.attendee,partner_id:0
+msgid "Partner related to contact"
+msgstr ""
+
+#. module: base_calendar
+#: view:res.alarm:0
+msgid "Reminder details"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,parent_ids:0
+msgid "Delegrated From"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,select1:0
+#: selection:calendar.event,select1:0
+#: selection:calendar.todo,select1:0
+msgid "Day of month"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+#: field:calendar.event,location:0
+#: field:calendar.event.edit.all,location:0
+#: field:calendar.todo,location:0
+msgid "Location"
+msgstr ""
+
+#. module: base_calendar
+#: field:base_calendar.invite.attendee,send_mail:0
+msgid "Send mail?"
+msgstr ""
+
+#. module: base_calendar
+#: field:base_calendar.invite.attendee,email:0
+#: selection:calendar.alarm,action:0
+#: field:calendar.attendee,email:0
+msgid "Email"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Event Detail"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,state:0
+msgid "Run"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,exdate:0
+#: field:calendar.todo,exdate:0
+msgid "Exception Date/Times"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,class:0
+#: selection:calendar.todo,class:0
+msgid "Confidential"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,end_date:0
+#: field:calendar.event,end_date:0
+#: field:calendar.todo,end_date:0
+msgid "Repeat Until"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.actions.act_window,help:base_calendar.action_res_alarm_view
+msgid ""
+"Create specific calendar alarms that may be assigned to calendar events or "
+"meetings."
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Visibility"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,rsvp:0
+msgid "Required Reply?"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,base_calendar_url:0
+#: field:calendar.todo,base_calendar_url:0
+msgid "Caldav URL"
+msgstr ""
+
+#. module: base_calendar
+#: view:base.calendar.set.exrule:0
+msgid "Select range to Exclude"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,recurrent_uid:0
+#: field:calendar.todo,recurrent_uid:0
+msgid "Recurrent ID"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "July"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: selection:calendar.attendee,state:0
+msgid "Accepted"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,th:0
+#: field:calendar.event,th:0
+#: field:calendar.todo,th:0
+msgid "Thu"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,child_ids:0
+msgid "Delegrated To"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Required Reply"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,end_type:0
+#: selection:calendar.todo,end_type:0
+msgid "Forever"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,role:0
+msgid "Participation required"
+msgstr ""
+
+#. module: base_calendar
+#: view:base.calendar.set.exrule:0
+msgid "_Cancel"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,create_date:0
+#: field:calendar.todo,create_date:0
+msgid "Created"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,class:0
+#: selection:calendar.todo,class:0
+msgid "Private"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,freq:0
+#: selection:calendar.event,rrule_type:0
+#: selection:calendar.todo,rrule_type:0
+msgid "Daily"
+msgstr ""
+
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:385
+#, python-format
+msgid "Can not Duplicate"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,class:0
+#: field:calendar.todo,class:0
+msgid "Mark as"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: field:calendar.attendee,partner_address_id:0
+msgid "Contact"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.event,rrule_type:0
+#: help:calendar.todo,rrule_type:0
+msgid "Let the event automatically repeat at that interval"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: view:calendar.event:0
+msgid "Delegate"
+msgstr ""
+
+#. module: base_calendar
+#: field:base_calendar.invite.attendee,partner_id:0
+#: view:calendar.attendee:0
+#: field:calendar.attendee,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: base_calendar
+#: view:base_calendar.invite.attendee:0
+#: selection:base_calendar.invite.attendee,type:0
+msgid "Partner Contacts"
+msgstr ""
+
+#. module: base_calendar
+#: view:base.calendar.set.exrule:0
+msgid "_Ok"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,byday:0
+#: selection:calendar.event,byday:0
+#: selection:calendar.todo,byday:0
+msgid "First"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Privacy"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,vtimezone:0
+#: field:calendar.todo,vtimezone:0
+msgid "Timezone"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Subject"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "September"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "December"
+msgstr ""
+
+#. module: base_calendar
+#: help:base_calendar.invite.attendee,send_mail:0
+msgid "Check this if you want to send an Email to Invited Person"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Availability"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event.edit.all:0
+msgid "_Save"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,cutype:0
+msgid "Individual"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.event,count:0
+#: help:calendar.todo,count:0
+msgid "Repeat x times"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,user_id:0
+msgid "Owner"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Delegation Info"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+#: field:calendar.event.edit.all,date:0
+msgid "Start Date"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,cn:0
+msgid "Common name"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: selection:calendar.attendee,state:0
+msgid "Declined"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "My Role"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "My Events"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: view:calendar.event:0
+msgid "Decline"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,freq:0
+#: selection:calendar.todo,freq:0
+msgid "Weeks"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,cutype:0
+msgid "Group"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,edit_all:0
+#: field:calendar.todo,edit_all:0
+msgid "Edit All"
+msgstr ""
+
+#. module: base_calendar
+#: field:base_calendar.invite.attendee,contact_ids:0
+msgid "Contacts"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_res_alarm
+msgid "Basic Alarm Information"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,fr:0
+#: field:calendar.event,fr:0
+#: field:calendar.todo,fr:0
+msgid "Fri"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,trigger_interval:0
+#: selection:calendar.event,freq:0
+#: selection:calendar.todo,freq:0
+#: selection:res.alarm,trigger_interval:0
+msgid "Hours"
+msgstr ""
+
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:1092
+#, python-format
+msgid "Count can not be Negative"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,member:0
+msgid "Member"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.event,location:0
+#: help:calendar.todo,location:0
+msgid "Location of Event"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,rrule:0
+#: field:calendar.todo,rrule:0
+msgid "Recurrent Rule"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,attach:0
+msgid "Attachment"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Invitation From"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "End of recurrency"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+#: field:calendar.event.edit.all,alarm_id:0
+msgid "Reminder"
+msgstr ""
+
+#. module: base_calendar
+#: view:base.calendar.set.exrule:0
+#: model:ir.actions.act_window,name:base_calendar.action_base_calendar_set_exrule
+#: model:ir.model,name:base_calendar.model_base_calendar_set_exrule
+msgid "Set Exrule"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+#: model:ir.actions.act_window,name:base_calendar.action_view_event
+#: model:ir.ui.menu,name:base_calendar.menu_events
+msgid "Events"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.actions.act_window,name:base_calendar.action_view_calendar_invite_attendee_wizard
+#: model:ir.model,name:base_calendar.model_base_calendar_invite_attendee
+msgid "Invite Attendees"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.attendee,email:0
+msgid "Email of Invited Person"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,repeat:0
+#: field:calendar.event,count:0
+#: field:calendar.todo,count:0
+#: field:res.alarm,repeat:0
+msgid "Repeat"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.attendee,dir:0
+msgid ""
+"Reference to the URIthat points to the directory information corresponding "
+"to the attendee."
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "August"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,week_list:0
+#: selection:calendar.event,week_list:0
+#: selection:calendar.todo,week_list:0
+msgid "Monday"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,byday:0
+#: selection:calendar.event,byday:0
+#: selection:calendar.todo,byday:0
+msgid "Third"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "June"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,alarm_id:0
+msgid "Basic Alarm"
+msgstr ""
+
+#. module: base_calendar
+#: view:base.calendar.set.exrule:0
+#: view:calendar.event:0
+msgid "The"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: field:calendar.attendee,delegated_from:0
+msgid "Delegated From"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+#: field:calendar.event,date:0
+msgid "Date"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "November"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.attendee,member:0
+msgid "Indicate the groups that the attendee belongs to"
+msgstr ""
+
+#. module: base_calendar
+#: view:base_calendar.invite.attendee:0
+msgid "Data"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,mo:0
+#: field:calendar.event,mo:0
+#: field:calendar.todo,mo:0
+msgid "Mon"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,count:0
+msgid "Count"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,freq:0
+#: selection:calendar.event,freq:0
+#: selection:calendar.todo,freq:0
+msgid "No Repeat"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "October"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: view:calendar.event:0
+msgid "Uncertain"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,language:0
+msgid "Language"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,trigger_occurs:0
+#: field:res.alarm,trigger_occurs:0
+msgid "Triggers"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "January"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,trigger_related:0
+#: field:res.alarm,trigger_related:0
+msgid "Related to"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,interval:0
+#: field:calendar.alarm,trigger_interval:0
+#: field:res.alarm,trigger_interval:0
+msgid "Interval"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,week_list:0
+#: selection:calendar.event,week_list:0
+#: selection:calendar.todo,week_list:0
+msgid "Wednesday"
+msgstr ""
+
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:1090
+#, python-format
+msgid "Interval can not be Negative"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,name:0
+#: view:calendar.event:0
+msgid "Summary"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,active:0
+#: field:calendar.event,active:0
+#: field:calendar.todo,active:0
+#: field:res.alarm,active:0
+msgid "Active"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Choose day in the month where repeat the meeting"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,action:0
+msgid "Action"
+msgstr ""
+
+#. module: base_calendar
+#: help:base_calendar.invite.attendee,type:0
+msgid "Select whom you want to Invite"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.alarm,duration:0
+#: help:res.alarm,duration:0
+msgid ""
+"Duration' and 'Repeat' are both optional, but if one occurs, so MUST the "
+"other"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_calendar_event_edit_all
+msgid "Calendar Edit all event"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.attendee,role:0
+msgid "Participation role for the calendar user"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: field:calendar.attendee,delegated_to:0
+msgid "Delegated To"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.alarm,action:0
+msgid "Defines the action to be invoked when an alarm is triggered"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,end_type:0
+#: selection:calendar.todo,end_type:0
+msgid "End date"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Search Events"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Recurrency Option"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,freq:0
+#: selection:calendar.event,rrule_type:0
+#: selection:calendar.todo,rrule_type:0
+msgid "Weekly"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.alarm,active:0
+#: help:res.alarm,active:0
+msgid ""
+"If the active field is set to true, it will allow you to hide the event "
+"alarm information without removing it."
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,recurrent_id:0
+#: field:calendar.todo,recurrent_id:0
+msgid "Recurrent ID date"
+msgstr ""
+
+#. module: base_calendar
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,state:0
+#: view:calendar.attendee:0
+#: field:calendar.attendee,state:0
+#: view:calendar.event:0
+#: field:calendar.event,state:0
+#: field:calendar.todo,state:0
+msgid "State"
+msgstr ""
+
+#. module: base_calendar
+#: view:res.alarm:0
+msgid "Reminder Details"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "To Review"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,freq:0
+#: field:calendar.event,freq:0
+#: field:calendar.todo,freq:0
+msgid "Frequency"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,state:0
+msgid "Done"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.event,interval:0
+#: help:calendar.todo,interval:0
+msgid "Repeat every (Days/Week/Month/Year)"
+msgstr ""
+
+#. module: base_calendar
+#: view:base_calendar.invite.attendee:0
+#: field:base_calendar.invite.attendee,user_ids:0
+msgid "Users"
+msgstr ""
+
+#. module: base_calendar
+#: view:base.calendar.set.exrule:0
+msgid "of"
+msgstr ""
+
+#. module: base_calendar
+#: view:base_calendar.invite.attendee:0
+#: view:calendar.event:0
+#: view:calendar.event.edit.all:0
+msgid "Cancel"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_res_users
+msgid "res.users"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,week_list:0
+#: selection:calendar.event,week_list:0
+#: selection:calendar.todo,week_list:0
+msgid "Tuesday"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.alarm,description:0
+msgid ""
+"Provides a more complete                             description of the "
+"calendar component, than that                             provided by the "
+"\"SUMMARY\" property"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Responsible User"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,availability:0
+#: selection:calendar.event,show_as:0
+#: selection:calendar.todo,show_as:0
+#: selection:res.users,availability:0
+msgid "Busy"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_calendar_event
+msgid "Calendar Event"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,state:0
+#: selection:calendar.event,state:0
+#: selection:calendar.todo,state:0
+msgid "Tentative"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,interval:0
+#: field:calendar.todo,interval:0
+msgid "Repeat every"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,end_type:0
+#: selection:calendar.todo,end_type:0
+msgid "Fix amout of times"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,recurrency:0
+#: field:calendar.todo,recurrency:0
+msgid "Recurrent"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,rrule_type:0
+#: field:calendar.todo,rrule_type:0
+msgid "Recurrency"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.actions.act_window,name:base_calendar.action_view_attendee_form
+#: model:ir.ui.menu,name:base_calendar.menu_attendee_invitations
+msgid "Event Invitations"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,week_list:0
+#: selection:calendar.event,week_list:0
+#: selection:calendar.todo,week_list:0
+msgid "Thursday"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,exrule:0
+#: field:calendar.todo,exrule:0
+msgid "Exception Rule"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.attendee,language:0
+msgid ""
+"To specify the language for text values in aproperty or property parameter."
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Details"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.event,exrule:0
+#: help:calendar.todo,exrule:0
+msgid ""
+"Defines a rule or repeating pattern of time to exclude from the recurring "
+"rule."
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,month_list:0
+#: field:calendar.event,month_list:0
+#: field:calendar.todo,month_list:0
+msgid "Month"
+msgstr ""
+
+#. module: base_calendar
+#: view:base_calendar.invite.attendee:0
+#: view:calendar.event:0
+msgid "Invite People"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.event,rrule:0
+#: help:calendar.todo,rrule:0
+msgid ""
+"Defines a rule or repeating pattern for recurring events\n"
+"e.g.: Every other month on the last Sunday of the month for 10 occurrences:  "
+"      FREQ=MONTHLY;INTERVAL=2;COUNT=10;BYDAY=-1SU"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,dir:0
+msgid "URI Reference"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,description:0
+#: view:calendar.event:0
+#: field:calendar.event,description:0
+#: field:calendar.event,name:0
+#: field:calendar.todo,description:0
+#: field:calendar.todo,name:0
+msgid "Description"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "May"
+msgstr ""
+
+#. module: base_calendar
+#: field:base_calendar.invite.attendee,type:0
+#: view:calendar.attendee:0
+msgid "Type"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Search Invitations"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,trigger_occurs:0
+#: selection:res.alarm,trigger_occurs:0
+msgid "After"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,state:0
+msgid "Stop"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_ir_values
+msgid "ir.values"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_ir_model
+msgid "Objects"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: selection:calendar.attendee,state:0
+msgid "Delegated"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,sa:0
+#: field:calendar.event,sa:0
+#: field:calendar.todo,sa:0
+msgid "Sat"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Choose day where repeat the meeting"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,freq:0
+msgid "Minutely"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.attendee,sent_by:0
+msgid "Specify the user that is acting on behalf of the calendar user"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+#: field:calendar.event.edit.all,date_deadline:0
+msgid "End Date"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "February"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,freq:0
+#: selection:calendar.todo,freq:0
+msgid "Months"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,cutype:0
+msgid "Resource"
+msgstr ""
+
+#. module: base_calendar
+#: field:res.alarm,name:0
+msgid "Name"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_calendar_alarm
+msgid "Event alarm information"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.alarm,name:0
+msgid ""
+"Contains the text to be                      used as the message subject for "
+"email                      or contains the text to be used for display"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,alarm_id:0
+#: field:calendar.event,base_calendar_alarm_id:0
+#: field:calendar.todo,alarm_id:0
+#: field:calendar.todo,base_calendar_alarm_id:0
+msgid "Alarm"
+msgstr ""
+
+#. module: base_calendar
+#: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:90
+#, python-format
+msgid "Please Apply Recurrency before applying Exception Rule."
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,sent_by_uid:0
+msgid "Sent By User"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "April"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Recurrency period"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,week_list:0
+#: field:calendar.event,week_list:0
+#: field:calendar.todo,week_list:0
+msgid "Weekday"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,byday:0
+#: field:calendar.event,byday:0
+#: field:calendar.todo,byday:0
+msgid "By day"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,model_id:0
+msgid "Model"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,action:0
+msgid "Audio"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,id:0
+#: field:calendar.todo,id:0
+msgid "ID"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,role:0
+msgid "For information Purpose"
+msgstr ""
+
+#. module: base_calendar
+#: view:base_calendar.invite.attendee:0
+msgid "Invite"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_calendar_attendee
+msgid "Attendee information"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,res_id:0
+msgid "Resource ID"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,state:0
+msgid "Needs Action"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,sent_by:0
+msgid "Sent By"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,sequence:0
+#: field:calendar.todo,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.event,alarm_id:0
+#: help:calendar.todo,alarm_id:0
+msgid "Set an alarm at this time, before the event occurs"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base_calendar.invite.attendee,type:0
+msgid "Internal User"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: view:calendar.event:0
+msgid "Accept"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,week_list:0
+#: selection:calendar.event,week_list:0
+#: selection:calendar.todo,week_list:0
+msgid "Saturday"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Invitation To"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,byday:0
+#: selection:calendar.event,byday:0
+#: selection:calendar.todo,byday:0
+msgid "Second"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,availability:0
+#: field:res.users,availability:0
+msgid "Free/Busy"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,end_type:0
+#: field:calendar.todo,end_type:0
+msgid "Way to end reccurency"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,duration:0
+#: field:calendar.alarm,trigger_duration:0
+#: field:calendar.event,duration:0
+#: field:calendar.todo,date:0
+#: field:calendar.todo,duration:0
+#: field:res.alarm,duration:0
+#: field:res.alarm,trigger_duration:0
+msgid "Duration"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base_calendar.invite.attendee,type:0
+msgid "External Email"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,trigger_date:0
+msgid "Trigger Date"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.alarm,attach:0
+msgid ""
+"* Points to a sound resource,                     which is rendered when the "
+"alarm is triggered for audio,\n"
+"                    * File which is intended to be sent as message "
+"attachments for email,\n"
+"                    * Points to a procedure resource, which is invoked when  "
+"                    the alarm is triggered for procedure."
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,byday:0
+#: selection:calendar.event,byday:0
+#: selection:calendar.todo,byday:0
+msgid "Fifth"
+msgstr ""
diff --git a/addons/base_synchro/i18n/ru.po b/addons/base_synchro/i18n/ru.po
index 2d5595e3191..1bc566195b9 100644
--- a/addons/base_synchro/i18n/ru.po
+++ b/addons/base_synchro/i18n/ru.po
@@ -8,24 +8,24 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2010-12-11 22:14+0000\n"
-"Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
+"PO-Revision-Date: 2011-04-25 08:58+0000\n"
+"Last-Translator: Viktor Prokopiev <Unknown>\n"
 "Language-Team: Russian <ru@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: 2011-01-15 05:56+0000\n"
-"X-Generator: Launchpad (build 12177)\n"
+"X-Launchpad-Export-Date: 2011-04-26 04:41+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: base_synchro
 #: model:ir.actions.act_window,name:base_synchro.action_view_base_synchro
 msgid "Base Synchronization"
-msgstr ""
+msgstr "Базовая синхронизация"
 
 #. module: base_synchro
 #: field:base.synchro.server,server_db:0
 msgid "Server Database"
-msgstr ""
+msgstr "База данных сервера"
 
 #. module: base_synchro
 #: view:base.synchro.server:0
@@ -46,7 +46,7 @@ msgstr "Последняя синхронизация"
 #. module: base_synchro
 #: field:base.synchro,user_id:0
 msgid "Send Result To"
-msgstr ""
+msgstr "Отправить результат"
 
 #. module: base_synchro
 #: model:ir.model,name:base_synchro.model_base_synchro_obj_avoid
@@ -56,7 +56,7 @@ msgstr "Не синхронизируемые поля"
 #. module: base_synchro
 #: view:base.synchro:0
 msgid "_Close"
-msgstr ""
+msgstr "_Закрыть"
 
 #. module: base_synchro
 #: view:base.synchro:0
@@ -66,7 +66,7 @@ msgstr "Передача данных на сервер"
 #. module: base_synchro
 #: model:ir.model,name:base_synchro.model_base_synchro_obj
 msgid "Register Class"
-msgstr ""
+msgstr "Класс регистра"
 
 #. module: base_synchro
 #: view:base.synchro.obj:0
@@ -127,7 +127,7 @@ msgstr "Пароль"
 #. module: base_synchro
 #: field:base.synchro.obj,avoid_ids:0
 msgid "Fields Not Sync."
-msgstr ""
+msgstr "Поля не синхронизированы"
 
 #. module: base_synchro
 #: selection:base.synchro.obj,action:0
@@ -147,12 +147,12 @@ msgstr "Поля"
 #. module: base_synchro
 #: view:base.synchro.obj.line:0
 msgid "Transfered Ids Details"
-msgstr ""
+msgstr "Сведения о переданных идентификаторах"
 
 #. module: base_synchro
 #: field:base.synchro.obj,action:0
 msgid "Synchronisation direction"
-msgstr ""
+msgstr "Направление синхронизации"
 
 #. module: base_synchro
 #: field:base.synchro.obj,server_id:0
@@ -164,12 +164,12 @@ msgstr "Сервер"
 #: model:ir.model,name:base_synchro.model_base_synchro_obj_line
 #: model:ir.ui.menu,name:base_synchro.menu_action_base_synchro_obj_line_tree
 msgid "Synchronized instances"
-msgstr ""
+msgstr "Синхронизированные экземпляры"
 
 #. module: base_synchro
 #: field:base.synchro.obj,active:0
 msgid "Active"
-msgstr ""
+msgstr "Активно"
 
 #. module: base_synchro
 #: view:base.synchro.obj:0
@@ -180,7 +180,7 @@ msgstr "Объект для синхронизации"
 #. module: base_synchro
 #: model:ir.module.module,shortdesc:base_synchro.module_meta_information
 msgid "Base Synchro"
-msgstr ""
+msgstr "Базовый Синхронизация"
 
 #. module: base_synchro
 #: model:ir.actions.act_window,name:base_synchro.action_base_synchro_server_tree
@@ -191,17 +191,17 @@ msgstr "Сервера для синхронизации"
 #. module: base_synchro
 #: view:base.synchro.obj:0
 msgid "Transfer Details"
-msgstr ""
+msgstr "Подробности передачи"
 
 #. module: base_synchro
 #: field:base.synchro.obj.line,remote_id:0
 msgid "Remote Id"
-msgstr ""
+msgstr "Удалённый идентификатор"
 
 #. module: base_synchro
 #: field:base.synchro.obj,line_id:0
 msgid "Ids Affected"
-msgstr ""
+msgstr "Затронутые идентификаторы"
 
 #. module: base_synchro
 #: model:ir.ui.menu,name:base_synchro.next_id_63
@@ -222,7 +222,7 @@ msgstr "Домен"
 #. module: base_synchro
 #: view:base.synchro:0
 msgid "_Synchronize"
-msgstr ""
+msgstr "_Синхронизировать"
 
 #. module: base_synchro
 #: view:base.synchro:0
@@ -237,7 +237,7 @@ msgstr "Имя сервера"
 #. module: base_synchro
 #: field:base.synchro.obj,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "Последовательность"
 
 #. module: base_synchro
 #: view:base.synchro:0
@@ -245,48 +245,49 @@ msgid ""
 "The synchronisation has been started.You will receive a request when it's "
 "done."
 msgstr ""
+"Синхронизация была начата. Вы получите запрос когда все будет сделано."
 
 #. module: base_synchro
 #: field:base.synchro.server,server_port:0
 msgid "Server Port"
-msgstr ""
+msgstr "Порт сервера"
 
 #. module: base_synchro
 #: model:ir.ui.menu,name:base_synchro.menu_action_view_base_synchro
 msgid "Synchronize objects"
-msgstr ""
+msgstr "Синхронизировать объекты"
 
 #. module: base_synchro
 #: view:base.synchro:0
 msgid "Synchronization Complited!"
-msgstr ""
+msgstr "Синхронизация выполнена!"
 
 #. module: base_synchro
 #: model:ir.model,name:base_synchro.model_base_synchro
 msgid "base.synchro"
-msgstr ""
+msgstr "base.synchro"
 
 #. module: base_synchro
 #: field:base.synchro.obj.line,local_id:0
 msgid "Local Id"
-msgstr ""
+msgstr "Локальный идентификатор"
 
 #. module: base_synchro
 #: model:ir.actions.act_window,name:base_synchro.actions_regclass_tree
 #: model:ir.actions.act_window,name:base_synchro.actions_transfer_line_form
 msgid "Filters"
-msgstr ""
+msgstr "Фильтры"
 
 #. module: base_synchro
 #: selection:base.synchro.obj,action:0
 msgid "Download"
-msgstr ""
+msgstr "Загрузить"
 
 #. module: base_synchro
 #: field:base.synchro,server_url:0
 #: field:base.synchro.server,server_url:0
 msgid "Server URL"
-msgstr ""
+msgstr "Адрес сервера"
 
 #~ msgid "The name of the module must be unique !"
 #~ msgstr "Название модуля должно быть уникальным !"
diff --git a/addons/crm/i18n/ru.po b/addons/crm/i18n/ru.po
index 21c2bb2263d..d4e920041b5 100644
--- a/addons/crm/i18n/ru.po
+++ b/addons/crm/i18n/ru.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-04-15 19:44+0000\n"
-"Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
+"PO-Revision-Date: 2011-04-25 08:48+0000\n"
+"Last-Translator: Stanislav Hanzhin <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: 2011-04-16 04:58+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-26 04:41+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -271,6 +271,10 @@ msgid ""
 "sort out your leads analysis by different groups to get accurate grained "
 "analysis."
 msgstr ""
+"Анализ кандидатов позволяет контролировать различную информацию о "
+"взаимоотношениях с клиентами. Проверять частоту обращений, количество "
+"ответов и отосланных писем. Вы можете разбить анализ кандидатов на группы "
+"для получения более подробного анализа."
 
 #. module: crm
 #: view:crm.lead:0
@@ -448,6 +452,11 @@ msgid ""
 "customer. You can also import a .CSV file with a list of calls to be done by "
 "your sales team."
 msgstr ""
+"\"Исходящие звонки\" - список всех звонков, которые предстоит сделать вашему "
+"отделу продаж. Менеджер продаж может записывать информацию о звонке. Эта "
+"информация будет привязана к контрагенту для отслеживания каждого контакта с "
+"ним. Так же вы можете импортировать файл в формате CSV со списком "
+"необходимых звонков звонков вашего отдела продаж."
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead2opportunity_action
@@ -660,6 +669,8 @@ msgid ""
 "Default state of mind for period preceeding the 'Max Interval' computation. "
 "This is the starting state of mind by default if the partner has no event."
 msgstr ""
+"Мнение по умолчанию для периода предшествующего вычислению 'Макс. интервал'. "
+"Это мнение по умолчанию для контрагентов без обращений."
 
 #. module: crm
 #: selection:crm.meeting,end_type:0
@@ -1317,7 +1328,7 @@ msgstr "Рассылки"
 #. module: crm
 #: field:crm.meeting,class:0
 msgid "Mark as"
-msgstr "Пометить как"
+msgstr "Отметить как"
 
 #. module: crm
 #: field:crm.meeting,count:0
@@ -1327,7 +1338,7 @@ msgstr "Повторить"
 #. module: crm
 #: help:crm.meeting,rrule_type:0
 msgid "Let the event automatically repeat at that interval"
-msgstr "Пусть события автоматически повторяются с этим интервалом"
+msgstr "Пусть событие автоматически повторяется с этим интервалом"
 
 #. module: crm
 #: view:base.action.rule:0
@@ -1434,7 +1445,7 @@ msgstr "crm.lead"
 #. module: crm
 #: field:crm.meeting,write_date:0
 msgid "Write Date"
-msgstr ""
+msgstr "Дата записи"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -1537,7 +1548,7 @@ msgstr "Предложения по категориям"
 #. module: crm
 #: view:crm.meeting:0
 msgid "Choose day in the month where repeat the meeting"
-msgstr "Выбери день месяца, когда повторить встречу."
+msgstr "Выберите день месяца, когда повторить встречу."
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -1622,7 +1633,7 @@ msgstr "Объединить два предложения"
 #. module: crm
 #: selection:crm.meeting,end_type:0
 msgid "Fix amout of times"
-msgstr ""
+msgstr "Определенное количество раз"
 
 #. module: crm
 #: view:crm.lead:0
@@ -1785,6 +1796,10 @@ msgid ""
 "sent/to be sent to your colleagues/partners. You can not only invite OpenERP "
 "users, but also external parties, such as a customer."
 msgstr ""
+"Используя \"Приглашения\" вы можете создавать и управлять приглашениями на "
+"совещания, которые отправлены или будут отправлены вашим "
+"коллегам/контрагентам. Вы можете приглашать не только пользователей OpenERP, "
+"но и внешних адресатов, например заказчиков."
 
 #. module: crm
 #: selection:crm.meeting,week_list:0
@@ -1940,6 +1955,10 @@ msgid ""
 "with a partner. From the phone call form, you can trigger a request for "
 "another call, a meeting or an opportunity."
 msgstr ""
+"Функция \"Входящие звонки\" позволяет вам быстро описывать входящие звонки. "
+"Каждый звонок будет связан с контрагентом для отслеживания каждого контакта. "
+"Из формы ввода звонка вы можете запланировать следующий звонок, совещание "
+"или предложение."
 
 #. module: crm
 #: help:crm.meeting,recurrency:0
@@ -2472,7 +2491,7 @@ msgstr ""
 #. module: crm
 #: help:crm.installer,crm_fundraising:0
 msgid "This may help associations in their fundraising process and tracking."
-msgstr ""
+msgstr "Это может помочь ассоциациям в сборе средств и их отслеживании."
 
 #. module: crm
 #: field:crm.lead2opportunity.partner,action:0
@@ -2527,7 +2546,7 @@ msgstr "Другое"
 #: selection:crm.meeting,state:0
 #: selection:crm.phonecall,state:0
 msgid "Done"
-msgstr "Готово"
+msgstr "Сделано"
 
 #. module: crm
 #: help:crm.meeting,interval:0
@@ -2587,7 +2606,7 @@ msgstr "Техподдержка"
 #. module: crm
 #: field:crm.meeting,recurrency:0
 msgid "Recurrent"
-msgstr "Повторение"
+msgstr "Повторяющийся"
 
 #. module: crm
 #: code:addons/crm/crm.py:397
@@ -2742,7 +2761,7 @@ msgstr "Кандидат в Предложение"
 #. module: crm
 #: model:ir.model,name:crm.model_calendar_attendee
 msgid "Attendee information"
-msgstr "Информация о участнике"
+msgstr "Информация об участнике"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -2940,7 +2959,7 @@ msgstr "Кем предложено"
 #: view:crm.lead:0
 #: model:ir.model,name:crm.model_crm_add_note
 msgid "Add Internal Note"
-msgstr "Добавить внутреннею запись"
+msgstr "Добавить внутреннею заметку"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:304
@@ -3916,7 +3935,7 @@ msgstr "Подтвердить"
 #. module: crm
 #: field:crm.segmentation.line,expr_name:0
 msgid "Control Variable"
-msgstr ""
+msgstr "Управляющая переменная"
 
 #. module: crm
 #: selection:crm.meeting,byday:0
diff --git a/addons/hr_attendance/i18n/pt_BR.po b/addons/hr_attendance/i18n/pt_BR.po
index e4a98842975..a742e3352e7 100644
--- a/addons/hr_attendance/i18n/pt_BR.po
+++ b/addons/hr_attendance/i18n/pt_BR.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-02-09 00:37+0000\n"
-"Last-Translator: Luiz Fernando M.França <Unknown>\n"
+"PO-Revision-Date: 2011-04-25 23:40+0000\n"
+"Last-Translator: Emerson <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: 2011-02-10 04:35+0000\n"
-"X-Generator: Launchpad (build 12177)\n"
+"X-Launchpad-Export-Date: 2011-04-26 04:41+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: hr_attendance
 #: model:ir.ui.menu,name:hr_attendance.menu_hr_time_tracking
@@ -24,12 +24,12 @@ msgstr ""
 #. module: hr_attendance
 #: view:hr.attendance:0
 msgid "Group By..."
-msgstr ""
+msgstr "Agrupar Por..."
 
 #. module: hr_attendance
 #: view:hr.attendance:0
 msgid "Today"
-msgstr ""
+msgstr "Hoje"
 
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
@@ -42,6 +42,8 @@ msgid ""
 "You did not sign out the last time. Please enter the date and time you "
 "signed out."
 msgstr ""
+"Da última vez você não deu a saída. Favor digitar a data e hora que você "
+"saiu."
 
 #. module: hr_attendance
 #: report:report.hr.timesheet.attendance.error:0
@@ -56,7 +58,7 @@ msgstr "Motivo"
 #. module: hr_attendance
 #: view:hr.attendance.error:0
 msgid "Print Attendance Report Error"
-msgstr ""
+msgstr "Imprimir Relatório de Erro de Frequência"
 
 #. module: hr_attendance
 #: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:156
@@ -80,18 +82,18 @@ msgstr ""
 #. module: hr_attendance
 #: view:hr.action.reason:0
 msgid "Attendance reasons"
-msgstr ""
+msgstr "Razões de frequência"
 
 #. module: hr_attendance
 #: view:hr.attendance:0
 #: field:hr.attendance,day:0
 msgid "Day"
-msgstr ""
+msgstr "Dia"
 
 #. module: hr_attendance
 #: selection:hr.employee,state:0
 msgid "Present"
-msgstr "Atual"
+msgstr "Presente"
 
 #. module: hr_attendance
 #: model:ir.model,name:hr_attendance.model_hr_sign_in_out_ask
@@ -107,29 +109,31 @@ msgstr ""
 #. module: hr_attendance
 #: view:hr.sign.in.out:0
 msgid "Ok"
-msgstr ""
+msgstr "Ok"
 
 #. module: hr_attendance
 #: view:hr.action.reason:0
 msgid "Define attendance reason"
-msgstr ""
+msgstr "Definir razões de frequência"
 
 #. module: hr_attendance
 #: constraint:hr.employee:0
 msgid ""
 "Error ! You cannot select a department for which the employee is the manager."
 msgstr ""
+"Erro! Você não pode selecionar um departamento do qual o funcionário é o "
+"gerente."
 
 #. module: hr_attendance
 #: model:ir.actions.act_window,name:hr_attendance.action_hr_attendance_month
 msgid "Attendances By Month"
-msgstr ""
+msgstr "Frequências Por Mês"
 
 #. module: hr_attendance
 #: field:hr.sign.in.out,name:0
 #: field:hr.sign.in.out.ask,name:0
 msgid "Employees name"
-msgstr ""
+msgstr "Nome do Funcionário"
 
 #. module: hr_attendance
 #: model:ir.actions.act_window,name:hr_attendance.open_view_attendance_reason
@@ -173,7 +177,7 @@ msgstr "A data de entrada precisa ser anterior"
 #: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:162
 #, python-format
 msgid "A sign-in must be right after a sign-out !"
-msgstr ""
+msgstr "Uma entrada deve ocorrer sempre após uma saída!"
 
 #. module: hr_attendance
 #: field:hr.employee,state:0
@@ -184,13 +188,13 @@ msgstr "Frequência"
 #. module: hr_attendance
 #: field:hr.attendance.error,max_delay:0
 msgid "Max. Delay (Min)"
-msgstr ""
+msgstr "Atraso Máx. (Min)"
 
 #. module: hr_attendance
 #: view:hr.attendance.error:0
 #: view:hr.attendance.month:0
 msgid "Print"
-msgstr ""
+msgstr "Imprimir"
 
 #. module: hr_attendance
 #: view:hr.attendance:0
@@ -206,6 +210,13 @@ msgid ""
 "    actions(Sign in/Sign out) performed by them.\n"
 "       "
 msgstr ""
+"\n"
+"    Este módulo tem como objetivo o gerenciamento de frequência de "
+"funcionários.\n"
+"    Ele mantém o apontamento das frequências com base nas ações "
+"(Entrada/Saída)\n"
+"    executadas pelos funcionários.\n"
+"       "
 
 #. module: hr_attendance
 #: constraint:hr.attendance:0
@@ -232,7 +243,7 @@ msgstr "Data de Início"
 #. module: hr_attendance
 #: report:report.hr.timesheet.attendance.error:0
 msgid "Min Delay"
-msgstr ""
+msgstr "Atraso Mín."
 
 #. module: hr_attendance
 #: selection:hr.attendance,action:0
@@ -249,7 +260,7 @@ msgstr "Operação"
 #: code:addons/hr_attendance/wizard/hr_attendance_error.py:49
 #, python-format
 msgid "No Data Available"
-msgstr ""
+msgstr "Nenhum Dado Disponível"
 
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
@@ -281,12 +292,12 @@ msgstr ""
 #. module: hr_attendance
 #: model:ir.model,name:hr_attendance.model_hr_attendance_month
 msgid "Print Monthly Attendance Report"
-msgstr ""
+msgstr "Imprimir Relatório de Frequência Mensal"
 
 #. module: hr_attendance
 #: model:ir.model,name:hr_attendance.model_hr_sign_in_out
 msgid "Sign In Sign Out"
-msgstr ""
+msgstr "Entrada e Saída"
 
 #. module: hr_attendance
 #: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:103
@@ -302,7 +313,7 @@ msgstr "Entrada / Saída"
 #. module: hr_attendance
 #: view:hr.sign.in.out.ask:0
 msgid "hr.sign.out.ask"
-msgstr ""
+msgstr "hr.sign.out.ask"
 
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
@@ -323,7 +334,7 @@ msgstr "Junho"
 #. module: hr_attendance
 #: model:ir.model,name:hr_attendance.model_hr_attendance_error
 msgid "Print Error Attendance Report"
-msgstr ""
+msgstr "Imprimir Relatório de Erros de Frequência"
 
 #. module: hr_attendance
 #: model:ir.module.module,shortdesc:hr_attendance.module_meta_information
@@ -343,7 +354,7 @@ msgstr "Novembro"
 #. module: hr_attendance
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
-msgstr ""
+msgstr "Erro! Você não pode criar uma Hierarquia de Funcionários recursiva."
 
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
@@ -353,7 +364,7 @@ msgstr "Outubro"
 #. module: hr_attendance
 #: view:hr.attendance:0
 msgid "My Attendances"
-msgstr ""
+msgstr "Minhas Frequências"
 
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
@@ -375,7 +386,7 @@ msgstr ""
 #. module: hr_attendance
 #: view:hr.sign.in.out:0
 msgid "Sign-Out Entry must follow Sign-In."
-msgstr ""
+msgstr "Um apontamento de Saída deve ser depois da Entrada."
 
 #. module: hr_attendance
 #: report:report.hr.timesheet.attendance.error:0
@@ -400,17 +411,17 @@ msgstr ""
 #. module: hr_attendance
 #: field:hr.sign.in.out,emp_id:0
 msgid "Employee ID"
-msgstr ""
+msgstr "ID de Funcionário"
 
 #. module: hr_attendance
 #: model:ir.model,name:hr_attendance.model_hr_attendance_week
 msgid "Print Week Attendance Report"
-msgstr ""
+msgstr "Imprimir Relatório de Frequência Semanal"
 
 #. module: hr_attendance
 #: field:hr.sign.in.out.ask,emp_id:0
 msgid "Empoyee ID"
-msgstr ""
+msgstr "ID de Funcionário"
 
 #. module: hr_attendance
 #: view:hr.attendance.error:0
@@ -423,7 +434,7 @@ msgstr "Cancelar"
 #. module: hr_attendance
 #: help:hr.action.reason,name:0
 msgid "Specifies the reason for Signing In/Signing Out."
-msgstr ""
+msgstr "Especifica a razão para Entrada/Saída."
 
 #. module: hr_attendance
 #: report:report.hr.timesheet.attendance.error:0
@@ -436,7 +447,7 @@ msgstr ""
 #. module: hr_attendance
 #: view:hr.attendance.month:0
 msgid "Print Attendance Report Monthly"
-msgstr ""
+msgstr "Imprimir Relatório de Frequência Mensal"
 
 #. module: hr_attendance
 #: selection:hr.action.reason,action_type:0
@@ -510,7 +521,7 @@ msgstr ""
 #. module: hr_attendance
 #: field:hr.attendance,employee_id:0
 msgid "Employee's Name"
-msgstr ""
+msgstr "Nome do Funcionário"
 
 #. module: hr_attendance
 #: selection:hr.employee,state:0
@@ -551,7 +562,7 @@ msgstr "Indique este atraso, o erro é considerado para ser voluntário"
 #: code:addons/hr_attendance/wizard/hr_attendance_error.py:49
 #, python-format
 msgid "No records found for your selection!"
-msgstr ""
+msgstr "Nenhum registro encontrado para sua consulta!"
 
 #. module: hr_attendance
 #: view:hr.sign.in.out.ask:0
@@ -559,6 +570,8 @@ msgid ""
 "You did not sign in the last time. Please enter the date and time you signed "
 "in."
 msgstr ""
+"Da última vez você não deu entrada. Favor digitar a data e hora que você "
+"entrou."
 
 #. module: hr_attendance
 #: field:hr.attendance.month,year:0
@@ -568,7 +581,7 @@ msgstr "Ano"
 #. module: hr_attendance
 #: view:hr.sign.in.out.ask:0
 msgid "hr.sign.in.out.ask"
-msgstr ""
+msgstr "hr.sign.in.out.ask"
 
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
diff --git a/addons/hr_timesheet_sheet/i18n/pt_BR.po b/addons/hr_timesheet_sheet/i18n/pt_BR.po
index 1f60699b465..01c35333f17 100644
--- a/addons/hr_timesheet_sheet/i18n/pt_BR.po
+++ b/addons/hr_timesheet_sheet/i18n/pt_BR.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: pt_BR\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-03-15 15:37+0000\n"
-"Last-Translator: Joe Pimentel <joe.b.pimentel@gmail.com>\n"
+"PO-Revision-Date: 2011-04-23 20:29+0000\n"
+"Last-Translator: Emerson <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: 2011-03-16 04:47+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-04-24 04:37+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:188
@@ -40,7 +40,7 @@ msgstr "Planilha"
 #. module: hr_timesheet_sheet
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_timesheetdraft0
 msgid "Service"
-msgstr ""
+msgstr "Serviço"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:38
@@ -53,7 +53,7 @@ msgstr "Não há funcionário definido para seu usuário!"
 #: view:hr_timesheet_sheet.sheet:0
 #: view:timesheet.report:0
 msgid "Group By..."
-msgstr ""
+msgstr "Agrupar Por..."
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,total_attendance:0
@@ -67,7 +67,7 @@ msgstr "Presença Total"
 #: view:timesheet.report:0
 #: field:timesheet.report,department_id:0
 msgid "Department"
-msgstr ""
+msgstr "Departamento"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_tasktimesheet0
@@ -91,7 +91,7 @@ msgstr ""
 #: selection:hr.timesheet.report,month:0
 #: selection:timesheet.report,month:0
 msgid "March"
-msgstr ""
+msgstr "Março"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0
@@ -100,7 +100,7 @@ msgstr ""
 #: view:timesheet.report:0
 #: field:timesheet.report,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Empresa"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0
@@ -127,7 +127,7 @@ msgstr "Data até"
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_invoiceonwork0
 msgid "Based on the timesheet"
-msgstr ""
+msgstr "Baseado na planilha de apontamento"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition.action,name:hr_timesheet_sheet.process_transition_action_validatetimesheet0
@@ -151,7 +151,7 @@ msgstr "Presente"
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0
 msgid "Total Cost"
-msgstr ""
+msgstr "Custo Total"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:608
@@ -195,12 +195,12 @@ msgstr "Você não pode efetuar entrada em uma data diferente de hoje"
 #: view:hr.timesheet.report:0
 #: view:timesheet.report:0
 msgid " Month-1 "
-msgstr ""
+msgstr " Mês-1 "
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_validatetimesheet0
 msgid "Validation"
-msgstr ""
+msgstr "Validação"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:199
@@ -237,7 +237,7 @@ msgstr "Data de"
 #: view:hr.timesheet.report:0
 #: view:timesheet.report:0
 msgid " Month "
-msgstr ""
+msgstr " Mês "
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -299,14 +299,14 @@ msgstr ""
 #. module: hr_timesheet_sheet
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr ""
+msgstr "Erro! Você não pode criar empresas recursivas."
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,state:0
 #: view:timesheet.report:0
 #: field:timesheet.report,state:0
 msgid "State"
-msgstr ""
+msgstr "Status"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_confirmedtimesheet0
@@ -316,7 +316,7 @@ msgstr ""
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,employee_id:0
 msgid "Employee"
-msgstr ""
+msgstr "Funcionário"
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
@@ -363,7 +363,7 @@ msgstr "Linhas do Apontamento de Horas"
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0
 msgid "Hours"
-msgstr ""
+msgstr "Horas"
 
 #. module: hr_timesheet_sheet
 #: view:timesheet.report:0
@@ -397,7 +397,7 @@ msgstr ""
 #: selection:hr.timesheet.report,month:0
 #: selection:timesheet.report,month:0
 msgid "July"
-msgstr ""
+msgstr "Julho"
 
 #. module: hr_timesheet_sheet
 #: view:res.company:0
@@ -427,7 +427,7 @@ msgstr "Visão Diária"
 #: view:timesheet.report:0
 #: field:timesheet.report,quantity:0
 msgid "#Quantity"
-msgstr ""
+msgstr "#Quantidade"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,total_timesheet:0
@@ -466,18 +466,18 @@ msgstr "Ir para:"
 #: selection:hr.timesheet.report,month:0
 #: selection:timesheet.report,month:0
 msgid "September"
-msgstr ""
+msgstr "Setembro"
 
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0
 #: selection:timesheet.report,month:0
 msgid "December"
-msgstr ""
+msgstr "Dezembro"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.current.open:0
 msgid "It will open your current timesheet"
-msgstr ""
+msgstr "Isto irá abrir sua planilha de apontamento atual"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0
@@ -497,7 +497,7 @@ msgstr ""
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "In Draft"
-msgstr ""
+msgstr "Provisório"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_attendancetimesheet0
@@ -507,7 +507,7 @@ msgstr ""
 #. module: hr_timesheet_sheet
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_invoiceontimesheet0
 msgid "Billing"
-msgstr ""
+msgstr "Cobrança"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,note:hr_timesheet_sheet.process_transition_timesheetdraft0
@@ -556,7 +556,7 @@ msgstr ""
 #: view:hr.timesheet.report:0
 #: view:timesheet.report:0
 msgid " Year "
-msgstr ""
+msgstr " Ano "
 
 #. module: hr_timesheet_sheet
 #: selection:res.company,timesheet_range:0
@@ -567,13 +567,13 @@ msgstr "Semana"
 #: selection:hr.timesheet.report,month:0
 #: selection:timesheet.report,month:0
 msgid "August"
-msgstr ""
+msgstr "Agosto"
 
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0
 #: selection:timesheet.report,month:0
 msgid "June"
-msgstr ""
+msgstr "Junho"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,state_attendance:0
@@ -618,13 +618,13 @@ msgstr "Data"
 #: selection:hr.timesheet.report,month:0
 #: selection:timesheet.report,month:0
 msgid "November"
-msgstr ""
+msgstr "Novembro"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0
 #: view:timesheet.report:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Filtros Extendidos..."
 
 #. module: hr_timesheet_sheet
 #: field:res.company,timesheet_range:0
@@ -645,7 +645,7 @@ msgstr ""
 #: selection:hr.timesheet.report,month:0
 #: selection:timesheet.report,month:0
 msgid "October"
-msgstr ""
+msgstr "Outubro"
 
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,help:hr_timesheet_sheet.act_hr_timesheet_sheet_form
@@ -659,7 +659,7 @@ msgstr ""
 #: selection:hr.timesheet.report,month:0
 #: selection:timesheet.report,month:0
 msgid "January"
-msgstr ""
+msgstr "Janeiro"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,note:hr_timesheet_sheet.process_transition_attendancetimesheet0
@@ -669,12 +669,12 @@ msgstr ""
 #. module: hr_timesheet_sheet
 #: model:ir.model,name:hr_timesheet_sheet.model_res_company
 msgid "Companies"
-msgstr ""
+msgstr "Empresas"
 
 #. module: hr_timesheet_sheet
 #: field:hr.timesheet.report,quantity:0
 msgid "Quantity"
-msgstr ""
+msgstr "Quantidade"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0
@@ -728,12 +728,12 @@ msgstr ""
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.current.open:0
 msgid "Cancel"
-msgstr ""
+msgstr "Cancelar"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
 msgid "Validated"
-msgstr ""
+msgstr "Validado"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,name:hr_timesheet_sheet.process_node_invoiceonwork0
@@ -804,7 +804,7 @@ msgstr "Linha de Apontamento de Horas"
 #: view:timesheet.report:0
 #: field:timesheet.report,product_id:0
 msgid "Product"
-msgstr ""
+msgstr "Produto"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -829,7 +829,7 @@ msgstr ""
 #: selection:hr.timesheet.report,month:0
 #: selection:timesheet.report,month:0
 msgid "May"
-msgstr ""
+msgstr "Maio"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_workontask0
@@ -879,12 +879,12 @@ msgstr "Ausente"
 #: selection:hr.timesheet.report,month:0
 #: selection:timesheet.report,month:0
 msgid "February"
-msgstr ""
+msgstr "Fevereiro"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Employees"
-msgstr ""
+msgstr "Funcionários"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_timesheet0
@@ -895,12 +895,12 @@ msgstr ""
 #: selection:hr.timesheet.report,month:0
 #: selection:timesheet.report,month:0
 msgid "April"
-msgstr ""
+msgstr "Abril"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_confirmtimesheet0
 msgid "Confirmation"
-msgstr ""
+msgstr "Confirmação"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet.account,invoice_rate:0
@@ -910,7 +910,7 @@ msgstr "Taxa da Fatura"
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Approve"
-msgstr ""
+msgstr "Aprovar"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,account_ids:0
@@ -921,7 +921,7 @@ msgstr "Contas analíticas"
 #: view:timesheet.report:0
 #: field:timesheet.report,to_invoice:0
 msgid "Type of Invoicing"
-msgstr ""
+msgstr "Tipo de Faturamento"
 
 #. module: hr_timesheet_sheet
 #: view:timesheet.report:0
@@ -932,7 +932,7 @@ msgstr ""
 #. module: hr_timesheet_sheet
 #: field:hr.timesheet.report,cost:0
 msgid "Cost"
-msgstr ""
+msgstr "Custo"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,date_current:0
diff --git a/addons/knowledge/i18n/it.po b/addons/knowledge/i18n/it.po
index 6ea8185e2be..58bdb25ee37 100644
--- a/addons/knowledge/i18n/it.po
+++ b/addons/knowledge/i18n/it.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-01-12 13:16+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2011-04-23 12:03+0000\n"
+"Last-Translator: simone.sandri <Unknown>\n"
 "Language-Team: Italian <it@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: 2011-01-15 05:53+0000\n"
-"X-Generator: Launchpad (build 12177)\n"
+"X-Launchpad-Export-Date: 2011-04-24 04:37+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document
@@ -72,7 +72,7 @@ msgstr ""
 #. module: knowledge
 #: view:knowledge.installer:0
 msgid "Configure"
-msgstr ""
+msgstr "Configura"
 
 #. module: knowledge
 #: view:knowledge.installer:0
diff --git a/addons/l10n_ca/i18n/it.po b/addons/l10n_ca/i18n/it.po
index 436cee96aa4..049f1e72e18 100644
--- a/addons/l10n_ca/i18n/it.po
+++ b/addons/l10n_ca/i18n/it.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-08-02 21:08+0000\n"
-"PO-Revision-Date: 2011-01-13 23:14+0000\n"
-"Last-Translator: Nicola Riolini - Micronaet <Unknown>\n"
+"PO-Revision-Date: 2011-04-23 12:00+0000\n"
+"Last-Translator: simone.sandri <Unknown>\n"
 "Language-Team: Italian <it@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: 2011-01-14 05:51+0000\n"
-"X-Generator: Launchpad (build 12177)\n"
+"X-Launchpad-Export-Date: 2011-04-24 04:37+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: l10n_ca
 #: model:account.account.type,name:l10n_ca.account_type_receivable
@@ -122,9 +122,9 @@ msgstr ""
 #. module: l10n_ca
 #: model:account.account.type,name:l10n_ca.account_type_income
 msgid "Income"
-msgstr ""
+msgstr "Entrate"
 
 #. module: l10n_ca
 #: model:account.account.type,name:l10n_ca.account_type_view
 msgid "View"
-msgstr ""
+msgstr "Visualizza"
diff --git a/addons/l10n_cr/i18n/it.po b/addons/l10n_cr/i18n/it.po
index de6eb7d021c..45579f226d4 100644
--- a/addons/l10n_cr/i18n/it.po
+++ b/addons/l10n_cr/i18n/it.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-07 05:56+0000\n"
-"PO-Revision-Date: 2011-02-15 15:37+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2011-04-23 12:04+0000\n"
+"Last-Translator: simone.sandri <Unknown>\n"
 "Language-Team: Italian <it@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: 2011-02-16 05:03+0000\n"
-"X-Generator: Launchpad (build 12351)\n"
+"X-Launchpad-Export-Date: 2011-04-24 04:37+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: l10n_cr
 #: model:res.partner.title,name:l10n_cr.res_partner_title_ing
@@ -156,7 +156,7 @@ msgstr ""
 #. module: l10n_cr
 #: model:res.partner.title,name:l10n_cr.res_partner_title_asoc
 msgid "Asociation"
-msgstr ""
+msgstr "Associazione"
 
 #. module: l10n_cr
 #: model:res.partner.title,shortcut:l10n_cr.res_partner_title_asoc
diff --git a/addons/mrp_repair/i18n/it.po b/addons/mrp_repair/i18n/it.po
index 4bc9f8888a0..c5138d7755d 100644
--- a/addons/mrp_repair/i18n/it.po
+++ b/addons/mrp_repair/i18n/it.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-01-12 14:03+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2011-04-23 12:05+0000\n"
+"Last-Translator: simone.sandri <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: 2011-01-15 05:47+0000\n"
-"X-Generator: Launchpad (build 12177)\n"
+"X-Launchpad-Export-Date: 2011-04-24 04:37+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -337,7 +337,7 @@ msgstr "Cerca ordini di riparazione"
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "(Add)"
-msgstr ""
+msgstr "(Aggiungi)"
 
 #. module: mrp_repair
 #: model:ir.model,name:mrp_repair.model_mrp_repair_line
@@ -412,7 +412,7 @@ msgstr "Prepara Fatture"
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "(Remove)"
-msgstr ""
+msgstr "(Rimuovi)"
 
 #. module: mrp_repair
 #: selection:mrp.repair.line,type:0
@@ -522,7 +522,7 @@ msgstr ""
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Quotations"
-msgstr ""
+msgstr "Quotazioni"
 
 #. module: mrp_repair
 #: field:mrp.repair.fee,product_uom_qty:0
diff --git a/addons/outlook/i18n/tr.po b/addons/outlook/i18n/tr.po
index ed0f1b4c7ff..6d24ae529c4 100644
--- a/addons/outlook/i18n/tr.po
+++ b/addons/outlook/i18n/tr.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-03-17 17:54+0000\n"
-"Last-Translator: Arif Aydogmus <arifaydogmus@gmail.com>\n"
+"PO-Revision-Date: 2011-04-24 16:22+0000\n"
+"Last-Translator: lo_ol <Unknown>\n"
 "Language-Team: Turkish <tr@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: 2011-03-18 04:59+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-04-25 04:50+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: outlook
 #: field:outlook.installer,doc_file:0
@@ -93,14 +93,14 @@ msgstr "Belgeleme dosyası :- how to install Outlook Plug-in."
 #. module: outlook
 #: model:ir.model,name:outlook.model_outlook_installer
 msgid "outlook.installer"
-msgstr ""
+msgstr "outlook.yükleyicisi"
 
 #. module: outlook
 #: model:ir.actions.act_window,name:outlook.action_outlook_installer
 #: model:ir.actions.act_window,name:outlook.action_outlook_wizard
 #: view:outlook.installer:0
 msgid "Outlook Plug-In Configuration"
-msgstr ""
+msgstr "Outlook eklenti-içe özel yapılandırma ayarları"
 
 #. module: outlook
 #: field:outlook.installer,progress:0
@@ -123,6 +123,8 @@ msgid ""
 "Allows you to select an object that you would like to add to your email and "
 "its attachments."
 msgstr ""
+"Size, e-postanıza ve eklerine eklemeniz için begendiğiniz bir nesneyi "
+"seçmeyi sağlar."
 
 #. module: outlook
 #: view:outlook.installer:0
@@ -149,8 +151,10 @@ msgstr "Resim"
 msgid ""
 "outlook plug-in file. Save as this file and install this plug-in in outlook."
 msgstr ""
+"Outlook eklenti-içe dosyası. Bu dosyayı kayıt edin ve bu eklenti-içe'yi "
+"outlook'a yükleyin"
 
 #. module: outlook
 #: view:outlook.installer:0
 msgid "Configure"
-msgstr ""
+msgstr "Yapılandır"
diff --git a/addons/procurement/i18n/tr.po b/addons/procurement/i18n/tr.po
new file mode 100644
index 00000000000..278c74b1fb4
--- /dev/null
+++ b/addons/procurement/i18n/tr.po
@@ -0,0 +1,906 @@
+# Turkish translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-04-25 11:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Turkish <tr@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: 2011-04-26 04:41+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
+
+#. module: procurement
+#: view:make.procurement:0
+msgid "Ask New Products"
+msgstr "Yeni Ürün Oluştur"
+
+#. module: procurement
+#: model:ir.ui.menu,name:procurement.menu_stock_sched
+msgid "Schedulers"
+msgstr "Zamanlayıcılar"
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_make_procurement
+msgid "Make Procurements"
+msgstr "Sipariş Oluştur"
+
+#. module: procurement
+#: help:procurement.order.compute.all,automatic:0
+msgid ""
+"Triggers an automatic procurement for all products that have a virtual stock "
+"under 0. You should probably not use this option, we suggest using a MTO "
+"configuration on products."
+msgstr ""
+"Stok miktarı 0 ın altına inen tüm ürünler için otomatik bir tedarik sürecini "
+"tetikler. Bu seçeneği muhtemelen kullanmamalısınız, ürünler için MTO "
+"ayarlarını kullanmanızı tavsiye ederiz."
+
+#. module: procurement
+#: view:stock.warehouse.orderpoint:0
+msgid "Group By..."
+msgstr "Grupla..."
+
+#. module: procurement
+#: help:stock.warehouse.orderpoint,procurement_draft_ids:0
+msgid "Draft procurement of the product and location of that orderpoint"
+msgstr ""
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:288
+#, python-format
+msgid "No supplier defined for this product !"
+msgstr "Bu ürün için tedarikçi tanımı bulunamadı!"
+
+#. module: procurement
+#: field:make.procurement,uom_id:0
+msgid "Unit of Measure"
+msgstr "Ölçü Birimi"
+
+#. module: procurement
+#: field:procurement.order,procure_method:0
+msgid "Procurement Method"
+msgstr "Satınalma Yöntemi"
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:298
+#, python-format
+msgid "No address defined for the supplier"
+msgstr "Bu tedarikçi için bir adres tanımı bulunamadı!"
+
+#. module: procurement
+#: model:ir.actions.act_window,name:procurement.action_procurement_compute
+msgid "Compute Stock Minimum Rules Only"
+msgstr "Sadece Minimum Stok Kuralını Hesapla"
+
+#. module: procurement
+#: field:procurement.order,company_id:0
+#: field:stock.warehouse.orderpoint,company_id:0
+msgid "Company"
+msgstr "Firma"
+
+#. module: procurement
+#: field:procurement.order,product_uos_qty:0
+msgid "UoS Quantity"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+#: field:procurement.order,name:0
+msgid "Reason"
+msgstr "Sebep"
+
+#. module: procurement
+#: view:procurement.order.compute:0
+msgid "Compute Procurements"
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order,message:0
+msgid "Latest error"
+msgstr "Son Hata"
+
+#. module: procurement
+#: help:mrp.property,composition:0
+msgid "Not used in computations, for information purpose only."
+msgstr "Sadece bilgi amaçlıdır, hesaplamalarda kullanılmaz."
+
+#. module: procurement
+#: field:stock.warehouse.orderpoint,procurement_id:0
+msgid "Latest procurement"
+msgstr "Son satınalma"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Notes"
+msgstr "Notlar"
+
+#. module: procurement
+#: selection:procurement.order,procure_method:0
+msgid "on order"
+msgstr "Sipariş"
+
+#. module: procurement
+#: help:procurement.order,message:0
+msgid "Exception occurred while computing procurement orders."
+msgstr "Satınalma emirlerini işlerken bir istisna oluştu."
+
+#. module: procurement
+#: help:procurement.order,state:0
+msgid ""
+"When a procurement is created the state is set to 'Draft'.\n"
+" If the procurement is confirmed, the state is set to 'Confirmed'.           "
+" \n"
+"After confirming the state is set to 'Running'.\n"
+" If any exception arises in the order then the state is set to 'Exception'.\n"
+" Once the exception is removed the state becomes 'Ready'.\n"
+" It is in 'Waiting'. state when the procurement is waiting for another one "
+"to finish."
+msgstr ""
+"Satınalma ilk  'Taslak' durumunda oluşturulur.\n"
+" Satınalma onaylandığında durumu 'Onaylandı' olur.            \n"
+"Onaylandıktan sonra durumu 'Yolda' olur.\n"
+" Bir istisna oluşursa durumu 'İstisna' olur.\n"
+" İstisna kaldırıldıktan sonra 'Hazır' durumuna geçer.\n"
+" Başka bir satınalmanın tamamlanmasını bekliyorsa 'Beklemede' durumundadır."
+
+#. module: procurement
+#: view:stock.warehouse.orderpoint:0
+msgid "Minimum Stock Rules Search"
+msgstr "Minimum Stok Kuralı Arama"
+
+#. module: procurement
+#: help:stock.warehouse.orderpoint,product_min_qty:0
+msgid ""
+"When the virtual stock goes belong the Min Quantity, OpenERP generates a "
+"procurement to bring the virtual stock to the Max Quantity."
+msgstr ""
+"Stok Min. Değer altına indiğinde, OpenERP stoğu Max. Değere getirecek bir "
+"satınalma oluşturur."
+
+#. module: procurement
+#: view:procurement.order.compute.all:0
+msgid "Scheduler Parameters"
+msgstr "Zamanlayıcı Parametreleri"
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_stock_move
+msgid "Stock Move"
+msgstr "Stok Hareketi"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Planification"
+msgstr ""
+
+#. module: procurement
+#: selection:procurement.order,state:0
+msgid "Ready"
+msgstr "Hazır"
+
+#. module: procurement
+#: field:procurement.order.compute.all,automatic:0
+msgid "Automatic orderpoint"
+msgstr "Otomatik Sipariş Noktası"
+
+#. module: procurement
+#: field:mrp.property,composition:0
+msgid "Properties composition"
+msgstr "Özellik Birleşimi"
+
+#. module: procurement
+#: selection:procurement.order,state:0
+msgid "Confirmed"
+msgstr "Onaylandı"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Retry"
+msgstr "Yeniden Dene"
+
+#. module: procurement
+#: view:procurement.order.compute:0
+#: view:procurement.orderpoint.compute:0
+msgid "Parameters"
+msgstr "Parametreler"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Confirm"
+msgstr "Onayla"
+
+#. module: procurement
+#: help:procurement.order,origin:0
+msgid ""
+"Reference of the document that created this Procurement.\n"
+"This is automatically completed by OpenERP."
+msgstr ""
+"Open ERP, bu satınalmayı başlatan belgeyi otomatik olarak kapamıştır."
+
+#. module: procurement
+#: view:stock.warehouse.orderpoint:0
+msgid "Procurement Orders to Process"
+msgstr ""
+
+#. module: procurement
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "Hata! İç içe tekrarlayan şirketler seçemezsiniz."
+
+#. module: procurement
+#: field:procurement.order,priority:0
+msgid "Priority"
+msgstr "Öncelik"
+
+#. module: procurement
+#: view:procurement.order:0
+#: field:procurement.order,state:0
+msgid "State"
+msgstr "Durum"
+
+#. module: procurement
+#: field:procurement.order,location_id:0
+#: view:stock.warehouse.orderpoint:0
+#: field:stock.warehouse.orderpoint,location_id:0
+msgid "Location"
+msgstr "Lokasyon"
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_stock_picking
+msgid "Picking List"
+msgstr "Paket Listesi"
+
+#. module: procurement
+#: field:make.procurement,warehouse_id:0
+#: view:stock.warehouse.orderpoint:0
+#: field:stock.warehouse.orderpoint,warehouse_id:0
+msgid "Warehouse"
+msgstr "Depo"
+
+#. module: procurement
+#: selection:stock.warehouse.orderpoint,logic:0
+msgid "Best price (not yet active!)"
+msgstr "En İyi Fiyat(Henüz aktif değil)"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Product & Location"
+msgstr "Ürün & Lokasyon Bilgisi"
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_procurement_order_compute
+msgid "Compute Procurement"
+msgstr "Satınalmayı Hesapla"
+
+#. module: procurement
+#: model:ir.module.module,shortdesc:procurement.module_meta_information
+#: field:stock.move,procurements:0
+msgid "Procurements"
+msgstr "Satınalmalar"
+
+#. module: procurement
+#: field:res.company,schedule_range:0
+msgid "Scheduler Range Days"
+msgstr "Zamanlayıcı Gün Aralığı"
+
+#. module: procurement
+#: model:ir.actions.act_window,help:procurement.procurement_action
+msgid ""
+"A procurement order is used to record a need for a specific product at a "
+"specific location. A procurement order is usually created automatically from "
+"sales orders, a Pull Logistics rule or Minimum Stock Rules. When the "
+"procurement order is confirmed, it automatically creates the necessary "
+"operations to fullfil the need: purchase order proposition, manufacturing "
+"order, etc."
+msgstr ""
+
+#. module: procurement
+#: field:make.procurement,date_planned:0
+msgid "Planned Date"
+msgstr "Planlanan Tarih"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Group By"
+msgstr "Grupla"
+
+#. module: procurement
+#: field:make.procurement,qty:0
+#: field:procurement.order,product_qty:0
+msgid "Quantity"
+msgstr "Miktar"
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:370
+#, python-format
+msgid "Not enough stock and no minimum orderpoint rule defined."
+msgstr "Yeterli stok yok ve minimum sipariş noktası kuralı tanımlı değil!"
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:137
+#, python-format
+msgid "Invalid action !"
+msgstr "Geçersiz eylem !"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "References"
+msgstr "Referanslar"
+
+#. module: procurement
+#: view:res.company:0
+msgid "Configuration"
+msgstr "Yapılandırma"
+
+#. module: procurement
+#: field:stock.warehouse.orderpoint,qty_multiple:0
+msgid "Qty Multiple"
+msgstr ""
+
+#. module: procurement
+#: help:procurement.order,procure_method:0
+msgid ""
+"If you encode manually a Procurement, you probably want to use a make to "
+"order method."
+msgstr ""
+
+#. module: procurement
+#: model:ir.ui.menu,name:procurement.menu_stock_procurement
+msgid "Automatic Procurements"
+msgstr "Otomatik Satınalmalar"
+
+#. module: procurement
+#: field:stock.warehouse.orderpoint,product_max_qty:0
+msgid "Max Quantity"
+msgstr "Max Miktar"
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_procurement_order
+#: model:process.process,name:procurement.process_process_procurementprocess0
+#: view:procurement.order:0
+msgid "Procurement"
+msgstr "Satınalma"
+
+#. module: procurement
+#: model:ir.actions.act_window,name:procurement.procurement_action
+msgid "Procurement Orders"
+msgstr "Satınalma Siparişleri"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "To Fix"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Exceptions"
+msgstr ""
+
+#. module: procurement
+#: model:process.node,note:procurement.process_node_serviceonorder0
+msgid "Assignment from Production or Purchase Order."
+msgstr ""
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_mrp_property
+msgid "Property"
+msgstr ""
+
+#. module: procurement
+#: model:ir.actions.act_window,name:procurement.act_make_procurement
+#: view:make.procurement:0
+msgid "Procurement Request"
+msgstr "Satınalma İsteği"
+
+#. module: procurement
+#: view:procurement.orderpoint.compute:0
+msgid "Compute Stock"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Late"
+msgstr "Geç"
+
+#. module: procurement
+#: model:process.process,name:procurement.process_process_serviceproductprocess0
+msgid "Service"
+msgstr "Hizmet"
+
+#. module: procurement
+#: model:ir.module.module,description:procurement.module_meta_information
+msgid ""
+"\n"
+"    This is the module for computing Procurements.\n"
+"    "
+msgstr ""
+
+#. module: procurement
+#: field:stock.warehouse.orderpoint,procurement_draft_ids:0
+msgid "Related Procurement Orders"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.orderpoint.compute:0
+msgid ""
+"Wizard checks all the stock minimum rules and generate procurement order."
+msgstr ""
+
+#. module: procurement
+#: field:stock.warehouse.orderpoint,product_min_qty:0
+msgid "Min Quantity"
+msgstr "Min. Miktar"
+
+#. module: procurement
+#: selection:procurement.order,priority:0
+msgid "Urgent"
+msgstr "Acil"
+
+#. module: procurement
+#: selection:mrp.property,composition:0
+msgid "plus"
+msgstr "artı"
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:319
+#, python-format
+msgid ""
+"Please check the Quantity in Procurement Order(s), it should not be less "
+"than 1!"
+msgstr ""
+"Lütfen satınalma sipariş(ler)indeki miktarı kontrol ediniz, 1 günden az "
+"olamaz!"
+
+#. module: procurement
+#: help:stock.warehouse.orderpoint,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the "
+"orderpoint without removing it."
+msgstr ""
+"Seçili alan 'False' ise, satınalma noktasını kaldırmadan gizlemenize izin "
+"verecektir."
+
+#. module: procurement
+#: help:stock.warehouse.orderpoint,product_max_qty:0
+msgid ""
+"When the virtual stock goes belong the Max Quantity, OpenERP generates a "
+"procurement to bring the virtual stock to the Max Quantity."
+msgstr ""
+
+#. module: procurement
+#: help:procurement.orderpoint.compute,automatic:0
+msgid "If the stock of a product is under 0, it will act like an orderpoint"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Procurement Lines"
+msgstr "Satınalma Kalemleri"
+
+#. module: procurement
+#: view:procurement.order.compute.all:0
+msgid ""
+"This wizard allows you to run all procurement, production and/or purchase "
+"orders that should be processed based on their configuration. By default, "
+"the scheduler is launched automatically every night by OpenERP. You can use "
+"this menu to force it to be launched now. Note that it runs in the "
+"background, you may have to wait for a few minutes until it has finished "
+"computing."
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+#: field:procurement.order,note:0
+msgid "Note"
+msgstr "Not"
+
+#. module: procurement
+#: selection:procurement.order,state:0
+msgid "Draft"
+msgstr "Taslak"
+
+#. module: procurement
+#: view:procurement.order.compute:0
+msgid "This wizard will schedule procurements."
+msgstr "Bu sihirbaz satınalmaları zamanlayacaktır."
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Status"
+msgstr "Durum"
+
+#. module: procurement
+#: selection:procurement.order,priority:0
+msgid "Normal"
+msgstr "Normal"
+
+#. module: procurement
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product"
+msgstr "Aynı üründen olmayan bir sarf atamaya çalışıyorsunuz"
+
+#. module: procurement
+#: field:stock.warehouse.orderpoint,active:0
+msgid "Active"
+msgstr "Aktif"
+
+#. module: procurement
+#: model:process.node,name:procurement.process_node_procureproducts0
+msgid "Procure Products"
+msgstr "Ürünleri Satınal"
+
+#. module: procurement
+#: field:procurement.order,date_planned:0
+msgid "Scheduled date"
+msgstr "Planlanan Tarih"
+
+#. module: procurement
+#: selection:procurement.order,state:0
+msgid "Exception"
+msgstr ""
+
+#. module: procurement
+#: code:addons/procurement/schedulers.py:179
+#, python-format
+msgid "Automatic OP: %s"
+msgstr ""
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_procurement_orderpoint_compute
+msgid "Automatic Order Point"
+msgstr ""
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_stock_warehouse_orderpoint
+msgid "Minimum Inventory Rule"
+msgstr ""
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Extra Information"
+msgstr ""
+
+#. module: procurement
+#: help:procurement.order,name:0
+msgid "Procurement name."
+msgstr ""
+
+#. module: procurement
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Procurement Reason"
+msgstr ""
+
+#. module: procurement
+#: sql_constraint:stock.warehouse.orderpoint:0
+msgid "Qty Multiple must be greater than zero."
+msgstr ""
+
+#. module: procurement
+#: selection:stock.warehouse.orderpoint,logic:0
+msgid "Order to Max"
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order,date_close:0
+msgid "Date Closed"
+msgstr "Kapanış Tarihi"
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:372
+#, python-format
+msgid "Procurement '%s' is in exception: not enough stock."
+msgstr ""
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:138
+#, python-format
+msgid "Cannot delete Procurement Order(s) which are in %s State!"
+msgstr ""
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:318
+#, python-format
+msgid "Data Insufficient !"
+msgstr "Yetersiz Bilgi !"
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_mrp_property_group
+#: field:mrp.property,group_id:0
+#: field:mrp.property.group,name:0
+msgid "Property Group"
+msgstr "Özellik Grubu"
+
+#. module: procurement
+#: view:stock.warehouse.orderpoint:0
+msgid "Misc"
+msgstr ""
+
+#. module: procurement
+#: view:stock.warehouse.orderpoint:0
+msgid "Locations"
+msgstr "Lokasyonlar"
+
+#. module: procurement
+#: selection:procurement.order,procure_method:0
+msgid "from stock"
+msgstr "Stoktan"
+
+#. module: procurement
+#: view:stock.warehouse.orderpoint:0
+msgid "General Information"
+msgstr "Genel Bilgi"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Run Procurement"
+msgstr ""
+
+#. module: procurement
+#: selection:procurement.order,state:0
+msgid "Done"
+msgstr "Tamamlandı"
+
+#. module: procurement
+#: help:stock.warehouse.orderpoint,qty_multiple:0
+msgid "The procurement quantity will by rounded up to this multiple."
+msgstr ""
+
+#. module: procurement
+#: view:make.procurement:0
+#: view:procurement.order:0
+#: selection:procurement.order,state:0
+#: view:procurement.order.compute:0
+#: view:procurement.order.compute.all:0
+#: view:procurement.orderpoint.compute:0
+msgid "Cancel"
+msgstr "Vazgeç"
+
+#. module: procurement
+#: field:stock.warehouse.orderpoint,logic:0
+msgid "Reordering Mode"
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order,origin:0
+msgid "Source Document"
+msgstr "Kaynak Belge"
+
+#. module: procurement
+#: selection:procurement.order,priority:0
+msgid "Not urgent"
+msgstr "Acil Değil"
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_procurement_order_compute_all
+msgid "Compute all schedulers"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Current"
+msgstr "Mevcut"
+
+#. module: procurement
+#: view:board.board:0
+msgid "Procurements in Exception"
+msgstr "İstisnai Satınalmalar"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Details"
+msgstr "Detaylar"
+
+#. module: procurement
+#: model:ir.actions.act_window,name:procurement.procurement_action5
+#: model:ir.actions.act_window,name:procurement.procurement_action_board
+#: model:ir.actions.act_window,name:procurement.procurement_exceptions
+#: model:ir.ui.menu,name:procurement.menu_stock_procurement_action
+msgid "Procurement Exceptions"
+msgstr ""
+
+#. module: procurement
+#: model:ir.actions.act_window,name:procurement.act_procurement_2_stock_warehouse_orderpoint
+#: model:ir.actions.act_window,name:procurement.act_product_product_2_stock_warehouse_orderpoint
+#: model:ir.actions.act_window,name:procurement.act_stock_warehouse_2_stock_warehouse_orderpoint
+#: model:ir.actions.act_window,name:procurement.action_orderpoint_form
+#: model:ir.ui.menu,name:procurement.menu_stock_order_points
+#: view:stock.warehouse.orderpoint:0
+msgid "Minimum Stock Rules"
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order,close_move:0
+msgid "Close Move at end"
+msgstr "Son Hareketi Kapat"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Scheduled Date"
+msgstr ""
+
+#. module: procurement
+#: field:make.procurement,product_id:0
+#: view:procurement.order:0
+#: field:procurement.order,product_id:0
+#: field:stock.warehouse.orderpoint,product_id:0
+msgid "Product"
+msgstr "Ürün"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Temporary"
+msgstr "Geçici"
+
+#. module: procurement
+#: field:mrp.property,description:0
+#: field:mrp.property.group,description:0
+msgid "Description"
+msgstr "Açıklama"
+
+#. module: procurement
+#: selection:mrp.property,composition:0
+msgid "min"
+msgstr "dk"
+
+#. module: procurement
+#: view:stock.warehouse.orderpoint:0
+msgid "Quantity Rules"
+msgstr ""
+
+#. module: procurement
+#: selection:procurement.order,state:0
+msgid "Running"
+msgstr ""
+
+#. module: procurement
+#: field:stock.warehouse.orderpoint,product_uom:0
+msgid "Product UOM"
+msgstr ""
+
+#. module: procurement
+#: model:process.node,name:procurement.process_node_serviceonorder0
+msgid "Make to Order"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "UOM"
+msgstr ""
+
+#. module: procurement
+#: selection:procurement.order,state:0
+msgid "Waiting"
+msgstr "Beklemede"
+
+#. module: procurement
+#: model:ir.actions.act_window,help:procurement.action_orderpoint_form
+msgid ""
+"You can define your minimum stock rules, so that OpenERP will automatically "
+"create draft manufacturing orders or purchase quotations according to the "
+"stock level. Once the virtual stock of a product (= stock on hand minus all "
+"confirmed orders and reservations) is below the minimum quantity, OpenERP "
+"will generate a procurement request to increase the stock up to the maximum "
+"quantity."
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order,move_id:0
+msgid "Reservation"
+msgstr "Rezervasyon"
+
+#. module: procurement
+#: model:process.node,note:procurement.process_node_procureproducts0
+msgid "The way to procurement depends on the product type."
+msgstr ""
+
+#. module: procurement
+#: view:make.procurement:0
+msgid ""
+"This wizard will plan the procurement for this product. This procurement may "
+"generate task, production orders or purchase orders."
+msgstr ""
+
+#. module: procurement
+#: view:res.company:0
+msgid "MRP & Logistics Scheduler"
+msgstr ""
+
+#. module: procurement
+#: field:mrp.property,name:0
+#: field:stock.warehouse.orderpoint,name:0
+msgid "Name"
+msgstr "Ad"
+
+#. module: procurement
+#: selection:mrp.property,composition:0
+msgid "max"
+msgstr "maks"
+
+#. module: procurement
+#: field:procurement.order,product_uos:0
+msgid "Product UoS"
+msgstr "Stok 2.Birim"
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:347
+#, python-format
+msgid "from stock: products assigned."
+msgstr ""
+
+#. module: procurement
+#: model:ir.actions.act_window,name:procurement.action_compute_schedulers
+#: model:ir.ui.menu,name:procurement.menu_stock_proc_schedulers
+#: view:procurement.order.compute.all:0
+msgid "Compute Schedulers"
+msgstr ""
+
+#. module: procurement
+#: model:ir.actions.act_window,help:procurement.procurement_exceptions
+msgid ""
+"Procurement Orders represent the need for a certain quantity of products, at "
+"a given time, in a given location. Sales Orders are one typical source of "
+"Procurement Orders (but these are distinct documents). Depending on the "
+"procurement parameters and the product configuration, the procurement engine "
+"will attempt to satisfy the need by reserving products from stock, ordering "
+"products from a supplier, or passing a manufacturing order, etc. A "
+"Procurement Exception occurs when the system cannot find a way to fulfill a "
+"procurement. Some exceptions will resolve themselves automatically, but "
+"others require manual intervention (those are identified by a specific error "
+"message)."
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order,product_uom:0
+msgid "Product UoM"
+msgstr "Birim"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Search Procurement"
+msgstr ""
+
+#. module: procurement
+#: help:res.company,schedule_range:0
+msgid ""
+"This is the time frame analysed by the scheduler when computing "
+"procurements. All procurements that are not between today and today+range "
+"are skipped for future computation."
+msgstr ""
+
+#. module: procurement
+#: selection:procurement.order,priority:0
+msgid "Very Urgent"
+msgstr "Çok Acil"
+
+#. module: procurement
+#: field:procurement.orderpoint.compute,automatic:0
+msgid "Automatic Orderpoint"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Procurement Details"
+msgstr "Satınalma Detayları"
+
+#. module: procurement
+#: code:addons/procurement/schedulers.py:180
+#, python-format
+msgid "SCHEDULER"
+msgstr "ZAMANLAYICI"
diff --git a/addons/profile_tools/i18n/ru.po b/addons/profile_tools/i18n/ru.po
new file mode 100644
index 00000000000..f5206b9b282
--- /dev/null
+++ b/addons/profile_tools/i18n/ru.po
@@ -0,0 +1,144 @@
+# Russian translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-04-23 20:51+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Russian <ru@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: 2011-04-24 04:37+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
+
+#. module: profile_tools
+#: help:misc_tools.installer,idea:0
+msgid "Promote ideas of the employees, votes and discussion on best ideas."
+msgstr ""
+
+#. module: profile_tools
+#: help:misc_tools.installer,share:0
+msgid ""
+"Allows you to give restricted access to your OpenERP documents to external "
+"users, such as customers, suppliers, or accountants. You can share any "
+"OpenERP Menu such as your project tasks, support requests, invoices, etc."
+msgstr ""
+
+#. module: profile_tools
+#: help:misc_tools.installer,lunch:0
+msgid "A simple module to help you to manage Lunch orders."
+msgstr ""
+
+#. module: profile_tools
+#: field:misc_tools.installer,subscription:0
+msgid "Recurring Documents"
+msgstr "Повторяющийся документ"
+
+#. module: profile_tools
+#: model:ir.model,name:profile_tools.model_misc_tools_installer
+msgid "misc_tools.installer"
+msgstr "misc_tools.installer"
+
+#. module: profile_tools
+#: model:ir.module.module,description:profile_tools.module_meta_information
+msgid ""
+"Installs tools for lunch,survey,subscription and audittrail\n"
+"    module\n"
+"    "
+msgstr ""
+
+#. module: profile_tools
+#: view:misc_tools.installer:0
+msgid ""
+"Extra Tools are applications that can help you improve your organization "
+"although they are not key for company management."
+msgstr ""
+
+#. module: profile_tools
+#: view:misc_tools.installer:0
+msgid "Configure"
+msgstr "Настройки"
+
+#. module: profile_tools
+#: help:misc_tools.installer,survey:0
+msgid "Allows you to organize surveys."
+msgstr "Позволяет организовать опросы."
+
+#. module: profile_tools
+#: model:ir.module.module,shortdesc:profile_tools.module_meta_information
+msgid "Miscellaneous Tools"
+msgstr "Разные инструменты"
+
+#. module: profile_tools
+#: help:misc_tools.installer,pad:0
+msgid ""
+"This module creates a tighter integration between a Pad instance of your "
+"choosing and your OpenERP Web Client by letting you easily link pads to "
+"OpenERP objects via OpenERP attachments."
+msgstr ""
+
+#. module: profile_tools
+#: field:misc_tools.installer,lunch:0
+msgid "Lunch"
+msgstr ""
+
+#. module: profile_tools
+#: view:misc_tools.installer:0
+msgid "Extra Tools Configuration"
+msgstr "Дополнительные инструменты настройки"
+
+#. module: profile_tools
+#: field:misc_tools.installer,idea:0
+msgid "Ideas Box"
+msgstr ""
+
+#. module: profile_tools
+#: help:misc_tools.installer,subscription:0
+msgid "Helps to generate automatically recurring documents."
+msgstr "Помогает генерировать автоматически повторяющиеся документы."
+
+#. module: profile_tools
+#: model:ir.actions.act_window,name:profile_tools.action_misc_tools_installer
+msgid "Tools Configuration"
+msgstr "Средства настройки"
+
+#. module: profile_tools
+#: field:misc_tools.installer,pad:0
+msgid "Collaborative Note Pads"
+msgstr ""
+
+#. module: profile_tools
+#: field:misc_tools.installer,survey:0
+msgid "Survey"
+msgstr "Опрос"
+
+#. module: profile_tools
+#: view:misc_tools.installer:0
+msgid "Configure Extra Tools"
+msgstr "Настроить дополнительные инструменты"
+
+#. module: profile_tools
+#: field:misc_tools.installer,progress:0
+msgid "Configuration Progress"
+msgstr "Настройка выполняется"
+
+#. module: profile_tools
+#: field:misc_tools.installer,config_logo:0
+msgid "Image"
+msgstr "Изображение"
+
+#. module: profile_tools
+#: view:misc_tools.installer:0
+msgid "title"
+msgstr ""
+
+#. module: profile_tools
+#: field:misc_tools.installer,share:0
+msgid "Web Share"
+msgstr ""
diff --git a/addons/project_mailgate/i18n/it.po b/addons/project_mailgate/i18n/it.po
index 971b25adfc3..496ea120808 100644
--- a/addons/project_mailgate/i18n/it.po
+++ b/addons/project_mailgate/i18n/it.po
@@ -8,19 +8,19 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-01-13 23:08+0000\n"
-"Last-Translator: Nicola Riolini - Micronaet <Unknown>\n"
+"PO-Revision-Date: 2011-04-22 09:54+0000\n"
+"Last-Translator: simone.sandri <Unknown>\n"
 "Language-Team: Italian <it@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: 2011-01-15 05:57+0000\n"
-"X-Generator: Launchpad (build 12177)\n"
+"X-Launchpad-Export-Date: 2011-04-23 04:53+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: project_mailgate
 #: view:project.task:0
 msgid "History Information"
-msgstr ""
+msgstr "Storico informazioni"
 
 #. module: project_mailgate
 #: model:ir.model,name:project_mailgate.model_project_task
@@ -87,13 +87,13 @@ msgstr "Annulla"
 #: code:addons/project_mailgate/project_mailgate.py:143
 #, python-format
 msgid "Done"
-msgstr ""
+msgstr "Completato"
 
 #. module: project_mailgate
 #: code:addons/project_mailgate/project_mailgate.py:129
 #, python-format
 msgid "Open"
-msgstr ""
+msgstr "Apri"
 
 #. module: project_mailgate
 #: code:addons/project_mailgate/project_mailgate.py:135
diff --git a/addons/project_planning/i18n/it.po b/addons/project_planning/i18n/it.po
index 469ebb0a801..9874347a7da 100644
--- a/addons/project_planning/i18n/it.po
+++ b/addons/project_planning/i18n/it.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-01-10 19:57+0000\n"
-"Last-Translator: Nicola Riolini - Micronaet <Unknown>\n"
+"PO-Revision-Date: 2011-04-25 10:56+0000\n"
+"Last-Translator: simone.sandri <Unknown>\n"
 "Language-Team: Italian <it@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: 2011-01-15 05:58+0000\n"
-"X-Generator: Launchpad (build 12177)\n"
+"X-Launchpad-Export-Date: 2011-04-26 04:41+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: project_planning
 #: constraint:account.analytic.account:0
@@ -52,7 +52,7 @@ msgstr "Riga Pianificazione"
 #. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Total Unallocated Time"
-msgstr ""
+msgstr "Totale tempo non allocato"
 
 #. module: project_planning
 #: field:report_account_analytic.planning,name:0
@@ -273,12 +273,12 @@ msgstr "Totale Pianificato"
 #. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Time Encoding"
-msgstr ""
+msgstr "Orario codificato"
 
 #. module: project_planning
 #: field:report_account_analytic.planning.user,free:0
 msgid "Unallocated Time"
-msgstr ""
+msgstr "Orario non codificato"
 
 #. module: project_planning
 #: help:report_account_analytic.planning.user,plan_open:0
@@ -292,7 +292,7 @@ msgstr ""
 #. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Delegate"
-msgstr ""
+msgstr "Delega"
 
 #. module: project_planning
 #: help:report_account_analytic.planning.user,free:0
@@ -300,6 +300,8 @@ msgid ""
 "Computed as Business Days - (Time Allocation of Tasks + Time Allocation "
 "without Tasks + Holiday Leaves)"
 msgstr ""
+"Calcolato come un giorno lavorativo - (Tempo allocato per attività + Tempo "
+"allocato senza attività + Permessi ferie)"
 
 #. module: project_planning
 #: help:report_account_analytic.planning,business_days:0
@@ -340,7 +342,7 @@ msgstr "Pianificazioni per conto (in giorni)"
 #. module: project_planning
 #: report:report_account_analytic.planning.print:0
 msgid "Time without tasks"
-msgstr ""
+msgstr "Tempo senza attività"
 
 #. module: project_planning
 #: field:report_account_analytic.planning,date_from:0
@@ -350,7 +352,7 @@ msgstr "Data inizio"
 #. module: project_planning
 #: field:report_account_analytic.planning,total_free:0
 msgid "Total Free"
-msgstr ""
+msgstr "Totalmente Libero"
 
 #. module: project_planning
 #: help:report_account_analytic.planning.account,plan_tasks:0
@@ -470,12 +472,12 @@ msgstr "Aziende"
 #. module: project_planning
 #: field:report_account_analytic.planning.line,amount_in_base_uom:0
 msgid "Quantity in base uom"
-msgstr ""
+msgstr "Quantità nell'u.m. di base"
 
 #. module: project_planning
 #: field:report_account_analytic.planning.user,plan_tasks:0
 msgid "Time Planned on Tasks"
-msgstr ""
+msgstr "Tempo pianificato per attività"
 
 #. module: project_planning
 #: field:report_account_analytic.planning.line,amount:0
@@ -518,7 +520,7 @@ msgstr "Statistiche di Pianificazione"
 #: view:report_account_analytic.planning:0
 #: selection:report_account_analytic.planning,state:0
 msgid "Open"
-msgstr ""
+msgstr "Apri"
 
 #. module: project_planning
 #: model:ir.model,name:project_planning.model_report_account_analytic_planning_user
@@ -564,7 +566,7 @@ msgstr "Cronologia per Utente"
 #. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Total Time Allocation without Tasks"
-msgstr ""
+msgstr "Totale tempo allocato senza attività"
 
 #. module: project_planning
 #: field:report_account_analytic.planning.user,holiday:0
diff --git a/addons/sale/i18n/ru.po b/addons/sale/i18n/ru.po
index 81c1b81fac3..badd0a459d6 100644
--- a/addons/sale/i18n/ru.po
+++ b/addons/sale/i18n/ru.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2011-03-23 14:07+0000\n"
-"Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
+"PO-Revision-Date: 2011-04-21 13:03+0000\n"
+"Last-Translator: Stanislav Hanzhin <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: 2011-03-24 04:50+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-04-22 04:38+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: sale
 #: view:board.board:0
@@ -457,6 +457,9 @@ msgid ""
 "Select a product of type service which is called 'Advance Product'. You may "
 "have to create it and set it as a default value on this field."
 msgstr ""
+"Выберите значение с названием «Предварительное изделие» имеющий тип "
+"«Услуга». Возможно вам понадобится создать его и установить в качестве "
+"значения по-умолчанию для этого поля."
 
 #. module: sale
 #: report:sale.order:0
@@ -1892,7 +1895,7 @@ msgstr "Журналы счетов"
 #. module: sale
 #: field:sale.advance.payment.inv,product_id:0
 msgid "Advance Product"
-msgstr ""
+msgstr "Продвижение продукта"
 
 #. module: sale
 #: view:sale.report:0
@@ -2088,7 +2091,7 @@ msgstr "Апрель"
 #. module: sale
 #: view:sale.shop:0
 msgid "Accounting"
-msgstr "Бухгалтерский учет"
+msgstr "Бухгалтерия"
 
 #. module: sale
 #: field:sale.config.picking_policy,step:0
diff --git a/addons/sale_crm/i18n/it.po b/addons/sale_crm/i18n/it.po
index 3e00ac4d29a..4b1babbc4e3 100644
--- a/addons/sale_crm/i18n/it.po
+++ b/addons/sale_crm/i18n/it.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2011-01-15 19:42+0000\n"
-"Last-Translator: Nicola Riolini - Micronaet <Unknown>\n"
+"PO-Revision-Date: 2011-04-25 10:56+0000\n"
+"Last-Translator: simone.sandri <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: 2011-03-18 04:46+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-04-26 04:41+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: sale_crm
 #: field:crm.make.sale,partner_id:0
@@ -30,7 +30,7 @@ msgstr "Converti in preventivo"
 #: code:addons/sale_crm/wizard/crm_make_sale.py:108
 #, python-format
 msgid "Opportunity  '%s' is converted to Quotation."
-msgstr ""
+msgstr "L'opportunità '%s' è stata convertita in Quotazione."
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:89
diff --git a/addons/sale_mrp/i18n/ru.po b/addons/sale_mrp/i18n/ru.po
index bbc8dd0e71b..10e2fb3de1d 100644
--- a/addons/sale_mrp/i18n/ru.po
+++ b/addons/sale_mrp/i18n/ru.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2010-12-25 11:19+0000\n"
-"Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
+"PO-Revision-Date: 2011-04-25 08:59+0000\n"
+"Last-Translator: Stanislav Hanzhin <Unknown>\n"
 "Language-Team: Russian <ru@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: 2011-01-15 05:51+0000\n"
-"X-Generator: Launchpad (build 12177)\n"
+"X-Launchpad-Export-Date: 2011-04-26 04:41+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: sale_mrp
 #: help:mrp.production,sale_ref:0

From bcbccd8eb8cf6602546bf2292b698d1d2692703f Mon Sep 17 00:00:00 2001
From: "pso (OpenERP)" <pso@tinyerp.com>
Date: Tue, 26 Apr 2011 11:07:14 +0530
Subject: [PATCH 307/331] [FIX] hr_holidays: Wrong allocation request created
 when allocating holidays per category of employee

lp bug: https://launchpad.net/bugs/767238 fixed

bzr revid: pso@tinyerp.com-20110426053714-i0jpn1fh620mk1j4
---
 addons/hr_holidays/hr_holidays.py       | 2 ++
 addons/hr_holidays/hr_holidays_view.xml | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index 131d38d7001..8cb2845f81b 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -167,6 +167,8 @@ class hr_holidays(osv.osv):
                 result['value'] = {
                     'employee_id': ids_employee[0]
                 }
+        else:
+            result['value'] = {'employee_id': False}
         return result
 
     # TODO: can be improved using resource calendar method
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index f49b2ab388a..f7705da0eef 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -36,6 +36,7 @@
                     </group>
                     <newline />
                     <group expand="0" string="Group By...">
+                    	<filter name="group_category" string="Category" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'category_id'}"/>
                         <filter name="group_employee" string="Employee" icon="terp-personal" domain="[]" context="{'group_by':'employee_id'}"/>
                         <filter string="Manager" icon="terp-personal" domain="[]" context="{'group_by':'manager_id'}"/>
                         <filter string="Department" icon="terp-personal+" domain="[]" context="{'group_by':'department_id','set_visible':True}"/>
@@ -153,7 +154,9 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree colors="red:state in ('refuse');blue:state in ('draft');black:state in ('confirm','validate','validate1')" string="Leaves" >
+                	<field name="holiday_type"/>
                     <field name="employee_id"/>
+                    <field name="category_id"/>
                     <field name="department_id" invisible="1"/>
                     <field name="holiday_status_id"/>
                     <field name="name"/>
@@ -232,6 +235,7 @@
             <field name="arch" type="xml">
                 <tree colors="red:state in ('refuse');blue:state in (' draft');black:state in ('confirm','validate','validate1')">
                     <field name="employee_id"/>
+                    <field name="category_id"/>
                     <field name="department_id" invisible="not context.get('set_visible',False)"/>
                     <field name="holiday_status_id"/>
                     <field name="name"/>

From 2703b86ef35f89740c4a172c8eb1f102078ad6fd Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Tue, 26 Apr 2011 06:03:05 +0000
Subject: [PATCH 308/331] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20110422055202-ctwv344tim8z1n9o
bzr revid: launchpad_translations_on_behalf_of_openerp-20110423060157-7dr4w1qwt3d0ft4h
bzr revid: launchpad_translations_on_behalf_of_openerp-20110424055249-en4wmwvvc63urzsl
bzr revid: launchpad_translations_on_behalf_of_openerp-20110425054353-a1bc27qj9y7j9hno
bzr revid: launchpad_translations_on_behalf_of_openerp-20110412060648-p30wsy7rnvddoyi2
bzr revid: launchpad_translations_on_behalf_of_openerp-20110413143501-b2r1v15r95ylrc2z
bzr revid: launchpad_translations_on_behalf_of_openerp-20110417061319-lmcuaxd300qw9qo1
bzr revid: launchpad_translations_on_behalf_of_openerp-20110419062059-25ehhurcvn9xsimx
bzr revid: launchpad_translations_on_behalf_of_openerp-20110420055644-i4guk2akxjkjgcg8
bzr revid: launchpad_translations_on_behalf_of_openerp-20110421060042-no595bx60hx6vr5g
bzr revid: launchpad_translations_on_behalf_of_openerp-20110422055127-d75yswj1g6f9owd4
bzr revid: launchpad_translations_on_behalf_of_openerp-20110423060138-12g9b7vd4uznergh
bzr revid: launchpad_translations_on_behalf_of_openerp-20110424055223-spk6mo1gtk5pmi6p
bzr revid: launchpad_translations_on_behalf_of_openerp-20110425054328-upp949j3yvgy0ckf
bzr revid: launchpad_translations_on_behalf_of_openerp-20110426060305-ck37iacq1f9zmjie
---
 addons/account/i18n/de.po              |    2 +-
 addons/account/i18n/ru.po              |    6 +-
 addons/account_payment/i18n/id.po      |    2 +-
 addons/account_sequence/i18n/pt.po     |  221 ++++
 addons/base_action_rule/i18n/ru.po     |   26 +-
 addons/base_calendar/i18n/it.po        |   16 +-
 addons/base_calendar/i18n/ru.po        |  283 ++--
 addons/base_calendar/i18n/tr.po        | 1660 ++++++++++++++++++++++++
 addons/base_contact/i18n/ru.po         |   30 +-
 addons/base_crypt/i18n/ru.po           |   27 +-
 addons/base_iban/i18n/ru.po            |   30 +-
 addons/crm/i18n/ru.po                  |   27 +-
 addons/crm_claim/i18n/ru.po            |  254 ++--
 addons/document/i18n/ru.po             |  127 +-
 addons/document_ftp/i18n/ru.po         |    8 +-
 addons/l10n_br/i18n/tr.po              |    2 +-
 addons/process/i18n/ru.po              |   10 +-
 addons/product_manufacturer/i18n/ru.po |   18 +-
 addons/profile_tools/i18n/it.po        |   10 +-
 addons/profile_tools/i18n/ru.po        |  144 ++
 addons/project_issue/i18n/fr.po        |   10 +-
 addons/project_mailgate/i18n/it.po     |   14 +-
 addons/purchase/i18n/pt.po             |   10 +-
 addons/sale/i18n/pt.po                 |   67 +-
 addons/sale/i18n/ru.po                 |    2 +-
 addons/stock/i18n/ru.po                |    2 +-
 addons/users_ldap/i18n/pt.po           |   18 +-
 bin/addons/base/i18n/pt_BR.po          |   12 +-
 bin/addons/base/i18n/ro.po             |   29 +-
 bin/addons/base/i18n/ru.po             |  527 +++++---
 bin/addons/base/i18n/vi.po             |   22 +-
 debian/po/ru.po                        |   10 +-
 32 files changed, 2998 insertions(+), 628 deletions(-)
 create mode 100644 addons/account_sequence/i18n/pt.po
 create mode 100644 addons/base_calendar/i18n/tr.po
 create mode 100644 addons/profile_tools/i18n/ru.po

diff --git a/addons/account/i18n/de.po b/addons/account/i18n/de.po
index d6527fe9306..f911e3a449c 100644
--- a/addons/account/i18n/de.po
+++ b/addons/account/i18n/de.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-21 06:01+0000\n"
+"X-Launchpad-Export-Date: 2011-04-22 05:51+0000\n"
 "X-Generator: Launchpad (build 12758)\n"
 
 #. module: account
diff --git a/addons/account/i18n/ru.po b/addons/account/i18n/ru.po
index 7a7630e4bd0..d5e44c8c879 100644
--- a/addons/account/i18n/ru.po
+++ b/addons/account/i18n/ru.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-04-19 17:03+0000\n"
-"Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
+"PO-Revision-Date: 2011-04-24 14:55+0000\n"
+"Last-Translator: Stanislav Hanzhin <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: 2011-04-20 05:56+0000\n"
+"X-Launchpad-Export-Date: 2011-04-25 05:43+0000\n"
 "X-Generator: Launchpad (build 12758)\n"
 
 #. module: account
diff --git a/addons/account_payment/i18n/id.po b/addons/account_payment/i18n/id.po
index 64cc3ba120e..66b7d844f0b 100644
--- a/addons/account_payment/i18n/id.po
+++ b/addons/account_payment/i18n/id.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-21 06:01+0000\n"
+"X-Launchpad-Export-Date: 2011-04-22 05:51+0000\n"
 "X-Generator: Launchpad (build 12758)\n"
 
 #. module: account_payment
diff --git a/addons/account_sequence/i18n/pt.po b/addons/account_sequence/i18n/pt.po
new file mode 100644
index 00000000000..ebe55f120d7
--- /dev/null
+++ b/addons/account_sequence/i18n/pt.po
@@ -0,0 +1,221 @@
+# Portuguese translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2011-04-24 03:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Portuguese <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: 2011-04-25 05:43+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
+
+#. module: account_sequence
+#: view:account.sequence.installer:0
+#: model:ir.actions.act_window,name:account_sequence.action_account_seq_installer
+msgid "Account Sequence Application Configuration"
+msgstr ""
+
+#. module: account_sequence
+#: constraint:account.move:0
+msgid ""
+"You cannot create entries on different periods/journals in the same move"
+msgstr ""
+
+#. module: account_sequence
+#: help:account.move,internal_sequence_number:0
+#: help:account.move.line,internal_sequence_number:0
+msgid "Internal Sequence Number"
+msgstr ""
+
+#. module: account_sequence
+#: help:account.sequence.installer,number_next:0
+msgid "Next number of this sequence"
+msgstr ""
+
+#. module: account_sequence
+#: field:account.sequence.installer,number_next:0
+msgid "Next Number"
+msgstr ""
+
+#. module: account_sequence
+#: field:account.sequence.installer,number_increment:0
+msgid "Increment Number"
+msgstr ""
+
+#. module: account_sequence
+#: model:ir.module.module,description:account_sequence.module_meta_information
+msgid ""
+"\n"
+"    This module maintains internal sequence number for accounting entries.\n"
+"    "
+msgstr ""
+
+#. module: account_sequence
+#: model:ir.module.module,shortdesc:account_sequence.module_meta_information
+msgid "Entries Sequence Numbering"
+msgstr ""
+
+#. module: account_sequence
+#: help:account.sequence.installer,number_increment:0
+msgid "The next number of the sequence will be incremented by this number"
+msgstr ""
+
+#. module: account_sequence
+#: view:account.sequence.installer:0
+msgid "Configure Your Account Sequence Application"
+msgstr ""
+
+#. module: account_sequence
+#: field:account.sequence.installer,progress:0
+msgid "Configuration Progress"
+msgstr ""
+
+#. module: account_sequence
+#: help:account.sequence.installer,suffix:0
+msgid "Suffix value of the record for the sequence"
+msgstr ""
+
+#. module: account_sequence
+#: field:account.sequence.installer,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: account_sequence
+#: help:account.journal,internal_sequence_id:0
+msgid ""
+"This sequence will be used to maintain the internal number for the journal "
+"entries related to this journal."
+msgstr ""
+
+#. module: account_sequence
+#: field:account.sequence.installer,padding:0
+msgid "Number padding"
+msgstr ""
+
+#. module: account_sequence
+#: model:ir.model,name:account_sequence.model_account_move_line
+msgid "Journal Items"
+msgstr ""
+
+#. module: account_sequence
+#: field:account.move,internal_sequence_number:0
+#: field:account.move.line,internal_sequence_number:0
+msgid "Internal Number"
+msgstr ""
+
+#. module: account_sequence
+#: constraint:account.move.line:0
+msgid "Company must be same for its related account and period."
+msgstr ""
+
+#. module: account_sequence
+#: help:account.sequence.installer,padding:0
+msgid ""
+"OpenERP will automatically adds some '0' on the left of the 'Next Number' to "
+"get the required padding size."
+msgstr ""
+
+#. module: account_sequence
+#: field:account.sequence.installer,name:0
+msgid "Name"
+msgstr ""
+
+#. module: account_sequence
+#: constraint:account.move.line:0
+msgid "You can not create move line on closed account."
+msgstr ""
+
+#. module: account_sequence
+#: constraint:account.move:0
+msgid ""
+"You cannot create more than one move per period on centralized journal"
+msgstr ""
+
+#. module: account_sequence
+#: sql_constraint:account.move.line:0
+msgid "Wrong credit or debit value in accounting entry !"
+msgstr ""
+
+#. module: account_sequence
+#: field:account.journal,internal_sequence_id:0
+msgid "Internal Sequence"
+msgstr ""
+
+#. module: account_sequence
+#: model:ir.model,name:account_sequence.model_account_sequence_installer
+msgid "account.sequence.installer"
+msgstr ""
+
+#. module: account_sequence
+#: view:account.sequence.installer:0
+msgid "Configure"
+msgstr ""
+
+#. module: account_sequence
+#: help:account.sequence.installer,prefix:0
+msgid "Prefix value of the record for the sequence"
+msgstr ""
+
+#. module: account_sequence
+#: model:ir.model,name:account_sequence.model_account_move
+msgid "Account Entry"
+msgstr ""
+
+#. module: account_sequence
+#: field:account.sequence.installer,suffix:0
+msgid "Suffix"
+msgstr ""
+
+#. module: account_sequence
+#: field:account.sequence.installer,config_logo:0
+msgid "Image"
+msgstr ""
+
+#. module: account_sequence
+#: view:account.sequence.installer:0
+msgid "title"
+msgstr ""
+
+#. module: account_sequence
+#: sql_constraint:account.journal:0
+msgid "The name of the journal must be unique per company !"
+msgstr ""
+
+#. module: account_sequence
+#: field:account.sequence.installer,prefix:0
+msgid "Prefix"
+msgstr ""
+
+#. module: account_sequence
+#: sql_constraint:account.journal:0
+msgid "The code of the journal must be unique per company !"
+msgstr ""
+
+#. module: account_sequence
+#: constraint:account.move.line:0
+msgid ""
+"You can not create move line on receivable/payable account without partner"
+msgstr ""
+
+#. module: account_sequence
+#: model:ir.model,name:account_sequence.model_account_journal
+msgid "Journal"
+msgstr ""
+
+#. module: account_sequence
+#: view:account.sequence.installer:0
+msgid "You can enhance the Account Sequence Application by installing ."
+msgstr ""
+
+#. module: account_sequence
+#: constraint:account.move.line:0
+msgid "You can not create move line on view account."
+msgstr ""
diff --git a/addons/base_action_rule/i18n/ru.po b/addons/base_action_rule/i18n/ru.po
index cdaebacb65f..3c3c054b376 100644
--- a/addons/base_action_rule/i18n/ru.po
+++ b/addons/base_action_rule/i18n/ru.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-01-19 12:00+0000\n"
-"Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
+"PO-Revision-Date: 2011-04-24 15:18+0000\n"
+"Last-Translator: Stanislav Hanzhin <Unknown>\n"
 "Language-Team: Russian <ru@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: 2011-01-25 06:29+0000\n"
-"X-Generator: Launchpad (build 12177)\n"
+"X-Launchpad-Export-Date: 2011-04-25 05:43+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_user:0
@@ -78,7 +78,7 @@ msgstr "Дней"
 #. module: base_action_rule
 #: field:base.action.rule,last_run:0
 msgid "Last Run"
-msgstr ""
+msgstr "Последнее выполнение"
 
 #. module: base_action_rule
 #: code:addons/base_action_rule/base_action_rule.py:313
@@ -135,7 +135,7 @@ msgstr "Партнер"
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "%(object_subject)s = Object subject"
-msgstr ""
+msgstr "%(object_subject)s = Тема объекта"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
@@ -160,11 +160,16 @@ msgid ""
 "specific sales team, or an opportunity which still has status pending after "
 "14 days might trigger an automatic reminder email."
 msgstr ""
+"Использовуйте автоматизацию для автоматического выполнения действий на "
+"разных экранах. Например, кандидат, созданный конкретным пользователем, "
+"может быть автоматически назначен конкретной команде менеджеров по продажам, "
+"или по предложению, по истечении 14 дней находящемуся в статусе «в "
+"ожидании», автоматически будет выслано напоминание."
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_email:0
 msgid "Email-id of the persons whom mail is to be sent"
-msgstr ""
+msgstr "Электронные адреса получателей почтового сообщения"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
@@ -228,6 +233,8 @@ msgid ""
 "Use a python expression to specify the right field on which one than we will "
 "use for the 'To' field of the header"
 msgstr ""
+"Используйте выражение на Python для указания поля, которое будет "
+"использовано в качестве поля заголовка «Кому»"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
@@ -257,6 +264,9 @@ msgid ""
 "string 'urgent'\n"
 "Note: This is case sensitive search."
 msgstr ""
+"Регулярное выражение для проверки названия ресурса\n"
+"напр. 'urgent.*' соответствует записям, начинающимся со строки 'urgent'.\n"
+"Прим.: поиск чувствителен к регистру."
 
 #. module: base_action_rule
 #: field:base.action.rule,act_method:0
@@ -293,6 +303,8 @@ msgid ""
 "Use a python expression to specify the right field on which one than we will "
 "use for the 'From' field of the header"
 msgstr ""
+"Используйте выражение на Python для указания поля, которое будет "
+"использовано в качестве поля заголовка «От кого»"
 
 #. module: base_action_rule
 #: field:base.action.rule,trg_date_range:0
diff --git a/addons/base_calendar/i18n/it.po b/addons/base_calendar/i18n/it.po
index 4b06f341550..c340257160e 100644
--- a/addons/base_calendar/i18n/it.po
+++ b/addons/base_calendar/i18n/it.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-01-19 12:00+0000\n"
-"Last-Translator: Nicola Riolini - Micronaet <Unknown>\n"
+"PO-Revision-Date: 2011-04-22 10:11+0000\n"
+"Last-Translator: simone.sandri <Unknown>\n"
 "Language-Team: Italian <it@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: 2011-01-25 06:29+0000\n"
-"X-Generator: Launchpad (build 12177)\n"
+"X-Launchpad-Export-Date: 2011-04-23 06:01+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_related:0
@@ -133,7 +133,7 @@ msgstr "Pubblico"
 #. module: base_calendar
 #: view:calendar.event:0
 msgid " "
-msgstr ""
+msgstr " "
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,month_list:0
@@ -607,7 +607,7 @@ msgstr "Risposta richiesta"
 #: selection:calendar.event,end_type:0
 #: selection:calendar.todo,end_type:0
 msgid "Forever"
-msgstr ""
+msgstr "Per sempre"
 
 #. module: base_calendar
 #: selection:calendar.attendee,role:0
@@ -876,7 +876,7 @@ msgstr "Invito da"
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "End of recurrency"
-msgstr ""
+msgstr "Fine della ricorrenza"
 
 #. module: base_calendar
 #: view:calendar.event:0
@@ -1139,7 +1139,7 @@ msgstr "Definisce l'azione che verrà eseguita quando scatta un avviso"
 #: selection:calendar.event,end_type:0
 #: selection:calendar.todo,end_type:0
 msgid "End date"
-msgstr ""
+msgstr "Data finale"
 
 #. module: base_calendar
 #: view:calendar.event:0
diff --git a/addons/base_calendar/i18n/ru.po b/addons/base_calendar/i18n/ru.po
index d7f0de6df9e..da89bd9fc4d 100644
--- a/addons/base_calendar/i18n/ru.po
+++ b/addons/base_calendar/i18n/ru.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-03-24 15:51+0000\n"
-"Last-Translator: Viktor Prokopiev <Unknown>\n"
+"PO-Revision-Date: 2011-04-24 21:46+0000\n"
+"Last-Translator: Stanislav Hanzhin <Unknown>\n"
 "Language-Team: Russian <ru@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: 2011-03-25 06:14+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-04-25 05:43+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_related:0
@@ -31,7 +31,7 @@ msgstr "Ежечасно"
 #. module: base_calendar
 #: view:calendar.attendee:0
 msgid "Required to Join"
-msgstr ""
+msgstr "Необходимо присутствие"
 
 #. module: base_calendar
 #: help:calendar.event,exdate:0
@@ -40,6 +40,8 @@ msgid ""
 "This property defines the list of date/time exceptions for a recurring "
 "calendar component."
 msgstr ""
+"Это свойство определяет список исключений дат/времени для повторяющихся "
+"элементов календаря."
 
 #. module: base_calendar
 #: constraint:res.users:0
@@ -92,7 +94,7 @@ msgstr "Воскресенье"
 #: view:calendar.attendee:0
 #: field:calendar.attendee,role:0
 msgid "Role"
-msgstr ""
+msgstr "Роль"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
@@ -178,7 +180,7 @@ msgstr "Свободно"
 #. module: base_calendar
 #: help:calendar.attendee,rsvp:0
 msgid "Indicats whether the favor of a reply is requested"
-msgstr ""
+msgstr "Указывает, требуется ли ответ"
 
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_ir_attachment
@@ -188,7 +190,7 @@ msgstr "ir.attachment"
 #. module: base_calendar
 #: help:calendar.attendee,delegated_to:0
 msgid "The users that the original request was delegated to"
-msgstr ""
+msgstr "Пользователи, которым был делегирован запрос"
 
 #. module: base_calendar
 #: field:calendar.attendee,ref:0
@@ -237,7 +239,7 @@ msgstr "Последний"
 #. module: base_calendar
 #: help:calendar.attendee,state:0
 msgid "Status of the attendee's participation"
-msgstr ""
+msgstr "Статус приглашённого"
 
 #. module: base_calendar
 #: selection:calendar.attendee,cutype:0
@@ -271,7 +273,7 @@ msgstr "Ошибка!"
 #. module: base_calendar
 #: selection:calendar.attendee,role:0
 msgid "Chair Person"
-msgstr ""
+msgstr "Председатель"
 
 #. module: base_calendar
 #: selection:calendar.alarm,action:0
@@ -298,7 +300,7 @@ msgstr "Отобразить"
 #. module: base_calendar
 #: view:calendar.event.edit.all:0
 msgid "Edit all Occurrences"
-msgstr ""
+msgstr "Редактировать все повторения"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
@@ -308,7 +310,7 @@ msgstr "Тип приглашения"
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,freq:0
 msgid "Secondly"
-msgstr ""
+msgstr "Дважды"
 
 #. module: base_calendar
 #: field:calendar.alarm,event_date:0
@@ -327,6 +329,7 @@ msgstr "Группировать по ..."
 #: help:base_calendar.invite.attendee,email:0
 msgid "Provide external email address who will receive this invitation."
 msgstr ""
+"Укажите внешний почтовый адрес, на который будет отправлено приглашение."
 
 #. module: base_calendar
 #: model:ir.module.module,description:base_calendar.module_meta_information
@@ -337,11 +340,16 @@ msgid ""
 "    - Recurring events\n"
 "    - Invitations to people"
 msgstr ""
+"Полнофункциональная система планирования с поддержкой:\n"
+"    - Календаря событий\n"
+"    - Уведомлений (создания запросов)\n"
+"    - Повторения событий\n"
+"    - Приглашения участников"
 
 #. module: base_calendar
 #: help:calendar.attendee,cutype:0
 msgid "Specify the type of Invitation"
-msgstr ""
+msgstr "Укажите тип приглашения"
 
 #. module: base_calendar
 #: selection:calendar.event,freq:0
@@ -358,7 +366,7 @@ msgstr "Окончание события"
 #. module: base_calendar
 #: selection:calendar.attendee,role:0
 msgid "Optional Participation"
-msgstr ""
+msgstr "Необязательное участие"
 
 #. module: base_calendar
 #: field:calendar.event,date_deadline:0
@@ -381,6 +389,8 @@ msgid ""
 "If the active field is set to          true, it will allow you to hide the "
 "event alarm information without removing it."
 msgstr ""
+"Если в поле «Активно» установлено значение Истина, вы сможете скрыть "
+"информацию об уведомлении без её удаления."
 
 #. module: base_calendar
 #: model:ir.module.module,shortdesc:base_calendar.module_meta_information
@@ -413,7 +423,7 @@ msgstr "Событие"
 #: help:calendar.event,edit_all:0
 #: help:calendar.todo,edit_all:0
 msgid "Edit all Occurrences  of recurrent Meeting."
-msgstr ""
+msgstr "Изменить все повторяющиеся встречи"
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_occurs:0
@@ -475,7 +485,7 @@ msgstr "Опции напоминания"
 #. module: base_calendar
 #: field:calendar.attendee,parent_ids:0
 msgid "Delegrated From"
-msgstr ""
+msgstr "Делегировано"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,select1:0
@@ -512,26 +522,26 @@ msgstr "Подробности события"
 #. module: base_calendar
 #: selection:calendar.alarm,state:0
 msgid "Run"
-msgstr ""
+msgstr "Выполняется"
 
 #. module: base_calendar
 #: field:calendar.event,exdate:0
 #: field:calendar.todo,exdate:0
 msgid "Exception Date/Times"
-msgstr ""
+msgstr "Дата/время исключительной ситуации"
 
 #. module: base_calendar
 #: selection:calendar.event,class:0
 #: selection:calendar.todo,class:0
 msgid "Confidential"
-msgstr ""
+msgstr "Конфиденциально"
 
 #. module: base_calendar
 #: field:base.calendar.set.exrule,end_date:0
 #: field:calendar.event,end_date:0
 #: field:calendar.todo,end_date:0
 msgid "Repeat Until"
-msgstr ""
+msgstr "Повторять до"
 
 #. module: base_calendar
 #: model:ir.actions.act_window,help:base_calendar.action_res_alarm_view
@@ -539,146 +549,148 @@ msgid ""
 "Create specific calendar alarms that may be assigned to calendar events or "
 "meetings."
 msgstr ""
+"Создайте специальное уведомление в календаре, назначаемое событиями или "
+"встречам."
 
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Visibility"
-msgstr ""
+msgstr "Видимость"
 
 #. module: base_calendar
 #: field:calendar.attendee,rsvp:0
 msgid "Required Reply?"
-msgstr ""
+msgstr "Ответ обязателен?"
 
 #. module: base_calendar
 #: field:calendar.event,base_calendar_url:0
 #: field:calendar.todo,base_calendar_url:0
 msgid "Caldav URL"
-msgstr ""
+msgstr "Адрес Caldav"
 
 #. module: base_calendar
 #: view:base.calendar.set.exrule:0
 msgid "Select range to Exclude"
-msgstr ""
+msgstr "Выберите диапазон для исключения"
 
 #. module: base_calendar
 #: field:calendar.event,recurrent_uid:0
 #: field:calendar.todo,recurrent_uid:0
 msgid "Recurrent ID"
-msgstr ""
+msgstr "Повторяющийся ID"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,month_list:0
 #: selection:calendar.event,month_list:0
 #: selection:calendar.todo,month_list:0
 msgid "July"
-msgstr ""
+msgstr "Июль"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 #: selection:calendar.attendee,state:0
 msgid "Accepted"
-msgstr ""
+msgstr "Принято"
 
 #. module: base_calendar
 #: field:base.calendar.set.exrule,th:0
 #: field:calendar.event,th:0
 #: field:calendar.todo,th:0
 msgid "Thu"
-msgstr ""
+msgstr "Чтв"
 
 #. module: base_calendar
 #: field:calendar.attendee,child_ids:0
 msgid "Delegrated To"
-msgstr ""
+msgstr "Поручено"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 msgid "Required Reply"
-msgstr ""
+msgstr "Требуется ответ"
 
 #. module: base_calendar
 #: selection:calendar.event,end_type:0
 #: selection:calendar.todo,end_type:0
 msgid "Forever"
-msgstr ""
+msgstr "Вечно"
 
 #. module: base_calendar
 #: selection:calendar.attendee,role:0
 msgid "Participation required"
-msgstr ""
+msgstr "Участие требуется"
 
 #. module: base_calendar
 #: view:base.calendar.set.exrule:0
 msgid "_Cancel"
-msgstr ""
+msgstr "_Отменить"
 
 #. module: base_calendar
 #: field:calendar.event,create_date:0
 #: field:calendar.todo,create_date:0
 msgid "Created"
-msgstr ""
+msgstr "Создано"
 
 #. module: base_calendar
 #: selection:calendar.event,class:0
 #: selection:calendar.todo,class:0
 msgid "Private"
-msgstr ""
+msgstr "Личное"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,freq:0
 #: selection:calendar.event,rrule_type:0
 #: selection:calendar.todo,rrule_type:0
 msgid "Daily"
-msgstr ""
+msgstr "Ежедневно"
 
 #. module: base_calendar
 #: code:addons/base_calendar/base_calendar.py:385
 #, python-format
 msgid "Can not Duplicate"
-msgstr ""
+msgstr "Невозможно дублировать"
 
 #. module: base_calendar
 #: field:calendar.event,class:0
 #: field:calendar.todo,class:0
 msgid "Mark as"
-msgstr ""
+msgstr "Отметить как"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 #: field:calendar.attendee,partner_address_id:0
 msgid "Contact"
-msgstr ""
+msgstr "Контакт"
 
 #. module: base_calendar
 #: help:calendar.event,rrule_type:0
 #: help:calendar.todo,rrule_type:0
 msgid "Let the event automatically repeat at that interval"
-msgstr ""
+msgstr "Пусть событие автоматически повторяется с этим интервалом"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 #: view:calendar.event:0
 msgid "Delegate"
-msgstr ""
+msgstr "Поручить"
 
 #. module: base_calendar
 #: field:base_calendar.invite.attendee,partner_id:0
 #: view:calendar.attendee:0
 #: field:calendar.attendee,partner_id:0
 msgid "Partner"
-msgstr ""
+msgstr "Контрагент"
 
 #. module: base_calendar
 #: view:base_calendar.invite.attendee:0
 #: selection:base_calendar.invite.attendee,type:0
 msgid "Partner Contacts"
-msgstr ""
+msgstr "Контакты контрагента"
 
 #. module: base_calendar
 #: view:base.calendar.set.exrule:0
 msgid "_Ok"
-msgstr ""
+msgstr "_OK"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,byday:0
@@ -690,135 +702,135 @@ msgstr ""
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Privacy"
-msgstr ""
+msgstr "Степень конфиденциальности"
 
 #. module: base_calendar
 #: field:calendar.event,vtimezone:0
 #: field:calendar.todo,vtimezone:0
 msgid "Timezone"
-msgstr ""
+msgstr "Часовой пояс"
 
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Subject"
-msgstr ""
+msgstr "Тема"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,month_list:0
 #: selection:calendar.event,month_list:0
 #: selection:calendar.todo,month_list:0
 msgid "September"
-msgstr ""
+msgstr "Сентябрь"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,month_list:0
 #: selection:calendar.event,month_list:0
 #: selection:calendar.todo,month_list:0
 msgid "December"
-msgstr ""
+msgstr "Декабрь"
 
 #. module: base_calendar
 #: help:base_calendar.invite.attendee,send_mail:0
 msgid "Check this if you want to send an Email to Invited Person"
-msgstr ""
+msgstr "Отметьте, если нужно отправить письмо приглашённому"
 
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Availability"
-msgstr ""
+msgstr "Доступность"
 
 #. module: base_calendar
 #: view:calendar.event.edit.all:0
 msgid "_Save"
-msgstr ""
+msgstr "_Сохранить"
 
 #. module: base_calendar
 #: selection:calendar.attendee,cutype:0
 msgid "Individual"
-msgstr ""
+msgstr "Персональный"
 
 #. module: base_calendar
 #: help:calendar.event,count:0
 #: help:calendar.todo,count:0
 msgid "Repeat x times"
-msgstr ""
+msgstr "Повторить х раз"
 
 #. module: base_calendar
 #: field:calendar.alarm,user_id:0
 msgid "Owner"
-msgstr ""
+msgstr "Владелец"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 msgid "Delegation Info"
-msgstr ""
+msgstr "Информация о поручении"
 
 #. module: base_calendar
 #: view:calendar.event:0
 #: field:calendar.event.edit.all,date:0
 msgid "Start Date"
-msgstr ""
+msgstr "Дата начала"
 
 #. module: base_calendar
 #: field:calendar.attendee,cn:0
 msgid "Common name"
-msgstr ""
+msgstr "Общее имя"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 #: selection:calendar.attendee,state:0
 msgid "Declined"
-msgstr ""
+msgstr "Отклонено"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 msgid "My Role"
-msgstr ""
+msgstr "Моя роль"
 
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "My Events"
-msgstr ""
+msgstr "Мои события"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 #: view:calendar.event:0
 msgid "Decline"
-msgstr ""
+msgstr "Отклонить"
 
 #. module: base_calendar
 #: selection:calendar.event,freq:0
 #: selection:calendar.todo,freq:0
 msgid "Weeks"
-msgstr ""
+msgstr "Недели"
 
 #. module: base_calendar
 #: selection:calendar.attendee,cutype:0
 msgid "Group"
-msgstr ""
+msgstr "Групповое"
 
 #. module: base_calendar
 #: field:calendar.event,edit_all:0
 #: field:calendar.todo,edit_all:0
 msgid "Edit All"
-msgstr ""
+msgstr "Править все"
 
 #. module: base_calendar
 #: field:base_calendar.invite.attendee,contact_ids:0
 msgid "Contacts"
-msgstr ""
+msgstr "Контакты"
 
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_res_alarm
 msgid "Basic Alarm Information"
-msgstr ""
+msgstr "Основная информация уведомления"
 
 #. module: base_calendar
 #: field:base.calendar.set.exrule,fr:0
 #: field:calendar.event,fr:0
 #: field:calendar.todo,fr:0
 msgid "Fri"
-msgstr ""
+msgstr "Пт"
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_interval:0
@@ -826,81 +838,81 @@ msgstr ""
 #: selection:calendar.todo,freq:0
 #: selection:res.alarm,trigger_interval:0
 msgid "Hours"
-msgstr ""
+msgstr "Часы"
 
 #. module: base_calendar
 #: code:addons/base_calendar/base_calendar.py:1092
 #, python-format
 msgid "Count can not be Negative"
-msgstr ""
+msgstr "Счетчик не может быть отрицательным"
 
 #. module: base_calendar
 #: field:calendar.attendee,member:0
 msgid "Member"
-msgstr ""
+msgstr "Участник"
 
 #. module: base_calendar
 #: help:calendar.event,location:0
 #: help:calendar.todo,location:0
 msgid "Location of Event"
-msgstr ""
+msgstr "Место проведения мероприятия"
 
 #. module: base_calendar
 #: field:calendar.event,rrule:0
 #: field:calendar.todo,rrule:0
 msgid "Recurrent Rule"
-msgstr ""
+msgstr "Повторяющееся правило"
 
 #. module: base_calendar
 #: selection:calendar.alarm,state:0
 msgid "Draft"
-msgstr ""
+msgstr "Черновик"
 
 #. module: base_calendar
 #: field:calendar.alarm,attach:0
 msgid "Attachment"
-msgstr ""
+msgstr "Вложение"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 msgid "Invitation From"
-msgstr ""
+msgstr "Форма приглашения"
 
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "End of recurrency"
-msgstr ""
+msgstr "Конец повторения"
 
 #. module: base_calendar
 #: view:calendar.event:0
 #: field:calendar.event.edit.all,alarm_id:0
 msgid "Reminder"
-msgstr ""
+msgstr "Напоминание"
 
 #. module: base_calendar
 #: view:base.calendar.set.exrule:0
 #: model:ir.actions.act_window,name:base_calendar.action_base_calendar_set_exrule
 #: model:ir.model,name:base_calendar.model_base_calendar_set_exrule
 msgid "Set Exrule"
-msgstr ""
+msgstr "Установить правило"
 
 #. module: base_calendar
 #: view:calendar.event:0
 #: model:ir.actions.act_window,name:base_calendar.action_view_event
 #: model:ir.ui.menu,name:base_calendar.menu_events
 msgid "Events"
-msgstr ""
+msgstr "События"
 
 #. module: base_calendar
 #: model:ir.actions.act_window,name:base_calendar.action_view_calendar_invite_attendee_wizard
 #: model:ir.model,name:base_calendar.model_base_calendar_invite_attendee
 msgid "Invite Attendees"
-msgstr ""
+msgstr "Пригласить участников"
 
 #. module: base_calendar
 #: help:calendar.attendee,email:0
 msgid "Email of Invited Person"
-msgstr ""
+msgstr "Адрес приглашённого лица"
 
 #. module: base_calendar
 #: field:calendar.alarm,repeat:0
@@ -908,7 +920,7 @@ msgstr ""
 #: field:calendar.todo,count:0
 #: field:res.alarm,repeat:0
 msgid "Repeat"
-msgstr ""
+msgstr "Повторение"
 
 #. module: base_calendar
 #: help:calendar.attendee,dir:0
@@ -916,39 +928,40 @@ msgid ""
 "Reference to the URIthat points to the directory information corresponding "
 "to the attendee."
 msgstr ""
+"Указание на URI, по которому доступна информация о приглашённом участника"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,month_list:0
 #: selection:calendar.event,month_list:0
 #: selection:calendar.todo,month_list:0
 msgid "August"
-msgstr ""
+msgstr "Август"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,week_list:0
 #: selection:calendar.event,week_list:0
 #: selection:calendar.todo,week_list:0
 msgid "Monday"
-msgstr ""
+msgstr "Понедельник"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,byday:0
 #: selection:calendar.event,byday:0
 #: selection:calendar.todo,byday:0
 msgid "Third"
-msgstr ""
+msgstr "Третий"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,month_list:0
 #: selection:calendar.event,month_list:0
 #: selection:calendar.todo,month_list:0
 msgid "June"
-msgstr ""
+msgstr "Июнь"
 
 #. module: base_calendar
 #: field:calendar.alarm,alarm_id:0
 msgid "Basic Alarm"
-msgstr ""
+msgstr "Базовое уведомление"
 
 #. module: base_calendar
 #: view:base.calendar.set.exrule:0
@@ -960,117 +973,117 @@ msgstr ""
 #: view:calendar.attendee:0
 #: field:calendar.attendee,delegated_from:0
 msgid "Delegated From"
-msgstr ""
+msgstr "Поручение от"
 
 #. module: base_calendar
 #: field:calendar.attendee,user_id:0
 msgid "User"
-msgstr ""
+msgstr "Пользователь"
 
 #. module: base_calendar
 #: view:calendar.event:0
 #: field:calendar.event,date:0
 msgid "Date"
-msgstr ""
+msgstr "Дата"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,month_list:0
 #: selection:calendar.event,month_list:0
 #: selection:calendar.todo,month_list:0
 msgid "November"
-msgstr ""
+msgstr "Ноябрь"
 
 #. module: base_calendar
 #: help:calendar.attendee,member:0
 msgid "Indicate the groups that the attendee belongs to"
-msgstr ""
+msgstr "Указывает на группы, к которым принадлежит приглашённый"
 
 #. module: base_calendar
 #: view:base_calendar.invite.attendee:0
 msgid "Data"
-msgstr ""
+msgstr "Данные"
 
 #. module: base_calendar
 #: field:base.calendar.set.exrule,mo:0
 #: field:calendar.event,mo:0
 #: field:calendar.todo,mo:0
 msgid "Mon"
-msgstr ""
+msgstr "Пн"
 
 #. module: base_calendar
 #: field:base.calendar.set.exrule,count:0
 msgid "Count"
-msgstr ""
+msgstr "Счётчик"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,freq:0
 #: selection:calendar.event,freq:0
 #: selection:calendar.todo,freq:0
 msgid "No Repeat"
-msgstr ""
+msgstr "Без повторения"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,month_list:0
 #: selection:calendar.event,month_list:0
 #: selection:calendar.todo,month_list:0
 msgid "October"
-msgstr ""
+msgstr "Октябрь"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 #: view:calendar.event:0
 msgid "Uncertain"
-msgstr ""
+msgstr "Возможно"
 
 #. module: base_calendar
 #: field:calendar.attendee,language:0
 msgid "Language"
-msgstr ""
+msgstr "Язык"
 
 #. module: base_calendar
 #: field:calendar.alarm,trigger_occurs:0
 #: field:res.alarm,trigger_occurs:0
 msgid "Triggers"
-msgstr ""
+msgstr "Триггеры"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,month_list:0
 #: selection:calendar.event,month_list:0
 #: selection:calendar.todo,month_list:0
 msgid "January"
-msgstr ""
+msgstr "Январь"
 
 #. module: base_calendar
 #: field:calendar.alarm,trigger_related:0
 #: field:res.alarm,trigger_related:0
 msgid "Related to"
-msgstr ""
+msgstr "Связан с"
 
 #. module: base_calendar
 #: field:base.calendar.set.exrule,interval:0
 #: field:calendar.alarm,trigger_interval:0
 #: field:res.alarm,trigger_interval:0
 msgid "Interval"
-msgstr ""
+msgstr "Интервал"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,week_list:0
 #: selection:calendar.event,week_list:0
 #: selection:calendar.todo,week_list:0
 msgid "Wednesday"
-msgstr ""
+msgstr "Среда"
 
 #. module: base_calendar
 #: code:addons/base_calendar/base_calendar.py:1090
 #, python-format
 msgid "Interval can not be Negative"
-msgstr ""
+msgstr "Интервал не может быть отрицательным"
 
 #. module: base_calendar
 #: field:calendar.alarm,name:0
 #: view:calendar.event:0
 msgid "Summary"
-msgstr ""
+msgstr "Описание"
 
 #. module: base_calendar
 #: field:calendar.alarm,active:0
@@ -1078,22 +1091,22 @@ msgstr ""
 #: field:calendar.todo,active:0
 #: field:res.alarm,active:0
 msgid "Active"
-msgstr ""
+msgstr "Активно"
 
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Choose day in the month where repeat the meeting"
-msgstr ""
+msgstr "Выберите день месяца, когда повторить встречу."
 
 #. module: base_calendar
 #: field:calendar.alarm,action:0
 msgid "Action"
-msgstr ""
+msgstr "Действие"
 
 #. module: base_calendar
 #: help:base_calendar.invite.attendee,type:0
 msgid "Select whom you want to Invite"
-msgstr ""
+msgstr "Укажите, кого хотелось бы пригласить"
 
 #. module: base_calendar
 #: help:calendar.alarm,duration:0
@@ -1102,50 +1115,52 @@ msgid ""
 "Duration' and 'Repeat' are both optional, but if one occurs, so MUST the "
 "other"
 msgstr ""
+"Длительность и повторение — дополнительная информация, но есть есть одно — "
+"должно быть и другое."
 
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_calendar_event_edit_all
 msgid "Calendar Edit all event"
-msgstr ""
+msgstr "Редактировать все события в календаре"
 
 #. module: base_calendar
 #: help:calendar.attendee,role:0
 msgid "Participation role for the calendar user"
-msgstr ""
+msgstr "Роль участия пользователя календаря"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 #: field:calendar.attendee,delegated_to:0
 msgid "Delegated To"
-msgstr ""
+msgstr "Поручение для"
 
 #. module: base_calendar
 #: help:calendar.alarm,action:0
 msgid "Defines the action to be invoked when an alarm is triggered"
-msgstr ""
+msgstr "Определяет действие, выполняемое при срабатывании уведомления"
 
 #. module: base_calendar
 #: selection:calendar.event,end_type:0
 #: selection:calendar.todo,end_type:0
 msgid "End date"
-msgstr ""
+msgstr "Дата окончания"
 
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Search Events"
-msgstr ""
+msgstr "Поиск событий"
 
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Recurrency Option"
-msgstr ""
+msgstr "Опция повторения"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,freq:0
 #: selection:calendar.event,rrule_type:0
 #: selection:calendar.todo,rrule_type:0
 msgid "Weekly"
-msgstr ""
+msgstr "Еженедельно"
 
 #. module: base_calendar
 #: help:calendar.alarm,active:0
@@ -1154,17 +1169,19 @@ msgid ""
 "If the active field is set to true, it will allow you to hide the event "
 "alarm information without removing it."
 msgstr ""
+"Если поле «Активен» имеет значение Истина, можно будет скрыть информацию об "
+"уведомлении о событии не удаляя её."
 
 #. module: base_calendar
 #: field:calendar.event,recurrent_id:0
 #: field:calendar.todo,recurrent_id:0
 msgid "Recurrent ID date"
-msgstr ""
+msgstr "Дата повторяющегося ID"
 
 #. module: base_calendar
 #: sql_constraint:res.users:0
 msgid "You can not have two users with the same login !"
-msgstr ""
+msgstr "Не может быть двух пользователей с одинаковым именем пользователя!"
 
 #. module: base_calendar
 #: field:calendar.alarm,state:0
@@ -1174,53 +1191,53 @@ msgstr ""
 #: field:calendar.event,state:0
 #: field:calendar.todo,state:0
 msgid "State"
-msgstr ""
+msgstr "Состояние"
 
 #. module: base_calendar
 #: view:res.alarm:0
 msgid "Reminder Details"
-msgstr ""
+msgstr "Поднобности напоминания"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 msgid "To Review"
-msgstr ""
+msgstr "Проверить"
 
 #. module: base_calendar
 #: field:base.calendar.set.exrule,freq:0
 #: field:calendar.event,freq:0
 #: field:calendar.todo,freq:0
 msgid "Frequency"
-msgstr ""
+msgstr "Частота"
 
 #. module: base_calendar
 #: selection:calendar.alarm,state:0
 msgid "Done"
-msgstr ""
+msgstr "Готово"
 
 #. module: base_calendar
 #: help:calendar.event,interval:0
 #: help:calendar.todo,interval:0
 msgid "Repeat every (Days/Week/Month/Year)"
-msgstr ""
+msgstr "Повтор каждый (День/Неделю/Месяц/Год)"
 
 #. module: base_calendar
 #: view:base_calendar.invite.attendee:0
 #: field:base_calendar.invite.attendee,user_ids:0
 msgid "Users"
-msgstr ""
+msgstr "Пользователи"
 
 #. module: base_calendar
 #: view:base.calendar.set.exrule:0
 msgid "of"
-msgstr ""
+msgstr "из"
 
 #. module: base_calendar
 #: view:base_calendar.invite.attendee:0
 #: view:calendar.event:0
 #: view:calendar.event.edit.all:0
 msgid "Cancel"
-msgstr ""
+msgstr "Отменить"
 
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_res_users
@@ -1232,7 +1249,7 @@ msgstr "res.users"
 #: selection:calendar.event,week_list:0
 #: selection:calendar.todo,week_list:0
 msgid "Tuesday"
-msgstr ""
+msgstr "Вторник"
 
 #. module: base_calendar
 #: help:calendar.alarm,description:0
@@ -1241,11 +1258,13 @@ msgid ""
 "calendar component, than that                             provided by the "
 "\"SUMMARY\" property"
 msgstr ""
+"Предоставляет более полное описание элемента календаря, предоставленное "
+"свойством «Итого»."
 
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Responsible User"
-msgstr ""
+msgstr "Ответственный пользователь"
 
 #. module: base_calendar
 #: selection:calendar.attendee,availability:0
diff --git a/addons/base_calendar/i18n/tr.po b/addons/base_calendar/i18n/tr.po
new file mode 100644
index 00000000000..1b59fdca7a6
--- /dev/null
+++ b/addons/base_calendar/i18n/tr.po
@@ -0,0 +1,1660 @@
+# Turkish translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2011-04-23 18:44+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Turkish <tr@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: 2011-04-24 05:52+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
+
+#. module: base_calendar
+#: selection:calendar.alarm,trigger_related:0
+#: selection:res.alarm,trigger_related:0
+msgid "The event starts"
+msgstr "Olay Başlar"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,freq:0
+msgid "Hourly"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Required to Join"
+msgstr "Katılmak gerekir"
+
+#. module: base_calendar
+#: help:calendar.event,exdate:0
+#: help:calendar.todo,exdate:0
+msgid ""
+"This property defines the list of date/time exceptions for a recurring "
+"calendar component."
+msgstr ""
+"Bu özellik yinelenen takvim öğeleri için istisna tutulan tarih/saat "
+"listesini belirtir."
+
+#. module: base_calendar
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event.edit.all,name:0
+msgid "Title"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,freq:0
+#: selection:calendar.event,rrule_type:0
+#: selection:calendar.todo,rrule_type:0
+msgid "Monthly"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Invited User"
+msgstr "Davetli Kullanıcı"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Invitation"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.event,recurrency:0
+#: help:calendar.todo,recurrency:0
+msgid "Recurrent Meeting"
+msgstr "Yinelenen Toplantı"
+
+#. module: base_calendar
+#: model:ir.actions.act_window,name:base_calendar.action_res_alarm_view
+#: model:ir.ui.menu,name:base_calendar.menu_crm_meeting_avail_alarm
+msgid "Alarms"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,week_list:0
+#: selection:calendar.event,week_list:0
+#: selection:calendar.todo,week_list:0
+msgid "Sunday"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: field:calendar.attendee,role:0
+msgid "Role"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: view:calendar.event:0
+msgid "Invitation details"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,byday:0
+#: selection:calendar.event,byday:0
+#: selection:calendar.todo,byday:0
+msgid "Fourth"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,show_as:0
+#: field:calendar.todo,show_as:0
+msgid "Show as"
+msgstr "Farklı Göster"
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,day:0
+#: selection:base.calendar.set.exrule,select1:0
+#: field:calendar.event,day:0
+#: selection:calendar.event,select1:0
+#: field:calendar.todo,day:0
+#: selection:calendar.todo,select1:0
+msgid "Date of month"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,class:0
+#: selection:calendar.todo,class:0
+msgid "Public"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid " "
+msgstr " "
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "March"
+msgstr ""
+
+#. module: base_calendar
+#: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:90
+#, python-format
+msgid "Warning !"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,week_list:0
+#: selection:calendar.event,week_list:0
+#: selection:calendar.todo,week_list:0
+msgid "Friday"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,allday:0
+#: field:calendar.todo,allday:0
+msgid "All Day"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,select1:0
+#: field:calendar.event,select1:0
+#: field:calendar.todo,select1:0
+msgid "Option"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,availability:0
+#: selection:calendar.event,show_as:0
+#: selection:calendar.todo,show_as:0
+#: selection:res.users,availability:0
+msgid "Free"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.attendee,rsvp:0
+msgid "Indicats whether the favor of a reply is requested"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_ir_attachment
+msgid "ir.attachment"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.attendee,delegated_to:0
+msgid "The users that the original request was delegated to"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,ref:0
+msgid "Event Ref"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,we:0
+#: field:calendar.event,we:0
+#: field:calendar.todo,we:0
+msgid "Wed"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Show time as"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,tu:0
+#: field:calendar.event,tu:0
+#: field:calendar.todo,tu:0
+msgid "Tue"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,freq:0
+#: selection:calendar.event,rrule_type:0
+#: selection:calendar.todo,rrule_type:0
+msgid "Yearly"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,trigger_related:0
+#: selection:res.alarm,trigger_related:0
+msgid "The event ends"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,byday:0
+#: selection:calendar.event,byday:0
+#: selection:calendar.todo,byday:0
+msgid "Last"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.attendee,state:0
+msgid "Status of the attendee's participation"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,cutype:0
+msgid "Room"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,trigger_interval:0
+#: selection:calendar.event,freq:0
+#: selection:calendar.todo,freq:0
+#: selection:res.alarm,trigger_interval:0
+msgid "Days"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: view:calendar.event:0
+msgid "Invitation Detail"
+msgstr ""
+
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:1356
+#: code:addons/base_calendar/wizard/base_calendar_invite_attendee.py:96
+#: code:addons/base_calendar/wizard/base_calendar_invite_attendee.py:143
+#: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:128
+#: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:136
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,role:0
+msgid "Chair Person"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,action:0
+msgid "Procedure"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,state:0
+#: selection:calendar.todo,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,trigger_interval:0
+#: selection:res.alarm,trigger_interval:0
+msgid "Minutes"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,action:0
+msgid "Display"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event.edit.all:0
+msgid "Edit all Occurrences"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Invitation type"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,freq:0
+msgid "Secondly"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,event_date:0
+#: field:calendar.attendee,event_date:0
+#: view:calendar.event:0
+msgid "Event Date"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: view:calendar.event:0
+msgid "Group By..."
+msgstr ""
+
+#. module: base_calendar
+#: help:base_calendar.invite.attendee,email:0
+msgid "Provide external email address who will receive this invitation."
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.module.module,description:base_calendar.module_meta_information
+msgid ""
+"Full featured calendar system that supports:\n"
+"    - Calendar of events\n"
+"    - Alerts (create requests)\n"
+"    - Recurring events\n"
+"    - Invitations to people"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.attendee,cutype:0
+msgid "Specify the type of Invitation"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,freq:0
+#: selection:calendar.todo,freq:0
+msgid "Years"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,event_end_date:0
+#: field:calendar.attendee,event_end_date:0
+msgid "Event End Date"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,role:0
+msgid "Optional Participation"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,date_deadline:0
+#: field:calendar.todo,date_deadline:0
+msgid "Deadline"
+msgstr ""
+
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:385
+#: code:addons/base_calendar/base_calendar.py:1090
+#: code:addons/base_calendar/base_calendar.py:1092
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.event,active:0
+#: help:calendar.todo,active:0
+msgid ""
+"If the active field is set to          true, it will allow you to hide the "
+"event alarm information without removing it."
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.module.module,shortdesc:base_calendar.module_meta_information
+msgid "Basic Calendar Functionality"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,organizer:0
+#: field:calendar.event,organizer_id:0
+#: field:calendar.todo,organizer:0
+#: field:calendar.todo,organizer_id:0
+msgid "Organizer"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: view:calendar.event:0
+#: field:calendar.event,user_id:0
+#: field:calendar.todo,user_id:0
+msgid "Responsible"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+#: model:res.request.link,name:base_calendar.request_link_meeting
+msgid "Event"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.event,edit_all:0
+#: help:calendar.todo,edit_all:0
+msgid "Edit all Occurrences  of recurrent Meeting."
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,trigger_occurs:0
+#: selection:res.alarm,trigger_occurs:0
+msgid "Before"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+#: selection:calendar.event,state:0
+#: selection:calendar.todo,state:0
+msgid "Confirmed"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.actions.act_window,name:base_calendar.action_calendar_event_edit_all
+msgid "Edit all events"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,attendee_ids:0
+#: field:calendar.event,attendee_ids:0
+#: field:calendar.todo,attendee_ids:0
+msgid "Attendees"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Confirm"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_calendar_todo
+msgid "Calendar Task"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,su:0
+#: field:calendar.event,su:0
+#: field:calendar.todo,su:0
+msgid "Sun"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,cutype:0
+msgid "Invite Type"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.attendee,partner_id:0
+msgid "Partner related to contact"
+msgstr ""
+
+#. module: base_calendar
+#: view:res.alarm:0
+msgid "Reminder details"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,parent_ids:0
+msgid "Delegrated From"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,select1:0
+#: selection:calendar.event,select1:0
+#: selection:calendar.todo,select1:0
+msgid "Day of month"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+#: field:calendar.event,location:0
+#: field:calendar.event.edit.all,location:0
+#: field:calendar.todo,location:0
+msgid "Location"
+msgstr ""
+
+#. module: base_calendar
+#: field:base_calendar.invite.attendee,send_mail:0
+msgid "Send mail?"
+msgstr ""
+
+#. module: base_calendar
+#: field:base_calendar.invite.attendee,email:0
+#: selection:calendar.alarm,action:0
+#: field:calendar.attendee,email:0
+msgid "Email"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Event Detail"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,state:0
+msgid "Run"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,exdate:0
+#: field:calendar.todo,exdate:0
+msgid "Exception Date/Times"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,class:0
+#: selection:calendar.todo,class:0
+msgid "Confidential"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,end_date:0
+#: field:calendar.event,end_date:0
+#: field:calendar.todo,end_date:0
+msgid "Repeat Until"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.actions.act_window,help:base_calendar.action_res_alarm_view
+msgid ""
+"Create specific calendar alarms that may be assigned to calendar events or "
+"meetings."
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Visibility"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,rsvp:0
+msgid "Required Reply?"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,base_calendar_url:0
+#: field:calendar.todo,base_calendar_url:0
+msgid "Caldav URL"
+msgstr ""
+
+#. module: base_calendar
+#: view:base.calendar.set.exrule:0
+msgid "Select range to Exclude"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,recurrent_uid:0
+#: field:calendar.todo,recurrent_uid:0
+msgid "Recurrent ID"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "July"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: selection:calendar.attendee,state:0
+msgid "Accepted"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,th:0
+#: field:calendar.event,th:0
+#: field:calendar.todo,th:0
+msgid "Thu"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,child_ids:0
+msgid "Delegrated To"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Required Reply"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,end_type:0
+#: selection:calendar.todo,end_type:0
+msgid "Forever"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,role:0
+msgid "Participation required"
+msgstr ""
+
+#. module: base_calendar
+#: view:base.calendar.set.exrule:0
+msgid "_Cancel"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,create_date:0
+#: field:calendar.todo,create_date:0
+msgid "Created"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,class:0
+#: selection:calendar.todo,class:0
+msgid "Private"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,freq:0
+#: selection:calendar.event,rrule_type:0
+#: selection:calendar.todo,rrule_type:0
+msgid "Daily"
+msgstr ""
+
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:385
+#, python-format
+msgid "Can not Duplicate"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,class:0
+#: field:calendar.todo,class:0
+msgid "Mark as"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: field:calendar.attendee,partner_address_id:0
+msgid "Contact"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.event,rrule_type:0
+#: help:calendar.todo,rrule_type:0
+msgid "Let the event automatically repeat at that interval"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: view:calendar.event:0
+msgid "Delegate"
+msgstr ""
+
+#. module: base_calendar
+#: field:base_calendar.invite.attendee,partner_id:0
+#: view:calendar.attendee:0
+#: field:calendar.attendee,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: base_calendar
+#: view:base_calendar.invite.attendee:0
+#: selection:base_calendar.invite.attendee,type:0
+msgid "Partner Contacts"
+msgstr ""
+
+#. module: base_calendar
+#: view:base.calendar.set.exrule:0
+msgid "_Ok"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,byday:0
+#: selection:calendar.event,byday:0
+#: selection:calendar.todo,byday:0
+msgid "First"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Privacy"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,vtimezone:0
+#: field:calendar.todo,vtimezone:0
+msgid "Timezone"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Subject"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "September"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "December"
+msgstr ""
+
+#. module: base_calendar
+#: help:base_calendar.invite.attendee,send_mail:0
+msgid "Check this if you want to send an Email to Invited Person"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Availability"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event.edit.all:0
+msgid "_Save"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,cutype:0
+msgid "Individual"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.event,count:0
+#: help:calendar.todo,count:0
+msgid "Repeat x times"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,user_id:0
+msgid "Owner"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Delegation Info"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+#: field:calendar.event.edit.all,date:0
+msgid "Start Date"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,cn:0
+msgid "Common name"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: selection:calendar.attendee,state:0
+msgid "Declined"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "My Role"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "My Events"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: view:calendar.event:0
+msgid "Decline"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,freq:0
+#: selection:calendar.todo,freq:0
+msgid "Weeks"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,cutype:0
+msgid "Group"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,edit_all:0
+#: field:calendar.todo,edit_all:0
+msgid "Edit All"
+msgstr ""
+
+#. module: base_calendar
+#: field:base_calendar.invite.attendee,contact_ids:0
+msgid "Contacts"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_res_alarm
+msgid "Basic Alarm Information"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,fr:0
+#: field:calendar.event,fr:0
+#: field:calendar.todo,fr:0
+msgid "Fri"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,trigger_interval:0
+#: selection:calendar.event,freq:0
+#: selection:calendar.todo,freq:0
+#: selection:res.alarm,trigger_interval:0
+msgid "Hours"
+msgstr ""
+
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:1092
+#, python-format
+msgid "Count can not be Negative"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,member:0
+msgid "Member"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.event,location:0
+#: help:calendar.todo,location:0
+msgid "Location of Event"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,rrule:0
+#: field:calendar.todo,rrule:0
+msgid "Recurrent Rule"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,attach:0
+msgid "Attachment"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Invitation From"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "End of recurrency"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+#: field:calendar.event.edit.all,alarm_id:0
+msgid "Reminder"
+msgstr ""
+
+#. module: base_calendar
+#: view:base.calendar.set.exrule:0
+#: model:ir.actions.act_window,name:base_calendar.action_base_calendar_set_exrule
+#: model:ir.model,name:base_calendar.model_base_calendar_set_exrule
+msgid "Set Exrule"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+#: model:ir.actions.act_window,name:base_calendar.action_view_event
+#: model:ir.ui.menu,name:base_calendar.menu_events
+msgid "Events"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.actions.act_window,name:base_calendar.action_view_calendar_invite_attendee_wizard
+#: model:ir.model,name:base_calendar.model_base_calendar_invite_attendee
+msgid "Invite Attendees"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.attendee,email:0
+msgid "Email of Invited Person"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,repeat:0
+#: field:calendar.event,count:0
+#: field:calendar.todo,count:0
+#: field:res.alarm,repeat:0
+msgid "Repeat"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.attendee,dir:0
+msgid ""
+"Reference to the URIthat points to the directory information corresponding "
+"to the attendee."
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "August"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,week_list:0
+#: selection:calendar.event,week_list:0
+#: selection:calendar.todo,week_list:0
+msgid "Monday"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,byday:0
+#: selection:calendar.event,byday:0
+#: selection:calendar.todo,byday:0
+msgid "Third"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "June"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,alarm_id:0
+msgid "Basic Alarm"
+msgstr ""
+
+#. module: base_calendar
+#: view:base.calendar.set.exrule:0
+#: view:calendar.event:0
+msgid "The"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: field:calendar.attendee,delegated_from:0
+msgid "Delegated From"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+#: field:calendar.event,date:0
+msgid "Date"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "November"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.attendee,member:0
+msgid "Indicate the groups that the attendee belongs to"
+msgstr ""
+
+#. module: base_calendar
+#: view:base_calendar.invite.attendee:0
+msgid "Data"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,mo:0
+#: field:calendar.event,mo:0
+#: field:calendar.todo,mo:0
+msgid "Mon"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,count:0
+msgid "Count"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,freq:0
+#: selection:calendar.event,freq:0
+#: selection:calendar.todo,freq:0
+msgid "No Repeat"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "October"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: view:calendar.event:0
+msgid "Uncertain"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,language:0
+msgid "Language"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,trigger_occurs:0
+#: field:res.alarm,trigger_occurs:0
+msgid "Triggers"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "January"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,trigger_related:0
+#: field:res.alarm,trigger_related:0
+msgid "Related to"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,interval:0
+#: field:calendar.alarm,trigger_interval:0
+#: field:res.alarm,trigger_interval:0
+msgid "Interval"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,week_list:0
+#: selection:calendar.event,week_list:0
+#: selection:calendar.todo,week_list:0
+msgid "Wednesday"
+msgstr ""
+
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:1090
+#, python-format
+msgid "Interval can not be Negative"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,name:0
+#: view:calendar.event:0
+msgid "Summary"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,active:0
+#: field:calendar.event,active:0
+#: field:calendar.todo,active:0
+#: field:res.alarm,active:0
+msgid "Active"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Choose day in the month where repeat the meeting"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,action:0
+msgid "Action"
+msgstr ""
+
+#. module: base_calendar
+#: help:base_calendar.invite.attendee,type:0
+msgid "Select whom you want to Invite"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.alarm,duration:0
+#: help:res.alarm,duration:0
+msgid ""
+"Duration' and 'Repeat' are both optional, but if one occurs, so MUST the "
+"other"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_calendar_event_edit_all
+msgid "Calendar Edit all event"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.attendee,role:0
+msgid "Participation role for the calendar user"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: field:calendar.attendee,delegated_to:0
+msgid "Delegated To"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.alarm,action:0
+msgid "Defines the action to be invoked when an alarm is triggered"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,end_type:0
+#: selection:calendar.todo,end_type:0
+msgid "End date"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Search Events"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Recurrency Option"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,freq:0
+#: selection:calendar.event,rrule_type:0
+#: selection:calendar.todo,rrule_type:0
+msgid "Weekly"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.alarm,active:0
+#: help:res.alarm,active:0
+msgid ""
+"If the active field is set to true, it will allow you to hide the event "
+"alarm information without removing it."
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,recurrent_id:0
+#: field:calendar.todo,recurrent_id:0
+msgid "Recurrent ID date"
+msgstr ""
+
+#. module: base_calendar
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,state:0
+#: view:calendar.attendee:0
+#: field:calendar.attendee,state:0
+#: view:calendar.event:0
+#: field:calendar.event,state:0
+#: field:calendar.todo,state:0
+msgid "State"
+msgstr ""
+
+#. module: base_calendar
+#: view:res.alarm:0
+msgid "Reminder Details"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "To Review"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,freq:0
+#: field:calendar.event,freq:0
+#: field:calendar.todo,freq:0
+msgid "Frequency"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,state:0
+msgid "Done"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.event,interval:0
+#: help:calendar.todo,interval:0
+msgid "Repeat every (Days/Week/Month/Year)"
+msgstr ""
+
+#. module: base_calendar
+#: view:base_calendar.invite.attendee:0
+#: field:base_calendar.invite.attendee,user_ids:0
+msgid "Users"
+msgstr ""
+
+#. module: base_calendar
+#: view:base.calendar.set.exrule:0
+msgid "of"
+msgstr ""
+
+#. module: base_calendar
+#: view:base_calendar.invite.attendee:0
+#: view:calendar.event:0
+#: view:calendar.event.edit.all:0
+msgid "Cancel"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_res_users
+msgid "res.users"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,week_list:0
+#: selection:calendar.event,week_list:0
+#: selection:calendar.todo,week_list:0
+msgid "Tuesday"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.alarm,description:0
+msgid ""
+"Provides a more complete                             description of the "
+"calendar component, than that                             provided by the "
+"\"SUMMARY\" property"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Responsible User"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,availability:0
+#: selection:calendar.event,show_as:0
+#: selection:calendar.todo,show_as:0
+#: selection:res.users,availability:0
+msgid "Busy"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_calendar_event
+msgid "Calendar Event"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,state:0
+#: selection:calendar.event,state:0
+#: selection:calendar.todo,state:0
+msgid "Tentative"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,interval:0
+#: field:calendar.todo,interval:0
+msgid "Repeat every"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,end_type:0
+#: selection:calendar.todo,end_type:0
+msgid "Fix amout of times"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,recurrency:0
+#: field:calendar.todo,recurrency:0
+msgid "Recurrent"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,rrule_type:0
+#: field:calendar.todo,rrule_type:0
+msgid "Recurrency"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.actions.act_window,name:base_calendar.action_view_attendee_form
+#: model:ir.ui.menu,name:base_calendar.menu_attendee_invitations
+msgid "Event Invitations"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,week_list:0
+#: selection:calendar.event,week_list:0
+#: selection:calendar.todo,week_list:0
+msgid "Thursday"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,exrule:0
+#: field:calendar.todo,exrule:0
+msgid "Exception Rule"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.attendee,language:0
+msgid ""
+"To specify the language for text values in aproperty or property parameter."
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Details"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.event,exrule:0
+#: help:calendar.todo,exrule:0
+msgid ""
+"Defines a rule or repeating pattern of time to exclude from the recurring "
+"rule."
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,month_list:0
+#: field:calendar.event,month_list:0
+#: field:calendar.todo,month_list:0
+msgid "Month"
+msgstr ""
+
+#. module: base_calendar
+#: view:base_calendar.invite.attendee:0
+#: view:calendar.event:0
+msgid "Invite People"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.event,rrule:0
+#: help:calendar.todo,rrule:0
+msgid ""
+"Defines a rule or repeating pattern for recurring events\n"
+"e.g.: Every other month on the last Sunday of the month for 10 occurrences:  "
+"      FREQ=MONTHLY;INTERVAL=2;COUNT=10;BYDAY=-1SU"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,dir:0
+msgid "URI Reference"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,description:0
+#: view:calendar.event:0
+#: field:calendar.event,description:0
+#: field:calendar.event,name:0
+#: field:calendar.todo,description:0
+#: field:calendar.todo,name:0
+msgid "Description"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "May"
+msgstr ""
+
+#. module: base_calendar
+#: field:base_calendar.invite.attendee,type:0
+#: view:calendar.attendee:0
+msgid "Type"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Search Invitations"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,trigger_occurs:0
+#: selection:res.alarm,trigger_occurs:0
+msgid "After"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,state:0
+msgid "Stop"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_ir_values
+msgid "ir.values"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_ir_model
+msgid "Objects"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: selection:calendar.attendee,state:0
+msgid "Delegated"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,sa:0
+#: field:calendar.event,sa:0
+#: field:calendar.todo,sa:0
+msgid "Sat"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Choose day where repeat the meeting"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,freq:0
+msgid "Minutely"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.attendee,sent_by:0
+msgid "Specify the user that is acting on behalf of the calendar user"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+#: field:calendar.event.edit.all,date_deadline:0
+msgid "End Date"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "February"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,freq:0
+#: selection:calendar.todo,freq:0
+msgid "Months"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,cutype:0
+msgid "Resource"
+msgstr ""
+
+#. module: base_calendar
+#: field:res.alarm,name:0
+msgid "Name"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_calendar_alarm
+msgid "Event alarm information"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.alarm,name:0
+msgid ""
+"Contains the text to be                      used as the message subject for "
+"email                      or contains the text to be used for display"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,alarm_id:0
+#: field:calendar.event,base_calendar_alarm_id:0
+#: field:calendar.todo,alarm_id:0
+#: field:calendar.todo,base_calendar_alarm_id:0
+msgid "Alarm"
+msgstr ""
+
+#. module: base_calendar
+#: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:90
+#, python-format
+msgid "Please Apply Recurrency before applying Exception Rule."
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,sent_by_uid:0
+msgid "Sent By User"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "April"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Recurrency period"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,week_list:0
+#: field:calendar.event,week_list:0
+#: field:calendar.todo,week_list:0
+msgid "Weekday"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,byday:0
+#: field:calendar.event,byday:0
+#: field:calendar.todo,byday:0
+msgid "By day"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,model_id:0
+msgid "Model"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,action:0
+msgid "Audio"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,id:0
+#: field:calendar.todo,id:0
+msgid "ID"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,role:0
+msgid "For information Purpose"
+msgstr ""
+
+#. module: base_calendar
+#: view:base_calendar.invite.attendee:0
+msgid "Invite"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_calendar_attendee
+msgid "Attendee information"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,res_id:0
+msgid "Resource ID"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,state:0
+msgid "Needs Action"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,sent_by:0
+msgid "Sent By"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,sequence:0
+#: field:calendar.todo,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.event,alarm_id:0
+#: help:calendar.todo,alarm_id:0
+msgid "Set an alarm at this time, before the event occurs"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base_calendar.invite.attendee,type:0
+msgid "Internal User"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: view:calendar.event:0
+msgid "Accept"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,week_list:0
+#: selection:calendar.event,week_list:0
+#: selection:calendar.todo,week_list:0
+msgid "Saturday"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Invitation To"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,byday:0
+#: selection:calendar.event,byday:0
+#: selection:calendar.todo,byday:0
+msgid "Second"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,availability:0
+#: field:res.users,availability:0
+msgid "Free/Busy"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,end_type:0
+#: field:calendar.todo,end_type:0
+msgid "Way to end reccurency"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,duration:0
+#: field:calendar.alarm,trigger_duration:0
+#: field:calendar.event,duration:0
+#: field:calendar.todo,date:0
+#: field:calendar.todo,duration:0
+#: field:res.alarm,duration:0
+#: field:res.alarm,trigger_duration:0
+msgid "Duration"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base_calendar.invite.attendee,type:0
+msgid "External Email"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,trigger_date:0
+msgid "Trigger Date"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.alarm,attach:0
+msgid ""
+"* Points to a sound resource,                     which is rendered when the "
+"alarm is triggered for audio,\n"
+"                    * File which is intended to be sent as message "
+"attachments for email,\n"
+"                    * Points to a procedure resource, which is invoked when  "
+"                    the alarm is triggered for procedure."
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,byday:0
+#: selection:calendar.event,byday:0
+#: selection:calendar.todo,byday:0
+msgid "Fifth"
+msgstr ""
diff --git a/addons/base_contact/i18n/ru.po b/addons/base_contact/i18n/ru.po
index c5e52fbe641..67036557c53 100644
--- a/addons/base_contact/i18n/ru.po
+++ b/addons/base_contact/i18n/ru.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-03-09 16:17+0000\n"
-"Last-Translator: Viktor Prokopiev <Unknown>\n"
+"PO-Revision-Date: 2011-04-24 15:49+0000\n"
+"Last-Translator: Stanislav Hanzhin <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: 2011-03-10 06:23+0000\n"
-"X-Generator: Launchpad (build 12351)\n"
+"X-Launchpad-Export-Date: 2011-04-25 05:43+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: base_contact
 #: field:res.partner.contact,title:0
@@ -39,7 +39,7 @@ msgstr "Обращение"
 #. module: base_contact
 #: help:res.partner.job,date_start:0
 msgid "Start date of job(Joining Date)"
-msgstr ""
+msgstr "Дата начала работы(дата присоединения)"
 
 #. module: base_contact
 #: view:base.contact.installer:0
@@ -129,6 +129,8 @@ msgid ""
 "If the active field is set to False,                 it will allow you to "
 "hide the partner contact without removing it."
 msgstr ""
+"Если поле 'Активно' имеет значение ложь, то это позволит вам скрыть контакт "
+"партнера, не удаляя его."
 
 #. module: base_contact
 #: model:ir.module.module,description:base_contact.module_meta_information
@@ -153,6 +155,22 @@ msgid ""
 "an other object.\n"
 "    "
 msgstr ""
+"\n"
+"        Этот модуль позволяет управлять контактами.\n"
+"\n"
+"    В нём можно определить\n"
+"        *контакты, не связанные с контрагентом,\n"
+"        *контакты с множеством адресов (возможно, для разных контрагентов),\n"
+"        *контакты с различными функциями в зависимости от их адреса\n"
+"\n"
+"    Он добавляет пункты меню в разделы\n"
+"        Контрагенты \\ Контакты\n"
+"        Контрагенты \\ Функции\n"
+"\n"
+"    Внимание! Этот модуль преобразует существующие адреса в «адреса + "
+"контакты». Это значит, что часть полей адреса будет утеряна (например, имя "
+"контакта), поскольку ожидается их объявление в другом объекте.\n"
+"    "
 
 #. module: base_contact
 #: model:ir.module.module,shortdesc:base_contact.module_meta_information
@@ -260,7 +278,7 @@ msgstr "Адреса партнера"
 #. module: base_contact
 #: view:base.contact.installer:0
 msgid "Address's Migration to Contacts"
-msgstr ""
+msgstr "Перенос адреса в контакты"
 
 #. module: base_contact
 #: field:res.partner.job,sequence_contact:0
diff --git a/addons/base_crypt/i18n/ru.po b/addons/base_crypt/i18n/ru.po
index 3cb5a293275..b080799e343 100644
--- a/addons/base_crypt/i18n/ru.po
+++ b/addons/base_crypt/i18n/ru.po
@@ -8,19 +8,19 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-03-15 23:59+0000\n"
+"PO-Revision-Date: 2011-04-24 15:43+0000\n"
 "Last-Translator: Stanislav Hanzhin <Unknown>\n"
 "Language-Team: Russian <ru@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: 2011-03-17 06:12+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-04-25 05:43+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: base_crypt
 #: sql_constraint:res.users:0
 msgid "You can not have two users with the same login !"
-msgstr ""
+msgstr "Не может быть двух пользователей с одинаковым именем пользователя!"
 
 #. module: base_crypt
 #: model:ir.model,name:base_crypt.model_res_users
@@ -31,23 +31,24 @@ msgstr "res.users"
 #: constraint:res.users:0
 msgid "The chosen company is not in the allowed companies for this user"
 msgstr ""
+"Выбранная организация отсутствует в списке разрешённых для этого пользователя"
 
 #. module: base_crypt
 #: code:addons/base_crypt/crypt.py:132
 #, python-format
 msgid "Please specify the password !"
-msgstr ""
+msgstr "Необходимо указать пароль!"
 
 #. module: base_crypt
 #: model:ir.module.module,shortdesc:base_crypt.module_meta_information
 msgid "Base - Password Encryption"
-msgstr ""
+msgstr "Основной - Шифрование паролей"
 
 #. module: base_crypt
 #: code:addons/base_crypt/crypt.py:132
 #, python-format
 msgid "Error"
-msgstr ""
+msgstr "Error"
 
 #. module: base_crypt
 #: model:ir.module.module,description:base_crypt.module_meta_information
@@ -69,3 +70,15 @@ msgid ""
 "unless you are using a secure protocol such as XML-RPCS.\n"
 "                    "
 msgstr ""
+"Этот модуль заменяет текстовые пароли в базе данных на их хэши,\n"
+"предотвращая хищение оригинальных паролей.\n"
+"Для существующей базы пользователей, удаление текстового пароля происходит "
+"при\n"
+"первом входе пользователя после установки base_crypt.\n"
+"После установки этого модуля станет невозможно восстановление пароля \n"
+"пользователя. Возможна будет только замена пароля.\n"
+"\n"
+"Прим.: установка этого модуля не избавляет от необходимости соблюдать\n"
+"базовые меры безопасности, поскольку пароли всё ещё передаются открытым\n"
+"текстом по сети, если не используется безопасный протокол вроде XML-RPCS.\n"
+"                    "
diff --git a/addons/base_iban/i18n/ru.po b/addons/base_iban/i18n/ru.po
index 6fb23bfcbbe..176ed3f22d6 100644
--- a/addons/base_iban/i18n/ru.po
+++ b/addons/base_iban/i18n/ru.po
@@ -7,19 +7,19 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-01-19 12:00+0000\n"
-"Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
+"PO-Revision-Date: 2011-04-24 15:21+0000\n"
+"Last-Translator: Stanislav Hanzhin <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: 2011-01-25 06:30+0000\n"
-"X-Generator: Launchpad (build 12177)\n"
+"X-Launchpad-Export-Date: 2011-04-25 05:43+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: base_iban
 #: model:ir.module.module,shortdesc:base_iban.module_meta_information
 msgid "Create IBAN bank accounts"
-msgstr ""
+msgstr "Создание банковских счетов IBAN"
 
 #. module: base_iban
 #: code:addons/base_iban/base_iban.py:120
@@ -28,11 +28,12 @@ msgid ""
 "The IBAN does not seems to be correct. You should have entered something "
 "like this %s"
 msgstr ""
+"Похоже, IBAN указан неверно. Должно быть указано что-то вроде этого: %s"
 
 #. module: base_iban
 #: model:res.partner.bank.type.field,name:base_iban.bank_zip_field
 msgid "zip"
-msgstr ""
+msgstr "zip"
 
 #. module: base_iban
 #: help:res.partner.bank,iban:0
@@ -42,7 +43,7 @@ msgstr "Международный номер банковского счета
 #. module: base_iban
 #: model:ir.model,name:base_iban.model_res_partner_bank
 msgid "Bank Accounts"
-msgstr ""
+msgstr "Банковские счета"
 
 #. module: base_iban
 #: model:res.partner.bank.type.field,name:base_iban.bank_country_field
@@ -52,23 +53,23 @@ msgstr "Интендификатор страны"
 #. module: base_iban
 #: model:res.partner.bank.type.field,name:base_iban.bank_swift_field
 msgid "bic"
-msgstr ""
+msgstr "bic"
 
 #. module: base_iban
 #: model:res.partner.bank.type.field,name:base_iban.bank_iban_field
 msgid "iban"
-msgstr ""
+msgstr "iban"
 
 #. module: base_iban
 #: code:addons/base_iban/base_iban.py:121
 #, python-format
 msgid "The IBAN is invalid, It should begin with the country code"
-msgstr ""
+msgstr "IBAN неверен. Он должен начинаться с кода страны"
 
 #. module: base_iban
 #: field:res.partner.bank,iban:0
 msgid "IBAN"
-msgstr ""
+msgstr "IBAN"
 
 #. module: base_iban
 #: model:res.partner.bank.type,name:base_iban.bank_iban
@@ -84,8 +85,13 @@ msgid ""
 "\n"
 "    "
 msgstr ""
+"\n"
+"Этот модуль устанавливает базовые компоненты для работы с  IBAN "
+"(Международный номер банковского счёта) и его проверки.\n"
+"\n"
+"    "
 
 #. module: base_iban
 #: model:res.partner.bank.type.field,name:base_iban.bank_acc_number_field
 msgid "acc_number"
-msgstr ""
+msgstr "acc_number"
diff --git a/addons/crm/i18n/ru.po b/addons/crm/i18n/ru.po
index ed60c121edf..d8cbcefb09b 100644
--- a/addons/crm/i18n/ru.po
+++ b/addons/crm/i18n/ru.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-04-18 19:14+0000\n"
+"PO-Revision-Date: 2011-04-22 13:24+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@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: 2011-04-20 05:57+0000\n"
+"X-Launchpad-Export-Date: 2011-04-23 06:01+0000\n"
 "X-Generator: Launchpad (build 12758)\n"
 
 #. module: crm
@@ -271,6 +271,10 @@ msgid ""
 "sort out your leads analysis by different groups to get accurate grained "
 "analysis."
 msgstr ""
+"Анализ кандидатов позволяет контролировать различную информацию о "
+"взаимоотношениях с клиентами. Проверять частоту обращений, количество "
+"ответов и отосланных писем. Вы можете разбить анализ кандидатов на группы "
+"для получения более подробного анализа."
 
 #. module: crm
 #: view:crm.lead:0
@@ -448,6 +452,11 @@ msgid ""
 "customer. You can also import a .CSV file with a list of calls to be done by "
 "your sales team."
 msgstr ""
+"\"Исходящие звонки\" - список всех звонков, которые предстоит сделать вашему "
+"отделу продаж. Менеджер продаж может записывать информацию о звонке. Эта "
+"информация будет привязана к контрагенту для отслеживания каждого контакта с "
+"ним. Так же вы можете импортировать файл в формате CSV со списком "
+"необходимых звонков звонков вашего отдела продаж."
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead2opportunity_action
@@ -660,6 +669,8 @@ msgid ""
 "Default state of mind for period preceeding the 'Max Interval' computation. "
 "This is the starting state of mind by default if the partner has no event."
 msgstr ""
+"Мнение по умолчанию для периода предшествующего вычислению 'Макс. интервал'. "
+"Это мнение по умолчанию для контрагентов без обращений."
 
 #. module: crm
 #: selection:crm.meeting,end_type:0
@@ -1785,6 +1796,10 @@ msgid ""
 "sent/to be sent to your colleagues/partners. You can not only invite OpenERP "
 "users, but also external parties, such as a customer."
 msgstr ""
+"Используя \"Приглашения\" вы можете создавать и управлять приглашениями на "
+"совещания, которые отправлены или будут отправлены вашим "
+"коллегам/контрагентам. Вы можете приглашать не только пользователей OpenERP, "
+"но и внешних адресатов, например заказчиков."
 
 #. module: crm
 #: selection:crm.meeting,week_list:0
@@ -1940,6 +1955,10 @@ msgid ""
 "with a partner. From the phone call form, you can trigger a request for "
 "another call, a meeting or an opportunity."
 msgstr ""
+"Функция \"Входящие звонки\" позволяет вам быстро описывать входящие звонки. "
+"Каждый звонок будет связан с контрагентом для отслеживания каждого контакта. "
+"Из формы ввода звонка вы можете запланировать следующий звонок, совещание "
+"или предложение."
 
 #. module: crm
 #: help:crm.meeting,recurrency:0
@@ -2466,7 +2485,7 @@ msgstr ""
 #. module: crm
 #: help:crm.installer,crm_fundraising:0
 msgid "This may help associations in their fundraising process and tracking."
-msgstr ""
+msgstr "Это может помочь ассоциациям в сборе средств и их отслеживании."
 
 #. module: crm
 #: field:crm.lead2opportunity.partner,action:0
@@ -3910,7 +3929,7 @@ msgstr "Подтвердить"
 #. module: crm
 #: field:crm.segmentation.line,expr_name:0
 msgid "Control Variable"
-msgstr ""
+msgstr "Управляющая переменная"
 
 #. module: crm
 #: selection:crm.meeting,byday:0
diff --git a/addons/crm_claim/i18n/ru.po b/addons/crm_claim/i18n/ru.po
index e843bce817d..06438d956c6 100644
--- a/addons/crm_claim/i18n/ru.po
+++ b/addons/crm_claim/i18n/ru.po
@@ -8,25 +8,25 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-03-16 00:04+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2011-04-23 20:48+0000\n"
+"Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: Russian <ru@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: 2011-03-17 06:12+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-04-24 05:52+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: crm_claim
 #: field:crm.claim.report,nbr:0
 msgid "# of Cases"
-msgstr ""
+msgstr "кол-во вопросов"
 
 #. module: crm_claim
 #: view:crm.claim:0
 #: view:crm.claim.report:0
 msgid "Group By..."
-msgstr ""
+msgstr "Объединять по..."
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -36,34 +36,34 @@ msgstr ""
 #. module: crm_claim
 #: field:crm.claim,date_action_next:0
 msgid "Next Action Date"
-msgstr ""
+msgstr "Дата следующего действия"
 
 #. module: crm_claim
 #: field:crm.claim.report,probability:0
 msgid "Probability"
-msgstr ""
+msgstr "Вероятность"
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
 msgid "March"
-msgstr ""
+msgstr "Март"
 
 #. module: crm_claim
 #: field:crm.claim.report,delay_close:0
 msgid "Delay to close"
-msgstr ""
+msgstr "Задержка закрытия"
 
 #. module: crm_claim
 #: field:crm.claim,resolution:0
 msgid "Resolution"
-msgstr ""
+msgstr "Решение"
 
 #. module: crm_claim
 #: field:crm.claim,company_id:0
 #: view:crm.claim.report:0
 #: field:crm.claim.report,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Компания"
 
 #. module: crm_claim
 #: field:crm.claim,email_cc:0
@@ -73,7 +73,7 @@ msgstr ""
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "#Claim"
-msgstr ""
+msgstr "# претензий"
 
 #. module: crm_claim
 #: model:ir.actions.act_window,help:crm_claim.crm_claim_stage_act
@@ -87,18 +87,18 @@ msgstr ""
 #: selection:crm.claim,priority:0
 #: selection:crm.claim.report,priority:0
 msgid "Highest"
-msgstr ""
+msgstr "Наивысший"
 
 #. module: crm_claim
 #: view:crm.claim.report:0
 #: field:crm.claim.report,day:0
 msgid "Day"
-msgstr ""
+msgstr "День"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Add Internal Note"
-msgstr ""
+msgstr "Добавить внутреннею заметку"
 
 #. module: crm_claim
 #: help:crm.claim,section_id:0
@@ -110,70 +110,70 @@ msgstr ""
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Claim Description"
-msgstr ""
+msgstr "Описание претензии"
 
 #. module: crm_claim
 #: field:crm.claim,message_ids:0
 msgid "Messages"
-msgstr ""
+msgstr "Сообщения"
 
 #. module: crm_claim
 #: model:crm.case.categ,name:crm_claim.categ_claim1
 msgid "Factual Claims"
-msgstr ""
+msgstr "Фактические претензии"
 
 #. module: crm_claim
 #: selection:crm.claim,state:0
 #: selection:crm.claim.report,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Отменено"
 
 #. module: crm_claim
 #: model:crm.case.resource.type,name:crm_claim.type_claim2
 msgid "Preventive"
-msgstr ""
+msgstr "Предупредительная мера"
 
 #. module: crm_claim
 #: model:crm.case.stage,name:crm_claim.stage_claim2
 msgid "Fixed"
-msgstr ""
+msgstr "Исправлено"
 
 #. module: crm_claim
 #: field:crm.claim,partner_address_id:0
 msgid "Partner Contact"
-msgstr ""
+msgstr "Контакт контрагента"
 
 #. module: crm_claim
 #: field:crm.claim.report,date_closed:0
 msgid "Close Date"
-msgstr ""
+msgstr "Дата закрытия"
 
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "   Month   "
-msgstr ""
+msgstr "   Месяц   "
 
 #. module: crm_claim
 #: field:crm.claim,ref:0
 msgid "Reference"
-msgstr ""
+msgstr "Ссылка"
 
 #. module: crm_claim
 #: field:crm.claim,action_next:0
 msgid "Next Action"
-msgstr ""
+msgstr "Следующее действие"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Reset to Draft"
-msgstr ""
+msgstr "Вернуть в черновики"
 
 #. module: crm_claim
 #: view:crm.claim:0
 #: field:crm.claim,date_deadline:0
 #: field:crm.claim.report,date_deadline:0
 msgid "Deadline"
-msgstr ""
+msgstr "Последний срок"
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -181,72 +181,72 @@ msgstr ""
 #: view:crm.claim.report:0
 #: field:crm.claim.report,partner_id:0
 msgid "Partner"
-msgstr ""
+msgstr "Контрагент"
 
 #. module: crm_claim
 #: selection:crm.claim,type_action:0
 #: selection:crm.claim.report,type_action:0
 msgid "Preventive Action"
-msgstr ""
+msgstr "Предупредительное действие"
 
 #. module: crm_claim
 #: field:crm.claim.report,section_id:0
 msgid "Section"
-msgstr ""
+msgstr "Раздел"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Root Causes"
-msgstr ""
+msgstr "Истинные причины"
 
 #. module: crm_claim
 #: field:crm.claim,user_fault:0
 msgid "Trouble Responsible"
-msgstr ""
+msgstr "Проблемный ответственный"
 
 #. module: crm_claim
 #: field:crm.claim,priority:0
 #: view:crm.claim.report:0
 #: field:crm.claim.report,priority:0
 msgid "Priority"
-msgstr ""
+msgstr "Важность"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Send New Email"
-msgstr ""
+msgstr "Отправить новое эл. письмо"
 
 #. module: crm_claim
 #: field:crm.claim.report,delay_expected:0
 msgid "Overpassed Deadline"
-msgstr ""
+msgstr "Просрочено"
 
 #. module: crm_claim
 #: view:crm.claim:0
 #: view:crm.claim.report:0
 msgid "Type"
-msgstr ""
+msgstr "Тип"
 
 #. module: crm_claim
 #: field:crm.claim,email_from:0
 msgid "Email"
-msgstr ""
+msgstr "Эл.почта"
 
 #. module: crm_claim
 #: selection:crm.claim,priority:0
 #: selection:crm.claim.report,priority:0
 msgid "Lowest"
-msgstr ""
+msgstr "Низший"
 
 #. module: crm_claim
 #: field:crm.claim,create_date:0
 msgid "Creation Date"
-msgstr ""
+msgstr "Дата создания"
 
 #. module: crm_claim
 #: field:crm.claim,name:0
 msgid "Claim Subject"
-msgstr ""
+msgstr "Предмет претензии"
 
 #. module: crm_claim
 #: model:ir.actions.act_window,help:crm_claim.action_report_crm_claim
@@ -254,21 +254,23 @@ msgid ""
 "Have a general overview of all claims processed in the system by sorting "
 "them with specific criteria."
 msgstr ""
+"Иметь общее представление о всех претензиях обработанных в системе при "
+"помощи их сортировки по определенным критериям."
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
 msgid "July"
-msgstr ""
+msgstr "Июль"
 
 #. module: crm_claim
 #: model:ir.actions.act_window,name:crm_claim.crm_claim_stage_act
 msgid "Claim Stages"
-msgstr ""
+msgstr "Этапы претензии"
 
 #. module: crm_claim
 #: model:ir.ui.menu,name:crm_claim.menu_crm_case_claim-act
 msgid "Categories"
-msgstr ""
+msgstr "Категории"
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -276,106 +278,106 @@ msgstr ""
 #: view:crm.claim.report:0
 #: field:crm.claim.report,stage_id:0
 msgid "Stage"
-msgstr ""
+msgstr "Этап"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "History Information"
-msgstr ""
+msgstr "История"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Dates"
-msgstr ""
+msgstr "Даты"
 
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "    Month-1    "
-msgstr ""
+msgstr "    Месяц-1    "
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Contact"
-msgstr ""
+msgstr "Контакт"
 
 #. module: crm_claim
 #: model:ir.ui.menu,name:crm_claim.menu_crm_claim_stage_act
 msgid "Stages"
-msgstr ""
+msgstr "Этапы"
 
 #. module: crm_claim
 #: model:ir.ui.menu,name:crm_claim.menu_report_crm_claim_tree
 msgid "Claims Analysis"
-msgstr ""
+msgstr "Анализ претензий"
 
 #. module: crm_claim
 #: help:crm.claim.report,delay_close:0
 msgid "Number of Days to close the case"
-msgstr ""
+msgstr "Количество дней, для закрытия вопроса"
 
 #. module: crm_claim
 #: model:ir.model,name:crm_claim.model_crm_claim_report
 msgid "CRM Claim Report"
-msgstr ""
+msgstr "Отчет о претензиях"
 
 #. module: crm_claim
 #: model:crm.case.stage,name:crm_claim.stage_claim1
 msgid "Accepted as Claim"
-msgstr ""
+msgstr "Принято как претензия"
 
 #. module: crm_claim
 #: model:crm.case.resource.type,name:crm_claim.type_claim1
 msgid "Corrective"
-msgstr ""
+msgstr "Изменение"
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
 msgid "September"
-msgstr ""
+msgstr "Сентябрь"
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
 msgid "December"
-msgstr ""
+msgstr "Декабрь"
 
 #. module: crm_claim
 #: view:crm.claim.report:0
 #: field:crm.claim.report,month:0
 msgid "Month"
-msgstr ""
+msgstr "Месяц"
 
 #. module: crm_claim
 #: field:crm.claim,type_action:0
 #: field:crm.claim.report,type_action:0
 msgid "Action Type"
-msgstr ""
+msgstr "Тип действия"
 
 #. module: crm_claim
 #: field:crm.claim,write_date:0
 msgid "Update Date"
-msgstr ""
+msgstr "Дата изменения"
 
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "Salesman"
-msgstr ""
+msgstr "Менеджер продаж"
 
 #. module: crm_claim
 #: field:crm.claim,categ_id:0
 #: view:crm.claim.report:0
 #: field:crm.claim.report,categ_id:0
 msgid "Category"
-msgstr ""
+msgstr "Категория"
 
 #. module: crm_claim
 #: model:crm.case.categ,name:crm_claim.categ_claim2
 msgid "Value Claims"
-msgstr ""
+msgstr "Значение претензии"
 
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "  Year  "
-msgstr ""
+msgstr "  Год  "
 
 #. module: crm_claim
 #: help:crm.claim,email_cc:0
@@ -390,20 +392,20 @@ msgstr ""
 #: view:crm.claim.report:0
 #: selection:crm.claim.report,state:0
 msgid "Draft"
-msgstr ""
+msgstr "Черновик"
 
 #. module: crm_claim
 #: selection:crm.claim,priority:0
 #: selection:crm.claim.report,priority:0
 msgid "Low"
-msgstr ""
+msgstr "Низкий"
 
 #. module: crm_claim
 #: field:crm.claim,date_closed:0
 #: selection:crm.claim,state:0
 #: selection:crm.claim.report,state:0
 msgid "Closed"
-msgstr ""
+msgstr "Закрыто"
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -411,83 +413,83 @@ msgstr ""
 #: view:crm.claim.report:0
 #: selection:crm.claim.report,state:0
 msgid "Pending"
-msgstr ""
+msgstr "Отложено"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Communication & History"
-msgstr ""
+msgstr "Общение & история"
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
 msgid "August"
-msgstr ""
+msgstr "Август"
 
 #. module: crm_claim
 #: selection:crm.claim,priority:0
 #: selection:crm.claim.report,priority:0
 msgid "Normal"
-msgstr ""
+msgstr "Обычный"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Global CC"
-msgstr ""
+msgstr "Глобальная копия"
 
 #. module: crm_claim
 #: model:ir.module.module,shortdesc:crm_claim.module_meta_information
 msgid "Customer & Supplier Relationship Management"
-msgstr ""
+msgstr "Управление взаимодействием с заказчиками и поставщиками"
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
 msgid "June"
-msgstr ""
+msgstr "Июнь"
 
 #. module: crm_claim
 #: field:crm.claim,partner_phone:0
 msgid "Phone"
-msgstr ""
+msgstr "Телефон"
 
 #. module: crm_claim
 #: field:crm.claim.report,user_id:0
 msgid "User"
-msgstr ""
+msgstr "Пользователь"
 
 #. module: crm_claim
 #: model:crm.case.stage,name:crm_claim.stage_claim5
 msgid "Awaiting Response"
-msgstr ""
+msgstr "Ожидание ответа"
 
 #. module: crm_claim
 #: model:ir.actions.act_window,name:crm_claim.crm_claim_categ_action
 msgid "Claim Categories"
-msgstr ""
+msgstr "Категории претензий"
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
 msgid "November"
-msgstr ""
+msgstr "Ноябрь"
 
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Расширенные фильтры..."
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Closure"
-msgstr ""
+msgstr "Закрытие"
 
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "Search"
-msgstr ""
+msgstr "Поиск"
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
 msgid "October"
-msgstr ""
+msgstr "Октябрь"
 
 #. module: crm_claim
 #: model:ir.module.module,description:crm_claim.module_meta_information
@@ -503,18 +505,18 @@ msgstr ""
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
 msgid "January"
-msgstr ""
+msgstr "Январь"
 
 #. module: crm_claim
 #: view:crm.claim:0
 #: field:crm.claim,date:0
 msgid "Claim Date"
-msgstr ""
+msgstr "Дата претензии"
 
 #. module: crm_claim
 #: help:crm.claim,email_from:0
 msgid "These people will receive email."
-msgstr ""
+msgstr "Эти люди получат эл. письма."
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -523,13 +525,13 @@ msgstr ""
 #: model:ir.actions.act_window,name:crm_claim.crm_case_categ_claim0
 #: model:ir.ui.menu,name:crm_claim.menu_crm_case_claims
 msgid "Claims"
-msgstr ""
+msgstr "Претензии"
 
 #. module: crm_claim
 #: selection:crm.claim,type_action:0
 #: selection:crm.claim.report,type_action:0
 msgid "Corrective Action"
-msgstr ""
+msgstr "Исправляющее действие"
 
 #. module: crm_claim
 #: model:crm.case.categ,name:crm_claim.categ_claim3
@@ -539,23 +541,23 @@ msgstr ""
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "History"
-msgstr ""
+msgstr "История"
 
 #. module: crm_claim
 #: model:ir.model,name:crm_claim.model_crm_claim
 #: model:ir.ui.menu,name:crm_claim.menu_config_claim
 msgid "Claim"
-msgstr ""
+msgstr "Претензия"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Attachments"
-msgstr ""
+msgstr "Вложения"
 
 #. module: crm_claim
 #: model:ir.model,name:crm_claim.model_crm_case_stage
 msgid "Stage of case"
-msgstr ""
+msgstr "Этап вопроса"
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -563,29 +565,29 @@ msgstr ""
 #: view:crm.claim.report:0
 #: field:crm.claim.report,state:0
 msgid "State"
-msgstr ""
+msgstr "Состояние"
 
 #. module: crm_claim
 #: view:crm.claim:0
 #: view:crm.claim.report:0
 msgid "Done"
-msgstr ""
+msgstr "Готово"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Claim Reporter"
-msgstr ""
+msgstr "Предъявивший претензию"
 
 #. module: crm_claim
 #: view:crm.claim:0
 #: view:crm.claim.report:0
 msgid "Cancel"
-msgstr ""
+msgstr "Отменить"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Close"
-msgstr ""
+msgstr "Закрыть"
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -593,75 +595,75 @@ msgstr ""
 #: view:crm.claim.report:0
 #: selection:crm.claim.report,state:0
 msgid "Open"
-msgstr ""
+msgstr "Открыть"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "In Progress"
-msgstr ""
+msgstr "Выполняется"
 
 #. module: crm_claim
 #: view:crm.claim:0
 #: field:crm.claim,user_id:0
 msgid "Responsible"
-msgstr ""
+msgstr "Ответственный"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Current"
-msgstr ""
+msgstr "Текущий"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Details"
-msgstr ""
+msgstr "Подробности"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Reply"
-msgstr ""
+msgstr "Ответ"
 
 #. module: crm_claim
 #: field:crm.claim,cause:0
 msgid "Root Cause"
-msgstr ""
+msgstr "Истинная причина"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Claim/Action Description"
-msgstr ""
+msgstr "Описание претензии/действия"
 
 #. module: crm_claim
 #: field:crm.claim,description:0
 msgid "Description"
-msgstr ""
+msgstr "Описание"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Search Claims"
-msgstr ""
+msgstr "Поиск претензий"
 
 #. module: crm_claim
 #: field:crm.claim,section_id:0
 #: view:crm.claim.report:0
 msgid "Sales Team"
-msgstr ""
+msgstr "Отдел продаж"
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
 msgid "May"
-msgstr ""
+msgstr "Май"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Resolution Actions"
-msgstr ""
+msgstr "Действия по исправлению"
 
 #. module: crm_claim
 #: model:ir.actions.act_window,name:crm_claim.act_claim_partner
 #: model:ir.actions.act_window,name:crm_claim.act_claim_partner_address
 msgid "Report a Claim"
-msgstr ""
+msgstr "Сообщить о претензии"
 
 #. module: crm_claim
 #: model:ir.actions.act_window,help:crm_claim.crm_case_categ_claim0
@@ -675,12 +677,12 @@ msgstr ""
 #. module: crm_claim
 #: field:crm.claim.report,email:0
 msgid "# Emails"
-msgstr ""
+msgstr "# эл. писем"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Follow Up"
-msgstr ""
+msgstr "К исполнению"
 
 #. module: crm_claim
 #: help:crm.claim,state:0
@@ -693,42 +695,46 @@ msgid ""
 "       \n"
 "If the case needs to be reviewed then the state is set to 'Pending'."
 msgstr ""
+"Состояние  установлено в 'Черновик', при создании вопроса.       \n"
+"Если вопрос в работе состояние  установлено в 'Открыто'.            \n"
+"Когда вопрос  решен состояние  установлено в 'Сделано'.              \n"
+"Если вопрос нуждается в рассмотрении, то состояние 'В ожидании'."
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
 msgid "February"
-msgstr ""
+msgstr "Февраль"
 
 #. module: crm_claim
 #: model:crm.case.stage,name:crm_claim.stage_claim3
 msgid "Won't fix"
-msgstr ""
+msgstr "Не будет исправлено"
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
 msgid "April"
-msgstr ""
+msgstr "Апрель"
 
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "My Case(s)"
-msgstr ""
+msgstr "Мои вопросы"
 
 #. module: crm_claim
 #: field:crm.claim,id:0
 msgid "ID"
-msgstr ""
+msgstr "Идентификатор"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Actions"
-msgstr ""
+msgstr "Действия"
 
 #. module: crm_claim
 #: selection:crm.claim,priority:0
 #: selection:crm.claim.report,priority:0
 msgid "High"
-msgstr ""
+msgstr "Высокий"
 
 #. module: crm_claim
 #: model:ir.actions.act_window,help:crm_claim.crm_claim_categ_action
@@ -736,14 +742,16 @@ msgid ""
 "Create claim categories to better manage and classify your claims. Some "
 "example of claims can be: preventive action, corrective action."
 msgstr ""
+"Создание категорий претензий, чтобы лучше управлять и классифицировать "
+"претензии. Например: предупредительное действие, исправляющее действие."
 
 #. module: crm_claim
 #: field:crm.claim.report,create_date:0
 msgid "Create Date"
-msgstr ""
+msgstr "Дата создания"
 
 #. module: crm_claim
 #: view:crm.claim.report:0
 #: field:crm.claim.report,name:0
 msgid "Year"
-msgstr ""
+msgstr "Год"
diff --git a/addons/document/i18n/ru.po b/addons/document/i18n/ru.po
index 481e16009ad..106d6f39a0b 100644
--- a/addons/document/i18n/ru.po
+++ b/addons/document/i18n/ru.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-04-18 19:50+0000\n"
+"PO-Revision-Date: 2011-04-23 18:48+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@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: 2011-04-20 05:57+0000\n"
+"X-Launchpad-Export-Date: 2011-04-24 05:52+0000\n"
 "X-Generator: Launchpad (build 12758)\n"
 
 #. module: document
@@ -24,12 +24,12 @@ msgstr "Родительский каталог"
 #. module: document
 #: model:ir.model,name:document.model_document_configuration
 msgid "Auto Directory Configuration"
-msgstr ""
+msgstr "Автоматическая настройка каталога"
 
 #. module: document
 #: field:document.directory,resource_field:0
 msgid "Name field"
-msgstr ""
+msgstr "Название поля"
 
 #. module: document
 #: view:board.board:0
@@ -39,12 +39,12 @@ msgstr "Доска документов"
 #. module: document
 #: model:ir.model,name:document.model_process_node
 msgid "Process Node"
-msgstr ""
+msgstr "Узел процесса"
 
 #. module: document
 #: view:document.directory:0
 msgid "Search Document Directory"
-msgstr ""
+msgstr "Искать каталог документов"
 
 #. module: document
 #: help:document.directory,resource_field:0
@@ -63,12 +63,12 @@ msgstr "Имя каталога содержит специальные симв
 #: view:document.directory:0
 #: view:document.storage:0
 msgid "Group By..."
-msgstr "Группировать по ..."
+msgstr "Объединять по..."
 
 #. module: document
 #: model:ir.model,name:document.model_document_directory_content_type
 msgid "Directory Content Type"
-msgstr ""
+msgstr "Тип содержимого каталога"
 
 #. module: document
 #: view:document.directory:0
@@ -101,7 +101,7 @@ msgstr ""
 #: view:document.directory:0
 #: field:document.directory,company_id:0
 msgid "Company"
-msgstr "Компании"
+msgstr "Компания"
 
 #. module: document
 #: model:ir.model,name:document.model_document_directory_content
@@ -111,7 +111,7 @@ msgstr "Содержимое папки"
 #. module: document
 #: view:document.directory:0
 msgid "Dynamic context"
-msgstr ""
+msgstr "Динамический контекст"
 
 #. module: document
 #: model:ir.ui.menu,name:document.menu_document_management_configuration
@@ -147,7 +147,7 @@ msgstr "Имя каталога должно быть уникальным!"
 #: view:ir.attachment:0
 #: field:ir.attachment,index_content:0
 msgid "Indexed Content"
-msgstr ""
+msgstr "Индексированное содержимое"
 
 #. module: document
 #: help:document.directory,resource_find_all:0
@@ -172,7 +172,7 @@ msgstr "Заказ на продажу"
 #. module: document
 #: model:ir.model,name:document.model_report_document_user
 msgid "Files details by Users"
-msgstr ""
+msgstr "Детали файлов по пользователям"
 
 #. module: document
 #: field:document.configuration,project:0
@@ -189,7 +189,7 @@ msgstr "Ошибка !"
 #. module: document
 #: help:document.configuration,product:0
 msgid "Auto directory configuration for Products."
-msgstr ""
+msgstr "Автоматическая настройка каталога для ТМЦ."
 
 #. module: document
 #: field:document.directory,resource_find_all:0
@@ -199,7 +199,7 @@ msgstr "Найти все ресурсы"
 #. module: document
 #: selection:document.directory,type:0
 msgid "Folders per resource"
-msgstr ""
+msgstr "Папки по ресурсам"
 
 #. module: document
 #: field:document.directory.content,suffix:0
@@ -209,7 +209,7 @@ msgstr "Суффикс"
 #. module: document
 #: field:report.document.user,change_date:0
 msgid "Modified Date"
-msgstr "Изменённая дата"
+msgstr "Дата изменения"
 
 #. module: document
 #: view:document.configuration:0
@@ -221,7 +221,7 @@ msgstr "Настройка приложения Знания"
 #: field:ir.attachment,partner_id:0
 #: field:report.files.partner,partner:0
 msgid "Partner"
-msgstr "Партнер"
+msgstr "Контрагент"
 
 #. module: document
 #: view:board.board:0
@@ -231,7 +231,7 @@ msgstr "Файлы по пользователям"
 #. module: document
 #: field:process.node,directory_id:0
 msgid "Document directory"
-msgstr ""
+msgstr "Каталог документов"
 
 #. module: document
 #: code:addons/document/document.py:154
@@ -241,7 +241,7 @@ msgstr ""
 #: code:addons/document/document_directory.py:276
 #, python-format
 msgid "ValidateError"
-msgstr ""
+msgstr "ValidateError"
 
 #. module: document
 #: model:ir.model,name:document.model_ir_actions_report_xml
@@ -270,7 +270,7 @@ msgstr "Хранилище"
 #. module: document
 #: view:document.configuration:0
 msgid "Configure Resource Directory"
-msgstr ""
+msgstr "Настройка каталога ресурсов"
 
 #. module: document
 #: field:ir.attachment,file_size:0
@@ -306,26 +306,28 @@ msgstr ""
 msgid ""
 "Use a domain if you want to apply an automatic filter on visible resources."
 msgstr ""
+"Используйте домен, если вы хотите применить автоматический фильтр видимых "
+"ресурсов."
 
 #. module: document
 #: model:ir.actions.act_window,name:document.action_view_files_by_partner
 msgid "Files Per Partner"
-msgstr ""
+msgstr "Файлы по контрагенту"
 
 #. module: document
 #: field:document.directory,dctx_ids:0
 msgid "Context fields"
-msgstr ""
+msgstr "Контекстные поля"
 
 #. module: document
 #: field:ir.attachment,store_fname:0
 msgid "Stored Filename"
-msgstr ""
+msgstr "Сохраненное имя файла"
 
 #. module: document
 #: field:document.directory,ressource_type_id:0
 msgid "Resource model"
-msgstr ""
+msgstr "Модель ресурса"
 
 #. module: document
 #: view:document.directory:0
@@ -374,12 +376,12 @@ msgstr "Изменен"
 #: code:addons/document/document_storage.py:639
 #, python-format
 msgid "Error at doc write!"
-msgstr ""
+msgstr "Ошибка записи документа!"
 
 #. module: document
 #: view:document.directory:0
 msgid "Generated Files"
-msgstr ""
+msgstr "Сгенерированные файлы"
 
 #. module: document
 #: field:document.directory.content,directory_id:0
@@ -390,7 +392,7 @@ msgstr ""
 #: model:ir.model,name:document.model_document_directory
 #: field:report.document.user,directory:0
 msgid "Directory"
-msgstr "Папка"
+msgstr "Каталог"
 
 #. module: document
 #: view:board.board:0
@@ -430,12 +432,12 @@ msgstr "Дата изменения"
 #. module: document
 #: model:ir.model,name:document.model_report_document_file
 msgid "Files details by Directory"
-msgstr ""
+msgstr "Детали файлов по каталогу"
 
 #. module: document
 #: view:report.document.user:0
 msgid "All users files"
-msgstr ""
+msgstr "Все файлы пользователей"
 
 #. module: document
 #: view:board.board:0
@@ -458,7 +460,7 @@ msgstr "Изображение"
 #. module: document
 #: selection:document.directory,type:0
 msgid "Static Directory"
-msgstr ""
+msgstr "Статический каталог"
 
 #. module: document
 #: field:document.directory,child_ids:0
@@ -495,7 +497,7 @@ msgstr ""
 #: help:document.storage,online:0
 msgid ""
 "If not checked, media is currently offline and its contents not available"
-msgstr ""
+msgstr "Если не установлен, носитель отключен и его содержимое не доступно"
 
 #. module: document
 #: view:document.directory:0
@@ -536,12 +538,12 @@ msgstr ""
 #. module: document
 #: model:ir.actions.act_window,name:document.action_config_auto_directory
 msgid "Auto Configure Directory"
-msgstr ""
+msgstr "Автоматическая настройка каталога"
 
 #. module: document
 #: field:document.directory.content,include_name:0
 msgid "Include Record Name"
-msgstr ""
+msgstr "Включать название записи"
 
 #. module: document
 #: view:ir.attachment:0
@@ -551,12 +553,12 @@ msgstr "Вложение"
 #. module: document
 #: field:ir.actions.report.xml,model_id:0
 msgid "Model Id"
-msgstr ""
+msgstr "Идентификатор модели"
 
 #. module: document
 #: field:document.storage,online:0
 msgid "Online"
-msgstr ""
+msgstr "Подключен"
 
 #. module: document
 #: help:document.directory,ressource_tree:0
@@ -564,6 +566,8 @@ msgid ""
 "Check this if you want to use the same tree structure as the object selected "
 "in the system."
 msgstr ""
+"Отметьте, если вы хотите использовать ту же древовидную структуру как и у "
+"объекта, выбранного в системе."
 
 #. module: document
 #: view:document.directory:0
@@ -586,7 +590,7 @@ msgstr "Август"
 #. module: document
 #: sql_constraint:document.directory:0
 msgid "Directory cannot be parent of itself!"
-msgstr ""
+msgstr "Каталог не может быть родительским для самого себя!"
 
 #. module: document
 #: selection:report.document.user,month:0
@@ -656,7 +660,7 @@ msgstr "База данных"
 #. module: document
 #: help:document.configuration,project:0
 msgid "Auto directory configuration for Projects."
-msgstr ""
+msgstr "Автоматическая настройка каталога для проектов."
 
 #. module: document
 #: view:ir.attachment:0
@@ -686,7 +690,7 @@ msgstr "Панель"
 #. module: document
 #: model:ir.actions.act_window,name:document.action_view_user_graph
 msgid "Files By Users"
-msgstr ""
+msgstr "Файлы по пользователям"
 
 #. module: document
 #: field:document.storage,readonly:0
@@ -740,17 +744,17 @@ msgstr "Имя файла"
 #. module: document
 #: view:document.configuration:0
 msgid "res_config_contents"
-msgstr ""
+msgstr "res_config_contents"
 
 #. module: document
 #: field:document.directory,ressource_id:0
 msgid "Resource ID"
-msgstr "ID объекта"
+msgstr "Идентификатор ресурса"
 
 #. module: document
 #: selection:document.storage,type:0
 msgid "External file storage"
-msgstr ""
+msgstr "Внешнее хранилище файлов"
 
 #. module: document
 #: view:board.board:0
@@ -762,12 +766,12 @@ msgstr "Доска позора"
 #. module: document
 #: help:document.storage,path:0
 msgid "For file storage, the root path of the storage"
-msgstr ""
+msgstr "Для хранилища файлов, корневой каталог хранилища"
 
 #. module: document
 #: model:ir.model,name:document.model_report_files_partner
 msgid "Files details by Partners"
-msgstr ""
+msgstr "Детали файлов по партнерам"
 
 #. module: document
 #: field:document.directory.dctx,field:0
@@ -777,17 +781,17 @@ msgstr "Поле"
 #. module: document
 #: model:ir.model,name:document.model_document_directory_dctx
 msgid "Directory Dynamic Context"
-msgstr ""
+msgstr "Динамический контекст каталога"
 
 #. module: document
 #: field:document.directory,ressource_parent_type_id:0
 msgid "Parent Model"
-msgstr ""
+msgstr "Родительская модель"
 
 #. module: document
 #: view:report.document.user:0
 msgid "Files by users"
-msgstr ""
+msgstr "Файлы по пользователям"
 
 #. module: document
 #: field:report.document.file,month:0
@@ -827,7 +831,7 @@ msgstr "Файлы всех пользователей"
 #. module: document
 #: model:ir.model,name:document.model_report_document_wall
 msgid "Users that did not inserted documents since one month"
-msgstr "Пользователи, не вставляшие документов месяц"
+msgstr "Пользователи, не поместившие документы за месяц"
 
 #. module: document
 #: model:ir.actions.act_window,help:document.action_document_file_form
@@ -862,12 +866,12 @@ msgstr "Январь"
 #. module: document
 #: view:document.directory:0
 msgid "Static"
-msgstr ""
+msgstr "Статический"
 
 #. module: document
 #: view:report.files.partner:0
 msgid "Files By Partner"
-msgstr ""
+msgstr "Файлы по контрагенту"
 
 #. module: document
 #: help:document.directory.dctx,field:0
@@ -879,7 +883,7 @@ msgstr ""
 #. module: document
 #: view:report.document.user:0
 msgid "This Month"
-msgstr "Данный месяц"
+msgstr "Этот месяц"
 
 #. module: document
 #: view:ir.attachment:0
@@ -891,6 +895,8 @@ msgstr "Примечания"
 msgid ""
 "Auto directory configuration for Sale Orders and Quotation with report."
 msgstr ""
+"Автоматическая настройка каталога для заказов на продажу и предложений цен с "
+"отчетом."
 
 #. module: document
 #: help:document.directory,type:0
@@ -901,6 +907,11 @@ msgid ""
 "resources automatically possess sub-directories for each of resource types "
 "defined in the parent directory."
 msgstr ""
+"Каждый каталог может быть либо статического типа либо быть связанным с "
+"ресурсом. Статический каталог, как в операционной системе, это классический "
+"каталог который содержит набор файлов. Каталог, связанный с ресурсами "
+"системы, автоматически обладает подкаталогами для каждого типа ресурсов, "
+"определенных в родительском каталоге."
 
 #. module: document
 #: selection:report.document.user,month:0
@@ -971,35 +982,35 @@ msgstr "Тип Mime"
 #. module: document
 #: field:document.directory.content,sequence:0
 msgid "Sequence"
-msgstr "Сортировать"
+msgstr "Последовательность"
 
 #. module: document
 #: field:document.directory.content,name:0
 msgid "Content Name"
-msgstr ""
+msgstr "Название содержимого"
 
 #. module: document
 #: code:addons/document/document.py:154
 #: code:addons/document/document.py:222
 #, python-format
 msgid "File name must be unique!"
-msgstr ""
+msgstr "Имя файла должно быть уникальным!"
 
 #. module: document
 #: selection:document.storage,type:0
 msgid "Internal File storage"
-msgstr ""
+msgstr "Внутреннее хранилище файлов"
 
 #. module: document
 #: sql_constraint:document.directory:0
 msgid "Directory must have a parent or a storage"
-msgstr ""
+msgstr "Каталог должен иметь родителя или хранилище"
 
 #. module: document
 #: model:ir.actions.act_window,name:document.action_document_directory_tree
 #: model:ir.ui.menu,name:document.menu_document_directories_tree
 msgid "Directories' Structure"
-msgstr ""
+msgstr "Структура каталогов"
 
 #. module: document
 #: view:board.board:0
@@ -1012,19 +1023,19 @@ msgstr "Файлы по типам ресурсов"
 #: field:report.document.user,name:0
 #: field:report.files.partner,name:0
 msgid "Year"
-msgstr ""
+msgstr "Год"
 
 #. module: document
 #: view:document.storage:0
 #: model:ir.model,name:document.model_document_storage
 #: model:ir.ui.menu,name:document.menu_document_storage_media
 msgid "Storage Media"
-msgstr ""
+msgstr "Сменный носитель"
 
 #. module: document
 #: view:document.storage:0
 msgid "Search Document storage"
-msgstr ""
+msgstr "Поиск по хранилищу документов"
 
 #. module: document
 #: field:document.directory.content,extension:0
diff --git a/addons/document_ftp/i18n/ru.po b/addons/document_ftp/i18n/ru.po
index ca5a7a90306..10a4bf16bb9 100644
--- a/addons/document_ftp/i18n/ru.po
+++ b/addons/document_ftp/i18n/ru.po
@@ -8,19 +8,19 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-04-18 19:23+0000\n"
+"PO-Revision-Date: 2011-04-23 19:55+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: Russian <ru@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: 2011-04-20 05:57+0000\n"
+"X-Launchpad-Export-Date: 2011-04-24 05:52+0000\n"
 "X-Generator: Launchpad (build 12758)\n"
 
 #. module: document_ftp
 #: model:ir.model,name:document_ftp.model_document_ftp_configuration
 msgid "Auto Directory Configuration"
-msgstr ""
+msgstr "Автоматическая настройка каталога"
 
 #. module: document_ftp
 #: view:document.ftp.configuration:0
@@ -134,4 +134,4 @@ msgstr "Просмотр документа"
 #. module: document_ftp
 #: view:document.ftp.configuration:0
 msgid "res_config_contents"
-msgstr ""
+msgstr "res_config_contents"
diff --git a/addons/l10n_br/i18n/tr.po b/addons/l10n_br/i18n/tr.po
index 6a6026d7c9a..82f3a85d239 100644
--- a/addons/l10n_br/i18n/tr.po
+++ b/addons/l10n_br/i18n/tr.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-21 06:01+0000\n"
+"X-Launchpad-Export-Date: 2011-04-22 05:51+0000\n"
 "X-Generator: Launchpad (build 12758)\n"
 
 #. module: l10n_br
diff --git a/addons/process/i18n/ru.po b/addons/process/i18n/ru.po
index e6f1ef9f428..72fac76b56f 100644
--- a/addons/process/i18n/ru.po
+++ b/addons/process/i18n/ru.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-04-06 06:20+0000\n"
-"Last-Translator: Stanislav Hanzhin <Unknown>\n"
+"PO-Revision-Date: 2011-04-23 20:55+0000\n"
+"Last-Translator: Chertykov Denis <chertykov@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: 2011-04-07 05:54+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-24 05:52+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: process
 #: model:ir.model,name:process.model_process_node
@@ -107,7 +107,7 @@ msgstr "Описание"
 #. module: process
 #: model:ir.model,name:process.model_process_transition_action
 msgid "Process Transitions Actions"
-msgstr ""
+msgstr "Процесс перехода действия"
 
 #. module: process
 #: field:process.condition,model_id:0
diff --git a/addons/product_manufacturer/i18n/ru.po b/addons/product_manufacturer/i18n/ru.po
index 781761900b7..cd8c2131c42 100644
--- a/addons/product_manufacturer/i18n/ru.po
+++ b/addons/product_manufacturer/i18n/ru.po
@@ -8,24 +8,24 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-01-19 12:00+0000\n"
+"PO-Revision-Date: 2011-04-23 17:33+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: Russian <ru@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: 2011-01-25 06:55+0000\n"
-"X-Generator: Launchpad (build 12177)\n"
+"X-Launchpad-Export-Date: 2011-04-24 05:52+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: product_manufacturer
 #: model:ir.module.module,description:product_manufacturer.module_meta_information
 msgid "A module that add manufacturers and attributes on the product form"
-msgstr ""
+msgstr "Модуль добавить производителей и атрибуты в форму ввода ТМЦ"
 
 #. module: product_manufacturer
 #: field:product.product,manufacturer_pref:0
 msgid "Manufacturer Product Code"
-msgstr ""
+msgstr "Код продукта у производителя"
 
 #. module: product_manufacturer
 #: model:ir.model,name:product_manufacturer.model_product_product
@@ -36,18 +36,18 @@ msgstr "Продукция"
 #. module: product_manufacturer
 #: view:product.manufacturer.attribute:0
 msgid "Product Template Name"
-msgstr ""
+msgstr "Шаблон имени продукта"
 
 #. module: product_manufacturer
 #: model:ir.model,name:product_manufacturer.model_product_manufacturer_attribute
 msgid "Product attributes"
-msgstr ""
+msgstr "Атрибуты продукта"
 
 #. module: product_manufacturer
 #: view:product.manufacturer.attribute:0
 #: view:product.product:0
 msgid "Product Attributes"
-msgstr ""
+msgstr "Атрибуты ТМЦ"
 
 #. module: product_manufacturer
 #: field:product.manufacturer.attribute,name:0
@@ -73,7 +73,7 @@ msgstr "Атрибуты"
 #. module: product_manufacturer
 #: model:ir.module.module,shortdesc:product_manufacturer.module_meta_information
 msgid "Products Attributes & Manufacturers"
-msgstr ""
+msgstr "Атрибуты и производители ТМЦ"
 
 #. module: product_manufacturer
 #: field:product.product,manufacturer_pname:0
diff --git a/addons/profile_tools/i18n/it.po b/addons/profile_tools/i18n/it.po
index 4cdd194f5a7..575fc7a4d22 100644
--- a/addons/profile_tools/i18n/it.po
+++ b/addons/profile_tools/i18n/it.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-01-19 12:00+0000\n"
-"Last-Translator: Nicola Riolini - Micronaet <Unknown>\n"
+"PO-Revision-Date: 2011-04-23 08:39+0000\n"
+"Last-Translator: simone.sandri <Unknown>\n"
 "Language-Team: Italian <it@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: 2011-01-25 06:56+0000\n"
-"X-Generator: Launchpad (build 12177)\n"
+"X-Launchpad-Export-Date: 2011-04-24 05:52+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: profile_tools
 #: help:misc_tools.installer,idea:0
@@ -38,7 +38,7 @@ msgstr "Un semplice modulo che aiuta nella gestione ordini pasto."
 #. module: profile_tools
 #: field:misc_tools.installer,subscription:0
 msgid "Recurring Documents"
-msgstr ""
+msgstr "Documenti Ricorrenti"
 
 #. module: profile_tools
 #: model:ir.model,name:profile_tools.model_misc_tools_installer
diff --git a/addons/profile_tools/i18n/ru.po b/addons/profile_tools/i18n/ru.po
new file mode 100644
index 00000000000..c934764a2d0
--- /dev/null
+++ b/addons/profile_tools/i18n/ru.po
@@ -0,0 +1,144 @@
+# Russian translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-04-23 20:54+0000\n"
+"Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
+"Language-Team: Russian <ru@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: 2011-04-24 05:52+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
+
+#. module: profile_tools
+#: help:misc_tools.installer,idea:0
+msgid "Promote ideas of the employees, votes and discussion on best ideas."
+msgstr ""
+
+#. module: profile_tools
+#: help:misc_tools.installer,share:0
+msgid ""
+"Allows you to give restricted access to your OpenERP documents to external "
+"users, such as customers, suppliers, or accountants. You can share any "
+"OpenERP Menu such as your project tasks, support requests, invoices, etc."
+msgstr ""
+
+#. module: profile_tools
+#: help:misc_tools.installer,lunch:0
+msgid "A simple module to help you to manage Lunch orders."
+msgstr ""
+
+#. module: profile_tools
+#: field:misc_tools.installer,subscription:0
+msgid "Recurring Documents"
+msgstr "Повторяющийся документ"
+
+#. module: profile_tools
+#: model:ir.model,name:profile_tools.model_misc_tools_installer
+msgid "misc_tools.installer"
+msgstr "misc_tools.installer"
+
+#. module: profile_tools
+#: model:ir.module.module,description:profile_tools.module_meta_information
+msgid ""
+"Installs tools for lunch,survey,subscription and audittrail\n"
+"    module\n"
+"    "
+msgstr ""
+
+#. module: profile_tools
+#: view:misc_tools.installer:0
+msgid ""
+"Extra Tools are applications that can help you improve your organization "
+"although they are not key for company management."
+msgstr ""
+
+#. module: profile_tools
+#: view:misc_tools.installer:0
+msgid "Configure"
+msgstr "Настройки"
+
+#. module: profile_tools
+#: help:misc_tools.installer,survey:0
+msgid "Allows you to organize surveys."
+msgstr "Позволяет организовать опросы."
+
+#. module: profile_tools
+#: model:ir.module.module,shortdesc:profile_tools.module_meta_information
+msgid "Miscellaneous Tools"
+msgstr "Разные инструменты"
+
+#. module: profile_tools
+#: help:misc_tools.installer,pad:0
+msgid ""
+"This module creates a tighter integration between a Pad instance of your "
+"choosing and your OpenERP Web Client by letting you easily link pads to "
+"OpenERP objects via OpenERP attachments."
+msgstr ""
+
+#. module: profile_tools
+#: field:misc_tools.installer,lunch:0
+msgid "Lunch"
+msgstr ""
+
+#. module: profile_tools
+#: view:misc_tools.installer:0
+msgid "Extra Tools Configuration"
+msgstr "Дополнительные инструменты настройки"
+
+#. module: profile_tools
+#: field:misc_tools.installer,idea:0
+msgid "Ideas Box"
+msgstr ""
+
+#. module: profile_tools
+#: help:misc_tools.installer,subscription:0
+msgid "Helps to generate automatically recurring documents."
+msgstr "Помогает генерировать автоматически повторяющиеся документы."
+
+#. module: profile_tools
+#: model:ir.actions.act_window,name:profile_tools.action_misc_tools_installer
+msgid "Tools Configuration"
+msgstr "Средства настройки"
+
+#. module: profile_tools
+#: field:misc_tools.installer,pad:0
+msgid "Collaborative Note Pads"
+msgstr ""
+
+#. module: profile_tools
+#: field:misc_tools.installer,survey:0
+msgid "Survey"
+msgstr "Опрос"
+
+#. module: profile_tools
+#: view:misc_tools.installer:0
+msgid "Configure Extra Tools"
+msgstr "Настроить дополнительные инструменты"
+
+#. module: profile_tools
+#: field:misc_tools.installer,progress:0
+msgid "Configuration Progress"
+msgstr "Настройка выполняется"
+
+#. module: profile_tools
+#: field:misc_tools.installer,config_logo:0
+msgid "Image"
+msgstr "Изображение"
+
+#. module: profile_tools
+#: view:misc_tools.installer:0
+msgid "title"
+msgstr ""
+
+#. module: profile_tools
+#: field:misc_tools.installer,share:0
+msgid "Web Share"
+msgstr ""
diff --git a/addons/project_issue/i18n/fr.po b/addons/project_issue/i18n/fr.po
index 0aee574b78e..bbfd1178087 100644
--- a/addons/project_issue/i18n/fr.po
+++ b/addons/project_issue/i18n/fr.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-01-19 12:00+0000\n"
-"Last-Translator: Quentin THEURET <quentin@theuret.net>\n"
+"PO-Revision-Date: 2011-04-21 15:32+0000\n"
+"Last-Translator: Christophe Chauvet - http://www.syleam.fr/ <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: 2011-01-25 06:57+0000\n"
-"X-Generator: Launchpad (build 12177)\n"
+"X-Launchpad-Export-Date: 2011-04-22 05:51+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: project_issue
 #: field:project.issue.report,delay_open:0
@@ -241,7 +241,7 @@ msgstr "Statistiques"
 #. module: project_issue
 #: view:project.issue:0
 msgid "Convert To Task"
-msgstr "Vonvertir en tâche"
+msgstr "Convertir en tâche"
 
 #. module: project_issue
 #: view:project.issue.report:0
diff --git a/addons/project_mailgate/i18n/it.po b/addons/project_mailgate/i18n/it.po
index 9aa786ec474..73c5b6cb7cd 100644
--- a/addons/project_mailgate/i18n/it.po
+++ b/addons/project_mailgate/i18n/it.po
@@ -8,19 +8,19 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-01-19 12:00+0000\n"
-"Last-Translator: Nicola Riolini - Micronaet <Unknown>\n"
+"PO-Revision-Date: 2011-04-22 09:17+0000\n"
+"Last-Translator: simone.sandri <Unknown>\n"
 "Language-Team: Italian <it@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: 2011-01-25 06:58+0000\n"
-"X-Generator: Launchpad (build 12177)\n"
+"X-Launchpad-Export-Date: 2011-04-23 06:01+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: project_mailgate
 #: view:project.task:0
 msgid "History Information"
-msgstr ""
+msgstr "Storico informazioni"
 
 #. module: project_mailgate
 #: model:ir.model,name:project_mailgate.model_project_task
@@ -87,13 +87,13 @@ msgstr "Annulla"
 #: code:addons/project_mailgate/project_mailgate.py:143
 #, python-format
 msgid "Done"
-msgstr ""
+msgstr "Completato"
 
 #. module: project_mailgate
 #: code:addons/project_mailgate/project_mailgate.py:129
 #, python-format
 msgid "Open"
-msgstr ""
+msgstr "Apri"
 
 #. module: project_mailgate
 #: code:addons/project_mailgate/project_mailgate.py:135
diff --git a/addons/purchase/i18n/pt.po b/addons/purchase/i18n/pt.po
index a93c98d0eb1..01761862cc9 100644
--- a/addons/purchase/i18n/pt.po
+++ b/addons/purchase/i18n/pt.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-01-19 12:00+0000\n"
-"Last-Translator: Rui Franco (multibase.pt) <Unknown>\n"
+"PO-Revision-Date: 2011-04-22 11:55+0000\n"
+"Last-Translator: Tiago Baptista <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: 2011-01-25 07:00+0000\n"
-"X-Generator: Launchpad (build 12177)\n"
+"X-Launchpad-Export-Date: 2011-04-23 06:01+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -1362,7 +1362,7 @@ msgstr "O fornecedor aprova a ordem de compra."
 #: model:ir.ui.menu,name:purchase.menu_purchase_form_action
 #: view:purchase.report:0
 msgid "Purchase Orders"
-msgstr "ordens de compra"
+msgstr "Ordens de compra"
 
 #. module: purchase
 #: field:purchase.order,origin:0
diff --git a/addons/sale/i18n/pt.po b/addons/sale/i18n/pt.po
index 1f7ff923e0a..8a684949ed3 100644
--- a/addons/sale/i18n/pt.po
+++ b/addons/sale/i18n/pt.po
@@ -7,20 +7,20 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2011-01-19 12:00+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2011-04-22 11:45+0000\n"
+"Last-Translator: Tiago Baptista <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: 2011-01-25 07:02+0000\n"
-"X-Generator: Launchpad (build 12177)\n"
+"X-Launchpad-Export-Date: 2011-04-23 06:01+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: sale
 #: view:board.board:0
 #: model:ir.actions.act_window,name:sale.action_sales_by_salesman
 msgid "Sales by Salesman in last 90 days"
-msgstr ""
+msgstr "Vendas por vendedor nos últimos 90 dias"
 
 #. module: sale
 #: help:sale.installer,delivery:0
@@ -39,7 +39,7 @@ msgstr ""
 #. module: sale
 #: help:sale.order,partner_shipping_id:0
 msgid "Shipping address for current sales order."
-msgstr ""
+msgstr "Morada de entrega para esta ordem de venda."
 
 #. module: sale
 #: field:sale.advance.payment.inv,qtty:0
@@ -68,7 +68,7 @@ msgstr "Configurar logística das ordens de venda"
 #: code:addons/sale/sale.py:603
 #, python-format
 msgid "The quotation '%s' has been converted to a sales order."
-msgstr ""
+msgstr "A cotação '%s' foi convertida numa ordem de venda."
 
 #. module: sale
 #: selection:sale.order,order_policy:0
@@ -111,6 +111,10 @@ msgid ""
 "sales orders partially, by lines of sales order. You do not need this list "
 "if you invoice from the delivery orders or if you invoice sales totally."
 msgstr ""
+"Aqui está uma lista de todas as linhas de encomendas a serem facturadas. "
+"Pode facturar encomendas parcialmente, por linha da encomenda. Não necessita "
+"desta lista se factura mediante guias de transporte ou se factura sempre "
+"pela totalidade da encomenda."
 
 #. module: sale
 #: model:process.node,name:sale.process_node_saleprocurement0
@@ -225,7 +229,7 @@ msgid ""
 "The invoice is created automatically if the shipping policy is 'Invoice from "
 "pick' or 'Invoice on order after delivery'."
 msgstr ""
-"A fatura é criada automaticamente se a política de transport é 'fatura "
+"A fatura é criada automaticamente se a política de transporte é 'fatura "
 "baseada na recolha' ou 'fatura baseada na ordem após entrega'."
 
 #. module: sale
@@ -266,7 +270,7 @@ msgstr "Embalagem"
 #. module: sale
 #: model:process.transition,name:sale.process_transition_saleinvoice0
 msgid "From a sales order"
-msgstr ""
+msgstr "A partir de ordem de venda"
 
 #. module: sale
 #: field:sale.shop,name:0
@@ -322,7 +326,7 @@ msgstr ""
 #. module: sale
 #: view:sale.installer:0
 msgid "Configure"
-msgstr ""
+msgstr "Configurar"
 
 #. module: sale
 #: constraint:stock.move:0
@@ -344,7 +348,7 @@ msgstr "Junho"
 #: code:addons/sale/sale.py:584
 #, python-format
 msgid "Could not cancel this sales order !"
-msgstr ""
+msgstr "Não foi possível cancelar esta ordem de venda!"
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_report
@@ -354,7 +358,7 @@ msgstr "Estatísticas de ordens de venda"
 #. module: sale
 #: help:sale.order,project_id:0
 msgid "The analytic account related to a sales order."
-msgstr ""
+msgstr "A conta analítica relacionada com uma ordem de venda."
 
 #. module: sale
 #: selection:sale.report,month:0
@@ -372,7 +376,7 @@ msgstr "Cotações"
 #. module: sale
 #: help:sale.order,pricelist_id:0
 msgid "Pricelist for current sales order."
-msgstr ""
+msgstr "Lista de Preços para esta ordem de venda."
 
 #. module: sale
 #: selection:sale.config.picking_policy,step:0
@@ -432,6 +436,8 @@ msgstr ""
 #, python-format
 msgid "You must first cancel stock moves attached to this sales order line."
 msgstr ""
+"Deve primeiro cancelar as movimentações de stock anexadas a esta linha de "
+"ordem de venda."
 
 #. module: sale
 #: code:addons/sale/sale.py:1042
@@ -470,7 +476,7 @@ msgstr "Notas"
 #. module: sale
 #: help:sale.order,partner_invoice_id:0
 msgid "Invoice address for current sales order."
-msgstr ""
+msgstr "Morada de facturação para esta ordem de venda."
 
 #. module: sale
 #: view:sale.installer:0
@@ -511,7 +517,7 @@ msgstr "Março"
 #. module: sale
 #: help:sale.order,amount_total:0
 msgid "The total amount."
-msgstr ""
+msgstr "Montante total."
 
 #. module: sale
 #: field:sale.order.line,price_subtotal:0
@@ -567,7 +573,7 @@ msgstr ""
 #: model:ir.model,name:sale.model_sale_order_line
 #: field:stock.move,sale_line_id:0
 msgid "Sales Order Line"
-msgstr ""
+msgstr "Linha da ordem de venda"
 
 #. module: sale
 #: view:sale.config.picking_policy:0
@@ -714,7 +720,7 @@ msgstr "Vendas, por mês"
 #: code:addons/sale/sale.py:970
 #, python-format
 msgid "Could not cancel sales order line!"
-msgstr ""
+msgstr "Não foi possível cancelar a linha da ordem de venda."
 
 #. module: sale
 #: field:res.company,security_lead:0
@@ -808,6 +814,9 @@ msgid ""
 "The same sales order may have been invoiced in several times (by line for "
 "example)."
 msgstr ""
+"Esta é a lista de facturas que foram geradas por esta ordem de venda. A "
+"mesma ordem de venda pode ter sido facturada várias vezes (por linha, por "
+"exemplo)."
 
 #. module: sale
 #: report:sale.order:0
@@ -825,7 +834,7 @@ msgstr ""
 #: code:addons/sale/sale.py:966
 #, python-format
 msgid "You cannot cancel a sales order line that has already been invoiced !"
-msgstr ""
+msgstr "Não pode cancelar uma linha de ordem de venda já facturada!"
 
 #. module: sale
 #: view:sale.order:0
@@ -876,7 +885,7 @@ msgstr "Fusão de ordens de vendas"
 #. module: sale
 #: view:sale.order:0
 msgid "Total Tax Excluded"
-msgstr ""
+msgstr "Total sem impostos"
 
 #. module: sale
 #: view:sale.order:0
@@ -947,7 +956,7 @@ msgstr "Endereço de Envio :"
 #: view:board.board:0
 #: model:ir.actions.act_window,name:sale.action_sales_by_partner
 msgid "Sales per Customer in last 90 days"
-msgstr ""
+msgstr "Vendas por cliente nos últimos 90 dias"
 
 #. module: sale
 #: model:process.node,note:sale.process_node_quotation0
@@ -957,7 +966,7 @@ msgstr ""
 #. module: sale
 #: model:process.transition,name:sale.process_transition_deliver0
 msgid "Create Delivery Order"
-msgstr ""
+msgstr "Criar ordem de entrega"
 
 #. module: sale
 #: field:sale.installer,delivery:0
@@ -967,7 +976,7 @@ msgstr "Custos de expedição"
 #. module: sale
 #: view:sale.order:0
 msgid "Total Tax Included"
-msgstr ""
+msgstr "Total com impostos"
 
 #. module: sale
 #: model:process.transition,name:sale.process_transition_packing0
@@ -1010,7 +1019,7 @@ msgstr "Recriar Factura"
 #: model:ir.actions.act_window,name:sale.outgoing_picking_list_to_invoice
 #: model:ir.ui.menu,name:sale.menu_action_picking_list_to_invoice
 msgid "Deliveries to Invoice"
-msgstr ""
+msgstr "Entregas a facturar"
 
 #. module: sale
 #: selection:sale.order,state:0
@@ -1021,7 +1030,7 @@ msgstr "A Espera da Agenda"
 #. module: sale
 #: field:sale.order.line,type:0
 msgid "Procurement Method"
-msgstr ""
+msgstr "Método de aprovisionamento"
 
 #. module: sale
 #: view:sale.config.picking_policy:0
@@ -1057,7 +1066,7 @@ msgstr "Confirmar Ordem"
 #. module: sale
 #: model:process.transition,name:sale.process_transition_saleprocurement0
 msgid "Create Procurement Order"
-msgstr ""
+msgstr "Criar ordem de aprovisionamento"
 
 #. module: sale
 #: view:sale.order:0
@@ -1074,7 +1083,7 @@ msgstr "Política de expedição"
 #. module: sale
 #: help:sale.order,create_date:0
 msgid "Date on which sales order is created."
-msgstr ""
+msgstr "Data em que a ordem de venda é criada."
 
 #. module: sale
 #: model:ir.model,name:sale.model_stock_move
@@ -1129,7 +1138,7 @@ msgstr "Erro !"
 #: code:addons/sale/sale.py:570
 #, python-format
 msgid "Could not cancel sales order !"
-msgstr ""
+msgstr "Não foi possível cancelar a ordem de venda!"
 
 #. module: sale
 #: selection:sale.report,month:0
@@ -1155,7 +1164,7 @@ msgstr "Agrupar as facturas"
 #. module: sale
 #: selection:sale.order,order_policy:0
 msgid "Shipping & Manual Invoice"
-msgstr "Expedição & Factura Manual"
+msgstr "Expedição e Factura Manual"
 
 #. module: sale
 #: code:addons/sale/sale.py:1051
@@ -1245,7 +1254,7 @@ msgstr ""
 #: help:sale.config.picking_policy,order_policy:0
 msgid ""
 "You can generate invoices based on sales orders or based on shippings."
-msgstr ""
+msgstr "Pode gerar facturas baseadas em ordens de venda ou em envios."
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
diff --git a/addons/sale/i18n/ru.po b/addons/sale/i18n/ru.po
index 899d539dd12..871fc2b1ab9 100644
--- a/addons/sale/i18n/ru.po
+++ b/addons/sale/i18n/ru.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-21 06:01+0000\n"
+"X-Launchpad-Export-Date: 2011-04-22 05:51+0000\n"
 "X-Generator: Launchpad (build 12758)\n"
 
 #. module: sale
diff --git a/addons/stock/i18n/ru.po b/addons/stock/i18n/ru.po
index bcfab7d5560..b0d93cb153a 100644
--- a/addons/stock/i18n/ru.po
+++ b/addons/stock/i18n/ru.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-21 06:01+0000\n"
+"X-Launchpad-Export-Date: 2011-04-22 05:52+0000\n"
 "X-Generator: Launchpad (build 12758)\n"
 
 #. module: stock
diff --git a/addons/users_ldap/i18n/pt.po b/addons/users_ldap/i18n/pt.po
index dfa1e83650a..e35ec4ee1c6 100644
--- a/addons/users_ldap/i18n/pt.po
+++ b/addons/users_ldap/i18n/pt.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2011-01-19 12:00+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2011-04-22 11:48+0000\n"
+"Last-Translator: Tiago Baptista <Unknown>\n"
 "Language-Team: Portuguese <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: 2011-01-25 07:08+0000\n"
-"X-Generator: Launchpad (build 12177)\n"
+"X-Launchpad-Export-Date: 2011-04-23 06:01+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: users_ldap
 #: constraint:res.company:0
@@ -42,7 +42,7 @@ msgstr "Configuração do LDAP"
 #. module: users_ldap
 #: field:res.company.ldap,ldap_binddn:0
 msgid "LDAP binddn"
-msgstr ""
+msgstr "LDAP binddn"
 
 #. module: users_ldap
 #: help:res.company.ldap,create_user:0
@@ -67,12 +67,12 @@ msgstr "Endereço do servidor de LDAP"
 #. module: users_ldap
 #: field:res.company.ldap,ldap_server_port:0
 msgid "LDAP Server port"
-msgstr ""
+msgstr "Porto do Servidor LDAP"
 
 #. module: users_ldap
 #: field:res.company.ldap,ldap_base:0
 msgid "LDAP base"
-msgstr ""
+msgstr "LDAP base"
 
 #. module: users_ldap
 #: model:ir.model,name:users_ldap.model_res_company
@@ -92,7 +92,7 @@ msgstr "res.company.ldap"
 #. module: users_ldap
 #: model:ir.module.module,description:users_ldap.module_meta_information
 msgid "Adds support for authentication by ldap server"
-msgstr ""
+msgstr "Permite a autenticação de utilizadores através de um servidor LDAP"
 
 #. module: users_ldap
 #: field:res.company.ldap,sequence:0
@@ -122,7 +122,7 @@ msgstr "res.users"
 #. module: users_ldap
 #: field:res.company.ldap,ldap_filter:0
 msgid "LDAP filter"
-msgstr ""
+msgstr "Filtro LDAP"
 
 #. module: users_ldap
 #: field:res.company.ldap,create_user:0
diff --git a/bin/addons/base/i18n/pt_BR.po b/bin/addons/base/i18n/pt_BR.po
index 6039ec938cd..bd1d6a8ecc6 100644
--- a/bin/addons/base/i18n/pt_BR.po
+++ b/bin/addons/base/i18n/pt_BR.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: pt_BR\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-03-29 13:43+0000\n"
-"Last-Translator: Alexsandro Haag <alexsandro.haag@gmail.com>\n"
+"PO-Revision-Date: 2011-04-23 20:42+0000\n"
+"Last-Translator: Emerson <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: 2011-03-31 06:35+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-04-24 05:52+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: base
 #: view:ir.filters:0
@@ -4104,7 +4104,7 @@ msgstr "Latvian / latviešu valoda"
 #: view:res.config:0
 #: view:res.config.installer:0
 msgid "vsep"
-msgstr ""
+msgstr "vsep"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -8572,7 +8572,7 @@ msgstr "Adicionar ou não um cabeçalho RML corporativo"
 #. module: base
 #: help:workflow.transition,act_to:0
 msgid "The destination activity."
-msgstr ""
+msgstr "A atividade destino."
 
 #. module: base
 #: view:base.module.update:0
diff --git a/bin/addons/base/i18n/ro.po b/bin/addons/base/i18n/ro.po
index c3a1a92de81..2a6bfcaf948 100644
--- a/bin/addons/base/i18n/ro.po
+++ b/bin/addons/base/i18n/ro.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-04-07 04:09+0000\n"
-"Last-Translator: Dorin <dhongu@gmail.com>\n"
+"PO-Revision-Date: 2011-04-20 19:04+0000\n"
+"Last-Translator: Mihai Boiciuc <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: 2011-04-08 06:12+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-21 06:00+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: base
 #: view:ir.filters:0
@@ -976,7 +976,7 @@ msgstr "Insulele Marshall"
 #: code:addons/base/ir/ir_model.py:328
 #, python-format
 msgid "Changing the model of a field is forbidden!"
-msgstr ""
+msgstr "Schimbarea modelului unui câmp este interzisă!"
 
 #. module: base
 #: model:res.country,name:base.ht
@@ -1651,6 +1651,7 @@ msgstr ""
 #, python-format
 msgid "A document was modified since you last viewed it (%s:%d)"
 msgstr ""
+"Un document a fost modificat decând l-aţi vizualizat ultima data (%s:%d)"
 
 #. module: base
 #: view:workflow:0
@@ -2403,7 +2404,7 @@ msgstr "Structura bazei de date"
 #: model:ir.model,name:base.model_partner_wizard_spam
 #: view:partner.wizard.spam:0
 msgid "Mass Mailing"
-msgstr ""
+msgstr "Trimitere e-mail în masă"
 
 #. module: base
 #: model:res.country,name:base.yt
@@ -3084,7 +3085,7 @@ msgstr ""
 #. module: base
 #: view:base.module.upgrade:0
 msgid "The selected modules have been updated / installed !"
-msgstr ""
+msgstr "Modulele selectate au fost actualizate - instalate !"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -3254,6 +3255,8 @@ msgid ""
 "You can not create this document (%s) ! Be sure your user belongs to one of "
 "these groups: %s."
 msgstr ""
+"Nu puteţi crea documentul acesta (%s) ! Asiguraţi-vă ca numele dvs. "
+"utilizator aparţine unuia din următoarele grupuri: %s."
 
 #. module: base
 #: model:res.country,name:base.mu
@@ -4029,7 +4032,7 @@ msgstr "Metoda 'create' nu este implementată pentru acest obiect !"
 #. module: base
 #: field:workflow.triggers,workitem_id:0
 msgid "Workitem"
-msgstr ""
+msgstr "Element de lucru"
 
 #. module: base
 #: view:ir.actions.todo:0
@@ -4190,7 +4193,7 @@ msgstr "Necitit"
 #. module: base
 #: field:ir.cron,doall:0
 msgid "Repeat Missed"
-msgstr ""
+msgstr "Repetare pierdute"
 
 #. module: base
 #: help:ir.actions.server,state:0
@@ -4251,7 +4254,7 @@ msgstr "Adaugă reîmprospătare automată acestei vizualizări"
 #. module: base
 #: help:res.partner,employee:0
 msgid "Check this box if the partner is an Employee."
-msgstr ""
+msgstr "Bifaţi această căsuţă dacă partenerul este un angajat."
 
 #. module: base
 #: field:ir.actions.report.xml,report_rml_content:0
@@ -4263,7 +4266,7 @@ msgstr "conținut RML"
 #: model:ir.actions.act_window,name:base.action_workflow_workitem_form
 #: model:ir.ui.menu,name:base.menu_workflow_workitem
 msgid "Workitems"
-msgstr ""
+msgstr "Elemente de lucru"
 
 #. module: base
 #: field:base.language.export,advice:0
@@ -4336,7 +4339,7 @@ msgstr ""
 #. module: base
 #: view:base.module.import:0
 msgid "Module file successfully imported!"
-msgstr ""
+msgstr "Fişierul modul importat cu succes!"
 
 #. module: base
 #: selection:ir.actions.todo,state:0
@@ -4506,7 +4509,7 @@ msgstr "_Ok"
 #. module: base
 #: help:ir.filters,user_id:0
 msgid "False means for every user"
-msgstr ""
+msgstr "Fals înseamnă pentru fiecare utilizator"
 
 #. module: base
 #: code:addons/base/module/module.py:198
diff --git a/bin/addons/base/i18n/ru.po b/bin/addons/base/i18n/ru.po
index 4c787b33458..1d4a964c19e 100644
--- a/bin/addons/base/i18n/ru.po
+++ b/bin/addons/base/i18n/ru.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-03-10 17:56+0000\n"
-"Last-Translator: Stanislav Hanzhin <Unknown>\n"
+"PO-Revision-Date: 2011-04-25 10:27+0000\n"
+"Last-Translator: Chertykov Denis <chertykov@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: 2011-03-11 06:00+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-04-26 06:03+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: base
 #: view:ir.filters:0
@@ -38,7 +38,7 @@ msgstr "Другие настройки"
 #. module: base
 #: selection:ir.property,type:0
 msgid "DateTime"
-msgstr "Дата и время"
+msgstr "DateTime"
 
 #. module: base
 #: code:addons/fields.py:534
@@ -61,7 +61,7 @@ msgstr "Метаданные"
 #: field:ir.ui.view,arch:0
 #: field:ir.ui.view.custom,arch:0
 msgid "View Architecture"
-msgstr "Просмотреть архитектуру"
+msgstr "Архитектура представления"
 
 #. module: base
 #: field:base.language.import,code:0
@@ -106,12 +106,12 @@ msgstr "Рабочий процесс включен"
 #. module: base
 #: field:ir.actions.act_window,display_menu_tip:0
 msgid "Display Menu Tips"
-msgstr "Выводить советы"
+msgstr "Отображать подсказки в меню"
 
 #. module: base
 #: view:ir.module.module:0
 msgid "Created Views"
-msgstr "Созданные виды"
+msgstr "Созданные представления"
 
 #. module: base
 #: code:addons/base/ir/ir_model.py:485
@@ -130,6 +130,9 @@ msgid ""
 "specified as a Python expression defining a list of triplets. For example: "
 "[('color','=','red')]"
 msgstr ""
+"Дополнительный способ ограничения возможных значений в полях отношений. "
+"Указывается как выражение на Python в виде списка трёхэлементных "
+"конструкций. Например: [('color','=','red')]"
 
 #. module: base
 #: field:res.partner,ref:0
@@ -154,6 +157,8 @@ msgid ""
 "Properties of base fields cannot be altered in this manner! Please modify "
 "them through Python code, preferably through a custom addon!"
 msgstr ""
+"Свойства основных полей базы данных не могут быть изменены таким образом! "
+"Измените их в коде Python, желательно при помощи стороннего дополнения!"
 
 #. module: base
 #: code:addons/osv.py:133
@@ -176,12 +181,12 @@ msgstr "Свазиленд"
 #: code:addons/orm.py:3653
 #, python-format
 msgid "created."
-msgstr "создано."
+msgstr "создан."
 
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_woodsuppliers0
 msgid "Wood Suppliers"
-msgstr ""
+msgstr "Поставщики древисины"
 
 #. module: base
 #: code:addons/base/module/module.py:303
@@ -197,7 +202,7 @@ msgstr ""
 #. module: base
 #: field:ir.sequence,number_increment:0
 msgid "Increment Number"
-msgstr "Увеличение номера"
+msgstr "Увеличивать число"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_res_company_tree
@@ -213,19 +218,20 @@ msgstr "Инуктитут / ᐃᓄᒃᑎᑐᑦ"
 #. module: base
 #: view:res.partner:0
 msgid "Search Partner"
-msgstr "Искать партнера"
+msgstr "Искать контрагента"
 
 #. module: base
 #: code:addons/base/res/res_user.py:132
 #, python-format
 msgid "\"smtp_server\" needs to be set to send mails to users"
-msgstr "Настройте \"smtp_server\" для отправки эл. почты пользователям"
+msgstr ""
+"Укажите значение поля «smtp_server» для отправки соообщений пользователям"
 
 #. module: base
 #: code:addons/base/module/wizard/base_export_language.py:60
 #, python-format
 msgid "new"
-msgstr "новый"
+msgstr "new"
 
 #. module: base
 #: field:ir.actions.report.xml,multi:0
@@ -250,7 +256,7 @@ msgstr "Макс. размер"
 #. module: base
 #: field:res.partner.address,name:0
 msgid "Contact Name"
-msgstr "Имя контакта"
+msgstr "Название договора"
 
 #. module: base
 #: code:addons/base/module/wizard/base_export_language.py:56
@@ -286,7 +292,7 @@ msgstr "неверный group_by"
 #. module: base
 #: field:res.partner,credit_limit:0
 msgid "Credit Limit"
-msgstr "Лимит кредита"
+msgstr "Кредитный лимит"
 
 #. module: base
 #: field:ir.model.data,date_update:0
@@ -440,7 +446,7 @@ msgstr "Запланировать обновление"
 #: code:addons/orm.py:838
 #, python-format
 msgid "Key/value '%s' not found in selection field '%s'"
-msgstr ""
+msgstr "Ключ/значение '%s' не найдено в поле выбора '%s'"
 
 #. module: base
 #: help:res.country,code:0
@@ -471,6 +477,8 @@ msgstr "Без перевода"
 msgid ""
 "Context dictionary as Python expression, empty by default (Default: {})"
 msgstr ""
+"Словарь контекста в виде Python-выражения является по умолчанию пустым (По "
+"умолчанию: {})"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.ir_action_wizard
@@ -515,6 +523,7 @@ msgstr "Описание модели"
 msgid ""
 "Optional model name of the objects on which this action should be visible"
 msgstr ""
+"Необязательное имя модели объектов, для которых действие должно быть видимым"
 
 #. module: base
 #: field:workflow.transition,trigger_expr_id:0
@@ -569,6 +578,9 @@ msgid ""
 "Launchpad.net, our open source project management facility. We use their "
 "online interface to synchronize all translations efforts."
 msgstr ""
+"Переводы OpenERP (ядро, модули, клиенты) управляются через Launchpad.net - "
+"наш инструмент управления проектами с открытым кодом. Мы используем его "
+"онлайн интерфейс для синхронизации всех усилий по переводу."
 
 #. module: base
 #: field:res.partner,title:0
@@ -673,6 +685,7 @@ msgstr "Импорт / Экспорт"
 msgid ""
 "Optional domain filtering of the destination data, as a Python expression"
 msgstr ""
+"Дополнительная фильтрация данных назначения, в виде выражения на Python"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_view_base_module_upgrade
@@ -692,7 +705,7 @@ msgstr ""
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (UY) / Español (UY)"
-msgstr ""
+msgstr "Испанский (UY) / Español (UY)"
 
 #. module: base
 #: field:res.partner,mobile:0
@@ -724,7 +737,7 @@ msgstr "Рабочие дни"
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "Other OSI Approved Licence"
-msgstr ""
+msgstr "Другие лицензии утвержденные OSI"
 
 #. module: base
 #: help:res.config.users,context_lang:0
@@ -863,7 +876,7 @@ msgstr "Переходы состояний"
 #: code:addons/orm.py:4020
 #, python-format
 msgid "Record #%d of %s not found, cannot copy!"
-msgstr ""
+msgstr "Запись №%d из %s не найдена, нельзя скопировать !"
 
 #. module: base
 #: field:ir.module.module,contributors:0
@@ -918,11 +931,15 @@ msgid ""
 "Lauchpad's web interface (Rosetta). If you need to perform mass translation, "
 "Launchpad also allows uploading full .po files at once"
 msgstr ""
+"Для улучшения или расширения официальных переводов Вам следует использовать  "
+"непосредственно веб-интерфейс Launchpad (Rosetta). Если Вам необходимо "
+"сделать объемный перевод, Launchpad также позволяет загрузить файлы .po "
+"целиком."
 
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (GT) / Español (GT)"
-msgstr ""
+msgstr "Испанский (GT) / Español (GT)"
 
 #. module: base
 #: view:res.lang:0
@@ -965,7 +982,7 @@ msgstr "Маршалловы Острова"
 #: code:addons/base/ir/ir_model.py:328
 #, python-format
 msgid "Changing the model of a field is forbidden!"
-msgstr ""
+msgstr "Изменение модели поля запрещено!"
 
 #. module: base
 #: model:res.country,name:base.ht
@@ -987,12 +1004,17 @@ msgid ""
 "reference it\n"
 "- creation/update: a mandatory field is not correctly set"
 msgstr ""
+"Операция не может быть завершена, вероятно, связано со следующим:\n"
+"- удаление: возможно, вы пытаетесь удалить запись в то время как другие "
+"записи, по-прежнему ссылаются на неё\n"
+"- создание/изменение: обязательное поле не корректно выбрано или заполнено"
 
 #. module: base
 #: view:ir.rule:0
 msgid ""
 "2. Group-specific rules are combined together with a logical AND operator"
 msgstr ""
+"2. Правила для группы связаны друг с другом оператором  логического И (AND)"
 
 #. module: base
 #: code:addons/base/res/res_user.py:206
@@ -1013,7 +1035,7 @@ msgstr "Дата запроса"
 #. module: base
 #: model:ir.ui.menu,name:base.menu_hr_dasboard
 msgid "Dashboard"
-msgstr "Инф. панель"
+msgstr "Инфо-панель"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_purchase_root
@@ -1058,7 +1080,7 @@ msgstr "Нет языка с кодом \"%s\""
 #: code:addons/base/publisher_warranty/publisher_warranty.py:163
 #, python-format
 msgid "Error during communication with the publisher warranty server."
-msgstr ""
+msgstr "Ошибка во время связи с сервером гарантии издателя."
 
 #. module: base
 #: help:ir.actions.server,email:0
@@ -1087,6 +1109,9 @@ msgid ""
 "system. After the contract has been registered, you will be able to send "
 "issues directly to OpenERP."
 msgstr ""
+"Этот мастер поможет вам зарегистрировать гарантийный договор с издателем в "
+"вашей системе OpenERP. После регистрации договора вы сможете отправлять "
+"отчёты о проблемах напрямую в OpenERP."
 
 #. module: base
 #: code:addons/orm.py:1744
@@ -1126,7 +1151,7 @@ msgstr "Если отмечено, ваши переводы будут заме
 #. module: base
 #: field:ir.actions.report.xml,report_rml:0
 msgid "Main report file path"
-msgstr ""
+msgstr "Путь к файлу главного отчета"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.ir_action_report_xml
@@ -1174,6 +1199,8 @@ msgid ""
 "Access all the fields related to the current object using expressions, i.e. "
 "object.partner_id.name "
 msgstr ""
+"Доступ ко всем полям, связанным с текущим объектом с помощью выражений, "
+"прим.: object.partner_id.name "
 
 #. module: base
 #: model:ir.model,name:base.model_res_country_state
@@ -1193,7 +1220,7 @@ msgstr "res.request.link"
 #. module: base
 #: field:ir.actions.wizard,name:0
 msgid "Wizard Info"
-msgstr "Информация мастера"
+msgstr "Информация о мастере"
 
 #. module: base
 #: view:base.language.export:0
@@ -1208,6 +1235,8 @@ msgid ""
 "Do not display this log if it belongs to the same object the user is working "
 "on"
 msgstr ""
+"Не показывать этот журнал, если он принадлежит объекту с которым работает "
+"пользователь"
 
 #. module: base
 #: model:res.country,name:base.tp
@@ -1247,7 +1276,7 @@ msgstr ""
 #. module: base
 #: field:res.currency,accuracy:0
 msgid "Computational Accuracy"
-msgstr "Валюта расчетов"
+msgstr "Точность вычислений"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -1277,7 +1306,7 @@ msgstr "Мальдивы"
 #. module: base
 #: help:ir.values,res_id:0
 msgid "Keep 0 if the action must appear on all resources."
-msgstr "Оставьте 0, если действие предназначено для всех ресурсов."
+msgstr "Оставьте 0, если действие относится ко всем ресурсам"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_rule
@@ -1320,7 +1349,7 @@ msgstr "Партнеры"
 #. module: base
 #: field:res.partner.category,parent_left:0
 msgid "Left parent"
-msgstr ""
+msgstr "Родитель слева"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.res_widget_act_window
@@ -1493,7 +1522,7 @@ msgstr "Испанский / Español"
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Korean (KP) / 한국어 (KP)"
-msgstr ""
+msgstr "Корейский (KP) / 한국어 (KP)"
 
 #. module: base
 #: view:base.module.update:0
@@ -1517,7 +1546,7 @@ msgstr "Поиск контакта"
 #. module: base
 #: view:ir.module.module:0
 msgid "Uninstall (beta)"
-msgstr "Удаление установки (бета)"
+msgstr "Деинсталяция (бета)"
 
 #. module: base
 #: selection:ir.actions.act_window,target:0
@@ -1571,6 +1600,8 @@ 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 ""
+"Пример: 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) )"
 
 #. module: base
 #: model:ir.actions.act_window,help:base.action_ui_view
@@ -1578,6 +1609,8 @@ 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."
 msgstr ""
+"Представления позволяют Вам настраивать вид OpenERP. Вы можете добавлять, "
+"перемещать поля, переименовывать их или удалять те, которые Вам не нужны."
 
 #. module: base
 #: field:ir.actions.act_window,groups_id:0
@@ -1603,7 +1636,7 @@ msgstr "Группы"
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (CL) / Español (CL)"
-msgstr ""
+msgstr "Испанский (CL) / Español (CL)"
 
 #. module: base
 #: view:res.config.users:0
@@ -1612,6 +1645,10 @@ msgid ""
 "access to selected functionalities within the system. Click on 'Done' if you "
 "do not wish to add more users at this stage, you can always do this later."
 msgstr ""
+"Создание дополнительных пользователей и назначение им групп, что позволит им "
+"иметь доступ к отдельным функциям в рамках системы. Нажмите на кнопку "
+"\"Сделано\", если вы не хотите добавлять пользователей на данном этапе, вы "
+"всегда можете сделать это позже."
 
 #. module: base
 #: model:res.country,name:base.bz
@@ -1634,12 +1671,14 @@ msgid ""
 "Comma-separated list of allowed view modes, such as 'form', 'tree', "
 "'calendar', etc. (Default: tree,form)"
 msgstr ""
+"Разделенный запятыми список доступных режимов представления, таких как "
+"«форма», «дерево», «календарь» и т.д. (По умолчанию: дерево, форма)"
 
 #. module: base
 #: code:addons/orm.py:3147
 #, python-format
 msgid "A document was modified since you last viewed it (%s:%d)"
-msgstr "Документ был изменен с момента вашего последнего посещения (%s:%d)"
+msgstr "Документ был изменен с момента вашего последнего просмотра (%s:%d)"
 
 #. module: base
 #: view:workflow:0
@@ -1705,7 +1744,7 @@ msgstr "Счет"
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Portugese (BR) / Português (BR)"
-msgstr ""
+msgstr "Португальский (BR) / Português (BR)"
 
 #. module: base
 #: model:res.country,name:base.bb
@@ -1833,7 +1872,7 @@ msgstr "Значения"
 #. module: base
 #: view:ir.actions.server:0
 msgid "Field Mappings"
-msgstr "Соответствие полей"
+msgstr "Соответствия полей"
 
 #. module: base
 #: view:base.language.export:0
@@ -1957,6 +1996,8 @@ msgid ""
 "One of the records you are trying to modify has already been deleted "
 "(Document type: %s)."
 msgstr ""
+"Одна из записей, которую вы пытаетесь изменить, уже удалена (Тип документа: "
+"%s)."
 
 #. module: base
 #: model:ir.actions.act_window,help:base.action_country
@@ -1965,6 +2006,8 @@ msgid ""
 "partner records. You can create or delete countries to make sure the ones "
 "you are working on will be maintained."
 msgstr ""
+"Отображение и управление списком всех стран, которые могут быть отнесены к "
+"вашим контрагентам. Вы можете создавать или удалять страны в процессе работы."
 
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_7
@@ -1979,12 +2022,12 @@ msgstr "Остров Норфолк"
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Korean (KR) / 한국어 (KR)"
-msgstr ""
+msgstr "Корейский (KR) / 한국어 (KR)"
 
 #. module: base
 #: help:ir.model.fields,model:0
 msgid "The technical name of the model this field belongs to"
-msgstr ""
+msgstr "Техническое название модели к которой относится это поле"
 
 #. module: base
 #: field:ir.actions.server,action_id:0
@@ -2000,7 +2043,7 @@ msgstr "Бангладеш"
 #. module: base
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr "Ошибка! Невозможно создать рекурсивную компанию."
+msgstr "Ошибка ! Нельзя создать рекурсивные компании."
 
 #. module: base
 #: selection:publisher_warranty.contract,state:0
@@ -2031,7 +2074,7 @@ msgstr "События партнера"
 #. module: base
 #: model:res.widget,title:base.facebook_widget
 msgid "Facebook"
-msgstr ""
+msgstr "Facebook"
 
 #. module: base
 #: model:res.country,name:base.am
@@ -2109,7 +2152,7 @@ msgstr "Австрия"
 #: selection:base.module.import,state:0
 #: selection:base.module.update,state:0
 msgid "done"
-msgstr "выполнено"
+msgstr "сделано"
 
 #. module: base
 #: selection:ir.actions.act_window.view,view_mode:0
@@ -2142,6 +2185,9 @@ msgid ""
 "separated list of valid field names (optionally followed by asc/desc for the "
 "direction)"
 msgstr ""
+"Указан неверный «порядок». Правильный «порядок» — список названий "
+"существующих полей, разделённый запятыми. Дополнительно можно указать "
+"порядок сортировки (asc или desc)."
 
 #. module: base
 #: model:ir.model,name:base.model_ir_module_module_dependency
@@ -2167,6 +2213,8 @@ msgid ""
 "way you want to print them in letters and other documents. Some example: "
 "Mr., Mrs. "
 msgstr ""
+"Управление обращениями к контактам, доступным в вашей системе, обращения при "
+"печати в письмах и других документах. Например: Г-н, Г-жа. "
 
 #. module: base
 #: field:res.company,rml_footer1:0
@@ -2199,7 +2247,7 @@ msgstr "Головная компания"
 #. module: base
 #: field:ir.ui.menu,web_icon_hover:0
 msgid "Web Icon File (hover)"
-msgstr ""
+msgstr "Файл значка для Web (наведение)"
 
 #. module: base
 #: view:ir.actions.server:0
@@ -2227,11 +2275,13 @@ msgid ""
 "Please double-check that the file encoding is set to UTF-8 (sometimes called "
 "Unicode) when the translator exports it."
 msgstr ""
+"Когда переводчик экспортирует файл, проверьте дважды что у него установлена "
+"кодировка UTF-8 (иногда называется Юникод)."
 
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (DO) / Español (DO)"
-msgstr ""
+msgstr "Испанский (DO) / Español (DO)"
 
 #. module: base
 #: model:ir.model,name:base.model_workflow_activity
@@ -2244,6 +2294,8 @@ msgid ""
 "Reference of the target resource, whose model/table depends on the 'Resource "
 "Name' field."
 msgstr ""
+"Ссылка на целевой ресурс, модель/таблица которого зависит от поля «Имя "
+"Ресурса»."
 
 #. module: base
 #: field:ir.model.fields,select_level:0
@@ -2258,7 +2310,7 @@ msgstr "Уругвай"
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Finnish / Suomi"
-msgstr ""
+msgstr "Финский / Suomi"
 
 #. module: base
 #: field:ir.rule,perm_write:0
@@ -2288,7 +2340,7 @@ msgstr "Соответствие полей"
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Portugese / Português"
-msgstr ""
+msgstr "Португальский / Português"
 
 #. module: base
 #: model:res.partner.title,name:base.res_partner_title_sir
@@ -2299,7 +2351,7 @@ msgstr "Г-н"
 #: code:addons/orm.py:1622
 #, python-format
 msgid "There is no view of type '%s' defined for the structure!"
-msgstr ""
+msgstr "Представление типа '%s' не определено для этой структуры!"
 
 #. module: base
 #: field:ir.default,ref_id:0
@@ -2358,7 +2410,7 @@ msgstr "Антарктида"
 #. module: base
 #: field:ir.actions.report.xml,auto:0
 msgid "Custom python parser"
-msgstr ""
+msgstr "Пользовательский парсер Python"
 
 #. module: base
 #: view:base.language.import:0
@@ -2426,7 +2478,7 @@ msgstr "Фильтры"
 #: code:addons/orm.py:758
 #, python-format
 msgid "Please check that all your lines have %d columns."
-msgstr ""
+msgstr "Проверьте, что во всех строках имеется %d столбцов."
 
 #. module: base
 #: model:ir.actions.act_window,name:base.ir_cron_act
@@ -2446,12 +2498,14 @@ msgstr "Название"
 #: help:ir.property,res_id:0
 msgid "If not set, acts as a default value for new resources"
 msgstr ""
+"Если не установлено, выступает в качестве значения по умолчанию для новых "
+"ресурсов"
 
 #. module: base
 #: code:addons/orm.py:3448
 #, python-format
 msgid "Recursivity Detected."
-msgstr ""
+msgstr "Обнаружена рекурсия."
 
 #. module: base
 #: code:addons/base/module/module.py:262
@@ -2487,7 +2541,7 @@ msgstr ""
 #. module: base
 #: model:ir.model,name:base.model_maintenance_contract
 msgid "maintenance.contract"
-msgstr ""
+msgstr "maintenance.contract"
 
 #. module: base
 #: model:res.country,name:base.ru
@@ -2497,7 +2551,7 @@ msgstr "Российская Федерация"
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Urdu / اردو"
-msgstr ""
+msgstr "Урду / اردو"
 
 #. module: base
 #: field:res.company,name:0
@@ -2574,7 +2628,7 @@ msgstr "GPL версии 2 или более поздней"
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_sir
 msgid "M."
-msgstr ""
+msgstr "Г-н"
 
 #. module: base
 #: code:addons/base/module/module.py:429
@@ -2644,6 +2698,9 @@ msgid ""
 "import a language pack from here. Other OpenERP languages than the official "
 "ones can be found on launchpad."
 msgstr ""
+"Если Вам необходим язык, отличный от официально доступных, вы можете "
+"импортировать языковой пакет отсюда. Другие языки OpenERP, кроме "
+"официальных, могут быть найдены на Launchpad."
 
 #. module: base
 #: view:ir.module.module:0
@@ -2682,7 +2739,7 @@ msgstr "Штрих-код 13"
 #: code:addons/orm.py:1622
 #, python-format
 msgid "Invalid Architecture!"
-msgstr ""
+msgstr "Неверная Архитектура!"
 
 #. module: base
 #: model:res.country,name:base.pt
@@ -2694,6 +2751,8 @@ msgstr "Португалия"
 msgid ""
 "You cannot have multiple records with the same id for the same module !"
 msgstr ""
+"Вы не можете иметь несколько записей с одинаковым идентификатором для одного "
+"модуля !"
 
 #. module: base
 #: field:ir.module.module,certificate:0
@@ -2846,7 +2905,7 @@ msgstr "Фильтры по умолчанию"
 #. module: base
 #: field:res.request.history,name:0
 msgid "Summary"
-msgstr "Обзор"
+msgstr "Содержание"
 
 #. module: base
 #: field:multi_company.default,expression:0
@@ -2873,6 +2932,8 @@ msgid ""
 "Optional help text for the users with a description of the target view, such "
 "as its usage and purpose."
 msgstr ""
+"Дополнительный текст помощи для пользователей с описанием целевого "
+"представления, например его использования или предназначения."
 
 #. module: base
 #: model:res.country,name:base.va
@@ -2929,7 +2990,7 @@ msgstr "Банковский счёт"
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (HN) / Español (HN)"
-msgstr ""
+msgstr "Испанский (HN) / Español (HN)"
 
 #. module: base
 #: view:ir.sequence.type:0
@@ -2939,7 +3000,7 @@ msgstr "Тип последовательности"
 #. module: base
 #: view:ir.ui.view.custom:0
 msgid "Customized Architecture"
-msgstr ""
+msgstr "Персонализированая архитектура"
 
 #. module: base
 #: field:ir.module.module,license:0
@@ -2973,6 +3034,8 @@ msgid ""
 "The selected language has been successfully installed. You must change the "
 "preferences of the user and open a new menu to view the changes."
 msgstr ""
+"Выбранный язык был успешно установлен. Вы должны изменить настройки "
+"пользователя и открыть новое меню для просмотра изменений."
 
 #. module: base
 #: sql_constraint:ir.config_parameter:0
@@ -3011,7 +3074,7 @@ msgstr "Автор"
 #. module: base
 #: model:res.country,name:base.mk
 msgid "FYROM"
-msgstr ""
+msgstr "Бывшая Югославская Республика Македония"
 
 #. module: base
 #: view:res.lang:0
@@ -3033,7 +3096,7 @@ msgstr ""
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Hebrew / עִבְרִי"
-msgstr ""
+msgstr "Иврит / עִבְרִי"
 
 #. module: base
 #: model:res.country,name:base.bo
@@ -3081,7 +3144,7 @@ msgstr "Выбранные модули будут обновлены / уста
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (PR) / Español (PR)"
-msgstr ""
+msgstr "Испанский (PR) / Español (PR)"
 
 #. module: base
 #: model:res.country,name:base.gt
@@ -3099,7 +3162,7 @@ msgstr "Рабочие процессы"
 #. module: base
 #: field:ir.translation,xml_id:0
 msgid "XML Id"
-msgstr ""
+msgstr "XML Id"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_config_user_form
@@ -3165,7 +3228,7 @@ msgstr "Пользовательские отчеты"
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Abkhazian / аҧсуа"
-msgstr ""
+msgstr "Абхазский / аҧсуа"
 
 #. module: base
 #: view:base.module.configuration:0
@@ -3176,7 +3239,7 @@ msgstr "Настройка системы выполнена"
 #: code:addons/orm.py:929
 #, python-format
 msgid "Error occurred while validating the field(s) %s: %s"
-msgstr ""
+msgstr "Произошла ошибка при проверке поля(ей)  %s: %s"
 
 #. module: base
 #: view:ir.property:0
@@ -3222,7 +3285,7 @@ msgstr "Суффикс записи для последовательности"
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (PY) / Español (PY)"
-msgstr ""
+msgstr "Испанский (PY) / Español (PY)"
 
 #. module: base
 #: field:ir.config_parameter,key:0
@@ -3246,6 +3309,8 @@ msgid ""
 "You can not create this document (%s) ! Be sure your user belongs to one of "
 "these groups: %s."
 msgstr ""
+"Вы не можете создать этот документ (%s) ! Убедитесь, что ваш пользователь "
+"принадлежит к одной из этих групп: %s."
 
 #. module: base
 #: model:res.country,name:base.mu
@@ -3287,7 +3352,7 @@ msgstr "Установлен"
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Ukrainian / українська"
-msgstr ""
+msgstr "Украинский / Українська"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_translation
@@ -3333,12 +3398,12 @@ msgstr "Следующее число"
 #. module: base
 #: help:workflow.transition,condition:0
 msgid "Expression to be satisfied if we want the transition done."
-msgstr ""
+msgstr "Выражение, которое будет выполнено, если мы хотим сделать переход."
 
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (PA) / Español (PA)"
-msgstr ""
+msgstr "Испанский (PA) / Español (PA)"
 
 #. module: base
 #: view:res.currency:0
@@ -3412,7 +3477,7 @@ msgstr "Применить для удаления"
 #: code:addons/base/ir/ir_model.py:319
 #, python-format
 msgid "Cannot rename column to %s, because that column already exists!"
-msgstr ""
+msgstr "Нельзя переименовать столбец в %s, потому что он уже существует !"
 
 #. module: base
 #: view:ir.attachment:0
@@ -3434,6 +3499,12 @@ msgid ""
 "to see. Whether they can have a read, write, create and delete access right "
 "can be managed from here."
 msgstr ""
+"Группа — это набор функциональных областей, назначаемых пользователю, чтобы "
+"предоставить ему доступ и права к определеным приложениям и задачам в "
+"системе. Вы можете создавать пользовательские группы или изменять "
+"существующие по умолчанию, чтобы настроить вид меню, отображаемый "
+"пользователю. Отсюда можно управлять правами доступа пользователей на "
+"чтение, запись, создание или удаление."
 
 #. module: base
 #: view:res.partner:0
@@ -3457,6 +3528,11 @@ msgid ""
 "Would your payment have been carried out after this mail was sent, please "
 "consider the present one as void."
 msgstr ""
+"Уведомляем, что наступило время следующего платежа. Если платёж был "
+"отправлен — предоставьте, пожалуйста, подробности этого платежа. Если платёж "
+"будет и далее задерживаться, свяжитесь, пожалуйста, с нами.                  "
+"       Если платёж был отправлен до отправки этого письма — возможно, письмо "
+"отправлено по ошибке."
 
 #. module: base
 #: model:res.country,name:base.mx
@@ -3570,6 +3646,15 @@ msgid ""
 "plugin, don't forget to register emails to each contact so that the gateway "
 "will automatically attach incoming emails to the right partner."
 msgstr ""
+"Заказчик — это сущность, с которой ведутся деловые отношения, например "
+"компания или организация. Для каждого заказчика может быть указано множество "
+"контактов или адресов, по которым ведёт деятельность эта компания. Можно "
+"использовать вкладку «История», чтобы отследить все транзакции, связанные с "
+"заказчиком: заказы на продажу, письма, коммерческие предложения, заявки и "
+"т.д. При использовании почтового шлюза, дополнений для Outlook или "
+"Thunderbird, не забывайте регистрировать письма каждому контактному лицу, "
+"чтобы шлюз автоматически сопоставлял входящие сообщения с нужным "
+"контрагентом."
 
 #. module: base
 #: field:ir.actions.report.xml,name:0
@@ -3605,6 +3690,8 @@ 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.ms
@@ -3618,6 +3705,8 @@ msgid ""
 "The Selection Options expression is not a valid Pythonic expression.Please "
 "provide an expression in the [('key','Label'), ...] format."
 msgstr ""
+"Выражение для вариантов выбора указано не в формате выражений Python. "
+"Выражение должно быть в формате [('ключ','Надпись'), ...]"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_translation_app
@@ -3631,6 +3720,8 @@ msgid ""
 "The user's timezone, used to perform timezone conversions between the server "
 "and the client."
 msgstr ""
+"Часовой пояс пользователя. Используется для обеспечения преобразования "
+"часового пояса между сервером и клиентом."
 
 #. module: base
 #: field:ir.module.module,demo:0
@@ -3645,7 +3736,7 @@ msgstr "Английский (Великобритания)"
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Japanese / 日本語"
-msgstr ""
+msgstr "Японский / 日本語"
 
 #. module: base
 #: help:workflow.transition,act_from:0
@@ -3653,6 +3744,8 @@ msgid ""
 "Source activity. When this activity is over, the condition is tested to "
 "determine if we can start the ACT_TO activity."
 msgstr ""
+"Исходное действие. При завершении этого действия происходит проверка "
+"возможности начать действие ACT_TO."
 
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_3
@@ -3665,6 +3758,8 @@ msgid ""
 "For one2many fields, the field on the target model that implement the "
 "opposite many2one relationship"
 msgstr ""
+"Для полей один-ко-многим. Поле на целевой модели, которое обеспечивает "
+"обратную связь многие-к-одному"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_actions_act_window_view
@@ -3771,7 +3866,7 @@ msgstr "Настройки SMS"
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (BO) / Español (BO)"
-msgstr ""
+msgstr "Испанский (BO) / Español (BO)"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.ir_access_act
@@ -3811,7 +3906,7 @@ msgstr "Дата инициализации"
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Gujarati / ગુજરાતી"
-msgstr ""
+msgstr "Гуджарати / ગુજરાતી"
 
 #. module: base
 #: code:addons/base/module/module.py:257
@@ -3826,6 +3921,7 @@ msgstr ""
 #: view:publisher_warranty.contract.wizard:0
 msgid "Please enter the serial key provided in your contract document:"
 msgstr ""
+"Пожалуйста, введите серийный ключ, предоставленный в вашем контракте:"
 
 #. module: base
 #: view:workflow.activity:0
@@ -3838,6 +3934,7 @@ msgstr "Начало процесса"
 #, python-format
 msgid "module base cannot be loaded! (hint: verify addons-path)"
 msgstr ""
+"базовый модуль не может быть загружен! (Подсказка: проверьте addons-path)"
 
 #. module: base
 #: view:res.partner.bank:0
@@ -3880,6 +3977,9 @@ msgid ""
 "form, signal tests the name of the pressed button. If signal is NULL, no "
 "button is necessary to validate this transition."
 msgstr ""
+"Когда операция перехода начинается нажатием кнопки в клиенской форме, сигнал "
+"проверяет имя нажатой кнопки. Если сигнал имеет значение NULL — кнопка для "
+"подтверждения перехода не требуется."
 
 #. module: base
 #: help:multi_company.default,object_id:0
@@ -3939,6 +4039,8 @@ msgid ""
 "Whether values for this field can be translated (enables the translation "
 "mechanism for that field)"
 msgstr ""
+"Могут ли переводиться значения данного поля (включает механизм перевода для "
+"данного поля)"
 
 #. module: base
 #: view:res.lang:0
@@ -3972,13 +4074,13 @@ msgstr "ir.actions.url"
 #. module: base
 #: model:res.widget,title:base.currency_converter_widget
 msgid "Currency Converter"
-msgstr ""
+msgstr "Конвертер валют"
 
 #. module: base
 #: code:addons/orm.py:156
 #, python-format
 msgid "Wrong ID for the browse record, got %r, expected an integer."
-msgstr ""
+msgstr "Неверный идентификатор записи, получено %r, ожидалось число."
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_partner_addess_tree
@@ -3999,13 +4101,13 @@ msgstr "Точность цен"
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Latvian / latviešu valoda"
-msgstr ""
+msgstr "Латвийский / latviešu valoda"
 
 #. module: base
 #: view:res.config:0
 #: view:res.config.installer:0
 msgid "vsep"
-msgstr ""
+msgstr "vsep"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -4104,7 +4206,7 @@ msgstr "Меню"
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Serbian (Latin) / srpski"
-msgstr ""
+msgstr "Сербский (Latin) / srpski"
 
 #. module: base
 #: model:res.country,name:base.il
@@ -4279,7 +4381,7 @@ msgstr ""
 #. module: base
 #: view:base.language.import:0
 msgid "- module,type,name,res_id,src,value"
-msgstr ""
+msgstr "- module,type,name,res_id,src,value"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -4298,7 +4400,7 @@ msgstr ""
 #. module: base
 #: help:ir.model.fields,relation:0
 msgid "For relationship fields, the technical name of the target model"
-msgstr ""
+msgstr "Для полей связей. Техническое имя целевой модели"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -4323,7 +4425,7 @@ msgstr "Проект"
 #. module: base
 #: field:ir.ui.menu,web_icon_hover_data:0
 msgid "Web Icon Image (hover)"
-msgstr ""
+msgstr "Изображение веб-иконки (в режиме ожидания)"
 
 #. module: base
 #: view:base.module.import:0
@@ -4399,7 +4501,7 @@ msgstr "Копия"
 #. module: base
 #: field:ir.model,osv_memory:0
 msgid "In-memory model"
-msgstr ""
+msgstr "Модель в памяти"
 
 #. module: base
 #: view:partner.clear.ids:0
@@ -4583,6 +4685,9 @@ msgid ""
 "OpenERP. They are launched during the installation of new modules, but you "
 "can choose to restart some wizards manually from this menu."
 msgstr ""
+"Мастера настройки используются для помощи при настройке нового экземпляра "
+"OpenERP. Они запускаются в процессе установки новых модулей, но можно "
+"запустить некоторые мастера заново из этого меню."
 
 #. module: base
 #: code:addons/base/res/res_user.py:206
@@ -4598,7 +4703,7 @@ msgstr ""
 #: code:addons/orm.py:1350
 #, python-format
 msgid "Insufficient fields for Calendar View!"
-msgstr ""
+msgstr "Недостаточно полей для режима Календаря!"
 
 #. module: base
 #: selection:ir.property,type:0
@@ -4611,6 +4716,8 @@ msgid ""
 "The path to the main report file (depending on Report Type) or NULL if the "
 "content is in another data field"
 msgstr ""
+"Путь к главному файлу отчёта (в зависимости от типа отчёта), или NULL, если "
+"содержание хранится в другом поле данных"
 
 #. module: base
 #: help:res.config.users,company_id:0
@@ -4672,7 +4779,7 @@ msgstr "Закрыть"
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (MX) / Español (MX)"
-msgstr ""
+msgstr "Испанский (MX) / Español (MX)"
 
 #. module: base
 #: view:res.log:0
@@ -4702,7 +4809,7 @@ msgstr "Данное окно"
 #. module: base
 #: view:publisher_warranty.contract:0
 msgid "Publisher Warranty Contracts"
-msgstr ""
+msgstr "Договоры о гарантии издателя"
 
 #. module: base
 #: help:res.log,name:0
@@ -4742,6 +4849,8 @@ msgid ""
 "federal states you are working on from here. Each state is attached to one "
 "country."
 msgstr ""
+"При работаете на американском рынке, вы можете управлять различными "
+"федеральными штатами отсюда. Каждый штат соотносится с одной страной."
 
 #. module: base
 #: view:workflow.workitem:0
@@ -4780,6 +4889,8 @@ msgstr "Сотрудники"
 msgid ""
 "If this log item has been read, get() should not send it to the client"
 msgstr ""
+"Если этот элемент журнала был прочитан, функция get() не должна отправлять "
+"его клиенту"
 
 #. module: base
 #: field:res.company,rml_header2:0
@@ -4804,6 +4915,9 @@ msgid ""
 "channels that will be maintained at the creation of a document in the "
 "system. Some examples of channels can be: Website, Phone Call, Reseller, etc."
 msgstr ""
+"Отлеживание источников появления кандидатов и предложений путём создания "
+"специализированных каналов, обслуживаемых при создании докумета в системе. "
+"Например, каналы могут быть такими: сайт, телефонный звонок, реселлер и т.д."
 
 #. module: base
 #: model:res.partner.bank.type.field,name:base.bank_normal_field
@@ -4892,7 +5006,7 @@ msgstr "Пользовательское поле"
 #. module: base
 #: field:ir.module.module,web:0
 msgid "Has a web component"
-msgstr ""
+msgstr "Имеет веб-компонент"
 
 #. module: base
 #: model:res.country,name:base.cc
@@ -4904,7 +5018,7 @@ msgstr "Кокосовые острова (Острова Килинг)"
 #: selection:base.module.import,state:0
 #: selection:base.module.update,state:0
 msgid "init"
-msgstr ""
+msgstr "init"
 
 #. module: base
 #: view:res.lang:0
@@ -4982,7 +5096,7 @@ msgstr "Поле объекта"
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (PE) / Español (PE)"
-msgstr ""
+msgstr "Испанский (PE) / Español (PE)"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -5008,7 +5122,7 @@ msgstr "Действия клиента"
 #: code:addons/orm.py:1806
 #, python-format
 msgid "The exists method is not implemented on this object !"
-msgstr ""
+msgstr "Метод exists не реализован для данного объекта!"
 
 #. module: base
 #: code:addons/base/module/module.py:336
@@ -5044,7 +5158,7 @@ msgstr "Категория предка"
 #. module: base
 #: selection:ir.property,type:0
 msgid "Integer Big"
-msgstr ""
+msgstr "Целочисленный Большой"
 
 #. module: base
 #: selection:res.partner.address,type:0
@@ -5115,7 +5229,7 @@ msgstr ""
 #. module: base
 #: selection:ir.property,type:0
 msgid "Many2One"
-msgstr ""
+msgstr "Многие-к-одному"
 
 #. module: base
 #: model:res.country,name:base.ng
@@ -5126,7 +5240,7 @@ msgstr "Нигерия"
 #: code:addons/base/ir/ir_model.py:250
 #, python-format
 msgid "For selection fields, the Selection Options must be given!"
-msgstr ""
+msgstr "Для полей выбора должны быть предоставлены варианты выбора!"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_partner_sms_send
@@ -5141,7 +5255,7 @@ msgstr "Акцептованные пользователи"
 #. module: base
 #: field:ir.ui.menu,web_icon_data:0
 msgid "Web Icon Image"
-msgstr ""
+msgstr "Изображение веб-иконки"
 
 #. module: base
 #: view:ir.values:0
@@ -5175,6 +5289,15 @@ msgid ""
 "installed the CRM, with the history tab, you can track all the interactions "
 "with a partner such as opportunities, emails, or sales orders issued."
 msgstr ""
+"Модуль «Заказчики» (также называемый «Контрагенты» в других областях "
+"системы) поможет вам управлять записями о компаниях в адресной книге, не "
+"смотря на то являются ли они заказчиками, поставщиками или потенциальными "
+"клиентами. Форма контрагента позволяет отслеживать и записывать всю "
+"информацию, необходимую для взаимодействия с контрагентом, от адреса "
+"компании до контактов, прайс-листов и многого другого. Если вы установили "
+"модуль CRM, то можете отслеживать всё взаимодействие с контрагентом, в том "
+"числе предложения, письма, продажи или поступившие заказы, на вкладке "
+"«История»."
 
 #. module: base
 #: model:res.country,name:base.ph
@@ -5235,7 +5358,7 @@ msgstr "Доминика"
 #: sql_constraint:publisher_warranty.contract:0
 msgid ""
 "Your publisher warranty contract is already subscribed in the system !"
-msgstr ""
+msgstr "Ваш гарантийный договор с издателем уже зарегистрирован в системе!"
 
 #. module: base
 #: help:ir.cron,nextcall:0
@@ -5260,6 +5383,8 @@ msgid ""
 "Invalid value for reference field \"%s\" (last part must be a non-zero "
 "integer): \"%s\""
 msgstr ""
+"Неверное значение для ссылающегося поля «%s» (последняя часть должна быть не "
+"нулевым целым числом): «%s»"
 
 #. module: base
 #: help:ir.cron,args:0
@@ -5273,13 +5398,16 @@ msgid ""
 "groups. If this field is empty, OpenERP will compute visibility based on the "
 "related object's read access."
 msgstr ""
+"При использовании групп, видимость меню основывается на этих группах. Если "
+"это поле пустое, OpenERP вычислит видимость на основе прав на просмотр "
+"связанных объектов."
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_ui_view_custom
 #: model:ir.ui.menu,name:base.menu_action_ui_view_custom
 #: view:ir.ui.view.custom:0
 msgid "Customized Views"
-msgstr ""
+msgstr "Персонализированные представления"
 
 #. module: base
 #: view:partner.sms.send:0
@@ -5314,6 +5442,11 @@ msgid ""
 "sure to save and close all forms before switching to a different company. "
 "(You can click on Cancel in the User Preferences now)"
 msgstr ""
+"Помните, что отображаемые в данный момент документы могут потерять "
+"актуальность при переключении на другую компанию. Если остались "
+"несохранённые изменения — перед переключением необходимо удостовериться, что "
+"они сохранены и все формы закрыты. (Можете нажать «Отмена» в настройках "
+"пользователя)"
 
 #. module: base
 #: view:ir.actions.configuration.wizard:0
@@ -5406,7 +5539,7 @@ msgstr "Компания по умолчанию"
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (EC) / Español (EC)"
-msgstr ""
+msgstr "Испанский (EC) / Español (EC)"
 
 #. module: base
 #: help:ir.ui.view,xml_id:0
@@ -5427,7 +5560,7 @@ msgstr "Американское Самоа"
 #. module: base
 #: help:ir.actions.act_window,res_model:0
 msgid "Model name of the object to open in the view window"
-msgstr ""
+msgstr "Название модели объекта, отображаемой в окне представления"
 
 #. module: base
 #: field:res.log,secondary:0
@@ -5466,7 +5599,7 @@ msgstr "Повтор"
 #: code:addons/orm.py:3532
 #, python-format
 msgid "UserError"
-msgstr ""
+msgstr "UserError"
 
 #. module: base
 #: model:res.country,name:base.ae
@@ -5489,6 +5622,8 @@ msgstr "Реюньон (заморский регион Франции)"
 msgid ""
 "New column name must still start with x_ , because it is a custom field!"
 msgstr ""
+"Название нового столбца всё равно должно начинаться с  x_ , поскольку это "
+"пользовательское поле!"
 
 #. module: base
 #: view:ir.model.access:0
@@ -5606,11 +5741,16 @@ msgid ""
 "Warning: if \"email_from\" and \"smtp_server\" aren't configured, it won't "
 "be possible to email new users."
 msgstr ""
+"При указании адреса электронной почты, на него будет отправлено "
+"приветственное сообщение.\n"
+"\n"
+"Внимание: если значения полей «email_from» и «smtp_server» не указаны — "
+"отправка писем новым пользователям будет невозможна."
 
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Flemish (BE) / Vlaams (BE)"
-msgstr ""
+msgstr "Фламандский (BE) / Vlaams (BE)"
 
 #. module: base
 #: field:ir.cron,interval_number:0
@@ -5660,7 +5800,7 @@ msgstr "ТОДО"
 #: code:addons/base/res/res_config.py:94
 #, python-format
 msgid "Couldn't find previous ir.actions.todo"
-msgstr ""
+msgstr "Невозможно найти предыдущее ir.actions.todo"
 
 #. module: base
 #: view:ir.actions.act_window:0
@@ -5675,7 +5815,7 @@ msgstr "Пользовательские комбинации клавиш"
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Vietnamese / Tiếng Việt"
-msgstr ""
+msgstr "Вьетнамский / Tiếng Việt"
 
 #. module: base
 #: model:res.country,name:base.dz
@@ -5741,6 +5881,7 @@ msgstr "Модель %s не существует !"
 #, python-format
 msgid "You cannot delete the language which is User's Preferred Language !"
 msgstr ""
+"Невозможно удалить язык, установленный как предпочитаемый пользователем!"
 
 #. module: base
 #: code:addons/fields.py:103
@@ -5793,12 +5934,12 @@ msgstr "Нейтральная зона"
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Hindi / हिंदी"
-msgstr ""
+msgstr "Хинди / हिंदी"
 
 #. module: base
 #: view:ir.model:0
 msgid "Custom"
-msgstr ""
+msgstr "Пользовательский"
 
 #. module: base
 #: view:res.request:0
@@ -5845,7 +5986,7 @@ msgstr "%I - часы [01,12]."
 #. module: base
 #: selection:publisher_warranty.contract.wizard,state:0
 msgid "Finished"
-msgstr ""
+msgstr "Завершено"
 
 #. module: base
 #: model:res.country,name:base.de
@@ -5878,6 +6019,8 @@ msgid ""
 "View type: set to 'tree' for a hierarchical tree view, or 'form' for other "
 "views"
 msgstr ""
+"Тип представления: установите «tree» для иерархического представления или "
+"«form» для остальных представлений"
 
 #. module: base
 #: code:addons/base/res/res_config.py:421
@@ -5901,6 +6044,8 @@ msgstr "Гондурас"
 msgid ""
 "Check out this box if you want to always display tips on each menu action"
 msgstr ""
+"Отметьте этот квадратик, если вы хотите всегда выводить советы для каждого "
+"пункта меню"
 
 #. module: base
 #: model:res.country,name:base.eg
@@ -5984,6 +6129,8 @@ msgid ""
 "It gives the status if the tip has to be displayed or not when a user "
 "executes an action"
 msgstr ""
+"Указывает, должна ли отображаться подсказка когда пользователь выполняет "
+"действие"
 
 #. module: base
 #: view:ir.model:0
@@ -5995,7 +6142,7 @@ msgstr "Базовый"
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Telugu / తెలుగు"
-msgstr ""
+msgstr "Телугу / తెలుగు"
 
 #. module: base
 #: model:res.country,name:base.lr
@@ -6085,7 +6232,7 @@ msgstr "Последовательность кодов"
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (CO) / Español (CO)"
-msgstr ""
+msgstr "Испанский (CO) / Español (CO)"
 
 #. module: base
 #: view:base.module.configuration:0
@@ -6093,6 +6240,8 @@ msgid ""
 "All pending configuration wizards have been executed. You may restart "
 "individual wizards via the list of configuration wizards."
 msgstr ""
+"Все ожидающие мастера настройки были выполнены. Можно презапустить некоторые "
+"из них с помощью списка мастеров настройки."
 
 #. module: base
 #: wizard_button:server.action.create,step_1,create:0
@@ -6124,6 +6273,7 @@ msgstr "res.log"
 #: help:ir.translation,xml_id:0
 msgid "Maps to the ir_model_data for which this translation is provided."
 msgstr ""
+"Отображается в данные ir_model_data для которых предоставлен перевод."
 
 #. module: base
 #: view:workflow.activity:0
@@ -6202,7 +6352,7 @@ msgstr "Китайский (тайваньский) / 正體字"
 #. module: base
 #: model:ir.model,name:base.model_res_request
 msgid "res.request"
-msgstr "Запрос"
+msgstr "res.request"
 
 #. module: base
 #: view:ir.model:0
@@ -6234,6 +6384,8 @@ msgstr "ООО"
 msgid ""
 "The group that a user must have to be authorized to validate this transition."
 msgstr ""
+"Группа, в которой должен состоять пользователь для подтверждения этого "
+"перехода."
 
 #. module: base
 #: constraint:res.config.users:0
@@ -6295,6 +6447,8 @@ msgid ""
 "OpenERP will automatically adds some '0' on the left of the 'Next Number' to "
 "get the required padding size."
 msgstr ""
+"OpenERP автоматически добавляет несколько '0' слева от 'Следующее число' для "
+" заданного выравнивания."
 
 #. module: base
 #: view:res.lang:0
@@ -6309,7 +6463,7 @@ msgstr "Месяцы"
 #. module: base
 #: field:ir.actions.act_window,search_view:0
 msgid "Search View"
-msgstr "Обзор поиска"
+msgstr "Поиск обзора"
 
 #. module: base
 #: sql_constraint:res.lang:0
@@ -6340,7 +6494,7 @@ msgstr "Прочие действия"
 #: selection:ir.actions.todo,state:0
 #: view:res.config.users:0
 msgid "Done"
-msgstr "Выполнено"
+msgstr "Сделано"
 
 #. module: base
 #: model:res.partner.title,name:base.res_partner_title_miss
@@ -6423,6 +6577,8 @@ msgid ""
 "Manage the partner titles you want to have available in your system. The "
 "partner titles is the legal status of the company: Private Limited, SA, etc."
 msgstr ""
+"Управление списком доступных в вашей системе организационно-правовых форм "
+"компаний. Примеры организационно-правовых форм: ЗАО, ООО, ОАО. и т.д."
 
 #. module: base
 #: view:base.language.export:0
@@ -6456,7 +6612,7 @@ msgstr "Установленная версия"
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Mongolian / монгол"
-msgstr ""
+msgstr "Монгольский / Монгол"
 
 #. module: base
 #: model:res.country,name:base.mr
@@ -6493,7 +6649,7 @@ msgstr "Родительская компания"
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (CR) / Español (CR)"
-msgstr ""
+msgstr "Испанский (CR) / Español (CR)"
 
 #. module: base
 #: field:res.currency.rate,rate:0
@@ -6543,6 +6699,8 @@ msgid ""
 "Customized views are used when users reorganize the content of their "
 "dashboard views (via web client)"
 msgstr ""
+"Настраиваемые виды используются при организации содержимого инфо-панели "
+"(через веб клиент)"
 
 #. module: base
 #: field:ir.model,name:0
@@ -6581,7 +6739,7 @@ msgstr "Пиктограмма"
 #. module: base
 #: help:ir.model.fields,model_id:0
 msgid "The model this field belongs to"
-msgstr ""
+msgstr "Модель к которой принадлежит это поле"
 
 #. module: base
 #: model:res.country,name:base.mq
@@ -6664,7 +6822,7 @@ msgstr "Проблемы в конфигурации `Record Id` в сервер
 #: code:addons/orm.py:2316
 #, python-format
 msgid "ValidateError"
-msgstr ""
+msgstr "ValidateError"
 
 #. module: base
 #: view:base.module.import:0
@@ -6675,7 +6833,7 @@ msgstr "Открыть модули"
 #. module: base
 #: model:ir.actions.act_window,help:base.action_res_bank_form
 msgid "Manage bank records you want to be used in the system."
-msgstr ""
+msgstr "Управление банковскими документами используемыми в системе."
 
 #. module: base
 #: view:base.module.import:0
@@ -6693,6 +6851,8 @@ msgid ""
 "The path to the main report file (depending on Report Type) or NULL if the "
 "content is in another field"
 msgstr ""
+"Путь к главному файлу отчёта (в зависимости от типа отчёта), или NULL, если "
+"содержание хранится в другом поле данных"
 
 #. module: base
 #: model:res.country,name:base.la
@@ -6719,6 +6879,8 @@ msgid ""
 "The sum of the data (2nd field) is null.\n"
 "We can't draw a pie chart !"
 msgstr ""
+"Сумма данных (второе поле) равно нулю.\n"
+"Мы не можем нарисовать круговую диаграмму !"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_lunch_reporting
@@ -6740,7 +6902,7 @@ msgstr "Того"
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "Other Proprietary"
-msgstr ""
+msgstr "Другой проприетарный"
 
 #. module: base
 #: selection:workflow.activity,kind:0
@@ -6794,6 +6956,8 @@ msgid ""
 "Enable this if you want to execute missed occurences as soon as the server "
 "restarts."
 msgstr ""
+"Включите при необходимости выполнять пропущенные события при перезапуске "
+"сервера."
 
 #. module: base
 #: view:base.module.upgrade:0
@@ -6804,7 +6968,7 @@ msgstr "Начать обновление"
 #: code:addons/base/publisher_warranty/publisher_warranty.py:144
 #, python-format
 msgid "Contract validation error"
-msgstr ""
+msgstr "Ошибка проверки контракта"
 
 #. module: base
 #: field:res.country.state,name:0
@@ -6831,12 +6995,12 @@ msgstr "События отчетов"
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_miss
 msgid "Mss"
-msgstr ""
+msgstr "Г-жа"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_ui_view
 msgid "ir.ui.view"
-msgstr "Обзор"
+msgstr "ir.ui.view"
 
 #. module: base
 #: constraint:res.partner:0
@@ -6895,6 +7059,10 @@ msgid ""
 "not connect to the system. You can assign them groups in order to give them "
 "specific access to the applications they need to use in the system."
 msgstr ""
+"Создавайте пользователей и управляйте их доступом к системе. Пользователи "
+"могут быть деактивированы при окончании периода их неактивности в системе. "
+"Пользователям могут быть назначены группы с целью предоставить им особый "
+"доступ к приложениям внутри системы."
 
 #. module: base
 #: selection:res.request,priority:0
@@ -6998,7 +7166,7 @@ msgstr "Настоящее имя пользователя, использует
 #: code:addons/osv.py:156
 #, python-format
 msgid "Integrity Error"
-msgstr ""
+msgstr "Ошибка целостности"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_wizard_screen
@@ -7048,7 +7216,7 @@ msgstr "Аргументы"
 #: code:addons/orm.py:716
 #, python-format
 msgid "Database ID doesn't exist: %s : %s"
-msgstr ""
+msgstr "Идентификатор базы данных не существует:  %s : %s"
 
 #. module: base
 #: selection:ir.module.module,license:0
@@ -7064,7 +7232,7 @@ msgstr "GPL версия 3"
 #: code:addons/orm.py:836
 #, python-format
 msgid "key '%s' not found in selection field '%s'"
-msgstr ""
+msgstr "Ключ '%s' не найден в поле выбора '%s'"
 
 #. module: base
 #: view:partner.wizard.ean.check:0
@@ -7075,7 +7243,7 @@ msgstr "Правильный штрих-код"
 #: code:addons/orm.py:2317
 #, python-format
 msgid "The value \"%s\" for the field \"%s\" is not in the selection"
-msgstr ""
+msgstr "Значение \"%s\" в поле \"%s\" не входит в выбранные"
 
 #. module: base
 #: field:res.partner,customer:0
@@ -7088,7 +7256,7 @@ msgstr "Заказчик"
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (NI) / Español (NI)"
-msgstr ""
+msgstr "Испанский (NI) / Español (NI)"
 
 #. module: base
 #: field:ir.module.module,shortdesc:0
@@ -7173,12 +7341,12 @@ msgstr "Отмена установки"
 #. module: base
 #: field:ir.model.fields,selection:0
 msgid "Selection Options"
-msgstr ""
+msgstr "Варианты выбора"
 
 #. module: base
 #: field:res.partner.category,parent_right:0
 msgid "Right parent"
-msgstr ""
+msgstr "Родитель справа"
 
 #. module: base
 #: view:res.lang:0
@@ -7252,6 +7420,9 @@ msgid ""
 "\n"
 "[object with reference: %s - %s]"
 msgstr ""
+"\n"
+"\n"
+"[объект со ссылкой: %s - %s]"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_default
@@ -7324,7 +7495,7 @@ msgstr "Настройки"
 #. module: base
 #: model:ir.model,name:base.model_publisher_warranty_contract_wizard
 msgid "publisher_warranty.contract.wizard"
-msgstr ""
+msgstr "publisher_warranty.contract.wizard"
 
 #. module: base
 #: field:ir.actions.server,expression:0
@@ -7397,7 +7568,7 @@ msgstr "Состояние"
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Galician / Galego"
-msgstr ""
+msgstr "Галисийский / Galego"
 
 #. module: base
 #: model:res.country,name:base.no
@@ -7468,7 +7639,7 @@ msgstr ""
 #. module: base
 #: view:base.language.import:0
 msgid "- type,name,res_id,src,value"
-msgstr ""
+msgstr "- type,name,res_id,src,value"
 
 #. module: base
 #: model:res.country,name:base.hm
@@ -7605,7 +7776,7 @@ msgstr "workflow.instance"
 #: code:addons/orm.py:278
 #, python-format
 msgid "Unknown attribute %s in %s "
-msgstr ""
+msgstr "Неизвестный атрибут %s в %s "
 
 #. module: base
 #: view:res.lang:0
@@ -7616,12 +7787,12 @@ msgstr "10. %S              ==> 20"
 #: code:addons/fields.py:106
 #, python-format
 msgid "undefined get method !"
-msgstr ""
+msgstr "не определен метод 'get'!"
 
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Norwegian Bokmål / Norsk bokmål"
-msgstr ""
+msgstr "Норвежский Bokmål / Norsk bokmål"
 
 #. module: base
 #: help:res.config.users,new_password:0
@@ -7630,6 +7801,8 @@ msgid ""
 "Only specify a value if you want to change the user password. This user will "
 "have to logout and login again!"
 msgstr ""
+"Вводите пароль, только если вы хотите его изменить. Этому пользователю "
+"придется выйти и снова войти !"
 
 #. module: base
 #: model:res.partner.title,name:base.res_partner_title_madam
@@ -7644,7 +7817,7 @@ msgstr "Эстония"
 #. module: base
 #: model:ir.ui.menu,name:base.dashboard
 msgid "Dashboards"
-msgstr "Информационные панели"
+msgstr "Инфо-панели"
 
 #. module: base
 #: help:ir.attachment,type:0
@@ -7655,7 +7828,7 @@ msgstr "Двоичный файл или внешний URL"
 #: field:res.config.users,new_password:0
 #: field:res.users,new_password:0
 msgid "Change password"
-msgstr ""
+msgstr "Сменить пароль"
 
 #. module: base
 #: model:res.country,name:base.nl
@@ -7680,7 +7853,7 @@ msgstr "Значения"
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Occitan (FR, post 1500) / Occitan"
-msgstr ""
+msgstr "Окситанский (FR, post 1500) / Occitan"
 
 #. module: base
 #: model:ir.actions.act_window,help:base.open_module_tree
@@ -7690,12 +7863,16 @@ msgid ""
 "button \"Schedule for Installation\" from the form view, then click on "
 "\"Apply Scheduled Upgrades\" to migrate your system."
 msgstr ""
+"Можно устанавливать новые модули для подключения новых функций, меню, "
+"отчётов или данных в вашем экземпляре OpenERP. Для установки модулей, "
+"нажмите на кнопку «Отметить для установки» в представлении в виде формы, "
+"затем нажмите «Применить отмеченные обновления», чтобы обновить вашу систему."
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_emails
 #: model:ir.ui.menu,name:base.menu_mail_gateway
 msgid "Emails"
-msgstr ""
+msgstr "Адреса эл.почты"
 
 #. module: base
 #: model:res.country,name:base.cd
@@ -7705,7 +7882,7 @@ msgstr "Демократическая республика Конго"
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Malayalam / മലയാളം"
-msgstr ""
+msgstr "Малаялам / മലയാളം"
 
 #. module: base
 #: view:res.request:0
@@ -7752,7 +7929,7 @@ msgstr "Греция"
 #. module: base
 #: field:res.request,trigger_date:0
 msgid "Trigger Date"
-msgstr "Дата триггера"
+msgstr "Дата активации"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -7824,6 +8001,9 @@ msgid ""
 "defining a list of (key, label) pairs. For example: "
 "[('blue','Blue'),('yellow','Yellow')]"
 msgstr ""
+"Список вариантов для полей с выбором, указанный в виде выражения на Python, "
+"определяющий список пар (ключ, значение). Например: "
+"[('blue','Blue'),('yellow','Yellow')]"
 
 #. module: base
 #: selection:base.language.export,state:0
@@ -7836,6 +8016,8 @@ msgid ""
 "Indicates whether this object model lives in memory only, i.e. is not "
 "persisted (osv.osv_memory)"
 msgstr ""
+"Указывает, существует ли модель этого объекта только в памяти, т.е. не "
+"является сохраняемой (osv.osv_memory)"
 
 #. module: base
 #: field:res.partner,child_ids:0
@@ -7853,7 +8035,7 @@ msgstr "Поставщики"
 #. module: base
 #: view:publisher_warranty.contract.wizard:0
 msgid "Register"
-msgstr ""
+msgstr "Зарегистрировать"
 
 #. module: base
 #: field:res.request,ref_doc2:0
@@ -7914,6 +8096,9 @@ msgid ""
 "loading a new language it becomes available as default interface language "
 "for users and partners."
 msgstr ""
+"Этот мастер поможет добавить новый язык в OpenERP. После загрузки нового "
+"языка он станет доступен как язык по-умолчанию для пользователей и "
+"контрагентов."
 
 #. module: base
 #: field:ir.actions.server,subject:0
@@ -7950,6 +8135,8 @@ msgid ""
 "Name of the method to be called on the object when this scheduler is "
 "executed."
 msgstr ""
+"Название метода который будет вызван из объекта, когда этот планировщик "
+"запустится."
 
 #. module: base
 #: code:addons/base/ir/ir_model.py:219
@@ -7958,6 +8145,8 @@ msgid ""
 "The Selection Options expression is must be in the [('key','Label'), ...] "
 "format!"
 msgstr ""
+"Выражение для вариантов выбора должно быть в формате [('ключ','Надпись'), "
+"...] !"
 
 #. module: base
 #: view:ir.actions.report.xml:0
@@ -7995,6 +8184,8 @@ msgid ""
 "Create and manage the companies that will be managed by OpenERP from here. "
 "Shops or subsidiaries can be created and maintained from here."
 msgstr ""
+"Здесь можно создавать компании, доступные в OpenERP и управлять ими. Здесь "
+"могут быть созданы магазины и дочерние предприятия."
 
 #. module: base
 #: model:res.country,name:base.id
@@ -8008,6 +8199,9 @@ msgid ""
 "you can then add translations manually or perform a complete export (as a "
 "template for a new language example)."
 msgstr ""
+"Этот мастер обнаружит новые термины для перевода в приложении, и предоставит "
+"возможность ввести перевод вручную или выполнить полную выгрузку переводов "
+"(как пример шаблона для нового языка)."
 
 #. module: base
 #: help:multi_company.default,expression:0
@@ -8024,7 +8218,7 @@ msgstr "Болгария"
 #. module: base
 #: view:publisher_warranty.contract.wizard:0
 msgid "Publisher warranty contract successfully registered!"
-msgstr ""
+msgstr "Контракт гарантии издателя успешно зарегистрирован !"
 
 #. module: base
 #: model:res.country,name:base.ao
@@ -8096,7 +8290,7 @@ msgstr "Виджеты пользователей"
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Slovak / Slovenský jazyk"
-msgstr ""
+msgstr "Словенский / Slovenský jazyk"
 
 #. module: base
 #: field:base.language.export,state:0
@@ -8275,7 +8469,7 @@ msgstr "Автообновление"
 #: code:addons/base/ir/ir_model.py:62
 #, python-format
 msgid "The osv_memory field can only be compared with = and != operator."
-msgstr ""
+msgstr "Поле osv_memory можно сравнивать только с помощью операторов = и !=."
 
 #. module: base
 #: selection:ir.ui.view,type:0
@@ -8383,7 +8577,7 @@ msgstr "Добавлять ли корпоративный заголовок RM
 #. module: base
 #: help:workflow.transition,act_to:0
 msgid "The destination activity."
-msgstr ""
+msgstr "Целевое действие."
 
 #. module: base
 #: view:base.module.update:0
@@ -8464,7 +8658,7 @@ msgstr "Вы не можете иметь двух одинаковых поль
 #. module: base
 #: model:ir.model,name:base.model_multi_company_default
 msgid "Default multi company"
-msgstr ""
+msgstr "Мульти-компания по умолчанию"
 
 #. module: base
 #: view:res.request:0
@@ -8537,7 +8731,7 @@ msgstr "Доминиканская республика"
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Serbian (Cyrillic) / српски"
-msgstr ""
+msgstr "Сербский (кириллица) / српски"
 
 #. module: base
 #: code:addons/orm.py:2161
@@ -8546,6 +8740,8 @@ msgid ""
 "Invalid group_by specification: \"%s\".\n"
 "A group_by specification must be a list of valid fields."
 msgstr ""
+"Неверное значение group_by: \"%s\".\n"
+"Значение group_by должно быть списком существующих полей."
 
 #. module: base
 #: model:res.country,name:base.sa
@@ -8580,7 +8776,7 @@ msgstr "Конфигурация системы завершена"
 #. module: base
 #: field:workflow.triggers,instance_id:0
 msgid "Destination Instance"
-msgstr ""
+msgstr "Целевой элемент"
 
 #. module: base
 #: field:ir.actions.act_window,multi:0
@@ -8601,7 +8797,7 @@ msgstr "Директория XML"
 #. module: base
 #: selection:ir.actions.todo,restart:0
 msgid "On Skip"
-msgstr ""
+msgstr "При пропуске"
 
 #. module: base
 #: model:res.country,name:base.gn
@@ -8632,7 +8828,7 @@ msgstr "Ошибка ! Нельзя создать зацикленные мен
 #: model:ir.ui.menu,name:base.menu_publisher_warranty_contract_add
 #: view:publisher_warranty.contract.wizard:0
 msgid "Register a Contract"
-msgstr ""
+msgstr "Зарегистрировать договор"
 
 #. module: base
 #: view:ir.rule:0
@@ -8640,12 +8836,16 @@ msgid ""
 "3. If user belongs to several groups, the results from step 2 are combined "
 "with logical OR operator"
 msgstr ""
+"3. Если пользователь относится к нескольким группам, результаты шага 2 "
+"объединяются оператором логического ИЛИ (OR)"
 
 #. module: base
 #: code:addons/base/publisher_warranty/publisher_warranty.py:145
 #, python-format
 msgid "Please check your publisher warranty contract name and validity."
 msgstr ""
+"Проверьте действительность и название вашего гарантийного договора с "
+"издателем."
 
 #. module: base
 #: model:res.country,name:base.sv
@@ -8690,7 +8890,7 @@ msgstr "Кандидаты & Сделки"
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Romanian / română"
-msgstr ""
+msgstr "Румынский / română"
 
 #. module: base
 #: view:res.log:0
@@ -8754,6 +8954,10 @@ msgid ""
 "be assigned to specific groups in order to make them accessible to some "
 "users within the system."
 msgstr ""
+"Управление и настройка пунктов, отображаемых в меню OpenERP. Можно удалить "
+"пункт меню пометив его флажком в начале строки и затем нажав на появившуюся "
+"кнопку. Пункты меню могут быть назначены отдельным группам с целью "
+"предоставить к ним доступ ограниченному кругу пользователей внутри системы."
 
 #. module: base
 #: field:ir.ui.view,field_parent:0
@@ -8806,12 +9010,12 @@ msgstr "Объект"
 #. module: base
 #: field:ir.ui.menu,web_icon:0
 msgid "Web Icon File"
-msgstr ""
+msgstr "Файл веб-значка"
 
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Persian / فارس"
-msgstr ""
+msgstr "Персидский / فارس"
 
 #. module: base
 #: view:ir.actions.act_window:0
@@ -8840,6 +9044,8 @@ msgid ""
 "You can not delete this document (%s) ! Be sure your user belongs to one of "
 "these groups: %s."
 msgstr ""
+"Вы не можете удалить этот документ (%s) ! Убедитесь, что ваш пользователь "
+"принадлежит к одной из этих групп: %s."
 
 #. module: base
 #: model:ir.model,name:base.model_base_module_configuration
@@ -8923,7 +9129,7 @@ msgstr "Договор гарантии"
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Bulgarian / български език"
-msgstr ""
+msgstr "Болгарский / български език"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_aftersale
@@ -8958,6 +9164,10 @@ msgid ""
 "categories have a hierarchy structure: a partner belonging to a category "
 "also belong to his parent category."
 msgstr ""
+"Управление категориями контрагентов, чтобы лучше классифицировать их для "
+"отслеживания и анализа. Контрагент может принадлежать к нескольким "
+"категориям в иерархической структуре: партнер принадлежащих к категории "
+"также относятся к своей родительской категории."
 
 #. module: base
 #: model:res.country,name:base.az
@@ -9004,6 +9214,10 @@ msgid ""
 "uncheck the 'Suppliers' filter button in order to search in all your "
 "partners, including customers and prospects."
 msgstr ""
+"Можно получить доступ ко всей информации о поставщиках через форму "
+"поставщика. Доступны данные об учёте, история переписки, встречи, закупки и "
+"т.д. При отключении кнопки фильтра «Поставщик» доступен поиск по всем "
+"контрагентам, включая заказчиков и потенциальных клиентов."
 
 #. module: base
 #: model:res.country,name:base.rw
@@ -9028,7 +9242,7 @@ msgstr "Не обновляемый"
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Klingon"
-msgstr ""
+msgstr "Клингонский"
 
 #. module: base
 #: model:res.country,name:base.sg
@@ -9052,6 +9266,9 @@ msgid ""
 "simplified interface, which has less features but is easier. You can always "
 "switch later from the user preferences."
 msgstr ""
+"Если Вы используете OpenERP первый раз, мы настоятельно советуем выбрать "
+"упрощенный интерфейс, который имеет меньше функций, но является более "
+"легким. Позже Вы всегда сможете сменить интерфейс в настройках пользователя."
 
 #. module: base
 #: model:ir.model,name:base.model_res_country
@@ -9082,6 +9299,8 @@ msgid ""
 "1. Global rules are combined together with a logical AND operator, and with "
 "the result of the following steps"
 msgstr ""
+"1. Глобальные правила связаны друг с другом оператором логического И (AND), "
+"а также результатом следующих шагов"
 
 #. module: base
 #: field:res.partner.category,name:0
@@ -9106,7 +9325,7 @@ msgstr "%X - Комбинированный формат времени."
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (SV) / Español (SV)"
-msgstr ""
+msgstr "Испанский (SV) / Español (SV)"
 
 #. module: base
 #: help:res.lang,grouping:0
@@ -9116,6 +9335,10 @@ msgid ""
 "1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
 "106,500. Provided ',' as the thousand separator in each case."
 msgstr ""
+"Формат разделителя должен иметь вид [,n] где 0 < n : начиная с разряда "
+"единиц. -1 завершает разделение. Например, [3,2,-1] представит число 106500 "
+"в виде 1,06,500; [1,2,-1] представит его в виде 106,50,0; [3] представит вид "
+"106,500. В каждом случае ',' используется для разделения разрядов."
 
 #. module: base
 #: view:res.company:0
@@ -9126,7 +9349,7 @@ msgstr "Книжная"
 #: code:addons/base/ir/ir_model.py:317
 #, python-format
 msgid "Can only rename one column at a time!"
-msgstr ""
+msgstr "Можно переименовать только одну колонку за один раз !"
 
 #. module: base
 #: selection:ir.translation,type:0
@@ -9230,6 +9453,8 @@ msgid ""
 "Only one client action will be executed, last client action will be "
 "considered in case of multiple client actions."
 msgstr ""
+"Только одно действие клиента будет выполнено, последнее действие клиента "
+"будет выполнено в случае использования нескольких действий клиента."
 
 #. module: base
 #: view:res.lang:0
@@ -9301,7 +9526,7 @@ msgstr "Владелец счёта"
 #: code:addons/base/res/res_user.py:256
 #, python-format
 msgid "Company Switch Warning"
-msgstr ""
+msgstr "Предупреждение о смене компании"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_res_widget_wizard
diff --git a/bin/addons/base/i18n/vi.po b/bin/addons/base/i18n/vi.po
index 879c653c457..be6a0983b3f 100644
--- a/bin/addons/base/i18n/vi.po
+++ b/bin/addons/base/i18n/vi.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-03-08 16:19+0000\n"
-"Last-Translator: Phong Nguyen-Thanh <Unknown>\n"
+"PO-Revision-Date: 2011-04-19 02:34+0000\n"
+"Last-Translator: Nguyễn Thịnh <thinhnverp@gmail.com>\n"
 "Language-Team: Vietnamese <vi@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: 2011-03-09 06:12+0000\n"
-"X-Generator: Launchpad (build 12351)\n"
+"X-Launchpad-Export-Date: 2011-04-20 05:56+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: base
 #: view:ir.filters:0
@@ -109,7 +109,7 @@ msgstr ""
 #. module: base
 #: view:ir.module.module:0
 msgid "Created Views"
-msgstr ""
+msgstr "Tạo khung nhìn"
 
 #. module: base
 #: code:addons/base/ir/ir_model.py:485
@@ -150,12 +150,14 @@ msgid ""
 "Properties of base fields cannot be altered in this manner! Please modify "
 "them through Python code, preferably through a custom addon!"
 msgstr ""
+"các thuộc tính cơ bản không thể thay đổi theo cách này  ! hãy thay đổi chúng "
+"thông qua Python mã, tốt hơn thông qua một addon tùy chỉnh!"
 
 #. module: base
 #: code:addons/osv.py:133
 #, python-format
 msgid "Constraint Error"
-msgstr ""
+msgstr "Lỗi ràng buộc"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_ui_view_custom
@@ -177,7 +179,7 @@ msgstr "đã được tạo."
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_woodsuppliers0
 msgid "Wood Suppliers"
-msgstr ""
+msgstr "người bán gỗ"
 
 #. module: base
 #: code:addons/base/module/module.py:303
@@ -192,13 +194,13 @@ msgstr ""
 #. module: base
 #: field:ir.sequence,number_increment:0
 msgid "Increment Number"
-msgstr ""
+msgstr "số tự tăng"
 
 #. module: base
 #: 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 "Cơ cấu công ty"
+msgstr "cấu trúc của công ty"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -6548,7 +6550,7 @@ msgstr ""
 #: view:base.module.import:0
 #: view:base.module.update:0
 msgid "Open Modules"
-msgstr ""
+msgstr "Mở danh sách Mô-đun"
 
 #. module: base
 #: model:ir.actions.act_window,help:base.action_res_bank_form
diff --git a/debian/po/ru.po b/debian/po/ru.po
index 0718c86e7b5..f1aac410718 100644
--- a/debian/po/ru.po
+++ b/debian/po/ru.po
@@ -8,20 +8,20 @@ msgstr ""
 "Project-Id-Version: openerp-server 5.0.1-0-2\n"
 "Report-Msgid-Bugs-To: openerp-server@packages.debian.org\n"
 "POT-Creation-Date: 2009-08-24 22:41+0300\n"
-"PO-Revision-Date: 2011-01-19 13:31+0000\n"
-"Last-Translator: Kirill <Unknown>\n"
+"PO-Revision-Date: 2011-04-21 17:00+0000\n"
+"Last-Translator: Stanislav Hanzhin <Unknown>\n"
 "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-01-20 06:12+0000\n"
-"X-Generator: Launchpad (build 12177)\n"
+"X-Launchpad-Export-Date: 2011-04-22 05:51+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. Type: string
 #. Description
 #: ../openerp-server.templates:1001
 msgid "Dedicated system account for the Open ERP server:"
-msgstr "Специально выделенная системная учётная запись для Open ERP службы:"
+msgstr "Выделенная в системе учётная запись для сервера OpenERP:"
 
 #. Type: string
 #. Description

From 428944635f83ac2e0fbe608308759a9e4fcc9ac6 Mon Sep 17 00:00:00 2001
From: "pso (OpenERP)" <pso@tinyerp.com>
Date: Tue, 26 Apr 2011 11:35:13 +0530
Subject: [PATCH 309/331] [IMP] hr_holidays: Improved Indentation

bzr revid: pso@tinyerp.com-20110426060513-nxbcemw0cfbkpdga
---
 addons/hr_holidays/hr_holidays_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index f7705da0eef..b9b4989f73e 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -154,7 +154,7 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree colors="red:state in ('refuse');blue:state in ('draft');black:state in ('confirm','validate','validate1')" string="Leaves" >
-                	<field name="holiday_type"/>
+                    <field name="holiday_type"/>
                     <field name="employee_id"/>
                     <field name="category_id"/>
                     <field name="department_id" invisible="1"/>

From 68122978876bcd886c8ef6a839348ba2b056cf48 Mon Sep 17 00:00:00 2001
From: "pso (OpenERP)" <pso@tinyerp.com>
Date: Tue, 26 Apr 2011 12:11:16 +0530
Subject: [PATCH 310/331] [IMP] hr_holidays: Improved search, tree view of
 holiday and onchange method

bzr revid: pso@tinyerp.com-20110426064116-47pn4y5yuifsbjmg
---
 addons/hr_holidays/hr_holidays.py       | 4 +---
 addons/hr_holidays/hr_holidays_view.xml | 3 ++-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index 8cb2845f81b..38f58df78d0 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -160,15 +160,13 @@ class hr_holidays(osv.osv):
         return obj_res_leave.unlink(cr, uid, leave_ids)
 
     def onchange_type(self, cr, uid, ids, holiday_type):
-        result = {}
+        result = {'value': {'employee_id': False}}
         if holiday_type == 'employee':
             ids_employee = self.pool.get('hr.employee').search(cr, uid, [('user_id','=', uid)])
             if ids_employee:
                 result['value'] = {
                     'employee_id': ids_employee[0]
                 }
-        else:
-            result['value'] = {'employee_id': False}
         return result
 
     # TODO: can be improved using resource calendar method
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index b9b4989f73e..6b1fdfebbef 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -36,8 +36,8 @@
                     </group>
                     <newline />
                     <group expand="0" string="Group By...">
-                    	<filter name="group_category" string="Category" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'category_id'}"/>
                         <filter name="group_employee" string="Employee" icon="terp-personal" domain="[]" context="{'group_by':'employee_id'}"/>
+                        <filter name="group_category" string="Category" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'category_id'}"/>
                         <filter string="Manager" icon="terp-personal" domain="[]" context="{'group_by':'manager_id'}"/>
                         <filter string="Department" icon="terp-personal+" domain="[]" context="{'group_by':'department_id','set_visible':True}"/>
                         <separator orientation="vertical"/>
@@ -234,6 +234,7 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree colors="red:state in ('refuse');blue:state in (' draft');black:state in ('confirm','validate','validate1')">
+                    <field name="holiday_type"/>
                     <field name="employee_id"/>
                     <field name="category_id"/>
                     <field name="department_id" invisible="not context.get('set_visible',False)"/>

From 92f18b5289ca2349bfc1c595fca026b2033b3be5 Mon Sep 17 00:00:00 2001
From: Jigar Amin <jam@tinyerp.com>
Date: Tue, 26 Apr 2011 12:40:23 +0530
Subject: [PATCH 311/331] [FIX] crm_profiling worng access roghts to the
 Manager

lp bug: https://launchpad.net/bugs/770281 fixed

bzr revid: jam@tinyerp.com-20110426071023-avczlyxyt9cmdi34
---
 addons/crm_profiling/security/ir.model.access.csv | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/crm_profiling/security/ir.model.access.csv b/addons/crm_profiling/security/ir.model.access.csv
index fb110ba70d1..43e1528fddb 100644
--- a/addons/crm_profiling/security/ir.model.access.csv
+++ b/addons/crm_profiling/security/ir.model.access.csv
@@ -1,7 +1,7 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_crm_profiling_answer_user","crm_profiling.answer user","model_crm_profiling_answer","base.group_sale_salesman",1,1,1,0
-"access_crm_profiling_answer_manager","crm_profiling.answer manager","model_crm_profiling_answer","base.group_sale_manager",1,0,0,0
-"access_crm_profiling_question_manager","crm_profiling.question manager","model_crm_profiling_question","base.group_sale_salesman",1,1,1,0
-"access_crm_profiling_question_user","crm_profiling.question user","model_crm_profiling_question","base.group_sale_manager",1,0,0,0
-"access_crm_profiling_questionnarie_user","crm_profiling.questionnarie user","model_crm_profiling_questionnaire","base.group_sale_salesman",1,0,0,0
-"access_crm_profiling_questionnarie_manager","crm_profiling.questionnarie manager","model_crm_profiling_questionnaire","base.group_sale_manager",1,1,1,1
+"access_crm_profiling_answer_salesman","crm_profiling.answer.salesman","model_crm_profiling_answer","base.group_sale_salesman",1,1,1,0
+"access_crm_profiling_answer_manager","crm_profiling.answer.manager","model_crm_profiling_answer","base.group_sale_manager",1,1,1,1
+"access_crm_profiling_question_salesman","crm_profiling.question.salesman","model_crm_profiling_question","base.group_sale_salesman",1,1,1,0
+"access_crm_profiling_question_manager","crm_profiling.question.manager","model_crm_profiling_question","base.group_sale_manager",1,1,1,1
+"access_crm_profiling_questionnarie_salesman","crm_profiling.questionnarie.salesman","model_crm_profiling_questionnaire","base.group_sale_salesman",1,1,1,0
+"access_crm_profiling_questionnarie_manager","crm_profiling.questionnarie.manager","model_crm_profiling_questionnaire","base.group_sale_manager",1,1,1,1

From 5e2cda5a0c382c297e45bb28d32b9ad7c89b9271 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 26 Apr 2011 10:55:27 +0200
Subject: [PATCH 312/331] [FIX] Made the list appear in many2many.

bzr revid: nicolas.vanhoren@openerp.com-20110426085527-5ntgrkug2clipp2s
---
 addons/base/static/src/js/form.js   | 1 -
 addons/base/static/src/js/search.js | 1 -
 addons/base/static/src/xml/base.xml | 5 +----
 3 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/addons/base/static/src/js/form.js b/addons/base/static/src/js/form.js
index ea2b377078b..c6ec07b11e6 100644
--- a/addons/base/static/src/js/form.js
+++ b/addons/base/static/src/js/form.js
@@ -899,7 +899,6 @@ openerp.base.form.FieldMany2Many = openerp.base.form.Field.extend({
         this.list_id = _.uniqueId("many2many");
     },
     start: function() {
-        debugger;
         this._super.apply(this, arguments);
         this.dataset = new openerp.base.DataSetSearch(this.session, this.field.relation);
         this.list_view = new openerp.base.ListView(undefined, this.view.session,
diff --git a/addons/base/static/src/js/search.js b/addons/base/static/src/js/search.js
index 0f4ab8585b8..ae5e8551b93 100644
--- a/addons/base/static/src/js/search.js
+++ b/addons/base/static/src/js/search.js
@@ -146,7 +146,6 @@ openerp.base.SearchView = openerp.base.Controller.extend({
     do_search: function (e) {
         if (e && e.preventDefault) { e.preventDefault(); }
 
-        //debugger;
         var domains = [], contexts = [];
 
         var errors = [];
diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml
index 4804f34d785..ef4cbba46b0 100644
--- a/addons/base/static/src/xml/base.xml
+++ b/addons/base/static/src/xml/base.xml
@@ -351,10 +351,7 @@
     </div>
 </t>
 <t t-name="FieldMany2Many">
-    <div style="background: #ccc; padding: 20px">
-        Many2Many widget
-        <div t-attr-id="widget.list_id"></div>
-    </div>
+    <div t-att-id="widget.list_id"></div>
 </t>
 <t t-name="FieldReference">
     <input type="text" t-att-name="widget.name" t-att-id="widget.element_id" t-att-class="'field_' + widget.type" style="width: 100%" placeholder="Widget Reference"/>

From 4dde77626579cebaa986b30387b363fe1842a76e Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Tue, 26 Apr 2011 15:00:26 +0530
Subject: [PATCH 313/331] [FIX] crm: regression on crm meeting view

bzr revid: hmo@tinyerp.com-20110426093026-tixw8l8tvy8yoja5
---
 addons/crm/crm_meeting_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index baa022a7d39..a2d66040fa9 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -44,7 +44,7 @@
                     <field name="alarm_id" string="Reminder"
                         widget="selection" />
                     <group colspan="2" col="4" attrs="{'readonly': ['|', ('recurrent_uid','!=',False), ('state','=','done')]}">
-                           <field name="recurrency" help="Is Meeting is occurring frequently or repeatedly?"/>
+                           <field name="recurrency"/>
                            <field name="edit_all" attrs="{'invisible':[('recurrency','=', False)]}"
                                 on_change="onchange_edit_all(rrule_type,edit_all)"/>
                     </group>

From 019813c381e2f4ff2adc293e5bdbfdefe042bcd3 Mon Sep 17 00:00:00 2001
From: "Anup (OpenERP)" <ach@tinyerp.com>
Date: Tue, 26 Apr 2011 16:44:58 +0530
Subject: [PATCH 314/331] [FIX] base : Partner was not being passed with the
 Events Fixed

bzr revid: ach@tinyerp.com-20110426111458-ccy2yrri6ilhdwp4
---
 bin/addons/base/res/partner/partner_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/addons/base/res/partner/partner_view.xml b/bin/addons/base/res/partner/partner_view.xml
index 9d46404132c..8ca7e43c6d1 100644
--- a/bin/addons/base/res/partner/partner_view.xml
+++ b/bin/addons/base/res/partner/partner_view.xml
@@ -583,7 +583,7 @@
 
         <menuitem action="action_partner_category_form" id="menu_partner_category_form" name="Partner Categories" sequence="4" parent="menu_config_address_book"/>
 
-        <act_window domain="[('partner_id', '=', active_id)]"
+        <act_window domain="[('partner_id', '=', active_id)]" context="{'default_partner_id':active_id}"
             id="act_res_partner_event" name="Events"
             res_model="res.partner.event"
             src_model="res.partner"

From 2cfc487ccddc9b1a21c23facdd44aee27b0d82c9 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 26 Apr 2011 13:24:13 +0200
Subject: [PATCH 315/331] [IMP] Read-only many2many implemented.

bzr revid: nicolas.vanhoren@openerp.com-20110426112413-nfoozpnol8zbli26
---
 addons/base/static/src/js/data.js |  9 +++++++++
 addons/base/static/src/js/form.js | 28 ++++++++++++++++++++++------
 2 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/addons/base/static/src/js/data.js b/addons/base/static/src/js/data.js
index a29f320b79c..bd84f1d7229 100644
--- a/addons/base/static/src/js/data.js
+++ b/addons/base/static/src/js/data.js
@@ -183,6 +183,15 @@ openerp.base.DataSetSearch =  openerp.base.DataSet.extend({
 openerp.base.DataSetRelational =  openerp.base.DataSet.extend( /** @lends openerp.base.DataSet# */{
 });
 
+openerp.base.DataSetMany2Many = openerp.base.DataSetSearch.extend({
+    /* should extend DataSetStatic instead, but list view still does not support it
+     */
+
+    unlink: function(ids) {
+        // just do nothing
+    },
+});
+
 };
 
 // vim:et fdc=0 fdl=0 foldnestmax=3 fdm=syntax:
diff --git a/addons/base/static/src/js/form.js b/addons/base/static/src/js/form.js
index c6ec07b11e6..08c4a4fbb74 100644
--- a/addons/base/static/src/js/form.js
+++ b/addons/base/static/src/js/form.js
@@ -900,20 +900,36 @@ openerp.base.form.FieldMany2Many = openerp.base.form.Field.extend({
     },
     start: function() {
         this._super.apply(this, arguments);
-        this.dataset = new openerp.base.DataSetSearch(this.session, this.field.relation);
-        this.list_view = new openerp.base.ListView(undefined, this.view.session,
-                this.list_id, this.dataset, false, undefined);
+        this.dataset = new openerp.base.DataSetMany2Many(this.session, this.field.relation);
+        this.list_view = new openerp.base.form.Many2ManyListView(undefined, this.view.session,
+                this.list_id, this.dataset, false, {'selected': false, 'addable': null, 'deletable': false});
         this.list_view.start();
     },
     set_value: function(value) {
         if (value != false) {
-            this.dataset.ids = value;
-            this.dataset.count = value.length;
-            this.list_view.do_update();
+            // this is not correct behavior, need to change once list view can work with
+            // static datasets
+            this.dataset.domain = [["id","in",value]];
+            /*this.dataset.ids = value;
+            this.dataset.count = value.length;*/
+            this.list_view.do_reload();
         }
     }
 });
 
+openerp.base.form.Many2ManyListView = openerp.base.ListView.extend({
+    do_delete: function (e) {
+        /*
+        e.stopImmediatePropagation();
+        var ids = [this.rows[$(e.currentTarget).closest('tr').prevAll().length].data.id.value];
+        this.dataset.ids = _.without.apply(null, [this.dataset.ids].concat(ids));
+        this.dataset.count = this.dataset.ids.length;
+        // there may be a faster way
+        this.do_reload();
+        */
+    }
+});
+
 openerp.base.form.FieldReference = openerp.base.form.Field.extend({
     init: function(view, node) {
         this._super(view, node);

From d866edf0ae0d8fb955c8f56cf36de7ccaabf85e3 Mon Sep 17 00:00:00 2001
From: "ARA (OpenERP)" <ara@tinyerp.com>
Date: Tue, 26 Apr 2011 16:57:55 +0530
Subject: [PATCH 316/331] [FIX] hr: Removing Administrator employee record
 causes future updates of hr module to fail

lp bug: https://launchpad.net/bugs/769632 fixed

bzr revid: ara@tinyerp.com-20110426112755-2n13xwebtlx21wun
---
 addons/hr/hr.py | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/addons/hr/hr.py b/addons/hr/hr.py
index b10d8a7194f..fcfd0b41a27 100644
--- a/addons/hr/hr.py
+++ b/addons/hr/hr.py
@@ -161,6 +161,17 @@ class hr_employee(osv.osv):
         'passport_id':fields.char('Passport No', size=64)
     }
 
+    def unlink(self, cr, uid, ids, context=None):
+        resource_obj = self.pool.get('resource.resource')
+        resource_ids = []
+        for employee in self.browse(cr, uid, ids, context=context):
+            resource = employee.resource_id
+            if resource:
+                resource_ids.append(resource.id)
+        if resource_ids:
+            resource_obj.unlink(cr, uid, resource_ids, context=context)
+        return super(hr_employee, self).unlink(cr, uid, ids, context=context)
+
     def onchange_address_id(self, cr, uid, ids, address, context=None):
         if address:
             address = self.pool.get('res.partner.address').browse(cr, uid, address, context=context)

From 96c1dacf4c2fd6b903d2d09697f2b3a21babf64b Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 26 Apr 2011 14:11:46 +0200
Subject: [PATCH 317/331] [IMP] m2m now support suppression of elements.

bzr revid: nicolas.vanhoren@openerp.com-20110426121146-kq1cuu7i1r0nwfiq
---
 addons/base/static/src/js/data.js |  2 +-
 addons/base/static/src/js/form.js | 32 ++++++++++++++++++++++---------
 2 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/addons/base/static/src/js/data.js b/addons/base/static/src/js/data.js
index bd84f1d7229..6d566f4de0a 100644
--- a/addons/base/static/src/js/data.js
+++ b/addons/base/static/src/js/data.js
@@ -183,7 +183,7 @@ openerp.base.DataSetSearch =  openerp.base.DataSet.extend({
 openerp.base.DataSetRelational =  openerp.base.DataSet.extend( /** @lends openerp.base.DataSet# */{
 });
 
-openerp.base.DataSetMany2Many = openerp.base.DataSetSearch.extend({
+openerp.base.DataSetMany2Many = openerp.base.DataSetStatic.extend({
     /* should extend DataSetStatic instead, but list view still does not support it
      */
 
diff --git a/addons/base/static/src/js/form.js b/addons/base/static/src/js/form.js
index 08c4a4fbb74..5e0d739a279 100644
--- a/addons/base/static/src/js/form.js
+++ b/addons/base/static/src/js/form.js
@@ -902,32 +902,46 @@ openerp.base.form.FieldMany2Many = openerp.base.form.Field.extend({
         this._super.apply(this, arguments);
         this.dataset = new openerp.base.DataSetMany2Many(this.session, this.field.relation);
         this.list_view = new openerp.base.form.Many2ManyListView(undefined, this.view.session,
-                this.list_id, this.dataset, false, {'selected': false, 'addable': null, 'deletable': false});
+                this.list_id, this.dataset, false, {'selected': false, 'addable': 'Add'});
+        var self = this;
+        this.list_view.do_delete.add_last(function() {
+            self.on_ui_change();
+        });
         this.list_view.start();
     },
     set_value: function(value) {
         if (value != false) {
-            // this is not correct behavior, need to change once list view can work with
-            // static datasets
-            this.dataset.domain = [["id","in",value]];
-            /*this.dataset.ids = value;
-            this.dataset.count = value.length;*/
+            this.dataset.ids = value;
+            this.dataset.count = value.length;
             this.list_view.do_reload();
         }
+    },
+    get_value: function() {
+        return [[6,false,this.dataset.ids]];
     }
 });
 
 openerp.base.form.Many2ManyListView = openerp.base.ListView.extend({
     do_delete: function (e) {
-        /*
         e.stopImmediatePropagation();
         var ids = [this.rows[$(e.currentTarget).closest('tr').prevAll().length].data.id.value];
         this.dataset.ids = _.without.apply(null, [this.dataset.ids].concat(ids));
         this.dataset.count = this.dataset.ids.length;
         // there may be a faster way
         this.do_reload();
-        */
-    }
+    },
+    do_reload: function () {
+        /* Dear xmo, according to your comments, this method's implementation in list view seems
+         * to be a little bit bullshit.
+         * I assume the list view will be changed later, so I hope it will support static datasets.
+         */
+        return this.rpc('/base/listview/fill', {
+            'model': this.dataset.model,
+            'id': this.view_id,
+            'domain': [["id", "in", this.dataset.ids]],
+            'context': this.dataset.context
+        }, this.do_fill_table);
+    },
 });
 
 openerp.base.form.FieldReference = openerp.base.form.Field.extend({

From ca3c3fdbc91640fe32f60218c72d5c7a5736ecbe Mon Sep 17 00:00:00 2001
From: "Naresh (OpenERP)" <nch@tinyerp.com>
Date: Tue, 26 Apr 2011 18:19:15 +0530
Subject: [PATCH 318/331] [FIX]:decimal_precision when precision is specified
 as 0

lp bug: https://launchpad.net/bugs/762960 fixed

bzr revid: nch@tinyerp.com-20110426124915-u1qykxakf9oyc35b
---
 addons/decimal_precision/decimal_precision.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/addons/decimal_precision/decimal_precision.py b/addons/decimal_precision/decimal_precision.py
index b0f8af50ce6..fcd30750437 100644
--- a/addons/decimal_precision/decimal_precision.py
+++ b/addons/decimal_precision/decimal_precision.py
@@ -41,7 +41,9 @@ class decimal_precision(osv.osv):
     def precision_get(self, cr, uid, application):
         cr.execute('select digits from decimal_precision where name=%s', (application,))
         res = cr.fetchone()
-        return res and res[0] or 2
+        if res:
+            return res[0]
+        return 2
 
     def write(self, cr, uid, ids, data, *args, **argv):
         res = super(decimal_precision, self).write(cr, uid, ids, data, *args, **argv)

From 7bb1ffec7bb15d8a8dd246b5717377105e252c27 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 26 Apr 2011 16:13:34 +0200
Subject: [PATCH 319/331] [IMP] Improved m2m to open a popup when we click one
 of the items.

bzr revid: nicolas.vanhoren@openerp.com-20110426141334-s3xl2y8rp9arphmn
---
 addons/base/static/src/js/form.js  | 54 ++++++++++++++++++++++++++++--
 addons/base/static/src/js/views.js |  9 ++++-
 2 files changed, 59 insertions(+), 4 deletions(-)

diff --git a/addons/base/static/src/js/form.js b/addons/base/static/src/js/form.js
index 5e0d739a279..4ed5c8f250a 100644
--- a/addons/base/static/src/js/form.js
+++ b/addons/base/static/src/js/form.js
@@ -904,9 +904,7 @@ openerp.base.form.FieldMany2Many = openerp.base.form.Field.extend({
         this.list_view = new openerp.base.form.Many2ManyListView(undefined, this.view.session,
                 this.list_id, this.dataset, false, {'selected': false, 'addable': 'Add'});
         var self = this;
-        this.list_view.do_delete.add_last(function() {
-            self.on_ui_change();
-        });
+        this.list_view.m2m_field = this;
         this.list_view.start();
     },
     set_value: function(value) {
@@ -929,6 +927,8 @@ openerp.base.form.Many2ManyListView = openerp.base.ListView.extend({
         this.dataset.count = this.dataset.ids.length;
         // there may be a faster way
         this.do_reload();
+        
+        this.m2m_field.on_ui_change();
     },
     do_reload: function () {
         /* Dear xmo, according to your comments, this method's implementation in list view seems
@@ -942,6 +942,54 @@ openerp.base.form.Many2ManyListView = openerp.base.ListView.extend({
             'context': this.dataset.context
         }, this.do_fill_table);
     },
+    do_add_record: function () {
+        // TODO: need to open a popup with search view
+    },
+    on_select_row: function(event) {
+        var $target = $(event.currentTarget);
+        var row = this.rows[$target.prevAll().length];
+        var id = row.data.id.value;
+        if(! id) {
+            return;
+        }
+        var action_manager = this.m2m_field.view.session.action_manager;
+        action_manager.do_action({
+            "res_model": this.dataset.model,
+            "views":[[false,"form"]],
+            "res_id": id,
+            "type":"ir.actions.act_window",
+            "view_type":"form",
+            "view_mode":"form",
+            "target":"new"
+        });
+        /*action_manager.do_action({
+            "groups_id":[],
+            "domain":"[]",
+            "help":false,
+            "res_model":"partner.sms.send",
+            "search_view_id":false,
+            "id":75,
+            "src_model":"res.partner",
+            "views":[[false,"form"]],
+            "menus":false,
+            "display_menu_tip":true,
+            "usage":"",
+            "type":"ir.actions.act_window",
+            "string":"SMS Send",
+            "view_type":"form",
+            "view_id":false,
+            "auto_refresh":0,
+            "view_mode":"form",
+            "view_ids":[],
+            "target":"new",
+            "multi":false,
+            "name":"SMS Send",
+            "auto_search":true,
+            "filter":false,
+            "limit":0,
+            "context":"{}"
+        });*/
+    }
 });
 
 openerp.base.form.FieldReference = openerp.base.form.Field.extend({
diff --git a/addons/base/static/src/js/views.js b/addons/base/static/src/js/views.js
index 8ef14a3edbf..8b29850d071 100644
--- a/addons/base/static/src/js/views.js
+++ b/addons/base/static/src/js/views.js
@@ -183,7 +183,14 @@ openerp.base.ViewManager =  openerp.base.Controller.extend({
 
 openerp.base.ViewManagerAction = openerp.base.ViewManager.extend({
     init: function(session, element_id, action, sidebar) {
-        var dataset = new openerp.base.DataSetSearch(session, action.res_model);
+        var dataset;
+        if(!action.res_id) {
+            dataset = new openerp.base.DataSetSearch(session, action.res_model);
+        } else {
+            dataset = new openerp.base.DataSetStatic(session, action.res_model);
+            dataset.ids = [action.res_id];
+            dataset.count = 1;
+        }
         this._super(session, element_id, dataset, action.views);
         this.action = action;
         this.sidebar = sidebar;

From 33a7bbb0c489b30f7a4889eb47f8163540e42ae7 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 26 Apr 2011 16:24:24 +0200
Subject: [PATCH 320/331] [FIX] Some problem when clicking 'Add' in many2many.

bzr revid: nicolas.vanhoren@openerp.com-20110426142424-llpiez4i9tgvjkr6
---
 addons/base/static/src/js/form.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/base/static/src/js/form.js b/addons/base/static/src/js/form.js
index 4ed5c8f250a..cda1b0047eb 100644
--- a/addons/base/static/src/js/form.js
+++ b/addons/base/static/src/js/form.js
@@ -942,7 +942,8 @@ openerp.base.form.Many2ManyListView = openerp.base.ListView.extend({
             'context': this.dataset.context
         }, this.do_fill_table);
     },
-    do_add_record: function () {
+    do_add_record: function (e) {
+        e.stopImmediatePropagation();
         // TODO: need to open a popup with search view
     },
     on_select_row: function(event) {

From c048cdac7503e6bdda56835c856577da7de3bcfa Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Wed, 27 Apr 2011 04:37:42 +0000
Subject: [PATCH 321/331] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20110427043742-x1bwe8whtov62a5q
---
 bin/addons/base/i18n/vi.po | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/bin/addons/base/i18n/vi.po b/bin/addons/base/i18n/vi.po
index 1ae261cb99e..6bacfb648cd 100644
--- a/bin/addons/base/i18n/vi.po
+++ b/bin/addons/base/i18n/vi.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-01-11 08:47+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2011-04-26 05:28+0000\n"
+"Last-Translator: Phong Nguyen-Thanh <Unknown>\n"
 "Language-Team: Vietnamese <vi@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: 2011-04-19 04:48+0000\n"
+"X-Launchpad-Export-Date: 2011-04-27 04:37+0000\n"
 "X-Generator: Launchpad (build 12758)\n"
 
 #. module: base
@@ -118,6 +118,8 @@ msgid ""
 "You can not write in this document (%s) ! Be sure your user belongs to one "
 "of these groups: %s."
 msgstr ""
+"Bạn không thể viết trong tài liệu này (% s) ! Hãy chắc chắn người dùng của "
+"bạn thuộc một trong các nhóm: %s."
 
 #. module: base
 #: help:ir.model.fields,domain:0

From 0c72a7e64770369995ab8841b2fe252c51dd3c1e Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Wed, 27 Apr 2011 04:41:42 +0000
Subject: [PATCH 322/331] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20110427044142-sh0bye0l0c3k70dg
---
 addons/account_payment/i18n/ro.po     |  12 +-
 addons/analytic/i18n/tr.po            | 255 ++++++++++++++
 addons/crm/i18n/lt.po                 |  10 +-
 addons/hr_attendance/i18n/pt_BR.po    |   2 +-
 addons/project/i18n/ro.po             |  58 +--
 addons/share/i18n/ru.po               | 485 ++++++++++++++++++++++++++
 addons/web_livechat/i18n/tr.po        |  39 +++
 addons/wiki_faq/i18n/tr.po            |  32 ++
 addons/wiki_quality_manual/i18n/ru.po |  32 ++
 addons/wiki_quality_manual/i18n/tr.po |  32 ++
 10 files changed, 916 insertions(+), 41 deletions(-)
 create mode 100644 addons/analytic/i18n/tr.po
 create mode 100644 addons/share/i18n/ru.po
 create mode 100644 addons/web_livechat/i18n/tr.po
 create mode 100644 addons/wiki_faq/i18n/tr.po
 create mode 100644 addons/wiki_quality_manual/i18n/ru.po
 create mode 100644 addons/wiki_quality_manual/i18n/tr.po

diff --git a/addons/account_payment/i18n/ro.po b/addons/account_payment/i18n/ro.po
index 405e9574e7a..78a7caaaf1e 100644
--- a/addons/account_payment/i18n/ro.po
+++ b/addons/account_payment/i18n/ro.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2010-08-02 22:08+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2011-04-26 18:16+0000\n"
+"Last-Translator: filsys <office@filsystem.ro>\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: 2011-01-15 05:33+0000\n"
-"X-Generator: Launchpad (build 12177)\n"
+"X-Launchpad-Export-Date: 2011-04-27 04:41+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: account_payment
 #: field:payment.order,date_scheduled:0
@@ -261,7 +261,7 @@ msgstr ""
 #: code:addons/account_payment/account_move_line.py:110
 #, python-format
 msgid "Error !"
-msgstr ""
+msgstr "Eroare !"
 
 #. module: account_payment
 #: view:account.move.line:0
@@ -414,7 +414,7 @@ msgstr "Mesajul următor al dialogului"
 #: code:addons/account_payment/account_move_line.py:110
 #, python-format
 msgid "No partner defined on entry line"
-msgstr ""
+msgstr "Nu a fost definit nici un partener"
 
 #. module: account_payment
 #: help:payment.line,info_partner:0
diff --git a/addons/analytic/i18n/tr.po b/addons/analytic/i18n/tr.po
new file mode 100644
index 00000000000..6934dd45c10
--- /dev/null
+++ b/addons/analytic/i18n/tr.po
@@ -0,0 +1,255 @@
+# Turkish translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2011-04-26 21:49+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Turkish <tr@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: 2011-04-27 04:41+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
+
+#. module: analytic
+#: field:account.analytic.account,child_ids:0
+msgid "Child Accounts"
+msgstr "Muavin Hesaplar"
+
+#. module: analytic
+#: field:account.analytic.account,name:0
+msgid "Account Name"
+msgstr "Hesap Adı"
+
+#. module: analytic
+#: help:account.analytic.line,unit_amount:0
+msgid "Specifies the amount of quantity to count."
+msgstr ""
+
+#. module: analytic
+#: model:ir.module.module,description:analytic.module_meta_information
+msgid ""
+"Module for defining analytic accounting object.\n"
+"    "
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,state:0
+msgid "State"
+msgstr "Durum"
+
+#. module: analytic
+#: field:account.analytic.account,user_id:0
+msgid "Account Manager"
+msgstr "Hesap Yöneticisi"
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Draft"
+msgstr "Taslak"
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Closed"
+msgstr "Kapalı"
+
+#. module: analytic
+#: field:account.analytic.account,debit:0
+msgid "Debit"
+msgstr "Borç"
+
+#. module: analytic
+#: help:account.analytic.account,state:0
+msgid ""
+"* When an account is created its in 'Draft' state.                           "
+"       \n"
+"* If any associated partner is there, it can be in 'Open' state.             "
+"                     \n"
+"* If any pending balance is there it can be in 'Pending'.                    "
+"               \n"
+"* And finally when all the transactions are over, it can be in 'Close' "
+"state.                                   \n"
+"* The project can be in either if the states 'Template' and 'Running'.\n"
+" If it is template then we can make projects based on the template projects. "
+"If its in 'Running' state it is a normal project.                            "
+"     \n"
+" If it is to be reviewed then the state is 'Pending'.\n"
+" When the project is completed the state is set to 'Done'."
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,type:0
+msgid "Account Type"
+msgstr ""
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Template"
+msgstr ""
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Pending"
+msgstr ""
+
+#. module: analytic
+#: model:ir.model,name:analytic.model_account_analytic_line
+msgid "Analytic Line"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,description:0
+#: field:account.analytic.line,name:0
+msgid "Description"
+msgstr ""
+
+#. module: analytic
+#: selection:account.analytic.account,type:0
+msgid "Normal"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,company_id:0
+#: field:account.analytic.line,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,quantity_max:0
+msgid "Maximum Quantity"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.line,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,parent_id:0
+msgid "Parent Analytic Account"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.line,date:0
+msgid "Date"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,currency_id:0
+msgid "Account currency"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,quantity:0
+#: field:account.analytic.line,unit_amount:0
+msgid "Quantity"
+msgstr ""
+
+#. module: analytic
+#: help:account.analytic.line,amount:0
+msgid ""
+"Calculated by multiplying the quantity and the price given in the Product's "
+"cost price. Always expressed in the company main currency."
+msgstr ""
+
+#. module: analytic
+#: help:account.analytic.account,quantity_max:0
+msgid "Sets the higher limit of quantity of hours."
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,credit:0
+msgid "Credit"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.line,amount:0
+msgid "Amount"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,contact_id:0
+msgid "Contact"
+msgstr ""
+
+#. module: analytic
+#: constraint:account.analytic.account:0
+msgid ""
+"Error! The currency has to be the same as the currency of the selected "
+"company"
+msgstr ""
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,balance:0
+msgid "Balance"
+msgstr ""
+
+#. module: analytic
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr ""
+
+#. module: analytic
+#: help:account.analytic.account,type:0
+msgid ""
+"If you select the View Type, it means you won't allow to create journal "
+"entries using that account."
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,date:0
+msgid "Date End"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,code:0
+msgid "Account Code"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,complete_name:0
+msgid "Full Account Name"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.line,account_id:0
+#: model:ir.model,name:analytic.model_account_analytic_account
+#: model:ir.module.module,shortdesc:analytic.module_meta_information
+msgid "Analytic Account"
+msgstr ""
+
+#. module: analytic
+#: selection:account.analytic.account,type:0
+msgid "View"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,date_start:0
+msgid "Date Start"
+msgstr ""
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Open"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,line_ids:0
+msgid "Analytic Entries"
+msgstr ""
diff --git a/addons/crm/i18n/lt.po b/addons/crm/i18n/lt.po
index fd607e6c3d0..a563d8fe75d 100644
--- a/addons/crm/i18n/lt.po
+++ b/addons/crm/i18n/lt.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-01-17 06:57+0000\n"
-"Last-Translator: Paulius Sladkevičius - inovera.lt <Unknown>\n"
+"PO-Revision-Date: 2011-04-26 14:24+0000\n"
+"Last-Translator: Mantas Kriaučiūnas <mantas@akl.lt>\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: 2011-03-18 04:44+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-04-27 04:41+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 "Language: lt\n"
 
 #. module: crm
@@ -1613,7 +1613,7 @@ msgstr "Nuorodos"
 #: view:res.partner:0
 #, python-format
 msgid "Cancel"
-msgstr "Atšaukti"
+msgstr "Atsisakyti"
 
 #. module: crm
 #: model:ir.model,name:crm.model_res_users
diff --git a/addons/hr_attendance/i18n/pt_BR.po b/addons/hr_attendance/i18n/pt_BR.po
index a742e3352e7..0a0bf657009 100644
--- a/addons/hr_attendance/i18n/pt_BR.po
+++ b/addons/hr_attendance/i18n/pt_BR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-26 04:41+0000\n"
+"X-Launchpad-Export-Date: 2011-04-27 04:41+0000\n"
 "X-Generator: Launchpad (build 12758)\n"
 
 #. module: hr_attendance
diff --git a/addons/project/i18n/ro.po b/addons/project/i18n/ro.po
index 16683f155ea..5f70f4580e6 100644
--- a/addons/project/i18n/ro.po
+++ b/addons/project/i18n/ro.po
@@ -7,19 +7,19 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2009-02-03 06:25+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2011-04-26 18:27+0000\n"
+"Last-Translator: Dorin <dhongu@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: 2011-03-18 04:38+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-04-27 04:41+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_res_users_2_project_task_opened
 msgid "Assigned tasks"
-msgstr ""
+msgstr "Sarcini atribuite"
 
 #. module: project
 #: help:project.task.delegate,new_task_description:0
@@ -59,7 +59,7 @@ msgstr ""
 #: code:addons/project/project.py:121
 #, python-format
 msgid "Operation Not Permitted !"
-msgstr ""
+msgstr "Operație nepermisă !"
 
 #. module: project
 #: code:addons/project/wizard/project_task_delegate.py:67
@@ -102,7 +102,7 @@ msgstr ""
 #: view:report.project.task.user:0
 #: field:report.project.task.user,progress:0
 msgid "Progress"
-msgstr ""
+msgstr "Progres"
 
 #. module: project
 #: help:project.task,remaining_hours:0
@@ -129,7 +129,7 @@ msgstr ""
 #. module: project
 #: field:project.project,members:0
 msgid "Project Members"
-msgstr ""
+msgstr "Membrii proiectului"
 
 #. module: project
 #: model:process.node,name:project.process_node_taskbydelegate0
@@ -139,7 +139,7 @@ msgstr ""
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "March"
-msgstr ""
+msgstr "Matrie"
 
 #. module: project
 #: view:project.task:0
@@ -161,7 +161,7 @@ msgstr ""
 #. module: project
 #: view:project.task:0
 msgid "My Tasks"
-msgstr ""
+msgstr "Sarcinile mele"
 
 #. module: project
 #: constraint:project.task:0
@@ -174,7 +174,7 @@ msgstr ""
 #: view:report.project.task.user:0
 #: field:report.project.task.user,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Firma"
 
 #. module: project
 #: field:project.installer,project_scrum:0
@@ -194,7 +194,7 @@ msgstr ""
 #. module: project
 #: field:project.task.type,name:0
 msgid "Stage Name"
-msgstr ""
+msgstr "Numele etapei"
 
 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_openpendingtask0
@@ -238,7 +238,7 @@ msgstr ""
 #: field:report.project.task.user,day:0
 #: field:task.by.days,day:0
 msgid "Day"
-msgstr ""
+msgstr "Zi"
 
 #. module: project
 #: code:addons/project/project.py:571
@@ -261,12 +261,12 @@ msgstr ""
 #: field:project.task.work,task_id:0
 #: view:report.project.task.user:0
 msgid "Task"
-msgstr ""
+msgstr "Sarcină"
 
 #. module: project
 #: view:project.project:0
 msgid "Members"
-msgstr ""
+msgstr "Membrii"
 
 #. module: project
 #: help:project.task,planned_hours:0
@@ -285,7 +285,7 @@ msgstr ""
 #: view:project.task:0
 #: field:project.task,notes:0
 msgid "Notes"
-msgstr ""
+msgstr "Notițe"
 
 #. module: project
 #: view:project.vs.hours:0
@@ -310,7 +310,7 @@ msgstr ""
 #. module: project
 #: view:project.task:0
 msgid "Start Task"
-msgstr ""
+msgstr "Start sarcină"
 
 #. module: project
 #: help:project.installer,project_timesheet:0
@@ -331,7 +331,7 @@ msgstr ""
 #: selection:report.project.task.user,state:0
 #: selection:task.by.days,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Anulat"
 
 #. module: project
 #: view:board.board:0
@@ -375,12 +375,12 @@ msgstr ""
 #: field:project.task,date_end:0
 #: field:report.project.task.user,date_end:0
 msgid "Ending Date"
-msgstr ""
+msgstr "Data de sfârşit"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "   Month   "
-msgstr ""
+msgstr "   Lună   "
 
 #. module: project
 #: model:process.transition,note:project.process_transition_delegate0
@@ -392,7 +392,7 @@ msgstr ""
 #: view:project.task:0
 #: view:report.project.task.user:0
 msgid "Group By..."
-msgstr ""
+msgstr "Grupează după..."
 
 #. module: project
 #: help:project.task,effective_hours:0
@@ -409,12 +409,12 @@ msgstr ""
 #. module: project
 #: model:ir.model,name:project.model_res_users
 msgid "res.users"
-msgstr ""
+msgstr "res.users"
 
 #. module: project
 #: model:project.task.type,name:project.project_tt_testing
 msgid "Testing"
-msgstr ""
+msgstr "Testare"
 
 #. module: project
 #: help:project.task.delegate,planned_hours:0
@@ -436,31 +436,31 @@ msgstr ""
 #: model:ir.model,name:project.model_account_analytic_account
 #: field:project.project,analytic_account_id:0
 msgid "Analytic Account"
-msgstr ""
+msgstr "Cont analitic"
 
 #. module: project
 #: field:project.task.work,user_id:0
 msgid "Done by"
-msgstr ""
+msgstr "Realizat de"
 
 #. module: project
 #: view:project.task:0
 msgid "Planning"
-msgstr ""
+msgstr "Planificare"
 
 #. module: project
 #: view:project.task:0
 #: field:project.task,date_deadline:0
 #: field:report.project.task.user,date_deadline:0
 msgid "Deadline"
-msgstr ""
+msgstr "Termen-limită"
 
 #. module: project
 #: view:project.task.close:0
 #: view:project.task.delegate:0
 #: view:project.task.reevaluate:0
 msgid "_Cancel"
-msgstr ""
+msgstr "_Renunță"
 
 #. module: project
 #: model:ir.model,name:project.model_res_partner
@@ -469,7 +469,7 @@ msgstr ""
 #: view:report.project.task.user:0
 #: field:report.project.task.user,partner_id:0
 msgid "Partner"
-msgstr ""
+msgstr "Partener"
 
 #. module: project
 #: constraint:account.analytic.account:0
diff --git a/addons/share/i18n/ru.po b/addons/share/i18n/ru.po
new file mode 100644
index 00000000000..ba1a12542e1
--- /dev/null
+++ b/addons/share/i18n/ru.po
@@ -0,0 +1,485 @@
+# Russian translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:16+0000\n"
+"PO-Revision-Date: 2011-04-26 05:57+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Russian <ru@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: 2011-04-27 04:41+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
+
+#. module: share
+#: code:addons/share/web/editors.py:15
+#, python-format
+msgid "Sharing"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:434
+#, python-format
+msgid ""
+"This additional data has been automatically added to your current access.\n"
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+msgid "Existing External Users"
+msgstr ""
+
+#. module: share
+#: help:res.groups,share:0
+msgid "Group created to set access rights for sharing data with some users."
+msgstr ""
+
+#. module: share
+#: model:ir.module.module,shortdesc:share.module_meta_information
+msgid "Share Management"
+msgstr ""
+
+#. module: share
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr "Не может быть двух пользователей с одинаковым именем пользователя!"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:76
+#, python-format
+msgid "Sharing Wizard - Step 1"
+msgstr ""
+
+#. module: share
+#: model:ir.actions.act_window,name:share.action_share_wizard
+#: model:ir.ui.menu,name:share.menu_action_share_wizard
+msgid "Share Access Rules"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:453
+#, python-format
+msgid ""
+"Dear,\n"
+"\n"
+"%s\n"
+"\n"
+msgstr ""
+
+#. module: share
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+"Выбранная компания отсутствует в списке разрешённых компаний для этого "
+"пользователя"
+
+#. module: share
+#: model:ir.model,name:share.model_res_users
+msgid "res.users"
+msgstr "res.users"
+
+#. module: share
+#: view:share.wizard:0
+msgid "Next"
+msgstr "Далее"
+
+#. module: share
+#: help:share.wizard,action_id:0
+msgid ""
+"The action that opens the screen containing the data you wish to share."
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:68
+#, python-format
+msgid "Please specify \"share_root_url\" in context"
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+msgid "Congratulations, you have successfully setup a new shared access!"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:247
+#, python-format
+msgid "(Copy for sharing)"
+msgstr ""
+
+#. module: share
+#: field:share.wizard.result.line,newly_created:0
+msgid "Newly created"
+msgstr "Вновь созданный"
+
+#. module: share
+#: field:share.wizard,share_root_url:0
+msgid "Generic Share Access URL"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:457
+#, python-format
+msgid ""
+"You may use the following login and password to get access to this protected "
+"area:\n"
+msgstr ""
+
+#. module: share
+#: view:res.groups:0
+msgid "Regular groups only (no share groups"
+msgstr ""
+
+#. module: share
+#: selection:share.wizard,access_mode:0
+msgid "Read & Write"
+msgstr "Чтение и запись"
+
+#. module: share
+#: view:share.wizard:0
+msgid "Share wizard: step 2"
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+msgid "Share wizard: step 0"
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+msgid "Share wizard: step 1"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:430
+#: field:share.wizard.result.line,login:0
+#, python-format
+msgid "Username"
+msgstr "Имя пользователя"
+
+#. module: share
+#: field:res.users,share:0
+msgid "Share User"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:424
+#, python-format
+msgid "%s has shared OpenERP %s information with you"
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+msgid "Finish"
+msgstr "Завершить"
+
+#. module: share
+#: field:share.wizard,user_ids:0
+#: field:share.wizard.user,user_id:0
+msgid "Users"
+msgstr "Пользователи"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:103
+#, python-format
+msgid ""
+"This username (%s) already exists, perhaps data has already been shared with "
+"this person.\n"
+"You may want to try selecting existing shared users instead."
+msgstr ""
+
+#. module: share
+#: field:share.wizard,new_users:0
+msgid "New users"
+msgstr "Новые пользователи"
+
+#. module: share
+#: model:ir.model,name:share.model_res_groups
+msgid "res.groups"
+msgstr "res.groups"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:121
+#, python-format
+msgid "%s (Shared)"
+msgstr ""
+
+#. module: share
+#: sql_constraint:res.groups:0
+msgid "The name of the group must be unique !"
+msgstr "Название группы должно быть уникальным !"
+
+#. module: share
+#: selection:share.wizard,user_type:0
+msgid "New users (emails required)"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:390
+#, python-format
+msgid "Sharing filter created by user %s (%s) for group %s"
+msgstr ""
+
+#. module: share
+#: view:res.groups:0
+msgid "Groups"
+msgstr "Группы"
+
+#. module: share
+#: view:share.wizard:0
+msgid "Select the desired shared access mode:"
+msgstr ""
+
+#. module: share
+#: field:res.groups,share:0
+msgid "Share Group"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:431
+#: field:share.wizard.result.line,password:0
+#, python-format
+msgid "Password"
+msgstr "Пароль"
+
+#. module: share
+#: view:share.wizard:0
+msgid "Who would you want to share this data with?"
+msgstr ""
+
+#. module: share
+#: model:ir.module.module,description:share.module_meta_information
+msgid ""
+"The goal is to implement a generic sharing mechanism, where user of OpenERP\n"
+"can share data from OpenERP to their colleagues, customers, or friends.\n"
+"The system will work by creating new users and groups on the fly, and by\n"
+"combining the appropriate access rights and ir.rules to ensure that the "
+"/shared\n"
+"users/ will only have access to the correct data.\n"
+"    "
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:102
+#, python-format
+msgid "User already exists"
+msgstr "Пользователь уже существует"
+
+#. module: share
+#: view:share.wizard:0
+msgid "Send Email Notification(s)"
+msgstr "Отправить уведомление по эл. почте"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:435
+#, python-format
+msgid ""
+"You may use your existing login and password to view it. As a reminder, your "
+"login is %s.\n"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:432
+#, python-format
+msgid "Database"
+msgstr "База данных"
+
+#. module: share
+#: model:ir.model,name:share.model_share_wizard_user
+msgid "share.wizard.user"
+msgstr "share.wizard.user"
+
+#. module: share
+#: view:share.wizard:0
+msgid ""
+"Please select the action that opens the screen containing the data you want "
+"to share."
+msgstr ""
+
+#. module: share
+#: selection:share.wizard,user_type:0
+msgid "Existing external users"
+msgstr "Cуществующие внешние пользователи"
+
+#. module: share
+#: view:share.wizard:0
+#: field:share.wizard,result_line_ids:0
+msgid "Summary"
+msgstr "Содержание"
+
+#. module: share
+#: field:share.wizard,user_type:0
+msgid "Users to share with"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:276
+#, python-format
+msgid "Indirect sharing filter created by user %s (%s) for group %s"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:420
+#, python-format
+msgid "Email required"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:212
+#, python-format
+msgid "Copied access for sharing"
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+msgid ""
+"Optionally, you may specify an additional domain restriction that will be "
+"applied to the shared data."
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+msgid "New Users (please provide one e-mail address per line below)"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:420
+#, python-format
+msgid ""
+"The current user must have an email address configured in User Preferences "
+"to be able to send outgoing emails."
+msgstr ""
+
+#. module: share
+#: view:res.users:0
+msgid "Regular users only (no share user)"
+msgstr ""
+
+#. module: share
+#: field:share.wizard.result.line,share_url:0
+msgid "Share URL"
+msgstr ""
+
+#. module: share
+#: field:share.wizard,domain:0
+msgid "Domain"
+msgstr "Домен"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:286
+#, python-format
+msgid ""
+"Sorry, the current screen and filter you are trying to share are not "
+"supported at the moment.\n"
+"You may want to try a simpler filter."
+msgstr ""
+
+#. module: share
+#: field:share.wizard,access_mode:0
+msgid "Access Mode"
+msgstr "Режим доступа"
+
+#. module: share
+#: view:share.wizard:0
+msgid "Access info"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:426
+#, python-format
+msgid ""
+"To access it, you can go to the following URL:\n"
+"    %s"
+msgstr ""
+
+#. module: share
+#: field:share.wizard,action_id:0
+msgid "Action to share"
+msgstr ""
+
+#. module: share
+#: code:addons/share/web/editors.py:18
+#, python-format
+msgid "Share"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:406
+#, python-format
+msgid "Sharing Wizard - Step 2"
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+msgid "Here is a summary of the access points you have just created:"
+msgstr ""
+
+#. module: share
+#: model:ir.model,name:share.model_share_wizard_result_line
+msgid "share.wizard.result.line"
+msgstr "share.wizard.result.line"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:285
+#, python-format
+msgid "Sharing access could not be setup"
+msgstr ""
+
+#. module: share
+#: model:ir.actions.act_window,name:share.action_share_wizard_step1
+#: model:ir.model,name:share.model_share_wizard
+#: field:share.wizard.result.line,share_wizard_id:0
+#: field:share.wizard.user,share_wizard_id:0
+msgid "Share Wizard"
+msgstr ""
+
+#. module: share
+#: help:share.wizard,user_type:0
+msgid "Select the type of user(s) you would like to share data with."
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+msgid "Cancel"
+msgstr "Отменить"
+
+#. module: share
+#: view:share.wizard:0
+msgid "Close"
+msgstr "Закрыть"
+
+#. module: share
+#: help:res.users,share:0
+msgid ""
+"External user with limited access, created only for the purpose of sharing "
+"data."
+msgstr ""
+
+#. module: share
+#: help:share.wizard,domain:0
+msgid "Optional domain for further data filtering"
+msgstr "Дополнительный домен для дальнейшей фильтрации данных"
+
+#. module: share
+#: selection:share.wizard,access_mode:0
+msgid "Read-only"
+msgstr "Только чтение"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:295
+#, python-format
+msgid "*usual password*"
+msgstr "*Обычный пароль*"
+
+#, python-format
+#~ msgid ""
+#~ "You may use the following login and password to get access to this protected "
+#~ "area:"
+#~ msgstr ""
+#~ "Вы можете использовать следующие логин и пароль, для доступа к этой "
+#~ "защищенной зоне:"
diff --git a/addons/web_livechat/i18n/tr.po b/addons/web_livechat/i18n/tr.po
new file mode 100644
index 00000000000..e03d64cac46
--- /dev/null
+++ b/addons/web_livechat/i18n/tr.po
@@ -0,0 +1,39 @@
+# Turkish translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:16+0000\n"
+"PO-Revision-Date: 2011-04-26 14:31+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Turkish <tr@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: 2011-04-27 04:41+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
+
+#. module: web_livechat
+#: sql_constraint:publisher_warranty.contract:0
+msgid ""
+"Your publisher warranty contract is already subscribed in the system !"
+msgstr "Yayıncı garanti sözleşmeniz halihazırda sistemde kayıtlı !"
+
+#. module: web_livechat
+#: model:ir.module.module,shortdesc:web_livechat.module_meta_information
+msgid "Live Chat Support"
+msgstr "Canlı Sohbet Desteği"
+
+#. module: web_livechat
+#: model:ir.model,name:web_livechat.model_publisher_warranty_contract
+msgid "publisher_warranty.contract"
+msgstr "publisher_warranty.contract"
+
+#. module: web_livechat
+#: model:ir.module.module,description:web_livechat.module_meta_information
+msgid "Enable live chat support for whom have a maintenance contract"
+msgstr "Bakım sözleşmesi olanlar için canlı sohbet desteğini açar"
diff --git a/addons/wiki_faq/i18n/tr.po b/addons/wiki_faq/i18n/tr.po
new file mode 100644
index 00000000000..2217d0c43a2
--- /dev/null
+++ b/addons/wiki_faq/i18n/tr.po
@@ -0,0 +1,32 @@
+# Turkish translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:16+0000\n"
+"PO-Revision-Date: 2011-04-26 14:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Turkish <tr@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: 2011-04-27 04:41+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
+
+#. module: wiki_faq
+#: model:ir.module.module,description:wiki_faq.module_meta_information
+msgid ""
+"This module provides a wiki FAQ Template\n"
+"    "
+msgstr ""
+"Bu modül bir wiki Sıkça Sorulan Sorular Şablonu içerir\n"
+"    "
+
+#. module: wiki_faq
+#: model:ir.module.module,shortdesc:wiki_faq.module_meta_information
+msgid "Document Management - Wiki - FAQ"
+msgstr "Döküman Yönetimi - Wiki - SSS"
diff --git a/addons/wiki_quality_manual/i18n/ru.po b/addons/wiki_quality_manual/i18n/ru.po
new file mode 100644
index 00000000000..2a3518f245f
--- /dev/null
+++ b/addons/wiki_quality_manual/i18n/ru.po
@@ -0,0 +1,32 @@
+# Russian translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:16+0000\n"
+"PO-Revision-Date: 2011-04-26 05:37+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Russian <ru@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: 2011-04-27 04:41+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
+
+#. module: wiki_quality_manual
+#: model:ir.module.module,description:wiki_quality_manual.module_meta_information
+msgid ""
+"Quality Manual Template\n"
+"    "
+msgstr ""
+"Шаблон руководства по качеству\n"
+"    "
+
+#. module: wiki_quality_manual
+#: model:ir.module.module,shortdesc:wiki_quality_manual.module_meta_information
+msgid "Document Management - Wiki - Quality Manual"
+msgstr "Управление документами - Вики - Руководство по качеству"
diff --git a/addons/wiki_quality_manual/i18n/tr.po b/addons/wiki_quality_manual/i18n/tr.po
new file mode 100644
index 00000000000..0427a2b010c
--- /dev/null
+++ b/addons/wiki_quality_manual/i18n/tr.po
@@ -0,0 +1,32 @@
+# Turkish translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:16+0000\n"
+"PO-Revision-Date: 2011-04-26 14:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Turkish <tr@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: 2011-04-27 04:41+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
+
+#. module: wiki_quality_manual
+#: model:ir.module.module,description:wiki_quality_manual.module_meta_information
+msgid ""
+"Quality Manual Template\n"
+"    "
+msgstr ""
+"Kalite El Kitabı Şablonu\n"
+"    "
+
+#. module: wiki_quality_manual
+#: model:ir.module.module,shortdesc:wiki_quality_manual.module_meta_information
+msgid "Document Management - Wiki - Quality Manual"
+msgstr "Döküman Yönetimi - Wiki - Kalite El Kitabı"

From f4fcbe650079c355c552af6960053e84c6f13026 Mon Sep 17 00:00:00 2001
From: "Ujjvala Collins (OpenERP)" <uco@tinyerp.com>
Date: Wed, 27 Apr 2011 10:53:03 +0530
Subject: [PATCH 323/331] [FIX] mail_gateway: Renamed a field having same name
 used twice.

lp bug: https://launchpad.net/bugs/771186 fixed

bzr revid: uco@tinyerp.com-20110427052303-kj0z2hx7b6l989lz
---
 addons/mail_gateway/mail_gateway.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mail_gateway/mail_gateway.py b/addons/mail_gateway/mail_gateway.py
index e664affbd80..c67a2668192 100644
--- a/addons/mail_gateway/mail_gateway.py
+++ b/addons/mail_gateway/mail_gateway.py
@@ -271,7 +271,7 @@ class mailgate_message(osv.osv):
         'date': fields.datetime('Date', readonly=True),
         'history': fields.boolean('Is History?', readonly=True),
         'user_id': fields.many2one('res.users', 'User Responsible', readonly=True),
-        'message': fields.text('Description', readonly=True),
+        'message': fields.text('Message', readonly=True),
         'email_from': fields.char('From', size=128, help="Email From", readonly=True),
         'email_to': fields.char('To', help="Email Recipients", size=256, readonly=True),
         'email_cc': fields.char('Cc', help="Carbon Copy Email Recipients", size=256, readonly=True),

From ad9b8bded96c0217099be491af27fec1c9923416 Mon Sep 17 00:00:00 2001
From: Vo Minh Thu <vmt@openerp.com>
Date: Wed, 27 Apr 2011 13:39:09 +0200
Subject: [PATCH 324/331] [FIX] account/project: renamed
 account.analytic.Journal.report to lowercase. - although it is an osv_memory,
 it is done for consistency - proper check will be added in the server for
 both osv and osv_memory - translation will be broken until we regenerate the
 .pot files and launchpad regenrates the .po files.

bzr revid: vmt@openerp.com-20110427113909-qej15r9k08whlzj5
---
 .../project/wizard/account_analytic_journal_report.py     | 8 ++++----
 .../wizard/account_analytic_journal_report_view.xml       | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/addons/account/project/wizard/account_analytic_journal_report.py b/addons/account/project/wizard/account_analytic_journal_report.py
index cb2b67aad39..59dd0361805 100644
--- a/addons/account/project/wizard/account_analytic_journal_report.py
+++ b/addons/account/project/wizard/account_analytic_journal_report.py
@@ -22,8 +22,8 @@ import time
 
 from osv import osv, fields
 
-class account_analytic_Journal_report(osv.osv_memory):
-    _name = 'account.analytic.Journal.report'
+class account_analytic_journal_report(osv.osv_memory):
+    _name = 'account.analytic.journal.report'
     _description = 'Account Analytic Journal'
 
     _columns = {
@@ -52,5 +52,5 @@ class account_analytic_Journal_report(osv.osv_memory):
             'datas': datas,
             }
 
-account_analytic_Journal_report()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+account_analytic_journal_report()
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/project/wizard/account_analytic_journal_report_view.xml b/addons/account/project/wizard/account_analytic_journal_report_view.xml
index 137920ee056..20777401da0 100644
--- a/addons/account/project/wizard/account_analytic_journal_report_view.xml
+++ b/addons/account/project/wizard/account_analytic_journal_report_view.xml
@@ -4,7 +4,7 @@
 
 		<record id="account_analytic_journal_view" model="ir.ui.view">
 			<field name="name">Account Analytic Journal</field>
-			<field name="model">account.analytic.Journal.report</field>
+			<field name="model">account.analytic.journal.report</field>
 			<field name="type">form</field>
 			<field name="arch" type="xml">
 				<form string="Select Period">
@@ -24,7 +24,7 @@
 		<record id="action_account_analytic_journal" model="ir.actions.act_window">
 			<field name="name">Analytic Journal</field>
 			<field name="type">ir.actions.act_window</field>
-			<field name="res_model">account.analytic.Journal.report</field>
+			<field name="res_model">account.analytic.journal.report</field>
 			<field name="view_type">form</field>
 			<field name="view_mode">form</field>
 			<field name="view_id" ref="account_analytic_journal_view"/>
@@ -42,4 +42,4 @@
 		</record>
 
     </data>
-</openerp>
\ No newline at end of file
+</openerp>

From 8b701308ec90e9ff16f2f5e47152196f9b435926 Mon Sep 17 00:00:00 2001
From: mtr <mtr@mtr>
Date: Wed, 27 Apr 2011 18:38:52 +0530
Subject: [PATCH 325/331] [FIX] hr_attendance: encoded with utf8

lp bug: https://launchpad.net/bugs/771657 fixed

bzr revid: mtr@mtr-20110427130852-6d8odic2ng8wwmlm
---
 addons/hr_attendance/report/timesheet.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/hr_attendance/report/timesheet.py b/addons/hr_attendance/report/timesheet.py
index 53cbb004872..900f982dc74 100644
--- a/addons/hr_attendance/report/timesheet.py
+++ b/addons/hr_attendance/report/timesheet.py
@@ -109,6 +109,7 @@ class report_custom(report_rml):
         %s
         </report>
         ''' % '\n'.join(user_xml)
+        xml = tools.ustr(xml).encode('utf8')
         return self.post_process_xml_data(cr, uid, xml, context)
 
 report_custom('report.hr.attendance.allweeks', 'hr.employee', '', 'addons/hr_attendance/report/timesheet.xsl')

From 625126ada9023e494784a612282f905ad0ecf32c Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Thu, 28 Apr 2011 04:37:50 +0000
Subject: [PATCH 326/331] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20110428043750-hxznxmmi77c1htfe
---
 addons/account/i18n/gl.po           |  10 +-
 addons/account/i18n/tr.po           | 173 +++++++++++++++++-----------
 addons/decimal_precision/i18n/tr.po |  71 ++++++++++++
 addons/web_uservoice/i18n/tr.po     |  29 +++++
 4 files changed, 212 insertions(+), 71 deletions(-)
 create mode 100644 addons/decimal_precision/i18n/tr.po
 create mode 100644 addons/web_uservoice/i18n/tr.po

diff --git a/addons/account/i18n/gl.po b/addons/account/i18n/gl.po
index 2d629ed90f1..28ae44ff267 100644
--- a/addons/account/i18n/gl.po
+++ b/addons/account/i18n/gl.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-02-02 10:14+0000\n"
-"Last-Translator: Alberto Luengo Cabanillas (Pexego) <alberto@pexego.es>\n"
+"PO-Revision-Date: 2011-04-27 15:37+0000\n"
+"Last-Translator: Xosé <Unknown>\n"
 "Language-Team: Galician <gl@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: 2011-03-18 04:49+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-04-28 04:37+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -2140,7 +2140,7 @@ msgstr ""
 #: field:analytic.entries.report,name:0
 #: field:report.invoice.created,name:0
 msgid "Description"
-msgstr "Descripción"
+msgstr "Descrición"
 
 #. module: account
 #: code:addons/account/account.py:2844
diff --git a/addons/account/i18n/tr.po b/addons/account/i18n/tr.po
index fc1edc96b66..81f376dcd82 100644
--- a/addons/account/i18n/tr.po
+++ b/addons/account/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-04-23 18:35+0000\n"
+"PO-Revision-Date: 2011-04-27 21:47+0000\n"
 "Last-Translator: Ayhan KIZILTAN <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: 2011-04-24 04:37+0000\n"
+"X-Launchpad-Export-Date: 2011-04-28 04:37+0000\n"
 "X-Generator: Launchpad (build 12758)\n"
 
 #. module: account
@@ -39,8 +39,8 @@ msgid ""
 "You cannot remove/deactivate an account which is set as a property to any "
 "Partner."
 msgstr ""
-"You cannot remove/deactivate an account which is set as a property to any "
-"Partner."
+"Herhangi bir Ortağa bir özellik olarak ayarlanmış bir hesabı "
+"kaldıramaz/durdurmazsınız."
 
 #. module: account
 #: view:account.move.reconcile:0
@@ -50,7 +50,7 @@ msgstr "Yevmiye Kaydını Mutabakatla"
 #. module: account
 #: field:account.installer.modules,account_voucher:0
 msgid "Voucher Management"
-msgstr ""
+msgstr "Fiş Yönetimi"
 
 #. module: account
 #: view:account.account:0
@@ -75,7 +75,7 @@ msgstr "Lütfen fatura dizisi tanımlayınız"
 #. module: account
 #: constraint:account.period:0
 msgid "Error ! The duration of the Period(s) is/are invalid. "
-msgstr "Hata! Dönem bilgisi hatalı "
+msgstr "Hata! Dönem(ler)in süresi geçersiz. "
 
 #. module: account
 #: field:account.analytic.line,currency_id:0
@@ -95,7 +95,7 @@ msgstr "Bugüne kadarki Yaşlandırılmış Alacak"
 #. module: account
 #: field:account.partner.ledger,reconcil:0
 msgid "Include Reconciled Entries"
-msgstr "Mutabakatlı girişler dahil"
+msgstr "Mutabakatlı girişleri içer"
 
 #. module: account
 #: view:account.pl.report:0
@@ -103,7 +103,7 @@ msgid ""
 "The Profit and Loss report gives you an overview of your company profit and "
 "loss in a single document"
 msgstr ""
-"Kar / Zarar raporu, tek sayfada şirketinizin kar ve zarar durumu ile ilgili "
+"Kar ve Zarar raporu, tek sayfada şirketinizin kar ve zarar durumu ile ilgili "
 "bilgi sunar."
 
 #. module: account
@@ -114,7 +114,7 @@ msgstr "Fatura ya da ödemeden içe aktar"
 #. module: account
 #: model:ir.model,name:account.model_wizard_multi_charts_accounts
 msgid "wizard.multi.charts.accounts"
-msgstr ""
+msgstr "sihirbaz.çoklu.plan.hesaplar"
 
 #. module: account
 #: view:account.move:0
@@ -127,8 +127,8 @@ msgid ""
 "If you unreconciliate transactions, you must also verify all the actions "
 "that are linked to those transactions because they will not be disabled"
 msgstr ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disabled"
+"Bir işlemin uzlaşmasını kaldırdığınızda, o işleme bağlı eylemler devre dışı "
+"bırakılmayacağı için o işleme bağlı bütün eylemleri de kontrol etmelisiniz."
 
 #. module: account
 #: report:account.tax.code.entries:0
@@ -139,7 +139,7 @@ msgstr "Muhasebe Girdileri-"
 #: code:addons/account/account.py:1291
 #, python-format
 msgid "You can not delete posted movement: \"%s\"!"
-msgstr "You can not delete posted movement: \"%s\"!"
+msgstr "İşlenmiş hareketleri sizmezsiniz: \"%s\"!"
 
 #. module: account
 #: report:account.invoice:0
@@ -155,7 +155,7 @@ msgstr "Menşei"
 #: view:account.move.line.reconcile:0
 #: view:account.move.line.reconcile.writeoff:0
 msgid "Reconcile"
-msgstr "Reconcile"
+msgstr "Mutabakat"
 
 #. module: account
 #: field:account.bank.statement.line,ref:0
@@ -177,9 +177,7 @@ msgstr "Mali Yılı Seçin "
 msgid ""
 "If the active field is set to False, it will allow you to hide the payment "
 "term without removing it."
-msgstr ""
-"'Aktif' seçeneği işaretli değilse, ödeme bilgilerini silmeden gizlemenize "
-"izin verir."
+msgstr "Aktif seçeneği seçili değilse, Ödeme şartları silmeden gizlenir."
 
 #. module: account
 #: code:addons/account/invoice.py:1421
@@ -196,12 +194,12 @@ msgstr "Hesap Kaynağı"
 #. module: account
 #: model:ir.actions.act_window,name:account.act_acc_analytic_acc_5_report_hr_timesheet_invoice_journal
 msgid "All Analytic Entries"
-msgstr "Bütün Analiz girişleri"
+msgstr "Bütün Analitik hareketler"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
 msgid "Invoices Created Within Past 15 Days"
-msgstr "Son 15 günde yaratılmış faturalar"
+msgstr "Son 15 Günde Oluşturulmuş Faturalar"
 
 #. module: account
 #: selection:account.account.type,sign:0
@@ -221,9 +219,9 @@ msgid ""
 "invoice) to create analytic entries, OpenERP will look for a matching "
 "journal of the same type."
 msgstr ""
-"Gives the type of the analytic journal. When it needs for a document (eg: an "
-"invoice) to create analytic entries, OpenERP will look for a matching "
-"journal of the same type."
+"Analitik yevmiye defterinin tipini belirtir. Bir belge için (ör: fatura) "
+"analitik giriş oluşturmak gerektiğinde OpenERP aynı tipe uyan yevmiye "
+"defteri arayacaktır."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_tax_template_form
@@ -234,7 +232,7 @@ msgstr "Vergi Şablonu"
 #. module: account
 #: model:ir.model,name:account.model_account_tax
 msgid "account.tax"
-msgstr "account.tax"
+msgstr "muhasebe.vergi"
 
 #. module: account
 #: code:addons/account/account.py:901
@@ -249,7 +247,7 @@ msgstr ""
 #. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile_select
 msgid "Move line reconcile select"
-msgstr "Move line reconcile select"
+msgstr "Seçilen mutabakat satırını taşı"
 
 #. module: account
 #: help:account.model.line,sequence:0
@@ -257,8 +255,7 @@ msgid ""
 "The sequence field is used to order the resources from lower sequences to "
 "higher ones"
 msgstr ""
-"The sequence field is used to order the resources from lower sequences to "
-"higher ones"
+"Sıra alanı, kaynakları küçükten büyüğe doğru sıralamak için kullanılır."
 
 #. module: account
 #: help:account.tax.code,notprintable:0
@@ -267,14 +264,14 @@ msgid ""
 "Check this box if you don't want any VAT related to this Tax Code to appear "
 "on invoices"
 msgstr ""
-"Check this box if you don't want any VAT related to this Tax Code to appear "
-"on invoices"
+"Faturalarda bu Vergi Koduyla ilintili KDV görünmesini istemiyorsanız bu "
+"kutuyu işaretleyin."
 
 #. module: account
 #: code:addons/account/invoice.py:1210
 #, python-format
 msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
-msgstr "'%s' faturası parçalı öndendi: (Ödenen %s%s Toplam %s%s Kalan %s%s)"
+msgstr "'%s' nolu fatura kısmen ödendi: (Ödenen %s%s Toplam %s%s Kalan %s%s)"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_supplierentriesreconcile0
@@ -284,7 +281,7 @@ msgstr "Hesap girişleri uzlaşmaya ait girişlerdir."
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_management_belgian_reports
 msgid "Belgian Reports"
-msgstr "Belgian Reports"
+msgstr "Belçika Raporları"
 
 #. module: account
 #: code:addons/account/account_move_line.py:1176
@@ -302,7 +299,7 @@ msgstr "Hesaplanan bakiye"
 #: model:ir.actions.act_window,name:account.action_view_account_use_model
 #: model:ir.ui.menu,name:account.menu_action_manual_recurring
 msgid "Manual Recurring"
-msgstr "Manual Recurring"
+msgstr "El ile Yineleme"
 
 #. module: account
 #: view:account.fiscalyear.close.state:0
@@ -312,7 +309,7 @@ msgstr "Mali Yılı Kapat"
 #. module: account
 #: field:account.automatic.reconcile,allow_write_off:0
 msgid "Allow write off"
-msgstr "Allow write off"
+msgstr "Borcu silmeye izin ver"
 
 #. module: account
 #: view:account.analytic.chart:0
@@ -322,7 +319,7 @@ msgstr "Analiz için dönem seçin"
 #. module: account
 #: view:account.move.line:0
 msgid "St."
-msgstr "St."
+msgstr "Ara Toplam"
 
 #. module: account
 #: code:addons/account/invoice.py:529
@@ -341,8 +338,8 @@ msgid ""
 "Installs localized accounting charts to match as closely as possible the "
 "accounting needs of your company based on your country."
 msgstr ""
-"Installs localized accounting charts to match as closely as possible the "
-"accounting needs of your company based on your country."
+"Ülkenizde kullanılan hesap planına en uygun yerelleştirilmiş hesap planını "
+"kurar."
 
 #. module: account
 #: code:addons/account/wizard/account_move_journal.py:63
@@ -391,16 +388,20 @@ msgid ""
 "OpenERP. Journal items are created by OpenERP if you use Bank Statements, "
 "Cash Registers, or Customer/Supplier payments."
 msgstr ""
+"Bu görünüm, OpenERP de kayıtların toplu olarak girilmesi için muhasebeciler "
+"tarafından kullanılır. Banka Hesap Özetleri, Kasa Kayıtları, veya "
+"Müşteri/Satıcı ödemelerine ait yevmiye girişleri OpenERP tarafından "
+"oluşturulur."
 
 #. module: account
 #: model:ir.model,name:account.model_account_tax_template
 msgid "account.tax.template"
-msgstr "account.tax.template"
+msgstr "muhasebe.vergi.şablonu"
 
 #. module: account
 #: model:ir.model,name:account.model_account_bank_accounts_wizard
 msgid "account.bank.accounts.wizard"
-msgstr "account.bank.accounts.wizard"
+msgstr "muhasebe.banka.hesap.sihirbazı"
 
 #. module: account
 #: field:account.move.line,date_created:0
@@ -421,7 +422,7 @@ msgstr "Açma/Kapama Durumu"
 #. module: account
 #: help:account.journal,currency:0
 msgid "The currency used to enter statement"
-msgstr "The currency used to enter statement"
+msgstr "hesap özeti girişi için kullanılacak para birimi"
 
 #. module: account
 #: field:account.open.closed.fiscalyear,fyear_id:0
@@ -434,8 +435,8 @@ msgid ""
 "This field contains the informatin related to the numbering of the journal "
 "entries of this journal."
 msgstr ""
-"This field contains the informatin related to the numbering of the journal "
-"entries of this journal."
+"Bu Alan, bu yevmiyenin yevmiye girişleri numaralandırılmasıyla ilintili "
+"bilgi içerir."
 
 #. module: account
 #: field:account.journal,default_debit_account_id:0
@@ -476,9 +477,9 @@ msgid ""
 "it comes to 'Printed' state. When all transactions are done, it comes in "
 "'Done' state."
 msgstr ""
-"When journal period is created. The state is 'Draft'. If a report is printed "
-"it comes to 'Printed' state. When all transactions are done, it comes in "
-"'Done' state."
+"Yevmiye dönemi oluşturulduğunda, durum 'Taslak' tır. Bir rapor "
+"yazdırıldığındadurum 'Yazdırılmış' halini alır. Bütün işlemlemler "
+"tamamalandığında durum 'Tamamlandı' halini alır."
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_tax_chart
@@ -488,6 +489,10 @@ msgid ""
 "amount of each area of the tax declaration for your country. It’s presented "
 "in a hierarchical structure, which can be modified to fit your needs."
 msgstr ""
+"Vergi Tablosu, Vergi Durumlarını (veya vergi kodlarını) gösteren bir ağaç "
+"görünümüdür ve geçerli vergi durumunu belirtir. Vergi Tablosu, ülkenize ait "
+"vergi tutarlarını gösterir. Gereksinimlerinize göre uyarlayabileceğiniz bir "
+"sıradüzenli yapıdadır."
 
 #. module: account
 #: view:account.analytic.line:0
@@ -531,12 +536,12 @@ msgstr "Seçili faturaları onayla"
 #. module: account
 #: field:account.addtmpl.wizard,cparent_id:0
 msgid "Parent target"
-msgstr "Hedef Cari"
+msgstr "Ana Hedef"
 
 #. module: account
 #: field:account.bank.statement,account_id:0
 msgid "Account used in this journal"
-msgstr "Cari bu yevmiyede kullanıldı"
+msgstr "Bu yevmiyede kullanılan hesap"
 
 #. module: account
 #: help:account.aged.trial.balance,chart_account_id:0
@@ -575,7 +580,7 @@ msgstr "Li."
 #. module: account
 #: field:account.automatic.reconcile,unreconciled:0
 msgid "Not reconciled transactions"
-msgstr "Hareketler için mutabakat yapılmadı"
+msgstr "Mutabakat yapılmayan hareketler"
 
 #. module: account
 #: code:addons/account/account_cash_statement.py:348
@@ -599,7 +604,7 @@ msgstr "Bir Mali Yılı Kapat"
 #. module: account
 #: model:process.transition,note:account.process_transition_confirmstatementfromdraft0
 msgid "The accountant confirms the statement."
-msgstr "The accountant confirms the statement."
+msgstr "Muhasebeci hesap özetini onaylar."
 
 #. module: account
 #: selection:account.balance.report,display_account:0
@@ -1123,6 +1128,10 @@ msgid ""
 "purchase orders or receipts. This way, you can control the invoice from your "
 "supplier according to what you purchased or received."
 msgstr ""
+"Satıcı Faturaları ile satıcılarınızın kestiği faturaları girip "
+"işleyebilirsiniz. OpenERP, satınalma siparişlerinden veya satıanalma "
+"fişlerinden taslak faturalar da oluşturabilir. Bu yolla siz de satıcı "
+"faturalarını satıalınan ve teslim alınan mala göre kontrol edebilirsainiz."
 
 #. module: account
 #: view:account.invoice.cancel:0
@@ -1403,6 +1412,8 @@ msgid ""
 "entry per accounting document: invoice, refund, supplier payment, bank "
 "statements, etc."
 msgstr ""
+"Borç ya da alacak işlemi olmak üzere bir çok yevmiye kalemi içeren Yevmiye "
+"Girişidir. Her hesap belgesi için OpenERP bir tek Yevmiye girişi oluşturur."
 
 #. module: account
 #: view:account.entries.report:0
@@ -1547,6 +1558,11 @@ msgid ""
 "the Payment column of a line, you can press F1 to open the reconciliation "
 "form."
 msgstr ""
+"Banka hesap özeti, belirli bir tarih aralığında, bir mevduat hesabında, "
+"kredi kartı hesabında veya herhangi bir finansal hesapta yapılan mali "
+"işlemlerin özetidir. Açılış bakiyesi otomatik olarak belirir ve özette "
+"kapanış bakiyesi degörülmelidir. Bir satırda Ödeme kolonunda iken F1 basarak "
+"Uzlaşm Formunu açabilirsiniz."
 
 #. module: account
 #: report:account.analytic.account.cost_ledger:0
@@ -1654,6 +1670,9 @@ msgid ""
 "Have a complete tree view of all journal items per account code by clicking "
 "on an account."
 msgstr ""
+"Şirket Hesap Planı, her mali yıl için ve arama süzgeci dönemsel aramaya "
+"ayarlı olarak görünür. Bir hesaba tıklayarak o hesaba ait bütün yevmiye "
+"girişlerinin ağaç görünümü elde edilir."
 
 #. module: account
 #: constraint:account.fiscalyear:0
@@ -1786,7 +1805,7 @@ msgstr "Reserve And Profit/Loss Account"
 #. module: account
 #: sql_constraint:account.move.line:0
 msgid "Wrong credit or debit value in accounting entry !"
-msgstr ""
+msgstr "Hesap girişindeki Alacak / Borç değeri hatalı !"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -1834,7 +1853,7 @@ msgstr "Sub Total"
 #. module: account
 #: view:account.account:0
 msgid "Treasury Analysis"
-msgstr ""
+msgstr "Maliye İncelemesi"
 
 #. module: account
 #: constraint:res.company:0
@@ -1953,6 +1972,7 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the tax "
 "without removing it."
 msgstr ""
+"Aktif alan Yanlışa ayarlıysa, vergiyi silmeden gizlemenize izin verir."
 
 #. module: account
 #: help:account.bank.statement,name:0
@@ -2033,6 +2053,8 @@ msgid ""
 "Invalid period ! Some periods overlap or the date period is not in the scope "
 "of the fiscal year. "
 msgstr ""
+"Geçersiz dönem ! Bazı dönemler çakışıyor veya mali yıl tarih dönemini "
+"kapsamıyor. "
 
 #. module: account
 #: selection:account.invoice,state:0
@@ -2046,7 +2068,7 @@ msgstr "Pro-forma"
 #: code:addons/account/installer.py:348
 #, python-format
 msgid " Journal"
-msgstr ""
+msgstr " Yevmiye"
 
 #. module: account
 #: code:addons/account/account.py:1319
@@ -2055,6 +2077,8 @@ msgid ""
 "There is no default default debit account defined \n"
 "on journal \"%s\""
 msgstr ""
+"Yevmiyede \"%s\" \n"
+"Varsayılan borç hesabı tanımlanmamış"
 
 #. module: account
 #: help:account.account,type:0
@@ -2085,6 +2109,9 @@ msgid ""
 "certified Chart of Accounts exists for your specified country, a generic one "
 "can be installed and will be selected by default."
 msgstr ""
+"Varsayılan Hesap planı ülke seçiminize uyuyor. Belirlediğiniz ülke için "
+"onaylı Hesap Planı yoksa, genel bir hesap planı kurulur ve varsayılan "
+"seçilir."
 
 #. module: account
 #: view:account.account.type:0
@@ -2282,6 +2309,10 @@ msgid ""
 "You can create one in the menu: \n"
 "Configuration\\Financial Accounting\\Accounts\\Journals."
 msgstr ""
+"Bu firma için %s tipindehesap yevmiyesi bulunamadı\n"
+"\n"
+"Menüde bir tane oluşturabilirsiniz \n"
+"Konfigürason\\Mali Hesap\\Hesaplar\\evmiyeler."
 
 #. module: account
 #: field:account.invoice.tax,base_code_id:0
@@ -2312,6 +2343,11 @@ msgid ""
 "useful because it enables you to preview at any time the tax that you owe at "
 "the start and end of the month or quarter."
 msgstr ""
+"Bu menü, fatura ve ödemelere göre KDV beyanı yazdırır. Bir ya da birkaç mali "
+"yıl dönemi seçin. Vergi beyanı için gerekli bilgi OpenERP tarafından "
+"faturalardan (veya bazı ülkelerde ödemelerden) otomatik olarak çıkartılır. "
+"Bu bilgi gerçek zamana güncellenir. Bu bilgi, vergiyi ay başlarında ve ay "
+"sonlarında ya da üçer aylık sürelerde izleminiz açısından yararlıdır."
 
 #. module: account
 #: selection:account.move.line,centralisation:0
@@ -2397,7 +2433,7 @@ msgstr ""
 #: view:account.print.journal:0
 msgid ""
 "This report gives you an overview of the situation of a specific journal"
-msgstr ""
+msgstr "Bu rapor, belirli bir yevmiyenin durumuna gözatmanızı sağlar."
 
 #. module: account
 #: constraint:product.category:0
@@ -2724,7 +2760,7 @@ msgstr "Base Code Amount"
 #. module: account
 #: field:wizard.multi.charts.accounts,sale_tax:0
 msgid "Default Sale Tax"
-msgstr ""
+msgstr "Varsayılan Satış Vergisi"
 
 #. module: account
 #: help:account.model.line,date_maturity:0
@@ -2908,7 +2944,7 @@ msgstr "Görünüm"
 #: code:addons/account/account.py:2951
 #, python-format
 msgid "BNK%s"
-msgstr ""
+msgstr "BNK%s"
 
 #. module: account
 #: code:addons/account/account.py:2906
@@ -3155,7 +3191,7 @@ msgstr "Faturada Yazılamaz"
 #: report:account.vat.declaration:0
 #: field:account.vat.declaration,chart_tax_id:0
 msgid "Chart of Tax"
-msgstr ""
+msgstr "Vergi Tablosu"
 
 #. module: account
 #: view:account.journal:0
@@ -3260,7 +3296,7 @@ msgstr ""
 #. module: account
 #: report:account.general.ledger:0
 msgid "Counterpart"
-msgstr ""
+msgstr "Karşılık"
 
 #. module: account
 #: view:account.journal:0
@@ -3514,7 +3550,7 @@ msgstr "Satıcılar Hesabı"
 #: constraint:account.move:0
 msgid ""
 "You cannot create entries on different periods/journals in the same move"
-msgstr ""
+msgstr "Aynı işlemde farklı dönemlere/yevmiyelere girişler oluşturamazsınız"
 
 #. module: account
 #: model:process.node,name:account.process_node_supplierpaymentorder0
@@ -3542,7 +3578,7 @@ msgstr "Unit Price"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_tree1
 msgid "Analytic Items"
-msgstr ""
+msgstr "Çözümsel Kalemler"
 
 #. module: account
 #: code:addons/account/account_move_line.py:1128
@@ -3560,7 +3596,7 @@ msgstr "#Entries"
 #, python-format
 msgid ""
 "You selected an Unit of Measure which is not compatible with the product."
-msgstr ""
+msgstr "ürünle uyumlu olmayan bir Ölçü Birimi seçtiniz."
 
 #. module: account
 #: code:addons/account/invoice.py:473
@@ -3695,6 +3731,7 @@ msgstr "Onayla"
 #: sql_constraint:account.model.line:0
 msgid "Wrong credit or debit value in model (Credit Or Debit Must Be \"0\")!"
 msgstr ""
+"Modelde yanlış alacak veya borç değeri (Alacak veya Borç \"0\" olmalı) !"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_invoice_report_all
@@ -3771,7 +3808,7 @@ msgstr "Analytic Balance"
 #: code:addons/account/report/account_profit_loss.py:124
 #, python-format
 msgid "Net Loss"
-msgstr ""
+msgstr "Net Zarar"
 
 #. module: account
 #: help:account.account,active:0
@@ -3779,6 +3816,8 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the account "
 "without removing it."
 msgstr ""
+"Aktif alan Yanlış olarak ayarlıysa, hesabı silmeden gizlemenize izin "
+"verecektir."
 
 #. module: account
 #: view:account.tax.template:0
@@ -3975,7 +4014,7 @@ msgstr "Statement %s is confirmed, journal items are created."
 #. module: account
 #: constraint:account.fiscalyear:0
 msgid "Error! The duration of the Fiscal Year is invalid. "
-msgstr ""
+msgstr "Hata! Mali Yıl süresi geçersiz. "
 
 #. module: account
 #: field:report.aged.receivable,name:0
@@ -3990,7 +4029,7 @@ msgstr "Check if you want to display Accounts with 0 balance too."
 #. module: account
 #: view:account.tax:0
 msgid "Compute Code"
-msgstr ""
+msgstr "Kodu Hesapla"
 
 #. module: account
 #: view:account.account.template:0
@@ -4096,7 +4135,7 @@ msgstr "Account Journal Select"
 #. module: account
 #: view:account.invoice:0
 msgid "Print Invoice"
-msgstr ""
+msgstr "Faturayı Yazdır"
 
 #. module: account
 #: view:account.tax.template:0
@@ -4146,6 +4185,8 @@ msgid ""
 "This will automatically configure your chart of accounts, bank accounts, "
 "taxes and journals according to the selected template"
 msgstr ""
+"Bu Hesap Planınızı, banka hesaplarınızı, vergilerinizi ve yevmiyeleri "
+"seçilen şablona uygun olarak otomatikmen yapılandıracaktır."
 
 #. module: account
 #: field:account.tax,price_include:0
@@ -4229,7 +4270,7 @@ msgstr "Closing balance based on cashBox"
 #: constraint:account.account:0
 #: constraint:account.tax.code:0
 msgid "Error ! You can not create recursive accounts."
-msgstr ""
+msgstr "Hata! Yinelen hesap oluşturamazsınız."
 
 #. module: account
 #: constraint:account.account:0
@@ -4248,7 +4289,7 @@ msgstr "Generate Entries"
 #. module: account
 #: help:account.vat.declaration,chart_tax_id:0
 msgid "Select Charts of Taxes"
-msgstr ""
+msgstr "Vergi Tablosu seçin"
 
 #. module: account
 #: view:account.fiscal.position:0
@@ -9874,12 +9915,12 @@ msgstr "Maturity"
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
 msgid "Future"
-msgstr "Future"
+msgstr "İleri Tarihli İşlemler"
 
 #. module: account
 #: view:account.move.line:0
 msgid "Search Journal Items"
-msgstr "Search Journal Items"
+msgstr "Yevmiye Maddelerini Araştır"
 
 #. module: account
 #: help:account.tax,base_sign:0
@@ -9891,7 +9932,7 @@ msgstr "Search Journal Items"
 #: help:account.tax.template,ref_tax_sign:0
 #: help:account.tax.template,tax_sign:0
 msgid "Usually 1 or -1."
-msgstr "Usually 1 or -1."
+msgstr "Genelde 1 veya -1"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account_template
diff --git a/addons/decimal_precision/i18n/tr.po b/addons/decimal_precision/i18n/tr.po
new file mode 100644
index 00000000000..90ef12bed7f
--- /dev/null
+++ b/addons/decimal_precision/i18n/tr.po
@@ -0,0 +1,71 @@
+# Turkish translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-04-27 17:10+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Turkish <tr@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: 2011-04-28 04:37+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
+
+#. module: decimal_precision
+#: field:decimal.precision,digits:0
+msgid "Digits"
+msgstr "Basamaklar"
+
+#. module: decimal_precision
+#: view:decimal.precision:0
+msgid "Decimal Precision"
+msgstr "Ondalık Hassasiyet"
+
+#. module: decimal_precision
+#: model:ir.actions.act_window,name:decimal_precision.action_decimal_precision_form
+#: model:ir.ui.menu,name:decimal_precision.menu_decimal_precision_form
+msgid "Decimal Accuracy Definitions"
+msgstr "Ondalık Hassasiyet Tanımları"
+
+#. module: decimal_precision
+#: model:ir.module.module,description:decimal_precision.module_meta_information
+msgid ""
+"\n"
+"This module allows to configure the price accuracy you need for different "
+"kind\n"
+"of usage: accounting, sales, purchases, ...\n"
+"\n"
+"The decimal precision is configured per company.\n"
+msgstr ""
+"\n"
+"Bu modül farklı kullanım yerlerinde fiyat hassasiyetlerini yönetmenize "
+"olanak verir.\n"
+"mesela: muhasebe, satış, satınalma, ...\n"
+"\n"
+"Ondalık hassasiyet şirket bazlı olarak ayarlanır.\n"
+
+#. module: decimal_precision
+#: field:decimal.precision,name:0
+msgid "Usage"
+msgstr "Kullanım"
+
+#. module: decimal_precision
+#: sql_constraint:decimal.precision:0
+msgid "Only one value can be defined for each given usage!"
+msgstr "Her kullanım için sadece bir değer tanımlanabilir !"
+
+#. module: decimal_precision
+#: model:ir.module.module,shortdesc:decimal_precision.module_meta_information
+msgid "Decimal Precision Configuration"
+msgstr "Ondalık Hassasiyet Ayarları"
+
+#. module: decimal_precision
+#: model:ir.model,name:decimal_precision.model_decimal_precision
+msgid "decimal.precision"
+msgstr "Ondalık.hassasiyet"
diff --git a/addons/web_uservoice/i18n/tr.po b/addons/web_uservoice/i18n/tr.po
new file mode 100644
index 00000000000..3b21df4ae98
--- /dev/null
+++ b/addons/web_uservoice/i18n/tr.po
@@ -0,0 +1,29 @@
+# Turkish translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-12 16:15+0000\n"
+"PO-Revision-Date: 2011-04-27 14:05+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Turkish <tr@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: 2011-04-28 04:37+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
+
+#. module: web_uservoice
+#: model:ir.module.module,shortdesc:web_uservoice.module_meta_information
+msgid "Add uservoice button in header"
+msgstr "Başlığa Uservoice tuşu ekle"
+
+#. module: web_uservoice
+#: code:addons/web_uservoice/web/editors.py:72
+#, python-format
+msgid "feedback"
+msgstr "geri bildirim"

From d1326f8695090de3d9dcc8ab1f1df2345cd8d84f Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Thu, 28 Apr 2011 05:48:48 +0000
Subject: [PATCH 327/331] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20110427054555-f0p8u7why5u24257
bzr revid: launchpad_translations_on_behalf_of_openerp-20110428054848-09s41q0rk90eo0wg
---
 bin/addons/base/i18n/he.po |  10 +--
 bin/addons/base/i18n/ru.po |   6 +-
 bin/addons/base/i18n/sv.po | 128 ++++++++++++++++++-------------------
 3 files changed, 72 insertions(+), 72 deletions(-)

diff --git a/bin/addons/base/i18n/he.po b/bin/addons/base/i18n/he.po
index 0df2767e53f..4707c6b55bd 100644
--- a/bin/addons/base/i18n/he.po
+++ b/bin/addons/base/i18n/he.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-01-19 13:31+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2011-04-27 16:19+0000\n"
+"Last-Translator: Natan Alter <Unknown>\n"
 "Language-Team: Hebrew <he@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: 2011-01-20 06:08+0000\n"
-"X-Generator: Launchpad (build 12177)\n"
+"X-Launchpad-Export-Date: 2011-04-28 05:48+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: base
 #: view:ir.filters:0
@@ -39,7 +39,7 @@ msgstr ""
 #. module: base
 #: selection:ir.property,type:0
 msgid "DateTime"
-msgstr ""
+msgstr "תאריך ושעה"
 
 #. module: base
 #: code:addons/fields.py:534
diff --git a/bin/addons/base/i18n/ru.po b/bin/addons/base/i18n/ru.po
index 1d4a964c19e..0ca9b63670b 100644
--- a/bin/addons/base/i18n/ru.po
+++ b/bin/addons/base/i18n/ru.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: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-04-25 10:27+0000\n"
+"PO-Revision-Date: 2011-04-27 12:17+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@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: 2011-04-26 06:03+0000\n"
+"X-Launchpad-Export-Date: 2011-04-28 05:48+0000\n"
 "X-Generator: Launchpad (build 12758)\n"
 
 #. module: base
@@ -5187,7 +5187,7 @@ msgstr "Отмена удаления"
 #: view:res.partner:0
 #: view:res.partner.address:0
 msgid "Communication"
-msgstr "Коммуникация"
+msgstr "Общение"
 
 #. module: base
 #: view:ir.actions.report.xml:0
diff --git a/bin/addons/base/i18n/sv.po b/bin/addons/base/i18n/sv.po
index 0255645fe57..bd44f59b5e5 100644
--- a/bin/addons/base/i18n/sv.po
+++ b/bin/addons/base/i18n/sv.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-02-07 11:12+0000\n"
-"Last-Translator: Alec Leamas <Unknown>\n"
+"PO-Revision-Date: 2011-04-26 19:36+0000\n"
+"Last-Translator: Jan-Eric Lindh <jelindh@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: 2011-02-08 05:58+0000\n"
-"X-Generator: Launchpad (build 12177)\n"
+"X-Launchpad-Export-Date: 2011-04-27 05:45+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: base
 #: view:ir.filters:0
@@ -33,7 +33,7 @@ msgstr "St Helena"
 #. module: base
 #: view:ir.actions.report.xml:0
 msgid "Other Configuration"
-msgstr "Övrig Konfiguration"
+msgstr "Övrig konfiguration"
 
 #. module: base
 #: selection:ir.property,type:0
@@ -47,7 +47,7 @@ msgid ""
 "The second argument of the many2many field %s must be a SQL table !You used "
 "%s, which is not a valid SQL table name."
 msgstr ""
-"Det andra argumentet i many2many fältet %s måste vara en SQL tabell! Du "
+"Det andra argumentet i many2many-fältet %s måste vara en SQL-tabell. Du "
 "använde %s , som inte är ett giltigt tabellnamn"
 
 #. module: base
@@ -266,7 +266,7 @@ msgstr ""
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The name of the language must be unique !"
-msgstr "Namnet på språket måste vara unikt!"
+msgstr "Namnet på språket måste vara unikt."
 
 #. module: base
 #: selection:res.request,state:0
@@ -379,7 +379,7 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.gf
 msgid "French Guyana"
-msgstr "French Guyana"
+msgstr "Franska Guyana"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -389,7 +389,7 @@ msgstr "Grekiska / Ελληνικά"
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Bosnian / bosanski jezik"
-msgstr "Bosnian / bosanski jezik"
+msgstr "Bosniska/bosanski jezik"
 
 #. module: base
 #: help:ir.actions.report.xml,attachment_use:0
@@ -404,7 +404,7 @@ msgstr ""
 #: code:addons/orm.py:904
 #, python-format
 msgid "The read method is not implemented on this object !"
-msgstr "Läsmetoden är ej implementerad för detta objekt!"
+msgstr "Läsmetoden är inte implementerad i detta objekt."
 
 #. module: base
 #: help:res.lang,iso_code:0
@@ -436,7 +436,7 @@ msgstr "Colombia"
 #. module: base
 #: view:ir.module.module:0
 msgid "Schedule Upgrade"
-msgstr "Schemalägg Uppgradering"
+msgstr "Schemalägg uppgradering"
 
 #. module: base
 #: code:addons/orm.py:838
@@ -450,7 +450,7 @@ msgid ""
 "The ISO country code in two chars.\n"
 "You can use this field for quick search."
 msgstr ""
-"ISO landskod med två tecken.\n"
+"ISO-landskod med två tecken.\n"
 "Du kan använda detta fält för snabbsökning."
 
 #. module: base
@@ -490,7 +490,7 @@ msgstr "Diverse leverantörer"
 #: code:addons/base/ir/ir_model.py:255
 #, python-format
 msgid "Custom fields must have a name that starts with 'x_' !"
-msgstr "Anpassade fält måste ha ett namn som börjar med 'x_' !"
+msgstr "Anpassade fält måste ha ett namn som börjar med 'x_' ."
 
 #. module: base
 #: help:ir.actions.server,action_id:0
@@ -521,7 +521,7 @@ msgstr ""
 #. module: base
 #: field:workflow.transition,trigger_expr_id:0
 msgid "Trigger Expression"
-msgstr "Trigger uttryck"
+msgstr "Trigger-uttryck"
 
 #. module: base
 #: model:res.country,name:base.jo
@@ -571,9 +571,9 @@ msgid ""
 "Launchpad.net, our open source project management facility. We use their "
 "online interface to synchronize all translations efforts."
 msgstr ""
-"OpenERP översättningar (kärna, moduler, klienter) sköts genom Launchpad.net, "
-"vårat öppen källkods projekthanteringssystem. Vi använder deras gränssnitt "
-"för att synkronisera alla översättningar."
+"OpenERP-översättningar (kärna, moduler, klienter) sköts genom Launchpad.net, "
+"vårt öppenkällkods-projekthanteringssystem. Vi använder deras gränssnitt för "
+"att synkronisera alla översättningar."
 
 #. module: base
 #: field:res.partner,title:0
@@ -583,7 +583,7 @@ msgstr "Partnersida"
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Swedish / svenska"
-msgstr "Swedish / svenska"
+msgstr "Svenska"
 
 #. module: base
 #: model:res.country,name:base.rs
@@ -661,7 +661,7 @@ msgstr "Mina partners"
 #. module: base
 #: view:ir.actions.report.xml:0
 msgid "XML Report"
-msgstr "XML rapport"
+msgstr "XML-rapport"
 
 #. module: base
 #: model:res.country,name:base.es
@@ -677,7 +677,7 @@ msgstr "Import / Export"
 #: help:ir.actions.act_window,domain:0
 msgid ""
 "Optional domain filtering of the destination data, as a Python expression"
-msgstr "Valfri domänfiltrering av slutdatan, i form av ett python uttryck"
+msgstr "Valfri domänfiltrering av slutdatan, i form av ett Pythonuttryck"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_view_base_module_upgrade
@@ -729,7 +729,7 @@ msgstr "Arbetsdagar"
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "Other OSI Approved Licence"
-msgstr "Övrig OSI godkänd licens"
+msgstr "Övrig OSI-godkänd licens"
 
 #. module: base
 #: help:res.config.users,context_lang:0
@@ -772,7 +772,7 @@ msgstr "client_action_multi, client_action_relate"
 #. module: base
 #: model:res.country,name:base.ad
 msgid "Andorra, Principality of"
-msgstr "Andorra, Principality of"
+msgstr "Andorra, furstendöme"
 
 #. module: base
 #: field:ir.module.category,child_ids:0
@@ -788,7 +788,7 @@ msgstr "ir.config_parameter"
 #. module: base
 #: selection:base.language.export,format:0
 msgid "TGZ Archive"
-msgstr "TGZ arkiv"
+msgstr "TGZ-arkiv"
 
 #. module: base
 #: view:res.lang:0
@@ -818,8 +818,8 @@ msgid ""
 "Language with code \"%s\" is not defined in your system !\n"
 "Define it through the Administration menu."
 msgstr ""
-"Språket med koden \"%s\" är ej definierat på ditt system!\n"
-"Definiera den med hjälp av Administrationsmenyn."
+"Språket med koden \"%s\" är inte definierat på ditt system.\n"
+"Definiera den med hjälp av administrationsmenyn."
 
 #. module: base
 #: model:res.country,name:base.gu
@@ -829,13 +829,13 @@ msgstr "Guam (USA)"
 #. module: base
 #: model:ir.ui.menu,name:base.menu_hr_project
 msgid "Human Resources Dashboard"
-msgstr "Personal dashboard"
+msgstr "personlig infopanel"
 
 #. module: base
 #: code:addons/base/res/res_user.py:507
 #, python-format
 msgid "Setting empty passwords is not allowed for security reasons!"
-msgstr "Att ha tomma lösenord är Ej tillåtet av säkerhetskäl!"
+msgstr "Att ha tomma lösenord är inte tillåtet av säkerhetskäl."
 
 #. module: base
 #: selection:ir.actions.server,state:0
@@ -846,7 +846,7 @@ msgstr "Test"
 #. module: base
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "Felaktig XML för Vyarkitektur!"
+msgstr "Felaktig XML för vyarkitektur."
 
 #. module: base
 #: model:res.country,name:base.ky
@@ -890,7 +890,7 @@ msgstr "Kontrakt"
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (AR) / Español (AR)"
-msgstr "Spanish (AR) / Español (AR)"
+msgstr "Spanska (AR) / Español (AR)"
 
 #. module: base
 #: model:res.country,name:base.ug
@@ -925,8 +925,8 @@ msgid ""
 "Launchpad also allows uploading full .po files at once"
 msgstr ""
 "För att förbättra eller utvidga officiella översättningar så bör du arbeta "
-"direkt mot Launchpad's webgränssnitt (Rosetta). Om du behöver genomföra "
-"massöversättningar så tillåter Launchpad direkt uppladdning av .po filer."
+"direkt mot Launchpads webbgränssnitt (Rosetta). Om du behöver genomföra "
+"massöversättningar så tillåter Launchpad direkt uppladdning av .po-filer."
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -940,8 +940,8 @@ msgid ""
 "decimal number [00,53]. All days in a new year preceding the first Monday "
 "are considered to be in week 0."
 msgstr ""
-"%W - Veckonummer för året (Måndag är veckans första dag) som ett decimaltal "
-"[00,53]. All dagar under det nya året som infaller före den första måndagen "
+"%W - Veckonummer för året (måndag är veckans första dag) som ett decimaltal "
+"[00,53]. Alla dagar under det nya året som infaller före den första måndagen "
 "antas ligga i vecka 0."
 
 #. module: base
@@ -958,7 +958,7 @@ msgstr "S. Georgia & S. Sandwich Isls."
 #. module: base
 #: field:ir.actions.url,url:0
 msgid "Action URL"
-msgstr "Händelse URL"
+msgstr "Händelse-URL"
 
 #. module: base
 #: field:base.module.import,module_name:0
@@ -968,7 +968,7 @@ msgstr "Modulnamn"
 #. module: base
 #: model:res.country,name:base.mh
 msgid "Marshall Islands"
-msgstr "Marshall Islands"
+msgstr "Marshallöarna"
 
 #. module: base
 #: code:addons/base/ir/ir_model.py:328
@@ -1002,8 +1002,8 @@ msgstr ""
 msgid ""
 "2. Group-specific rules are combined together with a logical AND operator"
 msgstr ""
-"2. Gruppspecifika regler är kombinerade tillsammans med en logisk AND  "
-"operand"
+"2. Gruppspecifika regler är kombinerade tillsammans med en logisk AND-"
+"operator"
 
 #. module: base
 #: code:addons/base/res/res_user.py:206
@@ -1034,7 +1034,7 @@ msgstr "Inköp"
 #. module: base
 #: model:res.country,name:base.md
 msgid "Moldavia"
-msgstr "Moldavia"
+msgstr "Moldavien"
 
 #. module: base
 #: view:ir.module.module:0
@@ -1078,14 +1078,14 @@ msgid ""
 "you select the invoice, then `object.invoice_address_id.email` is the field "
 "which gives the correct address"
 msgstr ""
-"Visar vilka fält som skall användas för att hämta epostadresser. Exempel när "
-"du väljer en faktura sä är `object.invoice_address_id.email` fältet som "
-"visar rätt epostadress."
+"Visar vilka fält som skall användas för att hämta e-postadresser. Exempel "
+"när du väljer en faktura så är `object.invoice_address_id.email` fältet som "
+"visar rätt e-postadress."
 
 #. module: base
 #: view:res.lang:0
 msgid "%Y - Year with century."
-msgstr "%Y - Är med århundrade"
+msgstr "%Y - År med århundrade"
 
 #. module: base
 #: report:ir.module.reference.graph:0
@@ -1100,7 +1100,7 @@ msgid ""
 "issues directly to OpenERP."
 msgstr ""
 "Denna guide hjälper dig att registrera ett garantikontrakt från utgivaren i "
-"ditt OpenERP-system. Sedan kontraktet reggistrerats kan du skicka ärenden "
+"ditt OpenERP-system. Sedan kontraktet registrerats kan du skicka ärenden "
 "direkt till utgivaren."
 
 #. module: base
@@ -1229,7 +1229,7 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.tp
 msgid "East Timor"
-msgstr "East Timor"
+msgstr "Östtimor"
 
 #. module: base
 #: model:res.company,follow_up_msg:base.main_company
@@ -1286,7 +1286,7 @@ msgstr "Dagar: %(dag)ar"
 #. module: base
 #: model:res.country,name:base.mv
 msgid "Maldives"
-msgstr "Maldives"
+msgstr "Maldiverna"
 
 #. module: base
 #: help:ir.values,res_id:0
@@ -1340,7 +1340,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:base.res_widget_act_window
 #: model:ir.ui.menu,name:base.menu_res_widget_act_window
 msgid "Homepage Widgets"
-msgstr "Hemside widgets"
+msgstr "Hemside-widgets"
 
 #. module: base
 #: help:ir.actions.server,message:0
@@ -1348,7 +1348,7 @@ msgid ""
 "Specify the message. You can use the fields from the object. e.g. `Dear [[ "
 "object.partner_id.name ]]`"
 msgstr ""
-"Definera meddelandet. Du kan används fält från objektet, t ex 'Bäste [[ "
+"Definera meddelandet. Du kan använda fält från objektet, t ex 'Bäste [[ "
 "object.partner_id.name ]]'"
 
 #. module: base
@@ -1397,7 +1397,7 @@ msgstr "Formel"
 #: code:addons/base/res/res_user.py:389
 #, python-format
 msgid "Can not remove root user!"
-msgstr "Kan inte ta bort root användare!"
+msgstr "Kan inte ta bort root-användare."
 
 #. module: base
 #: model:res.country,name:base.mw
@@ -1433,7 +1433,7 @@ msgid ""
 "decimal number [00,53]. All days in a new year preceding the first Sunday "
 "are considered to be in week 0."
 msgstr ""
-"%U - Årets veckonummer (Söndag är första dagen i veckan) som decimaltal "
+"%U - Årets veckonummer (söndag är första dagen i veckan) som decimaltal "
 "[00,53] Alla dagar som infaller före den första söndagen antas hamna i vecka "
 "0."
 
@@ -1502,7 +1502,7 @@ msgstr "Loggar"
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish / Español"
-msgstr "Spanish / Español"
+msgstr "Spanska / Español"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -1547,7 +1547,7 @@ msgstr "Bahamas"
 #, python-format
 msgid ""
 "Couldn't generate the next id because some partners have an alphabetic id !"
-msgstr "Kan inte skapa nästa id eftersom partnern har ett alfanumeriskt id !"
+msgstr "Kan inte skapa nästa id eftersom partnern har ett alfanumeriskt id."
 
 #. module: base
 #: view:ir.attachment:0
@@ -1557,7 +1557,7 @@ msgstr "Bilaga"
 #. module: base
 #: model:res.country,name:base.ie
 msgid "Ireland"
-msgstr "Ireland"
+msgstr "Irland"
 
 #. module: base
 #: field:base.module.update,update:0
@@ -1568,7 +1568,7 @@ msgstr "Antal uppdaterade moduler"
 #: code:addons/fields.py:100
 #, python-format
 msgid "Not implemented set_memory method !"
-msgstr "Ej implementerad set_memory metod!"
+msgstr "Ej implementerad set_memory metod."
 
 #. module: base
 #: view:workflow.activity:0
@@ -1651,7 +1651,7 @@ msgid ""
 "Comma-separated list of allowed view modes, such as 'form', 'tree', "
 "'calendar', etc. (Default: tree,form)"
 msgstr ""
-"Komma-separerad list över godkända vymoder som t ex 'form', 'tree', "
+"Komma-separerad lista över godkända vymoder som t ex 'form', 'tree', "
 "'calendar', etc. (Standard: tree,form)"
 
 #. module: base
@@ -1683,7 +1683,7 @@ msgid ""
 "order in Object, and you can have loop on the sales order line. Expression = "
 "`object.order_line`."
 msgstr ""
-"Skriv in de fält/uttryck som returnernar listan. Välj t ex 'sälj order' i "
+"Skriv in de fält/uttryck som returnernar listan. Välj t ex 'säljorder' i "
 "'Object', och du kan loopa över säljordrar. Uttryck är av formen "
 "object.order_line."
 
@@ -1742,7 +1742,7 @@ msgstr "Madagaskar"
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
-"Objektnamnet måste börja med x_ och får inte innehålla några specialtecken!"
+"Objektnamnet måste börja med x_ och får inte innehålla några specialtecken."
 
 #. module: base
 #: field:ir.actions.configuration.wizard,note:0
@@ -1764,7 +1764,7 @@ msgstr "Aktuell kurs"
 #. module: base
 #: field:ir.ui.view.custom,ref_id:0
 msgid "Original View"
-msgstr "Orginalvy"
+msgstr "Originalvy"
 
 #. module: base
 #: view:ir.values:0
@@ -1938,7 +1938,7 @@ msgstr "Meddelanden"
 #: code:addons/base/module/wizard/base_update_translations.py:38
 #, python-format
 msgid "Error!"
-msgstr "Fel!"
+msgstr "Fel"
 
 #. module: base
 #: view:res.lang:0
@@ -1948,7 +1948,7 @@ msgstr "%p - Lika med antingen FM eller EM,"
 #. module: base
 #: view:ir.actions.server:0
 msgid "Iteration Actions"
-msgstr "Ternationshändelser"
+msgstr "Upprepande händelser"
 
 #. module: base
 #: help:multi_company.default,company_id:0
@@ -2141,7 +2141,7 @@ msgstr "Kalender"
 #. module: base
 #: field:res.partner.address,partner_id:0
 msgid "Partner Name"
-msgstr "Partner namn"
+msgstr "Partnernamn"
 
 #. module: base
 #: field:workflow.activity,signal_send:0
@@ -2151,7 +2151,7 @@ msgstr "Signal (subflow.*)"
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_17
 msgid "HR sector"
-msgstr "Personalsektorn"
+msgstr "Personalsektor"
 
 #. module: base
 #: code:addons/orm.py:3817
@@ -2179,7 +2179,7 @@ msgstr "Utkast"
 #: selection:res.config.view,view:0
 #: selection:res.users,view:0
 msgid "Extended"
-msgstr "Utökat"
+msgstr "Utökad"
 
 #. module: base
 #: model:ir.actions.act_window,help:base.action_partner_title_contact
@@ -2303,7 +2303,7 @@ msgstr "Tyska/Deutsch"
 #. module: base
 #: help:ir.actions.server,trigger_name:0
 msgid "Select the Signal name that is to be used as the trigger."
-msgstr "Välj den Signal som skall användas som trigger"
+msgstr "Välj den signal som skall användas som trigger"
 
 #. module: base
 #: view:ir.actions.server:0
@@ -2324,7 +2324,7 @@ msgstr "Herr"
 #: code:addons/orm.py:1622
 #, python-format
 msgid "There is no view of type '%s' defined for the structure!"
-msgstr "Det finns ingen vy av typ %s definierar för denna struktur!"
+msgstr "Det finns ingen vy av typ %s definierad för denna struktur."
 
 #. module: base
 #: field:ir.default,ref_id:0

From 66a14cfc0dd90acbcdba800e9f85e854c34939f3 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Thu, 28 Apr 2011 15:50:45 +0200
Subject: [PATCH 328/331] [IMP] Added conversion functions for dates in
 javascript.

bzr revid: nicolas.vanhoren@openerp.com-20110428135045-ub5zuomewzjyob01
---
 addons/base/static/lib/datejs/date-en-US.js | 145 ++++++++++++++++++++
 addons/base/static/src/base.html            |   2 +
 addons/base/static/src/js/base.js           |   1 +
 addons/base/static/src/js/dates.js          |  89 ++++++++++++
 addons/base/static/test/dates.js            |   1 +
 addons/base/static/test/test.html           |   1 +
 openerpweb/openerpweb.py                    |   5 +-
 7 files changed, 242 insertions(+), 2 deletions(-)
 create mode 100644 addons/base/static/lib/datejs/date-en-US.js
 create mode 100644 addons/base/static/src/js/dates.js
 create mode 100644 addons/base/static/test/dates.js

diff --git a/addons/base/static/lib/datejs/date-en-US.js b/addons/base/static/lib/datejs/date-en-US.js
new file mode 100644
index 00000000000..59005e2097a
--- /dev/null
+++ b/addons/base/static/lib/datejs/date-en-US.js
@@ -0,0 +1,145 @@
+/**
+ * @version: 1.0 Alpha-1
+ * @author: Coolite Inc. http://www.coolite.com/
+ * @date: 2008-05-13
+ * @copyright: Copyright (c) 2006-2008, Coolite Inc. (http://www.coolite.com/). All rights reserved.
+ * @license: Licensed under The MIT License. See license.txt and http://www.datejs.com/license/. 
+ * @website: http://www.datejs.com/
+ */
+Date.CultureInfo={name:"en-US",englishName:"English (United States)",nativeName:"English (United States)",dayNames:["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],abbreviatedDayNames:["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],shortestDayNames:["Su","Mo","Tu","We","Th","Fr","Sa"],firstLetterDayNames:["S","M","T","W","T","F","S"],monthNames:["January","February","March","April","May","June","July","August","September","October","November","December"],abbreviatedMonthNames:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],amDesignator:"AM",pmDesignator:"PM",firstDayOfWeek:0,twoDigitYearMax:2029,dateElementOrder:"mdy",formatPatterns:{shortDate:"M/d/yyyy",longDate:"dddd, MMMM dd, yyyy",shortTime:"h:mm tt",longTime:"h:mm:ss tt",fullDateTime:"dddd, MMMM dd, yyyy h:mm:ss tt",sortableDateTime:"yyyy-MM-ddTHH:mm:ss",universalSortableDateTime:"yyyy-MM-dd HH:mm:ssZ",rfc1123:"ddd, dd MMM yyyy HH:mm:ss GMT",monthDay:"MMMM dd",yearMonth:"MMMM, yyyy"},regexPatterns:{jan:/^jan(uary)?/i,feb:/^feb(ruary)?/i,mar:/^mar(ch)?/i,apr:/^apr(il)?/i,may:/^may/i,jun:/^jun(e)?/i,jul:/^jul(y)?/i,aug:/^aug(ust)?/i,sep:/^sep(t(ember)?)?/i,oct:/^oct(ober)?/i,nov:/^nov(ember)?/i,dec:/^dec(ember)?/i,sun:/^su(n(day)?)?/i,mon:/^mo(n(day)?)?/i,tue:/^tu(e(s(day)?)?)?/i,wed:/^we(d(nesday)?)?/i,thu:/^th(u(r(s(day)?)?)?)?/i,fri:/^fr(i(day)?)?/i,sat:/^sa(t(urday)?)?/i,future:/^next/i,past:/^last|past|prev(ious)?/i,add:/^(\+|aft(er)?|from|hence)/i,subtract:/^(\-|bef(ore)?|ago)/i,yesterday:/^yes(terday)?/i,today:/^t(od(ay)?)?/i,tomorrow:/^tom(orrow)?/i,now:/^n(ow)?/i,millisecond:/^ms|milli(second)?s?/i,second:/^sec(ond)?s?/i,minute:/^mn|min(ute)?s?/i,hour:/^h(our)?s?/i,week:/^w(eek)?s?/i,month:/^m(onth)?s?/i,day:/^d(ay)?s?/i,year:/^y(ear)?s?/i,shortMeridian:/^(a|p)/i,longMeridian:/^(a\.?m?\.?|p\.?m?\.?)/i,timezone:/^((e(s|d)t|c(s|d)t|m(s|d)t|p(s|d)t)|((gmt)?\s*(\+|\-)\s*\d\d\d\d?)|gmt|utc)/i,ordinalSuffix:/^\s*(st|nd|rd|th)/i,timeContext:/^\s*(\:|a(?!u|p)|p)/i},timezones:[{name:"UTC",offset:"-000"},{name:"GMT",offset:"-000"},{name:"EST",offset:"-0500"},{name:"EDT",offset:"-0400"},{name:"CST",offset:"-0600"},{name:"CDT",offset:"-0500"},{name:"MST",offset:"-0700"},{name:"MDT",offset:"-0600"},{name:"PST",offset:"-0800"},{name:"PDT",offset:"-0700"}]};
+(function(){var $D=Date,$P=$D.prototype,$C=$D.CultureInfo,p=function(s,l){if(!l){l=2;}
+return("000"+s).slice(l*-1);};$P.clearTime=function(){this.setHours(0);this.setMinutes(0);this.setSeconds(0);this.setMilliseconds(0);return this;};$P.setTimeToNow=function(){var n=new Date();this.setHours(n.getHours());this.setMinutes(n.getMinutes());this.setSeconds(n.getSeconds());this.setMilliseconds(n.getMilliseconds());return this;};$D.today=function(){return new Date().clearTime();};$D.compare=function(date1,date2){if(isNaN(date1)||isNaN(date2)){throw new Error(date1+" - "+date2);}else if(date1 instanceof Date&&date2 instanceof Date){return(date1<date2)?-1:(date1>date2)?1:0;}else{throw new TypeError(date1+" - "+date2);}};$D.equals=function(date1,date2){return(date1.compareTo(date2)===0);};$D.getDayNumberFromName=function(name){var n=$C.dayNames,m=$C.abbreviatedDayNames,o=$C.shortestDayNames,s=name.toLowerCase();for(var i=0;i<n.length;i++){if(n[i].toLowerCase()==s||m[i].toLowerCase()==s||o[i].toLowerCase()==s){return i;}}
+return-1;};$D.getMonthNumberFromName=function(name){var n=$C.monthNames,m=$C.abbreviatedMonthNames,s=name.toLowerCase();for(var i=0;i<n.length;i++){if(n[i].toLowerCase()==s||m[i].toLowerCase()==s){return i;}}
+return-1;};$D.isLeapYear=function(year){return((year%4===0&&year%100!==0)||year%400===0);};$D.getDaysInMonth=function(year,month){return[31,($D.isLeapYear(year)?29:28),31,30,31,30,31,31,30,31,30,31][month];};$D.getTimezoneAbbreviation=function(offset){var z=$C.timezones,p;for(var i=0;i<z.length;i++){if(z[i].offset===offset){return z[i].name;}}
+return null;};$D.getTimezoneOffset=function(name){var z=$C.timezones,p;for(var i=0;i<z.length;i++){if(z[i].name===name.toUpperCase()){return z[i].offset;}}
+return null;};$P.clone=function(){return new Date(this.getTime());};$P.compareTo=function(date){return Date.compare(this,date);};$P.equals=function(date){return Date.equals(this,date||new Date());};$P.between=function(start,end){return this.getTime()>=start.getTime()&&this.getTime()<=end.getTime();};$P.isAfter=function(date){return this.compareTo(date||new Date())===1;};$P.isBefore=function(date){return(this.compareTo(date||new Date())===-1);};$P.isToday=function(){return this.isSameDay(new Date());};$P.isSameDay=function(date){return this.clone().clearTime().equals(date.clone().clearTime());};$P.addMilliseconds=function(value){this.setMilliseconds(this.getMilliseconds()+value);return this;};$P.addSeconds=function(value){return this.addMilliseconds(value*1000);};$P.addMinutes=function(value){return this.addMilliseconds(value*60000);};$P.addHours=function(value){return this.addMilliseconds(value*3600000);};$P.addDays=function(value){this.setDate(this.getDate()+value);return this;};$P.addWeeks=function(value){return this.addDays(value*7);};$P.addMonths=function(value){var n=this.getDate();this.setDate(1);this.setMonth(this.getMonth()+value);this.setDate(Math.min(n,$D.getDaysInMonth(this.getFullYear(),this.getMonth())));return this;};$P.addYears=function(value){return this.addMonths(value*12);};$P.add=function(config){if(typeof config=="number"){this._orient=config;return this;}
+var x=config;if(x.milliseconds){this.addMilliseconds(x.milliseconds);}
+if(x.seconds){this.addSeconds(x.seconds);}
+if(x.minutes){this.addMinutes(x.minutes);}
+if(x.hours){this.addHours(x.hours);}
+if(x.weeks){this.addWeeks(x.weeks);}
+if(x.months){this.addMonths(x.months);}
+if(x.years){this.addYears(x.years);}
+if(x.days){this.addDays(x.days);}
+return this;};var $y,$m,$d;$P.getWeek=function(){var a,b,c,d,e,f,g,n,s,w;$y=(!$y)?this.getFullYear():$y;$m=(!$m)?this.getMonth()+1:$m;$d=(!$d)?this.getDate():$d;if($m<=2){a=$y-1;b=(a/4|0)-(a/100|0)+(a/400|0);c=((a-1)/4|0)-((a-1)/100|0)+((a-1)/400|0);s=b-c;e=0;f=$d-1+(31*($m-1));}else{a=$y;b=(a/4|0)-(a/100|0)+(a/400|0);c=((a-1)/4|0)-((a-1)/100|0)+((a-1)/400|0);s=b-c;e=s+1;f=$d+((153*($m-3)+2)/5)+58+s;}
+g=(a+b)%7;d=(f+g-e)%7;n=(f+3-d)|0;if(n<0){w=53-((g-s)/5|0);}else if(n>364+s){w=1;}else{w=(n/7|0)+1;}
+$y=$m=$d=null;return w;};$P.getISOWeek=function(){$y=this.getUTCFullYear();$m=this.getUTCMonth()+1;$d=this.getUTCDate();return p(this.getWeek());};$P.setWeek=function(n){return this.moveToDayOfWeek(1).addWeeks(n-this.getWeek());};$D._validate=function(n,min,max,name){if(typeof n=="undefined"){return false;}else if(typeof n!="number"){throw new TypeError(n+" is not a Number.");}else if(n<min||n>max){throw new RangeError(n+" is not a valid value for "+name+".");}
+return true;};$D.validateMillisecond=function(value){return $D._validate(value,0,999,"millisecond");};$D.validateSecond=function(value){return $D._validate(value,0,59,"second");};$D.validateMinute=function(value){return $D._validate(value,0,59,"minute");};$D.validateHour=function(value){return $D._validate(value,0,23,"hour");};$D.validateDay=function(value,year,month){return $D._validate(value,1,$D.getDaysInMonth(year,month),"day");};$D.validateMonth=function(value){return $D._validate(value,0,11,"month");};$D.validateYear=function(value){return $D._validate(value,0,9999,"year");};$P.set=function(config){if($D.validateMillisecond(config.millisecond)){this.addMilliseconds(config.millisecond-this.getMilliseconds());}
+if($D.validateSecond(config.second)){this.addSeconds(config.second-this.getSeconds());}
+if($D.validateMinute(config.minute)){this.addMinutes(config.minute-this.getMinutes());}
+if($D.validateHour(config.hour)){this.addHours(config.hour-this.getHours());}
+if($D.validateMonth(config.month)){this.addMonths(config.month-this.getMonth());}
+if($D.validateYear(config.year)){this.addYears(config.year-this.getFullYear());}
+if($D.validateDay(config.day,this.getFullYear(),this.getMonth())){this.addDays(config.day-this.getDate());}
+if(config.timezone){this.setTimezone(config.timezone);}
+if(config.timezoneOffset){this.setTimezoneOffset(config.timezoneOffset);}
+if(config.week&&$D._validate(config.week,0,53,"week")){this.setWeek(config.week);}
+return this;};$P.moveToFirstDayOfMonth=function(){return this.set({day:1});};$P.moveToLastDayOfMonth=function(){return this.set({day:$D.getDaysInMonth(this.getFullYear(),this.getMonth())});};$P.moveToNthOccurrence=function(dayOfWeek,occurrence){var shift=0;if(occurrence>0){shift=occurrence-1;}
+else if(occurrence===-1){this.moveToLastDayOfMonth();if(this.getDay()!==dayOfWeek){this.moveToDayOfWeek(dayOfWeek,-1);}
+return this;}
+return this.moveToFirstDayOfMonth().addDays(-1).moveToDayOfWeek(dayOfWeek,+1).addWeeks(shift);};$P.moveToDayOfWeek=function(dayOfWeek,orient){var diff=(dayOfWeek-this.getDay()+7*(orient||+1))%7;return this.addDays((diff===0)?diff+=7*(orient||+1):diff);};$P.moveToMonth=function(month,orient){var diff=(month-this.getMonth()+12*(orient||+1))%12;return this.addMonths((diff===0)?diff+=12*(orient||+1):diff);};$P.getOrdinalNumber=function(){return Math.ceil((this.clone().clearTime()-new Date(this.getFullYear(),0,1))/86400000)+1;};$P.getTimezone=function(){return $D.getTimezoneAbbreviation(this.getUTCOffset());};$P.setTimezoneOffset=function(offset){var here=this.getTimezoneOffset(),there=Number(offset)*-6/10;return this.addMinutes(there-here);};$P.setTimezone=function(offset){return this.setTimezoneOffset($D.getTimezoneOffset(offset));};$P.hasDaylightSavingTime=function(){return(Date.today().set({month:0,day:1}).getTimezoneOffset()!==Date.today().set({month:6,day:1}).getTimezoneOffset());};$P.isDaylightSavingTime=function(){return(this.hasDaylightSavingTime()&&new Date().getTimezoneOffset()===Date.today().set({month:6,day:1}).getTimezoneOffset());};$P.getUTCOffset=function(){var n=this.getTimezoneOffset()*-10/6,r;if(n<0){r=(n-10000).toString();return r.charAt(0)+r.substr(2);}else{r=(n+10000).toString();return"+"+r.substr(1);}};$P.getElapsed=function(date){return(date||new Date())-this;};if(!$P.toISOString){$P.toISOString=function(){function f(n){return n<10?'0'+n:n;}
+return'"'+this.getUTCFullYear()+'-'+
+f(this.getUTCMonth()+1)+'-'+
+f(this.getUTCDate())+'T'+
+f(this.getUTCHours())+':'+
+f(this.getUTCMinutes())+':'+
+f(this.getUTCSeconds())+'Z"';};}
+$P._toString=$P.toString;$P.toString=function(format){var x=this;if(format&&format.length==1){var c=$C.formatPatterns;x.t=x.toString;switch(format){case"d":return x.t(c.shortDate);case"D":return x.t(c.longDate);case"F":return x.t(c.fullDateTime);case"m":return x.t(c.monthDay);case"r":return x.t(c.rfc1123);case"s":return x.t(c.sortableDateTime);case"t":return x.t(c.shortTime);case"T":return x.t(c.longTime);case"u":return x.t(c.universalSortableDateTime);case"y":return x.t(c.yearMonth);}}
+var ord=function(n){switch(n*1){case 1:case 21:case 31:return"st";case 2:case 22:return"nd";case 3:case 23:return"rd";default:return"th";}};return format?format.replace(/(\\)?(dd?d?d?|MM?M?M?|yy?y?y?|hh?|HH?|mm?|ss?|tt?|S)/g,function(m){if(m.charAt(0)==="\\"){return m.replace("\\","");}
+x.h=x.getHours;switch(m){case"hh":return p(x.h()<13?(x.h()===0?12:x.h()):(x.h()-12));case"h":return x.h()<13?(x.h()===0?12:x.h()):(x.h()-12);case"HH":return p(x.h());case"H":return x.h();case"mm":return p(x.getMinutes());case"m":return x.getMinutes();case"ss":return p(x.getSeconds());case"s":return x.getSeconds();case"yyyy":return p(x.getFullYear(),4);case"yy":return p(x.getFullYear());case"dddd":return $C.dayNames[x.getDay()];case"ddd":return $C.abbreviatedDayNames[x.getDay()];case"dd":return p(x.getDate());case"d":return x.getDate();case"MMMM":return $C.monthNames[x.getMonth()];case"MMM":return $C.abbreviatedMonthNames[x.getMonth()];case"MM":return p((x.getMonth()+1));case"M":return x.getMonth()+1;case"t":return x.h()<12?$C.amDesignator.substring(0,1):$C.pmDesignator.substring(0,1);case"tt":return x.h()<12?$C.amDesignator:$C.pmDesignator;case"S":return ord(x.getDate());default:return m;}}):this._toString();};}());
+(function(){var $D=Date,$P=$D.prototype,$C=$D.CultureInfo,$N=Number.prototype;$P._orient=+1;$P._nth=null;$P._is=false;$P._same=false;$P._isSecond=false;$N._dateElement="day";$P.next=function(){this._orient=+1;return this;};$D.next=function(){return $D.today().next();};$P.last=$P.prev=$P.previous=function(){this._orient=-1;return this;};$D.last=$D.prev=$D.previous=function(){return $D.today().last();};$P.is=function(){this._is=true;return this;};$P.same=function(){this._same=true;this._isSecond=false;return this;};$P.today=function(){return this.same().day();};$P.weekday=function(){if(this._is){this._is=false;return(!this.is().sat()&&!this.is().sun());}
+return false;};$P.at=function(time){return(typeof time==="string")?$D.parse(this.toString("d")+" "+time):this.set(time);};$N.fromNow=$N.after=function(date){var c={};c[this._dateElement]=this;return((!date)?new Date():date.clone()).add(c);};$N.ago=$N.before=function(date){var c={};c[this._dateElement]=this*-1;return((!date)?new Date():date.clone()).add(c);};var dx=("sunday monday tuesday wednesday thursday friday saturday").split(/\s/),mx=("january february march april may june july august september october november december").split(/\s/),px=("Millisecond Second Minute Hour Day Week Month Year").split(/\s/),pxf=("Milliseconds Seconds Minutes Hours Date Week Month FullYear").split(/\s/),nth=("final first second third fourth fifth").split(/\s/),de;$P.toObject=function(){var o={};for(var i=0;i<px.length;i++){o[px[i].toLowerCase()]=this["get"+pxf[i]]();}
+return o;};$D.fromObject=function(config){config.week=null;return Date.today().set(config);};var df=function(n){return function(){if(this._is){this._is=false;return this.getDay()==n;}
+if(this._nth!==null){if(this._isSecond){this.addSeconds(this._orient*-1);}
+this._isSecond=false;var ntemp=this._nth;this._nth=null;var temp=this.clone().moveToLastDayOfMonth();this.moveToNthOccurrence(n,ntemp);if(this>temp){throw new RangeError($D.getDayName(n)+" does not occur "+ntemp+" times in the month of "+$D.getMonthName(temp.getMonth())+" "+temp.getFullYear()+".");}
+return this;}
+return this.moveToDayOfWeek(n,this._orient);};};var sdf=function(n){return function(){var t=$D.today(),shift=n-t.getDay();if(n===0&&$C.firstDayOfWeek===1&&t.getDay()!==0){shift=shift+7;}
+return t.addDays(shift);};};for(var i=0;i<dx.length;i++){$D[dx[i].toUpperCase()]=$D[dx[i].toUpperCase().substring(0,3)]=i;$D[dx[i]]=$D[dx[i].substring(0,3)]=sdf(i);$P[dx[i]]=$P[dx[i].substring(0,3)]=df(i);}
+var mf=function(n){return function(){if(this._is){this._is=false;return this.getMonth()===n;}
+return this.moveToMonth(n,this._orient);};};var smf=function(n){return function(){return $D.today().set({month:n,day:1});};};for(var j=0;j<mx.length;j++){$D[mx[j].toUpperCase()]=$D[mx[j].toUpperCase().substring(0,3)]=j;$D[mx[j]]=$D[mx[j].substring(0,3)]=smf(j);$P[mx[j]]=$P[mx[j].substring(0,3)]=mf(j);}
+var ef=function(j){return function(){if(this._isSecond){this._isSecond=false;return this;}
+if(this._same){this._same=this._is=false;var o1=this.toObject(),o2=(arguments[0]||new Date()).toObject(),v="",k=j.toLowerCase();for(var m=(px.length-1);m>-1;m--){v=px[m].toLowerCase();if(o1[v]!=o2[v]){return false;}
+if(k==v){break;}}
+return true;}
+if(j.substring(j.length-1)!="s"){j+="s";}
+return this["add"+j](this._orient);};};var nf=function(n){return function(){this._dateElement=n;return this;};};for(var k=0;k<px.length;k++){de=px[k].toLowerCase();$P[de]=$P[de+"s"]=ef(px[k]);$N[de]=$N[de+"s"]=nf(de);}
+$P._ss=ef("Second");var nthfn=function(n){return function(dayOfWeek){if(this._same){return this._ss(arguments[0]);}
+if(dayOfWeek||dayOfWeek===0){return this.moveToNthOccurrence(dayOfWeek,n);}
+this._nth=n;if(n===2&&(dayOfWeek===undefined||dayOfWeek===null)){this._isSecond=true;return this.addSeconds(this._orient);}
+return this;};};for(var l=0;l<nth.length;l++){$P[nth[l]]=(l===0)?nthfn(-1):nthfn(l);}}());
+(function(){Date.Parsing={Exception:function(s){this.message="Parse error at '"+s.substring(0,10)+" ...'";}};var $P=Date.Parsing;var _=$P.Operators={rtoken:function(r){return function(s){var mx=s.match(r);if(mx){return([mx[0],s.substring(mx[0].length)]);}else{throw new $P.Exception(s);}};},token:function(s){return function(s){return _.rtoken(new RegExp("^\s*"+s+"\s*"))(s);};},stoken:function(s){return _.rtoken(new RegExp("^"+s));},until:function(p){return function(s){var qx=[],rx=null;while(s.length){try{rx=p.call(this,s);}catch(e){qx.push(rx[0]);s=rx[1];continue;}
+break;}
+return[qx,s];};},many:function(p){return function(s){var rx=[],r=null;while(s.length){try{r=p.call(this,s);}catch(e){return[rx,s];}
+rx.push(r[0]);s=r[1];}
+return[rx,s];};},optional:function(p){return function(s){var r=null;try{r=p.call(this,s);}catch(e){return[null,s];}
+return[r[0],r[1]];};},not:function(p){return function(s){try{p.call(this,s);}catch(e){return[null,s];}
+throw new $P.Exception(s);};},ignore:function(p){return p?function(s){var r=null;r=p.call(this,s);return[null,r[1]];}:null;},product:function(){var px=arguments[0],qx=Array.prototype.slice.call(arguments,1),rx=[];for(var i=0;i<px.length;i++){rx.push(_.each(px[i],qx));}
+return rx;},cache:function(rule){var cache={},r=null;return function(s){try{r=cache[s]=(cache[s]||rule.call(this,s));}catch(e){r=cache[s]=e;}
+if(r instanceof $P.Exception){throw r;}else{return r;}};},any:function(){var px=arguments;return function(s){var r=null;for(var i=0;i<px.length;i++){if(px[i]==null){continue;}
+try{r=(px[i].call(this,s));}catch(e){r=null;}
+if(r){return r;}}
+throw new $P.Exception(s);};},each:function(){var px=arguments;return function(s){var rx=[],r=null;for(var i=0;i<px.length;i++){if(px[i]==null){continue;}
+try{r=(px[i].call(this,s));}catch(e){throw new $P.Exception(s);}
+rx.push(r[0]);s=r[1];}
+return[rx,s];};},all:function(){var px=arguments,_=_;return _.each(_.optional(px));},sequence:function(px,d,c){d=d||_.rtoken(/^\s*/);c=c||null;if(px.length==1){return px[0];}
+return function(s){var r=null,q=null;var rx=[];for(var i=0;i<px.length;i++){try{r=px[i].call(this,s);}catch(e){break;}
+rx.push(r[0]);try{q=d.call(this,r[1]);}catch(ex){q=null;break;}
+s=q[1];}
+if(!r){throw new $P.Exception(s);}
+if(q){throw new $P.Exception(q[1]);}
+if(c){try{r=c.call(this,r[1]);}catch(ey){throw new $P.Exception(r[1]);}}
+return[rx,(r?r[1]:s)];};},between:function(d1,p,d2){d2=d2||d1;var _fn=_.each(_.ignore(d1),p,_.ignore(d2));return function(s){var rx=_fn.call(this,s);return[[rx[0][0],r[0][2]],rx[1]];};},list:function(p,d,c){d=d||_.rtoken(/^\s*/);c=c||null;return(p instanceof Array?_.each(_.product(p.slice(0,-1),_.ignore(d)),p.slice(-1),_.ignore(c)):_.each(_.many(_.each(p,_.ignore(d))),px,_.ignore(c)));},set:function(px,d,c){d=d||_.rtoken(/^\s*/);c=c||null;return function(s){var r=null,p=null,q=null,rx=null,best=[[],s],last=false;for(var i=0;i<px.length;i++){q=null;p=null;r=null;last=(px.length==1);try{r=px[i].call(this,s);}catch(e){continue;}
+rx=[[r[0]],r[1]];if(r[1].length>0&&!last){try{q=d.call(this,r[1]);}catch(ex){last=true;}}else{last=true;}
+if(!last&&q[1].length===0){last=true;}
+if(!last){var qx=[];for(var j=0;j<px.length;j++){if(i!=j){qx.push(px[j]);}}
+p=_.set(qx,d).call(this,q[1]);if(p[0].length>0){rx[0]=rx[0].concat(p[0]);rx[1]=p[1];}}
+if(rx[1].length<best[1].length){best=rx;}
+if(best[1].length===0){break;}}
+if(best[0].length===0){return best;}
+if(c){try{q=c.call(this,best[1]);}catch(ey){throw new $P.Exception(best[1]);}
+best[1]=q[1];}
+return best;};},forward:function(gr,fname){return function(s){return gr[fname].call(this,s);};},replace:function(rule,repl){return function(s){var r=rule.call(this,s);return[repl,r[1]];};},process:function(rule,fn){return function(s){var r=rule.call(this,s);return[fn.call(this,r[0]),r[1]];};},min:function(min,rule){return function(s){var rx=rule.call(this,s);if(rx[0].length<min){throw new $P.Exception(s);}
+return rx;};}};var _generator=function(op){return function(){var args=null,rx=[];if(arguments.length>1){args=Array.prototype.slice.call(arguments);}else if(arguments[0]instanceof Array){args=arguments[0];}
+if(args){for(var i=0,px=args.shift();i<px.length;i++){args.unshift(px[i]);rx.push(op.apply(null,args));args.shift();return rx;}}else{return op.apply(null,arguments);}};};var gx="optional not ignore cache".split(/\s/);for(var i=0;i<gx.length;i++){_[gx[i]]=_generator(_[gx[i]]);}
+var _vector=function(op){return function(){if(arguments[0]instanceof Array){return op.apply(null,arguments[0]);}else{return op.apply(null,arguments);}};};var vx="each any all".split(/\s/);for(var j=0;j<vx.length;j++){_[vx[j]]=_vector(_[vx[j]]);}}());(function(){var $D=Date,$P=$D.prototype,$C=$D.CultureInfo;var flattenAndCompact=function(ax){var rx=[];for(var i=0;i<ax.length;i++){if(ax[i]instanceof Array){rx=rx.concat(flattenAndCompact(ax[i]));}else{if(ax[i]){rx.push(ax[i]);}}}
+return rx;};$D.Grammar={};$D.Translator={hour:function(s){return function(){this.hour=Number(s);};},minute:function(s){return function(){this.minute=Number(s);};},second:function(s){return function(){this.second=Number(s);};},meridian:function(s){return function(){this.meridian=s.slice(0,1).toLowerCase();};},timezone:function(s){return function(){var n=s.replace(/[^\d\+\-]/g,"");if(n.length){this.timezoneOffset=Number(n);}else{this.timezone=s.toLowerCase();}};},day:function(x){var s=x[0];return function(){this.day=Number(s.match(/\d+/)[0]);};},month:function(s){return function(){this.month=(s.length==3)?"jan feb mar apr may jun jul aug sep oct nov dec".indexOf(s)/4:Number(s)-1;};},year:function(s){return function(){var n=Number(s);this.year=((s.length>2)?n:(n+(((n+2000)<$C.twoDigitYearMax)?2000:1900)));};},rday:function(s){return function(){switch(s){case"yesterday":this.days=-1;break;case"tomorrow":this.days=1;break;case"today":this.days=0;break;case"now":this.days=0;this.now=true;break;}};},finishExact:function(x){x=(x instanceof Array)?x:[x];for(var i=0;i<x.length;i++){if(x[i]){x[i].call(this);}}
+var now=new Date();if((this.hour||this.minute)&&(!this.month&&!this.year&&!this.day)){this.day=now.getDate();}
+if(!this.year){this.year=now.getFullYear();}
+if(!this.month&&this.month!==0){this.month=now.getMonth();}
+if(!this.day){this.day=1;}
+if(!this.hour){this.hour=0;}
+if(!this.minute){this.minute=0;}
+if(!this.second){this.second=0;}
+if(this.meridian&&this.hour){if(this.meridian=="p"&&this.hour<12){this.hour=this.hour+12;}else if(this.meridian=="a"&&this.hour==12){this.hour=0;}}
+if(this.day>$D.getDaysInMonth(this.year,this.month)){throw new RangeError(this.day+" is not a valid value for days.");}
+var r=new Date(this.year,this.month,this.day,this.hour,this.minute,this.second);if(this.timezone){r.set({timezone:this.timezone});}else if(this.timezoneOffset){r.set({timezoneOffset:this.timezoneOffset});}
+return r;},finish:function(x){x=(x instanceof Array)?flattenAndCompact(x):[x];if(x.length===0){return null;}
+for(var i=0;i<x.length;i++){if(typeof x[i]=="function"){x[i].call(this);}}
+var today=$D.today();if(this.now&&!this.unit&&!this.operator){return new Date();}else if(this.now){today=new Date();}
+var expression=!!(this.days&&this.days!==null||this.orient||this.operator);var gap,mod,orient;orient=((this.orient=="past"||this.operator=="subtract")?-1:1);if(!this.now&&"hour minute second".indexOf(this.unit)!=-1){today.setTimeToNow();}
+if(this.month||this.month===0){if("year day hour minute second".indexOf(this.unit)!=-1){this.value=this.month+1;this.month=null;expression=true;}}
+if(!expression&&this.weekday&&!this.day&&!this.days){var temp=Date[this.weekday]();this.day=temp.getDate();if(!this.month){this.month=temp.getMonth();}
+this.year=temp.getFullYear();}
+if(expression&&this.weekday&&this.unit!="month"){this.unit="day";gap=($D.getDayNumberFromName(this.weekday)-today.getDay());mod=7;this.days=gap?((gap+(orient*mod))%mod):(orient*mod);}
+if(this.month&&this.unit=="day"&&this.operator){this.value=(this.month+1);this.month=null;}
+if(this.value!=null&&this.month!=null&&this.year!=null){this.day=this.value*1;}
+if(this.month&&!this.day&&this.value){today.set({day:this.value*1});if(!expression){this.day=this.value*1;}}
+if(!this.month&&this.value&&this.unit=="month"&&!this.now){this.month=this.value;expression=true;}
+if(expression&&(this.month||this.month===0)&&this.unit!="year"){this.unit="month";gap=(this.month-today.getMonth());mod=12;this.months=gap?((gap+(orient*mod))%mod):(orient*mod);this.month=null;}
+if(!this.unit){this.unit="day";}
+if(!this.value&&this.operator&&this.operator!==null&&this[this.unit+"s"]&&this[this.unit+"s"]!==null){this[this.unit+"s"]=this[this.unit+"s"]+((this.operator=="add")?1:-1)+(this.value||0)*orient;}else if(this[this.unit+"s"]==null||this.operator!=null){if(!this.value){this.value=1;}
+this[this.unit+"s"]=this.value*orient;}
+if(this.meridian&&this.hour){if(this.meridian=="p"&&this.hour<12){this.hour=this.hour+12;}else if(this.meridian=="a"&&this.hour==12){this.hour=0;}}
+if(this.weekday&&!this.day&&!this.days){var temp=Date[this.weekday]();this.day=temp.getDate();if(temp.getMonth()!==today.getMonth()){this.month=temp.getMonth();}}
+if((this.month||this.month===0)&&!this.day){this.day=1;}
+if(!this.orient&&!this.operator&&this.unit=="week"&&this.value&&!this.day&&!this.month){return Date.today().setWeek(this.value);}
+if(expression&&this.timezone&&this.day&&this.days){this.day=this.days;}
+return(expression)?today.add(this):today.set(this);}};var _=$D.Parsing.Operators,g=$D.Grammar,t=$D.Translator,_fn;g.datePartDelimiter=_.rtoken(/^([\s\-\.\,\/\x27]+)/);g.timePartDelimiter=_.stoken(":");g.whiteSpace=_.rtoken(/^\s*/);g.generalDelimiter=_.rtoken(/^(([\s\,]|at|@|on)+)/);var _C={};g.ctoken=function(keys){var fn=_C[keys];if(!fn){var c=$C.regexPatterns;var kx=keys.split(/\s+/),px=[];for(var i=0;i<kx.length;i++){px.push(_.replace(_.rtoken(c[kx[i]]),kx[i]));}
+fn=_C[keys]=_.any.apply(null,px);}
+return fn;};g.ctoken2=function(key){return _.rtoken($C.regexPatterns[key]);};g.h=_.cache(_.process(_.rtoken(/^(0[0-9]|1[0-2]|[1-9])/),t.hour));g.hh=_.cache(_.process(_.rtoken(/^(0[0-9]|1[0-2])/),t.hour));g.H=_.cache(_.process(_.rtoken(/^([0-1][0-9]|2[0-3]|[0-9])/),t.hour));g.HH=_.cache(_.process(_.rtoken(/^([0-1][0-9]|2[0-3])/),t.hour));g.m=_.cache(_.process(_.rtoken(/^([0-5][0-9]|[0-9])/),t.minute));g.mm=_.cache(_.process(_.rtoken(/^[0-5][0-9]/),t.minute));g.s=_.cache(_.process(_.rtoken(/^([0-5][0-9]|[0-9])/),t.second));g.ss=_.cache(_.process(_.rtoken(/^[0-5][0-9]/),t.second));g.hms=_.cache(_.sequence([g.H,g.m,g.s],g.timePartDelimiter));g.t=_.cache(_.process(g.ctoken2("shortMeridian"),t.meridian));g.tt=_.cache(_.process(g.ctoken2("longMeridian"),t.meridian));g.z=_.cache(_.process(_.rtoken(/^((\+|\-)\s*\d\d\d\d)|((\+|\-)\d\d\:?\d\d)/),t.timezone));g.zz=_.cache(_.process(_.rtoken(/^((\+|\-)\s*\d\d\d\d)|((\+|\-)\d\d\:?\d\d)/),t.timezone));g.zzz=_.cache(_.process(g.ctoken2("timezone"),t.timezone));g.timeSuffix=_.each(_.ignore(g.whiteSpace),_.set([g.tt,g.zzz]));g.time=_.each(_.optional(_.ignore(_.stoken("T"))),g.hms,g.timeSuffix);g.d=_.cache(_.process(_.each(_.rtoken(/^([0-2]\d|3[0-1]|\d)/),_.optional(g.ctoken2("ordinalSuffix"))),t.day));g.dd=_.cache(_.process(_.each(_.rtoken(/^([0-2]\d|3[0-1])/),_.optional(g.ctoken2("ordinalSuffix"))),t.day));g.ddd=g.dddd=_.cache(_.process(g.ctoken("sun mon tue wed thu fri sat"),function(s){return function(){this.weekday=s;};}));g.M=_.cache(_.process(_.rtoken(/^(1[0-2]|0\d|\d)/),t.month));g.MM=_.cache(_.process(_.rtoken(/^(1[0-2]|0\d)/),t.month));g.MMM=g.MMMM=_.cache(_.process(g.ctoken("jan feb mar apr may jun jul aug sep oct nov dec"),t.month));g.y=_.cache(_.process(_.rtoken(/^(\d\d?)/),t.year));g.yy=_.cache(_.process(_.rtoken(/^(\d\d)/),t.year));g.yyy=_.cache(_.process(_.rtoken(/^(\d\d?\d?\d?)/),t.year));g.yyyy=_.cache(_.process(_.rtoken(/^(\d\d\d\d)/),t.year));_fn=function(){return _.each(_.any.apply(null,arguments),_.not(g.ctoken2("timeContext")));};g.day=_fn(g.d,g.dd);g.month=_fn(g.M,g.MMM);g.year=_fn(g.yyyy,g.yy);g.orientation=_.process(g.ctoken("past future"),function(s){return function(){this.orient=s;};});g.operator=_.process(g.ctoken("add subtract"),function(s){return function(){this.operator=s;};});g.rday=_.process(g.ctoken("yesterday tomorrow today now"),t.rday);g.unit=_.process(g.ctoken("second minute hour day week month year"),function(s){return function(){this.unit=s;};});g.value=_.process(_.rtoken(/^\d\d?(st|nd|rd|th)?/),function(s){return function(){this.value=s.replace(/\D/g,"");};});g.expression=_.set([g.rday,g.operator,g.value,g.unit,g.orientation,g.ddd,g.MMM]);_fn=function(){return _.set(arguments,g.datePartDelimiter);};g.mdy=_fn(g.ddd,g.month,g.day,g.year);g.ymd=_fn(g.ddd,g.year,g.month,g.day);g.dmy=_fn(g.ddd,g.day,g.month,g.year);g.date=function(s){return((g[$C.dateElementOrder]||g.mdy).call(this,s));};g.format=_.process(_.many(_.any(_.process(_.rtoken(/^(dd?d?d?|MM?M?M?|yy?y?y?|hh?|HH?|mm?|ss?|tt?|zz?z?)/),function(fmt){if(g[fmt]){return g[fmt];}else{throw $D.Parsing.Exception(fmt);}}),_.process(_.rtoken(/^[^dMyhHmstz]+/),function(s){return _.ignore(_.stoken(s));}))),function(rules){return _.process(_.each.apply(null,rules),t.finishExact);});var _F={};var _get=function(f){return _F[f]=(_F[f]||g.format(f)[0]);};g.formats=function(fx){if(fx instanceof Array){var rx=[];for(var i=0;i<fx.length;i++){rx.push(_get(fx[i]));}
+return _.any.apply(null,rx);}else{return _get(fx);}};g._formats=g.formats(["\"yyyy-MM-ddTHH:mm:ssZ\"","yyyy-MM-ddTHH:mm:ssZ","yyyy-MM-ddTHH:mm:ssz","yyyy-MM-ddTHH:mm:ss","yyyy-MM-ddTHH:mmZ","yyyy-MM-ddTHH:mmz","yyyy-MM-ddTHH:mm","ddd, MMM dd, yyyy H:mm:ss tt","ddd MMM d yyyy HH:mm:ss zzz","MMddyyyy","ddMMyyyy","Mddyyyy","ddMyyyy","Mdyyyy","dMyyyy","yyyy","Mdyy","dMyy","d"]);g._start=_.process(_.set([g.date,g.time,g.expression],g.generalDelimiter,g.whiteSpace),t.finish);g.start=function(s){try{var r=g._formats.call({},s);if(r[1].length===0){return r;}}catch(e){}
+return g._start.call({},s);};$D._parse=$D.parse;$D.parse=function(s){var r=null;if(!s){return null;}
+if(s instanceof Date){return s;}
+try{r=$D.Grammar.start.call({},s.replace(/^\s*(\S*(\s+\S+)*)\s*$/,"$1"));}catch(e){return null;}
+return((r[1].length===0)?r[0]:null);};$D.getParseFunction=function(fx){var fn=$D.Grammar.formats(fx);return function(s){var r=null;try{r=fn.call({},s);}catch(e){return null;}
+return((r[1].length===0)?r[0]:null);};};$D.parseExact=function(s,fx){return $D.getParseFunction(fx)(s);};}());
diff --git a/addons/base/static/src/base.html b/addons/base/static/src/base.html
index 83fbfcecefc..27c83aef380 100644
--- a/addons/base/static/src/base.html
+++ b/addons/base/static/src/base.html
@@ -16,7 +16,9 @@
     <script type="text/javascript" src="/base/static/lib/jquery.superfish/js/hoverIntent.js"></script>
     <script type="text/javascript" src="/base/static/lib/jquery.superfish/js/superfish.js"></script>
     <script type="text/javascript" src="/base/static/lib/jquery.ba-bbq/jquery.ba-bbq.js"></script>
+    <script type="text/javascript" src="/base/static/lib/datejs/date-en-US.js"></script>
     <script type="text/javascript" src="/base/static/src/js/base.js"></script>
+    <script type="text/javascript" src="/base/static/src/js/dates.js"></script>
     <script type="text/javascript" src="/base/static/src/js/chrome.js"></script>
     <script type="text/javascript" src="/base/static/src/js/data.js"></script>
     <script type="text/javascript" src="/base/static/src/js/form.js"></script>
diff --git a/addons/base/static/src/js/base.js b/addons/base/static/src/js/base.js
index 504f5ca744d..86ef80877cb 100644
--- a/addons/base/static/src/js/base.js
+++ b/addons/base/static/src/js/base.js
@@ -120,6 +120,7 @@
 
 /** @namespace */
 openerp.base = function(instance) {
+    openerp.base.dates(instance);
     openerp.base.chrome(instance);
     openerp.base.data(instance);
     openerp.base.views(instance);
diff --git a/addons/base/static/src/js/dates.js b/addons/base/static/src/js/dates.js
new file mode 100644
index 00000000000..da4e948e282
--- /dev/null
+++ b/addons/base/static/src/js/dates.js
@@ -0,0 +1,89 @@
+
+openerp.base.dates = function(openerp) {
+
+openerp.base.parse_datetime = function(str) {
+    if(!str) {
+        return str;
+    }
+    var regex = /\d\d\d\d-\d\d-\d\) \d\d:\d\d:\d\d/;
+    var res = regex.exec(str);
+    if ( res[0] != str ) {
+        throw "'" + str + "' is not a valid datetime";
+    }
+    var obj = Date.parse(str + " GMT");
+    if (! obj) {
+        throw "'" + str + "' is not a valid datetime";
+    }
+    return obj;
+};
+
+openerp.base.parse_date = function(str) {
+    if(!str) {
+        return str;
+    }
+    var regex = /\d\d\d\d-\d\d-\d\d/;
+    var res = regex.exec(str);
+    if ( res[0] != str ) {
+        throw "'" + str + "' is not a valid date";
+    }
+    var obj = Date.parse(str);
+    if (! obj) {
+        throw "'" + str + "' is not a valid date";
+    }
+    return obj;
+};
+
+openerp.base.parse_time = function(str) {
+    if(!str) {
+        return str;
+    }
+    var regex = /\d\d:\d\d:\d\d/;
+    var res = regex.exec(str);
+    if ( res[0] != str ) {
+        throw "'" + str + "' is not a valid time";
+    }
+    var obj = Date.parse(str);
+    if (! obj) {
+        throw "'" + str + "' is not a valid time";
+    }
+    return obj;
+};
+
+/**
+ * Just a simple function to add some '0' if an integer it too small.
+ */
+var fts = function(str, size) {
+    str = "" + str;
+    var to_add = "";
+    _.each(_.range(size - str.length), function() {
+        to_add = to_add + "0";
+    });
+    return to_add + str;
+};
+
+openerp.base.format_datetime = function(obj) {
+    if(! str) {
+        return false;
+    }
+    return fts(obj.getUTCFullYear(),4) + "-" + fts(obj.getUTCMonth() + 1,2) + "-"
+        + fts(obj.getUTCDate(),2) + " " + fts(obj.getUTCHours(),2) + ":"
+        + fts(obj.getUTCMinutes(),2) + ":" + fts(obj.getUTCSeconds(),2);
+};
+
+openerp.base.format_date = function(obj) {
+    if(! str) {
+        return false;
+    }
+    return fts(obj.getFullYear(),4) + "-" + fts(obj.getMonth() + 1,2) + "-"
+        + fts(obj.getDate(),2);
+};
+
+openerp.base.format_time = function(obj) {
+    if(! str) {
+        return false;
+    }
+    return fts(obj.getHours(),2) + ":" + fts(obj.getMinutes(),2) + ":"
+        + fts(obj.getSeconds(),2);
+};
+    
+};
\ No newline at end of file
diff --git a/addons/base/static/test/dates.js b/addons/base/static/test/dates.js
new file mode 100644
index 00000000000..3973f73e1a8
--- /dev/null
+++ b/addons/base/static/test/dates.js
@@ -0,0 +1 @@
+// TODO when the tests will not be broken anymore
\ No newline at end of file
diff --git a/addons/base/static/test/test.html b/addons/base/static/test/test.html
index 5fcf4f4c594..5c7fb1282d5 100644
--- a/addons/base/static/test/test.html
+++ b/addons/base/static/test/test.html
@@ -17,6 +17,7 @@
     <script src="/base/static/lib/qweb/qweb.js"></script>
 
     <script src="/base/static/src/js/base.js"></script>
+    <script src="/base/static/src/js/dates.js"></script>
     <script src="/base/static/src/js/chrome.js"></script>
     <script src="/base/static/src/js/data.js"></script>
     <script src="/base/static/src/js/views.js"></script>
diff --git a/openerpweb/openerpweb.py b/openerpweb/openerpweb.py
index d96a9c5ffec..512dd3594f3 100644
--- a/openerpweb/openerpweb.py
+++ b/openerpweb/openerpweb.py
@@ -142,8 +142,9 @@ class OpenERPSession(object):
         self.context = self.model('res.users').context_get(self.context)
         
         self.client_timezone = self.context.get("tz", False)
-        if self.client_timezone:
-            self.remote_timezone = self.execute('common', 'timezone_get')
+        # invalid code, anyway we decided the server will be in UTC
+        #if self.client_timezone:
+        #    self.remote_timezone = self.execute('common', 'timezone_get')
             
         self._locale = self.context.get('lang','en_US')
         lang_ids = self.execute('res.lang','search', [('code', '=', self._locale)])

From 71e9f4a75b06ae3770356a8abca1074bac9076aa Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Thu, 28 Apr 2011 16:03:28 +0200
Subject: [PATCH 329/331] [IMP] Added dates conversion functions on the python
 side.

bzr revid: nicolas.vanhoren@openerp.com-20110428140328-b4phov2b0a7f5r5f
---
 openerpweb/dates.py | 62 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 62 insertions(+)
 create mode 100644 openerpweb/dates.py

diff --git a/openerpweb/dates.py b/openerpweb/dates.py
new file mode 100644
index 00000000000..14313fd4a46
--- /dev/null
+++ b/openerpweb/dates.py
@@ -0,0 +1,62 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    Copyright (C) 2010 OpenERP s.a. (<http://openerp.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+""" We assume that, just like the OpenERP server, the python part of the client
+ doesn't need to handle timezone-aware datetimes, this could be changed in the future. """
+
+import datetime
+
+DEFAULT_SERVER_DATE_FORMAT = "%Y-%m-%d"
+DEFAULT_SERVER_TIME_FORMAT = "%H:%M:%S"
+DEFAULT_SERVER_DATETIME_FORMAT = "%s %s" % (
+    DEFAULT_SERVER_DATE_FORMAT,
+    DEFAULT_SERVER_TIME_FORMAT)
+
+def parse_datetime(str):
+    if not str:
+        return str
+    return datetime.datetime.strptime(str, DEFAULT_SERVER_DATETIME_FORMAT)
+
+def parse_date(str):
+    if not str:
+        return str
+    return datetime.datetime.strptime(str, DEFAULT_SERVER_DATE_FORMAT).date()
+
+def parse_time(str):
+    if not str:
+        return str
+    return datetime.datetime.strptime(str, DEFAULT_SERVER_TIME_FORMAT).time()
+
+def format_datetime(obj):
+    if not obj:
+        return False
+    return obj.strftime(DEFAULT_SERVER_DATETIME_FORMAT)
+
+def format_date(obj):
+    if not obj:
+        return False
+    return obj.strftime(DEFAULT_SERVER_DATE_FORMAT)
+
+def format_time(obj):
+    if not obj:
+        return False
+    return obj.strftime(DEFAULT_SERVER_TIME_FORMAT)

From be4b0194bfaaefc3cdeb8fa4fe72315683498a74 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Thu, 28 Apr 2011 17:16:08 +0200
Subject: [PATCH 330/331] [IMP] Changed global timezone of python side.

bzr revid: nicolas.vanhoren@openerp.com-20110428151608-6vjegsfnm7sfu51v
---
 openerpweb/openerpweb.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/openerpweb/openerpweb.py b/openerpweb/openerpweb.py
index 512dd3594f3..104394d361d 100644
--- a/openerpweb/openerpweb.py
+++ b/openerpweb/openerpweb.py
@@ -10,7 +10,6 @@ import time
 import traceback
 import uuid
 import xmlrpclib
-import pytz
 
 import cherrypy
 import cherrypy.lib.static
@@ -499,6 +498,9 @@ class Root(object):
     default.exposed = True
 
 def main(argv):
+    # change the timezone of the program to the OpenERP server's assumed timezone
+    os.environ["TZ"] = "UTC"
+    
     # Parse config
     op = optparse.OptionParser()
     op.add_option("-p", "--port", dest="socket_port", help="listening port", metavar="NUMBER", default=8002)

From baa9d24adfa64cb33379980d16e920ad41cc99f3 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Thu, 28 Apr 2011 17:39:01 +0200
Subject: [PATCH 331/331] [FIX] res_users: check() must raise when access is
 denied!

lp bug: https://launchpad.net/bugs/760301 fixed

bzr revid: odo@openerp.com-20110428153901-0msblcxirkgskmsl
---
 bin/addons/base/res/res_user.py | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/bin/addons/base/res/res_user.py b/bin/addons/base/res/res_user.py
index 261ec699659..7bf3674adc3 100644
--- a/bin/addons/base/res/res_user.py
+++ b/bin/addons/base/res/res_user.py
@@ -458,24 +458,25 @@ class users(osv.osv):
             raise security.ExceptionNoTb('AccessDenied')
 
     def check(self, db, uid, passwd):
+        """Verifies that the given (uid, password) pair is authorized for the database ``db`` and
+           raise an exception if it is not."""
         if not passwd:
-            return False
+            # empty passwords disallowed for obvious security reasons
+            raise security.ExceptionNoTb('AccessDenied')
         if self._uid_cache.get(db, {}).get(uid) == passwd:
-            return True
+            return
         cr = pooler.get_db(db).cursor()
         try:
             cr.execute('SELECT COUNT(1) FROM res_users WHERE id=%s AND password=%s AND active=%s',
                         (int(uid), passwd, True))
             res = cr.fetchone()[0]
-            if not bool(res):
+            if not res:
                 raise security.ExceptionNoTb('AccessDenied')
-            if res:
-                if self._uid_cache.has_key(db):
-                    ulist = self._uid_cache[db]
-                    ulist[uid] = passwd
-                else:
-                    self._uid_cache[db] = {uid:passwd}
-            return bool(res)
+            if self._uid_cache.has_key(db):
+                ulist = self._uid_cache[db]
+                ulist[uid] = passwd
+            else:
+                self._uid_cache[db] = {uid:passwd}
         finally:
             cr.close()
 
@@ -604,4 +605,4 @@ class res_config_view(osv.osv_memory):
 
 res_config_view()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: