Merge lp:~unifield-team/unifield-web/web_aio_24 into lp:unifield-web

[Xavier ALT]

Hi,

This as autocomplete="off" to password fields.

Regards,
Xavier

Unmerged revisions

4889. By Xavier ALT on 2012-10-22

[IMP] add autocomplete='off' to password field to present browser from storing this information

=== modified file 'MANIFEST.in'
--- MANIFEST.in	2010-11-25 08:48:06 +0000
+++ MANIFEST.in	2012-10-22 08:15:24 +0000
@@ -1,7 +1,7 @@
 include admin.py openerp-web.py run-tests.py py2exe_utils.py setup.nsi
 graft doc
 prune dist
-prune lib
+graft lib
 graft win32
 graft pixmaps
 

=== modified file 'addons/openerp/controllers/actions.py'
--- addons/openerp/controllers/actions.py	2012-03-07 16:27:59 +0000
+++ addons/openerp/controllers/actions.py	2012-10-22 08:15:24 +0000
@@ -312,7 +312,7 @@
 def act_url(action, data):
     return execute_url(**dict(data,
         url=action['url'],
-        target=action['target'],
+        target=action.get('target','new'),
         type=action['type']
     ))
 
@@ -347,8 +347,16 @@
     # for that passing active_id in headers, to get it in openAction
     if getattr(cherrypy.request, 'params', []):
         if getattr(cherrypy.request.params, 'context', {}):
-            cherrypy.response.headers['active_id'] = cherrypy.request.params.get('_terp_id')\
-            or cherrypy.request.params.context.get('active_id')
+<<<<<<< TREE
+            cherrypy.response.headers['active_id'] = cherrypy.request.params.get('_terp_id')\
+            or cherrypy.request.params.context.get('active_id')
+=======
+            cherrypy.response.headers['active_id'] = cherrypy.request.params.get('_terp_id')\
+            or cherrypy.request.params.context.get('active_id')
+
+    # when action 'open a new tab', make sure we follow 'nodestroy' flag, if set.
+    no_destroy = (action.get('nodestroy') and open_new_tab) and 'true' or 'false'
+>>>>>>> MERGE-SOURCE
 
     # Add 'opened' mark to indicate we're now within the popup and can
     # continue on during the second round of execution
@@ -370,11 +378,12 @@
         url = '/?' + urllib.urlencode({'next': url})
         
     cherrypy.response.headers['X-Target'] = action['target']
+    cherrypy.response.headers['X-No-Destroy'] = no_destroy
     cherrypy.response.headers['Location'] = url
     return """<script type="text/javascript">
-        window.top.openAction('%s', '%s');
+        window.top.openAction('%s', '%s', false, %s);
     </script>
-    """ % (url, action['target'])
+    """ % (url, action['target'], no_destroy)
 
 def execute(action, **data):
     """Execute the action with the provided data. for internal use only.
@@ -406,6 +415,9 @@
         # determine target for openAction()
         target = {'new': 'popup'}.get(data['target'], 'iframe')
 
+        cherrypy.response.headers['X-Target'] = target
+        cherrypy.response.headers['Location'] = url
+
         return """<script type="text/javascript">
                       openAction('%s', '%s')
                   </script>
@@ -447,6 +459,10 @@
         
     ctx = dict(rpc.session.context, **(data.get('context') or {}))   
 
+    if type == 'ir.actions.report.xml':
+        # avoid reading large binary values that we won't even care about
+        ctx['bin_size'] = True
+
     res = rpc.session.execute('object', 'execute', type, 'read', act_id, False, ctx)
     return execute(res, **data)
 

=== modified file 'addons/openerp/controllers/attachment.py'
--- addons/openerp/controllers/attachment.py	2011-01-17 11:57:11 +0000
+++ addons/openerp/controllers/attachment.py	2012-10-22 08:15:24 +0000
@@ -59,7 +59,7 @@
         attachment = rpc.RPCProxy('ir.attachment').read(record, [], rpc.session.context)
 
         if attachment['type'] == 'binary':
-            cherrypy.response.headers["Content-Disposition"] = 'attachment; filename="%s"' % attachment['name']
+            cherrypy.response.headers["Content-Disposition"] = 'attachment; filename="%s"' % attachment['name'].encode('utf-8')
             return base64.decodestring(attachment['datas'])
         elif attachment['type'] == 'url':
             raise redirect(attachment['url'])
@@ -75,6 +75,7 @@
         attachment_id = rpc.RPCProxy('ir.attachment').create({
             'name': datas.filename,
             'datas': base64.encodestring(datas.file.read()),
+            'datas_fname': datas.filename,
         }, ctx)
         return {'id': attachment_id, 'name': datas.filename}
 

=== modified file 'addons/openerp/controllers/form.py'
--- addons/openerp/controllers/form.py	2012-07-03 14:39:14 +0000
+++ addons/openerp/controllers/form.py	2012-10-22 08:15:24 +0000
@@ -415,6 +415,7 @@
                 params.ids = (params.ids or []) + [params.id]
                 params.count += 1
             else:
+<<<<<<< TREE
                 ctx = utils.context_with_concurrency_info(params.context, params.concurrency_info)
                 if params.button and params.button.name:
                     ctx.update({'button': params.button.name})
@@ -428,11 +429,38 @@
                 #            original_data[field] = original_value[0]
                 #        if field in data and data[field] != original_data[field]:
                 #            modified[field] = data[field]
+=======
+                ctx = dict((params.context or {}), **rpc.session.context)
+                original_data = Model.read(params.id, data.keys(), ctx)
+                modified = {}
+                
+                if original_data and isinstance(original_data, dict):
+                    for field, original_value in original_data.iteritems():
+                        if isinstance(original_value, tuple):
+                            original_data[field] = original_value[0]
+                        if field in data and data[field] != original_data[field]:
+                            #When field is many2many at that time following code will be applied
+                            if isinstance(data[field], list) and isinstance(data[field][0][2], list):
+                                if sorted(data[field][0][2]) != sorted(original_data[field]):
+                                    modified[field] = data[field]
+                            else:
+                                modified[field] = data[field]
+>>>>>>> MERGE-SOURCE
 
+<<<<<<< TREE
                 #    Model.write([params.id], modified, ctx)
                 #else:
                 #    Model.write([params.id], data, ctx)
                 Model.write([params.id], data, ctx)
+=======
+                    ctx = utils.context_with_concurrency_info(params.context, params.concurrency_info)
+                    if modified:
+                        Model.write([params.id], modified, ctx)
+                else:
+                    ctx = utils.context_with_concurrency_info(params.context, params.concurrency_info)
+                    if data:
+                        Model.write([params.id], data, ctx)
+>>>>>>> MERGE-SOURCE
 
             tw.ConcurrencyInfo.update(
                 params.model, Model.read([params.id], ['__last_update'], ctx)
@@ -672,7 +700,7 @@
     @expose(content_type='application/octet-stream')
     def save_binary_data(self, _fname='file.dat', **kw):
         params, data = TinyDict.split(kw)
-
+        
         cherrypy.response.headers['Content-Disposition'] = 'attachment; filename="%s"' % _fname
 
         if params.datas:
@@ -720,13 +748,14 @@
         model = kw.get('model')
         field = kw.get('field')
         id = kw.get('id')
+        default_value = kw.get('default_value')
         proxy = rpc.RPCProxy(model)
         if id == 'None':
             # FIXME: doesnt honor the context
-            res = proxy.default_get([field]).get(field,'')
+            res = default_value or proxy.default_get([field]).get(field,'')
         else:
             res = proxy.read([int(id)], [field])[0].get(field)
-        if res:
+        if res and res != 'None':
             return base64.decodestring(res)
         else:
             return open(openobject.paths.addons('openerp','static','images','placeholder.png'),'rb').read()
@@ -984,7 +1013,7 @@
     @expose()
     def action(self, **kw):
         params, data = TinyDict.split(kw)
-        context_menu = kw.get('context_menu')
+        context_menu = kw.get('context_menu') or False
 
         id = params.id or False
         ids = params.selection or []
@@ -1009,7 +1038,11 @@
 
         if type is None:
             action_type = rpc.RPCProxy('ir.actions.actions').read(act_id, ['type'], context)['type']
-            action = rpc.session.execute('object', 'execute', action_type, 'read', act_id, False, context)
+            tmp_ctx = dict(context)
+            if action_type == 'ir.actions.report.xml':
+                # avoid reading large binary values that we won't even care about
+                tmp_ctx['bin_size'] = True
+            action = rpc.session.execute('object', 'execute', action_type, 'read', act_id, False, tmp_ctx)
 
         if domain:
             if isinstance(domain, basestring):
@@ -1017,6 +1050,8 @@
             domain.extend(expr_eval(action.get('domain', '[]'), context))
             action['domain'] = ustr(domain)
 
+        if context.get('search_view'):
+            context.pop('search_view')
         action['form_context'] = context or {}
         import actions
         return actions.execute(action, model=params.model, id=id, ids=ids, report_type='pdf', context_menu=context_menu)
@@ -1038,6 +1073,10 @@
         model = data.pop('_terp_model')
         context = data.pop('_terp_context')
 
+        change_default = False
+        if '_terp_change_default' in data:
+            change_default = data.pop('_terp_change_default')
+
         try:
             context = eval(context) # convert to python dict
         except:
@@ -1148,6 +1187,17 @@
         if 'domain' in result:
             for k in result['domain']:
                 result['domain'][k] = ustr(result['domain'][k])
+<<<<<<< TREE
+=======
+
+        if change_default:
+            value = data.get('_terp_value')
+            proxy = rpc.RPCProxy('ir.values')
+            values = proxy.get('default', '%s=%s' % (caller, value), [(model, False)], False, context)
+            for index, fname, value in values:
+                if fname not in result['value']:
+                    result['value'][fname] = value
+>>>>>>> MERGE-SOURCE
         return result
 
     @expose('json')
@@ -1221,7 +1271,7 @@
         for index, fname, value in values:
             data[fname] = value
 
-        return dict(values=data)
+        return dict(value=data)
 
     # Possible to create shortcut for particular object or not.
     def can_shortcut_create(self):

=== modified file 'addons/openerp/controllers/impex.py'
--- addons/openerp/controllers/impex.py	2012-10-03 12:32:26 +0000
+++ addons/openerp/controllers/impex.py	2012-10-22 08:15:24 +0000
@@ -112,6 +112,13 @@
 
         params, data = TinyDict.split(kw)
         ctx = dict((params.context or {}), **rpc.session.context)
+<<<<<<< TREE
+=======
+
+        if ctx.get("group_by_no_leaf", 0):
+            raise common.warning(_("You cannot export these record(s) !"), _('Error'))
+
+>>>>>>> MERGE-SOURCE
         views = {}
         if params.view_mode and params.view_ids:
             for i, view in enumerate(params.view_mode):
@@ -235,23 +242,12 @@
             id = prefix + (prefix and '/' or '') + field
             nm = name + (name and '/' or '') + value['string']
 
-            if is_importing and (value.get('type') not in ('reference',)) and (not value.get('readonly') \
-                        or not dict(value.get('states', {}).get('draft', [('readonly', True)])).get('readonly', True)):
-
-                record.update(id=id, items={'name': nm},
-                              action='javascript: void(0)', target=None,
-                              icon=None, children=[],
-                              required=value.get('required', False))
-
-                records.append(record)
-
-            elif not is_importing:
-
-                record.update(id=id, items={'name': nm},
-                              action='javascript: void(0)', target=None,
-                              icon=None, children=[])
-                records.append(record)
-
+            record.update(id=id, items={'name': nm},
+                          action='javascript: void(0)', target=None,
+                          icon=None, children=[],
+                          required=value.get('required', False))
+
+            records.append(record)
 
             if len(nm.split('/')) < 3 and value.get('relation', False):
 

=== modified file 'addons/openerp/controllers/listgrid.py'
--- addons/openerp/controllers/listgrid.py	2012-03-28 09:17:20 +0000
+++ addons/openerp/controllers/listgrid.py	2012-10-22 08:15:24 +0000
@@ -22,7 +22,7 @@
 import simplejson
 
 import cherrypy
-from openerp.controllers import SecuredController
+from openerp.controllers import SecuredController, openo2m
 from openerp.utils import rpc, TinyDict, TinyForm, TinyFormError, context_with_concurrency_info, cache
 from openerp.widgets import listgrid, listgroup
 
@@ -186,14 +186,23 @@
         domain = grp_domain
         group_level = ast.literal_eval(group_level)
         groups = ast.literal_eval(groups)
-
-        context = {'group_by_no_leaf': int(no_leaf), 'group_by': group_by, '__domain': domain}
-        args = {'editable': True,
+        # build a new TinyDict to correctly handle _terp_* params
+        params = TinyDict(**kw)
+        editable = params.editable
+        selectable = params.selectable or 2
+        context = params.context or {}
+        context.update({'group_by_no_leaf': int(no_leaf), 'group_by': group_by, '__domain': domain})
+        # we force offset to 0, as in group_by mode only 'limit' have an effect
+        # (offset pagination in only for base grouping - which is handled by ListGroup)
+        offset = 0
+        limit = params.limit or 20
+        args = {'editable': editable,
                 'view_mode': ['tree', 'form', 'calendar', 'graph'],
                 'nolinks': 1, 'group_by_ctx': group_by,
-                'selectable': 2,
+                'selectable': selectable,
                 'multiple_group_by': True,
                 'sort_key': kw.get('sort_key'),
+                'offset': offset, 'limit': limit,
                 'sort_order': kw.get('sort_order')}
 
         listgrp = listgroup.MultipleGroup(name, model, view, ids=None, domain= domain, parent_group=parent_group, group_level=group_level, groups=groups, context=context, **args)
@@ -231,6 +240,15 @@
     def get(self, **kw):
         params, data = TinyDict.split(kw)
 
+        if not params.model and params.o2m and params.view_params.model:
+            # Ok, no base model, copy infos from _terp_view_params.
+            # This is required to be able to correctly build the form view
+            # and to get the 'widget' related to the requested listgrid
+            view_params_base, x = TinyDict.split(params.view_params)
+            view_params_update = dict([(k[6:], v) for k, v in view_params_base.iteritems()
+                                                if k.startswith('_terp_') ])
+            params.update(view_params_update)
+
         groupby = params.get('_terp_group_by_ctx')
         if groupby and isinstance(groupby, basestring):
             groupby = groupby.split(',')
@@ -283,6 +301,8 @@
         if params.wiz_id:
             res = wizard.Wizard().execute(params)
             frm = res['form']
+        elif params.o2m and len(params.o2m.split('/')) > 1:
+            frm = openo2m.OpenO2M().create_form(params)
         else:
             frm = form.Form().create_form(params)
 
@@ -373,14 +393,27 @@
             return dict(error = ustr(e))
 
     @expose('json', methods=('POST',))
-    def groupbyDrag(self, model, children, domain):
-        domain = ast.literal_eval(domain)[0]
+    def groupbyDrag(self, model, children, domain, level='0'):
+        """ update records represented by children domain based on groupby domain
+
+        :param model: model to update
+        :param children: children records domain or children record id
+        :param domain: group_by domain will be convert to values
+        """
+        domain = ast.literal_eval(domain)
         children = ast.literal_eval(children)
+        level = ast.literal_eval(level)
         if isinstance(children, list):
             children = list(children)
         else:
-            children = [children]
-        rpc.RPCProxy(model).write(children, {domain[0]: domain[2]})
+            children = [('id','=',children)]
+        # convert domain to values
+        values = {}
+        for i, d in enumerate(domain):
+            if len(d) == 3 and i <= level:
+                values[d[0]] = d[2]
+        children_ids = rpc.RPCProxy(model).search(children)
+        rpc.RPCProxy(model).write(children_ids, values)
         return {}
 
     @expose('json', methods=('POST',))

=== modified file 'addons/openerp/controllers/openo2m.py'
--- addons/openerp/controllers/openo2m.py	2012-08-16 08:51:47 +0000
+++ addons/openerp/controllers/openo2m.py	2012-10-22 08:15:24 +0000
@@ -46,18 +46,29 @@
         # to get proper view, first generate form using the view_params
         vp = params.view_params
 
+        widget_prefix, _sep, widget_name = (params.o2m or '').rpartition('/')
+        if widget_prefix:
+            prefix_vp = vp.chain_get(widget_prefix)
+            if prefix_vp:
+                vp = prefix_vp
+
         form = tw.form_view.ViewForm(vp, name="view_form", action="/openerp/openo2m/save")
         cherrypy.request.terp_validators = {}
 
-        if '/' in params.o2m:
-            params.o2m = '.'.join(params.o2m.split('/')[-1:])
+        wid = form.screen.widget.get_widgets_by_name(widget_name)[0]
 
-        wid = form.screen.widget.get_widgets_by_name(params.o2m)[0]
+        if widget_prefix and params.o2m:
+            prefix_params = params.chain_get(params.o2m)
+            if prefix_params:
+                params.update(prefix_params)
 
         # save view_params for later phazes
         vp = vp.make_plain('_terp_view_params/')
         hiddens = map(lambda x: tw.form.Hidden(name=x, default=ustr(vp[x])), vp)
 
+        if params.m2o:
+            hiddens += [tw.form.Hidden(name='_terp_m2o', default=params.m2o)]
+
         params.prefix = params.o2m
         params.views = wid.view
 

=== modified file 'addons/openerp/controllers/root.py'
--- addons/openerp/controllers/root.py	2011-09-26 09:06:26 +0000
+++ addons/openerp/controllers/root.py	2012-10-22 08:15:24 +0000
@@ -19,6 +19,7 @@
 #
 ###############################################################################
 import cherrypy
+import re
 
 import openobject
 from openerp.controllers import SecuredController, unsecured, actions, login as tiny_login, form, widgets
@@ -29,12 +30,26 @@
 
 _MAXIMUM_NUMBER_WELCOME_MESSAGES = 3
 
+def insert_xmlhttprequest_status_emulation(text, status=None):
+    """ insert http reponse status on document body,
+        so that XMLHttpRequest using <iframe/> hack when form
+        contains binary data, can work correctly """
+    if status is None:
+        status = cherrypy.response.status
+    body_starttag = re.search('<body.*?>', text)
+    if body_starttag:
+        # insert status attribute
+        insert_pos = body_starttag.end() - 1
+        return text[:insert_pos] + ' status="%d"' % (status) + text[insert_pos:]
+    return text
+
 def _cp_on_error():
     cherrypy.request.pool = openobject.pooler.get_pool()
 
     errorpage = cherrypy.request.pool.get_controller("/openerp/errorpage")
     message = errorpage.render()
     cherrypy.response.status = 500
+    message = insert_xmlhttprequest_status_emulation(message, 500)
     cherrypy.response.body = [message]
 
 cherrypy.config.update({'request.error_response': _cp_on_error})
@@ -127,7 +142,9 @@
                 id = ids[0] 
             ids = menus.search([('parent_id', '=', id)], 0, 0, 0, ctx)
             tools = menus.read(ids, ['name', 'action'], ctx)
-            view = cache.fields_view_get('ir.ui.menu', 1, 'tree', {})
+            #searching id for the hierarchycal tree view of ir.ui.menu 
+            view_id = rpc.RPCProxy('ir.ui.view').search([('model','=','ir.ui.menu'),('type','=','tree')],0,0,'id')[0]
+            view = cache.fields_view_get('ir.ui.menu', view_id, 'tree', {})
             fields = cache.fields_get(view['model'], False, ctx)
             
             for tool in tools:

=== modified file 'addons/openerp/controllers/search.py'
--- addons/openerp/controllers/search.py	2012-07-03 15:21:33 +0000
+++ addons/openerp/controllers/search.py	2012-10-22 08:15:24 +0000
@@ -91,10 +91,16 @@
         proxy = rpc.RPCProxy(model)
         params.search_text = False
 
+<<<<<<< TREE
         # parent's search_view has no business being in m2o or m2m
         if '_terp_context' in params and 'search_view' in params['_terp_context']:
             params.get('_terp_context').pop('search_view', None)
 
+=======
+        # parent's search_view has no business being in m2o or m2m
+        if '_terp_context' in params and 'search_view' in params['_terp_context']:
+            params.get('_terp_context').pop('search_view', None)
+>>>>>>> MERGE-SOURCE
         if text:
             params.search_text = True
             ids = proxy.name_search(text, params.domain or [], 'ilike', ctx, False)
@@ -186,6 +192,10 @@
                 if val is None:
                     context[key] = False
 
+        for key, val in context.items():
+            if key in ctx:
+                context[key] = ctx[key]
+
         if isinstance(context, dict):
             context = expr_eval(context, ctx)
         parent_context.update(context)
@@ -262,7 +272,15 @@
 
         group_by_ctx = kw.get('group_by_ctx', [])
         if isinstance(group_by_ctx, str):
-            group_by_ctx = cleanup_group_by(group_by_ctx).split(',')
+<<<<<<< TREE
+            group_by_ctx = cleanup_group_by(group_by_ctx).split(',')
+=======
+            group_by_ctx = cleanup_group_by(group_by_ctx).split(',')
+
+        filter_status = all_domains.get('filter_status')
+        if isinstance(filter_status, str):
+            filter_status = ast.literal_eval(filter_status)
+>>>>>>> MERGE-SOURCE
 
         if domains:
             domains = eval(domains)
@@ -283,7 +301,9 @@
 
         if check_domain and isinstance(check_domain, basestring):
             domain = expr_eval(check_domain, context) or []
-
+        m2o_filter_domain = all_domains.get('m2o_filter_domain', [])
+        for dom in m2o_filter_domain:
+            domain += expr_eval(dom['domain'], {'self': dom['self']}) or []
         search_data = {}
         model = kw.get('model')
         proxy = rpc.RPCProxy(model)
@@ -376,12 +396,42 @@
             if selection_domain:
                 domain.extend(selection_domain)
 
+        for i,flt in enumerate(ncustom_domain):
+            if len(flt) > 1:
+
+                left_field = flt[0]
+                operator = flt[1]
+                right_val = flt[2]
+
+                if res[left_field]['type'] == 'selection' and right_val:
+
+                    if operator in ['ilike','=','in']:
+                        operator = 'in'
+                    else:
+                        operator = 'not in'
+
+                    keys = []
+                    if isinstance(right_val, list):
+                        for sel_val in res[left_field]['selection']:
+                            for rgt_val in right_val:
+                                if sel_val[1].lower().find(rgt_val.lower()) != -1 and sel_val[0] not in keys:
+                                    keys.append(sel_val[0])
+                    else:
+                        for sel_val in res[left_field]['selection']:
+                            if sel_val[1].lower().find(right_val.lower()) != -1:
+                                keys.append(sel_val[0])
+
+                    if keys:
+                        ncustom_domain[i] = (left_field, operator, keys)
+
         if not domain:
             domain = None
         if not isinstance(group_by_ctx, list):
             group_by_ctx = [group_by_ctx]
         if group_by_ctx:
             search_data['group_by_ctx'] = group_by_ctx
+        if filter_status:
+            search_data['filter_status'] = filter_status
         ncustom_domain = openobject.i18n.format.convert_date_format_in_domain(ncustom_domain, res, context)
         return dict(domain=ustr(domain), context=ustr(ctx), search_data=ustr(search_data), filter_domain=ustr(ncustom_domain))
 
@@ -427,7 +477,9 @@
         name = kw.get('name')
         model = kw.get('model')
         domain = kw.get('domain')
-        group_by = kw.get('group_by', '[]')
+        group_by = kw.get('group_by', [])
+        if isinstance(group_by, str):
+            group_by = expr_eval(group_by)
         if group_by:
             context = {'group_by': group_by}
         else:

=== modified file 'addons/openerp/controllers/templates/base.mako'
--- addons/openerp/controllers/templates/base.mako	2010-11-08 14:50:06 +0000
+++ addons/openerp/controllers/templates/base.mako	2012-10-22 08:15:24 +0000
@@ -34,7 +34,7 @@
     <link rel="stylesheet" type="text/css" href="/openerp/static/css/listgrid.css"/>
     <link rel="stylesheet" type="text/css" href="/openerp/static/css/autocomplete.css"/>
     
-    <!--[if lt IE 9]>
+    <!--[if lte IE 9]>
     <link rel="stylesheet" type="text/css" href="/openerp/static/css/style-ie.css"/>
     <![endif]-->
     ${self.header()}

=== modified file 'addons/openerp/controllers/templates/error_page.mako'
--- addons/openerp/controllers/templates/error_page.mako	2011-12-23 10:27:14 +0000
+++ addons/openerp/controllers/templates/error_page.mako	2012-10-22 08:15:24 +0000
@@ -2,6 +2,10 @@
 <%!
     MAINTENANCE_CONTRACTS_URL = 'http://www.openerp.com/support-or-publisher-warranty-contract'
 %>
+<%! import cherrypy
+def is_xmlhttprequest():
+    return cherrypy.request.headers.get('X-Requested-With') == 'XMLHttpRequest' and True or False
+%>
 <%def name="header()">
     <script type="text/javascript" src="/openerp/static/javascript/openerp/openerp.ui.textarea.js"></script>
 
@@ -83,7 +87,9 @@
 </%def>
 
 <%def name="content()">
-
+% if is_xmlhttprequest():
+<body>
+% endif
 <table class="view" border="0" width="100%">
     <tr>
         % if maintenance:
@@ -225,5 +231,8 @@
         % endif
     </tr>
 </table>
+% if is_xmlhttprequest():
+</body>
+% endif
 
 </%def>

=== modified file 'addons/openerp/controllers/templates/form.mako'
--- addons/openerp/controllers/templates/form.mako	2012-06-29 09:38:15 +0000
+++ addons/openerp/controllers/templates/form.mako	2012-10-22 08:15:24 +0000
@@ -25,6 +25,7 @@
             /*
             % endif
             */
+            jQuery('[autofocus="autofocus"]').focus();
         });
     </script>
 

=== modified file 'addons/openerp/controllers/templates/login.mako'
--- addons/openerp/controllers/templates/login.mako	2012-08-17 08:47:11 +0000
+++ addons/openerp/controllers/templates/login.mako	2012-10-22 08:15:24 +0000
@@ -55,7 +55,7 @@
                                 </tr>
                                 <tr>
                                     <td class="label"><label for="password">${_("Password:")}</label></td>
-                                    <td style="padding: 3px;"><input type="password" value="${password}" id="password" name="password" class="db_user_pass"/></td>
+                                    <td style="padding: 3px;"><input type="password" value="${password}" id="password" name="password" class="db_user_pass" autocomplete="off"/></td>
                                 </tr>
                                 <tr>
                                     <td></td>

=== modified file 'addons/openerp/controllers/templates/login_ajax.mako'
--- addons/openerp/controllers/templates/login_ajax.mako	2010-09-15 10:58:44 +0000
+++ addons/openerp/controllers/templates/login_ajax.mako	2012-10-22 08:15:24 +0000
@@ -78,7 +78,7 @@
                     <td><strong><label for="password">${_("Password:")}</label></strong></td>
                 </tr>
                 <tr>
-                    <td><input type="password" value="${password}" id="password" name="password" class="user_pass"/></td>
+                    <td><input type="password" value="${password}" id="password" name="password" class="user_pass" autocomplete="off"/></td>
                 </tr>
                 <tr>
                     <td>
@@ -96,7 +96,7 @@
                 </tr>
                 <tr>
                     <td class="label"><label for="password">${_("Password:")}</label></td>
-                    <td><input type="password" value="${password}" id="password" name="password" class="user_pass"/></td>
+                    <td><input type="password" value="${password}" id="password" name="password" class="user_pass" autocomplete="off"/></td>
                 </tr>
                 <tr>
                     <td>&nbsp;</td>

=== modified file 'addons/openerp/controllers/templates/search.mako'
=== modified file 'addons/openerp/controllers/templates/translator.mako'
--- addons/openerp/controllers/templates/translator.mako	2010-12-22 16:40:40 +0000
+++ addons/openerp/controllers/templates/translator.mako	2012-10-22 08:15:24 +0000
@@ -56,7 +56,7 @@
                         	<td class="grid-cell" width="${100 / len(langs)}%">${lang['name']}</td>
                         % endfor
                     </tr>
-                    % for n, v, x, s in data:
+                    % for n, v, x, s, t in data:
                     <tr class="grid-row">
                         % if x:
                         	<input type="hidden" name="_terp_models/${n}" value="${x}"/>
@@ -64,11 +64,19 @@
                         % if translate=='fields':
                         	<td class="grid-cell label" align="right">${s}: </td>
                         % endif
-                        % for lang in langs:
-	                        <td class="grid-cell item">
-	                            <input type="text" name="${lang['code']}/${n}" value="${v[lang['code']]}" style="width: 100%;"/>
-	                        </td>
-                        % endfor
+                        % if t == 'text':
+                            % for lang in langs:
+                                <td class="grid-cell item">
+                                    <textarea name="${lang['code']}/${n}" style="width: 100%;">${v[lang['code']]}</textarea>
+                                </td>
+                            % endfor
+                        % else:
+                            % for lang in langs:
+                                <td class="grid-cell item">
+                                    <input type="text" name="${lang['code']}/${n}" value="${v[lang['code']]}" style="width: 100%;"/>
+                                </td>
+                            % endfor
+                        % endif
                     </tr>
                     % endfor
                 </table>

=== modified file 'addons/openerp/controllers/translator.py'
--- addons/openerp/controllers/translator.py	2011-02-01 18:02:11 +0000
+++ addons/openerp/controllers/translator.py	2012-10-22 08:15:24 +0000
@@ -66,6 +66,7 @@
             for name in names:
                 attrs = view_fields[name]
                 if attrs.get('translate'):
+                    type = attrs.get('type')
                     value = {}
                     for lang in langs:
                         context = copy.copy(ctx)
@@ -73,11 +74,12 @@
 
                         val = proxy.read([params.id], [name], context)
                         val = val[0] if isinstance(val,list) and len(val) > 0 else None
-
+                        if val[name] is False:
+                            val[name] = ""
                         value[lang['code']] = val[name] if isinstance(val,dict) \
                             and name in val else None
 
-                    data += [(name, value, None, attrs.get('string'))]
+                    data += [(name, value, None, attrs.get('string'), type)]
 
         if translate == 'labels':
             for name in names:
@@ -91,7 +93,7 @@
                         if name in val[code]:
                             value[code] = val[code][name] or None
 
-                    if value: data += [(name, value, None, None)]
+                    if value: data += [(name, value, None, None, None)]
 
         if translate == 'relates' and view_relates:
             for bar, tools in view_relates.items():
@@ -104,7 +106,7 @@
 
                         value[code] = val[0]['name'] or None
 
-                    data += [(tool['id'], value, tool['type'], None)]
+                    data += [(tool['id'], value, tool['type'], None, None)]
 
         if translate == 'view':
             for lang in langs:

=== modified file 'addons/openerp/controllers/tree.py'
--- addons/openerp/controllers/tree.py	2012-05-22 12:06:35 +0000
+++ addons/openerp/controllers/tree.py	2012-10-22 08:15:24 +0000
@@ -29,8 +29,12 @@
 
 import actions
 
+<<<<<<< TREE
 from openobject.i18n.format import format_datetime
 from openobject.i18n.format import format_decimal
+=======
+from openobject.i18n.format import format_datetime
+>>>>>>> MERGE-SOURCE
 from openobject.tools import url, expose
 
 from openerp.controllers import SecuredController
@@ -45,10 +49,17 @@
     return format_decimal(value, digit)
 
 FORMATTERS = {
+<<<<<<< TREE
     'integer': lambda value, _i: '%s' % int(value),
     'float': decimal_formatter,
     'date': lambda value, _i: format_datetime(value, 'date'),
     'datetime': lambda value, _i: format_datetime(value, 'datetime'),
+=======
+    'integer': lambda value, _i: '%s' % int(value),
+    'float': lambda value, _i: '%.02f' % (value),
+    'date': lambda value, _i: format_datetime(value, 'date'),
+    'datetime': lambda value, _i: format_datetime(value, 'datetime'),
+>>>>>>> MERGE-SOURCE
     'one2one': lambda value, _i: value[1],
     'many2one': lambda value, _i: value[1],
     'selection': lambda value, info: dict(info['selection']).get(value, ''),

=== modified file 'addons/openerp/po/javascript/ar.po'
--- addons/openerp/po/javascript/ar.po	2011-08-04 05:14:27 +0000
+++ addons/openerp/po/javascript/ar.po	2012-10-22 08:15:24 +0000
@@ -9,13 +9,18 @@
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-03-18 11:53+0100\n"
 "PO-Revision-Date: 2011-03-18 23:56+0000\n"
-"Last-Translator: kifcaliph <[e-mail]>\n"
+"Last-Translator: kifcaliph <Unknown>\n"
 "Language-Team: Arabic <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-08-04 05:11+0000\n"
 "X-Generator: Launchpad (build 13573)\n"
+=======
+"X-Launchpad-Export-Date: 2012-10-09 04:59+0000\n"
+"X-Generator: Launchpad (build 16112)\n"
+>>>>>>> MERGE-SOURCE
 
 #: static/javascript/form.js:92
 #, python-format

=== modified file 'addons/openerp/po/javascript/bg.po'
--- addons/openerp/po/javascript/bg.po	2011-08-04 05:14:27 +0000
+++ addons/openerp/po/javascript/bg.po	2012-10-22 08:15:24 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-08-04 05:11+0000\n"
 "X-Generator: Launchpad (build 13573)\n"
+=======
+"X-Launchpad-Export-Date: 2012-10-09 04:59+0000\n"
+"X-Generator: Launchpad (build 16112)\n"
+>>>>>>> MERGE-SOURCE
 
 #: static/javascript/form.js:92
 #, python-format

=== modified file 'addons/openerp/po/javascript/ca.po'
--- addons/openerp/po/javascript/ca.po	2011-08-04 05:14:27 +0000
+++ addons/openerp/po/javascript/ca.po	2012-10-22 08:15:24 +0000
@@ -8,15 +8,20 @@
 "Project-Id-Version: openobject-client-web\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-03-18 11:53+0100\n"
-"PO-Revision-Date: 2011-02-24 17:35+0000\n"
+"PO-Revision-Date: 2011-08-18 19:01+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<[e-mail]>\n"
 "Language-Team: Catalan <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-08-04 05:11+0000\n"
 "X-Generator: Launchpad (build 13573)\n"
+=======
+"X-Launchpad-Export-Date: 2012-10-09 04:59+0000\n"
+"X-Generator: Launchpad (build 16112)\n"
+>>>>>>> MERGE-SOURCE
 
 #: static/javascript/form.js:92
 #, python-format
@@ -37,7 +42,7 @@
 
 #: static/javascript/form.js:995
 msgid "You must save this record to perform the action !"
-msgstr ""
+msgstr "Heu de desar aquest registre per realitzar l'acció!"
 
 #: static/javascript/form.js:1127
 msgid "Do you really want to delete the attachment"
@@ -79,7 +84,7 @@
 
 #: static/javascript/search.js:285
 msgid "Invalid Value"
-msgstr ""
+msgstr "Valor no vàlid"
 
 #: static/javascript/viewed.js:63
 msgid "Do you really want to remove this node?"

=== added file 'addons/openerp/po/javascript/cs.po'
--- addons/openerp/po/javascript/cs.po	1970-01-01 00:00:00 +0000
+++ addons/openerp/po/javascript/cs.po	2012-10-22 08:15:24 +0000
@@ -0,0 +1,106 @@
+# Translations template for PROJECT.
+# Copyright (C) 2011 ORGANIZATION
+# This file is distributed under the same license as the PROJECT project.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-client-web\n"
+"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
+"POT-Creation-Date: 2011-03-18 11:53+0100\n"
+"PO-Revision-Date: 2011-08-08 08:08+0000\n"
+"Last-Translator: Jiří Hajda <[e-mail]>\n"
+"Language-Team: Czech\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-09 04:59+0000\n"
+"X-Generator: Launchpad (build 16112)\n"
+"Language: \n"
+"X-Poedit-Language: Czech\n"
+"Generated-By: Babel 0.9.5\n"
+
+#: static/javascript/form.js:92
+#, python-format
+msgid "You selected to open %(tabs)s tabs - do you want to continue?"
+msgstr "Vybrali jste k otevření %(tabs)s záložky - opravdu chcete otevřít?"
+
+#: static/javascript/form.js:169
+msgid "Invalid form, correct red fields."
+msgstr "Neplatný formulář, opravte červená pole."
+
+#: static/javascript/form.js:204
+msgid "Do you really want to delete this record?"
+msgstr "Opravdu chcete smazat tento záznam?"
+
+#: static/javascript/form.js:960
+msgid "You must select one or several records !"
+msgstr "Musíte vybrat jeden nebo více záznamů !"
+
+#: static/javascript/form.js:995
+msgid "You must save this record to perform the action !"
+msgstr "Musíte tento záznam uložit pro vykonání akce !"
+
+#: static/javascript/form.js:1127
+msgid "Do you really want to delete the attachment"
+msgstr "Opravdu chcete smazat přílohu?"
+
+#: static/javascript/form.js:1161
+msgid "No record selected ! You can only attach to existing record."
+msgstr "Nevybrán žádný záznam ! Můžete přiložit pouze existující záznam."
+
+#: static/javascript/form.js:1220
+msgid "OpenERP - Error"
+msgstr "OpenERP - Chyba"
+
+#: static/javascript/form.js:1291
+msgid ""
+"Warning, the record has been modified,\n"
+"your changes will be discarded."
+msgstr ""
+"Varování, záznam byl upraven,\n"
+"vaše změny budou zahozeny."
+
+#: static/javascript/listgrid.js:542 static/javascript/o2m.js:123
+msgid "To edit Record, please first save it."
+msgstr "Pro úpravu Záznamu jej prosíme nejdříve uložte."
+
+#: static/javascript/listgrid.js:650
+msgid "Do you really want to delete selected record(s) ?"
+msgstr "Opravdu chcete smazat vybrané záznam(y) ?"
+
+#: static/javascript/m2o.js:526
+msgid "error in display::"
+msgstr "chyba ve zobrazení::"
+
+#: static/javascript/o2m.js:67
+msgid "Do you really want to delete record ?"
+msgstr "Opravdu chcete smazat záznam ?"
+
+#: static/javascript/search.js:285
+msgid "Invalid Value"
+msgstr "Neplatná hodnota"
+
+#: static/javascript/viewed.js:63
+msgid "Do you really want to remove this node?"
+msgstr "Opravdu chcete odstranit tento uzel?"
+
+#: static/javascript/viewed.js:329
+msgid "Do you really wants to create an inherited view here?"
+msgstr "Opravdu zde chcete vytvořit zděděný pohled?"
+
+#: static/javascript/openerp/openerp.base.js:127
+msgid "doLoadingSuccess: Cannot parse JSON"
+msgstr "doLoadingSuccess: Nelze parsovat JSON"
+
+#: static/javascript/openerp/openerp.base.js:335
+msgid "Loading"
+msgstr "Načítání"
+
+#: static/javascript/openerp/openerp.ui.tips.js:51
+msgid "Object"
+msgstr "Objekt"
+
+#: static/javascript/openerp/openerp.ui.tips.js:52
+msgid "Field"
+msgstr "Pole"

=== modified file 'addons/openerp/po/javascript/da.po'
--- addons/openerp/po/javascript/da.po	2011-08-04 05:14:27 +0000
+++ addons/openerp/po/javascript/da.po	2012-10-22 08:15:24 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-08-04 05:11+0000\n"
 "X-Generator: Launchpad (build 13573)\n"
+=======
+"X-Launchpad-Export-Date: 2012-10-09 04:59+0000\n"
+"X-Generator: Launchpad (build 16112)\n"
+>>>>>>> MERGE-SOURCE
 
 #: static/javascript/form.js:92
 #, python-format

=== modified file 'addons/openerp/po/javascript/de.po'
--- addons/openerp/po/javascript/de.po	2011-08-04 05:14:27 +0000
+++ addons/openerp/po/javascript/de.po	2012-10-22 08:15:24 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n"
 "X-Generator: Launchpad (build 13573)\n"
+=======
+"X-Launchpad-Export-Date: 2012-10-09 05:00+0000\n"
+"X-Generator: Launchpad (build 16112)\n"
+>>>>>>> MERGE-SOURCE
 "Generated-By: Babel None\n"
 
 #: static/javascript/form.js:92

=== modified file 'addons/openerp/po/javascript/en_AU.po'
--- addons/openerp/po/javascript/en_AU.po	2011-08-04 05:14:27 +0000
+++ addons/openerp/po/javascript/en_AU.po	2012-10-22 08:15:24 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n"
 "X-Generator: Launchpad (build 13573)\n"
+=======
+"X-Launchpad-Export-Date: 2012-10-09 05:00+0000\n"
+"X-Generator: Launchpad (build 16112)\n"
+>>>>>>> MERGE-SOURCE
 
 #: static/javascript/form.js:92
 #, python-format

=== modified file 'addons/openerp/po/javascript/en_CA.po'
--- addons/openerp/po/javascript/en_CA.po	2011-08-04 05:14:27 +0000
+++ addons/openerp/po/javascript/en_CA.po	2012-10-22 08:15:24 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n"
 "X-Generator: Launchpad (build 13573)\n"
+=======
+"X-Launchpad-Export-Date: 2012-10-09 05:00+0000\n"
+"X-Generator: Launchpad (build 16112)\n"
+>>>>>>> MERGE-SOURCE
 
 #: static/javascript/form.js:92
 #, python-format

=== modified file 'addons/openerp/po/javascript/en_GB.po'
--- addons/openerp/po/javascript/en_GB.po	2011-08-04 05:14:27 +0000
+++ addons/openerp/po/javascript/en_GB.po	2012-10-22 08:15:24 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n"
 "X-Generator: Launchpad (build 13573)\n"
+=======
+"X-Launchpad-Export-Date: 2012-10-09 05:00+0000\n"
+"X-Generator: Launchpad (build 16112)\n"
+>>>>>>> MERGE-SOURCE
 
 #: static/javascript/form.js:92
 #, python-format

=== modified file 'addons/openerp/po/javascript/es.po'
--- addons/openerp/po/javascript/es.po	2011-08-04 05:14:27 +0000
+++ addons/openerp/po/javascript/es.po	2012-10-22 08:15:24 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n"
 "X-Generator: Launchpad (build 13573)\n"
+=======
+"X-Launchpad-Export-Date: 2012-10-09 05:00+0000\n"
+"X-Generator: Launchpad (build 16112)\n"
+>>>>>>> MERGE-SOURCE
 "Generated-By: Babel None\n"
 
 #: static/javascript/form.js:92

=== modified file 'addons/openerp/po/javascript/es_CL.po'
--- addons/openerp/po/javascript/es_CL.po	2011-08-04 05:14:27 +0000
+++ addons/openerp/po/javascript/es_CL.po	2012-10-22 08:15:24 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n"
 "X-Generator: Launchpad (build 13573)\n"
+=======
+"X-Launchpad-Export-Date: 2012-10-09 05:00+0000\n"
+"X-Generator: Launchpad (build 16112)\n"
+>>>>>>> MERGE-SOURCE
 
 #: static/javascript/form.js:92
 #, python-format
@@ -36,7 +41,7 @@
 
 #: static/javascript/form.js:995
 msgid "You must save this record to perform the action !"
-msgstr ""
+msgstr "Debe guardar este registro para ejecutar la acción"
 
 #: static/javascript/form.js:1127
 msgid "Do you really want to delete the attachment"
@@ -74,7 +79,7 @@
 
 #: static/javascript/search.js:285
 msgid "Invalid Value"
-msgstr ""
+msgstr "Valor inválido"
 
 #: static/javascript/viewed.js:63
 msgid "Do you really want to remove this node?"

=== modified file 'addons/openerp/po/javascript/eu.po'
--- addons/openerp/po/javascript/eu.po	2011-08-04 05:14:27 +0000
+++ addons/openerp/po/javascript/eu.po	2012-10-22 08:15:24 +0000
@@ -9,13 +9,18 @@
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-03-18 11:53+0100\n"
 "PO-Revision-Date: 2011-02-15 19:35+0000\n"
-"Last-Translator: Antony Lesuisse <[e-mail]>\n"
+"Last-Translator: Antony Lesuisse (OpenERP) <[e-mail]>\n"
 "Language-Team: Basque <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-08-04 05:11+0000\n"
 "X-Generator: Launchpad (build 13573)\n"
+=======
+"X-Launchpad-Export-Date: 2012-10-09 04:59+0000\n"
+"X-Generator: Launchpad (build 16112)\n"
+>>>>>>> MERGE-SOURCE
 
 #: static/javascript/form.js:92
 #, python-format

=== added file 'addons/openerp/po/javascript/fa.po'
--- addons/openerp/po/javascript/fa.po	1970-01-01 00:00:00 +0000
+++ addons/openerp/po/javascript/fa.po	2012-10-22 08:15:24 +0000
@@ -0,0 +1,101 @@
+# Persian translation for openobject-client-web
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-client-web package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-client-web\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-03-18 11:53+0100\n"
+"PO-Revision-Date: 2011-12-18 16:39+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Persian <[e-mail]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-09 05:00+0000\n"
+"X-Generator: Launchpad (build 16112)\n"
+
+#: static/javascript/form.js:92
+#, python-format
+msgid "You selected to open %(tabs)s tabs - do you want to continue?"
+msgstr ""
+
+#: static/javascript/form.js:169
+msgid "Invalid form, correct red fields."
+msgstr ""
+
+#: static/javascript/form.js:204
+msgid "Do you really want to delete this record?"
+msgstr ""
+
+#: static/javascript/form.js:960
+msgid "You must select one or several records !"
+msgstr ""
+
+#: static/javascript/form.js:995
+msgid "You must save this record to perform the action !"
+msgstr ""
+
+#: static/javascript/form.js:1127
+msgid "Do you really want to delete the attachment"
+msgstr ""
+
+#: static/javascript/form.js:1161
+msgid "No record selected ! You can only attach to existing record."
+msgstr ""
+
+#: static/javascript/form.js:1220
+msgid "OpenERP - Error"
+msgstr ""
+
+#: static/javascript/form.js:1291
+msgid ""
+"Warning, the record has been modified,\n"
+"your changes will be discarded."
+msgstr ""
+
+#: static/javascript/listgrid.js:542 static/javascript/o2m.js:123
+msgid "To edit Record, please first save it."
+msgstr ""
+
+#: static/javascript/listgrid.js:650
+msgid "Do you really want to delete selected record(s) ?"
+msgstr ""
+
+#: static/javascript/m2o.js:526
+msgid "error in display::"
+msgstr ""
+
+#: static/javascript/o2m.js:67
+msgid "Do you really want to delete record ?"
+msgstr ""
+
+#: static/javascript/search.js:285
+msgid "Invalid Value"
+msgstr ""
+
+#: static/javascript/viewed.js:63
+msgid "Do you really want to remove this node?"
+msgstr ""
+
+#: static/javascript/viewed.js:329
+msgid "Do you really wants to create an inherited view here?"
+msgstr ""
+
+#: static/javascript/openerp/openerp.base.js:127
+msgid "doLoadingSuccess: Cannot parse JSON"
+msgstr ""
+
+#: static/javascript/openerp/openerp.base.js:335
+msgid "Loading"
+msgstr ""
+
+#: static/javascript/openerp/openerp.ui.tips.js:51
+msgid "Object"
+msgstr ""
+
+#: static/javascript/openerp/openerp.ui.tips.js:52
+msgid "Field"
+msgstr ""

=== modified file 'addons/openerp/po/javascript/fi.po'
--- addons/openerp/po/javascript/fi.po	2011-08-04 05:14:27 +0000
+++ addons/openerp/po/javascript/fi.po	2012-10-22 08:15:24 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-08-04 05:11+0000\n"
 "X-Generator: Launchpad (build 13573)\n"
+=======
+"X-Launchpad-Export-Date: 2012-10-09 04:59+0000\n"
+"X-Generator: Launchpad (build 16112)\n"
+>>>>>>> MERGE-SOURCE
 
 #: static/javascript/form.js:92
 #, python-format

=== modified file 'addons/openerp/po/javascript/fr.po'
--- addons/openerp/po/javascript/fr.po	2011-08-04 05:14:27 +0000
+++ addons/openerp/po/javascript/fr.po	2012-10-22 08:15:24 +0000
@@ -8,26 +8,30 @@
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
 "POT-Creation-Date: 2011-03-18 11:53+0100\n"
-"PO-Revision-Date: 2011-05-16 16:57+0000\n"
-"Last-Translator: lolivier <[e-mail]>\n"
+"PO-Revision-Date: 2011-09-20 09:43+0000\n"
+"Last-Translator: Quentin THEURET <Unknown>\n"
 "Language-Team: fr <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-08-04 05:11+0000\n"
 "X-Generator: Launchpad (build 13573)\n"
+=======
+"X-Launchpad-Export-Date: 2012-10-09 04:59+0000\n"
+"X-Generator: Launchpad (build 16112)\n"
+>>>>>>> MERGE-SOURCE
 "Generated-By: Babel None\n"
 
 #: static/javascript/form.js:92
 #, python-format
 msgid "You selected to open %(tabs)s tabs - do you want to continue?"
-msgstr "Vous avez choisi d'ouvrir %(tabs)s onglets - voulez-vous continuer?"
+msgstr "Vous avez choisi d'ouvrir %(tabs)s onglets. Voulez-vous continuer ?"
 
 #: static/javascript/form.js:169
 msgid "Invalid form, correct red fields."
 msgstr ""
-"Le formulaire est incorrectement rempli, veuillez vérifier les champs "
-"surlignés en rouge"
+"Formulaire incomplet, veuillez mettre à jour les champs surlignés en rouge."
 
 #: static/javascript/form.js:204
 msgid "Do you really want to delete this record?"
@@ -43,7 +47,7 @@
 
 #: static/javascript/form.js:1127
 msgid "Do you really want to delete the attachment"
-msgstr "Voulez-vous réellement supprimer ce fichier attaché?"
+msgstr "Voulez-vous réellement supprimer cette pièce jointe ?"
 
 #: static/javascript/form.js:1161
 msgid "No record selected ! You can only attach to existing record."
@@ -69,7 +73,7 @@
 
 #: static/javascript/listgrid.js:650
 msgid "Do you really want to delete selected record(s) ?"
-msgstr "Voulez-vous réellement supprimer les enregistrements sélectionnés?"
+msgstr "Voulez-vous réellement supprimer les enregistrements sélectionnés ?"
 
 #: static/javascript/m2o.js:526
 msgid "error in display::"
@@ -77,7 +81,7 @@
 
 #: static/javascript/o2m.js:67
 msgid "Do you really want to delete record ?"
-msgstr "Voulez-vous réellement supprimer cet enregistrement?"
+msgstr "Voulez-vous réellement supprimer cet enregistrement ?"
 
 #: static/javascript/search.js:285
 msgid "Invalid Value"
@@ -85,11 +89,11 @@
 
 #: static/javascript/viewed.js:63
 msgid "Do you really want to remove this node?"
-msgstr "Voulez-vous réellement supprimer ce noeud?"
+msgstr "Voulez-vous réellement supprimer ce noeud ?"
 
 #: static/javascript/viewed.js:329
 msgid "Do you really wants to create an inherited view here?"
-msgstr "Voulez-vous réellement créer une vue héritée à cet emplacement?"
+msgstr "Voulez-vous réellement créer une vue héritée à cet emplacement ?"
 
 #: static/javascript/openerp/openerp.base.js:127
 msgid "doLoadingSuccess: Cannot parse JSON"

=== modified file 'addons/openerp/po/javascript/gl.po'
--- addons/openerp/po/javascript/gl.po	2011-08-04 05:14:27 +0000
+++ addons/openerp/po/javascript/gl.po	2012-10-22 08:15:24 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n"
 "X-Generator: Launchpad (build 13573)\n"
+=======
+"X-Launchpad-Export-Date: 2012-10-09 05:00+0000\n"
+"X-Generator: Launchpad (build 16112)\n"
+>>>>>>> MERGE-SOURCE
 
 #: static/javascript/form.js:92
 #, python-format

=== modified file 'addons/openerp/po/javascript/he.po'
--- addons/openerp/po/javascript/he.po	2011-08-04 05:14:27 +0000
+++ addons/openerp/po/javascript/he.po	2012-10-22 08:15:24 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n"
 "X-Generator: Launchpad (build 13573)\n"
+=======
+"X-Launchpad-Export-Date: 2012-10-09 05:00+0000\n"
+"X-Generator: Launchpad (build 16112)\n"
+>>>>>>> MERGE-SOURCE
 
 #: static/javascript/form.js:92
 #, python-format

=== modified file 'addons/openerp/po/javascript/hr.po'
--- addons/openerp/po/javascript/hr.po	2011-08-04 05:14:27 +0000
+++ addons/openerp/po/javascript/hr.po	2012-10-22 08:15:24 +0000
@@ -8,19 +8,24 @@
 "Project-Id-Version: openobject-client-web\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-03-18 11:53+0100\n"
-"PO-Revision-Date: 2011-02-15 19:35+0000\n"
-"Last-Translator: Goran Kliska <[e-mail]>\n"
+"PO-Revision-Date: 2011-10-04 18:19+0000\n"
+"Last-Translator: Goran Cvijanović <[e-mail]>\n"
 "Language-Team: Croatian <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n"
 "X-Generator: Launchpad (build 13573)\n"
+=======
+"X-Launchpad-Export-Date: 2012-10-09 05:00+0000\n"
+"X-Generator: Launchpad (build 16112)\n"
+>>>>>>> MERGE-SOURCE
 
 #: static/javascript/form.js:92
 #, python-format
 msgid "You selected to open %(tabs)s tabs - do you want to continue?"
-msgstr ""
+msgstr "Odabrali ste otvaranje %(tabs)s jezičke - želite li nastaviti?"
 
 #: static/javascript/form.js:169
 msgid "Invalid form, correct red fields."
@@ -36,7 +41,7 @@
 
 #: static/javascript/form.js:995
 msgid "You must save this record to perform the action !"
-msgstr ""
+msgstr "Morate spremiti zapis prije izvršenja akcije"
 
 #: static/javascript/form.js:1127
 msgid "Do you really want to delete the attachment"
@@ -68,7 +73,7 @@
 
 #: static/javascript/m2o.js:526
 msgid "error in display::"
-msgstr ""
+msgstr "greška u prikazu::"
 
 #: static/javascript/o2m.js:67
 msgid "Do you really want to delete record ?"
@@ -76,7 +81,7 @@
 
 #: static/javascript/search.js:285
 msgid "Invalid Value"
-msgstr ""
+msgstr "Pogrešna vrijednost"
 
 #: static/javascript/viewed.js:63
 msgid "Do you really want to remove this node?"
@@ -88,7 +93,7 @@
 
 #: static/javascript/openerp/openerp.base.js:127
 msgid "doLoadingSuccess: Cannot parse JSON"
-msgstr ""
+msgstr "doLoadingSuccess: Nije moguće parsirati JSON"
 
 #: static/javascript/openerp/openerp.base.js:335
 msgid "Loading"

=== modified file 'addons/openerp/po/javascript/hu.po'
--- addons/openerp/po/javascript/hu.po	2011-08-04 05:14:27 +0000
+++ addons/openerp/po/javascript/hu.po	2012-10-22 08:15:24 +0000
@@ -9,13 +9,19 @@
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-03-18 11:53+0100\n"
 "PO-Revision-Date: 2011-02-15 19:34+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ <[e-mail]>\n"
+"Last-Translator: NOVOTRADE RENDSZERHÁZ ( novotrade.hu ) "
+"<[e-mail]>\n"
 "Language-Team: Hungarian <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n"
 "X-Generator: Launchpad (build 13573)\n"
+=======
+"X-Launchpad-Export-Date: 2012-10-09 05:00+0000\n"
+"X-Generator: Launchpad (build 16112)\n"
+>>>>>>> MERGE-SOURCE
 
 #: static/javascript/form.js:92
 #, python-format

=== modified file 'addons/openerp/po/javascript/id.po'
--- addons/openerp/po/javascript/id.po	2011-08-04 05:14:27 +0000
+++ addons/openerp/po/javascript/id.po	2012-10-22 08:15:24 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n"
 "X-Generator: Launchpad (build 13573)\n"
+=======
+"X-Launchpad-Export-Date: 2012-10-09 05:00+0000\n"
+"X-Generator: Launchpad (build 16112)\n"
+>>>>>>> MERGE-SOURCE
 
 #: static/javascript/form.js:92
 #, python-format
@@ -37,7 +42,7 @@
 
 #: static/javascript/form.js:995
 msgid "You must save this record to perform the action !"
-msgstr "Anda harus menyimpan catatan ini untuk melakukan tindakan"
+msgstr "Anda harus menyimpan data ini untuk melakukan tindakan!"
 
 #: static/javascript/form.js:1127
 msgid "Do you really want to delete the attachment"
@@ -78,7 +83,7 @@
 
 #: static/javascript/search.js:285
 msgid "Invalid Value"
-msgstr "Nilai tidak valid"
+msgstr "Nilai Tidak Valid"
 
 #: static/javascript/viewed.js:63
 msgid "Do you really want to remove this node?"

=== modified file 'addons/openerp/po/javascript/it.po'
--- addons/openerp/po/javascript/it.po	2011-08-04 05:14:27 +0000
+++ addons/openerp/po/javascript/it.po	2012-10-22 08:15:24 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n"
 "X-Generator: Launchpad (build 13573)\n"
+=======
+"X-Launchpad-Export-Date: 2012-10-09 05:00+0000\n"
+"X-Generator: Launchpad (build 16112)\n"
+>>>>>>> MERGE-SOURCE
 "Generated-By: Babel None\n"
 
 #: static/javascript/form.js:92

=== modified file 'addons/openerp/po/javascript/lt.po'
--- addons/openerp/po/javascript/lt.po	2011-08-04 05:14:27 +0000
+++ addons/openerp/po/javascript/lt.po	2012-10-22 08:15:24 +0000
@@ -9,13 +9,18 @@
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-03-18 11:53+0100\n"
 "PO-Revision-Date: 2011-02-15 19:34+0000\n"
-"Last-Translator: Antony Lesuisse <[e-mail]>\n"
+"Last-Translator: Antony Lesuisse (OpenERP) <[e-mail]>\n"
 "Language-Team: Lithuanian <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n"
 "X-Generator: Launchpad (build 13573)\n"
+=======
+"X-Launchpad-Export-Date: 2012-10-09 05:00+0000\n"
+"X-Generator: Launchpad (build 16112)\n"
+>>>>>>> MERGE-SOURCE
 
 #: static/javascript/form.js:92
 #, python-format

=== modified file 'addons/openerp/po/javascript/lv.po'
--- addons/openerp/po/javascript/lv.po	2011-08-04 05:14:27 +0000
+++ addons/openerp/po/javascript/lv.po	2012-10-22 08:15:24 +0000
@@ -9,13 +9,18 @@
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-03-18 11:53+0100\n"
 "PO-Revision-Date: 2011-02-15 19:34+0000\n"
-"Last-Translator: Antony Lesuisse <[e-mail]>\n"
+"Last-Translator: Antony Lesuisse (OpenERP) <[e-mail]>\n"
 "Language-Team: Latvian <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n"
 "X-Generator: Launchpad (build 13573)\n"
+=======
+"X-Launchpad-Export-Date: 2012-10-09 05:00+0000\n"
+"X-Generator: Launchpad (build 16112)\n"
+>>>>>>> MERGE-SOURCE
 
 #: static/javascript/form.js:92
 #, python-format

=== modified file 'addons/openerp/po/javascript/mk.po'
--- addons/openerp/po/javascript/mk.po	2011-08-04 05:14:27 +0000
+++ addons/openerp/po/javascript/mk.po	2012-10-22 08:15:24 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n"
 "X-Generator: Launchpad (build 13573)\n"
+=======
+"X-Launchpad-Export-Date: 2012-10-09 05:00+0000\n"
+"X-Generator: Launchpad (build 16112)\n"
+>>>>>>> MERGE-SOURCE
 
 #: static/javascript/form.js:92
 #, python-format

=== modified file 'addons/openerp/po/javascript/mn.po'
--- addons/openerp/po/javascript/mn.po	2011-08-04 05:14:27 +0000
+++ addons/openerp/po/javascript/mn.po	2012-10-22 08:15:24 +0000
@@ -8,14 +8,19 @@
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
 "POT-Creation-Date: 2011-03-18 11:53+0100\n"
-"PO-Revision-Date: 2011-05-30 06:56+0000\n"
+"PO-Revision-Date: 2011-10-02 19:01+0000\n"
 "Last-Translator: BAYARAA Sainbayar <Unknown>\n"
 "Language-Team: mn <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n"
 "X-Generator: Launchpad (build 13573)\n"
+=======
+"X-Launchpad-Export-Date: 2012-10-09 05:00+0000\n"
+"X-Generator: Launchpad (build 16112)\n"
+>>>>>>> MERGE-SOURCE
 "Generated-By: Babel None\n"
 
 #: static/javascript/form.js:92
@@ -67,7 +72,7 @@
 
 #: static/javascript/m2o.js:526
 msgid "error in display::"
-msgstr "дэлгэцний алдаа::"
+msgstr "алдаа"
 
 #: static/javascript/o2m.js:67
 msgid "Do you really want to delete record ?"

=== modified file 'addons/openerp/po/javascript/nb.po'
--- addons/openerp/po/javascript/nb.po	2011-08-04 05:14:27 +0000
+++ addons/openerp/po/javascript/nb.po	2012-10-22 08:15:24 +0000
@@ -8,14 +8,19 @@
 "Project-Id-Version: openobject-client-web\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-03-18 11:53+0100\n"
-"PO-Revision-Date: 2011-07-11 10:09+0000\n"
+"PO-Revision-Date: 2012-07-02 19:25+0000\n"
 "Last-Translator: Ole Kristian Gaski <Unknown>\n"
 "Language-Team: Norwegian Bokmal <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n"
 "X-Generator: Launchpad (build 13573)\n"
+=======
+"X-Launchpad-Export-Date: 2012-10-09 05:00+0000\n"
+"X-Generator: Launchpad (build 16112)\n"
+>>>>>>> MERGE-SOURCE
 
 #: static/javascript/form.js:92
 #, python-format
@@ -86,7 +91,7 @@
 
 #: static/javascript/viewed.js:329
 msgid "Do you really wants to create an inherited view here?"
-msgstr ""
+msgstr "Vil du virkelig opprette en underordnet visning her?"
 
 #: static/javascript/openerp/openerp.base.js:127
 msgid "doLoadingSuccess: Cannot parse JSON"

=== modified file 'addons/openerp/po/javascript/nl.po'
--- addons/openerp/po/javascript/nl.po	2011-08-04 05:14:27 +0000
+++ addons/openerp/po/javascript/nl.po	2012-10-22 08:15:24 +0000
@@ -9,13 +9,18 @@
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
 "POT-Creation-Date: 2011-03-18 11:53+0100\n"
 "PO-Revision-Date: 2011-02-15 19:42+0000\n"
-"Last-Translator: Nicolas Vanhoren (OpenERP) <Unknown>\n"
+"Last-Translator: Nicolas (OpenERP) <Unknown>\n"
 "Language-Team: nl <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-08-04 05:11+0000\n"
 "X-Generator: Launchpad (build 13573)\n"
+=======
+"X-Launchpad-Export-Date: 2012-10-09 04:59+0000\n"
+"X-Generator: Launchpad (build 16112)\n"
+>>>>>>> MERGE-SOURCE
 "Generated-By: Babel None\n"
 
 #: static/javascript/form.js:92

=== modified file 'addons/openerp/po/javascript/pl.po'
--- addons/openerp/po/javascript/pl.po	2011-08-04 05:14:27 +0000
+++ addons/openerp/po/javascript/pl.po	2012-10-22 08:15:24 +0000
@@ -8,14 +8,19 @@
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
 "POT-Creation-Date: 2011-03-18 11:53+0100\n"
-"PO-Revision-Date: 2011-02-15 19:34+0000\n"
-"Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <[e-mail]>\n"
+"PO-Revision-Date: 2011-09-23 09:40+0000\n"
+"Last-Translator: Wojciech Zylinski <Unknown>\n"
 "Language-Team: pl <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n"
 "X-Generator: Launchpad (build 13573)\n"
+=======
+"X-Launchpad-Export-Date: 2012-10-09 05:00+0000\n"
+"X-Generator: Launchpad (build 16112)\n"
+>>>>>>> MERGE-SOURCE
 "Generated-By: Babel None\n"
 
 #: static/javascript/form.js:92
@@ -78,7 +83,7 @@
 
 #: static/javascript/search.js:285
 msgid "Invalid Value"
-msgstr ""
+msgstr "Niewłaściwa wartość"
 
 #: static/javascript/viewed.js:63
 msgid "Do you really want to remove this node?"

=== modified file 'addons/openerp/po/javascript/pt.po'
--- addons/openerp/po/javascript/pt.po	2011-08-04 05:14:27 +0000
+++ addons/openerp/po/javascript/pt.po	2012-10-22 08:15:24 +0000
@@ -8,14 +8,19 @@
 "Project-Id-Version: openobject-client-web\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-03-18 11:53+0100\n"
-"PO-Revision-Date: 2011-02-15 19:33+0000\n"
-"Last-Translator: Antony Lesuisse <[e-mail]>\n"
+"PO-Revision-Date: 2012-06-21 12:54+0000\n"
+"Last-Translator: ThinkOpen Solutions <Unknown>\n"
 "Language-Team: Portuguese <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n"
 "X-Generator: Launchpad (build 13573)\n"
+=======
+"X-Launchpad-Export-Date: 2012-10-09 05:00+0000\n"
+"X-Generator: Launchpad (build 16112)\n"
+>>>>>>> MERGE-SOURCE
 
 #: static/javascript/form.js:92
 #, python-format
@@ -36,7 +41,7 @@
 
 #: static/javascript/form.js:995
 msgid "You must save this record to perform the action !"
-msgstr ""
+msgstr "Precisa gravar este registo para executar a acção !"
 
 #: static/javascript/form.js:1127
 msgid "Do you really want to delete the attachment"
@@ -77,7 +82,7 @@
 
 #: static/javascript/search.js:285
 msgid "Invalid Value"
-msgstr ""
+msgstr "Valor Inválido"
 
 #: static/javascript/viewed.js:63
 msgid "Do you really want to remove this node?"

=== modified file 'addons/openerp/po/javascript/pt_BR.po'
--- addons/openerp/po/javascript/pt_BR.po	2011-08-04 05:14:27 +0000
+++ addons/openerp/po/javascript/pt_BR.po	2012-10-22 08:15:24 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n"
 "X-Generator: Launchpad (build 13573)\n"
+=======
+"X-Launchpad-Export-Date: 2012-10-09 05:00+0000\n"
+"X-Generator: Launchpad (build 16112)\n"
+>>>>>>> MERGE-SOURCE
 "Generated-By: Babel None\n"
 
 #: static/javascript/form.js:92

=== modified file 'addons/openerp/po/javascript/ro.po'
--- addons/openerp/po/javascript/ro.po	2011-08-04 05:14:27 +0000
+++ addons/openerp/po/javascript/ro.po	2012-10-22 08:15:24 +0000
@@ -8,14 +8,24 @@
 "Project-Id-Version: openobject-client-web\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-03-18 11:53+0100\n"
+<<<<<<< TREE
 "PO-Revision-Date: 2011-03-15 08:06+0000\n"
 "Last-Translator: Mihai Satmarean <Unknown>\n"
+=======
+"PO-Revision-Date: 2011-09-16 16:34+0000\n"
+"Last-Translator: Syraxes <Unknown>\n"
+>>>>>>> MERGE-SOURCE
 "Language-Team: Romanian <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n"
 "X-Generator: Launchpad (build 13573)\n"
+=======
+"X-Launchpad-Export-Date: 2012-10-09 05:00+0000\n"
+"X-Generator: Launchpad (build 16112)\n"
+>>>>>>> MERGE-SOURCE
 
 #: static/javascript/form.js:92
 #, python-format
@@ -24,7 +34,7 @@
 
 #: static/javascript/form.js:169
 msgid "Invalid form, correct red fields."
-msgstr ""
+msgstr "Forma invalidă. Corectați cîmpurile colorate în roșu."
 
 #: static/javascript/form.js:204
 msgid "Do you really want to delete this record?"
@@ -32,70 +42,74 @@
 
 #: static/javascript/form.js:960
 msgid "You must select one or several records !"
-msgstr ""
+msgstr "Trebuie să selectați cel puțin o înregistrare !"
 
 #: static/javascript/form.js:995
 msgid "You must save this record to perform the action !"
-msgstr ""
+msgstr "Trebuie să salvați înregistrarea mai întîi !"
 
 #: static/javascript/form.js:1127
 msgid "Do you really want to delete the attachment"
-msgstr ""
+msgstr "Sigur doriți să ștergeți atașamentul"
 
 #: static/javascript/form.js:1161
 msgid "No record selected ! You can only attach to existing record."
 msgstr ""
+"Nu ați selectat nici o înregistrare ! Atașarea nu poate fi făcută decît la o "
+"înregistrare existentă."
 
 #: static/javascript/form.js:1220
 msgid "OpenERP - Error"
-msgstr ""
+msgstr "Eroare OpenERP"
 
 #: static/javascript/form.js:1291
 msgid ""
 "Warning, the record has been modified,\n"
 "your changes will be discarded."
 msgstr ""
+"Atenție: înregistrarea a fost modificată întretimp,\n"
+"așadar schimbările făcute de dvs vor fi anulate."
 
 #: static/javascript/listgrid.js:542 static/javascript/o2m.js:123
 msgid "To edit Record, please first save it."
-msgstr ""
+msgstr "Vă rugăm să salvați înregistrarea înainte de a încerca să o editați."
 
 #: static/javascript/listgrid.js:650
 msgid "Do you really want to delete selected record(s) ?"
-msgstr ""
+msgstr "Sigur doriți ștergerea înregistrărilor selectate ?"
 
 #: static/javascript/m2o.js:526
 msgid "error in display::"
-msgstr ""
+msgstr "eroare la afișare::"
 
 #: static/javascript/o2m.js:67
 msgid "Do you really want to delete record ?"
-msgstr ""
+msgstr "Sigur doriți să ștergeți înregistrarea ?"
 
 #: static/javascript/search.js:285
 msgid "Invalid Value"
-msgstr ""
+msgstr "Valoare incorectă"
 
 #: static/javascript/viewed.js:63
 msgid "Do you really want to remove this node?"
-msgstr ""
+msgstr "Sigur doriți ștergerea acestui nod ?"
 
 #: static/javascript/viewed.js:329
 msgid "Do you really wants to create an inherited view here?"
-msgstr ""
+msgstr "Sigur doriți crearea aici a unui view moștenit ?"
 
 #: static/javascript/openerp/openerp.base.js:127
 msgid "doLoadingSuccess: Cannot parse JSON"
-msgstr ""
+msgstr "doLoadingSuccess: Eroare la parsarea JSON"
 
 #: static/javascript/openerp/openerp.base.js:335
 msgid "Loading"
-msgstr ""
+msgstr "Se încarcă"
 
 #: static/javascript/openerp/openerp.ui.tips.js:51
 msgid "Object"
-msgstr ""
+msgstr "Obiect"
 
 #: static/javascript/openerp/openerp.ui.tips.js:52
 msgid "Field"
-msgstr ""
+msgstr "Câmp"

=== modified file 'addons/openerp/po/javascript/ru.po'
--- addons/openerp/po/javascript/ru.po	2011-08-04 05:14:27 +0000
+++ addons/openerp/po/javascript/ru.po	2012-10-22 08:15:24 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n"
 "X-Generator: Launchpad (build 13573)\n"
+=======
+"X-Launchpad-Export-Date: 2012-10-09 05:00+0000\n"
+"X-Generator: Launchpad (build 16112)\n"
+>>>>>>> MERGE-SOURCE
 
 #: static/javascript/form.js:92
 #, python-format

=== modified file 'addons/openerp/po/javascript/sk.po'
--- addons/openerp/po/javascript/sk.po	2011-08-04 05:14:27 +0000
+++ addons/openerp/po/javascript/sk.po	2012-10-22 08:15:24 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n"
 "X-Generator: Launchpad (build 13573)\n"
+=======
+"X-Launchpad-Export-Date: 2012-10-09 05:00+0000\n"
+"X-Generator: Launchpad (build 16112)\n"
+>>>>>>> MERGE-SOURCE
 
 #: static/javascript/form.js:92
 #, python-format

=== added file 'addons/openerp/po/javascript/sl.po'
--- addons/openerp/po/javascript/sl.po	1970-01-01 00:00:00 +0000
+++ addons/openerp/po/javascript/sl.po	2012-10-22 08:15:24 +0000
@@ -0,0 +1,104 @@
+# Slovenian translation for openobject-client-web
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-client-web package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-client-web\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-03-18 11:53+0100\n"
+"PO-Revision-Date: 2011-09-21 08:29+0000\n"
+"Last-Translator: Anze (Neotek) <Unknown>\n"
+"Language-Team: Slovenian <[e-mail]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-09 05:00+0000\n"
+"X-Generator: Launchpad (build 16112)\n"
+
+#: static/javascript/form.js:92
+#, python-format
+msgid "You selected to open %(tabs)s tabs - do you want to continue?"
+msgstr ""
+"Izbrali ste, da boste odprli zavihke %(tabs)s - ali želite nadaljevati?"
+
+#: static/javascript/form.js:169
+msgid "Invalid form, correct red fields."
+msgstr "Neveljavna oblika, popravite rdeča polja."
+
+#: static/javascript/form.js:204
+msgid "Do you really want to delete this record?"
+msgstr "Ali res želite izbrisati ta zapis?"
+
+#: static/javascript/form.js:960
+msgid "You must select one or several records !"
+msgstr "Izbrati morate enega ali več zapisov!"
+
+#: static/javascript/form.js:995
+msgid "You must save this record to perform the action !"
+msgstr "Morate shtaniti zapis za izvršitev tega dejanja!"
+
+#: static/javascript/form.js:1127
+msgid "Do you really want to delete the attachment"
+msgstr "Ali res želite izbrisati to priponko?"
+
+#: static/javascript/form.js:1161
+msgid "No record selected ! You can only attach to existing record."
+msgstr "Zapis ni izbran. Pripnete lahko samo na obstoječ zapis!"
+
+#: static/javascript/form.js:1220
+msgid "OpenERP - Error"
+msgstr "OpenERP - Napaka"
+
+#: static/javascript/form.js:1291
+msgid ""
+"Warning, the record has been modified,\n"
+"your changes will be discarded."
+msgstr ""
+"Opozorilo, zapis je bil spremenjen,\n"
+"vaše spremembe ne bodo upoštevane."
+
+#: static/javascript/listgrid.js:542 static/javascript/o2m.js:123
+msgid "To edit Record, please first save it."
+msgstr "Za urejanje zapisa, ga prosim najprej shranite."
+
+#: static/javascript/listgrid.js:650
+msgid "Do you really want to delete selected record(s) ?"
+msgstr "Ali res želite izbrisati izbrane zapise?"
+
+#: static/javascript/m2o.js:526
+msgid "error in display::"
+msgstr "napaka v prikazu::"
+
+#: static/javascript/o2m.js:67
+msgid "Do you really want to delete record ?"
+msgstr "Ali res želite izbrisati zapis?"
+
+#: static/javascript/search.js:285
+msgid "Invalid Value"
+msgstr "Neveljavna vrednost"
+
+#: static/javascript/viewed.js:63
+msgid "Do you really want to remove this node?"
+msgstr "Ali res želite izbrisati to vozlišče?"
+
+#: static/javascript/viewed.js:329
+msgid "Do you really wants to create an inherited view here?"
+msgstr "Ali res želite ustvariti deden pogled tukaj?"
+
+#: static/javascript/openerp/openerp.base.js:127
+msgid "doLoadingSuccess: Cannot parse JSON"
+msgstr "doLoadingSuccess: Ni mogoče razčleniti JSON"
+
+#: static/javascript/openerp/openerp.base.js:335
+msgid "Loading"
+msgstr "Nalaganje"
+
+#: static/javascript/openerp/openerp.ui.tips.js:51
+msgid "Object"
+msgstr "Predmet"
+
+#: static/javascript/openerp/openerp.ui.tips.js:52
+msgid "Field"
+msgstr "Polje"

=== modified file 'addons/openerp/po/javascript/sr.po'
--- addons/openerp/po/javascript/sr.po	2011-08-04 05:14:27 +0000
+++ addons/openerp/po/javascript/sr.po	2012-10-22 08:15:24 +0000
@@ -9,13 +9,18 @@
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
 "POT-Creation-Date: 2011-03-18 11:53+0100\n"
 "PO-Revision-Date: 2011-02-15 19:32+0000\n"
-"Last-Translator: Antony Lesuisse <[e-mail]>\n"
+"Last-Translator: Antony Lesuisse (OpenERP) <[e-mail]>\n"
 "Language-Team: sr <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n"
 "X-Generator: Launchpad (build 13573)\n"
+=======
+"X-Launchpad-Export-Date: 2012-10-09 05:00+0000\n"
+"X-Generator: Launchpad (build 16112)\n"
+>>>>>>> MERGE-SOURCE
 "Generated-By: Babel None\n"
 
 #: static/javascript/form.js:92

=== modified file 'addons/openerp/po/javascript/[e-mail]'
--- addons/openerp/po/javascript/[e-mail]	2011-08-04 05:14:27 +0000
+++ addons/openerp/po/javascript/[e-mail]	2012-10-22 08:15:24 +0000
@@ -9,13 +9,18 @@
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-03-18 11:53+0100\n"
 "PO-Revision-Date: 2011-02-15 19:31+0000\n"
-"Last-Translator: Antony Lesuisse <[e-mail]>\n"
+"Last-Translator: Antony Lesuisse (OpenERP) <[e-mail]>\n"
 "Language-Team: Serbian latin <sr@[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n"
 "X-Generator: Launchpad (build 13573)\n"
+=======
+"X-Launchpad-Export-Date: 2012-10-09 05:00+0000\n"
+"X-Generator: Launchpad (build 16112)\n"
+>>>>>>> MERGE-SOURCE
 
 #: static/javascript/form.js:92
 #, python-format
@@ -74,7 +79,7 @@
 
 #: static/javascript/search.js:285
 msgid "Invalid Value"
-msgstr ""
+msgstr "Vrednost nije ispravna"
 
 #: static/javascript/viewed.js:63
 msgid "Do you really want to remove this node?"

=== modified file 'addons/openerp/po/javascript/sv.po'
--- addons/openerp/po/javascript/sv.po	2011-08-04 05:14:27 +0000
+++ addons/openerp/po/javascript/sv.po	2012-10-22 08:15:24 +0000
@@ -8,20 +8,25 @@
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
 "POT-Creation-Date: 2011-03-18 11:53+0100\n"
-"PO-Revision-Date: 2011-02-15 19:31+0000\n"
-"Last-Translator: Antony Lesuisse <[e-mail]>\n"
+"PO-Revision-Date: 2012-04-24 10:37+0000\n"
+"Last-Translator: Anders Wallenquist <[e-mail]>\n"
 "Language-Team: sv <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n"
 "X-Generator: Launchpad (build 13573)\n"
+=======
+"X-Launchpad-Export-Date: 2012-10-09 05:00+0000\n"
+"X-Generator: Launchpad (build 16112)\n"
+>>>>>>> MERGE-SOURCE
 "Generated-By: Babel None\n"
 
 #: static/javascript/form.js:92
 #, python-format
 msgid "You selected to open %(tabs)s tabs - do you want to continue?"
-msgstr ""
+msgstr "Du valde att öppna %(tabs)s flikar - vill du fullfölja?"
 
 #: static/javascript/form.js:169
 msgid "Invalid form, correct red fields."
@@ -33,11 +38,11 @@
 
 #: static/javascript/form.js:960
 msgid "You must select one or several records !"
-msgstr ""
+msgstr "Du måste välja minst en post !"
 
 #: static/javascript/form.js:995
 msgid "You must save this record to perform the action !"
-msgstr ""
+msgstr "Du måste spara denna post för att utföra åtgärden!"
 
 #: static/javascript/form.js:1127
 msgid "Do you really want to delete the attachment"
@@ -45,17 +50,19 @@
 
 #: static/javascript/form.js:1161
 msgid "No record selected ! You can only attach to existing record."
-msgstr ""
+msgstr "Ingen post vald ! Du kan endast bifoga till befintliga poster."
 
 #: static/javascript/form.js:1220
 msgid "OpenERP - Error"
-msgstr ""
+msgstr "OpenERP - Fel"
 
 #: static/javascript/form.js:1291
 msgid ""
 "Warning, the record has been modified,\n"
 "your changes will be discarded."
 msgstr ""
+"Varning! Posten har ändrats,\n"
+"dina ändringar kommer att förloras."
 
 #: static/javascript/listgrid.js:542 static/javascript/o2m.js:123
 msgid "To edit Record, please first save it."
@@ -67,7 +74,7 @@
 
 #: static/javascript/m2o.js:526
 msgid "error in display::"
-msgstr ""
+msgstr "fel i presentationen::"
 
 #: static/javascript/o2m.js:67
 msgid "Do you really want to delete record ?"
@@ -75,7 +82,7 @@
 
 #: static/javascript/search.js:285
 msgid "Invalid Value"
-msgstr ""
+msgstr "Ogiltigt värde"
 
 #: static/javascript/viewed.js:63
 msgid "Do you really want to remove this node?"
@@ -87,11 +94,11 @@
 
 #: static/javascript/openerp/openerp.base.js:127
 msgid "doLoadingSuccess: Cannot parse JSON"
-msgstr ""
+msgstr "doLoadingSuccess: Kan inte tolka JSON"
 
 #: static/javascript/openerp/openerp.base.js:335
 msgid "Loading"
-msgstr ""
+msgstr "Läser in"
 
 #: static/javascript/openerp/openerp.ui.tips.js:51
 msgid "Object"

=== modified file 'addons/openerp/po/javascript/th.po'
--- addons/openerp/po/javascript/th.po	2011-08-04 05:14:27 +0000
+++ addons/openerp/po/javascript/th.po	2012-10-22 08:15:24 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n"
 "X-Generator: Launchpad (build 13573)\n"
+=======
+"X-Launchpad-Export-Date: 2012-10-09 05:00+0000\n"
+"X-Generator: Launchpad (build 16112)\n"
+>>>>>>> MERGE-SOURCE
 
 #: static/javascript/form.js:92
 #, python-format

=== modified file 'addons/openerp/po/javascript/tr.po'
--- addons/openerp/po/javascript/tr.po	2011-08-04 05:14:27 +0000
+++ addons/openerp/po/javascript/tr.po	2012-10-22 08:15:24 +0000
@@ -8,23 +8,29 @@
 "Project-Id-Version: openobject-client-web\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-03-18 11:53+0100\n"
-"PO-Revision-Date: 2011-04-27 13:36+0000\n"
-"Last-Translator: Caner Başaran <Unknown>\n"
+"PO-Revision-Date: 2012-07-29 20:56+0000\n"
+"Last-Translator: Ayhan KIZILTAN <Unknown>\n"
 "Language-Team: Turkish <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n"
 "X-Generator: Launchpad (build 13573)\n"
+=======
+"X-Launchpad-Export-Date: 2012-10-09 05:00+0000\n"
+"X-Generator: Launchpad (build 16112)\n"
+>>>>>>> MERGE-SOURCE
 
 #: static/javascript/form.js:92
 #, python-format
 msgid "You selected to open %(tabs)s tabs - do you want to continue?"
-msgstr "Sekmelerini %(tabs) seçtiniz - Devam etmek istiyor musunuz?"
+msgstr ""
+"Açmak için %(tabs) sekmelerini seçtiniz - Devam etmek istiyor musunuz?"
 
 #: static/javascript/form.js:169
 msgid "Invalid form, correct red fields."
-msgstr "Hatalı form, kırmızı alanların düzeltiniz."
+msgstr "Geçersiz biçim, kırmızı alanları düzeltiniz."
 
 #: static/javascript/form.js:204
 msgid "Do you really want to delete this record?"
@@ -44,8 +50,7 @@
 
 #: static/javascript/form.js:1161
 msgid "No record selected ! You can only attach to existing record."
-msgstr ""
-"Hiç Kayıt seçilmedi! Sadece oluşturulmuş bir kayda ek ekleyebilirsiniz."
+msgstr "Hiç kayıt seçilmedi! Sadece varolan kayıta ekleyebilirsiniz."
 
 #: static/javascript/form.js:1220
 msgid "OpenERP - Error"
@@ -56,20 +61,20 @@
 "Warning, the record has been modified,\n"
 "your changes will be discarded."
 msgstr ""
-"Dikkat, Bu kayıt değiştirilmiş,\n"
+"Uyarı, Bu kayıt değiştirilmiş,\n"
 "yaptığınız değişiklikler gözardı edilecek."
 
 #: static/javascript/listgrid.js:542 static/javascript/o2m.js:123
 msgid "To edit Record, please first save it."
-msgstr "Bu kaydı düzenlemek için önce kaydetmeniz gerekiyor."
+msgstr "Kaydı düzenlemek için lütfen önce kaydedin."
 
 #: static/javascript/listgrid.js:650
 msgid "Do you really want to delete selected record(s) ?"
-msgstr "Bu kayıt(lar)ı silmek istediğinden emin misin?"
+msgstr "Seçili kayıt(lar)ı silmek istediğinize emin misiniz?"
 
 #: static/javascript/m2o.js:526
 msgid "error in display::"
-msgstr "ekranda hata::"
+msgstr "görüntüde hata::"
 
 #: static/javascript/o2m.js:67
 msgid "Do you really want to delete record ?"
@@ -81,15 +86,15 @@
 
 #: static/javascript/viewed.js:63
 msgid "Do you really want to remove this node?"
-msgstr "Bu kayıtı gerçekten silmek istiyor musunuz?"
+msgstr "Bu düğümü silmek istediğinize emin misiniz?"
 
 #: static/javascript/viewed.js:329
 msgid "Do you really wants to create an inherited view here?"
-msgstr "Bağlantılı görünüm oluşturmak istediğinden emin misin?"
+msgstr "Devralınmış görünüm oluşturmak istediğinden emin misin?"
 
 #: static/javascript/openerp/openerp.base.js:127
 msgid "doLoadingSuccess: Cannot parse JSON"
-msgstr "doLoadingSuccess: Parse edilemedi JSON"
+msgstr "doLoadingSuccess: JSON ayrıştırılamıyor"
 
 #: static/javascript/openerp/openerp.base.js:335
 msgid "Loading"

=== modified file 'addons/openerp/po/javascript/uk.po'
--- addons/openerp/po/javascript/uk.po	2011-08-04 05:14:27 +0000
+++ addons/openerp/po/javascript/uk.po	2012-10-22 08:15:24 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n"
 "X-Generator: Launchpad (build 13573)\n"
+=======
+"X-Launchpad-Export-Date: 2012-10-09 05:00+0000\n"
+"X-Generator: Launchpad (build 16112)\n"
+>>>>>>> MERGE-SOURCE
 
 #: static/javascript/form.js:92
 #, python-format

=== modified file 'addons/openerp/po/javascript/zh_CN.po'
--- addons/openerp/po/javascript/zh_CN.po	2011-08-04 05:14:27 +0000
+++ addons/openerp/po/javascript/zh_CN.po	2012-10-22 08:15:24 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n"
 "X-Generator: Launchpad (build 13573)\n"
+=======
+"X-Launchpad-Export-Date: 2012-10-09 05:00+0000\n"
+"X-Generator: Launchpad (build 16112)\n"
+>>>>>>> MERGE-SOURCE
 
 #: static/javascript/form.js:92
 #, python-format

=== added file 'addons/openerp/po/javascript/zh_TW.po'
--- addons/openerp/po/javascript/zh_TW.po	1970-01-01 00:00:00 +0000
+++ addons/openerp/po/javascript/zh_TW.po	2012-10-22 08:15:24 +0000
@@ -0,0 +1,101 @@
+# Chinese (Traditional) translation for openobject-client-web
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-client-web package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-client-web\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-03-18 11:53+0100\n"
+"PO-Revision-Date: 2011-12-04 16:15+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (Traditional) <[e-mail]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-09 05:00+0000\n"
+"X-Generator: Launchpad (build 16112)\n"
+
+#: static/javascript/form.js:92
+#, python-format
+msgid "You selected to open %(tabs)s tabs - do you want to continue?"
+msgstr ""
+
+#: static/javascript/form.js:169
+msgid "Invalid form, correct red fields."
+msgstr ""
+
+#: static/javascript/form.js:204
+msgid "Do you really want to delete this record?"
+msgstr ""
+
+#: static/javascript/form.js:960
+msgid "You must select one or several records !"
+msgstr ""
+
+#: static/javascript/form.js:995
+msgid "You must save this record to perform the action !"
+msgstr "必須儲存此紀錄以進行動作！"
+
+#: static/javascript/form.js:1127
+msgid "Do you really want to delete the attachment"
+msgstr ""
+
+#: static/javascript/form.js:1161
+msgid "No record selected ! You can only attach to existing record."
+msgstr ""
+
+#: static/javascript/form.js:1220
+msgid "OpenERP - Error"
+msgstr ""
+
+#: static/javascript/form.js:1291
+msgid ""
+"Warning, the record has been modified,\n"
+"your changes will be discarded."
+msgstr ""
+
+#: static/javascript/listgrid.js:542 static/javascript/o2m.js:123
+msgid "To edit Record, please first save it."
+msgstr ""
+
+#: static/javascript/listgrid.js:650
+msgid "Do you really want to delete selected record(s) ?"
+msgstr ""
+
+#: static/javascript/m2o.js:526
+msgid "error in display::"
+msgstr ""
+
+#: static/javascript/o2m.js:67
+msgid "Do you really want to delete record ?"
+msgstr ""
+
+#: static/javascript/search.js:285
+msgid "Invalid Value"
+msgstr ""
+
+#: static/javascript/viewed.js:63
+msgid "Do you really want to remove this node?"
+msgstr ""
+
+#: static/javascript/viewed.js:329
+msgid "Do you really wants to create an inherited view here?"
+msgstr ""
+
+#: static/javascript/openerp/openerp.base.js:127
+msgid "doLoadingSuccess: Cannot parse JSON"
+msgstr ""
+
+#: static/javascript/openerp/openerp.base.js:335
+msgid "Loading"
+msgstr ""
+
+#: static/javascript/openerp/openerp.ui.tips.js:51
+msgid "Object"
+msgstr ""
+
+#: static/javascript/openerp/openerp.ui.tips.js:52
+msgid "Field"
+msgstr ""

=== modified file 'addons/openerp/po/messages/ar.po'
--- addons/openerp/po/messages/ar.po	2011-08-04 05:14:27 +0000
+++ addons/openerp/po/messages/ar.po	2012-10-22 08:15:24 +0000
@@ -8,14 +8,19 @@
 "Project-Id-Version: openobject-client-web\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-03-18 11:53+0100\n"
-"PO-Revision-Date: 2011-03-26 15:22+0000\n"
-"Last-Translator: kifcaliph <[e-mail]>\n"
+"PO-Revision-Date: 2011-09-02 22:08+0000\n"
+"Last-Translator: kifcaliph <Unknown>\n"
 "Language-Team: Arabic <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-08-04 05:13+0000\n"
 "X-Generator: Launchpad (build 13573)\n"
+=======
+"X-Launchpad-Export-Date: 2012-10-09 05:00+0000\n"
+"X-Generator: Launchpad (build 16112)\n"
+>>>>>>> MERGE-SOURCE
 
 #: validators.py:75
 msgid "Invalid literal for float"
@@ -967,7 +972,7 @@
 
 #: controllers/templates/header.mako:66 controllers/templates/header.mako:69
 msgid "About"
-msgstr "عن"
+msgstr "عن النظام"
 
 #: controllers/templates/header.mako:73 controllers/templates/header.mako:75
 msgid "Help"
@@ -1577,79 +1582,3 @@
 #: widgets/templates/listgrid/listgrid.mako:194
 msgid "Delete record(s)."
 msgstr "حذف السجل او السجلات."
-
-#~ msgid "Click here to add new image."
-#~ msgstr "إضغط لإضافة صورة جديدة"
-
-#~ msgid "Add Resource:"
-#~ msgstr "إضافة مصدر:"
-
-#~ msgid "Image"
-#~ msgstr "صوره"
-
-#~ msgid "You do not have a valid OpenERP publisher warranty contract !"
-#~ msgstr "لا يوجد لديك عقد ضمان صحيح من الناشر للـ OpenERP"
-
-#~ msgid ""
-#~ "If you are using OpenERP in production, it is recommended to have\n"
-#~ "a publisher warranty program.\n"
-#~ "\n"
-#~ "The OpenERP publisher warranty contract provides you with bug fix guarantees "
-#~ "and an\n"
-#~ "automatic migration system so that we can start working on your problems "
-#~ "within a few\n"
-#~ "hours.\n"
-#~ "\n"
-#~ "With a publisher warranty contract, errors such as this one can be sent "
-#~ "directly to the OpenERP\n"
-#~ "team for review and evaluation.\n"
-#~ "\n"
-#~ "The publisher warranty program offers you:\n"
-#~ "* Automatic migrations on new versions,\n"
-#~ "* A bugfix guarantee,\n"
-#~ "* Monthly announces of potential bugs and their fixes,\n"
-#~ "* Security alerts by email and automatic migration,\n"
-#~ "* Access to the customer portal.\n"
-#~ msgstr ""
-#~ "إذا كنت تستخدم OpenERP للإنتاج، فإنه من المفضل الحصول\n"
-#~ "علي عقد ضمان من الناشر.\n"
-#~ "\n"
-#~ "يتضمن عقد الضمان من الناشر توفير حلول لمشاكل النظام و نقل\n"
-#~ "تلقائي للنظام و ذلك للبدء في حل مشاكلك في ساعات قليلة.\n"
-#~ "\n"
-#~ "مع عقد الضمان، مثل هذه الأخطاء يتم إرسالها مباشرة إلي فريق عمل\n"
-#~ "OpenERP للنظر فيها و التحليل.\n"
-#~ "\n"
-#~ "إن عقد الضمان يتيح لك:\n"
-#~ "* النقل التلقائي للإصدارات الجديدة.\n"
-#~ "* ضمان تصحيح أخطاء البرنامج.\n"
-#~ "* سلامة أمن النظام\n"
-#~ "* الدع م الفني اللازم\n"
-
-#~ msgid ""
-#~ "Your publisher warranty contract does not cover all modules installed in "
-#~ "your system !\n"
-#~ "If you are using OpenERP in production, it is highly suggested to upgrade "
-#~ "your\n"
-#~ "contract.\n"
-#~ "\n"
-#~ "If you have developed your own modules or installed third party module, we\n"
-#~ "can provide you an additional publisher warranty contract for these modules. "
-#~ "After\n"
-#~ "having reviewed your modules, our quality team will ensure they will "
-#~ "migrate\n"
-#~ "automatically for all future stable versions of OpenERP at no extra cost.\n"
-#~ "\n"
-#~ "Here is the list of modules not covered by your publisher warranty contract:"
-#~ msgstr ""
-#~ "لا يشمل عقد الضمان جميع الأكواد التي تم تنصيبها علي النظام!\n"
-#~ "إذا كنت تستخدم OpenERP للإنتاج، فإنه من الأفضل لك تحديث\n"
-#~ "عقد الضمان.\n"
-#~ "\n"
-#~ "إذا قمت بتطوير أكواد خاصة لك أو إستخدمت أكواد من شركات أخري غير OpenERP، "
-#~ "فنحن\n"
-#~ "يمكننا أيضاً تقديم عقد ضمان نشر إضافي لهذه الأكواد ايضاً، و ذلك بعد\n"
-#~ "ان يتم إستعراض هذه الأكواد، ليقوم فريق الجودة لتأكيد و لدعم النقل\n"
-#~ "التلقائي لكل الإصدارات الحديثة لنظام OpenERP و ذلك دون أي تكلفة\n"
-#~ "\n"
-#~ "هذه قائمة بـ بجميع الأكواد التي لا تشتمل علي ضمان الناشر:"

=== modified file 'addons/openerp/po/messages/bg.po'
--- addons/openerp/po/messages/bg.po	2011-08-04 05:14:27 +0000
+++ addons/openerp/po/messages/bg.po	2012-10-22 08:15:24 +0000
@@ -8,14 +8,19 @@
 "Project-Id-Version: openobject-client-web\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-03-18 11:53+0100\n"
-"PO-Revision-Date: 2011-03-27 16:44+0000\n"
+"PO-Revision-Date: 2012-03-01 16:57+0000\n"
 "Last-Translator: Dimitar Markov <[e-mail]>\n"
 "Language-Team: Bulgarian <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-08-04 05:13+0000\n"
 "X-Generator: Launchpad (build 13573)\n"
+=======
+"X-Launchpad-Export-Date: 2012-10-09 05:00+0000\n"
+"X-Generator: Launchpad (build 16112)\n"
+>>>>>>> MERGE-SOURCE
 
 #: validators.py:75
 msgid "Invalid literal for float"
@@ -64,7 +69,7 @@
 #: validators.py:256
 #, python-format
 msgid "You must provide a full domain name (like %(domain)s.com)"
-msgstr ""
+msgstr "Трябва да предоставите пълни име на домейн (напр. %(domain)s.com)"
 
 #: validators.py:260
 msgid "Please enter an integer value"
@@ -190,6 +195,8 @@
 "This is the password of the 'admin' user that will be created in your new "
 "database. It has to be the same than the above field."
 msgstr ""
+"Това е паролата на \"ADMIN\" потрбителят, който ще бъде създаден в новата "
+"база данни. Трябва да бъде еднакъв с горното поле."
 
 #: controllers/database.py:79
 msgid "Drop database"
@@ -1567,12 +1574,3 @@
 #: widgets/templates/listgrid/listgrid.mako:194
 msgid "Delete record(s)."
 msgstr "Изтриване на запис(и)."
-
-#~ msgid "Image"
-#~ msgstr "Изображение"
-
-#~ msgid "Add Resource:"
-#~ msgstr "Добави ресурс"
-
-#~ msgid "Click here to add new image."
-#~ msgstr "Натиснете за да добавите ново изображение."

=== added file 'addons/openerp/po/messages/bn.po'
--- addons/openerp/po/messages/bn.po	1970-01-01 00:00:00 +0000
+++ addons/openerp/po/messages/bn.po	2012-10-22 08:15:24 +0000
@@ -0,0 +1,1540 @@
+# Bengali translation for openobject-client-web
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-client-web package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-client-web\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-03-18 11:53+0100\n"
+"PO-Revision-Date: 2011-12-02 07:14+0000\n"
+"Last-Translator: Kaustav Das Modak <[e-mail]>\n"
+"Language-Team: Bengali <[e-mail]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-09 05:00+0000\n"
+"X-Generator: Launchpad (build 16112)\n"
+
+#: validators.py:75
+msgid "Invalid literal for float"
+msgstr ""
+
+#: validators.py:114 validators.py:119 validators.py:262
+msgid "Invalid datetime format"
+msgstr ""
+
+#: validators.py:166
+msgid "Please select a file."
+msgstr "অনুগ্রহ করে একটি ফাইল নির্বাচন করুন"
+
+#: validators.py:247
+msgid "Please enter an email address"
+msgstr "অনুগ্রহ করে একটি ই-মেল ঠিকানা লিখুন"
+
+#: validators.py:248
+msgid "An email address must contain a single @"
+msgstr "ই-মেল ঠিকানাতে একটি @ চিহ্ন থাকা উচিৎ"
+
+#: validators.py:249
+#, python-format
+msgid ""
+"The username portion of the email address is invalid (the portion before the "
+"@: %(username)s)"
+msgstr ""
+"ই-মেল ঠিকানায় ব্যবহারকারীর নামের অংশটি অবৈধ্য (@ ছিহ্নের আগের অংশটি: "
+"%(username)s)"
+
+#: validators.py:250
+#, python-format
+msgid ""
+"The domain portion of the email address is invalid (the portion after the @: "
+"%(domain)s)"
+msgstr ""
+"ই-মেল ঠিকানায় ডোমেন নামের অংশটি অবৈধ্য (@ ছিহ্নের পরের অংশটি: %(domain)s)"
+
+#: validators.py:254
+msgid "You must start your URL with http://, https://, etc"
+msgstr "ইউআরএল http://, https://, ইত্যাদি দিয়ে শুরু হওয়া উচিৎ"
+
+#: validators.py:255
+msgid "That is not a valid URL"
+msgstr ""
+
+#: validators.py:256
+#, python-format
+msgid "You must provide a full domain name (like %(domain)s.com)"
+msgstr ""
+
+#: validators.py:260
+msgid "Please enter an integer value"
+msgstr ""
+
+#: validators.py:261
+msgid "Please enter a number"
+msgstr ""
+
+#: controllers/actions.py:94
+msgid "Invalid View"
+msgstr ""
+
+#: controllers/actions.py:127
+msgid "Error no report"
+msgstr ""
+
+#: controllers/actions.py:153
+msgid "Nothing to print"
+msgstr ""
+
+#: controllers/actions.py:173
+msgid "Printing aborted, too long delay"
+msgstr ""
+
+#: controllers/actions.py:397
+msgid "Relative URLs are not supported"
+msgstr ""
+
+#: controllers/actions.py:425
+msgid "Action not found"
+msgstr ""
+
+#: controllers/actions.py:474
+msgid "No action defined"
+msgstr ""
+
+#: controllers/attachment.py:55
+msgid "No record selected, You can only attach to existing record..."
+msgstr ""
+
+#: controllers/database.py:63
+msgid "Create database"
+msgstr ""
+
+#: controllers/database.py:65 controllers/templates/database.mako:56
+#: controllers/templates/search.mako:145
+msgid "Create"
+msgstr ""
+
+#: controllers/database.py:68
+msgid "Super admin password:"
+msgstr ""
+
+#: controllers/database.py:68
+msgid ""
+"This is the password of the user that have the rights to administer "
+"databases. This is not a OpenERP user, just a super administrator. If you "
+"did not changed it, the password is 'admin' after installation."
+msgstr ""
+
+#: controllers/database.py:69 controllers/database.py:101
+msgid "New database name:"
+msgstr ""
+
+#: controllers/database.py:69
+msgid ""
+"Choose the name of the database that will be created. The name must not "
+"contain any special character. Exemple: 'terp'."
+msgstr ""
+
+#: controllers/database.py:70
+msgid "Load Demonstration data:"
+msgstr ""
+
+#: controllers/database.py:70
+msgid ""
+"Check this box if you want demonstration data to be installed on your new "
+"database. These data will help you to understand OpenERP, with predefined "
+"products, partners, etc."
+msgstr ""
+
+#: controllers/database.py:71
+msgid "Default Language:"
+msgstr ""
+
+#: controllers/database.py:71
+msgid ""
+"Choose the default language that will be installed for this database. You "
+"will be able to install new languages after installation through the "
+"administration menu."
+msgstr ""
+
+#: controllers/database.py:72
+msgid "Administrator password:"
+msgstr ""
+
+#: controllers/database.py:72
+msgid ""
+"This is the password of the 'admin' user that will be created in your new "
+"database."
+msgstr ""
+
+#: controllers/database.py:73
+msgid "Confirm password:"
+msgstr ""
+
+#: controllers/database.py:73
+msgid ""
+"This is the password of the 'admin' user that will be created in your new "
+"database. It has to be the same than the above field."
+msgstr ""
+
+#: controllers/database.py:79
+msgid "Drop database"
+msgstr ""
+
+#: controllers/database.py:81 controllers/templates/database.mako:58
+msgid "Drop"
+msgstr ""
+
+#: controllers/database.py:83 controllers/database.py:91
+#: controllers/templates/login.mako:43
+msgid "Database:"
+msgstr ""
+
+#: controllers/database.py:84 controllers/database.py:92
+#: controllers/database.py:100 controllers/templates/login.mako:61
+#: controllers/templates/login_ajax.mako:78
+#: controllers/templates/login_ajax.mako:98
+msgid "Password:"
+msgstr ""
+
+#: controllers/database.py:88
+msgid "Backup database"
+msgstr ""
+
+#: controllers/database.py:90 controllers/templates/database.mako:60
+msgid "Backup"
+msgstr ""
+
+#: controllers/database.py:96
+msgid "Restore database"
+msgstr ""
+
+#: controllers/database.py:98 controllers/templates/database.mako:62
+msgid "Restore"
+msgstr ""
+
+#: controllers/database.py:99
+msgid "File:"
+msgstr ""
+
+#: controllers/database.py:105
+msgid "Change Administrator Password"
+msgstr ""
+
+#: controllers/database.py:107 controllers/templates/preferences/index.mako:37
+msgid "Change Password"
+msgstr ""
+
+#: controllers/database.py:108
+msgid "Old Password:"
+msgstr ""
+
+#: controllers/database.py:109
+msgid "New Password:"
+msgstr ""
+
+#: controllers/database.py:110
+msgid "Confirm Password:"
+msgstr ""
+
+#: controllers/database.py:173
+msgid "You must avoid all accents, space or special characters."
+msgstr ""
+
+#: controllers/database.py:174
+msgid "Bad database name"
+msgstr ""
+
+#: controllers/database.py:194
+msgid ""
+"The server crashed during installation.\n"
+"We suggest you to drop this database."
+msgstr ""
+
+#: controllers/database.py:195
+msgid "Error during database creation"
+msgstr ""
+
+#: controllers/database.py:198 controllers/database.py:225
+#: controllers/database.py:271 controllers/database.py:294
+msgid "Bad super admin password"
+msgstr ""
+
+#: controllers/database.py:202
+msgid "Could not create database."
+msgstr ""
+
+#: controllers/database.py:228
+msgid "Could not drop database"
+msgstr ""
+
+#: controllers/database.py:251
+msgid "Could not create backup."
+msgstr ""
+
+#: controllers/database.py:275
+msgid "Could not restore database"
+msgstr ""
+
+#: controllers/database.py:298
+msgid "Error, password not changed."
+msgstr ""
+
+#: controllers/error_page.py:79
+msgid ""
+"Your problem has been sent to the quality team\n"
+"We will recontact you after analysing the problem."
+msgstr ""
+
+#: controllers/error_page.py:81
+#, python-format
+msgid ""
+"Your problem could not be sent to the quality team\n"
+"Please report this error manually at %s"
+msgstr ""
+
+#: controllers/form.py:561
+#, python-format
+msgid "Invalid button type \"%s\""
+msgstr ""
+
+#: controllers/form.py:944 controllers/tree.py:243
+msgid "No record selected"
+msgstr ""
+
+#: controllers/form.py:949
+msgid "Print Screen"
+msgstr ""
+
+#: controllers/form.py:1016 widgets/listgrid.py:305 widgets/listgrid.py:366
+#: widgets/form/_form.py:910
+msgid "Application Error"
+msgstr ""
+
+#: controllers/form.py:1016
+#, python-format
+msgid "Wrong on_change trigger: %s"
+msgstr ""
+
+#: controllers/form.py:1121
+msgid "Open resource"
+msgstr ""
+
+#: controllers/form.py:1124
+msgid "Set to default value"
+msgstr ""
+
+#: controllers/form.py:1125
+msgid "Set as default"
+msgstr ""
+
+#: controllers/form.py:1132
+msgid "Action"
+msgstr ""
+
+#: controllers/form.py:1133
+msgid "Report"
+msgstr ""
+
+#: controllers/impex.py:66
+msgid ""
+"Operation failed\n"
+"I/O error"
+msgstr ""
+
+#: controllers/impex.py:402
+msgid "Export Error"
+msgstr ""
+
+#: controllers/impex.py:469
+msgid "Database ID"
+msgstr ""
+
+#: controllers/impex.py:476
+msgid "Error opening .CSV file"
+msgstr ""
+
+#: controllers/impex.py:476
+msgid "Input Error."
+msgstr ""
+
+#: controllers/impex.py:498
+#, python-format
+msgid "You cannot import the field '%s', because we cannot auto-detect it"
+msgstr ""
+
+#: controllers/impex.py:501
+#, python-format
+msgid "Error processing the first line of the file. Field \"%s\" is unknown"
+msgstr ""
+
+#: controllers/impex.py:72 controllers/impex.py:501
+msgid "Import Error."
+msgstr ""
+
+#: controllers/impex.py:520
+msgid "The CSV delimiter must be a single character"
+msgstr ""
+
+#: controllers/impex.py:532
+msgid "File Format Error"
+msgstr ""
+
+#: controllers/impex.py:550
+msgid "XML-RPC error"
+msgstr ""
+
+#: controllers/impex.py:555
+#, python-format
+msgid "Imported %d objects"
+msgstr ""
+
+#: controllers/impex.py:560
+#, python-format
+msgid "Error trying to import this record:%s. ErrorMessage:%s %s"
+msgstr ""
+
+#: controllers/impex.py:561
+msgid "ImportationError"
+msgstr ""
+
+#: controllers/listgrid.py:52
+msgid "Parent record doesn't exists..."
+msgstr ""
+
+#: controllers/preferences.py:35
+msgid "Change your password"
+msgstr ""
+
+#: controllers/preferences.py:65 controllers/templates/header.mako:59
+msgid "Preferences"
+msgstr ""
+
+#: controllers/preferences.py:92
+msgid "All passwords have to be filled."
+msgstr ""
+
+#: controllers/preferences.py:94
+msgid "The new password and its confirmation must be identical."
+msgstr ""
+
+#: controllers/preferences.py:103
+msgid "Could not change your password."
+msgstr ""
+
+#: controllers/preferences.py:105
+msgid "Original password incorrect, your password was not changed."
+msgstr ""
+
+#: controllers/root.py:174
+#, python-format
+msgid "Version %s"
+msgstr ""
+
+#: controllers/translator.py:136
+msgid "You need to save the resource before adding translations."
+msgstr ""
+
+#: controllers/tree.py:274
+msgid "No resource selected"
+msgstr ""
+
+#: controllers/utils.py:43
+msgid "Could not connect to server"
+msgstr ""
+
+#: controllers/utils.py:127 controllers/templates/login_ajax.mako:111
+msgid "Bad username or password"
+msgstr ""
+
+#: controllers/view_log.py:32
+msgid "ID"
+msgstr ""
+
+#: controllers/view_log.py:33
+msgid "Creation User"
+msgstr ""
+
+#: controllers/view_log.py:34
+msgid "Creation Date"
+msgstr ""
+
+#: controllers/view_log.py:35
+msgid "Latest Modification by"
+msgstr ""
+
+#: controllers/view_log.py:36
+msgid "Latest Modification Date"
+msgstr ""
+
+#: controllers/view_log.py:37
+msgid "Owner"
+msgstr ""
+
+#: controllers/view_log.py:38
+msgid "Group Owner"
+msgstr ""
+
+#: controllers/view_log.py:39
+msgid "Access Level"
+msgstr ""
+
+#: controllers/view_log.py:40
+msgid "Internal module data ID"
+msgstr ""
+
+#: controllers/viewed.py:221
+msgid "Invalid view id."
+msgstr ""
+
+#: controllers/viewed.py:499
+msgid "Unable to create inherited view."
+msgstr ""
+
+#: controllers/viewed.py:501
+msgid "Can't create inherited view here."
+msgstr ""
+
+#: controllers/viewed.py:504
+msgid "Not implemented yet!"
+msgstr ""
+
+#: controllers/viewed.py:609
+msgid "Unable to update the view."
+msgstr ""
+
+#: controllers/viewed.py:859
+msgid "New Window"
+msgstr ""
+
+#: controllers/viewed.py:871
+msgid "Save Button"
+msgstr ""
+
+#: controllers/viewed.py:871
+msgid "Cancel Button"
+msgstr ""
+
+#: controllers/viewed.py:871
+msgid "Open Button"
+msgstr ""
+
+#: controllers/viewed.py:877
+msgid "Left"
+msgstr ""
+
+#: controllers/viewed.py:877
+msgid "Center"
+msgstr ""
+
+#: controllers/viewed.py:877
+msgid "Right"
+msgstr ""
+
+#: controllers/templates/about.mako:4
+msgid "About the OpenERP Web"
+msgstr ""
+
+#: controllers/templates/about.mako:27
+msgid "OpenERP Web"
+msgstr ""
+
+#: controllers/templates/about.mako:30
+msgid "Copyright &copy; 2006-TODAY OpenERP SA. All Rights Reserved."
+msgstr ""
+
+#: controllers/templates/about.mako:31
+msgid "OpenERP is a trademark of the OpenERP SA Company."
+msgstr ""
+
+#: controllers/templates/about.mako:33
+#, python-format
+msgid "%(ooweb)s is jointly developed by %(tiny)s and %(axelor)s."
+msgstr ""
+
+#: controllers/templates/about.mako:39
+#, python-format
+msgid "Licenced under the terms of %(license)s"
+msgstr ""
+
+#: controllers/templates/about.mako:42
+msgid "About OpenERP"
+msgstr ""
+
+#: controllers/templates/about.mako:44
+#, python-format
+msgid ""
+"%(openobject)s is a free enterprise-scale software system that is designed "
+"to boost\n"
+"                    productivity and profit through data integration. It "
+"connects, improves and\n"
+"                    manages business processes in areas such as sales, "
+"finance, supply chain,\n"
+"                    project management, production, services, CRM, etc..\n"
+"                    "
+msgstr ""
+
+#: controllers/templates/about.mako:51
+msgid ""
+"The system is platform-independent, and can be installed on Windows, Mac OS "
+"X,\n"
+"                    and various Linux and other Unix-based distributions. "
+"Its architecture enables\n"
+"                    new functionality to be rapidly created, modifications "
+"to be made to a\n"
+"                    production system and migration to a new version to be "
+"straightforward."
+msgstr ""
+
+#: controllers/templates/about.mako:57
+msgid ""
+"Depending on your needs, OpenERP is available through a web or application "
+"client."
+msgstr ""
+
+#: controllers/templates/database.mako:54 controllers/templates/login.mako:4
+#: controllers/templates/login.mako:71 controllers/templates/login_ajax.mako:85
+#: controllers/templates/login_ajax.mako:104
+msgid "Login"
+msgstr ""
+
+#: controllers/templates/database.mako:64
+msgid "Password"
+msgstr ""
+
+#: controllers/templates/error_page.mako:82
+#, python-format
+msgid "An %(error_type)s has been reported."
+msgstr ""
+
+#: controllers/templates/error_page.mako:84
+msgid "Let me fix it"
+msgstr ""
+
+#: controllers/templates/error_page.mako:91
+#: controllers/templates/error_page.mako:93
+msgid "Fix it for me"
+msgstr ""
+
+#: controllers/templates/error_page.mako:99
+msgid "Publisher warranty contract."
+msgstr ""
+
+#: controllers/templates/error_page.mako:100
+msgid ""
+"Your request will be sent to OpenERP and publisher warranty team will reply "
+"you shortly."
+msgstr ""
+
+#: controllers/templates/error_page.mako:104
+msgid "Summary of the problem:"
+msgstr ""
+
+#: controllers/templates/error_page.mako:111
+msgid "Explain what you did:"
+msgstr ""
+
+#: controllers/templates/error_page.mako:120
+msgid "Other Comments:"
+msgstr ""
+
+#: controllers/templates/error_page.mako:132
+msgid "Send to Publisher Warranty Team"
+msgstr ""
+
+#: controllers/templates/error_page.mako:159
+msgid "Write concurrency warning :"
+msgstr ""
+
+#: controllers/templates/error_page.mako:164
+msgid ""
+"This document has been modified while you were editing it.\n"
+"Choose:\n"
+"\n"
+"    - \"Cancel\" to cancel saving.\n"
+"    - \"Write anyway\" to save your current version."
+msgstr ""
+
+#: controllers/templates/error_page.mako:178 controllers/templates/exp.mako:251
+#: controllers/templates/form.mako:141 controllers/templates/openo2m.mako:41
+#: controllers/templates/selection.mako:43
+#: controllers/templates/viewlist.mako:160
+#: controllers/templates/preferences/index.mako:38
+#: widgets/templates/listgrid/listgrid.mako:41
+msgid "Cancel"
+msgstr ""
+
+#: controllers/templates/error_page.mako:179
+msgid "Write Anyway"
+msgstr ""
+
+#: controllers/templates/exp.mako:151
+msgid "Export Data"
+msgstr ""
+
+#: controllers/templates/exp.mako:166
+msgid "Export Type:"
+msgstr ""
+
+#: controllers/templates/exp.mako:169
+msgid "Import Compatible Export"
+msgstr ""
+
+#: controllers/templates/exp.mako:172
+msgid "Export all Data"
+msgstr ""
+
+#: controllers/templates/exp.mako:190
+msgid "Available fields"
+msgstr ""
+
+#: controllers/templates/exp.mako:192
+msgid "Fields to export"
+msgstr ""
+
+#: controllers/templates/exp.mako:194
+msgid "Save fields list"
+msgstr ""
+
+#: controllers/templates/exp.mako:196
+msgid "Save as:"
+msgstr ""
+
+#: controllers/templates/exp.mako:198 controllers/templates/fieldpref.mako:102
+#: controllers/templates/selection.mako:45
+msgid "OK"
+msgstr ""
+
+#: controllers/templates/exp.mako:202
+msgid "Saved exports:"
+msgstr ""
+
+#: controllers/templates/exp.mako:211 controllers/templates/form.mako:136
+#: widgets/form/templates/one2many.mako:23 widgets/templates/sidebar.mako:67
+#: widgets/templates/listgrid/listgrid.mako:119
+#: widgets/templates/listgrid/listgrid.mako:123
+#: widgets/templates/listgrid/listgrid.mako:127
+#: widgets/templates/listgrid/listgrid.mako:191
+#: widgets/templates/listgrid/listgrid.mako:196
+#: widgets/templates/listgrid/listgroup.mako:131
+#: widgets/templates/listgrid/multiple_group.mako:81
+msgid "Delete"
+msgstr ""
+
+#: controllers/templates/exp.mako:224 widgets/templates/sidebar.mako:56
+#: widgets/templates/listgrid/listgrid.mako:153
+msgid "Add"
+msgstr ""
+
+#: controllers/templates/exp.mako:229 controllers/templates/viewlist.mako:125
+msgid "Remove"
+msgstr ""
+
+#: controllers/templates/exp.mako:234
+msgid "Remove All"
+msgstr ""
+
+#: controllers/templates/exp.mako:252
+msgid "Export to File"
+msgstr ""
+
+#: controllers/templates/fieldpref.mako:4
+#: controllers/templates/fieldpref.mako:29
+msgid "Field Preferences"
+msgstr ""
+
+#: controllers/templates/fieldpref.mako:39
+msgid "Field Name:"
+msgstr ""
+
+#: controllers/templates/fieldpref.mako:43
+msgid "Domain:"
+msgstr ""
+
+#: controllers/templates/fieldpref.mako:47
+msgid "Default Value:"
+msgstr ""
+
+#: controllers/templates/fieldpref.mako:57
+msgid "Value applicable for:"
+msgstr ""
+
+#: controllers/templates/fieldpref.mako:63
+msgid "Only for you"
+msgstr ""
+
+#: controllers/templates/fieldpref.mako:67
+msgid "For all"
+msgstr ""
+
+#: controllers/templates/fieldpref.mako:76
+msgid "Value applicable if:"
+msgstr ""
+
+#: controllers/templates/fieldpref.mako:79
+msgid "Always applicable!"
+msgstr ""
+
+#: controllers/templates/fieldpref.mako:99 controllers/templates/imp.mako:204
+#: controllers/templates/index.mako:201 controllers/templates/openm2.mako:52
+#: controllers/templates/save_filter.mako:42
+#: controllers/templates/search.mako:129
+#: controllers/templates/translator.mako:41
+#: controllers/templates/translator.mako:108
+#: controllers/templates/viewed.mako:37
+#: controllers/templates/viewed_new.mako:43
+#: controllers/templates/viewed_new_model.mako:42
+#: controllers/templates/viewed_preview.mako:28
+#: controllers/templates/viewlist.mako:129 widgets/templates/sidebar.mako:67
+#: widgets/templates/viewform.mako:37
+msgid "Close"
+msgstr ""
+
+#: controllers/templates/footer.mako:3
+#, python-format
+msgid "&copy; 2008-2010 %(ooweb)s  SA. All Rights Reserved "
+msgstr ""
+
+#: controllers/templates/footer.mako:6
+msgid "Significant contributions to the web client have been made by"
+msgstr ""
+
+#: controllers/templates/form.mako:64 controllers/templates/tree.mako:33
+msgid "Disable all Tips"
+msgstr ""
+
+#: controllers/templates/form.mako:65 controllers/templates/tree.mako:34
+msgid "Hide this Tip"
+msgstr ""
+
+#: controllers/templates/form.mako:83 controllers/templates/tree.mako:41
+msgid "Add / Remove Shortcut..."
+msgstr ""
+
+#: controllers/templates/form.mako:87
+#, python-format
+msgid "Search: %s"
+msgstr ""
+
+#: controllers/templates/form.mako:94
+msgid "Corporate Intelligence..."
+msgstr ""
+
+#: controllers/templates/form.mako:100
+msgid "Show Logs..."
+msgstr ""
+
+#: controllers/templates/form.mako:112
+msgid "Create a new resource"
+msgstr ""
+
+#: controllers/templates/form.mako:113 controllers/templates/search.mako:128
+#: controllers/templates/viewed_new_model.mako:36
+#: controllers/templates/viewlist.mako:119 widgets/form/_o2m.py:97
+#: widgets/form/templates/one2many.mako:21
+#: widgets/templates/listgrid/listgrid.mako:158
+#: widgets/templates/listgrid/listgrid.mako:162
+#: widgets/templates/listgrid/listgroup.mako:20
+msgid "New"
+msgstr ""
+
+#: controllers/templates/form.mako:117
+msgid "Edit this resource"
+msgstr ""
+
+#: controllers/templates/form.mako:118 controllers/templates/viewlist.mako:122
+#: widgets/templates/listgrid/listgrid.mako:83
+#: widgets/templates/listgrid/listgrid.mako:93
+#: widgets/templates/listgrid/listgroup.mako:112
+#: widgets/templates/listgrid/multiple_group.mako:63
+msgid "Edit"
+msgstr ""
+
+#: controllers/templates/form.mako:122
+msgid "Save this resource"
+msgstr ""
+
+#: controllers/templates/form.mako:123 controllers/templates/openm2.mako:48
+#: controllers/templates/save_filter.mako:41
+#: controllers/templates/translator.mako:39
+#: controllers/templates/translator.mako:106
+#: controllers/templates/viewed_new.mako:40
+#: controllers/templates/viewed_new_model.mako:39
+#: controllers/templates/viewlist.mako:157
+#: controllers/templates/preferences/index.mako:39
+msgid "Save"
+msgstr ""
+
+#: controllers/templates/form.mako:125
+msgid "Save & Edit this resource"
+msgstr ""
+
+#: controllers/templates/form.mako:126
+msgid "Save & Edit"
+msgstr ""
+
+#: controllers/templates/form.mako:130
+msgid "Duplicate this resource"
+msgstr ""
+
+#: controllers/templates/form.mako:131
+msgid "Duplicate"
+msgstr ""
+
+#: controllers/templates/form.mako:135
+msgid "Delete this resource"
+msgstr ""
+
+#: controllers/templates/form.mako:140
+msgid "Cancel editing the current resource"
+msgstr ""
+
+#: controllers/templates/form.mako:145
+msgid "Create new node"
+msgstr ""
+
+#: controllers/templates/form.mako:146
+msgid "New Node"
+msgstr ""
+
+#: controllers/templates/form.mako:150
+msgid "Show grid in workflow canvas"
+msgstr ""
+
+#: controllers/templates/form.mako:151
+msgid "Show grid"
+msgstr ""
+
+#: controllers/templates/header.mako:33
+#, python-format
+msgid "%(company)s"
+msgstr ""
+
+#: controllers/templates/header.mako:34 controllers/templates/index.mako:230
+#, python-format
+msgid "%(user)s"
+msgstr ""
+
+#: controllers/templates/header.mako:45 controllers/templates/header.mako:47
+msgid "Home"
+msgstr ""
+
+#: controllers/templates/header.mako:53
+msgid "Requests"
+msgstr ""
+
+#: controllers/templates/header.mako:62
+msgid "Edit Preferences"
+msgstr ""
+
+#: controllers/templates/header.mako:66 controllers/templates/header.mako:69
+msgid "About"
+msgstr ""
+
+#: controllers/templates/header.mako:73 controllers/templates/header.mako:75
+msgid "Help"
+msgstr ""
+
+#: controllers/templates/header.mako:81 controllers/templates/header.mako:84
+msgid "Clear Cache"
+msgstr ""
+
+#: controllers/templates/header.mako:89
+msgid "Logout"
+msgstr ""
+
+#: controllers/templates/imp.mako:79
+msgid "Import Data"
+msgstr ""
+
+#: controllers/templates/imp.mako:89
+msgid "1. Import a .CSV file"
+msgstr ""
+
+#: controllers/templates/imp.mako:105
+msgid "CSV File:"
+msgstr ""
+
+#: controllers/templates/imp.mako:123
+msgid "2. Check your file format"
+msgstr ""
+
+#: controllers/templates/imp.mako:130
+#, python-format
+msgid "The import failed due to: %(message)s"
+msgstr ""
+
+#: controllers/templates/imp.mako:132
+msgid "Here is a preview of the file we could not import:"
+msgstr ""
+
+#: controllers/templates/imp.mako:157
+msgid "CSV Options"
+msgstr ""
+
+#: controllers/templates/imp.mako:160
+msgid "Separator:"
+msgstr ""
+
+#: controllers/templates/imp.mako:162
+msgid "Delimiter:"
+msgstr ""
+
+#: controllers/templates/imp.mako:166
+msgid "Encoding:"
+msgstr ""
+
+#: controllers/templates/imp.mako:173
+msgid "Lines to skip:"
+msgstr ""
+
+#: controllers/templates/imp.mako:187
+msgid "3. File imported"
+msgstr ""
+
+#: controllers/templates/imp.mako:205
+msgid "Import File"
+msgstr ""
+
+#: controllers/templates/index.mako:167
+msgid "System Logs"
+msgstr ""
+
+#: controllers/templates/index.mako:192
+msgid "More"
+msgstr ""
+
+#: controllers/templates/index.mako:193
+msgid "Widgets"
+msgstr ""
+
+#: controllers/templates/index.mako:233 controllers/templates/index.mako:238
+#, python-format
+msgid "Powered by %(openerp)s "
+msgstr ""
+
+#: controllers/templates/login.mako:57 controllers/templates/login_ajax.mako:72
+#: controllers/templates/login_ajax.mako:94
+msgid "User:"
+msgstr ""
+
+#: controllers/templates/login.mako:68
+msgid "Databases"
+msgstr ""
+
+#: controllers/templates/login.mako:88
+msgid "Top Contributor:"
+msgstr ""
+
+#: controllers/templates/login.mako:98
+msgid ""
+"We think that daily job activities can be more intuitive, efficient, "
+"automated, .. and even fun."
+msgstr ""
+
+#: controllers/templates/login.mako:99
+msgid "OpenERP's vision to be:"
+msgstr ""
+
+#: controllers/templates/login.mako:107
+msgid "Full featured"
+msgstr ""
+
+#: controllers/templates/login.mako:108
+msgid ""
+"Today's enterprise challenges are multiple. We provide one module for each "
+"need."
+msgstr ""
+
+#: controllers/templates/login.mako:116
+msgid "Open Source"
+msgstr ""
+
+#: controllers/templates/login.mako:117
+msgid ""
+"To Build a great product, we rely on the knowledge of thousands of "
+"contributors."
+msgstr ""
+
+#: controllers/templates/login.mako:125
+msgid "User Friendly"
+msgstr ""
+
+#: controllers/templates/login.mako:126
+msgid ""
+"In order to be productive, people need clean and easy to use interface."
+msgstr ""
+
+#: controllers/templates/modules.mako:4
+msgid "Module Management"
+msgstr ""
+
+#: controllers/templates/modules.mako:17
+msgid "Web Modules"
+msgstr ""
+
+#: controllers/templates/openo2m.mako:34
+msgid "Save & Close"
+msgstr ""
+
+#: controllers/templates/openo2m.mako:37
+msgid "Save & New"
+msgstr ""
+
+#: controllers/templates/save_filter.mako:18
+msgid "Save as Filter"
+msgstr ""
+
+#: controllers/templates/save_filter.mako:30
+msgid "Filter Name"
+msgstr ""
+
+#: controllers/templates/search.mako:110
+#, python-format
+msgid "Search %(name)s"
+msgstr ""
+
+#: controllers/templates/search.mako:125 widgets/form/templates/datetime.mako:8
+msgid "Select"
+msgstr ""
+
+#: controllers/templates/search.mako:127 widgets/_views.py:77
+#: widgets/form/templates/many2one.mako:22
+#: widgets/form/templates/reference.mako:27 widgets/templates/viewform.mako:26
+msgid "Search"
+msgstr ""
+
+#: controllers/templates/search.mako:143
+#, python-format
+msgid "No record found : '%(searched_string)s'."
+msgstr ""
+
+#: controllers/templates/selection.mako:4
+msgid "Select action"
+msgstr ""
+
+#: controllers/templates/selection.mako:23
+msgid "Select your action"
+msgstr ""
+
+#: controllers/templates/server_log.mako:4
+msgid "Server Actions..."
+msgstr ""
+
+#: controllers/templates/server_log.mako:14
+msgid "Server Actions"
+msgstr ""
+
+#: controllers/templates/translator.mako:4
+msgid "Add Translations"
+msgstr ""
+
+#: controllers/templates/translator.mako:17
+msgid "Add Translation"
+msgstr ""
+
+#: controllers/templates/translator.mako:27
+msgid "Add Translation for:"
+msgstr ""
+
+#: controllers/templates/translator.mako:31
+msgid "Fields"
+msgstr ""
+
+#: controllers/templates/translator.mako:32
+msgid "Labels"
+msgstr ""
+
+#: controllers/templates/translator.mako:33
+msgid "Relates"
+msgstr ""
+
+#: controllers/templates/translator.mako:34
+msgid "View"
+msgstr ""
+
+#: controllers/templates/translator.mako:53
+msgid "Field"
+msgstr ""
+
+#: controllers/templates/view_log.mako:4 controllers/templates/view_log.mako:12
+msgid "Information"
+msgstr ""
+
+#: controllers/templates/viewed.mako:17
+#, python-format
+msgid "View Editor %s - %s"
+msgstr ""
+
+#: controllers/templates/viewed.mako:31
+msgid "Create a new inherited view"
+msgstr ""
+
+#: controllers/templates/viewed.mako:31
+msgid "Inherited View"
+msgstr ""
+
+#: controllers/templates/viewed.mako:34
+msgid "Preview"
+msgstr ""
+
+#: controllers/templates/viewed_add.mako:6
+msgid "Node Type:"
+msgstr ""
+
+#: controllers/templates/viewed_add.mako:23
+msgid "New Field"
+msgstr ""
+
+#: controllers/templates/viewed_add.mako:27
+msgid "Position:"
+msgstr ""
+
+#: controllers/templates/viewlist.mako:4
+#: controllers/templates/viewlist.mako:108
+#, python-format
+msgid "Manage Views (%s)"
+msgstr ""
+
+#: controllers/templates/viewlist.mako:146
+#, python-format
+msgid "Create a view (%s)"
+msgstr ""
+
+#: controllers/templates/viewlist.mako:174
+msgid "View Name:"
+msgstr ""
+
+#: controllers/templates/viewlist.mako:178
+msgid "View Type:"
+msgstr ""
+
+#: controllers/templates/viewlist.mako:189
+msgid "Priority:"
+msgstr ""
+
+#: utils/common.py:24
+msgid "Error"
+msgstr ""
+
+#: utils/common.py:27
+msgid "Warning"
+msgstr ""
+
+#: utils/rpc.py:131
+msgid "Access Denied"
+msgstr ""
+
+#: utils/rpc.py:238
+msgid "Unsupported protocol."
+msgstr ""
+
+#: utils/rpc.py:342
+msgid ""
+"You select a timezone but OpenERP could not find pytz library!\n"
+"The timezone functionality will be disable."
+msgstr ""
+
+#: utils/rpc.py:355
+msgid "Not logged..."
+msgstr ""
+
+#: utils/rpc.py:355
+msgid "Authorization Error"
+msgstr ""
+
+#: utils/rpc.py:439
+msgid "== Access Denied =="
+msgstr ""
+
+#: widgets/_views.py:46
+msgid "Form"
+msgstr ""
+
+#: widgets/_views.py:47
+msgid "Form view..."
+msgstr ""
+
+#: widgets/_views.py:78
+msgid "Search view..."
+msgstr ""
+
+#: widgets/listgrid.py:305
+msgid "Wrong on_change trigger"
+msgstr ""
+
+#: widgets/listgrid.py:368 widgets/form/_form.py:904
+#, python-format
+msgid "Invalid view, duplicate field: %s"
+msgstr ""
+
+#: widgets/pager.py:56
+#, python-format
+msgid "%s"
+msgstr ""
+
+#: widgets/pager.py:68
+#, python-format
+msgid "%s - %s"
+msgstr ""
+
+#: widgets/search.py:280
+msgid "contains"
+msgstr ""
+
+#: widgets/search.py:280
+msgid "doesn't contain"
+msgstr ""
+
+#: widgets/search.py:281
+msgid "is equal to"
+msgstr ""
+
+#: widgets/search.py:281
+msgid "is not equal to"
+msgstr ""
+
+#: widgets/search.py:282
+msgid "greater than"
+msgstr ""
+
+#: widgets/search.py:282
+msgid "less than"
+msgstr ""
+
+#: widgets/search.py:283
+msgid "in"
+msgstr ""
+
+#: widgets/search.py:283
+msgid "not in"
+msgstr ""
+
+#: widgets/search.py:392
+msgid "Yes"
+msgstr ""
+
+#: widgets/search.py:392
+msgid "No"
+msgstr ""
+
+#: widgets/form/_action.py:48
+msgid "Action not found!"
+msgstr ""
+
+#: widgets/form/_o2m.py:97 widgets/templates/listgrid/listgrid.mako:156
+#: widgets/templates/listgrid/listgrid.mako:162
+#: widgets/templates/listgrid/listgroup.mako:20
+msgid "Create new record."
+msgstr ""
+
+#: widgets/form/_o2m.py:110
+msgid "Save/New"
+msgstr ""
+
+#: widgets/form/_o2m.py:110
+msgid "Save parent record."
+msgstr ""
+
+#: widgets/form/_o2m.py:229
+#, python-format
+msgid "%d of %d"
+msgstr ""
+
+#: widgets/form/_o2m.py:231
+#, python-format
+msgid "- of %d"
+msgstr ""
+
+#: widgets/form/templates/binary.mako:28
+msgid "Save As"
+msgstr ""
+
+#: widgets/form/templates/binary.mako:31
+msgid "add attachment"
+msgstr ""
+
+#: widgets/form/templates/image.mako:6
+msgid "Replace image"
+msgstr ""
+
+#: widgets/form/templates/many2one.mako:2
+#: widgets/form/templates/reference.mako:30
+msgid "Open"
+msgstr ""
+
+#: widgets/form/templates/many2one.mako:2
+#: widgets/form/templates/reference.mako:30
+msgid "Open a resource"
+msgstr ""
+
+#: widgets/form/templates/one2many.mako:21
+msgid "Create new record..."
+msgstr ""
+
+#: widgets/form/templates/one2many.mako:23
+msgid "Delete record..."
+msgstr ""
+
+#: widgets/form/templates/one2many.mako:29
+msgid "Translate me."
+msgstr ""
+
+#: widgets/form/templates/one2many.mako:48
+msgid "Previous record..."
+msgstr ""
+
+#: widgets/form/templates/one2many.mako:50
+msgid "Next record..."
+msgstr ""
+
+#: widgets/templates/logs.mako:22
+msgid "More..."
+msgstr ""
+
+#: widgets/templates/logs.mako:35
+msgid "Less..."
+msgstr ""
+
+#: widgets/templates/pager.mako:9
+msgid "<< First"
+msgstr ""
+
+#: widgets/templates/pager.mako:14
+msgid "< Previous"
+msgstr ""
+
+#: widgets/templates/pager.mako:19
+msgid "of"
+msgstr ""
+
+#: widgets/templates/pager.mako:24
+msgid "Next >"
+msgstr ""
+
+#: widgets/templates/pager.mako:29
+msgid "Last >>"
+msgstr ""
+
+#: widgets/templates/pager.mako:37
+msgid "Change Limit:"
+msgstr ""
+
+#: widgets/templates/sidebar.mako:37
+msgid "Reports"
+msgstr ""
+
+#: widgets/templates/sidebar.mako:41 widgets/templates/viewform.mako:51
+msgid "Actions"
+msgstr ""
+
+#: widgets/templates/sidebar.mako:45
+msgid "Links"
+msgstr ""
+
+#: widgets/templates/sidebar.mako:49
+msgid "Submenu"
+msgstr ""
+
+#: widgets/templates/sidebar.mako:54
+msgid "Attachments"
+msgstr ""
+
+#: widgets/templates/sidebar.mako:74
+msgid "File"
+msgstr ""
+
+#: widgets/templates/sidebar.mako:83
+msgid "Customize"
+msgstr ""
+
+#: widgets/templates/sidebar.mako:87
+msgid "Manage views of the current object"
+msgstr ""
+
+#: widgets/templates/sidebar.mako:89
+msgid "Manage Views"
+msgstr ""
+
+#: widgets/templates/sidebar.mako:93
+msgid "Edit workflow of the current object"
+msgstr ""
+
+#: widgets/templates/sidebar.mako:94
+msgid "Edit Workflow"
+msgstr ""
+
+#: widgets/templates/sidebar.mako:98
+msgid "Customize current object or create a new object"
+msgstr ""
+
+#: widgets/templates/sidebar.mako:100
+msgid "Customize Object"
+msgstr ""
+
+#: widgets/templates/sidebar.mako:106
+msgid "Other Options"
+msgstr ""
+
+#: widgets/templates/sidebar.mako:111 widgets/templates/sidebar.mako:119
+msgid "Import"
+msgstr ""
+
+#: widgets/templates/sidebar.mako:114 widgets/templates/sidebar.mako:122
+msgid "Export"
+msgstr ""
+
+#: widgets/templates/sidebar.mako:126
+msgid "Translate"
+msgstr ""
+
+#: widgets/templates/sidebar.mako:131
+msgid "View Log"
+msgstr ""
+
+#: widgets/templates/viewform.mako:25
+msgid "Filter records."
+msgstr ""
+
+#: widgets/templates/viewform.mako:33
+msgid "Clear all."
+msgstr ""
+
+#: widgets/templates/viewform.mako:35
+msgid "Clear"
+msgstr ""
+
+#: widgets/templates/viewform.mako:43
+msgid "Filters"
+msgstr ""
+
+#: widgets/templates/viewform.mako:45
+msgid "Saved Filters"
+msgstr ""
+
+#: widgets/templates/viewform.mako:52
+msgid "New Filter"
+msgstr ""
+
+#: widgets/templates/viewform.mako:53
+msgid "Save Filter"
+msgstr ""
+
+#: widgets/templates/viewform.mako:54
+msgid "Manage Filters"
+msgstr ""
+
+#: widgets/templates/listgrid/listgrid.mako:23
+msgid "Update"
+msgstr ""
+
+#: widgets/templates/listgrid/listgrid.mako:152
+msgid "Add records..."
+msgstr ""
+
+#: widgets/templates/listgrid/listgrid.mako:190
+#: widgets/templates/listgrid/listgrid.mako:194
+msgid "Delete record(s)."
+msgstr ""

=== modified file 'addons/openerp/po/messages/ca.po'
--- addons/openerp/po/messages/ca.po	2011-08-04 05:14:27 +0000
+++ addons/openerp/po/messages/ca.po	2012-10-22 08:15:24 +0000
@@ -8,14 +8,20 @@
 "Project-Id-Version: openobject-client-web\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-03-18 11:53+0100\n"
-"PO-Revision-Date: 2011-02-28 12:02+0000\n"
-"Last-Translator: Esther Xaus (Zikzakmedia) <Unknown>\n"
+"PO-Revision-Date: 2011-08-18 19:03+0000\n"
+"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
+"<[e-mail]>\n"
 "Language-Team: Catalan <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-08-04 05:13+0000\n"
 "X-Generator: Launchpad (build 13573)\n"
+=======
+"X-Launchpad-Export-Date: 2012-10-09 05:00+0000\n"
+"X-Generator: Launchpad (build 16112)\n"
+>>>>>>> MERGE-SOURCE
 
 #: validators.py:75
 msgid "Invalid literal for float"
@@ -403,11 +409,11 @@
 
 #: controllers/impex.py:520
 msgid "The CSV delimiter must be a single character"
-msgstr ""
+msgstr "El delimitador CSV ha de ser un únic caràcter"
 
 #: controllers/impex.py:532
 msgid "File Format Error"
-msgstr ""
+msgstr "Error format de fitxer"
 
 #: controllers/impex.py:550
 msgid "XML-RPC error"
@@ -1422,7 +1428,7 @@
 
 #: widgets/form/templates/image.mako:6
 msgid "Replace image"
-msgstr ""
+msgstr "Reemplaça imatge"
 
 #: widgets/form/templates/many2one.mako:2
 #: widgets/form/templates/reference.mako:30
@@ -1602,87 +1608,3 @@
 #: widgets/templates/listgrid/listgrid.mako:194
 msgid "Delete record(s)."
 msgstr "Elimina registre(s)."
-
-#~ msgid "You do not have a valid OpenERP publisher warranty contract !"
-#~ msgstr "No disposeu d'un contracte vàlid de garantia de l'editor d'OpenERP!"
-
-#~ msgid ""
-#~ "If you are using OpenERP in production, it is recommended to have\n"
-#~ "a publisher warranty program.\n"
-#~ "\n"
-#~ "The OpenERP publisher warranty contract provides you with bug fix guarantees "
-#~ "and an\n"
-#~ "automatic migration system so that we can start working on your problems "
-#~ "within a few\n"
-#~ "hours.\n"
-#~ "\n"
-#~ "With a publisher warranty contract, errors such as this one can be sent "
-#~ "directly to the OpenERP\n"
-#~ "team for review and evaluation.\n"
-#~ "\n"
-#~ "The publisher warranty program offers you:\n"
-#~ "* Automatic migrations on new versions,\n"
-#~ "* A bugfix guarantee,\n"
-#~ "* Monthly announces of potential bugs and their fixes,\n"
-#~ "* Security alerts by email and automatic migration,\n"
-#~ "* Access to the customer portal.\n"
-#~ msgstr ""
-#~ "Si esteu utilitzant OpenERP en producció, us recomanem adquirir\n"
-#~ "un contracte de garantia de l'editor.\n"
-#~ "El contracte de garantia de l'editor d'OpenERP us proporciona garanties de "
-#~ "correcció d'errors\n"
-#~ "i una migració automàtica del sistema, i nosaltres podrem treballar en el "
-#~ "vostre problema\n"
-#~ "en poques hores.\n"
-#~ "Amb el contracte de garantia de l'editor, errors com l'actual es poden "
-#~ "enviar directament a \n"
-#~ "l'equip d'OpenERP per la sevq revisió i avaluació.\n"
-#~ "El contracte de garantia de l'editor a més us ofereix:\n"
-#~ "* Migracions automàtiques cap noves versions,\n"
-#~ "* Garantia en correcció d'errors,\n"
-#~ "* Anuncis mensuals d'errors potencials i les seves solucions,\n"
-#~ "* Alertes de seguretat per email i migració automàtica,\n"
-#~ "* Accés al portal de clients.\n"
-
-#~ msgid ""
-#~ "Your publisher warranty contract does not cover all modules installed in "
-#~ "your system !\n"
-#~ "If you are using OpenERP in production, it is highly suggested to upgrade "
-#~ "your\n"
-#~ "contract.\n"
-#~ "\n"
-#~ "If you have developed your own modules or installed third party module, we\n"
-#~ "can provide you an additional publisher warranty contract for these modules. "
-#~ "After\n"
-#~ "having reviewed your modules, our quality team will ensure they will "
-#~ "migrate\n"
-#~ "automatically for all future stable versions of OpenERP at no extra cost.\n"
-#~ "\n"
-#~ "Here is the list of modules not covered by your publisher warranty contract:"
-#~ msgstr ""
-#~ "El vostre contracte de garantia de l'editor no cobreix tots els mòduls "
-#~ "instal·lats en el vostre sistema!\n"
-#~ "Si esteu utilitzant OpenERP en producció, és recomanable actualitzar el "
-#~ "vostre\n"
-#~ "contracte.\n"
-#~ "\n"
-#~ "Si heu desenvolupat els vostres propis mòduls o instal·lat un mòdul de "
-#~ "tercers, \n"
-#~ "podem oferir-li un contracte de garantia de l'editor addicional per aquests "
-#~ "mòduls. Després \n"
-#~ "d'haver examinat els mòduls, el nostre equip de qualitat garantira que els "
-#~ "migraran\n"
-#~ "automàticament per totes les versions futures estables d'OpenERP, sense cost "
-#~ "addicional.\n"
-#~ "\n"
-#~ "Aquesta és la llista dels mòduls que no estan coberts pel contracte de "
-#~ "garantia de l'editor:"
-
-#~ msgid "Image"
-#~ msgstr "Imatge"
-
-#~ msgid "Add Resource:"
-#~ msgstr "Afegeix recurs:"
-
-#~ msgid "Click here to add new image."
-#~ msgstr "Feu clic aquí per afegir una nova imatge."

=== added file 'addons/openerp/po/messages/cs.po'
--- addons/openerp/po/messages/cs.po	1970-01-01 00:00:00 +0000
+++ addons/openerp/po/messages/cs.po	2012-10-22 08:15:24 +0000
@@ -0,0 +1,1594 @@
+# Translations template for PROJECT.
+# Copyright (C) 2011 ORGANIZATION
+# This file is distributed under the same license as the PROJECT project.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-client-web\n"
+"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
+"POT-Creation-Date: 2011-03-18 11:53+0100\n"
+"PO-Revision-Date: 2011-12-14 10:07+0000\n"
+"Last-Translator: Konki <[e-mail]>\n"
+"Language-Team: Czech\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-09 05:00+0000\n"
+"X-Generator: Launchpad (build 16112)\n"
+"X-Poedit-Language: Czech\n"
+"Generated-By: Babel 0.9.5\n"
+
+#: validators.py:75
+msgid "Invalid literal for float"
+msgstr "Neplatné znaky pro desetinné číslo"
+
+#: validators.py:114 validators.py:119 validators.py:262
+msgid "Invalid datetime format"
+msgstr "Neplatný formát data a času"
+
+#: validators.py:166
+msgid "Please select a file."
+msgstr "Prosíme vyberte soubor."
+
+#: validators.py:247
+msgid "Please enter an email address"
+msgstr "Prosíme zadejte emailovou adresu"
+
+#: validators.py:248
+msgid "An email address must contain a single @"
+msgstr "Emailová adresa musí obsahovat jediný @"
+
+#: validators.py:249
+#, python-format
+msgid ""
+"The username portion of the email address is invalid (the portion before the "
+"@: %(username)s)"
+msgstr ""
+"Část jména uživatele emailové adresy není platná (část přes @: %(username)s)"
+
+#: validators.py:250
+#, python-format
+msgid ""
+"The domain portion of the email address is invalid (the portion after the @: "
+"%(domain)s)"
+msgstr "Neplatná doménová část emailové adresy (část po @: %(domain)s)"
+
+#: validators.py:254
+msgid "You must start your URL with http://, https://, etc"
+msgstr "Vaše URL musí začínat http://, https://, atd."
+
+#: validators.py:255
+msgid "That is not a valid URL"
+msgstr "Toto není platné URL"
+
+#: validators.py:256
+#, python-format
+msgid "You must provide a full domain name (like %(domain)s.com)"
+msgstr "Musíte poskytnout plné jméno domény (jako %(domain)s.com)"
+
+#: validators.py:260
+msgid "Please enter an integer value"
+msgstr "Prosíme zadejte číselnou hodnotu"
+
+#: validators.py:261
+msgid "Please enter a number"
+msgstr "Prosíme zadejte číslo"
+
+#: controllers/actions.py:94
+msgid "Invalid View"
+msgstr "Neplatný pohled"
+
+#: controllers/actions.py:127
+msgid "Error no report"
+msgstr "Chyba bez hlášení"
+
+#: controllers/actions.py:153
+msgid "Nothing to print"
+msgstr "Není co tisknout!"
+
+#: controllers/actions.py:173
+msgid "Printing aborted, too long delay"
+msgstr "Tisk zrušen, dlouhá čekací prodleva"
+
+#: controllers/actions.py:397
+msgid "Relative URLs are not supported"
+msgstr "Nejsou podporována relativní URL"
+
+#: controllers/actions.py:425
+msgid "Action not found"
+msgstr "Akce nenalezena"
+
+#: controllers/actions.py:474
+msgid "No action defined"
+msgstr "Nedefinována žádná akce"
+
+#: controllers/attachment.py:55
+msgid "No record selected, You can only attach to existing record..."
+msgstr "Nevybrán záznam, můžete přiložit pouze k existujícímu záznamu..."
+
+#: controllers/database.py:63
+msgid "Create database"
+msgstr "Vytvořit databázi"
+
+#: controllers/database.py:65 controllers/templates/database.mako:56
+#: controllers/templates/search.mako:145
+msgid "Create"
+msgstr "Vytvořit"
+
+#: controllers/database.py:68
+msgid "Super admin password:"
+msgstr "Heslo hlavního správce:"
+
+#: controllers/database.py:68
+msgid ""
+"This is the password of the user that have the rights to administer "
+"databases. This is not a OpenERP user, just a super administrator. If you "
+"did not changed it, the password is 'admin' after installation."
+msgstr ""
+"Toto je heslo uživatele, který má práva spravovat databázi. Toto není "
+"uživatel OpenERP, jen super správce. Heslo po instalaci je 'admin', pokud "
+"jste jej nezměnili."
+
+#: controllers/database.py:69 controllers/database.py:101
+msgid "New database name:"
+msgstr "Jméno nové databáze:"
+
+#: controllers/database.py:69
+msgid ""
+"Choose the name of the database that will be created. The name must not "
+"contain any special character. Exemple: 'terp'."
+msgstr ""
+"Vyberte jméno databáze, která bude vytvořena. Jméno nesmí obsahovat "
+"speciální symboly. Příklad: 'terp'."
+
+#: controllers/database.py:70
+msgid "Load Demonstration data:"
+msgstr "Načíst ukázkové údaje:"
+
+#: controllers/database.py:70
+msgid ""
+"Check this box if you want demonstration data to be installed on your new "
+"database. These data will help you to understand OpenERP, with predefined "
+"products, partners, etc."
+msgstr ""
+"Zaškrtněte toto pole, pokud chcete nechat načíst ukázková data do vaší nové "
+"databáze. Tyto data vám pomůžou pochopit OpenERP, s přednastavenými výrobky, "
+"partnery, aj."
+
+#: controllers/database.py:71
+msgid "Default Language:"
+msgstr "Výchozí jazyk:"
+
+#: controllers/database.py:71
+msgid ""
+"Choose the default language that will be installed for this database. You "
+"will be able to install new languages after installation through the "
+"administration menu."
+msgstr ""
+"Vyberte výchozí jazyk, který bude instalován do této databáze. Po instalaci "
+"budete mít možnost instalovat nové jazyky přes správcovskou nabídku."
+
+#: controllers/database.py:72
+msgid "Administrator password:"
+msgstr "Heslo správce:"
+
+#: controllers/database.py:72
+msgid ""
+"This is the password of the 'admin' user that will be created in your new "
+"database."
+msgstr ""
+"Toto je heslo uživatele 'admin', který bude vytvořen ve vaši nové databázi."
+
+#: controllers/database.py:73
+msgid "Confirm password:"
+msgstr "Potvrdit heslo:"
+
+#: controllers/database.py:73
+msgid ""
+"This is the password of the 'admin' user that will be created in your new "
+"database. It has to be the same than the above field."
+msgstr ""
+"Toto je heslo uživatele 'admin', který bude vytvořen ve vaši nové databázi. "
+"Musí být stejné jako pole nad ním."
+
+#: controllers/database.py:79
+msgid "Drop database"
+msgstr "Odstranit databázi"
+
+#: controllers/database.py:81 controllers/templates/database.mako:58
+msgid "Drop"
+msgstr "Odstranit"
+
+#: controllers/database.py:83 controllers/database.py:91
+#: controllers/templates/login.mako:43
+msgid "Database:"
+msgstr "Databáze:"
+
+#: controllers/database.py:84 controllers/database.py:92
+#: controllers/database.py:100 controllers/templates/login.mako:61
+#: controllers/templates/login_ajax.mako:78
+#: controllers/templates/login_ajax.mako:98
+msgid "Password:"
+msgstr "Heslo:"
+
+#: controllers/database.py:88
+msgid "Backup database"
+msgstr "Zálohovat databáze"
+
+#: controllers/database.py:90 controllers/templates/database.mako:60
+msgid "Backup"
+msgstr "Zálohovat"
+
+#: controllers/database.py:96
+msgid "Restore database"
+msgstr "Obnovit databázi"
+
+#: controllers/database.py:98 controllers/templates/database.mako:62
+msgid "Restore"
+msgstr "Obnovit"
+
+#: controllers/database.py:99
+msgid "File:"
+msgstr "Soubor:"
+
+#: controllers/database.py:105
+msgid "Change Administrator Password"
+msgstr "Změnit heslo správce"
+
+#: controllers/database.py:107 controllers/templates/preferences/index.mako:37
+msgid "Change Password"
+msgstr "Změnit heslo"
+
+#: controllers/database.py:108
+msgid "Old Password:"
+msgstr "Staré heslo:"
+
+#: controllers/database.py:109
+msgid "New Password:"
+msgstr "Nové heslo:"
+
+#: controllers/database.py:110
+msgid "Confirm Password:"
+msgstr "Potvrdit heslo:"
+
+#: controllers/database.py:173
+msgid "You must avoid all accents, space or special characters."
+msgstr "Musíte se vyhnout přízvukům, mezerám nebo speciálním znakům."
+
+#: controllers/database.py:174
+msgid "Bad database name"
+msgstr "Chybné jméno databáze"
+
+#: controllers/database.py:194
+msgid ""
+"The server crashed during installation.\n"
+"We suggest you to drop this database."
+msgstr ""
+"Server zkolaboval během instalace.\n"
+"Doporučujeme vám smazat tuto databázi."
+
+#: controllers/database.py:195
+msgid "Error during database creation"
+msgstr "Chyba během vytváření databáze"
+
+#: controllers/database.py:198 controllers/database.py:225
+#: controllers/database.py:271 controllers/database.py:294
+msgid "Bad super admin password"
+msgstr "Chybné heslo hlavního správce"
+
+#: controllers/database.py:202
+msgid "Could not create database."
+msgstr "Nelze vytvořit databázi."
+
+#: controllers/database.py:228
+msgid "Could not drop database"
+msgstr "Nelze odstranit databázi"
+
+#: controllers/database.py:251
+msgid "Could not create backup."
+msgstr "Nelze vytvořit zálohu."
+
+#: controllers/database.py:275
+msgid "Could not restore database"
+msgstr "Databázi nelze obnovit"
+
+#: controllers/database.py:298
+msgid "Error, password not changed."
+msgstr "Chyba, heslo nebylo změněno."
+
+#: controllers/error_page.py:79
+msgid ""
+"Your problem has been sent to the quality team\n"
+"We will recontact you after analysing the problem."
+msgstr ""
+"Váš problém byl odeslán týmu kvality\n"
+"Po analýze problému vás budeme kontaktovat."
+
+#: controllers/error_page.py:81
+#, python-format
+msgid ""
+"Your problem could not be sent to the quality team\n"
+"Please report this error manually at %s"
+msgstr ""
+"Váš problém nelze odeslat týmu kvality\n"
+"Prosíme nahlašte tuto chybu ručně na: %s"
+
+#: controllers/form.py:561
+#, python-format
+msgid "Invalid button type \"%s\""
+msgstr "Neplatný typ tlačítka \"%s\""
+
+#: controllers/form.py:944 controllers/tree.py:243
+msgid "No record selected"
+msgstr "Nevybrán žádný záznam"
+
+#: controllers/form.py:949
+msgid "Print Screen"
+msgstr "Tisknout obrazovku"
+
+#: controllers/form.py:1016 widgets/listgrid.py:305 widgets/listgrid.py:366
+#: widgets/form/_form.py:910
+msgid "Application Error"
+msgstr "Chyba aplikace"
+
+#: controllers/form.py:1016
+#, python-format
+msgid "Wrong on_change trigger: %s"
+msgstr "Chybný spouštěč on_change: %s"
+
+#: controllers/form.py:1121
+msgid "Open resource"
+msgstr "Otevřít zdroj"
+
+#: controllers/form.py:1124
+msgid "Set to default value"
+msgstr "Nastavit výchozí hodnotu"
+
+#: controllers/form.py:1125
+msgid "Set as default"
+msgstr "Nastavit jako výchozí"
+
+#: controllers/form.py:1132
+msgid "Action"
+msgstr "Akce"
+
+#: controllers/form.py:1133
+msgid "Report"
+msgstr "Výkaz"
+
+#: controllers/impex.py:66
+msgid ""
+"Operation failed\n"
+"I/O error"
+msgstr ""
+"Operace selhala\n"
+"I/O chyba"
+
+#: controllers/impex.py:402
+msgid "Export Error"
+msgstr "Chyba exportu"
+
+#: controllers/impex.py:469
+msgid "Database ID"
+msgstr "ID databáze"
+
+#: controllers/impex.py:476
+msgid "Error opening .CSV file"
+msgstr "Chyba otvírání souboru .CSV"
+
+#: controllers/impex.py:476
+msgid "Input Error."
+msgstr "Chyba vstupu."
+
+#: controllers/impex.py:498
+#, python-format
+msgid "You cannot import the field '%s', because we cannot auto-detect it"
+msgstr ""
+"Nemůžete importovat pole '%s', protože jej nemůžeme automaticky rozpoznat"
+
+#: controllers/impex.py:501
+#, python-format
+msgid "Error processing the first line of the file. Field \"%s\" is unknown"
+msgstr "Chyba zpracování první řádky souboru. Neznámé pole \"%s\""
+
+#: controllers/impex.py:72 controllers/impex.py:501
+msgid "Import Error."
+msgstr "Chyba importu."
+
+#: controllers/impex.py:520
+msgid "The CSV delimiter must be a single character"
+msgstr "CSV oddělovač musí být jediný znak"
+
+#: controllers/impex.py:532
+msgid "File Format Error"
+msgstr "Chyba formátu souboru"
+
+#: controllers/impex.py:550
+msgid "XML-RPC error"
+msgstr "Chyba XML-RPC"
+
+#: controllers/impex.py:555
+#, python-format
+msgid "Imported %d objects"
+msgstr "Importováno %d objektů"
+
+#: controllers/impex.py:560
+#, python-format
+msgid "Error trying to import this record:%s. ErrorMessage:%s %s"
+msgstr "Chyba při pokusu o import tohoto záznamu:%s. Chybová zpráva:%s %s"
+
+#: controllers/impex.py:561
+msgid "ImportationError"
+msgstr "ChybaImportování"
+
+#: controllers/listgrid.py:52
+msgid "Parent record doesn't exists..."
+msgstr "Nadřazený záznam neexistuje..."
+
+#: controllers/preferences.py:35
+msgid "Change your password"
+msgstr "Změnit vaše heslo"
+
+#: controllers/preferences.py:65 controllers/templates/header.mako:59
+msgid "Preferences"
+msgstr "Předvolby"
+
+#: controllers/preferences.py:92
+msgid "All passwords have to be filled."
+msgstr "Musí být vyplněna všechna hesla."
+
+#: controllers/preferences.py:94
+msgid "The new password and its confirmation must be identical."
+msgstr "Nové heslo a jeho potvrzení musí být stejné."
+
+#: controllers/preferences.py:103
+msgid "Could not change your password."
+msgstr "Nelze změnit vaše heslo."
+
+#: controllers/preferences.py:105
+msgid "Original password incorrect, your password was not changed."
+msgstr "Neplatné původní heslo, vaše heslo nebylo změněno."
+
+#: controllers/root.py:174
+#, python-format
+msgid "Version %s"
+msgstr "Verze %s"
+
+#: controllers/translator.py:136
+msgid "You need to save the resource before adding translations."
+msgstr "Potřebujte uložit zdroj před přidáním překladů."
+
+#: controllers/tree.py:274
+msgid "No resource selected"
+msgstr "Nevybrán žádný zdroj"
+
+#: controllers/utils.py:43
+msgid "Could not connect to server"
+msgstr "Nelze připojit k serveru"
+
+#: controllers/utils.py:127 controllers/templates/login_ajax.mako:111
+msgid "Bad username or password"
+msgstr "Chybné jméno nebo heslo"
+
+#: controllers/view_log.py:32
+msgid "ID"
+msgstr "ID"
+
+#: controllers/view_log.py:33
+msgid "Creation User"
+msgstr "Vytvořil"
+
+#: controllers/view_log.py:34
+msgid "Creation Date"
+msgstr "Datum vytvoření"
+
+#: controllers/view_log.py:35
+msgid "Latest Modification by"
+msgstr "Změnil"
+
+#: controllers/view_log.py:36
+msgid "Latest Modification Date"
+msgstr "Naposledy změněno"
+
+#: controllers/view_log.py:37
+msgid "Owner"
+msgstr "Vlastník"
+
+#: controllers/view_log.py:38
+msgid "Group Owner"
+msgstr "Vlastník skupiny"
+
+#: controllers/view_log.py:39
+msgid "Access Level"
+msgstr "Úroveň přístupu"
+
+#: controllers/view_log.py:40
+msgid "Internal module data ID"
+msgstr "ID vnitřního datového modulu"
+
+#: controllers/viewed.py:221
+msgid "Invalid view id."
+msgstr "Chybné id pohledu"
+
+#: controllers/viewed.py:499
+msgid "Unable to create inherited view."
+msgstr "Nelze vytvořit zděděný pohled"
+
+#: controllers/viewed.py:501
+msgid "Can't create inherited view here."
+msgstr "Zde nelze vytvořit zděděný pohled."
+
+#: controllers/viewed.py:504
+msgid "Not implemented yet!"
+msgstr "Doposud nerealizováno!"
+
+#: controllers/viewed.py:609
+msgid "Unable to update the view."
+msgstr "Nelze aktualizovat pohled."
+
+#: controllers/viewed.py:859
+msgid "New Window"
+msgstr "Nové okno"
+
+#: controllers/viewed.py:871
+msgid "Save Button"
+msgstr "Tlačítko Uložit"
+
+#: controllers/viewed.py:871
+msgid "Cancel Button"
+msgstr "Tlačítko Zrušit"
+
+#: controllers/viewed.py:871
+msgid "Open Button"
+msgstr "Tlačítko Otevřít"
+
+#: controllers/viewed.py:877
+msgid "Left"
+msgstr "Vlevo"
+
+#: controllers/viewed.py:877
+msgid "Center"
+msgstr "Uprostřed"
+
+#: controllers/viewed.py:877
+msgid "Right"
+msgstr "Vpravo"
+
+#: controllers/templates/about.mako:4
+msgid "About the OpenERP Web"
+msgstr "O webu OpenERP"
+
+#: controllers/templates/about.mako:27
+msgid "OpenERP Web"
+msgstr "Web OpenERP"
+
+#: controllers/templates/about.mako:30
+msgid "Copyright &copy; 2006-TODAY OpenERP SA. All Rights Reserved."
+msgstr "Copyright &copy; 2006-DNES OpenERP SA. Všechna práva vyhrazena."
+
+#: controllers/templates/about.mako:31
+msgid "OpenERP is a trademark of the OpenERP SA Company."
+msgstr "OpenERP je obchodní značka společnosti OpenERP SA."
+
+#: controllers/templates/about.mako:33
+#, python-format
+msgid "%(ooweb)s is jointly developed by %(tiny)s and %(axelor)s."
+msgstr "%(ooweb)s je společně vyvíjen %(tiny)s a %(axelor)s."
+
+#: controllers/templates/about.mako:39
+#, python-format
+msgid "Licenced under the terms of %(license)s"
+msgstr "Licence pod podmínkami %(license)s"
+
+#: controllers/templates/about.mako:42
+msgid "About OpenERP"
+msgstr "O OpenERP"
+
+#: controllers/templates/about.mako:44
+#, python-format
+msgid ""
+"%(openobject)s is a free enterprise-scale software system that is designed "
+"to boost\n"
+"                    productivity and profit through data integration. It "
+"connects, improves and\n"
+"                    manages business processes in areas such as sales, "
+"finance, supply chain,\n"
+"                    project management, production, services, CRM, etc..\n"
+"                    "
+msgstr ""
+"%(openobject)s je svobodný podnikový softwarový systém, který je navržen k "
+"posílení\n"
+"                    výkonnosti a zisku skrze datovou integraci. Propojuje, "
+"vylepšuje a\n"
+"                    spravuje podnikové procesy v oblastech jako prodeje, "
+"peněžnictví, dodavatelské kanály,\n"
+"                    projektové řízení, výroba, služby, CRM, atd..\n"
+"                    "
+
+#: controllers/templates/about.mako:51
+msgid ""
+"The system is platform-independent, and can be installed on Windows, Mac OS "
+"X,\n"
+"                    and various Linux and other Unix-based distributions. "
+"Its architecture enables\n"
+"                    new functionality to be rapidly created, modifications "
+"to be made to a\n"
+"                    production system and migration to a new version to be "
+"straightforward."
+msgstr ""
+"Systém je platformě nezávislý a lze jej instalovat na Windows, Mac OS X,\n"
+"                    a rozličné Linuxové a jiné Unixově založené distribuce. "
+"Jeho architektura umožňuje\n"
+"                    rapidní vytváření nové funkcionality, přímočaré úpravy "
+"potřebné pro\n"
+"                    produkční systém a stěhování na novou verzi."
+
+#: controllers/templates/about.mako:57
+msgid ""
+"Depending on your needs, OpenERP is available through a web or application "
+"client."
+msgstr ""
+"V závislosti na vašich potřebách, OpenERP je dostupný přes web nebo "
+"aplikačního klienta."
+
+#: controllers/templates/database.mako:54 controllers/templates/login.mako:4
+#: controllers/templates/login.mako:71 controllers/templates/login_ajax.mako:85
+#: controllers/templates/login_ajax.mako:104
+msgid "Login"
+msgstr "Přihlášení"
+
+#: controllers/templates/database.mako:64
+msgid "Password"